Merge branch 'dev' into zen-body-limit

feat(console): enforce 10mb request body limit on zen api
2026-08-03 16:56:33 -04:00 · 2026-07-04 01:33:46 +02:00 · 2026-07-03 23:01:20 +02:00
247 changed files with 9596 additions and 39595 deletions
@@ -125,4 +125,4 @@ OpenCode 内置两种 Agent，可用 `Tab` 键快速切换：

 ---

-**加入我们的社区** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=52ao9352-5623-4fa0-b7dd-3407c392c1af&qr_code=true) | [X.com](https://x.com/opencode)
+**加入我们的社区** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true) | [X.com](https://x.com/opencode)
@@ -125,4 +125,4 @@ OpenCode 內建了兩種 Agent，您可以使用 `Tab` 鍵快速切換。

 ---

-**加入我們的社群** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=52ao9352-5623-4fa0-b7dd-3407c392c1af&qr_code=true) | [X.com](https://x.com/opencode)
+**加入我們的社群** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true) | [X.com](https://x.com/opencode)
@@ -29,7 +29,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "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.13",
      "bin": {
        "lildax": "./bin/lildax.cjs",
      },
@@ -141,7 +141,7 @@
    },
    "packages/codemode": {
      "name": "@opencode-ai/codemode",
-      "version": "1.17.15",
+      "version": "0.0.1",
      "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.13",
      "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.13",
      "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.13",
      "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.13",
      "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.13",
      "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.13",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -378,7 +378,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -446,7 +446,7 @@
    },
    "packages/effect-sqlite-node": {
      "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -458,7 +458,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -490,7 +490,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "dependencies": {
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
@@ -556,7 +556,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -687,7 +687,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode-ai/sdk": "workspace:*",
@@ -704,9 +704,9 @@
        "typescript": "catalog:",
      },
      "peerDependencies": {
-        "@opentui/core": ">=0.4.3",
-        "@opentui/keymap": ">=0.4.3",
-        "@opentui/solid": ">=0.4.3",
+        "@opentui/core": ">=0.3.4",
+        "@opentui/keymap": ">=0.3.4",
+        "@opentui/solid": ">=0.3.4",
      },
      "optionalPeers": [
        "@opentui/core",
@@ -763,7 +763,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -778,7 +778,7 @@
    },
    "packages/server": {
      "name": "@opencode-ai/server",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/protocol": "workspace:*",
@@ -793,7 +793,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode-ai/session-ui",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -837,7 +837,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "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.15",
+      "version": "1.17.13",
      "dependencies": {
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
@@ -970,7 +970,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -1021,7 +1021,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.17.15",
+      "version": "1.17.13",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1096,9 +1096,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.4.3",
-    "@opentui/keymap": "0.4.3",
-    "@opentui/solid": "0.4.3",
+    "@opentui/core": "0.3.4",
+    "@opentui/keymap": "0.3.4",
+    "@opentui/solid": "0.3.4",
    "@pierre/diffs": "1.2.10",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -2031,27 +2031,27 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.41.1", "", {}, "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA=="],

-    "@opentui/core": ["@opentui/core@0.4.3", "", { "dependencies": { "bun-ffi-structs": "0.2.4", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.4.3", "@opentui/core-darwin-x64": "0.4.3", "@opentui/core-linux-arm64": "0.4.3", "@opentui/core-linux-arm64-musl": "0.4.3", "@opentui/core-linux-x64": "0.4.3", "@opentui/core-linux-x64-musl": "0.4.3", "@opentui/core-win32-arm64": "0.4.3", "@opentui/core-win32-x64": "0.4.3" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-rrJfAk13tALDqldYjhc78eWQ+aKq1iknJgffIOg3OwyZoqQo+p6gtuqyhmWvXIfQzlNUbpgpCPcxbXlhMnlaHQ=="],
+    "@opentui/core": ["@opentui/core@0.3.4", "", { "dependencies": { "bun-ffi-structs": "0.2.2", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.3.4", "@opentui/core-darwin-x64": "0.3.4", "@opentui/core-linux-arm64": "0.3.4", "@opentui/core-linux-arm64-musl": "0.3.4", "@opentui/core-linux-x64": "0.3.4", "@opentui/core-linux-x64-musl": "0.3.4", "@opentui/core-win32-arm64": "0.3.4", "@opentui/core-win32-x64": "0.3.4" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-y0DlrChP9lcJ4jC5z/1wMS34+ygfSTW7gD5OJHwJaAScfmlFvuJOZbwmCGrJURZ+5wFBxuOi9LatZsmeAUIKAA=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.4.3", "", { "os": "darwin", "cpu": "arm64" }, "sha512-p5+7AAxpxGuDGagyQfewKtmTFnN7THvTVY4FyKqUtJomNaHdQXPHztapNNzMx0DGWbwOUbVKzpL+yc3CZY3chQ=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.3.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-4A7JYXUsZqhu9PPCe07E30ourSJYkitkwMujUyNKjM5e/dHNDVnz+5r5cO3M5snofLafc1DN7+9jEPn4UQzchQ=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.4.3", "", { "os": "darwin", "cpu": "x64" }, "sha512-+fh0vEUE0lwVC7RW5ijYLRlTLp5NfvCRj8SzxDVd7IL2j2ssB6YXcfIbXq2EW7UGnrejwPRXf1tgUrIXW9KmOw=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.3.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-Jvm9E8n2sPhKEyKSXn9GlmJcj8WoJXJTooXb3djwjVaiimjihIj0XxHzCWhdqbDtQp+VxDFyCKoQagOOz20qhA=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.4.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-gl6qA5QJy6u8Cbt7gOtHbhhfMZ4qQDb0kEwFXHcMGmbnKzz4OHoq74D6tNjyvSQB9saoC7C6C0tvn2DcJOuNog=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.3.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-0uPuHCeZxm/O7+L+iNQl8zRAfehiwYstKkT9J0uTZO64/byBCLvy5lvn1DiE/72s/nTJ5nwpLN+pQs2/WYVKLQ=="],

-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.4.3", "", { "os": "linux", "cpu": "arm64" }, "sha512-8p8g8/AEq/xFGpQ7XcIFKcAqjc0QwsZcv+Ll9RbCDpUA56FGH6jfLDir0KYTNTgYXJTIrBIENI9K46VuxMUMQA=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.3.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-sJYUzYcSOb5PCXRlhwsse/fdsMiVomNvIwq/2TDhAANef+YPO3Br+OH9kQRbuj0bjVDmUS36SGYWSTFu2lUO+A=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.4.3", "", { "os": "linux", "cpu": "x64" }, "sha512-dXpJitiZdYE3hq2Pvx6e9I0uPQSOcnaLLp1pDgWAHv+3kvKSHEX//9Yr/pV/Ua6qqT7p+2D/K4vXNap/NKVo2w=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.3.4", "", { "os": "linux", "cpu": "x64" }, "sha512-btYIQeNdPbN4JCrCjVB/RwMGrnRY7qWB2piNEfALSByuULKNjPKQ33PYIj38Yd01zCvCV7FotIeXEGSHx3tgCA=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.4.3", "", { "os": "linux", "cpu": "x64" }, "sha512-/QiFpCrpU2O7vy8QYmLIQYbvAtKDgmqcVjR7dGtqSzkiQk3ktNJoo5RozG7ueXnjung1Wp0nKldKxo2Csg/OrA=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.3.4", "", { "os": "linux", "cpu": "x64" }, "sha512-fhmUey4oJJ2+N62xlIgAPxAl36Fa7wYffqDOT4QLpm0jfyD5xzo+wL/hr2zUqaEI439R8Iq6jHNxf/Nsx1WuuQ=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.4.3", "", { "os": "win32", "cpu": "arm64" }, "sha512-Mx2zuOjrhm/z2SDS6RExIyjP/SnN/8QhhagxURUw0jQi/NssGSeAllu1cBAFFnhobJL5QLTE4FU4CRhUK9svgg=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.3.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-sh432vPU+eLp8eA4I0KWKKn7D0VHbk01YTg6mA9/ihCNYHntc6LZ8/sLvsPv8CvKscMotfIkh3M5YhdS36BuXw=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.4.3", "", { "os": "win32", "cpu": "x64" }, "sha512-NuoqvWKGXaYnmlqvu7Gg2lLI6yVMnS9OfWBvxp+7Q+McSgHFSTQmYBXaPpvQ8HikpQXE1nCeMPtuSG4PdZHe2w=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.3.4", "", { "os": "win32", "cpu": "x64" }, "sha512-dw8FcjUZaLAjw25P3/7BarobCh/QOHn3srYaWYQdysoqyvSlPkQumpI8kV/KgpJtdITU1GW02MQC4EeLIFFalA=="],

-    "@opentui/keymap": ["@opentui/keymap@0.4.3", "", { "dependencies": { "@opentui/core": "0.4.3" }, "peerDependencies": { "@opentui/react": "0.4.3", "@opentui/solid": "0.4.3", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-sinX0pyQBRrEvo89PSSUbSUDIYpL3xWo81VEfec58VFoVRB5FG48/deAtvRTQfJ8w1kgbzN8hzdOXdSm61zBmw=="],
+    "@opentui/keymap": ["@opentui/keymap@0.3.4", "", { "dependencies": { "@opentui/core": "0.3.4" }, "peerDependencies": { "@opentui/react": "0.3.4", "@opentui/solid": "0.3.4", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-8fo6BZWQgCjANfbKkzPo0ghAzS1E7TlHjDDS+SUhrX01qEUO1clFTRssKluHbXd2UJY1Ehle01TV5bFmY78f8w=="],

-    "@opentui/solid": ["@opentui/solid@0.4.3", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.4.3", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-RcV0+S8HMdXOASyr7HmJUBuTUIaFPzAxMDa44VftS5C2JUgrmAuWo0Njv1q3TWRB1owjHnyKhEfWGKq7A82wxw=="],
+    "@opentui/solid": ["@opentui/solid@0.3.4", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.3.4", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-gin1VnsVBahX0nrU3mpgh5U1qvyJBIZu4NE5mc0YnObWOEf9HVNxKY4/BpUvQPh91kT6zeOzTBvAvYK4R7g9MQ=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -3243,7 +3243,7 @@

    "builder-util-runtime": ["builder-util-runtime@9.7.0", "", { "dependencies": { "debug": "^4.3.4", "sax": "^1.2.4" } }, "sha512-g/kR520giAFYkSXTzcmF3kqQq7wi8F6N6SzeDgZrqTBN+VHdmgWOyTdD1yD7AATDId/yXLvuP34CxW46/BwCdw=="],

-    "bun-ffi-structs": ["bun-ffi-structs@0.2.4", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-AJzsqoVFs1KBbJbWHIYrVZLDC3NhTqqh25awRXqzoLzmBAKr5oqk6+CwuYHAekKx+VBCYVohBoKuRq40dV+TYg=="],
+    "bun-ffi-structs": ["bun-ffi-structs@0.2.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-N/ZWtyN0piZlrXQT7TO0V+q952orYqkfhXRXM1Hcbb+R3QSiBH4vLnib187Mrs1H7pWIYECAmPeapGYDOMCl+w=="],

    "bun-pty": ["bun-pty@0.4.8", "", {}, "sha512-rO70Mrbr13+jxHHHu2YBkk2pNqrJE5cJn29WE++PUr+GFA0hq/VgtQPZANJ8dJo6d7XImvBk37Innt8GM7O28w=="],

@@ -5591,6 +5591,8 @@

    "yoctocolors": ["yoctocolors@2.1.2", "", {}, "sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug=="],

+    "yoga-layout": ["yoga-layout@3.2.1", "", {}, "sha512-0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ=="],
+
    "youch": ["youch@4.1.0-beta.10", "", { "dependencies": { "@poppinss/colors": "^4.1.5", "@poppinss/dumper": "^0.6.4", "@speed-highlight/core": "^1.2.7", "cookie": "^1.0.2", "youch-core": "^0.3.3" } }, "sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ=="],

    "youch-core": ["youch-core@0.3.3", "", { "dependencies": { "@poppinss/exception": "^1.2.2", "error-stack-parser-es": "^1.0.5" } }, "sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA=="],
@@ -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-ovrz0pALxRek5VEqSYkVpzb9YeiiVQWxfAHZQ3kX0/0=",
+    "aarch64-linux": "sha256-+sqBt11Nl1fDrL1JvFAcN8JMWahspfbBPuMeM7YdagU=",
+    "aarch64-darwin": "sha256-PsZfcmMpz/Xzudjv4CQZu+wPfnyijrlVYeP2x9tRffk=",
+    "x86_64-darwin": "sha256-4TpIc3Gh9nDaA5Y1zkCq0KraMdWu+PWtYVY3p7/CsJ0="
  }
 }
@@ -39,9 +39,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.4.3",
-      "@opentui/keymap": "0.4.3",
-      "@opentui/solid": "0.4.3",
+      "@opentui/core": "0.3.4",
+      "@opentui/keymap": "0.3.4",
+      "@opentui/solid": "0.3.4",
      "@tanstack/solid-virtual": "3.13.28",
      "@shikijs/stream": "4.2.0",
      "ulid": "3.0.1",
@@ -48,40 +48,6 @@ test("does not reverse visible rows when the user wheels during shell remeasurem
  await reportVisualStability(testInfo, "wheel-during-resize", trace, rowPairPlan(regions, 1))
 })

-test("keeps moving upward while drag-selecting above the timeline", async ({ page }) => {
-  await setupTimeline(page, {
-    messages: history(80),
-    viewport: { width: 1400, height: 700 },
-    reducedMotion: true,
-  })
-  const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-  const text = page.getByText("History 79.", { exact: false })
-  await expect(text).toBeVisible()
-  await scroller.evaluate((element) => {
-    element.dataset.selectionLength = "0"
-    document.addEventListener("selectionchange", () => {
-      element.dataset.selectionLength = String(
-        Math.max(Number(element.dataset.selectionLength), window.getSelection()?.toString().length ?? 0),
-      )
-    })
-  })
-  const textBox = await text.boundingBox()
-  const scrollBox = await scroller.boundingBox()
-  expect(textBox).not.toBeNull()
-  expect(scrollBox).not.toBeNull()
-  if (!textBox || !scrollBox) return
-
-  await page.mouse.move(textBox.x + textBox.width - 10, textBox.y + textBox.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(textBox.x + 20, scrollBox.y - 120, { steps: 30 })
-
-  await expect.poll(() => scroller.evaluate((element) => Number(element.dataset.selectionLength))).toBeGreaterThan(0)
-  await expect
-    .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-    .toBeGreaterThan(500)
-  await page.mouse.up()
-})
-
 test("does not pull a keyboard-scrolled user during shell remeasurement", async ({ page }, testInfo) => {
  const shellID = "prt_keyboard_01_shell"
  const followingID = "prt_keyboard_02_following"
@@ -1,312 +0,0 @@
-import type { Page } from "@playwright/test"
-import { benchmark, expect } from "../benchmark"
-import { setupTimelineBenchmark } from "./session-timeline-benchmark.fixture"
-
-const changedLinesPerFile = 100
-const linesPerSide = changedLinesPerFile / 2
-const fileCounts = [1, 10, 100, 1_000, 10_000]
-const filesPerDirectory = 100
-const readyFrames = 3
-const completionTimeoutMs = Number(process.env.REVIEW_PANE_COMPLETION_TIMEOUT_MS ?? 900_000)
-
-type ReviewPaneScalingSample = {
-  observedAtMs: number
-  logicalRows: number
-  treeRows: number
-  fileRows: number
-  diffLines: number
-  header: string
-  ready: boolean
-}
-
-type ReviewPaneScalingProbe = {
-  startedAt?: number
-  firstTreeRowMs?: number
-  logicalTreeReadyMs?: number
-  firstDiffRenderMs?: number
-  stableReadyMs?: number
-  samples: ReviewPaneScalingSample[]
-  frameTimesMs: number[]
-  longTasks: { startTime: number; duration: number }[]
-  stop: () => void
-}
-
-benchmark.describe("performance: review pane scaling", () => {
-  for (const fileCount of fileCounts) {
-    const changedLines = fileCount * changedLinesPerFile
-
-    benchmark(
-      `${changedLines} changed lines across ${fileCount} ${fileCount === 1 ? "file" : "files"}`,
-      async ({ page, report }) => {
-        benchmark.setTimeout(1_200_000)
-        await page.emulateMedia({ reducedMotion: "reduce" })
-
-        const patchByteLimit = Number(process.env.REVIEW_PANE_PATCH_BYTE_LIMIT ?? Number.POSITIVE_INFINITY)
-        if (Number.isNaN(patchByteLimit) || patchByteLimit < 0)
-          throw new Error(`Invalid REVIEW_PANE_PATCH_BYTE_LIMIT: ${process.env.REVIEW_PANE_PATCH_BYTE_LIMIT}`)
-        const responseBody = JSON.stringify(createScalingDiffs(fileCount, patchByteLimit))
-        await setupTimelineBenchmark(page, {
-          historyTurns: 0,
-          eventBatch: 1,
-          newLayoutDesigns: true,
-        })
-        await page.route("**/vcs/diff**", (route) =>
-          route.fulfill({
-            status: 200,
-            contentType: "application/json",
-            headers: { "access-control-allow-origin": "*" },
-            body: responseBody,
-          }),
-        )
-
-        const expectedRows = fileCount + 2 + Math.ceil(fileCount / filesPerDirectory)
-        const metrics = await measureReviewPaneLoad(page, {
-          expectedFile: reviewFile(0),
-          expectedRows,
-        })
-        const search = await measureBroadReviewSearch(page, fileCount)
-
-        expect(metrics.logicalRows).toBe(expectedRows)
-        expect(metrics.fileRows).toBeGreaterThan(0)
-        expect(metrics.treeRows).toBeGreaterThan(0)
-        expect(metrics.diffLines).toBeGreaterThan(0)
-        expect(search.logicalRows).toBe(fileCount)
-        expect(search.renderedRows).toBeGreaterThan(0)
-        report(
-          { ...metrics, search },
-          {
-            fileCount,
-            changedLinesPerFile,
-            changedLines,
-            additions: changedLines / 2,
-            deletions: changedLines / 2,
-            patchLines: changedLines,
-            patchByteLimit: Number.isFinite(patchByteLimit) ? patchByteLimit : null,
-            payloadBytes: new TextEncoder().encode(responseBody).byteLength,
-            expectedRows,
-          },
-        )
-      },
-    )
-  }
-})
-
-async function measureBroadReviewSearch(page: Page, expectedRows: number) {
-  const filter = page.getByRole("searchbox", { name: "Filter files" })
-  await filter.evaluate((element) => {
-    element.addEventListener(
-      "input",
-      () => {
-        ;(window as Window & { __reviewSearchStartedAt?: number }).__reviewSearchStartedAt = performance.now()
-      },
-      { once: true, capture: true },
-    )
-  })
-  await filter.fill("file-")
-
-  return page.evaluate((expectedRows) => {
-    const startedAt = (window as Window & { __reviewSearchStartedAt?: number }).__reviewSearchStartedAt!
-    return new Promise<{ stableMs: number; logicalRows: number; renderedRows: number }>((resolve) => {
-      let previous = -1
-      let streak = 0
-      const sample = () => {
-        const tree = document.querySelector<HTMLElement>('#review-panel [data-component="file-tree-v2"]')
-        const rows = [...document.querySelectorAll<HTMLElement>('#review-panel [data-slot="file-tree-v2-row"]')]
-        const logicalRows = Number(tree?.dataset.totalRows ?? rows.length)
-        const ready =
-          logicalRows === expectedRows && rows.length > 0 && rows.every((row) => row.textContent?.includes("file-"))
-        streak = ready && rows.length === previous ? streak + 1 : ready ? 1 : 0
-        previous = rows.length
-        if (streak >= 3) {
-          resolve({ stableMs: performance.now() - startedAt, logicalRows, renderedRows: rows.length })
-          return
-        }
-        requestAnimationFrame(sample)
-      }
-      requestAnimationFrame(sample)
-    })
-  }, expectedRows)
-}
-
-function createScalingDiffs(fileCount: number, patchByteLimit: number) {
-  const changes = Array.from({ length: linesPerSide }, (_, index) => {
-    const line = String(index).padStart(3, "0")
-    return `-export const value_${line} = "before"\n+export const value_${line} = "after"`
-  }).join("\n")
-  let patchBytes = 0
-  let capped = false
-
-  return Array.from({ length: fileCount }, (_, index) => {
-    const file = reviewFile(index)
-    const fullPatch = [
-      `diff --git a/${file} b/${file}`,
-      `--- a/${file}`,
-      `+++ b/${file}`,
-      `@@ -1,${linesPerSide} +1,${linesPerSide} @@`,
-      changes,
-    ].join("\n")
-    if (index === 0 && fullPatch.length > patchByteLimit)
-      throw new Error(`REVIEW_PANE_PATCH_BYTE_LIMIT must include the active patch (${fullPatch.length} bytes)`)
-    const patch = !capped && patchBytes + fullPatch.length <= patchByteLimit ? fullPatch : emptyReviewPatch(file)
-    if (patch === fullPatch) patchBytes += fullPatch.length
-    else capped = true
-    return {
-      file,
-      patch,
-      additions: linesPerSide,
-      deletions: linesPerSide,
-      status: "modified" as const,
-    }
-  })
-}
-
-function emptyReviewPatch(file: string) {
-  return [`diff --git a/${file} b/${file}`, `--- a/${file}`, `+++ b/${file}`].join("\n")
-}
-
-function reviewFile(index: number) {
-  return `src/review/d${String(Math.floor(index / filesPerDirectory)).padStart(5, "0")}/file-${String(index).padStart(5, "0")}.ts`
-}
-
-async function measureReviewPaneLoad(page: Page, input: { expectedFile: string; expectedRows: number }) {
-  const toggle = page.getByRole("button", { name: "Toggle review" })
-  await expect(toggle).toBeVisible()
-  await toggle.evaluate((element) => element.setAttribute("data-review-pane-scaling-toggle", ""))
-  await installReviewPaneScalingProbe(page, input)
-  await toggle.click()
-  await page.waitForFunction(
-    () =>
-      (window as Window & { __reviewPaneScalingProbe?: ReviewPaneScalingProbe }).__reviewPaneScalingProbe
-        ?.stableReadyMs !== undefined,
-    undefined,
-    { timeout: completionTimeoutMs },
-  )
-
-  return page.evaluate(() => {
-    const probe = (window as Window & { __reviewPaneScalingProbe?: ReviewPaneScalingProbe }).__reviewPaneScalingProbe!
-    probe.stop()
-    const startedAt = probe.startedAt!
-    const final = probe.samples.at(-1)!
-    const resources = performance
-      .getEntriesByType("resource")
-      .filter((entry) => entry.name.includes("/vcs/diff")) as PerformanceResourceTiming[]
-    const resource = resources.at(-1)
-    const longTasks = probe.longTasks.filter(
-      (entry) => entry.startTime >= startedAt && entry.startTime <= startedAt + probe.stableReadyMs!,
-    )
-    const frameGaps = probe.frameTimesMs.map((time, index) => time - (probe.frameTimesMs[index - 1] ?? 0))
-
-    return {
-      firstTreeRowMs: probe.firstTreeRowMs ?? null,
-      logicalTreeReadyMs: probe.logicalTreeReadyMs ?? null,
-      firstDiffRenderMs: probe.firstDiffRenderMs ?? null,
-      stableReadyMs: probe.stableReadyMs ?? null,
-      responseStartMs: resource ? resource.responseStart - startedAt : null,
-      responseEndMs: resource ? resource.responseEnd - startedAt : null,
-      responseToStableMs: resource ? probe.stableReadyMs! - (resource.responseEnd - startedAt) : null,
-      treeRows: final.treeRows,
-      logicalRows: final.logicalRows,
-      fileRows: final.fileRows,
-      diffLines: final.diffLines,
-      samples: probe.samples.length,
-      maxFrameGapMs: Math.max(0, ...frameGaps),
-      longTaskCount: longTasks.length,
-      longTaskTotalMs: longTasks.reduce((sum, entry) => sum + entry.duration, 0),
-      maxLongTaskMs: Math.max(0, ...longTasks.map((entry) => entry.duration)),
-    }
-  })
-}
-
-async function installReviewPaneScalingProbe(page: Page, input: { expectedFile: string; expectedRows: number }) {
-  await page.evaluate(
-    ({ expectedFile, expectedRows, stableFrames }) => {
-      let running = true
-      let readyStreak = 0
-      const basename = expectedFile.split("/").at(-1)!
-      const longTaskObserver = PerformanceObserver.supportedEntryTypes.includes("longtask")
-        ? new PerformanceObserver((list) => {
-            probe.longTasks.push(
-              ...list.getEntries().map((entry) => ({ startTime: entry.startTime, duration: entry.duration })),
-            )
-          })
-        : undefined
-      const probe: ReviewPaneScalingProbe = {
-        samples: [],
-        frameTimesMs: [],
-        longTasks: [],
-        stop: () => {
-          running = false
-          longTaskObserver?.disconnect()
-        },
-      }
-
-      const sample = (time: number) => {
-        if (!running || probe.startedAt === undefined) return
-        const panel = document.querySelector<HTMLElement>("#review-panel")
-        const tree = panel?.querySelector<HTMLElement>('[data-component="file-tree-v2"]')
-        const rows = panel?.querySelectorAll('[data-slot="file-tree-v2-row"]') ?? []
-        const fileRows = panel?.querySelectorAll('button[data-slot="file-tree-v2-row"]') ?? []
-        const header =
-          panel?.querySelector<HTMLElement>('[data-slot="session-review-v2-file-header"]')?.textContent?.trim() ?? ""
-        const viewers = panel
-          ? [...panel.querySelectorAll<HTMLElement>('[data-component="file"][data-mode="diff"]')]
-          : []
-        const diffLines = viewers.reduce(
-          (sum, viewer) =>
-            sum + (viewer.querySelector("diffs-container")?.shadowRoot?.querySelectorAll("[data-line]").length ?? 0),
-          0,
-        )
-        const observedAtMs = time - probe.startedAt
-        const logicalRows = Number(tree?.dataset.totalRows ?? rows.length)
-        const ready =
-          logicalRows === expectedRows &&
-          fileRows.length > 0 &&
-          header.includes(basename) &&
-          viewers.length === 1 &&
-          diffLines > 0
-        const previous = probe.samples.at(-1)
-        const stable =
-          ready &&
-          previous?.ready === true &&
-          previous.logicalRows === logicalRows &&
-          previous.treeRows === rows.length &&
-          previous.fileRows === fileRows.length &&
-          previous.diffLines === diffLines &&
-          previous.header === header
-
-        probe.frameTimesMs.push(observedAtMs)
-        probe.samples.push({
-          observedAtMs,
-          logicalRows,
-          treeRows: rows.length,
-          fileRows: fileRows.length,
-          diffLines,
-          header,
-          ready,
-        })
-        if (probe.firstTreeRowMs === undefined && rows.length > 0) probe.firstTreeRowMs = observedAtMs
-        if (probe.logicalTreeReadyMs === undefined && logicalRows === expectedRows)
-          probe.logicalTreeReadyMs = observedAtMs
-        if (probe.firstDiffRenderMs === undefined && diffLines > 0) probe.firstDiffRenderMs = observedAtMs
-        readyStreak = !ready ? 0 : stable ? readyStreak + 1 : 1
-        if (readyStreak === stableFrames) probe.stableReadyMs = observedAtMs
-        if (probe.stableReadyMs === undefined) requestAnimationFrame(sample)
-      }
-
-      longTaskObserver?.observe({ type: "longtask", buffered: true })
-      document.addEventListener(
-        "click",
-        (event) => {
-          const toggle = event.target instanceof Element ? event.target.closest("button") : undefined
-          if (!toggle?.hasAttribute("data-review-pane-scaling-toggle")) return
-          probe.startedAt = performance.now()
-          performance.mark("opencode.review-pane-scaling.click")
-          requestAnimationFrame(sample)
-        },
-        { capture: true, once: true },
-      )
-      ;(window as Window & { __reviewPaneScalingProbe?: ReviewPaneScalingProbe }).__reviewPaneScalingProbe = probe
-    },
-    { ...input, stableFrames: readyFrames },
-  )
-}
@@ -1,151 +0,0 @@
-import type { Page } from "@playwright/test"
-import { expectSessionTitle } from "../../utils/waits"
-import { mockOpenCodeServer } from "../../utils/mock-server"
-import { benchmark, expect, withBenchmarkPage } from "../benchmark"
-import { fixture } from "./session-timeline-stress.fixture"
-import { installStressSessionTabs, stressSessionHref } from "./timeline-test-helpers"
-import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"
-
-type ParentHydrationBenchmarkMode = "natural" | "candidate"
-
-const mode = process.env.SESSION_PARENT_HYDRATION_BENCHMARK_MODE ?? "natural"
-if (mode !== "natural" && mode !== "candidate") throw new Error(`Unknown parent hydration benchmark mode: ${mode}`)
-const userID = "msg_parent_hydration_user"
-const user = {
-  ...fixture.messages[fixture.targetID][0]!,
-  info: { ...fixture.messages[fixture.targetID][0]!.info, id: userID, time: { created: 1700001000000 } },
-  parts: fixture.messages[fixture.targetID][0]!.parts.map((part, index) => ({
-    ...part,
-    id: `prt_parent_hydration_user_${index}`,
-    messageID: userID,
-  })),
-}
-const assistantSeed = fixture.messages[fixture.targetID][3]!
-const assistants = Array.from({ length: 14 }, (_, index) => {
-  const messageID = `msg_parent_hydration_${String(index).padStart(2, "0")}`
-  return {
-    ...assistantSeed,
-    info: {
-      ...assistantSeed.info,
-      id: messageID,
-      parentID: userID,
-      time: { created: 1700001001000 + index * 1_000, completed: 1700001001500 + index * 1_000 },
-    },
-    parts: assistantSeed.parts.map((part, partIndex) => ({
-      ...part,
-      id: `prt_parent_hydration_${String(index).padStart(2, "0")}_${partIndex}`,
-      messageID,
-    })),
-  }
-})
-const messages = [user, ...assistants]
-const target = fixture.sessions.find((session) => session.id === fixture.targetID)!
-const lastID = userID
-const lastPartID = assistants.at(-1)!.parts.at(-1)!.id
-
-benchmark("hydrates an orphaned latest turn after a cold session click", async ({ browser, report }, testInfo) => {
-  benchmark.setTimeout(180_000)
-  const results = [] as Awaited<ReturnType<typeof trial>>[]
-  for (let run = 0; run < 5; run++) {
-    results.push(
-      await withBenchmarkPage(
-        browser,
-        `session-parent-hydration-${mode}-${run}`,
-        (page) => trial(page, mode),
-        testInfo,
-      ),
-    )
-  }
-  const timing = results.map((result) => result.metrics.firstCorrectObservedMs!).sort((a, b) => a - b)
-  report(
-    {
-      results: results.map((result) => ({ ...result.metrics, historyGateCount: result.historyGateCount })),
-      summary: {
-        firstCorrectObservedMs: { min: timing[0], median: timing[2], max: timing.at(-1) },
-        blankSamples: results.map((result) => result.metrics.blankSamples),
-        requestCounts: {
-          list: results.map((result) => result.requestCounts.list),
-          parent: results.map((result) => result.requestCounts.parent),
-        },
-        historyGateCount: results.map((result) => result.historyGateCount),
-      },
-    },
-    { mode },
-  )
-})
-
-async function trial(page: Page, mode: ParentHydrationBenchmarkMode) {
-  const requests: { type: "list" | "parent"; before?: string }[] = []
-  const history = mode === "candidate" ? Promise.withResolvers<void>() : undefined
-  let historyGates = 0
-  await mockOpenCodeServer(page, {
-    sessions: fixture.sessions.filter((session) => session.id === fixture.sourceID),
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    messageDelay: 50,
-    onMessages: (request) => {
-      if (request.sessionID === fixture.targetID && request.phase === "start")
-        requests.push({ type: "list", before: request.before })
-    },
-    beforeMessagesResponse: (request) => {
-      if (mode !== "candidate" || request.sessionID !== fixture.targetID || !request.before) return Promise.resolve()
-      historyGates++
-      return history!.promise
-    },
-    onMessage: (request) => {
-      if (request.sessionID === fixture.targetID && request.messageID === userID) requests.push({ type: "parent" })
-    },
-    message: (sessionID, messageID) => {
-      if (sessionID !== fixture.targetID || messageID !== userID) return
-      return user
-    },
-    pageMessages: (sessionID, limit, before) => {
-      const items = sessionID === fixture.targetID ? messages : fixture.messages[fixture.sourceID]
-      const end = before ? items.findIndex((message) => message.info.id === before) : items.length
-      const start = Math.max(0, end - limit)
-      return { items: items.slice(start, end), cursor: start > 0 ? items[start]!.info.id : undefined }
-    },
-  })
-  await page.route(`**/session/${fixture.targetID}`, (route) =>
-    route.fulfill({ status: 200, contentType: "application/json", body: JSON.stringify(target) }),
-  )
-  await installStressSessionTabs(page, { sessionIDs: [fixture.sourceID] })
-  await page.goto(stressSessionHref(fixture.sourceID))
-  await expectSessionTitle(page, fixture.expected.sourceTitle)
-  await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
-
-  const href = stressSessionHref(fixture.targetID)
-  await page.evaluate(
-    ({ href, title }) => {
-      const link = document.createElement("a")
-      link.id = "parent-hydration-target"
-      link.href = href
-      link.textContent = title
-      document.body.append(link)
-    },
-    { href, title: target.title },
-  )
-  const metrics = await measureSessionSwitch(page, {
-    destinationIDs: messages.map((message) => message.info.id),
-    sourceIDs: fixture.messages[fixture.sourceID].map((message) => message.info.id),
-    lastID,
-    requiredPartID: lastPartID,
-    requireBottomAnchor: false,
-    href,
-    switch: async () => {
-      await page.locator("#parent-hydration-target").click()
-      await expectSessionTitle(page, target.title)
-    },
-  }).finally(() => history?.resolve())
-  expect(metrics.firstCorrectObservedMs).not.toBeNull()
-  const requestCounts = {
-    list: requests.filter((request) => request.type === "list").length,
-    parent: requests.filter((request) => request.type === "parent").length,
-  }
-  if (mode === "candidate") {
-    expect(requestCounts.parent).toBe(1)
-    expect(historyGates).toBe(1)
-  }
-  return { metrics, requestCounts, historyGateCount: historyGates }
-}
@@ -4,8 +4,6 @@ export type SessionSwitchSample = {
  source: string[]
  hasVisibleRows: boolean
  last: boolean
-  requiredPartVisible?: boolean
-  bottomAnchorRequired?: boolean
  bottomErrorPx?: number
  review?: {
    fileHost: boolean
@@ -43,8 +41,7 @@ export function isCorrectDestination(sample: SessionSwitchSample) {
    sample.destination.length > 0 &&
    sample.source.length === 0 &&
    sample.last &&
-    sample.requiredPartVisible !== false &&
-    (sample.bottomAnchorRequired === false || Math.abs(sample.bottomErrorPx ?? Infinity) <= 1)
+    Math.abs(sample.bottomErrorPx ?? Infinity) <= 1
  )
 }

@@ -8,16 +8,9 @@ type SessionSwitchProbe = {

 async function installSessionSwitchProbe(
  page: Page,
-  input: {
-    destinationIDs: string[]
-    sourceIDs: string[]
-    lastID: string
-    requiredPartID?: string
-    requireBottomAnchor?: boolean
-    href: string
-  },
+  input: { destinationIDs: string[]; sourceIDs: string[]; lastID: string; href: string },
 ) {
-  await page.evaluate(({ destinationIDs, sourceIDs, lastID, requiredPartID, requireBottomAnchor, href }) => {
+  await page.evaluate(({ destinationIDs, sourceIDs, lastID, href }) => {
    const destination = new Set(destinationIDs)
    const source = new Set(sourceIDs)
    const samples: SessionSwitchSample[] = []
@@ -73,13 +66,6 @@ async function installSessionSwitchProbe(
            const rect = element.getBoundingClientRect()
            return rect.bottom > view.top && rect.top < view.bottom
          })
-          const requiredPartVisible = requiredPartID
-            ? [...root.querySelectorAll<HTMLElement>("[data-timeline-part-id]")].some((element) => {
-                if (element.dataset.timelinePartId !== requiredPartID) return false
-                const rect = element.getBoundingClientRect()
-                return rect.width > 0 && rect.height > 0 && rect.bottom > view.top && rect.top < view.bottom
-              })
-            : undefined
          const spacer = root.querySelector<HTMLElement>('[data-timeline-row="bottom-spacer"]')?.getBoundingClientRect()
          samples.push({
            observedAtMs,
@@ -87,22 +73,11 @@ async function installSessionSwitchProbe(
            source: visible.filter((id) => source.has(id)),
            hasVisibleRows,
            last: visible.includes(lastID),
-            requiredPartVisible,
-            bottomAnchorRequired: requireBottomAnchor !== false,
            bottomErrorPx: spacer ? spacer.bottom - view.bottom : undefined,
            review,
          })
        } else {
-          samples.push({
-            observedAtMs,
-            destination: [],
-            source: [],
-            hasVisibleRows: false,
-            last: false,
-            requiredPartVisible: requiredPartID ? false : undefined,
-            bottomAnchorRequired: requireBottomAnchor !== false,
-            review,
-          })
+          samples.push({ observedAtMs, destination: [], source: [], hasVisibleRows: false, last: false, review })
        }
        requestAnimationFrame(sample)
      }, 0)
@@ -142,8 +117,7 @@ async function waitForStableSessionSwitch(page: Page) {
            sample.destination.length > 0 &&
            sample.source.length === 0 &&
            sample.last &&
-            sample.requiredPartVisible !== false &&
-            (sample.bottomAnchorRequired === false || Math.abs(sample.bottomErrorPx ?? Infinity) <= 1),
+            Math.abs(sample.bottomErrorPx ?? Infinity) <= 1,
        )
      )
    })
@@ -161,27 +135,13 @@ async function collectSessionSwitchResult(page: Page) {

 export async function measureSessionSwitch(
  page: Page,
-  input: {
-    destinationIDs: string[]
-    sourceIDs: string[]
-    lastID: string
-    requiredPartID?: string
-    requireBottomAnchor?: boolean
-    href: string
-    switch: () => Promise<void>
-  },
+  input: { destinationIDs: string[]; sourceIDs: string[]; lastID: string; href: string; switch: () => Promise<void> },
 ) {
  const { switch: run, ...probe } = input
  await installSessionSwitchProbe(page, probe)
-  try {
-    await run()
-    await waitForStableSessionSwitch(page)
-    return await collectSessionSwitchResult(page)
-  } finally {
-    await page.evaluate(() => {
-      ;(window as Window & { __sessionSwitchProbe?: SessionSwitchProbe }).__sessionSwitchProbe?.stop()
-    })
-  }
+  await run()
+  await waitForStableSessionSwitch(page)
+  return collectSessionSwitchResult(page)
 }

 export async function waitForStableTimeline(page: Page, lastID: string) {
@@ -1,46 +0,0 @@
-import { expect, test } from "bun:test"
-import type { Page, Route } from "@playwright/test"
-import { mockOpenCodeServer } from "../../utils/mock-server"
-
-test("applies message latency after a list response gate is released", async () => {
-  const events: string[] = []
-  const gate = Promise.withResolvers<void>()
-  let handler: ((route: Route) => Promise<void>) | undefined
-  const page = {
-    route: (_url: string, callback: (route: Route) => Promise<void>) => {
-      handler = callback
-      return Promise.resolve()
-    },
-  } as unknown as Page
-  await mockOpenCodeServer(page, {
-    provider: {},
-    directory: "C:/OpenCode",
-    project: {},
-    sessions: [{ id: "session" }],
-    messageDelay: 25,
-    beforeMessagesResponse: () => {
-      events.push("before")
-      return gate.promise
-    },
-    onMessages: (request) => events.push(request.phase),
-    pageMessages: () => {
-      events.push("page")
-      return { items: [] }
-    },
-  })
-
-  const response = handler!({
-    request: () => ({ url: () => "http://127.0.0.1:4096/session/session/message" }),
-    fulfill: () => {
-      events.push("fulfill")
-      return Promise.resolve()
-    },
-  } as unknown as Route)
-  expect(events).toEqual(["start", "before"])
-
-  const released = performance.now()
-  gate.resolve()
-  await response
-  expect(performance.now() - released).toBeGreaterThanOrEqual(20)
-  expect(events).toEqual(["start", "before", "page", "end", "fulfill"])
-})
@@ -52,35 +52,3 @@ test("reports missing correctness without throwing", () => {
  expect(result.firstCorrectObservedMs).toBeNull()
  expect(result.stableObservedMs).toBeNull()
 })
-
-test("requires an explicitly tracked part to be visible", () => {
-  const result = classifySessionSwitch([
-    {
-      observedAtMs: 16,
-      destination: ["destination"],
-      source: [],
-      hasVisibleRows: true,
-      last: true,
-      requiredPartVisible: false,
-      bottomErrorPx: 0,
-    },
-  ])
-
-  expect(result.firstCorrectObservedMs).toBeNull()
-})
-
-test("can measure content correctness without requiring a bottom anchor", () => {
-  const result = classifySessionSwitch([
-    {
-      observedAtMs: 16,
-      destination: ["destination"],
-      source: [],
-      hasVisibleRows: true,
-      last: true,
-      requiredPartVisible: true,
-      bottomAnchorRequired: false,
-    },
-  ])
-
-  expect(result.firstCorrectObservedMs).toBe(16)
-})
@@ -1,55 +0,0 @@
-import { expect, test } from "bun:test"
-import type { Page } from "@playwright/test"
-import { measureSessionSwitch } from "../timeline/session-tab-switch-probe"
-
-function testPage(waitFailure?: Error) {
-  const stops: unknown[] = []
-  const page = {
-    evaluate: async (_callback: unknown, input?: unknown) => {
-      if (input) return
-      stops.push(undefined)
-    },
-    waitForFunction: async () => {
-      if (waitFailure) throw waitFailure
-    },
-  } as unknown as Page
-  return { page, stops }
-}
-
-function input(run: () => Promise<void>) {
-  return {
-    destinationIDs: ["destination"],
-    sourceIDs: ["source"],
-    lastID: "destination",
-    href: "/session/destination",
-    switch: run,
-  }
-}
-
-test("stops sampling when the session switch fails", async () => {
-  const failure = new Error("switch failed")
-  const context = testPage()
-
-  await expect(
-    measureSessionSwitch(
-      context.page,
-      input(async () => Promise.reject(failure)),
-    ),
-  ).rejects.toBe(failure)
-
-  expect(context.stops).toHaveLength(1)
-})
-
-test("stops sampling when the stable wait fails", async () => {
-  const failure = new Error("stable wait failed")
-  const context = testPage(failure)
-
-  await expect(
-    measureSessionSwitch(
-      context.page,
-      input(async () => {}),
-    ),
-  ).rejects.toBe(failure)
-
-  expect(context.stops).toHaveLength(1)
-})
@@ -1,83 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const draftID = "draft_new_session_panel_corner"
-const directory = "C:/OpenCode/NewSessionPanelCorner"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test.use({
-  viewport: { width: 935, height: 522 },
-  deviceScaleFactor: 1,
-})
-
-test("matches the rounded panel corners to the dark new-session background", async ({ page }, testInfo) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_new_session_panel_corner",
-      worktree: directory,
-      vcs: "git",
-      name: "new-session-panel-corner",
-      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: true } }))
-      localStorage.setItem("opencode-theme-id", "oc-2")
-      localStorage.setItem("opencode-color-scheme", "dark")
-      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([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-
-  await page.goto(`/new-session?draftId=${draftID}`)
-  await expectAppVisible(page.locator('[data-component="prompt-input"]'))
-  await expect(page.locator("html")).toHaveAttribute("data-color-scheme", "dark")
-  const panel = page.locator('main div[class*="rounded-[10px]"][class*="overflow-hidden"]')
-  await expect(panel).toHaveCount(1)
-  const box = await panel.boundingBox()
-  if (!box) throw new Error("New-session panel bounds are unavailable")
-
-  const screenshot = await page.screenshot({ path: testInfo.outputPath("new-session-dark.png") })
-  const corners = await page.evaluate(
-    async ({ source, points }) => {
-      const image = new Image()
-      image.src = source
-      await image.decode()
-      const canvas = document.createElement("canvas")
-      canvas.width = image.naturalWidth
-      canvas.height = image.naturalHeight
-      const context = canvas.getContext("2d")
-      if (!context) throw new Error("2D canvas is unavailable")
-      context.drawImage(image, 0, 0)
-      return points.map((point) => Array.from(context.getImageData(point.x, point.y, 1, 1).data))
-    },
-    {
-      source: `data:image/png;base64,${screenshot.toString("base64")}`,
-      points: [
-        { x: Math.floor(box.x), y: Math.floor(box.y) },
-        { x: Math.ceil(box.x + box.width) - 1, y: Math.floor(box.y) },
-        { x: Math.floor(box.x), y: Math.ceil(box.y + box.height) - 1 },
-        { x: Math.ceil(box.x + box.width) - 1, y: Math.ceil(box.y + box.height) - 1 },
-      ],
-    },
-  )
-
-  expect(corners.every(([red, green, blue, alpha]) => red <= 8 && green <= 8 && blue <= 8 && alpha === 255)).toBe(true)
-})
@@ -10,9 +10,6 @@ const sessionB = "ses_review_tab_b"
 const titleA = "Alpha session"
 const titleB = "Beta session"
 const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const diffs = Array.from({ length: 2_740 }, (_, index) =>
-  fileDiff(`src/generated-${String(index).padStart(4, "0")}.ts`),
-)
 // Marks the review pane DOM node so a remount (fresh node) is detectable.
 const PROBE = "original"

@@ -28,34 +25,20 @@ test("keeps the v2 review pane mounted when switching session tabs in a workspac
  await expectSessionTitle(page, titleA)

  await page.getByRole("button", { name: "Toggle review" }).click()
-  const reviewTab = page.getByRole("tab", { name: /Review/ })
-  const reviewTabPanel = page.getByRole("tabpanel", { name: /Review/ })
-  await expect(reviewTab).toHaveAttribute("aria-controls", "session-side-panel-review-tabpanel")
-  await expect(reviewTabPanel).toHaveAttribute("id", "session-side-panel-review-tabpanel")
  const review = page.locator('#review-panel [data-component="session-review-v2"]')
  await expectAppVisible(review)
-  await expectAppVisible(page.getByRole("button", { name: "generated-0000.ts" }))
+  await expectAppVisible(page.getByRole("button", { name: /example\.ts/ }))
  await writeProbe(page)

  await switchTab(page, titleB)
  await expectSessionTitle(page, titleB)
  await expectAppVisible(review)
-  await expectAppVisible(page.getByRole("button", { name: "generated-0000.ts" }))
  expect(await readProbe(page)).toBe(PROBE)

  await switchTab(page, titleA)
  await expectSessionTitle(page, titleA)
  await expectAppVisible(review)
-  await expectAppVisible(page.getByRole("button", { name: "generated-0000.ts" }))
  expect(await readProbe(page)).toBe(PROBE)
-
-  const viewport = page.locator('#review-panel [data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
-  await viewport.hover()
-  await page.mouse.wheel(0, 100_000)
-  await expect
-    .poll(() => viewport.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-    .toBeLessThanOrEqual(1)
-  await expect(page.getByRole("button", { name: "generated-2739.ts" })).toBeVisible()
 })

 type Probed = HTMLElement & { __e2eProbe?: string }
@@ -97,7 +80,16 @@ async function setup(page: Page) {
      default: { providerID: "opencode", modelID: "test" },
    },
    sessions: [session(sessionA, titleA, 1700000000000), session(sessionB, titleB, 1700000001000)],
-    vcsDiff: diffs,
+    vcsDiff: [
+      {
+        file: "src/example.ts",
+        additions: 1,
+        deletions: 1,
+        status: "modified",
+        patch:
+          "diff --git a/src/example.ts b/src/example.ts\n--- a/src/example.ts\n+++ b/src/example.ts\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after'\n",
+      },
+    ],
    pageMessages: () => ({ items: [] }),
  })

@@ -135,13 +127,3 @@ function session(id: string, title: string, created: number) {
 function sessionHref(sessionID: string) {
  return `/server/${base64Encode(server)}/session/${sessionID}`
 }
-
-function fileDiff(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`,
-  }
-}
@@ -1,212 +0,0 @@
-import { expect, test, type Page } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:/OpenCode/ReviewTerminalStacked"
-const projectID = "proj_review_terminal_stacked"
-const sessionID = "ses_review_terminal_stacked"
-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),
-  ),
-]
-
-test("keeps the review tree and terminal sized when both panels are open", async ({ page }) => {
-  test.setTimeout(120_000)
-  await page.setViewportSize({ width: 1400, height: 900 })
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "review-terminal-stacked",
-      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: "review-terminal-stacked",
-        projectID,
-        directory,
-        title,
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.route(/\/vcs(?:\?.*)?$/, (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({ branch: "review-pane-performance", 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"
-          ? branchDiffs
-          : Array.from({ length: 7 }, (_, index) => fileDiff(`src/git-${index}.ts`, 1)),
-      ),
-    }),
-  )
-  await page.route("**/pty", (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({ id: "pty_review_terminal", title: "Terminal 1" }),
-    }),
-  )
-  await page.route("**/pty/pty_review_terminal", (route) =>
-    route.fulfill({ status: 200, contentType: "application/json", body: "{}" }),
-  )
-  await page.routeWebSocket("**/pty/pty_review_terminal/connect", () => undefined)
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-    localStorage.setItem(
-      "opencode.global.dat:layout",
-      JSON.stringify({ review: { diffStyle: "split", panelOpened: true } }),
-    )
-  })
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-  await expectSessionTitle(page, title)
-  await expect(page.locator("#review-panel")).toBeVisible()
-  await expectTree(page, 8, "git-0.ts")
-
-  await selectMode(page, "Git changes", "Branch changes")
-  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 expectStackGeometry(page)
-
-  const treeViewport = page.locator('#review-panel [data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
-  await treeViewport.hover()
-  await page.mouse.wheel(0, 100_000)
-  await expect
-    .poll(() => treeViewport.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-    .toBeLessThanOrEqual(1)
-  const lastFile = page.getByRole("button", { name: "generated-2738.ts" })
-  await expect(lastFile).toBeVisible()
-  const bottomGap = await lastFile.evaluate((element) => {
-    const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
-    return viewport.bottom - element.getBoundingClientRect().bottom
-  })
-  expect(bottomGap).toBeGreaterThanOrEqual(0)
-  expect(bottomGap).toBeLessThanOrEqual(16)
-  await selectMode(page, "Branch changes", "Git changes")
-  await expectTree(page, 8, "git-0.ts")
-  await selectMode(page, "Git changes", "Branch changes")
-  await expectTree(page, 2_745, "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 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 page.keyboard.press("Control+Backquote")
-  await expect(page.locator("#terminal-panel")).toHaveCount(0)
-  await expectTree(page, 2_745, "action.yml")
-  await page.keyboard.press("Control+Backquote")
-  await expect(page.locator("#terminal-panel")).toBeVisible()
-  await expectTree(page, 2_745, "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 page.setViewportSize({ width: 1_000, height: 700 })
-  await expectTree(page, 2_745, "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 expectStackGeometry(page)
-})
-
-async function selectMode(page: Page, current: string, next: string) {
-  await page.getByRole("button", { name: current }).click()
-  const option = page.getByRole("option", { name: next })
-  await expect(option).toBeVisible()
-  await option.click()
-}
-
-async function expectTree(page: Page, total: number, file: string) {
-  await expectMountedTree(page, total)
-  await expect(page.getByRole("button", { name: file })).toBeVisible()
-}
-
-async function expectMountedTree(page: Page, total: number) {
-  const tree = page.locator('#review-panel [data-component="file-tree-v2"]')
-  await expect(tree).toHaveAttribute("data-total-rows", String(total))
-  await expect
-    .poll(() => tree.evaluate((element) => element.querySelectorAll('[data-slot="file-tree-v2-row"]').length))
-    .toBeGreaterThan(0)
-  const state = await tree.evaluate((element) => ({
-    root: element.getBoundingClientRect().height,
-    viewport: element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect().height,
-    rows: element.querySelectorAll('[data-slot="file-tree-v2-row"]').length,
-  }))
-  expect(state.viewport).toBeGreaterThan(0)
-  expect(state.root).toBeGreaterThan(0)
-  expect(state.rows).toBeGreaterThan(0)
-  expect(state.rows).toBeLessThanOrEqual(60)
-}
-
-async function expectStackGeometry(page: Page) {
-  const geometry = await page.evaluate(() => {
-    const review = document.querySelector<HTMLElement>("#review-panel")!
-    const terminal = document.querySelector<HTMLElement>("#terminal-panel")!
-    const reviewParent = review.parentElement!.getBoundingClientRect()
-    const terminalParent = terminal.parentElement!.getBoundingClientRect()
-    return {
-      review: review.getBoundingClientRect().height,
-      reviewParent: reviewParent.height,
-      terminal: terminal.getBoundingClientRect().height,
-      terminalParent: terminalParent.height,
-    }
-  })
-  expect(Math.abs(geometry.review - geometry.reviewParent)).toBeLessThanOrEqual(1)
-  expect(Math.abs(geometry.terminal - geometry.terminalParent)).toBeLessThanOrEqual(1)
-}
-
-function base64Encode(value: string) {
-  return Buffer.from(value, "utf8").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
-}
-
-function fileDiff(file: string, additions: number) {
-  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`,
-  }
-}
@@ -1,220 +0,0 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { expect, test, type Page } from "@playwright/test"
-import {
-  assistantMessage,
-  directory,
-  messageUpdated,
-  project,
-  session,
-  sessionID,
-  status,
-  textPart,
-  title,
-  userID,
-  userMessage,
-} from "../performance/timeline-stability/fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { installSseTransport } from "../utils/sse-transport"
-import { expectSessionTitle } from "../utils/waits"
-
-const assistants = Array.from({ length: 14 }, (_, index) =>
-  assistantMessage([textPart(`prt_history_root_${index}`, `Assistant response ${index}`)], {
-    id: `msg_${String(index + 1001).padStart(4, "0")}_history_root_assistant`,
-    parentID: userID,
-    created: 1700000001000 + index * 1_000,
-    completed: index < 13,
-  }),
-)
-const messages = [userMessage(), ...assistants]
-const lastAssistant = assistants.at(-1)!
-const lastPartID = assistants.at(-1)!.parts[0]!.id
-const userPartID = `prt_${userID}_text`
-const completed = {
-  ...lastAssistant.info,
-  time: { ...lastAssistant.info.time, completed: lastAssistant.info.time.created + 15_000 },
-}
-const scenarios = [
-  { name: "completion", info: completed, idleFirst: false, interrupted: false },
-  {
-    name: "interruption",
-    info: { ...completed, error: { name: "MessageAbortedError", data: { message: "Stopped" } } },
-    idleFirst: true,
-    interrupted: true,
-  },
-] as const
-
-test.use({ viewport: { width: 646, height: 1385 } })
-
-for (const scenario of scenarios) {
-  test(`keeps the latest user turn visible through ${scenario.name}`, async ({ page }) => {
-    const requests: { before?: string; phase: "start" | "end" }[] = []
-    const pages: { before?: string; limit: number }[] = []
-    const roots: { sessionID: string; messageID: string }[] = []
-    const sequence: string[] = []
-    const history = Promise.withResolvers<void>()
-    const transport = await installSseTransport<{ directory: string; payload: Record<string, unknown> }>(page, {
-      server: `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`,
-      retry: 20,
-    })
-    await mockOpenCodeServer(page, {
-      directory,
-      project: project(),
-      provider: {
-        all: [
-          {
-            id: "opencode",
-            name: "OpenCode",
-            models: {
-              "claude-opus-4-6": {
-                id: "claude-opus-4-6",
-                name: "Claude Opus 4.6",
-                limit: { context: 200_000 },
-              },
-            },
-          },
-        ],
-        connected: ["opencode"],
-        default: { providerID: "opencode", modelID: "claude-opus-4-6" },
-      },
-      sessions: [session()],
-      sessionStatus: { [sessionID]: { type: "busy" } },
-      beforeMessagesResponse: (request) => (request.before ? history.promise : Promise.resolve()),
-      onMessages: (request) => {
-        requests.push(request)
-        sequence.push(`messages:${request.phase}:${request.before ?? "latest"}`)
-      },
-      onMessage: (request) => {
-        roots.push(request)
-        sequence.push(`message:${request.messageID}`)
-      },
-      message: (requestedSessionID, messageID) => {
-        if (requestedSessionID !== sessionID) return
-        return messages.find((item) => item.info.id === messageID)
-      },
-      pageMessages: (_, limit, before) => {
-        pages.push({ before, limit })
-        const end = before ? messages.findIndex((message) => message.info.id === before) : messages.length
-        const start = Math.max(0, end - limit)
-        return {
-          items: messages.slice(start, end),
-          cursor: start > 0 ? messages[start]!.info.id : undefined,
-        }
-      },
-    })
-    await page.addInitScript(
-      ({ userPartID, lastPartID }) => {
-        const state = { armed: false, hidden: false, samples: 0, stop: false }
-        ;(window as Window & { __historyRootProbe?: typeof state }).__historyRootProbe = state
-        const sample = () => {
-          if (state.armed) {
-            const virtual = document.querySelector<HTMLElement>("[data-timeline-virtual-content]")
-            const viewport = virtual?.closest<HTMLElement>(".scroll-view__viewport")
-            const view = viewport?.getBoundingClientRect()
-            const visible = (partID: string) => {
-              const part = viewport?.querySelector<HTMLElement>(`[data-timeline-part-id="${partID}"]`)
-              const rect = part?.getBoundingClientRect()
-              return (
-                !!rect &&
-                !!view &&
-                rect.width > 0 &&
-                rect.height > 0 &&
-                rect.bottom > view.top &&
-                rect.top < view.bottom
-              )
-            }
-            if (!virtual || !visible(userPartID) || !visible(lastPartID)) state.hidden = true
-            state.samples++
-          }
-          if (!state.stop) requestAnimationFrame(() => setTimeout(sample, 0))
-        }
-        requestAnimationFrame(() => setTimeout(sample, 0))
-      },
-      { userPartID, lastPartID },
-    )
-
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-    await transport.waitForConnection()
-    await expectSessionTitle(page, title)
-    await expect(page.locator(`[data-timeline-part-id="${lastPartID}"]`)).toBeVisible()
-    await expect(page.locator(`[data-timeline-part-id="${userPartID}"]`)).toBeVisible()
-    await expect.poll(() => requests.filter((request) => request.phase === "start").length).toBe(2)
-    expect(requests.filter((request) => request.phase === "end")).toHaveLength(1)
-    expect(sequence.slice(0, 4)).toEqual([
-      "messages:start:latest",
-      "messages:end:latest",
-      `message:${userID}`,
-      `messages:start:${messages.at(-2)!.info.id}`,
-    ])
-    await page.evaluate(() => {
-      ;(
-        window as Window & {
-          __historyRootProbe?: { armed: boolean }
-        }
-      ).__historyRootProbe!.armed = true
-    })
-    await waitForProbeSamples(page, 0)
-    expect(await historyRootHidden(page)).toBe(false)
-    const beforeHistory = await probeSamples(page)
-    history.resolve()
-    await expect(page.locator('[data-timeline-part-id^="prt_history_root_"]')).toHaveCount(14)
-    await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
-    await waitForProbeSamples(page, beforeHistory)
-    expect(pages[0]).toEqual({ before: undefined, limit: 2 })
-    expect(roots).toEqual([{ sessionID, messageID: userID }])
-
-    const message = messageUpdated(scenario.info)
-    const idle = status("idle")
-    for (const event of scenario.idleFirst ? [idle, message] : [message, idle]) {
-      const beforeEvent = await probeSamples(page)
-      await transport.send(event)
-      if (event === idle) await expect(page.getByRole("button", { name: "Stop" })).toHaveCount(0)
-      if (event === message && scenario.interrupted)
-        await expect(page.getByText("Interrupted", { exact: true })).toBeVisible()
-      await waitForProbeSamples(page, beforeEvent)
-      const current = await timelineState(page)
-      expect(current, JSON.stringify(current)).toMatchObject({ virtual: true })
-      expect(current.rows, JSON.stringify(current)).toBeGreaterThan(0)
-    }
-
-    expect(requests[0]).toEqual({ before: undefined, phase: "start", sessionID })
-    expect(requests[1]).toEqual({ before: undefined, phase: "end", sessionID })
-    await expect(page.getByRole("button", { name: "Stop" })).toHaveCount(0)
-    await expect(page.locator('[data-timeline-row="bottom-spacer"]')).toBeVisible()
-    if (scenario.interrupted) await expect(page.getByText("Interrupted", { exact: true })).toBeVisible()
-    expect(
-      await page.evaluate(() => {
-        const state = (window as Window & { __historyRootProbe?: { hidden: boolean; stop: boolean } })
-          .__historyRootProbe!
-        state.stop = true
-        return state.hidden
-      }),
-    ).toBe(false)
-  })
-}
-
-function timelineState(page: Page) {
-  return page.evaluate(() => ({
-    virtual: !!document.querySelector("[data-timeline-virtual-content]"),
-    rows: document.querySelectorAll("[data-timeline-key]").length,
-  }))
-}
-
-function probeSamples(page: Page) {
-  return page.evaluate(
-    () => (window as Window & { __historyRootProbe?: { samples: number } }).__historyRootProbe!.samples,
-  )
-}
-
-async function waitForProbeSamples(page: Page, after: number) {
-  await page.waitForFunction(
-    (after) =>
-      (window as Window & { __historyRootProbe?: { samples: number } }).__historyRootProbe!.samples >= after + 3,
-    after,
-  )
-}
-
-function historyRootHidden(page: Page) {
-  return page.evaluate(
-    () => (window as Window & { __historyRootProbe?: { hidden: boolean } }).__historyRootProbe!.hidden,
-  )
-}
@@ -1,89 +0,0 @@
-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/TerminalComposerFocus"
-const projectID = "proj_terminal_composer_focus"
-const sessionID = "ses_terminal_composer_focus"
-const ptyID = "pty_terminal_composer_focus"
-
-test.use({ viewport: { width: 1440, height: 900 } })
-
-test("routes typing to the composer unless the open terminal is focused", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "terminal-composer-focus",
-      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: "terminal-composer-focus",
-        projectID,
-        directory,
-        title: "Terminal composer focus",
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.route("**/pty", (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({ id: ptyID, title: "Terminal 1" }),
-    }),
-  )
-  await page.route(`**/pty/${ptyID}`, (route) =>
-    route.fulfill({ status: 200, contentType: "application/json", body: "{}" }),
-  )
-  await page.route(`**/pty/${ptyID}/connect-token*`, (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      headers: { "access-control-allow-origin": "*" },
-      body: JSON.stringify({ ticket: "e2e-ticket" }),
-    }),
-  )
-  await page.routeWebSocket(new RegExp(`/pty/${ptyID}/connect`), () => undefined)
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-  })
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Terminal composer focus")
-
-  const composer = page.locator('[data-component="prompt-input"]')
-  const terminal = page.locator('[data-component="terminal"]')
-  await page.keyboard.press("Control+Backquote")
-  await expect(terminal).toBeVisible()
-  await expect.poll(() => terminal.evaluate((element) => element.contains(document.activeElement))).toBe(true)
-
-  await page.keyboard.type("x")
-  await expect(composer).toHaveText("")
-
-  await page.waitForTimeout(300)
-  await page.evaluate(() => (document.activeElement as HTMLElement | null)?.blur())
-  await page.keyboard.type("a")
-
-  await expect(composer).toBeFocused()
-  await expect(composer).toHaveText("a")
-})
@@ -7,7 +7,7 @@ const projectID = "proj_hidden_terminal_regression"
 const sessionID = "ses_hidden_terminal_regression"
 const title = "Hidden terminal regression"

-test("unmounts the terminal panel while it is hidden", async ({ page }) => {
+test("unmounts the terminal renderer while the pane is hidden", async ({ page }) => {
  await page.setViewportSize({ width: 1400, height: 900 })
  await mockOpenCodeServer(page, {
    directory,
@@ -64,14 +64,13 @@ test("unmounts the terminal panel while it is hidden", async ({ page }) => {
  await expect(page.locator('[data-component="terminal"]')).toBeVisible()

  await page.keyboard.press("Control+Backquote")
-  await expect(panel).toHaveCount(0)
+  await expect(panel).toHaveAttribute("aria-hidden", "true")
  await expect(page.locator('[data-component="terminal"]')).toHaveCount(0)

  await page.setViewportSize({ width: 1200, height: 700 })
  await expect(page.locator('[data-component="terminal"]')).toHaveCount(0)

  await page.keyboard.press("Control+Backquote")
-  await expect(panel).toBeVisible()
  await expect(page.locator('[data-component="terminal"]')).toBeVisible()
 })

@@ -10,7 +10,6 @@
    "./performance/timeline-stability/fixture.test.ts",
    "./performance/timeline-stability/fixture.ts",
    "./performance/unit/visual-stability.test.ts",
-    "./regression/new-session-panel-corner.spec.ts",
    "./regression/session-timeline-context-resize.spec.ts",
    "./utils/**/*.ts"
  ]
@@ -1,7 +1,7 @@
 import type { Page, Route } from "@playwright/test"

 const emptyList = new Set(["/skill", "/command", "/lsp", "/formatter", "/vcs/status", "/vcs/diff"])
-const emptyObject = new Set(["/global/config", "/config", "/provider/auth", "/mcp", "/experimental/resource"])
+const emptyObject = new Set(["/global/config", "/config", "/provider/auth", "/mcp"])

 export interface MockServerConfig {
  provider: unknown
@@ -11,10 +11,7 @@ export interface MockServerConfig {
  pageMessages: (sessionId: string, limit: number, before?: string) => { items: unknown[]; cursor?: string }
  vcsDiff?: unknown[]
  messageDelay?: number
-  beforeMessagesResponse?: (input: { sessionID: string; before?: string }) => Promise<void>
  onMessages?: (input: { sessionID: string; before?: string; phase: "start" | "end" }) => void
-  message?: (sessionID: string, messageID: string) => unknown
-  onMessage?: (input: { sessionID: string; messageID: string }) => void
  events?: () => unknown[]
  eventRetry?: number
  todos?: (sessionID: string) => unknown[]
@@ -55,7 +52,6 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
    const path = url.pathname
    if (path === "/global/event" || path === "/event") return sse(route, config.events?.(), config.eventRetry)
    if (path === "/global/health") return json(route, { healthy: true })
-    if (path === "/experimental/capabilities") return json(route, { backgroundSubagents: false })
    if (path === "/permission")
      return json(route, typeof config.permissions === "function" ? config.permissions() : (config.permissions ?? []))
    if (path === "/question")
@@ -66,14 +62,6 @@ 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 === "/api/reference")
-      return json(route, {
-        location: {
-          directory: config.directory,
-          project: { id: (config.project as { id?: string }).id, directory: config.directory },
-        },
-        data: [],
-      })
    if (emptyObject.has(path)) return json(route, {})
    if (emptyList.has(path)) return json(route, [])
    if (path in staticRoutes) return json(route, staticRoutes[path])
@@ -84,18 +72,6 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
      return json(route, session ?? {})
    }

-    const projectMatch = path.match(/^\/project\/([^/]+)$/)
-    if (projectMatch) return json(route, config.project)
-
-    const messageMatch = path.match(/^\/session\/([^/]+)\/message\/([^/]+)$/)
-    if (messageMatch) {
-      config.onMessage?.({ sessionID: messageMatch[1]!, messageID: messageMatch[2]! })
-      if (config.messageDelay !== undefined) await new Promise((resolve) => setTimeout(resolve, config.messageDelay))
-      const message = config.message?.(messageMatch[1]!, messageMatch[2]!)
-      if (message === undefined) return json(route, { error: "Message not found" }, undefined, 404)
-      return json(route, message)
-    }
-
    const todoMatch = path.match(/^\/session\/([^/]+)\/todo$/)
    if (todoMatch) return json(route, config.todos?.(todoMatch[1]!) ?? [])
    if (/^\/session\/[^/]+\/(children|diff)$/.test(path)) return json(route, [])
@@ -106,8 +82,7 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
      const before = token ? cursors.get(token) : undefined
      if (token && !before) return json(route, { error: "Invalid cursor" }, undefined, 400)
      config.onMessages?.({ sessionID: messagesMatch[1], before, phase: "start" })
-      await config.beforeMessagesResponse?.({ sessionID: messagesMatch[1]!, before })
-      if (config.messageDelay !== undefined) await new Promise((resolve) => setTimeout(resolve, config.messageDelay))
+      if (config.messageDelay) await new Promise((resolve) => setTimeout(resolve, config.messageDelay))
      const limit = Number(url.searchParams.get("limit") ?? 80)
      const pageData = config.pageMessages(messagesMatch[1], limit, before)
      config.onMessages?.({ sessionID: messagesMatch[1], before, phase: "end" })
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.17.15",
+  "version": "1.17.13",
  "description": "",
  "type": "module",
  "exports": {
@@ -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, useNavigate, useParams, useSearchParams } from "@solidjs/router"
+import { type BaseRouterProps, Navigate, Route, Router, 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, useServerSync } from "@/context/server-sync"
+import { ServerSyncProvider } from "@/context/server-sync"
 import { GlobalProvider, useGlobal } from "@/context/global"
 import { HighlightsProvider } from "@/context/highlights"
 import { LanguageProvider, type Locale, useLanguage } from "@/context/language"
@@ -52,10 +52,9 @@ import LegacyLayout from "@/pages/layout"
 import NewLayout from "@/pages/layout-new"
 import { ErrorPage } from "./pages/error"
 import { useCheckServerHealth } from "./utils/server-health"
-import { legacySessionHref, legacySessionServer, requireServerKey, sessionHref } from "./utils/session-route"
-import { createSessionLineage } from "@/pages/session/session-lineage"
+import { legacySessionServer, requireServerKey, sessionHref } from "./utils/session-route"

-import { SessionPage, SessionRouteErrorBoundary, TargetSessionRouteContent } from "@/pages/session"
+import { SessionPage, TargetSessionRouteContent } from "@/pages/session"
 import { NewHome, LegacyHome } from "@/pages/home"

 const NewSession = lazy(() => import("@/pages/new-session"))
@@ -89,14 +88,10 @@ const SessionRoute = () => {
    tabs.newDraft({ server: server.key, directory: sdk().directory }, search.prompt)
  })

-  return (
-    <SessionRouteErrorBoundary sessionID={params.id}>
-      <SessionPage />
-    </SessionRouteErrorBoundary>
-  )
+  return <SessionPage />
 }

-function TargetServerRoute(props: ParentProps) {
+const TargetSessionRoute = () => {
  const params = useParams<{ serverKey: string; id: string }>()
  const global = useGlobal()
  const conn = createMemo(() => {
@@ -110,47 +105,14 @@ function TargetServerRoute(props: ParentProps) {
    // re-resolves reactively instead); both rely on this key for server changes.
    <Show when={requireServerKey(params.serverKey)} keyed>
      <ServerSDKProvider server={conn}>
-        <ServerSyncProvider server={conn}>{props.children}</ServerSyncProvider>
+        <ServerSyncProvider server={conn}>
+          <TargetSessionRouteContent />
+        </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.
@@ -164,10 +126,10 @@ function SelectedServerProviders(props: ParentProps) {
  )
 }

-function LegacyServerLayout(props: ParentProps<{ serverScoped?: JSX.Element }>) {
+function LegacyServerLayout(props: ParentProps) {
  return (
    <SelectedServerProviders>
-      <LegacyServerScopedShell serverScoped={props.serverScoped}>{props.children}</LegacyServerScopedShell>
+      <LegacyServerScopedShell>{props.children}</LegacyServerScopedShell>
    </SelectedServerProviders>
  )
 }
@@ -224,7 +186,7 @@ declare global {
      deepLinks?: string[]
    }
    api?: {
-      setTitlebar?: (theme: { mode: "light" | "dark"; scheme?: "system" | "light" | "dark" }) => Promise<void>
+      setTitlebar?: (theme: { mode: "light" | "dark" }) => Promise<void>
      exportDebugLogs?: () => Promise<string>
    }
  }
@@ -301,14 +263,12 @@ function DesktopCommands() {
 type ServerScopedShellProps = ParentProps<{
  directory?: () => string | undefined
  sessionID?: () => string | undefined
-  serverScoped?: JSX.Element
 }>

 function ServerScopedProviders(props: ServerScopedShellProps) {
  return (
    <PermissionProvider directory={props.directory}>
      <LayoutProvider>
-        {props.serverScoped}
        <ModelsProvider directory={props.directory}>{props.children}</ModelsProvider>
      </LayoutProvider>
    </PermissionProvider>
@@ -317,16 +277,16 @@ function ServerScopedProviders(props: ServerScopedShellProps) {

 function LegacyServerScopedShell(props: ServerScopedShellProps) {
  return (
-    <ServerScopedProviders directory={props.directory} sessionID={props.sessionID} serverScoped={props.serverScoped}>
+    <ServerScopedProviders directory={props.directory} sessionID={props.sessionID}>
      <LegacyLayout>{props.children}</LegacyLayout>
    </ServerScopedProviders>
  )
 }

-function NewAppLayout(props: ParentProps<{ serverScoped?: JSX.Element }>) {
+function NewAppLayout(props: ParentProps) {
  return (
    <SelectedServerProviders>
-      <ServerScopedProviders serverScoped={props.serverScoped}>
+      <ServerScopedProviders>
        <NewLayout>{props.children}</NewLayout>
      </ServerScopedProviders>
    </SelectedServerProviders>
@@ -358,8 +318,8 @@ export function AppBaseProviders(props: ParentProps<{ locale?: Locale }>) {
    <MetaProvider>
      <Font />
      <ThemeProvider
-        onThemeApplied={(_, mode, scheme) => {
-          void window.api?.setTitlebar?.({ mode, scheme })
+        onThemeApplied={(_, mode) => {
+          void window.api?.setTitlebar?.({ mode })
        }}
      >
        <LanguageProvider locale={props.locale}>
@@ -387,7 +347,7 @@ export function AppBaseProviders(props: ParentProps<{ locale?: Locale }>) {
  )
 }

-function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean; startup?: Promise<void> }>) {
+function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean }>) {
  const server = useServer()
  const checkServerHealth = useCheckServerHealth()

@@ -416,45 +376,34 @@ function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean; start
  const checking = createMemo(
    () => checkMode() === "blocking" && ["unresolved", "pending"].includes(startupHealthCheck.state),
  )
-  const [startup] = createResource(async () => {
-    if (!props.startup) return true
-    await props.startup.catch((error) => {
-      console.error("[startup] startup gate failed", error)
-    })
-    return true
-  })
-  const startupChecking = createMemo(
-    () => startupHealthCheck.latest === true && ["unresolved", "pending"].includes(startup.state),
-  )
-  const loading = createMemo(() => checking() || startupChecking())

  return (
-    <>
-      <Show when={!checking()}>
-        <Show
-          when={startupHealthCheck.latest}
-          fallback={
-            <ConnectionError
-              onRetry={() => {
-                if (checkMode() === "background") void healthCheckActions.refetch()
-              }}
-              onServerSelected={(key) => {
-                setCheckMode("blocking")
-                server.setActive(key)
-                void healthCheckActions.refetch()
-              }}
-            />
-          }
-        >
-          {props.children}
-        </Show>
-      </Show>
-      <Show when={loading()}>
-        <div class="fixed inset-0 z-[9999] flex flex-col items-center justify-center bg-background-base">
+    <Show
+      when={!checking()}
+      fallback={
+        <div class="h-dvh w-screen flex flex-col items-center justify-center bg-background-base">
          <Splash class="w-16 h-20 opacity-50 animate-pulse" />
        </div>
+      }
+    >
+      <Show
+        when={startupHealthCheck.latest}
+        fallback={
+          <ConnectionError
+            onRetry={() => {
+              if (checkMode() === "background") void healthCheckActions.refetch()
+            }}
+            onServerSelected={(key) => {
+              setCheckMode("blocking")
+              server.setActive(key)
+              void healthCheckActions.refetch()
+            }}
+          />
+        }
+      >
+        {props.children}
      </Show>
-    </>
+    </Show>
  )
 }

@@ -521,8 +470,6 @@ export function AppInterface(props: {
  servers?: Array<ServerConnection.Any>
  router?: Component<BaseRouterProps>
  disableHealthCheck?: boolean
-  startup?: Promise<void>
-  serverScoped?: JSX.Element
 }) {
  // The visual new layout lives in the router root so it remains mounted across
  // route changes. Draft and session routes override only their server-bound data
@@ -544,7 +491,7 @@ export function AppInterface(props: {
    >
      <GlobalProvider>
        <SettingsProvider>
-          <ConnectionGate disableHealthCheck={props.disableHealthCheck} startup={props.startup}>
+          <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
            <Show when={useSettings().general.newLayoutDesigns().toString()} keyed>
              <Dynamic
                component={props.router ?? Router}
@@ -553,14 +500,14 @@ export function AppInterface(props: {
                    <NotificationProvider>
                      <ServerShell>
                        <Show when={useSettings().general.newLayoutDesigns()} fallback={routerProps.children}>
-                          <NewAppLayout serverScoped={props.serverScoped}>{routerProps.children}</NewAppLayout>
+                          <NewAppLayout>{routerProps.children}</NewAppLayout>
                        </Show>
                      </ServerShell>
                    </NotificationProvider>
                  </TabsProvider>
                )}
              >
-                <Routes serverScoped={props.serverScoped} />
+                <Routes />
              </Dynamic>
            </Show>
          </ConnectionGate>
@@ -570,24 +517,13 @@ export function AppInterface(props: {
  )
 }

-function Routes(props: { serverScoped?: JSX.Element }) {
+function Routes() {
  const settings = useSettings()

  return (
    <>
-      <Route
-        component={(routeProps) => (
-          <LegacyServerLayout serverScoped={props.serverScoped}>{routeProps.children}</LegacyServerLayout>
-        )}
-      >
-        <Show when={!settings.general.newLayoutDesigns()}>
-          {
-            <>
-              <Route path="/" component={LegacyHome} />
-              <Route path="/server/:serverKey/session/:id" component={LegacyTargetSessionRoute} />
-            </>
-          }
-        </Show>
+      <Route component={LegacyServerLayout}>
+        <Show when={!settings.general.newLayoutDesigns()}>{<Route path="/" component={LegacyHome} />}</Show>
        <Route path="/:dir" component={DirectoryLayout}>
          <Route path="/" component={() => <Navigate href="session" />} />
          <Route path="/session/:id?" component={SessionRoute} />
@@ -595,15 +531,15 @@ function Routes(props: { serverScoped?: JSX.Element }) {
      </Route>
      <Show when={settings.general.newLayoutDesigns()}>
        <Route path="/" component={NewHome} />
-        <Route path="/:dir/session/:id" component={NewLayoutLegacySessionRedirect} />
-        <Route path="/server/:serverKey/session/:id" component={TargetSessionRoute} />
+        <Route path="/:dir/session/:id" component={LegacyTargetSessionRoute} />
      </Show>
      <Route path="/new-session" component={DraftRoute} />
+      <Route path="/server/:serverKey/session/:id" component={TargetSessionRoute} />
    </>
  )
 }

-function NewLayoutLegacySessionRedirect() {
+function LegacyTargetSessionRoute() {
  const server = useServer()
  const tabs = useTabs()
  const params = useParams<{ id: string }>()
@@ -1,325 +0,0 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { getFilename } from "@opencode-ai/core/util/path"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { useNavigate } from "@solidjs/router"
-import { createMemo, onCleanup } from "solid-js"
-import { useCommand, type CommandOption } from "@/context/command"
-import { useFile } from "@/context/file"
-import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
-import { useServerSDK, type ServerSDK } from "@/context/server-sdk"
-import { useServerSync } from "@/context/server-sync"
-import { createSessionTabs } from "@/pages/session/helpers"
-import { useSessionLayout } from "@/pages/session/session-layout"
-import { decode64 } from "@/utils/base64"
-
-export type CommandPaletteEntry = {
-  id: string
-  type: "command" | "file" | "session"
-  title: string
-  description?: string
-  keybind?: string
-  category: string
-  option?: CommandOption
-  path?: string
-  directory?: string
-  sessionID?: string
-  archived?: number
-  updated?: number
-}
-
-const ENTRY_LIMIT = 5
-const COMMON_COMMAND_IDS = [
-  "session.new",
-  "workspace.new",
-  "session.previous",
-  "session.next",
-  "terminal.toggle",
-  "review.toggle",
-] as const
-
-export function uniqueCommandPaletteEntries(items: CommandPaletteEntry[]) {
-  const seen = new Set<string>()
-  return items.filter((item) => {
-    if (seen.has(item.id)) return false
-    seen.add(item.id)
-    return true
-  })
-}
-
-export function createCommandPaletteFileEntry(path: string, category: string): CommandPaletteEntry {
-  return {
-    id: "file:" + path,
-    type: "file",
-    title: path,
-    category,
-    path,
-  }
-}
-
-export function createCommandPaletteFileOpener(onOpenFile?: (path: string) => void) {
-  const file = useFile()
-  const layout = useLayout()
-  const { tabs, view } = useSessionLayout()
-
-  return (path: string) => {
-    const value = file.tab(path)
-    void tabs().open(value)
-    void file.load(path)
-    if (!view().reviewPanel.opened()) view().reviewPanel.open()
-    layout.fileTree.setTab("all")
-    onOpenFile?.(path)
-    tabs().setActive(value)
-  }
-}
-
-export function createCommandPaletteModel(props: { filesOnly?: () => boolean; onOpenFile?: (path: string) => void }) {
-  const command = useCommand()
-  const language = useLanguage()
-  const layout = useLayout()
-  const file = useFile()
-  const dialog = useDialog()
-  const navigate = useNavigate()
-  const serverSDK = useServerSDK()()
-  const serverSync = useServerSync()
-  const { params, tabs } = useSessionLayout()
-  const openFile = createCommandPaletteFileOpener(props.onOpenFile)
-  const state = { cleanup: undefined as (() => void) | void, committed: false }
-  const filesOnly = () => props.filesOnly?.() ?? false
-
-  const allowedCommands = createMemo(() => {
-    if (filesOnly()) return []
-    return command.options.filter(
-      (option) =>
-        !option.disabled && !option.hidden && !option.id.startsWith("suggested.") && option.id !== "file.open",
-    )
-  })
-  const commandEntries = createMemo(() => {
-    const category = language.t("palette.group.commands")
-    return allowedCommands().map((option) => createCommandEntry(option, category))
-  })
-  const preferredCommandEntries = createMemo(() => {
-    const all = allowedCommands()
-    const order = new Map<string, number>(COMMON_COMMAND_IDS.map((id, index) => [id, index]))
-    const picked = all.filter((option) => order.has(option.id))
-    const base = picked.length ? picked : all.slice(0, ENTRY_LIMIT)
-    const sorted = picked.length ? [...base].sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0)) : base
-    const category = language.t("palette.group.commands")
-    return sorted.map((option) => createCommandEntry(option, category))
-  })
-
-  const tabState = createSessionTabs({
-    tabs,
-    pathFromTab: file.pathFromTab,
-    normalizeTab: (tab) => (tab.startsWith("file://") ? file.tab(tab) : tab),
-  })
-  const recentFileEntries = createMemo(() => {
-    const all = tabState.openedTabs()
-    const active = tabState.activeFileTab()
-    const order = active ? [active, ...all.filter((item) => item !== active)] : all
-    const seen = new Set<string>()
-    const category = language.t("palette.group.files")
-    return order
-      .map((item) => file.pathFromTab(item))
-      .filter((path): path is string => {
-        if (!path || seen.has(path)) return false
-        seen.add(path)
-        return true
-      })
-      .slice(0, ENTRY_LIMIT)
-      .map((path) => createCommandPaletteFileEntry(path, category))
-  })
-  const rootFileEntries = createMemo(() => {
-    const category = language.t("palette.group.files")
-    return file.tree
-      .children("")
-      .filter((node) => node.type === "file")
-      .map((node) => node.path)
-      .sort((a, b) => a.localeCompare(b))
-      .slice(0, ENTRY_LIMIT)
-      .map((path) => createCommandPaletteFileEntry(path, category))
-  })
-
-  const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
-  const project = createMemo(() => {
-    const directory = projectDirectory()
-    if (!directory) return undefined
-    return layout.projects.list().find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
-  })
-  const workspaces = createMemo(() => {
-    const directory = projectDirectory()
-    const current = project()
-    if (!current) return directory ? [directory] : []
-    const dirs = [current.worktree, ...(current.sandboxes ?? [])]
-    if (directory && !dirs.includes(directory)) return [...dirs, directory]
-    return dirs
-  })
-  const homedir = createMemo(() => serverSync().data.path.home)
-  const sessions = createSessionEntries({
-    workspaces,
-    label: (directory) => {
-      const current = project()
-      const kind =
-        current && directory === current.worktree
-          ? language.t("workspace.type.local")
-          : language.t("workspace.type.sandbox")
-      const [store] = serverSync().child(directory, { bootstrap: false })
-      const home = homedir()
-      const path = home ? directory.replace(home, "~") : directory
-      const name = store.vcs?.branch ?? getFilename(directory)
-      return `${kind} : ${name || path}`
-    },
-    load: (directory) => serverSDK.client.session.list({ directory, roots: true }),
-    untitled: () => language.t("command.session.new"),
-    category: () => language.t("command.category.session"),
-  })
-
-  const highlight = (item: CommandPaletteEntry | undefined) => {
-    state.cleanup?.()
-    state.cleanup = undefined
-    if (item?.type !== "command") return
-    state.cleanup = item.option?.onHighlight?.()
-  }
-
-  const select = (item: CommandPaletteEntry | undefined) => {
-    if (!item) return
-    state.committed = true
-    state.cleanup = undefined
-    dialog.close()
-    if (item.type === "command") {
-      item.option?.onSelect?.("palette")
-      return
-    }
-    if (item.type === "session") {
-      if (!item.directory || !item.sessionID) return
-      navigate(`/${base64Encode(item.directory)}/session/${item.sessionID}`)
-      return
-    }
-    if (!item.path) return
-    openFile(item.path)
-  }
-
-  onCleanup(() => {
-    if (state.committed) return
-    state.cleanup?.()
-  })
-
-  return {
-    language,
-    file,
-    commandEntries,
-    preferredCommandEntries,
-    recentFileEntries,
-    rootFileEntries,
-    sessions,
-    highlight,
-    select,
-    close: () => dialog.close(),
-  }
-}
-
-function createCommandEntry(option: CommandOption, category: string): CommandPaletteEntry {
-  return {
-    id: "command:" + option.id,
-    type: "command",
-    title: option.title,
-    description: option.description,
-    keybind: option.keybind,
-    category,
-    option,
-  }
-}
-
-function createSessionEntries(props: {
-  workspaces: () => string[]
-  label: (directory: string) => string
-  load: (directory: string) => ReturnType<ServerSDK["client"]["session"]["list"]>
-  untitled: () => string
-  category: () => string
-}) {
-  const state: {
-    token: number
-    inflight: Promise<CommandPaletteEntry[]> | undefined
-    cached: CommandPaletteEntry[] | undefined
-  } = { token: 0, inflight: undefined, cached: undefined }
-
-  return (text: string) => {
-    if (!text.trim()) {
-      state.token += 1
-      state.inflight = undefined
-      state.cached = undefined
-      return [] as CommandPaletteEntry[]
-    }
-    if (state.cached) return state.cached
-    if (state.inflight) return state.inflight
-
-    const current = state.token
-    const dirs = props.workspaces()
-    if (dirs.length === 0) return [] as CommandPaletteEntry[]
-
-    state.inflight = Promise.all(
-      dirs.map((directory) => {
-        const description = props.label(directory)
-        return props
-          .load(directory)
-          .then((result) =>
-            (result.data ?? [])
-              .filter((session) => !!session?.id)
-              .map((session) => ({
-                id: session.id,
-                title: session.title ?? props.untitled(),
-                description,
-                directory,
-                archived: session.time?.archived,
-                updated: session.time?.updated,
-              })),
-          )
-          .catch(() => [] as SessionEntryInput[])
-      }),
-    )
-      .then((results) => {
-        if (state.token !== current) return [] as CommandPaletteEntry[]
-        const seen = new Set<string>()
-        const next = results
-          .flat()
-          .filter((item) => {
-            const key = `${item.directory}:${item.id}`
-            if (seen.has(key)) return false
-            seen.add(key)
-            return true
-          })
-          .map((item) => createSessionEntry(item, props.category()))
-        state.cached = next
-        return next
-      })
-      .catch(() => [] as CommandPaletteEntry[])
-      .finally(() => {
-        state.inflight = undefined
-      })
-
-    return state.inflight
-  }
-}
-
-type SessionEntryInput = {
-  directory: string
-  id: string
-  title: string
-  description: string
-  archived?: number
-  updated?: number
-}
-
-function createSessionEntry(input: SessionEntryInput, category: string): CommandPaletteEntry {
-  return {
-    id: `session:${input.directory}:${input.id}`,
-    type: "session",
-    title: input.title,
-    description: input.description,
-    category,
-    directory: input.directory,
-    sessionID: input.id,
-    archived: input.archived,
-    updated: input.updated,
-  }
-}
@@ -1,220 +0,0 @@
-.command-palette-v2 {
-  overflow: hidden;
-}
-
-/* Anchor to the top edge of where a centered 480px-tall dialog would sit, so the
-   top stays put while the content-driven height grows and shrinks. */
-[data-component="dialog-v2"]:has(.command-palette-v2) {
-  align-items: flex-start;
-}
-
-[data-component="dialog-v2"]:has(.command-palette-v2) [data-slot="dialog-container"] {
-  width: min(calc(100vw - 24px), 640px);
-  height: auto;
-  min-height: 280px;
-  max-height: min(calc(100vh - 96px), 480px);
-  margin-top: max(48px, calc((100vh - 480px) / 2));
-  border-radius: 12px;
-  background: var(--v2-background-bg-base);
-  box-shadow: var(--v2-elevation-floating);
-}
-
-.command-palette-v2-body {
-  display: flex;
-  min-height: 0;
-  flex: 1;
-  flex-direction: column;
-  gap: 0;
-  padding: 0;
-}
-
-.command-palette-v2-search {
-  flex-shrink: 0;
-  padding: 6px;
-}
-
-.command-palette-v2-search [data-component="text-input-v2"] {
-  width: 100%;
-  height: 36px;
-  border-radius: 6px;
-  outline: 0;
-  background: color-mix(in srgb, var(--v2-background-bg-layer-02) 60%, transparent);
-  box-shadow: none;
-  transition:
-    background-color 120ms ease-in-out,
-    box-shadow 120ms ease-in-out;
-}
-
-.command-palette-v2-search [data-component="text-input-v2"]:where(:hover):not([data-disabled], [data-invalid]),
-.command-palette-v2-search [data-component="text-input-v2"]:where(:focus-within):not([data-disabled], [data-invalid]) {
-  background: var(--v2-background-bg-layer-02);
-  box-shadow: none;
-}
-
-.command-palette-v2-search [data-component="text-input-v2"] [data-slot="text-input-v2-value"] {
-  border-radius: 6px;
-  background: transparent;
-  gap: 8px;
-}
-
-.command-palette-v2-search [data-component="text-input-v2"] [data-slot="text-input-v2-leading-icon"] {
-  padding-left: 12px;
-}
-
-.command-palette-v2-search [data-component="text-input-v2"] [data-slot="text-input-v2-input"] {
-  border-radius: 6px;
-  background: transparent;
-}
-
-.command-palette-v2-scroll {
-  min-height: 0;
-  flex: 1;
-}
-
-.command-palette-v2-results {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-  padding: 6px 6px 8px;
-}
-
-.command-palette-v2-group {
-  display: flex;
-  flex-direction: column;
-  gap: 1px;
-}
-
-.command-palette-v2-group-title {
-  margin: 6px 0;
-  padding: 0 12px;
-  color: var(--v2-text-text-muted);
-  font-size: 13px;
-  font-weight: 440;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-  user-select: none;
-}
-
-.command-palette-v2-row {
-  display: flex;
-  width: 100%;
-  height: 36px;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-  padding: 0 12px;
-  border: 0;
-  border-radius: 6px;
-  background: transparent;
-  color: var(--v2-text-text-base);
-  text-align: left;
-  cursor: default;
-  scroll-margin: 6px 0;
-}
-
-.command-palette-v2-row[data-active] {
-  background: var(--v2-overlay-simple-overlay-hover);
-}
-
-.command-palette-v2-row:focus-visible {
-  background: var(--v2-overlay-simple-overlay-hover);
-  outline: none;
-}
-
-.command-palette-v2-row-main {
-  display: flex;
-  min-width: 0;
-  flex: 1;
-  align-items: center;
-  gap: 8px;
-}
-
-.command-palette-v2-row-icon {
-  flex-shrink: 0;
-  color: var(--v2-icon-icon-muted);
-}
-
-.command-palette-v2-row-text {
-  display: flex;
-  min-width: 0;
-  align-items: center;
-  gap: 6px;
-}
-
-.command-palette-v2-title {
-  min-width: 0;
-  overflow: hidden;
-  color: var(--v2-text-text-base);
-  font-size: 13px;
-  font-weight: 530;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.command-palette-v2-description,
-.command-palette-v2-meta {
-  min-width: 0;
-  overflow: hidden;
-  color: var(--v2-text-text-muted);
-  font-size: 13px;
-  font-weight: 440;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.command-palette-v2-meta {
-  flex-shrink: 0;
-}
-
-.command-palette-v2-file-path {
-  display: flex;
-  min-width: 0;
-  align-items: baseline;
-  font-size: 13px;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-}
-
-.command-palette-v2-file-dir {
-  min-width: 0;
-  overflow: hidden;
-  color: var(--v2-text-text-muted);
-  font-weight: 440;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.command-palette-v2-file-name {
-  flex-shrink: 0;
-  color: var(--v2-text-text-base);
-  font-weight: 530;
-  white-space: nowrap;
-}
-
-.command-palette-v2-state {
-  display: grid;
-  min-height: 120px;
-  place-items: center;
-  color: var(--v2-text-text-muted);
-  font-size: 13px;
-  font-weight: 440;
-  line-height: 16px;
-  letter-spacing: -0.04px;
-}
-
-@media (max-width: 640px) {
-  .command-palette-v2-row-text {
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 1px;
-  }
-
-  .command-palette-v2-description {
-    max-width: 100%;
-  }
-}
@@ -1,221 +0,0 @@
-import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
-import { FileIcon } from "@opencode-ai/ui/file-icon"
-import { ScrollView } from "@opencode-ai/ui/scroll-view"
-import { Dialog, DialogBody } from "@opencode-ai/ui/v2/dialog-v2"
-import { Icon } from "@opencode-ai/ui/v2/icon"
-import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
-import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
-import { createEffect, createMemo, createResource, createSignal, For, Match, Show, Switch } from "solid-js"
-import { formatKeybindParts } from "@/context/command"
-import { useLanguage } from "@/context/language"
-import { getRelativeTime } from "@/utils/time"
-import {
-  createCommandPaletteFileEntry,
-  createCommandPaletteModel,
-  uniqueCommandPaletteEntries,
-  type CommandPaletteEntry,
-} from "./command-palette"
-import "./dialog-command-palette-v2.css"
-
-function groups(entries: CommandPaletteEntry[]) {
-  const map = new Map<string, CommandPaletteEntry[]>()
-  for (const entry of entries) map.set(entry.category, [...(map.get(entry.category) ?? []), entry])
-  return Array.from(map.entries()).map(([category, entries]) => ({ category, entries }))
-}
-
-function matchesEntry(entry: CommandPaletteEntry, query: string) {
-  const value = query.toLowerCase()
-  return [entry.title, entry.description, entry.category].some((text) => text?.toLowerCase().includes(value))
-}
-
-export function DialogCommandPaletteV2(props: { onOpenFile?: (path: string) => void }) {
-  const palette = createCommandPaletteModel(props)
-  const [query, setQuery] = createSignal("")
-  const [active, setActive] = createSignal(0)
-
-  const loadItems = async (text: string) => {
-    const q = text.trim()
-    if (!q) return [...palette.preferredCommandEntries(), ...palette.recentFileEntries()]
-
-    const [files, nextSessions] = await Promise.all([palette.file.searchFiles(q), Promise.resolve(palette.sessions(q))])
-    const category = palette.language.t("palette.group.files")
-    return [
-      ...palette.commandEntries().filter((entry) => matchesEntry(entry, q)),
-      ...nextSessions.filter((entry) => matchesEntry(entry, q)),
-      ...files.map((path) => createCommandPaletteFileEntry(path, category)),
-    ]
-  }
-
-  const [entries] = createResource(query, loadItems, { initialValue: [] as CommandPaletteEntry[] })
-  // Render stale results while a new query loads to avoid flashing "Loading" per keystroke.
-  const visibleEntries = createMemo(() => uniqueCommandPaletteEntries(entries.latest ?? []))
-  const groupedEntries = createMemo(() => groups(visibleEntries()))
-  const activeEntry = createMemo(() => visibleEntries()[active()])
-
-  createEffect(() => {
-    query()
-    visibleEntries()
-    setActive(0)
-  })
-
-  createEffect(() => {
-    palette.highlight(activeEntry())
-  })
-
-  let resultsRef: HTMLDivElement | undefined
-
-  const move = (delta: -1 | 1) => {
-    const count = visibleEntries().length
-    if (count === 0) return
-    setActive((index) => (index + delta + count) % count)
-    requestAnimationFrame(() => {
-      resultsRef?.querySelector("[data-active]")?.scrollIntoView({ block: "nearest" })
-    })
-  }
-
-  const handleKeyDown = (event: KeyboardEvent) => {
-    if (event.key === "ArrowDown") {
-      event.preventDefault()
-      move(1)
-      return
-    }
-    if (event.key === "ArrowUp") {
-      event.preventDefault()
-      move(-1)
-      return
-    }
-    if (event.key === "Enter") {
-      event.preventDefault()
-      palette.select(activeEntry())
-      return
-    }
-    if (event.key === "Escape") {
-      event.preventDefault()
-      palette.close()
-    }
-  }
-
-  return (
-    <Dialog class="command-palette-v2" size="large">
-      <DialogBody class="command-palette-v2-body">
-        <div class="command-palette-v2-search">
-          <TextInputV2
-            value={query()}
-            autofocus
-            autocomplete="off"
-            spellcheck={false}
-            appearance="large"
-            placeholder={palette.language.t("palette.search.placeholder")}
-            leadingIcon={<Icon name="magnifying-glass" />}
-            onInput={(event) => setQuery(event.currentTarget.value)}
-            onKeyDown={handleKeyDown}
-          />
-        </div>
-        <ScrollView class="command-palette-v2-scroll" viewportRef={(el) => (resultsRef = el)}>
-          <div class="command-palette-v2-results" role="listbox">
-            <Show
-              when={visibleEntries().length > 0}
-              fallback={
-                <div class="command-palette-v2-state">
-                  {entries.loading ? palette.language.t("common.loading") : palette.language.t("palette.empty")}
-                </div>
-              }
-            >
-              <For each={groupedEntries()}>
-                {(group) => (
-                  <div class="command-palette-v2-group">
-                    <Show when={group.category}>
-                      <div class="command-palette-v2-group-title">{group.category}</div>
-                    </Show>
-                    <For each={group.entries}>
-                      {(item) => (
-                        <PaletteRow
-                          item={item}
-                          active={activeEntry()?.id === item.id}
-                          language={palette.language}
-                          onActive={() => setActive(visibleEntries().findIndex((entry) => entry.id === item.id))}
-                          onSelect={() => palette.select(item)}
-                        />
-                      )}
-                    </For>
-                  </div>
-                )}
-              </For>
-            </Show>
-          </div>
-        </ScrollView>
-      </DialogBody>
-    </Dialog>
-  )
-}
-
-function PaletteRow(props: {
-  item: CommandPaletteEntry
-  active: boolean
-  language: ReturnType<typeof useLanguage>
-  onActive: () => void
-  onSelect: () => void
-}) {
-  return (
-    <button
-      type="button"
-      class="command-palette-v2-row"
-      role="option"
-      aria-selected={props.active}
-      data-active={props.active ? "" : undefined}
-      onMouseMove={(event) => {
-        // Ignore hover from a static cursor when keyboard scrolling moves rows underneath it.
-        if (event.movementX === 0 && event.movementY === 0) return
-        props.onActive()
-      }}
-      onMouseDown={(event) => event.preventDefault()}
-      onClick={props.onSelect}
-    >
-      <Switch
-        fallback={
-          <div class="command-palette-v2-row-main">
-            <FileIcon node={{ path: props.item.path ?? "", type: "file" }} class="command-palette-v2-row-icon size-4" />
-            <div class="command-palette-v2-file-path">
-              <span class="command-palette-v2-file-dir">{getDirectory(props.item.path ?? "")}</span>
-              <span class="command-palette-v2-file-name">{getFilename(props.item.path ?? "")}</span>
-            </div>
-          </div>
-        }
-      >
-        <Match when={props.item.type === "command"}>
-          <div class="command-palette-v2-row-main">
-            <div class="command-palette-v2-row-text">
-              <span class="command-palette-v2-title">{props.item.title}</span>
-              <Show when={props.item.description}>
-                <span class="command-palette-v2-description">{props.item.description}</span>
-              </Show>
-            </div>
-          </div>
-          <Show when={props.item.keybind}>
-            <KeybindV2 keys={formatKeybindParts(props.item.keybind ?? "", props.language.t)} variant="neutral" />
-          </Show>
-        </Match>
-        <Match when={props.item.type === "session"}>
-          <div class="command-palette-v2-row-main">
-            <Icon name="status" class="command-palette-v2-row-icon" />
-            <div class="command-palette-v2-row-text">
-              <span class="command-palette-v2-title" classList={{ "opacity-70": !!props.item.archived }}>
-                {props.item.title}
-              </span>
-              <Show when={props.item.description}>
-                <span class="command-palette-v2-description" classList={{ "opacity-70": !!props.item.archived }}>
-                  {props.item.description}
-                </span>
-              </Show>
-            </div>
-          </div>
-          <Show when={props.item.updated}>
-            <span class="command-palette-v2-meta">
-              {getRelativeTime(new Date(props.item.updated!).toISOString(), props.language.t)}
-            </span>
-          </Show>
-        </Match>
-      </Switch>
-    </button>
-  )
-}
@@ -7,174 +7,29 @@ import { IconButton } from "@opencode-ai/ui/icon-button"
 import { List, type ListRef } from "@opencode-ai/ui/list"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { Spinner } from "@opencode-ai/ui/spinner"
-import { Tag } from "@opencode-ai/ui/tag"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { showToast } from "@/utils/toast"
-import {
-  type Accessor,
-  type Component,
-  createEffect,
-  createMemo,
-  createResource,
-  Match,
-  onCleanup,
-  onMount,
-  Show,
-  Switch,
-} from "solid-js"
+import { type Accessor, createEffect, createMemo, createResource, Match, onCleanup, onMount, Switch } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { Link } from "@/components/link"
 import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
-import { popularProviders, useProviders } from "@/hooks/use-providers"
-import { CustomProviderForm } from "./dialog-custom-provider"
+import { useProviders } from "@/hooks/use-providers"

-const CUSTOM_ID = "_custom"
-
-export function useProviderConnectController(options: { onBack?: () => void } = {}) {
-  const [store, setStore] = createStore({ selected: undefined as string | undefined })
-  const reset = () => setStore("selected", undefined)
-
-  return {
-    selected: () => store.selected,
-    select: (provider?: string) => setStore("selected", provider),
-    back: options.onBack ?? reset,
-  }
-}
-
-export const DialogConnectProvider: Component<{
-  directory?: Accessor<string | undefined>
-  controller?: ReturnType<typeof useProviderConnectController>
-}> = (props) => {
-  const fallback = useProviderConnectController()
-  const controller = props.controller ?? fallback
-  const language = useLanguage()
-  const reset = controller.back
-  const back = { current: reset }
-  const select = (provider?: string) => {
-    back.current = reset
-    controller.select(provider)
-  }
-
-  return (
-    <Dialog
-      class="h-full"
-      transition
-      title={
-        <Show when={controller.selected()} fallback={language.t("command.provider.connect")}>
-          <IconButton
-            tabIndex={-1}
-            icon="arrow-left"
-            variant="ghost"
-            onClick={() => back.current()}
-            aria-label={language.t("common.goBack")}
-          />
-        </Show>
-      }
-    >
-      <Switch>
-        <Match when={controller.selected() === CUSTOM_ID}>
-          <CustomProviderForm />
-        </Match>
-        <Match when={controller.selected() && controller.selected() !== CUSTOM_ID ? controller.selected() : undefined}>
-          {(provider) => (
-            <ProviderConnection
-              provider={provider()}
-              directory={props.directory}
-              onBack={reset}
-              setBack={(handler) => (back.current = handler)}
-            />
-          )}
-        </Match>
-        <Match when={true}>
-          <ProviderPicker directory={props.directory} onSelect={select} />
-        </Match>
-      </Switch>
-    </Dialog>
-  )
-}
-
-function ProviderPicker(props: { directory?: Accessor<string | undefined>; onSelect: (provider: string) => void }) {
-  const providers = useProviders(props.directory)
-  const language = useLanguage()
-  const popularGroup = () => language.t("dialog.provider.group.popular")
-  const otherGroup = () => language.t("dialog.provider.group.other")
-  const customLabel = () => language.t("settings.providers.tag.custom")
-  const note = (id: string) => {
-    if (id === "anthropic") return language.t("dialog.provider.anthropic.note")
-    if (id === "openai") return language.t("dialog.provider.openai.note")
-    if (id.startsWith("github-copilot")) return language.t("dialog.provider.copilot.note")
-    if (id === "opencode-go") return language.t("dialog.provider.opencodeGo.tagline")
-    return undefined
-  }
-
-  return (
-    <List
-      class="px-3"
-      search={{ placeholder: language.t("dialog.provider.search.placeholder"), autofocus: true }}
-      emptyMessage={language.t("dialog.provider.empty")}
-      activeIcon="plus-small"
-      key={(x) => x?.id}
-      items={() => {
-        language.locale()
-        return [{ id: CUSTOM_ID, name: customLabel() }, ...providers.all().values()]
-      }}
-      filterKeys={["id", "name"]}
-      groupBy={(x) => (popularProviders.includes(x.id) ? popularGroup() : otherGroup())}
-      sortBy={(a, b) => {
-        if (a.id === CUSTOM_ID) return -1
-        if (b.id === CUSTOM_ID) return 1
-        if (popularProviders.includes(a.id) && popularProviders.includes(b.id))
-          return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
-        return a.name.localeCompare(b.name)
-      }}
-      sortGroupsBy={(a, b) => {
-        const popular = popularGroup()
-        if (a.category === popular && b.category !== popular) return -1
-        if (b.category === popular && a.category !== popular) return 1
-        return 0
-      }}
-      onSelect={(x) => {
-        if (!x) return
-        props.onSelect(x.id)
-      }}
-    >
-      {(i) => (
-        <div class="px-1.25 w-full flex items-center gap-x-3">
-          <ProviderIcon data-slot="list-item-extra-icon" id={i.id} />
-          <span>{i.name}</span>
-          <Show when={i.id === "opencode"}>
-            <div class="text-14-regular text-text-weak">{language.t("dialog.provider.opencode.tagline")}</div>
-          </Show>
-          <Show when={i.id === CUSTOM_ID}>
-            <Tag>{language.t("settings.providers.tag.custom")}</Tag>
-          </Show>
-          <Show when={i.id === "opencode"}>
-            <Tag>{language.t("dialog.provider.tag.recommended")}</Tag>
-          </Show>
-          <Show when={note(i.id)}>{(value) => <div class="text-14-regular text-text-weak">{value()}</div>}</Show>
-          <Show when={i.id === "opencode-go"}>
-            <Tag>{language.t("dialog.provider.tag.recommended")}</Tag>
-          </Show>
-        </div>
-      )}
-    </List>
-  )
-}
-
-function ProviderConnection(props: {
-  provider: string
-  directory?: Accessor<string | undefined>
-  onBack: () => void
-  setBack: (handler: () => void) => void
-}) {
+export function DialogConnectProvider(props: { provider: string; directory?: Accessor<string | undefined> }) {
  const dialog = useDialog()
  const serverSync = useServerSync()
  const serverSDK = useServerSDK()
  const language = useLanguage()
  const providers = useProviders(props.directory)

+  const all = () => {
+    void import("./dialog-select-provider").then((x) => {
+      dialog.show(() => <x.DialogSelectProvider directory={props.directory} />)
+    })
+  }
+
  const alive = { value: true }
  const timer = { current: undefined as ReturnType<typeof setTimeout> | undefined }

@@ -509,15 +364,21 @@ function ProviderConnection(props: {
  }

  function goBack() {
-    if (methods().length > 1 && store.methodIndex !== undefined) {
+    if (methods().length === 1) {
+      all()
+      return
+    }
+    if (store.authorization) {
      dispatch({ type: "method.reset" })
      return
    }
-    props.onBack()
+    if (store.methodIndex !== undefined) {
+      dispatch({ type: "method.reset" })
+      return
+    }
+    all()
  }

-  props.setBack(goBack)
-
  function MethodSelection() {
    return (
      <>
@@ -738,67 +599,79 @@ function ProviderConnection(props: {
  }

  return (
-    <div class="flex flex-col gap-6 px-2.5 pb-3">
-      <div class="px-2.5 flex gap-4 items-center">
-        <ProviderIcon id={props.provider} class="size-5 shrink-0 icon-strong-base" />
-        <div class="text-16-medium text-text-strong">
-          <Switch>
-            <Match when={props.provider === "anthropic" && method()?.label?.toLowerCase().includes("max")}>
-              {language.t("provider.connect.title.anthropicProMax")}
-            </Match>
-            <Match when={true}>{language.t("provider.connect.title", { provider: provider().name })}</Match>
-          </Switch>
+    <Dialog
+      title={
+        <IconButton
+          tabIndex={-1}
+          icon="arrow-left"
+          variant="ghost"
+          onClick={goBack}
+          aria-label={language.t("common.goBack")}
+        />
+      }
+    >
+      <div class="flex flex-col gap-6 px-2.5 pb-3">
+        <div class="px-2.5 flex gap-4 items-center">
+          <ProviderIcon id={props.provider} class="size-5 shrink-0 icon-strong-base" />
+          <div class="text-16-medium text-text-strong">
+            <Switch>
+              <Match when={props.provider === "anthropic" && method()?.label?.toLowerCase().includes("max")}>
+                {language.t("provider.connect.title.anthropicProMax")}
+              </Match>
+              <Match when={true}>{language.t("provider.connect.title", { provider: provider().name })}</Match>
+            </Switch>
+          </div>
+        </div>
+        <div class="px-2.5 pb-10 flex flex-col gap-6">
+          <div onKeyDown={handleKey} tabIndex={0} autofocus={store.methodIndex === undefined ? true : undefined}>
+            <Switch>
+              <Match when={loading()}>
+                <div class="text-14-regular text-text-base">
+                  <div class="flex items-center gap-x-2">
+                    <Spinner />
+                    <span>{language.t("provider.connect.status.inProgress")}</span>
+                  </div>
+                </div>
+              </Match>
+              <Match when={store.methodIndex === undefined}>
+                <MethodSelection />
+              </Match>
+              <Match when={store.state === "pending"}>
+                <div class="text-14-regular text-text-base">
+                  <div class="flex items-center gap-x-2">
+                    <Spinner />
+                    <span>{language.t("provider.connect.status.inProgress")}</span>
+                  </div>
+                </div>
+              </Match>
+              <Match when={store.state === "prompt"}>
+                <AuthPromptsView />
+              </Match>
+              <Match when={store.state === "error"}>
+                <div class="text-14-regular text-text-base">
+                  <div class="flex items-center gap-x-2">
+                    <Icon name="circle-ban-sign" class="text-icon-critical-base" />
+                    <span>{language.t("provider.connect.status.failed", { error: store.error ?? "" })}</span>
+                  </div>
+                </div>
+              </Match>
+              <Match when={method()?.type === "api"}>
+                <ApiAuthView />
+              </Match>
+              <Match when={method()?.type === "oauth"}>
+                <Switch>
+                  <Match when={store.authorization?.method === "code"}>
+                    <OAuthCodeView />
+                  </Match>
+                  <Match when={store.authorization?.method === "auto"}>
+                    <OAuthAutoView />
+                  </Match>
+                </Switch>
+              </Match>
+            </Switch>
+          </div>
        </div>
      </div>
-      <div class="px-2.5 pb-10 flex flex-col gap-6">
-        <div onKeyDown={handleKey} tabIndex={0} autofocus={store.methodIndex === undefined ? true : undefined}>
-          <Switch>
-            <Match when={loading()}>
-              <div class="text-14-regular text-text-base">
-                <div class="flex items-center gap-x-2">
-                  <Spinner />
-                  <span>{language.t("provider.connect.status.inProgress")}</span>
-                </div>
-              </div>
-            </Match>
-            <Match when={store.methodIndex === undefined}>
-              <MethodSelection />
-            </Match>
-            <Match when={store.state === "pending"}>
-              <div class="text-14-regular text-text-base">
-                <div class="flex items-center gap-x-2">
-                  <Spinner />
-                  <span>{language.t("provider.connect.status.inProgress")}</span>
-                </div>
-              </div>
-            </Match>
-            <Match when={store.state === "prompt"}>
-              <AuthPromptsView />
-            </Match>
-            <Match when={store.state === "error"}>
-              <div class="text-14-regular text-text-base">
-                <div class="flex items-center gap-x-2">
-                  <Icon name="circle-ban-sign" class="text-icon-critical-base" />
-                  <span>{language.t("provider.connect.status.failed", { error: store.error ?? "" })}</span>
-                </div>
-              </div>
-            </Match>
-            <Match when={method()?.type === "api"}>
-              <ApiAuthView />
-            </Match>
-            <Match when={method()?.type === "oauth"}>
-              <Switch>
-                <Match when={store.authorization?.method === "code"}>
-                  <OAuthCodeView />
-                </Match>
-                <Match when={store.authorization?.method === "auto"}>
-                  <OAuthAutoView />
-                </Match>
-              </Switch>
-            </Match>
-          </Switch>
-        </div>
-      </div>
-    </div>
+    </Dialog>
  )
 }
@@ -6,41 +6,21 @@ import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { useMutation } from "@tanstack/solid-query"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { showToast } from "@/utils/toast"
-import { batch, For } from "solid-js"
+import { type Accessor, batch, For } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { Link } from "@/components/link"
 import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
 import { type FormState, headerRow, modelRow, validateCustomProvider } from "./dialog-custom-provider-form"
+import { DialogSelectProvider } from "./dialog-select-provider"

 type Props = {
-  onBack: () => void
+  back?: "providers" | "close"
+  directory?: Accessor<string | undefined>
 }

 export function DialogCustomProvider(props: Props) {
-  const language = useLanguage()
-
-  return (
-    <Dialog
-      class="h-full"
-      title={
-        <IconButton
-          tabIndex={-1}
-          icon="arrow-left"
-          variant="ghost"
-          onClick={props.onBack}
-          aria-label={language.t("common.goBack")}
-        />
-      }
-      transition
-    >
-      <CustomProviderForm />
-    </Dialog>
-  )
-}
-
-export function CustomProviderForm() {
  const dialog = useDialog()
  const serverSync = useServerSync()
  const serverSDK = useServerSDK()
@@ -56,6 +36,14 @@ export function CustomProviderForm() {
    err: {},
  })

+  const goBack = () => {
+    if (props.back === "close") {
+      dialog.close()
+      return
+    }
+    dialog.show(() => <DialogSelectProvider directory={props.directory} />)
+  }
+
  const addModel = () => {
    setForm(
      "models",
@@ -175,155 +163,168 @@ export function CustomProviderForm() {
  }

  return (
-    <div class="flex flex-col gap-6 px-2.5 pb-3 overflow-y-auto max-h-[60vh]">
-      <div class="px-2.5 flex gap-4 items-center">
-        <ProviderIcon id="synthetic" class="size-5 shrink-0 icon-strong-base" />
-        <div class="text-16-medium text-text-strong">{language.t("provider.custom.title")}</div>
+    <Dialog
+      title={
+        <IconButton
+          tabIndex={-1}
+          icon="arrow-left"
+          variant="ghost"
+          onClick={goBack}
+          aria-label={language.t("common.goBack")}
+        />
+      }
+      transition
+    >
+      <div class="flex flex-col gap-6 px-2.5 pb-3 overflow-y-auto max-h-[60vh]">
+        <div class="px-2.5 flex gap-4 items-center">
+          <ProviderIcon id="synthetic" class="size-5 shrink-0 icon-strong-base" />
+          <div class="text-16-medium text-text-strong">{language.t("provider.custom.title")}</div>
+        </div>
+
+        <form onSubmit={save} class="px-2.5 pb-6 flex flex-col gap-6">
+          <p class="text-14-regular text-text-base">
+            {language.t("provider.custom.description.prefix")}
+            <Link href="https://opencode.ai/docs/providers/#custom-provider" tabIndex={-1}>
+              {language.t("provider.custom.description.link")}
+            </Link>
+            {language.t("provider.custom.description.suffix")}
+          </p>
+
+          <div class="flex flex-col gap-4">
+            <TextField
+              autofocus
+              label={language.t("provider.custom.field.providerID.label")}
+              placeholder={language.t("provider.custom.field.providerID.placeholder")}
+              description={language.t("provider.custom.field.providerID.description")}
+              value={form.providerID}
+              onChange={(v) => setField("providerID", v)}
+              validationState={form.err.providerID ? "invalid" : undefined}
+              error={form.err.providerID}
+            />
+            <TextField
+              label={language.t("provider.custom.field.name.label")}
+              placeholder={language.t("provider.custom.field.name.placeholder")}
+              value={form.name}
+              onChange={(v) => setField("name", v)}
+              validationState={form.err.name ? "invalid" : undefined}
+              error={form.err.name}
+            />
+            <TextField
+              label={language.t("provider.custom.field.baseURL.label")}
+              placeholder={language.t("provider.custom.field.baseURL.placeholder")}
+              value={form.baseURL}
+              onChange={(v) => setField("baseURL", v)}
+              validationState={form.err.baseURL ? "invalid" : undefined}
+              error={form.err.baseURL}
+            />
+            <TextField
+              label={language.t("provider.custom.field.apiKey.label")}
+              placeholder={language.t("provider.custom.field.apiKey.placeholder")}
+              description={language.t("provider.custom.field.apiKey.description")}
+              value={form.apiKey}
+              onChange={(v) => setField("apiKey", v)}
+            />
+          </div>
+
+          <div class="flex flex-col gap-3">
+            <label class="text-12-medium text-text-weak">{language.t("provider.custom.models.label")}</label>
+            <For each={form.models}>
+              {(m, i) => (
+                <div class="flex gap-2 items-start" data-row={m.row}>
+                  <div class="flex-1">
+                    <TextField
+                      label={language.t("provider.custom.models.id.label")}
+                      hideLabel
+                      placeholder={language.t("provider.custom.models.id.placeholder")}
+                      value={m.id}
+                      onChange={(v) => setModel(i(), "id", v)}
+                      validationState={m.err.id ? "invalid" : undefined}
+                      error={m.err.id}
+                    />
+                  </div>
+                  <div class="flex-1">
+                    <TextField
+                      label={language.t("provider.custom.models.name.label")}
+                      hideLabel
+                      placeholder={language.t("provider.custom.models.name.placeholder")}
+                      value={m.name}
+                      onChange={(v) => setModel(i(), "name", v)}
+                      validationState={m.err.name ? "invalid" : undefined}
+                      error={m.err.name}
+                    />
+                  </div>
+                  <IconButton
+                    type="button"
+                    icon="trash"
+                    variant="ghost"
+                    class="mt-1.5"
+                    onClick={() => removeModel(i())}
+                    disabled={form.models.length <= 1}
+                    aria-label={language.t("provider.custom.models.remove")}
+                  />
+                </div>
+              )}
+            </For>
+            <Button type="button" size="small" variant="ghost" icon="plus-small" onClick={addModel} class="self-start">
+              {language.t("provider.custom.models.add")}
+            </Button>
+          </div>
+
+          <div class="flex flex-col gap-3">
+            <label class="text-12-medium text-text-weak">{language.t("provider.custom.headers.label")}</label>
+            <For each={form.headers}>
+              {(h, i) => (
+                <div class="flex gap-2 items-start" data-row={h.row}>
+                  <div class="flex-1">
+                    <TextField
+                      label={language.t("provider.custom.headers.key.label")}
+                      hideLabel
+                      placeholder={language.t("provider.custom.headers.key.placeholder")}
+                      value={h.key}
+                      onChange={(v) => setHeader(i(), "key", v)}
+                      validationState={h.err.key ? "invalid" : undefined}
+                      error={h.err.key}
+                    />
+                  </div>
+                  <div class="flex-1">
+                    <TextField
+                      label={language.t("provider.custom.headers.value.label")}
+                      hideLabel
+                      placeholder={language.t("provider.custom.headers.value.placeholder")}
+                      value={h.value}
+                      onChange={(v) => setHeader(i(), "value", v)}
+                      validationState={h.err.value ? "invalid" : undefined}
+                      error={h.err.value}
+                    />
+                  </div>
+                  <IconButton
+                    type="button"
+                    icon="trash"
+                    variant="ghost"
+                    class="mt-1.5"
+                    onClick={() => removeHeader(i())}
+                    disabled={form.headers.length <= 1}
+                    aria-label={language.t("provider.custom.headers.remove")}
+                  />
+                </div>
+              )}
+            </For>
+            <Button type="button" size="small" variant="ghost" icon="plus-small" onClick={addHeader} class="self-start">
+              {language.t("provider.custom.headers.add")}
+            </Button>
+          </div>
+
+          <Button
+            class="w-auto self-start"
+            type="submit"
+            size="large"
+            variant="primary"
+            disabled={saveMutation.isPending}
+          >
+            {saveMutation.isPending ? language.t("common.saving") : language.t("common.submit")}
+          </Button>
+        </form>
      </div>
-
-      <form onSubmit={save} class="px-2.5 pb-6 flex flex-col gap-6">
-        <p class="text-14-regular text-text-base">
-          {language.t("provider.custom.description.prefix")}
-          <Link href="https://opencode.ai/docs/providers/#custom-provider" tabIndex={-1}>
-            {language.t("provider.custom.description.link")}
-          </Link>
-          {language.t("provider.custom.description.suffix")}
-        </p>
-
-        <div class="flex flex-col gap-4">
-          <TextField
-            autofocus
-            label={language.t("provider.custom.field.providerID.label")}
-            placeholder={language.t("provider.custom.field.providerID.placeholder")}
-            description={language.t("provider.custom.field.providerID.description")}
-            value={form.providerID}
-            onChange={(v) => setField("providerID", v)}
-            validationState={form.err.providerID ? "invalid" : undefined}
-            error={form.err.providerID}
-          />
-          <TextField
-            label={language.t("provider.custom.field.name.label")}
-            placeholder={language.t("provider.custom.field.name.placeholder")}
-            value={form.name}
-            onChange={(v) => setField("name", v)}
-            validationState={form.err.name ? "invalid" : undefined}
-            error={form.err.name}
-          />
-          <TextField
-            label={language.t("provider.custom.field.baseURL.label")}
-            placeholder={language.t("provider.custom.field.baseURL.placeholder")}
-            value={form.baseURL}
-            onChange={(v) => setField("baseURL", v)}
-            validationState={form.err.baseURL ? "invalid" : undefined}
-            error={form.err.baseURL}
-          />
-          <TextField
-            label={language.t("provider.custom.field.apiKey.label")}
-            placeholder={language.t("provider.custom.field.apiKey.placeholder")}
-            description={language.t("provider.custom.field.apiKey.description")}
-            value={form.apiKey}
-            onChange={(v) => setField("apiKey", v)}
-          />
-        </div>
-
-        <div class="flex flex-col gap-3">
-          <label class="text-12-medium text-text-weak">{language.t("provider.custom.models.label")}</label>
-          <For each={form.models}>
-            {(m, i) => (
-              <div class="flex gap-2 items-start" data-row={m.row}>
-                <div class="flex-1">
-                  <TextField
-                    label={language.t("provider.custom.models.id.label")}
-                    hideLabel
-                    placeholder={language.t("provider.custom.models.id.placeholder")}
-                    value={m.id}
-                    onChange={(v) => setModel(i(), "id", v)}
-                    validationState={m.err.id ? "invalid" : undefined}
-                    error={m.err.id}
-                  />
-                </div>
-                <div class="flex-1">
-                  <TextField
-                    label={language.t("provider.custom.models.name.label")}
-                    hideLabel
-                    placeholder={language.t("provider.custom.models.name.placeholder")}
-                    value={m.name}
-                    onChange={(v) => setModel(i(), "name", v)}
-                    validationState={m.err.name ? "invalid" : undefined}
-                    error={m.err.name}
-                  />
-                </div>
-                <IconButton
-                  type="button"
-                  icon="trash"
-                  variant="ghost"
-                  class="mt-1.5"
-                  onClick={() => removeModel(i())}
-                  disabled={form.models.length <= 1}
-                  aria-label={language.t("provider.custom.models.remove")}
-                />
-              </div>
-            )}
-          </For>
-          <Button type="button" size="small" variant="ghost" icon="plus-small" onClick={addModel} class="self-start">
-            {language.t("provider.custom.models.add")}
-          </Button>
-        </div>
-
-        <div class="flex flex-col gap-3">
-          <label class="text-12-medium text-text-weak">{language.t("provider.custom.headers.label")}</label>
-          <For each={form.headers}>
-            {(h, i) => (
-              <div class="flex gap-2 items-start" data-row={h.row}>
-                <div class="flex-1">
-                  <TextField
-                    label={language.t("provider.custom.headers.key.label")}
-                    hideLabel
-                    placeholder={language.t("provider.custom.headers.key.placeholder")}
-                    value={h.key}
-                    onChange={(v) => setHeader(i(), "key", v)}
-                    validationState={h.err.key ? "invalid" : undefined}
-                    error={h.err.key}
-                  />
-                </div>
-                <div class="flex-1">
-                  <TextField
-                    label={language.t("provider.custom.headers.value.label")}
-                    hideLabel
-                    placeholder={language.t("provider.custom.headers.value.placeholder")}
-                    value={h.value}
-                    onChange={(v) => setHeader(i(), "value", v)}
-                    validationState={h.err.value ? "invalid" : undefined}
-                    error={h.err.value}
-                  />
-                </div>
-                <IconButton
-                  type="button"
-                  icon="trash"
-                  variant="ghost"
-                  class="mt-1.5"
-                  onClick={() => removeHeader(i())}
-                  disabled={form.headers.length <= 1}
-                  aria-label={language.t("provider.custom.headers.remove")}
-                />
-              </div>
-            )}
-          </For>
-          <Button type="button" size="small" variant="ghost" icon="plus-small" onClick={addHeader} class="self-start">
-            {language.t("provider.custom.headers.add")}
-          </Button>
-        </div>
-
-        <Button
-          class="w-auto self-start"
-          type="submit"
-          size="large"
-          variant="primary"
-          disabled={saveMutation.isPending}
-        >
-          {saveMutation.isPending ? language.t("common.saving") : language.t("common.submit")}
-        </Button>
-      </form>
-    </div>
+    </Dialog>
  )
 }
@@ -16,7 +16,7 @@ import { useLocal } from "@/context/local"
 import { popularProviders } from "@/hooks/use-providers"
 import { useLanguage } from "@/context/language"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { DialogConnectProvider } from "./dialog-connect-provider"
+import { DialogSelectProvider } from "./dialog-select-provider"
 import { decode64 } from "@/utils/base64"
 import { SettingsListV2 } from "./settings-v2/parts/list"
 import { SettingsRowV2 } from "./settings-v2/parts/row"
@@ -31,7 +31,7 @@ export const DialogManageModels: Component = () => {
  const directory = () => decode64(local.slug())

  const handleConnectProvider = () => {
-    void dialog.show(() => <DialogConnectProvider directory={directory} />)
+    dialog.show(() => <DialogSelectProvider directory={directory} />)
  }
  const providerRank = (id: string) => popularProviders.indexOf(id)
  const providerList = (providerID: string) => local.model.list().filter((x) => x.provider.id === providerID)
@@ -123,7 +123,7 @@ export const DialogManageModelsV2: Component = () => {
  const directory = () => decode64(local.slug())

  const handleConnectProvider = () => {
-    void dialog.show(() => <DialogConnectProvider directory={directory} />)
+    dialog.show(() => <DialogSelectProvider directory={directory} />)
  }
  const providerList = (providerID: string) => local.model.list().filter((x) => x.provider.id === providerID)
  const providerVisible = (providerID: string) =>
@@ -1,84 +1,329 @@
+import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Keybind } from "@opencode-ai/ui/keybind"
 import { List } from "@opencode-ai/ui/list"
+import { base64Encode } from "@opencode-ai/core/util/encode"
 import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
-import { createMemo, createSignal, lazy, Match, Show, Switch } from "solid-js"
-import { formatKeybind } from "@/context/command"
-import { useServerSDK } from "@/context/server-sdk"
+import { useNavigate } from "@solidjs/router"
+import { createMemo, createSignal, lazy, Match, onCleanup, Show, Switch } from "solid-js"
+import { formatKeybind, useCommand, type CommandOption } from "@/context/command"
+import { useServerSDK, type ServerSDK } from "@/context/server-sdk"
+import { useServerSync } from "@/context/server-sync"
+import { useLayout } from "@/context/layout"
+import { useFile } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { useSettings } from "@/context/settings"
 import { useSessionLayout } from "@/pages/session/session-layout"
+import { createSessionTabs } from "@/pages/session/helpers"
 import { decode64 } from "@/utils/base64"
 import { getRelativeTime } from "@/utils/time"
-import {
-  createCommandPaletteFileEntry,
-  createCommandPaletteFileOpener,
-  createCommandPaletteModel,
-  uniqueCommandPaletteEntries,
-  type CommandPaletteEntry,
-} from "./command-palette"

 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 EntryType = "command" | "file" | "session"
+
+type Entry = {
+  id: string
+  type: EntryType
+  title: string
+  description?: string
+  keybind?: string
+  category: string
+  option?: CommandOption
+  path?: string
+  directory?: string
+  sessionID?: string
+  archived?: number
+  updated?: number
+}

 type DialogSelectFileMode = "all" | "files"

+const ENTRY_LIMIT = 5
+const COMMON_COMMAND_IDS = [
+  "session.new",
+  "workspace.new",
+  "session.previous",
+  "session.next",
+  "terminal.toggle",
+  "review.toggle",
+] as const
+
+const uniqueEntries = (items: Entry[]) => {
+  const seen = new Set<string>()
+  const out: Entry[] = []
+  for (const item of items) {
+    if (seen.has(item.id)) continue
+    seen.add(item.id)
+    out.push(item)
+  }
+  return out
+}
+
+const createCommandEntry = (option: CommandOption, category: string): Entry => ({
+  id: "command:" + option.id,
+  type: "command",
+  title: option.title,
+  description: option.description,
+  keybind: option.keybind,
+  category,
+  option,
+})
+
+const createFileEntry = (path: string, category: string): Entry => ({
+  id: "file:" + path,
+  type: "file",
+  title: path,
+  category,
+  path,
+})
+
+const createSessionEntry = (
+  input: {
+    directory: string
+    id: string
+    title: string
+    description: string
+    archived?: number
+    updated?: number
+  },
+  category: string,
+): Entry => ({
+  id: `session:${input.directory}:${input.id}`,
+  type: "session",
+  title: input.title,
+  description: input.description,
+  category,
+  directory: input.directory,
+  sessionID: input.id,
+  archived: input.archived,
+  updated: input.updated,
+})
+
+function createCommandEntries(props: {
+  filesOnly: () => boolean
+  command: ReturnType<typeof useCommand>
+  language: ReturnType<typeof useLanguage>
+}) {
+  const allowed = createMemo(() => {
+    if (props.filesOnly()) return []
+    return props.command.options.filter(
+      (option) =>
+        !option.disabled && !option.hidden && !option.id.startsWith("suggested.") && option.id !== "file.open",
+    )
+  })
+
+  const list = createMemo(() => {
+    const category = props.language.t("palette.group.commands")
+    return allowed().map((option) => createCommandEntry(option, category))
+  })
+
+  const picks = createMemo(() => {
+    const all = allowed()
+    const order = new Map<string, number>(COMMON_COMMAND_IDS.map((id, index) => [id, index]))
+    const picked = all.filter((option) => order.has(option.id))
+    const base = picked.length ? picked : all.slice(0, ENTRY_LIMIT)
+    const sorted = picked.length ? [...base].sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0)) : base
+    const category = props.language.t("palette.group.commands")
+    return sorted.map((option) => createCommandEntry(option, category))
+  })
+
+  return { allowed, list, picks }
+}
+
+function createFileEntries(props: {
+  file: ReturnType<typeof useFile>
+  tabs: () => ReturnType<ReturnType<typeof useLayout>["tabs"]>
+  language: ReturnType<typeof useLanguage>
+}) {
+  const tabState = createSessionTabs({
+    tabs: props.tabs,
+    pathFromTab: props.file.pathFromTab,
+    normalizeTab: (tab) => (tab.startsWith("file://") ? props.file.tab(tab) : tab),
+  })
+  const recent = createMemo(() => {
+    const all = tabState.openedTabs()
+    const active = tabState.activeFileTab()
+    const order = active ? [active, ...all.filter((item) => item !== active)] : all
+    const seen = new Set<string>()
+    const category = props.language.t("palette.group.files")
+    const items: Entry[] = []
+
+    for (const item of order) {
+      const path = props.file.pathFromTab(item)
+      if (!path) continue
+      if (seen.has(path)) continue
+      seen.add(path)
+      items.push(createFileEntry(path, category))
+    }
+
+    return items.slice(0, ENTRY_LIMIT)
+  })
+
+  const root = createMemo(() => {
+    const category = props.language.t("palette.group.files")
+    const nodes = props.file.tree.children("")
+    const paths = nodes
+      .filter((node) => node.type === "file")
+      .map((node) => node.path)
+      .sort((a, b) => a.localeCompare(b))
+    return paths.slice(0, ENTRY_LIMIT).map((path) => createFileEntry(path, category))
+  })
+
+  return { recent, root }
+}
+
+function createSessionEntries(props: {
+  workspaces: () => string[]
+  label: (directory: string) => string
+  serverSDK: ServerSDK
+  language: ReturnType<typeof useLanguage>
+}) {
+  const state: {
+    token: number
+    inflight: Promise<Entry[]> | undefined
+    cached: Entry[] | undefined
+  } = {
+    token: 0,
+    inflight: undefined,
+    cached: undefined,
+  }
+
+  const sessions = (text: string) => {
+    const query = text.trim()
+    if (!query) {
+      state.token += 1
+      state.inflight = undefined
+      state.cached = undefined
+      return [] as Entry[]
+    }
+
+    if (state.cached) return state.cached
+    if (state.inflight) return state.inflight
+
+    const current = state.token
+    const dirs = props.workspaces()
+    if (dirs.length === 0) return [] as Entry[]
+
+    state.inflight = Promise.all(
+      dirs.map((directory) => {
+        const description = props.label(directory)
+        return props.serverSDK.client.session
+          .list({ directory, roots: true })
+          .then((x) =>
+            (x.data ?? [])
+              .filter((s) => !!s?.id)
+              .map((s) => ({
+                id: s.id,
+                title: s.title ?? props.language.t("command.session.new"),
+                description,
+                directory,
+                archived: s.time?.archived,
+                updated: s.time?.updated,
+              })),
+          )
+          .catch(
+            () =>
+              [] as {
+                id: string
+                title: string
+                description: string
+                directory: string
+                archived?: number
+                updated?: number
+              }[],
+          )
+      }),
+    )
+      .then((results) => {
+        if (state.token !== current) return [] as Entry[]
+        const seen = new Set<string>()
+        const category = props.language.t("command.category.session")
+        const next = results
+          .flat()
+          .filter((item) => {
+            const key = `${item.directory}:${item.id}`
+            if (seen.has(key)) return false
+            seen.add(key)
+            return true
+          })
+          .map((item) => createSessionEntry(item, category))
+        state.cached = next
+        return next
+      })
+      .catch(() => [] as Entry[])
+      .finally(() => {
+        state.inflight = undefined
+      })
+
+    return state.inflight
+  }
+
+  return { sessions }
+}
+
 export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFile?: (path: string) => void }) {
+  const command = useCommand()
+  const language = useLanguage()
  const platform = usePlatform()
  const settings = useSettings()
-  const filesOnly = () => props.mode === "files"
-
-  if (!filesOnly() && settings.general.newLayoutDesigns()) {
-    return <DialogCommandPaletteV2 onOpenFile={props.onOpenFile} />
-  }
-
-  if (filesOnly() && platform.platform === "desktop" && settings.general.newLayoutDesigns()) {
-    return <DialogSelectFileDesktopV2 onOpenFile={props.onOpenFile} />
-  }
-
-  return <DialogSelectFileLegacy filesOnly={filesOnly} onOpenFile={props.onOpenFile} />
-}
-
-function DialogSelectFileDesktopV2(props: { onOpenFile?: (path: string) => void }) {
-  const language = useLanguage()
+  const layout = useLayout()
+  const file = useFile()
+  const dialog = useDialog()
+  const navigate = useNavigate()
  const serverSDK = useServerSDK()
-  const { params } = useSessionLayout()
-  const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
-  const openFile = createCommandPaletteFileOpener(props.onOpenFile)
-
-  return (
-    <DialogSelectFileV2
-      server={serverSDK().server}
-      mode="file"
-      start={projectDirectory()}
-      title={language.t("session.header.searchFiles")}
-      onSelect={(result) => {
-        if (typeof result !== "string") return
-        openFile(result)
-      }}
-    />
-  )
-}
-
-function DialogSelectFileLegacy(props: { filesOnly: () => boolean; onOpenFile?: (path: string) => void }) {
-  const palette = createCommandPaletteModel(props)
+  const serverSync = useServerSync()
+  const { params, tabs, view } = useSessionLayout()
+  const filesOnly = () => props.mode === "files"
+  const state = { cleanup: undefined as (() => void) | void, committed: false }
  const [grouped, setGrouped] = createSignal(false)
+  const commandEntries = createCommandEntries({ filesOnly, command, language })
+  const fileEntries = createFileEntries({ file, tabs, language })
+
+  const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
+  const project = createMemo(() => {
+    const directory = projectDirectory()
+    if (!directory) return
+    return layout.projects.list().find((p) => p.worktree === directory || p.sandboxes?.includes(directory))
+  })
+  const workspaces = createMemo(() => {
+    const directory = projectDirectory()
+    const current = project()
+    if (!current) return directory ? [directory] : []
+
+    const dirs = [current.worktree, ...(current.sandboxes ?? [])]
+    if (directory && !dirs.includes(directory)) return [...dirs, directory]
+    return dirs
+  })
+  const homedir = createMemo(() => serverSync().data.path.home)
+  const label = (directory: string) => {
+    const current = project()
+    const kind =
+      current && directory === current.worktree
+        ? language.t("workspace.type.local")
+        : language.t("workspace.type.sandbox")
+    const [store] = serverSync().child(directory, { bootstrap: false })
+    const home = homedir()
+    const path = home ? directory.replace(home, "~") : directory
+    const name = store.vcs?.branch ?? getFilename(directory)
+    return `${kind} : ${name || path}`
+  }
+
+  const { sessions } = createSessionEntries({ workspaces, label, serverSDK: serverSDK(), language })

  const items = async (text: string) => {
    const query = text.trim()
    setGrouped(query.length > 0)

-    if (!query && props.filesOnly()) {
-      const loaded = palette.file.tree.state("")?.loaded
-      const pending = loaded ? Promise.resolve() : palette.file.tree.list("")
-      const next = uniqueCommandPaletteEntries([...palette.recentFileEntries(), ...palette.rootFileEntries()])
+    if (!query && filesOnly()) {
+      const loaded = file.tree.state("")?.loaded
+      const pending = loaded ? Promise.resolve() : file.tree.list("")
+      const next = uniqueEntries([...fileEntries.recent(), ...fileEntries.root()])

      if (loaded || next.length > 0) {
        void pending
@@ -86,24 +331,79 @@ function DialogSelectFileLegacy(props: { filesOnly: () => boolean; onOpenFile?:
      }

      await pending
-      return uniqueCommandPaletteEntries([...palette.recentFileEntries(), ...palette.rootFileEntries()])
+      return uniqueEntries([...fileEntries.recent(), ...fileEntries.root()])
    }

-    if (!query) return [...palette.preferredCommandEntries(), ...palette.recentFileEntries()]
+    if (!query) return [...commandEntries.picks(), ...fileEntries.recent()]

-    if (props.filesOnly()) {
-      const files = await palette.file.searchFiles(query)
-      const category = palette.language.t("palette.group.files")
-      return files.map((path) => createCommandPaletteFileEntry(path, category))
+    if (filesOnly()) {
+      const files = await file.searchFiles(query)
+      const category = language.t("palette.group.files")
+      return files.map((path) => createFileEntry(path, category))
    }

-    const [files, nextSessions] = await Promise.all([
-      palette.file.searchFiles(query),
-      Promise.resolve(palette.sessions(query)),
-    ])
-    const category = palette.language.t("palette.group.files")
-    const entries = files.map((path) => createCommandPaletteFileEntry(path, category))
-    return [...palette.commandEntries(), ...nextSessions, ...entries]
+    const [files, nextSessions] = await Promise.all([file.searchFiles(query), Promise.resolve(sessions(query))])
+    const category = language.t("palette.group.files")
+    const entries = files.map((path) => createFileEntry(path, category))
+    return [...commandEntries.list(), ...nextSessions, ...entries]
+  }
+
+  const handleMove = (item: Entry | undefined) => {
+    state.cleanup?.()
+    if (!item) return
+    if (item.type !== "command") return
+    state.cleanup = item.option?.onHighlight?.()
+  }
+
+  const open = (path: string) => {
+    const value = file.tab(path)
+    void tabs().open(value)
+    void file.load(path)
+    if (!view().reviewPanel.opened()) view().reviewPanel.open()
+    layout.fileTree.setTab("all")
+    props.onOpenFile?.(path)
+    tabs().setActive(value)
+  }
+
+  const handleSelect = (item: Entry | undefined) => {
+    if (!item) return
+    state.committed = true
+    state.cleanup = undefined
+    dialog.close()
+
+    if (item.type === "command") {
+      item.option?.onSelect?.("palette")
+      return
+    }
+
+    if (item.type === "session") {
+      if (!item.directory || !item.sessionID) return
+      navigate(`/${base64Encode(item.directory)}/session/${item.sessionID}`)
+      return
+    }
+
+    if (!item.path) return
+    open(item.path)
+  }
+
+  onCleanup(() => {
+    if (state.committed) return
+    state.cleanup?.()
+  })
+
+  if (filesOnly() && platform.platform === "desktop" && settings.general.newLayoutDesigns()) {
+    return (
+      <DialogSelectFileV2
+        server={serverSDK().server}
+        mode="file"
+        start={projectDirectory()}
+        title={language.t("session.header.searchFiles")}
+        onSelect={(result) => {
+          if (typeof result !== "string") return
+          open(result)
+        }}
+      />
+    )
  }

  return (
@@ -111,21 +411,21 @@ function DialogSelectFileLegacy(props: { filesOnly: () => boolean; onOpenFile?:
      <List
        class="px-3"
        search={{
-          placeholder: props.filesOnly()
-            ? palette.language.t("session.header.searchFiles")
-            : palette.language.t("palette.search.placeholder"),
+          placeholder: filesOnly()
+            ? language.t("session.header.searchFiles")
+            : language.t("palette.search.placeholder"),
          autofocus: true,
          hideIcon: true,
        }}
-        emptyMessage={palette.language.t("palette.empty")}
-        loadingMessage={palette.language.t("common.loading")}
+        emptyMessage={language.t("palette.empty")}
+        loadingMessage={language.t("common.loading")}
        items={items}
        key={(item) => item.id}
        filterKeys={["title", "description", "category"]}
        skipFilter={(item) => item.type === "file"}
        groupBy={grouped() ? (item) => item.category : () => ""}
-        onMove={(item: CommandPaletteEntry | undefined) => palette.highlight(item)}
-        onSelect={(item: CommandPaletteEntry | undefined) => palette.select(item)}
+        onMove={handleMove}
+        onSelect={handleSelect}
      >
        {(item) => (
          <Switch
@@ -152,7 +452,7 @@ function DialogSelectFileLegacy(props: { filesOnly: () => boolean; onOpenFile?:
                  </Show>
                </div>
                <Show when={item.keybind}>
-                  <Keybind class="rounded-[4px]">{formatKeybind(item.keybind ?? "", palette.language.t)}</Keybind>
+                  <Keybind class="rounded-[4px]">{formatKeybind(item.keybind ?? "", language.t)}</Keybind>
                </Show>
              </div>
            </Match>
@@ -179,7 +479,7 @@ function DialogSelectFileLegacy(props: { filesOnly: () => boolean; onOpenFile?:
                </div>
                <Show when={item.updated}>
                  <span class="text-12-regular text-text-weak whitespace-nowrap ml-2">
-                    {getRelativeTime(new Date(item.updated!).toISOString(), palette.language.t)}
+                    {getRelativeTime(new Date(item.updated!).toISOString(), language.t)}
                  </span>
                </Show>
              </div>
@@ -22,16 +22,17 @@ export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props
  const providers = useProviders(directory)
  const language = useLanguage()

-  const openProviders = (provider?: string) => {
+  const connect = (provider: string) => {
    void import("./dialog-connect-provider").then((x) => {
-      const controller = x.useProviderConnectController()
-      controller.select(provider)
-      void dialog.show(() => <x.DialogConnectProvider controller={controller} directory={directory} />)
+      dialog.show(() => <x.DialogConnectProvider provider={provider} directory={directory} />)
    })
  }

-  const connect = (provider: string) => openProviders(provider)
-  const all = () => openProviders()
+  const all = () => {
+    void import("./dialog-select-provider").then((x) => {
+      dialog.show(() => <x.DialogSelectProvider directory={directory} />)
+    })
+  }

  let listRef: ListRef | undefined
  const handleKeyDown = (e: KeyboardEvent) => {
@@ -24,7 +24,6 @@ import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Icon } from "@opencode-ai/ui/v2/icon"
 import { Tag as TagV2 } from "@opencode-ai/ui/v2/badge-v2"
 import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { ModelTooltip } from "./model-tooltip"
 import { useLanguage } from "@/context/language"
 import { decode64 } from "@/utils/base64"
@@ -93,7 +92,6 @@ const ModelList: Component<{
          class="w-full"
          placement="right-start"
          gutter={12}
-          openDelay={0}
          value={<ModelTooltip model={item} latest={item.latest} free={isFree(item.provider.id, item.cost)} />}
        >
          {node}
@@ -157,8 +155,8 @@ export function ModelSelectorPopover(props: {

  const handleConnectProvider = () => {
    close("provider")
-    void import("./dialog-connect-provider").then((x) => {
-      void dialog.show(() => <x.DialogConnectProvider directory={directory} />)
+    void import("./dialog-select-provider").then((x) => {
+      dialog.show(() => <x.DialogSelectProvider directory={directory} />)
    })
  }
  const language = useLanguage()
@@ -448,41 +446,26 @@ export function ModelSelectorPopoverV2(props: {
                      <MenuV2.RadioGroup value={current()}>
                        <For each={group.items}>
                          {(item) => (
-                            <TooltipV2
-                              class="w-full"
-                              placement="right-start"
-                              gutter={6}
-                              openDelay={0}
-                              value={
-                                <ModelTooltip
-                                  model={item}
-                                  latest={item.latest}
-                                  free={isFree(item.provider.id, item.cost)}
-                                  v2
-                                />
-                              }
+                            <MenuV2.RadioItem
+                              value={modelKey(item)}
+                              data-option-key={modelKey(item)}
+                              data-selected-model={current() === modelKey(item) ? true : undefined}
+                              class="scroll-my-6"
+                              classList={{ "!bg-v2-overlay-simple-overlay-hover": store.active === modelKey(item) }}
+                              onMouseEnter={() => {
+                                setStore("active", modelKey(item))
+                                setTimeout(() => searchRef?.focus())
+                              }}
+                              onSelect={() => selectModel(item)}
                            >
-                              <MenuV2.RadioItem
-                                value={modelKey(item)}
-                                data-option-key={modelKey(item)}
-                                data-selected-model={current() === modelKey(item) ? true : undefined}
-                                class="scroll-my-6 w-full"
-                                classList={{ "!bg-v2-overlay-simple-overlay-hover": store.active === modelKey(item) }}
-                                onMouseEnter={() => {
-                                  setStore("active", modelKey(item))
-                                  setTimeout(() => searchRef?.focus())
-                                }}
-                                onSelect={() => selectModel(item)}
-                              >
-                                <span class="min-w-0 truncate">{item.name}</span>
-                                <Show when={isFree(item.provider.id, item.cost)}>
-                                  <TagV2 class="shrink-0">{language.t("model.tag.free")}</TagV2>
-                                </Show>
-                                <Show when={item.latest}>
-                                  <TagV2 class="shrink-0">{language.t("model.tag.latest")}</TagV2>
-                                </Show>
-                              </MenuV2.RadioItem>
-                            </TooltipV2>
+                              <span class="min-w-0 truncate">{item.name}</span>
+                              <Show when={isFree(item.provider.id, item.cost)}>
+                                <TagV2 class="shrink-0">{language.t("model.tag.free")}</TagV2>
+                              </Show>
+                              <Show when={item.latest}>
+                                <TagV2 class="shrink-0">{language.t("model.tag.latest")}</TagV2>
+                              </Show>
+                            </MenuV2.RadioItem>
                          )}
                        </For>
                      </MenuV2.RadioGroup>
@@ -520,8 +503,8 @@ export const DialogSelectModel: Component<{ provider?: string; model?: ModelStat
  const directory = () => decode64(local.slug())

  const provider = () => {
-    void import("./dialog-connect-provider").then((x) => {
-      void dialog.show(() => <x.DialogConnectProvider directory={directory} />)
+    void import("./dialog-select-provider").then((x) => {
+      dialog.show(() => <x.DialogSelectProvider directory={directory} />)
    })
  }

@@ -0,0 +1,87 @@
+import { type Accessor, Component, Show } from "solid-js"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { popularProviders, useProviders } from "@/hooks/use-providers"
+import { Dialog } from "@opencode-ai/ui/dialog"
+import { List } from "@opencode-ai/ui/list"
+import { Tag } from "@opencode-ai/ui/tag"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
+import { DialogConnectProvider } from "./dialog-connect-provider"
+import { useLanguage } from "@/context/language"
+import { DialogCustomProvider } from "./dialog-custom-provider"
+
+const CUSTOM_ID = "_custom"
+
+export const DialogSelectProvider: Component<{ directory?: Accessor<string | undefined> }> = (props) => {
+  const dialog = useDialog()
+  const providers = useProviders(props.directory)
+  const language = useLanguage()
+
+  const popularGroup = () => language.t("dialog.provider.group.popular")
+  const otherGroup = () => language.t("dialog.provider.group.other")
+  const customLabel = () => language.t("settings.providers.tag.custom")
+  const note = (id: string) => {
+    if (id === "anthropic") return language.t("dialog.provider.anthropic.note")
+    if (id === "openai") return language.t("dialog.provider.openai.note")
+    if (id.startsWith("github-copilot")) return language.t("dialog.provider.copilot.note")
+    if (id === "opencode-go") return language.t("dialog.provider.opencodeGo.tagline")
+  }
+
+  return (
+    <Dialog title={language.t("command.provider.connect")} transition>
+      <List
+        class="px-3"
+        search={{ placeholder: language.t("dialog.provider.search.placeholder"), autofocus: true }}
+        emptyMessage={language.t("dialog.provider.empty")}
+        activeIcon="plus-small"
+        key={(x) => x?.id}
+        items={() => {
+          language.locale()
+          return [{ id: CUSTOM_ID, name: customLabel() }, ...providers.all().values()]
+        }}
+        filterKeys={["id", "name"]}
+        groupBy={(x) => (popularProviders.includes(x.id) ? popularGroup() : otherGroup())}
+        sortBy={(a, b) => {
+          if (a.id === CUSTOM_ID) return -1
+          if (b.id === CUSTOM_ID) return 1
+          if (popularProviders.includes(a.id) && popularProviders.includes(b.id))
+            return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
+          return a.name.localeCompare(b.name)
+        }}
+        sortGroupsBy={(a, b) => {
+          const popular = popularGroup()
+          if (a.category === popular && b.category !== popular) return -1
+          if (b.category === popular && a.category !== popular) return 1
+          return 0
+        }}
+        onSelect={(x) => {
+          if (!x) return
+          if (x.id === CUSTOM_ID) {
+            dialog.show(() => <DialogCustomProvider back="providers" directory={props.directory} />)
+            return
+          }
+          dialog.show(() => <DialogConnectProvider provider={x.id} directory={props.directory} />)
+        }}
+      >
+        {(i) => (
+          <div class="px-1.25 w-full flex items-center gap-x-3">
+            <ProviderIcon data-slot="list-item-extra-icon" id={i.id} />
+            <span>{i.name}</span>
+            <Show when={i.id === "opencode"}>
+              <div class="text-14-regular text-text-weak">{language.t("dialog.provider.opencode.tagline")}</div>
+            </Show>
+            <Show when={i.id === CUSTOM_ID}>
+              <Tag>{language.t("settings.providers.tag.custom")}</Tag>
+            </Show>
+            <Show when={i.id === "opencode"}>
+              <Tag>{language.t("dialog.provider.tag.recommended")}</Tag>
+            </Show>
+            <Show when={note(i.id)}>{(value) => <div class="text-14-regular text-text-weak">{value()}</div>}</Show>
+            <Show when={i.id === "opencode-go"}>
+              <Tag>{language.t("dialog.provider.tag.recommended")}</Tag>
+            </Show>
+          </div>
+        )}
+      </List>
+    </Dialog>
+  )
+}
@@ -1,35 +1,22 @@
-import { Component, createSignal, startTransition } from "solid-js"
+import { Component } from "solid-js"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { Icon } from "@opencode-ai/ui/icon"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { SettingsGeneral } from "./settings-general"
 import { SettingsKeybinds } from "./settings-keybinds"
 import { SettingsProviders } from "./settings-providers"
 import { SettingsModels } from "./settings-models"
 import { SettingsServers } from "./settings-servers"

-export const DialogSettings: Component<{ defaultValue?: string }> = (props) => {
+export const DialogSettings: Component = () => {
  const language = useLanguage()
  const platform = usePlatform()
-  const dialog = useDialog()
-  const [tab, setTab] = createSignal(props.defaultValue ?? "general")
-
-  const showProviders = () => {
-    void dialog.show(() => <DialogSettings defaultValue="providers" />)
-  }

  return (
    <Dialog size="x-large" transition>
-      <Tabs
-        orientation="vertical"
-        variant="settings"
-        value={tab()}
-        onChange={(value) => void startTransition(() => setTab(value))}
-        class="h-full settings-dialog"
-      >
+      <Tabs orientation="vertical" variant="settings" defaultValue="general" class="h-full settings-dialog">
        <Tabs.List>
          <div class="flex flex-col justify-between h-full w-full gap-4">
            <div class="flex flex-col gap-3 w-full pt-3">
@@ -83,7 +70,7 @@ export const DialogSettings: Component<{ defaultValue?: string }> = (props) => {
          <SettingsServers />
        </Tabs.Content>
        <Tabs.Content value="providers" class="no-scrollbar">
-          <SettingsProviders onBack={showProviders} />
+          <SettingsProviders />
        </Tabs.Content>
        <Tabs.Content value="models" class="no-scrollbar">
          <SettingsModels />
@@ -1,46 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { buildFileTreeV2Model, flattenFileTreeV2 } from "./file-tree-v2-model"
-
-describe("file tree v2 model", () => {
-  test("builds sorted depth-first rows", () => {
-    const model = buildFileTreeV2Model(["src/z.ts", "src/lib/b.ts", "src/lib/a.ts", "README.md", "docs/guide.md"])
-
-    expect(model.total).toBe(8)
-    expect(flattenFileTreeV2(model, () => true).map((row) => [row.node.path, row.node.type, row.level])).toEqual([
-      ["docs", "directory", 0],
-      ["docs/guide.md", "file", 1],
-      ["src", "directory", 0],
-      ["src/lib", "directory", 1],
-      ["src/lib/a.ts", "file", 2],
-      ["src/lib/b.ts", "file", 2],
-      ["src/z.ts", "file", 1],
-      ["README.md", "file", 0],
-    ])
-  })
-
-  test("omits descendants of collapsed directories", () => {
-    const model = buildFileTreeV2Model(["src/lib/a.ts", "src/z.ts"])
-
-    expect(flattenFileTreeV2(model, (path) => path !== "src/lib").map((row) => row.node.path)).toEqual([
-      "src",
-      "src/lib",
-      "src/z.ts",
-    ])
-  })
-
-  test("normalizes separators and duplicate paths", () => {
-    const model = buildFileTreeV2Model(["src\\lib\\a.ts", "src/lib/a.ts", "/src//lib/b.ts/"])
-    const rows = flattenFileTreeV2(model, () => true)
-
-    expect(model.total).toBe(4)
-    expect(rows.map((row) => row.node.path)).toEqual(["src", "src/lib", "src/lib/a.ts", "src/lib/b.ts"])
-    expect(rows.find((row) => row.node.path === "src/lib/a.ts")?.node.originalPath).toBe("src\\lib\\a.ts")
-  })
-
-  test("supports paths deeper than the legacy recursion limit", () => {
-    const file = `${Array.from({ length: 130 }, (_, index) => `dir-${index}`).join("/")}/file.ts`
-    const model = buildFileTreeV2Model([file])
-
-    expect(flattenFileTreeV2(model, () => true)).toHaveLength(131)
-  })
-})
@@ -1,77 +0,0 @@
-import type { FileNode } from "@opencode-ai/sdk/v2"
-
-export type FileTreeV2Model = {
-  children: ReadonlyMap<string, readonly FileTreeV2Node[]>
-  total: number
-}
-
-export type FileTreeV2Node = FileNode & { originalPath: string }
-
-export type FileTreeV2Row = {
-  node: FileTreeV2Node
-  level: number
-}
-
-export function normalizeFileTreeV2Path(value: string) {
-  return value
-    .replaceAll("\\", "/")
-    .replace(/^\/+|\/+$/g, "")
-    .replace(/\/{2,}/g, "/")
-}
-
-export function buildFileTreeV2Model(paths: readonly string[]): FileTreeV2Model {
-  const nodes = new Map<string, FileTreeV2Node>()
-
-  paths.forEach((value) => {
-    const file = normalizeFileTreeV2Path(value)
-    if (!file) return
-
-    const parts = file.split("/")
-    parts.forEach((name, index) => {
-      const path = parts.slice(0, index + 1).join("/")
-      if (nodes.has(path)) return
-      nodes.set(path, {
-        name,
-        path,
-        absolute: path,
-        type: index === parts.length - 1 ? "file" : "directory",
-        ignored: false,
-        originalPath: index === parts.length - 1 ? value : path,
-      })
-    })
-  })
-
-  const children = new Map<string, FileTreeV2Node[]>()
-  nodes.forEach((node) => {
-    const index = node.path.lastIndexOf("/")
-    const parent = index === -1 ? "" : node.path.slice(0, index)
-    const list = children.get(parent)
-    if (list) list.push(node)
-    else children.set(parent, [node])
-  })
-  children.forEach((nodes) =>
-    nodes.sort((a, b) => {
-      if (a.type !== b.type) return a.type === "directory" ? -1 : 1
-      return a.name.localeCompare(b.name)
-    }),
-  )
-
-  return { children, total: nodes.size }
-}
-
-export function flattenFileTreeV2(model: FileTreeV2Model, expanded: (path: string) => boolean) {
-  const rows: FileTreeV2Row[] = []
-  const stack = (model.children.get("") ?? []).toReversed().map((node) => ({ node, level: 0 }))
-
-  while (stack.length > 0) {
-    const row = stack.pop()!
-    rows.push(row)
-    if (row.node.type !== "directory" || !expanded(row.node.path)) continue
-    const children = model.children.get(row.node.path) ?? []
-    for (let index = children.length - 1; index >= 0; index--) {
-      stack.push({ node: children[index]!, level: row.level + 1 })
-    }
-  }
-
-  return rows
-}
@@ -1,26 +1,95 @@
 import { useFile } from "@/context/file"
+import { Collapsible } from "@opencode-ai/ui/collapsible"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import "@opencode-ai/ui/v2/file-tree-v2.css"
 import {
  createEffect,
  createMemo,
-  createSignal,
  For,
+  Match,
+  on,
  Show,
  splitProps,
+  Switch,
+  untrack,
  type ComponentProps,
  type ParentProps,
 } from "solid-js"
 import { Dynamic } from "solid-js/web"
 import type { FileNode } from "@opencode-ai/sdk/v2"
 import { Icon } from "@opencode-ai/ui/v2/icon"
-import { pathToFileUrl, withFileDragImage, type Kind } from "@/components/file-tree"
-import { createVirtualizer, defaultRangeExtractor } from "@tanstack/solid-virtual"
-import { buildFileTreeV2Model, flattenFileTreeV2, normalizeFileTreeV2Path } from "@/components/file-tree-v2-model"
-import { virtualScrollElement } from "@/components/virtual-scroll-element"
+import {
+  dirsToExpand,
+  pathToFileUrl,
+  shouldListRoot,
+  visibleKind,
+  withFileDragImage,
+  type Filter,
+  type Kind,
+} from "@/components/file-tree"

 export type { Kind } from "@/components/file-tree"

+const MAX_DEPTH = 128
+
+function visibleNodesForPath(path: string, children: (dir: string) => FileNode[], current: Filter | undefined) {
+  const nodes = children(path)
+  if (!current) return nodes
+
+  const parent = (item: string) => {
+    const idx = item.lastIndexOf("/")
+    if (idx === -1) return ""
+    return item.slice(0, idx)
+  }
+
+  const leaf = (item: string) => {
+    const idx = item.lastIndexOf("/")
+    return idx === -1 ? item : item.slice(idx + 1)
+  }
+
+  const out = nodes.filter((node) => {
+    if (node.type === "file") return current.files.has(node.path)
+    return current.dirs.has(node.path)
+  })
+
+  const seen = new Set(out.map((node) => node.path))
+
+  for (const dir of current.dirs) {
+    if (parent(dir) !== path) continue
+    if (seen.has(dir)) continue
+    out.push({
+      name: leaf(dir),
+      path: dir,
+      absolute: dir,
+      type: "directory",
+      ignored: false,
+    })
+    seen.add(dir)
+  }
+
+  for (const item of current.files) {
+    if (parent(item) !== path) continue
+    if (seen.has(item)) continue
+    out.push({
+      name: leaf(item),
+      path: item,
+      absolute: item,
+      type: "file",
+      ignored: false,
+    })
+    seen.add(item)
+  }
+
+  out.sort((a, b) => {
+    if (a.type !== b.type) {
+      return a.type === "directory" ? -1 : 1
+    }
+    return a.name.localeCompare(b.name)
+  })
+
+  return out
+}
+
 const INDENT_STEP = 16

 function rowPaddingLeft(level: number, type: FileNode["type"]) {
@@ -54,6 +123,7 @@ const FileTreeNodeV2 = (
      active?: string
      draggable: boolean
      kinds?: ReadonlyMap<string, Kind>
+      marks?: Set<string>
      as?: "div" | "button"
    },
 ) => {
@@ -63,18 +133,18 @@ const FileTreeNodeV2 = (
    "active",
    "draggable",
    "kinds",
+    "marks",
    "as",
    "children",
    "class",
    "classList",
  ])
-  const kind = () => local.kinds?.get(local.node.path)
+  const kind = () => visibleKind(local.node, local.kinds, local.marks)

  return (
    <Dynamic
      component={local.as ?? "div"}
      data-slot="file-tree-v2-row"
-      data-path={local.node.path}
      data-selected={local.node.path === local.active ? "" : undefined}
      data-ignored={local.node.ignored ? "" : undefined}
      classList={{
@@ -107,161 +177,244 @@ const FileTreeNodeV2 = (
  )
 }

-function GuideLines(props: { level: number }) {
-  return (
-    <For each={Array.from({ length: props.level })}>
-      {(_, index) => (
-        <div
-          class="absolute top-0 bottom-0 w-px pointer-events-none bg-border-weak-base opacity-0 group-hover/file-tree-v2:opacity-50"
-          style={`left: ${guideLineLeft(index())}px`}
-        />
-      )}
-    </For>
-  )
-}
-
+// V2-styled fork of FileTree for the review sidebar. Unlike the v1 tree it never
+// lists unloaded subdirectories, so callers must pass `allowed` (nodes are
+// synthesized from that list) for nested content to appear.
 export default function FileTreeV2(props: {
+  path: string
  active?: string
+  level?: number
  allowed?: readonly string[]
  kinds?: ReadonlyMap<string, Kind>
  draggable?: boolean
  onFileClick?: (file: FileNode) => void
+
+  _filter?: Filter
+  _marks?: Set<string>
+  _deeps?: Map<string, number>
+  _kinds?: ReadonlyMap<string, Kind>
+  _chain?: readonly string[]
 }) {
  const file = useFile()
+  const level = props.level ?? 0
  const draggable = () => props.draggable ?? true
-  const active = () => normalizeFileTreeV2Path(props.active ?? "")
-  const model = createMemo(() => buildFileTreeV2Model(props.allowed ?? []))
-  const rows = createMemo(() => flattenFileTreeV2(model(), (path) => file.tree.state(path)?.expanded ?? true))
-  const [root, setRoot] = createSignal<HTMLDivElement>()
-  const [focused, setFocused] = createSignal<string>()
-  const virtualizer = createVirtualizer<HTMLDivElement, HTMLDivElement>({
-    get count() {
-      return rows().length
-    },
-    getScrollElement: () => virtualScrollElement(root()),
-    initialRect: { width: 0, height: 600 },
-    estimateSize: () => 28,
-    gap: 2,
-    overscan: 10,
-    get getItemKey() {
-      const current = rows()
-      return (index: number) => current[index]?.node.path ?? index
-    },
-    rangeExtractor: (range) => {
-      const indexes = defaultRangeExtractor(range)
-      const path = focused()
-      const index = path ? rows().findIndex((row) => row.node.path === path) : -1
-      if (index < 0 || indexes.includes(index)) return indexes
-      return [...indexes, index].sort((a, b) => a - b)
-    },
+
+  const key = (p: string) =>
+    file
+      .normalize(p)
+      .replace(/[\\/]+$/, "")
+      .replaceAll("\\", "/")
+  const chain = props._chain ? [...props._chain, key(props.path)] : [key(props.path)]
+
+  const filter = createMemo(() => {
+    if (props._filter) return props._filter
+
+    const allowed = props.allowed
+    if (!allowed) return
+
+    const files = new Set(allowed)
+    const dirs = new Set<string>()
+
+    for (const item of allowed) {
+      const parts = item.split("/")
+      const parents = parts.slice(0, -1)
+      for (const [idx] of parents.entries()) {
+        const dir = parents.slice(0, idx + 1).join("/")
+        if (dir) dirs.add(dir)
+      }
+    }
+
+    return { files, dirs }
  })
+
+  const marks = createMemo(() => {
+    if (props._marks) return props._marks
+
+    const out = new Set<string>(props.kinds?.keys() ?? [])
+    if (out.size === 0) return
+    return out
+  })
+
+  const kinds = createMemo(() => {
+    if (props._kinds) return props._kinds
+    return props.kinds
+  })
+
+  const deeps = createMemo(() => {
+    if (props._deeps) return props._deeps
+
+    const out = new Map<string, number>()
+
+    const root = props.path
+    if (!(file.tree.state(root)?.expanded ?? false)) return out
+
+    const seen = new Set<string>()
+    const stack: { dir: string; lvl: number; i: number; kids: string[]; max: number }[] = []
+
+    const push = (dir: string, lvl: number) => {
+      const id = key(dir)
+      if (seen.has(id)) return
+      seen.add(id)
+
+      const kids = file.tree
+        .children(dir)
+        .filter((node) => node.type === "directory" && (file.tree.state(node.path)?.expanded ?? false))
+        .map((node) => node.path)
+
+      stack.push({ dir, lvl, i: 0, kids, max: lvl })
+    }
+
+    push(root, level - 1)
+
+    while (stack.length > 0) {
+      const top = stack[stack.length - 1]!
+
+      if (top.i < top.kids.length) {
+        const next = top.kids[top.i]!
+        top.i++
+        push(next, top.lvl + 1)
+        continue
+      }
+
+      out.set(top.dir, top.max)
+      stack.pop()
+
+      const parent = stack[stack.length - 1]
+      if (!parent) continue
+      parent.max = Math.max(parent.max, top.max)
+    }
+
+    return out
+  })
+
  createEffect(() => {
-    const path = active()
-    if (!path) return
-    const index = rows().findIndex((row) => row.node.path === path)
-    if (index < 0) return
-    queueMicrotask(() => {
-      if (virtualizer.range && index >= virtualizer.range.startIndex && index <= virtualizer.range.endIndex) return
-      virtualizer.scrollToIndex(index, { align: "auto" })
+    const current = filter()
+    const dirs = dirsToExpand({
+      level,
+      filter: current,
+      expanded: (dir) => untrack(() => file.tree.state(dir)?.expanded) ?? false,
    })
+    // Nodes come from the `allowed` filter; skip listing so directories that only
+    // exist on the diff's base branch do not each fail with an error toast.
+    for (const dir of dirs) file.tree.expand(dir, { list: false })
  })
-  const rowByKey = createMemo(() => new Map(rows().map((row) => [row.node.path, row] as const)))
-  const virtualItemByKey = createMemo(
-    () => new Map(virtualizer.getVirtualItems().map((item) => [item.key, item] as const)),
+
+  createEffect(
+    on(
+      () => props.path,
+      (path) => {
+        const dir = untrack(() => file.tree.state(path))
+        if (!shouldListRoot({ level, dir })) return
+        void file.tree.list(path)
+      },
+      { defer: false },
+    ),
  )
-  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => item.key))
+
+  const nodes = createMemo(() => visibleNodesForPath(props.path, file.tree.children, filter()))

  return (
-    <div
-      ref={setRoot}
-      data-component="file-tree-v2"
-      data-total-rows={model().total}
-      class="group/file-tree-v2"
-      style={{ position: "relative", height: `${virtualizer.getTotalSize()}px` }}
-    >
-      <For each={virtualRowKeys()}>
-        {(key) => (
-          <Show when={virtualItemByKey().get(key)}>
-            {(item) => (
-              <div
-                style={{
-                  position: "absolute",
-                  top: "0",
-                  left: "0",
-                  width: "100%",
-                  height: `${item().size}px`,
-                  transform: `translateY(${item().start}px)`,
-                }}
-              >
-                <Show when={rowByKey().get(key as string)}>
-                  {(row) => (
-                    <Show
-                      when={row().node.type === "directory"}
-                      fallback={
-                        <FileTreeNodeV2
-                          node={row().node}
-                          level={row().level}
-                          active={active()}
-                          draggable={draggable()}
-                          kinds={props.kinds}
-                          as="button"
-                          type="button"
-                          class="relative"
-                          onFocus={() => setFocused(row().node.path)}
-                          onBlur={() => setFocused(undefined)}
-                          onClick={() =>
-                            props.onFileClick?.({
-                              ...row().node,
-                              path: row().node.originalPath,
-                              absolute: row().node.originalPath,
-                            })
-                          }
-                        >
-                          <GuideLines level={row().level} />
-                          <Show when={row().level > 0}>
-                            <div class="w-4 shrink-0" />
-                          </Show>
-                          <span class="filetree-iconpair size-4">
-                            <FileIcon node={row().node} class="size-4 filetree-icon filetree-icon--color" />
-                            <FileIcon node={row().node} class="size-4 filetree-icon filetree-icon--mono" mono />
-                          </span>
-                        </FileTreeNodeV2>
-                      }
+    // group/file-tree-v2 scopes the group-hover guide lines below; hosts may add
+    // an outer group with the same name to widen the hover area.
+    <div data-component="file-tree-v2" class="group/file-tree-v2">
+      <For each={nodes()}>
+        {(node) => {
+          const expanded = () => file.tree.state(node.path)?.expanded ?? false
+          const deep = () => deeps().get(node.path) ?? -1
+          const hasChildren = () => visibleNodesForPath(node.path, file.tree.children, filter()).length > 0
+          return (
+            <Switch>
+              <Match when={node.type === "directory"}>
+                <Collapsible
+                  variant="ghost"
+                  class="w-full"
+                  data-scope="file-tree-v2"
+                  forceMount={false}
+                  open={expanded()}
+                  onOpenChange={(open) =>
+                    open ? file.tree.expand(node.path, { list: false }) : file.tree.collapse(node.path)
+                  }
+                >
+                  <Collapsible.Trigger>
+                    <FileTreeNodeV2
+                      node={node}
+                      level={level}
+                      active={props.active}
+                      draggable={draggable()}
+                      kinds={kinds()}
+                      marks={marks()}
                    >
-                      <FileTreeNodeV2
-                        node={row().node}
-                        level={row().level}
-                        active={active()}
-                        draggable={draggable()}
-                        kinds={props.kinds}
-                        as="button"
-                        type="button"
-                        class="relative"
-                        onFocus={() => setFocused(row().node.path)}
-                        onBlur={() => setFocused(undefined)}
-                        aria-expanded={file.tree.state(row().node.path)?.expanded ?? true}
-                        onClick={() =>
-                          file.tree.state(row().node.path)?.expanded === false
-                            ? file.tree.expand(row().node.path, { list: false })
-                            : file.tree.collapse(row().node.path)
-                        }
+                      <div
+                        data-slot="file-tree-v2-chevron"
+                        data-expanded={expanded() ? "" : undefined}
+                        class="size-4 flex items-center justify-center"
                      >
-                        <GuideLines level={row().level} />
-                        <div
-                          data-slot="file-tree-v2-chevron"
-                          data-expanded={file.tree.state(row().node.path)?.expanded === false ? undefined : ""}
-                          class="size-4 flex items-center justify-center"
-                        >
-                          <Icon name="chevron-down" />
-                        </div>
-                      </FileTreeNodeV2>
-                    </Show>
-                  )}
-                </Show>
-              </div>
-            )}
-          </Show>
-        )}
+                        <Icon name="chevron-down" />
+                      </div>
+                    </FileTreeNodeV2>
+                  </Collapsible.Trigger>
+                  <Show when={hasChildren()}>
+                    <Collapsible.Content class="relative">
+                      <div
+                        classList={{
+                          "absolute top-0 bottom-0 w-px pointer-events-none bg-border-weak-base opacity-0 transition-opacity duration-150 ease-out motion-reduce:transition-none": true,
+                          "group-hover/file-tree-v2:opacity-100": expanded() && deep() === level,
+                          "group-hover/file-tree-v2:opacity-50": !(expanded() && deep() === level),
+                        }}
+                        style={`left: ${guideLineLeft(level)}px`}
+                      />
+                      <Show
+                        when={level < MAX_DEPTH && !chain.includes(key(node.path))}
+                        fallback={<div class="px-2 py-1 text-12-regular text-text-weak">...</div>}
+                      >
+                        <FileTreeV2
+                          path={node.path}
+                          level={level + 1}
+                          allowed={props.allowed}
+                          kinds={props.kinds}
+                          active={props.active}
+                          draggable={props.draggable}
+                          onFileClick={props.onFileClick}
+                          _filter={filter()}
+                          _marks={marks()}
+                          _deeps={deeps()}
+                          _kinds={kinds()}
+                          _chain={chain}
+                        />
+                      </Show>
+                    </Collapsible.Content>
+                  </Show>
+                </Collapsible>
+              </Match>
+              <Match when={node.type === "file"}>
+                <FileTreeNodeV2
+                  node={node}
+                  level={level}
+                  active={props.active}
+                  draggable={draggable()}
+                  kinds={kinds()}
+                  marks={marks()}
+                  as="button"
+                  type="button"
+                  onClick={() => props.onFileClick?.(node)}
+                >
+                  <Show when={level > 0}>
+                    <div class="w-4 shrink-0" />
+                  </Show>
+                  <Show
+                    when={!node.ignored}
+                    fallback={<FileIcon node={node} class="size-4 filetree-icon filetree-icon--mono" mono />}
+                  >
+                    <span class="filetree-iconpair size-4">
+                      <FileIcon node={node} class="size-4 filetree-icon filetree-icon--color" />
+                      <FileIcon node={node} class="size-4 filetree-icon filetree-icon--mono" mono />
+                    </span>
+                  </Show>
+                </FileTreeNodeV2>
+              </Match>
+            </Switch>
+          )
+        }}
      </For>
    </div>
  )
@@ -1,4 +1,4 @@
-import { Show, type Component, type JSX } from "solid-js"
+import { Show, type Component } from "solid-js"
 import { useLanguage } from "@/context/language"

 type InputKey = "text" | "image" | "audio" | "video" | "pdf"
@@ -23,18 +23,7 @@ type ModelInfo = {
  }
 }

-function ModelTooltipRow(props: { name: JSX.Element; value: JSX.Element }) {
-  return (
-    <div class="flex min-w-0 items-center gap-4">
-      <span class="shrink-0 text-v2-text-text-muted">{props.name}</span>
-      <span class="ml-auto min-w-0 truncate text-right text-v2-text-text-base">{props.value}</span>
-    </div>
-  )
-}
-
-export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?: boolean; v2?: boolean }> = (
-  props,
-) => {
+export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?: boolean }> = (props) => {
  const language = useLanguage()
  const sourceName = (model: ModelInfo) => {
    const value = `${model.id} ${model.name}`.toLowerCase()
@@ -62,13 +51,6 @@ export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?
    const suffix = tags.length ? ` (${tags.join(", ")})` : ""
    return `${sourceName(props.model)} ${props.model.name}${suffix}`
  }
-  const name = () => {
-    const tags: Array<string> = []
-    if (props.latest) tags.push(language.t("model.tag.latest"))
-    if (props.free) tags.push(language.t("model.tag.free"))
-    const suffix = tags.length ? ` (${tags.join(", ")})` : ""
-    return `${props.model.name}${suffix}`
-  }
  const inputs = () => {
    if (props.model.capabilities) {
      const input = props.model.capabilities.input
@@ -91,21 +73,6 @@ export const ModelTooltip: Component<{ model: ModelInfo; latest?: boolean; free?
      : language.t("model.tooltip.reasoning.none")
  }
  const context = () => language.t("model.tooltip.context", { limit: props.model.limit.context.toLocaleString() })
-  const contextLimit = () => props.model.limit.context.toLocaleString(language.intl())
-
-  if (props.v2) {
-    return (
-      <div class="flex w-[180px] flex-col gap-2">
-        <ModelTooltipRow name={language.t("model.tooltip.model")} value={name()} />
-        <ModelTooltipRow name={language.t("model.tooltip.provider")} value={props.model.provider.name} />
-        <Show when={inputs()}>
-          {(value) => <ModelTooltipRow name={language.t("model.tooltip.inputs")} value={value()} />}
-        </Show>
-        <ModelTooltipRow name={language.t("model.tooltip.reasoning")} value={reasoning()} />
-        <ModelTooltipRow name={language.t("model.tooltip.context.label")} value={contextLimit()} />
-      </div>
-    )
-  }

  return (
    <div class="flex flex-col gap-1 py-1">
@@ -1,7 +1,7 @@
 import { Component, For, Show } from "solid-js"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
+import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { getDirectory, getFilename, getFilenameTruncated } from "@opencode-ai/core/util/path"
 import type { ContextItem } from "@/context/prompt"

@@ -27,7 +27,7 @@ export const PromptContextItems: Component<ContextItemsProps> = (props) => {
            const selected = props.active(item)

            return (
-              <TooltipV2
+              <Tooltip
                value={
                  <span class="flex max-w-[300px]">
                    <span class="text-text-invert-base truncate-start [unicode-bidi:plaintext] min-w-0">
@@ -78,7 +78,7 @@ export const PromptContextItems: Component<ContextItemsProps> = (props) => {
                    {(comment) => <div class="text-12-regular text-text-strong ml-5 pr-1 truncate">{comment()}</div>}
                  </Show>
                </div>
-              </TooltipV2>
+              </Tooltip>
            )
          }}
        </For>
@@ -31,7 +31,6 @@ import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { reviewTooltipKeybind } from "../command-tooltip-keybind"
-import { useTitlebarRightMount } from "../titlebar"

 const OPEN_APPS = [
  "vscode",
@@ -285,9 +284,10 @@ export function SessionHeader() {
  }

  const [centerMount, setCenterMount] = createSignal<HTMLElement | null>(null)
-  const rightMount = useTitlebarRightMount()
+  const [rightMount, setRightMount] = createSignal<HTMLElement | null>(null)
  onMount(() => {
    setCenterMount(document.getElementById("opencode-titlebar-center"))
+    setRightMount(document.getElementById("opencode-titlebar-right"))
  })

  return (
@@ -1,271 +0,0 @@
-import type { JSX } from "solid-js"
-import { Show, createEffect, onCleanup } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useSortable } from "@dnd-kit/solid/sortable"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Tabs } from "@opencode-ai/ui/tabs"
-import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
-import { Icon } from "@opencode-ai/ui/icon"
-import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
-import { isDefaultTitle as isDefaultTerminalTitle } from "@/context/terminal-title"
-import { useTerminal, type LocalPTY } from "@/context/terminal"
-import { useLanguage } from "@/context/language"
-import { focusTerminalById } from "@/pages/session/helpers"
-
-export function SortableTerminalTabV2(props: {
-  terminal: LocalPTY
-  index: () => number
-  newLayout: boolean
-  onClose?: () => void
-}): JSX.Element {
-  const terminal = useTerminal()
-  const language = useLanguage()
-  const sortable = useSortable({
-    get id() {
-      return props.terminal.id
-    },
-    get index() {
-      return props.index()
-    },
-  })
-  const [store, setStore] = createStore({
-    editing: false,
-    title: props.terminal.title,
-    menuOpen: false,
-    menuPosition: { x: 0, y: 0 },
-    blurEnabled: false,
-  })
-  let input: HTMLInputElement | undefined
-  let blurFrame: number | undefined
-  let editRequested = false
-
-  const isDefaultTitle = () => {
-    const number = props.terminal.titleNumber
-    if (!Number.isFinite(number) || number <= 0) return false
-    return isDefaultTerminalTitle(props.terminal.title, number)
-  }
-
-  const label = () => {
-    language.locale()
-    if (props.terminal.title && !isDefaultTitle()) return props.terminal.title
-
-    const number = props.terminal.titleNumber
-    if (Number.isFinite(number) && number > 0) return language.t("terminal.title.numbered", { number })
-    if (props.terminal.title) return props.terminal.title
-    return language.t("terminal.title")
-  }
-
-  const close = () => {
-    const count = terminal.all().length
-    void terminal.close(props.terminal.id)
-    if (count === 1) {
-      props.onClose?.()
-    }
-  }
-
-  const focus = () => {
-    if (store.editing) return
-    terminal.open(props.terminal.id)
-    if (document.activeElement instanceof HTMLElement) document.activeElement.blur()
-    focusTerminalById(props.terminal.id)
-  }
-
-  const edit = (e?: Event) => {
-    if (e) {
-      e.stopPropagation()
-      e.preventDefault()
-    }
-
-    setStore("blurEnabled", false)
-    setStore("title", props.terminal.title)
-    setStore("editing", true)
-  }
-
-  const save = () => {
-    if (!store.blurEnabled) return
-
-    const value = store.title.trim()
-    if (value && value !== props.terminal.title) {
-      terminal.update({ id: props.terminal.id, title: value })
-    }
-    setStore("editing", false)
-  }
-
-  const keydown = (e: KeyboardEvent) => {
-    if (e.key === "Enter") {
-      e.preventDefault()
-      save()
-      return
-    }
-    if (e.key === "Escape") {
-      e.preventDefault()
-      setStore("editing", false)
-    }
-  }
-
-  const menu = (e: MouseEvent) => {
-    e.preventDefault()
-    setStore("menuPosition", { x: e.clientX, y: e.clientY })
-    setStore("menuOpen", true)
-  }
-
-  createEffect(() => {
-    if (!store.editing) return
-    if (!input) return
-    input.focus()
-    input.select()
-    if (blurFrame !== undefined) cancelAnimationFrame(blurFrame)
-    blurFrame = requestAnimationFrame(() => {
-      blurFrame = undefined
-      setStore("blurEnabled", true)
-    })
-  })
-
-  onCleanup(() => {
-    if (blurFrame === undefined) return
-    cancelAnimationFrame(blurFrame)
-  })
-
-  return (
-    <div
-      ref={sortable.ref}
-      class="outline-none focus:outline-none focus-visible:outline-none"
-      classList={{
-        "h-full flex items-center": props.newLayout,
-        "h-full": !props.newLayout,
-      }}
-    >
-      <Show
-        when={props.newLayout}
-        fallback={
-          <div class="relative h-full">
-            <Tabs.Trigger
-              value={props.terminal.id}
-              onClick={focus}
-              onMouseDown={(e) => e.preventDefault()}
-              onContextMenu={menu}
-              class="!shadow-none"
-              classes={{
-                button: "border-0 outline-none focus:outline-none focus-visible:outline-none !shadow-none !ring-0",
-              }}
-              closeButton={
-                <IconButton
-                  icon="close"
-                  variant="ghost"
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    close()
-                  }}
-                  aria-label={language.t("terminal.close")}
-                />
-              }
-            >
-              <span onDblClick={edit} classList={{ invisible: store.editing }}>
-                {label()}
-              </span>
-            </Tabs.Trigger>
-            <Show when={store.editing}>
-              <div class="absolute inset-0 flex items-center px-3 bg-muted z-10 pointer-events-auto">
-                <input
-                  ref={input}
-                  type="text"
-                  value={store.title}
-                  onInput={(e) => setStore("title", e.currentTarget.value)}
-                  onBlur={save}
-                  onKeyDown={keydown}
-                  onMouseDown={(e) => e.stopPropagation()}
-                  class="bg-transparent border-none outline-none text-sm min-w-0 flex-1"
-                />
-              </div>
-            </Show>
-            <DropdownMenu open={store.menuOpen} onOpenChange={(open) => setStore("menuOpen", open)}>
-              <DropdownMenu.Portal>
-                <DropdownMenu.Content
-                  class="fixed"
-                  style={{
-                    left: `${store.menuPosition.x}px`,
-                    top: `${store.menuPosition.y}px`,
-                  }}
-                  onCloseAutoFocus={(e) => {
-                    if (!editRequested) return
-                    e.preventDefault()
-                    editRequested = false
-                    requestAnimationFrame(() => edit())
-                  }}
-                >
-                  <DropdownMenu.Item onSelect={() => (editRequested = true)}>
-                    <Icon name="edit" class="w-4 h-4 mr-2" />
-                    {language.t("common.rename")}
-                  </DropdownMenu.Item>
-                  <DropdownMenu.Item onSelect={close}>
-                    <Icon name="close" class="w-4 h-4 mr-2" />
-                    {language.t("common.close")}
-                  </DropdownMenu.Item>
-                </DropdownMenu.Content>
-              </DropdownMenu.Portal>
-            </DropdownMenu>
-          </div>
-        }
-      >
-        <MenuV2.Context>
-          <MenuV2.Context.Trigger class="relative" as="div">
-            <Tabs.Trigger
-              value={props.terminal.id}
-              onClick={focus}
-              closeButton={
-                <IconButton
-                  icon="close-small"
-                  variant="ghost"
-                  class="h-5 w-5"
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    close()
-                  }}
-                  aria-label={language.t("terminal.close")}
-                />
-              }
-              hideCloseButton
-              onMiddleClick={close}
-            >
-              <span
-                class="truncate"
-                data-slot="terminal-tab-title"
-                onDblClick={edit}
-                classList={{ invisible: store.editing }}
-              >
-                {label()}
-              </span>
-            </Tabs.Trigger>
-            <Show when={store.editing}>
-              <div class="absolute inset-0 flex items-center bg-v2-background-bg-layer-01 z-10 pointer-events-auto rounded-[6px] shadow-[inset_0_0_0_0.5px_var(--v2-border-border-muted)] px-2">
-                <input
-                  ref={input}
-                  type="text"
-                  value={store.title}
-                  onInput={(e) => setStore("title", e.currentTarget.value)}
-                  onBlur={save}
-                  onKeyDown={keydown}
-                  onMouseDown={(e) => e.stopPropagation()}
-                  class="bg-transparent border-none outline-none min-w-0 flex-1 p-0 text-[13px] leading-4 tracking-[-0.04px] text-v2-text-text-base [font-weight:440] [font-variation-settings:'slnt'_0] [font-variant-numeric:tabular-nums]"
-                />
-              </div>
-            </Show>
-          </MenuV2.Context.Trigger>
-          <MenuV2.Context.Portal>
-            <MenuV2.Context.Content
-              onCloseAutoFocus={(e) => {
-                if (!editRequested) return
-                e.preventDefault()
-                editRequested = false
-                requestAnimationFrame(() => edit())
-              }}
-            >
-              <MenuV2.Item onSelect={() => (editRequested = true)}>{language.t("common.rename")}</MenuV2.Item>
-              <MenuV2.Item onSelect={close}>{language.t("common.close")}</MenuV2.Item>
-            </MenuV2.Context.Content>
-          </MenuV2.Context.Portal>
-        </MenuV2.Context>
-      </Show>
-    </div>
-  )
-}
@@ -440,6 +440,11 @@ export const SettingsGeneral: Component = () => {
            value={(o) => o.value}
            label={(o) => o.label}
            onSelect={(option) => option && theme.setColorScheme(option.value)}
+            onHighlight={(option) => {
+              if (!option) return
+              theme.previewColorScheme(option.value)
+              return () => theme.cancelPreview()
+            }}
            variant="secondary"
            size="small"
            triggerVariant="settings"
@@ -466,6 +471,11 @@ export const SettingsGeneral: Component = () => {
              if (!option) return
              theme.setTheme(option.id)
            }}
+            onHighlight={(option) => {
+              if (!option) return
+              theme.previewTheme(option.id)
+              return () => theme.cancelPreview()
+            }}
            variant="secondary"
            size="small"
            triggerVariant="settings"
@@ -5,18 +5,24 @@ import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { TextField } from "@opencode-ai/ui/text-field"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
-import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
 import { showToast } from "@/utils/toast"
 import fuzzysort from "fuzzysort"
 import { formatKeybind, parseKeybind, useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
 import { SettingsList } from "./settings-list"
-import { SettingsListV2 } from "./settings-v2/parts/list"

+const ButtonV2 = lazy(() => import("@opencode-ai/ui/v2/button-v2").then((module) => ({ default: module.ButtonV2 })))
 const IconV2 = lazy(() => import("@opencode-ai/ui/v2/icon").then((module) => ({ default: module.Icon })))
+const IconButtonV2 = lazy(() =>
+  import("@opencode-ai/ui/v2/icon-button-v2").then((module) => ({ default: module.IconButtonV2 })),
+)
+const TextInputV2 = lazy(() =>
+  import("@opencode-ai/ui/v2/text-input-v2").then((module) => ({ default: module.TextInputV2 })),
+)
+const SettingsListV2 = lazy(() =>
+  import("./settings-v2/parts/list").then((module) => ({ default: module.SettingsListV2 })),
+)

 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
 const PALETTE_ID = "command.palette"
@@ -8,7 +8,8 @@ import { createMemo, type Component, For, Show } from "solid-js"
 import { useLanguage } from "@/context/language"
 import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
-import { DialogConnectProvider, useProviderConnectController } from "./dialog-connect-provider"
+import { DialogConnectProvider } from "./dialog-connect-provider"
+import { DialogSelectProvider } from "./dialog-select-provider"
 import { DialogCustomProvider } from "./dialog-custom-provider"
 import { SettingsList } from "./settings-list"
 import { SettingsServerPicker, SettingsServerScope } from "./settings-server-picker"
@@ -27,26 +28,20 @@ const PROVIDER_NOTES = [
  { match: (id: string) => id === "vercel", key: "dialog.provider.vercel.note" },
 ] as const

-export const SettingsProviders: Component<{ onBack?: () => void }> = (props) => {
+export const SettingsProviders: Component = () => {
  return (
    <SettingsServerScope>
-      <SettingsProvidersContent onBack={props.onBack} />
+      <SettingsProvidersContent />
    </SettingsServerScope>
  )
 }

-const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) => {
+const SettingsProvidersContent: Component = () => {
  const dialog = useDialog()
  const language = useLanguage()
  const serverSDK = useServerSDK()
  const serverSync = useServerSync()
  const providers = useProviders()
-  const providerConnect = useProviderConnectController({ onBack: props.onBack })
-
-  const connect = (provider?: string) => {
-    providerConnect.select(provider)
-    void dialog.show(() => <DialogConnectProvider controller={providerConnect} />)
-  }

  const connected = createMemo(() => {
    return providers
@@ -211,7 +206,14 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
                      {(key) => <span class="text-12-regular text-text-weak pl-8">{language.t(key())}</span>}
                    </Show>
                  </div>
-                  <Button size="large" variant="secondary" icon="plus-small" onClick={() => connect(item.id)}>
+                  <Button
+                    size="large"
+                    variant="secondary"
+                    icon="plus-small"
+                    onClick={() => {
+                      dialog.show(() => <DialogConnectProvider provider={item.id} />)
+                    }}
+                  >
                    {language.t("common.connect")}
                  </Button>
                </div>
@@ -237,7 +239,7 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
                variant="secondary"
                icon="plus-small"
                onClick={() => {
-                  dialog.show(() => <DialogCustomProvider onBack={dialog.close} />)
+                  dialog.show(() => <DialogCustomProvider back="close" />)
                }}
              >
                {language.t("common.connect")}
@@ -248,7 +250,9 @@ const SettingsProvidersContent: Component<{ onBack?: () => void }> = (props) =>
          <Button
            variant="ghost"
            class="px-0 py-0 mt-5 text-14-medium text-text-interactive-base text-left justify-start hover:bg-transparent active:bg-transparent"
-            onClick={() => connect()}
+            onClick={() => {
+              dialog.show(() => <DialogSelectProvider />)
+            }}
          >
            {language.t("dialog.provider.viewAll")}
          </Button>
@@ -1,4 +1,4 @@
-import { Component, createSignal, startTransition } from "solid-js"
+import { Component } from "solid-js"
 import { Dialog } from "@opencode-ai/ui/v2/dialog-v2"
 import { TabsV2 } from "@opencode-ai/ui/v2/tabs-v2"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -10,30 +10,16 @@ import { SettingsProvidersV2 } from "./providers"
 import { SettingsModelsV2 } from "./models"
 import "./settings-v2.css"
 import { SettingsServersV2 } from "./servers"
-import { useDialog } from "@opencode-ai/ui/context/dialog"

 export const DialogSettings: Component<{
  sessionID?: string
-  defaultValue?: string
 }> = (props) => {
  const language = useLanguage()
  const platform = usePlatform()
-  const dialog = useDialog()
-  const [tab, setTab] = createSignal(props.defaultValue ?? "general")
-
-  const showProviders = () => {
-    void dialog.show(() => <DialogSettings sessionID={props.sessionID} defaultValue="providers" />)
-  }

  return (
    <Dialog size="x-large" variant="settings" class="settings-v2-dialog">
-      <TabsV2
-        orientation="vertical"
-        variant="settings"
-        value={tab()}
-        onChange={(value) => void startTransition(() => setTab(value))}
-        class="settings-v2"
-      >
+      <TabsV2 orientation="vertical" variant="settings" defaultValue="general" class="settings-v2">
        <TabsV2.List>
          <div class="flex flex-col justify-between h-full w-full">
            <div class="flex flex-col gap-3 w-full">
@@ -87,7 +73,7 @@ export const DialogSettings: Component<{
          <SettingsServersV2 />
        </TabsV2.Content>
        <TabsV2.Content value="providers" class="settings-v2-panel">
-          <SettingsProvidersV2 onBack={showProviders} />
+          <SettingsProvidersV2 />
        </TabsV2.Content>
        <TabsV2.Content value="models" class="settings-v2-panel">
          <SettingsModelsV2 />
@@ -422,6 +422,11 @@ export const SettingsGeneralV2: Component<{
            value={(o) => o.value}
            label={(o) => o.label}
            onSelect={(option) => option && theme.setColorScheme(option.value)}
+            onHighlight={(option) => {
+              if (!option) return
+              theme.previewColorScheme(option.value)
+              return () => theme.cancelPreview()
+            }}
          />
        </SettingsRowV2>

@@ -449,6 +454,11 @@ export const SettingsGeneralV2: Component<{
              if (!option) return
              theme.setTheme(option.id)
            }}
+            onHighlight={(option) => {
+              if (!option) return
+              theme.previewTheme(option.id)
+              return () => theme.cancelPreview()
+            }}
          />
        </SettingsRowV2>

@@ -8,7 +8,8 @@ import { createMemo, type Component, For, Show } from "solid-js"
 import { useLanguage } from "@/context/language"
 import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
-import { DialogConnectProvider, useProviderConnectController } from "../dialog-connect-provider"
+import { DialogConnectProvider } from "../dialog-connect-provider"
+import { DialogSelectProvider } from "../dialog-select-provider"
 import { DialogCustomProvider } from "../dialog-custom-provider"
 import { SettingsListV2 } from "./parts/list"
 import "./settings-v2.css"
@@ -29,18 +30,12 @@ const PROVIDER_NOTES = [

 const PROVIDER_ICON_SIZE = 16

-export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) => {
+export const SettingsProvidersV2: Component = () => {
  const dialog = useDialog()
  const language = useLanguage()
  const serverSdk = useServerSDK()
  const serverSync = useServerSync()
  const providers = useProviders()
-  const providerConnect = useProviderConnectController({ onBack: props.onBack })
-
-  const connect = (provider?: string) => {
-    providerConnect.select(provider)
-    void dialog.show(() => <DialogConnectProvider controller={providerConnect} />)
-  }

  const connected = createMemo(() => {
    return providers
@@ -211,7 +206,14 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
                      </Show>
                    </div>
                  </div>
-                  <ButtonV2 size="normal" variant="neutral" icon="plus" onClick={() => connect(item.id)}>
+                  <ButtonV2
+                    size="normal"
+                    variant="neutral"
+                    icon="plus"
+                    onClick={() => {
+                      dialog.show(() => <DialogConnectProvider provider={item.id} />)
+                    }}
+                  >
                    {language.t("common.connect")}
                  </ButtonV2>
                </div>
@@ -239,7 +241,7 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
                variant="neutral"
                icon="plus"
                onClick={() => {
-                  dialog.show(() => <DialogCustomProvider onBack={dialog.close} />)
+                  dialog.show(() => <DialogCustomProvider back="close" />)
                }}
              >
                {language.t("common.connect")}
@@ -247,7 +249,13 @@ export const SettingsProvidersV2: Component<{ onBack?: () => void }> = (props) =
            </div>
          </SettingsListV2>

-          <button type="button" class="settings-v2-providers-view-all" onClick={() => connect()}>
+          <button
+            type="button"
+            class="settings-v2-providers-view-all"
+            onClick={() => {
+              dialog.show(() => <DialogSelectProvider />)
+            }}
+          >
            {language.t("dialog.provider.viewAll")}
          </button>
        </div>
@@ -246,23 +246,18 @@ export function TabNavItem(props: {
          }}
          class="flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 text-[13px] font-medium text-v2-text-text-faint group-data-[active='true']:text-v2-text-text-base group-data-[editing='true']:text-v2-text-text-base [-webkit-user-drag:none]"
        >
-          <span data-slot="project-avatar-slot" class="flex size-4 shrink-0 items-center justify-center">
-            <Show
-              when={props.session()}
-              fallback={
-                <span class="block size-4 rounded-[3px] border border-v2-border-border-muted" aria-hidden="true" />
-              }
-            >
-              {(session) => (
+          <Show when={props.session()}>
+            {(session) => (
+              <span data-slot="project-avatar-slot">
                <SessionTabAvatar
                  project={project()}
                  directory={session().directory}
                  sessionId={session().id}
                  server={props.server}
                />
-              )}
-            </Show>
-          </span>
+              </span>
+            )}
+          </Show>
          <span
            ref={(el) => {
              titleEl = el
@@ -3,7 +3,7 @@ import { createSignal, Show, type JSXElement } from "solid-js"
 import "./titlebar-tab-popover.css"

 // Initial hover delay before the preview appears, per design.
-const OPEN_DELAY = 2_000
+const OPEN_DELAY = 400
 // Mouse-out delay: begin closing immediately (a brief exit animation plays).
 const CLOSE_DELAY = 0
 // After a preview closes, hovering a neighbouring tab within this window skips
@@ -17,6 +17,8 @@ import { createTabPromptState } from "@/context/prompt"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { canStartTabDrag, isTabCloseTarget } from "./titlebar-tab-gesture"

+const sortableTransition = { duration: 0 }
+
 function SessionTabSlot(props: {
  tab: SessionTab
  id: string
@@ -40,7 +42,6 @@ function SessionTabSlot(props: {
  let ref!: HTMLDivElement
  const sdk = createMemo(() => props.serverCtx()?.sdk ?? null)
  const cachedSession = createMemo(() => props.serverCtx()?.sync.session.peek(props.tab.sessionId))
-  const persisted = createMemo(() => tabs.info[props.id])
  const [loadedSession] = createResource(
    () => {
      const ctx = props.serverCtx()
@@ -72,10 +73,8 @@ function SessionTabSlot(props: {

  createEffect(() => {
    const value = session()
-    if (!value) return
-    tabs.rememberSessionInfo(props.tab, value)
    const current = sdk()
-    if (!current) return
+    if (!value || !current) return
    createTabPromptState(tabs, props.tab, current.scope, {
      dir: base64Encode(value.directory),
      id: value.id,
@@ -89,7 +88,7 @@ function SessionTabSlot(props: {
      data-tab-key={props.id}
      data-active={props.active()}
      class="relative flex w-56 min-w-7 max-w-56 flex-shrink"
-      classList={{ hidden: !session() && !missingSession() && !persisted()?.title }}
+      classList={{ hidden: !session() && !missingSession() }}
    >
      <TabNavItem
        ref={(el) => {
@@ -98,7 +97,7 @@ function SessionTabSlot(props: {
        href={tabHref(props.tab)}
        server={props.tab.server}
        session={session}
-        fallbackTitle={persisted()?.title ?? (missingSession() ? language.t("session.tab.unknown") : undefined)}
+        fallbackTitle={missingSession() ? language.t("session.tab.unknown") : undefined}
        onTitleChange={(title) => {
          const value = session()
          const ctx = props.serverCtx()
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createResource, createSignal, Match, onMount, Show, Switch, untrack } from "solid-js"
+import { createEffect, createMemo, createResource, createSignal, Match, Show, Switch, untrack } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useLocation, useNavigate, useParams } from "@solidjs/router"
 import { IconButton } from "@opencode-ai/ui/icon-button"
@@ -60,12 +60,6 @@ export type TitlebarUpdate = {
  install: () => void
 }

-export function useTitlebarRightMount() {
-  const [mount, setMount] = createSignal<HTMLElement | null>(null)
-  onMount(() => setMount(document.getElementById("opencode-titlebar-right")))
-  return mount
-}
-
 export function Titlebar(props: { update?: TitlebarUpdate }) {
  const layout = useLayout()
  const platform = usePlatform()
@@ -334,21 +328,6 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                return
              }

-              if (route.type === "home") {
-                const selection = layout.home.selection()
-                const conn = global.servers.list().find((item) => ServerConnection.key(item) === selection.server)
-                const project = conn
-                  ? global
-                      .ensureServerCtx(conn)
-                      .projects.list()
-                      .find((item) => item.worktree === selection.directory)
-                  : undefined
-                if (conn && project) {
-                  tabs.newDraft({ server: ServerConnection.key(conn), directory: project.worktree }, "")
-                  return
-                }
-              }
-
              const current = layout.projects.list()[0]
              if (current) {
                tabs.newDraft({ server: server.key, directory: current.worktree }, "")
@@ -395,16 +374,9 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                  keybind: "mod+w",
                  hidden: true,
                  onSelect: () => {
-                    tabsStoreActions.closeTab(tabsStore.findIndex((tab) => current === tab))
+                    tabsStoreActions.removeTab(tabsStore.findIndex((tab) => current === tab))
                  },
                },
-                {
-                  id: "tab.reopenClosed",
-                  category: language.t("command.category.file"),
-                  title: language.t("command.tab.reopenClosed"),
-                  keybind: "mod+shift+t",
-                  onSelect: () => tabsStoreActions.reopenClosedTab(),
-                },
                {
                  id: `tab.prev`,
                  category: "tab",
@@ -492,7 +464,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                  }}
                  onClose={(tab) => {
                    const index = tabsStore.findIndex((item) => tabKey(item) === tabKey(tab))
-                    if (index !== -1) tabsStoreActions.closeTab(index)
+                    if (index !== -1) tabsStoreActions.removeTab(index)
                  }}
                  onReorder={(keys) => tabsStoreActions.reorder(keys)}
                />
@@ -1,18 +0,0 @@
-import { expect, test } from "bun:test"
-import { virtualScrollElement } from "./virtual-scroll-element"
-
-test("resolves the connected viewport that owns the virtual root", () => {
-  const stale = document.createElement("div")
-  stale.className = "scroll-view__viewport"
-  const viewport = document.createElement("div")
-  viewport.className = "scroll-view__viewport"
-  const root = document.createElement("div")
-  viewport.append(root)
-  document.body.append(viewport)
-
-  expect(virtualScrollElement(root)).toBe(viewport)
-  expect(virtualScrollElement(root)).not.toBe(stale)
-
-  viewport.remove()
-  expect(virtualScrollElement(root)).toBeNull()
-})
@@ -1,4 +0,0 @@
-export function virtualScrollElement(root: HTMLElement | undefined) {
-  if (!root?.isConnected) return null
-  return root.closest<HTMLDivElement>(".scroll-view__viewport")
-}
@@ -1,40 +0,0 @@
-import type { SessionTab, Tab } from "./tabs"
-
-export type ClosedTab = {
-  tab: SessionTab
-  index: number
-}
-
-const CLOSED_TAB_LIMIT = 25
-
-// Only session tabs are recorded; closing a draft tab deletes its persisted
-// state, so a reopened draft would come back empty anyway.
-export function pushClosedTab(stack: ClosedTab[], tab: Tab, index: number): ClosedTab[] {
-  if (tab.type !== "session") return stack
-  return [...stack, { tab: { ...tab }, index }].slice(-CLOSED_TAB_LIMIT)
-}
-
-// Pops the most recently closed tab that is not open again,
-// discarding stale entries along the way.
-export function takeClosedTab(stack: ClosedTab[], tabs: Tab[]): { entry?: ClosedTab; stack: ClosedTab[] } {
-  const remaining = [...stack]
-  while (remaining.length) {
-    const entry = remaining.pop()
-    if (entry && !isOpen(tabs, entry.tab)) return { entry, stack: remaining }
-  }
-  return { stack: remaining }
-}
-
-export function removeClosedTabs(stack: ClosedTab[], server: SessionTab["server"], sessionIDs: string[]) {
-  const removed = new Set(sessionIDs)
-  return stack.filter((entry) => entry.tab.server !== server || !removed.has(entry.tab.sessionId))
-}
-
-export function nextTabAfterClose(tabs: Tab[], index: number, active: boolean) {
-  if (!active) return undefined
-  return tabs[index + 1] ?? tabs[index - 1] ?? null
-}
-
-function isOpen(tabs: Tab[], tab: SessionTab) {
-  return tabs.some((item) => item.type === "session" && item.server === tab.server && item.sessionId === tab.sessionId)
-}
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { resolveKeybindOption, upsertCommandRegistration } from "./command"
+import { upsertCommandRegistration } from "./command"

 describe("upsertCommandRegistration", () => {
  test("replaces keyed registrations", () => {
@@ -23,19 +23,3 @@ describe("upsertCommandRegistration", () => {
    expect(next[1]?.options).toBe(one)
  })
 })
-
-describe("resolveKeybindOption", () => {
-  test("prefers a matching contextual command over the global fallback", () => {
-    const fallback = { id: "tab.close", title: "Close tab" }
-    const contextual = { id: "terminal.close", title: "Close terminal", when: () => true }
-
-    expect(resolveKeybindOption([fallback, contextual], new KeyboardEvent("keydown"))).toBe(contextual)
-  })
-
-  test("uses the global fallback outside the command context", () => {
-    const fallback = { id: "tab.close", title: "Close tab" }
-    const contextual = { id: "terminal.close", title: "Close terminal", when: () => false }
-
-    expect(resolveKeybindOption([fallback, contextual], new KeyboardEvent("keydown"))).toBe(fallback)
-  })
-})
@@ -82,15 +82,10 @@ export interface CommandOption {
  suggested?: boolean
  disabled?: boolean
  hidden?: boolean
-  when?: (event: KeyboardEvent) => boolean
  onSelect?: (source?: "palette" | "keybind" | "slash") => void
  onHighlight?: () => (() => void) | void
 }

-export function resolveKeybindOption(candidates: CommandOption[] | undefined, event: KeyboardEvent) {
-  return candidates?.find((option) => option.when?.(event)) ?? candidates?.find((option) => !option.when)
-}
-
 type CommandSource = "palette" | "keybind" | "slash"

 export type CommandCatalogItem = {
@@ -339,7 +334,7 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
    })

    const keymap = createMemo(() => {
-      const map = new Map<string, CommandOption[]>()
+      const map = new Map<string, CommandOption>()
      for (const option of options()) {
        if (option.id.startsWith(SUGGESTED_PREFIX)) continue
        if (option.disabled) continue
@@ -349,12 +344,8 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
        for (const kb of keybinds) {
          if (!kb.key) continue
          const sig = signature(kb.key, kb.ctrl, kb.meta, kb.shift, kb.alt)
-          const existing = map.get(sig)
-          if (existing) {
-            existing.push(option)
-            continue
-          }
-          map.set(sig, [option])
+          if (map.has(sig)) continue
+          map.set(sig, option)
        }
      }
      return map
@@ -383,7 +374,7 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex

      const sig = signatureFromEvent(event)
      const isPalette = palette().has(sig)
-      const option = resolveKeybindOption(keymap().get(sig), event)
+      const option = keymap().get(sig)
      const modified = event.ctrlKey || event.metaKey || event.altKey
      const isTab = event.key === "Tab"

@@ -392,19 +383,17 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex

      if (isPalette) {
        event.preventDefault()
-        event.stopPropagation()
        showPalette()
        return
      }

      if (!option) return
      event.preventDefault()
-      event.stopPropagation()
      option.onSelect?.("keybind")
    }

    onMount(() => {
-      makeEventListener(document, "keydown", handleKeyDown, { capture: true })
+      makeEventListener(document, "keydown", handleKeyDown)
    })

    function register(cb: () => CommandOption[]): void
@@ -15,13 +15,11 @@ const session = (id: string, parentID?: string): Session => ({
 })

 type UserMessage = Extract<Message, { role: "user" }>
-type AssistantMessage = Extract<Message, { role: "assistant" }>
 type TextPart = Extract<Part, { type: "text" }>
 type MessageResponse = {
  data: { info: Message; parts: Part[] }[]
  response: { headers: Headers }
 }
-type SingleMessageResponse = { data: MessageResponse["data"][number] }

 const userMessage = (id: string, input: Partial<UserMessage> = {}): UserMessage => ({
  id,
@@ -33,22 +31,6 @@ const userMessage = (id: string, input: Partial<UserMessage> = {}): UserMessage
  ...input,
 })

-const assistantMessage = (id: string, parentID: string, input: Partial<AssistantMessage> = {}): AssistantMessage => ({
-  id,
-  sessionID: "child",
-  role: "assistant",
-  time: { created: Number(id.at(-1)), completed: Number(id.at(-1)) },
-  parentID,
-  modelID: "model",
-  providerID: "provider",
-  mode: "build",
-  agent: "build",
-  path: { cwd: "/repo", root: "/repo" },
-  cost: 0,
-  tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-  ...input,
-})
-
 const textPart = (messageID: string, input: Partial<TextPart> = {}): TextPart => ({
  id: "part",
  sessionID: "child",
@@ -63,8 +45,6 @@ const response = (data: MessageResponse["data"] = [], cursor?: string): MessageR
  response: { headers: new Headers(cursor ? { "x-next-cursor": cursor } : undefined) },
 })

-const singleResponse = (info: Message, parts: Part[] = []): SingleMessageResponse => ({ data: { info, parts } })
-
 const deferredResponse = () => Promise.withResolvers<MessageResponse>()

 function messageClient(...responses: Array<MessageResponse | Promise<MessageResponse>>) {
@@ -91,40 +71,6 @@ function messageClient(...responses: Array<MessageResponse | Promise<MessageResp
  })
 }

-function rootMessageClient(
-  pages: Array<MessageResponse | Promise<MessageResponse>>,
-  roots: Array<SingleMessageResponse | Promise<SingleMessageResponse>>,
-) {
-  let pageIndex = 0
-  let rootIndex = 0
-  const requests: unknown[] = []
-  const rootRequests: unknown[] = []
-  const rootWaiting = new Map<number, () => void>()
-  const client = {
-    session: {
-      get: async () => ({ data: session("child", "root") }),
-      messages: (input: unknown) => {
-        requests.push(input)
-        return pages[pageIndex++]
-      },
-      message: (input: unknown) => {
-        rootRequests.push(input)
-        rootWaiting.get(rootRequests.length)?.()
-        rootWaiting.delete(rootRequests.length)
-        return roots[rootIndex++]
-      },
-    },
-  } as unknown as OpencodeClient
-  return Object.assign(client, {
-    requests,
-    rootRequests,
-    rootRequested(count: number) {
-      if (rootRequests.length >= count) return Promise.resolve()
-      return new Promise<void>((resolve) => rootWaiting.set(count, resolve))
-    },
-  })
-}
-
 const retryImmediately: typeof retry = async (task, options = {}) => {
  const attempts = options.attempts ?? 3
  for (let attempt = 0; ; attempt++) {
@@ -174,242 +120,10 @@ describe("server session", () => {
    await ctx.store.sync("root")

    expect(ctx.get).toEqual([{ sessionID: "root" }])
-    expect(ctx.messages).toEqual([{ sessionID: "root", limit: 20, before: undefined }])
+    expect(ctx.messages).toEqual([{ sessionID: "root", limit: 2, before: undefined }])
    expect(ctx.store.data.message.root).toEqual([])
  })

-  test("backfills an assistant-only initial page through its user root", async () => {
-    const user = userMessage("message-1")
-    const assistants = [assistantMessage("message-2", user.id), assistantMessage("message-3", user.id)]
-    const client = rootMessageClient(
-      [
-        response(
-          assistants.map((info) => ({ info, parts: [] })),
-          "older",
-        ),
-      ],
-      [singleResponse(user)],
-    )
-    const store = createServerSession(client)
-
-    await store.sync("child")
-
-    expect(client.requests).toEqual([{ sessionID: "child", limit: 20, before: undefined }])
-    expect(client.rootRequests).toEqual([{ sessionID: "child", messageID: user.id }])
-    expect(store.data.message.child).toEqual([user, ...assistants])
-    expect(store.history.more("child")).toBe(true)
-  })
-
-  test("does not let an optimistic user suppress initial root backfill", async () => {
-    const user = userMessage("message-1")
-    const part = textPart(user.id)
-    const assistants = [assistantMessage("message-2", user.id), assistantMessage("message-3", user.id)]
-    const client = rootMessageClient(
-      [
-        response(
-          assistants.map((info) => ({ info, parts: [] })),
-          "older",
-        ),
-      ],
-      [singleResponse(user)],
-    )
-    const store = createServerSession(client)
-    store.optimistic.add({ sessionID: "child", message: user, parts: [part] })
-
-    await store.sync("child")
-    store.optimistic.remove({ sessionID: "child", messageID: user.id })
-
-    expect(client.requests).toHaveLength(1)
-    expect(client.rootRequests).toHaveLength(1)
-    expect(store.data.message.child).toEqual([user, ...assistants])
-  })
-
-  test("backfills the parent of fetched assistants when another user is cached", async () => {
-    const unrelated = userMessage("message-0", { time: { created: 0 } })
-    const user = userMessage("message-1")
-    const assistants = [assistantMessage("message-2", user.id), assistantMessage("message-3", user.id)]
-    const client = rootMessageClient(
-      [
-        response([{ info: unrelated, parts: [] }]),
-        response(
-          assistants.map((info) => ({ info, parts: [] })),
-          "older",
-        ),
-      ],
-      [singleResponse(user)],
-    )
-    const store = createServerSession(client)
-    await store.sync("child")
-
-    await store.sync("child", { force: true })
-
-    expect(client.requests).toHaveLength(2)
-    expect(client.rootRequests).toHaveLength(1)
-    expect(store.data.message.child).toEqual([unrelated, user, ...assistants])
-  })
-
-  test("preserves cached history between an injected parent and the page boundary", async () => {
-    const user = userMessage("message-1")
-    const cached = userMessage("message-3", { time: { created: 3 } })
-    const assistant = assistantMessage("message-4", user.id)
-    const client = rootMessageClient(
-      [response([{ info: cached, parts: [] }]), response([{ info: assistant, parts: [] }], "older")],
-      [singleResponse(user)],
-    )
-    const store = createServerSession(client)
-    await store.sync("child")
-
-    await store.sync("child", { force: true })
-
-    expect(store.data.message.child).toEqual([user, cached, assistant])
-  })
-
-  test("refreshes a cached parent omitted by an assistant-only replacement page", async () => {
-    const stale = userMessage("message-1", { summary: { title: "stale", diffs: [] } })
-    const fresh = { ...stale, summary: { title: "fresh", diffs: [] } }
-    const stalePart = textPart(stale.id, { text: "stale" })
-    const freshPart = { ...stalePart, text: "fresh" }
-    const assistant = assistantMessage("message-2", stale.id)
-    const client = rootMessageClient(
-      [response([{ info: stale, parts: [stalePart] }]), response([{ info: assistant, parts: [] }], "older")],
-      [singleResponse(fresh, [freshPart])],
-    )
-    const store = createServerSession(client)
-    await store.sync("child")
-
-    await store.sync("child", { force: true })
-
-    expect(client.rootRequests).toEqual([{ sessionID: "child", messageID: stale.id }])
-    expect(store.data.message.child).toEqual([fresh, assistant])
-    expect(store.data.part[stale.id]).toEqual([freshPart])
-  })
-
-  test("refreshes a confirmed optimistic parent while preserving pending parts", async () => {
-    const stale = userMessage("message-1", { summary: { title: "stale", diffs: [] } })
-    const fresh = { ...stale, summary: { title: "fresh", diffs: [] } }
-    const confirmed = textPart(stale.id, { id: "confirmed", text: "stale" })
-    const refreshed = { ...confirmed, text: "fresh" }
-    const pending = textPart(stale.id, { id: "pending", text: "pending" })
-    const assistant = assistantMessage("message-2", stale.id)
-    const client = rootMessageClient(
-      [response([{ info: stale, parts: [confirmed] }]), response([{ info: assistant, parts: [] }], "older")],
-      [singleResponse(fresh, [refreshed])],
-    )
-    const store = createServerSession(client)
-    store.optimistic.add({ sessionID: "child", message: stale, parts: [confirmed, pending] })
-    await store.sync("child")
-
-    await store.sync("child", { force: true })
-
-    expect(client.rootRequests).toEqual([{ sessionID: "child", messageID: stale.id }])
-    expect(store.data.message.child).toEqual([fresh, assistant])
-    expect(store.data.part[stale.id]).toEqual([refreshed, pending])
-  })
-
-  test("uses a parent received by SSE during the replacement load", async () => {
-    const pending = deferredResponse()
-    const user = userMessage("message-1")
-    const assistant = assistantMessage("message-2", user.id)
-    const client = rootMessageClient([pending.promise], [])
-    const store = createServerSession(client)
-    const loading = store.sync("child")
-
-    store.apply({ type: "message.updated", properties: { info: user } })
-    pending.resolve(response([{ info: assistant, parts: [] }], "older"))
-    await loading
-
-    expect(client.rootRequests).toEqual([])
-    expect(store.data.message.child).toEqual([user, assistant])
-  })
-
-  test("uses a successful retry over events received by a failed backfill attempt", async () => {
-    const failed = deferredResponse()
-    const user = userMessage("message-1")
-    const live = { ...user, agent: "stale" }
-    const assistants = [assistantMessage("message-2", user.id), assistantMessage("message-3", user.id)]
-    const client = rootMessageClient(
-      [
-        response(
-          assistants.map((info) => ({ info, parts: [] })),
-          "older",
-        ),
-      ],
-      [failed.promise.then((result) => ({ data: result.data[0]! })), singleResponse(user)],
-    )
-    const store = createServerSession(client, { retry: retryImmediately })
-    const loading = store.sync("child")
-    await client.rootRequested(1)
-
-    store.apply({ type: "message.updated", properties: { info: live } })
-    failed.reject(new Error("retry"))
-    await loading
-
-    expect(client.requests).toHaveLength(1)
-    expect(client.rootRequests).toHaveLength(2)
-    expect(store.data.message.child).toEqual([user, ...assistants])
-  })
-
-  test("preserves newer-page events across a failed parent retry", async () => {
-    const failed = deferredResponse()
-    const user = userMessage("message-1")
-    const assistant = assistantMessage("message-2", user.id)
-    const live = { ...assistant, cost: 1 }
-    const client = rootMessageClient(
-      [response([{ info: assistant, parts: [] }], "older")],
-      [failed.promise.then((result) => ({ data: result.data[0]! })), singleResponse(user)],
-    )
-    const store = createServerSession(client, { retry: retryImmediately })
-    const loading = store.sync("child")
-    await client.rootRequested(1)
-
-    store.apply({ type: "message.updated", properties: { info: live } })
-    failed.reject(new Error("retry"))
-    await loading
-
-    expect(store.data.message.child).toEqual([user, live])
-  })
-
-  test("preserves unrelated message events across a failed parent retry", async () => {
-    const failed = deferredResponse()
-    const user = userMessage("message-1")
-    const assistant = assistantMessage("message-2", user.id)
-    const live = userMessage("message-4", { time: { created: 4 } })
-    const client = rootMessageClient(
-      [response([{ info: assistant, parts: [] }], "older")],
-      [failed.promise.then((result) => ({ data: result.data[0]! })), singleResponse(user)],
-    )
-    const store = createServerSession(client, { retry: retryImmediately })
-    const loading = store.sync("child")
-    await client.rootRequested(1)
-
-    store.apply({ type: "message.updated", properties: { info: live } })
-    failed.reject(new Error("retry"))
-    await loading
-
-    expect(store.data.message.child).toEqual([user, assistant, live])
-  })
-
-  test("preserves newer-page part events across a failed parent retry", async () => {
-    const failed = deferredResponse()
-    const user = userMessage("message-1")
-    const assistant = assistantMessage("message-2", user.id)
-    const stale = textPart(assistant.id, { text: "stale" })
-    const live = { ...stale, text: "live" }
-    const client = rootMessageClient(
-      [response([{ info: assistant, parts: [stale] }], "older")],
-      [failed.promise.then((result) => ({ data: result.data[0]! })), singleResponse(user)],
-    )
-    const store = createServerSession(client, { retry: retryImmediately })
-    const loading = store.sync("child")
-    await client.rootRequested(1)
-
-    store.apply({ type: "message.part.updated", properties: { sessionID: "child", part: live, time: 2 } })
-    failed.reject(new Error("retry"))
-    await loading
-
-    expect(store.data.part[assistant.id]).toEqual([live])
-  })
-
  test("merges live events into the initial page", async () => {
    const pending = deferredResponse()
    const user = userMessage("message-1")
@@ -1191,26 +905,6 @@ describe("server session", () => {
    expect(store.data.message.child).toEqual([latest])
  })

-  test("does not scan cached messages for user roots during history prepend", async () => {
-    const guard = { active: false }
-    const latest = new Proxy(userMessage("message-2", { time: { created: 2 } }), {
-      get(target, property, receiver) {
-        if (guard.active && property === "role") throw new Error("cached role accessed")
-        return Reflect.get(target, property, receiver)
-      },
-    })
-    const older = userMessage("message-1")
-    const store = createServerSession(
-      messageClient(response([{ info: latest, parts: [] }], "older"), response([{ info: older, parts: [] }])),
-    )
-    await store.sync("child")
-    guard.active = true
-
-    await store.history.loadMore("child")
-
-    expect(store.data.message.child).toEqual([older, latest])
-  })
-
  test("preserves loaded history during an incomplete refresh", async () => {
    const older = userMessage("message-1")
    const latest = userMessage("message-2", { time: { created: 2 } })
@@ -21,7 +21,7 @@ import { dropSessionCaches, pickSessionCacheEvictions, SESSION_CACHE_LIMIT } fro
 const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)
 const cmpMessage = (a: Message, b: Message) => a.time.created - b.time.created || cmp(a.id, b.id)
 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
-const initialMessagePageSize = 20
+const initialMessagePageSize = 2
 const historyMessagePageSize = 200
 const sessionInfoLimit = 2_048
 const emptyIDs: ReadonlySet<string> = new Set()
@@ -54,11 +54,6 @@ type MessageLoadState = {
  clearedMessageParts: Set<string>
 }

-type MessageLoadBaseline = Pick<
-  MessageLoadState,
-  "touchedMessages" | "retainedMessages" | "touchedParts" | "clearedMessageParts"
->
-
 function mergeOptimisticPage(page: MessagePage, items: OptimisticItem[]) {
  if (items.length === 0) return { ...page, observed: [] as { messageID: string; parts: Part[] }[] }
  const session = [...page.session]
@@ -352,7 +347,7 @@ export function createServerSession(client: OpencodeClient, options?: { retry?:
    load.touchedParts.set(messageID, new Set([partID]))
  }

-  const resetMessageLoad = (sessionID: string, load: MessageLoadState, baseline?: MessageLoadBaseline) => {
+  const resetMessageLoad = (sessionID: string, load: MessageLoadState) => {
    load.touchedMessages.clear()
    load.retainedMessages.clear()
    load.touchedParts.clear()
@@ -385,27 +380,8 @@ export function createServerSession(client: OpencodeClient, options?: { retry?:
      parts.forEach((partID) => touched.add(partID))
      load.touchedParts.set(messageID, touched)
    }
-    baseline?.touchedMessages.forEach((messageID) => load.touchedMessages.add(messageID))
-    baseline?.retainedMessages.forEach((messageID) => load.retainedMessages.add(messageID))
-    baseline?.clearedMessageParts.forEach((messageID) => load.clearedMessageParts.add(messageID))
-    baseline?.touchedParts.forEach((parts, messageID) => {
-      const touched = load.touchedParts.get(messageID) ?? new Set<string>()
-      parts.forEach((partID) => touched.add(partID))
-      load.touchedParts.set(messageID, touched)
-    })
  }

-  const messageLoadBaseline = (load: MessageLoadState, exclude: string): MessageLoadBaseline => ({
-    touchedMessages: new Set([...load.touchedMessages].filter((messageID) => messageID !== exclude)),
-    retainedMessages: new Set([...load.retainedMessages].filter((messageID) => messageID !== exclude)),
-    touchedParts: new Map(
-      [...load.touchedParts]
-        .filter(([messageID]) => messageID !== exclude)
-        .map(([messageID, parts]) => [messageID, new Set(parts)]),
-    ),
-    clearedMessageParts: new Set([...load.clearedMessageParts].filter((messageID) => messageID !== exclude)),
-  })
-
  const evict = (sessionIDs: string[]) => {
    if (sessionIDs.length === 0) return
    const evicted = new Set(sessionIDs)
@@ -484,18 +460,6 @@ export function createServerSession(client: OpencodeClient, options?: { retry?:
    }
  }

-  const fetchMessage = async (sessionID: string, messageID: string, onAttempt?: () => void) => {
-    const response = await (options?.retry ?? retry)(() => {
-      onAttempt?.()
-      return client.session.message({ sessionID, messageID })
-    })
-    if (!response.data?.info?.id) throw new Error(`Message not found: ${messageID}`)
-    return {
-      message: cleanMessage(response.data.info),
-      parts: response.data.parts.filter((part) => !!part?.id).sort((a, b) => cmp(a.id, b.id)),
-    }
-  }
-
  const replaceMessages = (sessionID: string, messages: Message[]) => {
    const messageIDs = new Set(messages.map((message) => message.id))
    const dropped = (data.message[sessionID] ?? []).filter((message) => !messageIDs.has(message.id))
@@ -614,79 +578,36 @@ export function createServerSession(client: OpencodeClient, options?: { retry?:
    messageLoads.set(sessionID, load)
    setMeta("loading", sessionID, true)
    let applied = false
-    try {
-      const page = await fetchMessages(sessionID, limit, before, () => resetMessageLoad(sessionID, load))
-      const first = page.session.reduce<Message | undefined>(
-        (oldest, message) => (!oldest || cmpMessage(message, oldest) < 0 ? message : oldest),
-        undefined,
-      )
-      if (generations.get(sessionID) !== active) return
-
-      const parents = [] as Awaited<ReturnType<typeof fetchMessage>>[]
-      if (mode !== "prepend") {
-        const users = new Set([
-          ...page.session.filter((message) => message.role === "user").map((message) => message.id),
-          ...(data.message[sessionID] ?? [])
-            .filter((message) => {
-              if (message.role !== "user") return false
-              const item = optimistic.get(sessionID)?.get(message.id)
-              return load.touchedMessages.has(message.id) && (!item || item.confirmedMessage === true)
-            })
-            .map((message) => message.id),
-        ])
-        const parentIDs = [
-          ...new Set(
-            page.session.flatMap((message) =>
-              message.role === "assistant" && !users.has(message.parentID) ? [message.parentID] : [],
-            ),
-          ),
-        ]
-        for (const parentID of parentIDs) {
-          if (generations.get(sessionID) !== active) break
-          const parent = await fetchMessage(sessionID, parentID, () =>
-            resetMessageLoad(sessionID, load, messageLoadBaseline(load, parentID)),
-          )
-          if (parent.message.role !== "user") throw new Error(`Assistant parent is not a user message: ${parentID}`)
-          parents.push(parent)
+    await fetchMessages(sessionID, limit, before, () => resetMessageLoad(sessionID, load))
+      .then((page) => {
+        if (generations.get(sessionID) !== active) return
+        const first = page.session.reduce<Message | undefined>(
+          (oldest, message) => (!oldest || cmpMessage(message, oldest) < 0 ? message : oldest),
+          undefined,
+        )
+        const preserveUnfetched =
+          mode === "prepend" || (!page.complete && (!first || ((message: Message) => cmpMessage(message, first) < 0)))
+        applyMessagePage(
+          sessionID,
+          page,
+          messageLoads.get(sessionID) === load ? load : undefined,
+          preserveUnfetched,
+          mode !== "prepend",
+        )
+        applied = true
+      })
+      .finally(() => {
+        if (!applied && generations.get(sessionID) === active && messageLoads.get(sessionID) === load) {
+          for (const messageID of load.orphanParents) {
+            if (!orphanParts.get(sessionID)?.has(messageID)) continue
+            setData(produce((draft) => deleteMessageParts(draft, messageID)))
+            orphanParts.get(sessionID)?.delete(messageID)
+          }
+          if (orphanParts.get(sessionID)?.size === 0) orphanParts.delete(sessionID)
        }
-      }
-      if (generations.get(sessionID) !== active) return
-      const result =
-        mode === "prepend"
-          ? page
-          : {
-              ...page,
-              session: merge(
-                page.session,
-                parents.map((parent) => parent.message),
-              ),
-              part: merge(
-                page.part,
-                parents.map((parent) => ({ id: parent.message.id, part: parent.parts })),
-              ),
-            }
-      const preserveUnfetched =
-        mode === "prepend" || (!result.complete && (!first || ((message: Message) => cmpMessage(message, first) < 0)))
-      applyMessagePage(
-        sessionID,
-        result,
-        messageLoads.get(sessionID) === load ? load : undefined,
-        preserveUnfetched,
-        mode !== "prepend",
-      )
-      applied = true
-    } finally {
-      if (!applied && generations.get(sessionID) === active && messageLoads.get(sessionID) === load) {
-        for (const messageID of load.orphanParents) {
-          if (!orphanParts.get(sessionID)?.has(messageID)) continue
-          setData(produce((draft) => deleteMessageParts(draft, messageID)))
-          orphanParts.get(sessionID)?.delete(messageID)
-        }
-        if (orphanParts.get(sessionID)?.size === 0) orphanParts.delete(sessionID)
-      }
-      if (messageLoads.get(sessionID) === load) messageLoads.delete(sessionID)
-      if (generations.get(sessionID) === active) setMeta("loading", sessionID, false)
-    }
+        if (messageLoads.get(sessionID) === load) messageLoads.delete(sessionID)
+        if (generations.get(sessionID) === active) setMeta("loading", sessionID, false)
+      })
  }

  const sync = (sessionID: string, options?: { force?: boolean; messageLimit?: number }) => {
@@ -312,10 +312,7 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
      })
    }

-    const isReady = Object.assign(
-      createMemo(() => ready() && !!state.active),
-      { promise: ready.promise },
-    )
+    const isReady = createMemo(() => ready() && !!state.active)

    const scope = (key = state.active) => ServerScope.fromServerKey(key, props.canonicalLocalServer)
    const projects = createServerProjects({ scope, store, setStore })
@@ -1,15 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import { createRoot, getOwner, onCleanup } from "solid-js"
 import { createTabMemory } from "./tab-memory"
-import { nextTabAfterClose, pushClosedTab, removeClosedTabs, takeClosedTab, type ClosedTab } from "./closed-tabs"
-import type { SessionTab, Tab } from "./tabs"
-import type { ServerConnection } from "./server"
-
-const server = "local\nhttp://localhost:4096" as ServerConnection.Key
-
-function sessionTab(sessionId: string): SessionTab {
-  return { type: "session", server, sessionId }
-}

 describe("tab memory", () => {
  test("keeps state until its tab is removed", () => {
@@ -31,75 +22,3 @@ describe("tab memory", () => {
    })
  })
 })
-
-describe("closed tab stack", () => {
-  test("records session tabs with their index", () => {
-    const stack = pushClosedTab([], sessionTab("a"), 2)
-
-    expect(stack).toEqual([{ tab: sessionTab("a"), index: 2 }])
-  })
-
-  test("ignores draft tabs", () => {
-    const draft: Tab = { type: "draft", draftID: "d1", server, directory: "/tmp" }
-
-    expect(pushClosedTab([], draft, 0)).toEqual([])
-  })
-
-  test("caps the stack size", () => {
-    const stack = Array.from({ length: 30 }, (_, i) => i).reduce<ClosedTab[]>(
-      (acc, i) => pushClosedTab(acc, sessionTab(`s${i}`), i),
-      [],
-    )
-
-    expect(stack).toHaveLength(25)
-    expect(stack[0]?.tab.sessionId).toBe("s5")
-    expect(stack.at(-1)?.tab.sessionId).toBe("s29")
-  })
-
-  test("pops the most recently closed tab", () => {
-    const stack = [
-      { tab: sessionTab("a"), index: 0 },
-      { tab: sessionTab("b"), index: 1 },
-    ]
-    const result = takeClosedTab(stack, [])
-
-    expect(result.entry?.tab.sessionId).toBe("b")
-    expect(result.stack).toEqual([{ tab: sessionTab("a"), index: 0 }])
-  })
-
-  test("skips entries whose tab is already open", () => {
-    const stack = [
-      { tab: sessionTab("a"), index: 0 },
-      { tab: sessionTab("b"), index: 1 },
-    ]
-    const result = takeClosedTab(stack, [sessionTab("b")])
-
-    expect(result.entry?.tab.sessionId).toBe("a")
-    expect(result.stack).toEqual([])
-  })
-
-  test("returns no entry when everything is open or empty", () => {
-    expect(takeClosedTab([], []).entry).toBeUndefined()
-
-    const result = takeClosedTab([{ tab: sessionTab("a"), index: 0 }], [sessionTab("a")])
-    expect(result.entry).toBeUndefined()
-    expect(result.stack).toEqual([])
-  })
-
-  test("purges removed sessions", () => {
-    const stack = [
-      { tab: sessionTab("a"), index: 0 },
-      { tab: sessionTab("b"), index: 1 },
-    ]
-
-    expect(removeClosedTabs(stack, server, ["a"])).toEqual([{ tab: sessionTab("b"), index: 1 }])
-  })
-
-  test("does not navigate when a background tab closes", () => {
-    const tabs = [sessionTab("a"), sessionTab("b"), sessionTab("c")]
-
-    expect(nextTabAfterClose(tabs, 1, false)).toBeUndefined()
-    expect(nextTabAfterClose(tabs, 1, true)).toEqual(sessionTab("c"))
-    expect(nextTabAfterClose([sessionTab("a")], 0, true)).toBeNull()
-  })
-})
@@ -10,7 +10,6 @@ import { uuid } from "@/utils/uuid"
 import { SessionTabsRemovedDetail } from "@/components/titlebar-session-events"
 import { sessionHref } from "@/utils/session-route"
 import { createTabMemory } from "./tab-memory"
-import { nextTabAfterClose, pushClosedTab, removeClosedTabs, takeClosedTab, type ClosedTab } from "./closed-tabs"

 export type SessionTab = {
  type: "session"
@@ -28,11 +27,6 @@ export type DraftTab = {

 export type Tab = SessionTab | DraftTab

-export type TabInfo = {
-  title?: string
-  directory?: string
-}
-
 type RecentTab = {
  key?: string
 }
@@ -69,8 +63,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      createStore<Tab[]>([]),
    )
    const [recent, setRecent, , recentReady] = persisted(Persist.window("tabs.recent"), createStore<RecentTab>({}))
-    const [info, setInfo] = persisted(Persist.window("tabs.info"), createStore<Record<string, TabInfo>>({}))
-    const [closed, setClosed, , closedReady] = persisted(Persist.window("tabs.closed"), createStore<ClosedTab[]>([]))

    const params = useParams()
    const navigate = useNavigate()
@@ -95,28 +87,10 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      })
    }

-    const updateClosed = (update: (stack: ClosedTab[]) => ClosedTab[]) => {
-      const apply = () => setClosed((stack) => update(stack))
-      if (closedReady()) {
-        apply()
-        return
-      }
-      void closedReady.promise?.then(apply)
-    }
-
    const removeDraftPersisted = (draftID: string) => {
      for (const key of draftPersistedKeys()) removePersisted(Persist.draft(draftID, key), platform)
    }

-    const removeInfo = (key: string) => {
-      if (!info[key]) return
-      setInfo(
-        produce((draft) => {
-          delete draft[key]
-        }),
-      )
-    }
-
    onCleanup(memory.dispose)

    createEffect(() => {
@@ -125,26 +99,11 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      const next = store.filter((tab) => servers.has(tab.server))
      if (next.length !== store.length) {
        for (const tab of store) {
-          if (!servers.has(tab.server)) {
-            const key = tabKey(tab)
-            memory.remove(key)
-            removeInfo(key)
-          }
+          if (!servers.has(tab.server)) memory.remove(tabKey(tab))
        }
        setStore(() => next)
      }
      if (recent.key && !next.some((tab) => tabKey(tab) === recent.key)) setRecentKey(undefined)
-      const keys = new Set(next.map(tabKey))
-      for (const key of Object.keys(info)) {
-        if (!keys.has(key)) removeInfo(key)
-      }
-    })
-
-    createEffect(() => {
-      if (!closedReady()) return
-      const servers = new Set(server.list.map(ServerConnection.key))
-      const next = closed.filter((entry) => servers.has(entry.tab.server))
-      if (next.length !== closed.length) setClosed(() => next)
    })

    const navigateTab = (tab: Tab) => {
@@ -158,7 +117,7 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      if (!tab) return
      const key = tabKey(tab)
      const draftID = tab.type === "draft" ? tab.draftID : undefined
-      const nextTab = nextTabAfterClose(store, index, recentKey() === key && location.pathname !== "/")
+      const nextTab = store[index + 1] ?? store[index - 1]
      closing.add(key)
      void startTransition(() => {
        setStore(
@@ -166,14 +125,11 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
            tabs.splice(index, 1)
          }),
        )
-        if (nextTab === null) {
-          setRecentKey(undefined)
-          navigate("/")
-        }
+        if (recent.key === key) setRecentKey(nextTab && tabKey(nextTab))
        if (nextTab) navigateTab(nextTab)
+        else navigate("/")
      }).finally(() => closing.delete(key))
      memory.remove(key)
-      removeInfo(key)
      if (draftID) removeDraftPersisted(draftID)
    }

@@ -245,57 +201,23 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
        removeDraftPersisted(draftID)
      },
      removeTab,
-      // User-initiated close: records the tab so it can be reopened.
-      // Cleanup paths (missing sessions, archive, server removal) go through
-      // removeTab and friends directly and are not recorded.
-      closeTab(index: number) {
-        const tab = store[index]
-        if (!tab) return
-        if (tab.type === "session") updateClosed((stack) => pushClosedTab(stack, tab, index))
-        removeTab(index)
-      },
-      reopenClosedTab() {
-        if (!closedReady()) {
-          void closedReady.promise?.then(() => actions.reopenClosedTab())
-          return
-        }
-        const result = takeClosedTab(closed, store)
-        if (result.stack.length === closed.length) return
-        setClosed(() => result.stack)
-        const entry = result.entry
-        if (!entry) return
-        const index = Math.min(entry.index, store.length)
-        void startTransition(() => {
-          setStore(
-            produce((tabs) => {
-              if (tabs.some((item) => tabKey(item) === tabKey(entry.tab))) return
-              tabs.splice(index, 0, entry.tab)
-            }),
-          )
-          navigateTab(entry.tab)
-        })
-      },
      removeSessionTab(input: Omit<SessionTab, "type">) {
-        updateClosed((stack) => removeClosedTabs(stack, input.server, [input.sessionId]))
        const index = store.findIndex(
          (tab) => tab.type === "session" && tab.server === input.server && tab.sessionId === input.sessionId,
        )
        if (index !== -1) removeTab(index)
      },
      removeServer(key: ServerConnection.Key) {
-        updateClosed((stack) => stack.filter((entry) => entry.tab.server !== key))
        const drafts = store.flatMap((tab) => (tab.type === "draft" && tab.server === key ? [tab.draftID] : []))
        const removed = store.filter((tab) => tab.server === key).map(tabKey)
        setStore((tabs) => tabs.filter((tab) => tab.server !== key))
        for (const key of removed) memory.remove(key)
-        for (const key of removed) removeInfo(key)
        if (recent.key && removed.includes(recent.key)) setRecentKey(undefined)
        for (const draftID of drafts) removeDraftPersisted(draftID)
        if (server.key === key) navigate("/")
      },
      removeSessions: (input: SessionTabsRemovedDetail) => {
        const targetServer = input.server ?? server.key
-        updateClosed((stack) => removeClosedTabs(stack, targetServer, input.sessionIDs))
        const removed = store
          .filter(
            (tab) => tab.type === "session" && tab.server === targetServer && input.sessionIDs.includes(tab.sessionId),
@@ -343,14 +265,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
          if (recent.key && removed.includes(recent.key)) setRecentKey(undefined)
        })
        for (const key of removed) memory.remove(key)
-        for (const key of removed) removeInfo(key)
-      },
-      rememberSessionInfo(tab: SessionTab, session: Session) {
-        const key = tabKey(tab)
-        const next = { title: session.title, directory: session.directory }
-        const current = info[key]
-        if (current?.title === next.title && current.directory === next.directory) return
-        setInfo(key, next)
      },
      select: navigateTab,
      remember(tab: Tab) {
@@ -375,6 +289,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      },
    }

-    return { ...actions, store, info, ready, recentReady }
+    return { ...actions, store, ready, recentReady }
  },
 })
@@ -48,7 +48,6 @@ export const dict = {
  "command.session.new": "New session",
  "command.file.open": "Open file",
  "command.tab.close": "Close tab",
-  "command.tab.reopenClosed": "Reopen closed tab",
  "command.context.addSelection": "Add selection to context",
  "command.context.addSelection.description": "Add selected lines from the current file",
  "command.input.focus": "Focus input",
@@ -212,11 +211,6 @@ export const dict = {
  "model.input.video": "video",
  "model.input.pdf": "pdf",
  "model.tooltip.allows": "Allows: {{inputs}}",
-  "model.tooltip.context.label": "Context",
-  "model.tooltip.inputs": "Inputs",
-  "model.tooltip.model": "Model",
-  "model.tooltip.provider": "Provider",
-  "model.tooltip.reasoning": "Reasoning",
  "model.tooltip.reasoning.allowed": "Allows reasoning",
  "model.tooltip.reasoning.none": "No reasoning",
  "model.tooltip.context": "Context limit {{limit}}",
@@ -224,26 +224,7 @@

  [data-slot="model-selector-scroll"]::before {
    top: 0;
-    height: 12px;
-    background: linear-gradient(
-      180deg,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 80%, transparent) 0%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 78.3336%, transparent) 4.7%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 76.4824%, transparent) 8.9%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 74.368%, transparent) 12.8%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 71.9123%, transparent) 16.56%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 69.037%, transparent) 20.37%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 65.664%, transparent) 24.4%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 61.715%, transparent) 28.83%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 57.1117%, transparent) 33.84%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 51.776%, transparent) 39.6%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 45.6296%, transparent) 46.3%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 38.5944%, transparent) 54.1%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 30.592%, transparent) 63.2%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 21.5443%, transparent) 73.76%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 11.373%, transparent) 85.97%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 0%, transparent) 100%
-    );
+    background: linear-gradient(to bottom, var(--v2-background-bg-layer-01), transparent);
  }

  [data-slot="manage-models-scroll"]::before {
@@ -258,26 +239,7 @@

  [data-slot="model-selector-scroll"]::after {
    bottom: 0;
-    height: 12px;
-    background: linear-gradient(
-      0deg,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 80%, transparent) 0%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 78.3336%, transparent) 4.7%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 76.4824%, transparent) 8.9%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 74.368%, transparent) 12.8%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 71.9123%, transparent) 16.56%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 69.037%, transparent) 20.37%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 65.664%, transparent) 24.4%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 61.715%, transparent) 28.83%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 57.1117%, transparent) 33.84%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 51.776%, transparent) 39.6%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 45.6296%, transparent) 46.3%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 38.5944%, transparent) 54.1%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 30.592%, transparent) 63.2%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 21.5443%, transparent) 73.76%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 11.373%, transparent) 85.97%,
-      color-mix(in srgb, var(--v2-background-bg-layer-01) 0%, transparent) 100%
-    );
+    background: linear-gradient(to top, var(--v2-background-bg-layer-01), transparent);
  }

  @supports (animation-timeline: --home-projects-scroll) and (timeline-scope: --home-projects-scroll) {
@@ -1,10 +1,4 @@
 export { AppBaseProviders, AppInterface } from "./app"
-export { useLayout } from "./context/layout"
-export { useServerSDK } from "./context/server-sdk"
-export { useServerSync } from "./context/server-sync"
-export { useServer } from "./context/server"
-export { useTabs } from "./context/tabs"
-export { useProviders } from "./hooks/use-providers"
 export { ACCEPTED_FILE_EXTENSIONS, ACCEPTED_FILE_TYPES, filePickerFilters } from "./constants/file-picker"
 export { useCommand } from "./context/command"
 export { loadLocaleDict, normalizeLocale, type Locale } from "./context/language"
@@ -1,12 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { shouldOpenSessionInBackground } from "./home-session-open"
-
-describe("shouldOpenSessionInBackground", () => {
-  test("requires only the platform primary modifier", () => {
-    expect(shouldOpenSessionInBackground({ mac: true, meta: true, ctrl: false, shift: false, alt: false })).toBe(true)
-    expect(shouldOpenSessionInBackground({ mac: false, meta: false, ctrl: true, shift: false, alt: false })).toBe(true)
-    expect(shouldOpenSessionInBackground({ mac: true, meta: true, ctrl: false, shift: true, alt: false })).toBe(false)
-    expect(shouldOpenSessionInBackground({ mac: false, meta: false, ctrl: true, shift: false, alt: true })).toBe(false)
-    expect(shouldOpenSessionInBackground({ mac: false, meta: true, ctrl: false, shift: false, alt: false })).toBe(false)
-  })
-})
@@ -1,11 +0,0 @@
-export function shouldOpenSessionInBackground(input: {
-  mac: boolean
-  meta: boolean
-  ctrl: boolean
-  shift: boolean
-  alt: boolean
-}) {
-  if (input.shift || input.alt) return false
-  if (input.mac) return input.meta && !input.ctrl
-  return input.ctrl && !input.meta
-}
@@ -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 { useSettingsDialog } from "@/components/settings-dialog"
+import { useSettingsCommand } 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"
@@ -66,7 +66,6 @@ import { Persist, persisted } from "@/utils/persist"
 import { useMarked } from "@opencode-ai/ui/context/marked"
 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"

 const HOME_SESSION_LIMIT = 64
@@ -239,20 +238,6 @@ function useHomeSessionHeaderOpacity(groups: () => HomeSessionGroup[]) {
  return { setViewport, setContentRef, setHeaderRef, update, titleOpacity }
 }

-// Cmd+click on macOS (Ctrl+click elsewhere) opens a session tab in the
-// background without navigating, matching browser conventions.
-function isBackgroundOpen(event: MouseEvent) {
-  return shouldOpenSessionInBackground({
-    mac: typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform),
-    meta: event.metaKey,
-    ctrl: event.ctrlKey,
-    shift: event.shiftKey,
-    alt: event.altKey,
-  })
-}
-
-type OpenSessionOptions = { background?: boolean }
-
 export function NewHome() {
  const sync = useServerSync()
  const layout = useLayout()
@@ -267,7 +252,7 @@ export function NewHome() {
  const command = useCommand()
  const notification = useNotification()
  const marked = useMarked()
-  const openSettings = useSettingsDialog()
+  const openSettings = useSettingsCommand()
  let focusSessionSearch: (() => void) | undefined
  const [state, setState] = createStore({
    search: "",
@@ -392,11 +377,9 @@ export function NewHome() {
    setState("searchFocused", false)
  }

-  function selectSearchSession(session: Session, options?: OpenSessionOptions) {
-    openSession(session, options)
-    // Background opens keep the search visible so several results can be
-    // opened in a row.
-    if (!options?.background) closeSearch()
+  function selectSearchSession(session: Session) {
+    openSession(session)
+    closeSearch()
  }

  command.register("home", () => [
@@ -481,17 +464,13 @@ export function NewHome() {
      .forEach((directory) => state.project.markViewed(directory))
  }

-  function openSession(session: Session, options?: OpenSessionOptions) {
+  function openSession(session: Session) {
    const project = projectForSession(session, projects(), projectByID())
    const conn = focusedServer()
    if (!conn) return
    const directory = project?.worktree ?? session.directory
    const ctx = global.ensureServerCtx(conn)
    ctx.projects.open(directory)
-    if (options?.background) {
-      tabs.addSessionTab({ server: ServerConnection.key(conn), sessionId: session.id })
-      return
-    }
    ctx.projects.touch(directory)
    startTransition(() => {
      const tab = tabs.addSessionTab({ server: ServerConnection.key(conn), sessionId: session.id })
@@ -1151,7 +1130,7 @@ function HomeSessionSearch(props: {
  onInput: (value: string) => void
  onFocus: () => void
  onClose: () => void
-  onSelect: (session: Session, options?: OpenSessionOptions) => void
+  onSelect: (session: Session) => void
 }) {
  const language = useLanguage()
  const [store, setStore] = createStore({ active: "" })
@@ -1265,7 +1244,7 @@ function HomeSessionSearch(props: {
                                server={props.server}
                                selected={store.active === homeSessionSearchKey(record)}
                                onHighlight={() => setStore("active", homeSessionSearchKey(record))}
-                                onSelect={(session, options) => props.onSelect(session, options)}
+                                onSelect={(session) => props.onSelect(session)}
                              />
                            )}
                          </For>
@@ -1278,7 +1257,7 @@ function HomeSessionSearch(props: {
            </div>
          </div>
        </Show>
-        <label class="relative z-20 flex h-9 w-full items-center gap-2 rounded-[6px] bg-v2-background-bg-layer-02/60 py-1 pl-3 pr-2 text-v2-icon-icon-muted transition-[background-color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-02 focus-within:bg-v2-background-bg-layer-02">
+        <label class="relative z-20 flex h-9 w-full items-center gap-2 rounded-[6px] bg-v2-background-bg-layer-02/60 py-1 pl-3 pr-2 text-v2-icon-icon-muted transition-[background-color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-02">
          <IconV2 name="magnifying-glass" />
          <input
            ref={input}
@@ -1345,7 +1324,7 @@ function HomeSessionSearchResultRow(props: {
  server: ServerConnection.Key
  selected: boolean
  onHighlight: () => void
-  onSelect: (session: Session, options?: OpenSessionOptions) => void
+  onSelect: (session: Session) => void
 }) {
  const title = createMemo(() => sessionTitle(props.record.session.title) || props.record.session.id)
  const showProjectName = () => props.showProjectName && props.record.projectName
@@ -1366,7 +1345,7 @@ function HomeSessionSearchResultRow(props: {
        group: !!showProjectName(),
      }}
      onMouseEnter={() => props.onHighlight()}
-      onClick={(event) => props.onSelect(props.record.session, { background: isBackgroundOpen(event) })}
+      onClick={() => props.onSelect(props.record.session)}
    >
      <HomeSessionLeading
        project={props.record.project}
@@ -1410,7 +1389,7 @@ function HomeSessionRow(props: {
  record: HomeSessionRecord
  showProjectName: boolean
  server: ServerConnection.Key
-  openSession: (session: Session, options?: OpenSessionOptions) => void
+  openSession: (session: Session) => void
  archiveSession: (session: Session) => Promise<void>
 }) {
  const language = useLanguage()
@@ -1426,7 +1405,7 @@ function HomeSessionRow(props: {
        type="button"
        data-component="home-session-row"
        class={`${HOME_ROW} h-10 min-w-0 flex-1 gap-2 py-3 pl-3 pr-10`}
-        onClick={(event) => props.openSession(props.record.session, { background: isBackgroundOpen(event) })}
+        onClick={() => props.openSession(props.record.session)}
      >
        <HomeSessionLeading
          project={props.record.project}
@@ -6,13 +6,11 @@ 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))

@@ -1095,9 +1095,9 @@ export default function LegacyLayout(props: ParentProps) {

  function connectProvider() {
    const run = ++dialogRun
-    void import("@/components/dialog-connect-provider").then((x) => {
+    void import("@/components/dialog-select-provider").then((x) => {
      if (dialogDead || dialogRun !== run) return
-      void dialog.show(() => <x.DialogConnectProvider />)
+      dialog.show(() => <x.DialogSelectProvider />)
    })
  }

@@ -2,8 +2,8 @@ import { createMemo, type Accessor } from "solid-js"
 import { useGlobal } from "@/context/global"
 import { useNotification } from "@/context/notification"
 import { usePermission } from "@/context/permission"
-import { sessionPermissionRequest, sessionQuestionRequest } from "@/pages/session/composer/session-request-tree"
 import { ServerConnection } from "@/context/server"
+import { sessionPermissionRequest } from "@/pages/session/composer/session-request-tree"

 export function useSessionTabAvatarState(
  server: Accessor<ServerConnection.Key>,
@@ -26,20 +26,15 @@ export function useSessionTabAvatarState(
      return !permission.autoResponds(item, directory())
    })
  })
-  const hasQuestions = createMemo(() => {
-    const serverSync = sync()
-    if (!serverSync) return false
-    const [store] = serverSync.child(directory(), { bootstrap: false })
-    return !!sessionQuestionRequest(store.session, serverSync.session.data.question, sessionId())
+  const unread = createMemo(() => {
+    if (hasPermissions()) return true
+    if (!connection()) return false
+    return notification.ensureServerState(server()).session.unseenCount(sessionId()) > 0
  })
-  const needsAttention = createMemo(() => hasPermissions() || hasQuestions())
-  const unread = createMemo(
-    () => needsAttention() || notification.ensureServerState(server()).session.unseenCount(sessionId()) > 0,
-  )
  const loading = createMemo(() => {
    const serverSync = sync()
    if (!serverSync) return false
-    if (needsAttention()) return false
+    if (hasPermissions()) return false
    return serverSync.session.data.session_working(sessionId())
  })
  return { unread, loading }
@@ -1,11 +1,9 @@
 import { Show, createEffect, createMemo, createResource, 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 { 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,
@@ -17,15 +15,13 @@ import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
-import { useSettings } from "@/context/settings"
 import { createPromptInputController, createPromptProjectControls } from "@/pages/session/composer"
 import { useSessionKey } from "@/pages/session/session-layout"
 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"

-const workspaceBarEnabled = import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"
+const showWorkspaceBar = import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"

 /**
 * The `/new-session` draft page. Unlike `session.tsx`, this only renders the prompt
@@ -39,11 +35,11 @@ export default function NewSessionPage() {
  const serverSync = useServerSync()
  const comments = useComments()
  const language = useLanguage()
-  const settings = useSettings()
  const route = useSessionKey()
  const [searchParams, setSearchParams] = useSearchParams<{ draftId?: string; prompt?: string }>()

  useComposerCommands()
+  useSettingsCommand()

  let inputRef: HTMLDivElement | undefined

@@ -59,11 +55,8 @@ export default function NewSessionPage() {
  })

  const [store, setStore] = createStore<{ worktree?: string }>({})
-  const rightMount = useTitlebarRightMount()

-  const showWorkspaceBar = createMemo(() => workspaceBarEnabled && sync().project?.vcs === "git")
  const newSessionWorktree = createMemo(() => {
-    if (!showWorkspaceBar()) return "main"
    if (store.worktree) return store.worktree
    const project = sync().project
    if (project && sdk().directory !== project.worktree) return sdk().directory
@@ -99,19 +92,8 @@ export default function NewSessionPage() {

  return (
    <div class="relative size-full overflow-hidden flex flex-col">
-      <Show when={rightMount()}>
-        {(mount) => (
-          <Portal mount={mount()}>
-            <Show when={settings.visibility.status()}>
-              <Tooltip placement="bottom" value={language.t("status.popover.trigger")}>
-                <StatusPopoverV2 />
-              </Tooltip>
-            </Show>
-          </Portal>
-        )}
-      </Show>
      <div class="flex-1 min-h-0 flex flex-col gap-2 p-2">
-        <div class="@container relative flex flex-col min-h-0 h-full flex-1">
+        <div class="@container relative flex flex-col min-h-0 h-full bg-background-stronger flex-1">
          <div class="flex-1 min-h-0 overflow-hidden rounded-[10px]">
            <NewSessionDesignView>
              <div class={NEW_SESSION_CONTENT_WIDTH}>
@@ -123,7 +105,7 @@ export default function NewSessionPage() {
                    </div>
                  }
                >
-                  <div class="flex flex-col" classList={{ "gap-8": showWorkspaceBar(), "gap-3": !showWorkspaceBar() }}>
+                  <div class="flex flex-col" classList={{ "gap-8": showWorkspaceBar, "gap-3": !showWorkspaceBar }}>
                    <PromptInput
                      controls={inputController()}
                      variant="new-session"
@@ -143,15 +125,15 @@ export default function NewSessionPage() {
                      <div
                        class="flex min-h-7 min-w-0 items-center gap-0 text-v2-text-text-faint"
                        classList={{
-                          "flex-col justify-center sm:flex-row": showWorkspaceBar(),
-                          "justify-start": !showWorkspaceBar(),
+                          "flex-col justify-center sm:flex-row": showWorkspaceBar,
+                          "justify-start": !showWorkspaceBar,
                        }}
                      >
                        <PromptProjectSelector
                          controller={projectController}
-                          placement={showWorkspaceBar() ? "bottom" : "bottom-start"}
+                          placement={showWorkspaceBar ? "bottom" : "bottom-start"}
                        />
-                        <Show when={showWorkspaceBar()}>
+                        <Show when={showWorkspaceBar}>
                          <PromptWorkspaceSelector
                            value={newSessionWorktree()}
                            projectRoot={projectRoot()}
@@ -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 { useLocation, useNavigate, useParams, useSearchParams } from "@solidjs/router"
+import { Navigate, 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,6 +56,7 @@ 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,
@@ -63,20 +64,25 @@ import {
  createSessionComposerRegionController,
  SessionComposerRegion,
 } from "@/pages/session/composer"
-import { createOpenReviewFile, createSessionTabs, createSizing, shouldShowFileTree } from "@/pages/session/helpers"
+import {
+  createOpenReviewFile,
+  createSessionTabs,
+  createSizing,
+  focusTerminalById,
+  shouldFocusTerminalOnKeyDown,
+  shouldShowFileTree,
+} from "@/pages/session/helpers"
 import { MessageTimeline } from "@/pages/session/timeline/message-timeline"
 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 { 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"
 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 { TerminalPanel } from "@/pages/session/terminal-panel"
-import { TerminalPanelV2 } from "@/pages/session/terminal-panel-v2"
 import { useComposerCommands } from "@/pages/session/use-composer-commands"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
 import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll"
@@ -152,7 +158,7 @@ export function TargetSessionRouteContent() {
  )
 }

-export function SessionRouteErrorBoundary(
+function SessionRouteErrorBoundary(
  props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key; padded?: boolean }>,
 ) {
  const settings = useSettings()
@@ -220,6 +226,7 @@ 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))
@@ -246,11 +253,16 @@ function ResolvedTargetSessionRoute() {
          the terminal. Same-workspace tab switches keep it open because warm
          targets resolve synchronously from the sync cache. */}
      <Show when={directory()}>
-        <SDKProvider directory={targetDirectory}>
-          <DirectoryDataProvider directory={targetDirectory} server={serverKey}>
-            <TargetSessionPage />
-          </DirectoryDataProvider>
-        </SDKProvider>
+        <Show
+          when={settings.general.newLayoutDesigns()}
+          fallback={<Navigate href={legacySessionHref(directory()!, params.id)} />}
+        >
+          <SDKProvider directory={targetDirectory}>
+            <DirectoryDataProvider directory={targetDirectory} server={serverKey}>
+              <TargetSessionPage />
+            </DirectoryDataProvider>
+          </SDKProvider>
+        </Show>
      </Show>
    </TargetServerScopedProviders>
  )
@@ -422,12 +434,6 @@ export default function Page() {
  const isDesktop = createMediaQuery("(min-width: 768px)")
  const size = createSizing()
  const desktopReviewOpen = createMemo(() => isDesktop() && view().reviewPanel.opened())
-  const desktopV2ReviewOpen = createMemo(() => newSessionDesign() && desktopReviewOpen() && !!params.id)
-  const terminalOpen = createMemo(() => view().terminal.opened())
-  const desktopTerminalOpen = createMemo(() => isDesktop() && terminalOpen())
-  const desktopInlineTerminalOnlyOpen = createMemo(
-    () => newSessionDesign() && desktopTerminalOpen() && !desktopV2ReviewOpen(),
-  )
  const desktopFileTreeOpen = createMemo(
    () =>
      isDesktop() &&
@@ -436,23 +442,13 @@ export default function Page() {
        opened: layout.fileTree.opened(),
      }),
  )
-  const desktopSessionResizeOpen = createMemo(() =>
-    newSessionDesign() ? desktopV2ReviewOpen() || desktopTerminalOpen() : desktopReviewOpen(),
-  )
-  const desktopSidePanelOpen = createMemo(() => desktopSessionResizeOpen() || desktopFileTreeOpen())
+  const desktopSidePanelOpen = createMemo(() => desktopReviewOpen() || desktopFileTreeOpen())
  const sessionPanelWidth = createMemo(() => {
    if (!desktopSidePanelOpen()) return "100%"
-    if (desktopSessionResizeOpen()) return `${layout.session.width()}px`
+    if (desktopReviewOpen()) return `${layout.session.width()}px`
    return `calc(100% - ${layout.fileTree.width()}px)`
  })
  const centered = createMemo(() => isDesktop() && !desktopReviewOpen())
-  const desktopV2PanelLayout = createMemo(() =>
-    sessionPanelLayout({
-      review: desktopV2ReviewOpen(),
-      terminal: desktopTerminalOpen(),
-      files: desktopFileTreeOpen(),
-    }),
-  )

  function normalizeTab(tab: string) {
    if (!tab.startsWith("file://")) return tab
@@ -946,6 +942,12 @@ export default function Page() {
      return
    }

+    // Prefer the open terminal over the composer when it can take focus
+    if (view().terminal.opened()) {
+      const id = terminal.active()
+      if (id && shouldFocusTerminalOnKeyDown(event) && focusTerminalById(id)) return
+    }
+
    const key = scrollKey(event)
    if (key) {
      if (!scroller || !isScrollKeyTarget(target ?? null, key)) return
@@ -1014,6 +1016,7 @@ export default function Page() {
  }

  useComposerCommands()
+  useSettingsCommand()
  useSessionCommands({
    navigateMessageByOffset,
    setActiveMessage,
@@ -2103,7 +2106,7 @@ export default function Page() {
          classList={{
            "@container relative shrink-0 flex flex-col min-h-0 h-full flex-1 md:flex-none transition-[width]": true,
            "duration-[240ms] ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
-              !size.active() && !ui.reviewSnap && !desktopInlineTerminalOnlyOpen(),
+              !size.active() && !ui.reviewSnap,
          }}
          style={{
            width: sessionPanelWidth(),
@@ -2123,7 +2126,7 @@ export default function Page() {
            </SessionPanelFrame>
          )}

-          <Show when={desktopSessionResizeOpen()}>
+          <Show when={desktopReviewOpen()}>
            <div onPointerDown={() => size.start()}>
              <ResizeHandle
                classList={{
@@ -2142,84 +2145,22 @@ export default function Page() {
          </Show>
        </div>

-        <Show when={!newSessionDesign()}>
-          <SessionSidePanel
-            canReview={canReview}
-            diffs={reviewDiffs}
-            diffsReady={reviewReady}
-            empty={reviewEmptyText}
-            hasReview={hasReview}
-            reviewHasFocusableContent={hasReview}
-            reviewCount={reviewCount}
-            reviewPanel={reviewPanel}
-            activeDiff={tree.activeDiff}
-            focusReviewDiff={focusReviewDiff}
-            reviewSnap={ui.reviewSnap}
-            size={size}
-          />
-        </Show>
-        <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()),
-                  }}
-                >
-                  <SessionSidePanel
-                    canReview={canReview}
-                    diffs={reviewDiffs}
-                    diffsReady={reviewReady}
-                    empty={reviewEmptyText}
-                    hasReview={hasReview}
-                    reviewHasFocusableContent={() => hasReview() || reviewV2State.sidebarOpened()}
-                    reviewCount={reviewCount}
-                    reviewPanel={reviewPanelV2}
-                    activeDiff={tree.activeDiff}
-                    focusReviewDiff={focusReviewDiff}
-                    reviewSnap={ui.reviewSnap}
-                    size={size}
-                    stacked={desktopV2PanelLayout().stacked}
-                  />
-                </div>
-              </Show>
-              <Show when={desktopV2PanelLayout().stacked}>
-                <div class="relative h-2 shrink-0" onPointerDown={() => size.start()}>
-                  <ResizeHandle
-                    class="!relative !inset-auto !h-full !w-full !transform-none"
-                    direction="vertical"
-                    size={layout.terminal.height()}
-                    min={100}
-                    max={typeof window === "undefined" ? 600 : window.innerHeight * 0.6}
-                    collapseThreshold={50}
-                    onResize={(height) => {
-                      size.touch()
-                      layout.terminal.resize(height)
-                    }}
-                    onCollapse={() => view().terminal.close()}
-                  />
-                </div>
-              </Show>
-              <Show when={terminalOpen()}>
-                <div
-                  classList={{
-                    "min-h-0 shrink-0": desktopV2PanelLayout().stacked,
-                    "min-h-0 flex-1": !desktopV2PanelLayout().stacked,
-                  }}
-                >
-                  <TerminalPanelV2 stacked={desktopV2PanelLayout().stacked} />
-                </div>
-              </Show>
-            </div>
-          </Show>
-        </Show>
+        <SessionSidePanel
+          canReview={canReview}
+          diffs={reviewDiffs}
+          diffsReady={reviewReady}
+          empty={reviewEmptyText}
+          hasReview={hasReview}
+          reviewCount={reviewCount}
+          reviewPanel={() => (newSessionDesign() ? reviewPanelV2() : reviewPanel())}
+          activeDiff={tree.activeDiff}
+          focusReviewDiff={focusReviewDiff}
+          reviewSnap={ui.reviewSnap}
+          size={size}
+        />
      </div>

-      <Show when={!newSessionDesign()}>
-        <TerminalPanel />
-      </Show>
+      <TerminalPanel />
    </SessionRouteFrame>
  )
 }
@@ -7,6 +7,7 @@ import {
  createSessionTabs,
  focusTerminalById,
  getTabReorderIndex,
+  shouldFocusTerminalOnKeyDown,
  shouldShowFileTree,
 } from "./helpers"

@@ -94,6 +95,26 @@ describe("focusTerminalById", () => {
  })
 })

+describe("shouldFocusTerminalOnKeyDown", () => {
+  test("skips pure modifier keys", () => {
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Meta", metaKey: true }))).toBe(false)
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Control", ctrlKey: true }))).toBe(false)
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Alt", altKey: true }))).toBe(false)
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Shift", shiftKey: true }))).toBe(false)
+  })
+
+  test("skips shortcut key combos", () => {
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "c", metaKey: true }))).toBe(false)
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "c", ctrlKey: true }))).toBe(false)
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "ArrowLeft", altKey: true }))).toBe(false)
+  })
+
+  test("keeps plain typing focused on terminal", () => {
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "a" }))).toBe(true)
+    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "A", shiftKey: true }))).toBe(true)
+  })
+})
+
 describe("getTabReorderIndex", () => {
  test("returns target index for valid drag reorder", () => {
    expect(getTabReorderIndex(["a", "b", "c"], "a", "c")).toBe(2)
@@ -98,6 +98,13 @@ export const focusTerminalById = (id: string) => {
  return true
 }

+const skip = new Set(["Alt", "Control", "Meta", "Shift"])
+
+export const shouldFocusTerminalOnKeyDown = (event: Pick<KeyboardEvent, "key" | "ctrlKey" | "metaKey" | "altKey">) => {
+  if (skip.has(event.key)) return false
+  return !(event.ctrlKey || event.metaKey || event.altKey)
+}
+
 export const createOpenReviewFile = (input: {
  showAllFiles: () => void
  tabForPath: (path: string) => string
@@ -1,19 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { sessionPanelLayout } from "./session-panel-layout"
-
-describe("sessionPanelLayout", () => {
-  test("keeps one V2 owner while changing panel geometry", () => {
-    expect(sessionPanelLayout({ review: false, terminal: false, files: false })).toEqual({
-      visible: false,
-      stacked: false,
-    })
-    expect(sessionPanelLayout({ review: false, terminal: true, files: false })).toEqual({
-      visible: true,
-      stacked: false,
-    })
-    expect(sessionPanelLayout({ review: true, terminal: true, files: false })).toEqual({
-      visible: true,
-      stacked: true,
-    })
-  })
-})
@@ -1,6 +0,0 @@
-export function sessionPanelLayout(input: { review: boolean; terminal: boolean; files: boolean }) {
-  return {
-    visible: input.review || input.terminal || input.files,
-    stacked: input.review && input.terminal,
-  }
-}
@@ -14,9 +14,6 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"

 import FileTree from "@/components/file-tree"
 import { SessionContextUsage } from "@/components/session-context-usage"
-
-const reviewTabID = "session-side-panel-review-tab"
-const reviewTabPanelID = "session-side-panel-review-tabpanel"
 import { SessionContextTab, SortableTab, FileVisual } from "@/components/session"
 import { useCommand } from "@/context/command"
 import { useFile, type SelectedLineRange } from "@/context/file"
@@ -48,14 +45,12 @@ export function SessionSidePanel(props: {
  diffsReady: () => boolean
  empty: () => string
  hasReview: () => boolean
-  reviewHasFocusableContent: () => boolean
  reviewCount: () => number
  reviewPanel: () => JSX.Element
  activeDiff?: string
  focusReviewDiff: (path: string) => void
  reviewSnap: boolean
  size: Sizing
-  stacked?: boolean
 }) {
  const layout = useLayout()
  const settings = useSettings()
@@ -79,7 +74,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"
@@ -160,10 +154,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()

@@ -229,10 +219,8 @@ export function SessionSidePanel(props: {
        aria-label={language.t("session.panel.reviewAndFiles")}
        aria-hidden={!open()}
        inert={!open()}
-        class="relative min-w-0 flex overflow-hidden bg-background-base"
+        class="relative min-w-0 h-full flex shrink-0 overflow-hidden bg-background-base"
        classList={{
-          "h-full shrink-0": !props.stacked,
-          "h-full min-h-0": props.stacked,
          "pointer-events-none": !open(),
          "transition-[width] duration-[240ms] ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
            !props.size.active() && !props.reviewSnap,
@@ -241,7 +229,7 @@ export function SessionSidePanel(props: {
        }}
        style={{ width: panelWidth() }}
      >
-        <Show when={rendered()}>
+        <Show when={open()}>
          <div
            class="size-full flex"
            classList={{
@@ -274,11 +262,7 @@ export function SessionSidePanel(props: {
                        }}
                      >
                        <Show when={reviewTab() && props.canReview()}>
-                          <Tabs.Trigger
-                            value="review"
-                            id={reviewTabID}
-                            aria-controls={activeTab() === "review" ? reviewTabPanelID : undefined}
-                          >
+                          <Tabs.Trigger value="review">
                            <div class="flex items-center gap-1.5">
                              <div>{language.t("session.tab.review")}</div>
                              <Show when={props.hasReview()}>
@@ -341,20 +325,10 @@ export function SessionSidePanel(props: {
                      </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()}
-                      </div>
+                    <Show when={reviewTab() && props.canReview()}>
+                      <Tabs.Content value="review" class="flex flex-col h-full overflow-hidden contain-strict">
+                        <Show when={reviewOpen() && activeTab() === "review"}>{props.reviewPanel()}</Show>
+                      </Tabs.Content>
                    </Show>

                    <Tabs.Content value="empty" class="flex flex-col h-full overflow-hidden contain-strict">
@@ -1,366 +0,0 @@
-import { For, Show, createEffect, createMemo, on, onCleanup, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
-import { makeEventListener } from "@solid-primitives/event-listener"
-import { createMediaQuery } from "@solid-primitives/media"
-import { DragDropProvider, PointerSensor } from "@dnd-kit/solid"
-import { isSortable } from "@dnd-kit/solid/sortable"
-import { Accessibility, AutoScroller, Feedback, PointerActivationConstraints } from "@dnd-kit/dom"
-import { RestrictToHorizontalAxis } from "@dnd-kit/abstract/modifiers"
-import { RestrictToElement } from "@dnd-kit/dom/modifiers"
-import { Tabs } from "@opencode-ai/ui/tabs"
-import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { TooltipKeybind } from "@opencode-ai/ui/tooltip"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
-import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
-
-import { SortableTerminalTabV2 } from "@/components/session/session-sortable-terminal-tab-v2"
-import { Terminal } from "@/components/terminal"
-import { useCommand } from "@/context/command"
-import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
-import { useSettings } from "@/context/settings"
-import { useTerminal } from "@/context/terminal"
-import { useSDK } from "@/context/sdk"
-import { terminalTabLabel } from "@/pages/session/terminal-label"
-import { createSizing, focusTerminalById } from "@/pages/session/helpers"
-import { getTerminalHandoff, setTerminalHandoff } from "@/pages/session/handoff"
-import { useSessionLayout } from "@/pages/session/session-layout"
-
-export function TerminalPanelV2(props: { stacked?: boolean } = {}) {
-  const delays = [120, 240]
-  const layout = useLayout()
-  const terminal = useTerminal()
-  const sdk = useSDK()
-  const language = useLanguage()
-  const command = useCommand()
-  const settings = useSettings()
-  const { workspaceKey, view } = useSessionLayout()
-
-  const isDesktop = createMediaQuery("(min-width: 768px)")
-  const newLayout = createMemo(() => settings.general.newLayoutDesigns())
-  const opened = createMemo(() => view().terminal.opened())
-  const size = createSizing()
-  const height = createMemo(() => layout.terminal.height())
-  const close = () => view().terminal.close()
-  let root: HTMLDivElement | undefined
-  let tabList: HTMLDivElement | undefined
-
-  const [store, setStore] = createStore({
-    autoCreated: false,
-    recovered: {} as Record<string, boolean>,
-    view: typeof window === "undefined" ? 1000 : (window.visualViewport?.height ?? window.innerHeight),
-  })
-
-  const max = () => store.view * 0.6
-  const pane = () => Math.min(height(), max())
-  const stacked = createMemo(() => isDesktop() && props.stacked)
-  const panelHeight = createMemo(() =>
-    isDesktop() ? (stacked() ? `${pane()}px` : "100%") : opened() ? `${pane()}px` : "0px",
-  )
-  const contentHeight = createMemo(() => (isDesktop() ? (stacked() ? `${pane()}px` : "100%") : `${pane()}px`))
-  const newTerminalKeybind = createMemo(() => command.keybindParts("terminal.new"))
-
-  onMount(() => {
-    if (typeof window === "undefined") return
-
-    const sync = () => setStore("view", window.visualViewport?.height ?? window.innerHeight)
-    const port = window.visualViewport
-
-    sync()
-    makeEventListener(window, "resize", sync)
-    if (port) makeEventListener(port, "resize", sync)
-  })
-
-  createEffect(() => {
-    if (!opened()) {
-      setStore("autoCreated", false)
-      return
-    }
-
-    if (!terminal.ready() || terminal.all().length !== 0 || store.autoCreated) return
-    terminal.new()
-    setStore("autoCreated", true)
-  })
-
-  createEffect(
-    on(
-      () => terminal.all().length,
-      (count, prevCount) => {
-        if (prevCount === undefined || prevCount <= 0 || count !== 0) return
-        if (!opened()) return
-        close()
-      },
-    ),
-  )
-
-  const focus = (id: string) => {
-    focusTerminalById(id)
-
-    const frame = requestAnimationFrame(() => {
-      if (!opened()) return
-      if (terminal.active() !== id) return
-      focusTerminalById(id)
-    })
-
-    const timers = delays.map((ms) =>
-      window.setTimeout(() => {
-        if (!opened()) return
-        if (terminal.active() !== id) return
-        focusTerminalById(id)
-      }, ms),
-    )
-
-    return () => {
-      cancelAnimationFrame(frame)
-      for (const timer of timers) clearTimeout(timer)
-    }
-  }
-
-  createEffect(
-    on(
-      () => [opened(), terminal.active()] as const,
-      ([next, id]) => {
-        if (!next || !id) return
-        const stop = focus(id)
-        onCleanup(stop)
-      },
-    ),
-  )
-
-  createEffect(() => {
-    if (opened()) return
-    const active = document.activeElement
-    if (!(active instanceof HTMLElement)) return
-    if (!root?.contains(active)) return
-    active.blur()
-  })
-
-  createEffect(() => {
-    const dir = sdk().directory
-    if (!dir) return
-    if (!terminal.ready()) return
-    language.locale()
-
-    setTerminalHandoff(
-      workspaceKey(),
-      terminal.all().map((pty) =>
-        terminalTabLabel({
-          title: pty.title,
-          titleNumber: pty.titleNumber,
-          t: language.t as (key: string, vars?: Record<string, string | number | boolean>) => string,
-        }),
-      ),
-    )
-  })
-
-  const handoff = createMemo(() => {
-    const dir = sdk().directory
-    if (!dir) return []
-    return getTerminalHandoff(workspaceKey()) ?? []
-  })
-
-  const all = terminal.all
-  const ids = createMemo(() => all().map((pty) => pty.id))
-
-  const recoverTerminal = (key: string, id: string, clone: (id: string) => Promise<void>) => {
-    if (store.recovered[key]) return
-    setStore("recovered", key, true)
-    void clone(id)
-  }
-
-  const terminalRecoveryKey = (pty: { id: string; title: string; titleNumber: number }) => {
-    return String(pty.titleNumber || pty.title || pty.id)
-  }
-
-  const markTerminalConnected = (key: string, id: string, trim: (id: string) => void) => {
-    setStore("recovered", key, false)
-    trim(id)
-  }
-
-  const handleTerminalDragEnd = () => {
-    const activeId = terminal.active()
-    if (!activeId) return
-    requestAnimationFrame(() => {
-      if (terminal.active() !== activeId) return
-      focusTerminalById(activeId)
-    })
-  }
-
-  return (
-    <aside
-      ref={root}
-      id="terminal-panel"
-      role="region"
-      aria-label={language.t("terminal.title")}
-      aria-hidden={!opened()}
-      inert={!opened()}
-      class="relative shrink-0 overflow-hidden bg-background-stronger"
-      classList={{
-        "w-full": !isDesktop() || stacked(),
-        "min-w-0 h-full flex-1": isDesktop() && opened() && !stacked(),
-        "w-0 h-full pointer-events-none": isDesktop() && !opened(),
-        "rounded-[10px] shadow-[var(--v2-elevation-raised)]": isDesktop() && newLayout(),
-        "transition-[height] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[height] motion-reduce:transition-none":
-          !isDesktop() && !size.active(),
-      }}
-      style={{ height: panelHeight() }}
-    >
-      <div classList={{ "md:hidden": !stacked(), hidden: stacked() }} onPointerDown={() => size.start()}>
-        <ResizeHandle
-          classList={{
-            "-top-1": newLayout(),
-          }}
-          direction="vertical"
-          size={pane()}
-          min={100}
-          max={max()}
-          collapseThreshold={50}
-          onResize={(next) => {
-            size.touch()
-            layout.terminal.resize(next)
-          }}
-          onCollapse={close}
-        />
-      </div>
-      <div
-        class="absolute inset-0 flex flex-col overflow-hidden"
-        classList={{
-          "border-t border-border-weak-base": opened() && !isDesktop(),
-          "border-t border-border-weaker-base": opened() && stacked() && !newLayout(),
-          "border-l border-border-weaker-base": opened() && isDesktop() && !newLayout(),
-          "pointer-events-none": !opened(),
-        }}
-        style={{ height: contentHeight() }}
-      >
-        <Show
-          when={terminal.ready()}
-          fallback={
-            <div class="flex flex-col h-full pointer-events-none">
-              <div class="h-10 flex items-center gap-2 px-2 border-b border-border-weaker-base bg-background-stronger overflow-hidden">
-                <For each={handoff()}>
-                  {(title) => (
-                    <div class="px-2 py-1 rounded-md bg-surface-base text-14-regular text-text-weak truncate max-w-40">
-                      {title}
-                    </div>
-                  )}
-                </For>
-                <div class="flex-1" />
-                <div class="text-text-weak pr-2">
-                  {language.t("common.loading")}
-                  {language.t("common.loading.ellipsis")}
-                </div>
-              </div>
-              <div class="flex-1 flex items-center justify-center text-text-weak">{language.t("terminal.loading")}</div>
-            </div>
-          }
-        >
-          <DragDropProvider
-            sensors={[
-              PointerSensor.configure({
-                activationConstraints: [new PointerActivationConstraints.Distance({ value: 4 })],
-                preventActivation: (event) =>
-                  event.target instanceof Element &&
-                  !!event.target.closest('[data-slot="tabs-trigger-close-button"], input, [contenteditable="true"]'),
-              }),
-            ]}
-            modifiers={[RestrictToHorizontalAxis, RestrictToElement.configure({ element: () => tabList ?? null })]}
-            plugins={(defaults) => [
-              ...defaults.filter((plugin) => plugin !== Accessibility),
-              AutoScroller.configure({ acceleration: 8, threshold: { x: 0.05, y: 0 } }),
-              Feedback.configure({ dropAnimation: null }),
-            ]}
-            onDragEnd={(event) => {
-              const source = event.operation.source
-              if (!event.canceled && isSortable(source) && source.initialIndex !== source.index) {
-                terminal.move(source.id.toString(), source.index)
-              }
-              handleTerminalDragEnd()
-            }}
-          >
-            <div class="flex flex-col h-full">
-              <Tabs
-                variant={newLayout() ? "normal" : "alt"}
-                value={terminal.active()}
-                onChange={(id) => terminal.open(id)}
-                class={newLayout() ? "!h-[52px] !flex-none" : "!h-auto !flex-none"}
-              >
-                <Tabs.List ref={tabList} class={newLayout() ? undefined : "h-10 border-b border-border-weaker-base"}>
-                  <For each={all()}>
-                    {(pty, index) => (
-                      <SortableTerminalTabV2 terminal={pty} index={index} newLayout={newLayout()} onClose={close} />
-                    )}
-                  </For>
-                  <div class="h-full flex items-center justify-center">
-                    <Show
-                      when={newLayout()}
-                      fallback={
-                        <TooltipKeybind
-                          title={language.t("command.terminal.new")}
-                          keybind={command.keybind("terminal.new")}
-                          class="flex items-center"
-                        >
-                          <IconButton
-                            icon="plus-small"
-                            variant="ghost"
-                            iconSize="large"
-                            onClick={terminal.new}
-                            aria-label={language.t("command.terminal.new")}
-                          />
-                        </TooltipKeybind>
-                      }
-                    >
-                      <TooltipV2
-                        value={
-                          <>
-                            {language.t("command.terminal.new")}
-                            <Show when={newTerminalKeybind().length > 0}>
-                              <KeybindV2 keys={newTerminalKeybind()} variant="neutral" />
-                            </Show>
-                          </>
-                        }
-                        placement="bottom"
-                        class="flex items-center"
-                      >
-                        <IconButton
-                          icon="plus-small"
-                          variant="ghost"
-                          iconSize="large"
-                          onClick={terminal.new}
-                          aria-label={language.t("command.terminal.new")}
-                        />
-                      </TooltipV2>
-                    </Show>
-                  </div>
-                </Tabs.List>
-              </Tabs>
-              <div class="flex-1 min-h-0 relative">
-                <Show when={opened() && terminal.active()} keyed>
-                  {(id) => {
-                    const ops = terminal.bind()
-                    return (
-                      <Show when={all().find((pty) => pty.id === id)}>
-                        {(pty) => (
-                          <div id={`terminal-wrapper-${id}`} class="absolute inset-0">
-                            <Terminal
-                              pty={pty()}
-                              autoFocus={opened()}
-                              class="!px-[14px]"
-                              onConnect={() => markTerminalConnected(terminalRecoveryKey(pty()), id, ops.trim)}
-                              onCleanup={ops.update}
-                              onConnectError={() => recoverTerminal(terminalRecoveryKey(pty()), id, ops.clone)}
-                            />
-                          </div>
-                        )}
-                      </Show>
-                    )
-                  }}
-                </Show>
-              </div>
-            </div>
-          </DragDropProvider>
-        </Show>
-      </div>
-    </aside>
-  )
-}
@@ -598,12 +598,8 @@ export function MessageTimeline(props: {

  const handleListPointerDown = (event: PointerEvent & { currentTarget: HTMLDivElement }) => {
    if (!prependLoading) clearPrependAnchor()
-    props.onMarkScrollGesture(event.target)
-  }
-
-  const handleListPointerMove = (event: PointerEvent) => {
-    if (event.buttons !== 1) return
-    props.onMarkScrollGesture(event.target)
+    if (event.target !== event.currentTarget) return
+    props.onMarkScrollGesture(event.currentTarget)
  }

  const handleListKeyDown = (event: KeyboardEvent & { currentTarget: HTMLDivElement }) => {
@@ -1360,7 +1356,6 @@ export function MessageTimeline(props: {
        onTouchEnd={handleListTouchEnd}
        onTouchCancel={handleListTouchEnd}
        onPointerDown={handleListPointerDown}
-        onPointerMove={handleListPointerMove}
        onKeyDown={handleListKeyDown}
        onScroll={handleListScroll}
        onClick={props.onAutoScrollInteraction}
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { AssistantMessage, Message, UserMessage } from "@opencode-ai/sdk/v2"
-import { isTimelineReady, loadOlderTimeline, selectUserMessages, selectVisibleUserMessages } from "./model"
+import { loadOlderTimeline, selectUserMessages, selectVisibleUserMessages } from "./model"

 const user = (id: string) => ({ id, role: "user" }) as UserMessage
 const assistant = (id: string) => ({ id, role: "assistant" }) as AssistantMessage
@@ -15,12 +15,6 @@ describe("timeline model", () => {
    expect(selectVisibleUserMessages(users)).toBe(users)
  })

-  test("waits for an assistant-only load to hydrate its user root", () => {
-    expect(isTimelineReady([assistant("msg_2")], true)).toBe(false)
-    expect(isTimelineReady([user("msg_1"), assistant("msg_2")], true)).toBe(true)
-    expect(isTimelineReady([], false)).toBe(true)
-  })
-
  test("loads exactly one opaque cursor page", async () => {
    let calls = 0
    const anchors: Array<string | boolean> = []
@@ -45,7 +45,7 @@ export function createTimelineModel(input: {
  })
  const ready = createMemo(() => {
    const id = input.sessionID()
-    return !id || isTimelineReady(sync().data.message[id], serverSync().session.history.loading(id))
+    return !id || sync().data.message[id] !== undefined
  })
  const userMessages = createMemo(() => selectUserMessages(messages()), emptyUserMessages, { equals: same })
  const visibleUserMessages = createMemo(
@@ -98,10 +98,6 @@ export function selectUserMessages(messages: Message[]) {
  return messages.filter((message): message is UserMessage => message.role === "user")
 }

-export function isTimelineReady(messages: Message[] | undefined, loading: boolean) {
-  return messages !== undefined && (messages.some((message) => message.role === "user") || !loading)
-}
-
 export function selectVisibleUserMessages(messages: UserMessage[], revertMessageID?: string) {
  if (!revertMessageID) return messages
  return messages.filter((message) => message.id < revertMessageID)
@@ -76,11 +76,9 @@ export function useUsageExceededDialogs() {
              setGoUpsellState(keys.lastSeenAt, Date.now())
              if (dontShowAgain) setGoUpsellState(keys.dontShow, Date.now())
              else {
-                void import("../../components/dialog-connect-provider").then((x) => {
-                  const controller = x.useProviderConnectController()
-                  controller.select("opencode-go")
-                  void dialog.show(() => <x.DialogConnectProvider controller={controller} />)
-                })
+                void import("../../components/dialog-connect-provider").then((x) =>
+                  dialog.show(() => <x.DialogConnectProvider provider="opencode-go" />),
+                )
              }
            }}
          />
@@ -18,6 +18,8 @@ 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 = {
@@ -46,6 +48,7 @@ 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()
@@ -266,14 +269,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
    view().terminal.open()
  }

-  const closeTerminal = () => {
-    const id = terminal.active()
-    if (!id) return
-    const last = terminal.all().length === 1
-    void terminal.close(id)
-    if (last) view().terminal.close()
-  }
-
  const chooseMcp = () => {
    void openDialog(
      () => import("@/components/dialog-select-mcp"),
@@ -416,9 +411,9 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
      title: language.t("command.session.new"),
      keybind: "mod+shift+s",
      slash: "new",
-      onSelect: (source) => {
-        if (settings.general.newLayoutDesigns()) {
-          command.trigger("tab.new", source)
+      onSelect: () => {
+        if (params.serverKey) {
+          sessionTabs.newDraft({ server: requireServerKey(params.serverKey), directory: sdk().directory })
          return
        }
        navigate(`/${params.dir}/session`)
@@ -523,14 +518,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
  ]

  const terminalCmds = () => [
-    terminalCommand({
-      id: "terminal.close",
-      title: language.t("terminal.close"),
-      keybind: "mod+w",
-      hidden: true,
-      when: (event) => event.target instanceof Element && !!event.target.closest('[data-component="terminal"]'),
-      onSelect: closeTerminal,
-    }),
    terminalCommand({
      id: "terminal.new",
      title: language.t("command.terminal.new"),
@@ -12,13 +12,6 @@ describe("reviewDiffKinds", () => {
    expect(kinds.get("src/b.ts")).toBe("del")
    expect(kinds.get("src")).toBe("mix")
  })
-
-  test("normalizes file and directory paths", () => {
-    const kinds = reviewDiffKinds([{ file: "\\src//lib/a.ts/", additions: 1, deletions: 1, status: "modified" }])
-
-    expect(kinds.get("src/lib/a.ts")).toBe("mix")
-    expect(kinds.get("src/lib")).toBe("mix")
-  })
 })

 describe("filterReviewFiles", () => {
@@ -1,11 +1,10 @@
 import type { SnapshotFileDiff, VcsFileDiff } from "@opencode-ai/sdk/v2"
 import type { Kind } from "@/components/file-tree-v2"
-import { normalizeFileTreeV2Path } from "@/components/file-tree-v2-model"

 export type RenderDiff = (SnapshotFileDiff & { file: string }) | VcsFileDiff

 export function normalizePath(p: string) {
-  return normalizeFileTreeV2Path(p)
+  return p.replaceAll("\\", "/").replace(/\/+$/, "")
 }

 export function filterRenderableDiff(value: SnapshotFileDiff | VcsFileDiff): value is RenderDiff {
@@ -203,6 +203,7 @@ function ReviewPanelV2Sidebar(props: {
          when={props.searching()}
          fallback={
            <FileTreeV2
+              path=""
              allowed={props.filteredFiles()}
              kinds={props.kinds()}
              draggable={false}
@@ -1,11 +1,9 @@
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import "@opencode-ai/ui/v2/file-tree-v2.css"
 import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
-import { createEffect, createMemo, createSignal, For, Show } from "solid-js"
+import { createEffect, For, Show } from "solid-js"
 import { kindChange, kindLabel, type Kind } from "@/components/file-tree-v2"
 import { normalizePath } from "@/pages/session/v2/review-diff-kinds"
-import { createVirtualizer, defaultRangeExtractor } from "@tanstack/solid-virtual"
-import { virtualScrollElement } from "@/components/virtual-scroll-element"

 // Drives the highlight/selection of the flat search-result list from the filter
 // input's keyboard events.
@@ -47,107 +45,62 @@ export function SessionFileListV2(props: {
 }) {
  const active = () => normalizePath(props.active ?? "")
  const highlighted = () => normalizePath(props.highlighted ?? "")
-  const normalized = createMemo(() => props.files.map(normalizePath))
-  const [root, setRoot] = createSignal<HTMLDivElement>()
-  const [focused, setFocused] = createSignal<string>()
-  const virtualizer = createVirtualizer<HTMLDivElement, HTMLDivElement>({
-    get count() {
-      return props.files.length
-    },
-    getScrollElement: () => virtualScrollElement(root()),
-    initialRect: { width: 0, height: 600 },
-    estimateSize: () => 28,
-    gap: 2,
-    overscan: 10,
-    get getItemKey() {
-      const files = props.files
-      return (index: number) => files[index] ?? index
-    },
-    rangeExtractor: (range) => {
-      const indexes = defaultRangeExtractor(range)
-      const path = focused()
-      const index = path ? props.files.indexOf(path) : -1
-      if (index < 0 || indexes.includes(index)) return indexes
-      return [...indexes, index].sort((a, b) => a - b)
-    },
-  })
+  let rootRef: HTMLDivElement | undefined

  createEffect(() => {
-    const index = normalized().indexOf(highlighted())
-    if (index < 0) return
+    highlighted()
+    if (!rootRef) return
    queueMicrotask(() => {
-      if (virtualizer.range && index >= virtualizer.range.startIndex && index <= virtualizer.range.endIndex) return
-      virtualizer.scrollToIndex(index, { align: "auto" })
+      const row = rootRef?.querySelector<HTMLElement>('[data-slot="file-tree-v2-row"][data-highlighted]')
+      row?.scrollIntoView({ block: "nearest" })
    })
  })
-  const virtualItemByKey = createMemo(
-    () => new Map(virtualizer.getVirtualItems().map((item) => [item.key, item] as const)),
-  )
-  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => item.key))

  return (
    <div
-      ref={setRoot}
+      ref={(el) => {
+        rootRef = el
+      }}
      data-component="file-tree-v2"
-      data-total-rows={props.files.length}
-      style={{ position: "relative", height: `${virtualizer.getTotalSize()}px` }}
    >
-      <For each={virtualRowKeys()}>
-        {(key) => {
-          const path = key as string
-          const value = normalizePath(path)
-          const selected = () => (highlighted() ? highlighted() === value : active() === value)
-          const highlightedRow = () => highlighted() === value
-          const kind = () => props.kinds?.get(value)
-          const directory = () => (value.includes("/") ? getDirectory(value) : undefined)
-          const filename = () => getFilename(value)
+      <For each={props.files}>
+        {(path) => {
+          const normalized = normalizePath(path)
+          const selected = () => {
+            if (highlighted()) return highlighted() === normalized
+            return active() === normalized
+          }
+          const highlightedRow = () => highlighted() === normalized
+          const kind = () => props.kinds?.get(normalized)
+          const directory = () => (normalized.includes("/") ? getDirectory(normalized) : undefined)
+          const filename = () => getFilename(normalized)
          return (
-            <Show when={virtualItemByKey().get(key)}>
-              {(item) => (
-                <div
-                  style={{
-                    position: "absolute",
-                    top: "0",
-                    left: "0",
-                    width: "100%",
-                    height: `${item().size}px`,
-                    transform: `translateY(${item().start}px)`,
-                  }}
-                >
-                  <button
-                    type="button"
-                    data-slot="file-tree-v2-row"
-                    data-path={path}
-                    data-selected={selected() ? "" : undefined}
-                    data-highlighted={highlightedRow() ? "" : undefined}
-                    style="padding-left: 8px"
-                    onFocus={() => setFocused(path)}
-                    onBlur={() => setFocused(undefined)}
-                    onClick={() => props.onFileClick(path)}
-                  >
-                    <span class="filetree-iconpair size-4">
-                      <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
-                      <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--mono" mono />
-                    </span>
-                    <span class="flex min-w-0 flex-1 items-center overflow-hidden whitespace-nowrap">
-                      <Show when={directory()}>
-                        {(value) => (
-                          <span class="text-12-medium text-text-muted truncate min-w-0 shrink">{value()}</span>
-                        )}
-                      </Show>
-                      <span class="text-12-medium text-text-base truncate min-w-0 shrink-0">{filename()}</span>
-                    </span>
-                    <Show when={kind()}>
-                      {(value) => (
-                        <span data-slot="file-tree-v2-change" data-change={kindChange(value())}>
-                          {kindLabel(value())}
-                        </span>
-                      )}
-                    </Show>
-                  </button>
-                </div>
-              )}
-            </Show>
+            <button
+              type="button"
+              data-slot="file-tree-v2-row"
+              data-selected={selected() ? "" : undefined}
+              data-highlighted={highlightedRow() ? "" : undefined}
+              style="padding-left: 8px"
+              onClick={() => props.onFileClick(path)}
+            >
+              <span class="filetree-iconpair size-4">
+                <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
+                <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--mono" mono />
+              </span>
+              <span class="flex min-w-0 flex-1 items-center overflow-hidden whitespace-nowrap">
+                <Show when={directory()}>
+                  {(value) => <span class="text-12-medium text-text-muted truncate min-w-0 shrink">{value()}</span>}
+                </Show>
+                <span class="text-12-medium text-text-base truncate min-w-0 shrink-0">{filename()}</span>
+              </span>
+              <Show when={kind()}>
+                {(value) => (
+                  <span data-slot="file-tree-v2-change" data-change={kindChange(value())}>
+                    {kindLabel(value())}
+                  </span>
+                )}
+              </Show>
+            </button>
          )
        }}
      </For>
@@ -27,21 +27,6 @@ test("reactive count updates preserve measured row sizes", () => {
  })
 })

-test("initial rect projects rows before a scroll element connects", () => {
-  createRoot((dispose) => {
-    const virtualizer = createVirtualizer<HTMLDivElement, HTMLDivElement>({
-      count: 100,
-      getScrollElement: () => null,
-      estimateSize: () => 28,
-      initialRect: { width: 0, height: 600 },
-      overscan: 10,
-    })
-
-    expect(virtualizer.getVirtualItems().length).toBeGreaterThan(0)
-    dispose()
-  })
-})
-
 test("logical scroll offset includes pending measurement adjustments", () => {
  createRoot((dispose) => {
    const virtualizer = createVirtualizer<HTMLDivElement, HTMLDivElement>({
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/cli",
-  "version": "1.17.15",
+  "version": "1.17.13",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -5,14 +5,6 @@
 - Keep Code Mode unaware of host session, channel, and conversation models. The hosting application supplies trusted execution scope around it.
 - Tool schemas are the model-facing Interface. Keep arguments minimal and natural to the operation; never add unrelated IDs as ambient capability tokens.

-## OpenAPI
-
- Generate an operation only when its transport semantics are supported; otherwise return a precise `skipped` reason.
- Never guess parameter serialization or malformed security semantics. Unsupported serialization is skipped and malformed security fails closed.
- Render unresolved schema constructs as `unknown`, never as invented TypeScript names.
- Keep network reads bounded and map expected encoding, transport, and decoding failures to model-safe `ToolError` values.
- Test supported behavior directly; do not reproduce adapter algorithms in tests.
-
 ## Future Design Notes

 - If a captured user-visible output channel returns (an earlier `output.text`/`output.file`/`output.image` API was removed from v1), keep `output` as its name, distinct from the program return value: `return` stays the structured result for the model, while `output.*` describes artifacts the host may render into a conversation or UI after execution. Keep this host-neutral and let applications decide how captured output is delivered. In v1, hosts collect media host-side (outside the sandbox) instead.
@@ -4,7 +4,7 @@ Effect-native confined code execution over explicit, schema-described tools.

 CodeMode lets a model write a small JavaScript program that can call only the tools supplied by the host. The program can sequence calls, transform plain data, branch, loop, and run independent calls in parallel without receiving ambient filesystem, process, network, module, or application authority.

-The package is currently private to this workspace. Its API is designed around one-shot and reusable execution:
+The package is currently private to this workspace. Its API is designed around three uses:

 ```ts
 // One execution
@@ -13,6 +13,9 @@ yield * CodeMode.execute({ tools, code })
 // A reusable runtime
 const runtime = CodeMode.make({ tools, limits })
 yield * runtime.execute(code)
+
+// One agent-facing code tool
+const codeTool = runtime.agentTool()
 ```

 ## Install
@@ -60,7 +63,7 @@ const result =
 `)
 ```

-`result` is always a `CodeMode.Result`. Program, validation, limit, and tool failures are returned as diagnostics rather than failing the Effect. Host interruption remains interruption.
+`result` is always an `ExecuteResult`. Program, validation, limit, and tool failures are returned as diagnostics rather than failing the Effect. Host interruption remains interruption.

 Successful result values are JSON-safe data. A program that returns `undefined`, including by reaching the end without `return`, produces `null`; nested `undefined` values are normalized to `null` as well.

@@ -83,8 +86,6 @@ const tool = Tool.make({

 The description and schemas are part of the model-visible tool contract. Keep descriptions concrete and put authorization in `run` or in the service it calls.

-Public tool types are grouped under the same namespace: `Tool.Definition`, `Tool.Options`, `Tool.SchemaType`, and `Tool.JsonSchema`.
-
 ### `CodeMode.execute`

 Use `CodeMode.execute` for a single execution:
@@ -115,32 +116,31 @@ const runtime = CodeMode.make({

 runtime.catalog() // structured tool descriptions
 runtime.instructions() // model-facing syntax and tool guide
-runtime.execute(source) // CodeMode.Result
+runtime.execute(source) // ExecuteResult
+runtime.agentTool() // { name, description, input, output, execute }
 ```

-`CodeMode.Input`, `CodeMode.Result`, `CodeMode.Success`, `CodeMode.Failure`, `CodeMode.Diagnostic`, and `CodeMode.DiagnosticKind` are both Effect schemas and their inferred TypeScript types. Hosts can combine `CodeMode.Input` and `CodeMode.Result` with `runtime.instructions()` and `runtime.execute()` when constructing a framework-specific agent tool.
-
-All other CodeMode types use the same namespace: `CodeMode.Options`, `CodeMode.ExecuteOptions`, `CodeMode.Runtime`, `CodeMode.ExecutionLimits`, `CodeMode.DiscoveryOptions`, `CodeMode.DataValue`, `CodeMode.ToolDescription`, and the `CodeMode.ToolCall*` observation types.
+`catalog`, `instructions`, and `agentTool` are projections of the same configured tool tree. `agentTool().description` is exactly `instructions()`.

 ### Results

 ```ts
-type Result = Success | Failure
+type ExecuteResult = ExecuteSuccess | ExecuteFailure

-interface Success {
+interface ExecuteSuccess {
  readonly ok: true
-  readonly value: CodeMode.DataValue
+  readonly value: Schema.Json
  readonly logs?: ReadonlyArray<string>
  readonly truncated?: boolean
-  readonly toolCalls: ReadonlyArray<CodeMode.ToolCall>
+  readonly toolCalls: ReadonlyArray<ToolCall>
 }

-interface Failure {
+interface ExecuteFailure {
  readonly ok: false
-  readonly error: CodeMode.Diagnostic
+  readonly error: Diagnostic
  readonly logs?: ReadonlyArray<string>
  readonly truncated?: boolean
-  readonly toolCalls: ReadonlyArray<CodeMode.ToolCall>
+  readonly toolCalls: ReadonlyArray<ToolCall>
 }
 ```

@@ -152,41 +152,16 @@ interface Failure {

 `onToolCallEnd` receives `{ index, name, input, durationMs, outcome, message? }` when an admitted call settles. `outcome` is `"success"` or `"failure"`; `message` is the model-safe failure message and is present only on failure. Interrupted calls (for example when the execution timeout fires) do not produce an end event. Both hooks are Effect-returning and must not fail.

-### OpenAPI tools
-
-`OpenAPI.fromSpec` turns an OpenAPI 3.x document into a tool subtree - one tool per operation. Dotted `operationId` values form namespaces such as `v2.session.get`. Missing IDs receive a flat method/path fallback such as `getUsersById`; names are sanitized and deduplicated. The host places the subtree under a key in its `tools` tree; that key is the model-visible namespace.
-
-```ts
-import { CodeMode, OpenAPI } from "@opencode-ai/codemode"
-import { Effect } from "effect"
-import { FetchHttpClient } from "effect/unstable/http"
-
-const api = OpenAPI.fromSpec({
-  spec: await Bun.file("openapi.json").json(), // parsed document (no YAML)
-  auth: {
-    resolve: ({ name, scopes, operation }) =>
-      name === "BearerAuth" ? Effect.succeed({ type: "bearer", token }) : Effect.succeed(undefined),
-  },
-})
-
-const runtime = CodeMode.make({ tools: { opencode: api.tools } })
-const result = await Effect.runPromise(runtime.execute(code).pipe(Effect.provide(FetchHttpClient.layer)))
-```
-
-`fromSpec` is synchronous and returns `{ tools, skipped }`. The initial adapter supports query `form`/`deepObject`, path/header `simple`, JSON request bodies, JSON responses, and text responses; unsupported parameter encodings, non-JSON request bodies, binary responses, and streaming operations land in `skipped` instead of producing broken tools. Operation and path servers take precedence over document servers unless `baseUrl` explicitly overrides all of them. Tool inputs flatten path, query, header, and closed object-body fields into one model-facing object while retaining their HTTP locations internally. Cross-location name collisions receive a location prefix such as `path_id` and `query_id`; composed, nullable, dictionary, conditionally-required, and non-object JSON bodies remain under `body`. Auth is never model-visible. Responses are limited to 50 MiB, and non-2xx responses become safe tool failures carrying the status and a size-capped body summary. Deferred capabilities are tracked in `src/openapi/TODO.md`.
-
-Supported bearer, basic, header, and query authentication follows OpenAPI `security` semantics and is resolved host-side via `auth.resolve` - credential storage, OAuth flows, and token refresh never enter the compiler. Cookie authentication alternatives are discarded; an operation is skipped when it has no supported alternative. See the option docstrings in `src/openapi/types.ts` for the full semantics. Generated tools require `HttpClient.HttpClient` (from `effect/unstable/http`) in the Effect environment - provide `FetchHttpClient.layer` or a custom/test client layer at execution. The supplied client owns redirect policy; credentialed hosts should reject redirects or strip credentials when the origin changes.
-
 ## Discovery

-The agent-tool instructions use a budgeted catalog. Every tool namespace is always listed with its tool count regardless of budget, and as many complete, JSDoc-annotated tool signatures (each with a one-line description) as fit an estimated-token budget are inlined. Schema field descriptions and tags are part of each signature's measured cost. Selection is round-robin across namespaces for fairness: in each round (namespaces alphabetical), every namespace still holding un-inlined tools attempts to place its next-cheapest signature against the shared budget, and a namespace whose next signature does not fit drops out while the others keep going - so every namespace gets some representation before any namespace gets everything. The instructions state exactly how comprehensive the list is, both overall (`COMPLETE list` vs `PARTIAL - N of M shown`) and per namespace (`(3 tools)`, `(3 tools, 1 shown)`, `(3 tools, none shown)`).
+The agent-tool instructions use a budgeted catalog. Every tool namespace is always listed with its tool count regardless of budget, and as many complete tool signatures (each with a one-line description) as fit an estimated-token budget are inlined. Selection is round-robin across namespaces for fairness: in each round (namespaces alphabetical), every namespace still holding un-inlined tools attempts to place its next-cheapest signature line against the shared budget, and a namespace whose next line does not fit drops out while the others keep going - so every namespace gets some representation before any namespace gets everything. The instructions state exactly how comprehensive the list is, both overall (`COMPLETE list` vs `PARTIAL - N of M shown`) and per namespace (`(3 tools)`, `(3 tools, 1 shown)`, `(3 tools, none shown)`).

-The catalog-entry budget defaults to 2,000 estimated tokens (characters / 4, the same heuristic OpenCode uses). It applies only to full tool entries shown in the catalog; fixed instructions and namespace summaries are not counted. Override it when constructing a runtime:
+The default budget is 2,000 estimated tokens (characters / 4, the same heuristic OpenCode uses). Override it when constructing a runtime:

 ```ts
 const runtime = CodeMode.make({
  tools,
-  discovery: { catalogBudget: 6_000 },
+  discovery: { maxInlineCatalogTokens: 6_000 },
 })
 ```

@@ -199,37 +174,30 @@ const matches = await tools.$codemode.search({
  query: "order status",
  namespace: "orders", // optional: scope to one top-level namespace
  limit: 10,
-  offset: 0,
 })
 ```

-`search` performs deterministic, additive field-weighted matching. The query is tokenized (camelCase boundaries split; every non-alphanumeric character is a separator; empties and `*` are dropped), and each term scores every tool: exact path or path-segment match (20), path substring (8), description substring (4), and searchable-text substring (2). Each term also carries naive singular variants (trailing `s`/`es` stripped), and a field check passes when the term or any variant matches - so a plural query term (`issues`) still finds a tool whose text only says `issue`, without changing the weights. The searchable text also includes the input schema's property names and their description strings, so a query naming a parameter finds its tool, and substring matching means partial words match. Scores sum across terms; matches are sorted by score (ties broken alphabetically by path), then sliced from the zero-based `offset` (default 0) to the configured `limit` (default 10). `remaining` counts matches after the current page. `next` is `{ offset }` when another page exists and `null` on the final page; spread it into the original request to preserve its query, namespace, and limit.
+`search` performs deterministic, additive field-weighted matching. The query is tokenized (camelCase boundaries split; every non-alphanumeric character is a separator; empties and `*` are dropped), and each term scores every tool: exact path or path-segment match (20), path substring (8), description substring (4), and searchable-text substring (2). Each term also carries naive singular variants (trailing `s`/`es` stripped), and a field check passes when the term or any variant matches - so a plural query term (`issues`) still finds a tool whose text only says `issue`, without changing the weights. The searchable text also includes the input schema's property names and their description strings, so a query naming a parameter finds its tool, and substring matching means partial words match. Scores sum across terms; matches are sorted by score (ties broken alphabetically by path) and capped at `limit` results (default 10).

-```ts
-const request = { query: "order status", namespace: "orders", limit: 10 }
-const page = await tools.$codemode.search(request)
-const nextPage = page.next ? await tools.$codemode.search({ ...request, ...page.next }) : undefined
-```
-
-Each result contains the path, description, and the same generated TypeScript signature used by the inline catalog, so no second lookup is needed. Signatures use the JSDoc-annotated multiline form: each described input/output field carries its schema `description` as a `/** ... */` comment, and constraints TypeScript cannot express ride along as tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`).
+Each result contains the path, description, and generated TypeScript signature, so no second lookup is needed. The result signature is the pretty, JSDoc-annotated multiline form: each described input/output field carries its schema `description` as a `/** ... */` comment, and constraints TypeScript cannot express ride along as tags (`@deprecated`, `@default`, `@format`, `@minItems`, `@maxItems`). The inline catalog in the instructions keeps the compact single-line form.

 ```ts
 tools.github.list_issues(input: {
  /** Repository owner */
-  owner: string,
+  owner: string
  /** Cursor from the previous response's pageInfo */
-  after?: string,
+  after?: string
  /**
   * Results per page
   * @default 30
   */
-  perPage?: number,
+  perPage?: number
 }): Promise<unknown>
 ```

 Result paths are rendered as JavaScript expressions rooted at `tools` (`tools.orders.lookup`, or `tools.context7["resolve-library-id"]` for non-identifier segments), so each `path` is directly usable as the call site. An empty query browses the catalog alphabetically by path; combined with `namespace` (`{ query: "", namespace: "orders" }`) it lists everything in that namespace. A query that names one tool path exactly (canonical path, `tools.`-prefixed path, or rendered JavaScript expression) is treated as a lookup and returns that tool alone.

-The instructions are structured markdown, ordered so the workflow sits at the top and the catalog at the bottom: a `## Workflow` section with numbered steps (find a tool via search when the catalog is partial, or pick from the inlined list when it is complete; call the exact path as-is; return only the needed fields), a `## Rules` section holding only guidance the workflow does not already cover (only listed/search-result Code Mode tools and internal runtime tools exist inside `tools`; filter and aggregate collections in code; narrow `Promise<unknown>` results at runtime; run independent calls through `Promise.all`; enumerate `tools` with `Object.keys`/`for...in`; browse a namespace and paginate search results when search is advertised), a short `## Language` section that identifies the runtime as a restricted JavaScript orchestration language and names its major unavailable capabilities, and the budgeted `## Available tools` catalog. Example call forms use explicit `<namespace>.<tool>`/`<field>` placeholders - never a real or fabricated tool name.
+The instructions are structured markdown, ordered so the workflow sits at the top and the catalog at the bottom: a `## Workflow` section with numbered steps (find a tool via search when the catalog is partial, or pick from the inlined list when it is complete; call the exact path as-is; `JSON.parse` string results; return only the needed fields), a `## Rules` section holding only guidance the workflow does not already cover (only listed/search-result tools exist inside `tools`; filter and aggregate collections in code; treat `Promise<unknown>` results as shapeless until verified; run independent calls through `Promise.all`; enumerate `tools` with `Object.keys`/`for...in`; browse a namespace via search when it is advertised), a short `## Syntax` section that assumes standard JavaScript and names only what is unusual (TypeScript annotations stripped; the data-boundary serialization of Date/Map/Set/RegExp) or missing (classes, generators, `for await...of`, `.then`/`.catch`/`.finally`), and the budgeted `## Available tools` catalog. Example call forms use explicit `<namespace>.<tool>`/`<field>` placeholders - never a real or fabricated tool name.

 A host cannot define its own `$codemode` top-level namespace.

@@ -241,15 +209,14 @@ CodeMode executes a deliberately bounded JavaScript subset. It supports:
 - `if`, conditional expressions, `switch`, `for`, `for...of` (arrays, strings, Maps, Sets), `for...in` (own keys of plain objects, index strings of arrays, and namespace/tool names of `tools` references - anything else is an error suggesting `for...of` or `Object.keys`, rather than real JS's surprising behavior of indices for strings and zero iterations for Maps/Sets), `while`, and `do...while`.
 - Arrow functions and function declarations with closures, defaults, rest parameters, and destructuring.
 - Optional chaining, nullish coalescing, templates, spread (arrays, strings, Maps, Sets), and `try`/`catch`.
- Common array, string, number, `Object`, `Math`, and `JSON` operations. Mutating array methods include `push`/`pop`/`shift`/`unshift`/`splice` (removes in place and returns the removed elements)/`fill`/`copyWithin`; array `keys`/`values`/`entries` return **arrays** (matching the Map/Set convention) and work with `for...of` and spread. String methods include `localeCompare` (locale/options arguments ignored), `normalize`, and the `trimLeft`/`trimRight` aliases. `Object.keys` also accepts arrays (index strings, as in JS) and tool references: `Object.keys(tools)` lists the top-level namespaces, including `$codemode`, and `Object.keys(tools.ns)` lists the names at that node (a callable tool enumerates as `[]`; an unknown path is an `UnknownTool` diagnostic). `Object.values`/`Object.entries` on a tool reference fail with a pointer at `Object.keys(tools)` and `tools.$codemode.search`.
+- Common array, string, number, `Object`, `Math`, and `JSON` operations. Mutating array methods include `push`/`pop`/`shift`/`unshift`/`splice` (removes in place and returns the removed elements)/`fill`/`copyWithin`; array `keys`/`values`/`entries` return **arrays** (matching the Map/Set convention) and work with `for...of` and spread. String methods include `localeCompare` (locale/options arguments ignored), `normalize`, and the `trimLeft`/`trimRight` aliases. `Object.keys` also accepts arrays (index strings, as in JS) and tool references: `Object.keys(tools)` lists the top-level namespaces and `Object.keys(tools.ns)` the names at that node (a callable tool enumerates as `[]`; an unknown path is an `UnknownTool` diagnostic). `Object.values`/`Object.entries` on a tool reference fail with a pointer at `Object.keys(tools)` and `tools.$codemode.search`.
 - `Date` - `Date.now()`/`Date.parse()`/`Date.UTC()`, `new Date(...)`, the getter methods, and date arithmetic/comparison via the time value. Dates stringify as ISO (`toString` included, for determinism across host timezones).
- Regular expressions - `/literals/` and `new RegExp(...)` with `test`/`exec` (stateful `lastIndex` for `g`), plus string `match`/`matchAll`/`replace`/`replaceAll`/`split`/`search` with patterns. Match results are arrays carrying `index` and named `groups` as own properties (`input` is omitted). `replace` and `replaceAll` accept function replacers with captures, offset, input, and named groups; callbacks run sequentially, may await tool calls, and have their results coerced to strings. Invalid patterns, invalid flags, and missing-`g` calls fail with catchable errors that say what was wrong and how to fix it (escaping hints, the exact `/pattern/g` to write). Patterns run on the host engine, so pathological backtracking is bounded only by the execution timeout.
+- Regular expressions - `/literals/` and `new RegExp(...)` with `test`/`exec` (stateful `lastIndex` for `g`), plus string `match`/`matchAll`/`replace`/`replaceAll`/`split`/`search` with patterns. Match results are arrays carrying `index` and named `groups` as own properties (`input` is omitted). Invalid patterns, invalid flags, and missing-`g` calls fail with catchable errors that say what was wrong and how to fix it (escaping hints, the exact `/pattern/g` to write). Patterns run on the host engine, so pathological backtracking is bounded only by the execution timeout. Function replacers are not supported.
 - `Map` and `Set` - construction from entries/arrays/strings, `get`/`set`/`add`/`has`/`delete`/`clear`/`size`/`forEach`, and `keys`/`values`/`entries` returning **arrays** (not iterators).
- URL helpers - `URL` resolution and mutation, linked `URLSearchParams`, `URL.canParse`/`URL.parse`, URI and URI-component encoding/decoding, and query parameter construction, lookup, mutation, sorting, callbacks, and materialization. URLSearchParams iteration methods return arrays, matching the Map/Set convention.
 - First-class promises - an un-awaited `tools.ns.tool(...)` is a promise value whose call starts immediately on a supervised fiber; `await` resolves it (awaiting a non-promise value is a no-op, and `return tools.ns.tool(...)` resolves like an async-function return). `Promise.all`, `Promise.allSettled`, and `Promise.race` accept any array mixing promises and plain values (built inline, beforehand, or via spread); `Promise.resolve`/`Promise.reject` construct settled promises. `Promise.allSettled` rejection reasons are the same plain `{ name?, message }` data a `catch` binding sees, and `Promise.race` interrupts its losing in-flight calls. At most 8 tool calls run concurrently. When a program completes, still-running un-awaited calls are awaited before the execution ends; a failure from a call that was never awaited surfaces as an unhandled-rejection diagnostic.
- `throw value` and `throw new Error(message)` for explicit program failure. `Error` (and `TypeError`/`RangeError`/`SyntaxError`/`ReferenceError`/`EvalError`/`URIError`) are real constructors, callable with or without `new`; error values are plain `{ name, message }` data that additionally satisfy `instanceof Error` (a specific type matches itself and `Error`, as in JS). Every caught failure - thrown errors, interpreter runtime errors, and tool failures - is `instanceof Error` in a `catch` block; a thrown non-error value (`throw "text"`) is not, matching JS. Caught failures carry the `name` the equivalent real-JS failure would have - `JSON.parse` and invalid regex patterns produce a `SyntaxError` (satisfying `instanceof SyntaxError`), an unknown identifier a `ReferenceError`, assigning to a constant a `TypeError`, a bad `normalize` form a `RangeError`; failures with no specific analogue (including tool failures) are named `"Error"`. `instanceof` also recognizes `Date`, `RegExp`, `Map`, `Set`, `URL`, `URLSearchParams`, `Array`, `Object`, and `Promise`; any other right-hand side is a catchable error.
+- `throw value` and `throw new Error(message)` for explicit program failure. `Error` (and `TypeError`/`RangeError`/`SyntaxError`/`ReferenceError`/`EvalError`/`URIError`) are real constructors, callable with or without `new`; error values are plain `{ name, message }` data that additionally satisfy `instanceof Error` (a specific type matches itself and `Error`, as in JS). Every caught failure - thrown errors, interpreter runtime errors, and tool failures - is `instanceof Error` in a `catch` block; a thrown non-error value (`throw "text"`) is not, matching JS. Caught failures carry the `name` the equivalent real-JS failure would have - `JSON.parse` and invalid regex patterns produce a `SyntaxError` (satisfying `instanceof SyntaxError`), an unknown identifier a `ReferenceError`, assigning to a constant a `TypeError`, a bad `normalize` form a `RangeError`; failures with no specific analogue (including tool failures) are named `"Error"`. `instanceof` also recognizes `Date`, `RegExp`, `Map`, `Set`, `Array`, `Object`, and `Promise`; any other right-hand side is a catchable error.

-Inside a program, standard-library values stay live everywhere: the internal data checkpoints (`Object.*` helpers, spread, coercion inputs) preserve the instances, so `Object.values({ d: date })[0].getTime()` and a spread copy of an object holding a Map keep working. Only at the host boundary (final result, tool arguments, `JSON.stringify`) do they serialize exactly as `JSON.stringify` would: Date and URL become strings (an invalid Date becomes `null`), while RegExp, Map, Set, and URLSearchParams become `{}`. Promise values never cross a data boundary: an un-awaited promise in a result or tool argument produces a diagnostic that says to await it, instead of serializing to `{}`.
+Inside a program, Date/RegExp/Map/Set values stay live everywhere: the internal data checkpoints (`Object.*` helpers, spread, coercion inputs) preserve the instances, so `Object.values({ d: date })[0].getTime()` and a spread copy of an object holding a Map keep working. Only at the host boundary (final result, tool arguments, `JSON.stringify`) do the four value types serialize exactly as `JSON.stringify` would: a Date becomes its ISO string (`null` when invalid) and RegExp/Map/Set become `{}`. Promise values never cross a data boundary: an un-awaited promise in a result or tool argument produces a diagnostic that says to await it, instead of serializing to `{}`.

 It does not expose `eval`, dynamic imports, modules, classes, generators, timers, host globals, prototype mutation, custom promise constructors (`new Promise`), promise chaining (`.then`/`.catch`/`.finally` - `await` with `try`/`catch` is the supported style), or arbitrary method calls. Unsupported syntax returns an `UnsupportedSyntax` diagnostic with a source location when available.

@@ -312,7 +279,7 @@ import { toolError } from "@opencode-ai/codemode"
 run: ({ id }) => (authorized(id) ? loadOrder(id) : Effect.fail(toolError("Order is unavailable")))
 ```

-Only the supplied message is model-visible. The optional cause is never returned in `CodeMode.Result`; hosts should perform any required internal logging before crossing this boundary.
+Only the supplied message is model-visible. The optional cause is never returned in `ExecuteResult`; hosts should perform any required internal logging before crossing this boundary.

 ## Authority Boundary

@@ -341,10 +308,12 @@ A program cannot gain authority through prose or generated code. It can only exe
 The public contract is guided by these equivalences:

 - `CodeMode.execute({ ...options, code })` is equivalent to `CodeMode.make(options).execute(code)`.
+- `CodeMode.make(options).agentTool().execute({ code })` is equivalent to `CodeMode.make(options).execute(code)`.
+- `CodeMode.make(options).agentTool().description` equals `CodeMode.make(options).instructions()`.
 - A tool implementation is not invoked unless its input has decoded successfully.
 - A tool result is not visible to the program unless its output has decoded and crossed the plain-data boundary successfully.
 - Unknown host failures do not become model-visible diagnostics; `ToolError` is the explicit safe-message channel.
- Host interruption remains interruption rather than a `CodeMode.Failure`.
+- Host interruption remains interruption rather than an `ExecuteFailure`.

 ## Non-Goals

@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/codemode",
-  "version": "1.17.15",
+  "version": "0.0.1",
  "description": "Effect-native confined code execution over schema-described tools",
  "private": true,
  "type": "module",
@@ -1,4 +1,21 @@
-export * as CodeMode from "./codemode.js"
-export * as Tool from "./tool.js"
-export * as OpenAPI from "./openapi/index.js"
-export { ToolError, toolError } from "./tool-error.js"
+export { ToolError, CodeMode, ExecuteInputSchema, ExecuteResultSchema, toolError } from "./codemode.js"
+export { Tool } from "./tool.js"
+export type { Definition as ToolDefinition, JsonSchema, ToolSchema } from "./tool.js"
+export type { ToolCallEnded, ToolCallHooks } from "./tool-runtime.js"
+export type {
+  AgentToolDefinition,
+  CodeModeOptions,
+  CodeModeRuntime,
+  DataValue,
+  Diagnostic,
+  DiagnosticKind,
+  DiscoveryOptions,
+  ExecuteFailure,
+  ExecuteOptions,
+  ExecuteResult,
+  ExecuteSuccess,
+  ExecutionLimits,
+  ToolCall,
+  ToolCallStarted,
+  ToolDescription,
+} from "./codemode.js"
@@ -1,201 +0,0 @@
-import type { SafeObject } from "../tool-runtime.js"
-import type { SandboxURL } from "../values.js"
-
-export type SourcePosition = {
-  line: number
-  column: number
-}
-
-export type SourceLocation = {
-  start: SourcePosition
-  end: SourcePosition
-}
-
-export type AstNode = {
-  type: string
-  loc?: SourceLocation
-  [key: string]: unknown
-}
-
-export type ProgramNode = AstNode & {
-  type: "Program"
-  body: Array<AstNode>
-}
-
-export type Binding = {
-  mutable: boolean
-  value: unknown
-  initialized?: boolean
-}
-
-export type StatementResult =
-  | { kind: "none" }
-  | { kind: "value"; value: unknown }
-  | { kind: "return"; value: unknown }
-  | { kind: "break" }
-  | { kind: "continue" }
-
-export type MemberReference = {
-  target: SafeObject | Array<unknown> | SandboxURL
-  key: string | number
-}
-
-export class CodeModeFunction {
-  constructor(
-    readonly parameters: ReadonlyArray<AstNode>,
-    readonly body: AstNode,
-    readonly capturedScopes: ReadonlyArray<Map<string, Binding>>,
-  ) {}
-}
-
-export class IntrinsicReference {
-  constructor(
-    readonly receiver: unknown,
-    readonly name: string,
-  ) {}
-}
-
-export class ComputedValue {
-  constructor(readonly value: unknown) {}
-}
-
-export class PromiseNamespace {}
-
-export type PromiseMethodName = "all" | "allSettled" | "race" | "resolve" | "reject"
-
-export class PromiseMethodReference {
-  constructor(readonly name: PromiseMethodName) {}
-}
-
-export type GlobalNamespaceName =
-  | "Object"
-  | "Math"
-  | "JSON"
-  | "Array"
-  | "console"
-  | "Date"
-  | "RegExp"
-  | "Map"
-  | "Set"
-  | "URL"
-  | "URLSearchParams"
-
-export class GlobalNamespace {
-  constructor(readonly name: GlobalNamespaceName) {}
-}
-
-export class GlobalMethodReference {
-  constructor(
-    readonly namespace: GlobalNamespaceName | "Number" | "String",
-    readonly name: string,
-  ) {}
-}
-
-export class CoercionFunction {
-  constructor(readonly name: "Number" | "String" | "Boolean" | "parseInt" | "parseFloat") {}
-}
-
-export class UriFunction {
-  constructor(readonly name: "encodeURI" | "encodeURIComponent" | "decodeURI" | "decodeURIComponent") {}
-}
-
-export class ProgramThrow {
-  constructor(readonly value: unknown) {}
-}
-
-export class ErrorConstructorReference {
-  constructor(readonly name: string) {}
-}
-
-export type DiagnosticKind =
-  | "ParseError"
-  | "UnsupportedSyntax"
-  | "UnknownTool"
-  | "InvalidToolInput"
-  | "InvalidToolOutput"
-  | "InvalidDataValue"
-  | "ToolCallLimitExceeded"
-  | "TimeoutExceeded"
-  | "ToolFailure"
-  | "ExecutionFailure"
-
-export const OptionalShortCircuit: unique symbol = Symbol("codemode.optional-short-circuit")
-
-export const supportedSyntaxMessage =
-  "Supported orchestration syntax: tools.* calls (they return promises - resolve them with await), data literals, destructuring, optional chaining, template literals, conditionals, switch, loops (incl. for...of and for...in over object/array/tools keys), arrow functions, spread, try/catch, array methods (map/filter/find/findIndex/some/every/reduce/flatMap/forEach/sort/slice/concat/indexOf/lastIndexOf/at/flat/reverse/includes/join), string methods (incl. match/matchAll/replace/split with regular expressions), Date/RegExp/Map/Set/URL/URLSearchParams, URI encoding helpers, Object/Math/JSON helpers, captured console.log/warn/error/dir/table, and Promise.all/allSettled/race/resolve/reject over arrays mixing promises and plain values for parallel tool calls (promise chaining with .then/.catch is not supported - use await with try/catch)."
-
-export class InterpreterRuntimeError extends Error {
-  readonly node?: AstNode
-  errorName: string = "Error"
-
-  constructor(
-    message: string,
-    node?: AstNode,
-    readonly kind: DiagnosticKind = "ExecutionFailure",
-    readonly suggestions?: ReadonlyArray<string>,
-  ) {
-    super(message)
-    this.name = "InterpreterRuntimeError"
-    if (node) this.node = node
-  }
-
-  as(errorName: string): this {
-    this.errorName = errorName
-    return this
-  }
-}
-
-export const unsupportedSyntax = (kind: string, node: AstNode): InterpreterRuntimeError =>
-  new InterpreterRuntimeError(
-    `Syntax '${kind}' is not supported in CodeMode. ${supportedSyntaxMessage}`,
-    node,
-    "UnsupportedSyntax",
-    [supportedSyntaxMessage],
-  )
-
-export const isRecord = (value: unknown): value is Record<string, unknown> =>
-  typeof value === "object" && value !== null
-
-export const asNode = (value: unknown, context: string): AstNode => {
-  if (!isRecord(value) || typeof value.type !== "string") {
-    throw new InterpreterRuntimeError(`Invalid AST node while reading ${context}.`)
-  }
-  return value as AstNode
-}
-
-export const getArray = (node: AstNode, key: string): Array<unknown> => {
-  const value = node[key]
-  if (!Array.isArray(value)) throw new InterpreterRuntimeError(`Expected '${key}' to be an array.`, node)
-  return value
-}
-
-export const getString = (node: AstNode, key: string): string => {
-  const value = node[key]
-  if (typeof value !== "string") throw new InterpreterRuntimeError(`Expected '${key}' to be a string.`, node)
-  return value
-}
-
-export const getBoolean = (node: AstNode, key: string): boolean => {
-  const value = node[key]
-  if (typeof value !== "boolean") throw new InterpreterRuntimeError(`Expected '${key}' to be a boolean.`, node)
-  return value
-}
-
-export const getOptionalNode = (node: AstNode, key: string): AstNode | undefined => {
-  const value = node[key]
-  if (value === undefined || value === null) return undefined
-  return asNode(value, key)
-}
-
-export const getNode = (node: AstNode, key: string): AstNode => asNode(node[key], key)
-
-export const sourceLocation = (node: AstNode): { readonly line: number; readonly column: number } => ({
-  line: Math.max(1, (node.loc?.start.line ?? 2) - 1),
-  column: Math.max(1, (node.loc?.start.column ?? 4) - 3),
-})
-
-export const formatLocation = (node?: AstNode): string => {
-  if (!node?.loc) return ""
-  const location = sourceLocation(node)
-  return ` (line ${location.line}, col ${location.column})`
-}
@@ -1,19 +0,0 @@
-# OpenAPI Follow-ups
-
-The initial adapter intentionally skips operations it cannot execute correctly. Future work may add:
-
- Cookie parameters, authentication, and cookie-header merging.
- Matrix, label, space-delimited, pipe-delimited, `allowReserved`, and parameter `content` serialization.
- External references and complete nested `$defs` support.
- Relative or templated server URLs and server variables.
- Base URLs containing query strings or fragments.
- Runtime response-schema validation and full content negotiation.
- Binary response values and explicit byte-oriented return types.
- Request/response projection for `readOnly` and `writeOnly` properties.
- SSE, WebSocket, and other streaming transports.
- Recovery of responses rejected by a status-filtering `HttpClient`.
- Configurable request and response size limits.
- Adapter-enforced redirect policy independent of the supplied `HttpClient`.
- Strict UTF-8 and empty-body validation for JSON responses.
- Compile-time rejection of parameter schemas with nested values unsupported by their serialization style; runtime rejects them before auth resolution.
- Complete malformed-security-scheme validation and broader auth-combination coverage.
@@ -1,130 +0,0 @@
-import { HttpClient } from "effect/unstable/http"
-import { make, type Definition } from "../tool.js"
-import { invoke } from "./runtime.js"
-import {
-  componentDefinitions,
-  inputSchema,
-  isRecord,
-  methods,
-  nonEmptyString,
-  operationInput,
-  operationOutput,
-  operationPath,
-  operationSecurityRequirements,
-  securityRequirements,
-  securitySchemes,
-  specServerUrl,
-  validateBaseUrl,
-} from "./spec.js"
-import type { Operation, Options, Result, Skipped, Tools } from "./types.js"
-
-export type {
-  AuthResolver,
-  Credential,
-  Document,
-  Operation,
-  Options,
-  Result,
-  SecurityScheme,
-  Skipped,
-  Tools,
-} from "./types.js"
-
-/**
- * Builds a CodeMode tool subtree from an OpenAPI 3.x document, one tool per
- * operation. Auth is resolved host-side via `auth.resolve` and never
- * model-visible. Tools require `HttpClient.HttpClient`; unrepresentable
- * operations land in `skipped`.
- */
-export const fromSpec = (options: Options): Result => {
-  const document = options.spec
-  const schemes = securitySchemes(document)
-  const defaultSecurity = securityRequirements(document.security)
-  const definitions = componentDefinitions(document)
-  const paths = isRecord(document.paths) ? document.paths : {}
-  const used = new Set<string>()
-  const namespaces = new Set<string>()
-  const skipped: Array<Skipped> = []
-  const tools = Object.create(null) as Tools
-
-  for (const [path, pathValue] of Object.entries(paths)) {
-    if (!isRecord(pathValue)) continue
-    for (const [method, operationValue] of Object.entries(pathValue)) {
-      if (!methods.has(method) || !isRecord(operationValue)) continue
-      const segments = operationPath(method, path, operationValue, used, namespaces)
-      const operation: Operation = {
-        operationId: nonEmptyString(operationValue.operationId),
-        method: method.toUpperCase(),
-        path,
-        summary: nonEmptyString(operationValue.summary),
-        description: nonEmptyString(operationValue.description),
-      }
-      const output = operationOutput(document, operationValue, definitions)
-      if (!output.ok) {
-        skipped.push({ method: operation.method, path, reason: output.reason })
-        continue
-      }
-
-      const resolvedBaseUrl = (() => {
-        if (options.baseUrl !== undefined) return validateBaseUrl(options.baseUrl)
-        if (operationValue.servers !== undefined) return specServerUrl(operationValue)
-        if (pathValue.servers !== undefined) return specServerUrl(pathValue)
-        return specServerUrl(document)
-      })()
-      if (!resolvedBaseUrl.ok) {
-        skipped.push({ method: operation.method, path, reason: resolvedBaseUrl.reason })
-        continue
-      }
-      const parsedInput = operationInput(document, pathValue, operationValue)
-      if (!parsedInput.ok) {
-        skipped.push({ method: operation.method, path, reason: parsedInput.reason })
-        continue
-      }
-      const input = parsedInput.value
-
-      const security = operationSecurityRequirements(operationValue.security, defaultSecurity, schemes)
-      if (!security.ok) {
-        skipped.push({ method: operation.method, path, reason: security.reason })
-        continue
-      }
-      const plan = {
-        operation,
-        url: `${resolvedBaseUrl.value.replace(/\/+$/, "")}${path}`,
-        fields: input.fields,
-        body: input.body,
-        security: security.value,
-        schemes,
-        auth: options.auth,
-        headers: options.headers ?? {},
-      }
-      used.add(segments.join("."))
-      for (const index of segments.slice(0, -1).keys()) namespaces.add(segments.slice(0, index + 1).join("."))
-      setTool(
-        tools,
-        segments,
-        make({
-          description: operation.description ?? operation.summary ?? `${operation.method} ${path}`,
-          input: inputSchema(input.fields, definitions),
-          output: output.value,
-          run: (input) => invoke(plan, input),
-        }),
-      )
-    }
-  }
-
-  return { tools, skipped }
-}
-
-const setTool = (tools: Tools, path: ReadonlyArray<string>, definition: Definition<HttpClient.HttpClient>): void => {
-  const [head, ...rest] = path
-  if (head === undefined) return
-  if (rest.length === 0) {
-    tools[head] = definition
-    return
-  }
-  const child = tools[head]
-  if (child === undefined || !isRecord(child) || child._tag === "CodeModeTool") {
-    tools[head] = Object.create(null) as Tools
-  }
-  setTool(tools[head] as Tools, rest, definition)
-}
@@ -1,326 +0,0 @@
-import { Effect, Option, Schema, Stream } from "effect"
-import { HttpClient, HttpClientRequest, HttpClientResponse, type HttpMethod } from "effect/unstable/http"
-import { ToolError, toolError } from "../tool-error.js"
-import { isRecord, own } from "./spec.js"
-import type { AppliedAuth, Credential, Plan, SecurityScheme } from "./types.js"
-
-const decodeJson = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)
-const maxErrorBodyChars = 1_024
-const maxResponseBodyBytes = 50 * 1024 * 1024
-
-export const invoke = (plan: Plan, input: unknown): Effect.Effect<unknown, unknown, HttpClient.HttpClient> =>
-  Effect.gen(function* () {
-    const value = isRecord(input) ? input : {}
-
-    let request = yield* buildRequest(plan, value)
-
-    const auth = yield* resolveAuth(plan)
-    for (const [name, item] of Object.entries(auth.query)) {
-      request = HttpClientRequest.setUrlParam(request, name, item)
-    }
-    request = HttpClientRequest.setHeaders(request, auth.headers)
-
-    const client = yield* HttpClient.HttpClient
-    const response = yield* client
-      .execute(request)
-      .pipe(
-        Effect.catch((cause) =>
-          Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} failed: transport error`, cause)),
-        ),
-      )
-    const text = yield* readResponseBody(response, plan)
-    const mediaType = response.headers["content-type"]?.split(";")[0]?.trim().toLowerCase()
-    const json = mediaType === "application/json" || mediaType?.endsWith("+json") === true
-    const decoded = text === "" ? Option.some(null) : json ? decodeJson(text) : Option.none()
-    const parsed = json ? Option.getOrElse(decoded, () => text) : text === "" ? null : text
-    if (response.status < 200 || response.status >= 300) {
-      const rendered = typeof parsed === "string" ? parsed : (JSON.stringify(parsed) ?? "")
-      const summary =
-        rendered === "" || rendered === "null"
-          ? "no response body"
-          : rendered.length > maxErrorBodyChars
-            ? `${rendered.slice(0, maxErrorBodyChars)}...`
-            : rendered
-      return yield* Effect.fail(
-        toolError(`${plan.operation.method} ${plan.operation.path} failed with HTTP ${response.status}: ${summary}`),
-      )
-    }
-    if (json && Option.isNone(decoded)) {
-      return yield* Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} returned malformed JSON.`))
-    }
-    return parsed
-  })
-
-const buildRequest = (
-  plan: Plan,
-  input: Readonly<Record<string, unknown>>,
-): Effect.Effect<HttpClientRequest.HttpClientRequest, ToolError> =>
-  Effect.gen(function* () {
-    // Validate every model-controlled value before auth resolution, which may refresh tokens.
-    const url = buildUrl(plan, input)
-    if (url instanceof ToolError) return yield* Effect.fail(url)
-    const missing = plan.fields.find(
-      (field) => field.required && field.location !== "path" && own(input, field.inputName) === undefined,
-    )
-    if (missing !== undefined) {
-      const label = missing.location === "body" ? "body field" : `${missing.location} parameter`
-      return yield* Effect.fail(toolError(`Missing required ${label} '${missing.inputName}'.`))
-    }
-
-    let request = HttpClientRequest.make(plan.operation.method as HttpMethod.HttpMethod)(url)
-    for (const field of plan.fields) {
-      if (field.location !== "query") continue
-      const item = own(input, field.inputName)
-      if (item === undefined) continue
-      const serialized = serializeQuery(request, field, item)
-      if (serialized instanceof ToolError) return yield* Effect.fail(serialized)
-      request = serialized
-    }
-
-    // Host headers first, then declared header parameters.
-    request = HttpClientRequest.setHeaders(request, plan.headers)
-    for (const field of plan.fields) {
-      if (field.location !== "header") continue
-      const item = own(input, field.inputName)
-      if (item === undefined) continue
-      const serialized = serializeSimple(field, item, String)
-      if (serialized instanceof ToolError) return yield* Effect.fail(serialized)
-      request = HttpClientRequest.setHeader(request, field.name, serialized)
-    }
-
-    const setBody = (value: unknown, mediaType: string) =>
-      HttpClientRequest.bodyJson(request, value).pipe(
-        Effect.map((next) => HttpClientRequest.setHeader(next, "content-type", mediaType)),
-        Effect.mapError((cause) =>
-          toolError(`Invalid JSON body for ${plan.operation.method} ${plan.operation.path}.`, cause),
-        ),
-      )
-    if (plan.body?.mode === "value") {
-      const field = plan.fields.find((field) => field.location === "body")
-      const body = field === undefined ? undefined : own(input, field.inputName)
-      if (body !== undefined) request = yield* setBody(body, plan.body.mediaType)
-    }
-    if (plan.body?.mode === "object") {
-      const entries = plan.fields.flatMap((field) => {
-        if (field.location !== "body") return []
-        const item = own(input, field.inputName)
-        return item === undefined ? [] : [[field.name, item] as const]
-      })
-      if (plan.body.required || entries.length > 0) {
-        request = yield* setBody(Object.fromEntries(entries), plan.body.mediaType)
-      }
-    }
-    return request
-  })
-
-const resolveAuth = (plan: Plan): Effect.Effect<AppliedAuth, unknown> =>
-  Effect.gen(function* () {
-    const none: AppliedAuth = { headers: {}, query: {} }
-    if (plan.security.length === 0) return none
-
-    const unavailable: Array<string> = []
-    alternatives: for (const requirement of plan.security) {
-      const names = Object.keys(requirement)
-      if (names.length === 0) return none
-      const credentials: Array<readonly [string, SecurityScheme, Credential]> = []
-      for (const name of names) {
-        const scheme = own(plan.schemes, name)
-        if (scheme === undefined || plan.auth === undefined) {
-          unavailable.push(name)
-          continue alternatives
-        }
-        const credential = yield* plan.auth.resolve({
-          name,
-          definition: scheme,
-          scopes: requirement[name] ?? [],
-          operation: plan.operation,
-        })
-        if (credential === undefined) {
-          unavailable.push(name)
-          continue alternatives
-        }
-        credentials.push([name, scheme, credential])
-      }
-      const applied = applyCredentials(credentials)
-      return applied instanceof ToolError ? yield* Effect.fail(applied) : applied
-    }
-
-    return yield* Effect.fail(
-      toolError(
-        `${plan.operation.method} ${plan.operation.path} requires authentication; no credential available for: ${[...new Set(unavailable)].join(", ")}.`,
-      ),
-    )
-  })
-
-const applyCredentials = (
-  credentials: ReadonlyArray<readonly [string, SecurityScheme, Credential]>,
-): AppliedAuth | ToolError => {
-  const headers = new Map<string, string>()
-  const query = new Map<string, string>()
-  const add = (carrier: "header" | "query", name: string, value: string): ToolError | undefined => {
-    const target = carrier === "header" ? headers : query
-    if (target.has(name)) return toolError(`Authentication resolves multiple credentials for ${carrier} '${name}'.`)
-    target.set(name, value)
-  }
-  for (const [name, definition, credential] of credentials) {
-    if (credential.type === "bearer") {
-      const duplicate = add("header", "authorization", `Bearer ${credential.token}`)
-      if (duplicate !== undefined) return duplicate
-      continue
-    }
-    if (credential.type === "basic") {
-      // Buffer instead of btoa: btoa throws on non-Latin-1 credentials.
-      const duplicate = add(
-        "header",
-        "authorization",
-        `Basic ${Buffer.from(`${credential.username}:${credential.password}`, "utf8").toString("base64")}`,
-      )
-      if (duplicate !== undefined) return duplicate
-      continue
-    }
-    if (credential.type === "header") {
-      const duplicate = add("header", credential.name.toLowerCase(), credential.value)
-      if (duplicate !== undefined) return duplicate
-      continue
-    }
-    // apiKey: the carrier comes from the scheme declaration.
-    if (definition.type !== "apiKey") {
-      return toolError(
-        `Security scheme '${name}' is not an apiKey scheme; resolve a bearer, basic, or header credential for it.`,
-      )
-    }
-    if (definition.in === "cookie") return toolError(`Cookie authentication '${name}' is not supported.`)
-    const parameter = definition.in === "header" ? definition.name.toLowerCase() : definition.name
-    const duplicate = add(definition.in, parameter, credential.value)
-    if (duplicate !== undefined) return duplicate
-  }
-  return { headers: Object.fromEntries(headers), query: Object.fromEntries(query) }
-}
-
-const buildUrl = (plan: Plan, input: Readonly<Record<string, unknown>>): string | ToolError => {
-  let url = plan.url
-  for (const field of plan.fields) {
-    if (field.location !== "path") continue
-    const item = own(input, field.inputName)
-    if (item === undefined) {
-      return toolError(`Missing required path parameter '${field.inputName}'.`)
-    }
-    const fieldValue = serializeSimple(field, item, (value) =>
-      encodeURIComponent(value).replace(
-        /[!'()*]/g,
-        (character) => `%${character.charCodeAt(0).toString(16).toUpperCase()}`,
-      ),
-    )
-    if (fieldValue instanceof ToolError) return fieldValue
-    // '.'/'..' survive encoding and URL normalization collapses them, letting a
-    // model-supplied value retarget the request to a different endpoint.
-    if (fieldValue === "" || fieldValue === "." || fieldValue === "..") {
-      return toolError(`Invalid path parameter '${field.inputName}'.`)
-    }
-    url = url.replaceAll(`{${field.name}}`, fieldValue)
-  }
-  const unresolved = url.match(/\{[^{}]+\}/)
-  if (unresolved !== null) return toolError(`Unresolved path parameter ${unresolved[0]}.`)
-  return url
-}
-
-const serializeSimple = (
-  field: Plan["fields"][number],
-  value: unknown,
-  encode: (value: string) => string,
-): string | ToolError => {
-  const scalar = (item: unknown): string | ToolError =>
-    item !== null && typeof item !== "string" && typeof item !== "number" && typeof item !== "boolean"
-      ? toolError(`Parameter '${field.inputName}' contains an unsupported nested value.`)
-      : encode(String(item))
-  if (Array.isArray(value)) {
-    const items = value.map(scalar)
-    const invalid = items.find((item): item is ToolError => item instanceof ToolError)
-    return invalid ?? items.join(",")
-  }
-  if (!isRecord(value)) return scalar(value)
-  const entries = Object.entries(value).flatMap<string | ToolError>(([name, item]) => {
-    const rendered = scalar(item)
-    if (rendered instanceof ToolError) return [rendered]
-    return field.explode ? [`${encode(name)}=${rendered}`] : [encode(name), rendered]
-  })
-  const invalid = entries.find((item): item is ToolError => item instanceof ToolError)
-  return invalid ?? entries.join(",")
-}
-
-const serializeQuery = (
-  request: HttpClientRequest.HttpClientRequest,
-  field: Plan["fields"][number],
-  value: unknown,
-): HttpClientRequest.HttpClientRequest | ToolError => {
-  if (field.style === "deepObject") {
-    if (!isRecord(value)) return toolError(`Deep-object parameter '${field.inputName}' must be an object.`)
-    return Object.entries(value).reduce<HttpClientRequest.HttpClientRequest | ToolError>((current, [name, item]) => {
-      if (current instanceof ToolError) return current
-      if (item === undefined || (item !== null && typeof item === "object")) {
-        return toolError(`Deep-object parameter '${field.inputName}' contains an unsupported nested value.`)
-      }
-      return HttpClientRequest.appendUrlParam(current, `${field.name}[${name}]`, String(item))
-    }, request)
-  }
-  if (Array.isArray(value)) {
-    const rendered = serializeSimple(field, value, String)
-    if (rendered instanceof ToolError) return rendered
-    if (!field.explode) return HttpClientRequest.appendUrlParam(request, field.name, rendered)
-    if (value.some((item) => item === undefined || (item !== null && typeof item === "object"))) {
-      return toolError(`Query parameter '${field.inputName}' contains an unsupported nested value.`)
-    }
-    return value.reduce((current, item) => HttpClientRequest.appendUrlParam(current, field.name, String(item)), request)
-  }
-  if (isRecord(value) && field.explode) {
-    return Object.entries(value).reduce<HttpClientRequest.HttpClientRequest | ToolError>((current, [name, item]) => {
-      if (current instanceof ToolError) return current
-      if (item === undefined || (item !== null && typeof item === "object")) {
-        return toolError(`Query parameter '${field.inputName}' contains an unsupported nested value.`)
-      }
-      return HttpClientRequest.appendUrlParam(current, name, String(item))
-    }, request)
-  }
-  const rendered = serializeSimple(field, value, String)
-  return rendered instanceof ToolError ? rendered : HttpClientRequest.appendUrlParam(request, field.name, rendered)
-}
-
-const readResponseBody = (
-  response: HttpClientResponse.HttpClientResponse,
-  plan: Plan,
-): Effect.Effect<string, ToolError> =>
-  Effect.gen(function* () {
-    const contentLength = response.headers["content-length"]
-    const parsedSize = contentLength === undefined ? undefined : Number.parseInt(contentLength, 10)
-    const declaredSize =
-      parsedSize !== undefined && Number.isSafeInteger(parsedSize) && parsedSize >= 0 ? parsedSize : undefined
-    if (declaredSize !== undefined && declaredSize > maxResponseBodyBytes) {
-      return yield* Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} response exceeds 50 MiB.`))
-    }
-    let body = Buffer.allocUnsafe(Math.min(maxResponseBodyBytes, declaredSize ?? 64 * 1024))
-    let size = 0
-    yield* Stream.runForEach(response.stream, (chunk) => {
-      if (size + chunk.byteLength > maxResponseBodyBytes) {
-        return Effect.fail(toolError(`${plan.operation.method} ${plan.operation.path} response exceeds 50 MiB.`))
-      }
-      if (size + chunk.byteLength > body.byteLength) {
-        const grown = Buffer.allocUnsafe(
-          Math.min(maxResponseBodyBytes, Math.max(size + chunk.byteLength, body.byteLength * 2)),
-        )
-        body.copy(grown, 0, 0, size)
-        body = grown
-      }
-      body.set(chunk, size)
-      size += chunk.byteLength
-      return Effect.void
-    }).pipe(
-      Effect.catch((cause) => {
-        if (cause instanceof ToolError) return Effect.fail(cause)
-        if (cause.reason._tag === "EmptyBodyError") return Effect.void
-        return Effect.fail(
-          toolError(`${plan.operation.method} ${plan.operation.path} failed while reading the response body.`, cause),
-        )
-      }),
-    )
-    return new TextDecoder().decode(body.subarray(0, size))
-  })
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dustin Deus	8cb0a48dff	Merge branch 'dev' into zen-body-limit	2026-07-04 01:33:46 +02:00
starptech	9e39f1c8c7	feat(console): enforce 10mb request body limit on zen api	2026-07-03 23:01:20 +02:00