From 0b2e8707e3aabf958ef8d3f9e421d52e7d685dfc Mon Sep 17 00:00:00 2001
From: opencode <opencode@sst.dev>
Date: Tue, 7 Jul 2026 15:31:36 +0000
Subject: [PATCH 01/33] sync release versions for v1.17.15

---
 bun.lock                                    | 56 ++++++++++-----------
 packages/app/package.json                   |  2 +-
 packages/cli/package.json                   |  2 +-
 packages/codemode/package.json              |  2 +-
 packages/console/app/package.json           |  2 +-
 packages/console/core/package.json          |  2 +-
 packages/console/function/package.json      |  2 +-
 packages/console/mail/package.json          |  2 +-
 packages/console/support/package.json       |  2 +-
 packages/core/package.json                  |  2 +-
 packages/desktop/package.json               |  2 +-
 packages/effect-drizzle-sqlite/package.json |  2 +-
 packages/effect-sqlite-node/package.json    |  2 +-
 packages/enterprise/package.json            |  2 +-
 packages/function/package.json              |  2 +-
 packages/http-recorder/package.json         |  2 +-
 packages/llm/package.json                   |  2 +-
 packages/opencode/package.json              |  2 +-
 packages/plugin/package.json                |  2 +-
 packages/sdk/js/package.json                |  2 +-
 packages/server/package.json                |  2 +-
 packages/session-ui/package.json            |  2 +-
 packages/slack/package.json                 |  2 +-
 packages/stats/app/package.json             |  2 +-
 packages/stats/core/package.json            |  2 +-
 packages/stats/server/package.json          |  2 +-
 packages/tui/package.json                   |  2 +-
 packages/ui/package.json                    |  2 +-
 packages/web/package.json                   |  2 +-
 sdks/vscode/package.json                    |  2 +-
 30 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/bun.lock b/bun.lock
index 907c04c31d2f..6af38c1f784a 100644
--- a/bun.lock
+++ b/bun.lock
@@ -29,7 +29,7 @@
     },
     "packages/app": {
       "name": "@opencode-ai/app",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@dnd-kit/abstract": "0.5.0",
         "@dnd-kit/dom": "0.5.0",
@@ -93,7 +93,7 @@
     },
     "packages/cli": {
       "name": "@opencode-ai/cli",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "bin": {
         "lildax": "./bin/lildax.cjs",
       },
@@ -141,7 +141,7 @@
     },
     "packages/codemode": {
       "name": "@opencode-ai/codemode",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -155,7 +155,7 @@
     },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -191,7 +191,7 @@
     },
     "packages/console/core": {
       "name": "@opencode-ai/console-core",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -218,7 +218,7 @@
     },
     "packages/console/function": {
       "name": "@opencode-ai/console-function",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@ai-sdk/anthropic": "3.0.82",
         "@ai-sdk/openai": "3.0.48",
@@ -240,7 +240,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode-ai/console-mail",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -264,7 +264,7 @@
     },
     "packages/console/support": {
       "name": "@opencode-ai/console-support",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode-ai/console-core": "workspace:*",
@@ -284,7 +284,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -378,7 +378,7 @@
     },
     "packages/desktop": {
       "name": "@opencode-ai/desktop",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "effect": "catalog:",
@@ -432,7 +432,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -446,7 +446,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -458,7 +458,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -490,7 +490,7 @@
     },
     "packages/function": {
       "name": "@opencode-ai/function",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -506,7 +506,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@effect/platform-node": "4.0.0-beta.83",
         "@effect/platform-node-shared": "4.0.0-beta.83",
@@ -537,7 +537,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@opencode-ai/schema": "workspace:*",
         "@smithy/eventstream-codec": "4.2.14",
@@ -556,7 +556,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -687,7 +687,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode-ai/sdk": "workspace:*",
@@ -763,7 +763,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -778,7 +778,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
@@ -793,7 +793,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode-ai/session-ui",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -837,7 +837,7 @@
     },
     "packages/slack": {
       "name": "@opencode-ai/slack",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "@slack/bolt": "^3.17.1",
@@ -850,7 +850,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode-ai/stats-app",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@opencode-ai/stats-core": "workspace:*",
@@ -883,7 +883,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode-ai/stats-core",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -902,7 +902,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode-ai/stats-server",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -943,7 +943,7 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
@@ -970,7 +970,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -1021,7 +1021,7 @@
     },
     "packages/web": {
       "name": "@opencode-ai/web",
-      "version": "1.17.14",
+      "version": "1.17.15",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
diff --git a/packages/app/package.json b/packages/app/package.json
index 739dfc5ba0e6..7430a614bfaa 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "description": "",
   "type": "module",
   "exports": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5c84ce74eafe..eb3bb1bd01b1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/cli",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "bin": {
diff --git a/packages/codemode/package.json b/packages/codemode/package.json
index 1830d59c8cd6..7646ce44b2ba 100644
--- a/packages/codemode/package.json
+++ b/packages/codemode/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/codemode",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "description": "Effect-native confined code execution over schema-described tools",
   "private": true,
   "type": "module",
diff --git a/packages/console/app/package.json b/packages/console/app/package.json
index 2e3d2342d010..955a6e916223 100644
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/console/core/package.json b/packages/console/core/package.json
index 8acc8e14ae2c..1a2f180c4f5d 100644
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/console/function/package.json b/packages/console/function/package.json
index c3c8b8894502..946e7ddf8d91 100644
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/console/mail/package.json b/packages/console/mail/package.json
index 26af29143794..7977048f5cde 100644
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",
diff --git a/packages/console/support/package.json b/packages/console/support/package.json
index 3091274be278..f56e5da41354 100644
--- a/packages/console/support/package.json
+++ b/packages/console/support/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-support",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/core/package.json b/packages/core/package.json
index fe6c0950d0c2..c0927930af68 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 570318130458..76f25878704b 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opencode-ai/desktop",
   "private": true,
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",
diff --git a/packages/effect-drizzle-sqlite/package.json b/packages/effect-drizzle-sqlite/package.json
index cd524eabb535..5b901aaa27a6 100644
--- a/packages/effect-drizzle-sqlite/package.json
+++ b/packages/effect-drizzle-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "name": "@opencode-ai/effect-drizzle-sqlite",
   "type": "module",
   "license": "MIT",
diff --git a/packages/effect-sqlite-node/package.json b/packages/effect-sqlite-node/package.json
index 936b5d47c685..0f60780033c8 100644
--- a/packages/effect-sqlite-node/package.json
+++ b/packages/effect-sqlite-node/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "name": "@opencode-ai/effect-sqlite-node",
   "type": "module",
   "license": "MIT",
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index 70e12a009e43..c319fd05bf9f 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/enterprise",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/function/package.json b/packages/function/package.json
index 1e9b3e5fc12b..c3fd3baae20e 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/function",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index 0d4f1175ad0b..ad5248cee567 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "name": "@opencode-ai/http-recorder",
   "description": "Record and replay Effect HTTP client traffic with deterministic cassettes",
   "type": "module",
diff --git a/packages/llm/package.json b/packages/llm/package.json
index f7371c2938c2..28b58bd2711a 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "name": "@opencode-ai/llm",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index a7ad66d13747..eb05f6e384a2 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "name": "opencode",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index 3069aa104f4a..f7a00d9704cd 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/plugin",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index dda5b25445a3..0b0739061888 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/sdk",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index e721d1efdb96..855fd297bc92 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/server",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/session-ui/package.json b/packages/session-ui/package.json
index 0419004baa1e..7443187d6874 100644
--- a/packages/session-ui/package.json
+++ b/packages/session-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/session-ui",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/slack/package.json b/packages/slack/package.json
index 3758c3567a87..ccb37497d758 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/slack",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/stats/app/package.json b/packages/stats/app/package.json
index 2c8503d09b79..c9df8049da40 100644
--- a/packages/stats/app/package.json
+++ b/packages/stats/app/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-app",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/core/package.json b/packages/stats/core/package.json
index bd2f14470a83..3c6f06866079 100644
--- a/packages/stats/core/package.json
+++ b/packages/stats/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-core",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/server/package.json b/packages/stats/server/package.json
index 0ec2927c703d..53601d120efd 100644
--- a/packages/stats/server/package.json
+++ b/packages/stats/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-server",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 12c61b1da5aa..63c71ea273b9 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/tui",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 08b3c31dcb6d..554b5a688634 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/web/package.json b/packages/web/package.json
index d2825f264294..b19d6fa5533f 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,7 +2,7 @@
   "name": "@opencode-ai/web",
   "type": "module",
   "license": "MIT",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "scripts": {
     "dev": "astro dev",
     "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json
index 272b1ddabda4..cc8695fb0ffe 100644
--- a/sdks/vscode/package.json
+++ b/sdks/vscode/package.json
@@ -2,7 +2,7 @@
   "name": "opencode",
   "displayName": "opencode",
   "description": "opencode for VS Code",
-  "version": "1.17.14",
+  "version": "1.17.15",
   "publisher": "sst-dev",
   "repository": {
     "type": "git",

From 14a5529793a91001ca81c80e96f39533eab79127 Mon Sep 17 00:00:00 2001
From: Adam <2363879+adamdotdevin@users.noreply.github.com>
Date: Tue, 7 Jul 2026 11:12:17 -0500
Subject: [PATCH 02/33] feat(data): redesign model peers

---
 .../stats/app/src/routes/[lab]/[model].tsx    | 14 +++-
 packages/stats/app/src/routes/index.css       | 83 +++++++++++++++----
 packages/stats/core/src/domain/home.ts        |  4 +-
 3 files changed, 78 insertions(+), 23 deletions(-)

diff --git a/packages/stats/app/src/routes/[lab]/[model].tsx b/packages/stats/app/src/routes/[lab]/[model].tsx
index a71fd8e61b23..adbbf95c5c0f 100644
--- a/packages/stats/app/src/routes/[lab]/[model].tsx
+++ b/packages/stats/app/src/routes/[lab]/[model].tsx
@@ -1143,10 +1143,16 @@ function PeerRow(props: { peer: ModelPeerEntry; active: boolean }) {
         href={language.route(`${import.meta.env.BASE_URL}${providerSlug(props.peer.provider)}/${props.peer.slug}`)}
         data-active={props.active ? "true" : undefined}
       >
-        <span>{String(props.peer.rank).padStart(2, "0")}</span>
-        <ProviderIcon aria-hidden="true" id={getProviderIconId(props.peer.author)} />
-        <strong>{props.peer.model}</strong>
-        <em>{props.peer.author}</em>
+        <span data-slot="model-peer-rank" aria-label={props.active ? `Rank ${props.peer.rank}` : undefined}>
+          <Show when={!props.active}>{String(props.peer.rank).padStart(2, "0")}</Show>
+        </span>
+        <span data-slot="model-peer-avatar">
+          <ProviderIcon aria-hidden="true" id={getProviderIconId(props.peer.author)} />
+        </span>
+        <span data-slot="model-peer-copy">
+          <strong>{props.peer.model}</strong>
+          <em>{props.peer.author}</em>
+        </span>
         <b>{formatTokens(props.peer.tokens)}</b>
       </a>
     </li>
diff --git a/packages/stats/app/src/routes/index.css b/packages/stats/app/src/routes/index.css
index a2b652b15b2d..2b57338bf854 100644
--- a/packages/stats/app/src/routes/index.css
+++ b/packages/stats/app/src/routes/index.css
@@ -5159,7 +5159,10 @@
 
 [data-page="stats"] [data-component="model-peer-list"] {
   display: grid;
-  gap: 8px;
+  grid-auto-flow: column;
+  grid-auto-columns: minmax(0, 1fr);
+  grid-template-rows: repeat(5, 64px);
+  gap: 12px 40px;
   margin: 0;
   padding: 0;
   list-style: none;
@@ -5167,11 +5170,12 @@
 
 [data-page="stats"] [data-component="model-peer-list"] a {
   display: grid;
-  grid-template-columns: 38px 24px minmax(0, 1fr) minmax(96px, auto) minmax(80px, auto);
-  gap: 12px;
+  grid-template-columns: 32px 32px minmax(0, 1fr) minmax(64px, auto);
+  gap: 16px;
   align-items: center;
-  min-height: 44px;
-  padding: 0 12px;
+  box-sizing: border-box;
+  height: 64px;
+  padding: 15px 16px;
   border: 1px solid var(--stats-line);
   background: var(--stats-layer);
   color: var(--stats-text);
@@ -5180,25 +5184,56 @@
 
 [data-page="stats"] [data-component="model-peer-list"] a:hover,
 [data-page="stats"] [data-component="model-peer-list"] a[data-active="true"] {
-  border-color: var(--stats-line-strong);
+  border-color: var(--stats-text);
   background: var(--stats-bg);
   text-decoration: none;
 }
 
-[data-page="stats"] [data-component="model-peer-list"] span,
+[data-page="stats"] [data-slot="model-peer-rank"],
 [data-page="stats"] [data-component="model-peer-list"] em,
 [data-page="stats"] [data-component="model-peer-list"] b {
   color: var(--stats-muted);
-  font-size: 11px;
+  font-size: 13px;
   font-style: normal;
   font-weight: 500;
-  line-height: 1.2;
+  line-height: 16px;
+  font-variant-numeric: tabular-nums;
+}
+
+[data-page="stats"] [data-slot="model-peer-rank"] {
+  position: relative;
+  display: grid;
+  place-items: center;
+  width: 32px;
+  height: 32px;
+}
+
+[data-page="stats"] [data-component="model-peer-list"] a[data-active="true"] [data-slot="model-peer-rank"]::before {
+  width: 6px;
+  height: 6px;
+  content: "";
+  background: var(--stats-text);
+}
+
+[data-page="stats"] [data-slot="model-peer-avatar"] {
+  display: grid;
+  place-items: center;
+  width: 32px;
+  height: 32px;
+  color: var(--stats-muted);
+  background: var(--stats-bg);
+  box-shadow: inset 0 0 0 1px var(--stats-line);
 }
 
-[data-page="stats"] [data-component="model-peer-list"] svg {
+[data-page="stats"] [data-slot="model-peer-avatar"] svg {
   width: 18px;
   height: 18px;
-  color: var(--stats-muted);
+}
+
+[data-page="stats"] [data-slot="model-peer-copy"] {
+  display: grid;
+  gap: 2px;
+  min-width: 0;
 }
 
 [data-page="stats"] [data-component="model-peer-list"] strong {
@@ -5207,11 +5242,16 @@
   color: var(--stats-text);
   font-size: 13px;
   font-weight: 600;
-  line-height: 1.2;
+  line-height: 16px;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
 
+[data-page="stats"] [data-component="model-peer-list"] b {
+  justify-self: end;
+  color: var(--stats-text);
+}
+
 [data-page="stats"][data-theme="dark"],
 :root[data-stats-theme="dark"] [data-page="stats"]:not([data-theme="light"]) {
   color-scheme: dark;
@@ -5749,11 +5789,12 @@
   }
 
   [data-page="stats"] [data-component="model-peer-list"] a {
-    grid-template-columns: 32px 22px minmax(0, 1fr) minmax(72px, auto);
+    grid-template-columns: 32px 32px minmax(0, 1fr) minmax(64px, auto);
+    gap: 12px;
   }
 
   [data-page="stats"] [data-component="model-peer-list"] em {
-    display: none;
+    display: block;
   }
 
   [data-page="stats"] [data-slot="chart-footer"] {
@@ -6304,12 +6345,20 @@
     min-width: 0;
   }
 
+  [data-page="stats"] [data-component="model-peer-list"] {
+    grid-auto-flow: row;
+    grid-auto-columns: auto;
+    grid-template-rows: none;
+    gap: 12px;
+  }
+
   [data-page="stats"] [data-component="model-peer-list"] a {
-    grid-template-columns: 30px minmax(0, 1fr) minmax(64px, auto);
+    grid-template-columns: 28px 32px minmax(0, 1fr) minmax(56px, auto);
+    gap: 12px;
   }
 
-  [data-page="stats"] [data-component="model-peer-list"] svg {
-    display: none;
+  [data-page="stats"] [data-slot="model-peer-rank"] {
+    width: 28px;
   }
 
   [data-page="stats"] [data-section="top-models"] [data-slot="chart-footer"] {
diff --git a/packages/stats/core/src/domain/home.ts b/packages/stats/core/src/domain/home.ts
index 346d4da4f932..afaf624ca5f4 100644
--- a/packages/stats/core/src/domain/home.ts
+++ b/packages/stats/core/src/domain/home.ts
@@ -646,8 +646,8 @@ function buildModelTokenMix(aggregate: ModelAggregate): ModelMixEntry[] {
 }
 
 function buildModelPeers(peers: ModelAggregate[], rank: number, totalTokens: number): ModelPeerEntry[] {
-  const start = Math.max(0, Math.min(rank - 4, Math.max(peers.length - 7, 0)))
-  return peers.slice(start, start + 7).map((item, index) => ({
+  const start = Math.max(0, Math.min(rank - 5, Math.max(peers.length - 10, 0)))
+  return peers.slice(start, start + 10).map((item, index) => ({
     model: item.model,
     provider: item.provider,
     author: formatProvider(item.provider),

From 95013d2936c18fbb8a697c17ce4dad30b9010c09 Mon Sep 17 00:00:00 2001
From: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Date: Wed, 8 Jul 2026 11:24:21 +0800
Subject: [PATCH 03/33] fix(app): keep session routes within layouts (#35842)

---
 packages/app/src/app.tsx               | 71 +++++++++++++++++++++-----
 packages/app/src/pages/home.tsx        |  4 +-
 packages/app/src/pages/layout-new.tsx  |  2 +
 packages/app/src/pages/new-session.tsx |  2 -
 packages/app/src/pages/session.tsx     | 22 +++-----
 5 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx
index f4cf14518c4c..b7f87a09cd2a 100644
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -9,7 +9,7 @@ import { Font } from "@opencode-ai/ui/font"
 import { Splash } from "@opencode-ai/ui/logo"
 import { ThemeProvider } from "@opencode-ai/ui/theme/context"
 import { MetaProvider } from "@solidjs/meta"
-import { type BaseRouterProps, Navigate, Route, Router, useParams, useSearchParams } from "@solidjs/router"
+import { type BaseRouterProps, Navigate, Route, Router, useNavigate, useParams, useSearchParams } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { Effect } from "effect"
 import {
@@ -32,7 +32,7 @@ import { CommandProvider, useCommand, type CommandOption } from "@/context/comma
 import { CommentsProvider } from "@/context/comments"
 import { FileProvider } from "@/context/file"
 import { ServerSDKProvider } from "@/context/server-sdk"
-import { ServerSyncProvider } from "@/context/server-sync"
+import { ServerSyncProvider, useServerSync } from "@/context/server-sync"
 import { GlobalProvider, useGlobal } from "@/context/global"
 import { HighlightsProvider } from "@/context/highlights"
 import { LanguageProvider, type Locale, useLanguage } from "@/context/language"
@@ -52,9 +52,10 @@ import LegacyLayout from "@/pages/layout"
 import NewLayout from "@/pages/layout-new"
 import { ErrorPage } from "./pages/error"
 import { useCheckServerHealth } from "./utils/server-health"
-import { legacySessionServer, requireServerKey, sessionHref } from "./utils/session-route"
+import { legacySessionHref, legacySessionServer, requireServerKey, sessionHref } from "./utils/session-route"
+import { createSessionLineage } from "@/pages/session/session-lineage"
 
-import { SessionPage, TargetSessionRouteContent } from "@/pages/session"
+import { SessionPage, SessionRouteErrorBoundary, TargetSessionRouteContent } from "@/pages/session"
 import { NewHome, LegacyHome } from "@/pages/home"
 
 const NewSession = lazy(() => import("@/pages/new-session"))
@@ -88,10 +89,14 @@ const SessionRoute = () => {
     tabs.newDraft({ server: server.key, directory: sdk().directory }, search.prompt)
   })
 
-  return <SessionPage />
+  return (
+    <SessionRouteErrorBoundary sessionID={params.id}>
+      <SessionPage />
+    </SessionRouteErrorBoundary>
+  )
 }
 
-const TargetSessionRoute = () => {
+function TargetServerRoute(props: ParentProps) {
   const params = useParams<{ serverKey: string; id: string }>()
   const global = useGlobal()
   const conn = createMemo(() => {
@@ -105,14 +110,47 @@ const TargetSessionRoute = () => {
     // re-resolves reactively instead); both rely on this key for server changes.
     <Show when={requireServerKey(params.serverKey)} keyed>
       <ServerSDKProvider server={conn}>
-        <ServerSyncProvider server={conn}>
-          <TargetSessionRouteContent />
-        </ServerSyncProvider>
+        <ServerSyncProvider server={conn}>{props.children}</ServerSyncProvider>
       </ServerSDKProvider>
     </Show>
   )
 }
 
+const TargetSessionRoute = () => (
+  <TargetServerRoute>
+    <TargetSessionRouteContent />
+  </TargetServerRoute>
+)
+
+function LegacyTargetSessionRoute() {
+  const params = useParams<{ serverKey: string; id: string }>()
+  return (
+    <TargetServerRoute>
+      <SessionRouteErrorBoundary sessionID={params.id} serverKey={requireServerKey(params.serverKey)}>
+        <LegacyTargetSessionRedirect />
+      </SessionRouteErrorBoundary>
+    </TargetServerRoute>
+  )
+}
+
+function LegacyTargetSessionRedirect() {
+  const params = useParams<{ id: string }>()
+  const navigate = useNavigate()
+  const sync = useServerSync()
+  const current = createSessionLineage(
+    () => params.id,
+    () => sync().session.lineage,
+  )
+
+  createEffect(() => {
+    const directory = current()?.session.directory
+    if (!directory) return
+    navigate(legacySessionHref(directory, params.id), { replace: true })
+  })
+
+  return null
+}
+
 // Wraps the non-draft routes. They are gated on (and keyed to) the globally selected
 // server via ServerKey, then provide the server-scoped shell (Permission/Layout/
 // Notification/Models + the visual Layout) for that server.
@@ -542,7 +580,14 @@ function Routes(props: { serverScoped?: JSX.Element }) {
           <LegacyServerLayout serverScoped={props.serverScoped}>{routeProps.children}</LegacyServerLayout>
         )}
       >
-        <Show when={!settings.general.newLayoutDesigns()}>{<Route path="/" component={LegacyHome} />}</Show>
+        <Show when={!settings.general.newLayoutDesigns()}>
+          {
+            <>
+              <Route path="/" component={LegacyHome} />
+              <Route path="/server/:serverKey/session/:id" component={LegacyTargetSessionRoute} />
+            </>
+          }
+        </Show>
         <Route path="/:dir" component={DirectoryLayout}>
           <Route path="/" component={() => <Navigate href="session" />} />
           <Route path="/session/:id?" component={SessionRoute} />
@@ -550,15 +595,15 @@ function Routes(props: { serverScoped?: JSX.Element }) {
       </Route>
       <Show when={settings.general.newLayoutDesigns()}>
         <Route path="/" component={NewHome} />
-        <Route path="/:dir/session/:id" component={LegacyTargetSessionRoute} />
+        <Route path="/:dir/session/:id" component={NewLayoutLegacySessionRedirect} />
+        <Route path="/server/:serverKey/session/:id" component={TargetSessionRoute} />
       </Show>
       <Route path="/new-session" component={DraftRoute} />
-      <Route path="/server/:serverKey/session/:id" component={TargetSessionRoute} />
     </>
   )
 }
 
-function LegacyTargetSessionRoute() {
+function NewLayoutLegacySessionRedirect() {
   const server = useServer()
   const tabs = useTabs()
   const params = useParams<{ id: string }>()
diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index 762b8b2c8e02..c4d84a96f84c 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -35,7 +35,7 @@ import { usePlatform } from "@/context/platform"
 import { DateTime } from "luxon"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useDirectoryPicker } from "@/components/directory-picker"
-import { useSettingsCommand } from "@/components/settings-dialog"
+import { useSettingsDialog } from "@/components/settings-dialog"
 import { DialogSelectServer, useServerManagementController } from "@/components/dialog-select-server"
 import { DialogServerV2 } from "@/components/settings-v2/dialog-server-v2"
 import { ServerConnection, serverName, useServer } from "@/context/server"
@@ -267,7 +267,7 @@ export function NewHome() {
   const command = useCommand()
   const notification = useNotification()
   const marked = useMarked()
-  const openSettings = useSettingsCommand()
+  const openSettings = useSettingsDialog()
   let focusSessionSearch: (() => void) | undefined
   const [state, setState] = createStore({
     search: "",
diff --git a/packages/app/src/pages/layout-new.tsx b/packages/app/src/pages/layout-new.tsx
index 329b7c56b050..f73e7b17eb31 100644
--- a/packages/app/src/pages/layout-new.tsx
+++ b/packages/app/src/pages/layout-new.tsx
@@ -6,11 +6,13 @@ import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { usePlatform } from "@/context/platform"
 import { setNavigate } from "@/utils/notification-click"
 import { setV2Toast, ToastRegion } from "@/utils/toast"
+import { useSettingsCommand } from "@/components/settings-dialog"
 
 export default function NewLayout(props: ParentProps) {
   const platform = usePlatform()
   const navigate = useNavigate()
   setNavigate(navigate)
+  useSettingsCommand()
 
   createEffect(() => setV2Toast(true))
 
diff --git a/packages/app/src/pages/new-session.tsx b/packages/app/src/pages/new-session.tsx
index 461be60450b4..7831ed8514e3 100644
--- a/packages/app/src/pages/new-session.tsx
+++ b/packages/app/src/pages/new-session.tsx
@@ -6,7 +6,6 @@ import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { NewSessionDesignView } from "@/components/session"
 import { PromptInput } from "@/components/prompt-input"
 import { StatusPopoverV2 } from "@/components/status-popover"
-import { useSettingsCommand } from "@/components/settings-dialog"
 import {
   PromptProjectAddButton,
   PromptProjectSelector,
@@ -45,7 +44,6 @@ export default function NewSessionPage() {
   const [searchParams, setSearchParams] = useSearchParams<{ draftId?: string; prompt?: string }>()
 
   useComposerCommands()
-  useSettingsCommand()
 
   let inputRef: HTMLDivElement | undefined
 
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 46bd907167a4..84f6b013092b 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -35,7 +35,7 @@ import { previewSelectedLines } from "@opencode-ai/session-ui/pierre/selection-b
 import { Button } from "@opencode-ai/ui/button"
 import { showToast } from "@/utils/toast"
 import { base64Encode, checksum } from "@opencode-ai/core/util/encode"
-import { Navigate, useLocation, useNavigate, useParams, useSearchParams } from "@solidjs/router"
+import { useLocation, useNavigate, useParams, useSearchParams } from "@solidjs/router"
 import { NewSessionView, SessionHeader } from "@/components/session"
 import { ErrorPage } from "@/pages/error"
 import { CommentsProvider, useComments } from "@/context/comments"
@@ -56,7 +56,6 @@ import { useSync } from "@/context/sync"
 import { useTabs } from "@/context/tabs"
 import { TerminalProvider, useTerminal } from "@/context/terminal"
 import { PromptInput } from "@/components/prompt-input"
-import { useSettingsCommand } from "@/components/settings-dialog"
 import { type FollowupDraft, sendFollowupDraft } from "@/components/prompt-input/submit"
 import {
   createPromptInputController,
@@ -153,7 +152,7 @@ export function TargetSessionRouteContent() {
   )
 }
 
-function SessionRouteErrorBoundary(
+export function SessionRouteErrorBoundary(
   props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key; padded?: boolean }>,
 ) {
   const settings = useSettings()
@@ -221,7 +220,6 @@ function SessionErrorFallback(props: { error: unknown; sessionID?: string; serve
 
 function ResolvedTargetSessionRoute() {
   const params = useParams<{ serverKey: string; id: string }>()
-  const settings = useSettings()
   const tabs = useTabs()
   const sync = useServerSync()
   const serverKey = createMemo(() => requireServerKey(params.serverKey))
@@ -248,16 +246,11 @@ function ResolvedTargetSessionRoute() {
           the terminal. Same-workspace tab switches keep it open because warm
           targets resolve synchronously from the sync cache. */}
       <Show when={directory()}>
-        <Show
-          when={settings.general.newLayoutDesigns()}
-          fallback={<Navigate href={legacySessionHref(directory()!, params.id)} />}
-        >
-          <SDKProvider directory={targetDirectory}>
-            <DirectoryDataProvider directory={targetDirectory} server={serverKey}>
-              <TargetSessionPage />
-            </DirectoryDataProvider>
-          </SDKProvider>
-        </Show>
+        <SDKProvider directory={targetDirectory}>
+          <DirectoryDataProvider directory={targetDirectory} server={serverKey}>
+            <TargetSessionPage />
+          </DirectoryDataProvider>
+        </SDKProvider>
       </Show>
     </TargetServerScopedProviders>
   )
@@ -1021,7 +1014,6 @@ export default function Page() {
   }
 
   useComposerCommands()
-  useSettingsCommand()
   useSessionCommands({
     navigateMessageByOffset,
     setActiveMessage,

From 6cfe4bc34f61d5970536416f46e2c75a938ed9ec Mon Sep 17 00:00:00 2001
From: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Date: Wed, 8 Jul 2026 11:44:56 +0800
Subject: [PATCH 04/33] fix(app): route new session shortcut through tabs
 (#35849)

---
 packages/app/src/pages/session/use-session-commands.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/pages/session/use-session-commands.tsx b/packages/app/src/pages/session/use-session-commands.tsx
index baa5e817b60c..3c965b8ac8f8 100644
--- a/packages/app/src/pages/session/use-session-commands.tsx
+++ b/packages/app/src/pages/session/use-session-commands.tsx
@@ -18,8 +18,6 @@ import { createSessionTabs } from "@/pages/session/helpers"
 import { extractPromptFromParts } from "@/utils/prompt"
 import { UserMessage } from "@opencode-ai/sdk/v2"
 import { useSessionLayout } from "@/pages/session/session-layout"
-import { useTabs } from "@/context/tabs"
-import { requireServerKey } from "@/utils/session-route"
 import { createSessionOwnership } from "./session-ownership"
 
 export type SessionCommandContext = {
@@ -48,7 +46,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
   const settings = useSettings()
   const sync = useSync()
   const terminal = useTerminal()
-  const sessionTabs = useTabs()
   const layout = useLayout()
   const navigate = useNavigate()
   const { params, sessionKey, tabs, view } = useSessionLayout()
@@ -419,9 +416,9 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
       title: language.t("command.session.new"),
       keybind: "mod+shift+s",
       slash: "new",
-      onSelect: () => {
-        if (params.serverKey) {
-          sessionTabs.newDraft({ server: requireServerKey(params.serverKey), directory: sdk().directory })
+      onSelect: (source) => {
+        if (settings.general.newLayoutDesigns()) {
+          command.trigger("tab.new", source)
           return
         }
         navigate(`/${params.dir}/session`)

From 77429f59823c8c6df9cfee95d4c663043b017f46 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Wed, 8 Jul 2026 14:57:28 +1000
Subject: [PATCH 05/33] feat(app): sync product translations (#35856)

---
 package.json                                  |   1 +
 packages/app/src/i18n/ar.ts                   | 150 ++++-
 packages/app/src/i18n/br.ts                   | 155 +++++-
 packages/app/src/i18n/bs.ts                   | 153 ++++-
 packages/app/src/i18n/da.ts                   | 151 ++++-
 packages/app/src/i18n/de.ts                   | 154 +++++-
 packages/app/src/i18n/es.ts                   | 154 +++++-
 packages/app/src/i18n/fr.ts                   | 155 +++++-
 packages/app/src/i18n/ja.ts                   | 154 +++++-
 packages/app/src/i18n/ko.ts                   | 155 +++++-
 packages/app/src/i18n/no.ts                   | 167 +++++-
 packages/app/src/i18n/parity.test.ts          | 137 ++++-
 packages/app/src/i18n/pl.ts                   | 163 +++++-
 packages/app/src/i18n/ru.ts                   | 153 ++++-
 packages/app/src/i18n/th.ts                   | 161 +++++-
 packages/app/src/i18n/tr.ts                   | 160 +++++-
 packages/app/src/i18n/uk.ts                   | 122 ++++
 packages/app/src/i18n/zh.ts                   | 134 ++++-
 packages/app/src/i18n/zht.ts                  | 146 ++++-
 .../session/timeline/message-timeline.tsx     |   6 +-
 .../src/components/session-turn.tsx           |   6 +-
 packages/ui/src/i18n/ar.ts                    |  24 +
 packages/ui/src/i18n/br.ts                    |  24 +
 packages/ui/src/i18n/bs.ts                    |  24 +
 packages/ui/src/i18n/da.ts                    |  24 +
 packages/ui/src/i18n/de.ts                    |  25 +
 packages/ui/src/i18n/en.ts                    |   3 +-
 packages/ui/src/i18n/es.ts                    |  24 +
 packages/ui/src/i18n/fr.ts                    |  24 +
 packages/ui/src/i18n/ja.ts                    |  28 +-
 packages/ui/src/i18n/ko.ts                    |  25 +
 packages/ui/src/i18n/no.ts                    |  25 +
 packages/ui/src/i18n/pl.ts                    |  24 +
 packages/ui/src/i18n/ru.ts                    |  24 +
 packages/ui/src/i18n/th.ts                    |  24 +
 packages/ui/src/i18n/tr.ts                    |  24 +
 packages/ui/src/i18n/uk.ts                    |  32 +-
 packages/ui/src/i18n/zh.ts                    |  24 +
 packages/ui/src/i18n/zht.ts                   |  24 +
 script/translate-app.md                       |  21 +
 script/translate-app.test.ts                  | 168 ++++++
 script/translate-app.ts                       | 523 ++++++++++++++++++
 42 files changed, 3791 insertions(+), 84 deletions(-)
 create mode 100644 script/translate-app.md
 create mode 100644 script/translate-app.test.ts
 create mode 100644 script/translate-app.ts

diff --git a/package.json b/package.json
index e5526b22ffb1..e65499f878ce 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "prepare": "husky",
     "random": "echo 'Random script'",
     "sso": "aws sso login --sso-session=opencode --no-browser",
+    "translate:app": "bun run script/translate-app.ts",
     "test": "echo 'do not run tests from root' && exit 1"
   },
   "workspaces": {
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index a5174a59000e..c60920d10763 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -21,6 +21,9 @@ export const dict = {
   "theme.scheme.dark": "داكن",
   "command.sidebar.toggle": "تبديل الشريط الجانبي",
   "command.project.open": "فتح مشروع",
+  "command.project.previous": "المشروع السابق",
+  "command.project.next": "المشروع التالي",
+  "command.project.index": "التبديل إلى المشروع {{index}}",
   "command.provider.connect": "اتصال بموفر",
   "command.server.switch": "تبديل الخادم",
   "command.settings.open": "فتح الإعدادات",
@@ -39,6 +42,7 @@ export const dict = {
   "command.session.new": "جلسة جديدة",
   "command.file.open": "فتح ملف",
   "command.tab.close": "إغلاق علامة التبويب",
+  "command.tab.reopenClosed": "إعادة فتح علامة التبويب المغلقة",
   "command.context.addSelection": "إضافة التحديد إلى السياق",
   "command.context.addSelection.description": "إضافة الأسطر المحددة من الملف الحالي",
   "command.input.focus": "التركيز على حقل الإدخال",
@@ -193,6 +197,11 @@ export const dict = {
   "model.input.video": "فيديو",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "يسمح: {{inputs}}",
+  "model.tooltip.context.label": "السياق",
+  "model.tooltip.inputs": "المدخلات",
+  "model.tooltip.model": "النموذج",
+  "model.tooltip.provider": "الموفر",
+  "model.tooltip.reasoning": "الاستنتاج",
   "model.tooltip.reasoning.allowed": "يسمح بالاستنتاج",
   "model.tooltip.reasoning.none": "بدون استنتاج",
   "model.tooltip.context": "حد السياق {{limit}}",
@@ -202,6 +211,7 @@ export const dict = {
   "common.loading": "جارٍ التحميل",
   "common.loading.ellipsis": "...",
   "common.cancel": "إلغاء",
+  "common.clear": "مسح",
   "common.connect": "اتصال",
   "common.disconnect": "قطع الاتصال",
   "common.continue": "إرسال",
@@ -218,6 +228,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc للخروج",
+  "session.child.promptDisabled": "لا يمكن إرسال موجّهات إلى جلسات الوكلاء الفرعيين.",
+  "session.child.backToParent": "العودة إلى الجلسة الرئيسية.",
   "prompt.example.1": "إصلاح TODO في قاعدة التعليمات البرمجية",
   "prompt.example.2": "ما هو المكدس التقني لهذا المشروع؟",
   "prompt.example.3": "إصلاح الاختبارات المعطلة",
@@ -314,6 +326,74 @@ export const dict = {
   "dialog.server.menu.delete": "حذف",
   "dialog.server.current": "الخادم الحالي",
   "dialog.server.status.default": "افتراضي",
+  "wsl.server.add": "إضافة خادم WSL",
+  "wsl.server.addShort": "إضافة WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "خادم WSL",
+  "wsl.server.retryStart": "إعادة محاولة التشغيل",
+  "wsl.server.updating": "جارٍ التحديث...",
+  "wsl.onboarding.step.distro": "اختر توزيعة",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "جارٍ التحقق من WSL...",
+  "wsl.onboarding.restartRequired": "يحتاج Windows إلى إعادة التشغيل لإكمال تثبيت WSL.",
+  "wsl.onboarding.ready": "WSL جاهز.",
+  "wsl.onboarding.required": "يلزم WSL للمتابعة.",
+  "wsl.onboarding.checkingDistros": "جارٍ التحقق من التوزيعات...",
+  "wsl.onboarding.installingDistro": "جارٍ تثبيت {{distro}}...",
+  "wsl.onboarding.checkingDistro": "جارٍ التحقق من {{distro}}...",
+  "wsl.onboarding.listingDistros": "جارٍ سرد التوزيعات...",
+  "wsl.onboarding.distroReady": "{{distro}} جاهزة.",
+  "wsl.onboarding.distroNotInstalled": "لم يتم تثبيت {{distro}} بعد.",
+  "wsl.onboarding.openDistroOnce": "افتح {{distro}} مرة واحدة لإكمال الإعداد.",
+  "wsl.onboarding.finishingDistro": "جارٍ إكمال إعداد {{distro}}.",
+  "wsl.onboarding.pickDistro": "اختر توزيعة أو ثبّت واحدة أدناه.",
+  "wsl.onboarding.checkingOpencode": "جارٍ التحقق من OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "جارٍ التحقق من OpenCode في {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "جارٍ تحديث OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "جارٍ تحديث OpenCode في {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "حدّث OpenCode في {{distro}}.",
+  "wsl.onboarding.updateOpencode": "تحديث OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode جاهز في {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode جاهز.",
+  "wsl.onboarding.installOpencodeIn": "ثبّت OpenCode في {{distro}}.",
+  "wsl.onboarding.installOpencode": "تثبيت OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "اختر توزيعة أولاً.",
+  "wsl.onboarding.loadFailed": "فشل تحميل حالة WSL.",
+  "wsl.onboarding.loading": "جارٍ التحميل...",
+  "wsl.onboarding.installedDistros": "التوزيعات المثبتة",
+  "wsl.onboarding.checkAgain": "تحقق مجددًا",
+  "wsl.onboarding.distroStatus.ready": "جاهزة",
+  "wsl.onboarding.distroStatus.checking": "جارٍ التحقق...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode غير مثبت",
+  "wsl.onboarding.distroStatus.missingTools": "bash و curl مفقودان",
+  "wsl.onboarding.distroStatus.unsupported": "غير مدعومة · استخدم WSL 2",
+  "wsl.onboarding.needAnotherDistro": "هل تحتاج إلى توزيعة أخرى؟",
+  "wsl.onboarding.needAnotherDistroHint": "ثبّت توزيعة Linux من كتالوج WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL غير مثبت",
+  "wsl.onboarding.wslNotInstalled.description":
+    "يلزم WSL (نظام Windows الفرعي لـ Linux) قبل أن يتمكن OpenCode من إضافة خادم WSL",
+  "wsl.onboarding.wslUnavailable.title": "WSL غير متاح",
+  "wsl.onboarding.wslUnavailable.description": "تعذر على OpenCode التحقق من WSL على هذا الجهاز.",
+  "wsl.onboarding.installWsl": "تثبيت WSL",
+  "wsl.onboarding.windowsRestartRequired": "أعد تشغيل Windows لإكمال تثبيت WSL، ثم أعد فتح OpenCode.",
+  "wsl.onboarding.next": "التالي",
+  "wsl.onboarding.refresh": "تحديث",
+  "wsl.onboarding.allDistrosAdded": "تمت إضافة جميع التوزيعات المثبتة بالفعل.",
+  "wsl.onboarding.noDistros": "لم يتم اكتشاف أي توزيعات بعد.",
+  "wsl.onboarding.install": "تثبيت",
+  "wsl.onboarding.installing": "جارٍ التثبيت...",
+  "wsl.onboarding.installDistro": "تثبيت توزيعة",
+  "wsl.onboarding.searchDistros": "البحث عن توزيعات",
+  "wsl.onboarding.wsl2Required": "يلزم WSL 2.",
+  "wsl.onboarding.toolsRequired": "تحتاج هذه التوزيعة إلى bash و curl.",
+  "wsl.onboarding.openTerminal": "فتح المحطة الطرفية",
+  "wsl.onboarding.path": "المسار: {{path}}",
+  "wsl.onboarding.notFound": "غير موجود",
+  "wsl.onboarding.version": "الإصدار: {{version}}",
+  "wsl.onboarding.unknown": "غير معروف",
+  "wsl.onboarding.desktopVersion": "سطح المكتب {{version}}",
+  "wsl.onboarding.versionMismatch": "لا يتطابق الإصدار المثبت مع إصدار تطبيق سطح المكتب.",
+  "wsl.onboarding.adding": "جارٍ الإضافة...",
   "dialog.project.edit.title": "تحرير المشروع",
   "dialog.project.edit.name": "الاسم",
   "dialog.project.edit.icon": "أيقونة",
@@ -370,6 +450,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
   "toast.language.title": "لغة",
@@ -406,10 +487,12 @@ export const dict = {
   "toast.update.action.notYet": "ليس الآن",
   "error.page.title": "حدث خطأ ما",
   "error.page.description": "حدث خطأ أثناء تحميل التطبيق.",
+  "error.page.description.localServerStartup": "حدث خطأ أثناء بدء تشغيل الخادم المحلي.",
   "error.page.details.label": "تفاصيل الخطأ",
   "error.page.action.restart": "إعادة تشغيل",
   "error.page.action.report": "الإبلاغ عن الخطأ",
   "error.page.action.reported": "تم الإبلاغ عن الخطأ",
+  "error.page.action.exportLogs": "تصدير السجلات",
   "error.page.action.checking": "جارٍ التحقق...",
   "error.page.action.checkUpdates": "التحقق من وجود تحديثات",
   "error.page.action.updateTo": "تحديث إلى {{version}}",
@@ -450,16 +533,38 @@ export const dict = {
   "home.recentProjects": "المشاريع الحديثة",
   "home.empty.title": "لا توجد مشاريع حديثة",
   "home.empty.description": "ابدأ بفتح مشروع محلي",
+  "home.title": "الرئيسية",
+  "home.projects": "المشاريع",
+  "home.project.add": "إضافة مشروع",
+  "home.recentlyClosed": "المغلقة مؤخرًا",
+  "home.server.collapse": "طي مشاريع الخادم",
+  "home.server.expand": "توسيع مشاريع الخادم",
+  "home.sessions.search.placeholder": "البحث في الجلسات",
+  "home.sessions.search.placeholder.scoped": "البحث في جلسات {{scope}}",
+  "home.sessions.search.sessions": "الجلسات",
+  "home.sessions.search.noResults": "لم يتم العثور على جلسات لـ {{query}}",
+  "home.sessions.empty": "لا يوجد شيء هنا بعد",
+  "home.sessions.empty.description": "أنشئ جلسة للبدء",
+  "home.sessions.group.today": "اليوم",
+  "home.sessions.group.yesterday": "أمس",
+  "home.sessions.group.older": "الأقدم",
   "session.tab.session": "جلسة",
   "session.tab.review": "مراجعة",
   "session.tab.context": "سياق",
+  "session.tab.unknown": "جلسة غير معروفة",
   "session.panel.reviewAndFiles": "المراجعة والملفات",
+  "session.error.notFound": "لا يمكن العثور على هذه الجلسة",
+  "session.error.notFound.description": "يشير هذا التبويب إلى جلسة لم تعد موجودة على هذا الخادم.",
+  "session.error.notFound.closeTab": "إغلاق علامة التبويب",
+  "session.error.serverConnection": "تعذر الاتصال بهذا الخادم",
   "session.review.filesChanged": "تم تغيير {{count}} ملفات",
   "session.review.change.one": "تغيير",
   "session.review.change.other": "تغييرات",
   "session.review.loadingChanges": "جارٍ تحميل التغييرات...",
   "session.review.empty": "لا توجد تغييرات في هذه الجلسة بعد",
   "session.review.noChanges": "لا توجد تغييرات",
+  "session.review.noUncommittedChanges": "لا توجد تغييرات غير مُودَعة بعد",
+  "session.review.noBranchChanges": "لا توجد تغييرات في الفرع بعد",
   "session.review.noVcs": "لم يتم اكتشاف نظام التحكم في الإصدار Git، لن يتم عرض التغييرات",
   "session.review.noSnapshot": "تم تعطيل تتبع اللقطات في التكوين، لذا فإن تغييرات الجلسة غير متوفرة",
   "session.files.selectToOpen": "اختر ملفًا لفتحه",
@@ -475,6 +580,10 @@ export const dict = {
   "session.todo.title": "المهام",
   "session.todo.collapse": "طي",
   "session.todo.expand": "توسيع",
+  "session.question.minimize": "تصغير السؤال",
+  "session.question.restore": "استعادة السؤال",
+  "session.question.pending.one": "{{count}} سؤال معلق",
+  "session.question.pending.other": "الأسئلة المعلقة: {{count}}",
   "session.followupDock.summary.one": "{{count}} رسالة في الانتظار",
   "session.followupDock.summary.other": "{{count}} رسائل في الانتظار",
   "session.followupDock.sendNow": "إرسال الآن",
@@ -487,9 +596,16 @@ export const dict = {
   "session.revertDock.expand": "توسيع الرسائل التي تم التراجع عنها",
   "session.revertDock.restore": "استعادة الرسالة",
   "session.new.title": "ابنِ أي شيء",
+  "session.new.project.new": "مشروع جديد",
+  "session.new.project.search": "البحث عن المشاريع",
+  "session.new.project.add": "إضافة مشروع",
   "session.new.worktree.main": "الفرع الرئيسي",
   "session.new.worktree.mainWithBranch": "الفرع الرئيسي ({{branch}})",
   "session.new.worktree.create": "إنشاء شجرة عمل جديدة",
+  "session.new.workspace.runIn": "تشغيل الجلسة في",
+  "session.new.workspace.triggerLocal": "محلي",
+  "session.new.workspace.local": "المستودع المحلي",
+  "session.new.workspace.existing": "مساحة عمل…",
   "session.new.lastModified": "آخر تعديل",
   "session.header.search.placeholder": "بحث {{project}}",
   "session.header.searchFiles": "بحث عن الملفات",
@@ -550,6 +666,8 @@ export const dict = {
   "sidebar.project.recentSessions": "الجلسات الحديثة",
   "sidebar.project.viewAllSessions": "عرض جميع الجلسات",
   "sidebar.project.clearNotifications": "مسح الإشعارات",
+  "sidebar.empty.title": "لا توجد مشاريع مفتوحة",
+  "sidebar.empty.description": "افتح مشروعًا للبدء",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "سطح المكتب",
   "settings.section.server": "الخادم",
@@ -559,6 +677,7 @@ export const dict = {
   "settings.desktop.wsl.title": "تكامل WSL",
   "settings.desktop.wsl.description": "تشغيل خادم OpenCode داخل WSL على Windows.",
   "settings.general.section.appearance": "المظهر",
+  "settings.general.section.advanced": "متقدم",
   "settings.general.section.notifications": "إشعارات النظام",
   "settings.general.section.updates": "التحديثات",
   "settings.general.section.sounds": "المؤثرات الصوتية",
@@ -566,6 +685,11 @@ export const dict = {
   "settings.general.section.display": "شاشة العرض",
   "settings.general.row.language.title": "اللغة",
   "settings.general.row.language.description": "تغيير لغة العرض لـ OpenCode",
+  "settings.general.row.shell.title": "Shell المحطة الطرفية",
+  "settings.general.row.shell.description":
+    "اختر shell المستخدم في المحطة الطرفية. تُستخدم واجهات shell المتوافقة أيضًا في استدعاءات أدوات الوكيل.",
+  "settings.general.row.shell.autoDefault": "تلقائي (افتراضي)",
+  "settings.general.row.shell.terminalOnly": "المحطة الطرفية فقط",
   "settings.general.row.appearance.title": "المظهر",
   "settings.general.row.appearance.description": "تخصيص كيفية ظهور OpenCode على جهازك",
   "settings.general.row.colorScheme.title": "مخطط الألوان",
@@ -574,14 +698,29 @@ export const dict = {
   "settings.general.row.theme.description": "تخصيص سمة OpenCode.",
   "settings.general.row.font.title": "خط الكود",
   "settings.general.row.font.description": "خصّص الخط المستخدم في كتل التعليمات البرمجية",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "خط الطرفية",
+  "settings.general.row.terminalFont.description": "خصّص الخط المستخدم في الطرفية",
   "settings.general.row.uiFont.title": "خط الواجهة",
   "settings.general.row.uiFont.description": "خصّص الخط المستخدم في الواجهة بأكملها",
   "settings.general.row.followup.title": "سلوك المتابعة",
   "settings.general.row.followup.description": "اختر ما إذا كانت طلبات المتابعة توجه فورًا أو تنتظر في قائمة انتظار",
   "settings.general.row.followup.option.queue": "قائمة انتظار",
   "settings.general.row.followup.option.steer": "توجيه",
+  "settings.general.row.showFileTree.title": "شجرة الملفات",
+  "settings.general.row.showFileTree.description": "إظهار لوحة شجرة الملفات في الجلسات",
+  "settings.general.row.showNavigation.title": "عناصر التحكم في التنقل",
+  "settings.general.row.showNavigation.description": "إظهار زري الرجوع والتقدم في شريط عنوان سطح المكتب",
+  "settings.general.row.showSearch.title": "لوحة الأوامر",
+  "settings.general.row.showSearch.description": "إظهار زر البحث ولوحة الأوامر في شريط العنوان",
+  "settings.general.row.showTerminal.title": "المحطة الطرفية",
+  "settings.general.row.showTerminal.description": "إظهار زر المحطة الطرفية في شريط عنوان سطح المكتب",
+  "settings.general.row.showStatus.title": "حالة الخادم",
+  "settings.general.row.showStatus.description": "إظهار زر حالة الخادم في شريط العنوان",
+  "settings.general.row.mobileTitlebarBottom.title": "التنقل السفلي",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "وضع شريط العنوان وعلامات تبويب الجلسات أسفل الشاشة على الأجهزة المحمولة",
+  "settings.general.row.showCustomAgents.title": "الوكلاء المخصصون",
+  "settings.general.row.showCustomAgents.description": "إظهار محدد الوكلاء في محرر الرسائل",
   "settings.general.row.reasoningSummaries.title": "إظهار ملخصات الاستنتاج",
   "settings.general.row.reasoningSummaries.description": "عرض ملخصات استنتاج النموذج في الشريط الزمني",
   "settings.general.row.shellToolPartsExpanded.title": "توسيع أجزاء أداة shell",
@@ -590,6 +729,11 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "توسيع أجزاء أداة edit",
   "settings.general.row.editToolPartsExpanded.description":
     "إظهار أجزاء أدوات edit و write و patch موسعة بشكل افتراضي في الشريط الزمني",
+  "settings.general.row.newLayoutDesigns.title": "التخطيط والتصاميم الجديدة",
+  "settings.general.row.newLayoutDesigns.description":
+    "تمكين التخطيط والصفحة الرئيسية ومحرر الرسائل وواجهة الجلسة المعاد تصميمها",
+  "settings.general.row.pinchZoom.title": "التكبير بإيماءة القرص",
+  "settings.general.row.pinchZoom.description": "السماح بإيماءة القرص على لوحة اللمس وإيماءة Ctrl-scroll للتكبير",
   "settings.general.row.wayland.title": "استخدام Wayland الأصلي",
   "settings.general.row.wayland.description": "تعطيل التراجع إلى X11 على Wayland. يتطلب إعادة التشغيل.",
   "settings.general.row.wayland.tooltip":
@@ -602,6 +746,8 @@ export const dict = {
   "settings.updates.row.check.description": "التحقق يدويًا من التحديثات وتثبيتها إذا كانت متاحة",
   "settings.updates.action.checkNow": "تحقق الآن",
   "settings.updates.action.checking": "جارٍ التحقق...",
+  "settings.updates.action.downloading": "جارٍ التنزيل...",
+  "settings.updates.action.installing": "جارٍ التثبيت...",
   "settings.updates.toast.latest.title": "أنت على آخر إصدار",
   "settings.updates.toast.latest.description": "أنت تستخدم أحدث إصدار من OpenCode.",
   "sound.option.none": "بلا",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index 2e53bb1af0ec..12911744e2c2 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -21,6 +21,9 @@ export const dict = {
   "theme.scheme.dark": "Escuro",
   "command.sidebar.toggle": "Alternar barra lateral",
   "command.project.open": "Abrir projeto",
+  "command.project.previous": "Projeto anterior",
+  "command.project.next": "Próximo projeto",
+  "command.project.index": "Alternar para o projeto {{index}}",
   "command.provider.connect": "Conectar provedor",
   "command.server.switch": "Trocar servidor",
   "command.settings.open": "Abrir configurações",
@@ -39,6 +42,7 @@ export const dict = {
   "command.session.new": "Nova sessão",
   "command.file.open": "Abrir arquivo",
   "command.tab.close": "Fechar aba",
+  "command.tab.reopenClosed": "Reabrir aba fechada",
   "command.context.addSelection": "Adicionar seleção ao contexto",
   "command.context.addSelection.description": "Adicionar as linhas selecionadas do arquivo atual",
   "command.input.focus": "Focar entrada",
@@ -193,6 +197,11 @@ export const dict = {
   "model.input.video": "vídeo",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Permite: {{inputs}}",
+  "model.tooltip.context.label": "Contexto",
+  "model.tooltip.inputs": "Entradas",
+  "model.tooltip.model": "Modelo",
+  "model.tooltip.provider": "Provedor",
+  "model.tooltip.reasoning": "Raciocínio",
   "model.tooltip.reasoning.allowed": "Permite raciocínio",
   "model.tooltip.reasoning.none": "Sem raciocínio",
   "model.tooltip.context": "Limite de contexto {{limit}}",
@@ -202,6 +211,7 @@ export const dict = {
   "common.loading": "Carregando",
   "common.loading.ellipsis": "...",
   "common.cancel": "Cancelar",
+  "common.clear": "Limpar",
   "common.connect": "Conectar",
   "common.disconnect": "Desconectar",
   "common.continue": "Enviar",
@@ -218,6 +228,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc para sair",
+  "session.child.promptDisabled": "Não é possível enviar prompts em sessões de subagentes.",
+  "session.child.backToParent": "Voltar à sessão principal.",
   "prompt.example.1": "Corrigir um TODO no código",
   "prompt.example.2": "Qual é a stack tecnológica deste projeto?",
   "prompt.example.3": "Corrigir testes quebrados",
@@ -314,6 +326,75 @@ export const dict = {
   "dialog.server.menu.delete": "Excluir",
   "dialog.server.current": "Servidor atual",
   "dialog.server.status.default": "Padrão",
+  "wsl.server.add": "Adicionar servidor WSL",
+  "wsl.server.addShort": "Adicionar WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "Servidor WSL",
+  "wsl.server.retryStart": "Tentar iniciar novamente",
+  "wsl.server.updating": "Atualizando...",
+  "wsl.onboarding.step.distro": "Escolher distribuição",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Verificando o WSL...",
+  "wsl.onboarding.restartRequired": "O Windows precisa ser reiniciado para concluir a instalação do WSL.",
+  "wsl.onboarding.ready": "O WSL está pronto.",
+  "wsl.onboarding.required": "O WSL é necessário para continuar.",
+  "wsl.onboarding.checkingDistros": "Verificando distribuições...",
+  "wsl.onboarding.installingDistro": "Instalando {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Verificando {{distro}}...",
+  "wsl.onboarding.listingDistros": "Listando distribuições...",
+  "wsl.onboarding.distroReady": "{{distro}} está pronta.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} ainda não está instalada.",
+  "wsl.onboarding.openDistroOnce": "Abra {{distro}} uma vez para concluir a configuração.",
+  "wsl.onboarding.finishingDistro": "Concluindo a configuração de {{distro}}.",
+  "wsl.onboarding.pickDistro": "Escolha uma distribuição ou instale uma abaixo.",
+  "wsl.onboarding.checkingOpencode": "Verificando o OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Verificando o OpenCode em {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Atualizando o OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Atualizando o OpenCode em {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Atualize o OpenCode em {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Atualizar o OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "O OpenCode está pronto em {{distro}}.",
+  "wsl.onboarding.opencodeReady": "O OpenCode está pronto.",
+  "wsl.onboarding.installOpencodeIn": "Instale o OpenCode em {{distro}}.",
+  "wsl.onboarding.installOpencode": "Instalar o OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Escolha primeiro uma distribuição.",
+  "wsl.onboarding.loadFailed": "Falha ao carregar o estado do WSL.",
+  "wsl.onboarding.loading": "Carregando...",
+  "wsl.onboarding.installedDistros": "Distribuições instaladas",
+  "wsl.onboarding.checkAgain": "Verificar novamente",
+  "wsl.onboarding.distroStatus.ready": "Pronta",
+  "wsl.onboarding.distroStatus.checking": "Verificando...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode não instalado",
+  "wsl.onboarding.distroStatus.missingTools": "bash e curl ausentes",
+  "wsl.onboarding.distroStatus.unsupported": "Sem suporte · Use o WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Precisa de outra distribuição?",
+  "wsl.onboarding.needAnotherDistroHint": "Instale uma distribuição Linux pelo catálogo do WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL não instalado",
+  "wsl.onboarding.wslNotInstalled.description":
+    "O WSL (Windows Subsystem for Linux) é necessário para que o OpenCode possa adicionar um servidor WSL",
+  "wsl.onboarding.wslUnavailable.title": "WSL indisponível",
+  "wsl.onboarding.wslUnavailable.description": "O OpenCode não conseguiu verificar o WSL neste computador.",
+  "wsl.onboarding.installWsl": "Instalar o WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Reinicie o Windows para concluir a instalação do WSL e abra o OpenCode novamente.",
+  "wsl.onboarding.next": "Próximo",
+  "wsl.onboarding.refresh": "Atualizar",
+  "wsl.onboarding.allDistrosAdded": "Todas as distribuições instaladas já foram adicionadas.",
+  "wsl.onboarding.noDistros": "Nenhuma distribuição detectada ainda.",
+  "wsl.onboarding.install": "Instalar",
+  "wsl.onboarding.installing": "Instalando...",
+  "wsl.onboarding.installDistro": "Instalar distribuição",
+  "wsl.onboarding.searchDistros": "Buscar distribuições",
+  "wsl.onboarding.wsl2Required": "O WSL 2 é necessário.",
+  "wsl.onboarding.toolsRequired": "Esta distribuição precisa do bash e do curl.",
+  "wsl.onboarding.openTerminal": "Abrir terminal",
+  "wsl.onboarding.path": "Caminho: {{path}}",
+  "wsl.onboarding.notFound": "não encontrado",
+  "wsl.onboarding.version": "Versão: {{version}}",
+  "wsl.onboarding.unknown": "desconhecido",
+  "wsl.onboarding.desktopVersion": "desktop {{version}}",
+  "wsl.onboarding.versionMismatch": "A versão instalada não corresponde à versão do aplicativo para desktop.",
+  "wsl.onboarding.adding": "Adicionando...",
   "dialog.project.edit.title": "Editar projeto",
   "dialog.project.edit.name": "Nome",
   "dialog.project.edit.icon": "Ícone",
@@ -371,6 +452,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
   "toast.language.title": "Idioma",
@@ -407,10 +489,12 @@ export const dict = {
   "toast.update.action.notYet": "Agora não",
   "error.page.title": "Algo deu errado",
   "error.page.description": "Ocorreu um erro ao carregar a aplicação.",
+  "error.page.description.localServerStartup": "Ocorreu um erro ao iniciar o servidor local.",
   "error.page.details.label": "Detalhes do Erro",
   "error.page.action.restart": "Reiniciar",
   "error.page.action.report": "Reportar erro",
   "error.page.action.reported": "Erro reportado",
+  "error.page.action.exportLogs": "Exportar logs",
   "error.page.action.checking": "Verificando...",
   "error.page.action.checkUpdates": "Verificar atualizações",
   "error.page.action.updateTo": "Atualizar para {{version}}",
@@ -453,10 +537,30 @@ export const dict = {
   "home.recentProjects": "Projetos recentes",
   "home.empty.title": "Nenhum projeto recente",
   "home.empty.description": "Comece abrindo um projeto local",
+  "home.title": "Início",
+  "home.projects": "Projetos",
+  "home.project.add": "Adicionar projeto",
+  "home.recentlyClosed": "Projetos fechados recentemente",
+  "home.server.collapse": "Recolher projetos do servidor",
+  "home.server.expand": "Expandir projetos do servidor",
+  "home.sessions.search.placeholder": "Buscar sessões",
+  "home.sessions.search.placeholder.scoped": "Buscar sessões em {{scope}}",
+  "home.sessions.search.sessions": "Sessões",
+  "home.sessions.search.noResults": "Nenhuma sessão encontrada para {{query}}",
+  "home.sessions.empty": "Nada por aqui ainda",
+  "home.sessions.empty.description": "Crie uma sessão para começar",
+  "home.sessions.group.today": "Hoje",
+  "home.sessions.group.yesterday": "Ontem",
+  "home.sessions.group.older": "Mais antigas",
   "session.tab.session": "Sessão",
   "session.tab.review": "Revisão",
   "session.tab.context": "Contexto",
+  "session.tab.unknown": "Sessão desconhecida",
   "session.panel.reviewAndFiles": "Revisão e arquivos",
+  "session.error.notFound": "Esta sessão não foi encontrada",
+  "session.error.notFound.description": "Esta aba aponta para uma sessão que não existe mais neste servidor.",
+  "session.error.notFound.closeTab": "Fechar aba",
+  "session.error.serverConnection": "Não é possível conectar a este servidor",
   "session.review.filesChanged": "{{count}} Arquivos Alterados",
   "session.review.change.one": "Alteração",
   "session.review.change.other": "Alterações",
@@ -466,6 +570,8 @@ export const dict = {
   "session.review.noSnapshot":
     "O rastreamento de snapshot está desabilitado na configuração, então as alterações da sessão estão indisponíveis",
   "session.review.noChanges": "Sem alterações",
+  "session.review.noUncommittedChanges": "Ainda não há alterações sem commit",
+  "session.review.noBranchChanges": "Ainda não há alterações na branch",
   "session.files.selectToOpen": "Selecione um arquivo para abrir",
   "session.files.all": "Todos os arquivos",
   "session.files.empty": "Nenhum arquivo",
@@ -479,6 +585,10 @@ export const dict = {
   "session.todo.title": "Tarefas",
   "session.todo.collapse": "Recolher",
   "session.todo.expand": "Expandir",
+  "session.question.minimize": "Minimizar pergunta",
+  "session.question.restore": "Restaurar pergunta",
+  "session.question.pending.one": "{{count}} pergunta pendente",
+  "session.question.pending.other": "{{count}} perguntas pendentes",
   "session.followupDock.summary.one": "{{count}} mensagem na fila",
   "session.followupDock.summary.other": "{{count}} mensagens na fila",
   "session.followupDock.sendNow": "Enviar agora",
@@ -491,9 +601,16 @@ export const dict = {
   "session.revertDock.expand": "Expandir mensagens revertidas",
   "session.revertDock.restore": "Restaurar mensagem",
   "session.new.title": "Crie qualquer coisa",
+  "session.new.project.new": "Novo projeto",
+  "session.new.project.search": "Buscar projetos",
+  "session.new.project.add": "Adicionar projeto",
   "session.new.worktree.main": "Branch principal",
   "session.new.worktree.mainWithBranch": "Branch principal ({{branch}})",
   "session.new.worktree.create": "Criar novo worktree",
+  "session.new.workspace.runIn": "Executar sessão em",
+  "session.new.workspace.triggerLocal": "Local",
+  "session.new.workspace.local": "Repositório local",
+  "session.new.workspace.existing": "Espaço de trabalho…",
   "session.new.lastModified": "Última modificação",
   "session.header.search.placeholder": "Buscar {{project}}",
   "session.header.searchFiles": "Buscar arquivos",
@@ -557,15 +674,18 @@ export const dict = {
   "sidebar.project.recentSessions": "Sessões recentes",
   "sidebar.project.viewAllSessions": "Ver todas as sessões",
   "sidebar.project.clearNotifications": "Limpar notificações",
+  "sidebar.empty.title": "Nenhum projeto aberto",
+  "sidebar.empty.description": "Abra um projeto para começar",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Servidor",
   "settings.tab.general": "Geral",
   "settings.tab.shortcuts": "Atalhos",
   "settings.desktop.section.wsl": "WSL",
-  "settings.desktop.wsl.title": "WSL integration",
+  "settings.desktop.wsl.title": "Integração com WSL",
   "settings.desktop.wsl.description": "Executar o servidor OpenCode dentro do WSL no Windows.",
   "settings.general.section.appearance": "Aparência",
+  "settings.general.section.advanced": "Avançado",
   "settings.general.section.notifications": "Notificações do sistema",
   "settings.general.section.updates": "Atualizações",
   "settings.general.section.sounds": "Efeitos sonoros",
@@ -573,6 +693,11 @@ export const dict = {
   "settings.general.section.display": "Tela",
   "settings.general.row.language.title": "Idioma",
   "settings.general.row.language.description": "Alterar o idioma de exibição do OpenCode",
+  "settings.general.row.shell.title": "Shell do terminal",
+  "settings.general.row.shell.description":
+    "Escolha o shell usado no terminal. Os shells compatíveis também são usados nas chamadas de ferramentas do agente.",
+  "settings.general.row.shell.autoDefault": "Automático (Padrão)",
+  "settings.general.row.shell.terminalOnly": "somente no terminal",
   "settings.general.row.appearance.title": "Aparência",
   "settings.general.row.appearance.description": "Personalize como o OpenCode aparece no seu dispositivo",
   "settings.general.row.colorScheme.title": "Esquema de cores",
@@ -581,8 +706,8 @@ export const dict = {
   "settings.general.row.theme.description": "Personalize como o OpenCode é tematizado.",
   "settings.general.row.font.title": "Fonte de código",
   "settings.general.row.font.description": "Personalize a fonte usada em blocos de código",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Fonte do terminal",
+  "settings.general.row.terminalFont.description": "Personalize a fonte usada no terminal",
   "settings.general.row.uiFont.title": "Fonte da interface",
   "settings.general.row.uiFont.description": "Personalize a fonte usada em toda a interface",
   "settings.general.row.followup.title": "Comportamento de acompanhamento",
@@ -590,6 +715,22 @@ export const dict = {
     "Escolha se os prompts de acompanhamento orientam imediatamente ou esperam na fila",
   "settings.general.row.followup.option.queue": "Fila",
   "settings.general.row.followup.option.steer": "Orientar",
+  "settings.general.row.showFileTree.title": "Árvore de arquivos",
+  "settings.general.row.showFileTree.description": "Mostrar o painel da árvore de arquivos nas sessões",
+  "settings.general.row.showNavigation.title": "Controles de navegação",
+  "settings.general.row.showNavigation.description":
+    "Mostrar os botões de voltar e avançar na barra de título do desktop",
+  "settings.general.row.showSearch.title": "Paleta de comandos",
+  "settings.general.row.showSearch.description": "Mostrar o botão de busca e paleta de comandos na barra de título",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Mostrar o botão do terminal na barra de título do desktop",
+  "settings.general.row.showStatus.title": "Status do servidor",
+  "settings.general.row.showStatus.description": "Mostrar o botão de status do servidor na barra de título",
+  "settings.general.row.mobileTitlebarBottom.title": "Navegação inferior",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Posicionar a barra de título e as abas da sessão na parte inferior da tela em dispositivos móveis",
+  "settings.general.row.showCustomAgents.title": "Agentes personalizados",
+  "settings.general.row.showCustomAgents.description": "Mostrar o seletor de agentes na área de composição",
   "settings.general.row.reasoningSummaries.title": "Mostrar resumos de raciocínio",
   "settings.general.row.reasoningSummaries.description": "Exibir resumos de raciocínio do modelo na linha do tempo",
   "settings.general.row.shellToolPartsExpanded.title": "Expandir partes da ferramenta shell",
@@ -598,6 +739,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Expandir partes da ferramenta de edição",
   "settings.general.row.editToolPartsExpanded.description":
     "Mostrar partes das ferramentas de edição, escrita e patch expandidas por padrão na linha do tempo",
+  "settings.general.row.newLayoutDesigns.title": "Novo layout e design",
+  "settings.general.row.newLayoutDesigns.description":
+    "Ativar o layout, a página inicial, a área de composição e a interface de sessão reformulados",
+  "settings.general.row.pinchZoom.title": "Zoom com gesto de pinça",
+  "settings.general.row.pinchZoom.description":
+    "Permitir gestos de pinça no trackpad e de Ctrl+rolagem para aplicar zoom",
   "settings.general.row.wayland.title": "Usar Wayland nativo",
   "settings.general.row.wayland.description": "Desabilitar fallback X11 no Wayland. Requer reinicialização.",
   "settings.general.row.wayland.tooltip":
@@ -610,6 +757,8 @@ export const dict = {
   "settings.updates.row.check.description": "Verificar atualizações manualmente e instalar se houver",
   "settings.updates.action.checkNow": "Verificar agora",
   "settings.updates.action.checking": "Verificando...",
+  "settings.updates.action.downloading": "Baixando...",
+  "settings.updates.action.installing": "Instalando...",
   "settings.updates.toast.latest.title": "Você está atualizado",
   "settings.updates.toast.latest.description": "Você está usando a versão mais recente do OpenCode.",
   "sound.option.none": "Nenhum",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index c5b9e1a6d823..086ecc1b4c0b 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -23,6 +23,9 @@ export const dict = {
 
   "command.sidebar.toggle": "Prikaži/sakrij bočnu traku",
   "command.project.open": "Otvori projekat",
+  "command.project.previous": "Prethodni projekat",
+  "command.project.next": "Sljedeći projekat",
+  "command.project.index": "Prebaci na projekat {{index}}",
   "command.provider.connect": "Poveži provajdera",
   "command.server.switch": "Promijeni server",
   "command.settings.open": "Otvori postavke",
@@ -45,6 +48,7 @@ export const dict = {
   "command.session.new": "Nova sesija",
   "command.file.open": "Otvori datoteku",
   "command.tab.close": "Zatvori karticu",
+  "command.tab.reopenClosed": "Ponovo otvori zatvorenu karticu",
   "command.context.addSelection": "Dodaj odabir u kontekst",
   "command.context.addSelection.description": "Dodaj odabrane linije iz trenutne datoteke",
   "command.input.focus": "Fokusiraj polje za unos",
@@ -209,6 +213,11 @@ export const dict = {
   "model.input.video": "video",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Podržava: {{inputs}}",
+  "model.tooltip.context.label": "Kontekst",
+  "model.tooltip.inputs": "Ulazi",
+  "model.tooltip.model": "Model",
+  "model.tooltip.provider": "Provajder",
+  "model.tooltip.reasoning": "Rasuđivanje",
   "model.tooltip.reasoning.allowed": "Podržava rasuđivanje",
   "model.tooltip.reasoning.none": "Bez rasuđivanja",
   "model.tooltip.context": "Limit konteksta {{limit}}",
@@ -219,6 +228,7 @@ export const dict = {
   "common.loading": "Učitavanje",
   "common.loading.ellipsis": "...",
   "common.cancel": "Otkaži",
+  "common.clear": "Očisti",
   "common.connect": "Poveži",
   "common.disconnect": "Prekini vezu",
   "common.continue": "Pošalji",
@@ -236,6 +246,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc za izlaz",
+  "session.child.promptDisabled": "Sesijama podagenta nije moguće slati upite.",
+  "session.child.backToParent": "Nazad na glavnu sesiju.",
 
   "prompt.example.1": "Popravi TODO u bazi koda",
   "prompt.example.2": "Koji je tehnološki stack ovog projekta?",
@@ -342,6 +354,75 @@ export const dict = {
   "dialog.server.menu.delete": "Izbriši",
   "dialog.server.current": "Trenutni server",
   "dialog.server.status.default": "Podrazumijevano",
+  "wsl.server.add": "Dodaj WSL server",
+  "wsl.server.addShort": "Dodaj WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL server",
+  "wsl.server.retryStart": "Ponovi pokretanje",
+  "wsl.server.updating": "Ažuriranje...",
+  "wsl.onboarding.step.distro": "Odaberi distribuciju",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Provjera WSL-a...",
+  "wsl.onboarding.restartRequired": "Potrebno je ponovo pokrenuti Windows da bi se završila instalacija WSL-a.",
+  "wsl.onboarding.ready": "WSL je spreman.",
+  "wsl.onboarding.required": "WSL je potreban za nastavak.",
+  "wsl.onboarding.checkingDistros": "Provjera distribucija...",
+  "wsl.onboarding.installingDistro": "Instaliranje {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Provjera {{distro}}...",
+  "wsl.onboarding.listingDistros": "Učitavanje liste distribucija...",
+  "wsl.onboarding.distroReady": "Distribucija {{distro}} je spremna.",
+  "wsl.onboarding.distroNotInstalled": "Distribucija {{distro}} još nije instalirana.",
+  "wsl.onboarding.openDistroOnce": "Otvori {{distro}} jednom da završiš postavljanje.",
+  "wsl.onboarding.finishingDistro": "Završavanje postavljanja za {{distro}}.",
+  "wsl.onboarding.pickDistro": "Odaberi distribuciju ili instaliraj jednu ispod.",
+  "wsl.onboarding.checkingOpencode": "Provjera OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Provjera OpenCode u distribuciji {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Ažuriranje OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Ažuriranje OpenCode u distribuciji {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Ažuriraj OpenCode u distribuciji {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Ažuriraj OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode je spreman u distribuciji {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode je spreman.",
+  "wsl.onboarding.installOpencodeIn": "Instaliraj OpenCode u distribuciji {{distro}}.",
+  "wsl.onboarding.installOpencode": "Instaliraj OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Prvo odaberi distribuciju.",
+  "wsl.onboarding.loadFailed": "Nije uspjelo učitavanje WSL stanja.",
+  "wsl.onboarding.loading": "Učitavanje...",
+  "wsl.onboarding.installedDistros": "Instalirane distribucije",
+  "wsl.onboarding.checkAgain": "Provjeri ponovo",
+  "wsl.onboarding.distroStatus.ready": "Spremno",
+  "wsl.onboarding.distroStatus.checking": "Provjera...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode nije instaliran",
+  "wsl.onboarding.distroStatus.missingTools": "Nedostaju bash i curl",
+  "wsl.onboarding.distroStatus.unsupported": "Nije podržano · Koristi WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Treba ti druga distribucija?",
+  "wsl.onboarding.needAnotherDistroHint": "Instaliraj Linux distribuciju iz WSL kataloga",
+  "wsl.onboarding.wslNotInstalled.title": "WSL nije instaliran",
+  "wsl.onboarding.wslNotInstalled.description":
+    "WSL (Windows Subsystem for Linux) je potreban da bi OpenCode mogao dodati WSL server",
+  "wsl.onboarding.wslUnavailable.title": "WSL nije dostupan",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode nije mogao provjeriti WSL na ovom uređaju.",
+  "wsl.onboarding.installWsl": "Instaliraj WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Ponovo pokreni Windows da završiš instalaciju WSL-a, zatim ponovo otvori OpenCode.",
+  "wsl.onboarding.next": "Dalje",
+  "wsl.onboarding.refresh": "Osvježi",
+  "wsl.onboarding.allDistrosAdded": "Sve instalirane distribucije su već dodane.",
+  "wsl.onboarding.noDistros": "Još nema otkrivenih distribucija.",
+  "wsl.onboarding.install": "Instaliraj",
+  "wsl.onboarding.installing": "Instaliranje...",
+  "wsl.onboarding.installDistro": "Instaliraj distribuciju",
+  "wsl.onboarding.searchDistros": "Pretraži distribucije",
+  "wsl.onboarding.wsl2Required": "Potreban je WSL 2.",
+  "wsl.onboarding.toolsRequired": "Ovoj distribuciji su potrebni bash i curl.",
+  "wsl.onboarding.openTerminal": "Otvori terminal",
+  "wsl.onboarding.path": "Putanja: {{path}}",
+  "wsl.onboarding.notFound": "nije pronađeno",
+  "wsl.onboarding.version": "Verzija: {{version}}",
+  "wsl.onboarding.unknown": "nepoznato",
+  "wsl.onboarding.desktopVersion": "desktop {{version}}",
+  "wsl.onboarding.versionMismatch": "Instalirana verzija ne odgovara verziji desktop aplikacije.",
+  "wsl.onboarding.adding": "Dodavanje...",
 
   "dialog.project.edit.title": "Uredi projekat",
   "dialog.project.edit.name": "Naziv",
@@ -405,6 +486,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -453,10 +535,12 @@ export const dict = {
 
   "error.page.title": "Nešto je pošlo po zlu",
   "error.page.description": "Došlo je do greške prilikom učitavanja aplikacije.",
+  "error.page.description.localServerStartup": "Došlo je do greške pri pokretanju lokalnog servera.",
   "error.page.details.label": "Detalji greške",
   "error.page.action.restart": "Restartuj",
   "error.page.action.report": "Prijavi grešku",
   "error.page.action.reported": "Greška prijavljena",
+  "error.page.action.exportLogs": "Izvezi logove",
   "error.page.action.checking": "Provjera...",
   "error.page.action.checkUpdates": "Provjeri ažuriranja",
   "error.page.action.updateTo": "Ažuriraj na {{version}}",
@@ -504,11 +588,31 @@ export const dict = {
   "home.recentProjects": "Nedavni projekti",
   "home.empty.title": "Nema nedavnih projekata",
   "home.empty.description": "Kreni tako što ćeš otvoriti lokalni projekat",
+  "home.title": "Početna",
+  "home.projects": "Projekti",
+  "home.project.add": "Dodaj projekat",
+  "home.recentlyClosed": "Nedavno zatvoreni projekti",
+  "home.server.collapse": "Sažmi projekte servera",
+  "home.server.expand": "Proširi projekte servera",
+  "home.sessions.search.placeholder": "Pretraži sesije",
+  "home.sessions.search.placeholder.scoped": "Pretraži sesije u {{scope}}",
+  "home.sessions.search.sessions": "Sesije",
+  "home.sessions.search.noResults": "Nema pronađenih sesija za {{query}}",
+  "home.sessions.empty": "Ovdje još nema ničega",
+  "home.sessions.empty.description": "Kreiraj sesiju za početak",
+  "home.sessions.group.today": "Danas",
+  "home.sessions.group.yesterday": "Jučer",
+  "home.sessions.group.older": "Starije",
 
   "session.tab.session": "Sesija",
   "session.tab.review": "Pregled",
   "session.tab.context": "Kontekst",
+  "session.tab.unknown": "Nepoznata sesija",
   "session.panel.reviewAndFiles": "Pregled i datoteke",
+  "session.error.notFound": "Ova sesija nije pronađena",
+  "session.error.notFound.description": "Ova kartica upućuje na sesiju koja više ne postoji na ovom serveru.",
+  "session.error.notFound.closeTab": "Zatvori karticu",
+  "session.error.serverConnection": "Nije moguće povezati se s ovim serverom",
   "session.review.filesChanged": "Izmijenjeno {{count}} datoteka",
   "session.review.change.one": "Izmjena",
   "session.review.change.other": "Izmjene",
@@ -518,6 +622,8 @@ export const dict = {
   "session.review.noSnapshot":
     "Praćenje snimaka (snapshot) je onemogućeno u konfiguraciji, pa promjene sesije nisu dostupne",
   "session.review.noChanges": "Nema izmjena",
+  "session.review.noUncommittedChanges": "Još nema nepotvrđenih promjena",
+  "session.review.noBranchChanges": "Još nema promjena na grani",
 
   "session.files.selectToOpen": "Odaberi datoteku za otvaranje",
   "session.files.all": "Sve datoteke",
@@ -534,6 +640,10 @@ export const dict = {
   "session.todo.title": "Zadaci",
   "session.todo.collapse": "Sažmi",
   "session.todo.expand": "Proširi",
+  "session.question.minimize": "Minimiziraj pitanje",
+  "session.question.restore": "Vrati pitanje",
+  "session.question.pending.one": "{{count}} pitanje na čekanju",
+  "session.question.pending.other": "{{count}} pitanja na čekanju",
   "session.followupDock.summary.one": "{{count}} poruka na čekanju",
   "session.followupDock.summary.other": "{{count}} poruka na čekanju",
   "session.followupDock.sendNow": "Pošalji sada",
@@ -547,9 +657,16 @@ export const dict = {
   "session.revertDock.restore": "Vrati poruku",
 
   "session.new.title": "Napravi bilo šta",
+  "session.new.project.new": "Novi projekat",
+  "session.new.project.search": "Pretraži projekte",
+  "session.new.project.add": "Dodaj projekat",
   "session.new.worktree.main": "Glavna grana",
   "session.new.worktree.mainWithBranch": "Glavna grana ({{branch}})",
   "session.new.worktree.create": "Kreiraj novi worktree",
+  "session.new.workspace.runIn": "Pokreni sesiju u",
+  "session.new.workspace.triggerLocal": "Lokalno",
+  "session.new.workspace.local": "Lokalni repozitorij",
+  "session.new.workspace.existing": "Radni prostor…",
   "session.new.lastModified": "Posljednja izmjena",
 
   "session.header.search.placeholder": "Pretraži {{project}}",
@@ -618,6 +735,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Nedavne sesije",
   "sidebar.project.viewAllSessions": "Prikaži sve sesije",
   "sidebar.project.clearNotifications": "Očisti obavijesti",
+  "sidebar.empty.title": "Nema otvorenih projekata",
+  "sidebar.empty.description": "Otvori projekat za početak",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -630,6 +749,7 @@ export const dict = {
   "settings.desktop.wsl.description": "Pokreni OpenCode server unutar WSL-a na Windowsu.",
 
   "settings.general.section.appearance": "Izgled",
+  "settings.general.section.advanced": "Napredno",
   "settings.general.section.notifications": "Sistemske obavijesti",
   "settings.general.section.updates": "Ažuriranja",
   "settings.general.section.sounds": "Zvučni efekti",
@@ -638,6 +758,11 @@ export const dict = {
 
   "settings.general.row.language.title": "Jezik",
   "settings.general.row.language.description": "Promijeni jezik prikaza u OpenCode-u",
+  "settings.general.row.shell.title": "Shell terminala",
+  "settings.general.row.shell.description":
+    "Odaberi shell koji se koristi za terminal. Kompatibilni shellovi koriste se i za pozive alata agenta.",
+  "settings.general.row.shell.autoDefault": "Automatski (podrazumijevano)",
+  "settings.general.row.shell.terminalOnly": "samo terminal",
   "settings.general.row.appearance.title": "Izgled",
   "settings.general.row.appearance.description": "Prilagodi kako OpenCode izgleda na tvom uređaju",
   "settings.general.row.colorScheme.title": "Šema boja",
@@ -646,14 +771,30 @@ export const dict = {
   "settings.general.row.theme.description": "Prilagodi temu OpenCode-a.",
   "settings.general.row.font.title": "Font za kod",
   "settings.general.row.font.description": "Prilagodi font koji se koristi u blokovima koda",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Font terminala",
+  "settings.general.row.terminalFont.description": "Prilagodite font koji se koristi u terminalu",
   "settings.general.row.uiFont.title": "UI font",
   "settings.general.row.uiFont.description": "Prilagodi font koji se koristi u cijelom interfejsu",
   "settings.general.row.followup.title": "Ponašanje nadovezivanja",
   "settings.general.row.followup.description": "Odaberi da li upiti nadovezivanja usmjeravaju odmah ili čekaju u redu",
   "settings.general.row.followup.option.queue": "Red čekanja",
   "settings.general.row.followup.option.steer": "Usmjeri",
+  "settings.general.row.showFileTree.title": "Stablo datoteka",
+  "settings.general.row.showFileTree.description": "Prikaži stablo datoteka u sesijama",
+  "settings.general.row.showNavigation.title": "Kontrole navigacije",
+  "settings.general.row.showNavigation.description":
+    "Prikaži dugmad za nazad i naprijed u naslovnoj traci desktop aplikacije",
+  "settings.general.row.showSearch.title": "Paleta komandi",
+  "settings.general.row.showSearch.description": "Prikaži dugme za pretragu i paletu komandi u naslovnoj traci",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Prikaži dugme terminala u naslovnoj traci desktop aplikacije",
+  "settings.general.row.showStatus.title": "Status servera",
+  "settings.general.row.showStatus.description": "Prikaži dugme statusa servera u naslovnoj traci",
+  "settings.general.row.mobileTitlebarBottom.title": "Donja navigacija",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Postavi naslovnu traku i kartice sesije na dno ekrana na mobilnim uređajima",
+  "settings.general.row.showCustomAgents.title": "Prilagođeni agenti",
+  "settings.general.row.showCustomAgents.description": "Prikaži izbor agenta u uređivaču poruke",
   "settings.general.row.reasoningSummaries.title": "Prikaži sažetke rasuđivanja",
   "settings.general.row.reasoningSummaries.description": "Prikaži sažetke rasuđivanja modela na vremenskoj traci",
 
@@ -663,6 +804,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Proširi dijelove alata za uređivanje",
   "settings.general.row.editToolPartsExpanded.description":
     "Prikaži dijelove alata za uređivanje, pisanje i patch podrazumijevano proširene na vremenskoj traci",
+  "settings.general.row.newLayoutDesigns.title": "Novi raspored i dizajn",
+  "settings.general.row.newLayoutDesigns.description":
+    "Omogući redizajnirani raspored, početnu stranicu, uređivač poruke i interfejs sesije",
+  "settings.general.row.pinchZoom.title": "Zumiranje štipanjem",
+  "settings.general.row.pinchZoom.description":
+    "Dozvoli zumiranje gestom štipanja na dodirnoj ploči i pomoću Ctrl-pomjeranja",
   "settings.general.row.wayland.title": "Koristi nativni Wayland",
   "settings.general.row.wayland.description": "Onemogući X11 fallback na Waylandu. Zahtijeva restart.",
   "settings.general.row.wayland.tooltip":
@@ -677,6 +824,8 @@ export const dict = {
   "settings.updates.row.check.description": "Ručno provjeri ažuriranja i instaliraj ako su dostupna",
   "settings.updates.action.checkNow": "Provjeri sada",
   "settings.updates.action.checking": "Provjera...",
+  "settings.updates.action.downloading": "Preuzimanje...",
+  "settings.updates.action.installing": "Instaliranje...",
   "settings.updates.toast.latest.title": "Sve je ažurno",
   "settings.updates.toast.latest.description": "Koristiš najnoviju verziju OpenCode-a.",
   "sound.option.none": "Nijedan",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index ad43c1d11145..859bea230b26 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -23,6 +23,9 @@ export const dict = {
 
   "command.sidebar.toggle": "Skift sidebjælke",
   "command.project.open": "Åbn projekt",
+  "command.project.previous": "Forrige projekt",
+  "command.project.next": "Næste projekt",
+  "command.project.index": "Skift til projekt {{index}}",
   "command.provider.connect": "Tilslut udbyder",
   "command.server.switch": "Skift server",
   "command.settings.open": "Åbn indstillinger",
@@ -45,6 +48,7 @@ export const dict = {
   "command.session.new": "Ny session",
   "command.file.open": "Åbn fil",
   "command.tab.close": "Luk fane",
+  "command.tab.reopenClosed": "Åbn lukket fane igen",
   "command.context.addSelection": "Tilføj markering til kontekst",
   "command.context.addSelection.description": "Tilføj markerede linjer fra den aktuelle fil",
   "command.input.focus": "Fokuser inputfelt",
@@ -208,6 +212,11 @@ export const dict = {
   "model.input.video": "video",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Tillader: {{inputs}}",
+  "model.tooltip.context.label": "Kontekst",
+  "model.tooltip.inputs": "Input",
+  "model.tooltip.model": "Model",
+  "model.tooltip.provider": "Udbyder",
+  "model.tooltip.reasoning": "Tænkning",
   "model.tooltip.reasoning.allowed": "Tillader tænkning",
   "model.tooltip.reasoning.none": "Ingen tænkning",
   "model.tooltip.context": "Kontekstgrænse {{limit}}",
@@ -217,6 +226,7 @@ export const dict = {
   "common.loading": "Indlæser",
   "common.loading.ellipsis": "...",
   "common.cancel": "Annuller",
+  "common.clear": "Ryd",
   "common.connect": "Forbind",
   "common.disconnect": "Frakobl",
   "common.continue": "Indsend",
@@ -234,6 +244,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc for at afslutte",
+  "session.child.promptDisabled": "Der kan ikke sendes prompts til underagentsessioner.",
+  "session.child.backToParent": "Tilbage til hovedsessionen.",
 
   "prompt.example.1": "Ret en TODO i koden",
   "prompt.example.2": "Hvad er teknologistakken for dette projekt?",
@@ -340,6 +352,75 @@ export const dict = {
   "dialog.server.menu.delete": "Slet",
   "dialog.server.current": "Nuværende server",
   "dialog.server.status.default": "Standard",
+  "wsl.server.add": "Tilføj WSL-server",
+  "wsl.server.addShort": "Tilføj WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL-server",
+  "wsl.server.retryStart": "Prøv at starte igen",
+  "wsl.server.updating": "Opdaterer...",
+  "wsl.onboarding.step.distro": "Vælg distribution",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Tjekker WSL...",
+  "wsl.onboarding.restartRequired": "Windows skal genstartes for at fuldføre installationen af WSL.",
+  "wsl.onboarding.ready": "WSL er klar.",
+  "wsl.onboarding.required": "WSL er påkrævet for at fortsætte.",
+  "wsl.onboarding.checkingDistros": "Tjekker distributioner...",
+  "wsl.onboarding.installingDistro": "Installerer {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Tjekker {{distro}}...",
+  "wsl.onboarding.listingDistros": "Henter liste over distributioner...",
+  "wsl.onboarding.distroReady": "{{distro}} er klar.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} er ikke installeret endnu.",
+  "wsl.onboarding.openDistroOnce": "Åbn {{distro}} én gang for at fuldføre opsætningen.",
+  "wsl.onboarding.finishingDistro": "Fuldfører opsætningen af {{distro}}.",
+  "wsl.onboarding.pickDistro": "Vælg en distribution, eller installer en nedenfor.",
+  "wsl.onboarding.checkingOpencode": "Tjekker OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Tjekker OpenCode i {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Opdaterer OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Opdaterer OpenCode i {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Opdater OpenCode i {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Opdater OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode er klar i {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode er klar.",
+  "wsl.onboarding.installOpencodeIn": "Installer OpenCode i {{distro}}.",
+  "wsl.onboarding.installOpencode": "Installer OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Vælg først en distribution.",
+  "wsl.onboarding.loadFailed": "Kunne ikke indlæse WSL-status.",
+  "wsl.onboarding.loading": "Indlæser...",
+  "wsl.onboarding.installedDistros": "Installerede distributioner",
+  "wsl.onboarding.checkAgain": "Tjek igen",
+  "wsl.onboarding.distroStatus.ready": "Klar",
+  "wsl.onboarding.distroStatus.checking": "Tjekker...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode er ikke installeret",
+  "wsl.onboarding.distroStatus.missingTools": "Mangler bash, curl",
+  "wsl.onboarding.distroStatus.unsupported": "Ikke understøttet · Brug WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Har du brug for en anden distribution?",
+  "wsl.onboarding.needAnotherDistroHint": "Installer en Linux-distribution fra WSL-kataloget",
+  "wsl.onboarding.wslNotInstalled.title": "WSL er ikke installeret",
+  "wsl.onboarding.wslNotInstalled.description":
+    "WSL (Windows Subsystem for Linux) er påkrævet, før OpenCode kan tilføje en WSL-server",
+  "wsl.onboarding.wslUnavailable.title": "WSL er ikke tilgængelig",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode kunne ikke bekræfte WSL på denne maskine.",
+  "wsl.onboarding.installWsl": "Installer WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Genstart Windows for at fuldføre installationen af WSL, og åbn derefter OpenCode igen.",
+  "wsl.onboarding.next": "Næste",
+  "wsl.onboarding.refresh": "Opdater",
+  "wsl.onboarding.allDistrosAdded": "Alle installerede distributioner er allerede tilføjet.",
+  "wsl.onboarding.noDistros": "Ingen distributioner fundet endnu.",
+  "wsl.onboarding.install": "Installer",
+  "wsl.onboarding.installing": "Installerer...",
+  "wsl.onboarding.installDistro": "Installer distribution",
+  "wsl.onboarding.searchDistros": "Søg efter distributioner",
+  "wsl.onboarding.wsl2Required": "WSL 2 er påkrævet.",
+  "wsl.onboarding.toolsRequired": "Denne distribution kræver bash og curl.",
+  "wsl.onboarding.openTerminal": "Åbn terminal",
+  "wsl.onboarding.path": "Sti: {{path}}",
+  "wsl.onboarding.notFound": "ikke fundet",
+  "wsl.onboarding.version": "Version: {{version}}",
+  "wsl.onboarding.unknown": "ukendt",
+  "wsl.onboarding.desktopVersion": "desktop {{version}}",
+  "wsl.onboarding.versionMismatch": "Den installerede version matcher ikke desktopappens version.",
+  "wsl.onboarding.adding": "Tilføjer...",
 
   "dialog.project.edit.title": "Rediger projekt",
   "dialog.project.edit.name": "Navn",
@@ -403,6 +484,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -450,10 +532,12 @@ export const dict = {
 
   "error.page.title": "Noget gik galt",
   "error.page.description": "Der opstod en fejl under indlæsning af applikationen.",
+  "error.page.description.localServerStartup": "Der opstod en fejl under start af den lokale server.",
   "error.page.details.label": "Fejldetaljer",
   "error.page.action.restart": "Genstart",
   "error.page.action.report": "Rapportér fejl",
   "error.page.action.reported": "Fejl rapporteret",
+  "error.page.action.exportLogs": "Eksportér logfiler",
   "error.page.action.checking": "Tjekker...",
   "error.page.action.checkUpdates": "Tjek for opdateringer",
   "error.page.action.updateTo": "Opdater til {{version}}",
@@ -501,11 +585,31 @@ export const dict = {
   "home.recentProjects": "Seneste projekter",
   "home.empty.title": "Ingen seneste projekter",
   "home.empty.description": "Kom i gang ved at åbne et lokalt projekt",
+  "home.title": "Hjem",
+  "home.projects": "Projekter",
+  "home.project.add": "Tilføj projekt",
+  "home.recentlyClosed": "Lukket for nylig",
+  "home.server.collapse": "Skjul serverprojekter",
+  "home.server.expand": "Udvid serverprojekter",
+  "home.sessions.search.placeholder": "Søg i sessioner",
+  "home.sessions.search.placeholder.scoped": "Søg i sessioner i {{scope}}",
+  "home.sessions.search.sessions": "Sessioner",
+  "home.sessions.search.noResults": "Ingen sessioner fundet for {{query}}",
+  "home.sessions.empty": "Intet her endnu",
+  "home.sessions.empty.description": "Opret en session for at komme i gang",
+  "home.sessions.group.today": "I dag",
+  "home.sessions.group.yesterday": "I går",
+  "home.sessions.group.older": "Ældre",
 
   "session.tab.session": "Session",
   "session.tab.review": "Gennemgang",
   "session.tab.context": "Kontekst",
+  "session.tab.unknown": "Ukendt session",
   "session.panel.reviewAndFiles": "Gennemgang og filer",
+  "session.error.notFound": "Denne session kan ikke findes",
+  "session.error.notFound.description": "Denne fane henviser til en session, der ikke længere findes på denne server.",
+  "session.error.notFound.closeTab": "Luk fane",
+  "session.error.serverConnection": "Kan ikke oprette forbindelse til denne server",
   "session.review.filesChanged": "{{count}} Filer ændret",
   "session.review.change.one": "Ændring",
   "session.review.change.other": "Ændringer",
@@ -515,6 +619,8 @@ export const dict = {
   "session.review.noSnapshot":
     "Snapshot-sporing er deaktiveret i konfigurationen, så sessionsændringer er ikke tilgængelige",
   "session.review.noChanges": "Ingen ændringer",
+  "session.review.noUncommittedChanges": "Ingen ændringer uden commit endnu",
+  "session.review.noBranchChanges": "Ingen grenændringer endnu",
   "session.files.selectToOpen": "Vælg en fil at åbne",
   "session.files.all": "Alle filer",
   "session.files.empty": "Ingen filer",
@@ -529,6 +635,10 @@ export const dict = {
   "session.todo.title": "Opgaver",
   "session.todo.collapse": "Skjul",
   "session.todo.expand": "Udvid",
+  "session.question.minimize": "Minimer spørgsmål",
+  "session.question.restore": "Gendan spørgsmål",
+  "session.question.pending.one": "{{count}} afventende spørgsmål",
+  "session.question.pending.other": "{{count}} afventende spørgsmål",
   "session.followupDock.summary.one": "{{count}} besked i kø",
   "session.followupDock.summary.other": "{{count}} beskeder i kø",
   "session.followupDock.sendNow": "Send nu",
@@ -542,9 +652,16 @@ export const dict = {
   "session.revertDock.restore": "Gendan besked",
 
   "session.new.title": "Byg hvad som helst",
+  "session.new.project.new": "Nyt projekt",
+  "session.new.project.search": "Søg efter projekter",
+  "session.new.project.add": "Tilføj projekt",
   "session.new.worktree.main": "Hovedgren",
   "session.new.worktree.mainWithBranch": "Hovedgren ({{branch}})",
   "session.new.worktree.create": "Opret nyt worktree",
+  "session.new.workspace.runIn": "Kør session i",
+  "session.new.workspace.triggerLocal": "Lokal",
+  "session.new.workspace.local": "Lokalt repository",
+  "session.new.workspace.existing": "Arbejdsområde…",
   "session.new.lastModified": "Sidst ændret",
 
   "session.header.search.placeholder": "Søg {{project}}",
@@ -614,6 +731,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Seneste sessioner",
   "sidebar.project.viewAllSessions": "Vis alle sessioner",
   "sidebar.project.clearNotifications": "Ryd notifikationer",
+  "sidebar.empty.title": "Ingen åbne projekter",
+  "sidebar.empty.description": "Åbn et projekt for at komme i gang",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
@@ -625,6 +744,7 @@ export const dict = {
   "settings.desktop.wsl.description": "Kør OpenCode-serveren inde i WSL på Windows.",
 
   "settings.general.section.appearance": "Udseende",
+  "settings.general.section.advanced": "Avanceret",
   "settings.general.section.notifications": "Systemmeddelelser",
   "settings.general.section.updates": "Opdateringer",
   "settings.general.section.sounds": "Lydeffekter",
@@ -633,6 +753,11 @@ export const dict = {
 
   "settings.general.row.language.title": "Sprog",
   "settings.general.row.language.description": "Ændr visningssproget for OpenCode",
+  "settings.general.row.shell.title": "Terminalshell",
+  "settings.general.row.shell.description":
+    "Vælg den shell, der bruges i din terminal. Kompatible shells bruges også til agentens værktøjskald.",
+  "settings.general.row.shell.autoDefault": "Automatisk (standard)",
+  "settings.general.row.shell.terminalOnly": "kun terminal",
   "settings.general.row.appearance.title": "Udseende",
   "settings.general.row.appearance.description": "Tilpas hvordan OpenCode ser ud på din enhed",
   "settings.general.row.colorScheme.title": "Farveskema",
@@ -641,14 +766,29 @@ export const dict = {
   "settings.general.row.theme.description": "Tilpas hvordan OpenCode er temabestemt.",
   "settings.general.row.font.title": "Kode-skrifttype",
   "settings.general.row.font.description": "Tilpas skrifttypen, der bruges i kodeblokke",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Terminalskrifttype",
+  "settings.general.row.terminalFont.description": "Tilpas den skrifttype, der bruges i terminalen",
   "settings.general.row.uiFont.title": "UI-skrifttype",
   "settings.general.row.uiFont.description": "Tilpas skrifttypen, der bruges i hele brugerfladen",
   "settings.general.row.followup.title": "Opfølgningsadfærd",
   "settings.general.row.followup.description": "Vælg om opfølgende forespørgsler skal styre straks eller vente i kø",
   "settings.general.row.followup.option.queue": "Kø",
   "settings.general.row.followup.option.steer": "Styr",
+  "settings.general.row.showFileTree.title": "Filtræ",
+  "settings.general.row.showFileTree.description": "Vis filtræspanelet i sessioner",
+  "settings.general.row.showNavigation.title": "Navigationsknapper",
+  "settings.general.row.showNavigation.description": "Vis tilbage- og frem-knapperne i desktopappens titellinje",
+  "settings.general.row.showSearch.title": "Kommandopalette",
+  "settings.general.row.showSearch.description": "Vis knappen til søgning og kommandopaletten i titellinjen",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Vis terminalknappen i desktopappens titellinje",
+  "settings.general.row.showStatus.title": "Serverstatus",
+  "settings.general.row.showStatus.description": "Vis serverstatusknappen i titellinjen",
+  "settings.general.row.mobileTitlebarBottom.title": "Navigation nederst",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Placer titellinjen og sessionsfanerne nederst på skærmen på mobilenheder",
+  "settings.general.row.showCustomAgents.title": "Brugerdefinerede agenter",
+  "settings.general.row.showCustomAgents.description": "Vis agentvælgeren i promptfeltet",
   "settings.general.row.reasoningSummaries.title": "Vis tænkeoversigter",
   "settings.general.row.reasoningSummaries.description": "Vis model tænkeoversigter i tidslinjen",
 
@@ -657,6 +797,11 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Udvid edit-værktøjsdele",
   "settings.general.row.editToolPartsExpanded.description":
     "Vis edit-, write- og patch-værktøjsdele udvidet som standard i tidslinjen",
+  "settings.general.row.newLayoutDesigns.title": "Nyt layout og design",
+  "settings.general.row.newLayoutDesigns.description":
+    "Aktivér det nydesignede layout, startsiden, promptfeltet og sessionsbrugerfladen",
+  "settings.general.row.pinchZoom.title": "Knib for at zoome",
+  "settings.general.row.pinchZoom.description": "Tillad knibebevægelser på pegefeltet og Ctrl-rulning for at zoome",
   "settings.general.row.wayland.title": "Brug native Wayland",
   "settings.general.row.wayland.description": "Deaktiver X11-fallback på Wayland. Kræver genstart.",
   "settings.general.row.wayland.tooltip":
@@ -671,6 +816,8 @@ export const dict = {
   "settings.updates.row.check.description": "Tjek manuelt for opdateringer og installer, hvis tilgængelig",
   "settings.updates.action.checkNow": "Tjek nu",
   "settings.updates.action.checking": "Tjekker...",
+  "settings.updates.action.downloading": "Downloader...",
+  "settings.updates.action.installing": "Installerer...",
   "settings.updates.toast.latest.title": "Du er opdateret",
   "settings.updates.toast.latest.description": "Du kører den nyeste version af OpenCode.",
 
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index d0ec9507e060..c96dc232a5d3 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -25,6 +25,9 @@ export const dict = {
   "theme.scheme.dark": "Dunkel",
   "command.sidebar.toggle": "Seitenleiste umschalten",
   "command.project.open": "Projekt öffnen",
+  "command.project.previous": "Vorheriges Projekt",
+  "command.project.next": "Nächstes Projekt",
+  "command.project.index": "Zu Projekt {{index}} wechseln",
   "command.provider.connect": "Anbieter verbinden",
   "command.server.switch": "Server wechseln",
   "command.settings.open": "Einstellungen öffnen",
@@ -43,6 +46,7 @@ export const dict = {
   "command.session.new": "Neue Sitzung",
   "command.file.open": "Datei öffnen",
   "command.tab.close": "Tab schließen",
+  "command.tab.reopenClosed": "Geschlossenen Tab wieder öffnen",
   "command.context.addSelection": "Auswahl zum Kontext hinzufügen",
   "command.context.addSelection.description": "Ausgewählte Zeilen aus der aktuellen Datei hinzufügen",
   "command.input.focus": "Eingabefeld fokussieren",
@@ -198,6 +202,11 @@ export const dict = {
   "model.input.video": "Video",
   "model.input.pdf": "PDF",
   "model.tooltip.allows": "Erlaubt: {{inputs}}",
+  "model.tooltip.context.label": "Kontext",
+  "model.tooltip.inputs": "Eingaben",
+  "model.tooltip.model": "Modell",
+  "model.tooltip.provider": "Anbieter",
+  "model.tooltip.reasoning": "Reasoning",
   "model.tooltip.reasoning.allowed": "Erlaubt Reasoning",
   "model.tooltip.reasoning.none": "Kein Reasoning",
   "model.tooltip.context": "Kontextlimit {{limit}}",
@@ -207,6 +216,7 @@ export const dict = {
   "common.loading": "Laden",
   "common.loading.ellipsis": "...",
   "common.cancel": "Abbrechen",
+  "common.clear": "Leeren",
   "common.connect": "Verbinden",
   "common.disconnect": "Trennen",
   "common.continue": "Absenden",
@@ -223,6 +233,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc zum Verlassen",
+  "session.child.promptDisabled": "Unteragenten-Sitzungen können keine Prompts erhalten.",
+  "session.child.backToParent": "Zurück zur Hauptsitzung.",
   "prompt.example.1": "Ein TODO in der Codebasis beheben",
   "prompt.example.2": "Was ist der Tech-Stack dieses Projekts?",
   "prompt.example.3": "Fehlerhafte Tests beheben",
@@ -320,6 +332,75 @@ export const dict = {
   "dialog.server.menu.delete": "Löschen",
   "dialog.server.current": "Aktueller Server",
   "dialog.server.status.default": "Standard",
+  "wsl.server.add": "WSL-Server hinzufügen",
+  "wsl.server.addShort": "WSL hinzufügen",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL-Server",
+  "wsl.server.retryStart": "Start erneut versuchen",
+  "wsl.server.updating": "Wird aktualisiert...",
+  "wsl.onboarding.step.distro": "Distribution auswählen",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "WSL wird geprüft...",
+  "wsl.onboarding.restartRequired": "Windows muss neu gestartet werden, um die WSL-Installation abzuschließen.",
+  "wsl.onboarding.ready": "WSL ist bereit.",
+  "wsl.onboarding.required": "WSL ist erforderlich, um fortzufahren.",
+  "wsl.onboarding.checkingDistros": "Distributionen werden geprüft...",
+  "wsl.onboarding.installingDistro": "{{distro}} wird installiert...",
+  "wsl.onboarding.checkingDistro": "{{distro}} wird geprüft...",
+  "wsl.onboarding.listingDistros": "Distributionen werden aufgelistet...",
+  "wsl.onboarding.distroReady": "{{distro}} ist bereit.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} ist noch nicht installiert.",
+  "wsl.onboarding.openDistroOnce": "Öffnen Sie {{distro}} einmal, um die Einrichtung abzuschließen.",
+  "wsl.onboarding.finishingDistro": "Einrichtung von {{distro}} wird abgeschlossen.",
+  "wsl.onboarding.pickDistro": "Wählen Sie eine Distribution aus oder installieren Sie unten eine.",
+  "wsl.onboarding.checkingOpencode": "OpenCode wird geprüft...",
+  "wsl.onboarding.checkingOpencodeIn": "OpenCode in {{distro}} wird geprüft...",
+  "wsl.onboarding.updatingOpencode": "OpenCode wird aktualisiert...",
+  "wsl.onboarding.updatingOpencodeIn": "OpenCode in {{distro}} wird aktualisiert...",
+  "wsl.onboarding.updateOpencodeIn": "Aktualisieren Sie OpenCode in {{distro}}.",
+  "wsl.onboarding.updateOpencode": "OpenCode aktualisieren",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode ist in {{distro}} bereit.",
+  "wsl.onboarding.opencodeReady": "OpenCode ist bereit.",
+  "wsl.onboarding.installOpencodeIn": "Installieren Sie OpenCode in {{distro}}.",
+  "wsl.onboarding.installOpencode": "OpenCode installieren",
+  "wsl.onboarding.chooseDistroFirst": "Wählen Sie zuerst eine Distribution aus.",
+  "wsl.onboarding.loadFailed": "WSL-Status konnte nicht geladen werden.",
+  "wsl.onboarding.loading": "Wird geladen...",
+  "wsl.onboarding.installedDistros": "Installierte Distributionen",
+  "wsl.onboarding.checkAgain": "Erneut prüfen",
+  "wsl.onboarding.distroStatus.ready": "Bereit",
+  "wsl.onboarding.distroStatus.checking": "Wird geprüft...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode nicht installiert",
+  "wsl.onboarding.distroStatus.missingTools": "Fehlend: bash, curl",
+  "wsl.onboarding.distroStatus.unsupported": "Nicht unterstützt · WSL 2 verwenden",
+  "wsl.onboarding.needAnotherDistro": "Andere Distribution benötigt?",
+  "wsl.onboarding.needAnotherDistroHint": "Installieren Sie eine Linux-Distribution aus dem WSL-Katalog",
+  "wsl.onboarding.wslNotInstalled.title": "WSL nicht installiert",
+  "wsl.onboarding.wslNotInstalled.description":
+    "WSL (Windows Subsystem for Linux) ist erforderlich, bevor OpenCode einen WSL-Server hinzufügen kann",
+  "wsl.onboarding.wslUnavailable.title": "WSL nicht verfügbar",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode konnte WSL auf diesem Computer nicht überprüfen.",
+  "wsl.onboarding.installWsl": "WSL installieren",
+  "wsl.onboarding.windowsRestartRequired":
+    "Starten Sie Windows neu, um die WSL-Installation abzuschließen, und öffnen Sie dann OpenCode erneut.",
+  "wsl.onboarding.next": "Weiter",
+  "wsl.onboarding.refresh": "Aktualisieren",
+  "wsl.onboarding.allDistrosAdded": "Alle installierten Distributionen wurden bereits hinzugefügt.",
+  "wsl.onboarding.noDistros": "Noch keine Distributionen erkannt.",
+  "wsl.onboarding.install": "Installieren",
+  "wsl.onboarding.installing": "Wird installiert...",
+  "wsl.onboarding.installDistro": "Distribution installieren",
+  "wsl.onboarding.searchDistros": "Distributionen durchsuchen",
+  "wsl.onboarding.wsl2Required": "WSL 2 ist erforderlich.",
+  "wsl.onboarding.toolsRequired": "Diese Distribution benötigt bash und curl.",
+  "wsl.onboarding.openTerminal": "Terminal öffnen",
+  "wsl.onboarding.path": "Pfad: {{path}}",
+  "wsl.onboarding.notFound": "nicht gefunden",
+  "wsl.onboarding.version": "Version: {{version}}",
+  "wsl.onboarding.unknown": "unbekannt",
+  "wsl.onboarding.desktopVersion": "Desktop {{version}}",
+  "wsl.onboarding.versionMismatch": "Die installierte Version entspricht nicht der Version der Desktop-App.",
+  "wsl.onboarding.adding": "Wird hinzugefügt...",
   "dialog.project.edit.title": "Projekt bearbeiten",
   "dialog.project.edit.name": "Name",
   "dialog.project.edit.icon": "Icon",
@@ -378,6 +459,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
   "toast.language.title": "Sprache",
@@ -414,10 +496,12 @@ export const dict = {
   "toast.update.action.notYet": "Noch nicht",
   "error.page.title": "Etwas ist schiefgelaufen",
   "error.page.description": "Beim Laden der Anwendung ist ein Fehler aufgetreten.",
+  "error.page.description.localServerStartup": "Beim Starten des lokalen Servers ist ein Fehler aufgetreten.",
   "error.page.details.label": "Fehlerdetails",
   "error.page.action.restart": "Neustart",
   "error.page.action.report": "Fehler melden",
   "error.page.action.reported": "Fehler gemeldet",
+  "error.page.action.exportLogs": "Protokolle exportieren",
   "error.page.action.checking": "Prüfen...",
   "error.page.action.checkUpdates": "Nach Updates suchen",
   "error.page.action.updateTo": "Auf {{version}} aktualisieren",
@@ -461,10 +545,31 @@ export const dict = {
   "home.recentProjects": "Letzte Projekte",
   "home.empty.title": "Keine letzten Projekte",
   "home.empty.description": "Starten Sie, indem Sie ein lokales Projekt öffnen",
+  "home.title": "Startseite",
+  "home.projects": "Projekte",
+  "home.project.add": "Projekt hinzufügen",
+  "home.recentlyClosed": "Kürzlich geschlossen",
+  "home.server.collapse": "Serverprojekte einklappen",
+  "home.server.expand": "Serverprojekte ausklappen",
+  "home.sessions.search.placeholder": "Sitzungen durchsuchen",
+  "home.sessions.search.placeholder.scoped": "Sitzungen in {{scope}} durchsuchen",
+  "home.sessions.search.sessions": "Sitzungen",
+  "home.sessions.search.noResults": "Keine Sitzungen für {{query}} gefunden",
+  "home.sessions.empty": "Hier ist noch nichts",
+  "home.sessions.empty.description": "Erstellen Sie eine Sitzung, um loszulegen",
+  "home.sessions.group.today": "Heute",
+  "home.sessions.group.yesterday": "Gestern",
+  "home.sessions.group.older": "Älter",
   "session.tab.session": "Sitzung",
   "session.tab.review": "Überprüfung",
   "session.tab.context": "Kontext",
+  "session.tab.unknown": "Unbekannte Sitzung",
   "session.panel.reviewAndFiles": "Überprüfung und Dateien",
+  "session.error.notFound": "Diese Sitzung wurde nicht gefunden",
+  "session.error.notFound.description":
+    "Dieser Tab verweist auf eine Sitzung, die auf diesem Server nicht mehr existiert.",
+  "session.error.notFound.closeTab": "Tab schließen",
+  "session.error.serverConnection": "Verbindung zu diesem Server nicht möglich",
   "session.review.filesChanged": "{{count}} Dateien geändert",
   "session.review.change.one": "Änderung",
   "session.review.change.other": "Änderungen",
@@ -474,6 +579,8 @@ export const dict = {
   "session.review.noSnapshot":
     "Snapshot-Tracking ist in der Konfiguration deaktiviert, daher sind Sitzungsänderungen nicht verfügbar",
   "session.review.noChanges": "Keine Änderungen",
+  "session.review.noUncommittedChanges": "Noch keine nicht committeten Änderungen",
+  "session.review.noBranchChanges": "Noch keine Branch-Änderungen",
   "session.files.selectToOpen": "Datei zum Öffnen auswählen",
   "session.files.all": "Alle Dateien",
   "session.files.empty": "Keine Dateien",
@@ -487,6 +594,10 @@ export const dict = {
   "session.todo.title": "Aufgaben",
   "session.todo.collapse": "Einklappen",
   "session.todo.expand": "Ausklappen",
+  "session.question.minimize": "Frage minimieren",
+  "session.question.restore": "Frage wiederherstellen",
+  "session.question.pending.one": "{{count}} ausstehende Frage",
+  "session.question.pending.other": "{{count}} ausstehende Fragen",
   "session.followupDock.summary.one": "{{count}} Nachricht in der Warteschlange",
   "session.followupDock.summary.other": "{{count}} Nachrichten in der Warteschlange",
   "session.followupDock.sendNow": "Jetzt senden",
@@ -499,9 +610,16 @@ export const dict = {
   "session.revertDock.expand": "Zurückgesetzte Nachrichten ausklappen",
   "session.revertDock.restore": "Nachricht wiederherstellen",
   "session.new.title": "Baue, was du willst",
+  "session.new.project.new": "Neues Projekt",
+  "session.new.project.search": "Projekte durchsuchen",
+  "session.new.project.add": "Projekt hinzufügen",
   "session.new.worktree.main": "Haupt-Branch",
   "session.new.worktree.mainWithBranch": "Haupt-Branch ({{branch}})",
   "session.new.worktree.create": "Neuen Worktree erstellen",
+  "session.new.workspace.runIn": "Sitzung ausführen in",
+  "session.new.workspace.triggerLocal": "Lokal",
+  "session.new.workspace.local": "Lokales Repository",
+  "session.new.workspace.existing": "Arbeitsbereich…",
   "session.new.lastModified": "Zuletzt geändert",
   "session.header.search.placeholder": "{{project}} durchsuchen",
   "session.header.searchFiles": "Dateien suchen",
@@ -566,6 +684,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Letzte Sitzungen",
   "sidebar.project.viewAllSessions": "Alle Sitzungen anzeigen",
   "sidebar.project.clearNotifications": "Benachrichtigungen löschen",
+  "sidebar.empty.title": "Keine Projekte geöffnet",
+  "sidebar.empty.description": "Öffnen Sie ein Projekt, um loszulegen",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Server",
@@ -575,6 +695,7 @@ export const dict = {
   "settings.desktop.wsl.title": "WSL-Integration",
   "settings.desktop.wsl.description": "OpenCode-Server innerhalb von WSL unter Windows ausführen.",
   "settings.general.section.appearance": "Erscheinungsbild",
+  "settings.general.section.advanced": "Erweitert",
   "settings.general.section.notifications": "Systembenachrichtigungen",
   "settings.general.section.updates": "Updates",
   "settings.general.section.sounds": "Soundeffekte",
@@ -582,6 +703,11 @@ export const dict = {
   "settings.general.section.display": "Anzeige",
   "settings.general.row.language.title": "Sprache",
   "settings.general.row.language.description": "Die Anzeigesprache für OpenCode ändern",
+  "settings.general.row.shell.title": "Terminal-Shell",
+  "settings.general.row.shell.description":
+    "Wählen Sie die Shell für Ihr Terminal aus. Kompatible Shells werden auch für Tool-Aufrufe von Agenten verwendet.",
+  "settings.general.row.shell.autoDefault": "Automatisch (Standard)",
+  "settings.general.row.shell.terminalOnly": "nur Terminal",
   "settings.general.row.appearance.title": "Erscheinungsbild",
   "settings.general.row.appearance.description": "Anpassen, wie OpenCode auf Ihrem Gerät aussieht",
   "settings.general.row.colorScheme.title": "Farbschema",
@@ -591,8 +717,8 @@ export const dict = {
   "settings.general.row.theme.description": "Das Thema von OpenCode anpassen.",
   "settings.general.row.font.title": "Code-Schriftart",
   "settings.general.row.font.description": "Die in Codeblöcken verwendete Schriftart anpassen",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Terminalschriftart",
+  "settings.general.row.terminalFont.description": "Passe die im Terminal verwendete Schriftart an",
   "settings.general.row.uiFont.title": "UI-Schriftart",
   "settings.general.row.uiFont.description": "Die im gesamten Interface verwendete Schriftart anpassen",
   "settings.general.row.followup.title": "Verhalten bei Folgefragen",
@@ -600,6 +726,23 @@ export const dict = {
     "Wählen Sie, ob Folgefragen sofort steuern oder in einer Warteschlange warten",
   "settings.general.row.followup.option.queue": "Warteschlange",
   "settings.general.row.followup.option.steer": "Steuern",
+  "settings.general.row.showFileTree.title": "Dateibaum",
+  "settings.general.row.showFileTree.description": "Dateibaum in Sitzungen anzeigen",
+  "settings.general.row.showNavigation.title": "Navigationssteuerung",
+  "settings.general.row.showNavigation.description":
+    "Schaltflächen zum Vor- und Zurücknavigieren in der Desktop-Titelleiste anzeigen",
+  "settings.general.row.showSearch.title": "Befehlspalette",
+  "settings.general.row.showSearch.description":
+    "Schaltfläche für Suche und Befehlspalette in der Titelleiste anzeigen",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Terminal-Schaltfläche in der Desktop-Titelleiste anzeigen",
+  "settings.general.row.showStatus.title": "Serverstatus",
+  "settings.general.row.showStatus.description": "Serverstatus-Schaltfläche in der Titelleiste anzeigen",
+  "settings.general.row.mobileTitlebarBottom.title": "Navigation unten",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Titelleiste und Sitzungs-Tabs auf Mobilgeräten am unteren Bildschirmrand platzieren",
+  "settings.general.row.showCustomAgents.title": "Benutzerdefinierte Agenten",
+  "settings.general.row.showCustomAgents.description": "Agentenauswahl im Eingabebereich anzeigen",
   "settings.general.row.reasoningSummaries.title": "Reasoning-Zusammenfassungen anzeigen",
   "settings.general.row.reasoningSummaries.description":
     "Zusammenfassungen des Modell-Reasonings in der Timeline anzeigen",
@@ -609,6 +752,11 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Edit-Tool-Abschnitte ausklappen",
   "settings.general.row.editToolPartsExpanded.description":
     "Edit-, Write- und Patch-Tool-Abschnitte standardmäßig in der Timeline ausgeklappt anzeigen",
+  "settings.general.row.newLayoutDesigns.title": "Neues Layout und Design",
+  "settings.general.row.newLayoutDesigns.description":
+    "Neu gestaltetes Layout, Startseite, Eingabebereich und Sitzungsoberfläche aktivieren",
+  "settings.general.row.pinchZoom.title": "Zoom per Fingergeste",
+  "settings.general.row.pinchZoom.description": "Zoomen per Zwei-Finger- und Ctrl-Scroll-Geste erlauben",
   "settings.general.row.wayland.title": "Natives Wayland verwenden",
   "settings.general.row.wayland.description": "X11-Fallback unter Wayland deaktivieren. Erfordert Neustart.",
   "settings.general.row.wayland.tooltip":
@@ -621,6 +769,8 @@ export const dict = {
   "settings.updates.row.check.description": "Manuell nach Updates suchen und installieren, wenn verfügbar",
   "settings.updates.action.checkNow": "Jetzt prüfen",
   "settings.updates.action.checking": "Wird geprüft...",
+  "settings.updates.action.downloading": "Wird heruntergeladen...",
+  "settings.updates.action.installing": "Wird installiert...",
   "settings.updates.toast.latest.title": "Du bist auf dem neuesten Stand",
   "settings.updates.toast.latest.description": "Du verwendest die aktuelle Version von OpenCode.",
   "sound.option.none": "Keine",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index a6371d7312a0..5ef7862cd695 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -23,6 +23,9 @@ export const dict = {
 
   "command.sidebar.toggle": "Alternar barra lateral",
   "command.project.open": "Abrir proyecto",
+  "command.project.previous": "Proyecto anterior",
+  "command.project.next": "Siguiente proyecto",
+  "command.project.index": "Cambiar al proyecto {{index}}",
   "command.provider.connect": "Conectar proveedor",
   "command.server.switch": "Cambiar servidor",
   "command.settings.open": "Abrir ajustes",
@@ -45,6 +48,7 @@ export const dict = {
   "command.session.new": "Nueva sesión",
   "command.file.open": "Abrir archivo",
   "command.tab.close": "Cerrar pestaña",
+  "command.tab.reopenClosed": "Reabrir pestaña cerrada",
   "command.context.addSelection": "Añadir selección al contexto",
   "command.context.addSelection.description": "Añadir las líneas seleccionadas del archivo actual",
   "command.input.focus": "Enfocar entrada",
@@ -208,6 +212,11 @@ export const dict = {
   "model.input.video": "video",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Permite: {{inputs}}",
+  "model.tooltip.context.label": "Contexto",
+  "model.tooltip.inputs": "Entradas",
+  "model.tooltip.model": "Modelo",
+  "model.tooltip.provider": "Proveedor",
+  "model.tooltip.reasoning": "Razonamiento",
   "model.tooltip.reasoning.allowed": "Permite razonamiento",
   "model.tooltip.reasoning.none": "Sin razonamiento",
   "model.tooltip.context": "Límite de contexto {{limit}}",
@@ -218,6 +227,7 @@ export const dict = {
   "common.loading": "Cargando",
   "common.loading.ellipsis": "...",
   "common.cancel": "Cancelar",
+  "common.clear": "Limpiar",
   "common.connect": "Conectar",
   "common.disconnect": "Desconectar",
   "common.continue": "Enviar",
@@ -235,6 +245,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc para salir",
+  "session.child.promptDisabled": "No se pueden enviar prompts a las sesiones de subagentes.",
+  "session.child.backToParent": "Volver a la sesión principal.",
 
   "prompt.example.1": "Arreglar un TODO en el código",
   "prompt.example.2": "¿Cuál es el stack tecnológico de este proyecto?",
@@ -341,6 +353,75 @@ export const dict = {
   "dialog.server.menu.delete": "Eliminar",
   "dialog.server.current": "Servidor actual",
   "dialog.server.status.default": "Predeterminado",
+  "wsl.server.add": "Añadir servidor WSL",
+  "wsl.server.addShort": "Añadir WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "Servidor WSL",
+  "wsl.server.retryStart": "Reintentar el inicio",
+  "wsl.server.updating": "Actualizando...",
+  "wsl.onboarding.step.distro": "Elegir distribución",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Comprobando WSL...",
+  "wsl.onboarding.restartRequired": "Es necesario reiniciar Windows para terminar de instalar WSL.",
+  "wsl.onboarding.ready": "WSL está listo.",
+  "wsl.onboarding.required": "Se necesita WSL para continuar.",
+  "wsl.onboarding.checkingDistros": "Comprobando distribuciones...",
+  "wsl.onboarding.installingDistro": "Instalando {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Comprobando {{distro}}...",
+  "wsl.onboarding.listingDistros": "Listando distribuciones...",
+  "wsl.onboarding.distroReady": "La distribución {{distro}} está lista.",
+  "wsl.onboarding.distroNotInstalled": "La distribución {{distro}} aún no está instalada.",
+  "wsl.onboarding.openDistroOnce": "Abre {{distro}} una vez para completar la configuración.",
+  "wsl.onboarding.finishingDistro": "Completando la configuración de {{distro}}.",
+  "wsl.onboarding.pickDistro": "Elige una distribución o instala una abajo.",
+  "wsl.onboarding.checkingOpencode": "Comprobando OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Comprobando OpenCode en {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Actualizando OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Actualizando OpenCode en {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Actualiza OpenCode en {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Actualizar OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode está listo en {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode está listo.",
+  "wsl.onboarding.installOpencodeIn": "Instala OpenCode en {{distro}}.",
+  "wsl.onboarding.installOpencode": "Instalar OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Elige primero una distribución.",
+  "wsl.onboarding.loadFailed": "No se pudo cargar el estado de WSL.",
+  "wsl.onboarding.loading": "Cargando...",
+  "wsl.onboarding.installedDistros": "Distribuciones instaladas",
+  "wsl.onboarding.checkAgain": "Comprobar de nuevo",
+  "wsl.onboarding.distroStatus.ready": "Lista",
+  "wsl.onboarding.distroStatus.checking": "Comprobando...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode no está instalado",
+  "wsl.onboarding.distroStatus.missingTools": "Faltan bash y curl",
+  "wsl.onboarding.distroStatus.unsupported": "No compatible · Usa WSL 2",
+  "wsl.onboarding.needAnotherDistro": "¿Necesitas otra distribución?",
+  "wsl.onboarding.needAnotherDistroHint": "Instala una distribución de Linux desde el catálogo de WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL no está instalado",
+  "wsl.onboarding.wslNotInstalled.description":
+    "Se necesita WSL (Subsistema de Windows para Linux) para que OpenCode pueda añadir un servidor WSL",
+  "wsl.onboarding.wslUnavailable.title": "WSL no disponible",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode no pudo comprobar WSL en este equipo.",
+  "wsl.onboarding.installWsl": "Instalar WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Reinicia Windows para terminar de instalar WSL y, después, vuelve a abrir OpenCode.",
+  "wsl.onboarding.next": "Siguiente",
+  "wsl.onboarding.refresh": "Actualizar",
+  "wsl.onboarding.allDistrosAdded": "Ya se han añadido todas las distribuciones instaladas.",
+  "wsl.onboarding.noDistros": "Aún no se han detectado distribuciones.",
+  "wsl.onboarding.install": "Instalar",
+  "wsl.onboarding.installing": "Instalando...",
+  "wsl.onboarding.installDistro": "Instalar distribución",
+  "wsl.onboarding.searchDistros": "Buscar distribuciones",
+  "wsl.onboarding.wsl2Required": "Se necesita WSL 2.",
+  "wsl.onboarding.toolsRequired": "Esta distribución necesita bash y curl.",
+  "wsl.onboarding.openTerminal": "Abrir terminal",
+  "wsl.onboarding.path": "Ruta: {{path}}",
+  "wsl.onboarding.notFound": "no encontrado",
+  "wsl.onboarding.version": "Versión: {{version}}",
+  "wsl.onboarding.unknown": "desconocida",
+  "wsl.onboarding.desktopVersion": "escritorio {{version}}",
+  "wsl.onboarding.versionMismatch": "La versión instalada no coincide con la versión de la aplicación de escritorio.",
+  "wsl.onboarding.adding": "Añadiendo...",
 
   "dialog.project.edit.title": "Editar proyecto",
   "dialog.project.edit.name": "Nombre",
@@ -405,6 +486,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -453,10 +535,12 @@ export const dict = {
 
   "error.page.title": "Algo salió mal",
   "error.page.description": "Ocurrió un error al cargar la aplicación.",
+  "error.page.description.localServerStartup": "Ocurrió un error al iniciar el servidor local.",
   "error.page.details.label": "Detalles del error",
   "error.page.action.restart": "Reiniciar",
   "error.page.action.report": "Informar error",
   "error.page.action.reported": "Error informado",
+  "error.page.action.exportLogs": "Exportar registros",
   "error.page.action.checking": "Comprobando...",
   "error.page.action.checkUpdates": "Buscar actualizaciones",
   "error.page.action.updateTo": "Actualizar a {{version}}",
@@ -505,11 +589,31 @@ export const dict = {
   "home.recentProjects": "Proyectos recientes",
   "home.empty.title": "Sin proyectos recientes",
   "home.empty.description": "Empieza abriendo un proyecto local",
+  "home.title": "Inicio",
+  "home.projects": "Proyectos",
+  "home.project.add": "Añadir proyecto",
+  "home.recentlyClosed": "Proyectos cerrados recientemente",
+  "home.server.collapse": "Contraer proyectos del servidor",
+  "home.server.expand": "Expandir proyectos del servidor",
+  "home.sessions.search.placeholder": "Buscar sesiones",
+  "home.sessions.search.placeholder.scoped": "Buscar sesiones en {{scope}}",
+  "home.sessions.search.sessions": "Sesiones",
+  "home.sessions.search.noResults": "No se encontraron sesiones para {{query}}",
+  "home.sessions.empty": "Aún no hay nada",
+  "home.sessions.empty.description": "Crea una sesión para empezar",
+  "home.sessions.group.today": "Hoy",
+  "home.sessions.group.yesterday": "Ayer",
+  "home.sessions.group.older": "Anteriores",
 
   "session.tab.session": "Sesión",
   "session.tab.review": "Revisión",
   "session.tab.context": "Contexto",
+  "session.tab.unknown": "Sesión desconocida",
   "session.panel.reviewAndFiles": "Revisión y archivos",
+  "session.error.notFound": "No se encuentra esta sesión",
+  "session.error.notFound.description": "Esta pestaña apunta a una sesión que ya no existe en este servidor.",
+  "session.error.notFound.closeTab": "Cerrar pestaña",
+  "session.error.serverConnection": "No se puede conectar a este servidor",
   "session.review.filesChanged": "{{count}} Archivos Cambiados",
   "session.review.change.one": "Cambio",
   "session.review.change.other": "Cambios",
@@ -519,6 +623,8 @@ export const dict = {
   "session.review.noSnapshot":
     "El seguimiento de instantáneas está deshabilitado en la configuración, por lo que los cambios de sesión no están disponibles",
   "session.review.noChanges": "Sin cambios",
+  "session.review.noUncommittedChanges": "Aún no hay cambios sin confirmar",
+  "session.review.noBranchChanges": "Aún no hay cambios en la rama",
 
   "session.files.selectToOpen": "Selecciona un archivo para abrir",
   "session.files.all": "Todos los archivos",
@@ -535,6 +641,10 @@ export const dict = {
   "session.todo.title": "Tareas",
   "session.todo.collapse": "Contraer",
   "session.todo.expand": "Expandir",
+  "session.question.minimize": "Minimizar pregunta",
+  "session.question.restore": "Restaurar pregunta",
+  "session.question.pending.one": "{{count}} pregunta pendiente",
+  "session.question.pending.other": "{{count}} preguntas pendientes",
   "session.followupDock.summary.one": "{{count}} mensaje en cola",
   "session.followupDock.summary.other": "{{count}} mensajes en cola",
   "session.followupDock.sendNow": "Enviar ahora",
@@ -548,9 +658,16 @@ export const dict = {
   "session.revertDock.restore": "Restaurar mensaje",
 
   "session.new.title": "Construye lo que quieras",
+  "session.new.project.new": "Nuevo proyecto",
+  "session.new.project.search": "Buscar proyectos",
+  "session.new.project.add": "Añadir proyecto",
   "session.new.worktree.main": "Rama principal",
   "session.new.worktree.mainWithBranch": "Rama principal ({{branch}})",
   "session.new.worktree.create": "Crear nuevo árbol de trabajo",
+  "session.new.workspace.runIn": "Ejecutar sesión en",
+  "session.new.workspace.triggerLocal": "Local",
+  "session.new.workspace.local": "Repositorio local",
+  "session.new.workspace.existing": "Espacio de trabajo…",
   "session.new.lastModified": "Última modificación",
 
   "session.header.search.placeholder": "Buscar {{project}}",
@@ -621,6 +738,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Sesiones recientes",
   "sidebar.project.viewAllSessions": "Ver todas las sesiones",
   "sidebar.project.clearNotifications": "Borrar notificaciones",
+  "sidebar.empty.title": "No hay proyectos abiertos",
+  "sidebar.empty.description": "Abre un proyecto para empezar",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -633,6 +752,7 @@ export const dict = {
   "settings.desktop.wsl.description": "Ejecutar el servidor OpenCode dentro de WSL en Windows.",
 
   "settings.general.section.appearance": "Apariencia",
+  "settings.general.section.advanced": "Avanzado",
   "settings.general.section.notifications": "Notificaciones del sistema",
   "settings.general.section.updates": "Actualizaciones",
   "settings.general.section.sounds": "Efectos de sonido",
@@ -641,6 +761,11 @@ export const dict = {
 
   "settings.general.row.language.title": "Idioma",
   "settings.general.row.language.description": "Cambiar el idioma de visualización para OpenCode",
+  "settings.general.row.shell.title": "Shell del terminal",
+  "settings.general.row.shell.description":
+    "Elige el shell que se usará en el terminal. Los shells compatibles también se usarán para las llamadas a herramientas del agente.",
+  "settings.general.row.shell.autoDefault": "Automático (Predeterminado)",
+  "settings.general.row.shell.terminalOnly": "solo en el terminal",
   "settings.general.row.appearance.title": "Apariencia",
   "settings.general.row.appearance.description": "Personaliza cómo se ve OpenCode en tu dispositivo",
   "settings.general.row.colorScheme.title": "Esquema de color",
@@ -649,8 +774,8 @@ export const dict = {
   "settings.general.row.theme.description": "Personaliza el tema de OpenCode.",
   "settings.general.row.font.title": "Fuente de código",
   "settings.general.row.font.description": "Personaliza la fuente usada en bloques de código",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Fuente del terminal",
+  "settings.general.row.terminalFont.description": "Personaliza la fuente utilizada en el terminal",
   "settings.general.row.uiFont.title": "Fuente de la interfaz",
   "settings.general.row.uiFont.description": "Personaliza la fuente usada en toda la interfaz",
   "settings.general.row.followup.title": "Comportamiento de seguimiento",
@@ -658,6 +783,23 @@ export const dict = {
     "Elige si los prompts de seguimiento se dirigen inmediatamente o esperan en una cola",
   "settings.general.row.followup.option.queue": "Cola",
   "settings.general.row.followup.option.steer": "Dirigir",
+  "settings.general.row.showFileTree.title": "Árbol de archivos",
+  "settings.general.row.showFileTree.description": "Mostrar el panel del árbol de archivos en las sesiones",
+  "settings.general.row.showNavigation.title": "Controles de navegación",
+  "settings.general.row.showNavigation.description":
+    "Mostrar los botones para retroceder y avanzar en la barra de título de la aplicación de escritorio",
+  "settings.general.row.showSearch.title": "Paleta de comandos",
+  "settings.general.row.showSearch.description":
+    "Mostrar el botón de búsqueda y paleta de comandos en la barra de título",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Mostrar el botón del terminal en la barra de título",
+  "settings.general.row.showStatus.title": "Estado del servidor",
+  "settings.general.row.showStatus.description": "Mostrar el botón de estado del servidor en la barra de título",
+  "settings.general.row.mobileTitlebarBottom.title": "Navegación inferior",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Colocar la barra de título y las pestañas de sesión en la parte inferior de la pantalla en dispositivos móviles",
+  "settings.general.row.showCustomAgents.title": "Agentes personalizados",
+  "settings.general.row.showCustomAgents.description": "Mostrar el selector de agentes en el editor",
   "settings.general.row.reasoningSummaries.title": "Mostrar resúmenes de razonamiento",
   "settings.general.row.reasoningSummaries.description":
     "Mostrar resúmenes del razonamiento del modelo en la línea de tiempo",
@@ -667,6 +809,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Expandir partes de la herramienta de edición",
   "settings.general.row.editToolPartsExpanded.description":
     "Mostrar las partes de las herramientas de edición, escritura y parcheado expandidas por defecto en la línea de tiempo",
+  "settings.general.row.newLayoutDesigns.title": "Nuevo diseño y estilos",
+  "settings.general.row.newLayoutDesigns.description":
+    "Activar el nuevo diseño de la interfaz, la página de inicio, el editor y las sesiones",
+  "settings.general.row.pinchZoom.title": "Pellizcar para ampliar",
+  "settings.general.row.pinchZoom.description":
+    "Permitir ampliar con el gesto de pellizco del panel táctil y con Ctrl-scroll",
   "settings.general.row.wayland.title": "Usar Wayland nativo",
   "settings.general.row.wayland.description": "Deshabilitar fallback a X11 en Wayland. Requiere reinicio.",
   "settings.general.row.wayland.tooltip":
@@ -682,6 +830,8 @@ export const dict = {
   "settings.updates.row.check.description": "Buscar actualizaciones manualmente e instalarlas si hay alguna",
   "settings.updates.action.checkNow": "Buscar ahora",
   "settings.updates.action.checking": "Buscando...",
+  "settings.updates.action.downloading": "Descargando...",
+  "settings.updates.action.installing": "Instalando...",
   "settings.updates.toast.latest.title": "Estás al día",
   "settings.updates.toast.latest.description": "Estás usando la última versión de OpenCode.",
   "sound.option.none": "Ninguno",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index 7ebd34e66ba5..77a543180d20 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -21,6 +21,9 @@ export const dict = {
   "theme.scheme.dark": "Sombre",
   "command.sidebar.toggle": "Basculer la barre latérale",
   "command.project.open": "Ouvrir un projet",
+  "command.project.previous": "Projet précédent",
+  "command.project.next": "Projet suivant",
+  "command.project.index": "Passer au projet {{index}}",
   "command.provider.connect": "Connecter un fournisseur",
   "command.server.switch": "Changer de serveur",
   "command.settings.open": "Ouvrir les paramètres",
@@ -39,6 +42,7 @@ export const dict = {
   "command.session.new": "Nouvelle session",
   "command.file.open": "Ouvrir un fichier",
   "command.tab.close": "Fermer l'onglet",
+  "command.tab.reopenClosed": "Rouvrir l'onglet fermé",
   "command.context.addSelection": "Ajouter la sélection au contexte",
   "command.context.addSelection.description": "Ajouter les lignes sélectionnées du fichier actuel",
   "command.input.focus": "Focus sur l'entrée",
@@ -193,6 +197,11 @@ export const dict = {
   "model.input.video": "vidéo",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Autorise : {{inputs}}",
+  "model.tooltip.context.label": "Contexte",
+  "model.tooltip.inputs": "Entrées",
+  "model.tooltip.model": "Modèle",
+  "model.tooltip.provider": "Fournisseur",
+  "model.tooltip.reasoning": "Raisonnement",
   "model.tooltip.reasoning.allowed": "Autorise le raisonnement",
   "model.tooltip.reasoning.none": "Sans raisonnement",
   "model.tooltip.context": "Limite de contexte {{limit}}",
@@ -202,6 +211,7 @@ export const dict = {
   "common.loading": "Chargement",
   "common.loading.ellipsis": "...",
   "common.cancel": "Annuler",
+  "common.clear": "Effacer",
   "common.connect": "Connecter",
   "common.disconnect": "Déconnecter",
   "common.continue": "Soumettre",
@@ -218,6 +228,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc pour quitter",
+  "session.child.promptDisabled": "Les sessions de sous-agents ne peuvent pas recevoir de messages.",
+  "session.child.backToParent": "Revenir à la session principale.",
   "prompt.example.1": "Corriger un TODO dans la base de code",
   "prompt.example.2": "Quelle est la pile technique de ce projet ?",
   "prompt.example.3": "Réparer les tests échoués",
@@ -315,6 +327,75 @@ export const dict = {
   "dialog.server.menu.delete": "Supprimer",
   "dialog.server.current": "Serveur actuel",
   "dialog.server.status.default": "Défaut",
+  "wsl.server.add": "Ajouter un serveur WSL",
+  "wsl.server.addShort": "Ajouter WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "Serveur WSL",
+  "wsl.server.retryStart": "Réessayer de démarrer",
+  "wsl.server.updating": "Mise à jour...",
+  "wsl.onboarding.step.distro": "Choisir une distribution",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Vérification de WSL...",
+  "wsl.onboarding.restartRequired": "Windows doit redémarrer pour terminer l'installation de WSL.",
+  "wsl.onboarding.ready": "WSL est prêt.",
+  "wsl.onboarding.required": "WSL est requis pour continuer.",
+  "wsl.onboarding.checkingDistros": "Vérification des distributions...",
+  "wsl.onboarding.installingDistro": "Installation de {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Vérification de {{distro}}...",
+  "wsl.onboarding.listingDistros": "Récupération de la liste des distributions...",
+  "wsl.onboarding.distroReady": "{{distro}} est prête.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} n'est pas encore installée.",
+  "wsl.onboarding.openDistroOnce": "Ouvrez {{distro}} une fois pour terminer la configuration.",
+  "wsl.onboarding.finishingDistro": "Finalisation de la configuration de {{distro}}.",
+  "wsl.onboarding.pickDistro": "Choisissez une distribution ou installez-en une ci-dessous.",
+  "wsl.onboarding.checkingOpencode": "Vérification d'OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Vérification d'OpenCode dans {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Mise à jour d'OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Mise à jour d'OpenCode dans {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Mettez à jour OpenCode dans {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Mettre à jour OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode est prêt dans {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode est prêt.",
+  "wsl.onboarding.installOpencodeIn": "Installez OpenCode dans {{distro}}.",
+  "wsl.onboarding.installOpencode": "Installer OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Choisissez d'abord une distribution.",
+  "wsl.onboarding.loadFailed": "Impossible de charger l'état de WSL.",
+  "wsl.onboarding.loading": "Chargement...",
+  "wsl.onboarding.installedDistros": "Distributions installées",
+  "wsl.onboarding.checkAgain": "Vérifier à nouveau",
+  "wsl.onboarding.distroStatus.ready": "Prête",
+  "wsl.onboarding.distroStatus.checking": "Vérification...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode non installé",
+  "wsl.onboarding.distroStatus.missingTools": "bash et curl manquants",
+  "wsl.onboarding.distroStatus.unsupported": "Non prise en charge · Utilisez WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Besoin d'une autre distribution ?",
+  "wsl.onboarding.needAnotherDistroHint": "Installez une distribution Linux depuis le catalogue WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL n'est pas installé",
+  "wsl.onboarding.wslNotInstalled.description":
+    "WSL (Windows Subsystem for Linux) est requis avant qu'OpenCode puisse ajouter un serveur WSL",
+  "wsl.onboarding.wslUnavailable.title": "WSL indisponible",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode n'a pas pu vérifier WSL sur cet appareil.",
+  "wsl.onboarding.installWsl": "Installer WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Redémarrez Windows pour terminer l'installation de WSL, puis rouvrez OpenCode.",
+  "wsl.onboarding.next": "Suivant",
+  "wsl.onboarding.refresh": "Actualiser",
+  "wsl.onboarding.allDistrosAdded": "Toutes les distributions installées ont déjà été ajoutées.",
+  "wsl.onboarding.noDistros": "Aucune distribution détectée pour l'instant.",
+  "wsl.onboarding.install": "Installer",
+  "wsl.onboarding.installing": "Installation...",
+  "wsl.onboarding.installDistro": "Installer une distribution",
+  "wsl.onboarding.searchDistros": "Rechercher des distributions",
+  "wsl.onboarding.wsl2Required": "WSL 2 est requis.",
+  "wsl.onboarding.toolsRequired": "Cette distribution nécessite bash et curl.",
+  "wsl.onboarding.openTerminal": "Ouvrir le terminal",
+  "wsl.onboarding.path": "Chemin : {{path}}",
+  "wsl.onboarding.notFound": "introuvable",
+  "wsl.onboarding.version": "Version : {{version}}",
+  "wsl.onboarding.unknown": "inconnue",
+  "wsl.onboarding.desktopVersion": "desktop {{version}}",
+  "wsl.onboarding.versionMismatch": "La version installée ne correspond pas à celle de l'application desktop.",
+  "wsl.onboarding.adding": "Ajout...",
   "dialog.project.edit.title": "Modifier le projet",
   "dialog.project.edit.name": "Nom",
   "dialog.project.edit.icon": "Icône",
@@ -373,6 +454,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
   "toast.language.title": "Langue",
@@ -410,10 +492,12 @@ export const dict = {
   "toast.update.action.notYet": "Pas encore",
   "error.page.title": "Quelque chose s'est mal passé",
   "error.page.description": "Une erreur s'est produite lors du chargement de l'application.",
+  "error.page.description.localServerStartup": "Une erreur s'est produite lors du démarrage du serveur local.",
   "error.page.details.label": "Détails de l'erreur",
   "error.page.action.restart": "Redémarrer",
   "error.page.action.report": "Signaler l'erreur",
   "error.page.action.reported": "Erreur signalée",
+  "error.page.action.exportLogs": "Exporter les journaux",
   "error.page.action.checking": "Vérification...",
   "error.page.action.checkUpdates": "Vérifier les mises à jour",
   "error.page.action.updateTo": "Mettre à jour vers {{version}}",
@@ -458,16 +542,38 @@ export const dict = {
   "home.recentProjects": "Projets récents",
   "home.empty.title": "Aucun projet récent",
   "home.empty.description": "Commencez par ouvrir un projet local",
+  "home.title": "Accueil",
+  "home.projects": "Projets",
+  "home.project.add": "Ajouter un projet",
+  "home.recentlyClosed": "Récemment fermés",
+  "home.server.collapse": "Réduire les projets du serveur",
+  "home.server.expand": "Développer les projets du serveur",
+  "home.sessions.search.placeholder": "Rechercher des sessions",
+  "home.sessions.search.placeholder.scoped": "Rechercher les sessions dans {{scope}}",
+  "home.sessions.search.sessions": "Sessions",
+  "home.sessions.search.noResults": "Aucune session trouvée pour {{query}}",
+  "home.sessions.empty": "Rien ici pour l'instant",
+  "home.sessions.empty.description": "Créez une session pour commencer",
+  "home.sessions.group.today": "Aujourd'hui",
+  "home.sessions.group.yesterday": "Hier",
+  "home.sessions.group.older": "Plus anciennes",
   "session.tab.session": "Session",
   "session.tab.review": "Revue",
   "session.tab.context": "Contexte",
+  "session.tab.unknown": "Session inconnue",
   "session.panel.reviewAndFiles": "Revue et fichiers",
+  "session.error.notFound": "Cette session est introuvable",
+  "session.error.notFound.description": "Cet onglet pointe vers une session qui n'existe plus sur ce serveur.",
+  "session.error.notFound.closeTab": "Fermer l'onglet",
+  "session.error.serverConnection": "Impossible de se connecter à ce serveur",
   "session.review.filesChanged": "{{count}} fichiers modifiés",
   "session.review.change.one": "Modification",
   "session.review.change.other": "Modifications",
   "session.review.loadingChanges": "Chargement des modifications...",
   "session.review.empty": "Aucune modification dans cette session pour l'instant",
   "session.review.noChanges": "Aucune modification",
+  "session.review.noUncommittedChanges": "Aucune modification non validée pour l'instant",
+  "session.review.noBranchChanges": "Aucune modification de branche pour l'instant",
   "session.review.noVcs": "Aucun système de contrôle de version Git détecté, modifications non affichées",
   "session.review.noSnapshot":
     "Le suivi des instantanés est désactivé dans la configuration, les modifications de session sont donc indisponibles",
@@ -484,6 +590,10 @@ export const dict = {
   "session.todo.title": "Tâches",
   "session.todo.collapse": "Réduire",
   "session.todo.expand": "Développer",
+  "session.question.minimize": "Réduire la question",
+  "session.question.restore": "Restaurer la question",
+  "session.question.pending.one": "{{count}} question en attente",
+  "session.question.pending.other": "{{count}} questions en attente",
   "session.followupDock.summary.one": "{{count}} message en file d'attente",
   "session.followupDock.summary.other": "{{count}} messages en file d'attente",
   "session.followupDock.sendNow": "Envoyer maintenant",
@@ -496,9 +606,16 @@ export const dict = {
   "session.revertDock.expand": "Développer les messages annulés",
   "session.revertDock.restore": "Restaurer le message",
   "session.new.title": "Créez ce que vous voulez",
+  "session.new.project.new": "Nouveau projet",
+  "session.new.project.search": "Rechercher des projets",
+  "session.new.project.add": "Ajouter un projet",
   "session.new.worktree.main": "Branche principale",
   "session.new.worktree.mainWithBranch": "Branche principale ({{branch}})",
   "session.new.worktree.create": "Créer un nouvel arbre de travail",
+  "session.new.workspace.runIn": "Exécuter la session dans",
+  "session.new.workspace.triggerLocal": "Local",
+  "session.new.workspace.local": "Dépôt local",
+  "session.new.workspace.existing": "Espace de travail…",
   "session.new.lastModified": "Dernière modification",
   "session.header.search.placeholder": "Rechercher {{project}}",
   "session.header.searchFiles": "Rechercher des fichiers",
@@ -564,6 +681,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Sessions récentes",
   "sidebar.project.viewAllSessions": "Voir toutes les sessions",
   "sidebar.project.clearNotifications": "Effacer les notifications",
+  "sidebar.empty.title": "Aucun projet ouvert",
+  "sidebar.empty.description": "Ouvrez un projet pour commencer",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Bureau",
   "settings.section.server": "Serveur",
@@ -573,6 +692,7 @@ export const dict = {
   "settings.desktop.wsl.title": "Intégration WSL",
   "settings.desktop.wsl.description": "Exécuter le serveur OpenCode dans WSL sur Windows.",
   "settings.general.section.appearance": "Apparence",
+  "settings.general.section.advanced": "Avancé",
   "settings.general.section.notifications": "Notifications système",
   "settings.general.section.updates": "Mises à jour",
   "settings.general.section.sounds": "Effets sonores",
@@ -580,6 +700,11 @@ export const dict = {
   "settings.general.section.display": "Affichage",
   "settings.general.row.language.title": "Langue",
   "settings.general.row.language.description": "Changer la langue d'affichage pour OpenCode",
+  "settings.general.row.shell.title": "Shell du terminal",
+  "settings.general.row.shell.description":
+    "Choisissez le shell utilisé par votre terminal. Les shells compatibles sont également utilisés pour les appels d'outils de l'agent.",
+  "settings.general.row.shell.autoDefault": "Auto (par défaut)",
+  "settings.general.row.shell.terminalOnly": "terminal uniquement",
   "settings.general.row.appearance.title": "Apparence",
   "settings.general.row.appearance.description": "Personnaliser l'apparence d'OpenCode sur votre appareil",
   "settings.general.row.colorScheme.title": "Schéma de couleurs",
@@ -588,8 +713,8 @@ export const dict = {
   "settings.general.row.theme.description": "Personnaliser le thème d'OpenCode.",
   "settings.general.row.font.title": "Police de code",
   "settings.general.row.font.description": "Personnaliser la police utilisée dans les blocs de code",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Police du terminal",
+  "settings.general.row.terminalFont.description": "Personnalisez la police utilisée dans le terminal",
   "settings.general.row.uiFont.title": "Police de l'interface",
   "settings.general.row.uiFont.description": "Personnaliser la police utilisée dans toute l'interface",
   "settings.general.row.followup.title": "Comportement de suivi",
@@ -597,6 +722,24 @@ export const dict = {
     "Choisissez si les messages de suivi dirigent immédiatement ou attendent dans une file d'attente",
   "settings.general.row.followup.option.queue": "File d'attente",
   "settings.general.row.followup.option.steer": "Diriger",
+  "settings.general.row.showFileTree.title": "Arborescence des fichiers",
+  "settings.general.row.showFileTree.description": "Afficher le panneau d'arborescence des fichiers dans les sessions",
+  "settings.general.row.showNavigation.title": "Commandes de navigation",
+  "settings.general.row.showNavigation.description":
+    "Afficher les boutons précédent et suivant dans la barre de titre de l'application desktop",
+  "settings.general.row.showSearch.title": "Palette de commandes",
+  "settings.general.row.showSearch.description":
+    "Afficher le bouton de recherche et de palette de commandes dans la barre de titre",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description":
+    "Afficher le bouton du terminal dans la barre de titre de l'application desktop",
+  "settings.general.row.showStatus.title": "État du serveur",
+  "settings.general.row.showStatus.description": "Afficher le bouton d'état du serveur dans la barre de titre",
+  "settings.general.row.mobileTitlebarBottom.title": "Navigation en bas",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Placer la barre de titre et les onglets de session en bas de l'écran sur mobile",
+  "settings.general.row.showCustomAgents.title": "Agents personnalisés",
+  "settings.general.row.showCustomAgents.description": "Afficher le sélecteur d'agent dans la zone de saisie",
   "settings.general.row.reasoningSummaries.title": "Afficher les résumés de raisonnement",
   "settings.general.row.reasoningSummaries.description":
     "Afficher les résumés de raisonnement du modèle dans la chronologie",
@@ -606,6 +749,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Développer les parties de l'outil edit",
   "settings.general.row.editToolPartsExpanded.description":
     "Afficher les parties des outils edit, write et patch développées par défaut dans la chronologie",
+  "settings.general.row.newLayoutDesigns.title": "Nouvelle mise en page et nouveaux designs",
+  "settings.general.row.newLayoutDesigns.description":
+    "Activer la nouvelle mise en page et les nouvelles interfaces d'accueil, de saisie et de session",
+  "settings.general.row.pinchZoom.title": "Pincer pour zoomer",
+  "settings.general.row.pinchZoom.description":
+    "Autoriser les gestes de pincement du pavé tactile et Ctrl-défilement pour zoomer",
   "settings.general.row.wayland.title": "Utiliser Wayland natif",
   "settings.general.row.wayland.description": "Désactiver le repli X11 sur Wayland. Nécessite un redémarrage.",
   "settings.general.row.wayland.tooltip":
@@ -618,6 +767,8 @@ export const dict = {
   "settings.updates.row.check.description": "Vérifier manuellement les mises à jour et installer si disponible",
   "settings.updates.action.checkNow": "Vérifier maintenant",
   "settings.updates.action.checking": "Vérification...",
+  "settings.updates.action.downloading": "Téléchargement...",
+  "settings.updates.action.installing": "Installation...",
   "settings.updates.toast.latest.title": "Vous êtes à jour",
   "settings.updates.toast.latest.description": "Vous utilisez la dernière version d'OpenCode.",
   "sound.option.none": "Aucun",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index ad5dcf5387ae..24d1a29e8a28 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -21,6 +21,9 @@ export const dict = {
   "theme.scheme.dark": "ダーク",
   "command.sidebar.toggle": "サイドバーの切り替え",
   "command.project.open": "プロジェクトを開く",
+  "command.project.previous": "前のプロジェクト",
+  "command.project.next": "次のプロジェクト",
+  "command.project.index": "プロジェクト{{index}}に切り替え",
   "command.provider.connect": "プロバイダーに接続",
   "command.server.switch": "サーバーの切り替え",
   "command.settings.open": "設定を開く",
@@ -39,6 +42,7 @@ export const dict = {
   "command.session.new": "新しいセッション",
   "command.file.open": "ファイルを開く",
   "command.tab.close": "タブを閉じる",
+  "command.tab.reopenClosed": "閉じたタブを再度開く",
   "command.context.addSelection": "選択範囲をコンテキストに追加",
   "command.context.addSelection.description": "現在のファイルから選択した行を追加",
   "command.input.focus": "入力欄にフォーカス",
@@ -149,7 +153,7 @@ export const dict = {
   "provider.custom.field.providerID.placeholder": "myprovider",
   "provider.custom.field.providerID.description": "小文字、数字、ハイフン、アンダースコア",
   "provider.custom.field.name.label": "表示名",
-  "provider.custom.field.name.placeholder": "My AI Provider",
+  "provider.custom.field.name.placeholder": "マイAIプロバイダー",
   "provider.custom.field.baseURL.label": "ベースURL",
   "provider.custom.field.baseURL.placeholder": "https://api.myprovider.com/v1",
   "provider.custom.field.apiKey.label": "APIキー",
@@ -192,6 +196,11 @@ export const dict = {
   "model.input.video": "動画",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "対応: {{inputs}}",
+  "model.tooltip.context.label": "コンテキスト",
+  "model.tooltip.inputs": "入力",
+  "model.tooltip.model": "モデル",
+  "model.tooltip.provider": "プロバイダー",
+  "model.tooltip.reasoning": "推論",
   "model.tooltip.reasoning.allowed": "推論を許可",
   "model.tooltip.reasoning.none": "推論なし",
   "model.tooltip.context": "コンテキスト上限 {{limit}}",
@@ -201,6 +210,7 @@ export const dict = {
   "common.loading": "読み込み中",
   "common.loading.ellipsis": "...",
   "common.cancel": "キャンセル",
+  "common.clear": "クリア",
   "common.connect": "接続",
   "common.disconnect": "切断",
   "common.continue": "送信",
@@ -217,6 +227,8 @@ export const dict = {
   "prompt.mode.shell": "シェル",
   "prompt.mode.normal": "プロンプト",
   "prompt.mode.shell.exit": "escで終了",
+  "session.child.promptDisabled": "サブエージェントのセッションにはプロンプトを送信できません。",
+  "session.child.backToParent": "メインセッションに戻る。",
   "prompt.example.1": "コードベースのTODOを修正",
   "prompt.example.2": "このプロジェクトの技術スタックは何ですか？",
   "prompt.example.3": "壊れたテストを修正",
@@ -313,6 +325,75 @@ export const dict = {
   "dialog.server.menu.delete": "削除",
   "dialog.server.current": "現在のサーバー",
   "dialog.server.status.default": "デフォルト",
+  "wsl.server.add": "WSLサーバーを追加",
+  "wsl.server.addShort": "WSLを追加",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSLサーバー",
+  "wsl.server.retryStart": "起動を再試行",
+  "wsl.server.updating": "更新中...",
+  "wsl.onboarding.step.distro": "ディストリビューションを選択",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "WSLを確認中...",
+  "wsl.onboarding.restartRequired": "WSLのインストールを完了するにはWindowsの再起動が必要です。",
+  "wsl.onboarding.ready": "WSLの準備ができました。",
+  "wsl.onboarding.required": "続行するにはWSLが必要です。",
+  "wsl.onboarding.checkingDistros": "ディストリビューションを確認中...",
+  "wsl.onboarding.installingDistro": "{{distro}}をインストール中...",
+  "wsl.onboarding.checkingDistro": "{{distro}}を確認中...",
+  "wsl.onboarding.listingDistros": "ディストリビューションの一覧を取得中...",
+  "wsl.onboarding.distroReady": "{{distro}}の準備ができました。",
+  "wsl.onboarding.distroNotInstalled": "{{distro}}はまだインストールされていません。",
+  "wsl.onboarding.openDistroOnce": "セットアップを完了するには、{{distro}}を一度開いてください。",
+  "wsl.onboarding.finishingDistro": "{{distro}}のセットアップを完了しています。",
+  "wsl.onboarding.pickDistro": "ディストリビューションを選択するか、以下からインストールしてください。",
+  "wsl.onboarding.checkingOpencode": "OpenCodeを確認中...",
+  "wsl.onboarding.checkingOpencodeIn": "{{distro}}内のOpenCodeを確認中...",
+  "wsl.onboarding.updatingOpencode": "OpenCodeを更新中...",
+  "wsl.onboarding.updatingOpencodeIn": "{{distro}}内のOpenCodeを更新中...",
+  "wsl.onboarding.updateOpencodeIn": "{{distro}}内のOpenCodeを更新してください。",
+  "wsl.onboarding.updateOpencode": "OpenCodeを更新",
+  "wsl.onboarding.opencodeReadyIn": "{{distro}}内のOpenCodeの準備ができました。",
+  "wsl.onboarding.opencodeReady": "OpenCodeの準備ができました。",
+  "wsl.onboarding.installOpencodeIn": "{{distro}}にOpenCodeをインストールしてください。",
+  "wsl.onboarding.installOpencode": "OpenCodeをインストール",
+  "wsl.onboarding.chooseDistroFirst": "先にディストリビューションを選択してください。",
+  "wsl.onboarding.loadFailed": "WSLの状態を読み込めませんでした。",
+  "wsl.onboarding.loading": "読み込み中...",
+  "wsl.onboarding.installedDistros": "インストール済みのディストリビューション",
+  "wsl.onboarding.checkAgain": "再確認",
+  "wsl.onboarding.distroStatus.ready": "準備完了",
+  "wsl.onboarding.distroStatus.checking": "確認中...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCodeがインストールされていません",
+  "wsl.onboarding.distroStatus.missingTools": "bash、curlがありません",
+  "wsl.onboarding.distroStatus.unsupported": "非対応 · WSL 2を使用してください",
+  "wsl.onboarding.needAnotherDistro": "別のディストリビューションが必要ですか？",
+  "wsl.onboarding.needAnotherDistroHint": "WSLカタログからLinuxディストリビューションをインストール",
+  "wsl.onboarding.wslNotInstalled.title": "WSLがインストールされていません",
+  "wsl.onboarding.wslNotInstalled.description":
+    "OpenCodeでWSLサーバーを追加するには、WSL (Windows Subsystem for Linux) が必要です",
+  "wsl.onboarding.wslUnavailable.title": "WSLを利用できません",
+  "wsl.onboarding.wslUnavailable.description": "このマシンのWSLを確認できませんでした。",
+  "wsl.onboarding.installWsl": "WSLをインストール",
+  "wsl.onboarding.windowsRestartRequired":
+    "WSLのインストールを完了するにはWindowsを再起動し、OpenCodeをもう一度開いてください。",
+  "wsl.onboarding.next": "次へ",
+  "wsl.onboarding.refresh": "更新",
+  "wsl.onboarding.allDistrosAdded": "インストール済みのディストリビューションはすべて追加済みです。",
+  "wsl.onboarding.noDistros": "ディストリビューションはまだ検出されていません。",
+  "wsl.onboarding.install": "インストール",
+  "wsl.onboarding.installing": "インストール中...",
+  "wsl.onboarding.installDistro": "ディストリビューションをインストール",
+  "wsl.onboarding.searchDistros": "ディストリビューションを検索",
+  "wsl.onboarding.wsl2Required": "WSL 2が必要です。",
+  "wsl.onboarding.toolsRequired": "このディストリビューションにはbashとcurlが必要です。",
+  "wsl.onboarding.openTerminal": "ターミナルを開く",
+  "wsl.onboarding.path": "パス: {{path}}",
+  "wsl.onboarding.notFound": "見つかりません",
+  "wsl.onboarding.version": "バージョン: {{version}}",
+  "wsl.onboarding.unknown": "不明",
+  "wsl.onboarding.desktopVersion": "デスクトップ {{version}}",
+  "wsl.onboarding.versionMismatch": "インストールされているバージョンがデスクトップアプリのバージョンと一致しません。",
+  "wsl.onboarding.adding": "追加中...",
   "dialog.project.edit.title": "プロジェクトを編集",
   "dialog.project.edit.name": "名前",
   "dialog.project.edit.icon": "アイコン",
@@ -370,6 +451,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
   "toast.language.title": "言語",
@@ -406,10 +488,12 @@ export const dict = {
   "toast.update.action.notYet": "今はしない",
   "error.page.title": "問題が発生しました",
   "error.page.description": "アプリケーションの読み込み中にエラーが発生しました。",
+  "error.page.description.localServerStartup": "ローカルサーバーの起動中にエラーが発生しました。",
   "error.page.details.label": "エラー詳細",
   "error.page.action.restart": "再起動",
   "error.page.action.report": "エラーを報告",
   "error.page.action.reported": "エラーを報告しました",
+  "error.page.action.exportLogs": "ログをエクスポート",
   "error.page.action.checking": "確認中...",
   "error.page.action.checkUpdates": "アップデートを確認",
   "error.page.action.updateTo": "{{version}}にアップデート",
@@ -451,10 +535,30 @@ export const dict = {
   "home.recentProjects": "最近のプロジェクト",
   "home.empty.title": "最近のプロジェクトはありません",
   "home.empty.description": "ローカルプロジェクトを開いて始めましょう",
+  "home.title": "ホーム",
+  "home.projects": "プロジェクト",
+  "home.project.add": "プロジェクトを追加",
+  "home.recentlyClosed": "最近閉じたプロジェクト",
+  "home.server.collapse": "サーバーのプロジェクトを折りたたむ",
+  "home.server.expand": "サーバーのプロジェクトを展開",
+  "home.sessions.search.placeholder": "セッションを検索",
+  "home.sessions.search.placeholder.scoped": "{{scope}}のセッションを検索",
+  "home.sessions.search.sessions": "セッション",
+  "home.sessions.search.noResults": "{{query}}に一致するセッションが見つかりません",
+  "home.sessions.empty": "まだ何もありません",
+  "home.sessions.empty.description": "セッションを作成して始めましょう",
+  "home.sessions.group.today": "今日",
+  "home.sessions.group.yesterday": "昨日",
+  "home.sessions.group.older": "それ以前",
   "session.tab.session": "セッション",
   "session.tab.review": "レビュー",
   "session.tab.context": "コンテキスト",
+  "session.tab.unknown": "不明なセッション",
   "session.panel.reviewAndFiles": "レビューとファイル",
+  "session.error.notFound": "このセッションが見つかりません",
+  "session.error.notFound.description": "このタブが参照するセッションは、このサーバーには存在しません。",
+  "session.error.notFound.closeTab": "タブを閉じる",
+  "session.error.serverConnection": "このサーバーに接続できません",
   "session.review.filesChanged": "{{count}} ファイル変更",
   "session.review.change.one": "変更",
   "session.review.change.other": "変更",
@@ -463,6 +567,8 @@ export const dict = {
   "session.review.noVcs": "Gitバージョン管理システムが検出されないため、変更は表示されません",
   "session.review.noSnapshot": "設定でスナップショット追跡が無効になっているため、セッションの変更は利用できません",
   "session.review.noChanges": "変更なし",
+  "session.review.noUncommittedChanges": "コミットされていない変更はまだありません",
+  "session.review.noBranchChanges": "ブランチの変更はまだありません",
   "session.files.selectToOpen": "開くファイルを選択",
   "session.files.all": "すべてのファイル",
   "session.files.empty": "ファイルなし",
@@ -476,6 +582,10 @@ export const dict = {
   "session.todo.title": "ToDo",
   "session.todo.collapse": "折りたたむ",
   "session.todo.expand": "展開",
+  "session.question.minimize": "質問を最小化",
+  "session.question.restore": "質問を復元",
+  "session.question.pending.one": "{{count}}件の保留中の質問",
+  "session.question.pending.other": "{{count}}件の保留中の質問",
   "session.followupDock.summary.one": "{{count}} 件のメッセージが待機中",
   "session.followupDock.summary.other": "{{count}} 件のメッセージが待機中",
   "session.followupDock.sendNow": "今すぐ送信",
@@ -488,9 +598,16 @@ export const dict = {
   "session.revertDock.expand": "ロールバックされたメッセージを展開",
   "session.revertDock.restore": "メッセージを復元",
   "session.new.title": "何でも作る",
+  "session.new.project.new": "新しいプロジェクト",
+  "session.new.project.search": "プロジェクトを検索",
+  "session.new.project.add": "プロジェクトを追加",
   "session.new.worktree.main": "メインブランチ",
   "session.new.worktree.mainWithBranch": "メインブランチ ({{branch}})",
   "session.new.worktree.create": "新しいワークツリーを作成",
+  "session.new.workspace.runIn": "セッションの実行先",
+  "session.new.workspace.triggerLocal": "ローカル",
+  "session.new.workspace.local": "ローカルリポジトリ",
+  "session.new.workspace.existing": "ワークスペース…",
   "session.new.lastModified": "最終更新",
   "session.header.search.placeholder": "{{project}}を検索",
   "session.header.searchFiles": "ファイルを検索",
@@ -554,6 +671,8 @@ export const dict = {
   "sidebar.project.recentSessions": "最近のセッション",
   "sidebar.project.viewAllSessions": "すべてのセッションを表示",
   "sidebar.project.clearNotifications": "通知をクリア",
+  "sidebar.empty.title": "開いているプロジェクトはありません",
+  "sidebar.empty.description": "プロジェクトを開いて始めましょう",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "デスクトップ",
   "settings.section.server": "サーバー",
@@ -563,6 +682,7 @@ export const dict = {
   "settings.desktop.wsl.title": "WSL連携",
   "settings.desktop.wsl.description": "WindowsのWSL環境でOpenCodeサーバーを実行します。",
   "settings.general.section.appearance": "外観",
+  "settings.general.section.advanced": "詳細設定",
   "settings.general.section.notifications": "システム通知",
   "settings.general.section.updates": "アップデート",
   "settings.general.section.sounds": "効果音",
@@ -570,6 +690,11 @@ export const dict = {
   "settings.general.section.display": "ディスプレイ",
   "settings.general.row.language.title": "言語",
   "settings.general.row.language.description": "OpenCodeの表示言語を変更します",
+  "settings.general.row.shell.title": "ターミナルシェル",
+  "settings.general.row.shell.description":
+    "ターミナルで使用するシェルを選択します。互換性のあるシェルはエージェントのツール呼び出しにも使用されます。",
+  "settings.general.row.shell.autoDefault": "自動 (デフォルト)",
+  "settings.general.row.shell.terminalOnly": "ターミナルのみ",
   "settings.general.row.appearance.title": "外観",
   "settings.general.row.appearance.description": "デバイスでのOpenCodeの表示をカスタマイズします",
   "settings.general.row.colorScheme.title": "配色",
@@ -578,8 +703,8 @@ export const dict = {
   "settings.general.row.theme.description": "OpenCodeのテーマをカスタマイズします。",
   "settings.general.row.font.title": "コードフォント",
   "settings.general.row.font.description": "コードブロックで使用するフォントをカスタマイズします",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "ターミナルのフォント",
+  "settings.general.row.terminalFont.description": "ターミナルで使用するフォントをカスタマイズ",
   "settings.general.row.uiFont.title": "UIフォント",
   "settings.general.row.uiFont.description": "インターフェース全体で使用するフォントをカスタマイズします",
   "settings.general.row.followup.title": "フォローアップの動作",
@@ -587,6 +712,21 @@ export const dict = {
     "フォローアッププロンプトを即座に実行するか、キューで待機させるかを選択します",
   "settings.general.row.followup.option.queue": "キューに追加",
   "settings.general.row.followup.option.steer": "即座に実行 (Steer)",
+  "settings.general.row.showFileTree.title": "ファイルツリー",
+  "settings.general.row.showFileTree.description": "セッションにファイルツリーパネルを表示します",
+  "settings.general.row.showNavigation.title": "ナビゲーションコントロール",
+  "settings.general.row.showNavigation.description": "デスクトップのタイトルバーに戻るボタンと進むボタンを表示します",
+  "settings.general.row.showSearch.title": "コマンドパレット",
+  "settings.general.row.showSearch.description": "タイトルバーに検索とコマンドパレットのボタンを表示します",
+  "settings.general.row.showTerminal.title": "ターミナル",
+  "settings.general.row.showTerminal.description": "デスクトップのタイトルバーにターミナルボタンを表示します",
+  "settings.general.row.showStatus.title": "サーバーステータス",
+  "settings.general.row.showStatus.description": "タイトルバーにサーバーステータスボタンを表示します",
+  "settings.general.row.mobileTitlebarBottom.title": "下部ナビゲーション",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "モバイルではタイトルバーとセッションタブを画面下部に配置します",
+  "settings.general.row.showCustomAgents.title": "カスタムエージェント",
+  "settings.general.row.showCustomAgents.description": "コンポーザーにエージェント選択を表示します",
   "settings.general.row.reasoningSummaries.title": "推論の要約を表示",
   "settings.general.row.reasoningSummaries.description": "タイムラインにモデルの推論の要約を表示します",
   "settings.general.row.shellToolPartsExpanded.title": "shell ツールパーツを展開",
@@ -595,6 +735,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "edit ツールパーツを展開",
   "settings.general.row.editToolPartsExpanded.description":
     "タイムラインで edit、write、patch ツールパーツをデフォルトで展開して表示します",
+  "settings.general.row.newLayoutDesigns.title": "新しいレイアウトとデザイン",
+  "settings.general.row.newLayoutDesigns.description":
+    "刷新されたレイアウト、ホーム、コンポーザー、セッションUIを有効にします",
+  "settings.general.row.pinchZoom.title": "ピンチでズーム",
+  "settings.general.row.pinchZoom.description":
+    "トラックパッドのピンチ操作とCtrl+スクロール操作によるズームを許可します",
   "settings.general.row.wayland.title": "ネイティブWaylandを使用",
   "settings.general.row.wayland.description": "WaylandでのX11フォールバックを無効にします。再起動が必要です。",
   "settings.general.row.wayland.tooltip":
@@ -607,6 +753,8 @@ export const dict = {
   "settings.updates.row.check.description": "手動でアップデートを確認し、利用可能ならインストールします",
   "settings.updates.action.checkNow": "今すぐ確認",
   "settings.updates.action.checking": "確認中...",
+  "settings.updates.action.downloading": "ダウンロード中...",
+  "settings.updates.action.installing": "インストール中...",
   "settings.updates.toast.latest.title": "最新です",
   "settings.updates.toast.latest.description": "OpenCode は最新バージョンです。",
   "sound.option.none": "なし",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index 15f1f28013ef..cf789f5644b3 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -575,8 +575,8 @@ export const dict = {
   "settings.general.row.theme.description": "OpenCode 테마 사용자 지정",
   "settings.general.row.font.title": "코드 글꼴",
   "settings.general.row.font.description": "코드 블록에 사용되는 글꼴을 사용자 지정",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "터미널 글꼴",
+  "settings.general.row.terminalFont.description": "터미널에서 사용할 글꼴을 설정합니다",
   "settings.general.row.uiFont.title": "UI 글꼴",
   "settings.general.row.uiFont.description": "인터페이스 전반에 사용되는 글꼴을 사용자 지정",
   "settings.general.row.followup.title": "후속 조치 동작",
@@ -848,4 +848,155 @@ export const dict = {
   "error.childStore.persistedProjectIconCreateFailed": "영구 프로젝트 아이콘 생성 실패",
   "error.childStore.storeCreateFailed": "저장소 생성 실패",
   "terminal.connectionLost.abnormalClose": "WebSocket이 비정상적으로 닫힘: {{code}}",
+
+  "command.project.previous": "이전 프로젝트",
+  "command.project.next": "다음 프로젝트",
+  "command.project.index": "{{index}}번 프로젝트로 전환",
+  "command.tab.reopenClosed": "닫은 탭 다시 열기",
+  "model.tooltip.context.label": "컨텍스트",
+  "model.tooltip.inputs": "입력",
+  "model.tooltip.model": "모델",
+  "model.tooltip.provider": "공급자",
+  "model.tooltip.reasoning": "추론",
+  "common.clear": "지우기",
+  "session.child.promptDisabled": "하위 에이전트 세션에는 프롬프트를 입력할 수 없습니다.",
+  "session.child.backToParent": "메인 세션으로 돌아가기.",
+
+  "wsl.server.add": "WSL 서버 추가",
+  "wsl.server.addShort": "WSL 추가",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL 서버",
+  "wsl.server.retryStart": "시작 재시도",
+  "wsl.server.updating": "업데이트 중...",
+  "wsl.onboarding.step.distro": "배포판 선택",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "WSL 확인 중...",
+  "wsl.onboarding.restartRequired": "WSL 설치를 완료하려면 Windows를 다시 시작해야 합니다.",
+  "wsl.onboarding.ready": "WSL이 준비되었습니다.",
+  "wsl.onboarding.required": "계속하려면 WSL이 필요합니다.",
+  "wsl.onboarding.checkingDistros": "배포판 확인 중...",
+  "wsl.onboarding.installingDistro": "{{distro}} 배포판 설치 중...",
+  "wsl.onboarding.checkingDistro": "{{distro}} 배포판 확인 중...",
+  "wsl.onboarding.listingDistros": "배포판 목록 확인 중...",
+  "wsl.onboarding.distroReady": "{{distro}} 배포판이 준비되었습니다.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} 배포판이 아직 설치되지 않았습니다.",
+  "wsl.onboarding.openDistroOnce": "설정을 완료하려면 {{distro}} 배포판을 한 번 여세요.",
+  "wsl.onboarding.finishingDistro": "{{distro}} 배포판 설정을 마무리하는 중입니다.",
+  "wsl.onboarding.pickDistro": "배포판을 선택하거나 아래에서 설치하세요.",
+  "wsl.onboarding.checkingOpencode": "OpenCode 확인 중...",
+  "wsl.onboarding.checkingOpencodeIn": "{{distro}}에서 OpenCode 확인 중...",
+  "wsl.onboarding.updatingOpencode": "OpenCode 업데이트 중...",
+  "wsl.onboarding.updatingOpencodeIn": "{{distro}}에서 OpenCode 업데이트 중...",
+  "wsl.onboarding.updateOpencodeIn": "{{distro}}에서 OpenCode를 업데이트하세요.",
+  "wsl.onboarding.updateOpencode": "OpenCode 업데이트",
+  "wsl.onboarding.opencodeReadyIn": "{{distro}}에서 OpenCode를 사용할 준비가 되었습니다.",
+  "wsl.onboarding.opencodeReady": "OpenCode가 준비되었습니다.",
+  "wsl.onboarding.installOpencodeIn": "{{distro}}에 OpenCode를 설치하세요.",
+  "wsl.onboarding.installOpencode": "OpenCode 설치",
+  "wsl.onboarding.chooseDistroFirst": "먼저 배포판을 선택하세요.",
+  "wsl.onboarding.loadFailed": "WSL 상태를 불러오지 못했습니다.",
+  "wsl.onboarding.loading": "로딩 중...",
+  "wsl.onboarding.installedDistros": "설치된 배포판",
+  "wsl.onboarding.checkAgain": "다시 확인",
+  "wsl.onboarding.distroStatus.ready": "준비됨",
+  "wsl.onboarding.distroStatus.checking": "확인 중...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode가 설치되지 않음",
+  "wsl.onboarding.distroStatus.missingTools": "bash, curl 없음",
+  "wsl.onboarding.distroStatus.unsupported": "지원되지 않음 · WSL 2 사용",
+  "wsl.onboarding.needAnotherDistro": "다른 배포판이 필요하신가요?",
+  "wsl.onboarding.needAnotherDistroHint": "WSL 카탈로그에서 Linux 배포판을 설치하세요",
+  "wsl.onboarding.wslNotInstalled.title": "WSL이 설치되지 않음",
+  "wsl.onboarding.wslNotInstalled.description":
+    "OpenCode에서 WSL 서버를 추가하려면 WSL (Windows Subsystem for Linux)이 필요합니다",
+  "wsl.onboarding.wslUnavailable.title": "WSL을 사용할 수 없음",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode에서 이 컴퓨터의 WSL을 확인할 수 없습니다.",
+  "wsl.onboarding.installWsl": "WSL 설치",
+  "wsl.onboarding.windowsRestartRequired": "WSL 설치를 완료하려면 Windows를 다시 시작한 다음 OpenCode를 다시 여세요.",
+  "wsl.onboarding.next": "다음",
+  "wsl.onboarding.refresh": "새로 고침",
+  "wsl.onboarding.allDistrosAdded": "설치된 모든 배포판이 이미 추가되었습니다.",
+  "wsl.onboarding.noDistros": "아직 감지된 배포판이 없습니다.",
+  "wsl.onboarding.install": "설치",
+  "wsl.onboarding.installing": "설치 중...",
+  "wsl.onboarding.installDistro": "배포판 설치",
+  "wsl.onboarding.searchDistros": "배포판 검색",
+  "wsl.onboarding.wsl2Required": "WSL 2가 필요합니다.",
+  "wsl.onboarding.toolsRequired": "이 배포판에는 bash와 curl이 필요합니다.",
+  "wsl.onboarding.openTerminal": "터미널 열기",
+  "wsl.onboarding.path": "경로: {{path}}",
+  "wsl.onboarding.notFound": "찾을 수 없음",
+  "wsl.onboarding.version": "버전: {{version}}",
+  "wsl.onboarding.unknown": "알 수 없음",
+  "wsl.onboarding.desktopVersion": "데스크톱 {{version}}",
+  "wsl.onboarding.versionMismatch": "설치된 버전이 데스크톱 앱 버전과 일치하지 않습니다.",
+  "wsl.onboarding.adding": "추가 중...",
+
+  "language.uk": "Українська",
+  "error.page.description.localServerStartup": "로컬 서버를 시작하는 동안 오류가 발생했습니다.",
+  "error.page.action.exportLogs": "로그 내보내기",
+
+  "home.title": "홈",
+  "home.projects": "프로젝트",
+  "home.project.add": "프로젝트 추가",
+  "home.recentlyClosed": "최근에 닫은 항목",
+  "home.server.collapse": "서버 프로젝트 접기",
+  "home.server.expand": "서버 프로젝트 펼치기",
+  "home.sessions.search.placeholder": "세션 검색",
+  "home.sessions.search.placeholder.scoped": "{{scope}}에서 세션 검색",
+  "home.sessions.search.sessions": "세션",
+  "home.sessions.search.noResults": "{{query}}에 해당하는 세션을 찾을 수 없습니다",
+  "home.sessions.empty": "아직 아무것도 없습니다",
+  "home.sessions.empty.description": "세션을 생성하여 시작하세요",
+  "home.sessions.group.today": "오늘",
+  "home.sessions.group.yesterday": "어제",
+  "home.sessions.group.older": "이전",
+
+  "session.tab.unknown": "알 수 없는 세션",
+  "session.error.notFound": "이 세션을 찾을 수 없습니다",
+  "session.error.notFound.description": "이 탭은 이 서버에 더 이상 존재하지 않는 세션을 가리킵니다.",
+  "session.error.notFound.closeTab": "탭 닫기",
+  "session.error.serverConnection": "이 서버에 연결할 수 없습니다",
+  "session.review.noUncommittedChanges": "아직 커밋되지 않은 변경 사항이 없습니다",
+  "session.review.noBranchChanges": "아직 브랜치 변경 사항이 없습니다",
+  "session.question.minimize": "질문 최소화",
+  "session.question.restore": "질문 복원",
+  "session.question.pending.one": "{{count}}개의 대기 중인 질문",
+  "session.question.pending.other": "{{count}}개의 대기 중인 질문",
+  "session.new.project.new": "새 프로젝트",
+  "session.new.project.search": "프로젝트 검색",
+  "session.new.project.add": "프로젝트 추가",
+  "session.new.workspace.runIn": "세션 실행 위치",
+  "session.new.workspace.triggerLocal": "로컬",
+  "session.new.workspace.local": "로컬 저장소",
+  "session.new.workspace.existing": "작업 공간…",
+
+  "sidebar.empty.title": "열린 프로젝트 없음",
+  "sidebar.empty.description": "프로젝트를 열어 시작하세요",
+
+  "settings.general.section.advanced": "고급",
+  "settings.general.row.shell.title": "터미널 셸",
+  "settings.general.row.shell.description":
+    "터미널에서 사용할 셸을 선택하세요. 호환되는 셸은 에이전트 도구 호출에도 사용됩니다.",
+  "settings.general.row.shell.autoDefault": "자동 (기본값)",
+  "settings.general.row.shell.terminalOnly": "터미널 전용",
+  "settings.general.row.showFileTree.title": "파일 트리",
+  "settings.general.row.showFileTree.description": "세션에 파일 트리 패널 표시",
+  "settings.general.row.showNavigation.title": "탐색 컨트롤",
+  "settings.general.row.showNavigation.description": "데스크톱 제목 표시줄에 뒤로 및 앞으로 버튼 표시",
+  "settings.general.row.showSearch.title": "명령 팔레트",
+  "settings.general.row.showSearch.description": "제목 표시줄에 검색 및 명령 팔레트 버튼 표시",
+  "settings.general.row.showTerminal.title": "터미널",
+  "settings.general.row.showTerminal.description": "데스크톱 제목 표시줄에 터미널 버튼 표시",
+  "settings.general.row.showStatus.title": "서버 상태",
+  "settings.general.row.showStatus.description": "제목 표시줄에 서버 상태 버튼 표시",
+  "settings.general.row.mobileTitlebarBottom.title": "하단 탐색",
+  "settings.general.row.mobileTitlebarBottom.description": "모바일에서 제목 표시줄과 세션 탭을 화면 하단에 배치",
+  "settings.general.row.showCustomAgents.title": "사용자 지정 에이전트",
+  "settings.general.row.showCustomAgents.description": "입력창에 에이전트 선택기 표시",
+  "settings.general.row.newLayoutDesigns.title": "새 레이아웃 및 디자인",
+  "settings.general.row.newLayoutDesigns.description": "새롭게 디자인된 레이아웃, 홈, 입력창 및 세션 UI 활성화",
+  "settings.general.row.pinchZoom.title": "핀치 줌",
+  "settings.general.row.pinchZoom.description": "트랙패드 핀치 및 Ctrl-스크롤 제스처로 확대/축소 허용",
+  "settings.updates.action.downloading": "다운로드 중...",
+  "settings.updates.action.installing": "설치 중...",
 }
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index 8ec11de192ab..f3faa313829f 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -77,7 +77,7 @@ export const dict = {
   "command.permissions.autoaccept.enable": "Aksepter tillatelser automatisk",
   "command.permissions.autoaccept.disable": "Stopp automatisk akseptering av tillatelser",
   "command.workspace.toggle": "Veksle arbeidsområder",
-  "command.workspace.toggle.description": "Enable or disable multiple workspaces in the sidebar",
+  "command.workspace.toggle.description": "Aktiver eller deaktiver flere arbeidsområder i sidefeltet",
   "command.session.undo": "Angre",
   "command.session.undo.description": "Angre siste melding",
   "command.session.redo": "Gjør om",
@@ -469,7 +469,7 @@ export const dict = {
     "Rotelement ikke funnet. Glemte du å legge det til i index.html? Eller kanskje id-attributten er feilstavet?",
 
   "error.serverSync.connectFailed": "Kunne ikke koble til server. Kjører det en server på `{{url}}`?",
-  "directory.error.invalidUrl": "Invalid directory in URL.",
+  "directory.error.invalidUrl": "Ugyldig mappe i URL-en.",
 
   "error.chain.unknown": "Ukjent feil",
   "error.chain.causedBy": "Forårsaket av:",
@@ -649,8 +649,8 @@ export const dict = {
   "settings.general.row.theme.description": "Tilpass hvordan OpenCode er tematisert.",
   "settings.general.row.font.title": "Kodefont",
   "settings.general.row.font.description": "Tilpass skrifttypen som brukes i kodeblokker",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Terminalskrift",
+  "settings.general.row.terminalFont.description": "Tilpass skrifttypen som brukes i terminalen",
   "settings.general.row.uiFont.title": "UI-skrift",
   "settings.general.row.uiFont.description": "Tilpass skrifttypen som brukes i hele grensesnittet",
   "settings.general.row.followup.title": "Oppfølgingsadferd",
@@ -936,4 +936,163 @@ export const dict = {
   "error.childStore.persistedProjectIconCreateFailed": "Kunne ikke opprette vedvarende prosjektikon",
   "error.childStore.storeCreateFailed": "Kunne ikke opprette lager",
   "terminal.connectionLost.abnormalClose": "WebSocket lukket unormalt: {{code}}",
+
+  "command.project.previous": "Forrige prosjekt",
+  "command.project.next": "Neste prosjekt",
+  "command.project.index": "Bytt til prosjekt {{index}}",
+  "command.tab.reopenClosed": "Åpne lukket fane på nytt",
+
+  "model.tooltip.context.label": "Kontekst",
+  "model.tooltip.inputs": "Inndata",
+  "model.tooltip.model": "Modell",
+  "model.tooltip.provider": "Leverandør",
+  "model.tooltip.reasoning": "Resonnering",
+
+  "common.clear": "Tøm",
+
+  "session.child.promptDisabled": "Underagentsesjoner kan ikke motta forespørsler.",
+  "session.child.backToParent": "Tilbake til hovedsesjonen.",
+
+  "wsl.server.add": "Legg til WSL-server",
+  "wsl.server.addShort": "Legg til WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL-server",
+  "wsl.server.retryStart": "Prøv å starte på nytt",
+  "wsl.server.updating": "Oppdaterer...",
+  "wsl.onboarding.step.distro": "Velg distribusjon",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Sjekker WSL...",
+  "wsl.onboarding.restartRequired": "Windows må startes på nytt for å fullføre installasjonen av WSL.",
+  "wsl.onboarding.ready": "WSL er klart.",
+  "wsl.onboarding.required": "WSL kreves for å fortsette.",
+  "wsl.onboarding.checkingDistros": "Sjekker distribusjoner...",
+  "wsl.onboarding.installingDistro": "Installerer {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Sjekker {{distro}}...",
+  "wsl.onboarding.listingDistros": "Lister distribusjoner...",
+  "wsl.onboarding.distroReady": "{{distro}} er klar.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} er ikke installert ennå.",
+  "wsl.onboarding.openDistroOnce": "Åpne {{distro}} én gang for å fullføre oppsettet.",
+  "wsl.onboarding.finishingDistro": "Fullfører oppsettet for {{distro}}.",
+  "wsl.onboarding.pickDistro": "Velg en distribusjon eller installer en nedenfor.",
+  "wsl.onboarding.checkingOpencode": "Sjekker OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Sjekker OpenCode i {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Oppdaterer OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Oppdaterer OpenCode i {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Oppdater OpenCode i {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Oppdater OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode er klar i {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode er klar.",
+  "wsl.onboarding.installOpencodeIn": "Installer OpenCode i {{distro}}.",
+  "wsl.onboarding.installOpencode": "Installer OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Velg en distribusjon først.",
+  "wsl.onboarding.loadFailed": "Kunne ikke laste inn WSL-status.",
+  "wsl.onboarding.loading": "Laster...",
+  "wsl.onboarding.installedDistros": "Installerte distribusjoner",
+  "wsl.onboarding.checkAgain": "Sjekk på nytt",
+  "wsl.onboarding.distroStatus.ready": "Klar",
+  "wsl.onboarding.distroStatus.checking": "Sjekker...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode er ikke installert",
+  "wsl.onboarding.distroStatus.missingTools": "Mangler bash, curl",
+  "wsl.onboarding.distroStatus.unsupported": "Ikke støttet · Bruk WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Trenger du en annen distribusjon?",
+  "wsl.onboarding.needAnotherDistroHint": "Installer en Linux-distribusjon fra WSL-katalogen",
+  "wsl.onboarding.wslNotInstalled.title": "WSL er ikke installert",
+  "wsl.onboarding.wslNotInstalled.description":
+    "WSL (Windows Subsystem for Linux) kreves før OpenCode kan legge til en WSL-server",
+  "wsl.onboarding.wslUnavailable.title": "WSL er utilgjengelig",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode kunne ikke bekrefte WSL på denne maskinen.",
+  "wsl.onboarding.installWsl": "Installer WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Start Windows på nytt for å fullføre installasjonen av WSL, og åpne deretter OpenCode på nytt.",
+  "wsl.onboarding.next": "Neste",
+  "wsl.onboarding.refresh": "Oppdater",
+  "wsl.onboarding.allDistrosAdded": "Alle installerte distribusjoner er allerede lagt til.",
+  "wsl.onboarding.noDistros": "Ingen distribusjoner oppdaget ennå.",
+  "wsl.onboarding.install": "Installer",
+  "wsl.onboarding.installing": "Installerer...",
+  "wsl.onboarding.installDistro": "Installer distribusjon",
+  "wsl.onboarding.searchDistros": "Søk etter distribusjoner",
+  "wsl.onboarding.wsl2Required": "WSL 2 er påkrevd.",
+  "wsl.onboarding.toolsRequired": "Denne distribusjonen trenger bash og curl.",
+  "wsl.onboarding.openTerminal": "Åpne terminal",
+  "wsl.onboarding.path": "Bane: {{path}}",
+  "wsl.onboarding.notFound": "ikke funnet",
+  "wsl.onboarding.version": "Versjon: {{version}}",
+  "wsl.onboarding.unknown": "ukjent",
+  "wsl.onboarding.desktopVersion": "skrivebordsapp {{version}}",
+  "wsl.onboarding.versionMismatch": "Den installerte versjonen samsvarer ikke med versjonen av skrivebordsappen.",
+  "wsl.onboarding.adding": "Legger til...",
+
+  "language.uk": "Українська",
+
+  "error.page.description.localServerStartup": "Det oppstod en feil under oppstart av den lokale serveren.",
+  "error.page.action.exportLogs": "Eksporter logger",
+
+  "home.title": "Hjem",
+  "home.projects": "Prosjekter",
+  "home.project.add": "Legg til prosjekt",
+  "home.recentlyClosed": "Nylig lukket",
+  "home.server.collapse": "Fold sammen serverprosjekter",
+  "home.server.expand": "Utvid serverprosjekter",
+  "home.sessions.search.placeholder": "Søk etter sesjoner",
+  "home.sessions.search.placeholder.scoped": "Søk etter sesjoner i {{scope}}",
+  "home.sessions.search.sessions": "Sesjoner",
+  "home.sessions.search.noResults": "Ingen sesjoner funnet for {{query}}",
+  "home.sessions.empty": "Ingenting her ennå",
+  "home.sessions.empty.description": "Opprett en sesjon for å komme i gang",
+  "home.sessions.group.today": "I dag",
+  "home.sessions.group.yesterday": "I går",
+  "home.sessions.group.older": "Eldre",
+
+  "session.tab.unknown": "Ukjent sesjon",
+  "session.error.notFound": "Denne sesjonen finnes ikke",
+  "session.error.notFound.description": "Denne fanen peker til en sesjon som ikke lenger finnes på denne serveren.",
+  "session.error.notFound.closeTab": "Lukk fane",
+  "session.error.serverConnection": "Kan ikke koble til denne serveren",
+  "session.review.noUncommittedChanges": "Ingen ucommittede endringer ennå",
+  "session.review.noBranchChanges": "Ingen grenendringer ennå",
+  "session.question.minimize": "Minimer spørsmål",
+  "session.question.restore": "Gjenopprett spørsmål",
+  "session.question.pending.one": "{{count}} ventende spørsmål",
+  "session.question.pending.other": "{{count}} ventende spørsmål",
+  "session.new.project.new": "Nytt prosjekt",
+  "session.new.project.search": "Søk etter prosjekter",
+  "session.new.project.add": "Legg til prosjekt",
+  "session.new.workspace.runIn": "Kjør sesjonen i",
+  "session.new.workspace.triggerLocal": "Lokalt",
+  "session.new.workspace.local": "Lokalt depot",
+  "session.new.workspace.existing": "Arbeidsområde…",
+
+  "sidebar.empty.title": "Ingen åpne prosjekter",
+  "sidebar.empty.description": "Åpne et prosjekt for å komme i gang",
+
+  "settings.general.section.advanced": "Avansert",
+  "settings.general.row.shell.title": "Terminalskall",
+  "settings.general.row.shell.description":
+    "Velg skallet som skal brukes i terminalen. Kompatible skall brukes også til agentens verktøykall.",
+  "settings.general.row.shell.autoDefault": "Automatisk (standard)",
+  "settings.general.row.shell.terminalOnly": "kun terminal",
+  "settings.general.row.showFileTree.title": "Filtre",
+  "settings.general.row.showFileTree.description": "Vis filtrepanelet i sesjoner",
+  "settings.general.row.showNavigation.title": "Navigasjonskontroller",
+  "settings.general.row.showNavigation.description":
+    "Vis tilbake- og fremoverknappene på tittellinjen i skrivebordsappen",
+  "settings.general.row.showSearch.title": "Kommandopalett",
+  "settings.general.row.showSearch.description": "Vis knappen for søk og kommandopalett på tittellinjen",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Vis terminalknappen på tittellinjen i skrivebordsappen",
+  "settings.general.row.showStatus.title": "Serverstatus",
+  "settings.general.row.showStatus.description": "Vis serverstatusknappen på tittellinjen",
+  "settings.general.row.mobileTitlebarBottom.title": "Navigasjon nederst",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Plasser tittellinjen og sesjonsfanene nederst på mobilskjermen",
+  "settings.general.row.showCustomAgents.title": "Egendefinerte agenter",
+  "settings.general.row.showCustomAgents.description": "Vis agentvelgeren i skrivefeltet",
+  "settings.general.row.newLayoutDesigns.title": "Ny layout og utforming",
+  "settings.general.row.newLayoutDesigns.description":
+    "Aktiver ny layout og utforming for startsiden, skrivefeltet og sesjonsgrensesnittet",
+  "settings.general.row.pinchZoom.title": "Knip for å zoome",
+  "settings.general.row.pinchZoom.description": "Tillat knipebevegelser på styreflaten og Ctrl-rulling for å zoome",
+  "settings.updates.action.downloading": "Laster ned...",
+  "settings.updates.action.installing": "Installerer...",
 } satisfies Partial<Record<Keys, string>>
diff --git a/packages/app/src/i18n/parity.test.ts b/packages/app/src/i18n/parity.test.ts
index 8ad1beb56b0c..725b5f68a0c8 100644
--- a/packages/app/src/i18n/parity.test.ts
+++ b/packages/app/src/i18n/parity.test.ts
@@ -1,33 +1,118 @@
 import { describe, expect, test } from "bun:test"
-import { dict as en } from "./en"
-import { dict as ar } from "./ar"
-import { dict as br } from "./br"
-import { dict as bs } from "./bs"
-import { dict as da } from "./da"
-import { dict as de } from "./de"
-import { dict as es } from "./es"
-import { dict as fr } from "./fr"
-import { dict as ja } from "./ja"
-import { dict as ko } from "./ko"
-import { dict as no } from "./no"
-import { dict as pl } from "./pl"
-import { dict as ru } from "./ru"
-import { dict as uk } from "./uk"
-import { dict as th } from "./th"
-import { dict as zh } from "./zh"
-import { dict as zht } from "./zht"
-import { dict as tr } from "./tr"
-
-const locales = [ar, br, bs, da, de, es, fr, ja, ko, no, pl, ru, uk, th, tr, zh, zht]
-const keys = ["command.session.previous.unseen", "command.session.next.unseen"] as const
+
+const appLocales = [
+  "ar",
+  "br",
+  "bs",
+  "da",
+  "de",
+  "es",
+  "fr",
+  "ja",
+  "ko",
+  "no",
+  "pl",
+  "ru",
+  "uk",
+  "th",
+  "tr",
+  "zh",
+  "zht",
+] as const
+const desktopLocales = appLocales.filter((locale) => locale !== "th" && locale !== "tr")
+
+const domains = [
+  {
+    name: "app",
+    source: "./en.ts",
+    target: (locale: string) => `./${locale}.ts`,
+    locales: appLocales,
+  },
+  {
+    name: "ui",
+    source: "../../../ui/src/i18n/en.ts",
+    target: (locale: string) => `../../../ui/src/i18n/${locale}.ts`,
+    locales: appLocales,
+  },
+  {
+    name: "desktop",
+    source: "../../../desktop/src/renderer/i18n/en.ts",
+    target: (locale: string) => `../../../desktop/src/renderer/i18n/${locale}.ts`,
+    locales: desktopLocales,
+  },
+] as const
 
 describe("i18n parity", () => {
-  test("non-English locales translate targeted unseen session keys", () => {
-    for (const locale of locales) {
-      for (const key of keys) {
-        expect(locale[key]).toBeDefined()
-        expect(locale[key]).not.toBe(en[key])
+  test("non-English locales have every English key", async () => {
+    for (const domain of domains) {
+      const source = await dictionary(domain.source)
+      for (const locale of domain.locales) {
+        const target = await dictionary(domain.target(locale))
+        const missing = Object.keys(source).filter((key) => !Object.hasOwn(target, key))
+        const extra = Object.keys(target).filter((key) => !Object.hasOwn(source, key))
+        expect({ domain: domain.name, locale, missing, extra }).toEqual({
+          domain: domain.name,
+          locale,
+          missing: [],
+          extra: [],
+        })
+      }
+    }
+  })
+
+  test("non-English locales preserve English placeholders", async () => {
+    for (const domain of domains) {
+      const source = await dictionary(domain.source)
+      for (const locale of domain.locales) {
+        const target = await dictionary(domain.target(locale))
+        const mismatched = Object.keys(source).filter(
+          (key) => Object.hasOwn(target, key) && placeholders(source[key]).join() !== placeholders(target[key]).join(),
+        )
+        expect({ domain: domain.name, locale, mismatched }).toEqual({ domain: domain.name, locale, mismatched: [] })
+      }
+    }
+  })
+
+  test("non-English locales translate targeted unseen session keys", async () => {
+    const source = await dictionary("./en.ts")
+    for (const locale of appLocales) {
+      const target = await dictionary(`./${locale}.ts`)
+      for (const key of ["command.session.previous.unseen", "command.session.next.unseen"]) {
+        expect(target[key]).toBeDefined()
+        expect(target[key]).not.toBe(source[key])
+      }
+    }
+  })
+
+  test("changed-file summary keys preserve rendered English copy and localize complete phrases", async () => {
+    const source = await dictionary("../../../ui/src/i18n/en.ts")
+    expect(source["ui.sessionTurn.diffs.changed.one"].replace("{{count}}", "1")).toBe("1 Changed file")
+    expect(source["ui.sessionTurn.diffs.changed.other"].replace("{{count}}", "2")).toBe("2 Changed files")
+    expect(source["ui.sessionTurn.diffs.changed"]).toBeUndefined()
+
+    for (const locale of appLocales) {
+      const target = await dictionary(`../../../ui/src/i18n/${locale}.ts`)
+      for (const key of ["ui.sessionTurn.diffs.changed.one", "ui.sessionTurn.diffs.changed.other"]) {
+        expect(target[key].trim()).not.toBe("")
+        expect(placeholders(target[key])).toEqual(["count"])
       }
     }
   })
 })
+
+async function dictionary(file: string) {
+  const module: unknown = await import(file)
+  if (typeof module !== "object" || module === null || !("dict" in module) || !isDictionary(module.dict)) {
+    throw new Error(`Invalid translation dictionary: ${file}`)
+  }
+  return module.dict
+}
+
+function isDictionary(value: unknown): value is Record<string, string> {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false
+  return Object.values(value).every((item) => typeof item === "string")
+}
+
+function placeholders(value: string) {
+  return Array.from(value.matchAll(/{{\s*([^}]+?)\s*}}/g), (match) => match[1]).sort()
+}
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index fcf9927da016..295d8e615a55 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -21,6 +21,9 @@ export const dict = {
   "theme.scheme.dark": "Ciemny",
   "command.sidebar.toggle": "Przełącz pasek boczny",
   "command.project.open": "Otwórz projekt",
+  "command.project.previous": "Poprzedni projekt",
+  "command.project.next": "Następny projekt",
+  "command.project.index": "Przełącz na projekt {{index}}",
   "command.provider.connect": "Połącz dostawcę",
   "command.server.switch": "Przełącz serwer",
   "command.settings.open": "Otwórz ustawienia",
@@ -39,6 +42,7 @@ export const dict = {
   "command.session.new": "Nowa sesja",
   "command.file.open": "Otwórz plik",
   "command.tab.close": "Zamknij kartę",
+  "command.tab.reopenClosed": "Otwórz ponownie zamkniętą kartę",
   "command.context.addSelection": "Dodaj zaznaczenie do kontekstu",
   "command.context.addSelection.description": "Dodaj zaznaczone linie z bieżącego pliku",
   "command.input.focus": "Fokus na pole wejściowe",
@@ -194,6 +198,11 @@ export const dict = {
   "model.input.video": "wideo",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Obsługuje: {{inputs}}",
+  "model.tooltip.context.label": "Kontekst",
+  "model.tooltip.inputs": "Dane wejściowe",
+  "model.tooltip.model": "Model",
+  "model.tooltip.provider": "Dostawca",
+  "model.tooltip.reasoning": "Wnioskowanie",
   "model.tooltip.reasoning.allowed": "Obsługuje wnioskowanie",
   "model.tooltip.reasoning.none": "Brak wnioskowania",
   "model.tooltip.context": "Limit kontekstu {{limit}}",
@@ -203,6 +212,7 @@ export const dict = {
   "common.loading": "Ładowanie",
   "common.loading.ellipsis": "...",
   "common.cancel": "Anuluj",
+  "common.clear": "Wyczyść",
   "common.connect": "Połącz",
   "common.disconnect": "Rozłącz",
   "common.continue": "Prześlij",
@@ -219,6 +229,8 @@ export const dict = {
   "prompt.mode.shell": "Terminal",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "esc aby wyjść",
+  "session.child.promptDisabled": "Nie można wysyłać promptów w sesjach podagentów.",
+  "session.child.backToParent": "Wróć do głównej sesji.",
   "prompt.example.1": "Napraw TODO w bazie kodu",
   "prompt.example.2": "Jaki jest stos technologiczny tego projektu?",
   "prompt.example.3": "Napraw zepsute testy",
@@ -315,6 +327,75 @@ export const dict = {
   "dialog.server.menu.delete": "Usuń",
   "dialog.server.current": "Obecny serwer",
   "dialog.server.status.default": "Domyślny",
+  "wsl.server.add": "Dodaj serwer WSL",
+  "wsl.server.addShort": "Dodaj WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "Serwer WSL",
+  "wsl.server.retryStart": "Ponów uruchamianie",
+  "wsl.server.updating": "Aktualizowanie...",
+  "wsl.onboarding.step.distro": "Wybierz dystrybucję",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Sprawdzanie WSL...",
+  "wsl.onboarding.restartRequired": "Aby dokończyć instalację WSL, uruchom ponownie system Windows.",
+  "wsl.onboarding.ready": "WSL jest gotowy.",
+  "wsl.onboarding.required": "Aby kontynuować, wymagany jest WSL.",
+  "wsl.onboarding.checkingDistros": "Sprawdzanie dystrybucji...",
+  "wsl.onboarding.installingDistro": "Instalowanie {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Sprawdzanie {{distro}}...",
+  "wsl.onboarding.listingDistros": "Pobieranie listy dystrybucji...",
+  "wsl.onboarding.distroReady": "Dystrybucja {{distro}} jest gotowa.",
+  "wsl.onboarding.distroNotInstalled": "Dystrybucja {{distro}} nie jest jeszcze zainstalowana.",
+  "wsl.onboarding.openDistroOnce": "Uruchom raz {{distro}}, aby dokończyć konfigurację.",
+  "wsl.onboarding.finishingDistro": "Kończenie konfiguracji {{distro}}.",
+  "wsl.onboarding.pickDistro": "Wybierz dystrybucję lub zainstaluj jedną z poniższych.",
+  "wsl.onboarding.checkingOpencode": "Sprawdzanie OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Sprawdzanie OpenCode w dystrybucji {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Aktualizowanie OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Aktualizowanie OpenCode w dystrybucji {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Zaktualizuj OpenCode w dystrybucji {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Zaktualizuj OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode jest gotowy w dystrybucji {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode jest gotowy.",
+  "wsl.onboarding.installOpencodeIn": "Zainstaluj OpenCode w dystrybucji {{distro}}.",
+  "wsl.onboarding.installOpencode": "Zainstaluj OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Najpierw wybierz dystrybucję.",
+  "wsl.onboarding.loadFailed": "Nie udało się załadować stanu WSL.",
+  "wsl.onboarding.loading": "Ładowanie...",
+  "wsl.onboarding.installedDistros": "Zainstalowane dystrybucje",
+  "wsl.onboarding.checkAgain": "Sprawdź ponownie",
+  "wsl.onboarding.distroStatus.ready": "Gotowa",
+  "wsl.onboarding.distroStatus.checking": "Sprawdzanie...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode nie jest zainstalowany",
+  "wsl.onboarding.distroStatus.missingTools": "Brak bash i curl",
+  "wsl.onboarding.distroStatus.unsupported": "Nieobsługiwana · Użyj WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Potrzebujesz innej dystrybucji?",
+  "wsl.onboarding.needAnotherDistroHint": "Zainstaluj dystrybucję systemu Linux z katalogu WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL nie jest zainstalowany",
+  "wsl.onboarding.wslNotInstalled.description":
+    "WSL (Podsystem Windows dla systemu Linux) jest wymagany, zanim OpenCode będzie mógł dodać serwer WSL",
+  "wsl.onboarding.wslUnavailable.title": "WSL jest niedostępny",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode nie mógł zweryfikować WSL na tym komputerze.",
+  "wsl.onboarding.installWsl": "Zainstaluj WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Uruchom ponownie system Windows, aby dokończyć instalację WSL, a następnie ponownie otwórz OpenCode.",
+  "wsl.onboarding.next": "Dalej",
+  "wsl.onboarding.refresh": "Odśwież",
+  "wsl.onboarding.allDistrosAdded": "Wszystkie zainstalowane dystrybucje zostały już dodane.",
+  "wsl.onboarding.noDistros": "Nie wykryto jeszcze żadnych dystrybucji.",
+  "wsl.onboarding.install": "Zainstaluj",
+  "wsl.onboarding.installing": "Instalowanie...",
+  "wsl.onboarding.installDistro": "Zainstaluj dystrybucję",
+  "wsl.onboarding.searchDistros": "Szukaj dystrybucji",
+  "wsl.onboarding.wsl2Required": "Wymagany jest WSL 2.",
+  "wsl.onboarding.toolsRequired": "Ta dystrybucja wymaga bash i curl.",
+  "wsl.onboarding.openTerminal": "Otwórz terminal",
+  "wsl.onboarding.path": "Ścieżka: {{path}}",
+  "wsl.onboarding.notFound": "nie znaleziono",
+  "wsl.onboarding.version": "Wersja: {{version}}",
+  "wsl.onboarding.unknown": "nieznana",
+  "wsl.onboarding.desktopVersion": "aplikacja komputerowa {{version}}",
+  "wsl.onboarding.versionMismatch": "Zainstalowana wersja nie jest zgodna z wersją aplikacji komputerowej.",
+  "wsl.onboarding.adding": "Dodawanie...",
   "dialog.project.edit.title": "Edytuj projekt",
   "dialog.project.edit.name": "Nazwa",
   "dialog.project.edit.icon": "Ikona",
@@ -324,7 +405,8 @@ export const dict = {
   "dialog.project.edit.color": "Kolor",
   "dialog.project.edit.color.select": "Wybierz kolor {{color}}",
   "dialog.project.edit.worktree.startup": "Skrypt uruchamiania przestrzeni roboczej",
-  "dialog.project.edit.worktree.startup.description": "Runs after creating a new workspace (worktree).",
+  "dialog.project.edit.worktree.startup.description":
+    "Uruchamiany po utworzeniu nowej przestrzeni roboczej (worktree).",
   "dialog.project.edit.worktree.startup.placeholder": "np. bun install",
   "context.breakdown.title": "Podział kontekstu",
   "context.breakdown.note": 'Przybliżony podział tokenów wejściowych. "Inne" obejmuje definicje narzędzi i narzut.',
@@ -371,6 +453,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
   "toast.language.title": "Język",
@@ -407,10 +490,12 @@ export const dict = {
   "toast.update.action.notYet": "Jeszcze nie",
   "error.page.title": "Coś poszło nie tak",
   "error.page.description": "Wystąpił błąd podczas ładowania aplikacji.",
+  "error.page.description.localServerStartup": "Wystąpił błąd podczas uruchamiania serwera lokalnego.",
   "error.page.details.label": "Szczegóły błędu",
   "error.page.action.restart": "Restartuj",
   "error.page.action.report": "Zgłoś błąd",
   "error.page.action.reported": "Błąd zgłoszony",
+  "error.page.action.exportLogs": "Eksportuj dzienniki",
   "error.page.action.checking": "Sprawdzanie...",
   "error.page.action.checkUpdates": "Sprawdź aktualizacje",
   "error.page.action.updateTo": "Zaktualizuj do {{version}}",
@@ -430,7 +515,8 @@ export const dict = {
   "error.chain.didYouMean": "Czy miałeś na myśli: {{suggestions}}",
   "error.chain.modelNotFound": "Model nie znaleziony: {{provider}}/{{model}}",
   "error.chain.checkConfig": "Sprawdź swoją konfigurację (opencode.json) nazwy dostawców/modeli",
-  "error.chain.mcpFailed": 'MCP server "{{name}}" failed. Note, OpenCode does not support MCP authentication yet.',
+  "error.chain.mcpFailed":
+    "Serwer MCP „{{name}}” nie uruchomił się. Uwaga: OpenCode nie obsługuje jeszcze uwierzytelniania MCP.",
   "error.chain.providerAuthFailed": "Uwierzytelnianie dostawcy nie powiodło się ({{provider}}): {{message}}",
   "error.chain.providerInitFailed":
     'Nie udało się zainicjować dostawcy "{{provider}}". Sprawdź poświadczenia i konfigurację.',
@@ -452,10 +538,30 @@ export const dict = {
   "home.recentProjects": "Ostatnie projekty",
   "home.empty.title": "Brak ostatnich projektów",
   "home.empty.description": "Zacznij od otwarcia lokalnego projektu",
+  "home.title": "Strona główna",
+  "home.projects": "Projekty",
+  "home.project.add": "Dodaj projekt",
+  "home.recentlyClosed": "Ostatnio zamknięte",
+  "home.server.collapse": "Zwiń projekty serwera",
+  "home.server.expand": "Rozwiń projekty serwera",
+  "home.sessions.search.placeholder": "Szukaj sesji",
+  "home.sessions.search.placeholder.scoped": "Szukaj sesji w {{scope}}",
+  "home.sessions.search.sessions": "Sesje",
+  "home.sessions.search.noResults": "Nie znaleziono sesji dla {{query}}",
+  "home.sessions.empty": "Jeszcze nic tu nie ma",
+  "home.sessions.empty.description": "Utwórz sesję, aby rozpocząć",
+  "home.sessions.group.today": "Dzisiaj",
+  "home.sessions.group.yesterday": "Wczoraj",
+  "home.sessions.group.older": "Starsze",
   "session.tab.session": "Sesja",
   "session.tab.review": "Przegląd",
   "session.tab.context": "Kontekst",
+  "session.tab.unknown": "Nieznana sesja",
   "session.panel.reviewAndFiles": "Przegląd i pliki",
+  "session.error.notFound": "Nie można znaleźć tej sesji",
+  "session.error.notFound.description": "Ta karta wskazuje sesję, która nie istnieje już na tym serwerze.",
+  "session.error.notFound.closeTab": "Zamknij kartę",
+  "session.error.serverConnection": "Nie można połączyć się z tym serwerem",
   "session.review.filesChanged": "Zmieniono {{count}} plików",
   "session.review.change.one": "Zmiana",
   "session.review.change.other": "Zmiany",
@@ -464,6 +570,8 @@ export const dict = {
   "session.review.noVcs": "Nie wykryto systemu kontroli wersji Git, zmiany nie są wyświetlane",
   "session.review.noSnapshot": "Śledzenie migawek jest wyłączone w konfiguracji, więc zmiany w sesji są niedostępne",
   "session.review.noChanges": "Brak zmian",
+  "session.review.noUncommittedChanges": "Brak jeszcze niezatwierdzonych zmian",
+  "session.review.noBranchChanges": "Brak jeszcze zmian w gałęzi",
   "session.files.selectToOpen": "Wybierz plik do otwarcia",
   "session.files.all": "Wszystkie pliki",
   "session.files.empty": "Brak plików",
@@ -477,6 +585,10 @@ export const dict = {
   "session.todo.title": "Zadania",
   "session.todo.collapse": "Zwiń",
   "session.todo.expand": "Rozwiń",
+  "session.question.minimize": "Zminimalizuj pytanie",
+  "session.question.restore": "Przywróć pytanie",
+  "session.question.pending.one": "{{count}} oczekujące pytanie",
+  "session.question.pending.other": "Pytania oczekujące: {{count}}",
   "session.followupDock.summary.one": "{{count}} wiadomość w kolejce",
   "session.followupDock.summary.other": "{{count}} wiadomości w kolejce",
   "session.followupDock.sendNow": "Wyślij teraz",
@@ -489,9 +601,16 @@ export const dict = {
   "session.revertDock.expand": "Rozwiń cofnięte wiadomości",
   "session.revertDock.restore": "Przywróć wiadomość",
   "session.new.title": "Zbuduj cokolwiek",
+  "session.new.project.new": "Nowy projekt",
+  "session.new.project.search": "Szukaj projektów",
+  "session.new.project.add": "Dodaj projekt",
   "session.new.worktree.main": "Główna gałąź",
   "session.new.worktree.mainWithBranch": "Główna gałąź ({{branch}})",
   "session.new.worktree.create": "Utwórz nowe drzewo robocze",
+  "session.new.workspace.runIn": "Uruchom sesję w",
+  "session.new.workspace.triggerLocal": "Lokalnie",
+  "session.new.workspace.local": "Lokalne repozytorium",
+  "session.new.workspace.existing": "Przestrzeń robocza…",
   "session.new.lastModified": "Ostatnio zmodyfikowano",
   "session.header.search.placeholder": "Szukaj {{project}}",
   "session.header.searchFiles": "Szukaj plików",
@@ -555,15 +674,18 @@ export const dict = {
   "sidebar.project.recentSessions": "Ostatnie sesje",
   "sidebar.project.viewAllSessions": "Zobacz wszystkie sesje",
   "sidebar.project.clearNotifications": "Wyczyść powiadomienia",
+  "sidebar.empty.title": "Brak otwartych projektów",
+  "sidebar.empty.description": "Otwórz projekt, aby rozpocząć",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Pulpit",
   "settings.section.server": "Serwer",
   "settings.tab.general": "Ogólne",
   "settings.tab.shortcuts": "Skróty",
   "settings.desktop.section.wsl": "WSL",
-  "settings.desktop.wsl.title": "WSL integration",
-  "settings.desktop.wsl.description": "Run the OpenCode server inside WSL on Windows.",
+  "settings.desktop.wsl.title": "Integracja z WSL",
+  "settings.desktop.wsl.description": "Uruchamiaj serwer OpenCode wewnątrz WSL w systemie Windows.",
   "settings.general.section.appearance": "Wygląd",
+  "settings.general.section.advanced": "Zaawansowane",
   "settings.general.section.notifications": "Powiadomienia systemowe",
   "settings.general.section.updates": "Aktualizacje",
   "settings.general.section.sounds": "Efekty dźwiękowe",
@@ -571,6 +693,11 @@ export const dict = {
   "settings.general.section.display": "Ekran",
   "settings.general.row.language.title": "Język",
   "settings.general.row.language.description": "Zmień język wyświetlania dla OpenCode",
+  "settings.general.row.shell.title": "Powłoka terminala",
+  "settings.general.row.shell.description":
+    "Wybierz powłokę używaną w terminalu. Zgodne powłoki są również używane przez wywołania narzędzi agenta.",
+  "settings.general.row.shell.autoDefault": "Automatycznie (domyślna)",
+  "settings.general.row.shell.terminalOnly": "tylko terminal",
   "settings.general.row.appearance.title": "Wygląd",
   "settings.general.row.appearance.description": "Dostosuj wygląd OpenCode na swoim urządzeniu",
   "settings.general.row.colorScheme.title": "Schemat kolorów",
@@ -580,14 +707,30 @@ export const dict = {
   "settings.general.row.theme.description": "Dostosuj motyw OpenCode.",
   "settings.general.row.font.title": "Czcionka kodu",
   "settings.general.row.font.description": "Dostosuj czcionkę używaną w blokach kodu",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Czcionka terminala",
+  "settings.general.row.terminalFont.description": "Dostosuj czcionkę używaną w terminalu",
   "settings.general.row.uiFont.title": "Czcionka interfejsu",
   "settings.general.row.uiFont.description": "Dostosuj czcionkę używaną w całym interfejsie",
   "settings.general.row.followup.title": "Zachowanie kontynuacji",
   "settings.general.row.followup.description": "Wybierz, czy kontynuacja ma być natychmiastowa, czy czekać w kolejce",
   "settings.general.row.followup.option.queue": "Kolejka",
   "settings.general.row.followup.option.steer": "Sterowanie",
+  "settings.general.row.showFileTree.title": "Drzewo plików",
+  "settings.general.row.showFileTree.description": "Pokaż panel drzewa plików w sesjach",
+  "settings.general.row.showNavigation.title": "Elementy nawigacji",
+  "settings.general.row.showNavigation.description":
+    "Pokaż przyciski Wstecz i Dalej na pasku tytułu aplikacji komputerowej",
+  "settings.general.row.showSearch.title": "Paleta poleceń",
+  "settings.general.row.showSearch.description": "Pokaż przycisk wyszukiwania i palety poleceń na pasku tytułu",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Pokaż przycisk terminala na pasku tytułu aplikacji komputerowej",
+  "settings.general.row.showStatus.title": "Status serwera",
+  "settings.general.row.showStatus.description": "Pokaż przycisk statusu serwera na pasku tytułu",
+  "settings.general.row.mobileTitlebarBottom.title": "Dolna nawigacja",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Umieść pasek tytułu i karty sesji u dołu ekranu na urządzeniach mobilnych",
+  "settings.general.row.showCustomAgents.title": "Agenci niestandardowi",
+  "settings.general.row.showCustomAgents.description": "Pokaż wybór agenta w edytorze wiadomości",
   "settings.general.row.reasoningSummaries.title": "Pokaż podsumowania wnioskowania",
   "settings.general.row.reasoningSummaries.description": "Wyświetlaj podsumowania wnioskowania modelu na osi czasu",
   "settings.general.row.shellToolPartsExpanded.title": "Rozwijaj elementy narzędzia shell",
@@ -596,6 +739,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Rozwijaj elementy narzędzia edit",
   "settings.general.row.editToolPartsExpanded.description":
     "Domyślnie pokazuj rozwinięte elementy narzędzi edit, write i patch na osi czasu",
+  "settings.general.row.newLayoutDesigns.title": "Nowy układ i wygląd",
+  "settings.general.row.newLayoutDesigns.description":
+    "Włącz przeprojektowany układ, stronę główną, edytor wiadomości i interfejs sesji",
+  "settings.general.row.pinchZoom.title": "Powiększanie gestem szczypania",
+  "settings.general.row.pinchZoom.description":
+    "Zezwalaj na powiększanie gestem szczypania na gładziku i przewijaniem z klawiszem Ctrl",
   "settings.general.row.wayland.title": "Użyj natywnego Wayland",
   "settings.general.row.wayland.description": "Wyłącz fallback X11 na Wayland. Wymaga restartu.",
   "settings.general.row.wayland.tooltip":
@@ -608,6 +757,8 @@ export const dict = {
   "settings.updates.row.check.description": "Ręcznie sprawdź aktualizacje i zainstaluj, jeśli są dostępne",
   "settings.updates.action.checkNow": "Sprawdź teraz",
   "settings.updates.action.checking": "Sprawdzanie...",
+  "settings.updates.action.downloading": "Pobieranie...",
+  "settings.updates.action.installing": "Instalowanie...",
   "settings.updates.toast.latest.title": "Masz najnowszą wersję",
   "settings.updates.toast.latest.description": "Korzystasz z najnowszej wersji OpenCode.",
   "sound.option.none": "Brak",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index b2f58b101b40..7ef78bb4805d 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -23,6 +23,9 @@ export const dict = {
 
   "command.sidebar.toggle": "Переключить боковую панель",
   "command.project.open": "Открыть проект",
+  "command.project.previous": "Предыдущий проект",
+  "command.project.next": "Следующий проект",
+  "command.project.index": "Переключиться на проект {{index}}",
   "command.provider.connect": "Подключить провайдера",
   "command.server.switch": "Переключить сервер",
   "command.settings.open": "Открыть настройки",
@@ -45,6 +48,7 @@ export const dict = {
   "command.session.new": "Новая сессия",
   "command.file.open": "Открыть файл",
   "command.tab.close": "Закрыть вкладку",
+  "command.tab.reopenClosed": "Повторно открыть закрытую вкладку",
   "command.context.addSelection": "Добавить выделение в контекст",
   "command.context.addSelection.description": "Добавить выбранные строки из текущего файла",
   "command.input.focus": "Фокус на поле ввода",
@@ -208,6 +212,11 @@ export const dict = {
   "model.input.video": "видео",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Разрешено: {{inputs}}",
+  "model.tooltip.context.label": "Контекст",
+  "model.tooltip.inputs": "Входные данные",
+  "model.tooltip.model": "Модель",
+  "model.tooltip.provider": "Провайдер",
+  "model.tooltip.reasoning": "Рассуждение",
   "model.tooltip.reasoning.allowed": "Разрешает рассуждение",
   "model.tooltip.reasoning.none": "Без рассуждения",
   "model.tooltip.context": "Лимит контекста {{limit}}",
@@ -218,6 +227,7 @@ export const dict = {
   "common.loading": "Загрузка",
   "common.loading.ellipsis": "...",
   "common.cancel": "Отмена",
+  "common.clear": "Очистить",
   "common.connect": "Подключить",
   "common.disconnect": "Отключить",
   "common.continue": "Отправить",
@@ -235,6 +245,8 @@ export const dict = {
   "prompt.mode.shell": "Оболочка",
   "prompt.mode.normal": "Промпт",
   "prompt.mode.shell.exit": "esc для выхода",
+  "session.child.promptDisabled": "В сессиях субагентов нельзя отправлять запросы.",
+  "session.child.backToParent": "Вернуться к основной сессии.",
 
   "prompt.example.1": "Исправить TODO в коде",
   "prompt.example.2": "Какой технологический стек этого проекта?",
@@ -341,6 +353,75 @@ export const dict = {
   "dialog.server.menu.delete": "Удалить",
   "dialog.server.current": "Текущий сервер",
   "dialog.server.status.default": "По умолч.",
+  "wsl.server.add": "Добавить сервер WSL",
+  "wsl.server.addShort": "Добавить WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "Сервер WSL",
+  "wsl.server.retryStart": "Повторить запуск",
+  "wsl.server.updating": "Обновление...",
+  "wsl.onboarding.step.distro": "Выбрать дистрибутив",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Проверка WSL...",
+  "wsl.onboarding.restartRequired": "Чтобы завершить установку WSL, перезапустите Windows.",
+  "wsl.onboarding.ready": "WSL готова к работе.",
+  "wsl.onboarding.required": "Для продолжения требуется WSL.",
+  "wsl.onboarding.checkingDistros": "Проверка дистрибутивов...",
+  "wsl.onboarding.installingDistro": "Установка {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Проверка {{distro}}...",
+  "wsl.onboarding.listingDistros": "Получение списка дистрибутивов...",
+  "wsl.onboarding.distroReady": "Дистрибутив {{distro}} готов к работе.",
+  "wsl.onboarding.distroNotInstalled": "Дистрибутив {{distro}} пока не установлен.",
+  "wsl.onboarding.openDistroOnce": "Откройте {{distro}} один раз, чтобы завершить настройку.",
+  "wsl.onboarding.finishingDistro": "Завершение настройки {{distro}}.",
+  "wsl.onboarding.pickDistro": "Выберите дистрибутив или установите его ниже.",
+  "wsl.onboarding.checkingOpencode": "Проверка OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Проверка OpenCode в {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Обновление OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Обновление OpenCode в {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Обновите OpenCode в {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Обновить OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode в {{distro}} готов к работе.",
+  "wsl.onboarding.opencodeReady": "OpenCode готов к работе.",
+  "wsl.onboarding.installOpencodeIn": "Установите OpenCode в {{distro}}.",
+  "wsl.onboarding.installOpencode": "Установить OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Сначала выберите дистрибутив.",
+  "wsl.onboarding.loadFailed": "Не удалось загрузить состояние WSL.",
+  "wsl.onboarding.loading": "Загрузка...",
+  "wsl.onboarding.installedDistros": "Установленные дистрибутивы",
+  "wsl.onboarding.checkAgain": "Проверить снова",
+  "wsl.onboarding.distroStatus.ready": "Готов",
+  "wsl.onboarding.distroStatus.checking": "Проверка...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode не установлен",
+  "wsl.onboarding.distroStatus.missingTools": "Отсутствуют bash и curl",
+  "wsl.onboarding.distroStatus.unsupported": "Не поддерживается · Используйте WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Нужен другой дистрибутив?",
+  "wsl.onboarding.needAnotherDistroHint": "Установите дистрибутив Linux из каталога WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL не установлена",
+  "wsl.onboarding.wslNotInstalled.description":
+    "Для добавления сервера WSL в OpenCode требуется WSL (Windows Subsystem for Linux)",
+  "wsl.onboarding.wslUnavailable.title": "WSL недоступна",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode не смог проверить WSL на этом компьютере.",
+  "wsl.onboarding.installWsl": "Установить WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Перезапустите Windows, чтобы завершить установку WSL, затем снова откройте OpenCode.",
+  "wsl.onboarding.next": "Далее",
+  "wsl.onboarding.refresh": "Обновить",
+  "wsl.onboarding.allDistrosAdded": "Все установленные дистрибутивы уже добавлены.",
+  "wsl.onboarding.noDistros": "Дистрибутивы пока не обнаружены.",
+  "wsl.onboarding.install": "Установить",
+  "wsl.onboarding.installing": "Установка...",
+  "wsl.onboarding.installDistro": "Установить дистрибутив",
+  "wsl.onboarding.searchDistros": "Поиск дистрибутивов",
+  "wsl.onboarding.wsl2Required": "Требуется WSL 2.",
+  "wsl.onboarding.toolsRequired": "Для этого дистрибутива нужны bash и curl.",
+  "wsl.onboarding.openTerminal": "Открыть терминал",
+  "wsl.onboarding.path": "Путь: {{path}}",
+  "wsl.onboarding.notFound": "не найден",
+  "wsl.onboarding.version": "Версия: {{version}}",
+  "wsl.onboarding.unknown": "неизвестно",
+  "wsl.onboarding.desktopVersion": "приложение {{version}}",
+  "wsl.onboarding.versionMismatch": "Установленная версия не соответствует версии приложения.",
+  "wsl.onboarding.adding": "Добавление...",
 
   "dialog.project.edit.title": "Редактировать проект",
   "dialog.project.edit.name": "Название",
@@ -405,6 +486,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -452,10 +534,12 @@ export const dict = {
 
   "error.page.title": "Что-то пошло не так",
   "error.page.description": "Произошла ошибка при загрузке приложения.",
+  "error.page.description.localServerStartup": "Произошла ошибка при запуске локального сервера.",
   "error.page.details.label": "Детали ошибки",
   "error.page.action.restart": "Перезапустить",
   "error.page.action.report": "Сообщить об ошибке",
   "error.page.action.reported": "Об ошибке сообщено",
+  "error.page.action.exportLogs": "Экспортировать журналы",
   "error.page.action.checking": "Проверка...",
   "error.page.action.checkUpdates": "Проверить обновления",
   "error.page.action.updateTo": "Обновить до {{version}}",
@@ -505,11 +589,31 @@ export const dict = {
   "home.recentProjects": "Недавние проекты",
   "home.empty.title": "Нет недавних проектов",
   "home.empty.description": "Начните с открытия локального проекта",
+  "home.title": "Главная",
+  "home.projects": "Проекты",
+  "home.project.add": "Добавить проект",
+  "home.recentlyClosed": "Недавно закрытые",
+  "home.server.collapse": "Свернуть проекты сервера",
+  "home.server.expand": "Развернуть проекты сервера",
+  "home.sessions.search.placeholder": "Поиск сессий",
+  "home.sessions.search.placeholder.scoped": "Поиск сессий в {{scope}}",
+  "home.sessions.search.sessions": "Сессии",
+  "home.sessions.search.noResults": "Сессии по запросу {{query}} не найдены",
+  "home.sessions.empty": "Здесь пока ничего нет",
+  "home.sessions.empty.description": "Создайте сессию, чтобы начать",
+  "home.sessions.group.today": "Сегодня",
+  "home.sessions.group.yesterday": "Вчера",
+  "home.sessions.group.older": "Ранее",
 
   "session.tab.session": "Сессия",
   "session.tab.review": "Обзор",
   "session.tab.context": "Контекст",
+  "session.tab.unknown": "Неизвестная сессия",
   "session.panel.reviewAndFiles": "Обзор и файлы",
+  "session.error.notFound": "Эта сессия не найдена",
+  "session.error.notFound.description": "Эта вкладка указывает на сессию, которой больше нет на этом сервере.",
+  "session.error.notFound.closeTab": "Закрыть вкладку",
+  "session.error.serverConnection": "Не удаётся подключиться к этому серверу",
   "session.review.filesChanged": "{{count}} файлов изменено",
   "session.review.change.one": "Изменение",
   "session.review.change.other": "Изменения",
@@ -518,6 +622,8 @@ export const dict = {
   "session.review.noVcs": "Система контроля версий Git не обнаружена, изменения не отображаются",
   "session.review.noSnapshot": "Отслеживание снимков отключено в настройках, поэтому изменения сессии недоступны",
   "session.review.noChanges": "Нет изменений",
+  "session.review.noUncommittedChanges": "Пока нет незафиксированных изменений",
+  "session.review.noBranchChanges": "Пока нет изменений в ветке",
   "session.files.selectToOpen": "Выберите файл, чтобы открыть",
   "session.files.all": "Все файлы",
   "session.files.empty": "Нет файлов",
@@ -532,6 +638,10 @@ export const dict = {
   "session.todo.title": "Задачи",
   "session.todo.collapse": "Свернуть",
   "session.todo.expand": "Развернуть",
+  "session.question.minimize": "Свернуть вопрос",
+  "session.question.restore": "Восстановить вопрос",
+  "session.question.pending.one": "{{count}} вопрос без ответа",
+  "session.question.pending.other": "Вопросы без ответа: {{count}}",
   "session.followupDock.summary.one": "{{count}} сообщение в очереди",
   "session.followupDock.summary.other": "{{count}} сообщений в очереди",
   "session.followupDock.sendNow": "Отправить сейчас",
@@ -545,9 +655,16 @@ export const dict = {
   "session.revertDock.restore": "Восстановить сообщение",
 
   "session.new.title": "Создавайте что угодно",
+  "session.new.project.new": "Новый проект",
+  "session.new.project.search": "Поиск проектов",
+  "session.new.project.add": "Добавить проект",
   "session.new.worktree.main": "Основная ветка",
   "session.new.worktree.mainWithBranch": "Основная ветка ({{branch}})",
   "session.new.worktree.create": "Создать новый worktree",
+  "session.new.workspace.runIn": "Запустить сессию в",
+  "session.new.workspace.triggerLocal": "Локально",
+  "session.new.workspace.local": "Локальный репозиторий",
+  "session.new.workspace.existing": "Рабочее пространство…",
   "session.new.lastModified": "Последнее изменение",
 
   "session.header.search.placeholder": "Поиск {{project}}",
@@ -619,6 +736,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Недавние сессии",
   "sidebar.project.viewAllSessions": "Посмотреть все сессии",
   "sidebar.project.clearNotifications": "Очистить уведомления",
+  "sidebar.empty.title": "Нет открытых проектов",
+  "sidebar.empty.description": "Откройте проект, чтобы начать",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Приложение",
@@ -630,6 +749,7 @@ export const dict = {
   "settings.desktop.wsl.description": "Запускать сервер OpenCode внутри WSL на Windows.",
 
   "settings.general.section.appearance": "Внешний вид",
+  "settings.general.section.advanced": "Дополнительно",
   "settings.general.section.notifications": "Системные уведомления",
   "settings.general.section.updates": "Обновления",
   "settings.general.section.sounds": "Звуковые эффекты",
@@ -638,6 +758,11 @@ export const dict = {
 
   "settings.general.row.language.title": "Язык",
   "settings.general.row.language.description": "Изменить язык отображения OpenCode",
+  "settings.general.row.shell.title": "Оболочка терминала",
+  "settings.general.row.shell.description":
+    "Выберите оболочку для терминала. Совместимые оболочки также используются агентом при вызове инструментов.",
+  "settings.general.row.shell.autoDefault": "Авто (по умолчанию)",
+  "settings.general.row.shell.terminalOnly": "только терминал",
   "settings.general.row.appearance.title": "Внешний вид",
   "settings.general.row.appearance.description": "Настройте как OpenCode выглядит на вашем устройстве",
   "settings.general.row.colorScheme.title": "Цветовая схема",
@@ -646,8 +771,8 @@ export const dict = {
   "settings.general.row.theme.description": "Настройте оформление OpenCode.",
   "settings.general.row.font.title": "Шрифт кода",
   "settings.general.row.font.description": "Настройте шрифт, используемый в блоках кода",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Шрифт терминала",
+  "settings.general.row.terminalFont.description": "Настройте шрифт, используемый в терминале",
   "settings.general.row.uiFont.title": "Шрифт интерфейса",
   "settings.general.row.uiFont.description": "Настройте шрифт, используемый во всем интерфейсе",
   "settings.general.row.followup.title": "Поведение уточняющих вопросов",
@@ -655,6 +780,22 @@ export const dict = {
     "Выберите, отправлять ли уточняющие вопросы сразу или помещать их в очередь",
   "settings.general.row.followup.option.queue": "Очередь",
   "settings.general.row.followup.option.steer": "Направлять",
+  "settings.general.row.showFileTree.title": "Дерево файлов",
+  "settings.general.row.showFileTree.description": "Показывать панель дерева файлов в сессиях",
+  "settings.general.row.showNavigation.title": "Элементы навигации",
+  "settings.general.row.showNavigation.description":
+    "Показывать кнопки «Назад» и «Вперёд» в строке заголовка приложения",
+  "settings.general.row.showSearch.title": "Палитра команд",
+  "settings.general.row.showSearch.description": "Показывать кнопку поиска и палитры команд в строке заголовка",
+  "settings.general.row.showTerminal.title": "Терминал",
+  "settings.general.row.showTerminal.description": "Показывать кнопку терминала в строке заголовка приложения",
+  "settings.general.row.showStatus.title": "Состояние сервера",
+  "settings.general.row.showStatus.description": "Показывать кнопку состояния сервера в строке заголовка",
+  "settings.general.row.mobileTitlebarBottom.title": "Нижняя навигация",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "На мобильных устройствах размещать строку заголовка и вкладки сессии внизу экрана",
+  "settings.general.row.showCustomAgents.title": "Пользовательские агенты",
+  "settings.general.row.showCustomAgents.description": "Показывать выбор агента в редакторе запросов",
   "settings.general.row.reasoningSummaries.title": "Показывать сводки рассуждений",
   "settings.general.row.reasoningSummaries.description": "Отображать сводки рассуждений модели в ленте",
 
@@ -664,6 +805,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Разворачивать элементы инструмента edit",
   "settings.general.row.editToolPartsExpanded.description":
     "Показывать элементы инструментов edit, write и patch в ленте развернутыми по умолчанию",
+  "settings.general.row.newLayoutDesigns.title": "Новая компоновка и оформление",
+  "settings.general.row.newLayoutDesigns.description":
+    "Включить обновлённую компоновку, главную страницу, редактор запросов и интерфейс сессии",
+  "settings.general.row.pinchZoom.title": "Масштабирование щипком",
+  "settings.general.row.pinchZoom.description":
+    "Разрешить масштабирование жестом щипка на трекпаде и прокруткой с Ctrl",
   "settings.general.row.wayland.title": "Использовать нативный Wayland",
   "settings.general.row.wayland.description": "Отключить X11 fallback на Wayland. Требуется перезапуск.",
   "settings.general.row.wayland.tooltip":
@@ -678,6 +825,8 @@ export const dict = {
   "settings.updates.row.check.description": "Проверить обновления вручную и установить, если доступны",
   "settings.updates.action.checkNow": "Проверить сейчас",
   "settings.updates.action.checking": "Проверка...",
+  "settings.updates.action.downloading": "Загрузка...",
+  "settings.updates.action.installing": "Установка...",
   "settings.updates.toast.latest.title": "У вас последняя версия",
   "settings.updates.toast.latest.description": "Вы используете последнюю версию OpenCode.",
   "sound.option.none": "Нет",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index d066f3c616b8..686db7407c5b 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -23,6 +23,9 @@ export const dict = {
 
   "command.sidebar.toggle": "สลับแถบข้าง",
   "command.project.open": "เปิดโปรเจกต์",
+  "command.project.previous": "โปรเจกต์ก่อนหน้า",
+  "command.project.next": "โปรเจกต์ถัดไป",
+  "command.project.index": "สลับไปยังโปรเจกต์ {{index}}",
   "command.provider.connect": "เชื่อมต่อผู้ให้บริการ",
   "command.server.switch": "สลับเซิร์ฟเวอร์",
   "command.settings.open": "เปิดการตั้งค่า",
@@ -32,7 +35,7 @@ export const dict = {
   "command.session.next.unseen": "เซสชันที่ยังไม่ได้อ่านถัดไป",
   "command.session.archive": "จัดเก็บเซสชัน",
 
-  "command.palette": "คำสั่งค้นหา",
+  "command.palette": "ชุดคำสั่ง",
 
   "command.theme.cycle": "เปลี่ยนธีม",
   "command.theme.set": "ใช้ธีม: {{theme}}",
@@ -45,6 +48,7 @@ export const dict = {
   "command.session.new": "เซสชันใหม่",
   "command.file.open": "เปิดไฟล์",
   "command.tab.close": "ปิดแท็บ",
+  "command.tab.reopenClosed": "เปิดแท็บที่ปิดไปอีกครั้ง",
   "command.context.addSelection": "เพิ่มส่วนที่เลือกไปยังบริบท",
   "command.context.addSelection.description": "เพิ่มบรรทัดที่เลือกจากไฟล์ปัจจุบัน",
   "command.input.focus": "โฟกัสช่องป้อนข้อมูล",
@@ -163,7 +167,7 @@ export const dict = {
   "provider.custom.field.providerID.placeholder": "myprovider",
   "provider.custom.field.providerID.description": "ตัวอักษรพิมพ์เล็ก ตัวเลข ยัติภังค์ หรือขีดล่าง",
   "provider.custom.field.name.label": "ชื่อที่แสดง",
-  "provider.custom.field.name.placeholder": "My AI Provider",
+  "provider.custom.field.name.placeholder": "ผู้ให้บริการ AI ของฉัน",
   "provider.custom.field.baseURL.label": "URL พื้นฐาน",
   "provider.custom.field.baseURL.placeholder": "https://api.myprovider.com/v1",
   "provider.custom.field.apiKey.label": "คีย์ API",
@@ -208,6 +212,11 @@ export const dict = {
   "model.input.video": "วิดีโอ",
   "model.input.pdf": "PDF",
   "model.tooltip.allows": "อนุญาต: {{inputs}}",
+  "model.tooltip.context.label": "บริบท",
+  "model.tooltip.inputs": "ข้อมูลนำเข้า",
+  "model.tooltip.model": "โมเดล",
+  "model.tooltip.provider": "ผู้ให้บริการ",
+  "model.tooltip.reasoning": "การใช้เหตุผล",
   "model.tooltip.reasoning.allowed": "อนุญาตการใช้เหตุผล",
   "model.tooltip.reasoning.none": "ไม่มีการใช้เหตุผล",
   "model.tooltip.context": "ขีดจำกัดบริบท {{limit}}",
@@ -218,6 +227,7 @@ export const dict = {
   "common.loading": "กำลังโหลด",
   "common.loading.ellipsis": "...",
   "common.cancel": "ยกเลิก",
+  "common.clear": "ล้าง",
   "common.connect": "เชื่อมต่อ",
   "common.disconnect": "ยกเลิกการเชื่อมต่อ",
   "common.continue": "ส่ง",
@@ -235,6 +245,8 @@ export const dict = {
   "prompt.mode.shell": "เชลล์",
   "prompt.mode.normal": "พรอมต์",
   "prompt.mode.shell.exit": "กด esc เพื่อออก",
+  "session.child.promptDisabled": "ไม่สามารถส่งพรอมต์ในเซสชันเอเจนต์ย่อยได้.",
+  "session.child.backToParent": "กลับไปยังเซสชันหลัก.",
 
   "prompt.example.1": "แก้ไข TODO ในโค้ดเบส",
   "prompt.example.2": "เทคโนโลยีของโปรเจกต์นี้คืออะไร?",
@@ -341,6 +353,75 @@ export const dict = {
   "dialog.server.menu.delete": "ลบ",
   "dialog.server.current": "เซิร์ฟเวอร์ปัจจุบัน",
   "dialog.server.status.default": "ค่าเริ่มต้น",
+  "wsl.server.add": "เพิ่มเซิร์ฟเวอร์ WSL",
+  "wsl.server.addShort": "เพิ่ม WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "เซิร์ฟเวอร์ WSL",
+  "wsl.server.retryStart": "ลองเริ่มอีกครั้ง",
+  "wsl.server.updating": "กำลังอัปเดต...",
+  "wsl.onboarding.step.distro": "เลือกดิสโทร",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "กำลังตรวจสอบ WSL...",
+  "wsl.onboarding.restartRequired": "ต้องรีสตาร์ท Windows เพื่อให้การติดตั้ง WSL เสร็จสมบูรณ์.",
+  "wsl.onboarding.ready": "WSL พร้อมใช้งานแล้ว.",
+  "wsl.onboarding.required": "ต้องมี WSL เพื่อดำเนินการต่อ.",
+  "wsl.onboarding.checkingDistros": "กำลังตรวจสอบดิสโทร...",
+  "wsl.onboarding.installingDistro": "กำลังติดตั้ง {{distro}}...",
+  "wsl.onboarding.checkingDistro": "กำลังตรวจสอบ {{distro}}...",
+  "wsl.onboarding.listingDistros": "กำลังแสดงรายการดิสโทร...",
+  "wsl.onboarding.distroReady": "{{distro}} พร้อมใช้งานแล้ว.",
+  "wsl.onboarding.distroNotInstalled": "ยังไม่ได้ติดตั้ง {{distro}}.",
+  "wsl.onboarding.openDistroOnce": "เปิด {{distro}} หนึ่งครั้งเพื่อให้การตั้งค่าเสร็จสมบูรณ์.",
+  "wsl.onboarding.finishingDistro": "กำลังตั้งค่า {{distro}} ให้เสร็จสมบูรณ์.",
+  "wsl.onboarding.pickDistro": "เลือกดิสโทรหรือติดตั้งจากรายการด้านล่าง.",
+  "wsl.onboarding.checkingOpencode": "กำลังตรวจสอบ OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "กำลังตรวจสอบ OpenCode ใน {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "กำลังอัปเดต OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "กำลังอัปเดต OpenCode ใน {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "อัปเดต OpenCode ใน {{distro}}.",
+  "wsl.onboarding.updateOpencode": "อัปเดต OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode พร้อมใช้งานใน {{distro}} แล้ว.",
+  "wsl.onboarding.opencodeReady": "OpenCode พร้อมใช้งานแล้ว.",
+  "wsl.onboarding.installOpencodeIn": "ติดตั้ง OpenCode ใน {{distro}}.",
+  "wsl.onboarding.installOpencode": "ติดตั้ง OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "เลือกดิสโทรก่อน.",
+  "wsl.onboarding.loadFailed": "ไม่สามารถโหลดสถานะ WSL ได้.",
+  "wsl.onboarding.loading": "กำลังโหลด...",
+  "wsl.onboarding.installedDistros": "ดิสโทรที่ติดตั้งแล้ว",
+  "wsl.onboarding.checkAgain": "ตรวจสอบอีกครั้ง",
+  "wsl.onboarding.distroStatus.ready": "พร้อมใช้งาน",
+  "wsl.onboarding.distroStatus.checking": "กำลังตรวจสอบ...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "ยังไม่ได้ติดตั้ง OpenCode",
+  "wsl.onboarding.distroStatus.missingTools": "ไม่มี bash, curl",
+  "wsl.onboarding.distroStatus.unsupported": "ไม่รองรับ · ใช้ WSL 2",
+  "wsl.onboarding.needAnotherDistro": "ต้องการดิสโทรอื่น?",
+  "wsl.onboarding.needAnotherDistroHint": "ติดตั้งดิสทริบิวชัน Linux จากแค็ตตาล็อก WSL",
+  "wsl.onboarding.wslNotInstalled.title": "ยังไม่ได้ติดตั้ง WSL",
+  "wsl.onboarding.wslNotInstalled.description":
+    "ต้องมี WSL (Windows Subsystem for Linux) ก่อนที่ OpenCode จะเพิ่มเซิร์ฟเวอร์ WSL ได้",
+  "wsl.onboarding.wslUnavailable.title": "WSL ไม่พร้อมใช้งาน",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode ไม่สามารถตรวจสอบ WSL บนเครื่องนี้ได้.",
+  "wsl.onboarding.installWsl": "ติดตั้ง WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "รีสตาร์ท Windows เพื่อให้การติดตั้ง WSL เสร็จสมบูรณ์ แล้วเปิด OpenCode อีกครั้ง.",
+  "wsl.onboarding.next": "ถัดไป",
+  "wsl.onboarding.refresh": "รีเฟรช",
+  "wsl.onboarding.allDistrosAdded": "เพิ่มดิสโทรที่ติดตั้งไว้ทั้งหมดแล้ว.",
+  "wsl.onboarding.noDistros": "ยังไม่พบดิสโทร.",
+  "wsl.onboarding.install": "ติดตั้ง",
+  "wsl.onboarding.installing": "กำลังติดตั้ง...",
+  "wsl.onboarding.installDistro": "ติดตั้งดิสโทร",
+  "wsl.onboarding.searchDistros": "ค้นหาดิสโทร",
+  "wsl.onboarding.wsl2Required": "ต้องใช้ WSL 2.",
+  "wsl.onboarding.toolsRequired": "ดิสโทรนี้ต้องมี bash และ curl.",
+  "wsl.onboarding.openTerminal": "เปิดเทอร์มินัล",
+  "wsl.onboarding.path": "เส้นทาง: {{path}}",
+  "wsl.onboarding.notFound": "ไม่พบ",
+  "wsl.onboarding.version": "เวอร์ชัน: {{version}}",
+  "wsl.onboarding.unknown": "ไม่ทราบ",
+  "wsl.onboarding.desktopVersion": "เดสก์ท็อป {{version}}",
+  "wsl.onboarding.versionMismatch": "เวอร์ชันที่ติดตั้งไม่ตรงกับเวอร์ชันของแอปเดสก์ท็อป.",
+  "wsl.onboarding.adding": "กำลังเพิ่ม...",
 
   "dialog.project.edit.title": "แก้ไขโปรเจกต์",
   "dialog.project.edit.name": "ชื่อ",
@@ -403,6 +484,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -451,10 +533,12 @@ export const dict = {
 
   "error.page.title": "เกิดข้อผิดพลาด",
   "error.page.description": "เกิดข้อผิดพลาดระหว่างการโหลดแอปพลิเคชัน",
+  "error.page.description.localServerStartup": "เกิดข้อผิดพลาดขณะเริ่มเซิร์ฟเวอร์ในเครื่อง.",
   "error.page.details.label": "รายละเอียดข้อผิดพลาด",
   "error.page.action.restart": "รีสตาร์ท",
   "error.page.action.report": "รายงานข้อผิดพลาด",
   "error.page.action.reported": "รายงานข้อผิดพลาดแล้ว",
+  "error.page.action.exportLogs": "ส่งออกบันทึก",
   "error.page.action.checking": "กำลังตรวจสอบ...",
   "error.page.action.checkUpdates": "ตรวจสอบการอัปเดต",
   "error.page.action.updateTo": "อัปเดตเป็น {{version}}",
@@ -500,11 +584,31 @@ export const dict = {
   "home.recentProjects": "โปรเจกต์ล่าสุด",
   "home.empty.title": "ไม่มีโปรเจกต์ล่าสุด",
   "home.empty.description": "เริ่มต้นโดยเปิดโปรเจกต์ในเครื่อง",
+  "home.title": "หน้าหลัก",
+  "home.projects": "โปรเจกต์",
+  "home.project.add": "เพิ่มโปรเจกต์",
+  "home.recentlyClosed": "ที่ปิดไปล่าสุด",
+  "home.server.collapse": "ย่อโปรเจกต์ของเซิร์ฟเวอร์",
+  "home.server.expand": "ขยายโปรเจกต์ของเซิร์ฟเวอร์",
+  "home.sessions.search.placeholder": "ค้นหาเซสชัน",
+  "home.sessions.search.placeholder.scoped": "ค้นหาเซสชันใน {{scope}}",
+  "home.sessions.search.sessions": "เซสชัน",
+  "home.sessions.search.noResults": "ไม่พบเซสชันสำหรับ {{query}}",
+  "home.sessions.empty": "ยังไม่มีอะไรที่นี่",
+  "home.sessions.empty.description": "สร้างเซสชันเพื่อเริ่มต้น",
+  "home.sessions.group.today": "วันนี้",
+  "home.sessions.group.yesterday": "เมื่อวาน",
+  "home.sessions.group.older": "ก่อนหน้านี้",
 
   "session.tab.session": "เซสชัน",
   "session.tab.review": "ตรวจสอบ",
   "session.tab.context": "บริบท",
+  "session.tab.unknown": "เซสชันที่ไม่รู้จัก",
   "session.panel.reviewAndFiles": "ตรวจสอบและไฟล์",
+  "session.error.notFound": "ไม่พบเซสชันนี้",
+  "session.error.notFound.description": "แท็บนี้อ้างถึงเซสชันที่ไม่มีอยู่บนเซิร์ฟเวอร์นี้แล้ว.",
+  "session.error.notFound.closeTab": "ปิดแท็บ",
+  "session.error.serverConnection": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์นี้",
   "session.review.filesChanged": "{{count}} ไฟล์ที่เปลี่ยนแปลง",
   "session.review.change.one": "การเปลี่ยนแปลง",
   "session.review.change.other": "การเปลี่ยนแปลง",
@@ -513,6 +617,8 @@ export const dict = {
   "session.review.noVcs": "ไม่ตรวจพบระบบควบคุมเวอร์ชัน Git การเปลี่ยนแปลงจะไม่แสดง",
   "session.review.noSnapshot": "การติดตามสแนปชอตถูกปิดใช้งานในการกำหนดค่า ดังนั้นการเปลี่ยนแปลงเซสชันจึงไม่พร้อมใช้งาน",
   "session.review.noChanges": "ไม่มีการเปลี่ยนแปลง",
+  "session.review.noUncommittedChanges": "ยังไม่มีการเปลี่ยนแปลงที่รอคอมมิต",
+  "session.review.noBranchChanges": "ยังไม่มีการเปลี่ยนแปลงในสาขา",
 
   "session.files.selectToOpen": "เลือกไฟล์เพื่อเปิด",
   "session.files.empty": "ไม่มีไฟล์",
@@ -529,6 +635,10 @@ export const dict = {
   "session.todo.title": "สิ่งที่ต้องทำ",
   "session.todo.collapse": "ย่อ",
   "session.todo.expand": "ขยาย",
+  "session.question.minimize": "ย่อคำถาม",
+  "session.question.restore": "คืนค่าคำถาม",
+  "session.question.pending.one": "คำถามที่รอดำเนินการ {{count}} ข้อ",
+  "session.question.pending.other": "คำถามที่รอดำเนินการ {{count}} ข้อ",
   "session.followupDock.summary.one": "{{count}} ข้อความในคิว",
   "session.followupDock.summary.other": "{{count}} ข้อความในคิว",
   "session.followupDock.sendNow": "ส่งทันที",
@@ -542,9 +652,16 @@ export const dict = {
   "session.revertDock.restore": "กู้คืนข้อความ",
 
   "session.new.title": "สร้างอะไรก็ได้",
+  "session.new.project.new": "โปรเจกต์ใหม่",
+  "session.new.project.search": "ค้นหาโปรเจกต์",
+  "session.new.project.add": "เพิ่มโปรเจกต์",
   "session.new.worktree.main": "สาขาหลัก",
   "session.new.worktree.mainWithBranch": "สาขาหลัก ({{branch}})",
   "session.new.worktree.create": "สร้าง worktree ใหม่",
+  "session.new.workspace.runIn": "เรียกใช้เซสชันใน",
+  "session.new.workspace.triggerLocal": "ในเครื่อง",
+  "session.new.workspace.local": "รีโพซิทอรีในเครื่อง",
+  "session.new.workspace.existing": "พื้นที่ทำงาน…",
   "session.new.lastModified": "แก้ไขล่าสุด",
 
   "session.header.search.placeholder": "ค้นหา {{project}}",
@@ -612,6 +729,8 @@ export const dict = {
   "sidebar.project.recentSessions": "เซสชันล่าสุด",
   "sidebar.project.viewAllSessions": "ดูเซสชันทั้งหมด",
   "sidebar.project.clearNotifications": "ล้างการแจ้งเตือน",
+  "sidebar.empty.title": "ไม่มีโปรเจกต์ที่เปิดอยู่",
+  "sidebar.empty.description": "เปิดโปรเจกต์เพื่อเริ่มต้น",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -624,6 +743,7 @@ export const dict = {
   "settings.desktop.wsl.description": "เรียกใช้เซิร์ฟเวอร์ OpenCode ภายใน WSL บน Windows",
 
   "settings.general.section.appearance": "รูปลักษณ์",
+  "settings.general.section.advanced": "ขั้นสูง",
   "settings.general.section.notifications": "การแจ้งเตือนระบบ",
   "settings.general.section.updates": "การอัปเดต",
   "settings.general.section.sounds": "เสียงเอฟเฟกต์",
@@ -632,6 +752,11 @@ export const dict = {
 
   "settings.general.row.language.title": "ภาษา",
   "settings.general.row.language.description": "เปลี่ยนภาษาที่แสดงสำหรับ OpenCode",
+  "settings.general.row.shell.title": "เชลล์เทอร์มินัล",
+  "settings.general.row.shell.description":
+    "เลือกเชลล์ที่จะใช้กับเทอร์มินัล เชลล์ที่เข้ากันได้จะใช้สำหรับการเรียกเครื่องมือของเอเจนต์ด้วย",
+  "settings.general.row.shell.autoDefault": "อัตโนมัติ (ค่าเริ่มต้น)",
+  "settings.general.row.shell.terminalOnly": "เทอร์มินัลเท่านั้น",
   "settings.general.row.appearance.title": "รูปลักษณ์",
   "settings.general.row.appearance.description": "ปรับแต่งวิธีการที่ OpenCode มีลักษณะบนอุปกรณ์ของคุณ",
   "settings.general.row.colorScheme.title": "โทนสี",
@@ -640,14 +765,29 @@ export const dict = {
   "settings.general.row.theme.description": "ปรับแต่งวิธีการที่ OpenCode มีธีม",
   "settings.general.row.font.title": "ฟอนต์โค้ด",
   "settings.general.row.font.description": "ปรับแต่งฟอนต์ที่ใช้ในบล็อกโค้ด",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "ฟอนต์เทอร์มินัล",
+  "settings.general.row.terminalFont.description": "ปรับแต่งฟอนต์ที่ใช้ในเทอร์มินัล",
   "settings.general.row.uiFont.title": "ฟอนต์ UI",
   "settings.general.row.uiFont.description": "ปรับแต่งฟอนต์ที่ใช้ทั่วทั้งอินเทอร์เฟซ",
   "settings.general.row.followup.title": "พฤติกรรมการติดตามผล",
   "settings.general.row.followup.description": "เลือกว่าจะให้พร้อมท์ติดตามผลทำงานทันทีหรือรอในคิว",
   "settings.general.row.followup.option.queue": "คิว",
   "settings.general.row.followup.option.steer": "นำทาง",
+  "settings.general.row.showFileTree.title": "ต้นไม้ไฟล์",
+  "settings.general.row.showFileTree.description": "แสดงแผงต้นไม้ไฟล์ในเซสชัน",
+  "settings.general.row.showNavigation.title": "ตัวควบคุมการนำทาง",
+  "settings.general.row.showNavigation.description": "แสดงปุ่มย้อนกลับและไปข้างหน้าในแถบชื่อเรื่องเดสก์ท็อป",
+  "settings.general.row.showSearch.title": "ชุดคำสั่ง",
+  "settings.general.row.showSearch.description": "แสดงปุ่มค้นหาและชุดคำสั่งในแถบชื่อเรื่อง",
+  "settings.general.row.showTerminal.title": "เทอร์มินัล",
+  "settings.general.row.showTerminal.description": "แสดงปุ่มเทอร์มินัลในแถบชื่อเรื่องเดสก์ท็อป",
+  "settings.general.row.showStatus.title": "สถานะเซิร์ฟเวอร์",
+  "settings.general.row.showStatus.description": "แสดงปุ่มสถานะเซิร์ฟเวอร์ในแถบชื่อเรื่อง",
+  "settings.general.row.mobileTitlebarBottom.title": "การนำทางด้านล่าง",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "วางแถบชื่อเรื่องและแท็บเซสชันไว้ด้านล่างของหน้าจอบนอุปกรณ์เคลื่อนที่",
+  "settings.general.row.showCustomAgents.title": "เอเจนต์ที่กำหนดเอง",
+  "settings.general.row.showCustomAgents.description": "แสดงตัวเลือกเอเจนต์ในช่องเขียนข้อความ",
   "settings.general.row.reasoningSummaries.title": "แสดงสรุปการใช้เหตุผล",
   "settings.general.row.reasoningSummaries.description": "แสดงสรุปการใช้เหตุผลของโมเดลในไทม์ไลน์",
   "settings.general.row.shellToolPartsExpanded.title": "ขยายส่วนเครื่องมือ shell",
@@ -655,6 +795,11 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "ขยายส่วนเครื่องมือ edit",
   "settings.general.row.editToolPartsExpanded.description":
     "แสดงส่วนเครื่องมือ edit, write และ patch แบบขยายตามค่าเริ่มต้นในไทม์ไลน์",
+  "settings.general.row.newLayoutDesigns.title": "เลย์เอาต์และดีไซน์ใหม่",
+  "settings.general.row.newLayoutDesigns.description":
+    "เปิดใช้เลย์เอาต์ หน้าแรก ช่องเขียนข้อความ และ UI เซสชันที่ออกแบบใหม่",
+  "settings.general.row.pinchZoom.title": "บีบนิ้วเพื่อซูม",
+  "settings.general.row.pinchZoom.description": "อนุญาตให้ใช้ท่าบีบนิ้วบนแทร็คแพดและ Ctrl-scroll เพื่อซูม",
   "settings.general.row.wayland.title": "ใช้ Wayland แบบเนทีฟ",
   "settings.general.row.wayland.description": "ปิดใช้งาน X11 fallback บน Wayland ต้องรีสตาร์ท",
   "settings.general.row.wayland.tooltip": "บน Linux ที่มีจอภาพรีเฟรชเรตแบบผสม Wayland แบบเนทีฟอาจเสถียรกว่า",
@@ -668,6 +813,8 @@ export const dict = {
   "settings.updates.row.check.description": "ตรวจสอบการอัปเดตด้วยตนเองและติดตั้งหากมี",
   "settings.updates.action.checkNow": "ตรวจสอบทันที",
   "settings.updates.action.checking": "กำลังตรวจสอบ...",
+  "settings.updates.action.downloading": "กำลังดาวน์โหลด...",
+  "settings.updates.action.installing": "กำลังติดตั้ง...",
   "settings.updates.toast.latest.title": "คุณเป็นเวอร์ชันล่าสุดแล้ว",
   "settings.updates.toast.latest.description": "คุณกำลังใช้งาน OpenCode เวอร์ชันล่าสุด",
 
@@ -857,10 +1004,10 @@ export const dict = {
   "dialog.server.add.usernamePlaceholder": "ชื่อผู้ใช้",
   "dialog.server.add.passwordPlaceholder": "รหัสผ่าน",
   "server.row.noUsername": "ไม่มีชื่อผู้ใช้",
-  "session.review.noVcs.createGit.title": "สร้าง Git repository",
+  "session.review.noVcs.createGit.title": "สร้าง Git รีโพซิทอรี",
   "session.review.noVcs.createGit.description": "ติดตาม ตรวจสอบ และเลิกทำสิ่งเปลี่ยนแปลงในโปรเจกต์นี้",
-  "session.review.noVcs.createGit.actionLoading": "กำลังสร้าง Git repository...",
-  "session.review.noVcs.createGit.action": "สร้าง Git repository",
+  "session.review.noVcs.createGit.actionLoading": "กำลังสร้าง Git รีโพซิทอรี...",
+  "session.review.noVcs.createGit.action": "สร้าง Git รีโพซิทอรี",
   "session.todo.progress": "เสร็จสิ้น {{done}} จาก {{total}} รายการ",
   "session.question.progress": "{{current}} จาก {{total}} คำถาม",
   "session.header.open.finder": "Finder",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index 90531735994f..b578f89cca85 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -27,6 +27,9 @@ export const dict = {
 
   "command.sidebar.toggle": "Kenar çubuğunu aç/kapat",
   "command.project.open": "Proje aç",
+  "command.project.previous": "Önceki proje",
+  "command.project.next": "Sonraki proje",
+  "command.project.index": "{{index}} numaralı projeye geç",
   "command.provider.connect": "Sağlayıcı bağla",
   "command.server.switch": "Sunucu değiştir",
   "command.settings.open": "Ayarları aç",
@@ -49,6 +52,7 @@ export const dict = {
   "command.session.new": "Yeni oturum",
   "command.file.open": "Dosya aç",
   "command.tab.close": "Sekmeyi kapat",
+  "command.tab.reopenClosed": "Kapatılan sekmeyi yeniden aç",
   "command.context.addSelection": "Seçimi bağlama ekle",
   "command.context.addSelection.description": "Mevcut dosyadan seçili satırları ekle",
   "command.input.focus": "Girişi odakla",
@@ -132,7 +136,7 @@ export const dict = {
   "provider.connect.status.waiting": "Yetkilendirme bekleniyor...",
   "provider.connect.status.failed": "Yetkilendirme başarısız: {{error}}",
   "provider.connect.apiKey.description":
-    "{{provider}} hesabınızı bağlamak ve OpenCode'da {{provider}} modellerini kullanmak için {{provider}} API anahtarınızı girin.",
+    "{{provider}} hesabınızı bağlamak ve OpenCode'da {{provider}} modellerini kullanmak için API anahtarınızı girin.",
   "provider.connect.apiKey.label": "{{provider}} API anahtarı",
   "provider.connect.apiKey.placeholder": "API anahtarı",
   "provider.connect.apiKey.required": "API anahtarı gerekli",
@@ -143,10 +147,10 @@ export const dict = {
   "provider.connect.opencodeZen.visit.prefix": "",
   "provider.connect.opencodeZen.visit.link": "opencode.ai/zen",
   "provider.connect.opencodeZen.visit.suffix": " adresini ziyaret ederek API anahtarınızı alın.",
-  "provider.connect.oauth.code.visit.prefix":
-    "Hesabınızı bağlamak ve OpenCode'da {{provider}} modellerini kullanmak için ",
+  "provider.connect.oauth.code.visit.prefix": "Yetkilendirme kodunuzu almak için ",
   "provider.connect.oauth.code.visit.link": "bu bağlantıya",
-  "provider.connect.oauth.code.visit.suffix": " tıklayarak yetkilendirme kodunuzu alın.",
+  "provider.connect.oauth.code.visit.suffix":
+    " gidin; ardından hesabınızı bağlayarak OpenCode'da {{provider}} modellerini kullanın.",
   "provider.connect.oauth.code.label": "{{method}} yetkilendirme kodu",
   "provider.connect.oauth.code.placeholder": "Yetkilendirme kodu",
   "provider.connect.oauth.code.required": "Yetkilendirme kodu gerekli",
@@ -213,6 +217,11 @@ export const dict = {
   "model.input.video": "video",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Kabul eder: {{inputs}}",
+  "model.tooltip.context.label": "Bağlam",
+  "model.tooltip.inputs": "Girdiler",
+  "model.tooltip.model": "Model",
+  "model.tooltip.provider": "Sağlayıcı",
+  "model.tooltip.reasoning": "Akıl yürütme",
   "model.tooltip.reasoning.allowed": "Akıl yürütme destekler",
   "model.tooltip.reasoning.none": "Akıl yürütme yok",
   "model.tooltip.context": "Bağlam limiti {{limit}}",
@@ -223,6 +232,7 @@ export const dict = {
   "common.loading": "Yükleniyor",
   "common.loading.ellipsis": "...",
   "common.cancel": "İptal",
+  "common.clear": "Temizle",
   "common.connect": "Bağlan",
   "common.disconnect": "Bağlantı Kes",
   "common.continue": "Gönder",
@@ -240,6 +250,8 @@ export const dict = {
   "prompt.mode.shell": "Kabuk",
   "prompt.mode.normal": "Komut",
   "prompt.mode.shell.exit": "çıkmak için esc",
+  "session.child.promptDisabled": "Alt ajan oturumlarına istem gönderilemez.",
+  "session.child.backToParent": "Ana oturuma dön.",
 
   "prompt.example.1": "Kod tabanındaki bir TODO'yu düzelt",
   "prompt.example.2": "Bu projenin teknoloji yığını nedir?",
@@ -346,6 +358,75 @@ export const dict = {
   "dialog.server.menu.delete": "Sil",
   "dialog.server.current": "Mevcut Sunucu",
   "dialog.server.status.default": "Varsayılan",
+  "wsl.server.add": "WSL sunucusu ekle",
+  "wsl.server.addShort": "WSL ekle",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL sunucusu",
+  "wsl.server.retryStart": "Başlatmayı yeniden dene",
+  "wsl.server.updating": "Güncelleniyor...",
+  "wsl.onboarding.step.distro": "Dağıtım seç",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "WSL kontrol ediliyor...",
+  "wsl.onboarding.restartRequired": "WSL kurulumunu tamamlamak için Windows'un yeniden başlatılması gerekiyor.",
+  "wsl.onboarding.ready": "WSL hazır.",
+  "wsl.onboarding.required": "Devam etmek için WSL gerekli.",
+  "wsl.onboarding.checkingDistros": "Dağıtımlar kontrol ediliyor...",
+  "wsl.onboarding.installingDistro": "{{distro}} kuruluyor...",
+  "wsl.onboarding.checkingDistro": "{{distro}} kontrol ediliyor...",
+  "wsl.onboarding.listingDistros": "Dağıtımlar listeleniyor...",
+  "wsl.onboarding.distroReady": "{{distro}} hazır.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} henüz kurulu değil.",
+  "wsl.onboarding.openDistroOnce": "Kurulumu tamamlamak için {{distro}} dağıtımını bir kez açın.",
+  "wsl.onboarding.finishingDistro": "{{distro}} kurulumu tamamlanıyor.",
+  "wsl.onboarding.pickDistro": "Bir dağıtım seçin veya aşağıdan bir dağıtım kurun.",
+  "wsl.onboarding.checkingOpencode": "OpenCode kontrol ediliyor...",
+  "wsl.onboarding.checkingOpencodeIn": "{{distro}} içinde OpenCode kontrol ediliyor...",
+  "wsl.onboarding.updatingOpencode": "OpenCode güncelleniyor...",
+  "wsl.onboarding.updatingOpencodeIn": "{{distro}} içinde OpenCode güncelleniyor...",
+  "wsl.onboarding.updateOpencodeIn": "{{distro}} içindeki OpenCode'u güncelleyin.",
+  "wsl.onboarding.updateOpencode": "OpenCode'u güncelle",
+  "wsl.onboarding.opencodeReadyIn": "{{distro}} içinde OpenCode hazır.",
+  "wsl.onboarding.opencodeReady": "OpenCode hazır.",
+  "wsl.onboarding.installOpencodeIn": "OpenCode'u {{distro}} içine kurun.",
+  "wsl.onboarding.installOpencode": "OpenCode'u kur",
+  "wsl.onboarding.chooseDistroFirst": "Önce bir dağıtım seçin.",
+  "wsl.onboarding.loadFailed": "WSL durumu yüklenemedi.",
+  "wsl.onboarding.loading": "Yükleniyor...",
+  "wsl.onboarding.installedDistros": "Kurulu dağıtımlar",
+  "wsl.onboarding.checkAgain": "Tekrar kontrol et",
+  "wsl.onboarding.distroStatus.ready": "Hazır",
+  "wsl.onboarding.distroStatus.checking": "Kontrol ediliyor...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode kurulu değil",
+  "wsl.onboarding.distroStatus.missingTools": "bash ve curl eksik",
+  "wsl.onboarding.distroStatus.unsupported": "Desteklenmiyor · WSL 2 kullanın",
+  "wsl.onboarding.needAnotherDistro": "Başka bir dağıtım mı gerekiyor?",
+  "wsl.onboarding.needAnotherDistroHint": "WSL kataloğundan bir Linux dağıtımı kurun",
+  "wsl.onboarding.wslNotInstalled.title": "WSL kurulu değil",
+  "wsl.onboarding.wslNotInstalled.description":
+    "OpenCode'un WSL sunucusu ekleyebilmesi için önce WSL (Linux için Windows Alt Sistemi) kurulmalıdır",
+  "wsl.onboarding.wslUnavailable.title": "WSL kullanılamıyor",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode bu makinede WSL'yi doğrulayamadı.",
+  "wsl.onboarding.installWsl": "WSL'yi kur",
+  "wsl.onboarding.windowsRestartRequired":
+    "WSL kurulumunu tamamlamak için Windows'u yeniden başlatın, ardından OpenCode'u tekrar açın.",
+  "wsl.onboarding.next": "İleri",
+  "wsl.onboarding.refresh": "Yenile",
+  "wsl.onboarding.allDistrosAdded": "Kurulu tüm dağıtımlar zaten eklenmiş.",
+  "wsl.onboarding.noDistros": "Henüz dağıtım algılanmadı.",
+  "wsl.onboarding.install": "Kur",
+  "wsl.onboarding.installing": "Kuruluyor...",
+  "wsl.onboarding.installDistro": "Dağıtım kur",
+  "wsl.onboarding.searchDistros": "Dağıtım ara",
+  "wsl.onboarding.wsl2Required": "WSL 2 gerekli.",
+  "wsl.onboarding.toolsRequired": "Bu dağıtım için bash ve curl gerekli.",
+  "wsl.onboarding.openTerminal": "Terminali aç",
+  "wsl.onboarding.path": "Yol: {{path}}",
+  "wsl.onboarding.notFound": "bulunamadı",
+  "wsl.onboarding.version": "Sürüm: {{version}}",
+  "wsl.onboarding.unknown": "bilinmiyor",
+  "wsl.onboarding.desktopVersion": "masaüstü {{version}}",
+  "wsl.onboarding.versionMismatch": "Kurulu sürüm masaüstü uygulamasının sürümüyle eşleşmiyor.",
+  "wsl.onboarding.adding": "Ekleniyor...",
 
   "dialog.project.edit.title": "Projeyi düzenle",
   "dialog.project.edit.name": "Ad",
@@ -408,6 +489,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -456,10 +538,12 @@ export const dict = {
 
   "error.page.title": "Bir şeyler yanlış gitti",
   "error.page.description": "Uygulama yüklenirken bir hata oluştu.",
+  "error.page.description.localServerStartup": "Yerel sunucu başlatılırken bir hata oluştu.",
   "error.page.details.label": "Hata Detayları",
   "error.page.action.restart": "Yeniden Başlat",
   "error.page.action.report": "Hatayı Bildir",
   "error.page.action.reported": "Hata Bildirildi",
+  "error.page.action.exportLogs": "Günlükleri Dışa Aktar",
   "error.page.action.checking": "Kontrol ediliyor...",
   "error.page.action.checkUpdates": "Güncellemeleri kontrol et",
   "error.page.action.updateTo": "{{version}} sürümüne güncelle",
@@ -509,11 +593,31 @@ export const dict = {
   "home.recentProjects": "Son projeler",
   "home.empty.title": "Son proje yok",
   "home.empty.description": "Yerel bir proje açarak başlayın",
+  "home.title": "Ana Sayfa",
+  "home.projects": "Projeler",
+  "home.project.add": "Proje ekle",
+  "home.recentlyClosed": "Yakın zamanda kapatılanlar",
+  "home.server.collapse": "Sunucu projelerini daralt",
+  "home.server.expand": "Sunucu projelerini genişlet",
+  "home.sessions.search.placeholder": "Oturum ara",
+  "home.sessions.search.placeholder.scoped": "{{scope}} kapsamında oturum ara",
+  "home.sessions.search.sessions": "Oturumlar",
+  "home.sessions.search.noResults": "{{query}} için oturum bulunamadı",
+  "home.sessions.empty": "Henüz burada bir şey yok",
+  "home.sessions.empty.description": "Başlamak için bir oturum oluşturun",
+  "home.sessions.group.today": "Bugün",
+  "home.sessions.group.yesterday": "Dün",
+  "home.sessions.group.older": "Daha eski",
 
   "session.tab.session": "Oturum",
   "session.tab.review": "İnceleme",
   "session.tab.context": "Bağlam",
+  "session.tab.unknown": "Bilinmeyen Oturum",
   "session.panel.reviewAndFiles": "İnceleme ve dosyalar",
+  "session.error.notFound": "Bu oturum bulunamıyor",
+  "session.error.notFound.description": "Bu sekme, artık bu sunucuda bulunmayan bir oturuma yönlendiriyor.",
+  "session.error.notFound.closeTab": "Sekmeyi Kapat",
+  "session.error.serverConnection": "Bu sunucuya bağlanılamıyor",
   "session.review.filesChanged": "{{count}} Dosya Değişti",
   "session.review.change.one": "Değişiklik",
   "session.review.change.other": "Değişiklik",
@@ -523,6 +627,8 @@ export const dict = {
   "session.review.noSnapshot":
     "Yapılandırmada anlık görüntü takibi devre dışı bırakıldı, bu nedenle oturum değişiklikleri kullanılamıyor",
   "session.review.noChanges": "Değişiklik yok",
+  "session.review.noUncommittedChanges": "Henüz commit edilmemiş değişiklik yok",
+  "session.review.noBranchChanges": "Henüz dal değişikliği yok",
 
   "session.files.selectToOpen": "Açmak için bir dosya seçin",
   "session.files.all": "Tüm dosyalar",
@@ -539,6 +645,10 @@ export const dict = {
   "session.todo.title": "Görevler",
   "session.todo.collapse": "Daralt",
   "session.todo.expand": "Genişlet",
+  "session.question.minimize": "Soruyu küçült",
+  "session.question.restore": "Soruyu geri yükle",
+  "session.question.pending.one": "{{count}} bekleyen soru",
+  "session.question.pending.other": "{{count}} bekleyen soru",
   "session.followupDock.summary.one": "{{count}} sıradaki mesaj",
   "session.followupDock.summary.other": "{{count}} sıradaki mesaj",
   "session.followupDock.sendNow": "Şimdi gönder",
@@ -552,9 +662,16 @@ export const dict = {
   "session.revertDock.restore": "Mesajı geri yükle",
 
   "session.new.title": "İstediğini yap",
+  "session.new.project.new": "Yeni proje",
+  "session.new.project.search": "Proje ara",
+  "session.new.project.add": "Proje ekle",
   "session.new.worktree.main": "Ana dal",
   "session.new.worktree.mainWithBranch": "Ana dal ({{branch}})",
   "session.new.worktree.create": "Yeni çalışma ağacı oluştur",
+  "session.new.workspace.runIn": "Oturumu şurada çalıştır",
+  "session.new.workspace.triggerLocal": "Yerel",
+  "session.new.workspace.local": "Yerel depo",
+  "session.new.workspace.existing": "Çalışma alanı…",
   "session.new.lastModified": "Son değişiklik",
 
   "session.header.search.placeholder": "{{project}} ara",
@@ -624,6 +741,8 @@ export const dict = {
   "sidebar.project.recentSessions": "Son oturumlar",
   "sidebar.project.viewAllSessions": "Tüm oturumları görüntüle",
   "sidebar.project.clearNotifications": "Bildirimleri temizle",
+  "sidebar.empty.title": "Açık proje yok",
+  "sidebar.empty.description": "Başlamak için bir proje açın",
 
   "app.name.desktop": "OpenCode Masaüstü",
 
@@ -636,6 +755,7 @@ export const dict = {
   "settings.desktop.wsl.description": "OpenCode sunucusunu Windows'ta WSL içinde çalıştırın.",
 
   "settings.general.section.appearance": "Görünüm",
+  "settings.general.section.advanced": "Gelişmiş",
   "settings.general.section.notifications": "Sistem bildirimleri",
   "settings.general.section.updates": "Güncellemeler",
   "settings.general.section.sounds": "Ses efektleri",
@@ -644,6 +764,11 @@ export const dict = {
 
   "settings.general.row.language.title": "Dil",
   "settings.general.row.language.description": "OpenCode'un görünüm dilini değiştirin",
+  "settings.general.row.shell.title": "Terminal Kabuğu",
+  "settings.general.row.shell.description":
+    "Terminalinizde kullanılacak kabuğu seçin. Uyumlu kabuklar, ajan araç çağrılarında da kullanılır.",
+  "settings.general.row.shell.autoDefault": "Otomatik (Varsayılan)",
+  "settings.general.row.shell.terminalOnly": "yalnızca terminal",
   "settings.general.row.appearance.title": "Görünüm",
   "settings.general.row.appearance.description": "OpenCode'un cihazınızdaki görünümünü özelleştirin",
   "settings.general.row.colorScheme.title": "Renk şeması",
@@ -653,8 +778,8 @@ export const dict = {
   "settings.general.row.theme.description": "OpenCode'un temasını özelleştirin.",
   "settings.general.row.font.title": "Kod Yazı Tipi",
   "settings.general.row.font.description": "Kod bloklarında kullanılan yazı tipini özelleştirin",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "Terminal yazı tipi",
+  "settings.general.row.terminalFont.description": "Terminalde kullanılan yazı tipini özelleştirin",
   "settings.general.row.uiFont.title": "Arayüz Yazı Tipi",
   "settings.general.row.uiFont.description": "Arayüz genelinde kullanılan yazı tipini özelleştirin",
   "settings.general.row.followup.title": "Takip davranışı",
@@ -662,6 +787,21 @@ export const dict = {
     "Takip komutlarının hemen yönlendirilmesini mi yoksa sırada beklemesini mi istediğinizi seçin",
   "settings.general.row.followup.option.queue": "Sıra",
   "settings.general.row.followup.option.steer": "Yönlendir",
+  "settings.general.row.showFileTree.title": "Dosya ağacı",
+  "settings.general.row.showFileTree.description": "Oturumlarda dosya ağacı panelini göster",
+  "settings.general.row.showNavigation.title": "Gezinme denetimleri",
+  "settings.general.row.showNavigation.description": "Masaüstü başlık çubuğunda geri ve ileri düğmelerini göster",
+  "settings.general.row.showSearch.title": "Komut paleti",
+  "settings.general.row.showSearch.description": "Başlık çubuğunda arama ve komut paleti düğmesini göster",
+  "settings.general.row.showTerminal.title": "Terminal",
+  "settings.general.row.showTerminal.description": "Masaüstü başlık çubuğunda terminal düğmesini göster",
+  "settings.general.row.showStatus.title": "Sunucu durumu",
+  "settings.general.row.showStatus.description": "Başlık çubuğunda sunucu durumu düğmesini göster",
+  "settings.general.row.mobileTitlebarBottom.title": "Alt gezinme",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Mobil cihazlarda başlık çubuğunu ve oturum sekmelerini ekranın altına yerleştir",
+  "settings.general.row.showCustomAgents.title": "Özel ajanlar",
+  "settings.general.row.showCustomAgents.description": "Yazma alanında ajan seçiciyi göster",
   "settings.general.row.reasoningSummaries.title": "Akıl yürütme özetlerini göster",
   "settings.general.row.reasoningSummaries.description": "Zaman çizelgesinde model akıl yürütme özetlerini görüntüle",
   "settings.general.row.shellToolPartsExpanded.title": "Kabuk araç bileşenlerini genişlet",
@@ -670,6 +810,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Düzenleme araç bileşenlerini genişlet",
   "settings.general.row.editToolPartsExpanded.description":
     "Zaman çizelgesinde düzenleme, yazma ve yama araç bileşenlerini varsayılan olarak genişletilmiş göster",
+  "settings.general.row.newLayoutDesigns.title": "Yeni düzen ve tasarımlar",
+  "settings.general.row.newLayoutDesigns.description":
+    "Yeniden tasarlanan düzeni, ana sayfayı, yazma alanını ve oturum arayüzünü etkinleştir",
+  "settings.general.row.pinchZoom.title": "Sıkıştırarak yakınlaştır",
+  "settings.general.row.pinchZoom.description":
+    "İzleme dörtgeninde sıkıştırma ve Ctrl-kaydırma hareketleriyle yakınlaştırmaya izin ver",
 
   "settings.general.row.wayland.title": "Yerel Wayland kullan",
   "settings.general.row.wayland.description":
@@ -686,6 +832,8 @@ export const dict = {
   "settings.updates.row.check.description": "Elle güncelleme kontrolü yap ve varsa yükle",
   "settings.updates.action.checkNow": "Şimdi kontrol et",
   "settings.updates.action.checking": "Kontrol ediliyor...",
+  "settings.updates.action.downloading": "İndiriliyor...",
+  "settings.updates.action.installing": "Kuruluyor...",
   "settings.updates.toast.latest.title": "Güncelsiniz",
   "settings.updates.toast.latest.description": "OpenCode'un en son sürümünü kullanıyorsunuz.",
 
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index d875766e8855..ff18c8e342ed 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -48,6 +48,7 @@ export const dict = {
   "command.session.new": "Нова сесія",
   "command.file.open": "Відкрити файл",
   "command.tab.close": "Закрити вкладку",
+  "command.tab.reopenClosed": "Повторно відкрити закриту вкладку",
   "command.context.addSelection": "Додати виділення до контексту",
   "command.context.addSelection.description": "Додати вибрані рядки з поточного файлу",
   "command.input.focus": "Фокус на полі введення",
@@ -212,6 +213,11 @@ export const dict = {
   "model.input.video": "відео",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "Дозволяє: {{inputs}}",
+  "model.tooltip.context.label": "Контекст",
+  "model.tooltip.inputs": "Вхідні дані",
+  "model.tooltip.model": "Модель",
+  "model.tooltip.provider": "Провайдер",
+  "model.tooltip.reasoning": "Мислення",
   "model.tooltip.reasoning.allowed": "Підтримує мислення",
   "model.tooltip.reasoning.none": "Без мислення",
   "model.tooltip.context": "Ліміт контексту {{limit}}",
@@ -222,6 +228,7 @@ export const dict = {
   "common.loading": "Завантаження",
   "common.loading.ellipsis": "...",
   "common.cancel": "Скасувати",
+  "common.clear": "Очистити",
   "common.open": "Відкрити",
   "common.connect": "Підключити",
   "common.disconnect": "Відключити",
@@ -354,6 +361,75 @@ export const dict = {
   "dialog.server.menu.delete": "Видалити",
   "dialog.server.current": "Поточний сервер",
   "dialog.server.status.default": "За замовчуванням",
+  "wsl.server.add": "Додати сервер WSL",
+  "wsl.server.addShort": "Додати WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "Сервер WSL",
+  "wsl.server.retryStart": "Повторити запуск",
+  "wsl.server.updating": "Оновлення...",
+  "wsl.onboarding.step.distro": "Вибрати дистрибутив",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "Перевірка WSL...",
+  "wsl.onboarding.restartRequired": "Щоб завершити встановлення WSL, потрібно перезапустити Windows.",
+  "wsl.onboarding.ready": "WSL готова до роботи.",
+  "wsl.onboarding.required": "Для продовження потрібна WSL.",
+  "wsl.onboarding.checkingDistros": "Перевірка дистрибутивів...",
+  "wsl.onboarding.installingDistro": "Встановлення {{distro}}...",
+  "wsl.onboarding.checkingDistro": "Перевірка {{distro}}...",
+  "wsl.onboarding.listingDistros": "Отримання списку дистрибутивів...",
+  "wsl.onboarding.distroReady": "{{distro}} готовий до роботи.",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} ще не встановлено.",
+  "wsl.onboarding.openDistroOnce": "Відкрийте {{distro}} один раз, щоб завершити налаштування.",
+  "wsl.onboarding.finishingDistro": "Завершення налаштування {{distro}}.",
+  "wsl.onboarding.pickDistro": "Виберіть дистрибутив або встановіть один із наведених нижче.",
+  "wsl.onboarding.checkingOpencode": "Перевірка OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "Перевірка OpenCode у {{distro}}...",
+  "wsl.onboarding.updatingOpencode": "Оновлення OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "Оновлення OpenCode у {{distro}}...",
+  "wsl.onboarding.updateOpencodeIn": "Оновіть OpenCode у {{distro}}.",
+  "wsl.onboarding.updateOpencode": "Оновити OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "OpenCode готовий до роботи у {{distro}}.",
+  "wsl.onboarding.opencodeReady": "OpenCode готовий до роботи.",
+  "wsl.onboarding.installOpencodeIn": "Встановіть OpenCode у {{distro}}.",
+  "wsl.onboarding.installOpencode": "Встановити OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "Спочатку виберіть дистрибутив.",
+  "wsl.onboarding.loadFailed": "Не вдалося завантажити стан WSL.",
+  "wsl.onboarding.loading": "Завантаження...",
+  "wsl.onboarding.installedDistros": "Встановлені дистрибутиви",
+  "wsl.onboarding.checkAgain": "Перевірити ще раз",
+  "wsl.onboarding.distroStatus.ready": "Готовий",
+  "wsl.onboarding.distroStatus.checking": "Перевірка...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "OpenCode не встановлено",
+  "wsl.onboarding.distroStatus.missingTools": "Немає bash і curl",
+  "wsl.onboarding.distroStatus.unsupported": "Не підтримується · Використовуйте WSL 2",
+  "wsl.onboarding.needAnotherDistro": "Потрібен інший дистрибутив?",
+  "wsl.onboarding.needAnotherDistroHint": "Встановіть дистрибутив Linux із каталогу WSL",
+  "wsl.onboarding.wslNotInstalled.title": "WSL не встановлено",
+  "wsl.onboarding.wslNotInstalled.description":
+    "Для додавання сервера WSL в OpenCode потрібна WSL (Підсистема Windows для Linux)",
+  "wsl.onboarding.wslUnavailable.title": "WSL недоступна",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode не вдалося перевірити WSL на цьому комп'ютері.",
+  "wsl.onboarding.installWsl": "Встановити WSL",
+  "wsl.onboarding.windowsRestartRequired":
+    "Перезапустіть Windows, щоб завершити встановлення WSL, а потім знову відкрийте OpenCode.",
+  "wsl.onboarding.next": "Далі",
+  "wsl.onboarding.refresh": "Оновити",
+  "wsl.onboarding.allDistrosAdded": "Усі встановлені дистрибутиви вже додано.",
+  "wsl.onboarding.noDistros": "Дистрибутивів поки не виявлено.",
+  "wsl.onboarding.install": "Встановити",
+  "wsl.onboarding.installing": "Встановлення...",
+  "wsl.onboarding.installDistro": "Встановити дистрибутив",
+  "wsl.onboarding.searchDistros": "Пошук дистрибутивів",
+  "wsl.onboarding.wsl2Required": "Для роботи потрібна WSL 2.",
+  "wsl.onboarding.toolsRequired": "Для цього дистрибутива потрібні bash і curl.",
+  "wsl.onboarding.openTerminal": "Відкрити термінал",
+  "wsl.onboarding.path": "Шлях: {{path}}",
+  "wsl.onboarding.notFound": "не знайдено",
+  "wsl.onboarding.version": "Версія: {{version}}",
+  "wsl.onboarding.unknown": "невідомо",
+  "wsl.onboarding.desktopVersion": "десктопний застосунок {{version}}",
+  "wsl.onboarding.versionMismatch": "Встановлена версія не відповідає версії десктопного застосунку.",
+  "wsl.onboarding.adding": "Додавання...",
   "server.row.noUsername": "без імені користувача",
 
   "dialog.project.edit.title": "Редагувати проєкт",
@@ -473,10 +549,12 @@ export const dict = {
 
   "error.page.title": "Щось пішло не так",
   "error.page.description": "Під час завантаження програми сталася помилка.",
+  "error.page.description.localServerStartup": "Під час запуску локального сервера сталася помилка.",
   "error.page.details.label": "Деталі помилки",
   "error.page.action.restart": "Перезапустити",
   "error.page.action.report": "Повідомити про помилку",
   "error.page.action.reported": "Помилку повідомлено",
+  "error.page.action.exportLogs": "Експортувати журнали",
   "error.page.action.checking": "Перевірка...",
   "error.page.action.checkUpdates": "Перевірити оновлення",
   "error.page.action.updateTo": "Оновити до {{version}}",
@@ -533,11 +611,31 @@ export const dict = {
   "home.recentProjects": "Нещодавні проєкти",
   "home.empty.title": "Немає нещодавніх проєктів",
   "home.empty.description": "Почніть, відкривши локальний проєкт",
+  "home.title": "Головна",
+  "home.projects": "Проєкти",
+  "home.project.add": "Додати проєкт",
+  "home.recentlyClosed": "Нещодавно закриті",
+  "home.server.collapse": "Згорнути проєкти сервера",
+  "home.server.expand": "Розгорнути проєкти сервера",
+  "home.sessions.search.placeholder": "Пошук сесій",
+  "home.sessions.search.placeholder.scoped": "Пошук сесій у {{scope}}",
+  "home.sessions.search.sessions": "Сесії",
+  "home.sessions.search.noResults": "Сесій за запитом {{query}} не знайдено",
+  "home.sessions.empty": "Тут поки нічого немає",
+  "home.sessions.empty.description": "Створіть сесію, щоб почати",
+  "home.sessions.group.today": "Сьогодні",
+  "home.sessions.group.yesterday": "Учора",
+  "home.sessions.group.older": "Раніше",
 
   "session.tab.session": "Сесія",
   "session.tab.review": "Огляд",
   "session.tab.context": "Контекст",
+  "session.tab.unknown": "Невідома сесія",
   "session.panel.reviewAndFiles": "Огляд і файли",
+  "session.error.notFound": "Цю сесію не знайдено",
+  "session.error.notFound.description": "Ця вкладка посилається на сесію, якої більше немає на цьому сервері.",
+  "session.error.notFound.closeTab": "Закрити вкладку",
+  "session.error.serverConnection": "Не вдається підключитися до цього сервера",
   "session.review.filesChanged": "Змінено файлів: {{count}}",
   "session.review.change.one": "Зміна",
   "session.review.change.other": "Зміни",
@@ -570,6 +668,10 @@ export const dict = {
   "session.todo.expand": "Розгорнути",
   "session.todo.progress": "Виконано {{done}} з {{total}} завдань",
   "session.question.progress": "{{current}} з {{total}} запитань",
+  "session.question.minimize": "Згорнути запитання",
+  "session.question.restore": "Відновити запитання",
+  "session.question.pending.one": "{{count}} запитання очікує відповіді",
+  "session.question.pending.other": "Запитання, що очікують відповіді: {{count}}",
   "session.followupDock.summary.one": "{{count}} повідомлення в черзі",
   "session.followupDock.summary.other": "{{count}} повідомлень у черзі",
   "session.followupDock.sendNow": "Надіслати зараз",
@@ -583,9 +685,16 @@ export const dict = {
   "session.revertDock.restore": "Відновити повідомлення",
 
   "session.new.title": "Створити що завгодно",
+  "session.new.project.new": "Новий проєкт",
+  "session.new.project.search": "Пошук проєктів",
+  "session.new.project.add": "Додати проєкт",
   "session.new.worktree.main": "Основна гілка",
   "session.new.worktree.mainWithBranch": "Основна гілка ({{branch}})",
   "session.new.worktree.create": "Створити нове робоче дерево",
+  "session.new.workspace.runIn": "Запустити сесію в",
+  "session.new.workspace.triggerLocal": "Локально",
+  "session.new.workspace.local": "Локальний репозиторій",
+  "session.new.workspace.existing": "Робоча область…",
   "session.new.lastModified": "Востаннє змінено",
 
   "session.header.search.placeholder": "Пошук {{project}}",
@@ -773,6 +882,11 @@ export const dict = {
   "settings.general.row.showTerminal.description": "Показувати кнопку термінала в заголовку робочого столу",
   "settings.general.row.showStatus.title": "Статус сервера",
   "settings.general.row.showStatus.description": "Показувати кнопку статусу сервера в заголовку",
+  "settings.general.row.mobileTitlebarBottom.title": "Нижня навігація",
+  "settings.general.row.mobileTitlebarBottom.description":
+    "Розмістити заголовок і вкладки сесії внизу екрана на мобільних пристроях",
+  "settings.general.row.showCustomAgents.title": "Користувацькі агенти",
+  "settings.general.row.showCustomAgents.description": "Показувати вибір агента в редакторі запиту",
   "settings.general.row.reasoningSummaries.title": "Показувати підсумки мислення",
   "settings.general.row.reasoningSummaries.description": "Відображати підсумки мислення моделі на часовій шкалі",
   "settings.general.row.shellToolPartsExpanded.title": "Розгортати частини інструменту оболонки",
@@ -781,6 +895,12 @@ export const dict = {
   "settings.general.row.editToolPartsExpanded.title": "Розгортати частини інструменту редагування",
   "settings.general.row.editToolPartsExpanded.description":
     "Показувати частини інструментів редагування, запису та патчів розгорнутими за замовчуванням на часовій шкалі",
+  "settings.general.row.newLayoutDesigns.title": "Новий макет і дизайн",
+  "settings.general.row.newLayoutDesigns.description":
+    "Увімкнути оновлений макет та інтерфейси головної сторінки, редактора запитів і сесії",
+  "settings.general.row.pinchZoom.title": "Масштабування щипком",
+  "settings.general.row.pinchZoom.description":
+    "Дозволити масштабування жестом щипка на трекпаді та прокручуванням із Ctrl",
 
   "settings.general.row.wayland.title": "Використовувати нативний Wayland",
   "settings.general.row.wayland.description": "Вимкнути резервний X11 на Wayland. Потребує перезапуску.",
@@ -796,6 +916,8 @@ export const dict = {
   "settings.updates.row.check.description": "Вручну перевірити наявність оновлень і встановити, якщо доступні",
   "settings.updates.action.checkNow": "Перевірити зараз",
   "settings.updates.action.checking": "Перевірка...",
+  "settings.updates.action.downloading": "Завантаження...",
+  "settings.updates.action.installing": "Встановлення...",
   "settings.updates.toast.latest.title": "У вас актуальна версія",
   "settings.updates.toast.latest.description": "Ви використовуєте останню версію OpenCode.",
   "sound.option.none": "Немає",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index 15d873ee04a9..3cccc0c82d49 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -28,6 +28,9 @@ export const dict = {
   "command.sidebar.toggle": "切换侧边栏",
 
   "command.project.open": "打开项目",
+  "command.project.previous": "上一个项目",
+  "command.project.next": "下一个项目",
+  "command.project.index": "切换到项目 {{index}}",
 
   "command.provider.connect": "连接提供商",
 
@@ -56,6 +59,7 @@ export const dict = {
   "command.file.open": "打开文件",
 
   "command.tab.close": "关闭标签页",
+  "command.tab.reopenClosed": "重新打开已关闭的标签页",
 
   "command.context.addSelection": "将所选内容添加到上下文",
   "command.context.addSelection.description": "添加当前文件中选中的行",
@@ -230,6 +234,11 @@ export const dict = {
   "model.input.video": "视频",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "支持：{{inputs}}",
+  "model.tooltip.context.label": "上下文",
+  "model.tooltip.inputs": "输入",
+  "model.tooltip.model": "模型",
+  "model.tooltip.provider": "提供商",
+  "model.tooltip.reasoning": "推理",
   "model.tooltip.reasoning.allowed": "支持推理",
   "model.tooltip.reasoning.none": "不支持推理",
   "model.tooltip.context": "上下文上限 {{limit}}",
@@ -240,6 +249,7 @@ export const dict = {
   "common.loading": "加载中",
   "common.loading.ellipsis": "...",
   "common.cancel": "取消",
+  "common.clear": "清除",
   "common.connect": "连接",
   "common.disconnect": "断开连接",
   "common.continue": "提交",
@@ -257,6 +267,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "按 esc 退出",
+  "session.child.promptDisabled": "无法向子智能体会话发送提示词。",
+  "session.child.backToParent": "返回主会话。",
   "prompt.example.1": "修复代码库中的一个 TODO",
   "prompt.example.2": "这个项目的技术栈是什么？",
   "prompt.example.3": "修复失败的测试",
@@ -359,6 +371,73 @@ export const dict = {
   "dialog.server.menu.delete": "删除",
   "dialog.server.current": "当前服务器",
   "dialog.server.status.default": "默认",
+  "wsl.server.add": "添加 WSL 服务器",
+  "wsl.server.addShort": "添加 WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL 服务器",
+  "wsl.server.retryStart": "重试启动",
+  "wsl.server.updating": "正在更新...",
+  "wsl.onboarding.step.distro": "选择发行版",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "正在检查 WSL...",
+  "wsl.onboarding.restartRequired": "Windows 需要重启才能完成 WSL 安装。",
+  "wsl.onboarding.ready": "WSL 已就绪。",
+  "wsl.onboarding.required": "需要 WSL 才能继续。",
+  "wsl.onboarding.checkingDistros": "正在检查发行版...",
+  "wsl.onboarding.installingDistro": "正在安装 {{distro}}...",
+  "wsl.onboarding.checkingDistro": "正在检查 {{distro}}...",
+  "wsl.onboarding.listingDistros": "正在列出发行版...",
+  "wsl.onboarding.distroReady": "{{distro}} 已就绪。",
+  "wsl.onboarding.distroNotInstalled": "{{distro}} 尚未安装。",
+  "wsl.onboarding.openDistroOnce": "打开一次 {{distro}} 以完成设置。",
+  "wsl.onboarding.finishingDistro": "正在完成 {{distro}} 的设置。",
+  "wsl.onboarding.pickDistro": "选择一个发行版，或在下方安装。",
+  "wsl.onboarding.checkingOpencode": "正在检查 OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "正在检查 {{distro}} 中的 OpenCode...",
+  "wsl.onboarding.updatingOpencode": "正在更新 OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "正在更新 {{distro}} 中的 OpenCode...",
+  "wsl.onboarding.updateOpencodeIn": "更新 {{distro}} 中的 OpenCode。",
+  "wsl.onboarding.updateOpencode": "更新 OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "{{distro}} 中的 OpenCode 已就绪。",
+  "wsl.onboarding.opencodeReady": "OpenCode 已就绪。",
+  "wsl.onboarding.installOpencodeIn": "在 {{distro}} 中安装 OpenCode。",
+  "wsl.onboarding.installOpencode": "安装 OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "请先选择发行版。",
+  "wsl.onboarding.loadFailed": "加载 WSL 状态失败。",
+  "wsl.onboarding.loading": "加载中...",
+  "wsl.onboarding.installedDistros": "已安装的发行版",
+  "wsl.onboarding.checkAgain": "重新检查",
+  "wsl.onboarding.distroStatus.ready": "已就绪",
+  "wsl.onboarding.distroStatus.checking": "检查中...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "未安装 OpenCode",
+  "wsl.onboarding.distroStatus.missingTools": "缺少 bash、curl",
+  "wsl.onboarding.distroStatus.unsupported": "不支持 · 请使用 WSL 2",
+  "wsl.onboarding.needAnotherDistro": "需要其他发行版？",
+  "wsl.onboarding.needAnotherDistroHint": "从 WSL 目录安装 Linux 发行版",
+  "wsl.onboarding.wslNotInstalled.title": "未安装 WSL",
+  "wsl.onboarding.wslNotInstalled.description": "OpenCode 需要 WSL（Windows Subsystem for Linux）才能添加 WSL 服务器",
+  "wsl.onboarding.wslUnavailable.title": "WSL 不可用",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode 无法验证此设备上的 WSL。",
+  "wsl.onboarding.installWsl": "安装 WSL",
+  "wsl.onboarding.windowsRestartRequired": "重启 Windows 以完成 WSL 安装，然后重新打开 OpenCode。",
+  "wsl.onboarding.next": "下一步",
+  "wsl.onboarding.refresh": "刷新",
+  "wsl.onboarding.allDistrosAdded": "所有已安装的发行版均已添加。",
+  "wsl.onboarding.noDistros": "尚未检测到发行版。",
+  "wsl.onboarding.install": "安装",
+  "wsl.onboarding.installing": "正在安装...",
+  "wsl.onboarding.installDistro": "安装发行版",
+  "wsl.onboarding.searchDistros": "搜索发行版",
+  "wsl.onboarding.wsl2Required": "需要 WSL 2。",
+  "wsl.onboarding.toolsRequired": "此发行版需要 bash 和 curl。",
+  "wsl.onboarding.openTerminal": "打开终端",
+  "wsl.onboarding.path": "路径：{{path}}",
+  "wsl.onboarding.notFound": "未找到",
+  "wsl.onboarding.version": "版本：{{version}}",
+  "wsl.onboarding.unknown": "未知",
+  "wsl.onboarding.desktopVersion": "桌面版 {{version}}",
+  "wsl.onboarding.versionMismatch": "已安装版本与桌面应用版本不一致。",
+  "wsl.onboarding.adding": "正在添加...",
 
   "dialog.project.edit.title": "编辑项目",
   "dialog.project.edit.name": "名称",
@@ -418,6 +497,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -456,10 +536,12 @@ export const dict = {
 
   "error.page.title": "出了点问题",
   "error.page.description": "加载应用程序时发生错误。",
+  "error.page.description.localServerStartup": "启动本地服务器时发生错误。",
   "error.page.details.label": "错误详情",
   "error.page.action.restart": "重启",
   "error.page.action.report": "上报错误",
   "error.page.action.reported": "错误已上报",
+  "error.page.action.exportLogs": "导出日志",
   "error.page.action.checking": "检查中...",
   "error.page.action.checkUpdates": "检查更新",
   "error.page.action.updateTo": "更新到 {{version}}",
@@ -506,6 +588,9 @@ export const dict = {
   "home.title": "主页",
   "home.projects": "项目",
   "home.project.add": "添加项目",
+  "home.recentlyClosed": "最近关闭",
+  "home.server.collapse": "折叠服务器项目",
+  "home.server.expand": "展开服务器项目",
   "home.sessions.search.placeholder": "搜索会话",
   "home.sessions.search.placeholder.scoped": "在 {{scope}} 中搜索会话",
   "home.sessions.search.sessions": "会话",
@@ -519,7 +604,12 @@ export const dict = {
   "session.tab.session": "会话",
   "session.tab.review": "审查",
   "session.tab.context": "上下文",
+  "session.tab.unknown": "未知会话",
   "session.panel.reviewAndFiles": "审查和文件",
+  "session.error.notFound": "找不到此会话",
+  "session.error.notFound.description": "此标签页指向的会话已不存在于此服务器上。",
+  "session.error.notFound.closeTab": "关闭标签页",
+  "session.error.serverConnection": "无法连接到此服务器",
   "session.review.filesChanged": "{{count}} 个文件变更",
   "session.review.change.one": "更改",
   "session.review.change.other": "更改",
@@ -528,6 +618,8 @@ export const dict = {
   "session.review.noVcs": "未检测到 Git 版本控制系统，无法显示更改",
   "session.review.noSnapshot": "配置中已禁用快照跟踪，因此会话更改不可用",
   "session.review.noChanges": "无更改",
+  "session.review.noUncommittedChanges": "尚无未提交的更改",
+  "session.review.noBranchChanges": "尚无分支更改",
   "session.files.selectToOpen": "选择要打开的文件",
   "session.files.all": "所有文件",
   "session.files.empty": "无文件",
@@ -541,6 +633,10 @@ export const dict = {
   "session.todo.title": "待办事项",
   "session.todo.collapse": "折叠",
   "session.todo.expand": "展开",
+  "session.question.minimize": "最小化问题",
+  "session.question.restore": "恢复问题",
+  "session.question.pending.one": "{{count}} 个待处理问题",
+  "session.question.pending.other": "{{count}} 个待处理问题",
   "session.followupDock.summary.one": "{{count}} 条排队消息",
   "session.followupDock.summary.other": "{{count}} 条排队消息",
   "session.followupDock.sendNow": "立即发送",
@@ -553,9 +649,16 @@ export const dict = {
   "session.revertDock.expand": "展开已回滚消息",
   "session.revertDock.restore": "恢复消息",
   "session.new.title": "构建任何东西",
+  "session.new.project.new": "新建项目",
+  "session.new.project.search": "搜索项目",
+  "session.new.project.add": "添加项目",
   "session.new.worktree.main": "主分支",
   "session.new.worktree.mainWithBranch": "主分支（{{branch}}）",
   "session.new.worktree.create": "创建新的 worktree",
+  "session.new.workspace.runIn": "运行会话的位置",
+  "session.new.workspace.triggerLocal": "本地",
+  "session.new.workspace.local": "本地仓库",
+  "session.new.workspace.existing": "工作区…",
   "session.new.lastModified": "最后修改",
   "session.header.search.placeholder": "搜索 {{project}}",
   "session.header.searchFiles": "搜索文件",
@@ -623,6 +726,8 @@ export const dict = {
   "sidebar.project.recentSessions": "最近会话",
   "sidebar.project.viewAllSessions": "查看全部会话",
   "sidebar.project.clearNotifications": "清除通知",
+  "sidebar.empty.title": "没有打开的项目",
+  "sidebar.empty.description": "打开一个项目以开始使用",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -637,6 +742,7 @@ export const dict = {
   "settings.desktop.wsl.description": "在 Windows 的 WSL 环境中运行 OpenCode 服务器。",
 
   "settings.general.section.appearance": "外观",
+  "settings.general.section.advanced": "高级",
   "settings.general.section.notifications": "系统通知",
   "settings.general.section.updates": "更新",
   "settings.general.section.sounds": "音效",
@@ -644,6 +750,10 @@ export const dict = {
   "settings.general.section.display": "显示",
   "settings.general.row.language.title": "语言",
   "settings.general.row.language.description": "更改 OpenCode 的显示语言",
+  "settings.general.row.shell.title": "终端 Shell",
+  "settings.general.row.shell.description": "选择终端使用的 shell。兼容的 shell 也会用于智能体工具调用。",
+  "settings.general.row.shell.autoDefault": "自动（默认）",
+  "settings.general.row.shell.terminalOnly": "仅终端",
   "settings.general.row.appearance.title": "外观",
   "settings.general.row.appearance.description": "自定义 OpenCode 在你的设备上的外观",
   "settings.general.row.colorScheme.title": "配色方案",
@@ -652,20 +762,38 @@ export const dict = {
   "settings.general.row.theme.description": "自定义 OpenCode 的主题。",
   "settings.general.row.font.title": "代码字体",
   "settings.general.row.font.description": "自定义代码块使用的字体",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "终端字体",
+  "settings.general.row.terminalFont.description": "自定义终端使用的字体",
   "settings.general.row.uiFont.title": "界面字体",
   "settings.general.row.uiFont.description": "自定义整个界面使用的字体",
   "settings.general.row.followup.title": "跟进消息行为",
   "settings.general.row.followup.description": "选择跟进提示是立即引导还是在队列中等待",
   "settings.general.row.followup.option.queue": "排队",
   "settings.general.row.followup.option.steer": "引导",
+  "settings.general.row.showFileTree.title": "文件树",
+  "settings.general.row.showFileTree.description": "在会话中显示文件树面板",
+  "settings.general.row.showNavigation.title": "导航控件",
+  "settings.general.row.showNavigation.description": "在桌面版标题栏中显示前进和后退按钮",
+  "settings.general.row.showSearch.title": "命令面板",
+  "settings.general.row.showSearch.description": "在标题栏中显示搜索和命令面板按钮",
+  "settings.general.row.showTerminal.title": "终端",
+  "settings.general.row.showTerminal.description": "在桌面版标题栏中显示终端按钮",
+  "settings.general.row.showStatus.title": "服务器状态",
+  "settings.general.row.showStatus.description": "在标题栏中显示服务器状态按钮",
+  "settings.general.row.mobileTitlebarBottom.title": "底部导航",
+  "settings.general.row.mobileTitlebarBottom.description": "在移动设备上将标题栏和会话标签页置于屏幕底部",
+  "settings.general.row.showCustomAgents.title": "自定义智能体",
+  "settings.general.row.showCustomAgents.description": "在输入框中显示智能体选择器",
   "settings.general.row.reasoningSummaries.title": "显示推理摘要",
   "settings.general.row.reasoningSummaries.description": "在时间线中显示模型推理摘要",
   "settings.general.row.shellToolPartsExpanded.title": "展开 shell 工具部分",
   "settings.general.row.shellToolPartsExpanded.description": "默认在时间线中展开 shell 工具部分",
   "settings.general.row.editToolPartsExpanded.title": "展开编辑工具部分",
   "settings.general.row.editToolPartsExpanded.description": "默认在时间线中展开 edit、write 和 patch 工具部分",
+  "settings.general.row.newLayoutDesigns.title": "新版布局和设计",
+  "settings.general.row.newLayoutDesigns.description": "启用重新设计的布局、主页、输入框和会话界面",
+  "settings.general.row.pinchZoom.title": "双指缩放",
+  "settings.general.row.pinchZoom.description": "允许使用触控板双指捏合和 Ctrl-scroll 手势缩放",
   "settings.general.row.wayland.title": "使用原生 Wayland",
   "settings.general.row.wayland.description": "在 Wayland 上禁用 X11 回退。需要重启。",
   "settings.general.row.wayland.tooltip": "在混合刷新率显示器的 Linux 系统上，原生 Wayland 可能更稳定。",
@@ -678,6 +806,8 @@ export const dict = {
   "settings.updates.row.check.description": "手动检查更新并在有更新时安装",
   "settings.updates.action.checkNow": "立即检查",
   "settings.updates.action.checking": "正在检查...",
+  "settings.updates.action.downloading": "正在下载...",
+  "settings.updates.action.installing": "正在安装...",
   "settings.updates.toast.latest.title": "已是最新版本",
   "settings.updates.toast.latest.description": "你正在使用最新版本的 OpenCode。",
 
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index 7998dde3ef87..afe285f6e54b 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -27,6 +27,9 @@ export const dict = {
 
   "command.sidebar.toggle": "切換側邊欄",
   "command.project.open": "開啟專案",
+  "command.project.previous": "上一個專案",
+  "command.project.next": "下一個專案",
+  "command.project.index": "切換至專案 {{index}}",
   "command.provider.connect": "連接提供者",
   "command.server.switch": "切換伺服器",
   "command.settings.open": "開啟設定",
@@ -49,6 +52,7 @@ export const dict = {
   "command.session.new": "新增工作階段",
   "command.file.open": "開啟檔案",
   "command.tab.close": "關閉分頁",
+  "command.tab.reopenClosed": "重新開啟已關閉的分頁",
   "command.context.addSelection": "將選取內容加入上下文",
   "command.context.addSelection.description": "加入目前檔案中選取的行",
   "command.input.focus": "聚焦輸入框",
@@ -209,6 +213,11 @@ export const dict = {
   "model.input.video": "影片",
   "model.input.pdf": "pdf",
   "model.tooltip.allows": "支援: {{inputs}}",
+  "model.tooltip.context.label": "上下文",
+  "model.tooltip.inputs": "輸入",
+  "model.tooltip.model": "模型",
+  "model.tooltip.provider": "供應商",
+  "model.tooltip.reasoning": "推理",
   "model.tooltip.reasoning.allowed": "支援推理",
   "model.tooltip.reasoning.none": "不支援推理",
   "model.tooltip.context": "上下文上限 {{limit}}",
@@ -218,6 +227,7 @@ export const dict = {
   "common.loading": "載入中",
   "common.loading.ellipsis": "...",
   "common.cancel": "取消",
+  "common.clear": "清除",
   "common.connect": "連線",
   "common.disconnect": "中斷連線",
   "common.continue": "提交",
@@ -235,6 +245,8 @@ export const dict = {
   "prompt.mode.shell": "Shell",
   "prompt.mode.normal": "Prompt",
   "prompt.mode.shell.exit": "按 esc 退出",
+  "session.child.promptDisabled": "無法在子代理程式工作階段中輸入提示詞。",
+  "session.child.backToParent": "返回主要工作階段。",
 
   "prompt.example.1": "修復程式碼庫中的一個 TODO",
   "prompt.example.2": "這個專案的技術堆疊是什麼?",
@@ -340,6 +352,73 @@ export const dict = {
   "dialog.server.menu.delete": "刪除",
   "dialog.server.current": "目前伺服器",
   "dialog.server.status.default": "預設",
+  "wsl.server.add": "新增 WSL 伺服器",
+  "wsl.server.addShort": "新增 WSL",
+  "wsl.server.label": "WSL",
+  "wsl.server.menu.label": "WSL 伺服器",
+  "wsl.server.retryStart": "重試啟動",
+  "wsl.server.updating": "更新中...",
+  "wsl.onboarding.step.distro": "選擇發行版",
+  "wsl.onboarding.step.opencode": "OpenCode",
+  "wsl.onboarding.checkingRuntime": "正在檢查 WSL...",
+  "wsl.onboarding.restartRequired": "Windows 需要重新啟動，才能完成 WSL 安裝。",
+  "wsl.onboarding.ready": "WSL 已就緒。",
+  "wsl.onboarding.required": "需要 WSL 才能繼續。",
+  "wsl.onboarding.checkingDistros": "正在檢查發行版...",
+  "wsl.onboarding.installingDistro": "正在安裝 {{distro}}...",
+  "wsl.onboarding.checkingDistro": "正在檢查 {{distro}}...",
+  "wsl.onboarding.listingDistros": "正在列出發行版...",
+  "wsl.onboarding.distroReady": "{{distro}} 已就緒。",
+  "wsl.onboarding.distroNotInstalled": "尚未安裝 {{distro}}。",
+  "wsl.onboarding.openDistroOnce": "開啟 {{distro}} 一次以完成設定。",
+  "wsl.onboarding.finishingDistro": "正在完成 {{distro}} 的設定。",
+  "wsl.onboarding.pickDistro": "選擇發行版，或在下方安裝。",
+  "wsl.onboarding.checkingOpencode": "正在檢查 OpenCode...",
+  "wsl.onboarding.checkingOpencodeIn": "正在檢查 {{distro}} 中的 OpenCode...",
+  "wsl.onboarding.updatingOpencode": "正在更新 OpenCode...",
+  "wsl.onboarding.updatingOpencodeIn": "正在更新 {{distro}} 中的 OpenCode...",
+  "wsl.onboarding.updateOpencodeIn": "更新 {{distro}} 中的 OpenCode。",
+  "wsl.onboarding.updateOpencode": "更新 OpenCode",
+  "wsl.onboarding.opencodeReadyIn": "{{distro}} 中的 OpenCode 已就緒。",
+  "wsl.onboarding.opencodeReady": "OpenCode 已就緒。",
+  "wsl.onboarding.installOpencodeIn": "在 {{distro}} 中安裝 OpenCode。",
+  "wsl.onboarding.installOpencode": "安裝 OpenCode",
+  "wsl.onboarding.chooseDistroFirst": "請先選擇發行版。",
+  "wsl.onboarding.loadFailed": "無法載入 WSL 狀態。",
+  "wsl.onboarding.loading": "載入中...",
+  "wsl.onboarding.installedDistros": "已安裝的發行版",
+  "wsl.onboarding.checkAgain": "再次檢查",
+  "wsl.onboarding.distroStatus.ready": "就緒",
+  "wsl.onboarding.distroStatus.checking": "檢查中...",
+  "wsl.onboarding.distroStatus.opencodeMissing": "未安裝 OpenCode",
+  "wsl.onboarding.distroStatus.missingTools": "缺少 bash、curl",
+  "wsl.onboarding.distroStatus.unsupported": "不支援 · 請使用 WSL 2",
+  "wsl.onboarding.needAnotherDistro": "需要其他發行版？",
+  "wsl.onboarding.needAnotherDistroHint": "從 WSL 目錄安裝 Linux 發行版",
+  "wsl.onboarding.wslNotInstalled.title": "未安裝 WSL",
+  "wsl.onboarding.wslNotInstalled.description": "新增 WSL 伺服器前，必須先安裝 WSL（Windows Subsystem for Linux）",
+  "wsl.onboarding.wslUnavailable.title": "WSL 無法使用",
+  "wsl.onboarding.wslUnavailable.description": "OpenCode 無法確認此電腦上的 WSL。",
+  "wsl.onboarding.installWsl": "安裝 WSL",
+  "wsl.onboarding.windowsRestartRequired": "重新啟動 Windows 以完成 WSL 安裝，然後重新開啟 OpenCode。",
+  "wsl.onboarding.next": "下一步",
+  "wsl.onboarding.refresh": "重新整理",
+  "wsl.onboarding.allDistrosAdded": "所有已安裝的發行版都已新增。",
+  "wsl.onboarding.noDistros": "尚未偵測到發行版。",
+  "wsl.onboarding.install": "安裝",
+  "wsl.onboarding.installing": "安裝中...",
+  "wsl.onboarding.installDistro": "安裝發行版",
+  "wsl.onboarding.searchDistros": "搜尋發行版",
+  "wsl.onboarding.wsl2Required": "需要 WSL 2。",
+  "wsl.onboarding.toolsRequired": "此發行版需要 bash 和 curl。",
+  "wsl.onboarding.openTerminal": "開啟終端機",
+  "wsl.onboarding.path": "路徑: {{path}}",
+  "wsl.onboarding.notFound": "找不到",
+  "wsl.onboarding.version": "版本: {{version}}",
+  "wsl.onboarding.unknown": "未知",
+  "wsl.onboarding.desktopVersion": "桌面版 {{version}}",
+  "wsl.onboarding.versionMismatch": "已安裝版本與桌面應用程式版本不符。",
+  "wsl.onboarding.adding": "新增中...",
 
   "dialog.project.edit.title": "編輯專案",
   "dialog.project.edit.name": "名稱",
@@ -402,6 +481,7 @@ export const dict = {
   "language.no": "Norsk",
   "language.br": "Português (Brasil)",
   "language.bs": "Bosanski",
+  "language.uk": "Українська",
   "language.th": "ไทย",
   "language.tr": "Türkçe",
 
@@ -449,10 +529,12 @@ export const dict = {
 
   "error.page.title": "出了點問題",
   "error.page.description": "載入應用程式時發生錯誤。",
+  "error.page.description.localServerStartup": "啟動本機伺服器時發生錯誤。",
   "error.page.details.label": "錯誤詳情",
   "error.page.action.restart": "重新啟動",
   "error.page.action.report": "回報錯誤",
   "error.page.action.reported": "已回報錯誤",
+  "error.page.action.exportLogs": "匯出日誌",
   "error.page.action.checking": "檢查中...",
   "error.page.action.checkUpdates": "檢查更新",
   "error.page.action.updateTo": "更新到 {{version}}",
@@ -498,17 +580,39 @@ export const dict = {
   "home.recentProjects": "最近專案",
   "home.empty.title": "沒有最近專案",
   "home.empty.description": "透過開啟本地專案開始使用",
+  "home.title": "首頁",
+  "home.projects": "專案",
+  "home.project.add": "新增專案",
+  "home.recentlyClosed": "最近關閉",
+  "home.server.collapse": "收合伺服器專案",
+  "home.server.expand": "展開伺服器專案",
+  "home.sessions.search.placeholder": "搜尋工作階段",
+  "home.sessions.search.placeholder.scoped": "在 {{scope}} 中搜尋工作階段",
+  "home.sessions.search.sessions": "工作階段",
+  "home.sessions.search.noResults": "找不到符合 {{query}} 的工作階段",
+  "home.sessions.empty": "這裡還沒有內容",
+  "home.sessions.empty.description": "建立工作階段以開始使用",
+  "home.sessions.group.today": "今天",
+  "home.sessions.group.yesterday": "昨天",
+  "home.sessions.group.older": "更早",
 
   "session.tab.session": "工作階段",
   "session.tab.review": "審查",
   "session.tab.context": "上下文",
+  "session.tab.unknown": "未知的工作階段",
   "session.panel.reviewAndFiles": "審查與檔案",
+  "session.error.notFound": "找不到此工作階段",
+  "session.error.notFound.description": "此分頁指向的工作階段已不存在於此伺服器。",
+  "session.error.notFound.closeTab": "關閉分頁",
+  "session.error.serverConnection": "無法連線至此伺服器",
   "session.review.filesChanged": "{{count}} 個檔案變更",
   "session.review.change.one": "變更",
   "session.review.change.other": "變更",
   "session.review.loadingChanges": "正在載入變更...",
   "session.review.empty": "此工作階段暫無變更",
   "session.review.noChanges": "沒有變更",
+  "session.review.noUncommittedChanges": "尚無未提交的變更",
+  "session.review.noBranchChanges": "尚無分支變更",
   "session.review.noVcs": "未偵測到 Git 版本控制系統，無法顯示變更",
   "session.review.noSnapshot": "設定中已停用快照追蹤，因此無法使用工作階段變更",
   "session.files.selectToOpen": "選取要開啟的檔案",
@@ -525,6 +629,10 @@ export const dict = {
   "session.todo.title": "待辦事項",
   "session.todo.collapse": "折疊",
   "session.todo.expand": "展開",
+  "session.question.minimize": "最小化問題",
+  "session.question.restore": "還原問題",
+  "session.question.pending.one": "{{count}} 個待處理問題",
+  "session.question.pending.other": "{{count}} 個待處理問題",
   "session.followupDock.summary.one": "{{count}} 則佇列訊息",
   "session.followupDock.summary.other": "{{count}} 則佇列訊息",
   "session.followupDock.sendNow": "立即傳送",
@@ -538,9 +646,16 @@ export const dict = {
   "session.revertDock.restore": "還原訊息",
 
   "session.new.title": "建構任何東西",
+  "session.new.project.new": "新專案",
+  "session.new.project.search": "搜尋專案",
+  "session.new.project.add": "新增專案",
   "session.new.worktree.main": "主分支",
   "session.new.worktree.mainWithBranch": "主分支 ({{branch}})",
   "session.new.worktree.create": "建立新的 worktree",
+  "session.new.workspace.runIn": "工作階段執行位置",
+  "session.new.workspace.triggerLocal": "本機",
+  "session.new.workspace.local": "本機儲存庫",
+  "session.new.workspace.existing": "工作區…",
   "session.new.lastModified": "最後修改",
 
   "session.header.search.placeholder": "搜尋 {{project}}",
@@ -608,6 +723,8 @@ export const dict = {
   "sidebar.project.recentSessions": "最近工作階段",
   "sidebar.project.viewAllSessions": "查看全部工作階段",
   "sidebar.project.clearNotifications": "清除通知",
+  "sidebar.empty.title": "未開啟任何專案",
+  "sidebar.empty.description": "開啟專案以開始使用",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "桌面",
@@ -619,6 +736,7 @@ export const dict = {
   "settings.desktop.wsl.description": "在 Windows 上的 WSL 中執行 OpenCode 伺服器。",
 
   "settings.general.section.appearance": "外觀",
+  "settings.general.section.advanced": "進階",
   "settings.general.section.notifications": "系統通知",
   "settings.general.section.updates": "更新",
   "settings.general.section.sounds": "音效",
@@ -627,6 +745,10 @@ export const dict = {
 
   "settings.general.row.language.title": "語言",
   "settings.general.row.language.description": "變更 OpenCode 的顯示語言",
+  "settings.general.row.shell.title": "終端機 Shell",
+  "settings.general.row.shell.description": "選擇終端機使用的 Shell。相容的 Shell 也會用於代理程式工具呼叫。",
+  "settings.general.row.shell.autoDefault": "自動（預設）",
+  "settings.general.row.shell.terminalOnly": "僅限終端機",
   "settings.general.row.appearance.title": "外觀",
   "settings.general.row.appearance.description": "自訂 OpenCode 在你的裝置上的外觀",
   "settings.general.row.colorScheme.title": "配色方案",
@@ -635,14 +757,28 @@ export const dict = {
   "settings.general.row.theme.description": "自訂 OpenCode 的主題。",
   "settings.general.row.font.title": "程式碼字型",
   "settings.general.row.font.description": "自訂程式碼區塊使用的字型",
-  "settings.general.row.terminalFont.title": "Terminal Font",
-  "settings.general.row.terminalFont.description": "Customise the font used in the terminal",
+  "settings.general.row.terminalFont.title": "終端機字型",
+  "settings.general.row.terminalFont.description": "自訂終端機使用的字型",
   "settings.general.row.uiFont.title": "介面字型",
   "settings.general.row.uiFont.description": "自訂整個介面使用的字型",
   "settings.general.row.followup.title": "後續追問行為",
   "settings.general.row.followup.description": "選擇後續追問提示是立即引導還是進入佇列等待",
   "settings.general.row.followup.option.queue": "佇列",
   "settings.general.row.followup.option.steer": "引導",
+  "settings.general.row.showFileTree.title": "檔案樹",
+  "settings.general.row.showFileTree.description": "在工作階段中顯示檔案樹面板",
+  "settings.general.row.showNavigation.title": "導覽控制項",
+  "settings.general.row.showNavigation.description": "在桌面標題列中顯示上一頁和下一頁按鈕",
+  "settings.general.row.showSearch.title": "命令面板",
+  "settings.general.row.showSearch.description": "在標題列中顯示搜尋和命令面板按鈕",
+  "settings.general.row.showTerminal.title": "終端機",
+  "settings.general.row.showTerminal.description": "在桌面標題列中顯示終端機按鈕",
+  "settings.general.row.showStatus.title": "伺服器狀態",
+  "settings.general.row.showStatus.description": "在標題列中顯示伺服器狀態按鈕",
+  "settings.general.row.mobileTitlebarBottom.title": "底部導覽",
+  "settings.general.row.mobileTitlebarBottom.description": "在行動裝置上將標題列和工作階段分頁置於畫面底部",
+  "settings.general.row.showCustomAgents.title": "自訂代理程式",
+  "settings.general.row.showCustomAgents.description": "在輸入區顯示代理程式選擇器",
   "settings.general.row.reasoningSummaries.title": "顯示推理摘要",
   "settings.general.row.reasoningSummaries.description": "在時間軸中顯示模型推理摘要",
 
@@ -650,6 +786,10 @@ export const dict = {
   "settings.general.row.shellToolPartsExpanded.description": "在時間軸中預設展開 shell 工具區塊",
   "settings.general.row.editToolPartsExpanded.title": "展開 edit 工具區塊",
   "settings.general.row.editToolPartsExpanded.description": "在時間軸中預設展開 edit、write 和 patch 工具區塊",
+  "settings.general.row.newLayoutDesigns.title": "新版面與設計",
+  "settings.general.row.newLayoutDesigns.description": "啟用重新設計的版面、首頁、輸入區和工作階段介面",
+  "settings.general.row.pinchZoom.title": "雙指縮放",
+  "settings.general.row.pinchZoom.description": "允許使用觸控板雙指開合和 Ctrl-捲動手勢縮放",
   "settings.general.row.wayland.title": "使用原生 Wayland",
   "settings.general.row.wayland.description": "在 Wayland 上停用 X11 後備模式。需要重新啟動。",
   "settings.general.row.wayland.tooltip": "在混合更新率螢幕的 Linux 系統上，原生 Wayland 可能更穩定。",
@@ -663,6 +803,8 @@ export const dict = {
   "settings.updates.row.check.description": "手動檢查更新並在有更新時安裝",
   "settings.updates.action.checkNow": "立即檢查",
   "settings.updates.action.checking": "檢查中...",
+  "settings.updates.action.downloading": "下載中...",
+  "settings.updates.action.installing": "安裝中...",
   "settings.updates.toast.latest.title": "已是最新版本",
   "settings.updates.toast.latest.description": "你正在使用最新版本的 OpenCode。",
 
diff --git a/packages/app/src/pages/session/timeline/message-timeline.tsx b/packages/app/src/pages/session/timeline/message-timeline.tsx
index 2e2c65af3b33..d6cc7be972d6 100644
--- a/packages/app/src/pages/session/timeline/message-timeline.tsx
+++ b/packages/app/src/pages/session/timeline/message-timeline.tsx
@@ -160,8 +160,10 @@ function TimelineDiffSummaryRow(props: { diffs: SummaryDiff[] }) {
     >
       <div data-slot="session-turn-diffs-header">
         <span data-slot="session-turn-diffs-label">
-          {props.diffs.length} {language.t("ui.sessionTurn.diffs.changed")}{" "}
-          {language.t(props.diffs.length === 1 ? "ui.common.file.one" : "ui.common.file.other")}
+          {language.t(
+            props.diffs.length === 1 ? "ui.sessionTurn.diffs.changed.one" : "ui.sessionTurn.diffs.changed.other",
+            { count: String(props.diffs.length) },
+          )}
         </span>
         <DiffChanges changes={props.diffs} />
         <Show when={overflow() > 0}>
diff --git a/packages/session-ui/src/components/session-turn.tsx b/packages/session-ui/src/components/session-turn.tsx
index 4ebf6459b158..75274fc50e92 100644
--- a/packages/session-ui/src/components/session-turn.tsx
+++ b/packages/session-ui/src/components/session-turn.tsx
@@ -440,8 +440,10 @@ export function SessionTurn(
                 >
                   <div data-slot="session-turn-diffs-header">
                     <span data-slot="session-turn-diffs-label">
-                      {edited()} {i18n.t("ui.sessionTurn.diffs.changed")}{" "}
-                      {i18n.t(edited() === 1 ? "ui.common.file.one" : "ui.common.file.other")}
+                      {i18n.t(
+                        edited() === 1 ? "ui.sessionTurn.diffs.changed.one" : "ui.sessionTurn.diffs.changed.other",
+                        { count: String(edited()) },
+                      )}
                     </span>
                     <DiffChanges changes={diffs()} />
                     <Show when={overflow() > 0}>
diff --git a/packages/ui/src/i18n/ar.ts b/packages/ui/src/i18n/ar.ts
index dd8cfed6f98f..8e112e4d19d1 100644
--- a/packages/ui/src/i18n/ar.ts
+++ b/packages/ui/src/i18n/ar.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "تغييرات الجلسة",
+  "ui.sessionReview.title.git": "تغييرات Git",
+  "ui.sessionReview.title.branch": "تغييرات الفرع",
   "ui.sessionReview.title.lastTurn": "تغييرات آخر دور",
   "ui.sessionReview.diffStyle.unified": "موحد",
   "ui.sessionReview.diffStyle.split": "منقسم",
@@ -16,6 +18,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff كبير جدا لعرضه",
   "ui.sessionReview.largeDiff.meta": "الحد: {{limit}} سطرًا متغيرًا. الحالي: {{current}} سطرًا متغيرًا.",
   "ui.sessionReview.largeDiff.renderAnyway": "اعرض على أي حال",
+  "ui.sessionReviewV2.expandMode": "توسيع الفروقات أو طيها",
+  "ui.sessionReviewV2.filterFiles": "تصفية الملفات",
+  "ui.sessionReviewV2.toggleSidebar": "تبديل شجرة الملفات",
+  "ui.sessionReviewV2.showAllLines": "إظهار جميع الأسطر",
+  "ui.sessionReviewV2.hideNonDiffLines": "إخفاء الأسطر خارج الفروقات",
+  "ui.sessionReviewV2.unifiedDiff": "فروقات موحدة",
+  "ui.sessionReviewV2.splitDiff": "فروقات منقسمة",
+  "ui.sessionReviewV2.previousFile": "الملف السابق",
+  "ui.sessionReviewV2.nextFile": "الملف التالي",
+  "ui.sessionReviewV2.diffView": "عرض الفروقات",
+  "ui.sessionReviewV2.empty.noGit.title": "لا توجد تغييرات متتبعة",
+  "ui.sessionReviewV2.empty.noGit.description": "تتبع التغييرات في هذا المشروع وراجعها وتراجع عنها",
+  "ui.sessionReviewV2.empty.noGit.action": "إنشاء مستودع Git",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "جارٍ إنشاء مستودع Git...",
+  "ui.sessionReviewV2.empty.changes.title": "لا توجد تغييرات في الملفات بعد",
+  "ui.sessionReviewV2.empty.changes.description": "ستظهر تغييرات المشروع هنا",
   "ui.fileMedia.kind.image": "صورة",
   "ui.fileMedia.kind.audio": "صوت",
   "ui.fileMedia.state.removed": "تمت إزالة {{kind}}",
@@ -32,11 +50,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "أضف تعليقًا",
   "ui.lineComment.submit": "تعليق",
+  "ui.lineComment.cancel": "إلغاء",
 
   "ui.sessionTurn.steps.show": "إظهار الخطوات",
   "ui.sessionTurn.steps.hide": "إخفاء الخطوات",
   "ui.sessionTurn.summary.response": "استجابة",
   "ui.sessionTurn.diff.showMore": "إظهار المزيد من التغييرات ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "ملف معدل: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "الملفات المعدلة: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "إظهار الكل",
+  "ui.sessionTurn.diffs.showLess": "إظهار أقل",
+  "ui.sessionTurn.diffs.more": "ملفات إضافية: {{count}}",
 
   "ui.sessionTurn.retry.retrying": "إعادة المحاولة",
   "ui.sessionTurn.retry.inSeconds": "خلال {{seconds}} ثواني",
diff --git a/packages/ui/src/i18n/br.ts b/packages/ui/src/i18n/br.ts
index 4b2c418ca501..4661ece48733 100644
--- a/packages/ui/src/i18n/br.ts
+++ b/packages/ui/src/i18n/br.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "Alterações da sessão",
+  "ui.sessionReview.title.git": "Alterações do Git",
+  "ui.sessionReview.title.branch": "Alterações da branch",
   "ui.sessionReview.title.lastTurn": "Alterações do último turno",
   "ui.sessionReview.diffStyle.unified": "Unificado",
   "ui.sessionReview.diffStyle.split": "Dividido",
@@ -16,6 +18,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff grande demais para renderizar",
   "ui.sessionReview.largeDiff.meta": "Limite: {{limit}} linhas alteradas. Atual: {{current}} linhas alteradas.",
   "ui.sessionReview.largeDiff.renderAnyway": "Renderizar mesmo assim",
+  "ui.sessionReviewV2.expandMode": "Expandir ou recolher diff",
+  "ui.sessionReviewV2.filterFiles": "Filtrar arquivos",
+  "ui.sessionReviewV2.toggleSidebar": "Alternar árvore de arquivos",
+  "ui.sessionReviewV2.showAllLines": "Mostrar todas as linhas",
+  "ui.sessionReviewV2.hideNonDiffLines": "Ocultar linhas fora do diff",
+  "ui.sessionReviewV2.unifiedDiff": "Diff unificado",
+  "ui.sessionReviewV2.splitDiff": "Diff dividido",
+  "ui.sessionReviewV2.previousFile": "Arquivo anterior",
+  "ui.sessionReviewV2.nextFile": "Próximo arquivo",
+  "ui.sessionReviewV2.diffView": "Visualização do diff",
+  "ui.sessionReviewV2.empty.noGit.title": "Nenhuma alteração rastreada",
+  "ui.sessionReviewV2.empty.noGit.description": "Rastreie, revise e desfaça alterações neste projeto",
+  "ui.sessionReviewV2.empty.noGit.action": "Criar repositório Git",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Criando repositório Git...",
+  "ui.sessionReviewV2.empty.changes.title": "Nenhuma alteração em arquivos ainda",
+  "ui.sessionReviewV2.empty.changes.description": "As alterações do projeto aparecerão aqui",
   "ui.fileMedia.kind.image": "imagem",
   "ui.fileMedia.kind.audio": "áudio",
   "ui.fileMedia.state.removed": "Removido: {{kind}}",
@@ -32,11 +50,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Adicionar comentário",
   "ui.lineComment.submit": "Comentar",
+  "ui.lineComment.cancel": "Cancelar",
 
   "ui.sessionTurn.steps.show": "Mostrar passos",
   "ui.sessionTurn.steps.hide": "Ocultar passos",
   "ui.sessionTurn.summary.response": "Resposta",
   "ui.sessionTurn.diff.showMore": "Mostrar mais alterações ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Arquivo alterado: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Arquivos alterados: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Mostrar tudo",
+  "ui.sessionTurn.diffs.showLess": "Mostrar menos",
+  "ui.sessionTurn.diffs.more": "+{{count}} a mais",
 
   "ui.sessionTurn.retry.retrying": "tentando novamente",
   "ui.sessionTurn.retry.inSeconds": "em {{seconds}}s",
diff --git a/packages/ui/src/i18n/bs.ts b/packages/ui/src/i18n/bs.ts
index be041f147133..eac44effd41f 100644
--- a/packages/ui/src/i18n/bs.ts
+++ b/packages/ui/src/i18n/bs.ts
@@ -4,6 +4,8 @@ type Keys = keyof typeof en
 
 export const dict = {
   "ui.sessionReview.title": "Promjene sesije",
+  "ui.sessionReview.title.git": "Git promjene",
+  "ui.sessionReview.title.branch": "Promjene na grani",
   "ui.sessionReview.title.lastTurn": "Promjene u posljednjem potezu",
   "ui.sessionReview.diffStyle.unified": "Ujedinjeno",
   "ui.sessionReview.diffStyle.split": "Podijeljeno",
@@ -20,6 +22,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff je prevelik za prikaz",
   "ui.sessionReview.largeDiff.meta": "Limit: {{limit}} izmijenjenih linija. Trenutno: {{current}} izmijenjenih linija.",
   "ui.sessionReview.largeDiff.renderAnyway": "Prikaži svejedno",
+  "ui.sessionReviewV2.expandMode": "Proširi ili sažmi diff",
+  "ui.sessionReviewV2.filterFiles": "Filtriraj datoteke",
+  "ui.sessionReviewV2.toggleSidebar": "Prikaži/sakrij stablo datoteka",
+  "ui.sessionReviewV2.showAllLines": "Prikaži sve linije",
+  "ui.sessionReviewV2.hideNonDiffLines": "Sakrij linije bez izmjena",
+  "ui.sessionReviewV2.unifiedDiff": "Ujedinjeni diff",
+  "ui.sessionReviewV2.splitDiff": "Podijeljeni diff",
+  "ui.sessionReviewV2.previousFile": "Prethodna datoteka",
+  "ui.sessionReviewV2.nextFile": "Sljedeća datoteka",
+  "ui.sessionReviewV2.diffView": "Prikaz diff-a",
+  "ui.sessionReviewV2.empty.noGit.title": "Nema praćenih promjena",
+  "ui.sessionReviewV2.empty.noGit.description": "Prati, pregledaj i poništi promjene u ovom projektu",
+  "ui.sessionReviewV2.empty.noGit.action": "Kreiraj Git repozitorij",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Kreiranje Git repozitorija...",
+  "ui.sessionReviewV2.empty.changes.title": "Još nema izmjena u datotekama",
+  "ui.sessionReviewV2.empty.changes.description": "Promjene projekta će se prikazati ovdje",
   "ui.fileMedia.kind.image": "slika",
   "ui.fileMedia.kind.audio": "audio",
   "ui.fileMedia.state.removed": "Uklonjeno: {{kind}}",
@@ -36,11 +54,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Dodaj komentar",
   "ui.lineComment.submit": "Komentariši",
+  "ui.lineComment.cancel": "Otkaži",
 
   "ui.sessionTurn.steps.show": "Prikaži korake",
   "ui.sessionTurn.steps.hide": "Sakrij korake",
   "ui.sessionTurn.summary.response": "Odgovor",
   "ui.sessionTurn.diff.showMore": "Prikaži još izmjena ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Izmijenjena datoteka: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Izmijenjene datoteke: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Prikaži sve",
+  "ui.sessionTurn.diffs.showLess": "Prikaži manje",
+  "ui.sessionTurn.diffs.more": "+ još {{count}}",
 
   "ui.sessionTurn.retry.retrying": "ponovni pokušaj",
   "ui.sessionTurn.retry.inSeconds": "za {{seconds}}s",
diff --git a/packages/ui/src/i18n/da.ts b/packages/ui/src/i18n/da.ts
index 91adc52e9d45..0057691b2c9e 100644
--- a/packages/ui/src/i18n/da.ts
+++ b/packages/ui/src/i18n/da.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "Sessionsændringer",
+  "ui.sessionReview.title.git": "Git-ændringer",
+  "ui.sessionReview.title.branch": "Grenændringer",
   "ui.sessionReview.title.lastTurn": "Ændringer fra sidste tur",
   "ui.sessionReview.diffStyle.unified": "Samlet",
   "ui.sessionReview.diffStyle.split": "Opdelt",
@@ -17,6 +19,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff er for stor til at blive vist",
   "ui.sessionReview.largeDiff.meta": "Grænse: {{limit}} ændrede linjer. Nuværende: {{current}} ændrede linjer.",
   "ui.sessionReview.largeDiff.renderAnyway": "Vis alligevel",
+  "ui.sessionReviewV2.expandMode": "Udvid eller skjul diff",
+  "ui.sessionReviewV2.filterFiles": "Filtrer filer",
+  "ui.sessionReviewV2.toggleSidebar": "Skift filtræ",
+  "ui.sessionReviewV2.showAllLines": "Vis alle linjer",
+  "ui.sessionReviewV2.hideNonDiffLines": "Skjul linjer uden ændringer",
+  "ui.sessionReviewV2.unifiedDiff": "Samlet diff",
+  "ui.sessionReviewV2.splitDiff": "Opdelt diff",
+  "ui.sessionReviewV2.previousFile": "Forrige fil",
+  "ui.sessionReviewV2.nextFile": "Næste fil",
+  "ui.sessionReviewV2.diffView": "Diffvisning",
+  "ui.sessionReviewV2.empty.noGit.title": "Ingen sporede ændringer",
+  "ui.sessionReviewV2.empty.noGit.description": "Spor, gennemgå og fortryd ændringer i dette projekt",
+  "ui.sessionReviewV2.empty.noGit.action": "Opret et Git-repository",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Opretter Git-repository...",
+  "ui.sessionReviewV2.empty.changes.title": "Ingen filændringer endnu",
+  "ui.sessionReviewV2.empty.changes.description": "Projektændringer vises her",
   "ui.fileMedia.kind.image": "billede",
   "ui.fileMedia.kind.audio": "lyd",
   "ui.fileMedia.state.removed": "Fjernet: {{kind}}",
@@ -32,10 +50,16 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Tilføj kommentar",
   "ui.lineComment.submit": "Kommenter",
+  "ui.lineComment.cancel": "Annuller",
   "ui.sessionTurn.steps.show": "Vis trin",
   "ui.sessionTurn.steps.hide": "Skjul trin",
   "ui.sessionTurn.summary.response": "Svar",
   "ui.sessionTurn.diff.showMore": "Vis flere ændringer ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Ændret fil: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Ændrede filer: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Vis alle",
+  "ui.sessionTurn.diffs.showLess": "Vis færre",
+  "ui.sessionTurn.diffs.more": "+{{count}} mere",
 
   "ui.sessionTurn.retry.retrying": "prøver igen",
   "ui.sessionTurn.retry.inSeconds": "om {{seconds}}s",
diff --git a/packages/ui/src/i18n/de.ts b/packages/ui/src/i18n/de.ts
index 7b36859bf6de..49265274286e 100644
--- a/packages/ui/src/i18n/de.ts
+++ b/packages/ui/src/i18n/de.ts
@@ -4,6 +4,8 @@ type Keys = keyof typeof en
 
 export const dict = {
   "ui.sessionReview.title": "Sitzungsänderungen",
+  "ui.sessionReview.title.git": "Git-Änderungen",
+  "ui.sessionReview.title.branch": "Branch-Änderungen",
   "ui.sessionReview.title.lastTurn": "Änderungen der letzten Runde",
   "ui.sessionReview.diffStyle.unified": "Vereinheitlicht",
   "ui.sessionReview.diffStyle.split": "Geteilt",
@@ -21,6 +23,23 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff zu groß zum Rendern",
   "ui.sessionReview.largeDiff.meta": "Limit: {{limit}} geänderte Zeilen. Aktuell: {{current}} geänderte Zeilen.",
   "ui.sessionReview.largeDiff.renderAnyway": "Trotzdem rendern",
+  "ui.sessionReviewV2.expandMode": "Diff ein- oder ausklappen",
+  "ui.sessionReviewV2.filterFiles": "Dateien filtern",
+  "ui.sessionReviewV2.toggleSidebar": "Dateibaum umschalten",
+  "ui.sessionReviewV2.showAllLines": "Alle Zeilen anzeigen",
+  "ui.sessionReviewV2.hideNonDiffLines": "Zeilen außerhalb des Diffs ausblenden",
+  "ui.sessionReviewV2.unifiedDiff": "Vereinheitlichter Diff",
+  "ui.sessionReviewV2.splitDiff": "Geteilter Diff",
+  "ui.sessionReviewV2.previousFile": "Vorherige Datei",
+  "ui.sessionReviewV2.nextFile": "Nächste Datei",
+  "ui.sessionReviewV2.diffView": "Diff-Ansicht",
+  "ui.sessionReviewV2.empty.noGit.title": "Keine verfolgten Änderungen",
+  "ui.sessionReviewV2.empty.noGit.description":
+    "Änderungen in diesem Projekt verfolgen, überprüfen und rückgängig machen",
+  "ui.sessionReviewV2.empty.noGit.action": "Git-Repository erstellen",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Git-Repository wird erstellt...",
+  "ui.sessionReviewV2.empty.changes.title": "Noch keine Dateiänderungen",
+  "ui.sessionReviewV2.empty.changes.description": "Projektänderungen werden hier angezeigt",
   "ui.fileMedia.kind.image": "bild",
   "ui.fileMedia.kind.audio": "audio",
   "ui.fileMedia.state.removed": "{{kind}} entfernt",
@@ -38,10 +57,16 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Kommentar hinzufügen",
   "ui.lineComment.submit": "Kommentieren",
+  "ui.lineComment.cancel": "Abbrechen",
   "ui.sessionTurn.steps.show": "Schritte anzeigen",
   "ui.sessionTurn.steps.hide": "Schritte ausblenden",
   "ui.sessionTurn.summary.response": "Antwort",
   "ui.sessionTurn.diff.showMore": "Weitere Änderungen anzeigen ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Geänderte Datei: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Geänderte Dateien: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Alle anzeigen",
+  "ui.sessionTurn.diffs.showLess": "Weniger anzeigen",
+  "ui.sessionTurn.diffs.more": "+{{count}} weitere",
 
   "ui.sessionTurn.retry.retrying": "erneuter Versuch",
   "ui.sessionTurn.retry.inSeconds": "in {{seconds}}s",
diff --git a/packages/ui/src/i18n/en.ts b/packages/ui/src/i18n/en.ts
index 5e9e02b215ea..f982766d1328 100644
--- a/packages/ui/src/i18n/en.ts
+++ b/packages/ui/src/i18n/en.ts
@@ -58,7 +58,8 @@ export const dict: Record<string, string> = {
   "ui.sessionTurn.steps.hide": "Hide steps",
   "ui.sessionTurn.summary.response": "Response",
   "ui.sessionTurn.diff.showMore": "Show more changes ({{count}})",
-  "ui.sessionTurn.diffs.changed": "Changed",
+  "ui.sessionTurn.diffs.changed.one": "{{count}} Changed file",
+  "ui.sessionTurn.diffs.changed.other": "{{count}} Changed files",
   "ui.sessionTurn.diffs.showAll": "Show all",
   "ui.sessionTurn.diffs.showLess": "Show less",
   "ui.sessionTurn.diffs.more": "+{{count}} more files",
diff --git a/packages/ui/src/i18n/es.ts b/packages/ui/src/i18n/es.ts
index f883531031b0..59502b842112 100644
--- a/packages/ui/src/i18n/es.ts
+++ b/packages/ui/src/i18n/es.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "Cambios de la sesión",
+  "ui.sessionReview.title.git": "Cambios de Git",
+  "ui.sessionReview.title.branch": "Cambios de la rama",
   "ui.sessionReview.title.lastTurn": "Cambios del último turno",
   "ui.sessionReview.diffStyle.unified": "Unificado",
   "ui.sessionReview.diffStyle.split": "Dividido",
@@ -16,6 +18,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff demasiado grande para renderizar",
   "ui.sessionReview.largeDiff.meta": "Límite: {{limit}} líneas modificadas. Actual: {{current}} líneas modificadas.",
   "ui.sessionReview.largeDiff.renderAnyway": "Renderizar de todos modos",
+  "ui.sessionReviewV2.expandMode": "Expandir o colapsar diff",
+  "ui.sessionReviewV2.filterFiles": "Filtrar archivos",
+  "ui.sessionReviewV2.toggleSidebar": "Alternar árbol de archivos",
+  "ui.sessionReviewV2.showAllLines": "Mostrar todas las líneas",
+  "ui.sessionReviewV2.hideNonDiffLines": "Ocultar líneas sin cambios",
+  "ui.sessionReviewV2.unifiedDiff": "Diff unificado",
+  "ui.sessionReviewV2.splitDiff": "Diff dividido",
+  "ui.sessionReviewV2.previousFile": "Archivo anterior",
+  "ui.sessionReviewV2.nextFile": "Siguiente archivo",
+  "ui.sessionReviewV2.diffView": "Vista de diff",
+  "ui.sessionReviewV2.empty.noGit.title": "No hay cambios rastreados",
+  "ui.sessionReviewV2.empty.noGit.description": "Rastrea, revisa y deshaz cambios en este proyecto",
+  "ui.sessionReviewV2.empty.noGit.action": "Crear repositorio Git",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Creando repositorio Git...",
+  "ui.sessionReviewV2.empty.changes.title": "Aún no hay cambios en los archivos",
+  "ui.sessionReviewV2.empty.changes.description": "Los cambios del proyecto aparecerán aquí",
   "ui.fileMedia.kind.image": "imagen",
   "ui.fileMedia.kind.audio": "audio",
   "ui.fileMedia.state.removed": "Archivo de {{kind}} eliminado",
@@ -32,11 +50,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Añadir comentario",
   "ui.lineComment.submit": "Comentar",
+  "ui.lineComment.cancel": "Cancelar",
 
   "ui.sessionTurn.steps.show": "Mostrar pasos",
   "ui.sessionTurn.steps.hide": "Ocultar pasos",
   "ui.sessionTurn.summary.response": "Respuesta",
   "ui.sessionTurn.diff.showMore": "Mostrar más cambios ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Archivo modificado: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Archivos modificados: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Mostrar todos",
+  "ui.sessionTurn.diffs.showLess": "Mostrar menos",
+  "ui.sessionTurn.diffs.more": "+{{count}} más",
 
   "ui.sessionTurn.retry.retrying": "reintentando",
   "ui.sessionTurn.retry.inSeconds": "en {{seconds}}s",
diff --git a/packages/ui/src/i18n/fr.ts b/packages/ui/src/i18n/fr.ts
index 3ae122d35eeb..ccf681cc8474 100644
--- a/packages/ui/src/i18n/fr.ts
+++ b/packages/ui/src/i18n/fr.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "Modifications de la session",
+  "ui.sessionReview.title.git": "Modifications Git",
+  "ui.sessionReview.title.branch": "Modifications de la branche",
   "ui.sessionReview.title.lastTurn": "Modifications du dernier tour",
   "ui.sessionReview.diffStyle.unified": "Unifié",
   "ui.sessionReview.diffStyle.split": "Divisé",
@@ -16,6 +18,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff trop volumineux pour être affiché",
   "ui.sessionReview.largeDiff.meta": "Limite : {{limit}} lignes modifiées. Actuel : {{current}} lignes modifiées.",
   "ui.sessionReview.largeDiff.renderAnyway": "Afficher quand même",
+  "ui.sessionReviewV2.expandMode": "Développer ou réduire le diff",
+  "ui.sessionReviewV2.filterFiles": "Filtrer les fichiers",
+  "ui.sessionReviewV2.toggleSidebar": "Afficher ou masquer l'arborescence des fichiers",
+  "ui.sessionReviewV2.showAllLines": "Afficher toutes les lignes",
+  "ui.sessionReviewV2.hideNonDiffLines": "Masquer les lignes hors diff",
+  "ui.sessionReviewV2.unifiedDiff": "Diff unifié",
+  "ui.sessionReviewV2.splitDiff": "Diff côte à côte",
+  "ui.sessionReviewV2.previousFile": "Fichier précédent",
+  "ui.sessionReviewV2.nextFile": "Fichier suivant",
+  "ui.sessionReviewV2.diffView": "Vue du diff",
+  "ui.sessionReviewV2.empty.noGit.title": "Aucune modification suivie",
+  "ui.sessionReviewV2.empty.noGit.description": "Suivre, examiner et annuler les modifications dans ce projet",
+  "ui.sessionReviewV2.empty.noGit.action": "Créer un dépôt Git",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Création du dépôt Git...",
+  "ui.sessionReviewV2.empty.changes.title": "Aucune modification de fichier pour l'instant",
+  "ui.sessionReviewV2.empty.changes.description": "Les modifications du projet apparaîtront ici",
   "ui.fileMedia.kind.image": "image",
   "ui.fileMedia.kind.audio": "audio",
   "ui.fileMedia.state.removed": "Fichier {{kind}} supprimé",
@@ -32,11 +50,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Ajouter un commentaire",
   "ui.lineComment.submit": "Commenter",
+  "ui.lineComment.cancel": "Annuler",
 
   "ui.sessionTurn.steps.show": "Afficher les étapes",
   "ui.sessionTurn.steps.hide": "Masquer les étapes",
   "ui.sessionTurn.summary.response": "Réponse",
   "ui.sessionTurn.diff.showMore": "Afficher plus de modifications ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Fichier modifié : {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Fichiers modifiés : {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Tout afficher",
+  "ui.sessionTurn.diffs.showLess": "Afficher moins",
+  "ui.sessionTurn.diffs.more": "+{{count}} de plus",
 
   "ui.sessionTurn.retry.retrying": "nouvelle tentative",
   "ui.sessionTurn.retry.inSeconds": "dans {{seconds}}s",
diff --git a/packages/ui/src/i18n/ja.ts b/packages/ui/src/i18n/ja.ts
index 1b50cb5ff158..f22c0f6d5f0d 100644
--- a/packages/ui/src/i18n/ja.ts
+++ b/packages/ui/src/i18n/ja.ts
@@ -1,8 +1,10 @@
 export const dict = {
   "ui.sessionReview.title": "セッションの変更",
+  "ui.sessionReview.title.git": "Gitの変更",
+  "ui.sessionReview.title.branch": "ブランチの変更",
   "ui.sessionReview.title.lastTurn": "前回ターンの変更",
-  "ui.sessionReview.diffStyle.unified": "Unified",
-  "ui.sessionReview.diffStyle.split": "Split",
+  "ui.sessionReview.diffStyle.unified": "統合差分",
+  "ui.sessionReview.diffStyle.split": "分割差分",
   "ui.sessionReview.openFile": "ファイルを開く",
   "ui.sessionReview.selection.line": "{{line}} 行目",
   "ui.sessionReview.selection.lines": "{{start}}-{{end}} 行目",
@@ -17,6 +19,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "差分が大きすぎて表示できません",
   "ui.sessionReview.largeDiff.meta": "上限: {{limit}} 変更行。現在: {{current}} 変更行。",
   "ui.sessionReview.largeDiff.renderAnyway": "それでも表示する",
+  "ui.sessionReviewV2.expandMode": "差分を展開または折りたたむ",
+  "ui.sessionReviewV2.filterFiles": "ファイルを絞り込む",
+  "ui.sessionReviewV2.toggleSidebar": "ファイルツリーを切り替える",
+  "ui.sessionReviewV2.showAllLines": "すべての行を表示",
+  "ui.sessionReviewV2.hideNonDiffLines": "差分以外の行を非表示",
+  "ui.sessionReviewV2.unifiedDiff": "統合差分",
+  "ui.sessionReviewV2.splitDiff": "分割差分",
+  "ui.sessionReviewV2.previousFile": "前のファイル",
+  "ui.sessionReviewV2.nextFile": "次のファイル",
+  "ui.sessionReviewV2.diffView": "差分ビュー",
+  "ui.sessionReviewV2.empty.noGit.title": "追跡中の変更はありません",
+  "ui.sessionReviewV2.empty.noGit.description": "このプロジェクトの変更を追跡、レビュー、取り消しできます",
+  "ui.sessionReviewV2.empty.noGit.action": "Gitリポジトリを作成",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Gitリポジトリを作成中...",
+  "ui.sessionReviewV2.empty.changes.title": "ファイルの変更はまだありません",
+  "ui.sessionReviewV2.empty.changes.description": "プロジェクトの変更がここに表示されます",
   "ui.fileMedia.kind.image": "画像",
   "ui.fileMedia.kind.audio": "音声",
   "ui.fileMedia.state.removed": "{{kind}}は削除されました",
@@ -32,10 +50,16 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "へのコメントを作成中",
   "ui.lineComment.placeholder": "コメントを追加",
   "ui.lineComment.submit": "コメント",
+  "ui.lineComment.cancel": "キャンセル",
   "ui.sessionTurn.steps.show": "ステップを表示",
   "ui.sessionTurn.steps.hide": "ステップを隠す",
   "ui.sessionTurn.summary.response": "応答",
   "ui.sessionTurn.diff.showMore": "さらに変更を表示 ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "変更済みファイル: {{count}}件",
+  "ui.sessionTurn.diffs.changed.other": "変更済みファイル: {{count}}件",
+  "ui.sessionTurn.diffs.showAll": "すべて表示",
+  "ui.sessionTurn.diffs.showLess": "一部のみ表示",
+  "ui.sessionTurn.diffs.more": "+他{{count}}件",
 
   "ui.sessionTurn.retry.retrying": "再試行中",
   "ui.sessionTurn.retry.inSeconds": "{{seconds}}秒後",
diff --git a/packages/ui/src/i18n/ko.ts b/packages/ui/src/i18n/ko.ts
index d6c480364d3f..f358810fd236 100644
--- a/packages/ui/src/i18n/ko.ts
+++ b/packages/ui/src/i18n/ko.ts
@@ -165,4 +165,29 @@ export const dict = {
   "ui.toolErrorCard.copyError": "오류 복사",
   "ui.message.duration.seconds": "{{count}}초",
   "ui.message.duration.minutesSeconds": "{{minutes}}분 {{seconds}}초",
+
+  "ui.sessionReview.title.git": "Git 변경 사항",
+  "ui.sessionReview.title.branch": "브랜치 변경 사항",
+  "ui.sessionReviewV2.expandMode": "diff 펼치기 또는 접기",
+  "ui.sessionReviewV2.filterFiles": "파일 필터링",
+  "ui.sessionReviewV2.toggleSidebar": "파일 트리 토글",
+  "ui.sessionReviewV2.showAllLines": "모든 줄 표시",
+  "ui.sessionReviewV2.hideNonDiffLines": "변경되지 않은 줄 숨기기",
+  "ui.sessionReviewV2.unifiedDiff": "통합 diff",
+  "ui.sessionReviewV2.splitDiff": "분할 diff",
+  "ui.sessionReviewV2.previousFile": "이전 파일",
+  "ui.sessionReviewV2.nextFile": "다음 파일",
+  "ui.sessionReviewV2.diffView": "diff 보기",
+  "ui.sessionReviewV2.empty.noGit.title": "추적 중인 변경 사항 없음",
+  "ui.sessionReviewV2.empty.noGit.description": "이 프로젝트의 변경 사항을 추적, 검토 및 실행 취소",
+  "ui.sessionReviewV2.empty.noGit.action": "Git 저장소 생성",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Git 저장소 생성 중...",
+  "ui.sessionReviewV2.empty.changes.title": "아직 파일 변경 사항 없음",
+  "ui.sessionReviewV2.empty.changes.description": "프로젝트 변경 사항이 여기에 표시됩니다",
+  "ui.lineComment.cancel": "취소",
+  "ui.sessionTurn.diffs.changed.one": "변경된 파일: {{count}}개",
+  "ui.sessionTurn.diffs.changed.other": "변경된 파일: {{count}}개",
+  "ui.sessionTurn.diffs.showAll": "모두 표시",
+  "ui.sessionTurn.diffs.showLess": "간략히 표시",
+  "ui.sessionTurn.diffs.more": "+{{count}}개 더 보기",
 }
diff --git a/packages/ui/src/i18n/no.ts b/packages/ui/src/i18n/no.ts
index ecf67219d52f..0ee729adcb6b 100644
--- a/packages/ui/src/i18n/no.ts
+++ b/packages/ui/src/i18n/no.ts
@@ -168,4 +168,29 @@ export const dict: Record<Keys, string> = {
   "ui.toolErrorCard.copyError": "Kopier feil",
   "ui.message.duration.seconds": "{{count}}s",
   "ui.message.duration.minutesSeconds": "{{minutes}}m {{seconds}}s",
+
+  "ui.sessionReview.title.git": "Git-endringer",
+  "ui.sessionReview.title.branch": "Grenendringer",
+  "ui.sessionReviewV2.expandMode": "Utvid eller fold sammen diff",
+  "ui.sessionReviewV2.filterFiles": "Filtrer filer",
+  "ui.sessionReviewV2.toggleSidebar": "Vis eller skjul filtreet",
+  "ui.sessionReviewV2.showAllLines": "Vis alle linjer",
+  "ui.sessionReviewV2.hideNonDiffLines": "Skjul uendrede linjer",
+  "ui.sessionReviewV2.unifiedDiff": "Samlet diff",
+  "ui.sessionReviewV2.splitDiff": "Delt diff",
+  "ui.sessionReviewV2.previousFile": "Forrige fil",
+  "ui.sessionReviewV2.nextFile": "Neste fil",
+  "ui.sessionReviewV2.diffView": "Diffvisning",
+  "ui.sessionReviewV2.empty.noGit.title": "Ingen sporede endringer",
+  "ui.sessionReviewV2.empty.noGit.description": "Spor, gjennomgå og angre endringer i dette prosjektet",
+  "ui.sessionReviewV2.empty.noGit.action": "Opprett et Git-depot",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Oppretter Git-depot...",
+  "ui.sessionReviewV2.empty.changes.title": "Ingen filendringer ennå",
+  "ui.sessionReviewV2.empty.changes.description": "Prosjektendringer vises her",
+  "ui.lineComment.cancel": "Avbryt",
+  "ui.sessionTurn.diffs.changed.one": "Endret fil: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Endrede filer: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Vis alle",
+  "ui.sessionTurn.diffs.showLess": "Vis færre",
+  "ui.sessionTurn.diffs.more": "+{{count}} til",
 }
diff --git a/packages/ui/src/i18n/pl.ts b/packages/ui/src/i18n/pl.ts
index 6ef40d2dafdc..4dbbe03add34 100644
--- a/packages/ui/src/i18n/pl.ts
+++ b/packages/ui/src/i18n/pl.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "Zmiany w sesji",
+  "ui.sessionReview.title.git": "Zmiany Git",
+  "ui.sessionReview.title.branch": "Zmiany w gałęzi",
   "ui.sessionReview.title.lastTurn": "Zmiany z ostatniej tury",
   "ui.sessionReview.diffStyle.unified": "Ujednolicony",
   "ui.sessionReview.diffStyle.split": "Podzielony",
@@ -17,6 +19,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff jest zbyt duży, aby go wyrenderować",
   "ui.sessionReview.largeDiff.meta": "Limit: {{limit}} zmienionych linii. Obecnie: {{current}} zmienionych linii.",
   "ui.sessionReview.largeDiff.renderAnyway": "Renderuj mimo to",
+  "ui.sessionReviewV2.expandMode": "Rozwiń lub zwiń diff",
+  "ui.sessionReviewV2.filterFiles": "Filtruj pliki",
+  "ui.sessionReviewV2.toggleSidebar": "Przełącz drzewo plików",
+  "ui.sessionReviewV2.showAllLines": "Pokaż wszystkie linie",
+  "ui.sessionReviewV2.hideNonDiffLines": "Ukryj linie spoza zmian",
+  "ui.sessionReviewV2.unifiedDiff": "Ujednolicony diff",
+  "ui.sessionReviewV2.splitDiff": "Podzielony diff",
+  "ui.sessionReviewV2.previousFile": "Poprzedni plik",
+  "ui.sessionReviewV2.nextFile": "Następny plik",
+  "ui.sessionReviewV2.diffView": "Widok zmian",
+  "ui.sessionReviewV2.empty.noGit.title": "Brak śledzonych zmian",
+  "ui.sessionReviewV2.empty.noGit.description": "Śledź, przeglądaj i cofaj zmiany w tym projekcie",
+  "ui.sessionReviewV2.empty.noGit.action": "Utwórz repozytorium Git",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Tworzenie repozytorium Git...",
+  "ui.sessionReviewV2.empty.changes.title": "Brak jeszcze zmian w plikach",
+  "ui.sessionReviewV2.empty.changes.description": "Zmiany w projekcie pojawią się tutaj",
   "ui.fileMedia.kind.image": "obraz",
   "ui.fileMedia.kind.audio": "dźwięk",
   "ui.fileMedia.state.removed": "{{kind}} usunięty",
@@ -32,10 +50,16 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Dodaj komentarz",
   "ui.lineComment.submit": "Skomentuj",
+  "ui.lineComment.cancel": "Anuluj",
   "ui.sessionTurn.steps.show": "Pokaż kroki",
   "ui.sessionTurn.steps.hide": "Ukryj kroki",
   "ui.sessionTurn.summary.response": "Odpowiedź",
   "ui.sessionTurn.diff.showMore": "Pokaż więcej zmian ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Zmieniony plik: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Zmienione pliki: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Pokaż wszystkie",
+  "ui.sessionTurn.diffs.showLess": "Pokaż mniej",
+  "ui.sessionTurn.diffs.more": "+{{count}} więcej",
 
   "ui.sessionTurn.retry.retrying": "ponawianie",
   "ui.sessionTurn.retry.inSeconds": "za {{seconds}}s",
diff --git a/packages/ui/src/i18n/ru.ts b/packages/ui/src/i18n/ru.ts
index ed5c4e8f4f7c..80694cdbe079 100644
--- a/packages/ui/src/i18n/ru.ts
+++ b/packages/ui/src/i18n/ru.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "Изменения сессии",
+  "ui.sessionReview.title.git": "Изменения Git",
+  "ui.sessionReview.title.branch": "Изменения ветки",
   "ui.sessionReview.title.lastTurn": "Изменения последнего хода",
   "ui.sessionReview.diffStyle.unified": "Объединённый",
   "ui.sessionReview.diffStyle.split": "Разделённый",
@@ -17,6 +19,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Diff слишком большой для отображения",
   "ui.sessionReview.largeDiff.meta": "Лимит: {{limit}} изменённых строк. Текущий: {{current}} изменённых строк.",
   "ui.sessionReview.largeDiff.renderAnyway": "Отобразить всё равно",
+  "ui.sessionReviewV2.expandMode": "Развернуть или свернуть diff",
+  "ui.sessionReviewV2.filterFiles": "Фильтровать файлы",
+  "ui.sessionReviewV2.toggleSidebar": "Переключить дерево файлов",
+  "ui.sessionReviewV2.showAllLines": "Показать все строки",
+  "ui.sessionReviewV2.hideNonDiffLines": "Скрыть строки без изменений",
+  "ui.sessionReviewV2.unifiedDiff": "Объединённый diff",
+  "ui.sessionReviewV2.splitDiff": "Разделённый diff",
+  "ui.sessionReviewV2.previousFile": "Предыдущий файл",
+  "ui.sessionReviewV2.nextFile": "Следующий файл",
+  "ui.sessionReviewV2.diffView": "Просмотр diff",
+  "ui.sessionReviewV2.empty.noGit.title": "Нет отслеживаемых изменений",
+  "ui.sessionReviewV2.empty.noGit.description": "Отслеживайте, просматривайте и отменяйте изменения в этом проекте",
+  "ui.sessionReviewV2.empty.noGit.action": "Создать репозиторий Git",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Создание репозитория Git...",
+  "ui.sessionReviewV2.empty.changes.title": "Изменений в файлах пока нет",
+  "ui.sessionReviewV2.empty.changes.description": "Изменения проекта появятся здесь",
   "ui.fileMedia.kind.image": "изображение",
   "ui.fileMedia.kind.audio": "аудио",
   "ui.fileMedia.state.removed": "{{kind}} удалено",
@@ -32,10 +50,16 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Добавить комментарий",
   "ui.lineComment.submit": "Комментировать",
+  "ui.lineComment.cancel": "Отмена",
   "ui.sessionTurn.steps.show": "Показать шаги",
   "ui.sessionTurn.steps.hide": "Скрыть шаги",
   "ui.sessionTurn.summary.response": "Ответ",
   "ui.sessionTurn.diff.showMore": "Показать ещё изменений ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Изменённый файл: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Изменённые файлы: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Показать все",
+  "ui.sessionTurn.diffs.showLess": "Показать меньше",
+  "ui.sessionTurn.diffs.more": "+ ещё {{count}}",
 
   "ui.sessionTurn.retry.retrying": "повтор",
   "ui.sessionTurn.retry.inSeconds": "через {{seconds}}с",
diff --git a/packages/ui/src/i18n/th.ts b/packages/ui/src/i18n/th.ts
index e2534041ab20..10675a28d471 100644
--- a/packages/ui/src/i18n/th.ts
+++ b/packages/ui/src/i18n/th.ts
@@ -1,5 +1,7 @@
 export const dict = {
   "ui.sessionReview.title": "การเปลี่ยนแปลงเซสชัน",
+  "ui.sessionReview.title.git": "การเปลี่ยนแปลงใน Git",
+  "ui.sessionReview.title.branch": "การเปลี่ยนแปลงในสาขา",
   "ui.sessionReview.title.lastTurn": "การเปลี่ยนแปลงของเทิร์นล่าสุด",
   "ui.sessionReview.diffStyle.unified": "แบบรวม",
   "ui.sessionReview.diffStyle.split": "แบบแยก",
@@ -17,6 +19,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.meta":
     "ขีดจำกัด: {{limit}} บรรทัดที่เปลี่ยนแปลง. ปัจจุบัน: {{current}} บรรทัดที่เปลี่ยนแปลง.",
   "ui.sessionReview.largeDiff.renderAnyway": "แสดงผลต่อไป",
+  "ui.sessionReviewV2.expandMode": "ขยายหรือย่อ diff",
+  "ui.sessionReviewV2.filterFiles": "กรองไฟล์",
+  "ui.sessionReviewV2.toggleSidebar": "สลับต้นไม้ไฟล์",
+  "ui.sessionReviewV2.showAllLines": "แสดงทุกบรรทัด",
+  "ui.sessionReviewV2.hideNonDiffLines": "ซ่อนบรรทัดที่ไม่มี diff",
+  "ui.sessionReviewV2.unifiedDiff": "diff แบบรวม",
+  "ui.sessionReviewV2.splitDiff": "diff แบบแยก",
+  "ui.sessionReviewV2.previousFile": "ไฟล์ก่อนหน้า",
+  "ui.sessionReviewV2.nextFile": "ไฟล์ถัดไป",
+  "ui.sessionReviewV2.diffView": "มุมมอง diff",
+  "ui.sessionReviewV2.empty.noGit.title": "ไม่มีการเปลี่ยนแปลงที่ติดตามอยู่",
+  "ui.sessionReviewV2.empty.noGit.description": "ติดตาม ตรวจสอบ และเลิกทำการเปลี่ยนแปลงในโปรเจกต์นี้",
+  "ui.sessionReviewV2.empty.noGit.action": "สร้าง Git รีโพซิทอรี",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "กำลังสร้าง Git รีโพซิทอรี...",
+  "ui.sessionReviewV2.empty.changes.title": "ยังไม่มีการเปลี่ยนแปลงไฟล์",
+  "ui.sessionReviewV2.empty.changes.description": "การเปลี่ยนแปลงในโปรเจกต์จะแสดงที่นี่",
   "ui.fileMedia.kind.image": "รูปภาพ",
   "ui.fileMedia.kind.audio": "เสียง",
   "ui.fileMedia.state.removed": "ลบ{{kind}}แล้ว",
@@ -33,11 +51,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "เพิ่มความคิดเห็น",
   "ui.lineComment.submit": "แสดงความคิดเห็น",
+  "ui.lineComment.cancel": "ยกเลิก",
 
   "ui.sessionTurn.steps.show": "แสดงขั้นตอน",
   "ui.sessionTurn.steps.hide": "ซ่อนขั้นตอน",
   "ui.sessionTurn.summary.response": "การตอบสนอง",
   "ui.sessionTurn.diff.showMore": "แสดงการเปลี่ยนแปลงเพิ่มเติม ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "จำนวนไฟล์ที่เปลี่ยนแปลง: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "จำนวนไฟล์ที่เปลี่ยนแปลง: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "แสดงทั้งหมด",
+  "ui.sessionTurn.diffs.showLess": "แสดงน้อยลง",
+  "ui.sessionTurn.diffs.more": "+{{count}} ไฟล์เพิ่มเติม",
 
   "ui.sessionTurn.retry.retrying": "กำลังลองใหม่",
   "ui.sessionTurn.retry.inSeconds": "ใน {{seconds}}วิ",
diff --git a/packages/ui/src/i18n/tr.ts b/packages/ui/src/i18n/tr.ts
index 0ce4a73b6f52..5cdebfd6f448 100644
--- a/packages/ui/src/i18n/tr.ts
+++ b/packages/ui/src/i18n/tr.ts
@@ -4,6 +4,8 @@ type Keys = keyof typeof en
 
 export const dict = {
   "ui.sessionReview.title": "Oturum değişiklikleri",
+  "ui.sessionReview.title.git": "Git değişiklikleri",
+  "ui.sessionReview.title.branch": "Dal değişiklikleri",
   "ui.sessionReview.title.lastTurn": "Son tur değişiklikleri",
   "ui.sessionReview.diffStyle.unified": "Birleşik",
   "ui.sessionReview.diffStyle.split": "Bölünmüş",
@@ -21,6 +23,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "Fark gösterimi için çok büyük",
   "ui.sessionReview.largeDiff.meta": "Limit: {{limit}} değişen satır. Mevcut: {{current}} değişen satır.",
   "ui.sessionReview.largeDiff.renderAnyway": "Yine de göster",
+  "ui.sessionReviewV2.expandMode": "Farkı genişlet veya daralt",
+  "ui.sessionReviewV2.filterFiles": "Dosyaları filtrele",
+  "ui.sessionReviewV2.toggleSidebar": "Dosya ağacını aç/kapat",
+  "ui.sessionReviewV2.showAllLines": "Tüm satırları göster",
+  "ui.sessionReviewV2.hideNonDiffLines": "Fark içermeyen satırları gizle",
+  "ui.sessionReviewV2.unifiedDiff": "Birleşik fark",
+  "ui.sessionReviewV2.splitDiff": "Bölünmüş fark",
+  "ui.sessionReviewV2.previousFile": "Önceki dosya",
+  "ui.sessionReviewV2.nextFile": "Sonraki dosya",
+  "ui.sessionReviewV2.diffView": "Fark görünümü",
+  "ui.sessionReviewV2.empty.noGit.title": "İzlenen değişiklik yok",
+  "ui.sessionReviewV2.empty.noGit.description": "Bu projedeki değişiklikleri takip et, incele ve geri al",
+  "ui.sessionReviewV2.empty.noGit.action": "Git deposu oluştur",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Git deposu oluşturuluyor...",
+  "ui.sessionReviewV2.empty.changes.title": "Henüz dosya değişikliği yok",
+  "ui.sessionReviewV2.empty.changes.description": "Proje değişiklikleri burada görünecek",
 
   "ui.fileMedia.kind.image": "görsel",
   "ui.fileMedia.kind.audio": "ses",
@@ -38,11 +56,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Yorum ekle",
   "ui.lineComment.submit": "Yorum yap",
+  "ui.lineComment.cancel": "İptal",
 
   "ui.sessionTurn.steps.show": "Adımları göster",
   "ui.sessionTurn.steps.hide": "Adımları gizle",
   "ui.sessionTurn.summary.response": "Yanıt",
   "ui.sessionTurn.diff.showMore": "Daha fazla değişiklik göster ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "Değiştirilen dosya: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Değiştirilen dosyalar: {{count}}",
+  "ui.sessionTurn.diffs.showAll": "Tümünü göster",
+  "ui.sessionTurn.diffs.showLess": "Daha az göster",
+  "ui.sessionTurn.diffs.more": "+{{count}} dosya daha",
 
   "ui.sessionTurn.retry.retrying": "yeniden deneniyor",
   "ui.sessionTurn.retry.inSeconds": "{{seconds}}sn içinde",
diff --git a/packages/ui/src/i18n/uk.ts b/packages/ui/src/i18n/uk.ts
index 8bfb3e4404dc..abb35c79f5b6 100644
--- a/packages/ui/src/i18n/uk.ts
+++ b/packages/ui/src/i18n/uk.ts
@@ -15,6 +15,23 @@ export const dict: Record<string, string> = {
   "ui.sessionReview.largeDiff.title": "Завеликий diff для відображення",
   "ui.sessionReview.largeDiff.meta": "Ліміт: {{limit}} змінених рядків. Поточно: {{current}} змінених рядків.",
   "ui.sessionReview.largeDiff.renderAnyway": "Все одно відобразити",
+  "ui.sessionReviewV2.expandMode": "Розгорнути або згорнути diff",
+  "ui.sessionReviewV2.filterFiles": "Фільтрувати файли",
+  "ui.sessionReviewV2.toggleSidebar": "Перемкнути дерево файлів",
+  "ui.sessionReviewV2.showAllLines": "Показати всі рядки",
+  "ui.sessionReviewV2.hideNonDiffLines": "Приховати рядки поза diff",
+  "ui.sessionReviewV2.unifiedDiff": "Об'єднаний diff",
+  "ui.sessionReviewV2.splitDiff": "Розділений diff",
+  "ui.sessionReviewV2.previousFile": "Попередній файл",
+  "ui.sessionReviewV2.nextFile": "Наступний файл",
+  "ui.sessionReviewV2.diffView": "Перегляд diff",
+  "ui.sessionReviewV2.empty.noGit.title": "Немає відстежуваних змін",
+  "ui.sessionReviewV2.empty.noGit.description": "Відстежуйте, переглядайте та скасовуйте зміни в цьому проєкті",
+  "ui.sessionReviewV2.empty.noGit.action": "Створити Git-репозиторій",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "Створення Git-репозиторію...",
+  "ui.sessionReviewV2.empty.changes.title": "Змін у файлах ще немає",
+  "ui.sessionReviewV2.empty.changes.description": "Зміни проєкту з'являться тут",
+
   "ui.sessionReview.openFile": "Відкрити файл",
   "ui.sessionReview.selection.line": "рядок {{line}}",
   "ui.sessionReview.selection.lines": "рядки {{start}}-{{end}}",
@@ -35,15 +52,17 @@ export const dict: Record<string, string> = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "Додати коментар",
   "ui.lineComment.submit": "Коментувати",
+  "ui.lineComment.cancel": "Скасувати",
 
   "ui.sessionTurn.steps.show": "Показати кроки",
   "ui.sessionTurn.steps.hide": "Приховати кроки",
   "ui.sessionTurn.summary.response": "Відповідь",
   "ui.sessionTurn.diff.showMore": "Показати більше змін ({{count}})",
-  "ui.sessionTurn.diffs.changed": "Змінено",
+  "ui.sessionTurn.diffs.changed.one": "Змінений файл: {{count}}",
+  "ui.sessionTurn.diffs.changed.other": "Змінені файли: {{count}}",
   "ui.sessionTurn.diffs.showAll": "Показати всі",
   "ui.sessionTurn.diffs.showLess": "Показати менше",
-  "ui.sessionTurn.diffs.more": "+{{count}} інших файлів",
+  "ui.sessionTurn.diffs.more": "+ ще {{count}}",
 
   "ui.sessionTurn.retry.retrying": "повтор",
   "ui.sessionTurn.retry.inSeconds": "за {{seconds}}с",
@@ -53,6 +72,15 @@ export const dict: Record<string, string> = {
   "ui.sessionTurn.error.freeUsageExceeded": "Перевищено ліміт безкоштовного використання",
   "ui.sessionTurn.error.addCredits": "Додати кредити",
 
+  "dialog.usageExceeded.freeTier.title": "Безкоштовний ліміт вичерпано",
+  "dialog.usageExceeded.freeTier.description":
+    "Підпишіться на OpenCode Go для надійного доступу до найкращих моделей із відкритим кодом від $5 на місяць.",
+  "dialog.usageExceeded.freeTier.actionLabel": "Підписатися",
+  "dialog.usageExceeded.accountRateLimit.title": "Ліміт Go вичерпано",
+  "dialog.usageExceeded.accountRateLimit.description":
+    "Ліміт використання вичерпано. Щоб і надалі користуватися цією моделлю, увімкніть оплату з доступного балансу",
+  "dialog.usageExceeded.accountRateLimit.actionLabel": "Відкрити налаштування",
+
   "ui.sessionTurn.status.delegating": "Делегування роботи",
   "ui.sessionTurn.status.planning": "Планування наступних кроків",
   "ui.sessionTurn.status.gatheringContext": "Дослідження",
diff --git a/packages/ui/src/i18n/zh.ts b/packages/ui/src/i18n/zh.ts
index 1a385620f191..8a9e18aeea5d 100644
--- a/packages/ui/src/i18n/zh.ts
+++ b/packages/ui/src/i18n/zh.ts
@@ -4,6 +4,8 @@ type Keys = keyof typeof en
 
 export const dict = {
   "ui.sessionReview.title": "会话变更",
+  "ui.sessionReview.title.git": "Git 变更",
+  "ui.sessionReview.title.branch": "分支变更",
   "ui.sessionReview.title.lastTurn": "上一轮变更",
   "ui.sessionReview.diffStyle.unified": "统一",
   "ui.sessionReview.diffStyle.split": "拆分",
@@ -20,6 +22,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "差异过大，无法渲染",
   "ui.sessionReview.largeDiff.meta": "限制：{{limit}} 行变更。当前：{{current}} 行变更。",
   "ui.sessionReview.largeDiff.renderAnyway": "仍然渲染",
+  "ui.sessionReviewV2.expandMode": "展开或折叠差异",
+  "ui.sessionReviewV2.filterFiles": "筛选文件",
+  "ui.sessionReviewV2.toggleSidebar": "切换文件树",
+  "ui.sessionReviewV2.showAllLines": "显示所有行",
+  "ui.sessionReviewV2.hideNonDiffLines": "隐藏非差异行",
+  "ui.sessionReviewV2.unifiedDiff": "统一差异",
+  "ui.sessionReviewV2.splitDiff": "拆分差异",
+  "ui.sessionReviewV2.previousFile": "上一个文件",
+  "ui.sessionReviewV2.nextFile": "下一个文件",
+  "ui.sessionReviewV2.diffView": "差异视图",
+  "ui.sessionReviewV2.empty.noGit.title": "无已跟踪的变更",
+  "ui.sessionReviewV2.empty.noGit.description": "在此项目中跟踪、审查和撤销更改",
+  "ui.sessionReviewV2.empty.noGit.action": "创建 Git 仓库",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "正在创建 Git 仓库...",
+  "ui.sessionReviewV2.empty.changes.title": "尚无文件变更",
+  "ui.sessionReviewV2.empty.changes.description": "项目变更将显示在此处",
   "ui.fileMedia.kind.image": "图片",
   "ui.fileMedia.kind.audio": "音频",
   "ui.fileMedia.state.removed": "{{kind}}已移除",
@@ -36,11 +54,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "添加评论",
   "ui.lineComment.submit": "评论",
+  "ui.lineComment.cancel": "取消",
 
   "ui.sessionTurn.steps.show": "显示步骤",
   "ui.sessionTurn.steps.hide": "隐藏步骤",
   "ui.sessionTurn.summary.response": "回复",
   "ui.sessionTurn.diff.showMore": "显示更多更改（{{count}}）",
+  "ui.sessionTurn.diffs.changed.one": "已更改文件：{{count}} 个",
+  "ui.sessionTurn.diffs.changed.other": "已更改文件：{{count}} 个",
+  "ui.sessionTurn.diffs.showAll": "全部显示",
+  "ui.sessionTurn.diffs.showLess": "收起",
+  "ui.sessionTurn.diffs.more": "+{{count}} 个文件",
 
   "ui.sessionTurn.retry.retrying": "重试中",
   "ui.sessionTurn.retry.inSeconds": "{{seconds}} 秒后",
diff --git a/packages/ui/src/i18n/zht.ts b/packages/ui/src/i18n/zht.ts
index 941e1df636b7..19ba8e410696 100644
--- a/packages/ui/src/i18n/zht.ts
+++ b/packages/ui/src/i18n/zht.ts
@@ -4,6 +4,8 @@ type Keys = keyof typeof en
 
 export const dict = {
   "ui.sessionReview.title": "工作階段變更",
+  "ui.sessionReview.title.git": "Git 變更",
+  "ui.sessionReview.title.branch": "分支變更",
   "ui.sessionReview.title.lastTurn": "上一輪變更",
   "ui.sessionReview.diffStyle.unified": "整合",
   "ui.sessionReview.diffStyle.split": "拆分",
@@ -20,6 +22,22 @@ export const dict = {
   "ui.sessionReview.largeDiff.title": "差異過大，無法渲染",
   "ui.sessionReview.largeDiff.meta": "限制：{{limit}} 行變更。目前：{{current}} 行變更。",
   "ui.sessionReview.largeDiff.renderAnyway": "仍然渲染",
+  "ui.sessionReviewV2.expandMode": "展開或收合差異",
+  "ui.sessionReviewV2.filterFiles": "篩選檔案",
+  "ui.sessionReviewV2.toggleSidebar": "切換檔案樹",
+  "ui.sessionReviewV2.showAllLines": "顯示所有行",
+  "ui.sessionReviewV2.hideNonDiffLines": "隱藏無差異的行",
+  "ui.sessionReviewV2.unifiedDiff": "整合差異",
+  "ui.sessionReviewV2.splitDiff": "拆分差異",
+  "ui.sessionReviewV2.previousFile": "上一個檔案",
+  "ui.sessionReviewV2.nextFile": "下一個檔案",
+  "ui.sessionReviewV2.diffView": "差異檢視",
+  "ui.sessionReviewV2.empty.noGit.title": "沒有追蹤的變更",
+  "ui.sessionReviewV2.empty.noGit.description": "追蹤、檢閱及復原此專案中的變更",
+  "ui.sessionReviewV2.empty.noGit.action": "建立 Git 儲存庫",
+  "ui.sessionReviewV2.empty.noGit.actionLoading": "正在建立 Git 儲存庫...",
+  "ui.sessionReviewV2.empty.changes.title": "尚無檔案變更",
+  "ui.sessionReviewV2.empty.changes.description": "專案變更會顯示在這裡",
   "ui.fileMedia.kind.image": "圖片",
   "ui.fileMedia.kind.audio": "音訊",
   "ui.fileMedia.state.removed": "{{kind}}已移除",
@@ -36,11 +54,17 @@ export const dict = {
   "ui.lineComment.editorLabel.suffix": "",
   "ui.lineComment.placeholder": "新增評論",
   "ui.lineComment.submit": "評論",
+  "ui.lineComment.cancel": "取消",
 
   "ui.sessionTurn.steps.show": "顯示步驟",
   "ui.sessionTurn.steps.hide": "隱藏步驟",
   "ui.sessionTurn.summary.response": "回覆",
   "ui.sessionTurn.diff.showMore": "顯示更多變更 ({{count}})",
+  "ui.sessionTurn.diffs.changed.one": "已變更檔案：{{count}} 個",
+  "ui.sessionTurn.diffs.changed.other": "已變更檔案：{{count}} 個",
+  "ui.sessionTurn.diffs.showAll": "全部顯示",
+  "ui.sessionTurn.diffs.showLess": "顯示較少",
+  "ui.sessionTurn.diffs.more": "+{{count}} 個檔案",
 
   "ui.sessionTurn.retry.retrying": "重試中",
   "ui.sessionTurn.retry.inSeconds": "{{seconds}} 秒後",
diff --git a/script/translate-app.md b/script/translate-app.md
new file mode 100644
index 000000000000..96615f132b54
--- /dev/null
+++ b/script/translate-app.md
@@ -0,0 +1,21 @@
+Translate the product app locale `$1` from the English source dictionaries. English is the read-only source of truth. Its copy is intentional and must never be modified, rewritten, or "improved."
+
+The translation request below contains the locale glossary, exact source and target files, plus missing, extra, and placeholder-mismatched keys.
+
+```json
+$ARGUMENTS
+```
+
+Requirements:
+
+- Edit only the target files listed in the request. Never edit English, another locale, tests, registries, docs, or other packages.
+- Treat every English key and value as intentional. Translate from it without changing the English source files in any way.
+- Add every missing key with a natural, concise translation suitable for application UI.
+- Remove keys listed as extra and repair values listed under `placeholders` so their `{{tokens}}` exactly match English.
+- Preserve existing translations unless they have a listed placeholder mismatch.
+- Preserve meaning, intent, tone, capitalization, punctuation, whitespace, and formatting.
+- Preserve technical terms and artifacts exactly: OpenCode, API names, identifiers, code, commands, flags, paths, URLs, versions, error messages, config keys, and placeholder tokens.
+- Apply the locale glossary included in the request.
+- `ui.sessionTurn.diffs.changed.one` and `ui.sessionTurn.diffs.changed.other` are complete count phrases. Preserve `{{count}}` and translate the whole phrase naturally rather than composing translated fragments.
+- Use only read, glob, grep, and edit tools. Do not run commands or delegate work.
+- Finish only when every requested key is synchronized and no other file has changed.
diff --git a/script/translate-app.test.ts b/script/translate-app.test.ts
new file mode 100644
index 000000000000..4eafbc580aee
--- /dev/null
+++ b/script/translate-app.test.ts
@@ -0,0 +1,168 @@
+import { describe, expect, test } from "bun:test"
+import {
+  findDrift,
+  glossaryFile,
+  modelVariants,
+  parseTranslationArgs,
+  runPool,
+  sessionIDFromEvents,
+  sessionModels,
+  targetFiles,
+  textFromEvents,
+  translationConfig,
+  unexpectedChanges,
+} from "./translate-app"
+
+describe("translate app", () => {
+  test("parses one locale with the public model defaults", () => {
+    expect(parseTranslationArgs(["fr"])).toEqual({
+      target: "fr",
+      concurrency: 1,
+      model: "opencode/gpt-5.5",
+      variant: "xhigh",
+      dryRun: false,
+      check: false,
+      help: false,
+    })
+  })
+
+  test("parses all locales with bounded concurrency overrides", () => {
+    expect(
+      parseTranslationArgs([
+        "all",
+        "--concurrency",
+        "7",
+        "--model",
+        "opencode/gpt-5.4",
+        "--variant",
+        "high",
+        "--dry-run",
+      ]),
+    ).toEqual({
+      target: "all",
+      concurrency: 7,
+      model: "opencode/gpt-5.4",
+      variant: "high",
+      dryRun: true,
+      check: false,
+      help: false,
+    })
+  })
+
+  test("rejects unsupported targets and invalid concurrency", () => {
+    expect(() => parseTranslationArgs(["en"])).toThrow("Unknown locale")
+    expect(() => parseTranslationArgs(["fr", "de"])).toThrow("one locale")
+    expect(() => parseTranslationArgs(["all", "--concurrency", "0"])).toThrow("positive integer")
+  })
+
+  test("parses fresh-process parity checks without requesting translation", () => {
+    expect(parseTranslationArgs(["fr", "--check"]).check).toBe(true)
+  })
+
+  test("limits each locale to its app surfaces", () => {
+    expect(targetFiles("fr")).toEqual([
+      "packages/app/src/i18n/fr.ts",
+      "packages/ui/src/i18n/fr.ts",
+      "packages/desktop/src/renderer/i18n/fr.ts",
+    ])
+    expect(targetFiles("tr")).toEqual(["packages/app/src/i18n/tr.ts", "packages/ui/src/i18n/tr.ts"])
+  })
+
+  test("maps product locale codes to their glossaries", () => {
+    expect(glossaryFile("fr")).toBe(".opencode/glossary/fr.md")
+    expect(glossaryFile("zh")).toBe(".opencode/glossary/zh-cn.md")
+    expect(glossaryFile("zht")).toBe(".opencode/glossary/zh-tw.md")
+  })
+
+  test("finds key and placeholder drift", () => {
+    expect(
+      findDrift(
+        { keep: "Hello {{name}}", missing: "Missing", changed: "{{one}} {{two}}" },
+        { keep: "Bonjour {{name}}", extra: "Extra", changed: "{{one}}" },
+      ),
+    ).toEqual({ missing: ["missing"], extra: ["extra"], placeholders: ["changed"] })
+  })
+
+  test("runs work with the requested maximum concurrency", async () => {
+    const active = new Set<number>()
+    const peaks: number[] = []
+    const result = await runPool([1, 2, 3, 4, 5], 2, async (item) => {
+      active.add(item)
+      peaks.push(active.size)
+      await Bun.sleep(5)
+      active.delete(item)
+      return item * 2
+    })
+
+    expect(result).toEqual([2, 4, 6, 8, 10])
+    expect(Math.max(...peaks)).toBe(2)
+  })
+
+  test("reads the actual model and variant from the completed session", () => {
+    expect(sessionIDFromEvents('shared: https://example.test\n{"type":"step_start","sessionID":"ses_test"}\n')).toBe(
+      "ses_test",
+    )
+    expect(
+      sessionModels({
+        messages: [
+          { info: { role: "user" } },
+          {
+            info: {
+              role: "assistant",
+              providerID: "opencode",
+              modelID: "gpt-5.5",
+              variant: "xhigh",
+            },
+          },
+        ],
+      }),
+    ).toEqual([{ model: "opencode/gpt-5.5", variant: "xhigh" }])
+    expect(
+      textFromEvents(
+        'shared: https://example.test\n{"type":"text","sessionID":"ses_test","part":{"text":"finished"}}\n',
+      ),
+    ).toBe("finished")
+  })
+
+  test("resolves variants from verbose model output", () => {
+    const output = `opencode/other
+{"variants":{}}
+opencode/gpt-5.5
+{"variants":{"high":{"reasoningEffort":"high"},"xhigh":{"reasoningEffort":"xhigh"}}}
+opencode/next
+{"variants":{}}
+`
+    expect(modelVariants(output, "opencode/gpt-5.5")).toEqual({
+      high: { reasoningEffort: "high" },
+      xhigh: { reasoningEffort: "xhigh" },
+    })
+  })
+
+  test("disables side effects and scopes edits for the translation agent", () => {
+    const config = translationConfig("translate-app-fr", "opencode/gpt-5.5", ["packages/app/src/i18n/fr.ts"])
+    expect(config.share).toBe("disabled")
+    expect(config.formatter).toBe(false)
+    expect(config.lsp).toBe(false)
+    expect(config.agent["translate-app-fr"].permission.edit).toEqual({
+      "*": "deny",
+      "packages/app/src/i18n/fr.ts": "allow",
+    })
+  })
+
+  test("detects edits outside the locale targets", () => {
+    expect(
+      unexpectedChanges(
+        { "script/translate-app.ts": "before" },
+        {
+          "script/translate-app.ts": "before",
+          "packages/app/src/i18n/fr.ts": "translated",
+          "packages/app/src/app.tsx": "unexpected",
+        },
+        ["packages/app/src/i18n/fr.ts"],
+      ),
+    ).toEqual(["packages/app/src/app.tsx"])
+    expect(unexpectedChanges({ "already-dirty.ts": "before" }, { "already-dirty.ts": "after" }, [])).toEqual([
+      "already-dirty.ts",
+    ])
+  })
+})
diff --git a/script/translate-app.ts b/script/translate-app.ts
new file mode 100644
index 000000000000..e7e669dced8b
--- /dev/null
+++ b/script/translate-app.ts
@@ -0,0 +1,523 @@
+#!/usr/bin/env bun
+
+import path from "path"
+import { parseArgs } from "util"
+import { pathToFileURL } from "url"
+
+const locales = [
+  "ar",
+  "br",
+  "bs",
+  "da",
+  "de",
+  "es",
+  "fr",
+  "ja",
+  "ko",
+  "no",
+  "pl",
+  "ru",
+  "uk",
+  "th",
+  "tr",
+  "zh",
+  "zht",
+] as const
+type Locale = (typeof locales)[number]
+
+const languages = {
+  ar: "Arabic",
+  br: "Brazilian Portuguese",
+  bs: "Bosnian",
+  da: "Danish",
+  de: "German",
+  es: "Spanish",
+  fr: "French",
+  ja: "Japanese",
+  ko: "Korean",
+  no: "Norwegian Bokmal",
+  pl: "Polish",
+  ru: "Russian",
+  uk: "Ukrainian",
+  th: "Thai",
+  tr: "Turkish",
+  zh: "Simplified Chinese",
+  zht: "Traditional Chinese",
+} as const satisfies Record<Locale, string>
+
+type Dictionary = Record<string, string>
+type Drift = ReturnType<typeof findDrift>
+type Domain = { name: string; source: string; target: string; drift: Drift }
+
+const desktopLocales = new Set<Locale>(locales.filter((locale) => locale !== "th" && locale !== "tr"))
+const root = path.resolve(import.meta.dir, "..")
+
+export function parseTranslationArgs(args: string[]) {
+  const parsed = parseArgs({
+    args,
+    options: {
+      concurrency: { type: "string", short: "c", default: "4" },
+      model: { type: "string", default: "opencode/gpt-5.5" },
+      variant: { type: "string", default: "xhigh" },
+      "dry-run": { type: "boolean", default: false },
+      check: { type: "boolean", default: false },
+      help: { type: "boolean", short: "h", default: false },
+    },
+    allowPositionals: true,
+  })
+  const target = parsed.positionals[0] ?? "all"
+  const concurrency = Number(parsed.values.concurrency)
+
+  if (!parsed.values.help && parsed.positionals.length !== 1) throw new Error("Pass one locale or 'all'.")
+  if (target !== "all" && !isLocale(target)) throw new Error(`Unknown locale '${target}'.`)
+  if (!Number.isInteger(concurrency) || concurrency < 1) throw new Error("Concurrency must be a positive integer.")
+
+  return {
+    target,
+    concurrency: target === "all" ? concurrency : 1,
+    model: parsed.values.model,
+    variant: parsed.values.variant,
+    dryRun: parsed.values["dry-run"],
+    check: parsed.values.check,
+    help: parsed.values.help,
+  }
+}
+
+export function targetFiles(locale: Locale) {
+  return [
+    `packages/app/src/i18n/${locale}.ts`,
+    `packages/ui/src/i18n/${locale}.ts`,
+    ...(desktopLocales.has(locale) ? [`packages/desktop/src/renderer/i18n/${locale}.ts`] : []),
+  ]
+}
+
+export function glossaryFile(locale: Locale) {
+  if (locale === "zh") return ".opencode/glossary/zh-cn.md"
+  if (locale === "zht") return ".opencode/glossary/zh-tw.md"
+  return `.opencode/glossary/${locale}.md`
+}
+
+export function findDrift(source: Dictionary, target: Dictionary) {
+  return {
+    missing: Object.keys(source).filter((key) => !Object.hasOwn(target, key)),
+    extra: Object.keys(target).filter((key) => !Object.hasOwn(source, key)),
+    placeholders: Object.keys(source).filter(
+      (key) => Object.hasOwn(target, key) && tokens(source[key]).join() !== tokens(target[key]).join(),
+    ),
+  }
+}
+
+export function sessionIDFromEvents(output: string) {
+  const match = output.match(/"sessionID"\s*:\s*"([^"]+)"/)
+  if (!match?.[1]) throw new Error("OpenCode did not report a session ID.")
+  return match[1]
+}
+
+export function sessionModels(value: unknown) {
+  if (!isRecord(value) || !Array.isArray(value.messages))
+    throw new Error("OpenCode returned an invalid session export.")
+  return value.messages.flatMap((message) => {
+    if (!isRecord(message) || !isRecord(message.info) || message.info.role !== "assistant") return []
+    if (typeof message.info.providerID !== "string" || typeof message.info.modelID !== "string") {
+      throw new Error("OpenCode session export omitted the assistant model.")
+    }
+    return [
+      {
+        model: `${message.info.providerID}/${message.info.modelID}`,
+        variant: typeof message.info.variant === "string" ? message.info.variant : undefined,
+      },
+    ]
+  })
+}
+
+export function modelVariants(output: string, model: string) {
+  const normalized = output.replaceAll("\r\n", "\n")
+  const marker = `${model}\n`
+  const start = normalized.indexOf(marker)
+  if (start < 0) throw new Error(`Model not found: ${model}`)
+  const provider = model.split("/")[0]
+  const rest = normalized.slice(start + marker.length)
+  const next = rest.search(new RegExp(`^${escapeRegExp(provider)}/`, "m"))
+  const metadata: unknown = JSON.parse((next < 0 ? rest : rest.slice(0, next)).trim())
+  if (!isRecord(metadata) || !isRecord(metadata.variants)) throw new Error(`Model variants not found: ${model}`)
+  return metadata.variants
+}
+
+export function translationConfig(agent: string, model: string, targets: string[]) {
+  return {
+    $schema: "https://opencode.ai/config.json",
+    model,
+    default_agent: agent,
+    share: "disabled" as const,
+    formatter: false,
+    lsp: false,
+    snapshot: false,
+    agent: {
+      [agent]: {
+        mode: "primary" as const,
+        model,
+        permission: {
+          "*": "deny" as const,
+          read: "allow" as const,
+          glob: "allow" as const,
+          grep: "allow" as const,
+          edit: Object.fromEntries([["*", "deny"], ...targets.map((target) => [target, "allow"])]),
+        },
+      },
+    },
+  }
+}
+
+export function unexpectedChanges(before: Record<string, string>, after: Record<string, string>, allowed: string[]) {
+  const targets = new Set(allowed)
+  return [...new Set([...Object.keys(before), ...Object.keys(after)])]
+    .filter((file) => !targets.has(file) && before[file] !== after[file])
+    .sort()
+}
+
+export async function runPool<T, R>(items: readonly T[], concurrency: number, task: (item: T) => Promise<R>) {
+  const results = new Map<number, R>()
+  const entries = items.entries()
+  const worker = async (): Promise<void> => {
+    const next = entries.next()
+    if (next.done) return
+    results.set(next.value[0], await task(next.value[1]))
+    await worker()
+  }
+
+  await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, worker))
+  return Array.from(results.entries())
+    .sort((a, b) => a[0] - b[0])
+    .map((entry) => entry[1])
+}
+
+async function main() {
+  const options = parseTranslationArgs(Bun.argv.slice(2))
+  if (options.help) {
+    console.log(`
+Usage: bun run translate:app -- <locale|all> [options]
+
+Synchronizes product app translations with the English app, UI, and desktop dictionaries.
+
+Options:
+  -c, --concurrency <count>  Maximum parallel OpenCode runs for 'all' (default: 4)
+      --model <provider/id>  OpenCode model (default: opencode/gpt-5.5)
+      --variant <name>       Model variant (default: xhigh)
+      --dry-run              Report drift without running OpenCode
+      --check                Exit nonzero when translation drift exists
+  -h, --help                 Show this help message
+
+Examples:
+  bun run translate:app -- fr
+  bun run translate:app -- all --concurrency 4
+`)
+    return
+  }
+
+  const selected = options.target === "all" ? locales : [options.target]
+  const plans = await Promise.all(selected.map((locale) => inspect(locale)))
+  plans.forEach(report)
+  const pending = plans.filter((plan) => plan.domains.some((domain) => changed(domain.drift)))
+  if (options.check) {
+    if (pending.length) process.exitCode = 1
+    return
+  }
+  if (options.dryRun || pending.length === 0) return
+
+  const targets = pending.flatMap((plan) => plan.domains.map((domain) => domain.target))
+  const baseline = await worktreeSnapshot()
+  const variant = await resolveModelVariant(options.model, options.variant)
+  console.log(`Resolved ${options.model} (${options.variant}): ${JSON.stringify(variant)}`)
+  const template = await commandTemplate()
+  const results = await runPool(pending, options.concurrency, (plan) =>
+    translate(plan, template, options.model, options.variant).catch((error) => ({
+      locale: plan.locale,
+      code: 1,
+      stdout: "",
+      stderr: error instanceof Error ? error.message : String(error),
+    })),
+  )
+
+  results.forEach((result) => {
+    if (result.stdout) process.stdout.write(`\n[${result.locale}]\n${result.stdout}`)
+    if (result.stderr) process.stderr.write(`\n[${result.locale}]\n${result.stderr}`)
+  })
+
+  const failed = results.filter((result) => result.code !== 0)
+  const checks = await runPool(pending, options.concurrency, (plan) => check(plan.locale))
+  const incomplete = checks.filter((result) => result.code !== 0)
+  const escaped = unexpectedChanges(baseline, await worktreeSnapshot(), targets)
+  incomplete.forEach((result) => {
+    if (result.stdout) process.stderr.write(`\n[${result.locale} verification]\n${result.stdout}`)
+    if (result.stderr) process.stderr.write(`\n[${result.locale} verification]\n${result.stderr}`)
+  })
+
+  if (failed.length === 0 && incomplete.length === 0 && escaped.length === 0) {
+    console.log(`\nTranslated ${pending.map((plan) => plan.locale).join(", ")}.`)
+    return
+  }
+
+  if (failed.length) console.error(`\nOpenCode failed for: ${failed.map((result) => result.locale).join(", ")}`)
+  if (incomplete.length)
+    console.error(`Translation remains incomplete for: ${incomplete.map((plan) => plan.locale).join(", ")}`)
+  if (escaped.length) console.error(`Translation changed files outside its locale targets: ${escaped.join(", ")}`)
+  process.exitCode = 1
+}
+
+async function worktreeSnapshot() {
+  const groups = await Promise.all([
+    gitPaths(["diff", "--name-only", "-z", "HEAD"]),
+    gitPaths(["ls-files", "--others", "--exclude-standard", "-z"]),
+  ])
+  const files = [...new Set(groups.flat())]
+  return Object.fromEntries(
+    await Promise.all(
+      files.map(async (file) => {
+        const target = Bun.file(path.join(root, file))
+        if (!(await target.exists())) return [file, "<missing>"] as const
+        const hash = new Bun.CryptoHasher("sha256")
+        hash.update(await target.arrayBuffer())
+        return [file, hash.digest("hex")] as const
+      }),
+    ),
+  )
+}
+
+async function gitPaths(args: string[]) {
+  const proc = Bun.spawn(["git", ...args], {
+    cwd: root,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+  })
+  const result = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited])
+  if (result[2] !== 0) throw new Error(result[1] || `git ${args.join(" ")} failed`)
+  return result[0].split("\0").filter(Boolean)
+}
+
+async function check(locale: Locale) {
+  const proc = Bun.spawn([process.execPath, import.meta.path, locale, "--check"], {
+    cwd: root,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+  })
+  const result = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited])
+  return { locale, stdout: result[0], stderr: result[1], code: result[2] }
+}
+
+async function inspect(locale: Locale) {
+  const domains = await Promise.all(
+    targetFiles(locale).map(async (target) => {
+      const source = target.replace(`/${locale}.ts`, "/en.ts")
+      const dictionaries = await Promise.all([dictionary(source), dictionary(target)])
+      return {
+        name: target.includes("packages/app/") ? "app" : target.includes("packages/ui/") ? "ui" : "desktop",
+        source,
+        target,
+        drift: findDrift(dictionaries[0], dictionaries[1]),
+      }
+    }),
+  )
+  return { locale, language: languages[locale], domains }
+}
+
+async function dictionary(file: string) {
+  const module: unknown = await import(pathToFileURL(path.join(root, file)).href)
+  if (typeof module !== "object" || module === null || !("dict" in module) || !isDictionary(module.dict)) {
+    throw new Error(`Invalid translation dictionary: ${file}`)
+  }
+  return module.dict
+}
+
+async function commandTemplate() {
+  return (await Bun.file(path.join(root, "script/translate-app.md")).text()).trim()
+}
+
+async function translate(
+  plan: { locale: Locale; language: string; domains: Domain[] },
+  template: string,
+  model: string,
+  variant: string,
+) {
+  const glossary = glossaryFile(plan.locale)
+  const glossaryContent = (await Bun.file(path.join(root, glossary)).exists())
+    ? await Bun.file(path.join(root, glossary)).text()
+    : undefined
+  const prompt = template.replaceAll("$1", plan.locale).replaceAll(
+    "$ARGUMENTS",
+    JSON.stringify(
+      {
+        locale: plan.locale,
+        language: plan.language,
+        glossary: glossaryContent ? { file: glossary, content: glossaryContent } : undefined,
+        domains: plan.domains.map((domain) => ({
+          source: domain.source,
+          target: domain.target,
+          ...domain.drift,
+        })),
+      },
+      null,
+      2,
+    ),
+  )
+  const agent = `translate-app-${plan.locale}-${process.pid}`
+  const env = isolatedEnvironment()
+  env.OPENCODE_DISABLE_PROJECT_CONFIG = "1"
+  env.OPENCODE_CONFIG_CONTENT = JSON.stringify(
+    translationConfig(
+      agent,
+      model,
+      plan.domains.map((domain) => domain.target),
+    ),
+  )
+
+  const proc = Bun.spawn(
+    [
+      "opencode",
+      "--pure",
+      "run",
+      "--dir",
+      root,
+      "--agent",
+      agent,
+      "--model",
+      model,
+      "--variant",
+      variant,
+      "--title",
+      `Translate app ${plan.locale}`,
+      "--format",
+      "json",
+    ],
+    {
+      cwd: root,
+      env,
+      stdin: "pipe",
+      stdout: "pipe",
+      stderr: "pipe",
+    },
+  )
+  const stdout = new Response(proc.stdout).text()
+  const stderr = new Response(proc.stderr).text()
+  await proc.stdin.write(prompt)
+  await proc.stdin.end()
+  const result = await Promise.all([stdout, stderr, proc.exited])
+  if (result[2] !== 0) return { locale: plan.locale, stdout: result[0], stderr: result[1], code: result[2] }
+
+  const sessionID = sessionIDFromEvents(result[0])
+  const exported = Bun.spawn(["opencode", "--pure", "export", sessionID, "--sanitize"], {
+    cwd: root,
+    env,
+    stdout: "pipe",
+    stderr: "pipe",
+  })
+  const exportResult = await Promise.all([
+    new Response(exported.stdout).text(),
+    new Response(exported.stderr).text(),
+    exported.exited,
+  ])
+  if (exportResult[2] !== 0) {
+    return { locale: plan.locale, stdout: textFromEvents(result[0]), stderr: exportResult[1], code: exportResult[2] }
+  }
+
+  const session: unknown = JSON.parse(exportResult[0])
+  const observed = sessionModels(session)
+  const mismatch = observed.length === 0 || observed.some((item) => item.model !== model || item.variant !== variant)
+  const actual = Array.from(new Set(observed.map((item) => `${item.model} (${item.variant ?? "default"})`))).join(", ")
+  return {
+    locale: plan.locale,
+    stdout: `${textFromEvents(result[0])}\nVerified session model: ${actual}\n`,
+    stderr: mismatch
+      ? `Requested ${model} (${variant}), but session used ${actual || "no assistant model"}.\n`
+      : result[1],
+    code: mismatch ? 1 : 0,
+  }
+}
+
+function report(plan: { locale: Locale; domains: Domain[] }) {
+  const details = plan.domains
+    .map(
+      (domain) =>
+        `${domain.name}: ${domain.drift.missing.length} missing, ${domain.drift.extra.length} extra, ${domain.drift.placeholders.length} placeholder mismatches`,
+    )
+    .join("; ")
+  console.log(`[${plan.locale}] ${details}`)
+}
+
+function changed(drift: Drift) {
+  return drift.missing.length > 0 || drift.extra.length > 0 || drift.placeholders.length > 0
+}
+
+function isLocale(value: string): value is Locale {
+  return Object.hasOwn(languages, value)
+}
+
+function isDictionary(value: unknown): value is Dictionary {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) return false
+  return Object.values(value).every((item) => typeof item === "string")
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+}
+
+async function resolveModelVariant(model: string, variant: string) {
+  const provider = model.split("/")[0]
+  if (!provider || !model.includes("/")) throw new Error(`Model must use provider/model syntax: ${model}`)
+  const env = isolatedEnvironment()
+  env.OPENCODE_DISABLE_PROJECT_CONFIG = "1"
+  const proc = Bun.spawn(["opencode", "--pure", "models", provider, "--verbose"], {
+    cwd: root,
+    env,
+    stdin: "ignore",
+    stdout: "pipe",
+    stderr: "pipe",
+  })
+  const result = await Promise.all([new Response(proc.stdout).text(), new Response(proc.stderr).text(), proc.exited])
+  if (result[2] !== 0) throw new Error(result[1] || `Unable to resolve model: ${model}`)
+  const variants = modelVariants(result[0], model)
+  if (!Object.hasOwn(variants, variant)) throw new Error(`Variant '${variant}' is not configured for ${model}.`)
+  return variants[variant]
+}
+
+function isolatedEnvironment() {
+  const env = { ...process.env }
+  delete env.OPENCODE_CONFIG
+  delete env.OPENCODE_CONFIG_DIR
+  delete env.OPENCODE_CONFIG_CONTENT
+  delete env.OPENCODE_PERMISSION
+  delete env.OPENCODE_AUTO_SHARE
+  return env
+}
+
+function escapeRegExp(value: string) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
+}
+
+export function textFromEvents(output: string) {
+  return output
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter((line) => line.startsWith("{") && line.endsWith("}"))
+    .flatMap((line) => {
+      const event: unknown = JSON.parse(line)
+      if (!isRecord(event) || event.type !== "text" || !isRecord(event.part) || typeof event.part.text !== "string") {
+        return []
+      }
+      return [event.part.text.trim()]
+    })
+    .filter(Boolean)
+    .join("\n")
+}
+
+function tokens(value: string) {
+  return Array.from(value.matchAll(/{{\s*([^}]+?)\s*}}/g), (match) => match[1] ?? "").sort()
+}
+
+if (import.meta.main) {
+  main().catch((error) => {
+    console.error(error instanceof Error ? error.message : error)
+    process.exitCode = 1
+  })
+}

From 5a533e366f60165efc3c0b1c6dcd872122845f8a Mon Sep 17 00:00:00 2001
From: Adam <2363879+adamdotdevin@users.noreply.github.com>
Date: Wed, 24 Jun 2026 10:43:56 -0500
Subject: [PATCH 06/33] feat(stats): add model comparison pages

---
 .../stats/app/src/routes/[lab]/[model].tsx    |  59 ++
 packages/stats/app/src/routes/[lab]/index.tsx |  36 ++
 .../stats/app/src/routes/compare-cards.tsx    |  88 +++
 .../stats/app/src/routes/compare-selector.tsx |  83 +++
 .../[secondLab]/[secondModel].tsx             | 608 ++++++++++++++++++
 .../stats/app/src/routes/compare/index.tsx    | 148 +++++
 packages/stats/app/src/routes/index.css       | 255 +++++++-
 packages/stats/app/src/routes/index.tsx       |  38 +-
 packages/stats/app/src/routes/stats-shell.tsx |   5 +-
 packages/stats/core/src/domain/home.ts        |  58 +-
 10 files changed, 1373 insertions(+), 5 deletions(-)
 create mode 100644 packages/stats/app/src/routes/compare-cards.tsx
 create mode 100644 packages/stats/app/src/routes/compare-selector.tsx
 create mode 100644 packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx
 create mode 100644 packages/stats/app/src/routes/compare/index.tsx

diff --git a/packages/stats/app/src/routes/[lab]/[model].tsx b/packages/stats/app/src/routes/[lab]/[model].tsx
index adbbf95c5c0f..ddd8ff1e2e73 100644
--- a/packages/stats/app/src/routes/[lab]/[model].tsx
+++ b/packages/stats/app/src/routes/[lab]/[model].tsx
@@ -33,6 +33,12 @@ import {
 import { SectionHeading } from "../section-heading"
 import { runStatsEffect } from "../../stats-runtime"
 import { setStatsPageCacheHeaders } from "../stats-cache"
+import {
+  ComparisonCardsSection,
+  modelRefFromCatalog,
+  uniqueComparisonPairs,
+  type ComparisonModelRef,
+} from "../compare-cards"
 import {
   applyThemePreference,
   Footer,
@@ -189,6 +195,11 @@ export default function StatsModel() {
                 <ModelEfficiencySection data={stats() ?? null} catalog={catalogEntry() ?? null} />
                 <ModelGeoBreakdownSection data={stats()?.country ?? emptyCountryRecord()} />
                 <ModelPeersSection data={stats() ?? null} />
+                <ComparisonCardsSection
+                  pairs={modelComparisonPairs(catalog(), catalogEntry() ?? null, stats() ?? null)}
+                  title="Compare This Model"
+                  description="Other models to compare with this one."
+                />
               </>
             </Show>
           </Show>
@@ -197,6 +208,7 @@ export default function StatsModel() {
           themePreference={themePreference()}
           onThemePreferenceChange={updateThemePreference}
           links={modelFooterLinks()}
+          bridge={{ href: "#model-comparison", label: "MODEL COMPARISONS" }}
         />
       </div>
     </main>
@@ -1172,6 +1184,53 @@ function ModelEmptyState(props: { title: string; description: string; compact?:
   )
 }
 
+function modelComparisonPairs(
+  catalog: ModelCatalog | undefined,
+  catalogEntry: ModelCatalogEntry | null,
+  data: StatsModelData | null,
+) {
+  const current = modelComparisonRef(catalogEntry, data)
+  if (!current) return []
+  const peerPairs = (data?.peers ?? [])
+    .filter((peer) => peer.model !== data?.model)
+    .slice(0, 3)
+    .map((peer) => ({
+      first: current,
+      second: {
+        name: peer.model,
+        lab: peer.provider,
+        slug: peer.slug,
+        labName: peer.author,
+        metric: `#${peer.rank} / ${formatTokens(peer.tokens)}`,
+      },
+      detail: "Usage peer",
+    }))
+  const catalogPairs = (catalogEntry && catalog ? catalog.labs.find((lab) => lab.id === catalogEntry.lab)?.models ?? [] : [])
+    .filter((model) => model.id !== catalogEntry?.id)
+    .slice(0, 3)
+    .map((model) => ({
+      first: current,
+      second: modelRefFromCatalog(model),
+      detail: "Same lab pair",
+    }))
+  return uniqueComparisonPairs([...peerPairs, ...catalogPairs])
+}
+
+function modelComparisonRef(
+  catalogEntry: ModelCatalogEntry | null,
+  data: StatsModelData | null,
+): ComparisonModelRef | undefined {
+  if (catalogEntry) return modelRefFromCatalog(catalogEntry)
+  if (!data) return undefined
+  return {
+    name: data.model,
+    lab: data.provider,
+    slug: data.slug,
+    labName: data.author,
+    metric: `#${data.rank}`,
+  }
+}
+
 function getProviderIconId(author: string) {
   if (author === "MiniMax") return "minimax"
   if (author === "Moonshot") return "moonshotai"
diff --git a/packages/stats/app/src/routes/[lab]/index.tsx b/packages/stats/app/src/routes/[lab]/index.tsx
index c3147b1c5770..17b0783823b5 100644
--- a/packages/stats/app/src/routes/[lab]/index.tsx
+++ b/packages/stats/app/src/routes/[lab]/index.tsx
@@ -28,6 +28,11 @@ import {
 import { SectionHeading } from "../section-heading"
 import { runStatsEffect } from "../../stats-runtime"
 import { setStatsPageCacheHeaders } from "../stats-cache"
+import {
+  ComparisonCardsSection,
+  modelRefFromCatalog,
+  uniqueComparisonPairs,
+} from "../compare-cards"
 import {
   applyThemePreference,
   Footer,
@@ -149,6 +154,11 @@ export default function StatsLab() {
                     labs={catalog()?.labs ?? []}
                     market={homeStats()?.market["2M"] ?? []}
                   />
+                  <ComparisonCardsSection
+                    pairs={labComparisonPairs(data(), stats()?.models ?? [])}
+                    title={`${data().name} Model Comparisons`}
+                    description="Model pairs from this lab."
+                  />
                 </>
               )}
             </Show>
@@ -158,6 +168,7 @@ export default function StatsLab() {
           themePreference={themePreference()}
           onThemePreferenceChange={updateThemePreference}
           links={labFooterLinks()}
+          bridge={{ href: "#model-comparison", label: "MODEL COMPARISONS" }}
         />
       </div>
     </main>
@@ -732,6 +743,31 @@ function LabEmptyState(props: { title: string; description: string }) {
   )
 }
 
+function labComparisonPairs(lab: ModelCatalogLab, usage: LabUsageModelEntry[]) {
+  const usageRefs = usage.slice(0, 4).map((model) => ({
+    name: model.model,
+    lab: model.provider,
+    slug: model.slug,
+    labName: model.author,
+    metric: formatTokens(model.tokens),
+  }))
+  const refs = usageRefs.length > 1 ? usageRefs : lab.models.slice(0, 4).map(modelRefFromCatalog)
+  return uniqueComparisonPairs(
+    (
+      [
+        [0, 1, "Most-used lab pair"],
+        [0, 2, "Lab alternative"],
+        [1, 2, "Adjacent lab pair"],
+        [2, 3, "Same lab pair"],
+      ] as const
+    ).flatMap(([firstIndex, secondIndex, detail]) => {
+      const first = refs[firstIndex]
+      const second = refs[secondIndex]
+      return first && second ? [{ first, second, detail }] : []
+    }),
+  )
+}
+
 type RelatedLabEntry = { lab: ModelCatalogLab; share: number; tokens: number }
 
 function relatedLabs(current: ModelCatalogLab, labs: ModelCatalogLab[], market: MarketDay[]): RelatedLabEntry[] {
diff --git a/packages/stats/app/src/routes/compare-cards.tsx b/packages/stats/app/src/routes/compare-cards.tsx
new file mode 100644
index 000000000000..10f2f7677a2c
--- /dev/null
+++ b/packages/stats/app/src/routes/compare-cards.tsx
@@ -0,0 +1,88 @@
+import { For, Show } from "solid-js"
+import { catalogSlug, formatCatalogLabName, type ModelCatalogEntry } from "./model-catalog"
+
+export type ComparisonModelRef = {
+  name: string
+  lab: string
+  slug: string
+  labName?: string
+  metric?: string
+}
+
+export type ComparisonPair = {
+  first: ComparisonModelRef
+  second: ComparisonModelRef
+  detail: string
+}
+
+export function modelRefFromCatalog(entry: ModelCatalogEntry): ComparisonModelRef {
+  return {
+    name: entry.name,
+    lab: entry.lab,
+    slug: entry.slug,
+    labName: formatCatalogLabName(entry.lab),
+  }
+}
+
+export function comparisonHref(first: ComparisonModelRef, second: ComparisonModelRef) {
+  return `${import.meta.env.BASE_URL}compare/${catalogSlug(first.lab)}/${catalogSlug(first.slug)}/${catalogSlug(
+    second.lab,
+  )}/${catalogSlug(second.slug)}`
+}
+
+export function uniqueComparisonPairs(pairs: ComparisonPair[]) {
+  return pairs.reduce<{ keys: Set<string>; pairs: ComparisonPair[] }>(
+    (result, pair) => {
+      const key = [modelKey(pair.first), modelKey(pair.second)].toSorted().join("|")
+      if (result.keys.has(key) || modelKey(pair.first) === modelKey(pair.second)) return result
+      result.keys.add(key)
+      result.pairs.push(pair)
+      return result
+    },
+    { keys: new Set(), pairs: [] },
+  ).pairs
+}
+
+export function ComparisonCardsSection(props: {
+  pairs: ComparisonPair[]
+  title?: string
+  description?: string
+  compact?: boolean
+}) {
+  return (
+    <Show when={props.pairs.length > 0}>
+      <section id="model-comparison" data-section="model-panel" data-variant={props.compact ? "compact" : undefined}>
+        <p data-slot="section-title">
+          <strong>{props.title ?? "Model Comparisons"}.</strong>{" "}
+          <span>{props.description ?? "Compare usage, cost, limits, and features."}</span>
+        </p>
+        <div data-component="comparison-card-grid">
+          <For each={props.pairs}>
+            {(pair) => (
+              <a data-component="comparison-card" href={comparisonHref(pair.first, pair.second)}>
+                <span>{pair.detail}</span>
+                <strong>
+                  {pair.first.name} <em>vs</em> {pair.second.name}
+                </strong>
+                <p>
+                  <b>{pair.first.labName ?? formatCatalogLabName(pair.first.lab)}</b>
+                  <i />
+                  <b>{pair.second.labName ?? formatCatalogLabName(pair.second.lab)}</b>
+                </p>
+                <Show when={pair.first.metric || pair.second.metric}>
+                  <small>
+                    {pair.first.metric ?? "Listed"} / {pair.second.metric ?? "Listed"}
+                  </small>
+                </Show>
+              </a>
+            )}
+          </For>
+        </div>
+      </section>
+    </Show>
+  )
+}
+
+function modelKey(model: ComparisonModelRef) {
+  return `${catalogSlug(model.lab)}/${catalogSlug(model.slug)}`
+}
diff --git a/packages/stats/app/src/routes/compare-selector.tsx b/packages/stats/app/src/routes/compare-selector.tsx
new file mode 100644
index 000000000000..42c1349ea2db
--- /dev/null
+++ b/packages/stats/app/src/routes/compare-selector.tsx
@@ -0,0 +1,83 @@
+import { createEffect, createMemo, createSignal, For } from "solid-js"
+import { comparisonHref, modelRefFromCatalog } from "./compare-cards"
+import type { ModelCatalogEntry } from "./model-catalog"
+
+export function ComparisonSelector(props: {
+  models: ModelCatalogEntry[]
+  firstId?: string
+  secondId?: string
+  label?: string
+}) {
+  const [firstId, setFirstId] = createSignal(props.firstId ?? props.models[0]?.id ?? "")
+  const [secondId, setSecondId] = createSignal(differentModelId(props.models, firstId(), props.secondId))
+  const modelById = createMemo(() => new Map(props.models.map((model) => [model.id, model])))
+  const href = createMemo(() => {
+    const first = modelById().get(firstId())
+    const second = modelById().get(secondId())
+    if (!first || !second || first.id === second.id) return undefined
+    return comparisonHref(modelRefFromCatalog(first), modelRefFromCatalog(second))
+  })
+
+  createEffect(() => {
+    if (firstId() && modelById().has(firstId())) return
+    const next = props.firstId && modelById().has(props.firstId) ? props.firstId : props.models[0]?.id
+    if (next) setFirstId(next)
+  })
+
+  createEffect(() => {
+    if (secondId() && secondId() !== firstId() && modelById().has(secondId())) return
+    setSecondId(differentModelId(props.models, firstId(), props.secondId))
+  })
+
+  return (
+    <form
+      data-component="comparison-selector"
+      aria-label={props.label ?? "Model comparison selector"}
+      onSubmit={(event) => {
+        event.preventDefault()
+        const url = href()
+        if (!url || typeof window === "undefined") return
+        window.location.href = url
+      }}
+    >
+      <label>
+        <span>First model</span>
+        <select value={firstId()} onInput={(event) => setFirstId(event.currentTarget.value)} required>
+          <option value="" disabled>
+            Select model
+          </option>
+          <For each={props.models}>
+            {(model) => (
+              <option value={model.id}>
+                {model.name} ({model.lab})
+              </option>
+            )}
+          </For>
+        </select>
+      </label>
+      <label>
+        <span>Second model</span>
+        <select value={secondId()} onInput={(event) => setSecondId(event.currentTarget.value)} required>
+          <option value="" disabled>
+            Select model
+          </option>
+          <For each={props.models}>
+            {(model) => (
+              <option value={model.id} disabled={model.id === firstId()}>
+                {model.name} ({model.lab})
+              </option>
+            )}
+          </For>
+        </select>
+      </label>
+      <button type="submit" disabled={!href()}>
+        Compare models
+      </button>
+    </form>
+  )
+}
+
+function differentModelId(models: ModelCatalogEntry[], firstId: string, preferredId: string | undefined) {
+  if (preferredId && preferredId !== firstId && models.some((model) => model.id === preferredId)) return preferredId
+  return models.find((model) => model.id !== firstId)?.id ?? ""
+}
diff --git a/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx b/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx
new file mode 100644
index 000000000000..6455e0f1481b
--- /dev/null
+++ b/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx
@@ -0,0 +1,608 @@
+import "../../../../index.css"
+import { Link, Meta, Title } from "@solidjs/meta"
+import {
+  getStatsModelComparisonData,
+  type StatsModelComparisonEntry,
+} from "@opencode-ai/stats-core/domain/home"
+import { runtime } from "@opencode-ai/stats-core/runtime"
+import { createAsync, query, useParams } from "@solidjs/router"
+import { createMemo, createSignal, For, onMount, Show } from "solid-js"
+import { getRequestEvent } from "solid-js/web"
+import {
+  ComparisonCardsSection,
+  modelRefFromCatalog,
+  uniqueComparisonPairs,
+  type ComparisonModelRef,
+  type ComparisonPair,
+} from "../../../../compare-cards"
+import { ComparisonSelector } from "../../../../compare-selector"
+import {
+  catalogSlug,
+  findModelCatalogEntry,
+  formatCatalogLabName,
+  getModelCatalog,
+  type ModelCatalog,
+  type ModelCatalogEntry,
+} from "../../../../model-catalog"
+import {
+  applyThemePreference,
+  Footer,
+  getGitHubStars,
+  Header,
+  isThemePreference,
+  themeStorageKey,
+  type HeaderLink,
+  type ThemePreference,
+} from "../../../../stats-shell"
+
+const compareFallbackUrl = "https://stats.opencode.ai"
+const compareHeaderLinks: readonly HeaderLink[] = [
+  { href: "#overview", label: "Overview" },
+  { href: "#comparison", label: "Comparison" },
+  { href: "#compare-tool", label: "Compare" },
+  { href: "#model-comparison", label: "Related" },
+]
+const compareFooterLinks: readonly HeaderLink[] = [
+  { href: import.meta.env.BASE_URL, label: "Data Home" },
+  { href: `${import.meta.env.BASE_URL}compare`, label: "Model Compare" },
+  { href: `${import.meta.env.BASE_URL}#top-models`, label: "Top Models" },
+  { href: `${import.meta.env.BASE_URL}#token-cost`, label: "Token Cost" },
+]
+
+type ComparisonModel = {
+  name: string
+  lab: string
+  labName: string
+  slug: string
+  catalog: ModelCatalogEntry | null
+  stats: StatsModelComparisonEntry | null
+}
+type ComparisonDirection = "higher" | "lower"
+type ComparisonCell = { value: string; detail?: string; score?: number }
+type ComparisonRow = {
+  label: string
+  description: string
+  direction: ComparisonDirection
+  cells: [ComparisonCell, ComparisonCell]
+}
+
+const getComparisonData = query(
+  async (firstLab: string, firstModel: string, secondLab: string, secondModel: string) => {
+    "use server"
+    return runtime.runPromise(getStatsModelComparisonData(firstLab, firstModel, secondLab, secondModel))
+  },
+  "getStatsModelComparisonData",
+)
+
+export default function ModelComparePair() {
+  const event = getRequestEvent()
+  event?.response.headers.set("Cache-Control", "public, max-age=60, s-maxage=300, stale-while-revalidate=86400")
+  const params = useParams()
+  const firstLabParam = createMemo(() => params.firstLab ?? "")
+  const firstModelParam = createMemo(() => params.firstModel ?? "")
+  const secondLabParam = createMemo(() => params.secondLab ?? "")
+  const secondModelParam = createMemo(() => params.secondModel ?? "")
+  const catalog = createAsync(() => getModelCatalog())
+  const firstCatalog = createMemo(() => resolvedCatalogEntry(catalog(), firstLabParam(), firstModelParam()))
+  const secondCatalog = createMemo(() => resolvedCatalogEntry(catalog(), secondLabParam(), secondModelParam()))
+  const stats = createAsync(() => {
+    if (catalog() === undefined || firstCatalog() === undefined || secondCatalog() === undefined)
+      return Promise.resolve(undefined)
+    return getComparisonData(
+      firstCatalog()?.lab ?? firstLabParam(),
+      firstCatalog()?.slug ?? firstModelParam(),
+      secondCatalog()?.lab ?? secondLabParam(),
+      secondCatalog()?.slug ?? secondModelParam(),
+    )
+  })
+  const githubStars = createAsync(() => getGitHubStars())
+  const [themePreference, setThemePreference] = createSignal<ThemePreference>("system")
+  const models = createMemo(
+    () =>
+      [
+        buildComparisonModel(firstLabParam(), firstModelParam(), firstCatalog() ?? null, stats()?.models[0] ?? null),
+        buildComparisonModel(secondLabParam(), secondModelParam(), secondCatalog() ?? null, stats()?.models[1] ?? null),
+      ] as const,
+  )
+  const title = createMemo(() => `${models()[0].name} vs ${models()[1].name} - Model Comparison`)
+  const description = createMemo(
+    () =>
+      `Compare ${models()[0].name} and ${models()[1].name} by usage, rank, context window, output limit, cache ratio, and cost across OpenCode data.`,
+  )
+  const canonicalPath = createMemo(
+    () =>
+      `${import.meta.env.BASE_URL}compare/${catalogSlug(models()[0].lab)}/${catalogSlug(models()[0].slug)}/${catalogSlug(
+        models()[1].lab,
+      )}/${catalogSlug(models()[1].slug)}`,
+  )
+  const canonicalUrl = createMemo(() =>
+    new URL(
+      canonicalPath(),
+      event?.request.url ?? (typeof window === "undefined" ? compareFallbackUrl : window.location.href),
+    ).toString(),
+  )
+  const rows = createMemo(() => buildComparisonRows(models()[0], models()[1]))
+  const relatedPairs = createMemo(() => buildRelatedPairs(catalog(), models()[0], models()[1]))
+  const selectorModels = createMemo(() =>
+    uniqueCatalogModels([comparisonCatalogEntry(models()[0]), comparisonCatalogEntry(models()[1]), ...(catalog()?.models ?? [])]),
+  )
+  const structuredData = createMemo(() =>
+    JSON.stringify({
+      "@context": "https://schema.org",
+      "@type": "WebPage",
+      name: title(),
+      description: description(),
+      url: canonicalUrl(),
+      about: models().map((model) => ({
+        "@type": "SoftwareApplication",
+        name: model.name,
+        applicationCategory: "AI model",
+        provider: model.labName,
+      })),
+    }),
+  )
+  const updateThemePreference = (preference: ThemePreference) => {
+    applyThemePreference(preference)
+    setThemePreference(preference)
+    if (typeof window === "undefined") return
+    window.localStorage.setItem(themeStorageKey, preference)
+  }
+
+  onMount(() => {
+    if (typeof window === "undefined") return
+    const preference = window.localStorage.getItem(themeStorageKey)
+    const nextPreference = isThemePreference(preference) ? preference : "system"
+    applyThemePreference(nextPreference)
+    setThemePreference(nextPreference)
+  })
+
+  return (
+    <main data-page="stats" data-theme={themePreference()}>
+      <Title>{title()}</Title>
+      <Meta name="description" content={description()} />
+      <Link rel="canonical" href={canonicalUrl()} />
+      <Meta property="og:type" content="website" />
+      <Meta property="og:site_name" content="OpenCode" />
+      <Meta property="og:title" content={title()} />
+      <Meta property="og:description" content={description()} />
+      <Meta property="og:url" content={canonicalUrl()} />
+      <Meta name="twitter:card" content="summary" />
+      <Meta name="twitter:title" content={title()} />
+      <Meta name="twitter:description" content={description()} />
+      <script type="application/ld+json">{structuredData()}</script>
+      <Header githubStars={githubStars() ?? "150K"} links={compareHeaderLinks} brandHref={import.meta.env.BASE_URL} />
+      <div data-component="container">
+        <div data-component="content">
+          <ComparisonHero models={models()} />
+          <section id="comparison" data-section="model-panel">
+            <p data-slot="section-title">
+              <strong>Comparison Table.</strong>{" "}
+              <span>Compare usage, cost, limits, and features.</span>
+            </p>
+            <Show
+              when={stats() !== undefined}
+	              fallback={
+	                <div data-component="empty-state" data-compact="true">
+	                  <strong>Loading comparison</strong>
+	                  <p>Loading stats for both models.</p>
+	                </div>
+	              }
+            >
+              <ComparisonTable models={models()} rows={rows()} />
+            </Show>
+          </section>
+          <section id="compare-tool" data-section="model-panel" data-variant="compact">
+            <p data-slot="section-title">
+              <strong>Compare Another Pair.</strong> <span>Choose two models to compare.</span>
+            </p>
+            <Show
+              when={selectorModels().length > 1}
+	              fallback={
+	                <div data-component="empty-state" data-compact="true">
+	                  <strong>No models found</strong>
+	                  <p>The model list could not be loaded.</p>
+	                </div>
+	              }
+            >
+              <ComparisonSelector
+                models={selectorModels()}
+                firstId={comparisonCatalogEntry(models()[0]).id}
+                secondId={comparisonCatalogEntry(models()[1]).id}
+              />
+            </Show>
+          </section>
+          <ComparisonCardsSection
+            pairs={relatedPairs()}
+            title="Related Model Comparisons"
+            description="Other model pairs to check."
+          />
+        </div>
+        <Footer
+          themePreference={themePreference()}
+          onThemePreferenceChange={updateThemePreference}
+          links={compareFooterLinks}
+          bridge={{ href: "#comparison", label: "COMPARE TABLE" }}
+        />
+      </div>
+    </main>
+  )
+}
+
+function ComparisonHero(props: { models: readonly [ComparisonModel, ComparisonModel] }) {
+  return (
+    <section id="overview" data-section="model-hero">
+      <a data-slot="model-back-link" href={`${import.meta.env.BASE_URL}compare`}>
+        Compare
+      </a>
+      <div data-slot="model-hero-copy">
+        <h1>
+          {props.models[0].name} vs {props.models[1].name}
+        </h1>
+        <p>Compare usage, cost, limits, and features for these two models.</p>
+      </div>
+      <div data-slot="model-hero-pattern" aria-hidden="true" />
+    </section>
+  )
+}
+
+function ComparisonTable(props: { models: readonly [ComparisonModel, ComparisonModel]; rows: ComparisonRow[] }) {
+  return (
+    <div data-component="comparison-table-wrap">
+      <table data-component="comparison-table">
+        <caption>
+          {props.models[0].name} compared with {props.models[1].name}
+        </caption>
+        <thead>
+          <tr>
+            <th scope="col">Metric</th>
+            <For each={props.models}>{(model) => <th scope="col">{model.name}</th>}</For>
+          </tr>
+        </thead>
+        <tbody>
+          <For each={props.rows}>
+            {(row) => {
+              const best = () => bestCellIndex(row)
+              return (
+                <tr>
+                  <th scope="row">
+                    <strong>{row.label}</strong>
+                    <span>{row.description}</span>
+                  </th>
+                  <For each={row.cells}>
+                    {(cell, index) => (
+                      <td data-best={best() === index() ? "true" : undefined}>
+                        <strong>{cell.value}</strong>
+                        <Show when={cell.detail}>{(detail) => <span>{detail()}</span>}</Show>
+                      </td>
+                    )}
+                  </For>
+                </tr>
+              )
+            }}
+          </For>
+        </tbody>
+      </table>
+    </div>
+  )
+}
+
+function resolvedCatalogEntry(catalog: ModelCatalog | undefined, lab: string, model: string) {
+  if (!catalog) return undefined
+  return findModelCatalogEntry(catalog, model, lab) ?? null
+}
+
+function buildComparisonModel(
+  labParam: string,
+  modelParam: string,
+  catalog: ModelCatalogEntry | null,
+  stats: StatsModelComparisonEntry | null,
+): ComparisonModel {
+  return {
+    name: catalog?.name ?? stats?.model ?? formatParamName(modelParam),
+    lab: catalog?.lab ?? stats?.provider ?? catalogSlug(labParam),
+    labName: formatCatalogLabName(catalog?.lab ?? stats?.provider ?? labParam),
+    slug: catalog?.slug ?? stats?.slug ?? catalogSlug(modelParam),
+    catalog,
+    stats,
+  }
+}
+
+function comparisonCatalogEntry(model: ComparisonModel): ModelCatalogEntry {
+  if (model.catalog) return model.catalog
+  return {
+    id: `${catalogSlug(model.lab)}/${catalogSlug(model.slug)}`,
+    lab: catalogSlug(model.lab),
+    slug: catalogSlug(model.slug),
+    name: model.name,
+    modalities: { input: [], output: [] },
+    openWeights: false,
+    reasoning: false,
+    toolCall: false,
+    attachment: false,
+    temperature: false,
+    weights: [],
+    benchmarks: [],
+  }
+}
+
+function uniqueCatalogModels(models: ModelCatalogEntry[]) {
+  return Object.values(
+    models.reduce<Record<string, ModelCatalogEntry>>((result, model) => {
+      result[model.id] = result[model.id] ?? model
+      return result
+    }, {}),
+  )
+}
+
+function buildComparisonRows(first: ComparisonModel, second: ComparisonModel): ComparisonRow[] {
+  return [
+    comparisonRow(
+	      "Recent Rank",
+	      "Lower is better.",
+	      {
+	        value: first.stats?.rank == null ? "No usage" : `#${first.stats.rank}`,
+	        score: first.stats?.rank ?? undefined,
+	      },
+	      {
+	        value: second.stats?.rank == null ? "No usage" : `#${second.stats.rank}`,
+	        score: second.stats?.rank ?? undefined,
+	      },
+	      "lower",
+	    ),
+    comparisonRow(
+      "Token Share",
+      "Share of recent OpenCode usage.",
+      { value: first.stats ? formatPercent(first.stats.tokenShare) : "No usage", score: first.stats?.tokenShare },
+      { value: second.stats ? formatPercent(second.stats.tokenShare) : "No usage", score: second.stats?.tokenShare },
+      "higher",
+    ),
+    comparisonRow(
+      "Tokens",
+      "Recent token volume.",
+      { value: first.stats ? formatTokens(first.stats.totals.tokens) : "No usage", score: first.stats?.totals.tokens },
+      {
+        value: second.stats ? formatTokens(second.stats.totals.tokens) : "No usage",
+        score: second.stats?.totals.tokens,
+      },
+      "higher",
+    ),
+    comparisonRow(
+      "Sessions",
+      "Recent session count.",
+      {
+        value: first.stats ? formatInteger(first.stats.totals.sessions) : "No usage",
+        score: first.stats?.totals.sessions,
+      },
+      {
+        value: second.stats ? formatInteger(second.stats.totals.sessions) : "No usage",
+        score: second.stats?.totals.sessions,
+      },
+      "higher",
+    ),
+    comparisonRow(
+      "Cost / 1M Tokens",
+      "Lower is better.",
+      {
+        value: first.stats ? formatMoney(first.stats.totals.costPerMillion) : "No usage",
+        score: positiveScore(first.stats?.totals.costPerMillion),
+      },
+      {
+        value: second.stats ? formatMoney(second.stats.totals.costPerMillion) : "No usage",
+        score: positiveScore(second.stats?.totals.costPerMillion),
+      },
+      "lower",
+    ),
+    comparisonRow(
+      "Cost / Session",
+      "Lower is better.",
+      {
+        value: first.stats ? formatSessionCost(first.stats.totals.costPerSession) : "No usage",
+        score: positiveScore(first.stats?.totals.costPerSession),
+      },
+      {
+        value: second.stats ? formatSessionCost(second.stats.totals.costPerSession) : "No usage",
+        score: positiveScore(second.stats?.totals.costPerSession),
+      },
+      "lower",
+    ),
+    comparisonRow(
+      "Cache Ratio",
+      "Higher is better.",
+      { value: first.stats ? formatPercent(first.stats.totals.cacheRatio) : "No usage", score: first.stats?.totals.cacheRatio },
+      {
+        value: second.stats ? formatPercent(second.stats.totals.cacheRatio) : "No usage",
+        score: second.stats?.totals.cacheRatio,
+      },
+      "higher",
+    ),
+    comparisonRow(
+      "Context Window",
+      "Higher limit is better.",
+      {
+        value: formatCatalogLimit(first.catalog?.limit?.context),
+        score: first.catalog?.limit?.context,
+      },
+      {
+        value: formatCatalogLimit(second.catalog?.limit?.context),
+        score: second.catalog?.limit?.context,
+      },
+      "higher",
+    ),
+    comparisonRow(
+      "Output Limit",
+      "Higher limit is better.",
+      {
+        value: formatCatalogLimit(first.catalog?.limit?.output),
+        score: first.catalog?.limit?.output,
+      },
+      {
+        value: formatCatalogLimit(second.catalog?.limit?.output),
+        score: second.catalog?.limit?.output,
+      },
+      "higher",
+    ),
+    comparisonRow(
+      "Release Date",
+      "Newer release is highlighted.",
+      {
+        value: formatCatalogDate(first.catalog?.releaseDate),
+        score: catalogDateScore(first.catalog?.releaseDate),
+      },
+      {
+        value: formatCatalogDate(second.catalog?.releaseDate),
+        score: catalogDateScore(second.catalog?.releaseDate),
+      },
+      "higher",
+    ),
+    comparisonRow(
+      "Reasoning",
+      "Supports reasoning.",
+      booleanCell(first.catalog?.reasoning),
+      booleanCell(second.catalog?.reasoning),
+      "higher",
+    ),
+    comparisonRow(
+      "Tool Calling",
+      "Supports tool calls.",
+      booleanCell(first.catalog?.toolCall),
+      booleanCell(second.catalog?.toolCall),
+      "higher",
+    ),
+    comparisonRow(
+      "Attachments",
+      "Supports attachments.",
+      booleanCell(first.catalog?.attachment),
+      booleanCell(second.catalog?.attachment),
+      "higher",
+    ),
+    comparisonRow(
+      "Open Weights",
+      "Open weights available.",
+      booleanCell(first.catalog?.openWeights),
+      booleanCell(second.catalog?.openWeights),
+      "higher",
+    ),
+  ]
+}
+
+function comparisonRow(
+  label: string,
+  description: string,
+  first: ComparisonCell,
+  second: ComparisonCell,
+  direction: ComparisonDirection,
+): ComparisonRow {
+  return { label, description, direction, cells: [first, second] }
+}
+
+function bestCellIndex(row: ComparisonRow) {
+  const [first, second] = row.cells.map((cell) => cell.score)
+  if (first === undefined || second === undefined || first === second) return undefined
+  if (row.direction === "higher") return first > second ? 0 : 1
+  return first < second ? 0 : 1
+}
+
+function buildRelatedPairs(
+  catalog: ModelCatalog | undefined,
+  first: ComparisonModel,
+  second: ComparisonModel,
+): ComparisonPair[] {
+  const current = [comparisonRef(first), comparisonRef(second)] as const
+  const alternatives = (catalog?.models ?? [])
+    .filter((model) => model.id !== first.catalog?.id && model.id !== second.catalog?.id)
+    .slice(0, 4)
+    .map(modelRefFromCatalog)
+
+  return uniqueComparisonPairs([
+    ...alternatives.slice(0, 3).flatMap((model, index) => [
+      { first: current[0], second: model, detail: index === 0 ? "Nearby alternative" : "Related comparison" },
+      { first: current[1], second: model, detail: index === 0 ? "Nearby alternative" : "Related comparison" },
+    ]),
+  ]).slice(0, 6)
+}
+
+function comparisonRef(model: ComparisonModel): ComparisonModelRef {
+  return {
+    name: model.name,
+    lab: model.lab,
+    slug: model.slug,
+    labName: model.labName,
+    metric: model.stats ? `#${model.stats.rank}` : "Catalog",
+  }
+}
+
+function positiveScore(value: number | undefined) {
+  return value && value > 0 ? value : undefined
+}
+
+function booleanCell(value: boolean | undefined): ComparisonCell {
+  if (value === undefined) return { value: "Unknown" }
+  return { value: value ? "Yes" : "No", score: value ? 1 : 0 }
+}
+
+function catalogDateScore(value: string | undefined) {
+  if (!value) return undefined
+  const match = /^(\d{4})(?:-(\d{2}))?(?:-(\d{2}))?$/.exec(value)
+  if (!match) return undefined
+  return Date.UTC(Number(match[1]), match[2] ? Number(match[2]) - 1 : 0, match[3] ? Number(match[3]) : 1)
+}
+
+function formatParamName(value: string) {
+  return value
+    .replace(/[-_]/g, " ")
+    .replace(/\b\w/g, (letter) => letter.toUpperCase())
+    .trim()
+}
+
+function formatCatalogLimit(value: number | undefined) {
+  return value === undefined ? "Unknown" : formatTokens(value)
+}
+
+function formatCatalogDate(value: string | undefined) {
+  if (!value) return "Unknown"
+  const match = /^(\d{4})(?:-(\d{2}))?(?:-(\d{2}))?$/.exec(value)
+  if (!match) return value
+  const year = Number(match[1])
+  const month = match[2] ? Number(match[2]) - 1 : 0
+  const day = match[3] ? Number(match[3]) : 1
+  return new Intl.DateTimeFormat("en", {
+    month: match[2] ? "short" : undefined,
+    day: match[3] ? "numeric" : undefined,
+    year: "numeric",
+    timeZone: "UTC",
+  }).format(new Date(Date.UTC(year, month, day)))
+}
+
+function formatTokens(value: number) {
+  if (value >= 1_000_000_000_000)
+    return `${trimNumber(value / 1_000_000_000_000, value >= 10_000_000_000_000 ? 0 : 1)}T`
+  if (value >= 1_000_000_000) return `${trimNumber(value / 1_000_000_000, value >= 10_000_000_000 ? 0 : 1)}B`
+  if (value >= 1_000_000) return `${trimNumber(value / 1_000_000, value >= 10_000_000 ? 0 : 1)}M`
+  if (value >= 1_000) return `${trimNumber(value / 1_000, value >= 10_000 ? 0 : 1)}K`
+  return String(Math.round(value))
+}
+
+function formatInteger(value: number) {
+  return new Intl.NumberFormat("en").format(value)
+}
+
+function formatPercent(value: number) {
+  return `${trimNumber(value, value >= 10 ? 1 : 2)}%`
+}
+
+function formatMoney(value: number) {
+  if (value >= 1) return `$${trimNumber(value, 2)}`
+  if (value > 0) return `$${value.toFixed(4)}`
+  return "$0"
+}
+
+function formatSessionCost(value: number) {
+  if (value >= 1) return `$${trimNumber(value, 2)}`
+  if (value >= 0.01) return `$${value.toFixed(2)}`
+  if (value > 0) return `$${value.toFixed(4)}`
+  return "$0"
+}
+
+function trimNumber(value: number, digits: number) {
+  return Number(value.toFixed(digits)).toLocaleString("en")
+}
diff --git a/packages/stats/app/src/routes/compare/index.tsx b/packages/stats/app/src/routes/compare/index.tsx
new file mode 100644
index 000000000000..23e134225f25
--- /dev/null
+++ b/packages/stats/app/src/routes/compare/index.tsx
@@ -0,0 +1,148 @@
+import "../index.css"
+import { Link, Meta, Title } from "@solidjs/meta"
+import { createAsync } from "@solidjs/router"
+import { createMemo, createSignal, onMount, Show } from "solid-js"
+import { getRequestEvent } from "solid-js/web"
+import { ComparisonCardsSection, modelRefFromCatalog, uniqueComparisonPairs } from "../compare-cards"
+import { ComparisonSelector } from "../compare-selector"
+import { getModelCatalog, type ModelCatalogEntry } from "../model-catalog"
+import {
+  applyThemePreference,
+  Footer,
+  getGitHubStars,
+  Header,
+  isThemePreference,
+  themeStorageKey,
+  type HeaderLink,
+  type ThemePreference,
+} from "../stats-shell"
+
+const compareFallbackUrl = "https://stats.opencode.ai"
+const compareTitle = "AI Model Comparison"
+const compareDescription =
+  "Compare AI models used in OpenCode by context, output, release date, usage, rank, token share, and cost."
+const compareHeaderLinks: readonly HeaderLink[] = [
+  { href: "#compare-tool", label: "Compare" },
+  { href: "#model-comparison", label: "Popular" },
+]
+const compareFooterLinks: readonly HeaderLink[] = [
+  { href: import.meta.env.BASE_URL, label: "Data Home" },
+  { href: `${import.meta.env.BASE_URL}#top-models`, label: "Top Models" },
+  { href: `${import.meta.env.BASE_URL}#token-cost`, label: "Token Cost" },
+  { href: `${import.meta.env.BASE_URL}compare`, label: "Model Compare" },
+]
+
+export default function ModelCompareIndex() {
+  const event = getRequestEvent()
+  event?.response.headers.set("Cache-Control", "public, max-age=60, s-maxage=300, stale-while-revalidate=86400")
+  const catalog = createAsync(() => getModelCatalog())
+  const githubStars = createAsync(() => getGitHubStars())
+  const [themePreference, setThemePreference] = createSignal<ThemePreference>("system")
+  const compareUrl = createMemo(() =>
+    new URL(
+      `${import.meta.env.BASE_URL}compare`,
+      event?.request.url ?? (typeof window === "undefined" ? compareFallbackUrl : window.location.href),
+    ).toString(),
+  )
+  const featuredModels = createMemo(() => (catalog()?.models ?? []).slice(0, 120))
+  const pairs = createMemo(() => buildPopularPairs(featuredModels()))
+  const updateThemePreference = (preference: ThemePreference) => {
+    applyThemePreference(preference)
+    setThemePreference(preference)
+    if (typeof window === "undefined") return
+    window.localStorage.setItem(themeStorageKey, preference)
+  }
+
+  onMount(() => {
+    if (typeof window === "undefined") return
+    const preference = window.localStorage.getItem(themeStorageKey)
+    const nextPreference = isThemePreference(preference) ? preference : "system"
+    applyThemePreference(nextPreference)
+    setThemePreference(nextPreference)
+  })
+
+  return (
+    <main data-page="stats" data-theme={themePreference()}>
+      <Title>{compareTitle}</Title>
+      <Meta name="description" content={compareDescription} />
+      <Link rel="canonical" href={compareUrl()} />
+      <Meta property="og:type" content="website" />
+      <Meta property="og:site_name" content="OpenCode" />
+      <Meta property="og:title" content={compareTitle} />
+      <Meta property="og:description" content={compareDescription} />
+      <Meta property="og:url" content={compareUrl()} />
+      <Meta name="twitter:card" content="summary" />
+      <Meta name="twitter:title" content={compareTitle} />
+      <Meta name="twitter:description" content={compareDescription} />
+      <Header githubStars={githubStars() ?? "150K"} links={compareHeaderLinks} brandHref={import.meta.env.BASE_URL} />
+      <div data-component="container">
+        <div data-component="content">
+          <section id="compare-tool" data-section="model-hero">
+            <a data-slot="model-back-link" href={import.meta.env.BASE_URL}>
+              Data
+            </a>
+            <div data-slot="model-hero-grid">
+              <div data-slot="model-hero-copy">
+                <span data-slot="model-id-tag">/compare</span>
+                <h1>Model Comparison</h1>
+                <p>Choose two models and compare usage, cost, limits, and features.</p>
+              </div>
+              <div data-component="model-rank-panel">
+                <span>Model Pairs</span>
+                <strong>{formatPairCount(featuredModels().length)}</strong>
+                <p>Available pairings from the model list.</p>
+              </div>
+            </div>
+            <div data-slot="model-hero-pattern" aria-hidden="true" />
+            <Show
+              when={featuredModels().length > 1}
+	              fallback={
+	                <div data-component="empty-state" data-compact="true">
+	                  <strong>No models found</strong>
+	                  <p>The model list could not be loaded.</p>
+	                </div>
+	              }
+            >
+              <ComparisonSelector models={featuredModels()} />
+            </Show>
+          </section>
+          <ComparisonCardsSection
+            pairs={pairs()}
+            title="Popular Model Comparisons"
+            description="Common model pairs to start with."
+          />
+        </div>
+        <Footer
+          themePreference={themePreference()}
+          onThemePreferenceChange={updateThemePreference}
+          links={compareFooterLinks}
+          bridge={{ href: "#compare-tool", label: "MODEL COMPARE" }}
+        />
+      </div>
+    </main>
+  )
+}
+
+function buildPopularPairs(models: ModelCatalogEntry[]) {
+  return uniqueComparisonPairs(
+    (
+      [
+        [0, 1, "Popular pair"],
+        [0, 2, "Top alternative"],
+        [1, 2, "Nearby pair"],
+        [2, 3, "Recent model pair"],
+        [3, 4, "Model pair"],
+        [4, 5, "Model pair"],
+      ] as const
+    ).flatMap(([firstIndex, secondIndex, detail]) => {
+      const first = models[firstIndex]
+      const second = models[secondIndex]
+      return first && second ? [{ first: modelRefFromCatalog(first), second: modelRefFromCatalog(second), detail }] : []
+    }),
+  )
+}
+
+function formatPairCount(count: number) {
+  if (count < 2) return "0"
+  return new Intl.NumberFormat("en", { notation: "compact", maximumFractionDigits: 1 }).format((count * (count - 1)) / 2)
+}
diff --git a/packages/stats/app/src/routes/index.css b/packages/stats/app/src/routes/index.css
index 2b57338bf854..b52aa51e086d 100644
--- a/packages/stats/app/src/routes/index.css
+++ b/packages/stats/app/src/routes/index.css
@@ -5252,6 +5252,243 @@
   color: var(--stats-text);
 }
 
+[data-page="stats"] [data-section="model-panel"][data-variant="compact"] {
+  padding-top: 56px;
+  padding-bottom: 56px;
+}
+
+[data-page="stats"] [data-component="comparison-card-grid"] {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 8px;
+}
+
+[data-page="stats"] [data-component="comparison-card"] {
+  display: grid;
+  align-content: space-between;
+  gap: 18px;
+  min-height: 168px;
+  min-width: 0;
+  padding: 16px;
+  border: 1px solid var(--stats-line);
+  background: var(--stats-layer);
+  color: var(--stats-text);
+  text-decoration: none;
+}
+
+[data-page="stats"] [data-component="comparison-card"]:hover,
+[data-page="stats"] [data-component="comparison-card"]:focus-visible {
+  border-color: var(--stats-text);
+  outline: none;
+  background: var(--stats-bg);
+  text-decoration: none;
+}
+
+[data-page="stats"] [data-component="comparison-card"] span,
+[data-page="stats"] [data-component="comparison-card"] p,
+[data-page="stats"] [data-component="comparison-card"] small {
+  color: var(--stats-muted);
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 1.35;
+}
+
+[data-page="stats"] [data-component="comparison-card"] strong {
+  min-width: 0;
+  color: var(--stats-text);
+  font-size: 20px;
+  font-weight: 500;
+  line-height: 1.08;
+  overflow-wrap: anywhere;
+}
+
+[data-page="stats"] [data-component="comparison-card"] em {
+  color: var(--stats-faint);
+  font: inherit;
+}
+
+[data-page="stats"] [data-component="comparison-card"] p {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin: 0;
+}
+
+[data-page="stats"] [data-component="comparison-card"] b {
+  min-width: 0;
+  overflow: hidden;
+  font: inherit;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-component="comparison-card"] i {
+  flex: 0 0 auto;
+  width: 16px;
+  height: 1px;
+  background: var(--stats-line-strong);
+}
+
+[data-page="stats"] [data-component="comparison-selector"] {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) auto;
+  gap: 8px;
+  align-items: end;
+  max-width: 920px;
+}
+
+[data-page="stats"] [data-component="comparison-selector"] label {
+  display: grid;
+  gap: 8px;
+  min-width: 0;
+}
+
+[data-page="stats"] [data-component="comparison-selector"] label span {
+  color: var(--stats-muted);
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 1.2;
+}
+
+[data-page="stats"] [data-component="comparison-selector"] select,
+[data-page="stats"] [data-component="comparison-selector"] button {
+  box-sizing: border-box;
+  height: 40px;
+  min-width: 0;
+  border: 1px solid var(--stats-line);
+  border-radius: 0;
+  appearance: none;
+  font: inherit;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1;
+}
+
+[data-page="stats"] [data-component="comparison-selector"] select {
+  width: 100%;
+  padding: 0 36px 0 12px;
+  background:
+    linear-gradient(45deg, transparent 50%, var(--stats-muted) 50%) calc(100% - 18px) 17px / 5px 5px no-repeat,
+    linear-gradient(135deg, var(--stats-muted) 50%, transparent 50%) calc(100% - 13px) 17px / 5px 5px no-repeat,
+    var(--stats-bg);
+  color: var(--stats-text);
+}
+
+[data-page="stats"] [data-component="comparison-selector"] button {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 14px;
+  background: var(--stats-text);
+  color: var(--stats-bg);
+  cursor: pointer;
+  text-decoration: none;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-component="comparison-selector"] button:disabled {
+  cursor: not-allowed;
+  opacity: 0.45;
+}
+
+[data-page="stats"] [data-component="comparison-selector"] select:focus-visible,
+[data-page="stats"] [data-component="comparison-selector"] button:focus-visible {
+  outline: 2px solid var(--stats-accent);
+  outline-offset: 2px;
+}
+
+[data-page="stats"] [data-component="comparison-table-wrap"] {
+  overflow-x: auto;
+  border: 1px solid var(--stats-line);
+  background: var(--stats-layer);
+}
+
+[data-page="stats"] [data-component="comparison-table"] {
+  width: 100%;
+  min-width: 720px;
+  border-collapse: collapse;
+  color: var(--stats-text);
+  font-size: 13px;
+  line-height: 1.35;
+}
+
+[data-page="stats"] [data-component="comparison-table"] caption {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-component="comparison-table"] th,
+[data-page="stats"] [data-component="comparison-table"] td {
+  min-width: 0;
+  padding: 14px 16px;
+  border-bottom: 1px solid var(--stats-line);
+  border-left: 1px solid var(--stats-line);
+  text-align: left;
+  vertical-align: top;
+}
+
+[data-page="stats"] [data-component="comparison-table"] th:first-child {
+  border-left: 0;
+}
+
+[data-page="stats"] [data-component="comparison-table"] thead th {
+  color: var(--stats-muted);
+  font-size: 11px;
+  font-weight: 600;
+  line-height: 1.2;
+  text-transform: uppercase;
+}
+
+[data-page="stats"] [data-component="comparison-table"] tbody tr:last-child th,
+[data-page="stats"] [data-component="comparison-table"] tbody tr:last-child td {
+  border-bottom: 0;
+}
+
+[data-page="stats"] [data-component="comparison-table"] tbody th {
+  width: 34%;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-component="comparison-table"] tbody th strong,
+[data-page="stats"] [data-component="comparison-table"] td strong {
+  display: block;
+  color: var(--stats-text);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.25;
+  overflow-wrap: anywhere;
+}
+
+[data-page="stats"] [data-component="comparison-table"] tbody th span,
+[data-page="stats"] [data-component="comparison-table"] td span {
+  display: block;
+  margin-top: 5px;
+  color: var(--stats-muted);
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 1.35;
+}
+
+[data-page="stats"] [data-component="comparison-table"] td[data-best="true"] {
+  position: relative;
+  background: var(--stats-bg);
+  box-shadow: inset 0 0 0 1px var(--stats-accent);
+}
+
+[data-page="stats"] [data-component="comparison-table"] td[data-best="true"]::before {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 3px;
+  content: "";
+  background: var(--stats-accent);
+}
+
 [data-page="stats"][data-theme="dark"],
 :root[data-stats-theme="dark"] [data-page="stats"]:not([data-theme="light"]) {
   color-scheme: dark;
@@ -5784,10 +6021,19 @@
   [data-page="stats"] [data-component="model-metric-grid"],
   [data-page="stats"] [data-component="model-metric-grid"][data-variant="dense"],
   [data-page="stats"] [data-component="model-efficiency-grid"],
-  [data-page="stats"] [data-component="lab-model-grid"] {
+  [data-page="stats"] [data-component="lab-model-grid"],
+  [data-page="stats"] [data-component="comparison-card-grid"] {
     grid-template-columns: 1fr 1fr;
   }
 
+  [data-page="stats"] [data-component="comparison-selector"] {
+    grid-template-columns: 1fr;
+  }
+
+  [data-page="stats"] [data-component="comparison-selector"] button {
+    width: 100%;
+  }
+
   [data-page="stats"] [data-component="model-peer-list"] a {
     grid-template-columns: 32px 32px minmax(0, 1fr) minmax(64px, auto);
     gap: 12px;
@@ -6212,10 +6458,15 @@
   [data-page="stats"] [data-component="model-metric-grid"],
   [data-page="stats"] [data-component="model-metric-grid"][data-variant="dense"],
   [data-page="stats"] [data-component="model-efficiency-grid"],
-  [data-page="stats"] [data-component="lab-model-grid"] {
+  [data-page="stats"] [data-component="lab-model-grid"],
+  [data-page="stats"] [data-component="comparison-card-grid"] {
     grid-template-columns: 1fr;
   }
 
+  [data-page="stats"] [data-component="comparison-table"] {
+    min-width: 640px;
+  }
+
   [data-page="stats"] [data-component="model-metric"] {
     min-height: 112px;
   }
diff --git a/packages/stats/app/src/routes/index.tsx b/packages/stats/app/src/routes/index.tsx
index a30986dd96f6..19ca38b4e1f4 100644
--- a/packages/stats/app/src/routes/index.tsx
+++ b/packages/stats/app/src/routes/index.tsx
@@ -34,6 +34,7 @@ import { localizedUrl } from "../lib/language"
 import { findModelCatalogEntry, getModelCatalog, type ModelCatalog } from "./model-catalog"
 import { SectionHeading } from "./section-heading"
 import { setStatsPageCacheHeaders } from "./stats-cache"
+import { ComparisonCardsSection, uniqueComparisonPairs, type ComparisonModelRef } from "./compare-cards"
 import {
   applyThemePreference,
   Footer,
@@ -48,6 +49,12 @@ import {
 const products = ["All Users", "Zen", "Go"] as const
 const tokenProducts = ["Zen", "Go"] as const
 const ranges = ["1D", "1W", "2W", "1M", "2M"] as const
+const comparisonPairIndexes = [
+  [0, 1, "Top two by recent usage"],
+  [0, 2, "Leader vs challenger"],
+  [1, 2, "Adjacent leaderboard pair"],
+  [2, 3, "Top model alternative"],
+] as const
 const statsUnfurlPath = "banner.jpg"
 const usageColors = [
   "#ed6aff",
@@ -183,11 +190,20 @@ export default function StatsHome() {
                 <CacheRatioSection data={stats().cacheRatio} />
                 <MarketShareSection data={stats().market} />
                 <GeoBreakdownSection data={stats().country} />
+                <ComparisonCardsSection
+                  pairs={homeComparisonPairs(stats().leaderboard["All Users"]["2M"])}
+                  title="Model Comparisons"
+                  description="Popular model pairs from the leaderboard."
+                />
               </>
             )}
           </Show>
         </div>
-        <Footer themePreference={themePreference()} onThemePreferenceChange={updateThemePreference} />
+        <Footer
+          themePreference={themePreference()}
+          onThemePreferenceChange={updateThemePreference}
+          bridge={{ href: "#model-comparison", label: "MODEL COMPARISONS" }}
+        />
       </div>
     </main>
   )
@@ -1969,6 +1985,26 @@ function formatSessionCost(value: number) {
   return `$${value.toFixed(4)}`
 }
 
+function homeComparisonPairs(leaderboard: LeaderboardEntry[]) {
+  return uniqueComparisonPairs(
+    comparisonPairIndexes.flatMap(([firstIndex, secondIndex, detail]) => {
+      const first = leaderboard[firstIndex]
+      const second = leaderboard[secondIndex]
+      return first && second ? [{ first: leaderboardRef(first), second: leaderboardRef(second), detail }] : []
+    }),
+  )
+}
+
+function leaderboardRef(entry: LeaderboardEntry): ComparisonModelRef {
+  return {
+    name: entry.model,
+    lab: entry.provider,
+    slug: modelSlug(entry.model),
+    labName: entry.author,
+    metric: `#${entry.rank} / ${formatBillions(entry.tokens)}`,
+  }
+}
+
 function modelSlug(value: string) {
   return value
     .trim()
diff --git a/packages/stats/app/src/routes/stats-shell.tsx b/packages/stats/app/src/routes/stats-shell.tsx
index 2bff56d5213d..ca9b0e68fc25 100644
--- a/packages/stats/app/src/routes/stats-shell.tsx
+++ b/packages/stats/app/src/routes/stats-shell.tsx
@@ -216,6 +216,7 @@ export function Footer(props: {
   themePreference: ThemePreference
   onThemePreferenceChange: (preference: ThemePreference) => void
   links?: readonly HeaderLink[]
+  bridge?: HeaderLink | null
 }) {
   const i18n = useI18n()
   const language = useLanguage()
@@ -241,10 +242,12 @@ export function Footer(props: {
     { href: githubLink.href, label: i18n.t("header.github") },
     { href: "https://www.youtube.com/@anomaly-co", label: i18n.t("footer.youtube") },
   ]
+  const bridge = () =>
+    props.bridge === undefined ? { href: "#geo-breakdown", label: i18n.t("nav.geoBreakdown").toUpperCase() } : props.bridge
 
   return (
     <footer data-component="footer">
-      <SectionBridge label={i18n.t("nav.geoBreakdown").toUpperCase()} href="#geo-breakdown" />
+      <Show when={bridge()}>{(link) => <SectionBridge label={link().label} href={link().href} />}</Show>
       <div data-slot="footer-grid">
         <a data-slot="footer-mark" href="https://opencode.ai" aria-label={i18n.t("footer.homeAria")}>
           <OpenCodeMark />
diff --git a/packages/stats/core/src/domain/home.ts b/packages/stats/core/src/domain/home.ts
index afaf624ca5f4..1e3ebd6a137a 100644
--- a/packages/stats/core/src/domain/home.ts
+++ b/packages/stats/core/src/domain/home.ts
@@ -1,8 +1,9 @@
 import { Client } from "@planetscale/database"
 import { Effect } from "effect"
 import { Resource } from "sst/resource"
+import { DatabaseError } from "../database"
 import type { GeoStatMetric } from "./geo"
-import type { ModelStatMetric } from "./model"
+import { ModelStatRepo, type ModelStatMetric } from "./model"
 import type { ProviderStatMetric } from "./provider"
 
 export type UsageProduct = "All Users" | "Zen" | "Go" | "Enterprise"
@@ -81,6 +82,23 @@ export type StatsLabData = {
   usage: ModelUsagePoint[]
   models: LabUsageModelEntry[]
 }
+export type StatsModelComparisonEntry = {
+  updatedAt: string | null
+  model: string
+  slug: string
+  provider: string
+  author: string
+  rank: number | null
+  previousRank: number | null
+  totalModels: number
+  tokenShare: number
+  tokenChange: number
+  totals: StatsModelData["totals"]
+}
+export type StatsModelComparisonData = {
+  updatedAt: string | null
+  models: [StatsModelComparisonEntry | null, StatsModelComparisonEntry | null]
+}
 export type StatsHomeData = {
   updatedAt: string | null
   usage: Record<UsageProduct, Record<UsageRange, UsagePoint[]>>
@@ -271,6 +289,27 @@ function dateValue(value: unknown) {
   return value instanceof Date ? value : new Date(stringValue(value))
 }
 
+export const getStatsModelComparisonData: (
+  firstProvider: string,
+  firstModel: string,
+  secondProvider: string,
+  secondModel: string,
+) => Effect.Effect<StatsModelComparisonData, DatabaseError, ModelStatRepo> = Effect.fn("StatsModelComparison.getData")(
+  function* (firstProvider, firstModel, secondProvider, secondModel) {
+    const modelStats = yield* ModelStatRepo
+    const rows = yield* modelStats.listDaily()
+    const first = toComparisonEntry(buildStatsModelData(firstModel, rows, [], firstProvider))
+    const second = toComparisonEntry(buildStatsModelData(secondModel, rows, [], secondProvider))
+    const latest = [first?.updatedAt, second?.updatedAt]
+      .flatMap((value) => (value ? [dateTime(value)] : []))
+      .toSorted((a, b) => b - a)[0]
+    return {
+      updatedAt: latest === undefined ? null : new Date(latest).toISOString(),
+      models: [first, second],
+    }
+  },
+)
+
 function buildStatsHomeData(
   modelRows: ModelStatMetric[],
   providerRows: ProviderStatMetric[],
@@ -448,6 +487,23 @@ function buildStatsLabData(providerParam: string, modelRows: ModelStatMetric[]):
   }
 }
 
+function toComparisonEntry(data: StatsModelData | null): StatsModelComparisonEntry | null {
+  if (!data) return null
+  return {
+    updatedAt: data.updatedAt,
+    model: data.model,
+    slug: data.slug,
+    provider: data.provider,
+    author: data.author,
+    rank: data.rank,
+    previousRank: data.previousRank,
+    totalModels: data.totalModels,
+    tokenShare: data.tokenShare,
+    tokenChange: data.tokenChange,
+    totals: data.totals,
+  }
+}
+
 function emptyStatsHomeData(): StatsHomeData {
   return {
     updatedAt: null,

From ccd8676beeba33f3ec099b5121b42166f422144d Mon Sep 17 00:00:00 2001
From: Adam <2363879+adamdotdevin@users.noreply.github.com>
Date: Wed, 8 Jul 2026 11:28:21 -0500
Subject: [PATCH 07/33] feat(stats): add model comparison home

---
 .../stats/app/src/routes/compare/index.tsx    | 642 +++++++++++--
 packages/stats/app/src/routes/index.css       | 848 +++++++++++++++++-
 2 files changed, 1411 insertions(+), 79 deletions(-)

diff --git a/packages/stats/app/src/routes/compare/index.tsx b/packages/stats/app/src/routes/compare/index.tsx
index 23e134225f25..220048ddc1c5 100644
--- a/packages/stats/app/src/routes/compare/index.tsx
+++ b/packages/stats/app/src/routes/compare/index.tsx
@@ -1,11 +1,16 @@
 import "../index.css"
-import { Link, Meta, Title } from "@solidjs/meta"
+import { Meta, Title } from "@solidjs/meta"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { createAsync } from "@solidjs/router"
-import { createMemo, createSignal, onMount, Show } from "solid-js"
+import { createEffect, createMemo, createSignal, For, onMount, Show } from "solid-js"
 import { getRequestEvent } from "solid-js/web"
-import { ComparisonCardsSection, modelRefFromCatalog, uniqueComparisonPairs } from "../compare-cards"
-import { ComparisonSelector } from "../compare-selector"
-import { getModelCatalog, type ModelCatalogEntry } from "../model-catalog"
+import { LocaleLinks } from "../../component/locale-links"
+import { useI18n } from "../../context/i18n"
+import { useLanguage } from "../../context/language"
+import { localizedUrl } from "../../lib/language"
+import { comparisonHref, modelRefFromCatalog, type ComparisonModelRef } from "../compare-cards"
+import { formatCatalogLabName, getModelCatalog, type ModelCatalogEntry } from "../model-catalog"
+import { setStatsPageCacheHeaders } from "../stats-cache"
 import {
   applyThemePreference,
   Footer,
@@ -17,35 +22,75 @@ import {
   type ThemePreference,
 } from "../stats-shell"
 
-const compareFallbackUrl = "https://stats.opencode.ai"
+const comparePath = "/data/compare"
 const compareTitle = "AI Model Comparison"
 const compareDescription =
-  "Compare AI models used in OpenCode by context, output, release date, usage, rank, token share, and cost."
-const compareHeaderLinks: readonly HeaderLink[] = [
-  { href: "#compare-tool", label: "Compare" },
-  { href: "#model-comparison", label: "Popular" },
-]
-const compareFooterLinks: readonly HeaderLink[] = [
-  { href: import.meta.env.BASE_URL, label: "Data Home" },
-  { href: `${import.meta.env.BASE_URL}#top-models`, label: "Top Models" },
-  { href: `${import.meta.env.BASE_URL}#token-cost`, label: "Token Cost" },
-  { href: `${import.meta.env.BASE_URL}compare`, label: "Model Compare" },
-]
+  "Compare AI models on key metrics including benchmarks, price, context length, and other model features."
+const statsUnfurlPath = "banner.png"
+const uptimeBars = Array.from({ length: 10 }, (_, index) => index)
+const heroLabs = [
+  { lab: "deepseek", label: "DeepSeek" },
+  { lab: "openai", label: "OpenAI" },
+  { lab: "anthropic", label: "Anthropic" },
+] as const
+const categoryTemplates = [
+  {
+    title: "Flagship models",
+    description: "The latest top-tier model from major labs.",
+    kind: "flagship",
+  },
+  {
+    title: "Most affordable",
+    description: "Compact, lower-cost picks for high-throughput use.",
+    kind: "affordable",
+  },
+  {
+    title: "Best for code",
+    description: "Frequently chosen for programming tasks.",
+    kind: "code",
+  },
+  {
+    title: "Image generation",
+    description: "Compare top image models on cost and quality.",
+    kind: "image",
+  },
+] as const
+
+type CompareCategory = {
+  title: string
+  description: string
+  first: ComparisonModelRef
+  second: ComparisonModelRef
+  avatars: ComparisonModelRef[]
+}
+type CompareSlot = "first" | "second"
 
 export default function ModelCompareIndex() {
+  const i18n = useI18n()
+  const language = useLanguage()
   const event = getRequestEvent()
-  event?.response.headers.set("Cache-Control", "public, max-age=60, s-maxage=300, stale-while-revalidate=86400")
+  setStatsPageCacheHeaders(event?.response.headers)
   const catalog = createAsync(() => getModelCatalog())
   const githubStars = createAsync(() => getGitHubStars())
   const [themePreference, setThemePreference] = createSignal<ThemePreference>("system")
-  const compareUrl = createMemo(() =>
-    new URL(
-      `${import.meta.env.BASE_URL}compare`,
-      event?.request.url ?? (typeof window === "undefined" ? compareFallbackUrl : window.location.href),
-    ).toString(),
-  )
+  const compareUrl = createMemo(() => localizedUrl(language.locale(), comparePath))
+  const statsUnfurlUrl = new URL(statsUnfurlPath, localizedUrl("en", "/data/")).toString()
   const featuredModels = createMemo(() => (catalog()?.models ?? []).slice(0, 120))
-  const pairs = createMemo(() => buildPopularPairs(featuredModels()))
+  const categories = createMemo(() => buildComparisonCategories(featuredModels()))
+  const compareHeaderLinks = createMemo<readonly HeaderLink[]>(() => [
+    { href: `${import.meta.env.BASE_URL}#top-models`, label: i18n.t("nav.topModels") },
+    { href: `${import.meta.env.BASE_URL}#leaderboard`, label: i18n.t("nav.leaderboard") },
+    { href: `${import.meta.env.BASE_URL}#market-share`, label: i18n.t("nav.marketShare") },
+    { href: `${import.meta.env.BASE_URL}#token-cost`, label: i18n.t("nav.tokenCost") },
+    { href: `${import.meta.env.BASE_URL}#session-cost`, label: i18n.t("nav.sessionCost") },
+  ])
+  const compareFooterLinks = createMemo<readonly HeaderLink[]>(() => [
+    { href: `${import.meta.env.BASE_URL}#top-models`, label: i18n.t("nav.topModels") },
+    { href: `${import.meta.env.BASE_URL}#leaderboard`, label: i18n.t("nav.leaderboard") },
+    { href: `${import.meta.env.BASE_URL}#market-share`, label: i18n.t("nav.marketShare") },
+    { href: `${import.meta.env.BASE_URL}#token-cost`, label: i18n.t("nav.tokenCost") },
+    { href: `${import.meta.env.BASE_URL}#session-cost`, label: i18n.t("nav.sessionCost") },
+  ])
   const updateThemePreference = (preference: ThemePreference) => {
     applyThemePreference(preference)
     setThemePreference(preference)
@@ -65,84 +110,527 @@ export default function ModelCompareIndex() {
     <main data-page="stats" data-theme={themePreference()}>
       <Title>{compareTitle}</Title>
       <Meta name="description" content={compareDescription} />
-      <Link rel="canonical" href={compareUrl()} />
+      <LocaleLinks path={comparePath} />
       <Meta property="og:type" content="website" />
       <Meta property="og:site_name" content="OpenCode" />
       <Meta property="og:title" content={compareTitle} />
       <Meta property="og:description" content={compareDescription} />
       <Meta property="og:url" content={compareUrl()} />
-      <Meta name="twitter:card" content="summary" />
+      <Meta property="og:image" content={statsUnfurlUrl} />
+      <Meta property="og:image:type" content="image/png" />
+      <Meta property="og:image:width" content="1200" />
+      <Meta property="og:image:height" content="630" />
+      <Meta property="og:image:alt" content={i18n.t("app.unfurlAlt")} />
+      <Meta name="twitter:card" content="summary_large_image" />
       <Meta name="twitter:title" content={compareTitle} />
       <Meta name="twitter:description" content={compareDescription} />
-      <Header githubStars={githubStars() ?? "150K"} links={compareHeaderLinks} brandHref={import.meta.env.BASE_URL} />
+      <Meta name="twitter:image" content={statsUnfurlUrl} />
+      <Meta name="twitter:image:alt" content={i18n.t("app.unfurlAlt")} />
+      <Header githubStars={githubStars() ?? "150K"} links={compareHeaderLinks()} brandHref={import.meta.env.BASE_URL} />
       <div data-component="container">
         <div data-component="content">
-          <section id="compare-tool" data-section="model-hero">
-            <a data-slot="model-back-link" href={import.meta.env.BASE_URL}>
-              Data
-            </a>
-            <div data-slot="model-hero-grid">
-              <div data-slot="model-hero-copy">
-                <span data-slot="model-id-tag">/compare</span>
-                <h1>Model Comparison</h1>
-                <p>Choose two models and compare usage, cost, limits, and features.</p>
-              </div>
-              <div data-component="model-rank-panel">
-                <span>Model Pairs</span>
-                <strong>{formatPairCount(featuredModels().length)}</strong>
-                <p>Available pairings from the model list.</p>
-              </div>
+          <section id="compare-tool" data-section="compare-home-hero">
+            <nav data-component="compare-home-breadcrumb" aria-label="Breadcrumb">
+              <a data-slot="compare-home-crumb" href={language.route(import.meta.env.BASE_URL)}>
+                Data
+              </a>
+              <span data-slot="compare-home-separator">/</span>
+              <span data-slot="compare-home-crumb" data-current="true">
+                Compare
+              </span>
+            </nav>
+            <div data-slot="compare-home-hero-grid">
+              <h1 aria-label="Compare AI models">
+                <span>Compare</span>
+                <HeroModelStack />
+                <span>AI models</span>
+              </h1>
+              <p>{compareDescription}</p>
             </div>
-            <div data-slot="model-hero-pattern" aria-hidden="true" />
+            <div data-slot="compare-home-pattern" aria-hidden="true" />
+          </section>
+          <section data-section="compare-home-selector" aria-label="Choose models to compare">
             <Show
               when={featuredModels().length > 1}
-	              fallback={
-	                <div data-component="empty-state" data-compact="true">
-	                  <strong>No models found</strong>
-	                  <p>The model list could not be loaded.</p>
-	                </div>
-	              }
+              fallback={
+                <div data-component="empty-state" data-compact="true">
+                  <strong>No models found</strong>
+                  <p>The model list could not be loaded.</p>
+                </div>
+              }
             >
-              <ComparisonSelector models={featuredModels()} />
+              <CompareHomeSelector models={featuredModels()} />
             </Show>
           </section>
-          <ComparisonCardsSection
-            pairs={pairs()}
-            title="Popular Model Comparisons"
-            description="Common model pairs to start with."
-          />
+          <Show when={categories().length > 0}>
+            <section id="model-comparison" data-section="compare-home-related">
+              <p data-slot="section-title">
+                <strong>Related comparisons.</strong> <span>Other model pairs to check.</span>
+              </p>
+              <div data-component="compare-home-card-grid">
+                <For each={categories()}>{(category) => <CompareHomeCard category={category} />}</For>
+              </div>
+            </section>
+          </Show>
         </div>
         <Footer
           themePreference={themePreference()}
           onThemePreferenceChange={updateThemePreference}
-          links={compareFooterLinks}
-          bridge={{ href: "#compare-tool", label: "MODEL COMPARE" }}
+          links={compareFooterLinks()}
+          bridge={null}
         />
       </div>
     </main>
   )
 }
 
-function buildPopularPairs(models: ModelCatalogEntry[]) {
-  return uniqueComparisonPairs(
-    (
-      [
-        [0, 1, "Popular pair"],
-        [0, 2, "Top alternative"],
-        [1, 2, "Nearby pair"],
-        [2, 3, "Recent model pair"],
-        [3, 4, "Model pair"],
-        [4, 5, "Model pair"],
-      ] as const
-    ).flatMap(([firstIndex, secondIndex, detail]) => {
-      const first = models[firstIndex]
-      const second = models[secondIndex]
-      return first && second ? [{ first: modelRefFromCatalog(first), second: modelRefFromCatalog(second), detail }] : []
-    }),
+function CompareHomeSelector(props: { models: ModelCatalogEntry[] }) {
+  const [firstId, setFirstId] = createSignal("")
+  const [secondId, setSecondId] = createSignal("")
+  const [activeSlot, setActiveSlot] = createSignal<CompareSlot>()
+  const modelById = createMemo(() => new Map(props.models.map((model) => [model.id, model])))
+  const first = createMemo(() => modelById().get(firstId()))
+  const second = createMemo(() => modelById().get(secondId()))
+  const activeSelected = createMemo(() => (activeSlot() === "first" ? first() : second()))
+  const activeBlockedId = createMemo(() => (activeSlot() === "first" ? secondId() : firstId()))
+  const href = createMemo(() => {
+    const firstModel = first()
+    const secondModel = second()
+    if (!firstModel || !secondModel || firstModel.id === secondModel.id) return undefined
+    return comparisonHref(modelRefFromCatalog(firstModel), modelRefFromCatalog(secondModel))
+  })
+
+  createEffect(() => {
+    if (!secondId() || secondId() !== firstId()) return
+    setSecondId("")
+  })
+
+  createEffect(() => {
+    const url = href()
+    if (!url || typeof window === "undefined") return
+    window.location.href = url
+  })
+
+  return (
+    <form
+      data-component="compare-home-selector"
+      aria-label="Model comparison selector"
+      onSubmit={(event) => event.preventDefault()}
+    >
+      <CompareHomeSelect
+        selected={first()}
+        label="First model"
+        expanded={activeSlot() === "first"}
+        onOpen={() => setActiveSlot("first")}
+      />
+      <CompareHomeSelect
+        selected={second()}
+        label="Second model"
+        expanded={activeSlot() === "second"}
+        onOpen={() => setActiveSlot("second")}
+      />
+      <Show when={activeSlot()}>
+        {(slot) => (
+          <CompareModelSelectModal
+            models={props.models}
+            selected={activeSelected()}
+            blockedId={activeBlockedId()}
+            label={slot() === "first" ? "Choose first model" : "Choose second model"}
+            onClose={() => setActiveSlot(undefined)}
+            onSelect={(model) => {
+              if (slot() === "first") setFirstId(model.id)
+              if (slot() === "second") setSecondId(model.id)
+              setActiveSlot(undefined)
+            }}
+          />
+        )}
+      </Show>
+    </form>
+  )
+}
+
+function CompareHomeSelect(props: {
+  selected: ModelCatalogEntry | undefined
+  label: string
+  expanded: boolean
+  onOpen: () => void
+}) {
+  return (
+    <button
+      type="button"
+      data-slot="compare-home-select-panel"
+      data-selected={props.selected ? "true" : undefined}
+      aria-label={props.label}
+      aria-haspopup="dialog"
+      aria-expanded={props.expanded}
+      onClick={props.onOpen}
+    >
+      <span data-slot="compare-home-select-copy">
+        <span data-slot="compare-home-plus" aria-hidden="true">
+          +
+        </span>
+        <Show when={props.selected}>{(model) => <ModelAvatar model={model()} size="tiny" />}</Show>
+        <span data-slot="compare-home-select-name">{props.selected?.name ?? "Select a model"}</span>
+      </span>
+    </button>
+  )
+}
+
+function CompareModelSelectModal(props: {
+  models: ModelCatalogEntry[]
+  selected: ModelCatalogEntry | undefined
+  blockedId: string
+  label: string
+  onClose: () => void
+  onSelect: (model: ModelCatalogEntry) => void
+}) {
+  let searchInput: HTMLInputElement | undefined
+  const [search, setSearch] = createSignal("")
+  const [previewId, setPreviewId] = createSignal(props.selected?.id ?? "")
+  const availableModels = createMemo(() => props.models.filter((model) => model.id !== props.blockedId))
+  const filteredModels = createMemo(() => {
+    const terms = search().trim().toLowerCase().split(/\s+/).filter(Boolean)
+    if (terms.length === 0) return availableModels()
+    return availableModels().filter((model) => terms.every((term) => modelSearchText(model).includes(term)))
+  })
+  const preview = createMemo(
+    () =>
+      filteredModels().find((model) => model.id === previewId()) ??
+      filteredModels()[0] ??
+      availableModels()[0],
+  )
+
+  createEffect(() => {
+    const selected = props.selected
+    const fallback = selected && selected.id !== props.blockedId ? selected.id : filteredModels()[0]?.id
+    if (!fallback) return
+    if (availableModels().some((model) => model.id === previewId())) return
+    setPreviewId(fallback)
+  })
+
+  createEffect(() => {
+    const models = filteredModels()
+    if (models.some((model) => model.id === previewId())) return
+    setPreviewId(models[0]?.id ?? "")
+  })
+
+  createEffect(() => {
+    if (typeof window === "undefined") return
+    window.requestAnimationFrame(() => searchInput?.focus())
+  })
+
+  return (
+    <div
+      data-component="compare-model-modal-scrim"
+      role="presentation"
+      onClick={props.onClose}
+      onKeyDown={(event) => {
+        if (event.key !== "Escape") return
+        props.onClose()
+      }}
+    >
+      <div
+        data-component="compare-model-modal"
+        role="dialog"
+        aria-modal="true"
+        aria-label={props.label}
+        onClick={(event) => event.stopPropagation()}
+      >
+        <div data-slot="compare-model-modal-list">
+          <label data-slot="compare-model-modal-search">
+            <span data-slot="compare-model-modal-search-icon" aria-hidden="true" />
+            <input
+              ref={searchInput}
+              value={search()}
+              placeholder="Search models"
+              aria-label="Search models"
+              onInput={(event) => setSearch(event.currentTarget.value)}
+            />
+          </label>
+          <div data-slot="compare-model-modal-results">
+            <Show
+              when={filteredModels().length > 0}
+              fallback={
+                <div data-slot="compare-model-modal-empty">
+                  <strong>No models found</strong>
+                  <span>Try another search.</span>
+                </div>
+              }
+            >
+              <For each={filteredModels()}>
+                {(model) => (
+                  <button
+                    type="button"
+                    data-slot="compare-model-modal-row"
+                    data-active={preview()?.id === model.id ? "true" : undefined}
+                    onPointerEnter={() => setPreviewId(model.id)}
+                    onFocus={() => setPreviewId(model.id)}
+                    onClick={() => props.onSelect(model)}
+                  >
+                    <span data-slot="compare-model-modal-row-main">
+                      <ModelAvatar model={model} size="tiny" />
+                      <span>{model.name}</span>
+                    </span>
+                    <Show when={isFreeModel(model)}>
+                      <span data-slot="compare-model-modal-badge">Free</span>
+                    </Show>
+                  </button>
+                )}
+              </For>
+            </Show>
+          </div>
+        </div>
+        <div data-slot="compare-model-modal-divider" aria-hidden="true" />
+        <Show when={preview()}>{(model) => <CompareModelDetail model={model()} />}</Show>
+      </div>
+    </div>
+  )
+}
+
+function CompareModelDetail(props: { model: ModelCatalogEntry }) {
+  return (
+    <aside data-slot="compare-model-modal-detail">
+      <header data-slot="compare-model-modal-detail-header">
+        <ModelAvatar model={props.model} size="small" />
+        <strong>{props.model.name}</strong>
+      </header>
+      <div data-slot="compare-model-modal-description">
+        <p>{props.model.description ?? `${props.model.name} is an AI model from ${formatCatalogLabName(props.model.lab)}.`}</p>
+        <span aria-hidden="true" />
+      </div>
+      <dl data-slot="compare-model-modal-facts">
+        <CompareModelFact label="Release" value={formatCatalogDate(props.model.releaseDate)} />
+        <CompareModelFact label="Context" value={formatCatalogLimit(props.model.limit?.context)} />
+        <CompareModelFact label="Input" value={formatCatalogUnitPrice(props.model.cost?.input)} />
+        <CompareModelFact label="Output" value={formatCatalogUnitPrice(props.model.cost?.output)} />
+        <div data-slot="compare-model-modal-fact">
+          <dt>Uptime</dt>
+          <dd data-slot="compare-model-modal-uptime">
+            <For each={uptimeBars}>{(bar) => <span data-active={bar < 7 ? "true" : undefined} />}</For>
+          </dd>
+        </div>
+        <div data-slot="compare-model-modal-fact">
+          <dt>URL</dt>
+          <dd>
+            <a href={modelHref(props.model)}>{formatModelUrl(props.model)}</a>
+          </dd>
+        </div>
+      </dl>
+    </aside>
   )
 }
 
-function formatPairCount(count: number) {
-  if (count < 2) return "0"
-  return new Intl.NumberFormat("en", { notation: "compact", maximumFractionDigits: 1 }).format((count * (count - 1)) / 2)
+function CompareModelFact(props: { label: string; value: string }) {
+  return (
+    <div data-slot="compare-model-modal-fact">
+      <dt>{props.label}</dt>
+      <dd>{props.value}</dd>
+    </div>
+  )
+}
+
+function HeroModelStack() {
+  return (
+    <span data-slot="compare-home-avatar-stack" aria-hidden="true">
+      <For each={heroLabs}>
+        {(lab) => (
+          <span data-slot="compare-home-avatar-frame">
+            <LabLogo lab={lab.lab} label={lab.label} size="large" />
+          </span>
+        )}
+      </For>
+    </span>
+  )
+}
+
+function CompareHomeCard(props: { category: CompareCategory }) {
+  return (
+    <a
+      data-component="compare-home-card"
+      href={comparisonHref(props.category.first, props.category.second)}
+      aria-label={`${props.category.title}: ${props.category.first.name} vs ${props.category.second.name}`}
+    >
+      <span data-slot="compare-home-card-head">
+        <span>
+          <strong>{props.category.title}</strong>
+          <em>{props.category.description}</em>
+        </span>
+        <b aria-hidden="true" />
+      </span>
+      <span data-slot="compare-home-card-divider" aria-hidden="true" />
+      <span data-slot="compare-home-card-models">
+        <span>{props.category.first.name}</span>
+        <i aria-hidden="true">·</i>
+        <span>{props.category.second.name}</span>
+      </span>
+      <span data-slot="compare-home-card-avatars" aria-hidden="true">
+        <For each={props.category.avatars}>{(model) => <LabLogo lab={model.lab} label={model.name} size="small" />}</For>
+      </span>
+    </a>
+  )
+}
+
+function ModelAvatar(props: { model: ModelCatalogEntry; size: "large" | "small" | "tiny" }) {
+  return <LabLogo lab={props.model.lab} label={props.model.name} size={props.size} />
+}
+
+function LabLogo(props: { lab: string; label: string; size: "large" | "small" | "tiny" }) {
+  const iconId = () => getProviderIconId(props.lab)
+
+  return (
+    <span data-slot="compare-home-avatar" data-lab={iconId()} data-size={props.size} aria-label={props.label}>
+      <ProviderIcon aria-hidden="true" id={iconId()} />
+    </span>
+  )
+}
+
+function buildComparisonCategories(models: ModelCatalogEntry[]): CompareCategory[] {
+  return categoryTemplates.reduce<{ keys: Set<string>; categories: CompareCategory[] }>((result, template, index) => {
+    const candidates = categoryCandidates(template.kind, models)
+    const pair = categoryPair(candidates, models, index, result.keys)
+    if (!pair) return result
+    result.keys.add(comparisonKey(pair.first, pair.second))
+    const first = modelRefFromCatalog(pair.first)
+    const second = modelRefFromCatalog(pair.second)
+    result.categories.push({
+      title: template.title,
+      description: template.description,
+      first,
+      second,
+      avatars: [first, second],
+    })
+    return result
+  }, { keys: new Set(), categories: [] }).categories
+}
+
+function categoryPair(
+  candidates: ModelCatalogEntry[],
+  fallback: ModelCatalogEntry[],
+  offset: number,
+  usedKeys: Set<string>,
+) {
+  const pool = uniqueModels([...candidates, ...fallback.slice(offset), ...fallback])
+  return pool
+    .flatMap((first, firstIndex) =>
+      pool.slice(firstIndex + 1).map((second) => ({
+        first,
+        second,
+        key: comparisonKey(first, second),
+      })),
+    )
+    .find((pair) => !usedKeys.has(pair.key))
+}
+
+function categoryCandidates(kind: (typeof categoryTemplates)[number]["kind"], models: ModelCatalogEntry[]) {
+  if (kind === "affordable")
+    return models
+      .filter((model) => model.cost)
+      .toSorted((a, b) => modelCost(a) - modelCost(b) || displayDateTime(b.releaseDate) - displayDateTime(a.releaseDate))
+  if (kind === "code")
+    return models.filter((model) => model.toolCall || model.reasoning).toSorted(recentModelSort)
+  if (kind === "image")
+    return models
+      .filter((model) => model.modalities.output.some((modality) => modality.toLowerCase().includes("image")))
+      .toSorted(recentModelSort)
+  return models.toSorted(recentModelSort)
+}
+
+function uniqueModels(models: (ModelCatalogEntry | undefined)[]) {
+  return models.reduce<{ keys: Set<string>; models: ModelCatalogEntry[] }>(
+    (result, model) => {
+      if (!model || result.keys.has(model.id)) return result
+      result.keys.add(model.id)
+      result.models.push(model)
+      return result
+    },
+    { keys: new Set(), models: [] },
+  ).models
+}
+
+function recentModelSort(a: ModelCatalogEntry, b: ModelCatalogEntry) {
+  return displayDateTime(b.releaseDate) - displayDateTime(a.releaseDate) || a.name.localeCompare(b.name)
+}
+
+function comparisonKey(first: ModelCatalogEntry, second: ModelCatalogEntry) {
+  return [first.id, second.id].toSorted().join("|")
+}
+
+function modelCost(model: ModelCatalogEntry) {
+  return (model.cost?.input ?? Number.POSITIVE_INFINITY) + (model.cost?.output ?? Number.POSITIVE_INFINITY)
+}
+
+function modelSearchText(model: ModelCatalogEntry) {
+  return `${model.name} ${formatCatalogLabName(model.lab)} ${model.id}`.toLowerCase()
+}
+
+function isFreeModel(model: ModelCatalogEntry) {
+  return model.cost?.input === 0 && model.cost.output === 0
+}
+
+function modelHref(model: ModelCatalogEntry) {
+  return `${import.meta.env.BASE_URL}${model.lab}/${model.slug}`
+}
+
+function formatModelUrl(model: ModelCatalogEntry) {
+  return `.../${model.slug}`
+}
+
+function formatCatalogLimit(value: number | undefined) {
+  return value === undefined ? "Unknown" : formatTokens(value)
+}
+
+function formatCatalogUnitPrice(value: number | undefined) {
+  if (value === undefined) return "Unknown"
+  return `${formatModelPrice(value)} / 1M`
+}
+
+function formatModelPrice(value: number) {
+  if (value > 0 && value < 0.01) return `$${value.toFixed(4)}`
+  return formatMoney(value)
+}
+
+function formatMoney(value: number) {
+  if (value >= 1_000_000) return `$${trimNumber(value / 1_000_000, value >= 10_000_000 ? 0 : 1)}M`
+  if (value >= 1_000) return `$${trimNumber(value / 1_000, value >= 10_000 ? 0 : 1)}K`
+  return `$${value.toFixed(value >= 10 ? 0 : 2)}`
+}
+
+function formatCatalogDate(value: string | undefined) {
+  if (!value) return "Unknown"
+  const match = /^(\d{4})(?:-(\d{2}))?(?:-(\d{2}))?$/.exec(value)
+  if (!match) return value
+  return new Intl.DateTimeFormat("en", {
+    month: match[2] ? "short" : undefined,
+    day: match[3] ? "numeric" : undefined,
+    year: "numeric",
+    timeZone: "UTC",
+  }).format(new Date(Date.UTC(Number(match[1]), match[2] ? Number(match[2]) - 1 : 0, match[3] ? Number(match[3]) : 1)))
+}
+
+function formatTokens(value: number) {
+  if (value >= 1_000_000_000_000)
+    return `${trimNumber(value / 1_000_000_000_000, value >= 10_000_000_000_000 ? 0 : 1)}T`
+  if (value >= 1_000_000_000) return `${trimNumber(value / 1_000_000_000, value >= 10_000_000_000 ? 0 : 1)}B`
+  if (value >= 1_000_000) return `${trimNumber(value / 1_000_000, value >= 10_000_000 ? 0 : 1)}M`
+  if (value >= 1_000) return `${trimNumber(value / 1_000, value >= 10_000 ? 0 : 1)}K`
+  return String(Math.round(value))
+}
+
+function trimNumber(value: number, digits: number) {
+  return Number(value.toFixed(digits)).toLocaleString("en")
+}
+
+function displayDateTime(value: string | undefined) {
+  if (!value) return 0
+  const date = new Date(value)
+  if (!Number.isNaN(date.getTime())) return date.getTime()
+  const year = Number(value.match(/\d{4}/)?.[0] ?? 0)
+  return Number.isFinite(year) ? year : 0
+}
+
+function getProviderIconId(provider: string) {
+  const id = provider.toLowerCase().replace(/[^a-z0-9]+/g, "")
+  if (id === "moonshot") return "moonshotai"
+  if (id === "zhipu") return "zhipuai"
+  return id
 }
diff --git a/packages/stats/app/src/routes/index.css b/packages/stats/app/src/routes/index.css
index b52aa51e086d..24f470f86d47 100644
--- a/packages/stats/app/src/routes/index.css
+++ b/packages/stats/app/src/routes/index.css
@@ -5489,6 +5489,742 @@
   background: var(--stats-accent);
 }
 
+[data-page="stats"] [data-section="compare-home-hero"],
+[data-page="stats"] [data-section="compare-home-selector"],
+[data-page="stats"] [data-section="compare-home-related"] {
+  position: relative;
+  box-sizing: border-box;
+  color: var(--stats-text);
+}
+
+[data-page="stats"] [data-section="compare-home-hero"] {
+  display: grid;
+  align-content: end;
+  gap: 24px;
+  min-height: 316px;
+  padding: 128px 40px 40px;
+}
+
+[data-page="stats"] [data-component="compare-home-breadcrumb"] {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  height: 24px;
+  min-width: 0;
+}
+
+[data-page="stats"] [data-slot="compare-home-crumb"] {
+  display: inline-flex;
+  align-items: center;
+  height: 24px;
+  box-sizing: border-box;
+  padding: 0 8px;
+  color: var(--stats-hero-muted);
+  background: var(--stats-layer-2);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.1;
+  text-decoration: none;
+  white-space: nowrap;
+}
+
+[data-page="stats"] a[data-slot="compare-home-crumb"]:hover,
+[data-page="stats"] a[data-slot="compare-home-crumb"]:focus-visible {
+  color: var(--stats-text);
+  outline: none;
+  text-decoration: none;
+}
+
+[data-page="stats"] [data-slot="compare-home-separator"] {
+  color: var(--stats-faint);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1;
+}
+
+[data-page="stats"] [data-slot="compare-home-hero-grid"] {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(320px, 519px);
+  gap: 24px;
+  align-items: center;
+}
+
+[data-page="stats"] [data-section="compare-home-hero"] h1 {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 16px;
+  min-width: 0;
+  margin: 0;
+  color: var(--stats-text);
+  font-size: 40px;
+  font-weight: 500;
+  line-height: 60px;
+  letter-spacing: 0;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar-stack"] {
+  display: inline-flex;
+  align-items: center;
+  height: 46px;
+  padding-inline: 2px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar-frame"] {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  padding: 3px;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar-frame"] + [data-slot="compare-home-avatar-frame"] {
+  margin-left: -16px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"] {
+  display: grid;
+  place-items: center;
+  flex: 0 0 auto;
+  color: #ffffff;
+  background: var(--stats-accent-text);
+  box-shadow: inset 0 0 0 1px #0000001a;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-lab="deepseek"] {
+  background: #5d6ff4;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-lab="openai"] {
+  background: #252525;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-lab="anthropic"] {
+  background: #c99b75;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-size="large"] {
+  width: 40px;
+  height: 40px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-size="large"] svg {
+  width: 28px;
+  height: 28px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-size="small"] {
+  width: 20px;
+  height: 20px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-size="small"] svg {
+  width: 15px;
+  height: 15px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-size="tiny"] {
+  width: 16px;
+  height: 16px;
+}
+
+[data-page="stats"] [data-slot="compare-home-avatar"][data-size="tiny"] svg {
+  width: 12px;
+  height: 12px;
+}
+
+[data-page="stats"] [data-slot="compare-home-hero-grid"] > p {
+  max-width: 520px;
+  margin: 0;
+  color: var(--stats-muted);
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 24px;
+}
+
+[data-page="stats"] [data-slot="compare-home-pattern"] {
+  width: calc(100% + 80px);
+  height: 16px;
+  margin-inline: -40px;
+  overflow: hidden;
+  background: color-mix(in srgb, var(--stats-text) 10%, transparent);
+  mask-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 6 6' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0H2V2H0V0Z' fill='black'/%3E%3C/svg%3E");
+  mask-position: center top;
+  mask-repeat: repeat;
+  mask-size: 6px 6px;
+  -webkit-mask-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 6 6' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M0 0H2V2H0V0Z' fill='black'/%3E%3C/svg%3E");
+  -webkit-mask-position: center top;
+  -webkit-mask-repeat: repeat;
+  -webkit-mask-size: 6px 6px;
+}
+
+[data-page="stats"] [data-section="compare-home-selector"] {
+  min-height: 98px;
+  border-top: 1px solid var(--stats-line);
+  border-bottom: 1px solid var(--stats-line);
+  box-shadow:
+    inset 1px 0 var(--stats-line),
+    inset -1px 0 var(--stats-line);
+}
+
+[data-page="stats"] [data-component="compare-home-selector"] {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  min-height: 96px;
+}
+
+[data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"] {
+  position: relative;
+  display: grid;
+  place-items: center;
+  min-width: 0;
+  min-height: 96px;
+  padding: 0;
+  border: 0;
+  appearance: none;
+  border-radius: 0;
+  color: var(--stats-text);
+  background: var(--stats-bg);
+  cursor: pointer;
+  font: inherit;
+  text-align: inherit;
+}
+
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]:first-child::before,
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]:last-child::after {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  width: 1px;
+  content: "";
+  background: var(--stats-line);
+  pointer-events: none;
+}
+
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]:first-child::before {
+  left: 0;
+}
+
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]:last-child::after {
+  right: 0;
+}
+
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]
+  + button[data-slot="compare-home-select-panel"] {
+  box-shadow: inset 1px 0 var(--stats-line);
+}
+
+[data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]:hover,
+[data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]:focus-within {
+  background: var(--stats-layer);
+}
+
+[data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]:focus-visible {
+  z-index: 1;
+  outline: 1px solid var(--stats-line-strong);
+  outline-offset: -1px;
+}
+
+[data-page="stats"] [data-slot="compare-home-select-copy"] {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  max-width: calc(100% - 48px);
+  pointer-events: none;
+}
+
+[data-page="stats"] [data-slot="compare-home-plus"],
+[data-page="stats"] [data-slot="compare-home-select-name"] {
+  min-width: 0;
+  color: inherit;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 14px;
+}
+
+[data-page="stats"] [data-slot="compare-home-select-name"] {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-slot="compare-home-select-panel"][data-selected="true"] [data-slot="compare-home-plus"] {
+  display: none;
+}
+
+[data-page="stats"] [data-section="compare-home-related"] {
+  min-height: 425px;
+  margin-top: 40px;
+  padding: 80px 40px;
+  box-shadow:
+    inset 0 1px var(--stats-line),
+    inset 0 -1px var(--stats-line),
+    inset 1px 0 var(--stats-line),
+    inset -1px 0 var(--stats-line);
+}
+
+[data-page="stats"] [data-section="compare-home-related"] [data-slot="section-title"] {
+  margin-bottom: 40px;
+}
+
+[data-page="stats"] [data-component="compare-home-card-grid"] {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 10px;
+}
+
+[data-page="stats"] [data-component="compare-home-card"] {
+  position: relative;
+  display: grid;
+  grid-template-rows: 62px 1px 20px 20px;
+  gap: 16px;
+  min-width: 0;
+  height: 184px;
+  box-sizing: border-box;
+  padding: 16px;
+  overflow: hidden;
+  color: var(--stats-text);
+  background: var(--stats-layer);
+  border: 1px solid var(--stats-line);
+  box-shadow: 0 1px 2px #00000008;
+  text-decoration: none;
+}
+
+[data-page="stats"] [data-component="compare-home-card"]:hover,
+[data-page="stats"] [data-component="compare-home-card"]:focus-visible {
+  border-color: var(--stats-line-strong);
+  outline: none;
+  text-decoration: none;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) 32px;
+  gap: 16px;
+  min-width: 0;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] > span {
+  display: grid;
+  gap: 8px;
+  min-width: 0;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] strong,
+[data-page="stats"] [data-slot="compare-home-card-head"] em,
+[data-page="stats"] [data-slot="compare-home-card-models"] {
+  min-width: 0;
+  overflow: hidden;
+  font-size: 13px;
+  line-height: 20px;
+  text-overflow: ellipsis;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] strong {
+  color: var(--stats-text);
+  font-weight: 500;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] em {
+  display: -webkit-box;
+  color: var(--stats-muted);
+  font-style: normal;
+  font-weight: 400;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] b {
+  position: relative;
+  display: grid;
+  place-items: center;
+  width: 32px;
+  height: 32px;
+  box-sizing: border-box;
+  border: 1px solid var(--stats-line);
+  background: var(--stats-bg);
+  box-shadow: 0 1px 1.5px #0000000f;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] b::before {
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  width: 3px;
+  height: 3px;
+  content: "";
+  background: currentColor;
+  box-shadow:
+    7px 0 currentColor,
+    0 7px currentColor;
+  color: var(--stats-muted);
+}
+
+[data-page="stats"] [data-slot="compare-home-card-head"] b::after {
+  position: absolute;
+  right: 5px;
+  bottom: 5px;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  content: "";
+  background:
+    radial-gradient(circle at 4px 4px, transparent 2.5px, var(--stats-muted) 2.75px 4px, transparent 4.25px),
+    linear-gradient(var(--stats-muted) 0 0) 7px 8px / 5px 1.5px no-repeat;
+  transform: rotate(45deg);
+}
+
+[data-page="stats"] [data-slot="compare-home-card-divider"] {
+  height: 1px;
+  min-width: 0;
+  background: var(--stats-line);
+}
+
+[data-page="stats"] [data-slot="compare-home-card-models"] {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  color: var(--stats-muted);
+  font-weight: 400;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-models"] span {
+  flex: 0 0 auto;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-models"] i {
+  flex: 0 0 auto;
+  color: var(--stats-faint);
+  font-style: normal;
+}
+
+[data-page="stats"] [data-slot="compare-home-card-avatars"] {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+}
+
+[data-page="stats"] [data-component="compare-model-modal-scrim"] {
+  position: fixed;
+  inset: 0;
+  z-index: 1000;
+  display: grid;
+  place-items: center;
+  box-sizing: border-box;
+  padding: 24px;
+  background: rgb(0 0 0 / 40%);
+}
+
+[data-page="stats"] [data-component="compare-model-modal"] {
+  display: grid;
+  grid-template-columns: minmax(0, 440px) 1px minmax(0, 279px);
+  width: min(720px, calc(100vw - 48px));
+  height: min(480px, calc(100vh - 48px));
+  overflow: hidden;
+  color: var(--stats-text);
+  background: var(--stats-bg);
+  box-shadow:
+    0 0 0 0.5px rgb(0 0 0 / 12%),
+    0 8px 16px rgb(0 0 0 / 8%),
+    0 16px 32px rgb(0 0 0 / 4%);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-list"] {
+  display: grid;
+  grid-template-rows: 52px minmax(0, 1fr);
+  min-width: 0;
+  min-height: 0;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-search"] {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  box-sizing: border-box;
+  height: 52px;
+  padding: 16px;
+  border-bottom: 1px solid var(--stats-line);
+  color: var(--stats-muted);
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-search-icon"] {
+  position: relative;
+  flex: 0 0 auto;
+  width: 16px;
+  height: 16px;
+  color: var(--stats-faint);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-search-icon"]::before {
+  position: absolute;
+  top: 3px;
+  left: 3px;
+  width: 6px;
+  height: 6px;
+  border: 1.5px solid currentColor;
+  border-radius: 999px;
+  content: "";
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-search-icon"]::after {
+  position: absolute;
+  top: 10px;
+  left: 9px;
+  width: 5px;
+  height: 1.5px;
+  background: currentColor;
+  content: "";
+  transform: rotate(45deg);
+  transform-origin: left center;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-search"] input {
+  width: 100%;
+  min-width: 0;
+  height: 20px;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  color: var(--stats-text);
+  background: transparent;
+  font: inherit;
+  font-size: 13px;
+  font-weight: 400;
+  line-height: 1.1;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-search"] input::placeholder {
+  color: var(--stats-faint);
+  opacity: 1;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-results"] {
+  min-width: 0;
+  min-height: 0;
+  overflow-y: auto;
+  background: var(--stats-layer);
+}
+
+[data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"] {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  width: 100%;
+  height: 49px;
+  box-sizing: border-box;
+  padding: 0 16px;
+  border: 0;
+  border-bottom: 1px solid var(--stats-line);
+  appearance: none;
+  border-radius: 0;
+  color: var(--stats-text);
+  background: transparent;
+  cursor: pointer;
+  font: inherit;
+  text-align: left;
+}
+
+[data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"]:hover,
+[data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"]:focus-visible,
+[data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"][data-active="true"] {
+  color: var(--stats-text);
+  background: var(--stats-layer-2);
+  outline: none;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-row-main"] {
+  display: flex;
+  align-items: center;
+  flex: 1 1 auto;
+  gap: 12px;
+  min-width: 0;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-row-main"] > span:last-child {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--stats-text);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.1;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-badge"] {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  height: 16px;
+  padding: 0 6px;
+  color: var(--stats-muted);
+  background: var(--stats-layer-2);
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 1.1;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-empty"] {
+  display: grid;
+  gap: 8px;
+  padding: 24px 16px;
+  color: var(--stats-muted);
+  font-size: 13px;
+  line-height: 1.4;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-empty"] strong {
+  color: var(--stats-text);
+  font-weight: 500;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-divider"] {
+  width: 1px;
+  min-height: 0;
+  background: var(--stats-line);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-detail"] {
+  display: grid;
+  grid-template-rows: 52px minmax(0, 1fr) auto;
+  min-width: 0;
+  min-height: 0;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-detail-header"] {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  box-sizing: border-box;
+  height: 52px;
+  padding: 16px;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-detail-header"] strong {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--stats-text);
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.1;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-description"] {
+  position: relative;
+  min-width: 0;
+  min-height: 0;
+  padding: 0 16px 16px;
+  overflow: hidden;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-description"] p {
+  margin: 0;
+  color: var(--stats-muted);
+  font-size: 11px;
+  font-weight: 400;
+  line-height: 1.5;
+  white-space: pre-wrap;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-description"] > span {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  height: 32px;
+  background: linear-gradient(to bottom, transparent, var(--stats-bg));
+  pointer-events: none;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-facts"] {
+  display: grid;
+  gap: 8px;
+  box-sizing: border-box;
+  min-width: 0;
+  margin: 0;
+  padding: 16px;
+  overflow: hidden;
+  background: var(--stats-bg);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-fact"] {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+  gap: 16px;
+  min-width: 0;
+  padding-bottom: 8px;
+  border-bottom: 1px solid var(--stats-line);
+  color: var(--stats-muted);
+  font-size: 11px;
+  font-weight: 500;
+  line-height: 1.5;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-fact"]:last-child {
+  padding-bottom: 0;
+  border-bottom: 0;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-fact"] dt,
+[data-page="stats"] [data-slot="compare-model-modal-fact"] dd {
+  min-width: 0;
+  margin: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-fact"] dd {
+  color: var(--stats-text);
+  text-align: right;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-fact"] a {
+  color: inherit;
+  text-decoration: underline;
+  text-decoration-color: color-mix(in srgb, var(--stats-text) 20%, transparent);
+  text-underline-offset: 2px;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-uptime"] {
+  display: inline-flex;
+  justify-content: flex-end;
+  gap: 2px;
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-uptime"] span {
+  width: 3px;
+  height: 12px;
+  background: var(--stats-layer-2);
+}
+
+[data-page="stats"] [data-slot="compare-model-modal-uptime"] span[data-active="true"] {
+  background: #198b43;
+}
+
 [data-page="stats"][data-theme="dark"],
 :root[data-stats-theme="dark"] [data-page="stats"]:not([data-theme="light"]) {
   color-scheme: dark;
@@ -5886,10 +6622,22 @@
   [data-page="stats"] [data-section="model-hero"],
   [data-page="stats"] [data-section="lab-hero"],
   [data-page="stats"] [data-section="model-momentum"],
-  [data-page="stats"] [data-section="model-panel"] {
+  [data-page="stats"] [data-section="model-panel"],
+  [data-page="stats"] [data-section="compare-home-hero"],
+  [data-page="stats"] [data-section="compare-home-related"] {
     padding: 64px 32px;
   }
 
+  [data-page="stats"] [data-section="compare-home-hero"] {
+    min-height: 280px;
+    padding: 104px 32px 40px;
+  }
+
+  [data-page="stats"] [data-slot="compare-home-pattern"] {
+    width: calc(100% + 64px);
+    margin-inline: -32px;
+  }
+
   [data-page="stats"] [data-section="lab-hero"] {
     min-height: 280px;
     padding: 104px 32px 40px;
@@ -5943,6 +6691,15 @@
     align-items: start;
   }
 
+  [data-page="stats"] [data-slot="compare-home-hero-grid"] {
+    grid-template-columns: 1fr;
+    align-items: start;
+  }
+
+  [data-page="stats"] [data-component="compare-home-card-grid"] {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
   [data-page="stats"] [data-section="lab-overview"] {
     grid-template-columns: repeat(2, minmax(0, 1fr));
   }
@@ -6165,10 +6922,87 @@
   [data-page="stats"] [data-section="model-hero"],
   [data-page="stats"] [data-section="lab-hero"],
   [data-page="stats"] [data-section="model-momentum"],
-  [data-page="stats"] [data-section="model-panel"] {
+  [data-page="stats"] [data-section="model-panel"],
+  [data-page="stats"] [data-section="compare-home-hero"],
+  [data-page="stats"] [data-section="compare-home-related"] {
     padding: 48px 24px;
   }
 
+  [data-page="stats"] [data-section="compare-home-hero"] {
+    gap: 20px;
+    min-height: 316px;
+    padding: 72px 24px 40px;
+  }
+
+  [data-page="stats"] [data-slot="compare-home-pattern"] {
+    width: calc(100% + 48px);
+    margin-inline: -24px;
+  }
+
+  [data-page="stats"] [data-section="compare-home-hero"] h1 {
+    gap: 12px;
+    font-size: 32px;
+    line-height: 42px;
+  }
+
+  [data-page="stats"] [data-component="compare-home-breadcrumb"] {
+    flex-wrap: wrap;
+    height: auto;
+  }
+
+  [data-page="stats"] [data-component="compare-home-selector"] {
+    grid-template-columns: 1fr;
+  }
+
+  [data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]::before,
+  [data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]::after {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 1px;
+    content: "";
+    background: var(--stats-line);
+    pointer-events: none;
+  }
+
+  [data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]::before {
+    left: 0;
+  }
+
+  [data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]::after {
+    right: 0;
+  }
+
+  [data-page="stats"] [data-component="compare-model-modal-scrim"] {
+    padding: 16px;
+  }
+
+  [data-page="stats"] [data-component="compare-model-modal"] {
+    grid-template-columns: 1fr;
+    width: calc(100vw - 32px);
+    height: min(520px, calc(100vh - 32px));
+  }
+
+  [data-page="stats"] [data-slot="compare-model-modal-detail"],
+  [data-page="stats"] [data-slot="compare-model-modal-divider"] {
+    display: none;
+  }
+
+  [data-page="stats"]
+    [data-component="compare-home-selector"]
+    button[data-slot="compare-home-select-panel"]
+    + button[data-slot="compare-home-select-panel"] {
+    box-shadow: inset 0 1px var(--stats-line);
+  }
+
+  [data-page="stats"] [data-section="compare-home-related"] {
+    margin-top: 24px;
+  }
+
+  [data-page="stats"] [data-component="compare-home-card-grid"] {
+    grid-template-columns: 1fr;
+  }
+
   [data-page="stats"] [data-slot="top-models-title"],
   [data-page="stats"] [data-slot="section-title"] {
     margin-bottom: 32px;
@@ -6860,6 +7694,16 @@
 }
 
 @media (max-width: 40rem) {
+  [data-page="stats"] [data-section="compare-home-hero"] h1 {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+
+  [data-page="stats"] [data-slot="compare-home-hero-grid"] > p {
+    font-size: 14px;
+    line-height: 22px;
+  }
+
   [data-page="stats"] [data-slot="footer-grid"] {
     grid-template-columns: 1fr;
   }

From a72c3880bb2136a25d9d0af9806158715d2538c5 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]" <opencode-agent[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 16:30:17 +0000
Subject: [PATCH 08/33] chore: generate

---
 .../stats/app/src/routes/[lab]/[model].tsx    |  4 +-
 packages/stats/app/src/routes/[lab]/index.tsx |  6 +-
 .../[secondLab]/[secondModel].tsx             | 67 ++++++++++---------
 .../stats/app/src/routes/compare/index.tsx    | 56 +++++++++-------
 packages/stats/app/src/routes/index.css       | 12 +++-
 packages/stats/app/src/routes/stats-shell.tsx |  4 +-
 6 files changed, 82 insertions(+), 67 deletions(-)

diff --git a/packages/stats/app/src/routes/[lab]/[model].tsx b/packages/stats/app/src/routes/[lab]/[model].tsx
index ddd8ff1e2e73..7d14ec3d0170 100644
--- a/packages/stats/app/src/routes/[lab]/[model].tsx
+++ b/packages/stats/app/src/routes/[lab]/[model].tsx
@@ -1205,7 +1205,9 @@ function modelComparisonPairs(
       },
       detail: "Usage peer",
     }))
-  const catalogPairs = (catalogEntry && catalog ? catalog.labs.find((lab) => lab.id === catalogEntry.lab)?.models ?? [] : [])
+  const catalogPairs = (
+    catalogEntry && catalog ? (catalog.labs.find((lab) => lab.id === catalogEntry.lab)?.models ?? []) : []
+  )
     .filter((model) => model.id !== catalogEntry?.id)
     .slice(0, 3)
     .map((model) => ({
diff --git a/packages/stats/app/src/routes/[lab]/index.tsx b/packages/stats/app/src/routes/[lab]/index.tsx
index 17b0783823b5..01b7a4fc2fe9 100644
--- a/packages/stats/app/src/routes/[lab]/index.tsx
+++ b/packages/stats/app/src/routes/[lab]/index.tsx
@@ -28,11 +28,7 @@ import {
 import { SectionHeading } from "../section-heading"
 import { runStatsEffect } from "../../stats-runtime"
 import { setStatsPageCacheHeaders } from "../stats-cache"
-import {
-  ComparisonCardsSection,
-  modelRefFromCatalog,
-  uniqueComparisonPairs,
-} from "../compare-cards"
+import { ComparisonCardsSection, modelRefFromCatalog, uniqueComparisonPairs } from "../compare-cards"
 import {
   applyThemePreference,
   Footer,
diff --git a/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx b/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx
index 6455e0f1481b..88df35bf36d2 100644
--- a/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx
+++ b/packages/stats/app/src/routes/compare/[firstLab]/[firstModel]/[secondLab]/[secondModel].tsx
@@ -1,9 +1,6 @@
 import "../../../../index.css"
 import { Link, Meta, Title } from "@solidjs/meta"
-import {
-  getStatsModelComparisonData,
-  type StatsModelComparisonEntry,
-} from "@opencode-ai/stats-core/domain/home"
+import { getStatsModelComparisonData, type StatsModelComparisonEntry } from "@opencode-ai/stats-core/domain/home"
 import { runtime } from "@opencode-ai/stats-core/runtime"
 import { createAsync, query, useParams } from "@solidjs/router"
 import { createMemo, createSignal, For, onMount, Show } from "solid-js"
@@ -124,7 +121,11 @@ export default function ModelComparePair() {
   const rows = createMemo(() => buildComparisonRows(models()[0], models()[1]))
   const relatedPairs = createMemo(() => buildRelatedPairs(catalog(), models()[0], models()[1]))
   const selectorModels = createMemo(() =>
-    uniqueCatalogModels([comparisonCatalogEntry(models()[0]), comparisonCatalogEntry(models()[1]), ...(catalog()?.models ?? [])]),
+    uniqueCatalogModels([
+      comparisonCatalogEntry(models()[0]),
+      comparisonCatalogEntry(models()[1]),
+      ...(catalog()?.models ?? []),
+    ]),
   )
   const structuredData = createMemo(() =>
     JSON.stringify({
@@ -176,17 +177,16 @@ export default function ModelComparePair() {
           <ComparisonHero models={models()} />
           <section id="comparison" data-section="model-panel">
             <p data-slot="section-title">
-              <strong>Comparison Table.</strong>{" "}
-              <span>Compare usage, cost, limits, and features.</span>
+              <strong>Comparison Table.</strong> <span>Compare usage, cost, limits, and features.</span>
             </p>
             <Show
               when={stats() !== undefined}
-	              fallback={
-	                <div data-component="empty-state" data-compact="true">
-	                  <strong>Loading comparison</strong>
-	                  <p>Loading stats for both models.</p>
-	                </div>
-	              }
+              fallback={
+                <div data-component="empty-state" data-compact="true">
+                  <strong>Loading comparison</strong>
+                  <p>Loading stats for both models.</p>
+                </div>
+              }
             >
               <ComparisonTable models={models()} rows={rows()} />
             </Show>
@@ -197,12 +197,12 @@ export default function ModelComparePair() {
             </p>
             <Show
               when={selectorModels().length > 1}
-	              fallback={
-	                <div data-component="empty-state" data-compact="true">
-	                  <strong>No models found</strong>
-	                  <p>The model list could not be loaded.</p>
-	                </div>
-	              }
+              fallback={
+                <div data-component="empty-state" data-compact="true">
+                  <strong>No models found</strong>
+                  <p>The model list could not be loaded.</p>
+                </div>
+              }
             >
               <ComparisonSelector
                 models={selectorModels()}
@@ -337,18 +337,18 @@ function uniqueCatalogModels(models: ModelCatalogEntry[]) {
 function buildComparisonRows(first: ComparisonModel, second: ComparisonModel): ComparisonRow[] {
   return [
     comparisonRow(
-	      "Recent Rank",
-	      "Lower is better.",
-	      {
-	        value: first.stats?.rank == null ? "No usage" : `#${first.stats.rank}`,
-	        score: first.stats?.rank ?? undefined,
-	      },
-	      {
-	        value: second.stats?.rank == null ? "No usage" : `#${second.stats.rank}`,
-	        score: second.stats?.rank ?? undefined,
-	      },
-	      "lower",
-	    ),
+      "Recent Rank",
+      "Lower is better.",
+      {
+        value: first.stats?.rank == null ? "No usage" : `#${first.stats.rank}`,
+        score: first.stats?.rank ?? undefined,
+      },
+      {
+        value: second.stats?.rank == null ? "No usage" : `#${second.stats.rank}`,
+        score: second.stats?.rank ?? undefined,
+      },
+      "lower",
+    ),
     comparisonRow(
       "Token Share",
       "Share of recent OpenCode usage.",
@@ -408,7 +408,10 @@ function buildComparisonRows(first: ComparisonModel, second: ComparisonModel): C
     comparisonRow(
       "Cache Ratio",
       "Higher is better.",
-      { value: first.stats ? formatPercent(first.stats.totals.cacheRatio) : "No usage", score: first.stats?.totals.cacheRatio },
+      {
+        value: first.stats ? formatPercent(first.stats.totals.cacheRatio) : "No usage",
+        score: first.stats?.totals.cacheRatio,
+      },
       {
         value: second.stats ? formatPercent(second.stats.totals.cacheRatio) : "No usage",
         score: second.stats?.totals.cacheRatio,
diff --git a/packages/stats/app/src/routes/compare/index.tsx b/packages/stats/app/src/routes/compare/index.tsx
index 220048ddc1c5..748a0b08b2d2 100644
--- a/packages/stats/app/src/routes/compare/index.tsx
+++ b/packages/stats/app/src/routes/compare/index.tsx
@@ -294,10 +294,7 @@ function CompareModelSelectModal(props: {
     return availableModels().filter((model) => terms.every((term) => modelSearchText(model).includes(term)))
   })
   const preview = createMemo(
-    () =>
-      filteredModels().find((model) => model.id === previewId()) ??
-      filteredModels()[0] ??
-      availableModels()[0],
+    () => filteredModels().find((model) => model.id === previewId()) ?? filteredModels()[0] ?? availableModels()[0],
   )
 
   createEffect(() => {
@@ -395,7 +392,10 @@ function CompareModelDetail(props: { model: ModelCatalogEntry }) {
         <strong>{props.model.name}</strong>
       </header>
       <div data-slot="compare-model-modal-description">
-        <p>{props.model.description ?? `${props.model.name} is an AI model from ${formatCatalogLabName(props.model.lab)}.`}</p>
+        <p>
+          {props.model.description ??
+            `${props.model.name} is an AI model from ${formatCatalogLabName(props.model.lab)}.`}
+        </p>
         <span aria-hidden="true" />
       </div>
       <dl data-slot="compare-model-modal-facts">
@@ -464,7 +464,9 @@ function CompareHomeCard(props: { category: CompareCategory }) {
         <span>{props.category.second.name}</span>
       </span>
       <span data-slot="compare-home-card-avatars" aria-hidden="true">
-        <For each={props.category.avatars}>{(model) => <LabLogo lab={model.lab} label={model.name} size="small" />}</For>
+        <For each={props.category.avatars}>
+          {(model) => <LabLogo lab={model.lab} label={model.name} size="small" />}
+        </For>
       </span>
     </a>
   )
@@ -485,22 +487,25 @@ function LabLogo(props: { lab: string; label: string; size: "large" | "small" |
 }
 
 function buildComparisonCategories(models: ModelCatalogEntry[]): CompareCategory[] {
-  return categoryTemplates.reduce<{ keys: Set<string>; categories: CompareCategory[] }>((result, template, index) => {
-    const candidates = categoryCandidates(template.kind, models)
-    const pair = categoryPair(candidates, models, index, result.keys)
-    if (!pair) return result
-    result.keys.add(comparisonKey(pair.first, pair.second))
-    const first = modelRefFromCatalog(pair.first)
-    const second = modelRefFromCatalog(pair.second)
-    result.categories.push({
-      title: template.title,
-      description: template.description,
-      first,
-      second,
-      avatars: [first, second],
-    })
-    return result
-  }, { keys: new Set(), categories: [] }).categories
+  return categoryTemplates.reduce<{ keys: Set<string>; categories: CompareCategory[] }>(
+    (result, template, index) => {
+      const candidates = categoryCandidates(template.kind, models)
+      const pair = categoryPair(candidates, models, index, result.keys)
+      if (!pair) return result
+      result.keys.add(comparisonKey(pair.first, pair.second))
+      const first = modelRefFromCatalog(pair.first)
+      const second = modelRefFromCatalog(pair.second)
+      result.categories.push({
+        title: template.title,
+        description: template.description,
+        first,
+        second,
+        avatars: [first, second],
+      })
+      return result
+    },
+    { keys: new Set(), categories: [] },
+  ).categories
 }
 
 function categoryPair(
@@ -525,9 +530,10 @@ function categoryCandidates(kind: (typeof categoryTemplates)[number]["kind"], mo
   if (kind === "affordable")
     return models
       .filter((model) => model.cost)
-      .toSorted((a, b) => modelCost(a) - modelCost(b) || displayDateTime(b.releaseDate) - displayDateTime(a.releaseDate))
-  if (kind === "code")
-    return models.filter((model) => model.toolCall || model.reasoning).toSorted(recentModelSort)
+      .toSorted(
+        (a, b) => modelCost(a) - modelCost(b) || displayDateTime(b.releaseDate) - displayDateTime(a.releaseDate),
+      )
+  if (kind === "code") return models.filter((model) => model.toolCall || model.reasoning).toSorted(recentModelSort)
   if (kind === "image")
     return models
       .filter((model) => model.modalities.output.some((modality) => modality.toLowerCase().includes("image")))
diff --git a/packages/stats/app/src/routes/index.css b/packages/stats/app/src/routes/index.css
index 24f470f86d47..ca6c335b2695 100644
--- a/packages/stats/app/src/routes/index.css
+++ b/packages/stats/app/src/routes/index.css
@@ -5726,11 +5726,15 @@
 }
 
 [data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]:hover,
-[data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]:focus-within {
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]:focus-within {
   background: var(--stats-layer);
 }
 
-[data-page="stats"] [data-component="compare-home-selector"] button[data-slot="compare-home-select-panel"]:focus-visible {
+[data-page="stats"]
+  [data-component="compare-home-selector"]
+  button[data-slot="compare-home-select-panel"]:focus-visible {
   z-index: 1;
   outline: 1px solid var(--stats-line-strong);
   outline-offset: -1px;
@@ -6043,7 +6047,9 @@
 
 [data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"]:hover,
 [data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"]:focus-visible,
-[data-page="stats"] [data-component="compare-model-modal"] button[data-slot="compare-model-modal-row"][data-active="true"] {
+[data-page="stats"]
+  [data-component="compare-model-modal"]
+  button[data-slot="compare-model-modal-row"][data-active="true"] {
   color: var(--stats-text);
   background: var(--stats-layer-2);
   outline: none;
diff --git a/packages/stats/app/src/routes/stats-shell.tsx b/packages/stats/app/src/routes/stats-shell.tsx
index ca9b0e68fc25..8906dc9d5a7a 100644
--- a/packages/stats/app/src/routes/stats-shell.tsx
+++ b/packages/stats/app/src/routes/stats-shell.tsx
@@ -243,7 +243,9 @@ export function Footer(props: {
     { href: "https://www.youtube.com/@anomaly-co", label: i18n.t("footer.youtube") },
   ]
   const bridge = () =>
-    props.bridge === undefined ? { href: "#geo-breakdown", label: i18n.t("nav.geoBreakdown").toUpperCase() } : props.bridge
+    props.bridge === undefined
+      ? { href: "#geo-breakdown", label: i18n.t("nav.geoBreakdown").toUpperCase() }
+      : props.bridge
 
   return (
     <footer data-component="footer">

From ecd8be7593c75e4532bffd625f7dbe0a3a00fc3f Mon Sep 17 00:00:00 2001
From: Frank <frank@anoma.ly>
Date: Wed, 8 Jul 2026 15:30:49 -0400
Subject: [PATCH 09/33] zen: grok 4.5

---
 packages/web/src/content/docs/ar/zen.mdx    | 2 ++
 packages/web/src/content/docs/bs/zen.mdx    | 2 ++
 packages/web/src/content/docs/da/zen.mdx    | 2 ++
 packages/web/src/content/docs/de/zen.mdx    | 2 ++
 packages/web/src/content/docs/es/zen.mdx    | 2 ++
 packages/web/src/content/docs/fr/zen.mdx    | 2 ++
 packages/web/src/content/docs/it/zen.mdx    | 2 ++
 packages/web/src/content/docs/ja/zen.mdx    | 2 ++
 packages/web/src/content/docs/ko/zen.mdx    | 2 ++
 packages/web/src/content/docs/nb/zen.mdx    | 2 ++
 packages/web/src/content/docs/pl/zen.mdx    | 2 ++
 packages/web/src/content/docs/pt-br/zen.mdx | 2 ++
 packages/web/src/content/docs/ru/zen.mdx    | 2 ++
 packages/web/src/content/docs/th/zen.mdx    | 2 ++
 packages/web/src/content/docs/tr/zen.mdx    | 2 ++
 packages/web/src/content/docs/zen.mdx       | 2 ++
 packages/web/src/content/docs/zh-cn/zen.mdx | 2 ++
 packages/web/src/content/docs/zh-tw/zen.mdx | 2 ++
 18 files changed, 36 insertions(+)

diff --git a/packages/web/src/content/docs/ar/zen.mdx b/packages/web/src/content/docs/ar/zen.mdx
index aa827f6304a6..524605d327f4 100644
--- a/packages/web/src/content/docs/ar/zen.mdx
+++ b/packages/web/src/content/docs/ar/zen.mdx
@@ -99,6 +99,7 @@ OpenCode Zen هي بوابة AI تتيح لك الوصول إلى هذه الن
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -146,6 +147,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02           | $0.25           |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145          | -               |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028          | -               |
+| Grok 4.5                          | $2.00   | $6.00   | $0.50           | -               |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20           | -               |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00           | $12.50          |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50           | $6.25           |
diff --git a/packages/web/src/content/docs/bs/zen.mdx b/packages/web/src/content/docs/bs/zen.mdx
index d19e13c6e958..9c9ba820b4c6 100644
--- a/packages/web/src/content/docs/bs/zen.mdx
+++ b/packages/web/src/content/docs/bs/zen.mdx
@@ -104,6 +104,7 @@ Našim modelima možete pristupiti i preko sljedećih API endpointa.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ Podržavamo pay-as-you-go model. Ispod su cijene **po 1M tokena**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/da/zen.mdx b/packages/web/src/content/docs/da/zen.mdx
index 346af2b51b03..b7a941047b45 100644
--- a/packages/web/src/content/docs/da/zen.mdx
+++ b/packages/web/src/content/docs/da/zen.mdx
@@ -104,6 +104,7 @@ Du kan også få adgang til vores modeller gennem følgende API-endpoints.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ Vi understøtter en pay-as-you-go-model. Nedenfor er priserne **pr. 1M tokens**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/de/zen.mdx b/packages/web/src/content/docs/de/zen.mdx
index 7a2fa0bfc1e0..292831c811e9 100644
--- a/packages/web/src/content/docs/de/zen.mdx
+++ b/packages/web/src/content/docs/de/zen.mdx
@@ -95,6 +95,7 @@ Du kannst auch über die folgenden API-Endpunkte auf unsere Modelle zugreifen.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ Wir unterstützen ein Pay-as-you-go-Modell. Unten findest du die Preise **pro 1M
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/es/zen.mdx b/packages/web/src/content/docs/es/zen.mdx
index e5e4452c6be5..1ee927e94c08 100644
--- a/packages/web/src/content/docs/es/zen.mdx
+++ b/packages/web/src/content/docs/es/zen.mdx
@@ -104,6 +104,7 @@ También puedes acceder a nuestros modelos a través de los siguientes endpoints
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ Admitimos un modelo de pago por uso. A continuación se muestran los precios **p
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02            | $0.25              |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145           | -                  |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028           | -                  |
+| Grok 4.5                          | $2.00   | $6.00   | $0.50            | -                  |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20            | -                  |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00            | $12.50             |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50            | $6.25              |
diff --git a/packages/web/src/content/docs/fr/zen.mdx b/packages/web/src/content/docs/fr/zen.mdx
index 8342f76b8992..5b33194fdc5b 100644
--- a/packages/web/src/content/docs/fr/zen.mdx
+++ b/packages/web/src/content/docs/fr/zen.mdx
@@ -95,6 +95,7 @@ Vous pouvez également accéder à nos modèles via les points de terminaison AP
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ Nous prenons en charge un modèle de paiement à l'utilisation. Vous trouverez c
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/it/zen.mdx b/packages/web/src/content/docs/it/zen.mdx
index 77f019d43a92..7c56616d90a4 100644
--- a/packages/web/src/content/docs/it/zen.mdx
+++ b/packages/web/src/content/docs/it/zen.mdx
@@ -104,6 +104,7 @@ Puoi anche accedere ai nostri modelli tramite i seguenti endpoint API.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ Supportiamo un modello pay-as-you-go. Qui sotto trovi i prezzi **per 1M token**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/ja/zen.mdx b/packages/web/src/content/docs/ja/zen.mdx
index 72df27be4c00..ba37bbec4623 100644
--- a/packages/web/src/content/docs/ja/zen.mdx
+++ b/packages/web/src/content/docs/ja/zen.mdx
@@ -95,6 +95,7 @@ OpenCode Zen は、OpenCode のほかのプロバイダーと同じように動
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/ko/zen.mdx b/packages/web/src/content/docs/ko/zen.mdx
index 31b07f0a71f2..cbfeff53d686 100644
--- a/packages/web/src/content/docs/ko/zen.mdx
+++ b/packages/web/src/content/docs/ko/zen.mdx
@@ -95,6 +95,7 @@ OpenCode Zen은 OpenCode의 다른 provider와 똑같이 작동합니다.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/nb/zen.mdx b/packages/web/src/content/docs/nb/zen.mdx
index b08ee2e5f172..1d2430f02268 100644
--- a/packages/web/src/content/docs/nb/zen.mdx
+++ b/packages/web/src/content/docs/nb/zen.mdx
@@ -104,6 +104,7 @@ Du kan også få tilgang til modellene våre gjennom følgende API-endepunkter.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ Vi støtter en pay-as-you-go-modell. Nedenfor er prisene **per 1M tokens**.
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02         | $0.25           |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145        | -               |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028        | -               |
+| Grok 4.5                          | $2.00   | $6.00   | $0.50         | -               |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20         | -               |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00         | $12.50          |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50         | $6.25           |
diff --git a/packages/web/src/content/docs/pl/zen.mdx b/packages/web/src/content/docs/pl/zen.mdx
index 14f77c843e6f..b109ecf8fc30 100644
--- a/packages/web/src/content/docs/pl/zen.mdx
+++ b/packages/web/src/content/docs/pl/zen.mdx
@@ -104,6 +104,7 @@ Możesz też uzyskać dostęp do naszych modeli przez poniższe endpointy API.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ Obsługujemy model pay-as-you-go. Poniżej znajdują się ceny **za 1M tokenów*
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02          | $0.25          |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145         | -              |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028         | -              |
+| Grok 4.5                          | $2.00   | $6.00   | $0.50          | -              |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20          | -              |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00          | $12.50         |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50          | $6.25          |
diff --git a/packages/web/src/content/docs/pt-br/zen.mdx b/packages/web/src/content/docs/pt-br/zen.mdx
index 493b5eb322e5..b08fef7dbf6f 100644
--- a/packages/web/src/content/docs/pt-br/zen.mdx
+++ b/packages/web/src/content/docs/pt-br/zen.mdx
@@ -95,6 +95,7 @@ Você também pode acessar nossos modelos pelos seguintes endpoints de API.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ Oferecemos um modelo pay-as-you-go. Abaixo estão os preços **por 1M tokens**.
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02            | $0.25            |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145           | -                |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028           | -                |
+| Grok 4.5                          | $2.00   | $6.00   | $0.50            | -                |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20            | -                |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00            | $12.50           |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50            | $6.25            |
diff --git a/packages/web/src/content/docs/ru/zen.mdx b/packages/web/src/content/docs/ru/zen.mdx
index 218d4c029562..46b0ed6a15fe 100644
--- a/packages/web/src/content/docs/ru/zen.mdx
+++ b/packages/web/src/content/docs/ru/zen.mdx
@@ -104,6 +104,7 @@ OpenCode Zen работает как любой другой провайдер
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/th/zen.mdx b/packages/web/src/content/docs/th/zen.mdx
index 4f2c3aebd452..26e119dcfcbb 100644
--- a/packages/web/src/content/docs/th/zen.mdx
+++ b/packages/web/src/content/docs/th/zen.mdx
@@ -97,6 +97,7 @@ OpenCode Zen ทำงานเหมือน provider อื่น ๆ ใน
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -144,6 +145,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/tr/zen.mdx b/packages/web/src/content/docs/tr/zen.mdx
index 8655d23412c0..b01b34c44e9e 100644
--- a/packages/web/src/content/docs/tr/zen.mdx
+++ b/packages/web/src/content/docs/tr/zen.mdx
@@ -95,6 +95,7 @@ Modellerimize aşağıdaki API uç noktaları aracılığıyla da erişebilirsin
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ Kullandıkça öde modelini destekliyoruz. Aşağıda **1M token başına** fiya
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/zen.mdx b/packages/web/src/content/docs/zen.mdx
index 49ca11afe35b..5887376d6fc2 100644
--- a/packages/web/src/content/docs/zen.mdx
+++ b/packages/web/src/content/docs/zen.mdx
@@ -104,6 +104,7 @@ You can also access our models through the following API endpoints.
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -153,6 +154,7 @@ We support a pay-as-you-go model. Below are the prices **per 1M tokens**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/zh-cn/zen.mdx b/packages/web/src/content/docs/zh-cn/zen.mdx
index 55a55308df1a..b3e568a4534d 100644
--- a/packages/web/src/content/docs/zh-cn/zen.mdx
+++ b/packages/web/src/content/docs/zh-cn/zen.mdx
@@ -95,6 +95,7 @@ OpenCode Zen 的工作方式与 OpenCode 中的任何其他提供商相同。
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -142,6 +143,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02    | $0.25    |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145   | -        |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028   | -        |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50    | -        |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20    | -        |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00    | $12.50   |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50    | $6.25    |
diff --git a/packages/web/src/content/docs/zh-tw/zen.mdx b/packages/web/src/content/docs/zh-tw/zen.mdx
index 778df663bf51..beb2ea417eed 100644
--- a/packages/web/src/content/docs/zh-tw/zen.mdx
+++ b/packages/web/src/content/docs/zh-tw/zen.mdx
@@ -99,6 +99,7 @@ OpenCode Zen 的運作方式和 OpenCode 中的其他供應商一樣。
 | Kimi K2.5              | kimi-k2.5              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.6              | kimi-k2.6              | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Kimi K2.7 Code         | kimi-k2.7-code         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
+| Grok 4.5               | grok-4.5               | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Grok Build 0.1         | grok-build-0.1         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | Big Pickle             | big-pickle             | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
 | MiMo-V2.5 Free         | mimo-v2.5-free         | `https://opencode.ai/zen/v1/chat/completions`        | `@ai-sdk/openai-compatible` |
@@ -147,6 +148,7 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02    | $0.25    |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145   | -        |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028   | -        |
+| Grok 4.5                          | $2.00  | $6.00   | $0.50    | -        |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20    | -        |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00    | $12.50   |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50    | $6.25    |

From fe96d4aebd819a390052ccde7a24812431473fb2 Mon Sep 17 00:00:00 2001
From: Frank <frank@anoma.ly>
Date: Wed, 8 Jul 2026 15:52:56 -0400
Subject: [PATCH 10/33] zen: grok 4.5

---
 packages/web/src/content/docs/ar/zen.mdx    | 3 ++-
 packages/web/src/content/docs/bs/zen.mdx    | 3 ++-
 packages/web/src/content/docs/da/zen.mdx    | 3 ++-
 packages/web/src/content/docs/de/zen.mdx    | 3 ++-
 packages/web/src/content/docs/es/zen.mdx    | 3 ++-
 packages/web/src/content/docs/fr/zen.mdx    | 3 ++-
 packages/web/src/content/docs/it/zen.mdx    | 3 ++-
 packages/web/src/content/docs/ja/zen.mdx    | 3 ++-
 packages/web/src/content/docs/ko/zen.mdx    | 3 ++-
 packages/web/src/content/docs/nb/zen.mdx    | 3 ++-
 packages/web/src/content/docs/pl/zen.mdx    | 3 ++-
 packages/web/src/content/docs/pt-br/zen.mdx | 3 ++-
 packages/web/src/content/docs/ru/zen.mdx    | 3 ++-
 packages/web/src/content/docs/th/zen.mdx    | 3 ++-
 packages/web/src/content/docs/tr/zen.mdx    | 3 ++-
 packages/web/src/content/docs/zen.mdx       | 3 ++-
 packages/web/src/content/docs/zh-cn/zen.mdx | 3 ++-
 packages/web/src/content/docs/zh-tw/zen.mdx | 3 ++-
 18 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/packages/web/src/content/docs/ar/zen.mdx b/packages/web/src/content/docs/ar/zen.mdx
index 524605d327f4..038ce1807126 100644
--- a/packages/web/src/content/docs/ar/zen.mdx
+++ b/packages/web/src/content/docs/ar/zen.mdx
@@ -147,7 +147,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02           | $0.25           |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145          | -               |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028          | -               |
-| Grok 4.5                          | $2.00   | $6.00   | $0.50           | -               |
+| Grok 4.5 (≤ 200K tokens)          | $2.00   | $6.00   | $0.50           | -               |
+| Grok 4.5 (> 200K tokens)          | $4.00   | $12.00  | $1.00           | -               |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20           | -               |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00           | $12.50          |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50           | $6.25           |
diff --git a/packages/web/src/content/docs/bs/zen.mdx b/packages/web/src/content/docs/bs/zen.mdx
index 9c9ba820b4c6..308a1008c377 100644
--- a/packages/web/src/content/docs/bs/zen.mdx
+++ b/packages/web/src/content/docs/bs/zen.mdx
@@ -154,7 +154,8 @@ Podržavamo pay-as-you-go model. Ispod su cijene **po 1M tokena**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/da/zen.mdx b/packages/web/src/content/docs/da/zen.mdx
index b7a941047b45..606b9ad70ada 100644
--- a/packages/web/src/content/docs/da/zen.mdx
+++ b/packages/web/src/content/docs/da/zen.mdx
@@ -154,7 +154,8 @@ Vi understøtter en pay-as-you-go-model. Nedenfor er priserne **pr. 1M tokens**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/de/zen.mdx b/packages/web/src/content/docs/de/zen.mdx
index 292831c811e9..5bbf0bf5718a 100644
--- a/packages/web/src/content/docs/de/zen.mdx
+++ b/packages/web/src/content/docs/de/zen.mdx
@@ -143,7 +143,8 @@ Wir unterstützen ein Pay-as-you-go-Modell. Unten findest du die Preise **pro 1M
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/es/zen.mdx b/packages/web/src/content/docs/es/zen.mdx
index 1ee927e94c08..d074f07c3915 100644
--- a/packages/web/src/content/docs/es/zen.mdx
+++ b/packages/web/src/content/docs/es/zen.mdx
@@ -154,7 +154,8 @@ Admitimos un modelo de pago por uso. A continuación se muestran los precios **p
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02            | $0.25              |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145           | -                  |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028           | -                  |
-| Grok 4.5                          | $2.00   | $6.00   | $0.50            | -                  |
+| Grok 4.5 (≤ 200K tokens)          | $2.00   | $6.00   | $0.50            | -                  |
+| Grok 4.5 (> 200K tokens)          | $4.00   | $12.00  | $1.00            | -                  |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20            | -                  |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00            | $12.50             |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50            | $6.25              |
diff --git a/packages/web/src/content/docs/fr/zen.mdx b/packages/web/src/content/docs/fr/zen.mdx
index 5b33194fdc5b..7ee2858f2239 100644
--- a/packages/web/src/content/docs/fr/zen.mdx
+++ b/packages/web/src/content/docs/fr/zen.mdx
@@ -143,7 +143,8 @@ Nous prenons en charge un modèle de paiement à l'utilisation. Vous trouverez c
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/it/zen.mdx b/packages/web/src/content/docs/it/zen.mdx
index 7c56616d90a4..bb3379d475a7 100644
--- a/packages/web/src/content/docs/it/zen.mdx
+++ b/packages/web/src/content/docs/it/zen.mdx
@@ -154,7 +154,8 @@ Supportiamo un modello pay-as-you-go. Qui sotto trovi i prezzi **per 1M token**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/ja/zen.mdx b/packages/web/src/content/docs/ja/zen.mdx
index ba37bbec4623..221259c31cde 100644
--- a/packages/web/src/content/docs/ja/zen.mdx
+++ b/packages/web/src/content/docs/ja/zen.mdx
@@ -143,7 +143,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/ko/zen.mdx b/packages/web/src/content/docs/ko/zen.mdx
index cbfeff53d686..778fa4632035 100644
--- a/packages/web/src/content/docs/ko/zen.mdx
+++ b/packages/web/src/content/docs/ko/zen.mdx
@@ -143,7 +143,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/nb/zen.mdx b/packages/web/src/content/docs/nb/zen.mdx
index 1d2430f02268..8e407d280d59 100644
--- a/packages/web/src/content/docs/nb/zen.mdx
+++ b/packages/web/src/content/docs/nb/zen.mdx
@@ -154,7 +154,8 @@ Vi støtter en pay-as-you-go-modell. Nedenfor er prisene **per 1M tokens**.
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02         | $0.25           |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145        | -               |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028        | -               |
-| Grok 4.5                          | $2.00   | $6.00   | $0.50         | -               |
+| Grok 4.5 (≤ 200K tokens)          | $2.00   | $6.00   | $0.50         | -               |
+| Grok 4.5 (> 200K tokens)          | $4.00   | $12.00  | $1.00         | -               |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20         | -               |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00         | $12.50          |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50         | $6.25           |
diff --git a/packages/web/src/content/docs/pl/zen.mdx b/packages/web/src/content/docs/pl/zen.mdx
index b109ecf8fc30..6c08f85f0d84 100644
--- a/packages/web/src/content/docs/pl/zen.mdx
+++ b/packages/web/src/content/docs/pl/zen.mdx
@@ -154,7 +154,8 @@ Obsługujemy model pay-as-you-go. Poniżej znajdują się ceny **za 1M tokenów*
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02          | $0.25          |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145         | -              |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028         | -              |
-| Grok 4.5                          | $2.00   | $6.00   | $0.50          | -              |
+| Grok 4.5 (≤ 200K tokens)          | $2.00   | $6.00   | $0.50          | -              |
+| Grok 4.5 (> 200K tokens)          | $4.00   | $12.00  | $1.00          | -              |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20          | -              |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00          | $12.50         |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50          | $6.25          |
diff --git a/packages/web/src/content/docs/pt-br/zen.mdx b/packages/web/src/content/docs/pt-br/zen.mdx
index b08fef7dbf6f..8a3c8affd545 100644
--- a/packages/web/src/content/docs/pt-br/zen.mdx
+++ b/packages/web/src/content/docs/pt-br/zen.mdx
@@ -143,7 +143,8 @@ Oferecemos um modelo pay-as-you-go. Abaixo estão os preços **por 1M tokens**.
 | Qwen3.5 Plus                      | $0.20   | $1.20   | $0.02            | $0.25            |
 | DeepSeek V4 Pro                   | $1.74   | $3.48   | $0.145           | -                |
 | DeepSeek V4 Flash                 | $0.14   | $0.28   | $0.028           | -                |
-| Grok 4.5                          | $2.00   | $6.00   | $0.50            | -                |
+| Grok 4.5 (≤ 200K tokens)          | $2.00   | $6.00   | $0.50            | -                |
+| Grok 4.5 (> 200K tokens)          | $4.00   | $12.00  | $1.00            | -                |
 | Grok Build 0.1                    | $1.00   | $2.00   | $0.20            | -                |
 | Claude Fable 5                    | $10.00  | $50.00  | $1.00            | $12.50           |
 | Claude Opus 4.8                   | $5.00   | $25.00  | $0.50            | $6.25            |
diff --git a/packages/web/src/content/docs/ru/zen.mdx b/packages/web/src/content/docs/ru/zen.mdx
index 46b0ed6a15fe..c5a9b8ea1c39 100644
--- a/packages/web/src/content/docs/ru/zen.mdx
+++ b/packages/web/src/content/docs/ru/zen.mdx
@@ -154,7 +154,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/th/zen.mdx b/packages/web/src/content/docs/th/zen.mdx
index 26e119dcfcbb..8df796da9320 100644
--- a/packages/web/src/content/docs/th/zen.mdx
+++ b/packages/web/src/content/docs/th/zen.mdx
@@ -145,7 +145,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/tr/zen.mdx b/packages/web/src/content/docs/tr/zen.mdx
index b01b34c44e9e..5013a7a9b40f 100644
--- a/packages/web/src/content/docs/tr/zen.mdx
+++ b/packages/web/src/content/docs/tr/zen.mdx
@@ -143,7 +143,8 @@ Kullandıkça öde modelini destekliyoruz. Aşağıda **1M token başına** fiya
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/zen.mdx b/packages/web/src/content/docs/zen.mdx
index 5887376d6fc2..7621f2781153 100644
--- a/packages/web/src/content/docs/zen.mdx
+++ b/packages/web/src/content/docs/zen.mdx
@@ -154,7 +154,8 @@ We support a pay-as-you-go model. Below are the prices **per 1M tokens**.
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02       | $0.25        |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145      | -            |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028      | -            |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50       | -            |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00       | -            |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20       | -            |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00       | $12.50       |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50       | $6.25        |
diff --git a/packages/web/src/content/docs/zh-cn/zen.mdx b/packages/web/src/content/docs/zh-cn/zen.mdx
index b3e568a4534d..fd91df0e5a38 100644
--- a/packages/web/src/content/docs/zh-cn/zen.mdx
+++ b/packages/web/src/content/docs/zh-cn/zen.mdx
@@ -143,7 +143,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02    | $0.25    |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145   | -        |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028   | -        |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50    | -        |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50    | -        |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00    | -        |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20    | -        |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00    | $12.50   |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50    | $6.25    |
diff --git a/packages/web/src/content/docs/zh-tw/zen.mdx b/packages/web/src/content/docs/zh-tw/zen.mdx
index beb2ea417eed..dec9581c7178 100644
--- a/packages/web/src/content/docs/zh-tw/zen.mdx
+++ b/packages/web/src/content/docs/zh-tw/zen.mdx
@@ -148,7 +148,8 @@ https://opencode.ai/zen/v1/models
 | Qwen3.5 Plus                      | $0.20  | $1.20   | $0.02    | $0.25    |
 | DeepSeek V4 Pro                   | $1.74  | $3.48   | $0.145   | -        |
 | DeepSeek V4 Flash                 | $0.14  | $0.28   | $0.028   | -        |
-| Grok 4.5                          | $2.00  | $6.00   | $0.50    | -        |
+| Grok 4.5 (≤ 200K tokens)          | $2.00  | $6.00   | $0.50    | -        |
+| Grok 4.5 (> 200K tokens)          | $4.00  | $12.00  | $1.00    | -        |
 | Grok Build 0.1                    | $1.00  | $2.00   | $0.20    | -        |
 | Claude Fable 5                    | $10.00 | $50.00  | $1.00    | $12.50   |
 | Claude Opus 4.8                   | $5.00  | $25.00  | $0.50    | $6.25    |

From f95f877e5f7c8cc6eab4f920e2925572d69b015b Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 20:58:41 +0000
Subject: [PATCH 11/33] fix(core): watch only git projects (#35957)

Co-authored-by: Kit Langton <kit.langton@gmail.com>
---
 packages/core/src/filesystem/watcher.ts       |  2 +-
 packages/core/test/filesystem/watcher.test.ts | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/filesystem/watcher.ts b/packages/core/src/filesystem/watcher.ts
index b0f568a56661..c5e20631917e 100644
--- a/packages/core/src/filesystem/watcher.ts
+++ b/packages/core/src/filesystem/watcher.ts
@@ -106,7 +106,7 @@ const layer = Layer.effect(
     const config = (yield* (yield* Config.Service).entries())
       .filter((entry): entry is Config.Document => entry.type === "document")
       .flatMap((item) => item.info.watcher?.ignore ?? [])
-    if (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER) {
+    if (location.vcs && (yield* Flag.OPENCODE_EXPERIMENTAL_FILEWATCHER)) {
       yield* Effect.forkScoped(
         subscribe(location.directory, [...Ignore.PATTERNS, ...config, ...protecteds(location.directory)]),
       )
diff --git a/packages/core/test/filesystem/watcher.test.ts b/packages/core/test/filesystem/watcher.test.ts
index bce2bf69c24c..0a287ea010d9 100644
--- a/packages/core/test/filesystem/watcher.test.ts
+++ b/packages/core/test/filesystem/watcher.test.ts
@@ -168,16 +168,12 @@ describeWatcher("Watcher", () => {
     ),
   )
 
-  it.live("watches non-git roots", () =>
+  it.live("skips non-git roots", () =>
     withTmp((directory) =>
       Effect.gen(function* () {
         const fs = yield* FSUtil.Service
         const file = path.join(directory, "plain.txt")
-        yield* ready(directory)
-        expect(yield* nextUpdate((event) => event.file === file, fs.writeFileString(file, "plain"))).toEqual({
-          file,
-          event: "add",
-        })
+        yield* noUpdate((event) => event.file === file, fs.writeFileString(file, "plain"))
       }),
     ),
   )
@@ -190,7 +186,10 @@ describeWatcher("Watcher", () => {
         Effect.promise(() => tmpdir()),
         (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
       )
-      yield* ready(tmp.path).pipe(provide(tmp.path), Effect.scoped)
+      yield* ready(tmp.path).pipe(
+        provide(tmp.path, { type: "git", store: AbsolutePath.make(path.join(tmp.path, ".git")) }),
+        Effect.scoped,
+      )
       const file = path.join(tmp.path, "after-dispose.txt")
       yield* noUpdate((event) => event.file === file, fs.writeFileString(file, "gone")).pipe(
         Effect.provideService(EventV2.Service, events),

From ccb6b7c3eac7146c6ed0f319baeb1772023a0a14 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Wed, 8 Jul 2026 17:29:36 -0500
Subject: [PATCH 12/33] fix: improve xai cache hit rate (#35970)

---
 bun.lock                                      |  20 +-
 package.json                                  |   2 +-
 packages/core/package.json                    |   2 +-
 .../core/test/provider-xai-responses.test.ts  |  32 ++++
 packages/opencode/package.json                |   2 +-
 packages/opencode/src/provider/transform.ts   |   7 +-
 .../opencode/test/provider/transform.test.ts  |  52 +++++-
 patches/@ai-sdk%2Fxai@3.0.102.patch           | 174 ++++++++++++++++++
 patches/@ai-sdk%2Fxai@3.0.82.patch            |  99 ----------
 9 files changed, 281 insertions(+), 109 deletions(-)
 create mode 100644 packages/core/test/provider-xai-responses.test.ts
 create mode 100644 patches/@ai-sdk%2Fxai@3.0.102.patch
 delete mode 100644 patches/@ai-sdk%2Fxai@3.0.82.patch

diff --git a/bun.lock b/bun.lock
index 6af38c1f784a..2c91b45ed6de 100644
--- a/bun.lock
+++ b/bun.lock
@@ -308,7 +308,7 @@
         "@ai-sdk/provider-utils": "4.0.23",
         "@ai-sdk/togetherai": "2.0.41",
         "@ai-sdk/vercel": "2.0.39",
-        "@ai-sdk/xai": "3.0.82",
+        "@ai-sdk/xai": "3.0.102",
         "@aws-sdk/credential-providers": "3.1057.0",
         "@effect/opentelemetry": "catalog:",
         "@effect/platform-node": "catalog:",
@@ -582,7 +582,7 @@
         "@ai-sdk/provider": "3.0.8",
         "@ai-sdk/togetherai": "2.0.41",
         "@ai-sdk/vercel": "2.0.39",
-        "@ai-sdk/xai": "3.0.82",
+        "@ai-sdk/xai": "3.0.102",
         "@aws-sdk/credential-providers": "3.1057.0",
         "@clack/prompts": "1.0.0-alpha.1",
         "@effect/opentelemetry": "catalog:",
@@ -1064,6 +1064,7 @@
   ],
   "patchedDependencies": {
     "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
+    "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
     "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
     "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
@@ -1073,7 +1074,6 @@
     "@tanstack/solid-virtual@3.13.28": "patches/@tanstack%2Fsolid-virtual@3.13.28.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
-    "@ai-sdk/xai@3.0.82": "patches/@ai-sdk%2Fxai@3.0.82.patch",
     "@tanstack/virtual-core@3.17.0": "patches/@tanstack%2Fvirtual-core@3.17.0.patch",
     "pacote@21.5.0": "patches/pacote@21.5.0.patch",
   },
@@ -1211,7 +1211,7 @@
 
     "@ai-sdk/vercel": ["@ai-sdk/vercel@2.0.39", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8eu3ljJpkCTP4ppcyYB+NcBrkcBoSOFthCSgk5VnjaxnDaOJFaxnPwfddM7wx3RwMk2CiK1O61Px/LlqNc7QkQ=="],
 
-    "@ai-sdk/xai": ["@ai-sdk/xai@3.0.82", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-A0VFMufnVf4wODcT3SPQUUzvYXiIO1VhFuXj9r6z/vP4rlo+QRDPw3WSTchcz93ROQWSfBE3I6Szqz342OHi5w=="],
+    "@ai-sdk/xai": ["@ai-sdk/xai@3.0.102", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.56", "@ai-sdk/provider": "3.0.13", "@ai-sdk/provider-utils": "4.0.35" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-NeQyOR7OCqDMgaLS4uNX/ep/HrwUzzFYLzXQSRoqLy2jsnqxAJhsgltRwAwf+ADjyPBIAKEOestWnIQA+LrLrQ=="],
 
     "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="],
 
@@ -5693,7 +5693,11 @@
 
     "@ai-sdk/vercel/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
 
-    "@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
+    "@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.56", "", { "dependencies": { "@ai-sdk/provider": "3.0.13", "@ai-sdk/provider-utils": "4.0.35" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cQrN6OUn/jvsY3OdsU6Wn+ss7vp1iwIcakZKSlSRMnYqShBfyT7Qht+eqmgxs7w9ttrw6FAG6o11AiBs+iEsTA=="],
+
+    "@ai-sdk/xai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.13", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-ZPtVYt5QIJzOta1kdUiDuCx4HhFkvNPv/rvmZ2b1iXwybYjJsCnNYR4PAw4kW7rgVfDARvHXcU64efWuqNp6bw=="],
+
+    "@ai-sdk/xai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.35", "", { "dependencies": { "@ai-sdk/provider": "3.0.13", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-bjYld/2KGPLt78kpqbya+fD4LYS7BqVQJyUjE3qAHrYB0FR2Q90BaWEVIBZaguTWXf/A8L6uG1zO1v9TxVlGWg=="],
 
     "@astrojs/check/yargs": ["yargs@17.7.2", "", { "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", "string-width": "^4.2.3", "y18n": "^5.0.5", "yargs-parser": "^21.1.1" } }, "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="],
 
@@ -6143,6 +6147,8 @@
 
     "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],
 
+    "ai-gateway-provider/@ai-sdk/xai": ["@ai-sdk/xai@3.0.82", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-A0VFMufnVf4wODcT3SPQUUzvYXiIO1VhFuXj9r6z/vP4rlo+QRDPw3WSTchcz93ROQWSfBE3I6Szqz342OHi5w=="],
+
     "ai-gateway-provider/@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.8.1", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Y6j3yivgoEUf/kutD/k5GX/mzZfioRFoSx0gbQ+mIOzMaH/vJv1rCkztiuvlLw5xRYQil7oxHUZvmSfXqOx1NQ=="],
 
     "ajv-keywords/ajv": ["ajv@6.15.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="],
@@ -6577,6 +6583,8 @@
 
     "@ai-sdk/vercel/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
 
+    "@ai-sdk/xai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
+
     "@astrojs/check/yargs/cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],
 
     "@astrojs/check/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
@@ -6939,6 +6947,8 @@
 
     "ai-gateway-provider/@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
 
+    "ai-gateway-provider/@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
+
     "ajv-keywords/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
 
     "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
diff --git a/package.json b/package.json
index e65499f878ce..0d394011966a 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
     "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
-    "@ai-sdk/xai@3.0.82": "patches/@ai-sdk%2Fxai@3.0.82.patch",
+    "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
     "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
     "pacote@21.5.0": "patches/pacote@21.5.0.patch",
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
diff --git a/packages/core/package.json b/packages/core/package.json
index c0927930af68..0680fac03d92 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -80,7 +80,7 @@
     "@ai-sdk/provider-utils": "4.0.23",
     "@ai-sdk/togetherai": "2.0.41",
     "@ai-sdk/vercel": "2.0.39",
-    "@ai-sdk/xai": "3.0.82",
+    "@ai-sdk/xai": "3.0.102",
     "@aws-sdk/credential-providers": "3.1057.0",
     "@effect/opentelemetry": "catalog:",
     "@effect/platform-node": "catalog:",
diff --git a/packages/core/test/provider-xai-responses.test.ts b/packages/core/test/provider-xai-responses.test.ts
new file mode 100644
index 000000000000..d9d674fe169e
--- /dev/null
+++ b/packages/core/test/provider-xai-responses.test.ts
@@ -0,0 +1,32 @@
+import { createXai } from "@ai-sdk/xai"
+import { expect, test } from "bun:test"
+
+test("xAI Responses sends promptCacheKey as prompt_cache_key", async () => {
+  let body: Record<string, unknown> | undefined
+  const mockFetch = Object.assign(
+    async (_input: Parameters<typeof fetch>[0], init?: RequestInit) => {
+      body = JSON.parse(String(init?.body))
+      return Response.json({
+        id: "response-1",
+        created_at: 0,
+        model: "grok-4",
+        object: "response",
+        output: [],
+        usage: { input_tokens: 1, output_tokens: 0 },
+        status: "completed",
+      })
+    },
+    { preconnect: fetch.preconnect },
+  )
+  const model = createXai({
+    apiKey: "test",
+    fetch: mockFetch,
+  }).responses("grok-4")
+
+  await model.doGenerate({
+    prompt: [{ role: "user", content: [{ type: "text", text: "Hello" }] }],
+    providerOptions: { xai: { promptCacheKey: "session-123" } },
+  })
+
+  expect(body?.prompt_cache_key).toBe("session-123")
+})
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index eb05f6e384a2..401803c37cd8 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -73,7 +73,7 @@
     "@ai-sdk/provider": "3.0.8",
     "@ai-sdk/togetherai": "2.0.41",
     "@ai-sdk/vercel": "2.0.39",
-    "@ai-sdk/xai": "3.0.82",
+    "@ai-sdk/xai": "3.0.102",
     "@aws-sdk/credential-providers": "3.1057.0",
     "@clack/prompts": "1.0.0-alpha.1",
     "@effect/opentelemetry": "catalog:",
diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index f42e14139f1e..e50f4b768847 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -1127,7 +1127,12 @@ export function options(input: {
     }
   }
 
-  if (input.model.providerID === "openai" || input.providerOptions?.setCacheKey) {
+  if (
+    input.providerOptions?.setCacheKey !== false &&
+    (input.model.providerID === "openai" ||
+      input.model.api.npm === "@ai-sdk/xai" ||
+      input.providerOptions?.setCacheKey)
+  ) {
     result["promptCacheKey"] = input.sessionID
   }
 
diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts
index 7307e3f60b7e..8f2be02a6747 100644
--- a/packages/opencode/test/provider/transform.test.ts
+++ b/packages/opencode/test/provider/transform.test.ts
@@ -73,7 +73,7 @@ describe("ProviderTransform.options - setCacheKey", () => {
     expect(result.promptCacheKey).toBeUndefined()
   })
 
-  test("should set promptCacheKey for openai provider regardless of setCacheKey", () => {
+  test("should set promptCacheKey for openai provider by default", () => {
     const openaiModel = {
       ...mockModel,
       providerID: "openai",
@@ -87,6 +87,56 @@ describe("ProviderTransform.options - setCacheKey", () => {
     expect(result.promptCacheKey).toBe(sessionID)
   })
 
+  test("should not set promptCacheKey for openai when explicitly disabled", () => {
+    const openaiModel = {
+      ...mockModel,
+      providerID: "openai",
+      api: {
+        id: "gpt-4",
+        url: "https://api.openai.com",
+        npm: "@ai-sdk/openai",
+      },
+    }
+    const result = ProviderTransform.options({
+      model: openaiModel,
+      sessionID,
+      providerOptions: { setCacheKey: false },
+    })
+    expect(result.promptCacheKey).toBeUndefined()
+  })
+
+  test("should set promptCacheKey for the xAI SDK by default regardless of provider ID", () => {
+    const xaiModel = {
+      ...mockModel,
+      providerID: "custom-xai",
+      api: {
+        id: "grok-4",
+        url: "https://api.x.ai",
+        npm: "@ai-sdk/xai",
+      },
+    }
+    const result = ProviderTransform.options({ model: xaiModel, sessionID, providerOptions: {} })
+    expect(result.promptCacheKey).toBe(sessionID)
+  })
+
+  test("should not set promptCacheKey for the xAI SDK when explicitly disabled", () => {
+    const xaiModel = {
+      ...mockModel,
+      providerID: "xai",
+      api: {
+        id: "grok-4",
+        url: "https://api.x.ai",
+        npm: "@ai-sdk/xai",
+      },
+    }
+    const result = ProviderTransform.options({
+      model: xaiModel,
+      sessionID,
+      providerOptions: { setCacheKey: false },
+    })
+    expect(result.promptCacheKey).toBeUndefined()
+  })
+
   test("should set store=false for openai provider", () => {
     const openaiModel = {
       ...mockModel,
diff --git a/patches/@ai-sdk%2Fxai@3.0.102.patch b/patches/@ai-sdk%2Fxai@3.0.102.patch
new file mode 100644
index 000000000000..27a46014fca9
--- /dev/null
+++ b/patches/@ai-sdk%2Fxai@3.0.102.patch
@@ -0,0 +1,174 @@
+diff --git a/dist/index.d.mts b/dist/index.d.mts
+index 266c5ffdd9ee74ff95908ce90858ee4369d4e4ae..990ef4195bc67b6d25f249e1c81cf51710390f9a 100644
+--- a/dist/index.d.mts
++++ b/dist/index.d.mts
+@@ -78,6 +78,7 @@ declare const xaiLanguageModelResponsesOptions: z.ZodObject<{
+     topLogprobs: z.ZodOptional<z.ZodNumber>;
+     store: z.ZodOptional<z.ZodBoolean>;
+     previousResponseId: z.ZodOptional<z.ZodString>;
++    promptCacheKey: z.ZodOptional<z.ZodString>;
+     include: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
+         "file_search_call.results": "file_search_call.results";
+     }>>>>;
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index 266c5ffdd9ee74ff95908ce90858ee4369d4e4ae..990ef4195bc67b6d25f249e1c81cf51710390f9a 100644
+--- a/dist/index.d.ts
++++ b/dist/index.d.ts
+@@ -78,6 +78,7 @@ declare const xaiLanguageModelResponsesOptions: z.ZodObject<{
+     topLogprobs: z.ZodOptional<z.ZodNumber>;
+     store: z.ZodOptional<z.ZodBoolean>;
+     previousResponseId: z.ZodOptional<z.ZodString>;
++    promptCacheKey: z.ZodOptional<z.ZodString>;
+     include: z.ZodOptional<z.ZodNullable<z.ZodArray<z.ZodEnum<{
+         "file_search_call.results": "file_search_call.results";
+     }>>>>;
+diff --git a/dist/index.js b/dist/index.js
+index 717b74538f5c8f0d6ab1475ebb2a84a47ccd3950..dd7dbeb3bc307e0d355f4bb4939d06cc8eae7528 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -1119,6 +1119,14 @@ async function convertToXaiResponsesInput({
+                   type: "input_file",
+                   file_url: block.data.toString()
+                 });
++              } else if (block.mediaType === "application/pdf") {
++                contentParts.push({
++                  type: "input_file",
++                  ...typeof block.data === "string" && block.data.startsWith("file-") ? { file_id: block.data } : {
++                    filename: block.filename ?? "file",
++                    file_data: `data:application/pdf;base64,${(0, import_provider_utils5.convertToBase64)(block.data)}`
++                  }
++                });
+               } else {
+                 throw new import_provider4.UnsupportedFunctionalityError({
+                   functionality: `file part media type ${block.mediaType} as inline data (xAI Responses requires a URL or a Files API reference for non-image files)`
+@@ -1760,6 +1768,10 @@ var xaiLanguageModelResponsesOptions = import_v47.z.object({
+    * The ID of the previous response from the model.
+    */
+   previousResponseId: import_v47.z.string().optional(),
++  /**
++   * A stable key used by xAI to improve prompt cache routing.
++   */
++  promptCacheKey: import_v47.z.string().optional(),
+   /**
+    * Specify additional output data to include in the model response.
+    * Example values: 'file_search_call.results'.
+@@ -2165,6 +2177,9 @@ var XaiResponsesLanguageModel = class {
+       },
+       ...options.previousResponseId != null && {
+         previous_response_id: options.previousResponseId
++      },
++      ...options.promptCacheKey != null && {
++        prompt_cache_key: options.promptCacheKey
+       }
+     };
+     if (xaiTools2 && xaiTools2.length > 0) {
+diff --git a/dist/index.mjs b/dist/index.mjs
+index a26af109585fc2bd3053b320142aa869c06d36f4..774adaf971b648544317a4fc65d0c56e488d4fc7 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -1122,6 +1122,14 @@ async function convertToXaiResponsesInput({
+                   type: "input_file",
+                   file_url: block.data.toString()
+                 });
++              } else if (block.mediaType === "application/pdf") {
++                contentParts.push({
++                  type: "input_file",
++                  ...typeof block.data === "string" && block.data.startsWith("file-") ? { file_id: block.data } : {
++                    filename: block.filename ?? "file",
++                    file_data: `data:application/pdf;base64,${convertToBase642(block.data)}`
++                  }
++                });
+               } else {
+                 throw new UnsupportedFunctionalityError3({
+                   functionality: `file part media type ${block.mediaType} as inline data (xAI Responses requires a URL or a Files API reference for non-image files)`
+@@ -1763,6 +1771,10 @@ var xaiLanguageModelResponsesOptions = z7.object({
+    * The ID of the previous response from the model.
+    */
+   previousResponseId: z7.string().optional(),
++  /**
++   * A stable key used by xAI to improve prompt cache routing.
++   */
++  promptCacheKey: z7.string().optional(),
+   /**
+    * Specify additional output data to include in the model response.
+    * Example values: 'file_search_call.results'.
+@@ -2186,6 +2198,9 @@ var XaiResponsesLanguageModel = class {
+       },
+       ...options.previousResponseId != null && {
+         previous_response_id: options.previousResponseId
++      },
++      ...options.promptCacheKey != null && {
++        prompt_cache_key: options.promptCacheKey
+       }
+     };
+     if (xaiTools2 && xaiTools2.length > 0) {
+diff --git a/src/responses/convert-to-xai-responses-input.ts b/src/responses/convert-to-xai-responses-input.ts
+index 9a3712990cf646a6f7ba757d3f2893a3c37c6ef9..b018a9b95eb21e6c12794e6bddb3d953f40441e5 100644
+--- a/src/responses/convert-to-xai-responses-input.ts
++++ b/src/responses/convert-to-xai-responses-input.ts
+@@ -64,6 +64,17 @@ export async function convertToXaiResponsesInput({
+                   type: 'input_file',
+                   file_url: block.data.toString(),
+                 });
++              } else if (block.mediaType === 'application/pdf') {
++                contentParts.push({
++                  type: 'input_file',
++                  ...(typeof block.data === 'string' &&
++                  block.data.startsWith('file-')
++                    ? { file_id: block.data }
++                    : {
++                        filename: block.filename ?? 'file',
++                        file_data: `data:application/pdf;base64,${convertToBase64(block.data)}`,
++                      }),
++                });
+               } else {
+                 throw new UnsupportedFunctionalityError({
+                   functionality: `file part media type ${block.mediaType} as inline data (xAI Responses requires a URL or a Files API reference for non-image files)`,
+diff --git a/src/responses/xai-responses-api.ts b/src/responses/xai-responses-api.ts
+index 70483ea4f7c340b84c23766ac1d1df21e052842b..4b4d052860caa019556151e9e46dbfda8dfb18a9 100644
+--- a/src/responses/xai-responses-api.ts
++++ b/src/responses/xai-responses-api.ts
+@@ -27,7 +27,13 @@ export type XaiResponsesSystemMessage = {
+ export type XaiResponsesUserMessageContentPart =
+   | { type: 'input_text'; text: string }
+   | { type: 'input_image'; image_url: string }
+-  | { type: 'input_file'; file_url: string };
++  | {
++      type: 'input_file';
++      file_url?: string;
++      file_id?: string;
++      file_data?: string;
++      filename?: string;
++    };
+ 
+ export type XaiResponsesUserMessage = {
+   role: 'user';
+diff --git a/src/responses/xai-responses-language-model.ts b/src/responses/xai-responses-language-model.ts
+index f90df62eb9a30154388b1390e9f3acc3ccc022bf..00e61cba6cf048ae0045be692f33cb7e1e6a1188 100644
+--- a/src/responses/xai-responses-language-model.ts
++++ b/src/responses/xai-responses-language-model.ts
+@@ -182,6 +182,9 @@ export class XaiResponsesLanguageModel implements LanguageModelV3 {
+       ...(options.previousResponseId != null && {
+         previous_response_id: options.previousResponseId,
+       }),
++      ...(options.promptCacheKey != null && {
++        prompt_cache_key: options.promptCacheKey,
++      }),
+     };
+ 
+     if (xaiTools && xaiTools.length > 0) {
+diff --git a/src/responses/xai-responses-options.ts b/src/responses/xai-responses-options.ts
+index f8e96c061bf8793a402ababb8cad65bb2ad6aead..15c168892c1e8755453c61d3061e958cfd51ac71 100644
+--- a/src/responses/xai-responses-options.ts
++++ b/src/responses/xai-responses-options.ts
+@@ -32,6 +32,10 @@ export const xaiLanguageModelResponsesOptions = z.object({
+    * The ID of the previous response from the model.
+    */
+   previousResponseId: z.string().optional(),
++  /**
++   * A stable key used by xAI to improve prompt cache routing.
++   */
++  promptCacheKey: z.string().optional(),
+   /**
+    * Specify additional output data to include in the model response.
+    * Example values: 'file_search_call.results'.
diff --git a/patches/@ai-sdk%2Fxai@3.0.82.patch b/patches/@ai-sdk%2Fxai@3.0.82.patch
deleted file mode 100644
index dbe1207bcd18..000000000000
--- a/patches/@ai-sdk%2Fxai@3.0.82.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/dist/index.js b/dist/index.js
-index 135b95946139bbd1fc4b62239032931586189da0..7913520ad2f1c26b0f9621e7654f5fb570cba926 100644
---- a/dist/index.js
-+++ b/dist/index.js
-@@ -1077,6 +1077,20 @@ async function convertToXaiResponsesInput({
-                 const mediaType = block.mediaType === "image/*" ? "image/jpeg" : block.mediaType;
-                 const imageUrl = block.data instanceof URL ? block.data.toString() : `data:${mediaType};base64,${(0, import_provider_utils5.convertToBase64)(block.data)}`;
-                 contentParts.push({ type: "input_image", image_url: imageUrl });
-+              } else if (block.mediaType === "application/pdf") {
-+                if (block.data instanceof URL) {
-+                  contentParts.push({ type: "input_file", file_url: block.data.toString() });
-+                } else {
-+                  contentParts.push({
-+                    type: "input_file",
-+                    ...(typeof block.data === "string" && block.data.startsWith("file-")
-+                      ? { file_id: block.data }
-+                      : {
-+                          filename: block.filename ?? "file",
-+                          file_data: `data:application/pdf;base64,${(0, import_provider_utils5.convertToBase64)(block.data)}`,
-+                        }),
-+                  });
-+                }
-               } else {
-                 throw new import_provider4.UnsupportedFunctionalityError({
-                   functionality: `file part media type ${block.mediaType}`
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 61be60d452682b94dcdda39ffc47cb994eb8bfb1..d928f7f46e91057cd97fade9cc238db611345bcf 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -1080,6 +1080,20 @@ async function convertToXaiResponsesInput({
-                 const mediaType = block.mediaType === "image/*" ? "image/jpeg" : block.mediaType;
-                 const imageUrl = block.data instanceof URL ? block.data.toString() : `data:${mediaType};base64,${convertToBase642(block.data)}`;
-                 contentParts.push({ type: "input_image", image_url: imageUrl });
-+              } else if (block.mediaType === "application/pdf") {
-+                if (block.data instanceof URL) {
-+                  contentParts.push({ type: "input_file", file_url: block.data.toString() });
-+                } else {
-+                  contentParts.push({
-+                    type: "input_file",
-+                    ...(typeof block.data === "string" && block.data.startsWith("file-")
-+                      ? { file_id: block.data }
-+                      : {
-+                          filename: block.filename ?? "file",
-+                          file_data: `data:application/pdf;base64,${convertToBase642(block.data)}`,
-+                        }),
-+                  });
-+                }
-               } else {
-                 throw new UnsupportedFunctionalityError3({
-                   functionality: `file part media type ${block.mediaType}`
-diff --git a/src/responses/convert-to-xai-responses-input.ts b/src/responses/convert-to-xai-responses-input.ts
-index 19958d9fd90f7ce61bca70ad2d5f7b89a59fa63b..9329a1d56210af8aa33e5dbcb2916e24847070c1 100644
---- a/src/responses/convert-to-xai-responses-input.ts
-+++ b/src/responses/convert-to-xai-responses-input.ts
-@@ -54,6 +54,24 @@ export async function convertToXaiResponsesInput({
-                     : `data:${mediaType};base64,${convertToBase64(block.data)}`;
- 
-                 contentParts.push({ type: 'input_image', image_url: imageUrl });
-+              } else if (block.mediaType === 'application/pdf') {
-+                if (block.data instanceof URL) {
-+                  contentParts.push({
-+                    type: 'input_file',
-+                    file_url: block.data.toString(),
-+                  });
-+                } else {
-+                  contentParts.push({
-+                    type: 'input_file',
-+                    ...(typeof block.data === 'string' &&
-+                    block.data.startsWith('file-')
-+                      ? { file_id: block.data }
-+                      : {
-+                          filename: block.filename ?? 'file',
-+                          file_data: `data:application/pdf;base64,${convertToBase64(block.data)}`,
-+                        }),
-+                  });
-+                }
-               } else {
-                 throw new UnsupportedFunctionalityError({
-                   functionality: `file part media type ${block.mediaType}`,
-diff --git a/src/responses/xai-responses-api.ts b/src/responses/xai-responses-api.ts
-index df24c42d29fe7fc1dd7649cc2c4712a68c3a536b..00195468a83d43c1bfb50854ea040b55ea352433 100644
---- a/src/responses/xai-responses-api.ts
-+++ b/src/responses/xai-responses-api.ts
-@@ -26,7 +26,14 @@ export type XaiResponsesSystemMessage = {
- 
- export type XaiResponsesUserMessageContentPart =
-   | { type: 'input_text'; text: string }
--  | { type: 'input_image'; image_url: string };
-+  | { type: 'input_image'; image_url: string }
-+  | {
-+      type: 'input_file';
-+      file_url?: string;
-+      file_id?: string;
-+      file_data?: string;
-+      filename?: string;
-+    };
- 
- export type XaiResponsesUserMessage = {
-   role: 'user';

From 9644a008a45d9b832e274c6546eaae9c2d1b86ef Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]" <opencode-agent[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 22:31:09 +0000
Subject: [PATCH 13/33] chore: generate

---
 packages/opencode/src/provider/transform.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index e50f4b768847..8b5bcab6117a 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -1129,9 +1129,7 @@ export function options(input: {
 
   if (
     input.providerOptions?.setCacheKey !== false &&
-    (input.model.providerID === "openai" ||
-      input.model.api.npm === "@ai-sdk/xai" ||
-      input.providerOptions?.setCacheKey)
+    (input.model.providerID === "openai" || input.model.api.npm === "@ai-sdk/xai" || input.providerOptions?.setCacheKey)
   ) {
     result["promptCacheKey"] = input.sessionID
   }

From fff6764ed4ae296740650fbb107f50ffff9c0437 Mon Sep 17 00:00:00 2001
From: David Hill <1879069+iamdavidhill@users.noreply.github.com>
Date: Wed, 8 Jul 2026 23:48:11 +0100
Subject: [PATCH 14/33] fix(console): update square avatar previews (#35975)

---
 .../preview-opencode-logo-dark-square.png     | Bin 1477 -> 128611 bytes
 .../preview-opencode-logo-light-square.png    | Bin 1467 -> 92706 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/console/app/src/asset/brand/preview-opencode-logo-dark-square.png b/packages/console/app/src/asset/brand/preview-opencode-logo-dark-square.png
index 604ad7aa7a87c71d4a3972f18da4044e53f745fe..f30b4036ab035268972897f6fc82f04f8020831a 100644
GIT binary patch
literal 128611
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

literal 1477
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL9LzwG?TN?!0V$SrM_)$<hK>E)e-c@Ne1&9>
zAYTTCDm4a%h86~fUqGRT7Yq!g1`G_Z5*Qe)W-u^_7tGleXakf83GfMV1=1hiyun28
zU%gs1cdnz2jklZIqq}#b!@|5=U4d+%%7=IEM1_VzxRD_to-Qsx1sTc7KrJ6$zXlo@
zFuxY$Hi42LzhDLii5Gug>4^i8#NSshUI=lk@B-x+lf2zs7&=&GJ%Aj}0*}aI1_m)z
z5N7lYQuzQBWH0gbb!C6W#4V()m9m%>=ouDUPZ!6Kid%0la{4g^2(UVS^9^9Ux#z#*
zUM9{NA)j{pe@M$Rs$BIl=U=S8$$a1WzrRdo{gl+0z}h6r5vC9^6c`^Bx}VO;+bO}5
zvNP)ZgKMjwCMdj@`|<2Y_0Pt}1ZL)gY-~-uJS@@@9A*XrISC3k4mfNWo)RazbGPm0
z-*LChSmMOL4?kJISKi=fE3%ne|KQy6WQCxi5SK$J*`YY~T7$y$*OKq5Bzd2d?Vs~N
z@B8fph5p+U-+hzde)4_q^MCH|=dNhx2_G663hFce=0A)TEv>6k&v^?1%NErV*NBpo
z#FA92<f2p{#b9J$WTtCiq-$sxVrXGyVr*q(scm3jWnhruaU&H)LvDUbW?Cg~4U(b>
RH-Q=$JYD@<);T3K0RY|)#{mEU

diff --git a/packages/console/app/src/asset/brand/preview-opencode-logo-light-square.png b/packages/console/app/src/asset/brand/preview-opencode-logo-light-square.png
index 3964d8528440323730053e56f9d957539937b99d..6c4058402f28a990bad37b7e237b41e4f53b8cfe 100644
GIT binary patch
literal 92706
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
IC*RQj2ltPz!T<mO

literal 1467
zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL9LzwG?TN?!0V$SrM_)$<hK>E)e-c@Ne1&9>
zAYTTCDm4a%h86~fUqGRT7Yq!g1`G_Z5*Qe)W-u^_7tGleXakh+3-AeX1=5Oga+pX-
zUcR`n@W%CP=g*zh*VWm(dpD2)RHh&+YpAEUZ|@!;cmKY<7tWv4*U?$OZY@wf(5P=q
zw@e07{3Stt!3+!%FaEyL69*!Rzpq|wUamVGD8-oM?e4<R!7A$k<Zu>vL>4nJh^c}w
zqi2xH2cRH(iKnkC`zt1HA#JUc#jHSIuvmGzIEGZ*dV8@wmnlGi)v?HEMncg4sk@lD
zIaT_<lxtU%8_(QxrNqqsn)KQ9%h&DxCN=JfRETIyU~LlR2pb9vn-fWv%cJ$!m?PI+
zGv4tv%TnURa`rlle{ppQ3O5coY-nsuU}iqZ#@58k!y+xgVP+tZGdv|e#VtQu_MLV6
z?L5Ea#y9-;OWOY?C_F#SfA^^jN9a(9$sv^JP@HNicjD`}`}Y4=-!3(o@cVI9<8Hfm
z&5bti(|7$Y)|v3Q^Zn-UpA;4kk?aKV*|pOO`<V}&_gU>d_YAOLQ7v(eC`m~yNwrEY
zN(E93Mg~S^x&}tNhK3=A7FH(4Rz{ZE1_o9J1{oeVQc*PI=BH$)RpQnlDVlH-sDZ)L
L)z4*}Q$iB}B`L3|


From c33a2011c48a062ecb9bc4cb0586a818b4f07bb0 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 06:51:04 +0800
Subject: [PATCH 15/33] fix(app): prevent command palette first-open flash
 (#35858)

---
 packages/app/src/components/dialog-select-file.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/app/src/components/dialog-select-file.tsx b/packages/app/src/components/dialog-select-file.tsx
index d7c6c2a84f47..905abe1e2dd3 100644
--- a/packages/app/src/components/dialog-select-file.tsx
+++ b/packages/app/src/components/dialog-select-file.tsx
@@ -20,14 +20,11 @@ import {
   uniqueCommandPaletteEntries,
   type CommandPaletteEntry,
 } from "./command-palette"
+import { DialogCommandPaletteV2 } from "./dialog-command-palette-v2"
 
 const DialogSelectFileV2 = lazy(() =>
   import("./dialog-select-directory-v2").then((module) => ({ default: module.DialogSelectDirectoryV2 })),
 )
-const DialogCommandPaletteV2 = lazy(() =>
-  import("./dialog-command-palette-v2").then((module) => ({ default: module.DialogCommandPaletteV2 })),
-)
-
 type DialogSelectFileMode = "all" | "files"
 
 export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFile?: (path: string) => void }) {

From 7550aa4b89d652e05bf9fecd39535196db535f63 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]" <opencode-agent[bot]@users.noreply.github.com>
Date: Wed, 8 Jul 2026 22:51:45 +0000
Subject: [PATCH 16/33] chore: update nix node_modules hashes

---
 nix/hashes.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/hashes.json b/nix/hashes.json
index da7fa46acc1f..1814fdaace2e 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-KTyd2ISQ4n1E3tm1LMEHtz+rKRZga+SONn5J6H0pheQ=",
-    "aarch64-linux": "sha256-ZIeaaqRr4JorEmmwFYuitxfYEAtrP8C6IlD+pmFRko0=",
-    "aarch64-darwin": "sha256-Po8FISoBzUMwJSn6nw243/hLT/gAQCrm5HbwXe2uA0g=",
-    "x86_64-darwin": "sha256-5TZzrCnvg1z00YP6O9U0SXjL04r+VmF7LVrqQ9BbSn4="
+    "x86_64-linux": "sha256-K0V7FyvgujbeAf0Ip4SCJxcy0GpSt/H+iEwTVhvwBRQ=",
+    "aarch64-linux": "sha256-lz2GhziKY9zL4vXb2/CmlXKrmVYPF5hPFD1ZpfDOqgM=",
+    "aarch64-darwin": "sha256-vfxsqozBq40tc1v6w8xvl1HIAif8gRn6oIYrLt6fZ1c=",
+    "x86_64-darwin": "sha256-X7GAwO+8A6vwqObIHFtloDDJZO8ZUTqmplFDg1zfots="
   }
 }

From 62de2b3695a44fe44b7783322b4599b4093d3a7b Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:09:21 +1000
Subject: [PATCH 17/33] feat(app): add inline file browser tabs (#35829)

---
 .../e2e/regression/review-open-file.spec.ts   | 146 ++++++++++
 packages/app/e2e/utils/mock-server.ts         |  10 +
 packages/app/src/components/file-tree.tsx     |   3 +
 .../src/components/session-context-usage.tsx  |   5 +
 .../session/session-sortable-tab.tsx          |  16 +-
 packages/app/src/context/file.tsx             |  12 +-
 packages/app/src/context/layout-tabs.test.ts  |  82 ++++++
 packages/app/src/context/layout-tabs.ts       | 103 +++++++
 packages/app/src/context/layout.tsx           |  84 +++---
 packages/app/src/pages/session.tsx            |   2 +
 packages/app/src/pages/session/file-tabs.tsx  |  16 +-
 .../app/src/pages/session/helpers.test.ts     |  46 ++++
 packages/app/src/pages/session/helpers.ts     |  20 +-
 .../src/pages/session/session-side-panel.tsx  | 103 ++++++-
 .../pages/session/use-session-commands.tsx    |   2 +
 .../session/v2/session-file-browser-tab.tsx   | 193 ++++++++++++++
 .../pages/session/v2/session-file-list-v2.tsx |  10 +
 .../v2/components/session-file-panel-v2.tsx   |  43 +++
 .../src/v2/components/session-review-v2.tsx   | 251 +++++++++---------
 19 files changed, 968 insertions(+), 179 deletions(-)
 create mode 100644 packages/app/e2e/regression/review-open-file.spec.ts
 create mode 100644 packages/app/src/context/layout-tabs.test.ts
 create mode 100644 packages/app/src/context/layout-tabs.ts
 create mode 100644 packages/app/src/pages/session/v2/session-file-browser-tab.tsx
 create mode 100644 packages/session-ui/src/v2/components/session-file-panel-v2.tsx

diff --git a/packages/app/e2e/regression/review-open-file.spec.ts b/packages/app/e2e/regression/review-open-file.spec.ts
new file mode 100644
index 000000000000..f69591f608a6
--- /dev/null
+++ b/packages/app/e2e/regression/review-open-file.spec.ts
@@ -0,0 +1,146 @@
+import { base64Encode } from "@opencode-ai/core/util/encode"
+import { expect, test } from "@playwright/test"
+import { mockOpenCodeServer } from "../utils/mock-server"
+import { expectSessionTitle } from "../utils/waits"
+
+const directory = "C:/OpenCode/ReviewOpenFile"
+const projectID = "proj_review_open_file"
+const sessionID = "ses_review_open_file"
+const title = "Review open file"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+
+test.use({ viewport: { width: 1440, height: 900 } })
+
+test("opens and searches project files inline", async ({ page }) => {
+  const searches: { query: string; dirs?: string; limit?: number }[] = []
+  await mockOpenCodeServer(page, {
+    directory,
+    project: {
+      id: projectID,
+      worktree: directory,
+      vcs: "git",
+      name: "open-file-project",
+      time: { created: 1700000000000, updated: 1700000000000 },
+      sandboxes: [],
+    },
+    provider: {
+      all: [
+        {
+          id: "opencode",
+          name: "OpenCode",
+          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
+        },
+      ],
+      connected: ["opencode"],
+      default: { providerID: "opencode", modelID: "test" },
+    },
+    sessions: [
+      {
+        id: sessionID,
+        slug: sessionID,
+        projectID,
+        directory,
+        title,
+        version: "dev",
+        time: { created: 1700000000000, updated: 1700000000000 },
+      },
+    ],
+    vcsDiff: [fileDiff("src/changed.ts")],
+    fileList: (path) => {
+      if (path) return []
+      return [
+        fileNode("README.md"),
+        { name: "src", path: "src", absolute: `${directory}/src`, type: "directory", ignored: false },
+      ]
+    },
+    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
+    findFiles: (input) => {
+      searches.push(input)
+      return input.query === "nested" ? ["src/nested.ts"] : []
+    },
+    pageMessages: () => ({ items: [] }),
+  })
+  await page.addInitScript(
+    ({ directory, server, sessionID }) => {
+      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
+      localStorage.setItem(
+        "opencode.global.dat:server",
+        JSON.stringify({
+          projects: { local: [{ worktree: directory, expanded: true }] },
+          lastProject: { local: directory },
+        }),
+      )
+      localStorage.setItem(
+        "opencode.global.dat:layout",
+        JSON.stringify({ review: { diffStyle: "split", panelOpened: true } }),
+      )
+      localStorage.setItem(
+        "opencode.window.browser.dat:tabs",
+        JSON.stringify([{ type: "session", server, sessionId: sessionID }]),
+      )
+    },
+    { directory, server, sessionID },
+  )
+
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
+  await expectSessionTitle(page, title)
+
+  const panel = page.locator("#review-panel")
+  const contextButton = page.getByRole("button", { name: "View context usage" })
+  await contextButton.click()
+  await expect(panel.getByRole("tab", { name: "Context" })).toHaveAttribute("data-selected", "")
+  await panel.getByRole("button", { name: "Open file" }).click()
+  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
+  await contextButton.click()
+  await expect(panel.getByRole("tab", { name: "Context" })).toHaveAttribute("data-selected", "")
+  await panel.getByRole("button", { name: "Open file" }).click()
+  const filter = panel.getByRole("combobox", { name: "Filter files" })
+  await expect(filter).toBeFocused()
+  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
+  await expect(panel.getByText("open-file-project", { exact: true })).toBeVisible()
+
+  await panel.getByRole("button", { name: "README.md" }).click()
+  await expect(panel.getByRole("tab", { name: "README.md" })).toHaveAttribute("data-selected", "")
+  await expect(panel.getByText("contents:README.md", { exact: true })).toBeVisible()
+
+  await panel.getByRole("button", { name: "Open file" }).click()
+  await expect(panel.getByRole("tab", { name: "README.md" })).toHaveCount(0)
+  await filter.fill("nested")
+  const result = panel.getByRole("option", { name: /nested\.ts/ })
+  await expect(result).toBeVisible()
+  const resultID = await result.getAttribute("id")
+  expect(resultID).toBeTruthy()
+  await expect(filter).toHaveAttribute("aria-activedescendant", resultID!)
+  await filter.press("Enter")
+  await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveAttribute("data-selected", "")
+  await expect(panel.getByText("contents:src/nested.ts", { exact: true })).toBeVisible()
+  expect(searches).toContainEqual({ query: "nested", dirs: "false", limit: 200 })
+
+  await panel.getByRole("button", { name: "Open file" }).click()
+  await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveCount(1)
+  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
+  await page.keyboard.press("Control+w")
+  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveCount(0)
+  await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveAttribute("data-selected", "")
+})
+
+function fileNode(path: string) {
+  return {
+    name: path,
+    path,
+    absolute: `${directory}/${path}`,
+    type: "file",
+    ignored: false,
+  }
+}
+
+function fileDiff(file: string) {
+  return {
+    file,
+    before: "before\n",
+    after: "after\n",
+    additions: 1,
+    deletions: 1,
+    status: "modified",
+  }
+}
diff --git a/packages/app/e2e/utils/mock-server.ts b/packages/app/e2e/utils/mock-server.ts
index e5df40c7d2de..e1946b8fba0b 100644
--- a/packages/app/e2e/utils/mock-server.ts
+++ b/packages/app/e2e/utils/mock-server.ts
@@ -22,6 +22,7 @@ export interface MockServerConfig {
   questions?: unknown[] | (() => unknown[])
   fileList?: (path: string) => unknown | Promise<unknown>
   fileContent?: (path: string) => unknown | Promise<unknown>
+  findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown
   sessionStatus?: unknown
 }
 
@@ -66,6 +67,15 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
       return json(route, await config.fileList(url.searchParams.get("path") ?? ""))
     if (path === "/file/content" && config.fileContent)
       return json(route, await config.fileContent(url.searchParams.get("path") ?? ""))
+    if (path === "/find/file" && config.findFiles)
+      return json(
+        route,
+        await config.findFiles({
+          query: url.searchParams.get("query") ?? "",
+          dirs: url.searchParams.get("dirs") ?? undefined,
+          limit: url.searchParams.has("limit") ? Number(url.searchParams.get("limit")) : undefined,
+        }),
+      )
     if (path === "/api/reference")
       return json(route, {
         location: {
diff --git a/packages/app/src/components/file-tree.tsx b/packages/app/src/components/file-tree.tsx
index 93ff46d5c121..718e2f3493de 100644
--- a/packages/app/src/components/file-tree.tsx
+++ b/packages/app/src/components/file-tree.tsx
@@ -201,6 +201,7 @@ export default function FileTree(props: {
   kinds?: ReadonlyMap<string, Kind>
   draggable?: boolean
   onFileClick?: (file: FileNode) => void
+  onFileDoubleClick?: (file: FileNode) => void
 
   _filter?: Filter
   _marks?: Set<string>
@@ -440,6 +441,7 @@ export default function FileTree(props: {
                         active={props.active}
                         draggable={props.draggable}
                         onFileClick={props.onFileClick}
+                        onFileDoubleClick={props.onFileDoubleClick}
                         _filter={filter()}
                         _marks={marks()}
                         _deeps={deeps()}
@@ -462,6 +464,7 @@ export default function FileTree(props: {
                   as="button"
                   type="button"
                   onClick={() => props.onFileClick?.(node)}
+                  onDblClick={() => props.onFileDoubleClick?.(node)}
                 >
                   <div class="w-4 shrink-0" />
                   <Switch>
diff --git a/packages/app/src/components/session-context-usage.tsx b/packages/app/src/components/session-context-usage.tsx
index 7ac1aa9965d6..fd2d1dd1a30e 100644
--- a/packages/app/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
@@ -4,6 +4,7 @@ import { ProgressCircleV2 } from "@opencode-ai/ui/v2/progress-circle-v2"
 import { Button } from "@opencode-ai/ui/button"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
+import { createMediaQuery } from "@solid-primitives/media"
 
 import { useFile } from "@/context/file"
 import { useLayout } from "@/context/layout"
@@ -14,6 +15,7 @@ import { useSDK } from "@/context/sdk"
 import { getSessionContext, getSessionTokenTotal } from "@/components/session/session-context-metrics"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
+import { useSettings } from "@/context/settings"
 
 interface SessionContextUsageProps {
   variant?: "button" | "indicator"
@@ -47,8 +49,10 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
   const layout = useLayout()
   const language = useLanguage()
   const sdk = useSDK()
+  const settings = useSettings()
   const providers = useProviders(() => sdk().directory)
   const { params, tabs, view } = useSessionLayout()
+  const isDesktop = createMediaQuery("(min-width: 768px)")
 
   const variant = createMemo(() => props.variant ?? "button")
   const buttonAppearance = createMemo(() => props.buttonAppearance ?? "default")
@@ -56,6 +60,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
     tabs,
     pathFromTab: file.pathFromTab,
     normalizeTab: (tab) => (tab.startsWith("file://") ? file.tab(tab) : tab),
+    fileBrowser: () => settings.general.newLayoutDesigns() && isDesktop() && !!params.id,
   })
   const messages = createMemo(() => (params.id ? (sync().data.message[params.id] ?? []) : []))
   const info = createMemo(() => (params.id ? sync().session.get(params.id) : undefined))
diff --git a/packages/app/src/components/session/session-sortable-tab.tsx b/packages/app/src/components/session/session-sortable-tab.tsx
index f04228ca66c7..d78f392941ac 100644
--- a/packages/app/src/components/session/session-sortable-tab.tsx
+++ b/packages/app/src/components/session/session-sortable-tab.tsx
@@ -10,7 +10,7 @@ import { useFile } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { useCommand } from "@/context/command"
 
-export function FileVisual(props: { path: string; active?: boolean }): JSX.Element {
+export function FileVisual(props: { path: string; active?: boolean; temporary?: boolean }): JSX.Element {
   return (
     <div class="flex items-center gap-x-1.5 min-w-0">
       <Show
@@ -22,12 +22,19 @@ export function FileVisual(props: { path: string; active?: boolean }): JSX.Eleme
           <FileIcon node={{ path: props.path, type: "file" }} mono class="absolute inset-0 size-4 tab-fileicon-mono" />
         </span>
       </Show>
-      <span class="text-14-medium truncate">{getFilename(props.path)}</span>
+      <span class="text-14-medium truncate" classList={{ italic: props.temporary }}>
+        {getFilename(props.path)}
+      </span>
     </div>
   )
 }
 
-export function SortableTab(props: { tab: string; onTabClose: (tab: string) => void }): JSX.Element {
+export function SortableTab(props: {
+  tab: string
+  temporary?: boolean
+  onTabClose: (tab: string) => void
+  onTabDoubleClick?: (tab: string) => void
+}): JSX.Element {
   const file = useFile()
   const language = useLanguage()
   const command = useCommand()
@@ -36,7 +43,7 @@ export function SortableTab(props: { tab: string; onTabClose: (tab: string) => v
   const content = createMemo(() => {
     const value = path()
     if (!value) return
-    return <FileVisual path={value} />
+    return <FileVisual path={value} temporary={props.temporary} />
   })
   return (
     <div use:sortable class="h-full flex items-center" classList={{ "opacity-0": sortable.isActiveDraggable }}>
@@ -61,6 +68,7 @@ export function SortableTab(props: { tab: string; onTabClose: (tab: string) => v
           }
           hideCloseButton
           onMiddleClick={() => props.onTabClose(props.tab)}
+          onDblClick={() => props.onTabDoubleClick?.(props.tab)}
         >
           <Show when={content()}>{(value) => value()}</Show>
         </Tabs.Trigger>
diff --git a/packages/app/src/context/file.tsx b/packages/app/src/context/file.tsx
index f7668c19492b..6032b81dde70 100644
--- a/packages/app/src/context/file.tsx
+++ b/packages/app/src/context/file.tsx
@@ -203,12 +203,15 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
       return promise
     }
 
-    const search = (query: string, dirs: "true" | "false") =>
+    const search = (query: string, dirs: "true" | "false", options?: { limit?: number; signal?: AbortSignal }) =>
       sdk()
-        .client.find.files({ query, dirs })
+        .client.find.files({ query, dirs, limit: options?.limit }, { signal: options?.signal })
         .then(
           (x) => (x.data ?? []).map(path.normalize),
-          () => [],
+          (error) => {
+            if (options?.signal?.aborted) throw error
+            return []
+          },
         )
 
     const stop = sdk().event.listen((e) => {
@@ -284,7 +287,8 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
       setScrollLeft,
       selectedLines,
       setSelectedLines,
-      searchFiles: (query: string) => search(query, "false"),
+      searchFiles: (query: string, options?: { limit?: number; signal?: AbortSignal }) =>
+        search(query, "false", options),
       searchFilesAndDirectories: (query: string) => search(query, "true"),
     }
   },
diff --git a/packages/app/src/context/layout-tabs.test.ts b/packages/app/src/context/layout-tabs.test.ts
new file mode 100644
index 000000000000..646ed086cef9
--- /dev/null
+++ b/packages/app/src/context/layout-tabs.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, test } from "bun:test"
+import {
+  SESSION_OPEN_FILE_TAB,
+  closeSessionTab,
+  openSessionTab,
+  previewSessionTab,
+  type SessionTabState,
+} from "./layout-tabs"
+
+const state = (all: string[], active?: string, preview?: string): SessionTabState => ({
+  tabs: { all, active },
+  preview,
+})
+
+describe("previewSessionTab", () => {
+  test("appends the Open File placeholder", () => {
+    expect(previewSessionTab(state(["file://a.ts"], "file://a.ts"), SESSION_OPEN_FILE_TAB)).toEqual(
+      state(["file://a.ts", SESSION_OPEN_FILE_TAB], SESSION_OPEN_FILE_TAB, SESSION_OPEN_FILE_TAB),
+    )
+  })
+
+  test("replaces the current preview in place", () => {
+    expect(
+      previewSessionTab(
+        state(["context", SESSION_OPEN_FILE_TAB, "file://b.ts"], SESSION_OPEN_FILE_TAB, SESSION_OPEN_FILE_TAB),
+        "file://a.ts",
+      ),
+    ).toEqual(state(["context", "file://a.ts", "file://b.ts"], "file://a.ts", "file://a.ts"))
+  })
+
+  test("activates a durable tab without duplicating it", () => {
+    expect(
+      previewSessionTab(
+        state(["file://a.ts", SESSION_OPEN_FILE_TAB, "file://b.ts"], SESSION_OPEN_FILE_TAB, SESSION_OPEN_FILE_TAB),
+        "file://b.ts",
+      ),
+    ).toEqual(state(["file://a.ts", "file://b.ts"], "file://b.ts"))
+  })
+
+  test("replaces a restored Open File placeholder", () => {
+    expect(
+      previewSessionTab(state(["file://a.ts", SESSION_OPEN_FILE_TAB], SESSION_OPEN_FILE_TAB), "file://b.ts"),
+    ).toEqual(state(["file://a.ts", "file://b.ts"], "file://b.ts", "file://b.ts"))
+  })
+})
+
+describe("openSessionTab", () => {
+  test("pins the current preview", () => {
+    expect(openSessionTab(state(["file://a.ts"], "file://a.ts", "file://a.ts"), "file://a.ts")).toEqual(
+      state(["file://a.ts"], "file://a.ts"),
+    )
+  })
+
+  test("replaces a preview with a directly opened file", () => {
+    expect(openSessionTab(state(["file://a.ts"], "file://a.ts", "file://a.ts"), "file://b.ts")).toEqual(
+      state(["file://b.ts"], "file://b.ts"),
+    )
+  })
+
+  test("keeps the preview when switching to Review", () => {
+    expect(openSessionTab(state(["file://a.ts"], "file://a.ts", "file://a.ts"), "review")).toEqual(
+      state(["file://a.ts"], "review", "file://a.ts"),
+    )
+  })
+
+  test("replaces a restored Open File placeholder with a direct open", () => {
+    expect(openSessionTab(state(["file://a.ts", SESSION_OPEN_FILE_TAB], SESSION_OPEN_FILE_TAB), "file://b.ts")).toEqual(
+      state(["file://a.ts", "file://b.ts"], "file://b.ts"),
+    )
+  })
+})
+
+describe("closeSessionTab", () => {
+  test("clears preview metadata and selects the left neighbor", () => {
+    expect(
+      closeSessionTab(
+        state(["file://a.ts", "file://b.ts", "file://c.ts"], "file://b.ts", "file://b.ts"),
+        "file://b.ts",
+      ),
+    ).toEqual(state(["file://a.ts", "file://c.ts"], "file://a.ts"))
+  })
+})
diff --git a/packages/app/src/context/layout-tabs.ts b/packages/app/src/context/layout-tabs.ts
new file mode 100644
index 000000000000..ea4c675ff4ec
--- /dev/null
+++ b/packages/app/src/context/layout-tabs.ts
@@ -0,0 +1,103 @@
+export const SESSION_OPEN_FILE_TAB = "open-file"
+
+export type SessionTabs = {
+  active?: string
+  all: string[]
+}
+
+export type SessionTabState = {
+  tabs: SessionTabs
+  preview?: string
+}
+
+const sessionTabPreview = (current: SessionTabState) =>
+  current.preview ?? (current.tabs.all.includes(SESSION_OPEN_FILE_TAB) ? SESSION_OPEN_FILE_TAB : undefined)
+
+export function previewSessionTab(current: SessionTabState, tab: string): SessionTabState {
+  const preview = sessionTabPreview(current)
+  const previewIndex = preview ? current.tabs.all.indexOf(preview) : -1
+  const existingIndex = current.tabs.all.indexOf(tab)
+
+  if (existingIndex !== -1) {
+    if (previewIndex === -1 || preview === tab) {
+      return { tabs: { all: current.tabs.all, active: tab }, preview: preview === tab ? tab : undefined }
+    }
+    return {
+      tabs: { all: current.tabs.all.filter((item) => item !== preview), active: tab },
+    }
+  }
+
+  if (previewIndex === -1) {
+    return { tabs: { all: [...current.tabs.all, tab], active: tab }, preview: tab }
+  }
+
+  return {
+    tabs: {
+      all: current.tabs.all.map((item, index) => (index === previewIndex ? tab : item)),
+      active: tab,
+    },
+    preview: tab,
+  }
+}
+
+export function openSessionTab(current: SessionTabState, tab: string): SessionTabState {
+  const preview = sessionTabPreview(current)
+  if (tab === "review") {
+    return {
+      tabs: { all: current.tabs.all.filter((item) => item !== tab), active: tab },
+      preview,
+    }
+  }
+
+  if (tab === "context") {
+    return {
+      tabs: { all: [tab, ...current.tabs.all.filter((item) => item !== tab)], active: tab },
+      preview,
+    }
+  }
+
+  const previewIndex = preview ? current.tabs.all.indexOf(preview) : -1
+  const existingIndex = current.tabs.all.indexOf(tab)
+  if (existingIndex !== -1) {
+    if (previewIndex === -1 || preview === tab) {
+      return { tabs: { all: current.tabs.all, active: tab } }
+    }
+    return {
+      tabs: { all: current.tabs.all.filter((item) => item !== preview), active: tab },
+    }
+  }
+
+  if (previewIndex === -1) {
+    return { tabs: { all: [...current.tabs.all, tab], active: tab } }
+  }
+
+  return {
+    tabs: {
+      all: current.tabs.all.map((item, index) => (index === previewIndex ? tab : item)),
+      active: tab,
+    },
+  }
+}
+
+export function closeSessionTab(current: SessionTabState, tab: string): SessionTabState {
+  if (tab === "review") {
+    if (current.tabs.active !== tab) return current
+    return {
+      tabs: { all: current.tabs.all, active: current.tabs.all[0] },
+      preview: current.preview,
+    }
+  }
+
+  const all = current.tabs.all.filter((item) => item !== tab)
+  const preview = current.preview === tab ? undefined : current.preview
+  if (current.tabs.active !== tab) return { tabs: { ...current.tabs, all }, preview }
+
+  const index = current.tabs.all.indexOf(tab)
+  return {
+    tabs: {
+      all,
+      active: current.tabs.all[index - 1] ?? current.tabs.all[index + 1] ?? all[0],
+    },
+    preview,
+  }
+}
diff --git a/packages/app/src/context/layout.tsx b/packages/app/src/context/layout.tsx
index b09a77eb339a..3b2b34752b8d 100644
--- a/packages/app/src/context/layout.tsx
+++ b/packages/app/src/context/layout.tsx
@@ -19,6 +19,7 @@ import { migrateLegacySessionStateKeys, ServerScope, SessionStateKey } from "@/u
 import { createSessionKeyReader, ensureSessionKey, pruneSessionKeys } from "./layout-helpers"
 import { requireServerKey } from "@/utils/session-route"
 import { type DraftTab, useTabs } from "./tabs"
+import { closeSessionTab, openSessionTab, previewSessionTab, type SessionTabs } from "./layout-tabs"
 
 export { createSessionKeyReader, ensureSessionKey, pruneSessionKeys }
 
@@ -55,11 +56,6 @@ export function getProjectAvatarVariant(key?: string): ProjectAvatarVariant {
   return "gray"
 }
 
-type SessionTabs = {
-  active?: string
-  all: string[]
-}
-
 type SessionView = {
   scroll: Record<string, SessionScroll>
   reviewOpen?: string[]
@@ -87,14 +83,6 @@ export type LayoutRoute =
   | { type: "dir-new-sesssion"; dir: string; dirBase64: string; server?: ServerConnection.Key }
   | { type: "session"; sessionId: string; server?: ServerConnection.Key }
 
-function nextSessionTabsForOpen(current: SessionTabs | undefined, tab: string): SessionTabs {
-  const all = current?.all ?? []
-  if (tab === "review") return { all: all.filter((x) => x !== "review"), active: tab }
-  if (tab === "context") return { all: [tab, ...all.filter((x) => x !== tab)], active: tab }
-  if (!all.includes(tab)) return { all: [...all, tab], active: tab }
-  return { all, active: tab }
-}
-
 const sessionPath = (key: string) => {
   const dir = SessionStateKey.route(key).split("/")[0]
   if (!dir) return
@@ -308,6 +296,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
     )
     const [ephemeral, setEphemeral] = createStore({
       reviewPanelSource: "other" as ReviewPanelSource,
+      sessionTabPreview: {} as Record<string, string | undefined>,
     })
 
     const MAX_SESSION_KEYS = 50
@@ -366,6 +355,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
 
       scroll.drop(drop)
       dropSessionState(drop)
+      setEphemeral(
+        "sessionTabPreview",
+        produce((draft) => {
+          for (const key of drop) delete draft[key]
+        }),
+      )
 
       for (const key of drop) {
         usage.used.delete(key)
@@ -945,10 +940,17 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
         const tabs = createMemo(() => store.sessionTabs[key()] ?? { all: [] })
         const normalize = (tab: string) => normalizeSessionTab(path(), tab)
         const normalizeAll = (all: string[]) => normalizeSessionTabList(path(), all)
+        const apply = (session: string, next: ReturnType<typeof openSessionTab>) => {
+          batch(() => {
+            setStore("sessionTabs", session, next.tabs)
+            setEphemeral("sessionTabPreview", session, next.preview)
+          })
+        }
         return {
           tabs,
           active: createMemo(() => tabs().active),
           all: createMemo(() => tabs().all.filter((tab) => tab !== "review")),
+          preview: createMemo(() => ephemeral.sessionTabPreview[key()]),
           setActive(tab: string | undefined) {
             const session = key()
             const next = tab ? normalize(tab) : tab
@@ -961,40 +963,44 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
           setAll(all: string[]) {
             const session = key()
             const next = normalizeAll(all).filter((tab) => tab !== "review")
-            if (!store.sessionTabs[session]) {
-              setStore("sessionTabs", session, { all: next, active: undefined })
-            } else {
-              setStore("sessionTabs", session, "all", next)
-            }
+            batch(() => {
+              if (!store.sessionTabs[session]) {
+                setStore("sessionTabs", session, { all: next, active: undefined })
+              } else {
+                setStore("sessionTabs", session, "all", next)
+              }
+              const preview = ephemeral.sessionTabPreview[session]
+              if (preview && !next.includes(preview)) setEphemeral("sessionTabPreview", session, undefined)
+            })
           },
           async open(tab: string) {
             const session = key()
-            const next = nextSessionTabsForOpen(store.sessionTabs[session], normalize(tab))
-            setStore("sessionTabs", session, next)
+            apply(
+              session,
+              openSessionTab(
+                { tabs: store.sessionTabs[session] ?? { all: [] }, preview: ephemeral.sessionTabPreview[session] },
+                normalize(tab),
+              ),
+            )
+          },
+          previewTab(tab: string) {
+            const session = key()
+            apply(
+              session,
+              previewSessionTab(
+                { tabs: store.sessionTabs[session] ?? { all: [] }, preview: ephemeral.sessionTabPreview[session] },
+                normalize(tab),
+              ),
+            )
           },
           close(tab: string) {
             const session = key()
             const current = store.sessionTabs[session]
             if (!current) return
-
-            if (tab === "review") {
-              if (current.active !== tab) return
-              setStore("sessionTabs", session, "active", current.all[0])
-              return
-            }
-
-            const all = current.all.filter((x) => x !== tab)
-            if (current.active !== tab) {
-              setStore("sessionTabs", session, "all", all)
-              return
-            }
-
-            const index = current.all.findIndex((f) => f === tab)
-            const next = current.all[index - 1] ?? current.all[index + 1] ?? all[0]
-            batch(() => {
-              setStore("sessionTabs", session, "all", all)
-              setStore("sessionTabs", session, "active", next)
-            })
+            apply(
+              session,
+              closeSessionTab({ tabs: current, preview: ephemeral.sessionTabPreview[session] }, normalize(tab)),
+            )
           },
           move(tab: string, to: number) {
             const session = key()
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 84f6b013092b..6080e5c95f91 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1019,6 +1019,7 @@ export default function Page() {
     setActiveMessage,
     focusInput,
     review: reviewTab,
+    fileBrowser: () => newSessionDesign() && isDesktop() && !!params.id,
   })
 
   const openReviewFile = createOpenReviewFile({
@@ -2177,6 +2178,7 @@ export default function Page() {
                     reviewHasFocusableContent={() => hasReview() || reviewV2State.sidebarOpened()}
                     reviewCount={reviewCount}
                     reviewPanel={reviewPanelV2}
+                    fileBrowserState={reviewV2State}
                     activeDiff={tree.activeDiff}
                     focusReviewDiff={focusReviewDiff}
                     reviewSnap={ui.reviewSnap}
diff --git a/packages/app/src/pages/session/file-tabs.tsx b/packages/app/src/pages/session/file-tabs.tsx
index 7d110ee54463..dd51dd05852e 100644
--- a/packages/app/src/pages/session/file-tabs.tsx
+++ b/packages/app/src/pages/session/file-tabs.tsx
@@ -172,6 +172,14 @@ function createScrollSync(input: { tab: () => string; view: ReturnType<typeof us
 }
 
 export function FileTabContent(props: { tab: string }) {
+  return (
+    <Tabs.Content value={props.tab}>
+      <SessionFileView tab={props.tab} />
+    </Tabs.Content>
+  )
+}
+
+export function SessionFileView(props: { tab: string }) {
   const file = useFile()
   const comments = useComments()
   const language = useLanguage()
@@ -439,8 +447,8 @@ export function FileTabContent(props: { tab: string }) {
     </div>
   )
 
-  return (
-    <Tabs.Content value={props.tab} class="mt-3 relative h-full">
+  const content = () => (
+    <div class="mt-3 relative h-full min-h-0">
       <ScrollView class="h-full" viewportRef={scrollSync.setViewport} onScroll={scrollSync.handleScroll as any}>
         <Switch>
           <Match when={state()?.loaded}>{renderFile(contents())}</Match>
@@ -450,6 +458,8 @@ export function FileTabContent(props: { tab: string }) {
           <Match when={state()?.error}>{(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}</Match>
         </Switch>
       </ScrollView>
-    </Tabs.Content>
+    </div>
   )
+
+  return content()
 }
diff --git a/packages/app/src/pages/session/helpers.test.ts b/packages/app/src/pages/session/helpers.test.ts
index b70917ae9b0e..c04502562805 100644
--- a/packages/app/src/pages/session/helpers.test.ts
+++ b/packages/app/src/pages/session/helpers.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, test } from "bun:test"
 import { createMemo, createRoot } from "solid-js"
 import { createStore } from "solid-js/store"
 import {
+  SESSION_OPEN_FILE_TAB,
   createOpenReviewFile,
   createOpenSessionFileTab,
   createSessionTabs,
@@ -165,4 +166,49 @@ describe("createSessionTabs", () => {
       dispose()
     })
   })
+
+  test("exposes the Open File tab without treating it as a file tab", () => {
+    createRoot((dispose) => {
+      const [state] = createStore({
+        active: SESSION_OPEN_FILE_TAB as string | undefined,
+        all: ["file://src/a.ts", SESSION_OPEN_FILE_TAB],
+      })
+      const tabs = createMemo(() => ({ active: () => state.active, all: () => state.all }))
+      const result = createSessionTabs({
+        tabs,
+        pathFromTab: (tab) => (tab.startsWith("file://") ? tab.slice("file://".length) : undefined),
+        normalizeTab: (tab) => tab,
+        fileBrowser: () => true,
+      })
+
+      expect(result.openFileOpen()).toBe(true)
+      expect(result.panelTabs()).toEqual(["file://src/a.ts", SESSION_OPEN_FILE_TAB])
+      expect(result.openedTabs()).toEqual(["file://src/a.ts"])
+      expect(result.activeTab()).toBe(SESSION_OPEN_FILE_TAB)
+      expect(result.activeFileTab()).toBeUndefined()
+      expect(result.closableTab()).toBe(SESSION_OPEN_FILE_TAB)
+      dispose()
+    })
+  })
+
+  test("hides the Open File placeholder when the file browser is unavailable", () => {
+    createRoot((dispose) => {
+      const [state] = createStore({
+        active: SESSION_OPEN_FILE_TAB as string | undefined,
+        all: ["file://src/a.ts", SESSION_OPEN_FILE_TAB],
+      })
+      const tabs = createMemo(() => ({ active: () => state.active, all: () => state.all }))
+      const result = createSessionTabs({
+        tabs,
+        pathFromTab: (tab) => (tab.startsWith("file://") ? tab.slice("file://".length) : undefined),
+        normalizeTab: (tab) => tab,
+        fileBrowser: () => false,
+      })
+
+      expect(result.openFileOpen()).toBe(false)
+      expect(result.panelTabs()).toEqual(["file://src/a.ts"])
+      expect(result.activeTab()).toBe("file://src/a.ts")
+      dispose()
+    })
+  })
 })
diff --git a/packages/app/src/pages/session/helpers.ts b/packages/app/src/pages/session/helpers.ts
index fcbc681acdea..c43f6bc6a365 100644
--- a/packages/app/src/pages/session/helpers.ts
+++ b/packages/app/src/pages/session/helpers.ts
@@ -2,6 +2,9 @@ import { batch, createMemo, onCleanup, onMount, type Accessor } from "solid-js"
 import { createStore } from "solid-js/store"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { same } from "@/utils/same"
+import { SESSION_OPEN_FILE_TAB } from "@/context/layout-tabs"
+
+export { SESSION_OPEN_FILE_TAB } from "@/context/layout-tabs"
 
 const emptyTabs: string[] = []
 
@@ -16,6 +19,7 @@ type TabsInput = {
   normalizeTab: (tab: string) => string
   review?: Accessor<boolean>
   hasReview?: Accessor<boolean>
+  fileBrowser?: Accessor<boolean>
 }
 
 export const getSessionKey = (dir: string | undefined, id: string | undefined) => `${dir ?? ""}${id ? `/${id}` : ""}`
@@ -27,8 +31,14 @@ export function shouldShowFileTree(input: { visible: boolean; opened: boolean })
 export const createSessionTabs = (input: TabsInput) => {
   const review = input.review ?? (() => false)
   const hasReview = input.hasReview ?? (() => false)
+  const fileBrowser = input.fileBrowser ?? (() => false)
   const contextOpen = createMemo(() => input.tabs().active() === "context" || input.tabs().all().includes("context"))
-  const openedTabs = createMemo(
+  const openFileOpen = createMemo(
+    () =>
+      fileBrowser() &&
+      (input.tabs().active() === SESSION_OPEN_FILE_TAB || input.tabs().all().includes(SESSION_OPEN_FILE_TAB)),
+  )
+  const panelTabs = createMemo(
     () => {
       const seen = new Set<string>()
       return input
@@ -36,6 +46,7 @@ export const createSessionTabs = (input: TabsInput) => {
         .all()
         .flatMap((tab) => {
           if (tab === "context" || tab === "review") return []
+          if (tab === SESSION_OPEN_FILE_TAB && !fileBrowser()) return []
           const value = input.pathFromTab(tab) ? input.normalizeTab(tab) : tab
           if (seen.has(value)) return []
           seen.add(value)
@@ -45,9 +56,13 @@ export const createSessionTabs = (input: TabsInput) => {
     emptyTabs,
     { equals: same },
   )
+  const openedTabs = createMemo(() => panelTabs().filter((tab) => tab !== SESSION_OPEN_FILE_TAB), emptyTabs, {
+    equals: same,
+  })
   const activeTab = createMemo(() => {
     const active = input.tabs().active()
     if (active === "context") return active
+    if (active === SESSION_OPEN_FILE_TAB && openFileOpen()) return active
     if (active === "review" && review()) return active
     if (active && input.pathFromTab(active)) return input.normalizeTab(active)
 
@@ -65,12 +80,15 @@ export const createSessionTabs = (input: TabsInput) => {
   const closableTab = createMemo(() => {
     const active = activeTab()
     if (active === "context") return active
+    if (active === SESSION_OPEN_FILE_TAB && openFileOpen()) return active
     if (!openedTabs().includes(active)) return
     return active
   })
 
   return {
     contextOpen,
+    openFileOpen,
+    panelTabs,
     openedTabs,
     activeTab,
     activeFileTab,
diff --git a/packages/app/src/pages/session/session-side-panel.tsx b/packages/app/src/pages/session/session-side-panel.tsx
index 3f44aba48832..1ea20459c805 100644
--- a/packages/app/src/pages/session/session-side-panel.tsx
+++ b/packages/app/src/pages/session/session-side-panel.tsx
@@ -3,6 +3,7 @@ import { createStore } from "solid-js/store"
 import { createMediaQuery } from "@solid-primitives/media"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { IconButton } from "@opencode-ai/ui/icon-button"
+import { Icon } from "@opencode-ai/ui/icon"
 import { TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Mark } from "@opencode-ai/ui/logo"
@@ -23,10 +24,10 @@ import { useFile, type SelectedLineRange } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { useSettings } from "@/context/settings"
-import { useSync } from "@/context/sync"
 import { createFileTabListSync } from "@/pages/session/file-tab-scroll"
 import { FileTabContent } from "@/pages/session/file-tabs"
 import {
+  SESSION_OPEN_FILE_TAB,
   createOpenSessionFileTab,
   createSessionTabs,
   getTabReorderIndex,
@@ -35,6 +36,7 @@ import {
 } from "@/pages/session/helpers"
 import { setSessionHandoff } from "@/pages/session/handoff"
 import { useSessionLayout } from "@/pages/session/session-layout"
+import { SessionFileBrowserTab, type SessionFileBrowserState } from "@/pages/session/v2/session-file-browser-tab"
 
 type RenderDiff = (SnapshotFileDiff & { file: string }) | VcsFileDiff
 
@@ -51,6 +53,7 @@ export function SessionSidePanel(props: {
   reviewHasFocusableContent: () => boolean
   reviewCount: () => number
   reviewPanel: () => JSX.Element
+  fileBrowserState?: SessionFileBrowserState
   activeDiff?: string
   focusReviewDiff: (path: string) => void
   reviewSnap: boolean
@@ -59,7 +62,6 @@ export function SessionSidePanel(props: {
 }) {
   const layout = useLayout()
   const settings = useSettings()
-  const sync = useSync()
   const file = useFile()
   const language = useLanguage()
   const command = useCommand()
@@ -155,8 +157,10 @@ export function SessionSidePanel(props: {
     normalizeTab,
     review: reviewTab,
     hasReview: props.canReview,
+    fileBrowser: () => !!props.fileBrowserState,
   })
   const contextOpen = tabState.contextOpen
+  const panelTabs = tabState.panelTabs
   const openedTabs = tabState.openedTabs
   const activeTab = tabState.activeTab
   const activeFileTab = tabState.activeFileTab
@@ -180,6 +184,33 @@ export function SessionSidePanel(props: {
   const [store, setStore] = createStore({
     activeDraggable: undefined as string | undefined,
   })
+  let fileFilter: HTMLInputElement | undefined
+  const temporaryTab = tabs().preview
+  const previewTab = (value: string) => {
+    const next = normalizeTab(value)
+    tabs().previewTab(next)
+    const path = file.pathFromTab(next)
+    if (path) void file.load(path)
+    openReviewPanel()
+    queueMicrotask(() => tabs().setActive(next))
+  }
+  const openFileBrowser = () => {
+    previewTab(SESSION_OPEN_FILE_TAB)
+    queueMicrotask(() => fileFilter?.focus())
+  }
+  const activateTab = (value: string) => {
+    const next = normalizeTab(value)
+    const path = file.pathFromTab(next)
+    if (path) void file.load(path)
+    openReviewPanel()
+    tabs().setActive(next)
+  }
+  const browserTab = createMemo(() => {
+    if (!props.fileBrowserState) return undefined
+    if (activeTab() === SESSION_OPEN_FILE_TAB) return SESSION_OPEN_FILE_TAB
+    return activeFileTab()
+  })
+  const browserKinds = createMemo(() => new Map([...kinds()].filter(([, kind]) => kind !== "mix")))
 
   const handleDragStart = (event: unknown) => {
     const id = getDraggableId(event)
@@ -265,7 +296,7 @@ export function SessionSidePanel(props: {
                 >
                   <DragDropSensors />
                   <ConstrainDragYAxis />
-                  <Tabs value={activeTab()} onChange={openTab}>
+                  <Tabs value={activeTab()} onChange={activateTab}>
                     <div class="sticky top-0 shrink-0 flex">
                       <Tabs.List
                         ref={(el: HTMLDivElement) => {
@@ -316,7 +347,48 @@ export function SessionSidePanel(props: {
                           </Tabs.Trigger>
                         </Show>
                         <SortableProvider ids={openedTabs()}>
-                          <For each={openedTabs()}>{(tab) => <SortableTab tab={tab} onTabClose={tabs().close} />}</For>
+                          <For each={panelTabs()}>
+                            {(tab) => (
+                              <Show
+                                when={tab === SESSION_OPEN_FILE_TAB}
+                                fallback={
+                                  <SortableTab
+                                    tab={tab}
+                                    temporary={temporaryTab() === tab}
+                                    onTabClose={tabs().close}
+                                    onTabDoubleClick={temporaryTab() === tab ? openTab : undefined}
+                                  />
+                                }
+                              >
+                                <Tabs.Trigger
+                                  value={SESSION_OPEN_FILE_TAB}
+                                  closeButton={
+                                    <TooltipKeybind
+                                      title={language.t("common.closeTab")}
+                                      keybind={command.keybind("tab.close")}
+                                      placement="bottom"
+                                      gutter={10}
+                                    >
+                                      <IconButton
+                                        icon="close-small"
+                                        variant="ghost"
+                                        class="h-5 w-5"
+                                        onClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
+                                        aria-label={language.t("common.closeTab")}
+                                      />
+                                    </TooltipKeybind>
+                                  }
+                                  hideCloseButton
+                                  onMiddleClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
+                                >
+                                  <div class="flex items-center gap-1.5 italic">
+                                    <Icon name="open-file" size="small" />
+                                    <span>{language.t("command.file.open")}</span>
+                                  </div>
+                                </Tabs.Trigger>
+                              </Show>
+                            )}
+                          </For>
                         </SortableProvider>
                         <div class="bg-background-stronger h-full shrink-0 sticky right-0 z-10 flex items-center justify-center pr-3">
                           <TooltipKeybind
@@ -330,6 +402,10 @@ export function SessionSidePanel(props: {
                               iconSize="large"
                               class="!rounded-md"
                               onClick={() => {
+                                if (props.fileBrowserState) {
+                                  openFileBrowser()
+                                  return
+                                }
                                 void import("@/components/dialog-select-file").then((x) => {
                                   dialog.show(() => <x.DialogSelectFile mode="files" onOpenFile={showAllFiles} />)
                                 })
@@ -380,7 +456,20 @@ export function SessionSidePanel(props: {
                       </Tabs.Content>
                     </Show>
 
-                    <Show when={activeFileTab()} keyed>
+                    <Show when={browserTab()}>
+                      <SessionFileBrowserTab
+                        tab={browserTab()!}
+                        placeholder={browserTab() === SESSION_OPEN_FILE_TAB}
+                        active={file.pathFromTab(browserTab()!)}
+                        kinds={browserKinds()}
+                        state={props.fileBrowserState!}
+                        onSelect={(path) => previewTab(file.tab(path))}
+                        onSelectPermanent={(path) => openTab(file.tab(path))}
+                        filterRef={(element) => (fileFilter = element)}
+                      />
+                    </Show>
+
+                    <Show when={!props.fileBrowserState && activeFileTab()} keyed>
                       {(tab) => <FileTabContent tab={tab} />}
                     </Show>
                   </Tabs>
@@ -390,7 +479,9 @@ export function SessionSidePanel(props: {
                         const path = file.pathFromTab(tab)
                         return (
                           <div data-component="tabs-drag-preview">
-                            <Show when={path}>{(p) => <FileVisual active path={p()} />}</Show>
+                            <Show when={path}>
+                              {(p) => <FileVisual active path={p()} temporary={temporaryTab() === tab} />}
+                            </Show>
                           </div>
                         )
                       }}
diff --git a/packages/app/src/pages/session/use-session-commands.tsx b/packages/app/src/pages/session/use-session-commands.tsx
index 3c965b8ac8f8..e23268c64bbb 100644
--- a/packages/app/src/pages/session/use-session-commands.tsx
+++ b/packages/app/src/pages/session/use-session-commands.tsx
@@ -25,6 +25,7 @@ export type SessionCommandContext = {
   setActiveMessage: (message: UserMessage | undefined) => void
   focusInput: () => void
   review?: () => boolean
+  fileBrowser?: () => boolean
 }
 
 const withCategory = (category: string) => {
@@ -83,6 +84,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
     normalizeTab,
     review: actions.review,
     hasReview,
+    fileBrowser: actions.fileBrowser,
   })
   const activeFileTab = tabState.activeFileTab
   const closableTab = tabState.closableTab
diff --git a/packages/app/src/pages/session/v2/session-file-browser-tab.tsx b/packages/app/src/pages/session/v2/session-file-browser-tab.tsx
new file mode 100644
index 000000000000..597ebd3f7edc
--- /dev/null
+++ b/packages/app/src/pages/session/v2/session-file-browser-tab.tsx
@@ -0,0 +1,193 @@
+import { createMemo, createSignal, createUniqueId, Show } from "solid-js"
+import { createQuery } from "@tanstack/solid-query"
+import { Tabs } from "@opencode-ai/ui/tabs"
+import { Icon } from "@opencode-ai/ui/icon"
+import {
+  SessionFilePanelV2,
+  SessionFilePanelV2Empty,
+  SessionFilePanelV2Title,
+} from "@opencode-ai/session-ui/v2/session-file-panel-v2"
+import { SessionReviewV2Sidebar, SessionReviewV2SidebarToggle } from "@opencode-ai/session-ui/v2/session-review-v2"
+import FileTree, { type Kind } from "@/components/file-tree"
+import { useFile } from "@/context/file"
+import { useLanguage } from "@/context/language"
+import { useLayout } from "@/context/layout"
+import { useSDK } from "@/context/sdk"
+import { displayName } from "@/pages/layout/helpers"
+import { useSessionLayout } from "@/pages/session/session-layout"
+import { SessionFileView } from "@/pages/session/file-tabs"
+import { applyFileListKeyDown, SessionFileListV2 } from "@/pages/session/v2/session-file-list-v2"
+import { pathKey } from "@/utils/path-key"
+
+const emptyFiles: string[] = []
+
+export type SessionFileBrowserState = {
+  sidebarOpened: () => boolean
+  sidebarWidth: () => number
+  resizeSidebar: (width: number) => void
+  toggleSidebar: () => void
+}
+
+export function SessionFileBrowserTab(props: {
+  tab: string
+  placeholder: boolean
+  active?: string
+  kinds: ReadonlyMap<string, Kind>
+  state: SessionFileBrowserState
+  onSelect: (path: string) => void
+  onSelectPermanent: (path: string) => void
+  filterRef?: (element: HTMLInputElement) => void
+}) {
+  const file = useFile()
+  const language = useLanguage()
+  const layout = useLayout()
+  const sdk = useSDK()
+  const { workspaceKey } = useSessionLayout()
+  const resultsID = `session-file-browser-results-${createUniqueId()}`
+  const [filter, setFilter] = createSignal("")
+  const [explicitHighlight, setExplicitHighlight] = createSignal<string>()
+  const query = createMemo(() => filter().trim())
+  const search = createQuery(() => {
+    const value = query()
+    return {
+      queryKey: ["session-open-file", workspaceKey(), value] as const,
+      enabled: value.length > 0,
+      queryFn: ({ signal }) => file.searchFiles(value, { limit: 200, signal }),
+    }
+  })
+  const files = createMemo(() => {
+    if (!query() || search.isPending) return emptyFiles
+    return [...new Set(search.data ?? emptyFiles)]
+  })
+  const highlighted = createMemo(() => {
+    const values = files()
+    if (values.length === 0) return undefined
+    const explicit = explicitHighlight()
+    if (explicit && values.includes(explicit)) return explicit
+    return values[0]
+  })
+  const loading = createMemo(() => query().length > 0 && search.isPending)
+  const project = createMemo(() => {
+    const directory = pathKey(sdk().directory)
+    return layout.projects
+      .list()
+      .find(
+        (item) =>
+          pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
+      )
+  })
+  const title = createMemo(() => displayName(project() ?? { worktree: sdk().directory }))
+  const optionID = (path: string) => `${resultsID}-option-${files().indexOf(path)}`
+
+  const onFilterKeyDown = (event: KeyboardEvent & { currentTarget: HTMLInputElement }) => {
+    if (event.key === "Escape" && query()) {
+      event.preventDefault()
+      setFilter("")
+      return
+    }
+    if (!query()) return
+    applyFileListKeyDown(event, files(), highlighted(), {
+      onHighlight: setExplicitHighlight,
+      onSelect: props.onSelectPermanent,
+    })
+  }
+
+  return (
+    <Tabs.Content value={props.tab} class="h-full min-h-0 overflow-hidden">
+      <SessionFilePanelV2
+        toolbar
+        toolbarStart={
+          <>
+            <SessionReviewV2SidebarToggle opened={props.state.sidebarOpened()} onToggle={props.state.toggleSidebar} />
+            <Show when={!props.state.sidebarOpened()}>
+              <SessionFilePanelV2Title>{title()}</SessionFilePanelV2Title>
+            </Show>
+          </>
+        }
+        sidebar={
+          <SessionReviewV2Sidebar
+            open={props.state.sidebarOpened()}
+            title={<span class="truncate">{title()}</span>}
+            filter={filter()}
+            onFilterChange={setFilter}
+            onFilterKeyDown={onFilterKeyDown}
+            filterAutofocus={props.placeholder}
+            filterRef={props.filterRef}
+            filterControls={resultsID}
+            filterActiveDescendant={highlighted() ? optionID(highlighted()!) : undefined}
+            filterExpanded={query().length > 0 && files().length > 0}
+            width={props.state.sidebarWidth()}
+            onWidthChange={props.state.resizeSidebar}
+          >
+            <Show
+              when={query()}
+              fallback={
+                <FileTree
+                  path=""
+                  class="pt-1"
+                  active={props.active}
+                  kinds={props.kinds}
+                  onFileClick={(node) => props.onSelect(node.path)}
+                  onFileDoubleClick={(node) => props.onSelectPermanent(node.path)}
+                />
+              }
+            >
+              <Show
+                when={!loading()}
+                fallback={
+                  <div role="status" class="px-2 py-2 text-12-regular text-text-weak">
+                    {language.t("common.loading")}
+                    {language.t("common.loading.ellipsis")}
+                  </div>
+                }
+              >
+                <Show
+                  when={files().length > 0}
+                  fallback={
+                    <div role="status" class="px-2 py-2 text-12-regular text-text-weak">
+                      {language.t("palette.empty")}
+                    </div>
+                  }
+                >
+                  <SessionFileListV2
+                    id={resultsID}
+                    role="listbox"
+                    optionID={optionID}
+                    files={files()}
+                    kinds={props.kinds}
+                    active={props.active}
+                    highlighted={highlighted()}
+                    onFileClick={(path) => {
+                      setExplicitHighlight(path)
+                      props.onSelect(path)
+                    }}
+                    onFileDoubleClick={props.onSelectPermanent}
+                  />
+                </Show>
+              </Show>
+            </Show>
+          </SessionReviewV2Sidebar>
+        }
+      >
+        <Show
+          when={!props.placeholder}
+          fallback={
+            <SessionFilePanelV2Empty>
+              <div class="flex flex-col items-center gap-3 text-center text-text-weak">
+                <Icon name="file-tree" size="large" />
+                <div class="text-14-medium text-text-strong">{language.t("command.file.open")}</div>
+                <div class="text-13-regular">{language.t("session.files.selectToOpen")}</div>
+              </div>
+            </SessionFilePanelV2Empty>
+          }
+        >
+          <div class="min-h-0 flex-1">
+            <Show when={props.tab} keyed>
+              {(tab) => <SessionFileView tab={tab} />}
+            </Show>
+          </div>
+        </Show>
+      </SessionFilePanelV2>
+    </Tabs.Content>
+  )
+}
diff --git a/packages/app/src/pages/session/v2/session-file-list-v2.tsx b/packages/app/src/pages/session/v2/session-file-list-v2.tsx
index 3a0a17a487f5..16cac2a45d66 100644
--- a/packages/app/src/pages/session/v2/session-file-list-v2.tsx
+++ b/packages/app/src/pages/session/v2/session-file-list-v2.tsx
@@ -43,7 +43,11 @@ export function SessionFileListV2(props: {
   active?: string
   highlighted?: string
   kinds?: ReadonlyMap<string, Kind>
+  id?: string
+  role?: "listbox"
+  optionID?: (path: string) => string
   onFileClick: (path: string) => void
+  onFileDoubleClick?: (path: string) => void
 }) {
   const active = () => normalizePath(props.active ?? "")
   const highlighted = () => normalizePath(props.highlighted ?? "")
@@ -88,6 +92,8 @@ export function SessionFileListV2(props: {
   return (
     <div
       ref={setRoot}
+      id={props.id}
+      role={props.role}
       data-component="file-tree-v2"
       data-total-rows={props.files.length}
       style={{ position: "relative", height: `${virtualizer.getTotalSize()}px` }}
@@ -116,6 +122,9 @@ export function SessionFileListV2(props: {
                 >
                   <button
                     type="button"
+                    id={props.optionID?.(path)}
+                    role={props.role ? "option" : undefined}
+                    aria-selected={props.role ? selected() : undefined}
                     data-slot="file-tree-v2-row"
                     data-path={path}
                     data-selected={selected() ? "" : undefined}
@@ -124,6 +133,7 @@ export function SessionFileListV2(props: {
                     onFocus={() => setFocused(path)}
                     onBlur={() => setFocused(undefined)}
                     onClick={() => props.onFileClick(path)}
+                    onDblClick={() => props.onFileDoubleClick?.(path)}
                   >
                     <span class="filetree-iconpair size-4">
                       <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
diff --git a/packages/session-ui/src/v2/components/session-file-panel-v2.tsx b/packages/session-ui/src/v2/components/session-file-panel-v2.tsx
new file mode 100644
index 000000000000..d81c57359662
--- /dev/null
+++ b/packages/session-ui/src/v2/components/session-file-panel-v2.tsx
@@ -0,0 +1,43 @@
+import { Show, type JSX, type ParentProps } from "solid-js"
+import "./session-review-v2.css"
+
+export function SessionFilePanelV2(props: {
+  sidebar?: JSX.Element
+  toolbar: boolean
+  toolbarStart?: JSX.Element
+  toolbarEnd?: JSX.Element
+  children?: JSX.Element
+}) {
+  return (
+    <div data-component="session-review-v2">
+      <div data-slot="session-review-v2-body">
+        {props.sidebar}
+        <div data-slot="session-review-v2-preview">
+          <Show when={props.toolbar}>
+            <div data-slot="session-review-v2-toolbar">
+              <div data-slot="session-review-v2-toolbar-group" class="session-review-v2-toolbar-group--start">
+                {props.toolbarStart}
+              </div>
+              <Show when={props.toolbarEnd}>
+                {(toolbar) => (
+                  <div data-slot="session-review-v2-toolbar-group" class="session-review-v2-toolbar-group--segments">
+                    {toolbar()}
+                  </div>
+                )}
+              </Show>
+            </div>
+          </Show>
+          {props.children}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export function SessionFilePanelV2Title(props: ParentProps) {
+  return <div data-slot="session-review-v2-toolbar-title">{props.children}</div>
+}
+
+export function SessionFilePanelV2Empty(props: ParentProps) {
+  return <div data-slot="session-review-v2-empty">{props.children}</div>
+}
diff --git a/packages/session-ui/src/v2/components/session-review-v2.tsx b/packages/session-ui/src/v2/components/session-review-v2.tsx
index 176dce4fc983..5689f292cad3 100644
--- a/packages/session-ui/src/v2/components/session-review-v2.tsx
+++ b/packages/session-ui/src/v2/components/session-review-v2.tsx
@@ -12,7 +12,7 @@ import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { Show, createEffect, createMemo, createSignal, type JSX } from "solid-js"
 import { getWorkerPool } from "../../pierre/worker"
-import "./session-review-v2.css"
+import { SessionFilePanelV2, SessionFilePanelV2Empty } from "./session-file-panel-v2"
 
 export const SESSION_REVIEW_V2_SIDEBAR_WIDTH_DEFAULT = 240
 export const SESSION_REVIEW_V2_SIDEBAR_WIDTH_MIN = 200
@@ -45,6 +45,11 @@ export type SessionReviewV2SidebarProps = {
   filter: string
   onFilterChange: (value: string) => void
   onFilterKeyDown?: JSX.EventHandlerUnion<HTMLInputElement, KeyboardEvent>
+  filterAutofocus?: boolean
+  filterRef?: (element: HTMLInputElement) => void
+  filterControls?: string
+  filterActiveDescendant?: string
+  filterExpanded?: boolean
   width?: number
   onWidthChange?: (width: number) => void
   minWidth?: number
@@ -86,6 +91,13 @@ export function SessionReviewV2Sidebar(props: SessionReviewV2SidebarProps) {
             value={props.filter}
             onInput={(event) => props.onFilterChange(event.currentTarget.value)}
             onKeyDown={props.onFilterKeyDown}
+            autofocus={props.filterAutofocus}
+            ref={props.filterRef}
+            role={props.filterControls ? "combobox" : undefined}
+            aria-autocomplete={props.filterControls ? "list" : undefined}
+            aria-controls={props.filterControls}
+            aria-activedescendant={props.filterActiveDescendant}
+            aria-expanded={props.filterControls ? props.filterExpanded : undefined}
             showClearButton={props.filter.length > 0}
             clearLabel={i18n.t("ui.list.clearFilter")}
             onClearClick={() => props.onFilterChange("")}
@@ -185,130 +197,125 @@ export function SessionReviewV2(props: SessionReviewV2Props) {
     cycle(event.key === "<" ? prev() : next())
   })
 
-  return (
-    <div data-component="session-review-v2">
-      <div data-slot="session-review-v2-body">
-        {props.sidebar}
-
-        <div data-slot="session-review-v2-preview">
-          <Show when={props.hasDiffs} fallback={props.empty}>
-            <div data-slot="session-review-v2-toolbar">
-              <div data-slot="session-review-v2-toolbar-group" class="session-review-v2-toolbar-group--start">
-                {props.sidebarToggle}
-                <Show when={showCollapsedMeta()}>
-                  <div data-slot="session-review-v2-toolbar-collapsed-meta">
-                    <Show when={title()}>
-                      <div data-slot="session-review-v2-toolbar-title">{title()}</div>
-                    </Show>
-                    {stats()}
-                    <Show when={canCycle()}>
-                      <span data-slot="session-review-v2-file-position">
-                        {fileIndex() + 1}/{props.files.length}
-                      </span>
-                    </Show>
-                  </div>
-                </Show>
-                <div data-slot="session-review-v2-toolbar-group">
-                  <TooltipV2
-                    openDelay={2000}
-                    value={
-                      <>
-                        {i18n.t("ui.sessionReviewV2.previousFile")}
-                        <KeybindV2 keys={["<"]} variant="neutral" />
-                      </>
-                    }
-                  >
-                    <IconButton
-                      icon="arrow-left"
-                      variant="ghost"
-                      size="small"
-                      class="session-review-v2-file-nav-button"
-                      disabled={!canCycle()}
-                      onClick={() => {
-                        const file = prev()
-                        if (!file) return
-                        props.onSelectFile(file)
-                      }}
-                      aria-label={i18n.t("ui.sessionReviewV2.previousFile")}
-                    />
-                  </TooltipV2>
-                  <TooltipV2
-                    openDelay={2000}
-                    value={
-                      <>
-                        {i18n.t("ui.sessionReviewV2.nextFile")}
-                        <KeybindV2 keys={[">"]} variant="neutral" />
-                      </>
-                    }
-                  >
-                    <IconButton
-                      icon="arrow-right"
-                      variant="ghost"
-                      size="small"
-                      class="session-review-v2-file-nav-button"
-                      disabled={!canCycle()}
-                      onClick={() => {
-                        const file = next()
-                        if (!file) return
-                        props.onSelectFile(file)
-                      }}
-                      aria-label={i18n.t("ui.sessionReviewV2.nextFile")}
-                    />
-                  </TooltipV2>
-                </div>
-              </div>
-              <div data-slot="session-review-v2-toolbar-group" class="session-review-v2-toolbar-group--segments">
-                <SegmentedControlV2
-                  value={props.expandMode}
-                  onChange={(value) => {
-                    if (value !== "expand" && value !== "collapse") return
-                    props.onExpandModeChange(value)
-                  }}
-                  class="session-review-v2-segmented-control session-review-v2-segmented-control--icon"
-                  aria-label={i18n.t("ui.sessionReviewV2.expandMode")}
-                >
-                  <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.showAllLines")}>
-                    <SegmentedControlItemV2 value="expand" aria-label={i18n.t("ui.sessionReviewV2.showAllLines")}>
-                      <Icon name="expand" />
-                    </SegmentedControlItemV2>
-                  </TooltipV2>
-                  <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.hideNonDiffLines")}>
-                    <SegmentedControlItemV2 value="collapse" aria-label={i18n.t("ui.sessionReviewV2.hideNonDiffLines")}>
-                      <Icon name="collapse" />
-                    </SegmentedControlItemV2>
-                  </TooltipV2>
-                </SegmentedControlV2>
-                <Show when={props.onDiffStyleChange}>
-                  <SegmentedControlV2
-                    value={props.diffStyle}
-                    onChange={(value) => {
-                      if (value !== "unified" && value !== "split") return
-                      props.onDiffStyleChange?.(value)
-                    }}
-                    class="session-review-v2-segmented-control session-review-v2-segmented-control--icon"
-                    aria-label={i18n.t("ui.sessionReviewV2.diffView")}
-                  >
-                    <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.unifiedDiff")}>
-                      <SegmentedControlItemV2 value="unified" aria-label={i18n.t("ui.sessionReviewV2.unifiedDiff")}>
-                        <Icon name="unified" />
-                      </SegmentedControlItemV2>
-                    </TooltipV2>
-                    <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.splitDiff")}>
-                      <SegmentedControlItemV2 value="split" aria-label={i18n.t("ui.sessionReviewV2.splitDiff")}>
-                        <Icon name="split" />
-                      </SegmentedControlItemV2>
-                    </TooltipV2>
-                  </SegmentedControlV2>
-                </Show>
-              </div>
-            </div>
-            <Show when={props.activeFile} fallback={<div data-slot="session-review-v2-empty">{props.empty}</div>}>
-              {props.preview}
-            </Show>
+  const toolbarStart = () => (
+    <>
+      {props.sidebarToggle}
+      <Show when={showCollapsedMeta()}>
+        <div data-slot="session-review-v2-toolbar-collapsed-meta">
+          <Show when={title()}>
+            <div data-slot="session-review-v2-toolbar-title">{title()}</div>
+          </Show>
+          {stats()}
+          <Show when={canCycle()}>
+            <span data-slot="session-review-v2-file-position">
+              {fileIndex() + 1}/{props.files.length}
+            </span>
           </Show>
         </div>
+      </Show>
+      <div class="flex items-center">
+        <TooltipV2
+          openDelay={2000}
+          value={
+            <>
+              {i18n.t("ui.sessionReviewV2.previousFile")}
+              <KeybindV2 keys={["<"]} variant="neutral" />
+            </>
+          }
+        >
+          <IconButton
+            icon="arrow-left"
+            variant="ghost"
+            size="small"
+            class="session-review-v2-file-nav-button"
+            disabled={!canCycle()}
+            onClick={() => cycle(prev())}
+            aria-label={i18n.t("ui.sessionReviewV2.previousFile")}
+          />
+        </TooltipV2>
+        <TooltipV2
+          openDelay={2000}
+          value={
+            <>
+              {i18n.t("ui.sessionReviewV2.nextFile")}
+              <KeybindV2 keys={[">"]} variant="neutral" />
+            </>
+          }
+        >
+          <IconButton
+            icon="arrow-right"
+            variant="ghost"
+            size="small"
+            class="session-review-v2-file-nav-button"
+            disabled={!canCycle()}
+            onClick={() => cycle(next())}
+            aria-label={i18n.t("ui.sessionReviewV2.nextFile")}
+          />
+        </TooltipV2>
       </div>
-    </div>
+    </>
+  )
+
+  const toolbarEnd = () => (
+    <>
+      <SegmentedControlV2
+        value={props.expandMode}
+        onChange={(value) => {
+          if (value !== "expand" && value !== "collapse") return
+          props.onExpandModeChange(value)
+        }}
+        class="session-review-v2-segmented-control session-review-v2-segmented-control--icon"
+        aria-label={i18n.t("ui.sessionReviewV2.expandMode")}
+      >
+        <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.showAllLines")}>
+          <SegmentedControlItemV2 value="expand" aria-label={i18n.t("ui.sessionReviewV2.showAllLines")}>
+            <Icon name="expand" />
+          </SegmentedControlItemV2>
+        </TooltipV2>
+        <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.hideNonDiffLines")}>
+          <SegmentedControlItemV2 value="collapse" aria-label={i18n.t("ui.sessionReviewV2.hideNonDiffLines")}>
+            <Icon name="collapse" />
+          </SegmentedControlItemV2>
+        </TooltipV2>
+      </SegmentedControlV2>
+      <Show when={props.onDiffStyleChange}>
+        <SegmentedControlV2
+          value={props.diffStyle}
+          onChange={(value) => {
+            if (value !== "unified" && value !== "split") return
+            props.onDiffStyleChange?.(value)
+          }}
+          class="session-review-v2-segmented-control session-review-v2-segmented-control--icon"
+          aria-label={i18n.t("ui.sessionReviewV2.diffView")}
+        >
+          <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.unifiedDiff")}>
+            <SegmentedControlItemV2 value="unified" aria-label={i18n.t("ui.sessionReviewV2.unifiedDiff")}>
+              <Icon name="unified" />
+            </SegmentedControlItemV2>
+          </TooltipV2>
+          <TooltipV2 openDelay={2000} value={i18n.t("ui.sessionReviewV2.splitDiff")}>
+            <SegmentedControlItemV2 value="split" aria-label={i18n.t("ui.sessionReviewV2.splitDiff")}>
+              <Icon name="split" />
+            </SegmentedControlItemV2>
+          </TooltipV2>
+        </SegmentedControlV2>
+      </Show>
+    </>
+  )
+
+  return (
+    <SessionFilePanelV2
+      sidebar={props.sidebar}
+      toolbar={props.hasDiffs}
+      toolbarStart={toolbarStart()}
+      toolbarEnd={toolbarEnd()}
+    >
+      <Show when={props.hasDiffs} fallback={props.empty}>
+        <Show when={props.activeFile} fallback={<SessionFilePanelV2Empty>{props.empty}</SessionFilePanelV2Empty>}>
+          {props.preview}
+        </Show>
+      </Show>
+    </SessionFilePanelV2>
   )
 }
 

From 824455e2f15654b7bbf7bb387ca735f1c43e49e0 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:09:32 +1000
Subject: [PATCH 18/33] fix(app): load capped review patches (#35633)

---
 .../review-terminal-stacked.spec.ts           | 88 +++++++++++++++----
 packages/app/src/pages/session.tsx            | 47 +++++++++-
 .../session/v2/review-diff-kinds.test.ts      | 42 ++++++++-
 .../src/pages/session/v2/review-diff-kinds.ts | 18 ++++
 .../src/pages/session/v2/review-panel-v2.tsx  | 26 +++++-
 5 files changed, 199 insertions(+), 22 deletions(-)

diff --git a/packages/app/e2e/regression/review-terminal-stacked.spec.ts b/packages/app/e2e/regression/review-terminal-stacked.spec.ts
index 1ba8ed9474cf..71c1c28ef300 100644
--- a/packages/app/e2e/regression/review-terminal-stacked.spec.ts
+++ b/packages/app/e2e/regression/review-terminal-stacked.spec.ts
@@ -9,12 +9,19 @@ const title = "Review terminal stacked"
 const branchDiffs = [
   fileDiff(".github/actions/setup-bun/action.yml", 7),
   ...Array.from({ length: 2_739 }, (_, index) =>
-    fileDiff(`src/branch/generated-${String(index).padStart(4, "0")}.ts`, 100),
+    fileDiff(
+      `src/branch/d${String(Math.floor(index / 100)).padStart(5, "0")}/generated-${String(index).padStart(4, "0")}.ts`,
+      100,
+      false,
+    ),
   ),
 ]
 
 test("keeps the review tree and terminal sized when both panels are open", async ({ page }) => {
   test.setTimeout(120_000)
+  const events: Array<{ directory: string; payload: Record<string, unknown> }> = []
+  let detailVersion = 1
+  let detailFailures = 1
   await page.setViewportSize({ width: 1400, height: 900 })
   await mockOpenCodeServer(page, {
     directory,
@@ -48,7 +55,10 @@ test("keeps the review tree and terminal sized when both panels are open", async
         time: { created: 1700000000000, updated: 1700000000000 },
       },
     ],
+    sessionStatus: { [sessionID]: { type: "idle" } },
     pageMessages: () => ({ items: [] }),
+    events: () => events.splice(0, 1),
+    eventRetry: 16,
   })
   await page.route(/\/vcs(?:\?.*)?$/, (route) =>
     route.fulfill({
@@ -57,17 +67,25 @@ test("keeps the review tree and terminal sized when both panels are open", async
       body: JSON.stringify({ branch: "review-pane-performance", default_branch: "dev" }),
     }),
   )
-  await page.route("**/vcs/diff**", (route) =>
-    route.fulfill({
+  await page.route("**/vcs/diff**", (route) => {
+    const url = new URL(route.request().url())
+    const scope = url.searchParams.get("directory")?.replaceAll("\\", "/")
+    const detail = scope?.endsWith("/src/branch/d00027")
+    if (detail && detailFailures-- > 0) return route.fulfill({ status: 500, body: "retry detail" })
+    return route.fulfill({
       status: 200,
       contentType: "application/json",
       body: JSON.stringify(
-        new URL(route.request().url()).searchParams.get("mode") === "branch"
-          ? branchDiffs
+        url.searchParams.get("mode") === "branch"
+          ? detail
+            ? branchDiffs
+                .filter((diff) => diff.file.startsWith("src/branch/d00027/"))
+                .map((diff) => fileDiff(diff.file, diff.additions, true, detailVersion))
+            : branchDiffs
           : Array.from({ length: 7 }, (_, index) => fileDiff(`src/git-${index}.ts`, 1)),
       ),
-    }),
-  )
+    })
+  })
   await page.route("**/pty", (route) =>
     route.fulfill({
       status: 200,
@@ -96,7 +114,7 @@ test("keeps the review tree and terminal sized when both panels are open", async
   await expect(page.getByRole("tab", { name: "Review 2740" })).toBeVisible()
   await page.keyboard.press("Control+Backquote")
   await expect(page.locator("#terminal-panel")).toBeVisible()
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
   await expectStackGeometry(page)
 
   const treeViewport = page.locator('#review-panel [data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
@@ -113,41 +131,66 @@ test("keeps the review tree and terminal sized when both panels are open", async
   })
   expect(bottomGap).toBeGreaterThanOrEqual(0)
   expect(bottomGap).toBeLessThanOrEqual(16)
+  const lazyDiff = page.waitForRequest((request) => {
+    const url = new URL(request.url())
+    return (
+      url.pathname === "/vcs/diff" &&
+      url.searchParams.get("directory")?.replaceAll("\\", "/").endsWith("/src/branch/d00027") === true
+    )
+  })
+  await lastFile.click()
+  await lazyDiff
+  const preview = page.locator('[data-slot="session-review-v2-diff-scroll"]')
+  await expect(preview).toContainText("after-1")
+  detailVersion = 2
+  events.push(statusEvent("busy"))
+  await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
+  const refreshedDiff = page.waitForRequest((request) => {
+    const url = new URL(request.url())
+    return (
+      url.pathname === "/vcs/diff" &&
+      url.searchParams.get("directory")?.replaceAll("\\", "/").endsWith("/src/branch/d00027") === true
+    )
+  })
+  events.push(statusEvent("idle"))
+  await refreshedDiff
+  await expect(preview).toContainText("after-2")
   await selectMode(page, "Branch changes", "Git changes")
   await expectTree(page, 8, "git-0.ts")
+  await page.getByRole("button", { name: "git-0.ts" }).click()
   await selectMode(page, "Git changes", "Branch changes")
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
 
   const filter = page.getByRole("searchbox", { name: "Filter files" })
   await filter.fill("generated-2738")
   await expectTree(page, 1, "generated-2738.ts")
   await filter.fill("")
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
 
   await page.getByRole("button", { name: "Toggle file tree" }).click()
   await expect(page.locator('[data-slot="session-review-v2-sidebar"]')).toHaveAttribute("aria-hidden", "true")
   await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(1)
   await page.getByRole("button", { name: "Toggle file tree" }).click()
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
 
   await page.keyboard.press("Control+Backquote")
   await expect(page.locator("#terminal-panel")).toHaveCount(0)
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
   await page.keyboard.press("Control+Backquote")
   await expect(page.locator("#terminal-panel")).toBeVisible()
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
 
   await page.getByRole("button", { name: "Toggle review" }).click()
   await expect(page.locator("#review-panel")).toHaveAttribute("aria-hidden", "true")
   await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(1)
   await page.getByRole("button", { name: "Toggle review" }).click()
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
   await page.setViewportSize({ width: 1_000, height: 700 })
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
   await expectStackGeometry(page)
   await page.setViewportSize({ width: 1_000, height: 120 })
   await page.setViewportSize({ width: 1_400, height: 900 })
-  await expectTree(page, 2_745, "action.yml")
+  await expectTree(page, 2_773, "action.yml")
   await expectStackGeometry(page)
 })
 
@@ -201,12 +244,21 @@ function base64Encode(value: string) {
   return Buffer.from(value, "utf8").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
 }
 
-function fileDiff(file: string, additions: number) {
+function statusEvent(type: "busy" | "idle") {
+  return {
+    directory,
+    payload: { type: "session.status", properties: { sessionID, status: { type } } },
+  }
+}
+
+function fileDiff(file: string, additions: number, loaded = true, version = 1) {
   return {
     file,
     additions,
     deletions: 0,
     status: "modified",
-    patch: `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after'\n`,
+    patch: loaded
+      ? `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after-${version}'\n`
+      : `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}`,
   }
 }
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 6080e5c95f91..f4d47b8c495c 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1,4 +1,4 @@
-import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
+import type { Project, UserMessage, VcsFileDiff } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { createQuery, skipToken, useMutation, useQueryClient } from "@tanstack/solid-query"
 import {
@@ -75,6 +75,7 @@ import { SessionReviewEmptyChangesV2 } from "@opencode-ai/session-ui/v2/session-
 import { SessionReviewEmptyNoGitV2 } from "@opencode-ai/session-ui/v2/session-review-empty-no-git-v2"
 import { ReviewPanelV2 } from "@/pages/session/v2/review-panel-v2"
 import { createReviewPanelV2State } from "@/pages/session/v2/review-panel-v2-state"
+import { reviewDiffDirectory, reviewDiffNeedsLoad, reviewRootDirectory } from "@/pages/session/v2/review-diff-kinds"
 import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { TerminalPanelV2 } from "@/pages/session/terminal-panel-v2"
 import { useComposerCommands } from "@/pages/session/use-composer-commands"
@@ -644,6 +645,46 @@ export default function Page() {
     if (store.changes === "git" || store.changes === "branch") return !vcsQuery.isPending
     return true
   }
+  const loadReviewDiff = async (file: string, version?: number): Promise<VcsFileDiff | undefined> => {
+    const mode = vcsMode()
+    if (!mode) return
+    const root = reviewRootDirectory(sync().project?.worktree ?? sdk().directory)
+    const directory = reviewDiffDirectory(root, file)
+    const source = reviewDiffs().find((diff) => diff.file === file)
+    const valid = (diff: VcsFileDiff | undefined) => {
+      if (!diff || !source) return
+      if (diff.additions !== source.additions || diff.deletions !== source.deletions) return
+      if (reviewDiffNeedsLoad(diff)) return
+      return diff
+    }
+    const request = (scope: string, context?: number) =>
+      queryClient
+        .fetchQuery({
+          queryKey: [serverSDK().scope, ...vcsKey(), mode, "directory", scope, context, version] as const,
+          staleTime: Number.POSITIVE_INFINITY,
+          retry: 2,
+          queryFn: () =>
+            sdk()
+              .client.vcs.diff({ mode, directory: scope, context })
+              .then((result) => result.data ?? []),
+        })
+        .then((diffs) => diffs.find((diff) => diff.file === file))
+
+    if (directory !== root) {
+      try {
+        const scoped = valid(await request(directory))
+        if (scoped) return scoped
+      } catch (error) {
+        console.debug("[session-review] failed to load scoped vcs diff", { mode, file, directory, error })
+      }
+    }
+    try {
+      const bounded = valid(await request(root, 3))
+      if (bounded) return bounded
+    } catch (error) {
+      console.debug("[session-review] failed to load bounded vcs diff", { mode, file, root, error })
+    }
+  }
 
   const newSessionWorktree = createMemo(() => {
     if (store.newSessionWorktree === "create") return "create"
@@ -1175,6 +1216,10 @@ export default function Page() {
     },
     diffs: reviewDiffs,
     diffsReady: reviewReady,
+    get diffVersion() {
+      return vcsQuery.dataUpdatedAt
+    },
+    loadDiff: loadReviewDiff,
     get activeFile() {
       return tree.activeDiff
     },
diff --git a/packages/app/src/pages/session/v2/review-diff-kinds.test.ts b/packages/app/src/pages/session/v2/review-diff-kinds.test.ts
index ee37a2c8b4c9..2d069cdb186f 100644
--- a/packages/app/src/pages/session/v2/review-diff-kinds.test.ts
+++ b/packages/app/src/pages/session/v2/review-diff-kinds.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { filterReviewFiles, reviewDiffKinds } from "./review-diff-kinds"
+import { filterReviewFiles, reviewDiffDirectory, reviewDiffKinds, reviewDiffNeedsLoad } from "./review-diff-kinds"
 
 describe("reviewDiffKinds", () => {
   test("maps file and directory kinds", () => {
@@ -28,3 +28,43 @@ describe("filterReviewFiles", () => {
     expect(filterReviewFiles(files, "")).toEqual(files)
   })
 })
+
+describe("reviewDiffNeedsLoad", () => {
+  test("loads changed files whose aggregate patch has no hunks", () => {
+    expect(
+      reviewDiffNeedsLoad({
+        file: "src/a.ts",
+        additions: 1,
+        deletions: 0,
+        patch: "diff --git a/src/a.ts b/src/a.ts\n--- a/src/a.ts\n+++ b/src/a.ts",
+      }),
+    ).toBe(true)
+  })
+
+  test("keeps complete patches and empty changes", () => {
+    expect(
+      reviewDiffNeedsLoad({
+        file: "src/a.ts",
+        additions: 1,
+        deletions: 0,
+        patch: "@@ -0,0 +1 @@\n+value",
+      }),
+    ).toBe(false)
+    expect(reviewDiffNeedsLoad({ file: "empty.txt", additions: 0, deletions: 0 })).toBe(false)
+  })
+})
+
+describe("reviewDiffDirectory", () => {
+  test("scopes nested files to their parent directory", () => {
+    expect(reviewDiffDirectory("/repo", "src/lib/a.ts")).toBe("/repo/src/lib")
+    expect(reviewDiffDirectory("C:\\repo", "src/lib/a.ts")).toBe("C:\\repo\\src\\lib")
+  })
+
+  test("does not rescope root files", () => {
+    expect(reviewDiffDirectory("/repo/", "README.md")).toBe("/repo")
+    expect(reviewDiffDirectory("/", "README.md")).toBe("/")
+    expect(reviewDiffDirectory("C:\\", "README.md")).toBe("C:\\")
+    expect(reviewDiffDirectory("/", "src/a.ts")).toBe("/src")
+    expect(reviewDiffDirectory("C:\\", "src/a.ts")).toBe("C:\\src")
+  })
+})
diff --git a/packages/app/src/pages/session/v2/review-diff-kinds.ts b/packages/app/src/pages/session/v2/review-diff-kinds.ts
index c288c357068d..49cec334bc47 100644
--- a/packages/app/src/pages/session/v2/review-diff-kinds.ts
+++ b/packages/app/src/pages/session/v2/review-diff-kinds.ts
@@ -12,6 +12,24 @@ export function filterRenderableDiff(value: SnapshotFileDiff | VcsFileDiff): val
   return typeof value.file === "string"
 }
 
+export function reviewDiffNeedsLoad(diff: RenderDiff) {
+  if (diff.additions === 0 && diff.deletions === 0) return false
+  return !diff.patch || !/^@@ /m.test(diff.patch)
+}
+
+export function reviewRootDirectory(root: string) {
+  return root === "/" || /^[A-Za-z]:[/\\]?$/.test(root) ? root : root.replace(/[/\\]+$/, "")
+}
+
+export function reviewDiffDirectory(root: string, file: string) {
+  const path = normalizePath(file)
+  const index = path.lastIndexOf("/")
+  const separator = root.includes("\\") ? "\\" : "/"
+  const base = reviewRootDirectory(root)
+  if (index < 0) return base
+  return `${base.endsWith(separator) ? base : base + separator}${path.slice(0, index).replaceAll("/", separator)}`
+}
+
 export function reviewDiffKinds(diffs: RenderDiff[]) {
   const merge = (a: Kind | undefined, b: Kind) => {
     if (!a) return b
diff --git a/packages/app/src/pages/session/v2/review-panel-v2.tsx b/packages/app/src/pages/session/v2/review-panel-v2.tsx
index fcd52756ab08..a202a1e39dae 100644
--- a/packages/app/src/pages/session/v2/review-panel-v2.tsx
+++ b/packages/app/src/pages/session/v2/review-panel-v2.tsx
@@ -1,4 +1,4 @@
-import { createMemo, createSignal, Show, type JSX } from "solid-js"
+import { createMemo, createResource, createSignal, Show, type JSX } from "solid-js"
 import type { SnapshotFileDiff, VcsFileDiff } from "@opencode-ai/sdk/v2"
 import {
   SESSION_REVIEW_V2_SIDEBAR_WIDTH_MAX,
@@ -25,6 +25,7 @@ import {
   filterRenderableDiff,
   filterReviewFiles,
   reviewDiffKinds,
+  reviewDiffNeedsLoad,
   type RenderDiff,
 } from "@/pages/session/v2/review-diff-kinds"
 import type { ReviewPanelV2State } from "@/pages/session/v2/review-panel-v2-state"
@@ -37,6 +38,8 @@ export type ReviewPanelV2Props = {
   empty?: JSX.Element
   diffs: () => ReviewDiff[]
   diffsReady: () => boolean
+  diffVersion?: number
+  loadDiff?: (path: string, version?: number) => Promise<RenderDiff | undefined>
   activeFile?: string
   onSelectFile: (path: string) => void
   diffStyle: SessionReviewDiffStyle
@@ -74,7 +77,26 @@ export function ReviewPanelV2(props: ReviewPanelV2Props) {
     if (active && files.includes(active)) return active
     return files[0]
   })
-  const activeItem = createMemo(() => diffs().find((diff) => diff.file === activeDiff()))
+  const sourceActiveItem = createMemo(() => diffs().find((diff) => diff.file === activeDiff()))
+  const detailSource = createMemo(() => {
+    const diff = sourceActiveItem()
+    const load = props.loadDiff
+    if (!diff || !load || !reviewDiffNeedsLoad(diff)) return
+    return { diff, load, version: props.diffVersion }
+  })
+  const [loadedDiff] = createResource(detailSource, async ({ diff, load, version }) => {
+    const value = await load(diff.file, version)
+    if (value?.file !== diff.file) return
+    return { source: diff, version, value }
+  })
+
+  const activeItem = createMemo(() => {
+    const source = sourceActiveItem()
+    if (loadedDiff.state !== "ready") return source
+    const loaded = loadedDiff()
+    if (loaded && loaded.source === source && loaded.version === props.diffVersion) return loaded.value
+    return source
+  })
 
   const readFile = async (path: string) =>
     sdk()

From 83d633fd13677b75899801decd6c76609c99a7a4 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:38:56 +1000
Subject: [PATCH 19/33] fix(app): route legacy drafts to session page (#35808)

---
 .../e2e/regression/legacy-new-session.spec.ts | 40 +++++++++++++++++++
 packages/app/src/app.tsx                      | 11 ++++-
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 packages/app/e2e/regression/legacy-new-session.spec.ts

diff --git a/packages/app/e2e/regression/legacy-new-session.spec.ts b/packages/app/e2e/regression/legacy-new-session.spec.ts
new file mode 100644
index 000000000000..30233a5aae10
--- /dev/null
+++ b/packages/app/e2e/regression/legacy-new-session.spec.ts
@@ -0,0 +1,40 @@
+import { expect, test } from "@playwright/test"
+import { base64Encode } from "@opencode-ai/core/util/encode"
+import { mockOpenCodeServer } from "../utils/mock-server"
+
+const draftID = "draft_legacy_new_session"
+const directory = "C:/OpenCode/LegacyNewSession"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+
+test("redirects a draft to the legacy new-session route", async ({ page }) => {
+  await mockOpenCodeServer(page, {
+    directory,
+    project: {
+      id: "proj_legacy_new_session",
+      worktree: directory,
+      vcs: "git",
+      name: "legacy-new-session",
+      time: { created: 1700000000000, updated: 1700000000000 },
+      sandboxes: [],
+    },
+    provider: { all: [], connected: [], default: {} },
+    sessions: [],
+    pageMessages: () => ({ items: [] }),
+  })
+  await page.addInitScript(
+    ({ directory, draftID, server }) => {
+      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: false } }))
+      localStorage.setItem(
+        "opencode.window.browser.dat:tabs",
+        JSON.stringify([{ type: "draft", draftID, server, directory }]),
+      )
+    },
+    { directory, draftID, server },
+  )
+
+  await page.goto(`/new-session?draftId=${draftID}`)
+
+  await expect(page).toHaveURL(`/${base64Encode(directory)}/session`)
+  await expect(page.locator("header[data-tauri-drag-region]")).toBeVisible()
+  await expect(page.locator('[data-component="prompt-input"]')).toBeVisible()
+})
diff --git a/packages/app/src/app.tsx b/packages/app/src/app.tsx
index b7f87a09cd2a..86263d172d0a 100644
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -12,6 +12,7 @@ import { MetaProvider } from "@solidjs/meta"
 import { type BaseRouterProps, Navigate, Route, Router, useNavigate, useParams, useSearchParams } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { Effect } from "effect"
+import { base64Encode } from "@opencode-ai/core/util/encode"
 import {
   type Component,
   createEffect,
@@ -174,6 +175,7 @@ function LegacyServerLayout(props: ParentProps<{ serverScoped?: JSX.Element }>)
 
 function DraftRoute() {
   const [search] = useSearchParams<{ draftId?: string }>()
+  const settings = useSettings()
   const tabs = useTabs()
   return (
     <Show when={tabs.ready()}>
@@ -182,7 +184,14 @@ function DraftRoute() {
         keyed
         fallback={<Navigate href="/" />}
       >
-        {(draft) => <ResolvedDraftRoute draft={draft} />}
+        {(draft) => (
+          <Show
+            when={settings.general.newLayoutDesigns()}
+            fallback={<Navigate href={`/${base64Encode(draft.directory)}/session`} />}
+          >
+            <ResolvedDraftRoute draft={draft} />
+          </Show>
+        )}
       </Show>
     </Show>
   )

From aa52d30d7f39100b3782810013c540169d86c059 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:43:28 +1000
Subject: [PATCH 20/33] feat(app): persist review state per session (#35488)

---
 .../review-state-persistence.spec.ts          | 152 ++++++++++++++++++
 packages/app/src/context/layout.tsx           |  37 +++++
 packages/app/src/pages/session.tsx            |  56 ++++---
 3 files changed, 222 insertions(+), 23 deletions(-)
 create mode 100644 packages/app/e2e/regression/review-state-persistence.spec.ts

diff --git a/packages/app/e2e/regression/review-state-persistence.spec.ts b/packages/app/e2e/regression/review-state-persistence.spec.ts
new file mode 100644
index 000000000000..aa42f1bb516d
--- /dev/null
+++ b/packages/app/e2e/regression/review-state-persistence.spec.ts
@@ -0,0 +1,152 @@
+import { base64Encode } from "@opencode-ai/core/util/encode"
+import { expect, test, type Page } from "@playwright/test"
+import { mockOpenCodeServer } from "../utils/mock-server"
+import { expectSessionTitle } from "../utils/waits"
+
+const directory = "C:/OpenCode/ReviewStatePersistence"
+const projectID = "proj_review_state_persistence"
+const sessionA = "ses_review_state_a"
+const sessionB = "ses_review_state_b"
+const titleA = "Alpha review state"
+const titleB = "Beta review state"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+
+test.use({ viewport: { width: 1440, height: 900 } })
+
+test("restores review mode and selected file per session", async ({ page }) => {
+  await setup(page)
+  await page.goto(sessionHref(sessionA))
+  await expectSessionTitle(page, titleA)
+  await page.getByRole("button", { name: "Toggle review" }).click()
+
+  await selectMode(page, "Git changes", "Branch changes")
+  await selectFile(page, "beta.ts")
+
+  await switchSession(page, titleB)
+  await expect(page.getByRole("button", { name: "Git changes" })).toBeVisible()
+  await selectFile(page, "gamma.ts")
+
+  await switchSession(page, titleA)
+  await expect(page.getByRole("button", { name: "Branch changes" })).toBeVisible()
+  await expectSelectedFile(page, "beta.ts")
+  await selectMode(page, "Branch changes", "Git changes")
+  await expectSelectedFile(page, "alpha.ts")
+  await selectMode(page, "Git changes", "Branch changes")
+  await expectSelectedFile(page, "beta.ts")
+
+  await page.reload()
+  await expectSessionTitle(page, titleA)
+  await expect(page.getByRole("button", { name: "Branch changes" })).toBeVisible()
+  await expectSelectedFile(page, "beta.ts")
+
+  await switchSession(page, titleB)
+  await expect(page.getByRole("button", { name: "Git changes" })).toBeVisible()
+  await expectSelectedFile(page, "gamma.ts")
+})
+
+async function selectMode(page: Page, current: string, next: string) {
+  await page.getByRole("button", { name: current }).click()
+  await page.getByRole("option", { name: next }).click()
+}
+
+async function selectFile(page: Page, file: string) {
+  await page.getByRole("button", { name: file }).click()
+  await expectSelectedFile(page, file)
+}
+
+async function expectSelectedFile(page: Page, file: string) {
+  await expect(page.locator('[data-slot="session-review-v2-file-name"]')).toHaveText(file)
+}
+
+async function switchSession(page: Page, title: string) {
+  await page.locator("[data-titlebar-tab-slot]", { hasText: title }).click()
+  await expectSessionTitle(page, title)
+}
+
+async function setup(page: Page) {
+  await mockOpenCodeServer(page, {
+    directory,
+    project: {
+      id: projectID,
+      worktree: directory,
+      vcs: "git",
+      name: "review-state-persistence",
+      time: { created: 1700000000000, updated: 1700000000000 },
+      sandboxes: [],
+    },
+    provider: {
+      all: [
+        {
+          id: "opencode",
+          name: "OpenCode",
+          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
+        },
+      ],
+      connected: ["opencode"],
+      default: { providerID: "opencode", modelID: "test" },
+    },
+    sessions: [session(sessionA, titleA, 1700000000000), session(sessionB, titleB, 1700000001000)],
+    pageMessages: () => ({ items: [] }),
+  })
+  await page.route(/\/vcs(?:\?.*)?$/, (route) =>
+    route.fulfill({
+      status: 200,
+      contentType: "application/json",
+      body: JSON.stringify({ branch: "feature", default_branch: "dev" }),
+    }),
+  )
+  await page.route("**/vcs/diff**", (route) =>
+    route.fulfill({
+      status: 200,
+      contentType: "application/json",
+      body: JSON.stringify(
+        new URL(route.request().url()).searchParams.get("mode") === "branch"
+          ? [diff("src/alpha.ts"), diff("src/beta.ts")]
+          : [diff("src/alpha.ts"), diff("src/gamma.ts")],
+      ),
+    }),
+  )
+  await page.addInitScript(
+    ({ directory, server, sessions }) => {
+      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
+      localStorage.setItem(
+        "opencode.global.dat:server",
+        JSON.stringify({
+          projects: { local: [{ worktree: directory, expanded: true }] },
+          lastProject: { local: directory },
+        }),
+      )
+      localStorage.setItem(
+        "opencode.window.browser.dat:tabs",
+        JSON.stringify(sessions.map((sessionId: string) => ({ type: "session", server, sessionId }))),
+      )
+    },
+    { directory, server, sessions: [sessionA, sessionB] },
+  )
+}
+
+function session(id: string, title: string, created: number) {
+  return {
+    id,
+    slug: id,
+    projectID,
+    directory,
+    title,
+    version: "dev",
+    time: { created, updated: created },
+  }
+}
+
+function diff(file: string) {
+  return {
+    file,
+    additions: 1,
+    deletions: 1,
+    status: "modified",
+    patch: `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after'\n`,
+  }
+}
+
+function sessionHref(sessionID: string) {
+  return `/server/${base64Encode(server)}/session/${sessionID}`
+}
diff --git a/packages/app/src/context/layout.tsx b/packages/app/src/context/layout.tsx
index 3b2b34752b8d..dcac3e778104 100644
--- a/packages/app/src/context/layout.tsx
+++ b/packages/app/src/context/layout.tsx
@@ -59,6 +59,8 @@ export function getProjectAvatarVariant(key?: string): ProjectAvatarVariant {
 type SessionView = {
   scroll: Record<string, SessionScroll>
   reviewOpen?: string[]
+  reviewMode?: ReviewChangeMode
+  reviewFile?: string
   pendingMessage?: string
   pendingMessageAt?: number
   todoCollapsed?: boolean
@@ -75,6 +77,7 @@ export type LocalProject = Partial<Project> & { worktree: string; expanded: bool
 export type HomeProjectSelection = { server: ServerConnection.Key; directory?: string }
 
 export type ReviewDiffStyle = "unified" | "split"
+export type ReviewChangeMode = "git" | "branch" | "turn"
 export type ReviewPanelSource = "context-button" | "other"
 
 export type LayoutRoute =
@@ -786,6 +789,14 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
       view(sessionKey: string | Accessor<string>) {
         const key = createSessionKeyReader(sessionKey, ensureKey)
         const s = createMemo(() => store.sessionView[key()] ?? { scroll: {} })
+        const reviewMode = createMemo(() => {
+          const mode = s().reviewMode
+          if (mode === "git" || mode === "branch" || mode === "turn") return mode
+        })
+        const reviewFile = createMemo(() => {
+          const file = s().reviewFile
+          if (typeof file === "string") return file
+        })
         const terminalOpened = createMemo(() => store.terminal?.opened ?? false)
         const reviewPanelOpened = createMemo(() => store.review?.panelOpened ?? DEFAULT_REVIEW_PANEL_OPENED)
         const reviewPanelSource = createMemo(() => (reviewPanelOpened() ? ephemeral.reviewPanelSource : "other"))
@@ -869,6 +880,32 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
             },
           },
           review: {
+            mode: reviewMode,
+            setMode(mode: ReviewChangeMode) {
+              const session = key()
+              const current = store.sessionView[session]
+              if (!current) {
+                setStore("sessionView", session, { scroll: {}, reviewMode: mode })
+                prune(session)
+                return
+              }
+              if (current.reviewMode === mode) return
+              setStore("sessionView", session, "reviewMode", mode)
+              prune(session)
+            },
+            file: reviewFile,
+            setFile(file: string) {
+              const session = key()
+              const current = store.sessionView[session]
+              if (!current) {
+                setStore("sessionView", session, { scroll: {}, reviewFile: file })
+                prune(session)
+                return
+              }
+              if (current.reviewFile === file) return
+              setStore("sessionView", session, "reviewFile", file)
+              prune(session)
+            },
             open: createMemo(() => s().reviewOpen ?? []),
             setOpen(open: string[]) {
               const session = key()
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index f4d47b8c495c..67f3d80b796e 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -101,7 +101,6 @@ type VcsMode = "git" | "branch"
 const sessionViewState = () => ({
   messageId: undefined as string | undefined,
   mobileTab: "session" as "session" | "changes",
-  changes: "git" as ChangeMode,
 })
 
 function isCurrentSessionNotFoundError(error: unknown, sessionID: string | undefined) {
@@ -348,6 +347,8 @@ export default function Page() {
   const location = useLocation()
   const navigate = useNavigate()
   const { params, sessionKey, workspaceKey, tabs, view } = useSessionLayout()
+  const reviewMode = () => view().review.mode() ?? "git"
+  const reviewFile = () => view().review.file()
   const sessionOwnership = createSessionOwnership(sessionKey)
   const newSessionDesign = createMemo(() => settings.general.newLayoutDesigns())
 
@@ -607,7 +608,8 @@ export default function Page() {
       : store.mobileTab === "changes",
   )
   const vcsMode = createMemo<VcsMode | undefined>(() => {
-    if (store.changes === "git" || store.changes === "branch") return store.changes
+    const mode = reviewMode()
+    if (mode === "git" || mode === "branch") return mode
   })
   const vcsKey = createMemo(
     () =>
@@ -634,15 +636,21 @@ export default function Page() {
   })
   const refreshVcs = debounce(() => void queryClient.invalidateQueries({ queryKey: vcsKey() }), 100)
   const reviewDiffs = () => {
-    if (store.changes === "git" || store.changes === "branch")
+    if (reviewMode() === "git" || reviewMode() === "branch")
       // avoids suspense
       return vcsQuery.isFetched ? (vcsQuery.data ?? []) : []
     return turnDiffs()
   }
+  const activeReviewFile = () => {
+    const diffs = reviewDiffs()
+    const selected = reviewFile()
+    if (selected && diffs.some((diff) => diff.file === selected)) return selected
+    return diffs[0]?.file
+  }
   const reviewCount = () => reviewDiffs().length
   const hasReview = () => reviewCount() > 0
   const reviewReady = () => {
-    if (store.changes === "git" || store.changes === "branch") return !vcsQuery.isPending
+    if (reviewMode() === "git" || reviewMode() === "branch") return !vcsQuery.isPending
     return true
   }
   const loadReviewDiff = async (file: string, version?: number): Promise<VcsFileDiff | undefined> => {
@@ -1002,12 +1010,15 @@ export default function Page() {
   }
 
   createEffect(() => {
+    if (!layout.ready()) return
+    if (sync().status !== "complete") return
     if (!sync().project) return
     const list = changesOptions()
-    if (list.includes(store.changes)) return
+    const mode = reviewMode()
+    if (list.includes(mode)) return
     const next = list[0]
     if (!next) return
-    setStore("changes", next)
+    view().review.setMode(next)
   })
 
   createEffect(
@@ -1027,7 +1038,6 @@ export default function Page() {
   const [tree, setTree] = createStore({
     reviewScroll: undefined as HTMLDivElement | undefined,
     pendingDiff: undefined as string | undefined,
-    activeDiff: undefined as string | undefined,
   })
 
   createEffect(
@@ -1037,7 +1047,6 @@ export default function Page() {
         setTree({
           reviewScroll: undefined,
           pendingDiff: undefined,
-          activeDiff: undefined,
         })
       },
       { defer: true },
@@ -1085,9 +1094,9 @@ export default function Page() {
     return (
       <Select
         options={changesOptions()}
-        current={store.changes}
+        current={reviewMode()}
         label={changesLabel}
-        onSelect={(option) => option && setStore("changes", option)}
+        onSelect={(option) => option && view().review.setMode(option)}
         variant="ghost"
         size="small"
         valueClass="text-14-medium"
@@ -1104,11 +1113,11 @@ export default function Page() {
       <SelectV2
         appearance="inline"
         options={changesOptions()}
-        current={store.changes}
+        current={reviewMode()}
         label={changesLabel}
         placement="bottom-start"
         gutter={6}
-        onSelect={(option) => option && setStore("changes", option)}
+        onSelect={(option) => option && view().review.setMode(option)}
       />
     )
   }
@@ -1136,18 +1145,18 @@ export default function Page() {
   )
 
   const reviewEmptyText = createMemo(() => {
-    if (store.changes === "git") return language.t("session.review.noUncommittedChanges")
-    if (store.changes === "branch") return language.t("session.review.noBranchChanges")
+    if (reviewMode() === "git") return language.t("session.review.noUncommittedChanges")
+    if (reviewMode() === "branch") return language.t("session.review.noBranchChanges")
     return language.t("session.review.noChanges")
   })
 
   const reviewEmpty = (input: { loadingClass: string; emptyClass: string }) => {
-    if (store.changes === "git" || store.changes === "branch") {
+    if (reviewMode() === "git" || reviewMode() === "branch") {
       if (!reviewReady()) return <div class={input.loadingClass}>{language.t("session.review.loadingChanges")}</div>
       return empty(reviewEmptyText())
     }
 
-    if (store.changes === "turn") {
+    if (reviewMode() === "turn") {
       if (nogit()) return createGit(input)
       return empty(reviewEmptyText())
     }
@@ -1160,10 +1169,10 @@ export default function Page() {
   }
 
   const reviewEmptyV2 = () => {
-    if ((store.changes === "git" || store.changes === "branch") && !reviewReady()) {
+    if ((reviewMode() === "git" || reviewMode() === "branch") && !reviewReady()) {
       return <div class="px-6 py-4 text-text-weak">{language.t("session.review.loadingChanges")}</div>
     }
-    if (store.changes === "turn" && nogit()) {
+    if (reviewMode() === "turn" && nogit()) {
       return <SessionReviewEmptyNoGitV2 pending={gitMutation.isPending} onInitGit={initGit} />
     }
     return <SessionReviewEmptyChangesV2 />
@@ -1185,7 +1194,7 @@ export default function Page() {
         diffStyle={input.diffStyle}
         onDiffStyleChange={input.onDiffStyleChange}
         onScrollRef={(el) => setTree("reviewScroll", el)}
-        focusedFile={tree.activeDiff}
+        focusedFile={activeReviewFile()}
         onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
         onLineCommentUpdate={updateCommentInContext}
         onLineCommentDelete={removeCommentFromContext}
@@ -1221,7 +1230,7 @@ export default function Page() {
     },
     loadDiff: loadReviewDiff,
     get activeFile() {
-      return tree.activeDiff
+      return activeReviewFile()
     },
     onSelectFile: focusReviewDiff,
     get diffStyle() {
@@ -1334,7 +1343,8 @@ export default function Page() {
   const focusReviewDiff = (path: string) => {
     openReviewPanel()
     view().review.openPath(path)
-    setTree({ activeDiff: path, pendingDiff: path })
+    view().review.setFile(path)
+    setTree("pendingDiff", path)
   }
 
   createEffect(() => {
@@ -2198,7 +2208,7 @@ export default function Page() {
             reviewHasFocusableContent={hasReview}
             reviewCount={reviewCount}
             reviewPanel={reviewPanel}
-            activeDiff={tree.activeDiff}
+            activeDiff={activeReviewFile()}
             focusReviewDiff={focusReviewDiff}
             reviewSnap={ui.reviewSnap}
             size={size}
@@ -2224,7 +2234,7 @@ export default function Page() {
                     reviewCount={reviewCount}
                     reviewPanel={reviewPanelV2}
                     fileBrowserState={reviewV2State}
-                    activeDiff={tree.activeDiff}
+                    activeDiff={activeReviewFile()}
                     focusReviewDiff={focusReviewDiff}
                     reviewSnap={ui.reviewSnap}
                     size={size}

From d8a57ee15c97b87dbde88ff416ceb60177d831de Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:44:02 +1000
Subject: [PATCH 21/33] fix(app): unmount hidden session panes (#35628)

---
 .../review-terminal-stacked.spec.ts           |   7 +-
 packages/app/src/pages/session.tsx            |  11 +-
 .../src/pages/session/session-side-panel.tsx  | 464 +++++++++---------
 .../src/v2/components/session-review-v2.tsx   | 110 ++---
 4 files changed, 286 insertions(+), 306 deletions(-)

diff --git a/packages/app/e2e/regression/review-terminal-stacked.spec.ts b/packages/app/e2e/regression/review-terminal-stacked.spec.ts
index 71c1c28ef300..e3ba607b3d84 100644
--- a/packages/app/e2e/regression/review-terminal-stacked.spec.ts
+++ b/packages/app/e2e/regression/review-terminal-stacked.spec.ts
@@ -168,8 +168,8 @@ test("keeps the review tree and terminal sized when both panels are open", async
   await expectTree(page, 2_773, "action.yml")
 
   await page.getByRole("button", { name: "Toggle file tree" }).click()
-  await expect(page.locator('[data-slot="session-review-v2-sidebar"]')).toHaveAttribute("aria-hidden", "true")
-  await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(1)
+  await expect(page.locator('[data-slot="session-review-v2-sidebar"]')).toHaveCount(0)
+  await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(0)
   await page.getByRole("button", { name: "Toggle file tree" }).click()
   await expectTree(page, 2_773, "action.yml")
 
@@ -181,8 +181,7 @@ test("keeps the review tree and terminal sized when both panels are open", async
   await expectTree(page, 2_773, "action.yml")
 
   await page.getByRole("button", { name: "Toggle review" }).click()
-  await expect(page.locator("#review-panel")).toHaveAttribute("aria-hidden", "true")
-  await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(1)
+  await expect(page.locator("#review-panel")).toHaveCount(0)
   await page.getByRole("button", { name: "Toggle review" }).click()
   await expectTree(page, 2_773, "action.yml")
   await page.setViewportSize({ width: 1_000, height: 700 })
diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 67f3d80b796e..912ff17f1de9 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -2198,7 +2198,7 @@ export default function Page() {
           </Show>
         </div>
 
-        <Show when={!newSessionDesign()}>
+        <Show when={!newSessionDesign() && desktopSidePanelOpen()}>
           <SessionSidePanel
             canReview={canReview}
             diffs={reviewDiffs}
@@ -2217,13 +2217,8 @@ export default function Page() {
         <Show when={newSessionDesign()}>
           <Show when={isDesktop() ? desktopV2PanelLayout().visible : terminalOpen()}>
             <div class="min-w-0 h-full flex flex-1 flex-col">
-              <Show when={isDesktop()}>
-                <div
-                  classList={{
-                    "min-h-0 flex-1": desktopV2ReviewOpen() || desktopFileTreeOpen(),
-                    "size-0 shrink-0 overflow-hidden": !(desktopV2ReviewOpen() || desktopFileTreeOpen()),
-                  }}
-                >
+              <Show when={isDesktop() && (desktopV2ReviewOpen() || desktopFileTreeOpen())}>
+                <div class="min-h-0 flex-1">
                   <SessionSidePanel
                     canReview={canReview}
                     diffs={reviewDiffs}
diff --git a/packages/app/src/pages/session/session-side-panel.tsx b/packages/app/src/pages/session/session-side-panel.tsx
index 1ea20459c805..5e5f89e3e220 100644
--- a/packages/app/src/pages/session/session-side-panel.tsx
+++ b/packages/app/src/pages/session/session-side-panel.tsx
@@ -81,7 +81,6 @@ export function SessionSidePanel(props: {
       }),
   )
   const open = createMemo(() => reviewOpen() || fileOpen())
-  const rendered = createMemo<boolean>((previous) => previous || open(), false)
   const reviewTab = createMemo(() => isDesktop())
   const panelWidth = createMemo(() => {
     if (!open()) return "0px"
@@ -164,10 +163,6 @@ export function SessionSidePanel(props: {
   const openedTabs = tabState.openedTabs
   const activeTab = tabState.activeTab
   const activeFileTab = tabState.activeFileTab
-  const reviewContentRendered = createMemo<boolean>(
-    (previous) => previous || (reviewOpen() && activeTab() === "review"),
-    false,
-  )
 
   const fileTreeTab = () => layout.fileTree.tab()
 
@@ -272,233 +267,220 @@ export function SessionSidePanel(props: {
         }}
         style={{ width: panelWidth() }}
       >
-        <Show when={rendered()}>
+        <Show when={open()}>
           <div
             class="size-full flex"
             classList={{
               "border-l border-border-weaker-base": !settings.general.newLayoutDesigns(),
             }}
           >
-            <div
-              aria-hidden={!reviewOpen()}
-              inert={!reviewOpen()}
-              class="relative min-w-0 h-full flex-1 overflow-hidden bg-background-base"
-              classList={{
-                "pointer-events-none": !reviewOpen(),
-              }}
-            >
-              <div class="size-full min-w-0 h-full bg-background-base">
-                <DragDropProvider
-                  onDragStart={handleDragStart}
-                  onDragEnd={handleDragEnd}
-                  onDragOver={handleDragOver}
-                  collisionDetector={closestCenter}
-                >
-                  <DragDropSensors />
-                  <ConstrainDragYAxis />
-                  <Tabs value={activeTab()} onChange={activateTab}>
-                    <div class="sticky top-0 shrink-0 flex">
-                      <Tabs.List
-                        ref={(el: HTMLDivElement) => {
-                          const stop = createFileTabListSync({ el, contextOpen })
-                          onCleanup(stop)
-                        }}
-                      >
-                        <Show when={reviewTab() && props.canReview()}>
-                          <Tabs.Trigger
-                            value="review"
-                            id={reviewTabID}
-                            aria-controls={activeTab() === "review" ? reviewTabPanelID : undefined}
-                          >
-                            <div class="flex items-center gap-1.5">
-                              <div>{language.t("session.tab.review")}</div>
-                              <Show when={props.hasReview()}>
-                                <div>{props.reviewCount()}</div>
-                              </Show>
-                            </div>
-                          </Tabs.Trigger>
-                        </Show>
-                        <Show when={contextOpen()}>
-                          <Tabs.Trigger
-                            value="context"
-                            closeButton={
-                              <TooltipKeybind
-                                title={language.t("common.closeTab")}
-                                keybind={command.keybind("tab.close")}
-                                placement="bottom"
-                                gutter={10}
-                              >
-                                <IconButton
-                                  icon="close-small"
-                                  variant="ghost"
-                                  class="h-5 w-5"
-                                  onClick={() => tabs().close("context")}
-                                  aria-label={language.t("common.closeTab")}
-                                />
-                              </TooltipKeybind>
-                            }
-                            hideCloseButton
-                            onMiddleClick={() => tabs().close("context")}
-                          >
-                            <div class="flex items-center gap-2">
-                              <SessionContextUsage variant="indicator" />
-                              <div>{language.t("session.tab.context")}</div>
-                            </div>
-                          </Tabs.Trigger>
-                        </Show>
-                        <SortableProvider ids={openedTabs()}>
-                          <For each={panelTabs()}>
-                            {(tab) => (
-                              <Show
-                                when={tab === SESSION_OPEN_FILE_TAB}
-                                fallback={
-                                  <SortableTab
-                                    tab={tab}
-                                    temporary={temporaryTab() === tab}
-                                    onTabClose={tabs().close}
-                                    onTabDoubleClick={temporaryTab() === tab ? openTab : undefined}
+            <Show when={reviewOpen()}>
+              <div class="relative min-w-0 h-full flex-1 overflow-hidden bg-background-base">
+                <div class="size-full min-w-0 h-full bg-background-base">
+                  <DragDropProvider
+                    onDragStart={handleDragStart}
+                    onDragEnd={handleDragEnd}
+                    onDragOver={handleDragOver}
+                    collisionDetector={closestCenter}
+                  >
+                    <DragDropSensors />
+                    <ConstrainDragYAxis />
+                    <Tabs value={activeTab()} onChange={activateTab}>
+                      <div class="sticky top-0 shrink-0 flex">
+                        <Tabs.List
+                          ref={(el: HTMLDivElement) => {
+                            const stop = createFileTabListSync({ el, contextOpen })
+                            onCleanup(stop)
+                          }}
+                        >
+                          <Show when={reviewTab() && props.canReview()}>
+                            <Tabs.Trigger
+                              value="review"
+                              id={reviewTabID}
+                              aria-controls={activeTab() === "review" ? reviewTabPanelID : undefined}
+                            >
+                              <div class="flex items-center gap-1.5">
+                                <div>{language.t("session.tab.review")}</div>
+                                <Show when={props.hasReview()}>
+                                  <div>{props.reviewCount()}</div>
+                                </Show>
+                              </div>
+                            </Tabs.Trigger>
+                          </Show>
+                          <Show when={contextOpen()}>
+                            <Tabs.Trigger
+                              value="context"
+                              closeButton={
+                                <TooltipKeybind
+                                  title={language.t("common.closeTab")}
+                                  keybind={command.keybind("tab.close")}
+                                  placement="bottom"
+                                  gutter={10}
+                                >
+                                  <IconButton
+                                    icon="close-small"
+                                    variant="ghost"
+                                    class="h-5 w-5"
+                                    onClick={() => tabs().close("context")}
+                                    aria-label={language.t("common.closeTab")}
                                   />
-                                }
-                              >
-                                <Tabs.Trigger
-                                  value={SESSION_OPEN_FILE_TAB}
-                                  closeButton={
-                                    <TooltipKeybind
-                                      title={language.t("common.closeTab")}
-                                      keybind={command.keybind("tab.close")}
-                                      placement="bottom"
-                                      gutter={10}
-                                    >
-                                      <IconButton
-                                        icon="close-small"
-                                        variant="ghost"
-                                        class="h-5 w-5"
-                                        onClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
-                                        aria-label={language.t("common.closeTab")}
-                                      />
-                                    </TooltipKeybind>
+                                </TooltipKeybind>
+                              }
+                              hideCloseButton
+                              onMiddleClick={() => tabs().close("context")}
+                            >
+                              <div class="flex items-center gap-2">
+                                <SessionContextUsage variant="indicator" />
+                                <div>{language.t("session.tab.context")}</div>
+                              </div>
+                            </Tabs.Trigger>
+                          </Show>
+                          <SortableProvider ids={openedTabs()}>
+                            <For each={panelTabs()}>
+                              {(tab) => (
+                                <Show
+                                  when={tab === SESSION_OPEN_FILE_TAB}
+                                  fallback={
+                                    <SortableTab
+                                      tab={tab}
+                                      temporary={temporaryTab() === tab}
+                                      onTabClose={tabs().close}
+                                      onTabDoubleClick={temporaryTab() === tab ? openTab : undefined}
+                                    />
                                   }
-                                  hideCloseButton
-                                  onMiddleClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
                                 >
-                                  <div class="flex items-center gap-1.5 italic">
-                                    <Icon name="open-file" size="small" />
-                                    <span>{language.t("command.file.open")}</span>
-                                  </div>
-                                </Tabs.Trigger>
-                              </Show>
-                            )}
-                          </For>
-                        </SortableProvider>
-                        <div class="bg-background-stronger h-full shrink-0 sticky right-0 z-10 flex items-center justify-center pr-3">
-                          <TooltipKeybind
-                            title={language.t("command.file.open")}
-                            keybind={command.keybind("file.open")}
-                            class="flex items-center"
-                          >
-                            <IconButton
-                              icon="plus-small"
-                              variant="ghost"
-                              iconSize="large"
-                              class="!rounded-md"
-                              onClick={() => {
-                                if (props.fileBrowserState) {
-                                  openFileBrowser()
-                                  return
-                                }
-                                void import("@/components/dialog-select-file").then((x) => {
-                                  dialog.show(() => <x.DialogSelectFile mode="files" onOpenFile={showAllFiles} />)
-                                })
-                              }}
-                              aria-label={language.t("command.file.open")}
-                            />
-                          </TooltipKeybind>
-                        </div>
-                      </Tabs.List>
-                    </div>
-
-                    <Show when={reviewTab() && props.canReview() && reviewContentRendered()}>
-                      <div
-                        id={reviewTabPanelID}
-                        role="tabpanel"
-                        aria-labelledby={reviewTabID}
-                        aria-hidden={activeTab() !== "review"}
-                        inert={activeTab() !== "review"}
-                        tabIndex={props.reviewHasFocusableContent() ? undefined : 0}
-                        data-slot="tabs-content"
-                        class="flex flex-col h-full overflow-hidden contain-strict"
-                        classList={{ hidden: activeTab() !== "review" }}
-                      >
-                        {props.reviewPanel()}
+                                  <Tabs.Trigger
+                                    value={SESSION_OPEN_FILE_TAB}
+                                    closeButton={
+                                      <TooltipKeybind
+                                        title={language.t("common.closeTab")}
+                                        keybind={command.keybind("tab.close")}
+                                        placement="bottom"
+                                        gutter={10}
+                                      >
+                                        <IconButton
+                                          icon="close-small"
+                                          variant="ghost"
+                                          class="h-5 w-5"
+                                          onClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
+                                          aria-label={language.t("common.closeTab")}
+                                        />
+                                      </TooltipKeybind>
+                                    }
+                                    hideCloseButton
+                                    onMiddleClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
+                                  >
+                                    <div class="flex items-center gap-1.5 italic">
+                                      <Icon name="open-file" size="small" />
+                                      <span>{language.t("command.file.open")}</span>
+                                    </div>
+                                  </Tabs.Trigger>
+                                </Show>
+                              )}
+                            </For>
+                          </SortableProvider>
+                          <div class="bg-background-stronger h-full shrink-0 sticky right-0 z-10 flex items-center justify-center pr-3">
+                            <TooltipKeybind
+                              title={language.t("command.file.open")}
+                              keybind={command.keybind("file.open")}
+                              class="flex items-center"
+                            >
+                              <IconButton
+                                icon="plus-small"
+                                variant="ghost"
+                                iconSize="large"
+                                class="!rounded-md"
+                                onClick={() => {
+                                  if (props.fileBrowserState) {
+                                    openFileBrowser()
+                                    return
+                                  }
+                                  void import("@/components/dialog-select-file").then((x) => {
+                                    dialog.show(() => <x.DialogSelectFile mode="files" onOpenFile={showAllFiles} />)
+                                  })
+                                }}
+                                aria-label={language.t("command.file.open")}
+                              />
+                            </TooltipKeybind>
+                          </div>
+                        </Tabs.List>
                       </div>
-                    </Show>
 
-                    <Tabs.Content value="empty" class="flex flex-col h-full overflow-hidden contain-strict">
+                      <Show when={reviewTab() && props.canReview() && activeTab() === "review"}>
+                        <div
+                          id={reviewTabPanelID}
+                          role="tabpanel"
+                          aria-labelledby={reviewTabID}
+                          tabIndex={props.reviewHasFocusableContent() ? undefined : 0}
+                          data-slot="tabs-content"
+                          class="flex flex-col h-full overflow-hidden contain-strict"
+                        >
+                          {props.reviewPanel()}
+                        </div>
+                      </Show>
+
                       <Show when={activeTab() === "empty"}>
-                        <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
-                          <div class="h-full px-6 pb-42 -mt-4 flex flex-col items-center justify-center text-center gap-6">
-                            <Mark class="w-14 opacity-10" />
-                            <div class="text-14-regular text-text-weak max-w-56">
-                              {language.t("session.files.selectToOpen")}
+                        <Tabs.Content value="empty" class="flex flex-col h-full overflow-hidden contain-strict">
+                          <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
+                            <div class="h-full px-6 pb-42 -mt-4 flex flex-col items-center justify-center text-center gap-6">
+                              <Mark class="w-14 opacity-10" />
+                              <div class="text-14-regular text-text-weak max-w-56">
+                                {language.t("session.files.selectToOpen")}
+                              </div>
                             </div>
                           </div>
-                        </div>
+                        </Tabs.Content>
                       </Show>
-                    </Tabs.Content>
 
-                    <Show when={contextOpen()}>
-                      <Tabs.Content value="context" class="flex flex-col h-full overflow-hidden contain-strict">
-                        <Show when={activeTab() === "context"}>
+                      <Show when={activeTab() === "context"}>
+                        <Tabs.Content value="context" class="flex flex-col h-full overflow-hidden contain-strict">
                           <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
                             <SessionContextTab />
                           </div>
-                        </Show>
-                      </Tabs.Content>
-                    </Show>
+                        </Tabs.Content>
+                      </Show>
 
-                    <Show when={browserTab()}>
-                      <SessionFileBrowserTab
-                        tab={browserTab()!}
-                        placeholder={browserTab() === SESSION_OPEN_FILE_TAB}
-                        active={file.pathFromTab(browserTab()!)}
-                        kinds={browserKinds()}
-                        state={props.fileBrowserState!}
-                        onSelect={(path) => previewTab(file.tab(path))}
-                        onSelectPermanent={(path) => openTab(file.tab(path))}
-                        filterRef={(element) => (fileFilter = element)}
-                      />
-                    </Show>
+                      <Show when={browserTab()}>
+                        <SessionFileBrowserTab
+                          tab={browserTab()!}
+                          placeholder={browserTab() === SESSION_OPEN_FILE_TAB}
+                          active={file.pathFromTab(browserTab()!)}
+                          kinds={browserKinds()}
+                          state={props.fileBrowserState!}
+                          onSelect={(path) => previewTab(file.tab(path))}
+                          onSelectPermanent={(path) => openTab(file.tab(path))}
+                          filterRef={(element) => (fileFilter = element)}
+                        />
+                      </Show>
 
-                    <Show when={!props.fileBrowserState && activeFileTab()} keyed>
-                      {(tab) => <FileTabContent tab={tab} />}
-                    </Show>
-                  </Tabs>
-                  <DragOverlay>
-                    <Show when={store.activeDraggable} keyed>
-                      {(tab) => {
-                        const path = file.pathFromTab(tab)
-                        return (
-                          <div data-component="tabs-drag-preview">
-                            <Show when={path}>
-                              {(p) => <FileVisual active path={p()} temporary={temporaryTab() === tab} />}
-                            </Show>
-                          </div>
-                        )
-                      }}
-                    </Show>
-                  </DragOverlay>
-                </DragDropProvider>
+                      <Show when={!props.fileBrowserState && activeFileTab()} keyed>
+                        {(tab) => <FileTabContent tab={tab} />}
+                      </Show>
+                    </Tabs>
+                    <DragOverlay>
+                      <Show when={store.activeDraggable} keyed>
+                        {(tab) => {
+                          const path = file.pathFromTab(tab)
+                          return (
+                            <div data-component="tabs-drag-preview">
+                              <Show when={path}>
+                                {(p) => <FileVisual active path={p()} temporary={temporaryTab() === tab} />}
+                              </Show>
+                            </div>
+                          )
+                        }}
+                      </Show>
+                    </DragOverlay>
+                  </DragDropProvider>
+                </div>
               </div>
-            </div>
+            </Show>
 
-            <Show when={shown()}>
+            <Show when={fileOpen()}>
               <div
                 id="file-tree-panel"
-                aria-hidden={!fileOpen()}
-                inert={!fileOpen()}
                 class="relative min-w-0 h-full shrink-0 overflow-hidden"
                 classList={{
-                  "pointer-events-none": !fileOpen(),
                   "transition-[width] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
                     !props.size.active(),
                 }}
@@ -526,45 +508,49 @@ export function SessionSidePanel(props: {
                         {language.t("session.files.all")}
                       </Tabs.Trigger>
                     </Tabs.List>
-                    <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
-                      <Switch>
-                        <Match when={props.hasReview() || !props.diffsReady()}>
-                          <Show
-                            when={props.diffsReady()}
-                            fallback={
-                              <div class="px-2 py-2 text-12-regular text-text-weak">
-                                {language.t("common.loading")}
-                                {language.t("common.loading.ellipsis")}
-                              </div>
-                            }
-                          >
+                    <Show when={fileTreeTab() === "changes"}>
+                      <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
+                        <Switch>
+                          <Match when={props.hasReview() || !props.diffsReady()}>
+                            <Show
+                              when={props.diffsReady()}
+                              fallback={
+                                <div class="px-2 py-2 text-12-regular text-text-weak">
+                                  {language.t("common.loading")}
+                                  {language.t("common.loading.ellipsis")}
+                                </div>
+                              }
+                            >
+                              <FileTree
+                                path=""
+                                class="pt-3"
+                                allowed={diffFiles()}
+                                kinds={kinds()}
+                                draggable={false}
+                                active={props.activeDiff}
+                                onFileClick={(node) => props.focusReviewDiff(node.path)}
+                              />
+                            </Show>
+                          </Match>
+                        </Switch>
+                      </Tabs.Content>
+                    </Show>
+                    <Show when={fileTreeTab() === "all"}>
+                      <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
+                        <Switch>
+                          <Match when={nofiles()}>{empty(language.t("session.files.empty"))}</Match>
+                          <Match when={true}>
                             <FileTree
                               path=""
                               class="pt-3"
-                              allowed={diffFiles()}
+                              modified={diffFiles()}
                               kinds={kinds()}
-                              draggable={false}
-                              active={props.activeDiff}
-                              onFileClick={(node) => props.focusReviewDiff(node.path)}
+                              onFileClick={(node) => openTab(file.tab(node.path))}
                             />
-                          </Show>
-                        </Match>
-                      </Switch>
-                    </Tabs.Content>
-                    <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
-                      <Switch>
-                        <Match when={nofiles()}>{empty(language.t("session.files.empty"))}</Match>
-                        <Match when={true}>
-                          <FileTree
-                            path=""
-                            class="pt-3"
-                            modified={diffFiles()}
-                            kinds={kinds()}
-                            onFileClick={(node) => openTab(file.tab(node.path))}
-                          />
-                        </Match>
-                      </Switch>
-                    </Tabs.Content>
+                          </Match>
+                        </Switch>
+                      </Tabs.Content>
+                    </Show>
                   </Tabs>
                 </div>
                 <Show when={fileOpen()}>
diff --git a/packages/session-ui/src/v2/components/session-review-v2.tsx b/packages/session-ui/src/v2/components/session-review-v2.tsx
index 5689f292cad3..3c13c75d7bb1 100644
--- a/packages/session-ui/src/v2/components/session-review-v2.tsx
+++ b/packages/session-ui/src/v2/components/session-review-v2.tsx
@@ -74,62 +74,62 @@ export function SessionReviewV2Sidebar(props: SessionReviewV2SidebarProps) {
 
   return (
     <div data-component="session-review-v2-sidebar-root">
-      <aside
-        data-slot="session-review-v2-sidebar"
-        data-resizing={resizing() ? "" : undefined}
-        aria-hidden={!props.open}
-        inert={!props.open}
-        style={{ width: props.open ? `${width()}px` : "0px" }}
-      >
-        <div data-slot="session-review-v2-sidebar-header">
-          <div data-slot="session-review-v2-sidebar-title">{props.title}</div>
-          {props.stats}
-        </div>
-        <div data-slot="session-review-v2-sidebar-filter">
-          <TextInputV2
-            type="search"
-            value={props.filter}
-            onInput={(event) => props.onFilterChange(event.currentTarget.value)}
-            onKeyDown={props.onFilterKeyDown}
-            autofocus={props.filterAutofocus}
-            ref={props.filterRef}
-            role={props.filterControls ? "combobox" : undefined}
-            aria-autocomplete={props.filterControls ? "list" : undefined}
-            aria-controls={props.filterControls}
-            aria-activedescendant={props.filterActiveDescendant}
-            aria-expanded={props.filterControls ? props.filterExpanded : undefined}
-            showClearButton={props.filter.length > 0}
-            clearLabel={i18n.t("ui.list.clearFilter")}
-            onClearClick={() => props.onFilterChange("")}
-            placeholder={i18n.t("ui.sessionReviewV2.filterFiles")}
-            aria-label={i18n.t("ui.sessionReviewV2.filterFiles")}
-            leadingIcon={
-              <svg
-                width="14"
-                height="14"
-                viewBox="0 0 14 14"
-                fill="none"
-                xmlns="http://www.w3.org/2000/svg"
-                aria-hidden="true"
-              >
-                <path
-                  d="M12.25 12.25L10.0625 10.0625M11.0833 6.41667C11.0833 8.994 8.994 11.0833 6.41667 11.0833C3.83934 11.0833 1.75 8.994 1.75 6.41667C1.75 3.83934 3.83934 1.75 6.41667 1.75C8.994 1.75 11.0833 3.83934 11.0833 6.41667Z"
-                  stroke="currentColor"
-                  stroke-linecap="square"
-                />
-              </svg>
-            }
-          />
-        </div>
-        <ScrollView
-          data-slot="session-review-v2-sidebar-tree"
-          class="group/file-tree-v2"
-          thumbVisibility="scroll"
-          viewportRef={props.viewportRef}
+      <Show when={props.open}>
+        <aside
+          data-slot="session-review-v2-sidebar"
+          data-resizing={resizing() ? "" : undefined}
+          style={{ width: `${width()}px` }}
         >
-          {props.children}
-        </ScrollView>
-      </aside>
+          <div data-slot="session-review-v2-sidebar-header">
+            <div data-slot="session-review-v2-sidebar-title">{props.title}</div>
+            {props.stats}
+          </div>
+          <div data-slot="session-review-v2-sidebar-filter">
+            <TextInputV2
+              type="search"
+              value={props.filter}
+              onInput={(event) => props.onFilterChange(event.currentTarget.value)}
+              onKeyDown={props.onFilterKeyDown}
+              autofocus={props.filterAutofocus}
+              ref={props.filterRef}
+              role={props.filterControls ? "combobox" : undefined}
+              aria-autocomplete={props.filterControls ? "list" : undefined}
+              aria-controls={props.filterControls}
+              aria-activedescendant={props.filterActiveDescendant}
+              aria-expanded={props.filterControls ? props.filterExpanded : undefined}
+              showClearButton={props.filter.length > 0}
+              clearLabel={i18n.t("ui.list.clearFilter")}
+              onClearClick={() => props.onFilterChange("")}
+              placeholder={i18n.t("ui.sessionReviewV2.filterFiles")}
+              aria-label={i18n.t("ui.sessionReviewV2.filterFiles")}
+              leadingIcon={
+                <svg
+                  width="14"
+                  height="14"
+                  viewBox="0 0 14 14"
+                  fill="none"
+                  xmlns="http://www.w3.org/2000/svg"
+                  aria-hidden="true"
+                >
+                  <path
+                    d="M12.25 12.25L10.0625 10.0625M11.0833 6.41667C11.0833 8.994 8.994 11.0833 6.41667 11.0833C3.83934 11.0833 1.75 8.994 1.75 6.41667C1.75 3.83934 3.83934 1.75 6.41667 1.75C8.994 1.75 11.0833 3.83934 11.0833 6.41667Z"
+                    stroke="currentColor"
+                    stroke-linecap="square"
+                  />
+                </svg>
+              }
+            />
+          </div>
+          <ScrollView
+            data-slot="session-review-v2-sidebar-tree"
+            class="group/file-tree-v2"
+            thumbVisibility="scroll"
+            viewportRef={props.viewportRef}
+          >
+            {props.children}
+          </ScrollView>
+        </aside>
+      </Show>
       <Show when={props.open && props.onWidthChange}>
         <div data-slot="session-review-v2-sidebar-resize" onPointerDown={() => setResizing(true)}>
           <ResizeHandle

From dd25d143c5a4f9dfe998b4b43e450e495bf55e06 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:47:46 +1000
Subject: [PATCH 22/33] fix(app): reserve review pane minimum instead of
 capping chat width at 45% (#35078)

---
 packages/app/src/pages/session.tsx            | 45 ++++++++++++++--
 .../pages/session/session-panel-width.test.ts | 52 +++++++++++++++++++
 .../src/pages/session/session-panel-width.ts  | 19 +++++++
 3 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 packages/app/src/pages/session/session-panel-width.test.ts
 create mode 100644 packages/app/src/pages/session/session-panel-width.ts

diff --git a/packages/app/src/pages/session.tsx b/packages/app/src/pages/session.tsx
index 912ff17f1de9..cbf47dc84984 100644
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -11,6 +11,7 @@ import {
   createMemo,
   createEffect,
   createComputed,
+  createSignal,
   on,
   onMount,
   type ParentProps,
@@ -69,6 +70,11 @@ import { createTimelineModel } from "@/pages/session/timeline/model"
 import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { syncSessionModel } from "@/pages/session/session-model-helpers"
+import {
+  clampSessionPanelWidth,
+  SESSION_PANEL_WIDTH_MIN,
+  sessionPanelWidthMax,
+} from "@/pages/session/session-panel-width"
 import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { sessionPanelLayout } from "@/pages/session/session-panel-layout"
 import { SessionReviewEmptyChangesV2 } from "@opencode-ai/session-ui/v2/session-review-empty-changes-v2"
@@ -442,9 +448,39 @@ export default function Page() {
     newSessionDesign() ? desktopV2ReviewOpen() || desktopTerminalOpen() : desktopReviewOpen(),
   )
   const desktopSidePanelOpen = createMemo(() => desktopSessionResizeOpen() || desktopFileTreeOpen())
+  let panelRow: HTMLDivElement | undefined
+  const [panelRowWidth, setPanelRowWidth] = createSignal<number>()
+  createResizeObserver(
+    () => panelRow,
+    ({ width }) => setPanelRowWidth(width),
+  )
+  const splitReview = createMemo(
+    () => (newSessionDesign() ? desktopV2ReviewOpen() : desktopReviewOpen()) && layout.review.diffStyle() === "split",
+  )
+  // The observer reports the content-box width, which already excludes the row
+  // padding; only the flex gap between the panels remains to subtract.
+  const sessionPanelAvailable = createMemo(() => {
+    const width = panelRowWidth()
+    if (width === undefined) return undefined
+    return width - (settings.general.newLayoutDesigns() ? 8 : 0)
+  })
+  const sessionPanelMax = createMemo(() => {
+    const available = sessionPanelAvailable()
+    if (available === undefined) return 1000
+    return sessionPanelWidthMax({ available, split: splitReview() })
+  })
+  // Clamp at render time so window or sidebar resizes squeeze the chat panel
+  // instead of the review pane, without overwriting the persisted width.
+  const sessionPanelResizedWidth = createMemo(() =>
+    clampSessionPanelWidth({
+      width: layout.session.width(),
+      available: sessionPanelAvailable(),
+      split: splitReview(),
+    }),
+  )
   const sessionPanelWidth = createMemo(() => {
     if (!desktopSidePanelOpen()) return "100%"
-    if (desktopSessionResizeOpen()) return `${layout.session.width()}px`
+    if (desktopSessionResizeOpen()) return `${sessionPanelResizedWidth()}px`
     return `calc(100% - ${layout.fileTree.width()}px)`
   })
   const centered = createMemo(() => isDesktop() && !desktopReviewOpen())
@@ -2148,6 +2184,7 @@ export default function Page() {
     <SessionRouteFrame>
       <SessionHeader />
       <div
+        ref={panelRow}
         class="flex-1 min-h-0 flex flex-col md:flex-row"
         classList={{
           "gap-2 p-2": settings.general.newLayoutDesigns(),
@@ -2186,9 +2223,9 @@ export default function Page() {
                   "-right-1": settings.general.newLayoutDesigns(),
                 }}
                 direction="horizontal"
-                size={layout.session.width()}
-                min={450}
-                max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.45}
+                size={sessionPanelResizedWidth()}
+                min={SESSION_PANEL_WIDTH_MIN}
+                max={sessionPanelMax()}
                 onResize={(width) => {
                   size.touch()
                   layout.session.resize(width)
diff --git a/packages/app/src/pages/session/session-panel-width.test.ts b/packages/app/src/pages/session/session-panel-width.test.ts
new file mode 100644
index 000000000000..3e2623775fe9
--- /dev/null
+++ b/packages/app/src/pages/session/session-panel-width.test.ts
@@ -0,0 +1,52 @@
+import { describe, expect, test } from "bun:test"
+import {
+  clampSessionPanelWidth,
+  REVIEW_PANE_WIDTH_MIN,
+  REVIEW_PANE_WIDTH_MIN_SPLIT,
+  SESSION_PANEL_WIDTH_MIN,
+  sessionPanelWidthMax,
+} from "./session-panel-width"
+
+describe("sessionPanelWidthMax", () => {
+  test("reserves the unified review pane minimum", () => {
+    expect(sessionPanelWidthMax({ available: 1700, split: false })).toBe(1700 - REVIEW_PANE_WIDTH_MIN)
+  })
+
+  test("reserves a larger minimum for split diffs", () => {
+    expect(sessionPanelWidthMax({ available: 1700, split: true })).toBe(1700 - REVIEW_PANE_WIDTH_MIN_SPLIT)
+    expect(REVIEW_PANE_WIDTH_MIN_SPLIT).toBeGreaterThan(REVIEW_PANE_WIDTH_MIN)
+  })
+
+  test("lets the chat panel take everything beyond the review pane minimum", () => {
+    // Regression: the old cap was 45% of the window, forcing the review pane
+    // to at least 55% of the window regardless of content.
+    const available = 3440
+    expect(sessionPanelWidthMax({ available, split: false })).toBeGreaterThan(available * 0.45)
+  })
+
+  test("never drops below the chat panel minimum on small windows", () => {
+    expect(sessionPanelWidthMax({ available: 600, split: true })).toBe(SESSION_PANEL_WIDTH_MIN)
+    expect(sessionPanelWidthMax({ available: 0, split: false })).toBe(SESSION_PANEL_WIDTH_MIN)
+  })
+})
+
+describe("clampSessionPanelWidth", () => {
+  test("keeps widths already within the limit", () => {
+    expect(clampSessionPanelWidth({ width: 800, available: 1700, split: false })).toBe(800)
+  })
+
+  test("forces the width down when the window shrinks", () => {
+    expect(clampSessionPanelWidth({ width: 1600, available: 1700, split: false })).toBe(1700 - REVIEW_PANE_WIDTH_MIN)
+    expect(clampSessionPanelWidth({ width: 1600, available: 1700, split: true })).toBe(
+      1700 - REVIEW_PANE_WIDTH_MIN_SPLIT,
+    )
+  })
+
+  test("holds the chat panel minimum when there is no room for both", () => {
+    expect(clampSessionPanelWidth({ width: 1600, available: 700, split: true })).toBe(SESSION_PANEL_WIDTH_MIN)
+  })
+
+  test("skips clamping before the layout is measured", () => {
+    expect(clampSessionPanelWidth({ width: 1600, available: undefined, split: false })).toBe(1600)
+  })
+})
diff --git a/packages/app/src/pages/session/session-panel-width.ts b/packages/app/src/pages/session/session-panel-width.ts
new file mode 100644
index 000000000000..d04646b48399
--- /dev/null
+++ b/packages/app/src/pages/session/session-panel-width.ts
@@ -0,0 +1,19 @@
+// The review pane has no width of its own: it takes whatever the chat panel
+// leaves behind. Instead of capping the chat panel at a fraction of the window
+// (which forces the review pane to grow with the monitor), reserve a fixed
+// minimum for the review pane and let the chat panel take everything else.
+export const SESSION_PANEL_WIDTH_MIN = 450
+export const REVIEW_PANE_WIDTH_MIN = 480
+export const REVIEW_PANE_WIDTH_MIN_SPLIT = 800
+
+export function sessionPanelWidthMax(input: { available: number; split: boolean }) {
+  const pane = input.split ? REVIEW_PANE_WIDTH_MIN_SPLIT : REVIEW_PANE_WIDTH_MIN
+  return Math.max(SESSION_PANEL_WIDTH_MIN, input.available - pane)
+}
+
+// `available` is undefined until the layout row is first measured; render the
+// stored width untouched until then to avoid a first-frame snap.
+export function clampSessionPanelWidth(input: { width: number; available: number | undefined; split: boolean }) {
+  if (input.available === undefined) return input.width
+  return Math.min(input.width, sessionPanelWidthMax({ available: input.available, split: input.split }))
+}

From 0abbcddac233e313bcb67608a527929910df861c Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]"
 <219766164+opencode-agent[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 09:53:05 +1000
Subject: [PATCH 23/33] chore: add missing team members (#35980)

Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
---
 .github/TEAM_MEMBERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/TEAM_MEMBERS b/.github/TEAM_MEMBERS
index f892eb95dbc4..5eb465e0dd41 100644
--- a/.github/TEAM_MEMBERS
+++ b/.github/TEAM_MEMBERS
@@ -1,4 +1,5 @@
 adamdotdevin
+arvsrn
 Brendonovich
 fwang
 Hona
@@ -7,11 +8,14 @@ jayair
 jlongster
 kitlangton
 kommander
+ludvigrask
 MrMushrooooom
 nexxeln
 R44VC0RP
 rekram1-node
 thdxr
 simonklee
+Slickstef11
+usrnk1
 vimtor
 starptech

From 1db5c2402cbb3cde95684f018fec0a740d56ee41 Mon Sep 17 00:00:00 2001
From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Date: Thu, 9 Jul 2026 00:13:10 -0500
Subject: [PATCH 24/33] fix(opencode): expose Grok reasoning variants (#36017)

---
 packages/opencode/src/provider/transform.ts       |  1 -
 packages/opencode/test/provider/transform.test.ts | 14 ++++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/opencode/src/provider/transform.ts b/packages/opencode/src/provider/transform.ts
index 8b5bcab6117a..c14587ba8a4e 100644
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -734,7 +734,6 @@ export function variants(model: Provider.Model): Record<string, Record<string, a
       high: { reasoningEffort: "high" },
     }
   }
-  if (id.includes("grok")) return {}
 
   switch (model.api.npm) {
     case "@openrouter/ai-sdk-provider":
diff --git a/packages/opencode/test/provider/transform.test.ts b/packages/opencode/test/provider/transform.test.ts
index 8f2be02a6747..e69dab70f65d 100644
--- a/packages/opencode/test/provider/transform.test.ts
+++ b/packages/opencode/test/provider/transform.test.ts
@@ -3339,7 +3339,7 @@ describe("ProviderTransform.variants", () => {
       expect(Object.keys(result)).toEqual(["low", "medium", "high"])
     })
 
-    test("grok-4 returns empty object", () => {
+    test("grok-4 uses the provider's standard efforts", () => {
       const model = createMockModel({
         id: "openrouter/grok-4",
         providerID: "openrouter",
@@ -3350,7 +3350,8 @@ describe("ProviderTransform.variants", () => {
         },
       })
       const result = ProviderTransform.variants(model)
-      expect(result).toEqual({})
+      expect(Object.keys(result)).toEqual(["low", "medium", "high"])
+      expect(result.medium).toEqual({ reasoning: { effort: "medium" } })
     })
 
     test("grok-3-mini returns low and high with reasoning", () => {
@@ -3766,18 +3767,19 @@ describe("ProviderTransform.variants", () => {
   })
 
   describe("@ai-sdk/xai", () => {
-    test("grok-3 returns empty object", () => {
+    test("grok-4.5 uses standard reasoning efforts", () => {
       const model = createMockModel({
-        id: "xai/grok-3",
+        id: "xai/grok-4.5",
         providerID: "xai",
         api: {
-          id: "grok-3",
+          id: "grok-4.5",
           url: "https://api.x.ai",
           npm: "@ai-sdk/xai",
         },
       })
       const result = ProviderTransform.variants(model)
-      expect(result).toEqual({})
+      expect(Object.keys(result)).toEqual(["low", "medium", "high"])
+      expect(result.medium).toEqual({ reasoningEffort: "medium" })
     })
 
     test("grok-3-mini returns low and high with reasoningEffort", () => {

From 13fa4937b236117f9d683ab7ac12c2dd570ea5ed Mon Sep 17 00:00:00 2001
From: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Date: Thu, 9 Jul 2026 07:27:22 +0200
Subject: [PATCH 25/33] feat(desktop): add provider connection tip (#35948)

Co-authored-by: Brendan Allan <git@brendonovich.dev>
---
 bun.lock                                      |  5 +-
 packages/app/package.json                     |  1 +
 .../app/src/components/settings-dialog.tsx    |  4 +-
 packages/app/src/i18n/ar.ts                   |  1 +
 packages/app/src/i18n/br.ts                   |  1 +
 packages/app/src/i18n/bs.ts                   |  1 +
 packages/app/src/i18n/da.ts                   |  1 +
 packages/app/src/i18n/de.ts                   |  1 +
 packages/app/src/i18n/en.ts                   |  1 +
 packages/app/src/i18n/es.ts                   |  1 +
 packages/app/src/i18n/fr.ts                   |  1 +
 packages/app/src/i18n/ja.ts                   |  1 +
 packages/app/src/i18n/ko.ts                   |  1 +
 packages/app/src/i18n/no.ts                   |  1 +
 packages/app/src/i18n/pl.ts                   |  1 +
 packages/app/src/i18n/ru.ts                   |  1 +
 packages/app/src/i18n/th.ts                   |  1 +
 packages/app/src/i18n/tr.ts                   |  1 +
 packages/app/src/i18n/uk.ts                   |  1 +
 packages/app/src/i18n/zh.ts                   |  1 +
 packages/app/src/i18n/zht.ts                  |  1 +
 packages/app/src/pages/new-session.tsx        | 84 ++++++++++++++++++-
 22 files changed, 108 insertions(+), 4 deletions(-)

diff --git a/bun.lock b/bun.lock
index 2c91b45ed6de..ba18f4635aa1 100644
--- a/bun.lock
+++ b/bun.lock
@@ -72,6 +72,7 @@
         "shiki": "catalog:",
         "solid-js": "catalog:",
         "solid-list": "catalog:",
+        "solid-presence": "0.2.0",
         "tailwindcss": "catalog:",
       },
       "devDependencies": {
@@ -5103,7 +5104,7 @@
 
     "solid-list": ["solid-list@0.3.0", "", { "dependencies": { "@corvu/utils": "~0.4.0" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-t4hx/F/l8Vmq+ib9HtZYl7Z9F1eKxq3eKJTXlvcm7P7yI4Z8O7QSOOEVHb/K6DD7M0RxzVRobK/BS5aSfLRwKg=="],
 
-    "solid-presence": ["solid-presence@0.1.8", "", { "dependencies": { "@corvu/utils": "~0.4.0" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-pWGtXUFWYYUZNbg5YpG5vkQJyOtzn2KXhxYaMx/4I+lylTLYkITOLevaCwMRN+liCVk0pqB6EayLWojNqBFECA=="],
+    "solid-presence": ["solid-presence@0.2.0", "", { "dependencies": { "@corvu/utils": "~0.4.2" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-YM92o+jvpzX3XGaD4rLYmq/Kc2ZVh47GSCLEufHBFQQIurvZTs8SoGJxO8BJGNDxBKdcS8F3dYhW1SDXp4BNjA=="],
 
     "solid-prevent-scroll": ["solid-prevent-scroll@0.1.10", "", { "dependencies": { "@corvu/utils": "~0.4.1" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-KplGPX2GHiWJLZ6AXYRql4M127PdYzfwvLJJXMkO+CMb8Np4VxqDAg5S8jLdwlEuBis/ia9DKw2M8dFx5u8Mhw=="],
 
@@ -5921,6 +5922,8 @@
 
     "@jsx-email/doiuse-email/htmlparser2": ["htmlparser2@9.1.0", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", "domutils": "^3.1.0", "entities": "^4.5.0" } }, "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ=="],
 
+    "@kobalte/core/solid-presence": ["solid-presence@0.1.8", "", { "dependencies": { "@corvu/utils": "~0.4.0" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-pWGtXUFWYYUZNbg5YpG5vkQJyOtzn2KXhxYaMx/4I+lylTLYkITOLevaCwMRN+liCVk0pqB6EayLWojNqBFECA=="],
+
     "@malept/flatpak-bundler/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],
 
     "@mdx-js/mdx/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
diff --git a/packages/app/package.json b/packages/app/package.json
index 7430a614bfaa..704c7401f23d 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -88,6 +88,7 @@
     "shiki": "catalog:",
     "solid-js": "catalog:",
     "solid-list": "catalog:",
+    "solid-presence": "0.2.0",
     "tailwindcss": "catalog:"
   }
 }
diff --git a/packages/app/src/components/settings-dialog.tsx b/packages/app/src/components/settings-dialog.tsx
index d2cc85c04e57..46dd89ade817 100644
--- a/packages/app/src/components/settings-dialog.tsx
+++ b/packages/app/src/components/settings-dialog.tsx
@@ -4,7 +4,7 @@ import { useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 
-export function useSettingsDialog() {
+export function useSettingsDialog(defaultValue?: string) {
   const dialog = useDialog()
   const params = useParams<{ id?: string }>()
   let run = 0
@@ -19,7 +19,7 @@ export function useSettingsDialog() {
     const sessionID = params.id
     void import("@/components/settings-v2").then((module) => {
       if (dead || run !== current) return
-      void dialog.show(() => <module.DialogSettings sessionID={sessionID} />)
+      void dialog.show(() => <module.DialogSettings sessionID={sessionID} defaultValue={defaultValue} />)
     })
   }
 }
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index c60920d10763..b343d1a92921 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -548,6 +548,7 @@ export const dict = {
   "home.sessions.group.today": "اليوم",
   "home.sessions.group.yesterday": "أمس",
   "home.sessions.group.older": "الأقدم",
+  "home.providerTip": "اتصل بأكثر من 75 مزودًا لاستخدام نماذج أخرى، بما فيها Claude وGPT وGemini وغيرها",
   "session.tab.session": "جلسة",
   "session.tab.review": "مراجعة",
   "session.tab.context": "سياق",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index 12911744e2c2..0d164cd03a45 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -552,6 +552,7 @@ export const dict = {
   "home.sessions.group.today": "Hoje",
   "home.sessions.group.yesterday": "Ontem",
   "home.sessions.group.older": "Mais antigas",
+  "home.providerTip": "Conecte-se a mais de 75 provedores para usar outros modelos, incluindo Claude, GPT, Gemini e muito mais",
   "session.tab.session": "Sessão",
   "session.tab.review": "Revisão",
   "session.tab.context": "Contexto",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index 086ecc1b4c0b..04b6474a784d 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -603,6 +603,7 @@ export const dict = {
   "home.sessions.group.today": "Danas",
   "home.sessions.group.yesterday": "Jučer",
   "home.sessions.group.older": "Starije",
+  "home.providerTip": "Povežite se s više od 75 pružalaca usluga kako biste koristili druge modele, uključujući Claude, GPT, Gemini i druge",
 
   "session.tab.session": "Sesija",
   "session.tab.review": "Pregled",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index 859bea230b26..35cee17aeff4 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -600,6 +600,7 @@ export const dict = {
   "home.sessions.group.today": "I dag",
   "home.sessions.group.yesterday": "I går",
   "home.sessions.group.older": "Ældre",
+  "home.providerTip": "Opret forbindelse til mere end 75 udbydere for at bruge andre modeller, herunder Claude, GPT, Gemini og flere",
 
   "session.tab.session": "Session",
   "session.tab.review": "Gennemgang",
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index c96dc232a5d3..afd176c58008 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -560,6 +560,7 @@ export const dict = {
   "home.sessions.group.today": "Heute",
   "home.sessions.group.yesterday": "Gestern",
   "home.sessions.group.older": "Älter",
+  "home.providerTip": "Verbinde dich mit über 75 Anbietern, um weitere Modelle wie Claude, GPT, Gemini und andere zu nutzen",
   "session.tab.session": "Sitzung",
   "session.tab.review": "Überprüfung",
   "session.tab.context": "Kontext",
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 3da8183bb7e7..a281968d656b 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -622,6 +622,7 @@ export const dict = {
   "home.sessions.group.today": "Today",
   "home.sessions.group.yesterday": "Yesterday",
   "home.sessions.group.older": "Older",
+  "home.providerTip": "Connect to 75+ providers to use other models, including Claude, GPT, Gemini, etc",
 
   "session.tab.session": "Session",
   "session.tab.review": "Review",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index 5ef7862cd695..77011732c8b7 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -604,6 +604,7 @@ export const dict = {
   "home.sessions.group.today": "Hoy",
   "home.sessions.group.yesterday": "Ayer",
   "home.sessions.group.older": "Anteriores",
+  "home.providerTip": "Conéctate a más de 75 proveedores para usar otros modelos, como Claude, GPT, Gemini y muchos más",
 
   "session.tab.session": "Sesión",
   "session.tab.review": "Revisión",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index 77a543180d20..fa6262ec75ca 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -557,6 +557,7 @@ export const dict = {
   "home.sessions.group.today": "Aujourd'hui",
   "home.sessions.group.yesterday": "Hier",
   "home.sessions.group.older": "Plus anciennes",
+  "home.providerTip": "Connectez-vous à plus de 75 fournisseurs pour utiliser d’autres modèles, notamment Claude, GPT, Gemini, etc.",
   "session.tab.session": "Session",
   "session.tab.review": "Revue",
   "session.tab.context": "Contexte",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index 24d1a29e8a28..87f0ebebe7f4 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -550,6 +550,7 @@ export const dict = {
   "home.sessions.group.today": "今日",
   "home.sessions.group.yesterday": "昨日",
   "home.sessions.group.older": "それ以前",
+  "home.providerTip": "75以上のプロバイダーに接続して、Claude、GPT、Geminiなどの他のモデルを利用できます",
   "session.tab.session": "セッション",
   "session.tab.review": "レビュー",
   "session.tab.context": "コンテキスト",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index cf789f5644b3..de3a61a9f94f 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -950,6 +950,7 @@ export const dict = {
   "home.sessions.group.today": "오늘",
   "home.sessions.group.yesterday": "어제",
   "home.sessions.group.older": "이전",
+  "home.providerTip": "75개 이상의 제공업체에 연결하여 Claude, GPT, Gemini 등의 다른 모델을 사용하세요",
 
   "session.tab.unknown": "알 수 없는 세션",
   "session.error.notFound": "이 세션을 찾을 수 없습니다",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index f3faa313829f..36c64e683d3b 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -1043,6 +1043,7 @@ export const dict = {
   "home.sessions.group.today": "I dag",
   "home.sessions.group.yesterday": "I går",
   "home.sessions.group.older": "Eldre",
+  "home.providerTip": "Koble til over 75 leverandører for å bruke andre modeller, inkludert Claude, GPT, Gemini og flere",
 
   "session.tab.unknown": "Ukjent sesjon",
   "session.error.notFound": "Denne sesjonen finnes ikke",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index 295d8e615a55..2a087909b46a 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -553,6 +553,7 @@ export const dict = {
   "home.sessions.group.today": "Dzisiaj",
   "home.sessions.group.yesterday": "Wczoraj",
   "home.sessions.group.older": "Starsze",
+  "home.providerTip": "Połącz się z ponad 75 dostawcami, aby korzystać z innych modeli, w tym Claude, GPT, Gemini i innych",
   "session.tab.session": "Sesja",
   "session.tab.review": "Przegląd",
   "session.tab.context": "Kontekst",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index 7ef78bb4805d..6079004d6f4c 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -604,6 +604,7 @@ export const dict = {
   "home.sessions.group.today": "Сегодня",
   "home.sessions.group.yesterday": "Вчера",
   "home.sessions.group.older": "Ранее",
+  "home.providerTip": "Подключитесь к более чем 75 провайдерам, чтобы использовать другие модели, включая Claude, GPT, Gemini и другие",
 
   "session.tab.session": "Сессия",
   "session.tab.review": "Обзор",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index 686db7407c5b..5b245d55e29b 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -599,6 +599,7 @@ export const dict = {
   "home.sessions.group.today": "วันนี้",
   "home.sessions.group.yesterday": "เมื่อวาน",
   "home.sessions.group.older": "ก่อนหน้านี้",
+  "home.providerTip": "เชื่อมต่อกับผู้ให้บริการกว่า 75 รายเพื่อใช้โมเดลอื่นๆ รวมถึง Claude, GPT, Gemini และอีกมากมาย",
 
   "session.tab.session": "เซสชัน",
   "session.tab.review": "ตรวจสอบ",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index b578f89cca85..f0472d325e02 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -608,6 +608,7 @@ export const dict = {
   "home.sessions.group.today": "Bugün",
   "home.sessions.group.yesterday": "Dün",
   "home.sessions.group.older": "Daha eski",
+  "home.providerTip": "Claude, GPT, Gemini ve diğer modelleri kullanmak için 75'ten fazla sağlayıcıya bağlanın",
 
   "session.tab.session": "Oturum",
   "session.tab.review": "İnceleme",
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index ff18c8e342ed..afac52b0e255 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -626,6 +626,7 @@ export const dict = {
   "home.sessions.group.today": "Сьогодні",
   "home.sessions.group.yesterday": "Учора",
   "home.sessions.group.older": "Раніше",
+  "home.providerTip": "Підключіться до понад 75 провайдерів, щоб використовувати інші моделі, зокрема Claude, GPT, Gemini та інші",
 
   "session.tab.session": "Сесія",
   "session.tab.review": "Огляд",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index 3cccc0c82d49..a1325d90678c 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -600,6 +600,7 @@ export const dict = {
   "home.sessions.group.today": "今天",
   "home.sessions.group.yesterday": "昨天",
   "home.sessions.group.older": "更早",
+  "home.providerTip": "连接 75 个以上的提供商，使用 Claude、GPT、Gemini 等其他模型",
 
   "session.tab.session": "会话",
   "session.tab.review": "审查",
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index afe285f6e54b..436e2b60d8f5 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -595,6 +595,7 @@ export const dict = {
   "home.sessions.group.today": "今天",
   "home.sessions.group.yesterday": "昨天",
   "home.sessions.group.older": "更早",
+  "home.providerTip": "連接 75 個以上的供應商，使用 Claude、GPT、Gemini 等其他模型",
 
   "session.tab.session": "工作階段",
   "session.tab.review": "審查",
diff --git a/packages/app/src/pages/new-session.tsx b/packages/app/src/pages/new-session.tsx
index 7831ed8514e3..7a8e44c5abc2 100644
--- a/packages/app/src/pages/new-session.tsx
+++ b/packages/app/src/pages/new-session.tsx
@@ -1,8 +1,10 @@
-import { Show, createEffect, createMemo, createResource, untrack } from "solid-js"
+import { Show, createEffect, createMemo, createResource, createSignal, onCleanup, untrack } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Portal } from "solid-js/web"
 import { useSearchParams } from "@solidjs/router"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
+import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
+import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { NewSessionDesignView } from "@/components/session"
 import { PromptInput } from "@/components/prompt-input"
 import { StatusPopoverV2 } from "@/components/status-popover"
@@ -24,8 +26,14 @@ import { useComposerCommands } from "@/pages/session/use-composer-commands"
 import { NEW_SESSION_CONTENT_WIDTH } from "@/pages/session/new-session-layout"
 import { PromptWorkspaceSelector } from "@/components/prompt-workspace-selector"
 import { useTitlebarRightMount } from "@/components/titlebar"
+import { useProviders } from "@/hooks/use-providers"
+import { useSettingsDialog } from "@/components/settings-dialog"
+import { Persist, persisted } from "@/utils/persist"
+import createPresence from "solid-presence"
 
 const workspaceBarEnabled = import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"
+const providerTipDismissalDuration = 30 * 24 * 60 * 60 * 1000
+const providerTipExitDuration = 250
 
 /**
  * The `/new-session` draft page. Unlike `session.tsx`, this only renders the prompt
@@ -40,6 +48,8 @@ export default function NewSessionPage() {
   const comments = useComments()
   const language = useLanguage()
   const settings = useSettings()
+  const providers = useProviders(() => sdk().directory)
+  const openProviderSettings = useSettingsDialog("providers")
   const route = useSessionKey()
   const [searchParams, setSearchParams] = useSearchParams<{ draftId?: string; prompt?: string }>()
 
@@ -174,9 +184,81 @@ export default function NewSessionPage() {
                 </Show>
               </div>
             </NewSessionDesignView>
+            <ProviderTip
+              ready={() => serverSync().child(sdk().directory)[0].provider_ready}
+              connected={() => providers.paid().length > 0}
+              openProviders={openProviderSettings}
+            />
           </div>
         </div>
       </div>
     </div>
   )
 }
+
+function ProviderTip(props: { ready: () => boolean; connected: () => boolean; openProviders: () => void }) {
+  const language = useLanguage()
+  const [persistedState, setPersistedState, , persistedReady] = persisted(
+    Persist.global("new-session.provider-tip"),
+    createStore({ dismissedAt: 0 }),
+  )
+  const visible = createMemo(
+    () =>
+      props.ready() &&
+      persistedReady() &&
+      !props.connected() &&
+      Date.now() - persistedState.dismissedAt >= providerTipDismissalDuration,
+  )
+
+  function dismiss() {
+    setPersistedState("dismissedAt", Date.now())
+  }
+
+  const [ref, setRef] = createSignal<HTMLDivElement>()
+  const presence = createPresence({
+    show: () => visible(),
+    element: () => ref() ?? null,
+  })
+
+  return (
+    <Show when={presence.present()}>
+      <div class="pointer-events-none absolute inset-x-0 bottom-4 flex justify-center px-10">
+        <div
+          ref={setRef}
+          data-component="provider-tip"
+          data-visible={visible()}
+          class="group/provider-tip pointer-events-auto relative flex h-6 max-w-full items-center transition-[opacity,transform] duration-[250ms] ease-[cubic-bezier(0.215,0.61,0.355,1)] motion-reduce:transition-none"
+          classList={{
+            "data-[visible=false]:animate-out fade-out slide-out-to-bottom-4": true,
+          }}
+        >
+          <button
+            type="button"
+            class="flex h-6 min-w-0 items-center rounded-[4px] pl-1.5 text-[13px] leading-none tracking-[-0.04px] text-v2-text-text-faint transition-[background-color,color] duration-150 ease-in-out hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-text-text-muted focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-text-text-muted focus-visible:outline-none"
+            onClick={props.openProviders}
+          >
+            <span class="truncate">{language.t("home.providerTip")}</span>
+            <span class="flex size-6 shrink-0 items-center justify-center" aria-hidden="true">
+              <IconV2 name="chevron-down" size="small" class="-rotate-90" />
+            </span>
+          </button>
+          <TooltipV2
+            class="hover-reveal absolute left-full top-0 flex h-6 w-7 items-center justify-end delay-0 duration-0 group-hover/provider-tip:delay-[250ms] group-hover/provider-tip:duration-150 group-hover/provider-tip:opacity-100 focus-within:delay-0 focus-within:duration-0 focus-within:opacity-100"
+            placement="top"
+            openDelay={1000}
+            value={language.t("common.dismiss")}
+          >
+            <button
+              type="button"
+              class="flex size-6 items-center justify-center rounded-[4px] text-v2-icon-icon-muted transition-[background-color,color] duration-150 ease-in-out hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-icon-icon-base focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-icon-icon-base focus-visible:outline-none"
+              aria-label={language.t("common.dismiss")}
+              onClick={dismiss}
+            >
+              <IconV2 name="xmark-small" />
+            </button>
+          </TooltipV2>
+        </div>
+      </div>
+    </Show>
+  )
+}

From 7c56319aa48037484f84b0190a09e4b72e16535e Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]" <opencode-agent[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 05:28:34 +0000
Subject: [PATCH 26/33] chore: generate

---
 packages/app/src/i18n/br.ts | 3 ++-
 packages/app/src/i18n/bs.ts | 3 ++-
 packages/app/src/i18n/da.ts | 3 ++-
 packages/app/src/i18n/de.ts | 3 ++-
 packages/app/src/i18n/es.ts | 3 ++-
 packages/app/src/i18n/fr.ts | 3 ++-
 packages/app/src/i18n/no.ts | 3 ++-
 packages/app/src/i18n/pl.ts | 3 ++-
 packages/app/src/i18n/ru.ts | 3 ++-
 packages/app/src/i18n/uk.ts | 3 ++-
 10 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index 0d164cd03a45..522749144529 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -552,7 +552,8 @@ export const dict = {
   "home.sessions.group.today": "Hoje",
   "home.sessions.group.yesterday": "Ontem",
   "home.sessions.group.older": "Mais antigas",
-  "home.providerTip": "Conecte-se a mais de 75 provedores para usar outros modelos, incluindo Claude, GPT, Gemini e muito mais",
+  "home.providerTip":
+    "Conecte-se a mais de 75 provedores para usar outros modelos, incluindo Claude, GPT, Gemini e muito mais",
   "session.tab.session": "Sessão",
   "session.tab.review": "Revisão",
   "session.tab.context": "Contexto",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index 04b6474a784d..8e259a153417 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -603,7 +603,8 @@ export const dict = {
   "home.sessions.group.today": "Danas",
   "home.sessions.group.yesterday": "Jučer",
   "home.sessions.group.older": "Starije",
-  "home.providerTip": "Povežite se s više od 75 pružalaca usluga kako biste koristili druge modele, uključujući Claude, GPT, Gemini i druge",
+  "home.providerTip":
+    "Povežite se s više od 75 pružalaca usluga kako biste koristili druge modele, uključujući Claude, GPT, Gemini i druge",
 
   "session.tab.session": "Sesija",
   "session.tab.review": "Pregled",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index 35cee17aeff4..b92b2ad94618 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -600,7 +600,8 @@ export const dict = {
   "home.sessions.group.today": "I dag",
   "home.sessions.group.yesterday": "I går",
   "home.sessions.group.older": "Ældre",
-  "home.providerTip": "Opret forbindelse til mere end 75 udbydere for at bruge andre modeller, herunder Claude, GPT, Gemini og flere",
+  "home.providerTip":
+    "Opret forbindelse til mere end 75 udbydere for at bruge andre modeller, herunder Claude, GPT, Gemini og flere",
 
   "session.tab.session": "Session",
   "session.tab.review": "Gennemgang",
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index afd176c58008..508f9f4c9444 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -560,7 +560,8 @@ export const dict = {
   "home.sessions.group.today": "Heute",
   "home.sessions.group.yesterday": "Gestern",
   "home.sessions.group.older": "Älter",
-  "home.providerTip": "Verbinde dich mit über 75 Anbietern, um weitere Modelle wie Claude, GPT, Gemini und andere zu nutzen",
+  "home.providerTip":
+    "Verbinde dich mit über 75 Anbietern, um weitere Modelle wie Claude, GPT, Gemini und andere zu nutzen",
   "session.tab.session": "Sitzung",
   "session.tab.review": "Überprüfung",
   "session.tab.context": "Kontext",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index 77011732c8b7..8a42519da595 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -604,7 +604,8 @@ export const dict = {
   "home.sessions.group.today": "Hoy",
   "home.sessions.group.yesterday": "Ayer",
   "home.sessions.group.older": "Anteriores",
-  "home.providerTip": "Conéctate a más de 75 proveedores para usar otros modelos, como Claude, GPT, Gemini y muchos más",
+  "home.providerTip":
+    "Conéctate a más de 75 proveedores para usar otros modelos, como Claude, GPT, Gemini y muchos más",
 
   "session.tab.session": "Sesión",
   "session.tab.review": "Revisión",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index fa6262ec75ca..781fbb6305ff 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -557,7 +557,8 @@ export const dict = {
   "home.sessions.group.today": "Aujourd'hui",
   "home.sessions.group.yesterday": "Hier",
   "home.sessions.group.older": "Plus anciennes",
-  "home.providerTip": "Connectez-vous à plus de 75 fournisseurs pour utiliser d’autres modèles, notamment Claude, GPT, Gemini, etc.",
+  "home.providerTip":
+    "Connectez-vous à plus de 75 fournisseurs pour utiliser d’autres modèles, notamment Claude, GPT, Gemini, etc.",
   "session.tab.session": "Session",
   "session.tab.review": "Revue",
   "session.tab.context": "Contexte",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index 36c64e683d3b..90638a6c366b 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -1043,7 +1043,8 @@ export const dict = {
   "home.sessions.group.today": "I dag",
   "home.sessions.group.yesterday": "I går",
   "home.sessions.group.older": "Eldre",
-  "home.providerTip": "Koble til over 75 leverandører for å bruke andre modeller, inkludert Claude, GPT, Gemini og flere",
+  "home.providerTip":
+    "Koble til over 75 leverandører for å bruke andre modeller, inkludert Claude, GPT, Gemini og flere",
 
   "session.tab.unknown": "Ukjent sesjon",
   "session.error.notFound": "Denne sesjonen finnes ikke",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index 2a087909b46a..469dbbda7a15 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -553,7 +553,8 @@ export const dict = {
   "home.sessions.group.today": "Dzisiaj",
   "home.sessions.group.yesterday": "Wczoraj",
   "home.sessions.group.older": "Starsze",
-  "home.providerTip": "Połącz się z ponad 75 dostawcami, aby korzystać z innych modeli, w tym Claude, GPT, Gemini i innych",
+  "home.providerTip":
+    "Połącz się z ponad 75 dostawcami, aby korzystać z innych modeli, w tym Claude, GPT, Gemini i innych",
   "session.tab.session": "Sesja",
   "session.tab.review": "Przegląd",
   "session.tab.context": "Kontekst",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index 6079004d6f4c..fbc4878165a4 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -604,7 +604,8 @@ export const dict = {
   "home.sessions.group.today": "Сегодня",
   "home.sessions.group.yesterday": "Вчера",
   "home.sessions.group.older": "Ранее",
-  "home.providerTip": "Подключитесь к более чем 75 провайдерам, чтобы использовать другие модели, включая Claude, GPT, Gemini и другие",
+  "home.providerTip":
+    "Подключитесь к более чем 75 провайдерам, чтобы использовать другие модели, включая Claude, GPT, Gemini и другие",
 
   "session.tab.session": "Сессия",
   "session.tab.review": "Обзор",
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index afac52b0e255..0da1f738fbf1 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -626,7 +626,8 @@ export const dict = {
   "home.sessions.group.today": "Сьогодні",
   "home.sessions.group.yesterday": "Учора",
   "home.sessions.group.older": "Раніше",
-  "home.providerTip": "Підключіться до понад 75 провайдерів, щоб використовувати інші моделі, зокрема Claude, GPT, Gemini та інші",
+  "home.providerTip":
+    "Підключіться до понад 75 провайдерів, щоб використовувати інші моделі, зокрема Claude, GPT, Gemini та інші",
 
   "session.tab.session": "Сесія",
   "session.tab.review": "Огляд",

From 3cd9ee5a735d709c51a92afd095c1d73dfed47bb Mon Sep 17 00:00:00 2001
From: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Date: Thu, 9 Jul 2026 07:39:55 +0200
Subject: [PATCH 27/33] feat(app): add composer add menu with draft-preserving
 commands (#35711)

---
 packages/app/src/components/prompt-input.tsx  | 130 +++++++++++++++---
 .../components/prompt-input/slash-popover.tsx |  18 +++
 .../prompt-input/transient-state.ts           |   6 +
 packages/app/src/i18n/ar.ts                   |   5 +
 packages/app/src/i18n/br.ts                   |   5 +
 packages/app/src/i18n/bs.ts                   |   5 +
 packages/app/src/i18n/da.ts                   |   5 +
 packages/app/src/i18n/de.ts                   |   5 +
 packages/app/src/i18n/en.ts                   |   5 +
 packages/app/src/i18n/es.ts                   |   5 +
 packages/app/src/i18n/fr.ts                   |   5 +
 packages/app/src/i18n/ja.ts                   |   5 +
 packages/app/src/i18n/ko.ts                   |   5 +
 packages/app/src/i18n/no.ts                   |   5 +
 packages/app/src/i18n/pl.ts                   |   5 +
 packages/app/src/i18n/ru.ts                   |   5 +
 packages/app/src/i18n/th.ts                   |   5 +
 packages/app/src/i18n/tr.ts                   |   5 +
 packages/app/src/i18n/uk.ts                   |   5 +
 packages/app/src/i18n/zh.ts                   |   5 +
 packages/app/src/i18n/zht.ts                  |   5 +
 .../prompt-transient-state.test.ts            |   4 +
 22 files changed, 228 insertions(+), 20 deletions(-)

diff --git a/packages/app/src/components/prompt-input.tsx b/packages/app/src/components/prompt-input.tsx
index 75ec3b7be52b..92aefd97175f 100644
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -520,7 +520,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
 
   const setMode = (mode: "normal" | "shell") => {
     setStore("mode", mode)
-    setStore("popover", null)
+    setStore({ popover: null, slashMenu: false, slashMenuQuery: "" })
     requestAnimationFrame(() => editorRef?.focus())
   }
 
@@ -554,7 +554,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     },
   ])
 
-  const closePopover = () => setStore("popover", null)
+  const closePopover = () => setStore({ popover: null, slashMenu: false, slashMenuQuery: "" })
 
   const resetHistoryNavigation = (force = false) => {
     if (!force && (store.historyIndex < 0 || store.applyingHistory)) return
@@ -800,17 +800,30 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
 
   const handleSlashSelect = (cmd: SlashCommand | undefined) => {
     if (!cmd) return
+    const menu = store.slashMenu
     closePopover()
     const images = imageAttachments()
 
     if (cmd.type === "custom") {
       const text = `/${cmd.trigger} `
+      if (menu) {
+        editorRef.focus()
+        setCursorPosition(editorRef, 0)
+        addPart({ type: "text", content: text, start: 0, end: text.length })
+        focusEditorEnd()
+        return
+      }
       setEditorText(text)
       prompt.set([{ type: "text", content: text, start: 0, end: text.length }, ...images], text.length)
       focusEditorEnd()
       return
     }
 
+    if (menu) {
+      command.trigger(cmd.id, "slash")
+      return
+    }
+
     clearEditor()
     prompt.set([...DEFAULT_PROMPT, ...images], 0)
     command.trigger(cmd.id, "slash")
@@ -1072,10 +1085,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
 
       if (atMatch) {
         atOnInput(atMatch[1])
-        setStore("popover", "at")
+        setStore({ popover: "at", slashMenu: false, slashMenuQuery: "" })
       } else if (slashMatch) {
         slashOnInput(slashMatch[1])
-        setStore("popover", "slash")
+        setStore({ popover: "slash", slashMenu: false, slashMenuQuery: "" })
       } else {
         closePopover()
       }
@@ -1171,6 +1184,28 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     return true
   }
 
+  const openCommands = () => {
+    const populated = prompt.dirty() || commentCount() > 0
+    requestAnimationFrame(() => {
+      if (!populated) {
+        if (!addPart({ type: "text", content: "/", start: 0, end: 0 })) return
+        slashOnInput("")
+        setStore({ popover: "slash", slashMenu: false, slashMenuQuery: "" })
+        return
+      }
+      slashOnInput("")
+      setStore({ popover: "slash", slashMenu: true, slashMenuQuery: "" })
+    })
+  }
+
+  const openContext = () => {
+    requestAnimationFrame(() => {
+      if (!addPart({ type: "text", content: "@", start: 0, end: 0 })) return
+      atOnInput("")
+      setStore({ popover: "at", slashMenu: false, slashMenuQuery: "" })
+    })
+  }
+
   const addToHistory = (prompt: Prompt, mode: "normal" | "shell") => {
     history.add(prompt, mode, mode === "shell" ? [] : historyComments())
   }
@@ -1199,7 +1234,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         }
 
         setStore("mode", "normal")
-        setStore("popover", null)
+        closePopover()
         setStore("historyIndex", -1)
         setStore("savedPrompt", null)
         prompt.set(edit.prompt, promptLength(edit.prompt))
@@ -1286,7 +1321,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         resetHistoryNavigation(true)
       },
       setMode: (mode) => setStore("mode", mode),
-      setPopover: (popover) => setStore("popover", popover),
+      setPopover: (popover) => {
+        if (!popover) return closePopover()
+        setStore({ popover, slashMenu: false, slashMenuQuery: "" })
+      },
       newSessionWorktree: () => props.newSessionWorktree,
       onNewSessionWorktreeReset: props.onNewSessionWorktreeReset,
       shouldQueue: props.shouldQueue,
@@ -1325,7 +1363,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       const cursorPosition = getCursorPosition(editorRef)
       if (cursorPosition === 0) {
         setStore("mode", "shell")
-        setStore("popover", null)
+        closePopover()
         event.preventDefault()
         return
       }
@@ -1460,6 +1498,29 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     }
   }
 
+  const handleSlashMenuKeyDown = (event: KeyboardEvent) => {
+    if (event.key === "Escape") {
+      closePopover()
+      requestAnimationFrame(() => editorRef.focus())
+      event.preventDefault()
+      return
+    }
+
+    if (event.key === "Tab") {
+      selectPopoverActive()
+      event.preventDefault()
+      return
+    }
+
+    const ctrl = event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey
+    const nav = event.key === "ArrowUp" || event.key === "ArrowDown" || event.key === "Enter"
+    const ctrlNav = ctrl && (event.key === "n" || event.key === "p")
+    if (!nav && !ctrlNav) return
+    slashOnKeyDown(event)
+    if (event.key === "ArrowUp" || event.key === "ArrowDown" || ctrlNav) scrollSlashActiveIntoView()
+    event.preventDefault()
+  }
+
   const agentsLoading = () => props.controls.agents.loading
   const agentsShouldFadeIn = createMemo<boolean>((prev) => prev ?? agentsLoading())
   const providersLoading = () => props.controls.model.loading
@@ -1527,6 +1588,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
         slashActive={slashActive() ?? undefined}
         setSlashActive={setSlashActive}
         onSlashSelect={handleSlashSelect}
+        slashMenu={store.slashMenu}
+        slashMenuQuery={store.slashMenuQuery}
+        onSlashMenuInput={(value) => {
+          setStore("slashMenuQuery", value)
+          slashOnInput(value)
+        }}
+        onSlashMenuKeyDown={handleSlashMenuKeyDown}
         commandKeybind={command.keybind}
         commandKeybindParts={command.keybindParts}
         newLayoutDesigns={props.controls.newLayoutDesigns}
@@ -1625,23 +1693,45 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                     placement="top"
                     value={
                       <>
-                        {language.t("prompt.action.attachFile")}
+                        {language.t("prompt.menu.addImagesAndFiles")}
                         <KeybindV2 keys={command.keybindParts("file.attach")} variant="neutral" />
                       </>
                     }
                   >
-                    <IconButton
-                      data-action="prompt-attach"
-                      type="button"
-                      icon="plus"
-                      variant="ghost"
-                      class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted"
-                      style={buttons()}
-                      onClick={pick}
-                      disabled={store.mode !== "normal"}
-                      tabIndex={store.mode === "normal" ? undefined : -1}
-                      aria-label={language.t("prompt.action.attachFile")}
-                    />
+                    <MenuV2 gutter={6} modal={false} placement="top-start">
+                      <MenuV2.Trigger
+                        as={IconButton}
+                        data-action="prompt-attach"
+                        type="button"
+                        icon="plus"
+                        variant="ghost"
+                        class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted"
+                        style={buttons()}
+                        disabled={store.mode !== "normal"}
+                        tabIndex={store.mode === "normal" ? undefined : -1}
+                        aria-label={language.t("prompt.menu.addImagesAndFiles")}
+                      />
+                      <MenuV2.Portal>
+                        <MenuV2.Content
+                          class="[&_[data-slot=menu-v2-item-shortcut]]:w-5 [&_[data-slot=menu-v2-item-shortcut]]:justify-center"
+                          style={{ "min-width": "180px" }}
+                        >
+                          <MenuV2.Item onSelect={pick} shortcut={command.keybind("file.attach")}>
+                            {language.t("prompt.menu.imagesAndFiles")}
+                          </MenuV2.Item>
+                          <MenuV2.Separator />
+                          <MenuV2.Item onSelect={openCommands} shortcut="/">
+                            {language.t("prompt.menu.commands")}
+                          </MenuV2.Item>
+                          <MenuV2.Item onSelect={openContext} shortcut="@">
+                            {language.t("prompt.menu.context")}
+                          </MenuV2.Item>
+                          <MenuV2.Item onSelect={() => setMode("shell")} shortcut="!">
+                            {language.t("prompt.menu.shellCommand")}
+                          </MenuV2.Item>
+                        </MenuV2.Content>
+                      </MenuV2.Portal>
+                    </MenuV2>
                   </TooltipV2>
                   <Show when={showAgentControl()}>
                     <ComposerAgentControl state={agentControlState()} />
diff --git a/packages/app/src/components/prompt-input/slash-popover.tsx b/packages/app/src/components/prompt-input/slash-popover.tsx
index a84cbcca0894..b9a2dc7afaf3 100644
--- a/packages/app/src/components/prompt-input/slash-popover.tsx
+++ b/packages/app/src/components/prompt-input/slash-popover.tsx
@@ -41,6 +41,10 @@ type PromptPopoverProps = {
   slashActive?: string
   setSlashActive: (id: string) => void
   onSlashSelect: (item: SlashCommand) => void
+  slashMenu: boolean
+  slashMenuQuery: string
+  onSlashMenuInput: (value: string) => void
+  onSlashMenuKeyDown: (event: KeyboardEvent) => void
   commandKeybind: (id: string) => string | undefined
   commandKeybindParts: (id: string) => string[]
   newLayoutDesigns: boolean
@@ -254,6 +258,20 @@ export const PromptPopover: Component<PromptPopoverProps> = (props) => {
             </Show>
           </Match>
           <Match when={props.popover === "slash"}>
+            <Show when={props.slashMenu}>
+              <div class="px-2 py-1">
+                <input
+                  ref={(el) => requestAnimationFrame(() => el.focus())}
+                  value={props.slashMenuQuery}
+                  onInput={(event) => props.onSlashMenuInput(event.currentTarget.value)}
+                  onKeyDown={props.onSlashMenuKeyDown}
+                  onMouseDown={(event) => event.stopPropagation()}
+                  aria-label={props.t("prompt.menu.commands")}
+                  placeholder="/"
+                  class="w-full bg-transparent outline-none text-[13px] leading-5 text-v2-text-text-base placeholder:text-v2-text-text-faint"
+                />
+              </div>
+            </Show>
             <Show
               when={props.slashFlat.length > 0}
               fallback={
diff --git a/packages/app/src/components/prompt-input/transient-state.ts b/packages/app/src/components/prompt-input/transient-state.ts
index c8abf9a76683..eaf35476d1ad 100644
--- a/packages/app/src/components/prompt-input/transient-state.ts
+++ b/packages/app/src/components/prompt-input/transient-state.ts
@@ -4,6 +4,8 @@ import type { PromptHistoryEntry } from "./history"
 
 export type PromptInputTransientState = {
   popover: "at" | "slash" | null
+  slashMenu: boolean
+  slashMenuQuery: string
   historyIndex: number
   savedPrompt: PromptHistoryEntry | null
   placeholder: number
@@ -16,6 +18,8 @@ export type PromptInputTransientState = {
 function resetPromptInputTransientState(setStore: SetStoreFunction<PromptInputTransientState>) {
   setStore({
     popover: null,
+    slashMenu: false,
+    slashMenuQuery: "",
     historyIndex: -1,
     savedPrompt: null,
     draggingType: null,
@@ -28,6 +32,8 @@ function resetPromptInputTransientState(setStore: SetStoreFunction<PromptInputTr
 export function createPromptInputTransientState(identity: Accessor<unknown>, placeholder: number) {
   const [store, setStore] = createStore<PromptInputTransientState>({
     popover: null,
+    slashMenu: false,
+    slashMenuQuery: "",
     historyIndex: -1,
     savedPrompt: null,
     placeholder,
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index b343d1a92921..2b639eded7d1 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -267,6 +267,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "إزالة الملف النشط من السياق",
   "prompt.context.removeFile": "إزالة الملف من السياق",
   "prompt.action.attachFile": "إرفاق ملف",
+  "prompt.menu.addImagesAndFiles": "إضافة ملفات والمزيد",
+  "prompt.menu.imagesAndFiles": "الصور والملفات",
+  "prompt.menu.commands": "الأوامر",
+  "prompt.menu.context": "السياق",
+  "prompt.menu.shellCommand": "أمر shell",
   "prompt.attachment.remove": "إزالة المرفق",
   "prompt.action.send": "إرسال",
   "prompt.action.stop": "توقف",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index 522749144529..688b05fee1de 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -267,6 +267,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Remover arquivo ativo do contexto",
   "prompt.context.removeFile": "Remover arquivo do contexto",
   "prompt.action.attachFile": "Anexar arquivo",
+  "prompt.menu.addImagesAndFiles": "Adicionar arquivos e mais",
+  "prompt.menu.imagesAndFiles": "Imagens e arquivos",
+  "prompt.menu.commands": "Comandos",
+  "prompt.menu.context": "Contexto",
+  "prompt.menu.shellCommand": "Comando shell",
   "prompt.attachment.remove": "Remover anexo",
   "prompt.action.send": "Enviar",
   "prompt.action.stop": "Parar",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index 8e259a153417..e0d4e2aa03e5 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -287,6 +287,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Ukloni aktivnu datoteku iz konteksta",
   "prompt.context.removeFile": "Ukloni datoteku iz konteksta",
   "prompt.action.attachFile": "Priloži datoteku",
+  "prompt.menu.addImagesAndFiles": "Dodaj datoteke i više",
+  "prompt.menu.imagesAndFiles": "Slike i datoteke",
+  "prompt.menu.commands": "Komande",
+  "prompt.menu.context": "Kontekst",
+  "prompt.menu.shellCommand": "Shell naredba",
   "prompt.attachment.remove": "Ukloni prilog",
   "prompt.action.send": "Pošalji",
   "prompt.action.stop": "Zaustavi",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index b92b2ad94618..3b02b6a02612 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -285,6 +285,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
   "prompt.context.removeFile": "Fjern fil fra kontekst",
   "prompt.action.attachFile": "Vedhæft fil",
+  "prompt.menu.addImagesAndFiles": "Tilføj filer og mere",
+  "prompt.menu.imagesAndFiles": "Billeder og filer",
+  "prompt.menu.commands": "Kommandoer",
+  "prompt.menu.context": "Kontekst",
+  "prompt.menu.shellCommand": "Shell-kommando",
   "prompt.attachment.remove": "Fjern vedhæftning",
   "prompt.action.send": "Send",
   "prompt.action.stop": "Stop",
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index 508f9f4c9444..cf530f64884d 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -272,6 +272,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Aktive Datei aus dem Kontext entfernen",
   "prompt.context.removeFile": "Datei aus dem Kontext entfernen",
   "prompt.action.attachFile": "Datei anhängen",
+  "prompt.menu.addImagesAndFiles": "Dateien und mehr hinzufügen",
+  "prompt.menu.imagesAndFiles": "Bilder und Dateien",
+  "prompt.menu.commands": "Befehle",
+  "prompt.menu.context": "Kontext",
+  "prompt.menu.shellCommand": "Shell-Befehl",
   "prompt.attachment.remove": "Anhang entfernen",
   "prompt.action.send": "Senden",
   "prompt.action.stop": "Stopp",
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index a281968d656b..f44af82297b8 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -287,6 +287,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Remove active file from context",
   "prompt.context.removeFile": "Remove file from context",
   "prompt.action.attachFile": "Add files",
+  "prompt.menu.addImagesAndFiles": "Add files and more",
+  "prompt.menu.imagesAndFiles": "Images and files",
+  "prompt.menu.commands": "Commands",
+  "prompt.menu.context": "Context",
+  "prompt.menu.shellCommand": "Shell command",
   "prompt.attachment.remove": "Remove attachment",
   "prompt.action.send": "Send",
   "prompt.action.stop": "Stop",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index 8a42519da595..0610f2de00cf 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -286,6 +286,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Eliminar archivo activo del contexto",
   "prompt.context.removeFile": "Eliminar archivo del contexto",
   "prompt.action.attachFile": "Adjuntar archivo",
+  "prompt.menu.addImagesAndFiles": "Añadir archivos y más",
+  "prompt.menu.imagesAndFiles": "Imágenes y archivos",
+  "prompt.menu.commands": "Comandos",
+  "prompt.menu.context": "Contexto",
+  "prompt.menu.shellCommand": "Comando de shell",
   "prompt.attachment.remove": "Eliminar adjunto",
   "prompt.action.send": "Enviar",
   "prompt.action.stop": "Detener",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index 781fbb6305ff..3ed47d5dba6e 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -267,6 +267,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Retirer le fichier actif du contexte",
   "prompt.context.removeFile": "Retirer le fichier du contexte",
   "prompt.action.attachFile": "Joindre un fichier",
+  "prompt.menu.addImagesAndFiles": "Ajouter des fichiers et plus encore",
+  "prompt.menu.imagesAndFiles": "Images et fichiers",
+  "prompt.menu.commands": "Commandes",
+  "prompt.menu.context": "Contexte",
+  "prompt.menu.shellCommand": "Commande shell",
   "prompt.attachment.remove": "Supprimer la pièce jointe",
   "prompt.action.send": "Envoyer",
   "prompt.action.stop": "Arrêter",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index 87f0ebebe7f4..52ec83b3c4ad 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -266,6 +266,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "コンテキストからアクティブなファイルを削除",
   "prompt.context.removeFile": "コンテキストからファイルを削除",
   "prompt.action.attachFile": "ファイルを添付",
+  "prompt.menu.addImagesAndFiles": "ファイルなどを追加",
+  "prompt.menu.imagesAndFiles": "画像とファイル",
+  "prompt.menu.commands": "コマンド",
+  "prompt.menu.context": "コンテキスト",
+  "prompt.menu.shellCommand": "シェルコマンド",
   "prompt.attachment.remove": "添付ファイルを削除",
   "prompt.action.send": "送信",
   "prompt.action.stop": "停止",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index de3a61a9f94f..738123fe03ca 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -254,6 +254,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "컨텍스트에서 활성 파일 제거",
   "prompt.context.removeFile": "컨텍스트에서 파일 제거",
   "prompt.action.attachFile": "파일 첨부",
+  "prompt.menu.addImagesAndFiles": "파일 및 기타 항목 추가",
+  "prompt.menu.imagesAndFiles": "이미지 및 파일",
+  "prompt.menu.commands": "명령어",
+  "prompt.menu.context": "컨텍스트",
+  "prompt.menu.shellCommand": "셸 명령",
   "prompt.attachment.remove": "첨부 파일 제거",
   "prompt.action.send": "전송",
   "prompt.action.stop": "중지",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index 90638a6c366b..0a37f8bf3237 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -277,6 +277,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
   "prompt.context.removeFile": "Fjern fil fra kontekst",
   "prompt.action.attachFile": "Legg ved fil",
+  "prompt.menu.addImagesAndFiles": "Legg til filer og mer",
+  "prompt.menu.imagesAndFiles": "Bilder og filer",
+  "prompt.menu.commands": "Kommandoer",
+  "prompt.menu.context": "Kontekst",
+  "prompt.menu.shellCommand": "Shell-kommando",
   "prompt.attachment.remove": "Fjern vedlegg",
   "prompt.action.send": "Send",
   "prompt.action.stop": "Stopp",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index 469dbbda7a15..f56e023aed07 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -268,6 +268,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Usuń aktywny plik z kontekstu",
   "prompt.context.removeFile": "Usuń plik z kontekstu",
   "prompt.action.attachFile": "Załącz plik",
+  "prompt.menu.addImagesAndFiles": "Dodaj pliki i inne elementy",
+  "prompt.menu.imagesAndFiles": "Obrazy i pliki",
+  "prompt.menu.commands": "Polecenia",
+  "prompt.menu.context": "Kontekst",
+  "prompt.menu.shellCommand": "Polecenie powłoki",
   "prompt.attachment.remove": "Usuń załącznik",
   "prompt.action.send": "Wyślij",
   "prompt.action.stop": "Zatrzymaj",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index fbc4878165a4..0d68552e6d70 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -286,6 +286,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Удалить активный файл из контекста",
   "prompt.context.removeFile": "Удалить файл из контекста",
   "prompt.action.attachFile": "Прикрепить файл",
+  "prompt.menu.addImagesAndFiles": "Добавить файлы и другое",
+  "prompt.menu.imagesAndFiles": "Изображения и файлы",
+  "prompt.menu.commands": "Команды",
+  "prompt.menu.context": "Контекст",
+  "prompt.menu.shellCommand": "Команда оболочки",
   "prompt.attachment.remove": "Удалить вложение",
   "prompt.action.send": "Отправить",
   "prompt.action.stop": "Остановить",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index 5b245d55e29b..91c009be0c54 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -286,6 +286,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "เอาไฟล์ที่ใช้งานอยู่ออกจากบริบท",
   "prompt.context.removeFile": "เอาไฟล์ออกจากบริบท",
   "prompt.action.attachFile": "แนบไฟล์",
+  "prompt.menu.addImagesAndFiles": "เพิ่มไฟล์และอื่น ๆ",
+  "prompt.menu.imagesAndFiles": "รูปภาพและไฟล์",
+  "prompt.menu.commands": "คำสั่ง",
+  "prompt.menu.context": "บริบท",
+  "prompt.menu.shellCommand": "คำสั่งเชลล์",
   "prompt.attachment.remove": "เอาไฟล์แนบออก",
   "prompt.action.send": "ส่ง",
   "prompt.action.stop": "หยุด",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index f0472d325e02..ff17d0001ce0 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -291,6 +291,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Aktif dosyayı bağlamdan çıkar",
   "prompt.context.removeFile": "Dosyayı bağlamdan çıkar",
   "prompt.action.attachFile": "Dosya ekle",
+  "prompt.menu.addImagesAndFiles": "Dosya ve daha fazlasını ekle",
+  "prompt.menu.imagesAndFiles": "Görseller ve dosyalar",
+  "prompt.menu.commands": "Komutlar",
+  "prompt.menu.context": "Bağlam",
+  "prompt.menu.shellCommand": "Kabuk komutu",
   "prompt.attachment.remove": "Eki kaldır",
   "prompt.action.send": "Gönder",
   "prompt.action.stop": "Durdur",
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index 0da1f738fbf1..c6a0ae96298c 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -288,6 +288,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "Видалити активний файл з контексту",
   "prompt.context.removeFile": "Видалити файл з контексту",
   "prompt.action.attachFile": "Додати файли",
+  "prompt.menu.addImagesAndFiles": "Додати файли та інше",
+  "prompt.menu.imagesAndFiles": "Зображення та файли",
+  "prompt.menu.commands": "Команди",
+  "prompt.menu.context": "Контекст",
+  "prompt.menu.shellCommand": "Команда оболонки",
   "prompt.attachment.remove": "Видалити вкладення",
   "prompt.action.send": "Надіслати",
   "prompt.action.stop": "Зупинити",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index a1325d90678c..a44bfc107f4a 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -306,6 +306,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "从上下文移除活动文件",
   "prompt.context.removeFile": "从上下文移除文件",
   "prompt.action.attachFile": "附加文件",
+  "prompt.menu.addImagesAndFiles": "添加文件及更多内容",
+  "prompt.menu.imagesAndFiles": "图片和文件",
+  "prompt.menu.commands": "命令",
+  "prompt.menu.context": "上下文",
+  "prompt.menu.shellCommand": "shell 命令",
   "prompt.attachment.remove": "移除附件",
   "prompt.action.send": "发送",
   "prompt.action.stop": "停止",
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index 436e2b60d8f5..e9a1fea29e66 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -286,6 +286,11 @@ export const dict = {
   "prompt.context.removeActiveFile": "從上下文移除目前檔案",
   "prompt.context.removeFile": "從上下文移除檔案",
   "prompt.action.attachFile": "附加檔案",
+  "prompt.menu.addImagesAndFiles": "新增檔案及更多內容",
+  "prompt.menu.imagesAndFiles": "圖片和檔案",
+  "prompt.menu.commands": "命令",
+  "prompt.menu.context": "上下文",
+  "prompt.menu.shellCommand": "shell 命令",
   "prompt.attachment.remove": "移除附件",
   "prompt.action.send": "傳送",
   "prompt.action.stop": "停止",
diff --git a/packages/app/test-browser/prompt-transient-state.test.ts b/packages/app/test-browser/prompt-transient-state.test.ts
index 55ef8d3922a6..61b5c6a14faa 100644
--- a/packages/app/test-browser/prompt-transient-state.test.ts
+++ b/packages/app/test-browser/prompt-transient-state.test.ts
@@ -8,6 +8,8 @@ test("resets transient prompt input state when the prompt session changes", () =
     const [state, setState] = createPromptInputTransientState(identity, 3)
     setState({
       popover: "slash",
+      slashMenu: true,
+      slashMenuQuery: "compact",
       historyIndex: 2,
       savedPrompt: {
         prompt: [{ type: "text", content: "draft-A", start: 0, end: 7 }],
@@ -23,6 +25,8 @@ test("resets transient prompt input state when the prompt session changes", () =
 
     expect(state).toMatchObject({
       popover: null,
+      slashMenu: false,
+      slashMenuQuery: "",
       historyIndex: -1,
       savedPrompt: null,
       placeholder: 3,

From a4c17f08b173750e80bc0b8aa95e2d39cf5e1413 Mon Sep 17 00:00:00 2001
From: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Date: Thu, 9 Jul 2026 07:41:56 +0200
Subject: [PATCH 28/33] feat(desktop): reveal projects in file manager (#35731)

---
 .../src/components/session/session-header.tsx |  7 ++----
 packages/app/src/i18n/en.ts                   |  3 +++
 packages/app/src/pages/home.tsx               | 18 ++++++++++++++
 packages/app/src/utils/file-manager.ts        | 24 +++++++++++++++++++
 4 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 packages/app/src/utils/file-manager.ts

diff --git a/packages/app/src/components/session/session-header.tsx b/packages/app/src/components/session/session-header.tsx
index 500cce7def13..da1770cd130e 100644
--- a/packages/app/src/components/session/session-header.tsx
+++ b/packages/app/src/components/session/session-header.tsx
@@ -24,6 +24,7 @@ import { focusTerminalById } from "@/pages/session/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { messageAgentColor } from "@/utils/agent"
 import { decode64 } from "@/utils/base64"
+import { fileManagerApp } from "@/utils/file-manager"
 import { Persist, persisted } from "@/utils/persist"
 import { StatusPopover, StatusPopoverV2 } from "../status-popover"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
@@ -175,11 +176,7 @@ export function SessionHeader() {
     return LINUX_APPS
   })
 
-  const fileManager = createMemo(() => {
-    if (os() === "macos") return { label: "session.header.open.finder", icon: "finder" as const }
-    if (os() === "windows") return { label: "session.header.open.fileExplorer", icon: "file-explorer" as const }
-    return { label: "session.header.open.fileManager", icon: "finder" as const }
-  })
+  const fileManager = createMemo(() => fileManagerApp(os()))
 
   createEffect(() => {
     if (platform.platform !== "desktop") return
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index f44af82297b8..9d122447a8d0 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -709,6 +709,9 @@ export const dict = {
   "session.header.open.finder": "Finder",
   "session.header.open.fileExplorer": "File Explorer",
   "session.header.open.fileManager": "File Manager",
+  "session.header.reveal.finder": "Reveal in Finder",
+  "session.header.reveal.fileExplorer": "Reveal in File Explorer",
+  "session.header.reveal.containingFolder": "Open containing folder",
   "session.header.open.app.vscode": "VS Code",
   "session.header.open.app.cursor": "Cursor",
   "session.header.open.app.zed": "Zed",
diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index c4d84a96f84c..4ae787964a82 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -68,6 +68,7 @@ import { preloadMarkdown } from "@opencode-ai/session-ui/markdown-cache"
 import { archiveHomeSession } from "./home-session-archive"
 import { shouldOpenSessionInBackground } from "./home-session-open"
 import { showToast } from "@/utils/toast"
+import { fileManagerApp } from "@/utils/file-manager"
 
 const HOME_SESSION_LIMIT = 64
 const HOME_SESSION_HEADER_STICKY_TOP = 12
@@ -1030,8 +1031,22 @@ function HomeProjectRow(props: {
   language: ReturnType<typeof useLanguage>
 }) {
   const global = useGlobal()
+  const platform = usePlatform()
   const serverUnreachable = () => global.servers.health[ServerConnection.key(props.server)]?.healthy === false
   const [state, setState] = createStore({ menuOpen: false })
+  const canRevealInFileManager = () =>
+    platform.platform === "desktop" && !!platform.openPath && ServerConnection.local(props.server)
+  const fileManagerActionLabel = () =>
+    props.language.t(fileManagerApp(platform.platform === "desktop" ? platform.os ?? "unknown" : "unknown").actionLabel)
+  const revealInFileManager = () => {
+    if (!platform.openPath) return
+    platform.openPath(props.project.worktree).catch((err: unknown) =>
+      showToast({
+        title: props.language.t("common.requestFailed"),
+        description: errorMessage(err, props.language.t("common.requestFailed")),
+      }),
+    )
+  }
   return (
     <div class="group/project relative flex h-7 min-w-0 items-center rounded-[6px]">
       <button
@@ -1073,6 +1088,9 @@ function HomeProjectRow(props: {
               <MenuV2.Item onSelect={() => props.editProject(props.server, props.project)}>
                 {props.language.t("dialog.project.edit.title")}
               </MenuV2.Item>
+              <Show when={canRevealInFileManager()}>
+                <MenuV2.Item onSelect={revealInFileManager}>{fileManagerActionLabel()}</MenuV2.Item>
+              </Show>
               <MenuV2.Item
                 disabled={props.unseenCount === 0}
                 onSelect={() => props.clearNotifications(props.server, props.project)}
diff --git a/packages/app/src/utils/file-manager.ts b/packages/app/src/utils/file-manager.ts
new file mode 100644
index 000000000000..2fba23cc5abc
--- /dev/null
+++ b/packages/app/src/utils/file-manager.ts
@@ -0,0 +1,24 @@
+export type FileManagerOS = "macos" | "windows" | "linux" | "unknown"
+
+export function fileManagerApp(os: FileManagerOS): {
+  label: "session.header.open.finder" | "session.header.open.fileExplorer" | "session.header.open.fileManager"
+  actionLabel:
+    | "session.header.reveal.finder"
+    | "session.header.reveal.fileExplorer"
+    | "session.header.reveal.containingFolder"
+  icon: "finder" | "file-explorer"
+} {
+  if (os === "macos")
+    return { label: "session.header.open.finder", actionLabel: "session.header.reveal.finder", icon: "finder" }
+  if (os === "windows")
+    return {
+      label: "session.header.open.fileExplorer",
+      actionLabel: "session.header.reveal.fileExplorer",
+      icon: "file-explorer",
+    }
+  return {
+    label: "session.header.open.fileManager",
+    actionLabel: "session.header.reveal.containingFolder",
+    icon: "finder",
+  }
+}

From 353e0eef8a840146800127f6a2c16903e83d146e Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]" <opencode-agent[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 05:43:07 +0000
Subject: [PATCH 29/33] chore: generate

---
 packages/app/src/pages/home.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/pages/home.tsx b/packages/app/src/pages/home.tsx
index 4ae787964a82..c8a89672dfca 100644
--- a/packages/app/src/pages/home.tsx
+++ b/packages/app/src/pages/home.tsx
@@ -1037,7 +1037,9 @@ function HomeProjectRow(props: {
   const canRevealInFileManager = () =>
     platform.platform === "desktop" && !!platform.openPath && ServerConnection.local(props.server)
   const fileManagerActionLabel = () =>
-    props.language.t(fileManagerApp(platform.platform === "desktop" ? platform.os ?? "unknown" : "unknown").actionLabel)
+    props.language.t(
+      fileManagerApp(platform.platform === "desktop" ? (platform.os ?? "unknown") : "unknown").actionLabel,
+    )
   const revealInFileManager = () => {
     if (!platform.openPath) return
     platform.openPath(props.project.worktree).catch((err: unknown) =>

From fb1edc49180a3a2f69429f5dcca48fd96b41e2b7 Mon Sep 17 00:00:00 2001
From: "opencode-agent[bot]" <opencode-agent[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 05:48:48 +0000
Subject: [PATCH 30/33] chore: update nix node_modules hashes

---
 nix/hashes.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/hashes.json b/nix/hashes.json
index 1814fdaace2e..a7bc1549abff 100644
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-K0V7FyvgujbeAf0Ip4SCJxcy0GpSt/H+iEwTVhvwBRQ=",
-    "aarch64-linux": "sha256-lz2GhziKY9zL4vXb2/CmlXKrmVYPF5hPFD1ZpfDOqgM=",
-    "aarch64-darwin": "sha256-vfxsqozBq40tc1v6w8xvl1HIAif8gRn6oIYrLt6fZ1c=",
-    "x86_64-darwin": "sha256-X7GAwO+8A6vwqObIHFtloDDJZO8ZUTqmplFDg1zfots="
+    "x86_64-linux": "sha256-DDHxztBr46Jxrb0uYvLYSezrqMgY+UrozRHvKdEyeXY=",
+    "aarch64-linux": "sha256-Dp2ohpv1jXcFX2ri4fVmsnC9WEx60bviUSlcOtIJBmE=",
+    "aarch64-darwin": "sha256-CXFJmkcRAS+liHf9TG5qoUG08VvKe5RusEGZTlnNer4=",
+    "x86_64-darwin": "sha256-7iuCfAzggMDyJ7tX8UuS7T7DCbr9h+lskE+HVFUaD0Q="
   }
 }

From c7f08b30383fb2de8baaebca91143f74bfeec447 Mon Sep 17 00:00:00 2001
From: opencode <opencode@sst.dev>
Date: Thu, 9 Jul 2026 06:35:44 +0000
Subject: [PATCH 31/33] release: v1.17.16

---
 bun.lock                                    | 56 ++++++++++-----------
 packages/app/package.json                   |  2 +-
 packages/cli/package.json                   |  2 +-
 packages/codemode/package.json              |  2 +-
 packages/console/app/package.json           |  2 +-
 packages/console/core/package.json          |  2 +-
 packages/console/function/package.json      |  2 +-
 packages/console/mail/package.json          |  2 +-
 packages/console/support/package.json       |  2 +-
 packages/core/package.json                  |  2 +-
 packages/desktop/package.json               |  2 +-
 packages/effect-drizzle-sqlite/package.json |  2 +-
 packages/effect-sqlite-node/package.json    |  2 +-
 packages/enterprise/package.json            |  2 +-
 packages/function/package.json              |  2 +-
 packages/http-recorder/package.json         |  2 +-
 packages/llm/package.json                   |  2 +-
 packages/opencode/package.json              |  2 +-
 packages/plugin/package.json                |  2 +-
 packages/sdk/js/package.json                |  2 +-
 packages/server/package.json                |  2 +-
 packages/session-ui/package.json            |  2 +-
 packages/slack/package.json                 |  2 +-
 packages/stats/app/package.json             |  2 +-
 packages/stats/core/package.json            |  2 +-
 packages/stats/server/package.json          |  2 +-
 packages/tui/package.json                   |  2 +-
 packages/ui/package.json                    |  2 +-
 packages/web/package.json                   |  2 +-
 sdks/vscode/package.json                    |  2 +-
 30 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/bun.lock b/bun.lock
index ba18f4635aa1..285499f3f414 100644
--- a/bun.lock
+++ b/bun.lock
@@ -29,7 +29,7 @@
     },
     "packages/app": {
       "name": "@opencode-ai/app",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@dnd-kit/abstract": "0.5.0",
         "@dnd-kit/dom": "0.5.0",
@@ -94,7 +94,7 @@
     },
     "packages/cli": {
       "name": "@opencode-ai/cli",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "bin": {
         "lildax": "./bin/lildax.cjs",
       },
@@ -142,7 +142,7 @@
     },
     "packages/codemode": {
       "name": "@opencode-ai/codemode",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -156,7 +156,7 @@
     },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -192,7 +192,7 @@
     },
     "packages/console/core": {
       "name": "@opencode-ai/console-core",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -219,7 +219,7 @@
     },
     "packages/console/function": {
       "name": "@opencode-ai/console-function",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@ai-sdk/anthropic": "3.0.82",
         "@ai-sdk/openai": "3.0.48",
@@ -241,7 +241,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode-ai/console-mail",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -265,7 +265,7 @@
     },
     "packages/console/support": {
       "name": "@opencode-ai/console-support",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode-ai/console-core": "workspace:*",
@@ -285,7 +285,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -379,7 +379,7 @@
     },
     "packages/desktop": {
       "name": "@opencode-ai/desktop",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "effect": "catalog:",
@@ -433,7 +433,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -447,7 +447,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -459,7 +459,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -491,7 +491,7 @@
     },
     "packages/function": {
       "name": "@opencode-ai/function",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -507,7 +507,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@effect/platform-node": "4.0.0-beta.83",
         "@effect/platform-node-shared": "4.0.0-beta.83",
@@ -538,7 +538,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/schema": "workspace:*",
         "@smithy/eventstream-codec": "4.2.14",
@@ -557,7 +557,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -688,7 +688,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode-ai/sdk": "workspace:*",
@@ -764,7 +764,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -779,7 +779,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
@@ -794,7 +794,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode-ai/session-ui",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -838,7 +838,7 @@
     },
     "packages/slack": {
       "name": "@opencode-ai/slack",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "@slack/bolt": "^3.17.1",
@@ -851,7 +851,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode-ai/stats-app",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@opencode-ai/stats-core": "workspace:*",
@@ -884,7 +884,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode-ai/stats-core",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -903,7 +903,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode-ai/stats-server",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -944,7 +944,7 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
@@ -971,7 +971,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -1022,7 +1022,7 @@
     },
     "packages/web": {
       "name": "@opencode-ai/web",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
diff --git a/packages/app/package.json b/packages/app/package.json
index 704c7401f23d..cc6f580a5b7c 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "description": "",
   "type": "module",
   "exports": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index eb3bb1bd01b1..d3b9981d1af5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/cli",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "bin": {
diff --git a/packages/codemode/package.json b/packages/codemode/package.json
index 7646ce44b2ba..49bd6edac51f 100644
--- a/packages/codemode/package.json
+++ b/packages/codemode/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/codemode",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "description": "Effect-native confined code execution over schema-described tools",
   "private": true,
   "type": "module",
diff --git a/packages/console/app/package.json b/packages/console/app/package.json
index 955a6e916223..aa55ac720f18 100644
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/console/core/package.json b/packages/console/core/package.json
index 1a2f180c4f5d..c009a35a80b9 100644
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/console/function/package.json b/packages/console/function/package.json
index 946e7ddf8d91..69904bea9064 100644
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/console/mail/package.json b/packages/console/mail/package.json
index 7977048f5cde..31952653942e 100644
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",
diff --git a/packages/console/support/package.json b/packages/console/support/package.json
index f56e5da41354..ef29aa406461 100644
--- a/packages/console/support/package.json
+++ b/packages/console/support/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-support",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/core/package.json b/packages/core/package.json
index 0680fac03d92..9fd15d5ea9fe 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 76f25878704b..e12ad568b98d 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opencode-ai/desktop",
   "private": true,
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",
diff --git a/packages/effect-drizzle-sqlite/package.json b/packages/effect-drizzle-sqlite/package.json
index 5b901aaa27a6..e6dde2a1f861 100644
--- a/packages/effect-drizzle-sqlite/package.json
+++ b/packages/effect-drizzle-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/effect-drizzle-sqlite",
   "type": "module",
   "license": "MIT",
diff --git a/packages/effect-sqlite-node/package.json b/packages/effect-sqlite-node/package.json
index 0f60780033c8..100571826df9 100644
--- a/packages/effect-sqlite-node/package.json
+++ b/packages/effect-sqlite-node/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/effect-sqlite-node",
   "type": "module",
   "license": "MIT",
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index c319fd05bf9f..80aa77e49015 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/enterprise",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/function/package.json b/packages/function/package.json
index c3fd3baae20e..eee6e3dcd54d 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/function",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index ad5248cee567..13c7e04eb144 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/http-recorder",
   "description": "Record and replay Effect HTTP client traffic with deterministic cassettes",
   "type": "module",
diff --git a/packages/llm/package.json b/packages/llm/package.json
index 28b58bd2711a..41cecee3c559 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/llm",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index 401803c37cd8..09c9b36b9ce2 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "opencode",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index f7a00d9704cd..2a09f4996077 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/plugin",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 0b0739061888..f2a5708b2c00 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/sdk",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 855fd297bc92..676241d1c3b1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/server",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/session-ui/package.json b/packages/session-ui/package.json
index 7443187d6874..1734449d1d6a 100644
--- a/packages/session-ui/package.json
+++ b/packages/session-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/session-ui",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/slack/package.json b/packages/slack/package.json
index ccb37497d758..ebef44433f84 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/slack",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/stats/app/package.json b/packages/stats/app/package.json
index c9df8049da40..811123b5e0b8 100644
--- a/packages/stats/app/package.json
+++ b/packages/stats/app/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-app",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/core/package.json b/packages/stats/core/package.json
index 3c6f06866079..47e55ec30669 100644
--- a/packages/stats/core/package.json
+++ b/packages/stats/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-core",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/server/package.json b/packages/stats/server/package.json
index 53601d120efd..c1f0f7045c19 100644
--- a/packages/stats/server/package.json
+++ b/packages/stats/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-server",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 63c71ea273b9..cd853f05b5f9 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/tui",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 554b5a688634..f521ec861adb 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/web/package.json b/packages/web/package.json
index b19d6fa5533f..c65c9c12eaf0 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,7 +2,7 @@
   "name": "@opencode-ai/web",
   "type": "module",
   "license": "MIT",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "scripts": {
     "dev": "astro dev",
     "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",
diff --git a/sdks/vscode/package.json b/sdks/vscode/package.json
index cc8695fb0ffe..28dbe0feb6db 100644
--- a/sdks/vscode/package.json
+++ b/sdks/vscode/package.json
@@ -2,7 +2,7 @@
   "name": "opencode",
   "displayName": "opencode",
   "description": "opencode for VS Code",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "publisher": "sst-dev",
   "repository": {
     "type": "git",

From d632f38e14041510869d137465665a83e7490d48 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 16:21:32 +0000
Subject: [PATCH 32/33] chore(termux): seed release automation

---
 .github/actions/build-android-cli/action.yml  | 167 +++++++++
 .../scripts/termux-cleanup-release-branch.sh  | 175 +++++++++
 .github/scripts/termux-configure-git.sh       |  37 ++
 .../termux-create-android-build-deployment.sh |  55 +++
 .../scripts/termux-create-checkpoint-pr.sh    | 146 ++++++++
 ...ermux-create-or-update-mirrored-release.sh |  67 ++++
 .github/scripts/termux-create-release-pr.sh   | 284 +++++++++++++++
 .github/scripts/termux-find-release-pr.sh     |  41 +++
 .../termux-finish-android-build-deployment.sh |  31 ++
 .../scripts/termux-read-release-metadata.sh   |  54 +++
 .github/scripts/termux-release-paths.sh       |  53 +++
 .github/scripts/termux-resolve-release-ref.sh |  35 ++
 .github/scripts/termux-select-release.sh      | 335 ++++++++++++++++++
 .github/scripts/termux-validate-gh-env.sh     |  12 +
 .github/workflows/publish.yml                 | 126 ++++++-
 .../termux-release-branch-cleanup.yml         |  89 +++++
 .../workflows/termux-release-checkpoint.yml   | 106 ++++++
 .github/workflows/termux-release-deploy.yml   | 223 ++++++++++++
 .github/workflows/termux-release-watch.yml    | 174 +++++++++
 19 files changed, 2203 insertions(+), 7 deletions(-)
 create mode 100644 .github/actions/build-android-cli/action.yml
 create mode 100755 .github/scripts/termux-cleanup-release-branch.sh
 create mode 100755 .github/scripts/termux-configure-git.sh
 create mode 100755 .github/scripts/termux-create-android-build-deployment.sh
 create mode 100755 .github/scripts/termux-create-checkpoint-pr.sh
 create mode 100755 .github/scripts/termux-create-or-update-mirrored-release.sh
 create mode 100755 .github/scripts/termux-create-release-pr.sh
 create mode 100755 .github/scripts/termux-find-release-pr.sh
 create mode 100755 .github/scripts/termux-finish-android-build-deployment.sh
 create mode 100755 .github/scripts/termux-read-release-metadata.sh
 create mode 100755 .github/scripts/termux-release-paths.sh
 create mode 100755 .github/scripts/termux-resolve-release-ref.sh
 create mode 100755 .github/scripts/termux-select-release.sh
 create mode 100755 .github/scripts/termux-validate-gh-env.sh
 create mode 100644 .github/workflows/termux-release-branch-cleanup.yml
 create mode 100644 .github/workflows/termux-release-checkpoint.yml
 create mode 100644 .github/workflows/termux-release-deploy.yml
 create mode 100644 .github/workflows/termux-release-watch.yml

diff --git a/.github/actions/build-android-cli/action.yml b/.github/actions/build-android-cli/action.yml
new file mode 100644
index 000000000000..161a5e89a53a
--- /dev/null
+++ b/.github/actions/build-android-cli/action.yml
@@ -0,0 +1,167 @@
+name: "Build Android CLI"
+description: "Build and smoke-check the Android arm64 opencode artifact"
+inputs:
+  version:
+    description: "Version to embed in the Android CLI"
+    required: true
+  release:
+    description: "Release flag passed to the opencode build"
+    required: false
+    default: ""
+  repo:
+    description: "Repository name passed to the opencode build"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/setup-bun
+
+    - name: Setup Zig
+      shell: bash
+      run: |
+        set -euo pipefail
+        zig_version=0.15.2
+        case "${RUNNER_OS}-${RUNNER_ARCH}" in
+          Linux-X64) zig_target="x86_64-linux" ;;
+          Linux-ARM64) zig_target="aarch64-linux" ;;
+          *) echo "Unsupported Zig host: ${RUNNER_OS}-${RUNNER_ARCH}" >&2; exit 1 ;;
+        esac
+
+        zig_dir="${RUNNER_TOOL_CACHE:-${RUNNER_TEMP}}/zig/${zig_version}/${zig_target}"
+        if [[ ! -x "${zig_dir}/zig" ]]; then
+          archive="${RUNNER_TEMP}/zig-${zig_target}-${zig_version}.tar.xz"
+          mkdir -p "${zig_dir}"
+          curl -fsSL "https://ziglang.org/download/${zig_version}/zig-${zig_target}-${zig_version}.tar.xz" -o "${archive}"
+          tar -xJf "${archive}" -C "${zig_dir}" --strip-components=1
+        fi
+
+        echo "${zig_dir}" >> "${GITHUB_PATH}"
+        "${zig_dir}/zig" version
+
+    - name: Install Bun build toolchain
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends curl wget gnupg software-properties-common ninja-build cmake file binutils
+        for attempt in 1 2 3
+        do
+          if curl -fsSL --retry 5 --retry-delay 5 --retry-all-errors --connect-timeout 20 --max-time 120 https://apt.llvm.org/llvm.sh -o "$RUNNER_TEMP/llvm.sh"; then
+            break
+          fi
+          if [[ "$attempt" -eq 3 ]]; then
+            exit 1
+          fi
+          echo "LLVM installer download failed on attempt $attempt; retrying..." >&2
+          sleep $((attempt * 30))
+        done
+        chmod +x "$RUNNER_TEMP/llvm.sh"
+        for attempt in 1 2 3
+        do
+          if sudo "$RUNNER_TEMP/llvm.sh" 21; then
+            break
+          fi
+          if [[ "$attempt" -eq 3 ]]; then
+            exit 1
+          fi
+          echo "LLVM apt setup failed on attempt $attempt; retrying..." >&2
+          sudo rm -f /etc/apt/sources.list.d/*llvm* /etc/apt/sources.list.d/archive_uri-https_apt_llvm_org_noble_-noble.list
+          sleep $((attempt * 30))
+        done
+        for attempt in 1 2 3
+        do
+          if sudo apt-get update -o Acquire::Retries=5 && sudo apt-get install -y --no-install-recommends clang-21 lld-21; then
+            break
+          fi
+          if [[ "$attempt" -eq 3 ]]; then
+            exit 1
+          fi
+          echo "LLVM package install failed on attempt $attempt; retrying..." >&2
+          sleep $((attempt * 30))
+        done
+        LLVM_RESOURCE_DIR="$(clang-21 -print-resource-dir)"
+        NDK_PREBUILT="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64"
+        NDK_CLANG_VERSION="$(ls "$NDK_PREBUILT/lib/clang" | sort -V | tail -n 1)"
+        NDK_RUNTIME_DIR="$NDK_PREBUILT/lib/clang/$NDK_CLANG_VERSION/lib/linux"
+        sudo mkdir -p "$LLVM_RESOURCE_DIR/lib/aarch64-unknown-linux-android28" "$LLVM_RESOURCE_DIR/lib/linux/aarch64"
+        sudo ln -sf "$NDK_RUNTIME_DIR/libclang_rt.builtins-aarch64-android.a" "$LLVM_RESOURCE_DIR/lib/aarch64-unknown-linux-android28/libclang_rt.builtins.a"
+        sudo ln -sf "$NDK_RUNTIME_DIR/aarch64/libunwind.a" "$LLVM_RESOURCE_DIR/lib/aarch64-unknown-linux-android28/libunwind.a"
+        sudo ln -sf "$NDK_RUNTIME_DIR/libclang_rt.builtins-aarch64-android.a" "$LLVM_RESOURCE_DIR/lib/linux/libclang_rt.builtins-aarch64-android.a"
+        sudo ln -sf "$NDK_RUNTIME_DIR/aarch64/libunwind.a" "$LLVM_RESOURCE_DIR/lib/linux/aarch64/libunwind.a"
+
+    - name: Build Android Bun runtime with FFI
+      shell: bash
+      run: |
+        export CC=clang-21
+        export CXX=clang++-21
+        export LD=ld.lld-21
+        NDK_PREBUILT="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64"
+        mkdir -p "$RUNNER_TEMP/android-toolchain-bin"
+        ln -sf "$NDK_PREBUILT/bin/llvm-strip" "$RUNNER_TEMP/android-toolchain-bin/strip"
+        export PATH="$RUNNER_TEMP/android-toolchain-bin:$PATH"
+        BUN_VERSION="$(node -p "require('./package.json').packageManager.split('@')[1]")"
+        BUN_SOURCE="$RUNNER_TEMP/bun-src"
+        git clone --depth=1 --branch "bun-v${BUN_VERSION}" https://github.com/oven-sh/bun.git "$BUN_SOURCE"
+        BUN_BUILD="$BUN_SOURCE/build/android-ffi"
+        cd "$BUN_SOURCE"
+        bun install --frozen-lockfile
+        bun scripts/build.ts --profile=android-release --tinycc=on --build-dir="$BUN_BUILD" --target=bun -j"$(nproc)"
+        test -x "$BUN_BUILD/bun"
+        file "$BUN_BUILD/bun"
+        echo "OPENCODE_ANDROID_BUN=$BUN_BUILD/bun" >> "$GITHUB_ENV"
+
+    - name: Build Android CLI
+      shell: bash
+      run: ./packages/opencode/script/build.ts --target=android-arm64
+      env:
+        OPENCODE_VERSION: ${{ inputs.version }}
+        OPENCODE_RELEASE: ${{ inputs.release }}
+        GH_REPO: ${{ inputs.repo }}
+
+    - name: Smoke Android CLI artifact
+      shell: bash
+      run: |
+        set -euo pipefail
+        artifact_dir="packages/opencode/dist/opencode-android-arm64"
+        binary="${artifact_dir}/bin/opencode"
+        opentui_lib="packages/opencode/node_modules/@opentui/core/android-arm64/libopentui.so"
+        smoke_dir="packages/opencode/dist/android-smoke"
+        mkdir -p "$smoke_dir"
+
+        test -x "$binary"
+        file "$binary" | tee "$smoke_dir/file.txt"
+        readelf -h "$binary" | tee "$smoke_dir/readelf-header.txt"
+        readelf -l "$binary" | tee "$smoke_dir/readelf-program-headers.txt"
+        readelf -S "$binary" > "$smoke_dir/readelf-sections.txt"
+        readelf -d "$binary" | tee "$smoke_dir/readelf-dynamic.txt"
+
+        grep -q "Machine:.*AArch64" "$smoke_dir/readelf-header.txt"
+        grep -q "Type:.*DYN" "$smoke_dir/readelf-header.txt"
+        if grep -E "Requesting program interpreter: .*(ld-linux|ld-musl)" "$smoke_dir/readelf-program-headers.txt"; then
+          echo "Android artifact unexpectedly references a Linux ELF interpreter." >&2
+          exit 1
+        fi
+        if grep -E "Shared library: \\[(libc\\.so\\.6|ld-linux|ld-musl)" "$smoke_dir/readelf-dynamic.txt"; then
+          echo "Android artifact unexpectedly links Linux libc/runtime libraries." >&2
+          exit 1
+        fi
+
+        test -f "$opentui_lib"
+        file "$opentui_lib" | tee "$smoke_dir/opentui-file.txt"
+        readelf -d "$opentui_lib" | tee "$smoke_dir/opentui-readelf-dynamic.txt"
+        readelf -Ws "$opentui_lib" > "$smoke_dir/opentui-readelf-symbols.txt"
+        readelf -r "$opentui_lib" > "$smoke_dir/opentui-readelf-relocs.txt"
+
+        if grep -E "Shared library: \\[(libc\\.so\\.6|ld-linux|ld-musl|libstdc\\+\\+|libgcc_s)" "$smoke_dir/opentui-readelf-dynamic.txt"; then
+          echo "OpenTUI Android library unexpectedly links non-Android runtime libraries." >&2
+          exit 1
+        fi
+        if grep -E "Shared library: \\[(libc\\+\\+|libc\\+\\+_shared|libunwind)\\.so" "$smoke_dir/opentui-readelf-dynamic.txt"; then
+          echo "OpenTUI Android library requires an unbundled C++/unwind runtime." >&2
+          exit 1
+        fi
+        grep -E " (YGNode|facebook4yoga|yogaNode)" "$smoke_dir/opentui-readelf-symbols.txt" | head -80 || true
+
+    - name: Pack Android artifact
+      shell: bash
+      working-directory: packages/opencode/dist/opencode-android-arm64/bin
+      run: tar -czf ../../opencode-android-arm64.tar.gz *
diff --git a/.github/scripts/termux-cleanup-release-branch.sh b/.github/scripts/termux-cleanup-release-branch.sh
new file mode 100755
index 000000000000..4bc7d2566f2f
--- /dev/null
+++ b/.github/scripts/termux-cleanup-release-branch.sh
@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+cleanup_limit="${CLEANUP_LIMIT:-100}"
+cleanup_matched_checkpoint=false
+
+append_cleanup_summary() {
+  local outcome="$1"
+  local release_branch="${2:-}"
+  local detail="${3:-}"
+
+  [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] || return 0
+
+  {
+    echo "## Termux release branch cleanup"
+    echo
+    echo "- Outcome: ${outcome}"
+    if [[ -n "${release_branch}" ]]; then
+      echo "- Release branch: \`${release_branch}\`"
+    fi
+    if [[ -n "${detail}" ]]; then
+      echo "- Detail: ${detail}"
+    fi
+  } >> "${GITHUB_STEP_SUMMARY}"
+}
+
+checkpoint_source_branch() {
+  jq -r '
+    [
+      (.body // "")
+      | split("\n")[]
+      | try capture("^- Source branch: `(?<branch>[^`]+)`").branch catch empty
+    ][0] // ""
+  ' <<< "$1"
+}
+
+checkpoint_has_label() {
+  local checkpoint_json="$1"
+  local label="$2"
+
+  jq -e --arg label "${label}" '[.labels[]?.name] | index($label) != null' <<< "${checkpoint_json}" >/dev/null
+}
+
+release_branch_is_valid() {
+  [[ "$1" =~ ^release-[A-Za-z0-9._-]+$ ]]
+}
+
+open_prs_using_branch() {
+  local release_branch="$1"
+
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state open \
+    --limit 200 \
+    --json number,title,url,headRefName,baseRefName,headRepository \
+    | jq \
+      --arg branch "${release_branch}" \
+      --arg repo "${GITHUB_REPOSITORY}" \
+      '
+      [
+        .[]
+        | select(
+            .baseRefName == $branch
+            or (
+              .headRefName == $branch
+              and ((.headRepository.nameWithOwner // "") == $repo)
+            )
+          )
+      ]
+    '
+}
+
+delete_release_branch_if_unused() {
+  local release_branch="$1"
+  local checkpoint_url="$2"
+  local open_prs
+  local branch_sha
+
+  if ! release_branch_is_valid "${release_branch}"; then
+    echo "::warning::Refusing to delete unexpected release branch name: ${release_branch}"
+    append_cleanup_summary "skipped" "${release_branch}" "branch name did not match release-* cleanup policy"
+    return 0
+  fi
+
+  if ! branch_sha="$(gh api --method GET "repos/${GITHUB_REPOSITORY}/git/ref/heads/${release_branch}" --jq '.object.sha' 2>/dev/null)"; then
+    echo "${release_branch} no longer exists on ${GITHUB_REPOSITORY}."
+    append_cleanup_summary "already deleted" "${release_branch}" "remote branch was not found"
+    return 0
+  fi
+
+  open_prs="$(open_prs_using_branch "${release_branch}")"
+  if [[ "$(jq 'length' <<< "${open_prs}")" != "0" ]]; then
+    echo "Leaving ${release_branch} in place because open PRs still use it as a source or target:"
+    jq -r '.[] | "- #\(.number) \(.title) (\(.url))"' <<< "${open_prs}"
+    append_cleanup_summary "skipped" "${release_branch}" "open PRs still use this branch"
+    return 0
+  fi
+
+  gh api --silent --method DELETE "repos/${GITHUB_REPOSITORY}/git/refs/heads/${release_branch}"
+  echo "Deleted ${release_branch} at ${branch_sha} after merged checkpoint ${checkpoint_url}."
+  append_cleanup_summary "deleted" "${release_branch}" "checkpoint ${checkpoint_url} merged and no open PRs use the branch"
+}
+
+cleanup_checkpoint_pr() {
+  local checkpoint_json="$1"
+  local checkpoint_url
+  local release_branch
+
+  checkpoint_url="$(jq -r '.url // empty' <<< "${checkpoint_json}")"
+
+  if [[ "$(jq -r '.mergedAt // empty' <<< "${checkpoint_json}")" == "" ]]; then
+    echo "Checkpoint PR ${checkpoint_url:-unknown} is not merged yet; release branch cleanup is deferred."
+    append_cleanup_summary "deferred" "" "checkpoint PR is not merged yet"
+    return 0
+  fi
+
+  if ! checkpoint_has_label "${checkpoint_json}" "checkpoint" || ! checkpoint_has_label "${checkpoint_json}" "termux-release"; then
+    echo "Skipping ${checkpoint_url:-checkpoint PR}; it is not labeled as a Termux checkpoint."
+    return 0
+  fi
+
+  release_branch="$(checkpoint_source_branch "${checkpoint_json}")"
+  if [[ -z "${release_branch}" ]]; then
+    echo "::warning::Could not find release source branch in checkpoint PR ${checkpoint_url}."
+    append_cleanup_summary "skipped" "" "checkpoint PR did not include a source branch"
+    return 0
+  fi
+
+  if [[ -n "${SOURCE_BRANCH:-}" && "${release_branch}" != "${SOURCE_BRANCH}" ]]; then
+    echo "Skipping ${checkpoint_url}; source branch ${release_branch} does not match requested ${SOURCE_BRANCH}."
+    return 0
+  fi
+
+  cleanup_matched_checkpoint=true
+  delete_release_branch_if_unused "${release_branch}" "${checkpoint_url}"
+}
+
+if [[ -n "${CHECKPOINT_PR:-}" ]]; then
+  cleanup_checkpoint_pr "$(
+    gh pr view "${CHECKPOINT_PR}" \
+      --repo "${GITHUB_REPOSITORY}" \
+      --json number,title,body,baseRefName,headRefName,labels,mergedAt,state,url
+  )"
+  exit 0
+fi
+
+while IFS= read -r checkpoint_json; do
+  cleanup_checkpoint_pr "${checkpoint_json}"
+done < <(
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state merged \
+    --limit "${cleanup_limit}" \
+    --json number,title,body,baseRefName,headRefName,labels,mergedAt,state,url \
+    | jq -c '
+      .[]
+      | select(([.labels[]?.name] | index("checkpoint") != null))
+      | select(([.labels[]?.name] | index("termux-release") != null))
+    '
+)
+
+if [[ "${cleanup_matched_checkpoint}" == "false" ]]; then
+  if [[ -n "${SOURCE_BRANCH:-}" ]]; then
+    echo "No merged Termux checkpoint PR found for ${SOURCE_BRANCH} in the most recent ${cleanup_limit} merged PRs."
+    append_cleanup_summary "skipped" "${SOURCE_BRANCH}" "no merged checkpoint PR found"
+    exit 0
+  fi
+
+  echo "No merged Termux checkpoint PRs found in the most recent ${cleanup_limit} merged PRs."
+  append_cleanup_summary "skipped" "" "no merged checkpoint PRs found"
+fi
diff --git a/.github/scripts/termux-configure-git.sh b/.github/scripts/termux-configure-git.sh
new file mode 100755
index 000000000000..764e936776d6
--- /dev/null
+++ b/.github/scripts/termux-configure-git.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+git config user.name "github-actions[bot]"
+git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+while (($#)); do
+  case "$1" in
+    --origin)
+      shift
+      origin_refs=()
+      while (($#)) && [[ "$1" != --* ]]; do
+        origin_refs+=("$1")
+        shift
+      done
+      if ((${#origin_refs[@]})); then
+        git fetch --prune origin "${origin_refs[@]}"
+      fi
+      ;;
+    --upstream-tag)
+      if (($# < 3)); then
+        echo "--upstream-tag requires <repo> <tag>." >&2
+        exit 1
+      fi
+      upstream_repo="$2"
+      upstream_tag="$3"
+      git remote add upstream "https://github.com/${upstream_repo}.git" 2>/dev/null || true
+      git fetch --prune --no-tags upstream "+refs/tags/${upstream_tag}:refs/tags/${upstream_tag}"
+      shift 3
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      exit 1
+      ;;
+  esac
+done
diff --git a/.github/scripts/termux-create-android-build-deployment.sh b/.github/scripts/termux-create-android-build-deployment.sh
new file mode 100755
index 000000000000..ac85205b0718
--- /dev/null
+++ b/.github/scripts/termux-create-android-build-deployment.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GITHUB_RUN_ID:?GITHUB_RUN_ID is required}"
+: "${GITHUB_SERVER_URL:?GITHUB_SERVER_URL is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${RELEASE_BRANCH:?RELEASE_BRANCH is required}"
+: "${RELEASE_SHA:?RELEASE_SHA is required}"
+: "${TERMUX_TAG:?TERMUX_TAG is required}"
+
+deployment_json="$(
+  jq -n \
+    --arg ref "${RELEASE_SHA}" \
+    --arg termux_tag "${TERMUX_TAG}" \
+    --arg release_branch "${RELEASE_BRANCH}" \
+    '{
+      ref: $ref,
+      task: "build-android",
+      auto_merge: false,
+      required_contexts: [],
+      environment: "termux-android",
+      description: ("Build Android artifact for " + $termux_tag),
+      transient_environment: true,
+      production_environment: false,
+      payload: {
+        termux_tag: $termux_tag,
+        release_branch: $release_branch
+      }
+    }' \
+    | gh api --method POST "repos/${GITHUB_REPOSITORY}/deployments" --input -
+)"
+
+deployment_id="$(jq -r '.id' <<< "${deployment_json}")"
+if [[ -z "${deployment_id}" || "${deployment_id}" == "null" ]]; then
+  echo "GitHub did not return a deployment id." >&2
+  echo "${deployment_json}" >&2
+  exit 1
+fi
+
+gh api --method POST "repos/${GITHUB_REPOSITORY}/deployments/${deployment_id}/statuses" \
+  --input - <<< "$(
+    jq -n \
+      --arg log_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+      '{
+        state: "in_progress",
+        environment: "termux-android",
+        log_url: $log_url,
+        description: "Building Android artifact"
+      }'
+  )"
+
+echo "deployment_id=${deployment_id}" >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-create-checkpoint-pr.sh b/.github/scripts/termux-create-checkpoint-pr.sh
new file mode 100755
index 000000000000..f4d523835edb
--- /dev/null
+++ b/.github/scripts/termux-create-checkpoint-pr.sh
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${DESTINATION_BRANCH:?DESTINATION_BRANCH is required}"
+: "${RUNNER_TEMP:?RUNNER_TEMP is required}"
+
+script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=.github/scripts/termux-release-paths.sh
+source "${script_dir}/termux-release-paths.sh"
+
+source_branch="${SOURCE_BRANCH:-${REQUESTED_SOURCE_BRANCH:-${GITHUB_REF_NAME:-}}}"
+source_sha="${SOURCE_SHA:-${REQUESTED_SOURCE_SHA:-}}"
+if [[ -z "${source_branch}" ]]; then
+  echo "SOURCE_BRANCH is required." >&2
+  exit 1
+fi
+if [[ -z "${source_sha}" ]]; then
+  source_sha="$(git rev-parse "origin/${source_branch}")"
+fi
+rm -rf "${PROMOTED_DIR:-promoted}"
+
+short_sha="${source_sha:0:12}"
+checkpoint_branch="checkpoint-${short_sha}"
+pr_title="checkpoint: ${source_branch} into ${DESTINATION_BRANCH} @ ${short_sha}"
+merge_conflicted=false
+conflict_summary=""
+
+existing_pr="$(
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --head "${checkpoint_branch}" \
+    --state all \
+    --json body,number,state,mergedAt,url \
+    --jq '[.[] | select(.state == "OPEN" or .mergedAt != null)] | .[0] // empty'
+)"
+if [[ -n "${existing_pr}" ]]; then
+  existing_url="$(jq -r '.url' <<< "${existing_pr}")"
+  echo "Checkpoint PR already exists for ${checkpoint_branch}: ${existing_url}."
+  echo "pr_url=${existing_url}" >> "${GITHUB_OUTPUT:-/dev/null}"
+  exit 0
+fi
+
+git fetch origin "${DESTINATION_BRANCH}" "${source_branch}"
+git checkout -B "${checkpoint_branch}" "origin/${DESTINATION_BRANCH}"
+
+if ! git merge --no-ff --no-edit "${source_sha}"; then
+  mapfile -t conflicted_paths < <(git diff --name-only --diff-filter=U)
+  for conflicted_path in "${conflicted_paths[@]}"; do
+    if termux_is_checkpoint_release_only_path "${conflicted_path}"; then
+      echo "Auto-resolving release-only checkpoint conflict in ${conflicted_path} by keeping ${DESTINATION_BRANCH}."
+      if git cat-file -e "HEAD:${conflicted_path}" 2>/dev/null; then
+        git checkout --ours -- "${conflicted_path}"
+        git add "${conflicted_path}"
+      else
+        git rm -f --ignore-unmatch "${conflicted_path}"
+      fi
+    fi
+  done
+
+  mapfile -t remaining_conflicts < <(git diff --name-only --diff-filter=U)
+  if [[ "${#remaining_conflicts[@]}" -eq 0 ]]; then
+    git commit --no-edit
+  else
+    merge_conflicted=true
+    conflict_summary="$(printf '%s\n' "${remaining_conflicts[@]}" | awk '{ print "- `" $0 "`" }')"
+    echo "Automatic checkpoint merge failed; creating a manual-resolution PR." >&2
+    if git rev-parse -q --verify MERGE_HEAD >/dev/null; then
+      git merge --abort
+    fi
+    git checkout -B "${checkpoint_branch}" "${source_sha}"
+  fi
+fi
+
+for release_only_path in "${TERMUX_CHECKPOINT_RELEASE_ONLY_PATHS[@]}"; do
+  if git cat-file -e "origin/${DESTINATION_BRANCH}:${release_only_path}" 2>/dev/null; then
+    git checkout "origin/${DESTINATION_BRANCH}" -- "${release_only_path}"
+  else
+    git rm -f --ignore-unmatch -- "${release_only_path}"
+  fi
+done
+
+if ! git diff --quiet || ! git diff --cached --quiet; then
+  git add -A
+  if [[ "${merge_conflicted}" == "true" ]]; then
+    git commit -m "checkpoint: prepare ${source_branch} for ${DESTINATION_BRANCH}"
+  else
+    git commit --amend --no-edit
+  fi
+fi
+
+if git diff --quiet "origin/${DESTINATION_BRANCH}" HEAD; then
+  echo "Checkpoint merge produced no destination changes after release-only files were restored."
+  exit 0
+fi
+
+git push --no-verify --force-with-lease origin "${checkpoint_branch}"
+
+body_path="${RUNNER_TEMP}/termux-checkpoint-pr.md"
+{
+  echo "## Termux release checkpoint"
+  echo
+  echo "- Source branch: \`${source_branch}\`"
+  echo "- Source hash: \`${source_sha}\`"
+  echo "- Destination branch: \`${DESTINATION_BRANCH}\`"
+  echo
+  echo "This PR carries release-train conflict fixes and follow-up changes back into the reusable Termux patch branch. Release metadata is removed before opening the PR."
+  if [[ "${merge_conflicted}" == "true" ]]; then
+    echo
+    echo "## Merge conflicts"
+    echo
+    echo "GitHub Actions could not create the checkpoint merge commit automatically, so this PR was created from the release branch state for manual conflict resolution."
+    echo
+    printf '%s\n' "${conflict_summary:-"- Conflict details unavailable"}"
+  fi
+} > "${body_path}"
+
+pr_url="$(
+  gh pr create \
+    --repo "${GITHUB_REPOSITORY}" \
+    --base "${DESTINATION_BRANCH}" \
+    --head "${checkpoint_branch}" \
+    --title "${pr_title}" \
+    --body-file "${body_path}"
+)"
+if [[ -n "${REVIEWER:-}" ]]; then
+  gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-reviewer "${REVIEWER}" || true
+fi
+gh label create checkpoint --repo "${GITHUB_REPOSITORY}" --color c5def5 --description "Checkpoint merge" --force
+gh label create termux-release --repo "${GITHUB_REPOSITORY}" --color 0e8a16 --description "Termux release automation" --force
+gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-label "checkpoint" --add-label "termux-release"
+
+if [[ "${merge_conflicted}" != "true" ]]; then
+  pr_head_sha="$(gh pr view "${pr_url}" --repo "${GITHUB_REPOSITORY}" --json headRefOid --jq '.headRefOid')"
+  gh pr merge "${pr_url}" \
+    --repo "${GITHUB_REPOSITORY}" \
+    --merge \
+    --auto \
+    --delete-branch \
+    --match-head-commit "${pr_head_sha}" \
+    || echo "::warning::Could not enable checkpoint auto-merge for ${pr_url}."
+fi
+
+echo "pr_url=${pr_url}" >> "${GITHUB_OUTPUT:-/dev/null}"
diff --git a/.github/scripts/termux-create-or-update-mirrored-release.sh b/.github/scripts/termux-create-or-update-mirrored-release.sh
new file mode 100755
index 000000000000..033ea8562547
--- /dev/null
+++ b/.github/scripts/termux-create-or-update-mirrored-release.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${RUNNER_TEMP:?RUNNER_TEMP is required}"
+: "${UPSTREAM_TAG:?UPSTREAM_TAG is required}"
+: "${UPSTREAM_REPO:?UPSTREAM_REPO is required}"
+: "${UPSTREAM_NAME?UPSTREAM_NAME is required}"
+: "${TERMUX_TAG:?TERMUX_TAG is required}"
+: "${UPSTREAM_PRERELEASE:?UPSTREAM_PRERELEASE is required}"
+: "${UPSTREAM_HTML_URL?UPSTREAM_HTML_URL is required}"
+: "${RELEASE_TRAIN?RELEASE_TRAIN is required}"
+: "${RELEASE_EXISTS:?RELEASE_EXISTS is required}"
+: "${PR_NUMBER:?PR_NUMBER is required}"
+: "${HEAD_SHA:?HEAD_SHA is required}"
+: "${RELEASE_SHA:?RELEASE_SHA is required}"
+
+promoted_dir="${PROMOTED_DIR:-promoted}"
+asset_path="${promoted_dir}/opencode-android-arm64.tar.gz"
+body_path="${RUNNER_TEMP}/termux-release-body.md"
+upstream_body_path="${RUNNER_TEMP}/termux-upstream-release-body.md"
+
+if ! gh release view "${UPSTREAM_TAG}" --repo "${UPSTREAM_REPO}" --json body --jq '.body // ""' > "${upstream_body_path}"; then
+  echo "::warning::Could not read ${UPSTREAM_REPO} release ${UPSTREAM_TAG}."
+  : > "${upstream_body_path}"
+fi
+
+{
+  echo "Termux Android build for ${UPSTREAM_TAG}."
+  echo
+  echo "- Upstream release: ${UPSTREAM_HTML_URL}"
+  echo "- Release train: \`${RELEASE_TRAIN}\`"
+  echo "- Promoted PR: #${PR_NUMBER}"
+  echo "- Promoted PR head SHA: \`${HEAD_SHA}\`"
+  echo
+  if [[ -s "${upstream_body_path}" ]]; then
+    echo "## Upstream release notes"
+    echo
+    cat "${upstream_body_path}"
+  fi
+} > "${body_path}"
+
+release_title="${UPSTREAM_NAME}"
+if [[ -z "${release_title}" || "${release_title}" == "null" ]]; then
+  release_title="${TERMUX_TAG}"
+fi
+
+if [[ "${RELEASE_EXISTS}" == "true" ]]; then
+  gh release upload "${TERMUX_TAG}" "${asset_path}#opencode-android-arm64.tar.gz" --repo "${GITHUB_REPOSITORY}" --clobber
+  gh release edit "${TERMUX_TAG}" --repo "${GITHUB_REPOSITORY}" --notes-file "${body_path}" --title "${release_title}"
+  exit 0
+fi
+
+release_args=(
+  gh release create "${TERMUX_TAG}"
+  --repo "${GITHUB_REPOSITORY}"
+  --target "${RELEASE_SHA}"
+  --title "${release_title}"
+  --notes-file "${body_path}"
+)
+if [[ "${UPSTREAM_PRERELEASE}" == "true" ]]; then
+  release_args+=(--prerelease)
+fi
+release_args+=("${asset_path}#opencode-android-arm64.tar.gz")
+"${release_args[@]}"
diff --git a/.github/scripts/termux-create-release-pr.sh b/.github/scripts/termux-create-release-pr.sh
new file mode 100755
index 000000000000..df00345e64df
--- /dev/null
+++ b/.github/scripts/termux-create-release-pr.sh
@@ -0,0 +1,284 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${UPSTREAM_REPO:?UPSTREAM_REPO is required}"
+: "${UPSTREAM_TAG:?UPSTREAM_TAG is required}"
+: "${UPSTREAM_NAME?UPSTREAM_NAME is required}"
+: "${UPSTREAM_HTML_URL:?UPSTREAM_HTML_URL is required}"
+: "${UPSTREAM_PRERELEASE:?UPSTREAM_PRERELEASE is required}"
+: "${UPSTREAM_TARGET?UPSTREAM_TARGET is required}"
+: "${UPSTREAM_ID?UPSTREAM_ID is required}"
+: "${RELEASE_TRAIN:?RELEASE_TRAIN is required}"
+: "${RELEASE_BRANCH:?RELEASE_BRANCH is required}"
+: "${WORK_BRANCH:?WORK_BRANCH is required}"
+: "${TERMUX_TAG:?TERMUX_TAG is required}"
+: "${PATCH_BRANCH:?PATCH_BRANCH is required}"
+: "${REVIEWER?REVIEWER is required}"
+: "${RUNNER_TEMP:?RUNNER_TEMP is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+automation_root="$(cd -- "${script_dir}/../.." && pwd)"
+# shellcheck source=.github/scripts/termux-release-paths.sh
+source "${script_dir}/termux-release-paths.sh"
+
+pr_title="Termux ${UPSTREAM_TAG}"
+seed_dir="${RUNNER_TEMP}/termux-release-seed"
+
+capture_seeded_release_files() {
+  local seeded_path
+
+  for seeded_path in "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"; do
+    mkdir -p "${seed_dir}/$(dirname "${seeded_path}")"
+    cp "${automation_root}/${seeded_path}" "${seed_dir}/${seeded_path}"
+  done
+}
+
+seed_release_automation_files() {
+  local seeded_path
+
+  for seeded_path in "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"; do
+    mkdir -p "$(dirname "${seeded_path}")"
+    cp "${seed_dir}/${seeded_path}" "${seeded_path}"
+    case "${seeded_path}" in
+      .github/scripts/*.sh)
+        chmod +x "${seeded_path}"
+        ;;
+    esac
+  done
+}
+
+normalize_workspace_versions() {
+  local version="${UPSTREAM_TAG#v}"
+  version="${version%-termux}"
+
+  OPENCODE_UPSTREAM_VERSION="${version}" node <<'NODE'
+const fs = require("fs")
+const path = require("path")
+
+const version = process.env.OPENCODE_UPSTREAM_VERSION
+
+function visit(dir) {
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const full = path.join(dir, entry.name)
+    if (entry.isDirectory()) {
+      visit(full)
+      continue
+    }
+    if (entry.name !== "package.json") continue
+    const text = fs.readFileSync(full, "utf8")
+    const pkg = JSON.parse(text)
+    if (!pkg.version) continue
+    if (pkg.name !== "opencode" && !String(pkg.name || "").startsWith("@opencode-ai/")) continue
+    pkg.version = version
+    fs.writeFileSync(full, `${JSON.stringify(pkg, null, 2)}\n`)
+  }
+}
+
+visit("packages")
+NODE
+
+  if command -v bun >/dev/null 2>&1; then
+    bun install --lockfile-only --ignore-scripts
+  else
+    echo "::warning::bun is unavailable; package versions were normalized but bun.lock was not refreshed."
+  fi
+}
+
+open_prs_json() {
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state open \
+    --limit 200 \
+    --json number,title,body,headRefName,baseRefName,url
+}
+
+existing_open_release_pr() {
+  open_prs_json \
+    | jq -c \
+      --arg release_branch "${RELEASE_BRANCH}" \
+      '
+        [
+          .[]
+          | select(.baseRefName == $release_branch)
+          | select(
+              ((.title // "") | startswith("Termux v"))
+              and ((.body // "") | contains("Release branch: `" + $release_branch + "`"))
+            )
+        ]
+        | sort_by(.number)
+        | reverse
+        | .[0] // empty
+      '
+}
+
+enable_release_pr_automerge() {
+  local pr_url="$1"
+  local pr_info
+
+  if ! pr_info="$(gh pr view "${pr_url}" --repo "${GITHUB_REPOSITORY}" --json headRefOid,mergeStateStatus,mergeable,state,url)"; then
+    echo "::warning::Could not inspect ${pr_url}; leaving auto-merge disabled."
+    return 0
+  fi
+
+  if [[ "$(jq -r '.state' <<< "${pr_info}")" != "OPEN" ]]; then
+    return 0
+  fi
+
+  if [[ "$(jq -r '.mergeable // ""' <<< "${pr_info}")" == "CONFLICTING" || "$(jq -r '.mergeStateStatus // ""' <<< "${pr_info}")" == "DIRTY" ]]; then
+    echo "Skipping auto-merge for ${pr_url}; GitHub reports conflicts."
+    return 0
+  fi
+
+  gh pr merge "${pr_url}" \
+    --repo "${GITHUB_REPOSITORY}" \
+    --squash \
+    --auto \
+    --delete-branch \
+    --match-head-commit "$(jq -r '.headRefOid' <<< "${pr_info}")" \
+    || echo "::warning::Could not enable auto-merge for ${pr_url}."
+}
+
+append_pr_summary() {
+  local outcome="$1"
+  local pr_url="${2:-}"
+
+  [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] || return 0
+
+  {
+    echo "## Termux release PR"
+    echo
+    echo "- Outcome: ${outcome}"
+    echo "- Upstream tag: \`${UPSTREAM_TAG}\`"
+    echo "- Termux tag: \`${TERMUX_TAG}\`"
+    echo "- Release branch: \`${RELEASE_BRANCH}\`"
+    echo "- Work branch: \`${WORK_BRANCH}\`"
+    echo "- Patch branch: \`${PATCH_BRANCH}\`"
+    if [[ -n "${pr_url}" ]]; then
+      echo "- PR: ${pr_url}"
+    fi
+  } >> "${GITHUB_STEP_SUMMARY}"
+}
+
+capture_seeded_release_files
+
+release_branch_exists=false
+if git ls-remote --exit-code --heads origin "${RELEASE_BRANCH}" >/dev/null 2>&1; then
+  release_branch_exists=true
+  git fetch origin "${RELEASE_BRANCH}"
+fi
+
+if [[ "${release_branch_exists}" == "false" ]]; then
+  git checkout -B "${RELEASE_BRANCH}" "refs/tags/${UPSTREAM_TAG}"
+  seed_release_automation_files
+  git add -- "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"
+  if ! git diff --cached --quiet; then
+    git commit -m "chore(termux): seed release automation"
+  fi
+  git push --no-verify origin "${RELEASE_BRANCH}"
+fi
+
+git fetch origin "${RELEASE_BRANCH}"
+existing_pr="$(existing_open_release_pr)"
+if [[ -n "${existing_pr}" && "$(jq -r '.headRefName' <<< "${existing_pr}")" != "${WORK_BRANCH}" ]]; then
+  WORK_BRANCH="$(jq -r '.headRefName' <<< "${existing_pr}")"
+fi
+
+if git ls-remote --exit-code --heads origin "${WORK_BRANCH}" >/dev/null 2>&1; then
+  git fetch origin "${WORK_BRANCH}"
+  git checkout -B "${WORK_BRANCH}" "origin/${WORK_BRANCH}"
+else
+  git checkout -B "${WORK_BRANCH}" "origin/${PATCH_BRANCH}"
+fi
+
+seed_release_automation_files
+normalize_workspace_versions
+
+mkdir -p .github
+jq -n \
+  --arg upstream_repo "${UPSTREAM_REPO}" \
+  --arg upstream_tag "${UPSTREAM_TAG}" \
+  --arg upstream_name "${UPSTREAM_NAME}" \
+  --arg upstream_html_url "${UPSTREAM_HTML_URL}" \
+  --arg upstream_target "${UPSTREAM_TARGET}" \
+  --arg upstream_release_id "${UPSTREAM_ID}" \
+  --arg release_train "${RELEASE_TRAIN}" \
+  --arg release_branch "${RELEASE_BRANCH}" \
+  --arg work_branch "${WORK_BRANCH}" \
+  --arg patch_branch "${PATCH_BRANCH}" \
+  --arg patch_source_sha "$(git rev-parse "origin/${PATCH_BRANCH}")" \
+  --arg termux_tag "${TERMUX_TAG}" \
+  --argjson upstream_prerelease "${UPSTREAM_PRERELEASE}" \
+  '{
+    upstream_repo: $upstream_repo,
+    upstream_tag: $upstream_tag,
+    upstream_name: $upstream_name,
+    upstream_html_url: $upstream_html_url,
+    upstream_target: $upstream_target,
+    upstream_release_id: $upstream_release_id,
+    upstream_prerelease: $upstream_prerelease,
+    release_train: $release_train,
+    release_branch: $release_branch,
+    work_branch: $work_branch,
+    patch_branch: $patch_branch,
+    patch_source_sha: $patch_source_sha,
+    termux_tag: $termux_tag
+  }' > .github/termux-release.json
+
+git add -A
+if git diff --cached --quiet; then
+  echo "No changes to propose for ${UPSTREAM_TAG}."
+  append_pr_summary "no changes to propose"
+  exit 0
+fi
+
+git commit -m "chore(termux): prepare ${UPSTREAM_TAG}"
+git push --no-verify --force-with-lease origin "${WORK_BRANCH}"
+
+body_path="${RUNNER_TEMP}/termux-release-pr.md"
+{
+  echo "## Termux release train"
+  echo
+  echo "- Upstream release: ${UPSTREAM_HTML_URL}"
+  echo "- Upstream tag: \`${UPSTREAM_TAG}\`"
+  echo "- Termux release tag: \`${TERMUX_TAG}\`"
+  echo "- Release branch: \`${RELEASE_BRANCH}\`"
+  echo "- Patch source: \`${PATCH_BRANCH}\`"
+  echo
+  echo "This PR carries the Termux patch branch onto the upstream release tag. If GitHub reports conflicts, resolve them by keeping upstream release code and preserving the Termux compatibility fixes."
+  echo
+  echo "After this PR merges, the Termux deploy workflow builds \`opencode-android-arm64\` under a GitHub Deployment, mirrors the release asset to \`${TERMUX_TAG}\`, and opens a checkpoint PR back to \`${PATCH_BRANCH}\`."
+  echo
+  echo "## Upstream notes"
+  echo
+  printf '%s\n' "${UPSTREAM_BODY}"
+} > "${body_path}"
+
+if [[ -n "${existing_pr}" ]]; then
+  pr_url="$(jq -r '.url' <<< "${existing_pr}")"
+  gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --title "${pr_title}" --body-file "${body_path}"
+  pr_action="updated"
+else
+  pr_url="$(
+    gh pr create \
+      --repo "${GITHUB_REPOSITORY}" \
+      --base "${RELEASE_BRANCH}" \
+      --head "${WORK_BRANCH}" \
+      --title "${pr_title}" \
+      --body-file "${body_path}"
+  )"
+  pr_action="created"
+fi
+
+if [[ -n "${REVIEWER}" ]]; then
+  gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-reviewer "${REVIEWER}" || true
+fi
+gh label create termux-release --repo "${GITHUB_REPOSITORY}" --color 0e8a16 --description "Termux release automation" --force
+gh label create release-train --repo "${GITHUB_REPOSITORY}" --color 1d76db --description "Release train PR" --force
+gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-label "termux-release" --add-label "release-train"
+enable_release_pr_automerge "${pr_url}"
+echo "pr_url=${pr_url}" >> "${GITHUB_OUTPUT}"
+append_pr_summary "${pr_action} release train PR" "${pr_url}"
diff --git a/.github/scripts/termux-find-release-pr.sh b/.github/scripts/termux-find-release-pr.sh
new file mode 100755
index 000000000000..0560f51b58a9
--- /dev/null
+++ b/.github/scripts/termux-find-release-pr.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+if [[ -n "${INPUT_PR_NUMBER:-}" || -n "${INPUT_PR_HEAD_SHA:-}" ]]; then
+  if [[ -z "${INPUT_PR_NUMBER:-}" || -z "${INPUT_PR_HEAD_SHA:-}" ]]; then
+    echo "workflow_dispatch inputs pr_number and pr_head_sha must be provided together." >&2
+    exit 1
+  fi
+  pr_number="${INPUT_PR_NUMBER}"
+  head_sha="${INPUT_PR_HEAD_SHA}"
+  head_ref=""
+else
+  : "${RELEASE_BRANCH:?RELEASE_BRANCH is required}"
+  : "${RELEASE_SHA:?RELEASE_SHA is required}"
+  pr_json="$(
+    gh pr list \
+      --repo "${GITHUB_REPOSITORY}" \
+      --base "${RELEASE_BRANCH}" \
+      --state merged \
+      --limit 100 \
+      --json number,headRefOid,headRefName,mergeCommit \
+      --jq "[.[] | select(.mergeCommit.oid == \"${RELEASE_SHA}\")] | sort_by(.number) | reverse | .[0] // empty"
+  )"
+  if [[ -z "${pr_json}" ]]; then
+    echo "Unable to find merged PR for ${RELEASE_SHA} into ${RELEASE_BRANCH}" >&2
+    exit 1
+  fi
+  pr_number="$(jq -r '.number' <<< "${pr_json}")"
+  head_sha="$(jq -r '.headRefOid' <<< "${pr_json}")"
+  head_ref="$(jq -r '.headRefName' <<< "${pr_json}")"
+fi
+
+{
+  echo "number=${pr_number}"
+  echo "head_sha=${head_sha}"
+  echo "head_ref=${head_ref}"
+} >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-finish-android-build-deployment.sh b/.github/scripts/termux-finish-android-build-deployment.sh
new file mode 100755
index 000000000000..0cf33af079fe
--- /dev/null
+++ b/.github/scripts/termux-finish-android-build-deployment.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GITHUB_RUN_ID:?GITHUB_RUN_ID is required}"
+: "${GITHUB_SERVER_URL:?GITHUB_SERVER_URL is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${DEPLOYMENT_ID:?DEPLOYMENT_ID is required}"
+: "${BUILD_RESULT:?BUILD_RESULT is required}"
+
+state="success"
+description="Android artifact build completed"
+if [[ "${BUILD_RESULT}" != "success" ]]; then
+  state="failure"
+  description="Android artifact build failed"
+fi
+
+gh api --method POST "repos/${GITHUB_REPOSITORY}/deployments/${DEPLOYMENT_ID}/statuses" \
+  --input - <<< "$(
+    jq -n \
+      --arg state "${state}" \
+      --arg description "${description}" \
+      --arg log_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+      '{
+        state: $state,
+        environment: "termux-android",
+        log_url: $log_url,
+        description: $description
+      }'
+  )"
diff --git a/.github/scripts/termux-read-release-metadata.sh b/.github/scripts/termux-read-release-metadata.sh
new file mode 100755
index 000000000000..be17c87a9204
--- /dev/null
+++ b/.github/scripts/termux-read-release-metadata.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+metadata=".github/termux-release.json"
+if [[ ! -f "${metadata}" ]]; then
+  echo "No ${metadata}; this is not a Termux release deployment."
+  echo "deploy=false" >> "${GITHUB_OUTPUT}"
+  exit 0
+fi
+
+upstream_tag="$(jq -r '.upstream_tag // empty' "${metadata}")"
+upstream_name="$(jq -r '.upstream_name // .upstream_tag // empty' "${metadata}")"
+termux_tag="$(jq -r '.termux_tag // empty' "${metadata}")"
+upstream_prerelease="$(jq -r '.upstream_prerelease // false' "${metadata}")"
+upstream_html_url="$(jq -r '.upstream_html_url // ""' "${metadata}")"
+upstream_repo="$(jq -r '.upstream_repo // "anomalyco/opencode"' "${metadata}")"
+release_train="$(jq -r '.release_train // ""' "${metadata}")"
+
+if [[ -z "${upstream_tag}" || -z "${termux_tag}" ]]; then
+  echo "Missing upstream_tag or termux_tag in ${metadata}" >&2
+  exit 1
+fi
+
+release_exists=false
+asset_exists=false
+if gh release view "${termux_tag}" --repo "${GITHUB_REPOSITORY}" >/dev/null 2>&1; then
+  release_exists=true
+  if [[ "$(
+    gh release view "${termux_tag}" \
+      --repo "${GITHUB_REPOSITORY}" \
+      --json assets \
+      --jq '.assets | map(.name) | any(. == "opencode-android-arm64.tar.gz")'
+  )" == "true" ]]; then
+    asset_exists=true
+  fi
+fi
+
+{
+  echo "deploy=true"
+  echo "upstream_tag=${upstream_tag}"
+  echo "upstream_name=${upstream_name}"
+  echo "termux_tag=${termux_tag}"
+  echo "build_version=${termux_tag#v}"
+  echo "upstream_prerelease=${upstream_prerelease}"
+  echo "upstream_html_url=${upstream_html_url}"
+  echo "upstream_repo=${upstream_repo}"
+  echo "release_train=${release_train}"
+  echo "release_exists=${release_exists}"
+  echo "asset_exists=${asset_exists}"
+} >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-release-paths.sh b/.github/scripts/termux-release-paths.sh
new file mode 100755
index 000000000000..4a58e49e6164
--- /dev/null
+++ b/.github/scripts/termux-release-paths.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+readonly -a TERMUX_RELEASE_WORKFLOW_PATHS=(
+  .github/actions/build-android-cli/action.yml
+  .github/workflows/publish.yml
+  .github/workflows/termux-release-branch-cleanup.yml
+  .github/workflows/termux-release-checkpoint.yml
+  .github/workflows/termux-release-deploy.yml
+  .github/workflows/termux-release-watch.yml
+)
+
+readonly -a TERMUX_RELEASE_SCRIPT_PATHS=(
+  .github/scripts/termux-configure-git.sh
+  .github/scripts/termux-cleanup-release-branch.sh
+  .github/scripts/termux-create-checkpoint-pr.sh
+  .github/scripts/termux-create-android-build-deployment.sh
+  .github/scripts/termux-create-or-update-mirrored-release.sh
+  .github/scripts/termux-create-release-pr.sh
+  .github/scripts/termux-find-release-pr.sh
+  .github/scripts/termux-finish-android-build-deployment.sh
+  .github/scripts/termux-read-release-metadata.sh
+  .github/scripts/termux-release-paths.sh
+  .github/scripts/termux-resolve-release-ref.sh
+  .github/scripts/termux-select-release.sh
+  .github/scripts/termux-validate-gh-env.sh
+)
+
+readonly -a TERMUX_RELEASE_AUTOMATION_PATHS=(
+  "${TERMUX_RELEASE_WORKFLOW_PATHS[@]}"
+  "${TERMUX_RELEASE_SCRIPT_PATHS[@]}"
+)
+
+readonly -a TERMUX_CHECKPOINT_RELEASE_ONLY_PATHS=(
+  "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"
+  .github/termux-release.json
+)
+
+termux_path_in_list() {
+  local candidate="$1"
+  shift
+  local listed_path
+
+  for listed_path in "$@"; do
+    [[ "${candidate}" != "${listed_path}" ]] || return 0
+  done
+  return 1
+}
+
+termux_is_checkpoint_release_only_path() {
+  termux_path_in_list "$1" "${TERMUX_CHECKPOINT_RELEASE_ONLY_PATHS[@]}"
+}
diff --git a/.github/scripts/termux-resolve-release-ref.sh b/.github/scripts/termux-resolve-release-ref.sh
new file mode 100755
index 000000000000..02e92b4e3d8f
--- /dev/null
+++ b/.github/scripts/termux-resolve-release-ref.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_EVENT_NAME:?GITHUB_EVENT_NAME is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+
+input_release_branch="${INPUT_RELEASE_BRANCH:-${REQUESTED_RELEASE_BRANCH:-}}"
+input_release_sha="${INPUT_RELEASE_SHA:-${REQUESTED_RELEASE_SHA:-}}"
+
+if [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
+  if [[ -z "${input_release_branch}" ]]; then
+    echo "release_branch is required for workflow_dispatch." >&2
+    exit 1
+  fi
+  release_branch="${input_release_branch}"
+  git fetch origin "${release_branch}"
+  git checkout --detach "origin/${release_branch}"
+  if [[ -n "${input_release_sha}" ]]; then
+    git checkout --detach "${input_release_sha}"
+    release_sha="${input_release_sha}"
+  else
+    release_sha="$(git rev-parse HEAD)"
+  fi
+else
+  : "${GITHUB_REF_NAME:?GITHUB_REF_NAME is required}"
+  : "${GITHUB_SHA:?GITHUB_SHA is required}"
+  release_branch="${GITHUB_REF_NAME}"
+  release_sha="${GITHUB_SHA}"
+fi
+
+{
+  echo "branch=${release_branch}"
+  echo "sha=${release_sha}"
+} >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-select-release.sh b/.github/scripts/termux-select-release.sh
new file mode 100755
index 000000000000..2784c8c91737
--- /dev/null
+++ b/.github/scripts/termux-select-release.sh
@@ -0,0 +1,335 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${UPSTREAM_REPO:?UPSTREAM_REPO is required}"
+: "${REQUESTED_TAG?REQUESTED_TAG is required}"
+: "${BYPASS_PRIOR_RELEASE_TRAIN:?BYPASS_PRIOR_RELEASE_TRAIN is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+normalize_tag_version() {
+  local tag="$1"
+  local version="${tag#v}"
+  version="${version%-termux}"
+  printf '%s\n' "${version}"
+}
+
+requested_upstream_tag() {
+  local requested="${1#refs/tags/}"
+  printf 'v%s\n' "$(normalize_tag_version "${requested}")"
+}
+
+release_train_for_tag() {
+  local version
+  version="$(normalize_tag_version "$1")"
+  printf '%s\n' "${version%%-*}"
+}
+
+release_branch_for_tag() {
+  printf 'release-%s\n' "$(release_train_for_tag "$1")"
+}
+
+work_branch_for_tag() {
+  printf 'termux-%s\n' "$(release_train_for_tag "$1")"
+}
+
+termux_tag_for_tag() {
+  printf '%s-termux\n' "$1"
+}
+
+latest_release_json() {
+  gh api --method GET "repos/${UPSTREAM_REPO}/releases?per_page=1" \
+    | jq -c '
+      .[0] // empty
+      | select(type == "object")
+      | {
+        tagName: (.tag_name // .tagName // ""),
+        name: (.name // .tag_name // .tagName // ""),
+        body: (.body // ""),
+        url: (.html_url // .url // ""),
+        isPrerelease: (.prerelease // .isPrerelease // false),
+        targetCommitish: (.target_commitish // .targetCommitish // ""),
+        databaseId: (.id // .databaseId // "")
+      }
+    '
+}
+
+release_json_for_tag() {
+  local tag="$1"
+  gh api --method GET "repos/${UPSTREAM_REPO}/releases/tags/${tag}" \
+    | jq -c '{
+      tagName: (.tag_name // .tagName // ""),
+      name: (.name // .tag_name // .tagName // ""),
+      body: (.body // ""),
+      url: (.html_url // .url // ""),
+      isPrerelease: (.prerelease // .isPrerelease // false),
+      targetCommitish: (.target_commitish // .targetCommitish // ""),
+      databaseId: (.id // .databaseId // "")
+    }'
+}
+
+open_prs_json() {
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state open \
+    --limit 200 \
+    --json number,title,body,headRefName,baseRefName,url
+}
+
+release_branch_current_tag() {
+  git show "origin/$1:.github/termux-release.json" 2>/dev/null \
+    | jq -r '.upstream_tag // empty' 2>/dev/null \
+    || true
+}
+
+version_is_newer() {
+  local candidate="$1"
+  local current="$2"
+  local candidate_version
+  local current_version
+  local newest
+
+  if [[ -z "${current}" ]]; then
+    return 0
+  fi
+
+  candidate_version="$(normalize_tag_version "${candidate}")"
+  current_version="$(normalize_tag_version "${current}")"
+  newest="$(printf '%s\n%s\n' "${current_version}" "${candidate_version}" | sort -V | tail -n 1)"
+  [[ "${newest}" == "${candidate_version}" && "${candidate_version}" != "${current_version}" ]]
+}
+
+latest_mirrored_termux_tag() {
+  local release_train="${1:-}"
+  local newest_tag=""
+  local tag
+  local tag_train
+
+  while IFS= read -r tag; do
+    [[ -n "${tag}" ]] || continue
+    [[ "${tag}" == v*-termux ]] || continue
+    if [[ -n "${release_train}" ]]; then
+      tag_train="$(release_train_for_tag "${tag}")"
+      [[ "${tag_train}" == "${release_train}" ]] || continue
+    fi
+    if [[ -z "${newest_tag}" ]] || version_is_newer "${tag}" "${newest_tag}"; then
+      newest_tag="${tag}"
+    fi
+  done < <(
+    gh release list \
+      --repo "${GITHUB_REPOSITORY}" \
+      --exclude-drafts \
+      --limit 200 \
+      --json tagName \
+      --jq '.[].tagName'
+  )
+
+  printf '%s\n' "${newest_tag}"
+}
+
+latest_mirrored_termux_tag_for_train() {
+  latest_mirrored_termux_tag "$1"
+}
+
+open_release_train_pr_for_branch() {
+  local release_branch="$1"
+  open_prs_json \
+    | jq -c \
+      --arg release_branch "${release_branch}" \
+      '
+        [
+          .[]
+          | select(.baseRefName == $release_branch)
+          | select(
+              ((.title // "") | startswith("Termux v"))
+              and ((.body // "") | contains("Release branch: `" + $release_branch + "`"))
+            )
+          | . + {
+              upstreamTag: (
+                (.body // "")
+                | try capture("- Upstream tag: `(?<tag>v[^`]+)`").tag catch ""
+              )
+            }
+        ]
+        | sort_by(.number)
+        | reverse
+        | .[0] // empty
+      '
+}
+
+open_other_release_train_prs() {
+  local release_branch="$1"
+  open_prs_json \
+    | jq -r \
+      --arg release_branch "${release_branch}" \
+      '
+        .[]
+        | select(.baseRefName != $release_branch)
+        | select(
+            ((.title // "") | startswith("Termux v"))
+            and ((.body // "") | contains("Release branch: `release-"))
+          )
+        | "- #\(.number) \(.title) (\(.url))"
+      '
+}
+
+append_selection_summary() {
+  local selected="$1"
+  local upstream_tag="${2:-}"
+  local release_branch="${3:-}"
+  local work_branch="${4:-}"
+  local termux_tag="${5:-}"
+
+  [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] || return 0
+
+  {
+    echo "## Termux release selection"
+    echo
+    echo "- Repository: \`${GITHUB_REPOSITORY}\`"
+    echo "- Upstream repository: \`${UPSTREAM_REPO}\`"
+    if [[ "${selected}" == "true" ]]; then
+      echo "- Selected upstream tag: \`${upstream_tag}\`"
+      echo "- Release branch: \`${release_branch}\`"
+      echo "- Work branch: \`${work_branch}\`"
+      echo "- Termux tag: \`${termux_tag}\`"
+    else
+      echo "- Selected: no"
+    fi
+  } >> "${GITHUB_STEP_SUMMARY}"
+}
+
+emit_selected_release() {
+  local release_json="$1"
+  local release_branch="$2"
+  local work_branch="$3"
+  local termux_tag="$4"
+  local upstream_tag
+  local upstream_body
+
+  upstream_tag="$(jq -r '.tagName' <<< "${release_json}")"
+  upstream_body="$(jq -r '.body // ""' <<< "${release_json}")"
+
+  {
+    echo "selected=true"
+    echo "upstream_tag=${upstream_tag}"
+    echo "upstream_name=$(jq -r '.name' <<< "${release_json}")"
+    echo "upstream_html_url=$(jq -r '.url' <<< "${release_json}")"
+    echo "upstream_prerelease=$(jq -r '.isPrerelease' <<< "${release_json}")"
+    echo "upstream_target=$(jq -r '.targetCommitish' <<< "${release_json}")"
+    echo "upstream_id=$(jq -r '.databaseId' <<< "${release_json}")"
+    echo "release_train=$(release_train_for_tag "${upstream_tag}")"
+    echo "release_branch=${release_branch}"
+    echo "work_branch=${work_branch}"
+    echo "termux_tag=${termux_tag}"
+  } >> "${GITHUB_OUTPUT}"
+
+  body_delimiter="termux_release_body_$(date +%s%N)_${RANDOM}_${RANDOM}"
+  while grep -qxF "${body_delimiter}" <<< "${upstream_body}"; do
+    body_delimiter="termux_release_body_$(date +%s%N)_${RANDOM}_${RANDOM}"
+  done
+  {
+    echo "body<<${body_delimiter}"
+    printf '%s\n' "${upstream_body}"
+    echo "${body_delimiter}"
+  } >> "${GITHUB_OUTPUT}"
+
+  append_selection_summary "true" "${upstream_tag}" "${release_branch}" "${work_branch}" "${termux_tag}"
+}
+
+maybe_select_release() {
+  local release_json="$1"
+  local selection_mode="${2:-latest}"
+  local upstream_tag
+  local release_train
+  local release_branch
+  local work_branch
+  local termux_tag
+  local current_tag
+  local mirrored_tag
+  local open_pr_json
+  local open_pr_tag
+  local pending_other_prs
+
+  upstream_tag="$(jq -r '.tagName // empty' <<< "${release_json}")"
+  [[ "${upstream_tag}" == v* ]] || return 1
+
+  release_train="$(release_train_for_tag "${upstream_tag}")"
+  release_branch="$(release_branch_for_tag "${upstream_tag}")"
+  work_branch="$(work_branch_for_tag "${upstream_tag}")"
+  termux_tag="$(termux_tag_for_tag "${upstream_tag}")"
+
+  if gh release view "${termux_tag}" --repo "${GITHUB_REPOSITORY}" >/dev/null 2>&1; then
+    echo "${termux_tag} already exists; nothing to do."
+    return 1
+  fi
+
+  open_pr_json="$(open_release_train_pr_for_branch "${release_branch}")"
+  if [[ -n "${open_pr_json}" ]]; then
+    open_pr_tag="$(jq -r '.upstreamTag // empty' <<< "${open_pr_json}")"
+    work_branch="$(jq -r '.headRefName' <<< "${open_pr_json}")"
+    if [[ "${open_pr_tag}" == "${upstream_tag}" && "${selection_mode}" == "requested" ]]; then
+      emit_selected_release "${release_json}" "${release_branch}" "${work_branch}" "${termux_tag}"
+      return 0
+    fi
+    if [[ "${open_pr_tag}" == "${upstream_tag}" ]]; then
+      echo "${upstream_tag} already has open release PR $(jq -r '.url' <<< "${open_pr_json}"); nothing to do."
+      return 1
+    fi
+    if [[ "${selection_mode}" != "requested" ]] && ! version_is_newer "${upstream_tag}" "${open_pr_tag}"; then
+      echo "${upstream_tag} is not newer than open PR tag ${open_pr_tag}; nothing to do."
+      return 1
+    fi
+  fi
+
+  if [[ "${selection_mode}" != "requested" ]]; then
+    current_tag="$(release_branch_current_tag "${release_branch}")"
+    if ! version_is_newer "${upstream_tag}" "${current_tag}"; then
+      echo "${upstream_tag} is not newer than ${current_tag} already recorded on ${release_branch}; nothing to do."
+      return 1
+    fi
+
+    mirrored_tag="$(latest_mirrored_termux_tag)"
+    if ! version_is_newer "${upstream_tag}" "${mirrored_tag}"; then
+      echo "${upstream_tag} is not newer than ${mirrored_tag} already mirrored; nothing to do."
+      return 1
+    fi
+
+    mirrored_tag="$(latest_mirrored_termux_tag_for_train "${release_train}")"
+    if ! version_is_newer "${upstream_tag}" "${mirrored_tag}"; then
+      echo "${upstream_tag} is not newer than ${mirrored_tag} already mirrored for ${release_train}; nothing to do."
+      return 1
+    fi
+
+    if [[ "${BYPASS_PRIOR_RELEASE_TRAIN}" != "true" ]]; then
+      pending_other_prs="$(open_other_release_train_prs "${release_branch}")"
+      if [[ -n "${pending_other_prs}" ]]; then
+        echo "${upstream_tag} is newer, but another release train PR is open."
+        printf '%s\n' "${pending_other_prs}"
+        return 1
+      fi
+    fi
+  fi
+
+  emit_selected_release "${release_json}" "${release_branch}" "${work_branch}" "${termux_tag}"
+}
+
+if [[ -n "${REQUESTED_TAG}" ]]; then
+  requested_tag="$(requested_upstream_tag "${REQUESTED_TAG}")"
+  if ! release_json="$(release_json_for_tag "${requested_tag}")"; then
+    echo "Requested upstream release ${requested_tag} does not exist remotely."
+  elif maybe_select_release "${release_json}" "requested"; then
+    exit 0
+  else
+    echo "Requested upstream release ${requested_tag} does not need a Termux mirror."
+  fi
+else
+  if release_json="$(latest_release_json)" && [[ -n "${release_json}" ]] && maybe_select_release "${release_json}"; then
+    exit 0
+  fi
+fi
+
+echo "No upstream release needs a Termux mirror."
+echo "selected=false" >> "${GITHUB_OUTPUT}"
+append_selection_summary "false"
diff --git a/.github/scripts/termux-validate-gh-env.sh b/.github/scripts/termux-validate-gh-env.sh
new file mode 100755
index 000000000000..c57a9774d11d
--- /dev/null
+++ b/.github/scripts/termux-validate-gh-env.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+command -v gh
+command -v jq
+
+printf 'GITHUB_REPOSITORY=%s\n' "${GITHUB_REPOSITORY}"
+printf 'GITHUB_REF_NAME=%s\n' "${GITHUB_REF_NAME:-}"
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 037020c03af1..cdd65000c479 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,5 +1,5 @@
 name: publish
-run-name: "${{ format('release {0}', inputs.bump) }}"
+run-name: "${{ inputs.target == 'android-arm64' && 'build android artifact' || inputs.target == 'android-smoke' && 'build android smoke artifact' || format('release {0}', inputs.bump) }}"
 
 on:
   push:
@@ -23,18 +23,39 @@ on:
         description: "Override version (optional)"
         required: false
         type: string
+      target:
+        description: "Manual build target"
+        required: false
+        default: all
+        type: choice
+        options:
+          - all
+          - android-arm64
+          - android-smoke
 
-concurrency: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.version || inputs.bump }}
+concurrency: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.target || 'all' }}-${{ inputs.version || inputs.bump }}
 
 permissions:
+  actions: read
+  artifact-metadata: read
+  attestations: read
+  checks: read
   id-token: write
   contents: write
+  deployments: read
+  discussions: read
+  issues: read
+  models: read
   packages: write
+  pages: read
+  pull-requests: read
+  security-events: read
+  statuses: read
 
 jobs:
   version:
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'anomalyco/opencode' && !contains(fromJSON('["android-arm64","android-smoke"]'), inputs.target)
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
@@ -71,7 +92,7 @@ jobs:
   build-cli:
     needs: version
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'anomalyco/opencode' && !contains(fromJSON('["android-arm64","android-smoke"]'), inputs.target)
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
@@ -79,6 +100,11 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
 
+      - name: Setup Zig
+        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        with:
+          version: 0.15.2
+
       - name: Setup git committer
         id: committer
         uses: ./.github/actions/setup-git-committer
@@ -101,6 +127,7 @@ jobs:
         with:
           name: opencode-cli
           path: |
+            packages/opencode/dist/opencode-android*
             packages/opencode/dist/opencode-darwin*
             packages/opencode/dist/opencode-linux*
 
@@ -117,6 +144,87 @@ jobs:
     outputs:
       version: ${{ needs.version.outputs.version }}
 
+  build-android:
+    runs-on: ubuntu-24.04
+    if: github.event_name == 'workflow_dispatch' && inputs.target == 'android-arm64'
+    timeout-minutes: 120
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        with:
+          fetch-tags: true
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Build Android CLI
+        uses: ./.github/actions/build-android-cli
+        with:
+          version: ${{ inputs.version || format('0.0.0-android.{0}', github.run_number) }}
+          release: ""
+          repo: ${{ github.repository }}
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: opencode-android-arm64
+          path: |
+            packages/opencode/dist/opencode-android-arm64
+            packages/opencode/dist/opencode-android-arm64.tar.gz
+            packages/opencode/dist/android-smoke
+
+  termux-android-smoke:
+    name: Smoke Android artifact in Termux
+    needs: build-android
+    if: github.event_name == 'workflow_dispatch' && inputs.target == 'android-arm64'
+    permissions:
+      actions: read
+      contents: read
+    uses: ./.github/workflows/termux-android-artifact-smoke.yml
+    with:
+      artifact_name: opencode-android-arm64
+      artifact_run_id: ${{ github.run_id }}
+
+  build-android-smoke:
+    runs-on: ubuntu-24.04
+    if: github.event_name == 'workflow_dispatch' && inputs.target == 'android-smoke'
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - uses: ./.github/actions/setup-bun
+
+      - name: Build Android compile smoke
+        run: |
+          mkdir -p "$RUNNER_TEMP/opencode-android-smoke"
+          cat > "$RUNNER_TEMP/opencode-android-smoke/smoke.ts" <<'EOF'
+          console.log("bun android compile smoke")
+          console.log(process.platform)
+          console.log(process.arch)
+          EOF
+          bun build "$RUNNER_TEMP/opencode-android-smoke/smoke.ts" \
+            --compile \
+            --target=bun-android-arm64 \
+            --outfile="$RUNNER_TEMP/opencode-android-smoke/smoke"
+          bun packages/opencode/script/patch-android-elf.ts "$RUNNER_TEMP/opencode-android-smoke/smoke"
+          file "$RUNNER_TEMP/opencode-android-smoke/smoke" | tee "$RUNNER_TEMP/opencode-android-smoke/file.txt"
+          readelf -l "$RUNNER_TEMP/opencode-android-smoke/smoke" > "$RUNNER_TEMP/opencode-android-smoke/readelf-program-headers.txt"
+          readelf -S "$RUNNER_TEMP/opencode-android-smoke/smoke" > "$RUNNER_TEMP/opencode-android-smoke/readelf-sections.txt"
+          readelf -d "$RUNNER_TEMP/opencode-android-smoke/smoke" > "$RUNNER_TEMP/opencode-android-smoke/readelf-dynamic.txt"
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: bun-android-compile-smoke
+          path: ${{ runner.temp }}/opencode-android-smoke
+
   sign-cli-windows:
     needs:
       - build-cli
@@ -411,14 +519,15 @@ jobs:
       - build-cli
       - sign-cli-windows
       - build-electron
-    if: always() && !failure() && !cancelled()
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    if: github.repository == 'anomalyco/opencode' && (always() && !failure() && !cancelled())
+    runs-on: ${{ github.repository == 'anomalyco/opencode' && 'blacksmith-4vcpu-ubuntu-2404' || 'ubuntu-latest' }}
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
       - uses: ./.github/actions/setup-bun
 
       - name: Login to GitHub Container Registry
+        if: github.repository == 'anomalyco/opencode'
         uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           registry: ghcr.io
@@ -470,6 +579,7 @@ jobs:
           merge-multiple: true
 
       - name: Setup git committer
+        if: github.repository == 'anomalyco/opencode'
         id: committer
         uses: ./.github/actions/setup-git-committer
         with:
@@ -485,6 +595,7 @@ jobs:
             ${{ runner.os }}-apt-aur-
 
       - name: Setup SSH for AUR
+        if: github.repository == 'anomalyco/opencode'
         run: |
           sudo apt-get update
           sudo apt-get install -y pacman-package-manager
@@ -496,7 +607,7 @@ jobs:
           ssh-keyscan -H aur.archlinux.org >> ~/.ssh/known_hosts || true
 
       - name: Upload desktop release assets
-        if: needs.version.outputs.release
+        if: github.repository == 'anomalyco/opencode' && (needs.version.outputs.release)
         env:
           GH_TOKEN: ${{ steps.committer.outputs.token }}
         run: |
@@ -509,6 +620,7 @@ jobs:
           gh release upload "v${{ needs.version.outputs.version }}" "${files[@]}" --clobber --repo "${{ needs.version.outputs.repo }}"
 
       - run: ./script/publish.ts
+        if: github.repository == 'anomalyco/opencode'
         env:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
diff --git a/.github/workflows/termux-release-branch-cleanup.yml b/.github/workflows/termux-release-branch-cleanup.yml
new file mode 100644
index 000000000000..902ecca36d2f
--- /dev/null
+++ b/.github/workflows/termux-release-branch-cleanup.yml
@@ -0,0 +1,89 @@
+name: termux-release-branch-cleanup
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_branch:
+        description: "Release branch to clean up, for example release-1.17.13"
+        required: false
+        type: string
+        default: ""
+      checkpoint_pr:
+        description: "Checkpoint PR number or URL to verify before cleanup"
+        required: false
+        type: string
+        default: ""
+      cleanup_limit:
+        description: "Number of recent merged checkpoint PRs to scan"
+        required: false
+        type: string
+        default: "100"
+  schedule:
+    - cron: "37 8 * * *"
+
+permissions:
+  actions: read
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: read
+  discussions: read
+  id-token: none
+  issues: read
+  models: read
+  packages: read
+  pages: read
+  pull-requests: read
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-branch-cleanup-${{ inputs.release_branch || inputs.checkpoint_pr || github.event_name }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  cleanup:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout automation branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          ref: dev
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Delete release branches after merged checkpoints
+        env:
+          CHECKPOINT_PR: ${{ inputs.checkpoint_pr }}
+          SOURCE_BRANCH: ${{ inputs.release_branch }}
+          CLEANUP_LIMIT: ${{ inputs.cleanup_limit || '100' }}
+        run: bash .github/scripts/termux-cleanup-release-branch.sh
diff --git a/.github/workflows/termux-release-checkpoint.yml b/.github/workflows/termux-release-checkpoint.yml
new file mode 100644
index 000000000000..a69a1a596979
--- /dev/null
+++ b/.github/workflows/termux-release-checkpoint.yml
@@ -0,0 +1,106 @@
+name: termux-release-checkpoint
+
+on:
+  workflow_dispatch:
+    inputs:
+      source_branch:
+        description: "Release branch to checkpoint from"
+        required: true
+        type: string
+      source_sha:
+        description: "Release branch SHA; defaults to source branch head"
+        required: false
+        type: string
+        default: ""
+      destination_branch:
+        description: "Reusable Termux patch branch"
+        required: false
+        type: string
+        default: "termux-target"
+      reviewer:
+        description: "GitHub username to request as reviewer"
+        required: false
+        type: string
+        default: "wallentx"
+
+permissions:
+  actions: read
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: read
+  discussions: read
+  id-token: none
+  issues: write
+  models: read
+  packages: read
+  pages: read
+  pull-requests: write
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-checkpoint-${{ inputs.source_branch }}-${{ inputs.destination_branch }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  checkpoint:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout destination branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.destination_branch }}
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Configure git
+        run: bash .github/scripts/termux-configure-git.sh --origin "${SOURCE_BRANCH}" "${DESTINATION_BRANCH}"
+        env:
+          SOURCE_BRANCH: ${{ inputs.source_branch }}
+          DESTINATION_BRANCH: ${{ inputs.destination_branch || 'termux-target' }}
+
+      - name: Create checkpoint PR
+        id: checkpoint-pr
+        env:
+          REQUESTED_SOURCE_BRANCH: ${{ inputs.source_branch }}
+          REQUESTED_SOURCE_SHA: ${{ inputs.source_sha }}
+          DESTINATION_BRANCH: ${{ inputs.destination_branch || 'termux-target' }}
+          REVIEWER: ${{ inputs.reviewer || 'wallentx' }}
+        run: bash .github/scripts/termux-create-checkpoint-pr.sh
+
+      - name: Delete release branch after merged checkpoint
+        if: steps.checkpoint-pr.outputs.pr_url != ''
+        env:
+          CHECKPOINT_PR: ${{ steps.checkpoint-pr.outputs.pr_url }}
+          SOURCE_BRANCH: ${{ inputs.source_branch }}
+        run: bash .github/scripts/termux-cleanup-release-branch.sh
diff --git a/.github/workflows/termux-release-deploy.yml b/.github/workflows/termux-release-deploy.yml
new file mode 100644
index 000000000000..2fa9aff48305
--- /dev/null
+++ b/.github/workflows/termux-release-deploy.yml
@@ -0,0 +1,223 @@
+name: termux-release-deploy
+
+on:
+  push:
+    branches:
+      - "release-*"
+  workflow_dispatch:
+    inputs:
+      release_branch:
+        description: "Release branch to deploy, for example release-1.17.13"
+        required: true
+        type: string
+      release_sha:
+        description: "Release branch SHA to deploy; defaults to current branch head"
+        required: false
+        type: string
+        default: ""
+      pr_number:
+        description: "Merged release PR number, optional with pr_head_sha"
+        required: false
+        type: string
+        default: ""
+      pr_head_sha:
+        description: "Merged release PR head SHA, optional with pr_number"
+        required: false
+        type: string
+        default: ""
+      destination_branch:
+        description: "Reusable Termux patch branch to checkpoint into"
+        required: false
+        type: string
+        default: "termux-target"
+      reviewer:
+        description: "GitHub username to request on checkpoint PR"
+        required: false
+        type: string
+        default: "wallentx"
+
+permissions:
+  actions: write
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: write
+  discussions: read
+  id-token: none
+  issues: write
+  models: read
+  packages: read
+  pages: read
+  pull-requests: write
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-deploy-${{ inputs.release_branch || github.ref_name }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  deploy:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 180
+    env:
+      TERMUX_AUTOMATION_DIR: ${{ github.workspace }}/.termux-release-automation
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout release branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.release_branch || github.ref_name }}
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Checkout automation helpers
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          ref: ${{ github.workflow_sha }}
+          path: .termux-release-automation
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-validate-gh-env.sh"
+
+      - name: Configure git
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-configure-git.sh"
+
+      - name: Resolve release ref
+        id: release-ref
+        env:
+          INPUT_RELEASE_BRANCH: ${{ inputs.release_branch }}
+          INPUT_RELEASE_SHA: ${{ inputs.release_sha }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-resolve-release-ref.sh"
+
+      - name: Read release metadata
+        id: metadata
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-read-release-metadata.sh"
+
+      - name: Find merged release PR
+        id: pr
+        if: steps.metadata.outputs.deploy == 'true'
+        env:
+          RELEASE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+          RELEASE_SHA: ${{ steps.release-ref.outputs.sha }}
+          INPUT_PR_NUMBER: ${{ inputs.pr_number }}
+          INPUT_PR_HEAD_SHA: ${{ inputs.pr_head_sha }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-find-release-pr.sh"
+
+      - name: Create Android build deployment
+        id: android-deployment
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists != 'true'
+        env:
+          RELEASE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+          RELEASE_SHA: ${{ steps.release-ref.outputs.sha }}
+          TERMUX_TAG: ${{ steps.metadata.outputs.termux_tag }}
+          GH_TOKEN: ${{ github.token }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-create-android-build-deployment.sh"
+
+      - name: Build Android artifact
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists != 'true'
+        uses: ./.github/actions/build-android-cli
+        with:
+          version: ${{ steps.metadata.outputs.build_version }}
+          release: ""
+          repo: ${{ github.repository }}
+
+      - name: Promote built Android artifact
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists != 'true'
+        run: |
+          set -euo pipefail
+          mkdir -p promoted
+          cp packages/opencode/dist/opencode-android-arm64.tar.gz promoted/
+          sha256sum promoted/opencode-android-arm64.tar.gz
+
+      - name: Finish Android build deployment
+        if: always() && steps.android-deployment.outputs.deployment_id != ''
+        env:
+          DEPLOYMENT_ID: ${{ steps.android-deployment.outputs.deployment_id }}
+          BUILD_RESULT: ${{ job.status }}
+          GH_TOKEN: ${{ github.token }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-finish-android-build-deployment.sh"
+
+      - name: Download existing Android artifact if release needs repair
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists == 'true'
+        run: |
+          set -euo pipefail
+          mkdir -p promoted
+          gh release download "${TERMUX_TAG}" \
+            --repo "${GITHUB_REPOSITORY}" \
+            --pattern opencode-android-arm64.tar.gz \
+            --dir promoted \
+            --clobber
+        env:
+          TERMUX_TAG: ${{ steps.metadata.outputs.termux_tag }}
+
+      - name: Create or repair mirrored release
+        if: steps.metadata.outputs.deploy == 'true'
+        env:
+          UPSTREAM_TAG: ${{ steps.metadata.outputs.upstream_tag }}
+          UPSTREAM_REPO: ${{ steps.metadata.outputs.upstream_repo }}
+          UPSTREAM_NAME: ${{ steps.metadata.outputs.upstream_name }}
+          TERMUX_TAG: ${{ steps.metadata.outputs.termux_tag }}
+          UPSTREAM_PRERELEASE: ${{ steps.metadata.outputs.upstream_prerelease }}
+          UPSTREAM_HTML_URL: ${{ steps.metadata.outputs.upstream_html_url }}
+          RELEASE_TRAIN: ${{ steps.metadata.outputs.release_train }}
+          RELEASE_EXISTS: ${{ steps.metadata.outputs.release_exists }}
+          PR_NUMBER: ${{ steps.pr.outputs.number }}
+          HEAD_SHA: ${{ steps.pr.outputs.head_sha }}
+          RELEASE_SHA: ${{ steps.release-ref.outputs.sha }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-create-or-update-mirrored-release.sh"
+
+      - name: Open checkpoint PR
+        id: checkpoint-pr
+        if: steps.metadata.outputs.deploy == 'true'
+        env:
+          SOURCE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+          SOURCE_SHA: ${{ steps.release-ref.outputs.sha }}
+          DESTINATION_BRANCH: ${{ inputs.destination_branch || 'termux-target' }}
+          REVIEWER: ${{ inputs.reviewer || 'wallentx' }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-create-checkpoint-pr.sh"
+
+      - name: Delete release branch after merged checkpoint
+        if: steps.metadata.outputs.deploy == 'true' && steps.checkpoint-pr.outputs.pr_url != ''
+        env:
+          CHECKPOINT_PR: ${{ steps.checkpoint-pr.outputs.pr_url }}
+          SOURCE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-cleanup-release-branch.sh"
+
+      - name: Restore local action metadata
+        if: always()
+        run: |
+          set -euo pipefail
+          if [[ ! -d "${TERMUX_AUTOMATION_DIR}/.github/actions" ]]; then
+            echo "Automation helpers were not checked out; skipping local action metadata restore."
+            exit 0
+          fi
+          mkdir -p .github/actions
+          cp -a "${TERMUX_AUTOMATION_DIR}/.github/actions/build-android-cli" .github/actions/
+          cp -a "${TERMUX_AUTOMATION_DIR}/.github/actions/setup-bun" .github/actions/
diff --git a/.github/workflows/termux-release-watch.yml b/.github/workflows/termux-release-watch.yml
new file mode 100644
index 000000000000..d61b7362e7cc
--- /dev/null
+++ b/.github/workflows/termux-release-watch.yml
@@ -0,0 +1,174 @@
+name: termux-release-watch
+
+on:
+  schedule:
+    - cron: "17 */3 * * *"
+  workflow_dispatch:
+    inputs:
+      upstream_tag:
+        description: "Specific upstream version or tag to process, for example 1.17.13 or v1.17.13"
+        required: false
+        type: string
+        default: ""
+      patch_branch:
+        description: "Branch carrying reusable Termux fixes"
+        required: false
+        type: string
+        default: "termux-target"
+      reviewer:
+        description: "GitHub username to request as reviewer"
+        required: false
+        type: string
+        default: "wallentx"
+      bypass_prior_release_train:
+        description: "Allow workflow_dispatch to update a train while another Termux release PR is open"
+        required: false
+        type: boolean
+        default: false
+
+permissions:
+  actions: write
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: read
+  discussions: read
+  id-token: none
+  issues: write
+  models: read
+  packages: read
+  pages: read
+  pull-requests: write
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-watch
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  look-for-newer-release:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    outputs:
+      selected: ${{ steps.upstream.outputs.selected }}
+      upstream_tag: ${{ steps.upstream.outputs.upstream_tag }}
+      upstream_name: ${{ steps.upstream.outputs.upstream_name }}
+      upstream_html_url: ${{ steps.upstream.outputs.upstream_html_url }}
+      upstream_prerelease: ${{ steps.upstream.outputs.upstream_prerelease }}
+      upstream_target: ${{ steps.upstream.outputs.upstream_target }}
+      upstream_id: ${{ steps.upstream.outputs.upstream_id }}
+      release_train: ${{ steps.upstream.outputs.release_train }}
+      release_branch: ${{ steps.upstream.outputs.release_branch }}
+      work_branch: ${{ steps.upstream.outputs.work_branch }}
+      termux_tag: ${{ steps.upstream.outputs.termux_tag }}
+      body: ${{ steps.upstream.outputs.body }}
+    env:
+      UPSTREAM_REPO: anomalyco/opencode
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout automation branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Select upstream release
+        id: upstream
+        env:
+          REQUESTED_TAG: ${{ inputs.upstream_tag }}
+          BYPASS_PRIOR_RELEASE_TRAIN: ${{ inputs.bypass_prior_release_train || false }}
+        run: bash .github/scripts/termux-select-release.sh
+
+  create-release-pr:
+    needs: look-for-newer-release
+    if: github.repository == 'wallentx/opencode-termux' && needs.look-for-newer-release.outputs.selected == 'true'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 45
+    env:
+      REVIEWER: ${{ inputs.reviewer || 'wallentx' }}
+      UPSTREAM_REPO: anomalyco/opencode
+      PATCH_BRANCH: ${{ inputs.patch_branch || 'termux-target' }}
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout automation branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Configure git
+        env:
+          UPSTREAM_TAG: ${{ needs.look-for-newer-release.outputs.upstream_tag }}
+        run: |
+          set -euo pipefail
+          bash .github/scripts/termux-configure-git.sh \
+            --origin "${PATCH_BRANCH}" \
+            --upstream-tag "${UPSTREAM_REPO}" "${UPSTREAM_TAG}"
+
+      - name: Create or update release train PR
+        id: pr
+        env:
+          UPSTREAM_TAG: ${{ needs.look-for-newer-release.outputs.upstream_tag }}
+          UPSTREAM_NAME: ${{ needs.look-for-newer-release.outputs.upstream_name }}
+          UPSTREAM_HTML_URL: ${{ needs.look-for-newer-release.outputs.upstream_html_url }}
+          UPSTREAM_PRERELEASE: ${{ needs.look-for-newer-release.outputs.upstream_prerelease }}
+          UPSTREAM_TARGET: ${{ needs.look-for-newer-release.outputs.upstream_target }}
+          UPSTREAM_ID: ${{ needs.look-for-newer-release.outputs.upstream_id }}
+          RELEASE_TRAIN: ${{ needs.look-for-newer-release.outputs.release_train }}
+          RELEASE_BRANCH: ${{ needs.look-for-newer-release.outputs.release_branch }}
+          WORK_BRANCH: ${{ needs.look-for-newer-release.outputs.work_branch }}
+          TERMUX_TAG: ${{ needs.look-for-newer-release.outputs.termux_tag }}
+          UPSTREAM_BODY: ${{ needs.look-for-newer-release.outputs.body }}
+        run: bash .github/scripts/termux-create-release-pr.sh

From 40b500ea74f52857bae1c16512f7008ed5a24f73 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2026 16:21:36 +0000
Subject: [PATCH 33/33] chore(termux): prepare v1.17.16

---
 .github/actions/build-android-cli/action.yml  | 167 +++++++++
 .../scripts/termux-cleanup-release-branch.sh  | 175 +++++++++
 .github/scripts/termux-configure-git.sh       |  37 ++
 .../termux-create-android-build-deployment.sh |  55 +++
 .../scripts/termux-create-checkpoint-pr.sh    | 146 ++++++++
 ...ermux-create-or-update-mirrored-release.sh |  67 ++++
 .github/scripts/termux-create-release-pr.sh   | 284 +++++++++++++++
 .github/scripts/termux-find-release-pr.sh     |  41 +++
 .../termux-finish-android-build-deployment.sh |  31 ++
 .../scripts/termux-read-release-metadata.sh   |  54 +++
 .github/scripts/termux-release-paths.sh       |  53 +++
 .github/scripts/termux-resolve-release-ref.sh |  35 ++
 .github/scripts/termux-select-release.sh      | 335 ++++++++++++++++++
 .github/scripts/termux-validate-gh-env.sh     |  12 +
 .github/termux-release.json                   |  15 +
 .github/workflows/publish.yml                 | 116 +++++-
 .../termux-release-branch-cleanup.yml         |  89 +++++
 .../workflows/termux-release-checkpoint.yml   | 106 ++++++
 .github/workflows/termux-release-deploy.yml   | 223 ++++++++++++
 .github/workflows/termux-release-watch.yml    | 174 +++++++++
 bun.lock                                      |  56 +--
 packages/app/package.json                     |   2 +-
 packages/cli/package.json                     |   2 +-
 packages/codemode/package.json                |   2 +-
 packages/console/app/package.json             |   2 +-
 packages/console/core/package.json            |   2 +-
 packages/console/function/package.json        |   2 +-
 packages/console/mail/package.json            |   2 +-
 packages/console/support/package.json         |   2 +-
 packages/core/package.json                    |   2 +-
 packages/desktop/package.json                 |   2 +-
 packages/effect-drizzle-sqlite/package.json   |   2 +-
 packages/effect-sqlite-node/package.json      |   2 +-
 packages/enterprise/package.json              |   2 +-
 packages/function/package.json                |   2 +-
 packages/http-recorder/package.json           |   2 +-
 packages/llm/package.json                     |   2 +-
 packages/opencode/package.json                |   2 +-
 packages/plugin/package.json                  |   2 +-
 packages/sdk/js/package.json                  |   2 +-
 packages/server/package.json                  |   2 +-
 packages/session-ui/package.json              |   2 +-
 packages/slack/package.json                   |   2 +-
 packages/stats/app/package.json               |   2 +-
 packages/stats/core/package.json              |   2 +-
 packages/stats/server/package.json            |   2 +-
 packages/tui/package.json                     |   2 +-
 packages/ui/package.json                      |   2 +-
 packages/web/package.json                     |   2 +-
 49 files changed, 2267 insertions(+), 60 deletions(-)
 create mode 100644 .github/actions/build-android-cli/action.yml
 create mode 100755 .github/scripts/termux-cleanup-release-branch.sh
 create mode 100755 .github/scripts/termux-configure-git.sh
 create mode 100755 .github/scripts/termux-create-android-build-deployment.sh
 create mode 100755 .github/scripts/termux-create-checkpoint-pr.sh
 create mode 100755 .github/scripts/termux-create-or-update-mirrored-release.sh
 create mode 100755 .github/scripts/termux-create-release-pr.sh
 create mode 100755 .github/scripts/termux-find-release-pr.sh
 create mode 100755 .github/scripts/termux-finish-android-build-deployment.sh
 create mode 100755 .github/scripts/termux-read-release-metadata.sh
 create mode 100755 .github/scripts/termux-release-paths.sh
 create mode 100755 .github/scripts/termux-resolve-release-ref.sh
 create mode 100755 .github/scripts/termux-select-release.sh
 create mode 100755 .github/scripts/termux-validate-gh-env.sh
 create mode 100644 .github/termux-release.json
 create mode 100644 .github/workflows/termux-release-branch-cleanup.yml
 create mode 100644 .github/workflows/termux-release-checkpoint.yml
 create mode 100644 .github/workflows/termux-release-deploy.yml
 create mode 100644 .github/workflows/termux-release-watch.yml

diff --git a/.github/actions/build-android-cli/action.yml b/.github/actions/build-android-cli/action.yml
new file mode 100644
index 000000000000..161a5e89a53a
--- /dev/null
+++ b/.github/actions/build-android-cli/action.yml
@@ -0,0 +1,167 @@
+name: "Build Android CLI"
+description: "Build and smoke-check the Android arm64 opencode artifact"
+inputs:
+  version:
+    description: "Version to embed in the Android CLI"
+    required: true
+  release:
+    description: "Release flag passed to the opencode build"
+    required: false
+    default: ""
+  repo:
+    description: "Repository name passed to the opencode build"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/setup-bun
+
+    - name: Setup Zig
+      shell: bash
+      run: |
+        set -euo pipefail
+        zig_version=0.15.2
+        case "${RUNNER_OS}-${RUNNER_ARCH}" in
+          Linux-X64) zig_target="x86_64-linux" ;;
+          Linux-ARM64) zig_target="aarch64-linux" ;;
+          *) echo "Unsupported Zig host: ${RUNNER_OS}-${RUNNER_ARCH}" >&2; exit 1 ;;
+        esac
+
+        zig_dir="${RUNNER_TOOL_CACHE:-${RUNNER_TEMP}}/zig/${zig_version}/${zig_target}"
+        if [[ ! -x "${zig_dir}/zig" ]]; then
+          archive="${RUNNER_TEMP}/zig-${zig_target}-${zig_version}.tar.xz"
+          mkdir -p "${zig_dir}"
+          curl -fsSL "https://ziglang.org/download/${zig_version}/zig-${zig_target}-${zig_version}.tar.xz" -o "${archive}"
+          tar -xJf "${archive}" -C "${zig_dir}" --strip-components=1
+        fi
+
+        echo "${zig_dir}" >> "${GITHUB_PATH}"
+        "${zig_dir}/zig" version
+
+    - name: Install Bun build toolchain
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y --no-install-recommends curl wget gnupg software-properties-common ninja-build cmake file binutils
+        for attempt in 1 2 3
+        do
+          if curl -fsSL --retry 5 --retry-delay 5 --retry-all-errors --connect-timeout 20 --max-time 120 https://apt.llvm.org/llvm.sh -o "$RUNNER_TEMP/llvm.sh"; then
+            break
+          fi
+          if [[ "$attempt" -eq 3 ]]; then
+            exit 1
+          fi
+          echo "LLVM installer download failed on attempt $attempt; retrying..." >&2
+          sleep $((attempt * 30))
+        done
+        chmod +x "$RUNNER_TEMP/llvm.sh"
+        for attempt in 1 2 3
+        do
+          if sudo "$RUNNER_TEMP/llvm.sh" 21; then
+            break
+          fi
+          if [[ "$attempt" -eq 3 ]]; then
+            exit 1
+          fi
+          echo "LLVM apt setup failed on attempt $attempt; retrying..." >&2
+          sudo rm -f /etc/apt/sources.list.d/*llvm* /etc/apt/sources.list.d/archive_uri-https_apt_llvm_org_noble_-noble.list
+          sleep $((attempt * 30))
+        done
+        for attempt in 1 2 3
+        do
+          if sudo apt-get update -o Acquire::Retries=5 && sudo apt-get install -y --no-install-recommends clang-21 lld-21; then
+            break
+          fi
+          if [[ "$attempt" -eq 3 ]]; then
+            exit 1
+          fi
+          echo "LLVM package install failed on attempt $attempt; retrying..." >&2
+          sleep $((attempt * 30))
+        done
+        LLVM_RESOURCE_DIR="$(clang-21 -print-resource-dir)"
+        NDK_PREBUILT="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64"
+        NDK_CLANG_VERSION="$(ls "$NDK_PREBUILT/lib/clang" | sort -V | tail -n 1)"
+        NDK_RUNTIME_DIR="$NDK_PREBUILT/lib/clang/$NDK_CLANG_VERSION/lib/linux"
+        sudo mkdir -p "$LLVM_RESOURCE_DIR/lib/aarch64-unknown-linux-android28" "$LLVM_RESOURCE_DIR/lib/linux/aarch64"
+        sudo ln -sf "$NDK_RUNTIME_DIR/libclang_rt.builtins-aarch64-android.a" "$LLVM_RESOURCE_DIR/lib/aarch64-unknown-linux-android28/libclang_rt.builtins.a"
+        sudo ln -sf "$NDK_RUNTIME_DIR/aarch64/libunwind.a" "$LLVM_RESOURCE_DIR/lib/aarch64-unknown-linux-android28/libunwind.a"
+        sudo ln -sf "$NDK_RUNTIME_DIR/libclang_rt.builtins-aarch64-android.a" "$LLVM_RESOURCE_DIR/lib/linux/libclang_rt.builtins-aarch64-android.a"
+        sudo ln -sf "$NDK_RUNTIME_DIR/aarch64/libunwind.a" "$LLVM_RESOURCE_DIR/lib/linux/aarch64/libunwind.a"
+
+    - name: Build Android Bun runtime with FFI
+      shell: bash
+      run: |
+        export CC=clang-21
+        export CXX=clang++-21
+        export LD=ld.lld-21
+        NDK_PREBUILT="$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64"
+        mkdir -p "$RUNNER_TEMP/android-toolchain-bin"
+        ln -sf "$NDK_PREBUILT/bin/llvm-strip" "$RUNNER_TEMP/android-toolchain-bin/strip"
+        export PATH="$RUNNER_TEMP/android-toolchain-bin:$PATH"
+        BUN_VERSION="$(node -p "require('./package.json').packageManager.split('@')[1]")"
+        BUN_SOURCE="$RUNNER_TEMP/bun-src"
+        git clone --depth=1 --branch "bun-v${BUN_VERSION}" https://github.com/oven-sh/bun.git "$BUN_SOURCE"
+        BUN_BUILD="$BUN_SOURCE/build/android-ffi"
+        cd "$BUN_SOURCE"
+        bun install --frozen-lockfile
+        bun scripts/build.ts --profile=android-release --tinycc=on --build-dir="$BUN_BUILD" --target=bun -j"$(nproc)"
+        test -x "$BUN_BUILD/bun"
+        file "$BUN_BUILD/bun"
+        echo "OPENCODE_ANDROID_BUN=$BUN_BUILD/bun" >> "$GITHUB_ENV"
+
+    - name: Build Android CLI
+      shell: bash
+      run: ./packages/opencode/script/build.ts --target=android-arm64
+      env:
+        OPENCODE_VERSION: ${{ inputs.version }}
+        OPENCODE_RELEASE: ${{ inputs.release }}
+        GH_REPO: ${{ inputs.repo }}
+
+    - name: Smoke Android CLI artifact
+      shell: bash
+      run: |
+        set -euo pipefail
+        artifact_dir="packages/opencode/dist/opencode-android-arm64"
+        binary="${artifact_dir}/bin/opencode"
+        opentui_lib="packages/opencode/node_modules/@opentui/core/android-arm64/libopentui.so"
+        smoke_dir="packages/opencode/dist/android-smoke"
+        mkdir -p "$smoke_dir"
+
+        test -x "$binary"
+        file "$binary" | tee "$smoke_dir/file.txt"
+        readelf -h "$binary" | tee "$smoke_dir/readelf-header.txt"
+        readelf -l "$binary" | tee "$smoke_dir/readelf-program-headers.txt"
+        readelf -S "$binary" > "$smoke_dir/readelf-sections.txt"
+        readelf -d "$binary" | tee "$smoke_dir/readelf-dynamic.txt"
+
+        grep -q "Machine:.*AArch64" "$smoke_dir/readelf-header.txt"
+        grep -q "Type:.*DYN" "$smoke_dir/readelf-header.txt"
+        if grep -E "Requesting program interpreter: .*(ld-linux|ld-musl)" "$smoke_dir/readelf-program-headers.txt"; then
+          echo "Android artifact unexpectedly references a Linux ELF interpreter." >&2
+          exit 1
+        fi
+        if grep -E "Shared library: \\[(libc\\.so\\.6|ld-linux|ld-musl)" "$smoke_dir/readelf-dynamic.txt"; then
+          echo "Android artifact unexpectedly links Linux libc/runtime libraries." >&2
+          exit 1
+        fi
+
+        test -f "$opentui_lib"
+        file "$opentui_lib" | tee "$smoke_dir/opentui-file.txt"
+        readelf -d "$opentui_lib" | tee "$smoke_dir/opentui-readelf-dynamic.txt"
+        readelf -Ws "$opentui_lib" > "$smoke_dir/opentui-readelf-symbols.txt"
+        readelf -r "$opentui_lib" > "$smoke_dir/opentui-readelf-relocs.txt"
+
+        if grep -E "Shared library: \\[(libc\\.so\\.6|ld-linux|ld-musl|libstdc\\+\\+|libgcc_s)" "$smoke_dir/opentui-readelf-dynamic.txt"; then
+          echo "OpenTUI Android library unexpectedly links non-Android runtime libraries." >&2
+          exit 1
+        fi
+        if grep -E "Shared library: \\[(libc\\+\\+|libc\\+\\+_shared|libunwind)\\.so" "$smoke_dir/opentui-readelf-dynamic.txt"; then
+          echo "OpenTUI Android library requires an unbundled C++/unwind runtime." >&2
+          exit 1
+        fi
+        grep -E " (YGNode|facebook4yoga|yogaNode)" "$smoke_dir/opentui-readelf-symbols.txt" | head -80 || true
+
+    - name: Pack Android artifact
+      shell: bash
+      working-directory: packages/opencode/dist/opencode-android-arm64/bin
+      run: tar -czf ../../opencode-android-arm64.tar.gz *
diff --git a/.github/scripts/termux-cleanup-release-branch.sh b/.github/scripts/termux-cleanup-release-branch.sh
new file mode 100755
index 000000000000..4bc7d2566f2f
--- /dev/null
+++ b/.github/scripts/termux-cleanup-release-branch.sh
@@ -0,0 +1,175 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+cleanup_limit="${CLEANUP_LIMIT:-100}"
+cleanup_matched_checkpoint=false
+
+append_cleanup_summary() {
+  local outcome="$1"
+  local release_branch="${2:-}"
+  local detail="${3:-}"
+
+  [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] || return 0
+
+  {
+    echo "## Termux release branch cleanup"
+    echo
+    echo "- Outcome: ${outcome}"
+    if [[ -n "${release_branch}" ]]; then
+      echo "- Release branch: \`${release_branch}\`"
+    fi
+    if [[ -n "${detail}" ]]; then
+      echo "- Detail: ${detail}"
+    fi
+  } >> "${GITHUB_STEP_SUMMARY}"
+}
+
+checkpoint_source_branch() {
+  jq -r '
+    [
+      (.body // "")
+      | split("\n")[]
+      | try capture("^- Source branch: `(?<branch>[^`]+)`").branch catch empty
+    ][0] // ""
+  ' <<< "$1"
+}
+
+checkpoint_has_label() {
+  local checkpoint_json="$1"
+  local label="$2"
+
+  jq -e --arg label "${label}" '[.labels[]?.name] | index($label) != null' <<< "${checkpoint_json}" >/dev/null
+}
+
+release_branch_is_valid() {
+  [[ "$1" =~ ^release-[A-Za-z0-9._-]+$ ]]
+}
+
+open_prs_using_branch() {
+  local release_branch="$1"
+
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state open \
+    --limit 200 \
+    --json number,title,url,headRefName,baseRefName,headRepository \
+    | jq \
+      --arg branch "${release_branch}" \
+      --arg repo "${GITHUB_REPOSITORY}" \
+      '
+      [
+        .[]
+        | select(
+            .baseRefName == $branch
+            or (
+              .headRefName == $branch
+              and ((.headRepository.nameWithOwner // "") == $repo)
+            )
+          )
+      ]
+    '
+}
+
+delete_release_branch_if_unused() {
+  local release_branch="$1"
+  local checkpoint_url="$2"
+  local open_prs
+  local branch_sha
+
+  if ! release_branch_is_valid "${release_branch}"; then
+    echo "::warning::Refusing to delete unexpected release branch name: ${release_branch}"
+    append_cleanup_summary "skipped" "${release_branch}" "branch name did not match release-* cleanup policy"
+    return 0
+  fi
+
+  if ! branch_sha="$(gh api --method GET "repos/${GITHUB_REPOSITORY}/git/ref/heads/${release_branch}" --jq '.object.sha' 2>/dev/null)"; then
+    echo "${release_branch} no longer exists on ${GITHUB_REPOSITORY}."
+    append_cleanup_summary "already deleted" "${release_branch}" "remote branch was not found"
+    return 0
+  fi
+
+  open_prs="$(open_prs_using_branch "${release_branch}")"
+  if [[ "$(jq 'length' <<< "${open_prs}")" != "0" ]]; then
+    echo "Leaving ${release_branch} in place because open PRs still use it as a source or target:"
+    jq -r '.[] | "- #\(.number) \(.title) (\(.url))"' <<< "${open_prs}"
+    append_cleanup_summary "skipped" "${release_branch}" "open PRs still use this branch"
+    return 0
+  fi
+
+  gh api --silent --method DELETE "repos/${GITHUB_REPOSITORY}/git/refs/heads/${release_branch}"
+  echo "Deleted ${release_branch} at ${branch_sha} after merged checkpoint ${checkpoint_url}."
+  append_cleanup_summary "deleted" "${release_branch}" "checkpoint ${checkpoint_url} merged and no open PRs use the branch"
+}
+
+cleanup_checkpoint_pr() {
+  local checkpoint_json="$1"
+  local checkpoint_url
+  local release_branch
+
+  checkpoint_url="$(jq -r '.url // empty' <<< "${checkpoint_json}")"
+
+  if [[ "$(jq -r '.mergedAt // empty' <<< "${checkpoint_json}")" == "" ]]; then
+    echo "Checkpoint PR ${checkpoint_url:-unknown} is not merged yet; release branch cleanup is deferred."
+    append_cleanup_summary "deferred" "" "checkpoint PR is not merged yet"
+    return 0
+  fi
+
+  if ! checkpoint_has_label "${checkpoint_json}" "checkpoint" || ! checkpoint_has_label "${checkpoint_json}" "termux-release"; then
+    echo "Skipping ${checkpoint_url:-checkpoint PR}; it is not labeled as a Termux checkpoint."
+    return 0
+  fi
+
+  release_branch="$(checkpoint_source_branch "${checkpoint_json}")"
+  if [[ -z "${release_branch}" ]]; then
+    echo "::warning::Could not find release source branch in checkpoint PR ${checkpoint_url}."
+    append_cleanup_summary "skipped" "" "checkpoint PR did not include a source branch"
+    return 0
+  fi
+
+  if [[ -n "${SOURCE_BRANCH:-}" && "${release_branch}" != "${SOURCE_BRANCH}" ]]; then
+    echo "Skipping ${checkpoint_url}; source branch ${release_branch} does not match requested ${SOURCE_BRANCH}."
+    return 0
+  fi
+
+  cleanup_matched_checkpoint=true
+  delete_release_branch_if_unused "${release_branch}" "${checkpoint_url}"
+}
+
+if [[ -n "${CHECKPOINT_PR:-}" ]]; then
+  cleanup_checkpoint_pr "$(
+    gh pr view "${CHECKPOINT_PR}" \
+      --repo "${GITHUB_REPOSITORY}" \
+      --json number,title,body,baseRefName,headRefName,labels,mergedAt,state,url
+  )"
+  exit 0
+fi
+
+while IFS= read -r checkpoint_json; do
+  cleanup_checkpoint_pr "${checkpoint_json}"
+done < <(
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state merged \
+    --limit "${cleanup_limit}" \
+    --json number,title,body,baseRefName,headRefName,labels,mergedAt,state,url \
+    | jq -c '
+      .[]
+      | select(([.labels[]?.name] | index("checkpoint") != null))
+      | select(([.labels[]?.name] | index("termux-release") != null))
+    '
+)
+
+if [[ "${cleanup_matched_checkpoint}" == "false" ]]; then
+  if [[ -n "${SOURCE_BRANCH:-}" ]]; then
+    echo "No merged Termux checkpoint PR found for ${SOURCE_BRANCH} in the most recent ${cleanup_limit} merged PRs."
+    append_cleanup_summary "skipped" "${SOURCE_BRANCH}" "no merged checkpoint PR found"
+    exit 0
+  fi
+
+  echo "No merged Termux checkpoint PRs found in the most recent ${cleanup_limit} merged PRs."
+  append_cleanup_summary "skipped" "" "no merged checkpoint PRs found"
+fi
diff --git a/.github/scripts/termux-configure-git.sh b/.github/scripts/termux-configure-git.sh
new file mode 100755
index 000000000000..764e936776d6
--- /dev/null
+++ b/.github/scripts/termux-configure-git.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+git config user.name "github-actions[bot]"
+git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+while (($#)); do
+  case "$1" in
+    --origin)
+      shift
+      origin_refs=()
+      while (($#)) && [[ "$1" != --* ]]; do
+        origin_refs+=("$1")
+        shift
+      done
+      if ((${#origin_refs[@]})); then
+        git fetch --prune origin "${origin_refs[@]}"
+      fi
+      ;;
+    --upstream-tag)
+      if (($# < 3)); then
+        echo "--upstream-tag requires <repo> <tag>." >&2
+        exit 1
+      fi
+      upstream_repo="$2"
+      upstream_tag="$3"
+      git remote add upstream "https://github.com/${upstream_repo}.git" 2>/dev/null || true
+      git fetch --prune --no-tags upstream "+refs/tags/${upstream_tag}:refs/tags/${upstream_tag}"
+      shift 3
+      ;;
+    *)
+      echo "Unknown argument: $1" >&2
+      exit 1
+      ;;
+  esac
+done
diff --git a/.github/scripts/termux-create-android-build-deployment.sh b/.github/scripts/termux-create-android-build-deployment.sh
new file mode 100755
index 000000000000..ac85205b0718
--- /dev/null
+++ b/.github/scripts/termux-create-android-build-deployment.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GITHUB_RUN_ID:?GITHUB_RUN_ID is required}"
+: "${GITHUB_SERVER_URL:?GITHUB_SERVER_URL is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${RELEASE_BRANCH:?RELEASE_BRANCH is required}"
+: "${RELEASE_SHA:?RELEASE_SHA is required}"
+: "${TERMUX_TAG:?TERMUX_TAG is required}"
+
+deployment_json="$(
+  jq -n \
+    --arg ref "${RELEASE_SHA}" \
+    --arg termux_tag "${TERMUX_TAG}" \
+    --arg release_branch "${RELEASE_BRANCH}" \
+    '{
+      ref: $ref,
+      task: "build-android",
+      auto_merge: false,
+      required_contexts: [],
+      environment: "termux-android",
+      description: ("Build Android artifact for " + $termux_tag),
+      transient_environment: true,
+      production_environment: false,
+      payload: {
+        termux_tag: $termux_tag,
+        release_branch: $release_branch
+      }
+    }' \
+    | gh api --method POST "repos/${GITHUB_REPOSITORY}/deployments" --input -
+)"
+
+deployment_id="$(jq -r '.id' <<< "${deployment_json}")"
+if [[ -z "${deployment_id}" || "${deployment_id}" == "null" ]]; then
+  echo "GitHub did not return a deployment id." >&2
+  echo "${deployment_json}" >&2
+  exit 1
+fi
+
+gh api --method POST "repos/${GITHUB_REPOSITORY}/deployments/${deployment_id}/statuses" \
+  --input - <<< "$(
+    jq -n \
+      --arg log_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+      '{
+        state: "in_progress",
+        environment: "termux-android",
+        log_url: $log_url,
+        description: "Building Android artifact"
+      }'
+  )"
+
+echo "deployment_id=${deployment_id}" >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-create-checkpoint-pr.sh b/.github/scripts/termux-create-checkpoint-pr.sh
new file mode 100755
index 000000000000..f4d523835edb
--- /dev/null
+++ b/.github/scripts/termux-create-checkpoint-pr.sh
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${DESTINATION_BRANCH:?DESTINATION_BRANCH is required}"
+: "${RUNNER_TEMP:?RUNNER_TEMP is required}"
+
+script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=.github/scripts/termux-release-paths.sh
+source "${script_dir}/termux-release-paths.sh"
+
+source_branch="${SOURCE_BRANCH:-${REQUESTED_SOURCE_BRANCH:-${GITHUB_REF_NAME:-}}}"
+source_sha="${SOURCE_SHA:-${REQUESTED_SOURCE_SHA:-}}"
+if [[ -z "${source_branch}" ]]; then
+  echo "SOURCE_BRANCH is required." >&2
+  exit 1
+fi
+if [[ -z "${source_sha}" ]]; then
+  source_sha="$(git rev-parse "origin/${source_branch}")"
+fi
+rm -rf "${PROMOTED_DIR:-promoted}"
+
+short_sha="${source_sha:0:12}"
+checkpoint_branch="checkpoint-${short_sha}"
+pr_title="checkpoint: ${source_branch} into ${DESTINATION_BRANCH} @ ${short_sha}"
+merge_conflicted=false
+conflict_summary=""
+
+existing_pr="$(
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --head "${checkpoint_branch}" \
+    --state all \
+    --json body,number,state,mergedAt,url \
+    --jq '[.[] | select(.state == "OPEN" or .mergedAt != null)] | .[0] // empty'
+)"
+if [[ -n "${existing_pr}" ]]; then
+  existing_url="$(jq -r '.url' <<< "${existing_pr}")"
+  echo "Checkpoint PR already exists for ${checkpoint_branch}: ${existing_url}."
+  echo "pr_url=${existing_url}" >> "${GITHUB_OUTPUT:-/dev/null}"
+  exit 0
+fi
+
+git fetch origin "${DESTINATION_BRANCH}" "${source_branch}"
+git checkout -B "${checkpoint_branch}" "origin/${DESTINATION_BRANCH}"
+
+if ! git merge --no-ff --no-edit "${source_sha}"; then
+  mapfile -t conflicted_paths < <(git diff --name-only --diff-filter=U)
+  for conflicted_path in "${conflicted_paths[@]}"; do
+    if termux_is_checkpoint_release_only_path "${conflicted_path}"; then
+      echo "Auto-resolving release-only checkpoint conflict in ${conflicted_path} by keeping ${DESTINATION_BRANCH}."
+      if git cat-file -e "HEAD:${conflicted_path}" 2>/dev/null; then
+        git checkout --ours -- "${conflicted_path}"
+        git add "${conflicted_path}"
+      else
+        git rm -f --ignore-unmatch "${conflicted_path}"
+      fi
+    fi
+  done
+
+  mapfile -t remaining_conflicts < <(git diff --name-only --diff-filter=U)
+  if [[ "${#remaining_conflicts[@]}" -eq 0 ]]; then
+    git commit --no-edit
+  else
+    merge_conflicted=true
+    conflict_summary="$(printf '%s\n' "${remaining_conflicts[@]}" | awk '{ print "- `" $0 "`" }')"
+    echo "Automatic checkpoint merge failed; creating a manual-resolution PR." >&2
+    if git rev-parse -q --verify MERGE_HEAD >/dev/null; then
+      git merge --abort
+    fi
+    git checkout -B "${checkpoint_branch}" "${source_sha}"
+  fi
+fi
+
+for release_only_path in "${TERMUX_CHECKPOINT_RELEASE_ONLY_PATHS[@]}"; do
+  if git cat-file -e "origin/${DESTINATION_BRANCH}:${release_only_path}" 2>/dev/null; then
+    git checkout "origin/${DESTINATION_BRANCH}" -- "${release_only_path}"
+  else
+    git rm -f --ignore-unmatch -- "${release_only_path}"
+  fi
+done
+
+if ! git diff --quiet || ! git diff --cached --quiet; then
+  git add -A
+  if [[ "${merge_conflicted}" == "true" ]]; then
+    git commit -m "checkpoint: prepare ${source_branch} for ${DESTINATION_BRANCH}"
+  else
+    git commit --amend --no-edit
+  fi
+fi
+
+if git diff --quiet "origin/${DESTINATION_BRANCH}" HEAD; then
+  echo "Checkpoint merge produced no destination changes after release-only files were restored."
+  exit 0
+fi
+
+git push --no-verify --force-with-lease origin "${checkpoint_branch}"
+
+body_path="${RUNNER_TEMP}/termux-checkpoint-pr.md"
+{
+  echo "## Termux release checkpoint"
+  echo
+  echo "- Source branch: \`${source_branch}\`"
+  echo "- Source hash: \`${source_sha}\`"
+  echo "- Destination branch: \`${DESTINATION_BRANCH}\`"
+  echo
+  echo "This PR carries release-train conflict fixes and follow-up changes back into the reusable Termux patch branch. Release metadata is removed before opening the PR."
+  if [[ "${merge_conflicted}" == "true" ]]; then
+    echo
+    echo "## Merge conflicts"
+    echo
+    echo "GitHub Actions could not create the checkpoint merge commit automatically, so this PR was created from the release branch state for manual conflict resolution."
+    echo
+    printf '%s\n' "${conflict_summary:-"- Conflict details unavailable"}"
+  fi
+} > "${body_path}"
+
+pr_url="$(
+  gh pr create \
+    --repo "${GITHUB_REPOSITORY}" \
+    --base "${DESTINATION_BRANCH}" \
+    --head "${checkpoint_branch}" \
+    --title "${pr_title}" \
+    --body-file "${body_path}"
+)"
+if [[ -n "${REVIEWER:-}" ]]; then
+  gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-reviewer "${REVIEWER}" || true
+fi
+gh label create checkpoint --repo "${GITHUB_REPOSITORY}" --color c5def5 --description "Checkpoint merge" --force
+gh label create termux-release --repo "${GITHUB_REPOSITORY}" --color 0e8a16 --description "Termux release automation" --force
+gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-label "checkpoint" --add-label "termux-release"
+
+if [[ "${merge_conflicted}" != "true" ]]; then
+  pr_head_sha="$(gh pr view "${pr_url}" --repo "${GITHUB_REPOSITORY}" --json headRefOid --jq '.headRefOid')"
+  gh pr merge "${pr_url}" \
+    --repo "${GITHUB_REPOSITORY}" \
+    --merge \
+    --auto \
+    --delete-branch \
+    --match-head-commit "${pr_head_sha}" \
+    || echo "::warning::Could not enable checkpoint auto-merge for ${pr_url}."
+fi
+
+echo "pr_url=${pr_url}" >> "${GITHUB_OUTPUT:-/dev/null}"
diff --git a/.github/scripts/termux-create-or-update-mirrored-release.sh b/.github/scripts/termux-create-or-update-mirrored-release.sh
new file mode 100755
index 000000000000..033ea8562547
--- /dev/null
+++ b/.github/scripts/termux-create-or-update-mirrored-release.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${RUNNER_TEMP:?RUNNER_TEMP is required}"
+: "${UPSTREAM_TAG:?UPSTREAM_TAG is required}"
+: "${UPSTREAM_REPO:?UPSTREAM_REPO is required}"
+: "${UPSTREAM_NAME?UPSTREAM_NAME is required}"
+: "${TERMUX_TAG:?TERMUX_TAG is required}"
+: "${UPSTREAM_PRERELEASE:?UPSTREAM_PRERELEASE is required}"
+: "${UPSTREAM_HTML_URL?UPSTREAM_HTML_URL is required}"
+: "${RELEASE_TRAIN?RELEASE_TRAIN is required}"
+: "${RELEASE_EXISTS:?RELEASE_EXISTS is required}"
+: "${PR_NUMBER:?PR_NUMBER is required}"
+: "${HEAD_SHA:?HEAD_SHA is required}"
+: "${RELEASE_SHA:?RELEASE_SHA is required}"
+
+promoted_dir="${PROMOTED_DIR:-promoted}"
+asset_path="${promoted_dir}/opencode-android-arm64.tar.gz"
+body_path="${RUNNER_TEMP}/termux-release-body.md"
+upstream_body_path="${RUNNER_TEMP}/termux-upstream-release-body.md"
+
+if ! gh release view "${UPSTREAM_TAG}" --repo "${UPSTREAM_REPO}" --json body --jq '.body // ""' > "${upstream_body_path}"; then
+  echo "::warning::Could not read ${UPSTREAM_REPO} release ${UPSTREAM_TAG}."
+  : > "${upstream_body_path}"
+fi
+
+{
+  echo "Termux Android build for ${UPSTREAM_TAG}."
+  echo
+  echo "- Upstream release: ${UPSTREAM_HTML_URL}"
+  echo "- Release train: \`${RELEASE_TRAIN}\`"
+  echo "- Promoted PR: #${PR_NUMBER}"
+  echo "- Promoted PR head SHA: \`${HEAD_SHA}\`"
+  echo
+  if [[ -s "${upstream_body_path}" ]]; then
+    echo "## Upstream release notes"
+    echo
+    cat "${upstream_body_path}"
+  fi
+} > "${body_path}"
+
+release_title="${UPSTREAM_NAME}"
+if [[ -z "${release_title}" || "${release_title}" == "null" ]]; then
+  release_title="${TERMUX_TAG}"
+fi
+
+if [[ "${RELEASE_EXISTS}" == "true" ]]; then
+  gh release upload "${TERMUX_TAG}" "${asset_path}#opencode-android-arm64.tar.gz" --repo "${GITHUB_REPOSITORY}" --clobber
+  gh release edit "${TERMUX_TAG}" --repo "${GITHUB_REPOSITORY}" --notes-file "${body_path}" --title "${release_title}"
+  exit 0
+fi
+
+release_args=(
+  gh release create "${TERMUX_TAG}"
+  --repo "${GITHUB_REPOSITORY}"
+  --target "${RELEASE_SHA}"
+  --title "${release_title}"
+  --notes-file "${body_path}"
+)
+if [[ "${UPSTREAM_PRERELEASE}" == "true" ]]; then
+  release_args+=(--prerelease)
+fi
+release_args+=("${asset_path}#opencode-android-arm64.tar.gz")
+"${release_args[@]}"
diff --git a/.github/scripts/termux-create-release-pr.sh b/.github/scripts/termux-create-release-pr.sh
new file mode 100755
index 000000000000..df00345e64df
--- /dev/null
+++ b/.github/scripts/termux-create-release-pr.sh
@@ -0,0 +1,284 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${UPSTREAM_REPO:?UPSTREAM_REPO is required}"
+: "${UPSTREAM_TAG:?UPSTREAM_TAG is required}"
+: "${UPSTREAM_NAME?UPSTREAM_NAME is required}"
+: "${UPSTREAM_HTML_URL:?UPSTREAM_HTML_URL is required}"
+: "${UPSTREAM_PRERELEASE:?UPSTREAM_PRERELEASE is required}"
+: "${UPSTREAM_TARGET?UPSTREAM_TARGET is required}"
+: "${UPSTREAM_ID?UPSTREAM_ID is required}"
+: "${RELEASE_TRAIN:?RELEASE_TRAIN is required}"
+: "${RELEASE_BRANCH:?RELEASE_BRANCH is required}"
+: "${WORK_BRANCH:?WORK_BRANCH is required}"
+: "${TERMUX_TAG:?TERMUX_TAG is required}"
+: "${PATCH_BRANCH:?PATCH_BRANCH is required}"
+: "${REVIEWER?REVIEWER is required}"
+: "${RUNNER_TEMP:?RUNNER_TEMP is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+automation_root="$(cd -- "${script_dir}/../.." && pwd)"
+# shellcheck source=.github/scripts/termux-release-paths.sh
+source "${script_dir}/termux-release-paths.sh"
+
+pr_title="Termux ${UPSTREAM_TAG}"
+seed_dir="${RUNNER_TEMP}/termux-release-seed"
+
+capture_seeded_release_files() {
+  local seeded_path
+
+  for seeded_path in "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"; do
+    mkdir -p "${seed_dir}/$(dirname "${seeded_path}")"
+    cp "${automation_root}/${seeded_path}" "${seed_dir}/${seeded_path}"
+  done
+}
+
+seed_release_automation_files() {
+  local seeded_path
+
+  for seeded_path in "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"; do
+    mkdir -p "$(dirname "${seeded_path}")"
+    cp "${seed_dir}/${seeded_path}" "${seeded_path}"
+    case "${seeded_path}" in
+      .github/scripts/*.sh)
+        chmod +x "${seeded_path}"
+        ;;
+    esac
+  done
+}
+
+normalize_workspace_versions() {
+  local version="${UPSTREAM_TAG#v}"
+  version="${version%-termux}"
+
+  OPENCODE_UPSTREAM_VERSION="${version}" node <<'NODE'
+const fs = require("fs")
+const path = require("path")
+
+const version = process.env.OPENCODE_UPSTREAM_VERSION
+
+function visit(dir) {
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const full = path.join(dir, entry.name)
+    if (entry.isDirectory()) {
+      visit(full)
+      continue
+    }
+    if (entry.name !== "package.json") continue
+    const text = fs.readFileSync(full, "utf8")
+    const pkg = JSON.parse(text)
+    if (!pkg.version) continue
+    if (pkg.name !== "opencode" && !String(pkg.name || "").startsWith("@opencode-ai/")) continue
+    pkg.version = version
+    fs.writeFileSync(full, `${JSON.stringify(pkg, null, 2)}\n`)
+  }
+}
+
+visit("packages")
+NODE
+
+  if command -v bun >/dev/null 2>&1; then
+    bun install --lockfile-only --ignore-scripts
+  else
+    echo "::warning::bun is unavailable; package versions were normalized but bun.lock was not refreshed."
+  fi
+}
+
+open_prs_json() {
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state open \
+    --limit 200 \
+    --json number,title,body,headRefName,baseRefName,url
+}
+
+existing_open_release_pr() {
+  open_prs_json \
+    | jq -c \
+      --arg release_branch "${RELEASE_BRANCH}" \
+      '
+        [
+          .[]
+          | select(.baseRefName == $release_branch)
+          | select(
+              ((.title // "") | startswith("Termux v"))
+              and ((.body // "") | contains("Release branch: `" + $release_branch + "`"))
+            )
+        ]
+        | sort_by(.number)
+        | reverse
+        | .[0] // empty
+      '
+}
+
+enable_release_pr_automerge() {
+  local pr_url="$1"
+  local pr_info
+
+  if ! pr_info="$(gh pr view "${pr_url}" --repo "${GITHUB_REPOSITORY}" --json headRefOid,mergeStateStatus,mergeable,state,url)"; then
+    echo "::warning::Could not inspect ${pr_url}; leaving auto-merge disabled."
+    return 0
+  fi
+
+  if [[ "$(jq -r '.state' <<< "${pr_info}")" != "OPEN" ]]; then
+    return 0
+  fi
+
+  if [[ "$(jq -r '.mergeable // ""' <<< "${pr_info}")" == "CONFLICTING" || "$(jq -r '.mergeStateStatus // ""' <<< "${pr_info}")" == "DIRTY" ]]; then
+    echo "Skipping auto-merge for ${pr_url}; GitHub reports conflicts."
+    return 0
+  fi
+
+  gh pr merge "${pr_url}" \
+    --repo "${GITHUB_REPOSITORY}" \
+    --squash \
+    --auto \
+    --delete-branch \
+    --match-head-commit "$(jq -r '.headRefOid' <<< "${pr_info}")" \
+    || echo "::warning::Could not enable auto-merge for ${pr_url}."
+}
+
+append_pr_summary() {
+  local outcome="$1"
+  local pr_url="${2:-}"
+
+  [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] || return 0
+
+  {
+    echo "## Termux release PR"
+    echo
+    echo "- Outcome: ${outcome}"
+    echo "- Upstream tag: \`${UPSTREAM_TAG}\`"
+    echo "- Termux tag: \`${TERMUX_TAG}\`"
+    echo "- Release branch: \`${RELEASE_BRANCH}\`"
+    echo "- Work branch: \`${WORK_BRANCH}\`"
+    echo "- Patch branch: \`${PATCH_BRANCH}\`"
+    if [[ -n "${pr_url}" ]]; then
+      echo "- PR: ${pr_url}"
+    fi
+  } >> "${GITHUB_STEP_SUMMARY}"
+}
+
+capture_seeded_release_files
+
+release_branch_exists=false
+if git ls-remote --exit-code --heads origin "${RELEASE_BRANCH}" >/dev/null 2>&1; then
+  release_branch_exists=true
+  git fetch origin "${RELEASE_BRANCH}"
+fi
+
+if [[ "${release_branch_exists}" == "false" ]]; then
+  git checkout -B "${RELEASE_BRANCH}" "refs/tags/${UPSTREAM_TAG}"
+  seed_release_automation_files
+  git add -- "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"
+  if ! git diff --cached --quiet; then
+    git commit -m "chore(termux): seed release automation"
+  fi
+  git push --no-verify origin "${RELEASE_BRANCH}"
+fi
+
+git fetch origin "${RELEASE_BRANCH}"
+existing_pr="$(existing_open_release_pr)"
+if [[ -n "${existing_pr}" && "$(jq -r '.headRefName' <<< "${existing_pr}")" != "${WORK_BRANCH}" ]]; then
+  WORK_BRANCH="$(jq -r '.headRefName' <<< "${existing_pr}")"
+fi
+
+if git ls-remote --exit-code --heads origin "${WORK_BRANCH}" >/dev/null 2>&1; then
+  git fetch origin "${WORK_BRANCH}"
+  git checkout -B "${WORK_BRANCH}" "origin/${WORK_BRANCH}"
+else
+  git checkout -B "${WORK_BRANCH}" "origin/${PATCH_BRANCH}"
+fi
+
+seed_release_automation_files
+normalize_workspace_versions
+
+mkdir -p .github
+jq -n \
+  --arg upstream_repo "${UPSTREAM_REPO}" \
+  --arg upstream_tag "${UPSTREAM_TAG}" \
+  --arg upstream_name "${UPSTREAM_NAME}" \
+  --arg upstream_html_url "${UPSTREAM_HTML_URL}" \
+  --arg upstream_target "${UPSTREAM_TARGET}" \
+  --arg upstream_release_id "${UPSTREAM_ID}" \
+  --arg release_train "${RELEASE_TRAIN}" \
+  --arg release_branch "${RELEASE_BRANCH}" \
+  --arg work_branch "${WORK_BRANCH}" \
+  --arg patch_branch "${PATCH_BRANCH}" \
+  --arg patch_source_sha "$(git rev-parse "origin/${PATCH_BRANCH}")" \
+  --arg termux_tag "${TERMUX_TAG}" \
+  --argjson upstream_prerelease "${UPSTREAM_PRERELEASE}" \
+  '{
+    upstream_repo: $upstream_repo,
+    upstream_tag: $upstream_tag,
+    upstream_name: $upstream_name,
+    upstream_html_url: $upstream_html_url,
+    upstream_target: $upstream_target,
+    upstream_release_id: $upstream_release_id,
+    upstream_prerelease: $upstream_prerelease,
+    release_train: $release_train,
+    release_branch: $release_branch,
+    work_branch: $work_branch,
+    patch_branch: $patch_branch,
+    patch_source_sha: $patch_source_sha,
+    termux_tag: $termux_tag
+  }' > .github/termux-release.json
+
+git add -A
+if git diff --cached --quiet; then
+  echo "No changes to propose for ${UPSTREAM_TAG}."
+  append_pr_summary "no changes to propose"
+  exit 0
+fi
+
+git commit -m "chore(termux): prepare ${UPSTREAM_TAG}"
+git push --no-verify --force-with-lease origin "${WORK_BRANCH}"
+
+body_path="${RUNNER_TEMP}/termux-release-pr.md"
+{
+  echo "## Termux release train"
+  echo
+  echo "- Upstream release: ${UPSTREAM_HTML_URL}"
+  echo "- Upstream tag: \`${UPSTREAM_TAG}\`"
+  echo "- Termux release tag: \`${TERMUX_TAG}\`"
+  echo "- Release branch: \`${RELEASE_BRANCH}\`"
+  echo "- Patch source: \`${PATCH_BRANCH}\`"
+  echo
+  echo "This PR carries the Termux patch branch onto the upstream release tag. If GitHub reports conflicts, resolve them by keeping upstream release code and preserving the Termux compatibility fixes."
+  echo
+  echo "After this PR merges, the Termux deploy workflow builds \`opencode-android-arm64\` under a GitHub Deployment, mirrors the release asset to \`${TERMUX_TAG}\`, and opens a checkpoint PR back to \`${PATCH_BRANCH}\`."
+  echo
+  echo "## Upstream notes"
+  echo
+  printf '%s\n' "${UPSTREAM_BODY}"
+} > "${body_path}"
+
+if [[ -n "${existing_pr}" ]]; then
+  pr_url="$(jq -r '.url' <<< "${existing_pr}")"
+  gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --title "${pr_title}" --body-file "${body_path}"
+  pr_action="updated"
+else
+  pr_url="$(
+    gh pr create \
+      --repo "${GITHUB_REPOSITORY}" \
+      --base "${RELEASE_BRANCH}" \
+      --head "${WORK_BRANCH}" \
+      --title "${pr_title}" \
+      --body-file "${body_path}"
+  )"
+  pr_action="created"
+fi
+
+if [[ -n "${REVIEWER}" ]]; then
+  gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-reviewer "${REVIEWER}" || true
+fi
+gh label create termux-release --repo "${GITHUB_REPOSITORY}" --color 0e8a16 --description "Termux release automation" --force
+gh label create release-train --repo "${GITHUB_REPOSITORY}" --color 1d76db --description "Release train PR" --force
+gh pr edit "${pr_url}" --repo "${GITHUB_REPOSITORY}" --add-label "termux-release" --add-label "release-train"
+enable_release_pr_automerge "${pr_url}"
+echo "pr_url=${pr_url}" >> "${GITHUB_OUTPUT}"
+append_pr_summary "${pr_action} release train PR" "${pr_url}"
diff --git a/.github/scripts/termux-find-release-pr.sh b/.github/scripts/termux-find-release-pr.sh
new file mode 100755
index 000000000000..0560f51b58a9
--- /dev/null
+++ b/.github/scripts/termux-find-release-pr.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+if [[ -n "${INPUT_PR_NUMBER:-}" || -n "${INPUT_PR_HEAD_SHA:-}" ]]; then
+  if [[ -z "${INPUT_PR_NUMBER:-}" || -z "${INPUT_PR_HEAD_SHA:-}" ]]; then
+    echo "workflow_dispatch inputs pr_number and pr_head_sha must be provided together." >&2
+    exit 1
+  fi
+  pr_number="${INPUT_PR_NUMBER}"
+  head_sha="${INPUT_PR_HEAD_SHA}"
+  head_ref=""
+else
+  : "${RELEASE_BRANCH:?RELEASE_BRANCH is required}"
+  : "${RELEASE_SHA:?RELEASE_SHA is required}"
+  pr_json="$(
+    gh pr list \
+      --repo "${GITHUB_REPOSITORY}" \
+      --base "${RELEASE_BRANCH}" \
+      --state merged \
+      --limit 100 \
+      --json number,headRefOid,headRefName,mergeCommit \
+      --jq "[.[] | select(.mergeCommit.oid == \"${RELEASE_SHA}\")] | sort_by(.number) | reverse | .[0] // empty"
+  )"
+  if [[ -z "${pr_json}" ]]; then
+    echo "Unable to find merged PR for ${RELEASE_SHA} into ${RELEASE_BRANCH}" >&2
+    exit 1
+  fi
+  pr_number="$(jq -r '.number' <<< "${pr_json}")"
+  head_sha="$(jq -r '.headRefOid' <<< "${pr_json}")"
+  head_ref="$(jq -r '.headRefName' <<< "${pr_json}")"
+fi
+
+{
+  echo "number=${pr_number}"
+  echo "head_sha=${head_sha}"
+  echo "head_ref=${head_ref}"
+} >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-finish-android-build-deployment.sh b/.github/scripts/termux-finish-android-build-deployment.sh
new file mode 100755
index 000000000000..0cf33af079fe
--- /dev/null
+++ b/.github/scripts/termux-finish-android-build-deployment.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GITHUB_RUN_ID:?GITHUB_RUN_ID is required}"
+: "${GITHUB_SERVER_URL:?GITHUB_SERVER_URL is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+: "${DEPLOYMENT_ID:?DEPLOYMENT_ID is required}"
+: "${BUILD_RESULT:?BUILD_RESULT is required}"
+
+state="success"
+description="Android artifact build completed"
+if [[ "${BUILD_RESULT}" != "success" ]]; then
+  state="failure"
+  description="Android artifact build failed"
+fi
+
+gh api --method POST "repos/${GITHUB_REPOSITORY}/deployments/${DEPLOYMENT_ID}/statuses" \
+  --input - <<< "$(
+    jq -n \
+      --arg state "${state}" \
+      --arg description "${description}" \
+      --arg log_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
+      '{
+        state: $state,
+        environment: "termux-android",
+        log_url: $log_url,
+        description: $description
+      }'
+  )"
diff --git a/.github/scripts/termux-read-release-metadata.sh b/.github/scripts/termux-read-release-metadata.sh
new file mode 100755
index 000000000000..be17c87a9204
--- /dev/null
+++ b/.github/scripts/termux-read-release-metadata.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+metadata=".github/termux-release.json"
+if [[ ! -f "${metadata}" ]]; then
+  echo "No ${metadata}; this is not a Termux release deployment."
+  echo "deploy=false" >> "${GITHUB_OUTPUT}"
+  exit 0
+fi
+
+upstream_tag="$(jq -r '.upstream_tag // empty' "${metadata}")"
+upstream_name="$(jq -r '.upstream_name // .upstream_tag // empty' "${metadata}")"
+termux_tag="$(jq -r '.termux_tag // empty' "${metadata}")"
+upstream_prerelease="$(jq -r '.upstream_prerelease // false' "${metadata}")"
+upstream_html_url="$(jq -r '.upstream_html_url // ""' "${metadata}")"
+upstream_repo="$(jq -r '.upstream_repo // "anomalyco/opencode"' "${metadata}")"
+release_train="$(jq -r '.release_train // ""' "${metadata}")"
+
+if [[ -z "${upstream_tag}" || -z "${termux_tag}" ]]; then
+  echo "Missing upstream_tag or termux_tag in ${metadata}" >&2
+  exit 1
+fi
+
+release_exists=false
+asset_exists=false
+if gh release view "${termux_tag}" --repo "${GITHUB_REPOSITORY}" >/dev/null 2>&1; then
+  release_exists=true
+  if [[ "$(
+    gh release view "${termux_tag}" \
+      --repo "${GITHUB_REPOSITORY}" \
+      --json assets \
+      --jq '.assets | map(.name) | any(. == "opencode-android-arm64.tar.gz")'
+  )" == "true" ]]; then
+    asset_exists=true
+  fi
+fi
+
+{
+  echo "deploy=true"
+  echo "upstream_tag=${upstream_tag}"
+  echo "upstream_name=${upstream_name}"
+  echo "termux_tag=${termux_tag}"
+  echo "build_version=${termux_tag#v}"
+  echo "upstream_prerelease=${upstream_prerelease}"
+  echo "upstream_html_url=${upstream_html_url}"
+  echo "upstream_repo=${upstream_repo}"
+  echo "release_train=${release_train}"
+  echo "release_exists=${release_exists}"
+  echo "asset_exists=${asset_exists}"
+} >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-release-paths.sh b/.github/scripts/termux-release-paths.sh
new file mode 100755
index 000000000000..4a58e49e6164
--- /dev/null
+++ b/.github/scripts/termux-release-paths.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+readonly -a TERMUX_RELEASE_WORKFLOW_PATHS=(
+  .github/actions/build-android-cli/action.yml
+  .github/workflows/publish.yml
+  .github/workflows/termux-release-branch-cleanup.yml
+  .github/workflows/termux-release-checkpoint.yml
+  .github/workflows/termux-release-deploy.yml
+  .github/workflows/termux-release-watch.yml
+)
+
+readonly -a TERMUX_RELEASE_SCRIPT_PATHS=(
+  .github/scripts/termux-configure-git.sh
+  .github/scripts/termux-cleanup-release-branch.sh
+  .github/scripts/termux-create-checkpoint-pr.sh
+  .github/scripts/termux-create-android-build-deployment.sh
+  .github/scripts/termux-create-or-update-mirrored-release.sh
+  .github/scripts/termux-create-release-pr.sh
+  .github/scripts/termux-find-release-pr.sh
+  .github/scripts/termux-finish-android-build-deployment.sh
+  .github/scripts/termux-read-release-metadata.sh
+  .github/scripts/termux-release-paths.sh
+  .github/scripts/termux-resolve-release-ref.sh
+  .github/scripts/termux-select-release.sh
+  .github/scripts/termux-validate-gh-env.sh
+)
+
+readonly -a TERMUX_RELEASE_AUTOMATION_PATHS=(
+  "${TERMUX_RELEASE_WORKFLOW_PATHS[@]}"
+  "${TERMUX_RELEASE_SCRIPT_PATHS[@]}"
+)
+
+readonly -a TERMUX_CHECKPOINT_RELEASE_ONLY_PATHS=(
+  "${TERMUX_RELEASE_AUTOMATION_PATHS[@]}"
+  .github/termux-release.json
+)
+
+termux_path_in_list() {
+  local candidate="$1"
+  shift
+  local listed_path
+
+  for listed_path in "$@"; do
+    [[ "${candidate}" != "${listed_path}" ]] || return 0
+  done
+  return 1
+}
+
+termux_is_checkpoint_release_only_path() {
+  termux_path_in_list "$1" "${TERMUX_CHECKPOINT_RELEASE_ONLY_PATHS[@]}"
+}
diff --git a/.github/scripts/termux-resolve-release-ref.sh b/.github/scripts/termux-resolve-release-ref.sh
new file mode 100755
index 000000000000..02e92b4e3d8f
--- /dev/null
+++ b/.github/scripts/termux-resolve-release-ref.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_EVENT_NAME:?GITHUB_EVENT_NAME is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+
+input_release_branch="${INPUT_RELEASE_BRANCH:-${REQUESTED_RELEASE_BRANCH:-}}"
+input_release_sha="${INPUT_RELEASE_SHA:-${REQUESTED_RELEASE_SHA:-}}"
+
+if [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
+  if [[ -z "${input_release_branch}" ]]; then
+    echo "release_branch is required for workflow_dispatch." >&2
+    exit 1
+  fi
+  release_branch="${input_release_branch}"
+  git fetch origin "${release_branch}"
+  git checkout --detach "origin/${release_branch}"
+  if [[ -n "${input_release_sha}" ]]; then
+    git checkout --detach "${input_release_sha}"
+    release_sha="${input_release_sha}"
+  else
+    release_sha="$(git rev-parse HEAD)"
+  fi
+else
+  : "${GITHUB_REF_NAME:?GITHUB_REF_NAME is required}"
+  : "${GITHUB_SHA:?GITHUB_SHA is required}"
+  release_branch="${GITHUB_REF_NAME}"
+  release_sha="${GITHUB_SHA}"
+fi
+
+{
+  echo "branch=${release_branch}"
+  echo "sha=${release_sha}"
+} >> "${GITHUB_OUTPUT}"
diff --git a/.github/scripts/termux-select-release.sh b/.github/scripts/termux-select-release.sh
new file mode 100755
index 000000000000..2784c8c91737
--- /dev/null
+++ b/.github/scripts/termux-select-release.sh
@@ -0,0 +1,335 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${UPSTREAM_REPO:?UPSTREAM_REPO is required}"
+: "${REQUESTED_TAG?REQUESTED_TAG is required}"
+: "${BYPASS_PRIOR_RELEASE_TRAIN:?BYPASS_PRIOR_RELEASE_TRAIN is required}"
+: "${GITHUB_OUTPUT:?GITHUB_OUTPUT is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+normalize_tag_version() {
+  local tag="$1"
+  local version="${tag#v}"
+  version="${version%-termux}"
+  printf '%s\n' "${version}"
+}
+
+requested_upstream_tag() {
+  local requested="${1#refs/tags/}"
+  printf 'v%s\n' "$(normalize_tag_version "${requested}")"
+}
+
+release_train_for_tag() {
+  local version
+  version="$(normalize_tag_version "$1")"
+  printf '%s\n' "${version%%-*}"
+}
+
+release_branch_for_tag() {
+  printf 'release-%s\n' "$(release_train_for_tag "$1")"
+}
+
+work_branch_for_tag() {
+  printf 'termux-%s\n' "$(release_train_for_tag "$1")"
+}
+
+termux_tag_for_tag() {
+  printf '%s-termux\n' "$1"
+}
+
+latest_release_json() {
+  gh api --method GET "repos/${UPSTREAM_REPO}/releases?per_page=1" \
+    | jq -c '
+      .[0] // empty
+      | select(type == "object")
+      | {
+        tagName: (.tag_name // .tagName // ""),
+        name: (.name // .tag_name // .tagName // ""),
+        body: (.body // ""),
+        url: (.html_url // .url // ""),
+        isPrerelease: (.prerelease // .isPrerelease // false),
+        targetCommitish: (.target_commitish // .targetCommitish // ""),
+        databaseId: (.id // .databaseId // "")
+      }
+    '
+}
+
+release_json_for_tag() {
+  local tag="$1"
+  gh api --method GET "repos/${UPSTREAM_REPO}/releases/tags/${tag}" \
+    | jq -c '{
+      tagName: (.tag_name // .tagName // ""),
+      name: (.name // .tag_name // .tagName // ""),
+      body: (.body // ""),
+      url: (.html_url // .url // ""),
+      isPrerelease: (.prerelease // .isPrerelease // false),
+      targetCommitish: (.target_commitish // .targetCommitish // ""),
+      databaseId: (.id // .databaseId // "")
+    }'
+}
+
+open_prs_json() {
+  gh pr list \
+    --repo "${GITHUB_REPOSITORY}" \
+    --state open \
+    --limit 200 \
+    --json number,title,body,headRefName,baseRefName,url
+}
+
+release_branch_current_tag() {
+  git show "origin/$1:.github/termux-release.json" 2>/dev/null \
+    | jq -r '.upstream_tag // empty' 2>/dev/null \
+    || true
+}
+
+version_is_newer() {
+  local candidate="$1"
+  local current="$2"
+  local candidate_version
+  local current_version
+  local newest
+
+  if [[ -z "${current}" ]]; then
+    return 0
+  fi
+
+  candidate_version="$(normalize_tag_version "${candidate}")"
+  current_version="$(normalize_tag_version "${current}")"
+  newest="$(printf '%s\n%s\n' "${current_version}" "${candidate_version}" | sort -V | tail -n 1)"
+  [[ "${newest}" == "${candidate_version}" && "${candidate_version}" != "${current_version}" ]]
+}
+
+latest_mirrored_termux_tag() {
+  local release_train="${1:-}"
+  local newest_tag=""
+  local tag
+  local tag_train
+
+  while IFS= read -r tag; do
+    [[ -n "${tag}" ]] || continue
+    [[ "${tag}" == v*-termux ]] || continue
+    if [[ -n "${release_train}" ]]; then
+      tag_train="$(release_train_for_tag "${tag}")"
+      [[ "${tag_train}" == "${release_train}" ]] || continue
+    fi
+    if [[ -z "${newest_tag}" ]] || version_is_newer "${tag}" "${newest_tag}"; then
+      newest_tag="${tag}"
+    fi
+  done < <(
+    gh release list \
+      --repo "${GITHUB_REPOSITORY}" \
+      --exclude-drafts \
+      --limit 200 \
+      --json tagName \
+      --jq '.[].tagName'
+  )
+
+  printf '%s\n' "${newest_tag}"
+}
+
+latest_mirrored_termux_tag_for_train() {
+  latest_mirrored_termux_tag "$1"
+}
+
+open_release_train_pr_for_branch() {
+  local release_branch="$1"
+  open_prs_json \
+    | jq -c \
+      --arg release_branch "${release_branch}" \
+      '
+        [
+          .[]
+          | select(.baseRefName == $release_branch)
+          | select(
+              ((.title // "") | startswith("Termux v"))
+              and ((.body // "") | contains("Release branch: `" + $release_branch + "`"))
+            )
+          | . + {
+              upstreamTag: (
+                (.body // "")
+                | try capture("- Upstream tag: `(?<tag>v[^`]+)`").tag catch ""
+              )
+            }
+        ]
+        | sort_by(.number)
+        | reverse
+        | .[0] // empty
+      '
+}
+
+open_other_release_train_prs() {
+  local release_branch="$1"
+  open_prs_json \
+    | jq -r \
+      --arg release_branch "${release_branch}" \
+      '
+        .[]
+        | select(.baseRefName != $release_branch)
+        | select(
+            ((.title // "") | startswith("Termux v"))
+            and ((.body // "") | contains("Release branch: `release-"))
+          )
+        | "- #\(.number) \(.title) (\(.url))"
+      '
+}
+
+append_selection_summary() {
+  local selected="$1"
+  local upstream_tag="${2:-}"
+  local release_branch="${3:-}"
+  local work_branch="${4:-}"
+  local termux_tag="${5:-}"
+
+  [[ -n "${GITHUB_STEP_SUMMARY:-}" ]] || return 0
+
+  {
+    echo "## Termux release selection"
+    echo
+    echo "- Repository: \`${GITHUB_REPOSITORY}\`"
+    echo "- Upstream repository: \`${UPSTREAM_REPO}\`"
+    if [[ "${selected}" == "true" ]]; then
+      echo "- Selected upstream tag: \`${upstream_tag}\`"
+      echo "- Release branch: \`${release_branch}\`"
+      echo "- Work branch: \`${work_branch}\`"
+      echo "- Termux tag: \`${termux_tag}\`"
+    else
+      echo "- Selected: no"
+    fi
+  } >> "${GITHUB_STEP_SUMMARY}"
+}
+
+emit_selected_release() {
+  local release_json="$1"
+  local release_branch="$2"
+  local work_branch="$3"
+  local termux_tag="$4"
+  local upstream_tag
+  local upstream_body
+
+  upstream_tag="$(jq -r '.tagName' <<< "${release_json}")"
+  upstream_body="$(jq -r '.body // ""' <<< "${release_json}")"
+
+  {
+    echo "selected=true"
+    echo "upstream_tag=${upstream_tag}"
+    echo "upstream_name=$(jq -r '.name' <<< "${release_json}")"
+    echo "upstream_html_url=$(jq -r '.url' <<< "${release_json}")"
+    echo "upstream_prerelease=$(jq -r '.isPrerelease' <<< "${release_json}")"
+    echo "upstream_target=$(jq -r '.targetCommitish' <<< "${release_json}")"
+    echo "upstream_id=$(jq -r '.databaseId' <<< "${release_json}")"
+    echo "release_train=$(release_train_for_tag "${upstream_tag}")"
+    echo "release_branch=${release_branch}"
+    echo "work_branch=${work_branch}"
+    echo "termux_tag=${termux_tag}"
+  } >> "${GITHUB_OUTPUT}"
+
+  body_delimiter="termux_release_body_$(date +%s%N)_${RANDOM}_${RANDOM}"
+  while grep -qxF "${body_delimiter}" <<< "${upstream_body}"; do
+    body_delimiter="termux_release_body_$(date +%s%N)_${RANDOM}_${RANDOM}"
+  done
+  {
+    echo "body<<${body_delimiter}"
+    printf '%s\n' "${upstream_body}"
+    echo "${body_delimiter}"
+  } >> "${GITHUB_OUTPUT}"
+
+  append_selection_summary "true" "${upstream_tag}" "${release_branch}" "${work_branch}" "${termux_tag}"
+}
+
+maybe_select_release() {
+  local release_json="$1"
+  local selection_mode="${2:-latest}"
+  local upstream_tag
+  local release_train
+  local release_branch
+  local work_branch
+  local termux_tag
+  local current_tag
+  local mirrored_tag
+  local open_pr_json
+  local open_pr_tag
+  local pending_other_prs
+
+  upstream_tag="$(jq -r '.tagName // empty' <<< "${release_json}")"
+  [[ "${upstream_tag}" == v* ]] || return 1
+
+  release_train="$(release_train_for_tag "${upstream_tag}")"
+  release_branch="$(release_branch_for_tag "${upstream_tag}")"
+  work_branch="$(work_branch_for_tag "${upstream_tag}")"
+  termux_tag="$(termux_tag_for_tag "${upstream_tag}")"
+
+  if gh release view "${termux_tag}" --repo "${GITHUB_REPOSITORY}" >/dev/null 2>&1; then
+    echo "${termux_tag} already exists; nothing to do."
+    return 1
+  fi
+
+  open_pr_json="$(open_release_train_pr_for_branch "${release_branch}")"
+  if [[ -n "${open_pr_json}" ]]; then
+    open_pr_tag="$(jq -r '.upstreamTag // empty' <<< "${open_pr_json}")"
+    work_branch="$(jq -r '.headRefName' <<< "${open_pr_json}")"
+    if [[ "${open_pr_tag}" == "${upstream_tag}" && "${selection_mode}" == "requested" ]]; then
+      emit_selected_release "${release_json}" "${release_branch}" "${work_branch}" "${termux_tag}"
+      return 0
+    fi
+    if [[ "${open_pr_tag}" == "${upstream_tag}" ]]; then
+      echo "${upstream_tag} already has open release PR $(jq -r '.url' <<< "${open_pr_json}"); nothing to do."
+      return 1
+    fi
+    if [[ "${selection_mode}" != "requested" ]] && ! version_is_newer "${upstream_tag}" "${open_pr_tag}"; then
+      echo "${upstream_tag} is not newer than open PR tag ${open_pr_tag}; nothing to do."
+      return 1
+    fi
+  fi
+
+  if [[ "${selection_mode}" != "requested" ]]; then
+    current_tag="$(release_branch_current_tag "${release_branch}")"
+    if ! version_is_newer "${upstream_tag}" "${current_tag}"; then
+      echo "${upstream_tag} is not newer than ${current_tag} already recorded on ${release_branch}; nothing to do."
+      return 1
+    fi
+
+    mirrored_tag="$(latest_mirrored_termux_tag)"
+    if ! version_is_newer "${upstream_tag}" "${mirrored_tag}"; then
+      echo "${upstream_tag} is not newer than ${mirrored_tag} already mirrored; nothing to do."
+      return 1
+    fi
+
+    mirrored_tag="$(latest_mirrored_termux_tag_for_train "${release_train}")"
+    if ! version_is_newer "${upstream_tag}" "${mirrored_tag}"; then
+      echo "${upstream_tag} is not newer than ${mirrored_tag} already mirrored for ${release_train}; nothing to do."
+      return 1
+    fi
+
+    if [[ "${BYPASS_PRIOR_RELEASE_TRAIN}" != "true" ]]; then
+      pending_other_prs="$(open_other_release_train_prs "${release_branch}")"
+      if [[ -n "${pending_other_prs}" ]]; then
+        echo "${upstream_tag} is newer, but another release train PR is open."
+        printf '%s\n' "${pending_other_prs}"
+        return 1
+      fi
+    fi
+  fi
+
+  emit_selected_release "${release_json}" "${release_branch}" "${work_branch}" "${termux_tag}"
+}
+
+if [[ -n "${REQUESTED_TAG}" ]]; then
+  requested_tag="$(requested_upstream_tag "${REQUESTED_TAG}")"
+  if ! release_json="$(release_json_for_tag "${requested_tag}")"; then
+    echo "Requested upstream release ${requested_tag} does not exist remotely."
+  elif maybe_select_release "${release_json}" "requested"; then
+    exit 0
+  else
+    echo "Requested upstream release ${requested_tag} does not need a Termux mirror."
+  fi
+else
+  if release_json="$(latest_release_json)" && [[ -n "${release_json}" ]] && maybe_select_release "${release_json}"; then
+    exit 0
+  fi
+fi
+
+echo "No upstream release needs a Termux mirror."
+echo "selected=false" >> "${GITHUB_OUTPUT}"
+append_selection_summary "false"
diff --git a/.github/scripts/termux-validate-gh-env.sh b/.github/scripts/termux-validate-gh-env.sh
new file mode 100755
index 000000000000..c57a9774d11d
--- /dev/null
+++ b/.github/scripts/termux-validate-gh-env.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
+: "${GH_TOKEN:?GH_TOKEN is required}"
+
+command -v gh
+command -v jq
+
+printf 'GITHUB_REPOSITORY=%s\n' "${GITHUB_REPOSITORY}"
+printf 'GITHUB_REF_NAME=%s\n' "${GITHUB_REF_NAME:-}"
diff --git a/.github/termux-release.json b/.github/termux-release.json
new file mode 100644
index 000000000000..6ece8d0ede8c
--- /dev/null
+++ b/.github/termux-release.json
@@ -0,0 +1,15 @@
+{
+  "upstream_repo": "anomalyco/opencode",
+  "upstream_tag": "v1.17.16",
+  "upstream_name": "v1.17.16",
+  "upstream_html_url": "https://github.com/anomalyco/opencode/releases/tag/v1.17.16",
+  "upstream_target": "fb1edc49180a3a2f69429f5dcca48fd96b41e2b7",
+  "upstream_release_id": "351318322",
+  "upstream_prerelease": false,
+  "release_train": "1.17.16",
+  "release_branch": "release-1.17.16",
+  "work_branch": "termux-1.17.16",
+  "patch_branch": "termux-target",
+  "patch_source_sha": "22d30206e0b5264c14e621fd51013735e551bd8f",
+  "termux_tag": "v1.17.16-termux"
+}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cb24b53944d9..cdd65000c479 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,5 +1,5 @@
 name: publish
-run-name: "${{ format('release {0}', inputs.bump) }}"
+run-name: "${{ inputs.target == 'android-arm64' && 'build android artifact' || inputs.target == 'android-smoke' && 'build android smoke artifact' || format('release {0}', inputs.bump) }}"
 
 on:
   push:
@@ -23,18 +23,39 @@ on:
         description: "Override version (optional)"
         required: false
         type: string
+      target:
+        description: "Manual build target"
+        required: false
+        default: all
+        type: choice
+        options:
+          - all
+          - android-arm64
+          - android-smoke
 
-concurrency: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.version || inputs.bump }}
+concurrency: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.target || 'all' }}-${{ inputs.version || inputs.bump }}
 
 permissions:
+  actions: read
+  artifact-metadata: read
+  attestations: read
+  checks: read
   id-token: write
   contents: write
+  deployments: read
+  discussions: read
+  issues: read
+  models: read
   packages: write
+  pages: read
+  pull-requests: read
+  security-events: read
+  statuses: read
 
 jobs:
   version:
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'anomalyco/opencode' && !contains(fromJSON('["android-arm64","android-smoke"]'), inputs.target)
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
@@ -71,7 +92,7 @@ jobs:
   build-cli:
     needs: version
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'anomalyco/opencode' && !contains(fromJSON('["android-arm64","android-smoke"]'), inputs.target)
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
@@ -79,6 +100,11 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
 
+      - name: Setup Zig
+        uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
+        with:
+          version: 0.15.2
+
       - name: Setup git committer
         id: committer
         uses: ./.github/actions/setup-git-committer
@@ -101,6 +127,7 @@ jobs:
         with:
           name: opencode-cli
           path: |
+            packages/opencode/dist/opencode-android*
             packages/opencode/dist/opencode-darwin*
             packages/opencode/dist/opencode-linux*
 
@@ -117,6 +144,87 @@ jobs:
     outputs:
       version: ${{ needs.version.outputs.version }}
 
+  build-android:
+    runs-on: ubuntu-24.04
+    if: github.event_name == 'workflow_dispatch' && inputs.target == 'android-arm64'
+    timeout-minutes: 120
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        with:
+          fetch-tags: true
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Build Android CLI
+        uses: ./.github/actions/build-android-cli
+        with:
+          version: ${{ inputs.version || format('0.0.0-android.{0}', github.run_number) }}
+          release: ""
+          repo: ${{ github.repository }}
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: opencode-android-arm64
+          path: |
+            packages/opencode/dist/opencode-android-arm64
+            packages/opencode/dist/opencode-android-arm64.tar.gz
+            packages/opencode/dist/android-smoke
+
+  termux-android-smoke:
+    name: Smoke Android artifact in Termux
+    needs: build-android
+    if: github.event_name == 'workflow_dispatch' && inputs.target == 'android-arm64'
+    permissions:
+      actions: read
+      contents: read
+    uses: ./.github/workflows/termux-android-artifact-smoke.yml
+    with:
+      artifact_name: opencode-android-arm64
+      artifact_run_id: ${{ github.run_id }}
+
+  build-android-smoke:
+    runs-on: ubuntu-24.04
+    if: github.event_name == 'workflow_dispatch' && inputs.target == 'android-smoke'
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - uses: ./.github/actions/setup-bun
+
+      - name: Build Android compile smoke
+        run: |
+          mkdir -p "$RUNNER_TEMP/opencode-android-smoke"
+          cat > "$RUNNER_TEMP/opencode-android-smoke/smoke.ts" <<'EOF'
+          console.log("bun android compile smoke")
+          console.log(process.platform)
+          console.log(process.arch)
+          EOF
+          bun build "$RUNNER_TEMP/opencode-android-smoke/smoke.ts" \
+            --compile \
+            --target=bun-android-arm64 \
+            --outfile="$RUNNER_TEMP/opencode-android-smoke/smoke"
+          bun packages/opencode/script/patch-android-elf.ts "$RUNNER_TEMP/opencode-android-smoke/smoke"
+          file "$RUNNER_TEMP/opencode-android-smoke/smoke" | tee "$RUNNER_TEMP/opencode-android-smoke/file.txt"
+          readelf -l "$RUNNER_TEMP/opencode-android-smoke/smoke" > "$RUNNER_TEMP/opencode-android-smoke/readelf-program-headers.txt"
+          readelf -S "$RUNNER_TEMP/opencode-android-smoke/smoke" > "$RUNNER_TEMP/opencode-android-smoke/readelf-sections.txt"
+          readelf -d "$RUNNER_TEMP/opencode-android-smoke/smoke" > "$RUNNER_TEMP/opencode-android-smoke/readelf-dynamic.txt"
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: bun-android-compile-smoke
+          path: ${{ runner.temp }}/opencode-android-smoke
+
   sign-cli-windows:
     needs:
       - build-cli
diff --git a/.github/workflows/termux-release-branch-cleanup.yml b/.github/workflows/termux-release-branch-cleanup.yml
new file mode 100644
index 000000000000..902ecca36d2f
--- /dev/null
+++ b/.github/workflows/termux-release-branch-cleanup.yml
@@ -0,0 +1,89 @@
+name: termux-release-branch-cleanup
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_branch:
+        description: "Release branch to clean up, for example release-1.17.13"
+        required: false
+        type: string
+        default: ""
+      checkpoint_pr:
+        description: "Checkpoint PR number or URL to verify before cleanup"
+        required: false
+        type: string
+        default: ""
+      cleanup_limit:
+        description: "Number of recent merged checkpoint PRs to scan"
+        required: false
+        type: string
+        default: "100"
+  schedule:
+    - cron: "37 8 * * *"
+
+permissions:
+  actions: read
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: read
+  discussions: read
+  id-token: none
+  issues: read
+  models: read
+  packages: read
+  pages: read
+  pull-requests: read
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-branch-cleanup-${{ inputs.release_branch || inputs.checkpoint_pr || github.event_name }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  cleanup:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout automation branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          ref: dev
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Delete release branches after merged checkpoints
+        env:
+          CHECKPOINT_PR: ${{ inputs.checkpoint_pr }}
+          SOURCE_BRANCH: ${{ inputs.release_branch }}
+          CLEANUP_LIMIT: ${{ inputs.cleanup_limit || '100' }}
+        run: bash .github/scripts/termux-cleanup-release-branch.sh
diff --git a/.github/workflows/termux-release-checkpoint.yml b/.github/workflows/termux-release-checkpoint.yml
new file mode 100644
index 000000000000..a69a1a596979
--- /dev/null
+++ b/.github/workflows/termux-release-checkpoint.yml
@@ -0,0 +1,106 @@
+name: termux-release-checkpoint
+
+on:
+  workflow_dispatch:
+    inputs:
+      source_branch:
+        description: "Release branch to checkpoint from"
+        required: true
+        type: string
+      source_sha:
+        description: "Release branch SHA; defaults to source branch head"
+        required: false
+        type: string
+        default: ""
+      destination_branch:
+        description: "Reusable Termux patch branch"
+        required: false
+        type: string
+        default: "termux-target"
+      reviewer:
+        description: "GitHub username to request as reviewer"
+        required: false
+        type: string
+        default: "wallentx"
+
+permissions:
+  actions: read
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: read
+  discussions: read
+  id-token: none
+  issues: write
+  models: read
+  packages: read
+  pages: read
+  pull-requests: write
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-checkpoint-${{ inputs.source_branch }}-${{ inputs.destination_branch }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  checkpoint:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout destination branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.destination_branch }}
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Configure git
+        run: bash .github/scripts/termux-configure-git.sh --origin "${SOURCE_BRANCH}" "${DESTINATION_BRANCH}"
+        env:
+          SOURCE_BRANCH: ${{ inputs.source_branch }}
+          DESTINATION_BRANCH: ${{ inputs.destination_branch || 'termux-target' }}
+
+      - name: Create checkpoint PR
+        id: checkpoint-pr
+        env:
+          REQUESTED_SOURCE_BRANCH: ${{ inputs.source_branch }}
+          REQUESTED_SOURCE_SHA: ${{ inputs.source_sha }}
+          DESTINATION_BRANCH: ${{ inputs.destination_branch || 'termux-target' }}
+          REVIEWER: ${{ inputs.reviewer || 'wallentx' }}
+        run: bash .github/scripts/termux-create-checkpoint-pr.sh
+
+      - name: Delete release branch after merged checkpoint
+        if: steps.checkpoint-pr.outputs.pr_url != ''
+        env:
+          CHECKPOINT_PR: ${{ steps.checkpoint-pr.outputs.pr_url }}
+          SOURCE_BRANCH: ${{ inputs.source_branch }}
+        run: bash .github/scripts/termux-cleanup-release-branch.sh
diff --git a/.github/workflows/termux-release-deploy.yml b/.github/workflows/termux-release-deploy.yml
new file mode 100644
index 000000000000..2fa9aff48305
--- /dev/null
+++ b/.github/workflows/termux-release-deploy.yml
@@ -0,0 +1,223 @@
+name: termux-release-deploy
+
+on:
+  push:
+    branches:
+      - "release-*"
+  workflow_dispatch:
+    inputs:
+      release_branch:
+        description: "Release branch to deploy, for example release-1.17.13"
+        required: true
+        type: string
+      release_sha:
+        description: "Release branch SHA to deploy; defaults to current branch head"
+        required: false
+        type: string
+        default: ""
+      pr_number:
+        description: "Merged release PR number, optional with pr_head_sha"
+        required: false
+        type: string
+        default: ""
+      pr_head_sha:
+        description: "Merged release PR head SHA, optional with pr_number"
+        required: false
+        type: string
+        default: ""
+      destination_branch:
+        description: "Reusable Termux patch branch to checkpoint into"
+        required: false
+        type: string
+        default: "termux-target"
+      reviewer:
+        description: "GitHub username to request on checkpoint PR"
+        required: false
+        type: string
+        default: "wallentx"
+
+permissions:
+  actions: write
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: write
+  discussions: read
+  id-token: none
+  issues: write
+  models: read
+  packages: read
+  pages: read
+  pull-requests: write
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-deploy-${{ inputs.release_branch || github.ref_name }}
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  deploy:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 180
+    env:
+      TERMUX_AUTOMATION_DIR: ${{ github.workspace }}/.termux-release-automation
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout release branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ inputs.release_branch || github.ref_name }}
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Checkout automation helpers
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          ref: ${{ github.workflow_sha }}
+          path: .termux-release-automation
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-validate-gh-env.sh"
+
+      - name: Configure git
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-configure-git.sh"
+
+      - name: Resolve release ref
+        id: release-ref
+        env:
+          INPUT_RELEASE_BRANCH: ${{ inputs.release_branch }}
+          INPUT_RELEASE_SHA: ${{ inputs.release_sha }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-resolve-release-ref.sh"
+
+      - name: Read release metadata
+        id: metadata
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-read-release-metadata.sh"
+
+      - name: Find merged release PR
+        id: pr
+        if: steps.metadata.outputs.deploy == 'true'
+        env:
+          RELEASE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+          RELEASE_SHA: ${{ steps.release-ref.outputs.sha }}
+          INPUT_PR_NUMBER: ${{ inputs.pr_number }}
+          INPUT_PR_HEAD_SHA: ${{ inputs.pr_head_sha }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-find-release-pr.sh"
+
+      - name: Create Android build deployment
+        id: android-deployment
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists != 'true'
+        env:
+          RELEASE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+          RELEASE_SHA: ${{ steps.release-ref.outputs.sha }}
+          TERMUX_TAG: ${{ steps.metadata.outputs.termux_tag }}
+          GH_TOKEN: ${{ github.token }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-create-android-build-deployment.sh"
+
+      - name: Build Android artifact
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists != 'true'
+        uses: ./.github/actions/build-android-cli
+        with:
+          version: ${{ steps.metadata.outputs.build_version }}
+          release: ""
+          repo: ${{ github.repository }}
+
+      - name: Promote built Android artifact
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists != 'true'
+        run: |
+          set -euo pipefail
+          mkdir -p promoted
+          cp packages/opencode/dist/opencode-android-arm64.tar.gz promoted/
+          sha256sum promoted/opencode-android-arm64.tar.gz
+
+      - name: Finish Android build deployment
+        if: always() && steps.android-deployment.outputs.deployment_id != ''
+        env:
+          DEPLOYMENT_ID: ${{ steps.android-deployment.outputs.deployment_id }}
+          BUILD_RESULT: ${{ job.status }}
+          GH_TOKEN: ${{ github.token }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-finish-android-build-deployment.sh"
+
+      - name: Download existing Android artifact if release needs repair
+        if: steps.metadata.outputs.deploy == 'true' && steps.metadata.outputs.asset_exists == 'true'
+        run: |
+          set -euo pipefail
+          mkdir -p promoted
+          gh release download "${TERMUX_TAG}" \
+            --repo "${GITHUB_REPOSITORY}" \
+            --pattern opencode-android-arm64.tar.gz \
+            --dir promoted \
+            --clobber
+        env:
+          TERMUX_TAG: ${{ steps.metadata.outputs.termux_tag }}
+
+      - name: Create or repair mirrored release
+        if: steps.metadata.outputs.deploy == 'true'
+        env:
+          UPSTREAM_TAG: ${{ steps.metadata.outputs.upstream_tag }}
+          UPSTREAM_REPO: ${{ steps.metadata.outputs.upstream_repo }}
+          UPSTREAM_NAME: ${{ steps.metadata.outputs.upstream_name }}
+          TERMUX_TAG: ${{ steps.metadata.outputs.termux_tag }}
+          UPSTREAM_PRERELEASE: ${{ steps.metadata.outputs.upstream_prerelease }}
+          UPSTREAM_HTML_URL: ${{ steps.metadata.outputs.upstream_html_url }}
+          RELEASE_TRAIN: ${{ steps.metadata.outputs.release_train }}
+          RELEASE_EXISTS: ${{ steps.metadata.outputs.release_exists }}
+          PR_NUMBER: ${{ steps.pr.outputs.number }}
+          HEAD_SHA: ${{ steps.pr.outputs.head_sha }}
+          RELEASE_SHA: ${{ steps.release-ref.outputs.sha }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-create-or-update-mirrored-release.sh"
+
+      - name: Open checkpoint PR
+        id: checkpoint-pr
+        if: steps.metadata.outputs.deploy == 'true'
+        env:
+          SOURCE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+          SOURCE_SHA: ${{ steps.release-ref.outputs.sha }}
+          DESTINATION_BRANCH: ${{ inputs.destination_branch || 'termux-target' }}
+          REVIEWER: ${{ inputs.reviewer || 'wallentx' }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-create-checkpoint-pr.sh"
+
+      - name: Delete release branch after merged checkpoint
+        if: steps.metadata.outputs.deploy == 'true' && steps.checkpoint-pr.outputs.pr_url != ''
+        env:
+          CHECKPOINT_PR: ${{ steps.checkpoint-pr.outputs.pr_url }}
+          SOURCE_BRANCH: ${{ steps.release-ref.outputs.branch }}
+        run: bash "${TERMUX_AUTOMATION_DIR}/.github/scripts/termux-cleanup-release-branch.sh"
+
+      - name: Restore local action metadata
+        if: always()
+        run: |
+          set -euo pipefail
+          if [[ ! -d "${TERMUX_AUTOMATION_DIR}/.github/actions" ]]; then
+            echo "Automation helpers were not checked out; skipping local action metadata restore."
+            exit 0
+          fi
+          mkdir -p .github/actions
+          cp -a "${TERMUX_AUTOMATION_DIR}/.github/actions/build-android-cli" .github/actions/
+          cp -a "${TERMUX_AUTOMATION_DIR}/.github/actions/setup-bun" .github/actions/
diff --git a/.github/workflows/termux-release-watch.yml b/.github/workflows/termux-release-watch.yml
new file mode 100644
index 000000000000..d61b7362e7cc
--- /dev/null
+++ b/.github/workflows/termux-release-watch.yml
@@ -0,0 +1,174 @@
+name: termux-release-watch
+
+on:
+  schedule:
+    - cron: "17 */3 * * *"
+  workflow_dispatch:
+    inputs:
+      upstream_tag:
+        description: "Specific upstream version or tag to process, for example 1.17.13 or v1.17.13"
+        required: false
+        type: string
+        default: ""
+      patch_branch:
+        description: "Branch carrying reusable Termux fixes"
+        required: false
+        type: string
+        default: "termux-target"
+      reviewer:
+        description: "GitHub username to request as reviewer"
+        required: false
+        type: string
+        default: "wallentx"
+      bypass_prior_release_train:
+        description: "Allow workflow_dispatch to update a train while another Termux release PR is open"
+        required: false
+        type: boolean
+        default: false
+
+permissions:
+  actions: write
+  artifact-metadata: read
+  attestations: read
+  checks: read
+  contents: write
+  deployments: read
+  discussions: read
+  id-token: none
+  issues: write
+  models: read
+  packages: read
+  pages: read
+  pull-requests: write
+  security-events: read
+  statuses: read
+
+concurrency:
+  group: termux-release-watch
+  cancel-in-progress: false
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  look-for-newer-release:
+    if: github.repository == 'wallentx/opencode-termux'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 15
+    outputs:
+      selected: ${{ steps.upstream.outputs.selected }}
+      upstream_tag: ${{ steps.upstream.outputs.upstream_tag }}
+      upstream_name: ${{ steps.upstream.outputs.upstream_name }}
+      upstream_html_url: ${{ steps.upstream.outputs.upstream_html_url }}
+      upstream_prerelease: ${{ steps.upstream.outputs.upstream_prerelease }}
+      upstream_target: ${{ steps.upstream.outputs.upstream_target }}
+      upstream_id: ${{ steps.upstream.outputs.upstream_id }}
+      release_train: ${{ steps.upstream.outputs.release_train }}
+      release_branch: ${{ steps.upstream.outputs.release_branch }}
+      work_branch: ${{ steps.upstream.outputs.work_branch }}
+      termux_tag: ${{ steps.upstream.outputs.termux_tag }}
+      body: ${{ steps.upstream.outputs.body }}
+    env:
+      UPSTREAM_REPO: anomalyco/opencode
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout automation branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Select upstream release
+        id: upstream
+        env:
+          REQUESTED_TAG: ${{ inputs.upstream_tag }}
+          BYPASS_PRIOR_RELEASE_TRAIN: ${{ inputs.bypass_prior_release_train || false }}
+        run: bash .github/scripts/termux-select-release.sh
+
+  create-release-pr:
+    needs: look-for-newer-release
+    if: github.repository == 'wallentx/opencode-termux' && needs.look-for-newer-release.outputs.selected == 'true'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 45
+    env:
+      REVIEWER: ${{ inputs.reviewer || 'wallentx' }}
+      UPSTREAM_REPO: anomalyco/opencode
+      PATCH_BRANCH: ${{ inputs.patch_branch || 'termux-target' }}
+    steps:
+      - name: Generate GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          client-id: ${{ vars.APP_CLIENT_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Export GitHub App token for gh
+        env:
+          APP_TOKEN: ${{ steps.app-token.outputs.token }}
+        run: echo "GH_TOKEN=${APP_TOKEN}" >> "${GITHUB_ENV}"
+
+      - name: Checkout automation branch
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: 🧰 Actions Toolbox
+        uses: wallentx/gh-actions/composite/actions-toolbox@main
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          checkout: false
+
+      - name: Setup Bun
+        uses: ./.github/actions/setup-bun
+
+      - name: Validate GitHub CLI environment
+        run: bash .github/scripts/termux-validate-gh-env.sh
+
+      - name: Configure git
+        env:
+          UPSTREAM_TAG: ${{ needs.look-for-newer-release.outputs.upstream_tag }}
+        run: |
+          set -euo pipefail
+          bash .github/scripts/termux-configure-git.sh \
+            --origin "${PATCH_BRANCH}" \
+            --upstream-tag "${UPSTREAM_REPO}" "${UPSTREAM_TAG}"
+
+      - name: Create or update release train PR
+        id: pr
+        env:
+          UPSTREAM_TAG: ${{ needs.look-for-newer-release.outputs.upstream_tag }}
+          UPSTREAM_NAME: ${{ needs.look-for-newer-release.outputs.upstream_name }}
+          UPSTREAM_HTML_URL: ${{ needs.look-for-newer-release.outputs.upstream_html_url }}
+          UPSTREAM_PRERELEASE: ${{ needs.look-for-newer-release.outputs.upstream_prerelease }}
+          UPSTREAM_TARGET: ${{ needs.look-for-newer-release.outputs.upstream_target }}
+          UPSTREAM_ID: ${{ needs.look-for-newer-release.outputs.upstream_id }}
+          RELEASE_TRAIN: ${{ needs.look-for-newer-release.outputs.release_train }}
+          RELEASE_BRANCH: ${{ needs.look-for-newer-release.outputs.release_branch }}
+          WORK_BRANCH: ${{ needs.look-for-newer-release.outputs.work_branch }}
+          TERMUX_TAG: ${{ needs.look-for-newer-release.outputs.termux_tag }}
+          UPSTREAM_BODY: ${{ needs.look-for-newer-release.outputs.body }}
+        run: bash .github/scripts/termux-create-release-pr.sh
diff --git a/bun.lock b/bun.lock
index c3457f10924e..a1140535b05c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -29,7 +29,7 @@
     },
     "packages/app": {
       "name": "@opencode-ai/app",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@dnd-kit/abstract": "0.5.0",
         "@dnd-kit/dom": "0.5.0",
@@ -93,7 +93,7 @@
     },
     "packages/cli": {
       "name": "@opencode-ai/cli",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "bin": {
         "lildax": "./bin/lildax.cjs",
       },
@@ -141,7 +141,7 @@
     },
     "packages/codemode": {
       "name": "@opencode-ai/codemode",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -155,7 +155,7 @@
     },
     "packages/console/app": {
       "name": "@opencode-ai/console-app",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -191,7 +191,7 @@
     },
     "packages/console/core": {
       "name": "@opencode-ai/console-core",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -218,7 +218,7 @@
     },
     "packages/console/function": {
       "name": "@opencode-ai/console-function",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@ai-sdk/anthropic": "3.0.82",
         "@ai-sdk/openai": "3.0.48",
@@ -240,7 +240,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode-ai/console-mail",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -264,7 +264,7 @@
     },
     "packages/console/support": {
       "name": "@opencode-ai/console-support",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode-ai/console-core": "workspace:*",
@@ -284,7 +284,7 @@
     },
     "packages/core": {
       "name": "@opencode-ai/core",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -379,7 +379,7 @@
     },
     "packages/desktop": {
       "name": "@opencode-ai/desktop",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "effect": "catalog:",
@@ -433,7 +433,7 @@
     },
     "packages/effect-drizzle-sqlite": {
       "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
@@ -447,7 +447,7 @@
     },
     "packages/effect-sqlite-node": {
       "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "effect": "catalog:",
       },
@@ -459,7 +459,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode-ai/enterprise",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -491,7 +491,7 @@
     },
     "packages/function": {
       "name": "@opencode-ai/function",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -507,7 +507,7 @@
     },
     "packages/http-recorder": {
       "name": "@opencode-ai/http-recorder",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@effect/platform-node": "4.0.0-beta.83",
         "@effect/platform-node-shared": "4.0.0-beta.83",
@@ -538,7 +538,7 @@
     },
     "packages/llm": {
       "name": "@opencode-ai/llm",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/schema": "workspace:*",
         "@smithy/eventstream-codec": "4.2.14",
@@ -557,7 +557,7 @@
     },
     "packages/opencode": {
       "name": "opencode",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "bin": {
         "opencode": "./bin/opencode",
       },
@@ -688,7 +688,7 @@
     },
     "packages/plugin": {
       "name": "@opencode-ai/plugin",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode-ai/sdk": "workspace:*",
@@ -764,7 +764,7 @@
     },
     "packages/sdk/js": {
       "name": "@opencode-ai/sdk",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "cross-spawn": "catalog:",
       },
@@ -779,7 +779,7 @@
     },
     "packages/server": {
       "name": "@opencode-ai/server",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/protocol": "workspace:*",
@@ -794,7 +794,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode-ai/session-ui",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode-ai/core": "workspace:*",
@@ -838,7 +838,7 @@
     },
     "packages/slack": {
       "name": "@opencode-ai/slack",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/sdk": "workspace:*",
         "@slack/bolt": "^3.17.1",
@@ -851,7 +851,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode-ai/stats-app",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@opencode-ai/stats-core": "workspace:*",
@@ -884,7 +884,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode-ai/stats-core",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -903,7 +903,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode-ai/stats-server",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -944,7 +944,7 @@
     },
     "packages/tui": {
       "name": "@opencode-ai/tui",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@opencode-ai/core": "workspace:*",
         "@opencode-ai/plugin": "workspace:*",
@@ -971,7 +971,7 @@
     },
     "packages/ui": {
       "name": "@opencode-ai/ui",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -1022,7 +1022,7 @@
     },
     "packages/web": {
       "name": "@opencode-ai/web",
-      "version": "1.17.15",
+      "version": "1.17.16",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
diff --git a/packages/app/package.json b/packages/app/package.json
index 7430a614bfaa..11a790f386af 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "description": "",
   "type": "module",
   "exports": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index eb3bb1bd01b1..d3b9981d1af5 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/cli",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "bin": {
diff --git a/packages/codemode/package.json b/packages/codemode/package.json
index 7646ce44b2ba..49bd6edac51f 100644
--- a/packages/codemode/package.json
+++ b/packages/codemode/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/codemode",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "description": "Effect-native confined code execution over schema-described tools",
   "private": true,
   "type": "module",
diff --git a/packages/console/app/package.json b/packages/console/app/package.json
index 955a6e916223..aa55ac720f18 100644
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/console/core/package.json b/packages/console/core/package.json
index 1a2f180c4f5d..c009a35a80b9 100644
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/console/function/package.json b/packages/console/function/package.json
index 946e7ddf8d91..69904bea9064 100644
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/console/mail/package.json b/packages/console/mail/package.json
index 7977048f5cde..31952653942e 100644
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-mail",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "dependencies": {
     "@jsx-email/all": "2.2.3",
     "@jsx-email/cli": "1.4.3",
diff --git a/packages/console/support/package.json b/packages/console/support/package.json
index f56e5da41354..ef29aa406461 100644
--- a/packages/console/support/package.json
+++ b/packages/console/support/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-support",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/core/package.json b/packages/core/package.json
index d95ef678e483..c34c4e446fb8 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/core",
   "type": "module",
   "license": "MIT",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 76f25878704b..e12ad568b98d 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@opencode-ai/desktop",
   "private": true,
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "homepage": "https://opencode.ai",
diff --git a/packages/effect-drizzle-sqlite/package.json b/packages/effect-drizzle-sqlite/package.json
index 5b901aaa27a6..e6dde2a1f861 100644
--- a/packages/effect-drizzle-sqlite/package.json
+++ b/packages/effect-drizzle-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/effect-drizzle-sqlite",
   "type": "module",
   "license": "MIT",
diff --git a/packages/effect-sqlite-node/package.json b/packages/effect-sqlite-node/package.json
index 0f60780033c8..100571826df9 100644
--- a/packages/effect-sqlite-node/package.json
+++ b/packages/effect-sqlite-node/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/effect-sqlite-node",
   "type": "module",
   "license": "MIT",
diff --git a/packages/enterprise/package.json b/packages/enterprise/package.json
index c319fd05bf9f..80aa77e49015 100644
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/enterprise",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/function/package.json b/packages/function/package.json
index c3fd3baae20e..eee6e3dcd54d 100644
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/function",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",
diff --git a/packages/http-recorder/package.json b/packages/http-recorder/package.json
index ad5248cee567..13c7e04eb144 100644
--- a/packages/http-recorder/package.json
+++ b/packages/http-recorder/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/http-recorder",
   "description": "Record and replay Effect HTTP client traffic with deterministic cassettes",
   "type": "module",
diff --git a/packages/llm/package.json b/packages/llm/package.json
index 28b58bd2711a..41cecee3c559 100644
--- a/packages/llm/package.json
+++ b/packages/llm/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "@opencode-ai/llm",
   "type": "module",
   "license": "MIT",
diff --git a/packages/opencode/package.json b/packages/opencode/package.json
index eb05f6e384a2..d62f193899fe 100644
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "name": "opencode",
   "type": "module",
   "license": "MIT",
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
index e76af5b02510..2078a196ad9d 100644
--- a/packages/plugin/package.json
+++ b/packages/plugin/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/plugin",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/sdk/js/package.json b/packages/sdk/js/package.json
index 0b0739061888..f2a5708b2c00 100644
--- a/packages/sdk/js/package.json
+++ b/packages/sdk/js/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/sdk",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/server/package.json b/packages/server/package.json
index 855fd297bc92..676241d1c3b1 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/server",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/session-ui/package.json b/packages/session-ui/package.json
index 7443187d6874..1734449d1d6a 100644
--- a/packages/session-ui/package.json
+++ b/packages/session-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/session-ui",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/slack/package.json b/packages/slack/package.json
index ccb37497d758..ebef44433f84 100644
--- a/packages/slack/package.json
+++ b/packages/slack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/slack",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "scripts": {
diff --git a/packages/stats/app/package.json b/packages/stats/app/package.json
index c9df8049da40..811123b5e0b8 100644
--- a/packages/stats/app/package.json
+++ b/packages/stats/app/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-app",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/core/package.json b/packages/stats/core/package.json
index 3c6f06866079..47e55ec30669 100644
--- a/packages/stats/core/package.json
+++ b/packages/stats/core/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-core",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/stats/server/package.json b/packages/stats/server/package.json
index 53601d120efd..c1f0f7045c19 100644
--- a/packages/stats/server/package.json
+++ b/packages/stats/server/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/stats-server",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/tui/package.json b/packages/tui/package.json
index 63c71ea273b9..cd853f05b5f9 100644
--- a/packages/tui/package.json
+++ b/packages/tui/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/tui",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "private": true,
   "type": "module",
   "license": "MIT",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 554b5a688634..f521ec861adb 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/ui",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "type": "module",
   "license": "MIT",
   "repository": {
diff --git a/packages/web/package.json b/packages/web/package.json
index b19d6fa5533f..c65c9c12eaf0 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -2,7 +2,7 @@
   "name": "@opencode-ai/web",
   "type": "module",
   "license": "MIT",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "scripts": {
     "dev": "astro dev",
     "dev:remote": "VITE_API_URL=https://api.opencode.ai astro dev",