Merge remote-tracking branch 'origin/v2' into tui-drop-path

fix: preserve attachment paths throughout model input
fix(core): expose inline media source paths
2026-09-06 08:56:22 +00:00 · 2026-09-04 17:11:55 +00:00 · 2026-09-04 17:11:55 +00:00 · 2026-09-04 17:06:11 +00:00 · 2026-09-04 16:58:14 +00:00
288 changed files with 3303 additions and 12589 deletions
@@ -91,7 +91,7 @@ jobs:

      - uses: ./.github/actions/setup-bun
        with:
-          bun-version: 1.4.2
+          bun-version: 1.4.1

      - name: Setup git committer
        id: committer
@@ -113,7 +113,7 @@ jobs:
        id: build
        run: ./packages/cli/script/build.ts ${{ (github.ref_name == 'beta' && '--sourcemaps') || '' }}
        env:
-          BUN_COMPILE_RELEASE: bun-v1.4.2
+          BUN_COMPILE_RELEASE: bun-v1.4.1
          OPENCODE_VERSION: ${{ needs.version.outputs.version }}
          OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
          GH_REPO: ${{ needs.version.outputs.repo }}
@@ -183,7 +183,7 @@ const table = sqliteTable("session", {
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
 - Preserve one explicit `llm.stream(request)` call per Physical Attempt and reload projected history before durable continuation. A logical Step may use generic pre-output retries, one full-context retry after continuation rejection, incomplete-stream continuation, or one overflow-compaction rebuild. Generic retries retain the logical step number and do not consume another agent-step allowance. Do not delegate orchestration to an in-memory tool loop.
 - Keep local Session drains process-local until clustering is implemented. `SessionRunCoordinator` joins explicit same-Session resumes, coalesces prompt wakeups, and allows different Sessions to run concurrently. A write-ahead execution claim marks a process-local busy period for restart recovery: terminal completion, failure, or user interruption releases it, while shutdown interruption and process death preserve it. Startup recovery resumes claimed top-level Sessions with durable per-execution attempt accounting. The claim is a recovery marker, not clustered ownership, fencing, or an exactly-once guarantee.
- Keep delivery vocabulary explicit. Prompts steer by default. At safe step boundaries, steered compaction takes priority up to the first steered move control; other steers retain enqueue order. At an idle boundary, steers take priority; otherwise exactly one queued item delivers before the runner reevaluates continuation. Inbox items may be cancelled or changed between queue and steer before delivery. Promoting new user input resets the selected agent's step allowance; a batch of steers resets it once.
+- Keep delivery vocabulary explicit. Prompts steer by default. Steers deliver in enqueue order at safe step boundaries, stopping before compaction or move control items. At an idle boundary, steers take priority; otherwise exactly one queued item delivers before the runner reevaluates continuation. Inbox items may be cancelled or changed between queue and steer before delivery. Promoting new user input resets the selected agent's step allowance; a batch of steers resets it once.
 - One step is one logical LLM call; its durable record covers only the model-visible span. Do not write "provider turn", and do not use bare "turn" for a single call: "turn" is reserved for the future assistant-turn unit containing all steps from prompt promotion until the session would go idle.
 - Keep event replay ownership separate from clustered Session execution ownership.
 - Keep the Instructions algebra and built-ins in `src/instructions`; keep instruction producers with their observed domains, and keep Session History selection plus `InstructionState` and `InstructionEntry` persistence Session-owned. `InstructionDiscovery` observes ambient global and upward-project instructions. The runner composes built-ins, discovery, guidance, and entries explicitly in `loadInstructions`; there is no instruction registry.
@@ -33,7 +33,6 @@
      "name": "@opencode-ai/ai",
      "version": "1.17.20",
      "dependencies": {
-        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
        "@smithy/util-utf8": "4.2.2",
@@ -339,6 +338,7 @@
      "version": "1.18.4",
      "dependencies": {
        "@ai-sdk/alibaba": "1.0.17",
+        "@ai-sdk/amazon-bedrock": "4.0.112",
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/azure": "3.0.88",
        "@ai-sdk/cohere": "3.0.27",
@@ -350,6 +350,7 @@
        "@ai-sdk/provider": "3.0.8",
        "@ai-sdk/provider-utils": "4.0.23",
        "@ai-sdk/vercel": "2.0.39",
+        "@aws-sdk/credential-providers": "3.1057.0",
        "@ff-labs/fff-bun": "0.10.5",
        "@ff-labs/fff-node": "0.10.5",
        "@lydell/node-pty": "catalog:",
@@ -357,7 +358,6 @@
        "@opencode-ai/ai": "workspace:*",
        "@opencode-ai/codemode": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
-        "@opencode-ai/plugin-browser": "workspace:*",
        "@opencode-ai/pty": "0.1.13",
        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -605,21 +605,6 @@
        "solid-js",
      ],
    },
-    "packages/plugin-browser": {
-      "name": "@opencode-ai/plugin-browser",
-      "version": "0.0.0",
-      "dependencies": {
-        "@opencode-ai/plugin": "workspace:*",
-        "@opencode-ai/schema": "workspace:*",
-        "effect": "catalog:",
-      },
-      "devDependencies": {
-        "@tsconfig/bun": "catalog:",
-        "@types/bun": "catalog:",
-        "@typescript/native-preview": "catalog:",
-        "typescript": "catalog:",
-      },
-    },
    "packages/posts": {
      "name": "@opencode-ai/posts",
      "dependencies": {
@@ -710,8 +695,6 @@
        "effect": "catalog:",
      },
      "devDependencies": {
-        "@opencode-ai/client": "workspace:*",
-        "@opencode-ai/plugin": "workspace:*",
        "@tsconfig/bun": "catalog:",
        "@types/bun": "catalog:",
        "@typescript/native-preview": "catalog:",
@@ -1082,7 +1065,7 @@
    "@opentui/solid": "catalog:",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
-    "bun-types": "1.4.2",
+    "bun-types": "1.4.1",
    "effect": "catalog:",
    "solid-js": "catalog:",
  },
@@ -1204,7 +1187,7 @@

    "@ai-sdk/mistral": ["@ai-sdk/mistral@3.0.51", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.40" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-83eXY6p0lUFhSuMvNDmTKDuMciK5XDAWDlNh5c0L80tKjmtCFRItA1MZHp4IKe1r7eK8Rb5nN7qtxqMLUFRIRw=="],

-    "@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+    "@ai-sdk/openai": ["@ai-sdk/openai@3.0.67", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-oAiGC9eWG7IgtdsdS74bOCnAAHarAfTJhWN9x5INwnWPekL802AvF+0I5DvLzIF1MIRmNw4N8mPSL/GUVbX9Mw=="],

    "@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],

@@ -2162,8 +2145,6 @@

    "@opencode-ai/plugin": ["@opencode-ai/plugin@workspace:packages/plugin"],

-    "@opencode-ai/plugin-browser": ["@opencode-ai/plugin-browser@workspace:packages/plugin-browser"],
-
    "@opencode-ai/posts": ["@opencode-ai/posts@workspace:packages/posts"],

    "@opencode-ai/protocol": ["@opencode-ai/protocol@workspace:packages/protocol"],
@@ -3504,7 +3485,7 @@

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

-    "bun-types": ["bun-types@1.4.2", "", { "dependencies": { "@types/node": "*" } }, "sha512-bxV1FgK7yBIzjRe5zBozIM4Bem11ZJcCXSrjWRG3YWLt8yFDePu4cLjpebO8OvPeIE9trbyPF4fuj3Cia4Fj3w=="],
+    "bun-types": ["bun-types@1.4.1", "", { "dependencies": { "@types/node": "*" } }, "sha512-loKuVrAFZKfEv+JvWkHRS9GW5IqLuLRjVXN9p+vZvBN86O5hf/pBZQ5hSoyipsrMmWObZBDvWnlmKvjKTM0PdA=="],

    "bundle-name": ["bundle-name@4.1.0", "", { "dependencies": { "run-applescript": "^7.0.0" } }, "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q=="],

@@ -5884,8 +5865,6 @@

    "@ai-sdk/amazon-bedrock/@ai-sdk/anthropic": ["@ai-sdk/anthropic@3.0.81", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-B1JDd9Ugq9R5AgIaW3674lhGCMMYJcPUxnrZh8fzbGojgg4QvHFRv6eZahGQAUsmGHbcf74G9bdSBDLWQGY2GA=="],

-    "@ai-sdk/amazon-bedrock/@ai-sdk/openai": ["@ai-sdk/openai@3.0.67", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@ai-sdk/provider-utils": "4.0.27" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-oAiGC9eWG7IgtdsdS74bOCnAAHarAfTJhWN9x5INwnWPekL802AvF+0I5DvLzIF1MIRmNw4N8mPSL/GUVbX9Mw=="],
-
    "@ai-sdk/amazon-bedrock/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],

    "@ai-sdk/amazon-bedrock/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],
@@ -5894,6 +5873,8 @@

    "@ai-sdk/anthropic/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],

+    "@ai-sdk/azure/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+
    "@ai-sdk/azure/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],

    "@ai-sdk/azure/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
@@ -5940,9 +5921,9 @@

    "@ai-sdk/mistral/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.40", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-OL5IrpUm9Y8Dwy+w/vvFwPotS6m52O9W0op2oXgXdCROMJIBalBI0oro6OIBYkPxvm5Xg02GSkoQN25RlR0bnw=="],

-    "@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+    "@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.10", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-Q3BZ27qfpYqnCYGvE3vt+Qi6LGOF9R5Nmzn+9JoM1lCRsD9mYaIhfJLkSunN48nfGXJ6n+XNV0J/XVpqGQl7Dw=="],

-    "@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
+    "@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.27", "", { "dependencies": { "@ai-sdk/provider": "3.0.10", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ubkAJ+xODouwtmN1tYlvTPphH1hPOBfZaEQe8U7skGvFAnIRs9PPpsq57bC2+Ky/MB4yzhd6YOsxTAx9sGpazw=="],

    "@ai-sdk/perplexity/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],

@@ -6402,6 +6383,8 @@

    "ai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@5.0.27", "", { "dependencies": { "@ai-sdk/provider": "4.0.7", "@standard-schema/spec": "^1.1.0", "@workflow/serde": "4.1.0", "eventsource-parser": "^3.0.8", "undici": "^7.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-EzAn4pdgG5g0xXtH6lE2zyNmfjDQIDjATkfqzuidEI35g++hh4+07vnjzkT/RmGmIClPZiRj/Q2GMPV2V7mkHw=="],

+    "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.84", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cmgbeJL0bbY0yTJH4/AdmP5E7MjWRL9G8UdhIi0JlV/So03o82ORJofW8OzwCZPTORVQblFbpZXYGDcUd9NdUQ=="],
+
    "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

    "anymatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
@@ -7262,6 +7245,10 @@

    "@vitest/expect/@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.2.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA=="],

+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
+
+    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
+
    "ai/@ai-sdk/provider-utils/undici": ["undici@7.29.0", "", {}, "sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw=="],

    "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
@@ -235,7 +235,6 @@ const bucketNew = new sst.cloudflare.Bucket("ZenDataNew")
 const DISCORD_INCIDENT_WEBHOOK_URL = new sst.Secret("DISCORD_INCIDENT_WEBHOOK_URL")
 const AWS_SES_ACCESS_KEY_ID = new sst.Secret("AWS_SES_ACCESS_KEY_ID")
 const AWS_SES_SECRET_ACCESS_KEY = new sst.Secret("AWS_SES_SECRET_ACCESS_KEY")
-const ENTERPRISE_SALES_INBOX_EMAIL = new sst.Secret("ENTERPRISE_SALES_INBOX_EMAIL")

 const SALESFORCE_CLIENT_ID = new sst.Secret("SALESFORCE_CLIENT_ID")
 const SALESFORCE_CLIENT_SECRET = new sst.Secret("SALESFORCE_CLIENT_SECRET")
@@ -264,7 +263,6 @@ new sst.cloudflare.x.SolidStart("Console", {
    EMAILOCTOPUS_API_KEY,
    AWS_SES_ACCESS_KEY_ID,
    AWS_SES_SECRET_ACCESS_KEY,
-    ENTERPRISE_SALES_INBOX_EMAIL,
    SALESFORCE_CLIENT_ID,
    SALESFORCE_CLIENT_SECRET,
    SALESFORCE_INSTANCE_URL,
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-bWKV3fV8Yc+3ILaNRChIYajsRcvEG2OkydsD2KMUXCM=",
-    "aarch64-linux": "sha256-zIavB09LW+BU3GOq0PO7Lqfc3MVchkiOUf3trnAjhRM=",
-    "aarch64-darwin": "sha256-Jlvz7QsXsb8GS9Ty4TmUIfGOawiueZWWEYmyEPms3dc=",
-    "x86_64-darwin": "sha256-TzTDtcDtj1c3+eP2WZAHOfkszxIS06J6QUwlnscLaUM="
+    "x86_64-linux": "sha256-J7xJ1+x+f13zso+UMP1YYzkjFM0LiHZURmf8HhO3X4M=",
+    "aarch64-linux": "sha256-CF7BiObbwjFT4BV5FUqB535fqoPuXuExKpERcev/Re0=",
+    "aarch64-darwin": "sha256-ts3zgHiPeQcrehST1ikr+BNwlF+3JDn0/IUeJSAOB3o=",
+    "x86_64-darwin": "sha256-awKiMBuDMrapw3Lrm39TbE+ILJZ1P8R8sqYJEWapSf8="
  }
 }
@@ -5,9 +5,9 @@
  "version": "0.0.0",
  "private": true,
  "type": "module",
-  "packageManager": "bun@1.4.2",
+  "packageManager": "bun@1.4.1",
  "scripts": {
-    "dev": "bun run --cwd packages/cli src/index.ts",
+    "dev": "bun run --cwd packages/cli --conditions=browser src/index.ts",
    "dev:live": "sh -c 'OPENCODE_TUI_CHANNEL=dev OPENCODE_PASSWORD=\"$(opencode2 service get password)\" exec bun run dev \"$@\" --server \"$(opencode2 service status)\"' --",
    "dev:desktop": "bun --cwd packages/desktop dev",
    "dev:web": "bun --cwd packages/app dev",
@@ -159,7 +159,7 @@
    "@effect/platform-node-shared": "catalog:",
    "@types/bun": "catalog:",
    "@types/node": "catalog:",
-    "bun-types": "1.4.2",
+    "bun-types": "1.4.1",
    "effect": "catalog:",
    "solid-js": "catalog:"
  },
@@ -28,7 +28,6 @@
    "typescript": "catalog:"
  },
  "dependencies": {
-    "@aws-sdk/credential-providers": "3.1057.0",
    "@smithy/eventstream-codec": "4.2.14",
    "@smithy/util-utf8": "4.2.2",
    "@opencode-ai/schema": "workspace:*",
@@ -2,12 +2,13 @@ import { AwsV4Signer } from "aws4fetch"
 import { Effect } from "effect"
 import { Headers } from "effect/unstable/http"
 import { Auth, type AuthInput } from "../../route/auth.js"
-import { AIError, AuthenticationError } from "../../schema/index.js"
 import { ProviderShared } from "../shared.js"

 /**
 * AWS credentials for SigV4 signing. Bedrock also supports Bearer API key auth,
- * which provider facades configure as route auth instead of SigV4.
+ * which provider facades configure as route auth instead of SigV4. STS-vended
+ * credentials should be refreshed by the consumer (rebuild the model) before
+ * they expire; the route does not refresh.
 */
 export interface Credentials {
  readonly region: string
@@ -16,44 +17,6 @@ export interface Credentials {
  readonly sessionToken?: string
 }

-/** Static credentials or an effect resolved before every request. */
-export type CredentialSource = Credentials | Effect.Effect<Credentials, AIError>
-
-export interface DefaultChainOptions {
-  readonly region: string
-  /** Shared config profile passed to the AWS default chain. */
-  readonly profile?: string
-}
-
-/**
- * Resolve credentials through the AWS default provider chain: environment
- * variables, shared config and SSO caches, web identity tokens, process
- * credentials, and container or instance metadata. A fresh chain runs on every
- * request so credentials rotated on disk without an expiration (for example
- * shared-config keys rewritten by a corporate SSO tool) are always re-read;
- * the SDK's own memoization would otherwise pin them for the process lifetime.
- */
-export const defaultChain = (options: DefaultChainOptions): Effect.Effect<Credentials, AIError> =>
-  Effect.tryPromise({
-    try: async () => {
-      const { fromNodeProviderChain } = await import("@aws-sdk/credential-providers")
-      const identity = await fromNodeProviderChain(options.profile === undefined ? {} : { profile: options.profile })()
-      return {
-        region: options.region,
-        accessKeyId: identity.accessKeyId,
-        secretAccessKey: identity.secretAccessKey,
-        ...(identity.sessionToken === undefined ? {} : { sessionToken: identity.sessionToken }),
-      }
-    },
-    catch: (error) =>
-      new AIError({
-        reason: new AuthenticationError({
-          message: `AWS default credential chain failed: ${ProviderShared.errorText(error)}`,
-          cause: error,
-        }),
-      }),
-  })
-
 const signRequest = (input: {
  readonly url: string
  readonly body: string
@@ -85,17 +48,16 @@ const signRequest = (input: {

 /** Sign the exact JSON bytes with SigV4 using credentials configured on the route. */
 export const sigV4 = (
-  source: CredentialSource | undefined,
+  credentials: Credentials | undefined,
  options: { readonly service?: string; readonly name?: string } = {},
 ) =>
  Auth.custom((input: AuthInput) => {
    return Effect.gen(function* () {
-      if (!source) {
+      if (!credentials) {
        return yield* ProviderShared.invalidRequest(
          `${options.name ?? "Bedrock Converse"} requires either route bearer auth or AWS credentials configured on the route`,
        )
      }
-      const credentials = Effect.isEffect(source) ? yield* source : source
      const headersForSigning = Headers.set(input.headers, "content-type", "application/json")
      const signed = yield* signRequest({
        url: input.url,
@@ -112,35 +74,4 @@ export const sigV4 = (
 /** Bedrock route auth defaults to SigV4 and expects credentials from route configuration. */
 export const auth = sigV4(undefined)

-export const resolveRegion = (input: {
-  readonly region?: string
-  readonly credentials?: { readonly region: string }
-}) =>
-  input.region ?? input.credentials?.region ?? process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? "us-east-1"
-
-export interface ResolveAuthInput {
-  readonly apiKey?: string
-  readonly credentials?: Credentials
-  readonly profile?: string
-}
-
-export interface ResolveAuthOptions {
-  readonly service?: string
-  readonly name?: string
-  /** `sigv4` ignores an ambient `AWS_BEARER_TOKEN_BEDROCK`; `bearer` is validated by the caller. */
-  readonly mode?: "bearer" | "sigv4"
-}
-
-/**
- * Bearer wins over SigV4 and explicit static credentials win over the default
- * chain, matching the AWS SDK's own precedence for `AWS_BEARER_TOKEN_BEDROCK`.
- * The region is applied to the SigV4 scope so it always matches the endpoint host.
- */
-export const resolveAuth = (input: ResolveAuthInput, region: string, options: ResolveAuthOptions = {}) => {
-  const apiKey = options.mode === "sigv4" ? undefined : (input.apiKey ?? process.env.AWS_BEARER_TOKEN_BEDROCK)
-  if (apiKey !== undefined) return Auth.bearer(apiKey)
-  if (input.credentials !== undefined) return sigV4({ ...input.credentials, region }, options)
-  return sigV4(defaultChain({ region, profile: input.profile }), options)
-}
-
 export * as BedrockAuth from "./bedrock-auth.js"
@@ -1,3 +1,4 @@
+import { Auth } from "../route/auth.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import type { ProviderPackage } from "../provider-package.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
@@ -9,15 +10,9 @@ import { withOpenAIOptions, type OpenAIProviderOptionsInput } from "./openai-opt
 export const id = ProviderID.make("amazon-bedrock")

 export type Config = RouteDefaultsInput & {
-  /** Bedrock API key. Falls back to `AWS_BEARER_TOKEN_BEDROCK`; bearer auth takes precedence over SigV4. */
  readonly apiKey?: string
-  /** `sigv4` ignores `apiKey` fallbacks from the environment; `bearer` requires a token. */
-  readonly auth?: "bearer" | "sigv4"
  readonly baseURL?: string
-  /** Static SigV4 credentials. When omitted the AWS default credential chain resolves them per request. */
  readonly credentials?: Credentials
-  /** Shared config profile for the default credential chain. */
-  readonly profile?: string
  readonly region?: string
  readonly providerOptions?: OpenAIProviderOptionsInput
 }
@@ -27,7 +22,6 @@ export interface Settings extends ProviderPackage.Settings {
  readonly auth?: "bearer" | "sigv4"
  readonly baseURL?: string
  readonly credentials?: Credentials
-  readonly profile?: string
  readonly region?: string
  readonly topP?: number
  readonly providerOptions?: OpenAIProviderOptionsInput
@@ -53,35 +47,23 @@ const chatRoute = OpenAIChat.route.with({
 export const routes = [responsesRoute, chatRoute]

 const configuredRoute = <Body, Prepared>(route: Route<Body, Prepared>, input: Config) => {
-  const region = BedrockAuth.resolveRegion(input)
+  const region = input.region ?? input.credentials?.region ?? "us-east-1"
+  const credentials = input.credentials === undefined ? undefined : { ...input.credentials, region }
  return route.with({
    endpoint: { baseURL: input.baseURL ?? `https://bedrock-mantle.${region}.api.aws/v1` },
-    auth: BedrockAuth.resolveAuth(input, region, {
-      service: "bedrock-mantle",
-      name: "Bedrock Mantle",
-      mode: input.auth,
-    }),
+    auth:
+      input.apiKey === undefined
+        ? BedrockAuth.sigV4(credentials, { service: "bedrock-mantle", name: "Bedrock Mantle" })
+        : Auth.bearer(input.apiKey),
  })
 }

 const defaults = (input: Config) => {
-  const {
-    apiKey: _,
-    auth: _auth,
-    baseURL: _baseURL,
-    credentials: _credentials,
-    profile: _profile,
-    region: _region,
-    ...rest
-  } = input
+  const { apiKey: _, baseURL: _baseURL, credentials: _credentials, region: _region, ...rest } = input
  return rest
 }

 export const configure = (input: Config = {}) => {
-  if (input.auth === "bearer" && input.apiKey === undefined && process.env.AWS_BEARER_TOKEN_BEDROCK === undefined)
-    throw new Error("Amazon Bedrock Mantle bearer auth requires apiKey")
-  if (input.auth === "sigv4" && input.apiKey !== undefined)
-    throw new Error("Amazon Bedrock Mantle SigV4 auth does not accept apiKey")
  const configuredResponsesRoute = configuredRoute(responsesRoute, input)
  const configuredChatRoute = configuredRoute(chatRoute, input)
  const modelDefaults = defaults(input)
@@ -105,26 +87,29 @@ export const configure = (input: Config = {}) => {

 export const provider = configure()

-const fromSettings = (settings: Settings) =>
-  configure({
-    apiKey: settings.apiKey,
-    auth: settings.auth,
+const config = (settings: Settings): Config => {
+  if (settings.auth === "bearer" && settings.apiKey === undefined)
+    throw new Error("Amazon Bedrock Mantle bearer auth requires apiKey")
+  if (settings.auth === "sigv4" && settings.apiKey !== undefined)
+    throw new Error("Amazon Bedrock Mantle SigV4 auth does not accept apiKey")
+  return {
+    apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey,
    baseURL: settings.baseURL,
    credentials: settings.credentials,
    generation: settings.topP === undefined ? undefined : { topP: settings.topP },
    headers: settings.headers === undefined ? undefined : { ...settings.headers },
    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    profile: settings.profile,
    providerOptions: settings.providerOptions,
    region: settings.region,
-  })
+  }
+}

 export const chatModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
  modelID,
  settings,
-) => fromSettings(settings).chat(modelID)
+) => configure(config(settings)).chat(modelID)
 export const responsesModel: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (
  modelID,
  settings,
-) => fromSettings(settings).responses(modelID)
+) => configure(config(settings)).responses(modelID)
 export const model = responsesModel
@@ -1,23 +1,17 @@
 import type { RouteDefaultsInput } from "../route/client.js"
+import { Auth } from "../route/auth.js"
 import type { ProviderPackage } from "../provider-package.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
 import * as BedrockConverse from "../protocols/bedrock-converse.js"
 import type { BedrockCredentials } from "../protocols/bedrock-converse.js"
-import { BedrockAuth } from "../protocols/utils/bedrock-auth.js"

 export const id = ProviderID.make("amazon-bedrock")

 export type Config = RouteDefaultsInput & {
-  /** Bedrock API key. Falls back to `AWS_BEARER_TOKEN_BEDROCK`; bearer auth takes precedence over SigV4. */
  readonly apiKey?: string
-  /** `sigv4` ignores `apiKey` fallbacks from the environment; `bearer` requires a token. */
-  readonly auth?: "bearer" | "sigv4"
  readonly headers?: Record<string, string>
-  /** Static SigV4 credentials. When omitted the AWS default credential chain resolves them per request. */
  readonly credentials?: BedrockCredentials
-  /** Shared config profile for the default credential chain. */
-  readonly profile?: string
-  /** AWS region. Falls back to `credentials.region`, `AWS_REGION`, `AWS_DEFAULT_REGION`, then `us-east-1`. */
+  /** AWS region. Defaults to `us-east-1` when neither this nor `credentials.region` is set. */
  readonly region?: string
  /** Override the computed `https://bedrock-runtime.<region>.amazonaws.com` URL. */
  readonly baseURL?: string
@@ -28,7 +22,6 @@ export interface Settings extends ProviderPackage.Settings {
  readonly auth?: "bearer" | "sigv4"
  readonly baseURL?: string
  readonly credentials?: BedrockCredentials
-  readonly profile?: string
  readonly region?: string
  readonly topP?: number
 }
@@ -37,17 +30,14 @@ export const routes = [BedrockConverse.route]
 const bedrockBaseURL = (region: string) => `https://bedrock-runtime.${region}.amazonaws.com`

 const configuredRoute = (input: Config) => {
-  const { apiKey, auth, credentials, profile, region, baseURL, ...rest } = input
-  if (auth === "bearer" && apiKey === undefined && process.env.AWS_BEARER_TOKEN_BEDROCK === undefined)
-    throw new Error("Amazon Bedrock bearer auth requires apiKey")
-  if (auth === "sigv4" && apiKey !== undefined) throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey")
-  const resolvedRegion = BedrockAuth.resolveRegion(input)
+  const { apiKey, credentials, region, baseURL, ...rest } = input
+  const resolvedRegion = region ?? credentials?.region ?? "us-east-1"
  return BedrockConverse.route.with({
    ...rest,
    provider: id,
    providerMetadataKey: "bedrock",
    endpoint: { baseURL: baseURL ?? bedrockBaseURL(resolvedRegion) },
-    auth: BedrockAuth.resolveAuth({ apiKey, credentials, profile }, resolvedRegion, { mode: auth }),
+    auth: apiKey === undefined ? BedrockConverse.sigV4Auth(credentials) : Auth.bearer(apiKey),
  })
 }

@@ -61,15 +51,18 @@ export const configure = (input: Config = {}) => {
 }

 export const provider = configure()
-export const model: ProviderPackage.Definition<Settings>["model"] = (modelID, settings) =>
-  configure({
-    apiKey: settings.apiKey,
-    auth: settings.auth,
+export const model: ProviderPackage.Definition<Settings>["model"] = (modelID, settings) => {
+  if (settings.auth === "bearer" && settings.apiKey === undefined)
+    throw new Error("Amazon Bedrock bearer auth requires apiKey")
+  if (settings.auth === "sigv4" && settings.apiKey !== undefined)
+    throw new Error("Amazon Bedrock SigV4 auth does not accept apiKey")
+  return configure({
+    apiKey: settings.auth === "sigv4" ? undefined : settings.apiKey,
    baseURL: settings.baseURL,
    credentials: settings.credentials,
    generation: settings.topP === undefined ? undefined : { topP: settings.topP },
    headers: settings.headers === undefined ? undefined : { ...settings.headers },
    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    profile: settings.profile,
    region: settings.region,
  }).model(modelID)
+}
@@ -1,30 +0,0 @@
-import { Effect } from "effect"
-
-/**
- * Run an effect with `process.env` overrides, restoring the previous values
- * afterwards. Use for code that reads `process.env` directly, such as AWS SDK
- * credential providers, where Effect `ConfigProvider` layers do not apply.
- * `undefined` removes a variable for the duration of the effect.
- */
-export const withProcessEnv =
-  (env: Record<string, string | undefined>) =>
-  <A, E, R>(effect: Effect.Effect<A, E, R>) =>
-    Effect.acquireUseRelease(
-      Effect.sync(() => {
-        const previous = Object.fromEntries(Object.keys(env).map((name) => [name, process.env[name]]))
-        apply(env)
-        return previous
-      }),
-      () => effect,
-      (previous) => Effect.sync(() => apply(previous)),
-    )
-
-const apply = (env: Record<string, string | undefined>) => {
-  for (const [name, value] of Object.entries(env)) {
-    if (value === undefined) {
-      delete process.env[name]
-      continue
-    }
-    process.env[name] = value
-  }
-}
@@ -2,11 +2,9 @@ import { EventStreamCodec } from "@smithy/eventstream-codec"
 import { fromUtf8, toUtf8 } from "@smithy/util-utf8"
 import { describe, expect } from "bun:test"
 import { Effect, Encoding, Ref, Stream } from "effect"
-import { HttpClientRequest } from "effect/unstable/http"
 import {
  CacheHint,
  GenerationOptions,
-  type LanguageModel,
  LLM,
  LLMEvent,
  LLMRequest,
@@ -20,8 +18,7 @@ import { compileRequest } from "../../src/route/client.js"
 import { AmazonBedrock } from "../../src/providers.js"
 import * as BedrockConverse from "../../src/protocols/bedrock-converse.js"
 import { it } from "../lib/effect.js"
-import { withProcessEnv } from "../lib/env.js"
-import { dynamicResponse, fixedResponse } from "../lib/http.js"
+import { fixedResponse } from "../lib/http.js"
 import {
  eventSummary,
  expectWeatherToolLoop,
@@ -98,41 +95,6 @@ const fixedByteChunks = (...chunks: ReadonlyArray<Uint8Array>) =>
    { headers: { "content-type": "application/vnd.amazon.eventstream" } },
  )

-// Clears every input the AWS default chain reads so tests do not pick up the
-// developer's profiles, SSO cache, or instance metadata.
-const noAmbientAWS = {
-  AWS_ACCESS_KEY_ID: undefined,
-  AWS_SECRET_ACCESS_KEY: undefined,
-  AWS_SESSION_TOKEN: undefined,
-  AWS_BEARER_TOKEN_BEDROCK: undefined,
-  AWS_PROFILE: undefined,
-  AWS_REGION: undefined,
-  AWS_DEFAULT_REGION: undefined,
-  AWS_WEB_IDENTITY_TOKEN_FILE: undefined,
-  AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: undefined,
-  AWS_CONTAINER_CREDENTIALS_FULL_URI: undefined,
-  AWS_EC2_METADATA_DISABLED: "true",
-}
-
-const captureHeaders = (target: LanguageModel) =>
-  Effect.gen(function* () {
-    const seen: Array<Headers> = []
-    yield* LLMClient.generate(LLMRequest.update(baseRequest, { model: target })).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            const request = yield* HttpClientRequest.toWeb(input.request)
-            seen.push(request.headers)
-            return input.respond(eventStreamBody(["messageStop", { stopReason: "end_turn" }]), {
-              headers: { "content-type": "application/vnd.amazon.eventstream" },
-            })
-          }),
-        ),
-      ),
-    )
-    return seen[0]!
-  })
-
 const model = AmazonBedrock.configure({
  baseURL: "https://bedrock-runtime.test",
  apiKey: "test-bearer",
@@ -1349,137 +1311,35 @@ describe("Bedrock Converse route", () => {
    }),
  )

-  it.effect("fails with an authentication error when the default chain cannot resolve credentials", () =>
+  it.effect("rejects requests with no auth path", () =>
    Effect.gen(function* () {
      const unsignedModel = AmazonBedrock.configure({
        baseURL: "https://bedrock-runtime.test",
-        profile: "opencode-test-missing-profile",
      }).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
      const error = yield* LLMClient.generate(LLMRequest.update(baseRequest, { model: unsignedModel })).pipe(
        Effect.provide(fixedBytes(eventStreamBody(["messageStop", { stopReason: "end_turn" }]))),
        Effect.flip,
      )

-      expect(error.reason._tag).toBe("Authentication")
-      expect(error.message).toContain("AWS default credential chain failed")
-    }).pipe(withProcessEnv(noAmbientAWS)),
+      expect(error.message).toContain("Bedrock Converse requires either route bearer auth or AWS credentials")
+    }),
  )

-  it.effect("signs with static credentials using the configured region for the SigV4 scope", () =>
+  it.effect("signs requests with SigV4 when AWS credentials are provided (deterministic plumbing check)", () =>
    Effect.gen(function* () {
      const signed = AmazonBedrock.configure({
        baseURL: "https://bedrock-runtime.test",
-        region: "eu-west-1",
        credentials: {
          region: "us-east-1",
          accessKeyId: "AKIAIOSFODNN7EXAMPLE",
          secretAccessKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
        },
      }).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
-      const headers = yield* captureHeaders(signed)
+      const prepared = yield* compileRequest(LLMRequest.update(baseRequest, { model: signed }))

-      expect(headers.get("authorization")).toContain("Credential=AKIAIOSFODNN7EXAMPLE/")
-      expect(headers.get("authorization")).toContain("/eu-west-1/bedrock/aws4_request")
-      expect(headers.get("x-amz-security-token")).toBeNull()
-    }).pipe(withProcessEnv(noAmbientAWS)),
-  )
-
-  it.effect("resolves SigV4 credentials through the AWS default chain on every request", () =>
-    Effect.gen(function* () {
-      const chained = AmazonBedrock.configure({ baseURL: "https://bedrock-runtime.test", region: "us-west-2" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const headers = yield* captureHeaders(chained)
-
-      expect(headers.get("authorization")).toContain("Credential=AKIACHAINEXAMPLE/")
-      expect(headers.get("authorization")).toContain("/us-west-2/bedrock/aws4_request")
-      expect(headers.get("x-amz-security-token")).toBe("chain-session-token")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-        AWS_SESSION_TOKEN: "chain-session-token",
-      }),
-    ),
-  )
-
-  it.effect("re-resolves rotated chain credentials on the next request without rebuilding the model", () =>
-    Effect.gen(function* () {
-      const chained = AmazonBedrock.configure({ baseURL: "https://bedrock-runtime.test", region: "us-west-2" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const first = yield* captureHeaders(chained)
-      const second = yield* captureHeaders(chained).pipe(
-        withProcessEnv({ AWS_ACCESS_KEY_ID: "AKIAROTATEDEXAMPLE", AWS_SECRET_ACCESS_KEY: "rotated-secret" }),
-      )
-
-      expect(first.get("authorization")).toContain("Credential=AKIACHAINEXAMPLE/")
-      expect(second.get("authorization")).toContain("Credential=AKIAROTATEDEXAMPLE/")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-      }),
-    ),
-  )
-
-  it.effect("prefers AWS_BEARER_TOKEN_BEDROCK over the credential chain", () =>
-    Effect.gen(function* () {
-      const bearer = AmazonBedrock.configure({ baseURL: "https://bedrock-runtime.test" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const headers = yield* captureHeaders(bearer)
-
-      expect(headers.get("authorization")).toBe("Bearer env-bearer-token")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_BEARER_TOKEN_BEDROCK: "env-bearer-token",
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-      }),
-    ),
-  )
-
-  it.effect("auth: sigv4 ignores an ambient bearer token from configure and settings", () =>
-    Effect.gen(function* () {
-      const configured = AmazonBedrock.configure({ auth: "sigv4", baseURL: "https://bedrock-runtime.test" }).model(
-        "anthropic.claude-3-5-sonnet-20240620-v1:0",
-      )
-      const fromSettings = AmazonBedrock.model("anthropic.claude-3-5-sonnet-20240620-v1:0", {
-        auth: "sigv4",
-        baseURL: "https://bedrock-runtime.test",
-      })
-
-      for (const target of [configured, fromSettings]) {
-        const headers = yield* captureHeaders(target)
-        expect(headers.get("authorization")).toContain("Credential=AKIACHAINEXAMPLE/")
-        expect(headers.get("authorization")).toContain("/ap-southeast-2/bedrock/aws4_request")
-      }
-      expect(() => AmazonBedrock.configure({ auth: "sigv4", apiKey: "k" })).toThrow("does not accept apiKey")
-    }).pipe(
-      withProcessEnv({
-        ...noAmbientAWS,
-        AWS_BEARER_TOKEN_BEDROCK: "env-bearer-token",
-        AWS_REGION: "ap-southeast-2",
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-      }),
-    ),
-  )
-
-  it.effect("derives the endpoint region from AWS_REGION then AWS_DEFAULT_REGION", () =>
-    Effect.gen(function* () {
-      const fromRegion = AmazonBedrock.configure({ apiKey: "k" }).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
-      expect(fromRegion.route.endpoint.baseURL).toBe("https://bedrock-runtime.eu-central-1.amazonaws.com")
-
-      const fromDefault = yield* Effect.sync(() =>
-        AmazonBedrock.configure({ apiKey: "k" }).model("anthropic.claude-3-5-sonnet-20240620-v1:0"),
-      ).pipe(withProcessEnv({ AWS_REGION: undefined }))
-      expect(fromDefault.route.endpoint.baseURL).toBe("https://bedrock-runtime.us-gov-west-1.amazonaws.com")
-    }).pipe(withProcessEnv({ ...noAmbientAWS, AWS_REGION: "eu-central-1", AWS_DEFAULT_REGION: "us-gov-west-1" })),
+      expect(prepared.route).toBe("bedrock-converse")
+      expect(prepared.model).toBe(signed)
+    }),
  )

  it.effect("emits cachePoint markers after system, user-text, and assistant-text with cache hints", () =>
@@ -7,7 +7,6 @@ import { model } from "../../src/providers/amazon-bedrock/mantle.js"
 import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
 import { compileRequest, LLMClient } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
-import { withProcessEnv } from "../lib/env.js"
 import { dynamicResponse, fixedResponse } from "../lib/http.js"
 import { sseEvents } from "../lib/sse.js"
 import { recordedTests } from "../recorded-test.js"
@@ -83,36 +82,6 @@ describe("Amazon Bedrock Mantle provider", () => {
    }),
  )

-  it.effect("signs with the Mantle service using default-chain credentials", () =>
-    Effect.gen(function* () {
-      const seen: Array<string | undefined> = []
-      const model = AmazonBedrockMantle.configure({ region: "us-west-1" }).responses("openai.gpt-oss-120b")
-      yield* LLMClient.generate(LLM.request({ model, prompt: "Hi" })).pipe(
-        Effect.provide(
-          dynamicResponse((input) =>
-            Effect.gen(function* () {
-              const request = yield* HttpClientRequest.toWeb(input.request)
-              seen.push(request.headers.get("authorization") ?? undefined)
-              return input.respond("", { headers: { "content-type": "text/event-stream" } })
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(seen[0]).toContain("Credential=AKIACHAINEXAMPLE/")
-      expect(seen[0]).toContain("/us-west-1/bedrock-mantle/aws4_request")
-    }).pipe(
-      withProcessEnv({
-        AWS_BEARER_TOKEN_BEDROCK: undefined,
-        AWS_PROFILE: undefined,
-        AWS_ACCESS_KEY_ID: "AKIACHAINEXAMPLE",
-        AWS_SECRET_ACCESS_KEY: "chain-secret",
-        AWS_SESSION_TOKEN: undefined,
-      }),
-    ),
-  )
-
  it.effect("supports bearer authentication and custom base URLs", () =>
    Effect.gen(function* () {
      const seen: Array<{ readonly url: string; readonly authorization: string | undefined }> = []
@@ -1,139 +1,16 @@
 import { expect, story } from "../../storybook/playwright/story"

-for (const direction of ["ltr", "rtl"]) {
-  for (const alternate of ["none", "queue", "steer"]) {
-    story(`scrolls overflowing controls beside fixed ${alternate} actions in ${direction}`, async ({ mount, page }) => {
-      const component = await mount("opencode-composer-flow--toolbar-overflow", {
-        args: { alternate },
-        globals: { direction },
-      })
-      const controls = component.locator('[data-slot="composer-controls"]')
-      const actions = component.locator('[data-slot="composer-actions"]')
-      const submit = component.locator('[data-action="composer-submit"]')
-      const add = component.locator('[data-action="composer-attach"]')
-      const agent = controls.getByRole("button", { name: "Choose agent" })
-      const variant = controls.getByRole("button", { name: "Choose model variant" })
-      await expect(controls).toHaveCSS("overflow-x", "auto")
-      await expect(controls).toHaveCSS("overscroll-behavior-x", "contain")
-      await expect(controls).toHaveCSS("direction", direction)
-      await expect(controls).toHaveCSS("padding-inline-start", "0px")
-      await expect(controls).toHaveCSS("padding-inline-end", "0px")
-      await expect(component.locator('[data-action="composer-alternate-delivery"]')).toHaveCount(
-        alternate === "none" ? 0 : 1,
-      )
+story("raises the docked composer only in dark mode", async ({ mount, page }) => {
+  const component = await mount("opencode-composer-flow--empty-draft")
+  const composer = component.locator('[data-component="composer"]')

-      for (const width of [1024, 360]) {
-        await page.setViewportSize({ width, height: 720 })
-        await expect
-          .poll(() => controls.evaluate((element) => element.scrollWidth - element.clientWidth))
-          .toBeGreaterThan(0)
-        const fixed = await submit.boundingBox()
-        const fixedAdd = await add.boundingBox()
-        const viewport = await controls.boundingBox()
-        const action = await actions.boundingBox()
-        expect(fixed).not.toBeNull()
-        expect(viewport).not.toBeNull()
-        expect(action).not.toBeNull()
-        expect(fixedAdd).not.toBeNull()
-        if (!fixed || !viewport || !action || !fixedAdd) return
-        expect(direction === "ltr" ? fixedAdd.x + fixedAdd.width : viewport.x + viewport.width).toBeCloseTo(
-          direction === "ltr" ? viewport.x - 4 : fixedAdd.x - 4,
-          1,
-        )
-        expect(direction === "ltr" ? viewport.x + viewport.width : action.x + action.width).toBeCloseTo(
-          direction === "ltr" ? action.x - 12 : viewport.x - 12,
-          1,
-        )
+  await page.locator("html").evaluate((root) => root.setAttribute("data-color-scheme", "light"))
+  await expect(composer).toHaveCSS("background-color", "rgb(255, 255, 255)")

-        await controls.evaluate((element) => {
-          element.scrollLeft = 0
-        })
-        await expect(controls).toHaveAttribute("data-overflow-start", "false")
-        await expect(controls).toHaveAttribute("data-overflow-end", "true")
-        await expect(controls).toHaveCSS(
-          "mask-image",
-          `linear-gradient(to ${direction === "ltr" ? "right" : "left"}, rgba(0, 0, 0, 0), rgb(0, 0, 0) 0px, rgb(0, 0, 0) calc(100% - 16px), rgba(0, 0, 0, 0))`,
-        )
-        const first = await agent.boundingBox()
-        if (!first) throw new Error("Missing agent control")
-        expect(
-          direction === "ltr" ? first.x - viewport.x : viewport.x + viewport.width - first.x - first.width,
-        ).toBeCloseTo(0, 0)
-        await controls.evaluate((element) => {
-          element.scrollLeft =
-            ((getComputedStyle(element).direction === "rtl" ? -1 : 1) * (element.scrollWidth - element.clientWidth)) / 2
-        })
-        await expect(controls).toHaveAttribute("data-overflow-start", "true")
-        await expect(controls).toHaveAttribute("data-overflow-end", "true")
-        const scrolled = (await controls.boundingBox())!
-        expect(scrolled.x).toBeCloseTo(viewport.x, 1)
-        expect(scrolled.width).toBeCloseTo(viewport.width, 1)
-        await controls.hover()
-        await page.mouse.wheel(direction === "ltr" ? 1000 : -1000, 0)
-        await expect.poll(() => controls.evaluate((element) => Math.abs(element.scrollLeft))).toBeGreaterThan(0)
-        expect(await submit.boundingBox()).toEqual(fixed)
-        expect(await add.boundingBox()).toEqual(fixedAdd)
-
-        // The fade disappears at the endpoint instead of reserving padding.
-        await variant.focus()
-        await controls.evaluate((element) => {
-          element.scrollLeft =
-            getComputedStyle(element).direction === "rtl" ? -element.scrollWidth : element.scrollWidth
-        })
-        await expect(controls).toHaveAttribute("data-overflow-start", "true")
-        await expect(controls).toHaveAttribute("data-overflow-end", "false")
-        const last = await variant.boundingBox()
-        if (!last) throw new Error("Missing variant control")
-        expect(
-          Math.abs(direction === "ltr" ? viewport.x + viewport.width - last.x - last.width : last.x - viewport.x),
-        ).toBeLessThan(1)
-        expect(
-          Math.abs((direction === "ltr" ? action.x - last.x - last.width : last.x - action.x - action.width) - 12),
-        ).toBeLessThan(1)
-        await page.keyboard.press("Enter")
-        await expect(page.getByRole("menuitemradio", { name: "high", exact: true })).toBeVisible()
-        await page.keyboard.press("Escape")
-        await expect(variant).toBeFocused()
-        await expect(submit).toBeInViewport()
-        await expect(add).toBeInViewport()
-        await add.click()
-        await expect(page.getByRole("menuitem", { name: "Images and files" })).toBeVisible()
-        await page.keyboard.press("Escape")
-        expect(await add.boundingBox()).toEqual(fixedAdd)
-      }
-
-      if (alternate !== "none") {
-        const width = (await controls.boundingBox())!.width
-        await component.getByRole("textbox", { name: "Prompt", exact: true }).fill("")
-        await expect(component.locator('[data-action="composer-alternate-delivery"]')).toHaveCount(0)
-        await expect.poll(async () => (await controls.boundingBox())!.width).toBeGreaterThan(width)
-      }
-    })
-  }
-}
-
-story("does not mask or pad controls when they fit", async ({ mount }) => {
-  const component = await mount("opencode-composer-flow--model-and-variant")
-  const controls = component.locator('[data-slot="composer-controls"]')
-  await expect(controls).toHaveAttribute("data-overflow-start", "false")
-  await expect(controls).toHaveAttribute("data-overflow-end", "false")
-  await expect(controls).toHaveCSS("mask-image", "none")
-  await expect(controls).toHaveCSS("padding-inline-start", "0px")
-  await expect(controls).toHaveCSS("padding-inline-end", "0px")
+  await page.locator("html").evaluate((root) => root.setAttribute("data-color-scheme", "dark"))
+  await expect(composer).toHaveCSS("background-color", "rgb(36, 36, 36)")
 })

-// ThemeProvider writes resolved token values into a <style> block, so toggling data-color-scheme by hand
-// leaves every --v2-* variable at its previous value. Switch themes through the Storybook global instead.
-for (const [theme, background] of [
-  ["light", "rgb(255, 255, 255)"],
-  ["dark", "rgb(36, 36, 36)"],
-] as const) {
-  story(`raises the docked composer only in dark mode (${theme})`, async ({ mount }) => {
-    const component = await mount("opencode-composer-flow--empty-draft", { globals: { theme } })
-    await expect(component.locator('[data-component="composer"]')).toHaveCSS("background-color", background)
-  })
-}
-
 story("centers add menu shortcuts in a consistent column", async ({ mount, page }) => {
  const component = await mount("opencode-composer-flow--empty-draft")
  await component.locator('[data-action="composer-attach"]').click()
@@ -1,86 +0,0 @@
-import { expect, story } from "../../storybook/playwright/story"
-
-for (const theme of ["light", "dark"]) {
-  for (const direction of ["ltr", "rtl"]) {
-    story(`shimmers once over the visible wordmark (${theme}, ${direction})`, async ({ mount, page }, testInfo) => {
-      await page.emulateMedia({ reducedMotion: "no-preference" })
-      const component = await mount("app-new-session-wordmark--reveal", { globals: { theme, direction } })
-      const logo = component.locator('[data-component="new-session-wordmark"]')
-      const reveal = logo.locator('[data-slot="wordmark-reveal"]')
-      const shimmer = logo.locator(".wordmark-shimmer")
-      const base = logo.locator("svg").first()
-      await expect(base).toHaveCSS("opacity", theme === "dark" ? "0.5" : "0.6")
-      await expect(shimmer).toHaveCSS("animation-iteration-count", "1")
-      await expect(logo.locator("g[mask]")).toHaveCount(0)
-      await expect(shimmer).toHaveCSS("color", "rgb(255, 255, 255)")
-      await expect(shimmer).toHaveCSS("mix-blend-mode", "screen")
-      await expect(base.locator("g[fill]")).toHaveAttribute("fill", "currentColor")
-
-      await logo.evaluate((element) => {
-        element.getAnimations({ subtree: true }).forEach((animation) => {
-          animation.pause()
-          animation.currentTime = 0
-        })
-      })
-      await expect(reveal).toHaveCSS("opacity", "1")
-      await expect(reveal).toHaveCSS("animation-name", "none")
-      await expect(shimmer).toHaveCSS("mask-position", "100% 0px")
-
-      await logo.evaluate((element) => {
-        element.getAnimations({ subtree: true }).forEach((animation) => (animation.currentTime = 400))
-      })
-      await expect(shimmer).toHaveCSS("mask-position", "50% 0px")
-      await expect(shimmer).toHaveCSS("opacity", theme === "dark" ? "0.0672" : "0.45")
-      const swept = await logo.screenshot({ path: testInfo.outputPath("wordmark-shimmer.png") })
-
-      await logo.evaluate((element) => {
-        element.getAnimations({ subtree: true }).forEach((animation) => animation.finish())
-      })
-      await expect(reveal).toHaveCSS("opacity", "1")
-      await expect(shimmer).toHaveCSS("opacity", "0")
-      await expect(shimmer).toHaveCSS("mask-position", "0% 0px")
-      const settled = await logo.screenshot({ path: testInfo.outputPath("wordmark-settled.png") })
-      const brightness = await page.evaluate(
-        async (screenshots) => {
-          const pixels = await Promise.all(
-            screenshots.map(async (screenshot) => {
-              const image = new Image()
-              image.src = `data:image/png;base64,${screenshot}`
-              await image.decode()
-              const canvas = new OffscreenCanvas(image.width, image.height)
-              const context = canvas.getContext("2d")
-              if (!context) throw new Error("Cannot read screenshot pixels")
-              context.drawImage(image, 0, 0)
-              return context.getImageData(0, 0, image.width, image.height).data
-            }),
-          )
-          return {
-            min: pixels[0].reduce(
-              (min, value, index) => (index % 4 === 3 ? min : Math.min(min, value - pixels[1][index])),
-              0,
-            ),
-            max: pixels[0].reduce(
-              (max, value, index) => (index % 4 === 3 ? max : Math.max(max, value - pixels[1][index])),
-              0,
-            ),
-          }
-        },
-        [swept.toString("base64"), settled.toString("base64")],
-      )
-      expect(brightness.min).toBeGreaterThanOrEqual(0)
-      expect(brightness.max).toBeGreaterThanOrEqual(5)
-    })
-  }
-
-  story(`shows a static wordmark with reduced motion (${theme})`, async ({ mount, page }) => {
-    await page.emulateMedia({ reducedMotion: "reduce" })
-    await page.setViewportSize({ width: 360, height: 640 })
-    const component = await mount("app-new-session-wordmark--reveal", { globals: { theme } })
-    const logo = component.locator('[data-component="new-session-wordmark"]')
-    await expect(logo.locator("svg").first()).toHaveCSS("opacity", theme === "dark" ? "0.5" : "0.6")
-    await expect(logo.locator('[data-slot="wordmark-reveal"]')).toHaveCSS("opacity", "1")
-    await expect(logo.locator(".wordmark-shimmer")).toHaveCSS("opacity", "0")
-    expect(await logo.evaluate((element) => element.getAnimations({ subtree: true }).length)).toBe(0)
-    expect(await logo.evaluate((element) => element.getBoundingClientRect().right <= innerWidth)).toBe(true)
-  })
-}
@@ -1,79 +0,0 @@
-import { expect, story } from "../../storybook/playwright/story"
-
-story("enables Any only after confirmation and supports resetting the preview", async ({ mount }) => {
-  const component = await mount("app-current-session-surface--web-search-request")
-  const card = component.getByRole("region", { name: "Third-party web search" })
-  await expect(card.getByRole("button", { name: "Enable", exact: true })).toBeEnabled()
-  await expect(card.getByRole("button", { name: "Search provider Any", exact: true })).toBeVisible()
-  await card.getByRole("button", { name: "Enable", exact: true }).click()
-  await expect(component.getByRole("status")).toHaveText("Web search selection (local only): random")
-  await expect(card).toHaveCount(0)
-  await component.getByRole("button", { name: "Reset", exact: true }).click()
-  await expect(card.getByRole("button", { name: "Enable", exact: true })).toBeEnabled()
-})
-
-story("declining search is an explicit disabled selection", async ({ mount }) => {
-  const component = await mount("app-current-session-surface--web-search-request")
-  const card = component.getByRole("region", { name: "Third-party web search" })
-  await card.getByRole("button", { name: "Don’t use search", exact: true }).click()
-  await expect(component.getByRole("status")).toHaveText("Web search selection (local only): false")
-  await expect(card).toHaveCount(0)
-})
-
-story("sizes provider options to their content", async ({ mount, page }) => {
-  const component = await mount("app-current-session-surface--web-search-request")
-  await component.getByRole("button", { name: "Search provider Any", exact: true }).click()
-  const menu = page.getByRole("listbox", { name: "Search provider", exact: true })
-  await expect(menu).toBeVisible()
-  const metrics = await menu.evaluate((listbox) => {
-    const items = Array.from(listbox.querySelectorAll('[data-component="menu-v2-item"]'))
-    const longest = items
-      .flatMap((item) => {
-        const label = item.querySelector('[data-slot="menu-v2-item-content"]')?.getBoundingClientRect()
-        const check = item.querySelector('[data-slot="menu-v2-item-indicator"]')?.getBoundingClientRect()
-        return label && check ? [{ label, check }] : []
-      })
-      .toSorted((a, b) => b.label.width - a.label.width)[0]
-    return {
-      width: listbox.getBoundingClientRect().width,
-      gap: longest ? longest.check.left - longest.label.right : 0,
-    }
-  })
-  expect(metrics.width).toBeLessThan(160)
-  expect(metrics.gap).toBe(24)
-})
-
-for (const width of [360, 1200]) {
-  for (const direction of ["ltr", "rtl"]) {
-    for (const theme of ["light", "dark"]) {
-      story(`selects and confirms a provider at ${width}px in ${direction} ${theme}`, async ({ mount, page }) => {
-        await page.setViewportSize({ width, height: 900 })
-        const component = await mount("app-current-session-surface--web-search-request", {
-          globals: { theme, direction },
-        })
-        const card = component.getByRole("region", { name: "Third-party web search" })
-        const select = card.getByRole("button", { name: /^Search provider/ })
-        await expect(select).toBeEnabled()
-        await expect(card).toHaveCSS("direction", direction)
-        expect(await card.evaluate((node) => node.scrollWidth <= node.clientWidth)).toBe(true)
-        await select.focus()
-        await select.press("Enter")
-        const list = page.getByRole("listbox", { name: "Search provider", exact: true })
-        await expect(list).toHaveCSS("direction", direction)
-        await list.getByRole("option", { name: "Parallel", exact: true }).click()
-        await expect(select).toHaveText("Parallel")
-        await expect(card).toBeVisible()
-        await expect(component.getByRole("status")).toHaveText("Ready")
-        await expect(select).toBeFocused()
-        await select.press("Tab")
-        await expect(card.getByRole("button", { name: "Don’t use search", exact: true })).toBeFocused()
-        await page.keyboard.press("Tab")
-        const enable = card.getByRole("button", { name: "Enable", exact: true })
-        await expect(enable).toBeFocused()
-        await enable.press("Enter")
-        await expect(component.getByRole("status")).toHaveText("Web search selection (local only): parallel")
-        await expect(card).toHaveCount(0)
-      })
-    }
-  }
-}
@@ -86,12 +86,7 @@ async function mockServers(page: Page, requests: string[]) {
      }
      return json(route, url.pathname === "/api/project" ? [project] : { id: project.id, directory: current.directory })
    }
-    if (url.pathname === "/api/location")
-      return json(route, {
-        directory: current.directory,
-        project: { id: current.projectID, directory: current.directory, canonical: current.directory },
-      })
-    if (url.pathname === "/api/worktree") return json(route, [{ directory: current.directory }])
+    if (url.pathname === "/api/location") return json(route, { directory: current.directory })
    if (url.pathname === "/api/vcs")
      return json(route, {
        location: { directory: current.directory },
@@ -490,24 +490,20 @@ async function openDraft(
  page.on("request", (request) => {
    if (request.method() !== "POST") return
    const path = new URL(request.url()).pathname
-    if (path === "/api/worktree") {
-      expect(new URL(request.url()).searchParams.get("location[directory]")).toBe(directory)
+    if (path === `/api/worktree/${projectID}`) {
      calls.push("worktree")
      worktreeRequests.push(request.postDataJSON())
    }
    if (path === "/api/session") calls.push("session")
    if (/^\/api\/session\/[^/]+\/prompt$/.test(path)) calls.push("prompt")
  })
-  await page.route(
-    (url) => url.pathname === "/api/worktree",
-    async (route) => {
-      if (route.request().method() !== "POST") return route.fallback()
-      // Keep the real HTTP response pending until the test has checked the preview.
-      const response = await worktree.promise
-      if (response.status === 200) project.sandboxes.push(workspace)
-      await route.fulfill({ ...response, headers })
-    },
-  )
+  await page.route(`**/api/worktree/${projectID}`, async (route) => {
+    if (route.request().method() !== "POST") return route.fallback()
+    // Keep the real HTTP response pending until the test has checked the preview.
+    const response = await worktree.promise
+    if (response.status === 200) project.sandboxes.push(workspace)
+    await route.fulfill({ ...response, headers })
+  })
  await page.route("**/api/session", async (route) => {
    if (route.request().method() !== "POST") return route.fallback()
    const body: Record<string, unknown> = route.request().postDataJSON()
@@ -7,13 +7,11 @@ const directory = "C:/OpenCode/OpenFileExpand"
 const projectID = "proj_open_file_expand"
 const sessionID = "ses_open_file_expand"
 const title = "Open file expand"
-const longFilename = "a-very-long-file-name-that-must-overflow-the-file-sidebar-instead-of-being-truncated.ts"
-const longPath = `frontend/${longFilename}`
 const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`

 test.use({ viewport: { width: 1440, height: 900 } })

-test("expands Windows paths and horizontally scrolls long filenames", async ({ page }) => {
+test("expands a folder whose path has a trailing Windows separator", async ({ page }) => {
  await mockOpenCodeServer(page, {
    directory,
    project: {
@@ -46,17 +44,7 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
        time: { created: 1700000000000, updated: 1700000000000 },
      },
    ],
-    vcsDiff: [
-      {
-        file: longPath,
-        before: "",
-        after: "export const added = true\n",
-        additions: 1,
-        deletions: 0,
-        status: "added",
-        patch: "@@ -0,0 +1 @@\n+export const added = true\n",
-      },
-    ],
+    vcsDiff: [],
    fileList: (path) => {
      if (path === "frontend\\" || path === "frontend") {
        return [
@@ -67,13 +55,6 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
            type: "file" as const,
            ignored: false,
          },
-          {
-            name: longFilename,
-            path: `frontend\\${longFilename}`,
-            absolute: `${directory}/${longPath}`,
-            type: "file" as const,
-            ignored: false,
-          },
        ]
      }
      if (path) return []
@@ -94,7 +75,6 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
        },
      ]
    },
-    findFiles: ({ query }) => (longPath.includes(query) ? [longPath] : []),
    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
    pageMessages: () => ({ items: [] }),
  })
@@ -139,93 +119,6 @@ test("expands Windows paths and horizontally scrolls long filenames", async ({ p
  await frontendRow.click()
  await expect(frontendRow).toHaveAttribute("aria-expanded", "true")

-  const viewport = sidebar.locator('[data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
-  const longRow = panel.getByRole("button", { name: longFilename })
-  await expect(longRow).toBeVisible()
-  await expect.poll(() => viewport.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeGreaterThan(0)
-  expect(
-    await longRow.evaluate((element) => getComputedStyle(element.querySelector("bdi")!.parentElement!).textOverflow),
-  ).toBe("clip")
-  expect(await longRow.evaluate((element) => element.getBoundingClientRect().width)).toBeGreaterThanOrEqual(
-    await viewport.evaluate((element) => element.clientWidth),
-  )
-  await expect
-    .poll(() =>
-      panel.locator('[data-slot="file-tree-v2-row"]').evaluateAll((rows) => {
-        const widths = rows.map((row) => row.getBoundingClientRect().width)
-        return Math.max(...widths) - Math.min(...widths)
-      }),
-    )
-    .toBeLessThanOrEqual(0.5)
-  await expect(longRow.locator('[data-slot="file-tree-v2-label"]')).toHaveCSS("margin-inline-end", "12px")
-  const status = longRow.locator('[data-slot="file-tree-v2-change"]')
-  await expect(status).toHaveText("A")
-  const statusBox = await status.boundingBox()
-  if (!statusBox) throw new Error("File status has no bounding box")
-  const viewportBox = await viewport.boundingBox()
-  if (!viewportBox) throw new Error("File tree viewport has no bounding box")
-  expect(viewportBox.x + viewportBox.width - statusBox.x - statusBox.width).toBeLessThanOrEqual(24)
-
-  await viewport.hover()
-  const horizontalThumb = sidebar.locator('.scroll-view__thumb[data-orientation="horizontal"]')
-  await expect(horizontalThumb).toHaveCSS("opacity", "1")
-  await page.mouse.wheel(1_000, 0)
-  await expect.poll(() => viewport.evaluate((element) => Math.abs(element.scrollLeft))).toBeGreaterThan(0)
-  await expect(horizontalThumb).toHaveAttribute("data-visible", "true")
-  await expect
-    .poll(() =>
-      status.evaluate((element) => {
-        const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
-        return viewport.right - element.getBoundingClientRect().right
-      }),
-    )
-    .toBeLessThanOrEqual(24)
-
-  const beforeDrag = await viewport.evaluate((element) => Math.abs(element.scrollLeft))
-  const thumbBox = await horizontalThumb.boundingBox()
-  if (!thumbBox) throw new Error("Horizontal scrollbar thumb has no bounding box")
-  await page.mouse.move(thumbBox.x + thumbBox.width / 2, thumbBox.y + thumbBox.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(thumbBox.x + thumbBox.width / 2 - 40, thumbBox.y + thumbBox.height / 2)
-  await page.mouse.up()
-  await expect.poll(() => viewport.evaluate((element) => Math.abs(element.scrollLeft))).toBeLessThan(beforeDrag)
-
-  const filter = panel.getByRole("combobox", { name: "Filter files" })
-  await filter.fill(longFilename)
-  const filteredRow = panel.getByRole("option", { name: longFilename })
-  await expect(filteredRow).toBeVisible()
-  const filteredStatus = filteredRow.locator('[data-slot="file-tree-v2-change"]')
-  await expect(filteredStatus).toHaveText("A")
-  await expect.poll(() => viewport.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeGreaterThan(0)
-
-  await viewport.evaluate((element) => {
-    element.setAttribute("dir", "rtl")
-    element.scrollLeft = 0
-    element.dispatchEvent(new Event("scroll"))
-  })
-  await expect
-    .poll(() =>
-      filteredStatus.evaluate((element) => {
-        const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
-        return element.getBoundingClientRect().left - viewport.left
-      }),
-    )
-    .toBeLessThanOrEqual(24)
-  const rtlThumbBox = await horizontalThumb.boundingBox()
-  if (!rtlThumbBox) throw new Error("RTL horizontal scrollbar thumb has no bounding box")
-  await page.mouse.move(rtlThumbBox.x + rtlThumbBox.width / 2, rtlThumbBox.y + rtlThumbBox.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(rtlThumbBox.x + rtlThumbBox.width / 2 - 40, rtlThumbBox.y + rtlThumbBox.height / 2)
-  await page.mouse.up()
-  await expect.poll(() => viewport.evaluate((element) => element.scrollLeft)).toBeLessThan(0)
-  await viewport.evaluate((element) => {
-    element.removeAttribute("dir")
-    element.scrollLeft = 0
-    element.dispatchEvent(new Event("scroll"))
-  })
-
-  await filter.fill("")
-
  const appRow = panel.locator('[data-slot="file-tree-v2-row"][data-path="frontend/app.ts"]')
  await expect(appRow).toBeVisible()
  await appRow.click()
@@ -1,68 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { createTwoFilesPatch } from "diff"
-import { assistantMessage, setupTimeline, toolPart, userMessage } from "../performance/timeline-stability/fixture"
-
-test.use({
-  deviceScaleFactor: 2,
-  // Emulating DPR alone does not exercise Chromium's native hairline border rounding.
-  launchOptions: { args: ["--force-device-scale-factor=2"] },
-})
-
-for (const width of [1400, 390]) {
-  test(`patch file borders retain a full CSS pixel at ${width}px on high-density displays`, async ({ page }) => {
-    const file = `src/${"long-directory/".repeat(12)}patch-border.ts`
-    await setupTimeline(page, {
-      messages: [
-        userMessage(),
-        assistantMessage([
-          toolPart(
-            "prt_border_patch",
-            "patch",
-            "completed",
-            { patchText: "Update file" },
-            {
-              metadata: {
-                files: [
-                  {
-                    file,
-                    status: "modified",
-                    additions: 1,
-                    deletions: 1,
-                    patch: createTwoFilesPatch(file, file, "const value = 1\n", "const value = 2\n"),
-                  },
-                ],
-              },
-            },
-          ),
-        ]),
-      ],
-      reducedMotion: true,
-      viewport: { width, height: 900 },
-    })
-    await page.getByRole("button", { name: "Used 1 Patch", exact: true }).click()
-    const patch = page.locator('[data-component="apply-patch-tool"]')
-    const trigger = patch.getByRole("button", { name: /patch-border.ts/ })
-    await expect(trigger).toHaveAttribute("aria-expanded", "false")
-    await expect(trigger).toHaveCSS("height", "32px")
-    for (const side of ["top", "right", "bottom", "left"]) {
-      await expect(trigger).toHaveCSS(`border-${side}-width`, "1px")
-    }
-
-    const box = await trigger.boundingBox()
-    await trigger.hover()
-    expect(await trigger.boundingBox()).toEqual(box)
-    await page.mouse.move(0, 0)
-    expect(await trigger.boundingBox()).toEqual(box)
-
-    await trigger.click()
-    await expect(trigger).toHaveAttribute("aria-expanded", "true")
-    const content = patch.locator('[data-slot="accordion-content"]')
-    await expect(content).toBeVisible()
-    for (const side of ["left", "right", "bottom"]) {
-      await expect(content).toHaveCSS(`border-${side}-width`, "1px")
-    }
-    await expect(content).toHaveCSS("border-top-width", "0px")
-    await trigger.press("Enter")
-    await expect(trigger).toHaveAttribute("aria-expanded", "false")
-  })
-}
@@ -396,12 +396,7 @@ async function mockServers(
      return json(route, { data: [], cursor: {} })
    if (sessions.some((session) => url.pathname === `/api/session/${session.id}/inbox`))
      return json(route, { data: [] })
-    if (url.pathname === "/api/location")
-      return json(route, {
-        directory,
-        project: { id: remote ? sessionB.projectID : "project-server-a", directory, canonical: directory },
-      })
-    if (url.pathname === "/api/worktree") return json(route, [{ directory }])
+    if (url.pathname === "/api/location") return json(route, { directory })
    if (url.pathname === "/api/vcs")
      return json(route, { location: { directory }, data: { branch: "main", defaultBranch: "main" } })
    if (url.pathname === "/api/pty/shells") return json(route, { location: { directory }, data: [] })
@@ -87,24 +87,16 @@ test("recording a new session shortcut stays in settings until recording finishe
 test("workspaces opens without waiting for inventory or sessions", async ({ page }) => {
  const inventory = Promise.withResolvers<void>()
  const sessions = Promise.withResolvers<void>()
-  await page.route(
-    (url) => url.pathname === "/api/worktree",
-    async (route) => {
-      await inventory.promise
-      await route.fallback()
-    },
-  )
+  await page.route("**/api/worktree/*", async (route) => {
+    await inventory.promise
+    await route.fallback()
+  })
  await page.route("**/api/session?*", async (route) => {
    if (new URL(route.request().url()).searchParams.has("directory")) await sessions.promise
    await route.fallback()
  })
  const settings = page.getByTestId("settings-screen")
-  const requested = page.waitForRequest(
-    (request) =>
-      new URL(request.url()).pathname === "/api/worktree" &&
-      new URL(request.url()).searchParams.get("location[directory]") === directory &&
-      request.method() === "GET",
-  )
+  const requested = page.waitForRequest((request) => new URL(request.url()).pathname.startsWith("/api/worktree/"))
  await settings.getByRole("tab", { name: "Worktrees", exact: true }).click()
  await requested
  await expect(settings.getByRole("heading", { name: "Worktrees", exact: true })).toBeVisible()
@@ -118,57 +110,16 @@ test("workspaces opens without waiting for inventory or sessions", async ({ page
  await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible()

  const refresh = Promise.withResolvers<void>()
-  await page.route(
-    (url) => url.pathname === "/api/worktree",
-    async (route) => {
-      await refresh.promise
-      await route.fallback()
-    },
-  )
+  await page.route("**/api/worktree/*", async (route) => {
+    await refresh.promise
+    await route.fallback()
+  })
  await settings.getByRole("tab", { name: "Preferences", exact: true }).click()
  await settings.getByRole("tab", { name: "Worktrees", exact: true }).click()
  await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible()
  refresh.resolve()
 })

-test("worktree deletion sends the project location separately from the target", async ({ page }) => {
-  const removed = new Set<string>()
-  await page.route(
-    (url) => url.pathname === "/api/worktree",
-    async (route) => {
-      if (route.request().method() === "GET") {
-        return route.fulfill({
-          json: [
-            { directory },
-            ...sandboxes.filter((item) => !removed.has(item)).map((directory) => ({ directory, strategy: "git" })),
-          ],
-        })
-      }
-      if (route.request().method() === "DELETE") {
-        removed.add(route.request().postDataJSON().directory)
-        return route.fulfill({ status: 204 })
-      }
-      return route.fallback()
-    },
-  )
-  const settings = page.getByTestId("settings-screen")
-  await settings.getByRole("tab", { name: "Worktrees", exact: true }).click()
-  await expect(settings.getByText(sandboxes[0], { exact: true })).toBeVisible()
-  await settings.getByRole("button", { name: 'Delete worktree "workspace-1"?', exact: true }).click()
-  const confirmation = page.getByRole("dialog", { name: "Delete worktree", exact: true })
-  const remove = confirmation.getByRole("button", { name: "Delete worktree", exact: true })
-  await expect(remove).toBeEnabled()
-  const deleting = page.waitForRequest(
-    (request) => new URL(request.url()).pathname === "/api/worktree" && request.method() === "DELETE",
-  )
-  await remove.click()
-  const request = await deleting
-  expect(new URL(request.url()).searchParams.get("location[directory]")).toBe(directory)
-  expect(request.postDataJSON()).toEqual({ directory: sandboxes[0], force: true })
-  await expect(settings.getByText(sandboxes[0], { exact: true })).toHaveCount(0)
-  await expect(settings.getByText("11 worktrees", { exact: true })).toBeVisible()
-})
-
 test("extensions opens without waiting for MCPs", async ({ page }) => {
  const mcps = Promise.withResolvers<void>()
  await page.route("**/api/mcp", async (route) => {
@@ -225,90 +225,19 @@ test("vertical tabs show project details, resize, and navigate", async ({ page }
  await page.mouse.down()
  await page.mouse.move(resized.x - 200, resized.y + resized.height / 2)
  await page.mouse.up()
-  await expect(sidebar).toHaveCSS("width", "140px")
+  await expect(sidebar).toHaveCSS("width", "130px")

  await tabB.click()
  await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
  await expect(tabB).toBeVisible()
 })

-for (const count of [0, 26]) {
-  test(`vertical navigation labels and icons use the available width with ${count} tabs`, async ({
-    page,
-  }, testInfo) => {
-    await mockServer(page)
-    await page.addInitScript(
-      ({ server, directory, count }) => {
-        localStorage.setItem(
-          "settings.v3",
-          JSON.stringify({
-            appearance: { tabLayout: "vertical" },
-            keybinds: { "home.toggle": "alt+home", "tab.new": "ctrl+shift+n" },
-          }),
-        )
-        localStorage.setItem(
-          "opencode.window.browser.dat:tabs",
-          JSON.stringify(
-            Array.from({ length: count }, (_, index) => ({
-              type: "draft",
-              server,
-              directory,
-              draftID: `draft_navigation_${index}`,
-            })),
-          ),
-        )
-      },
-      { server, directory: sessionA.directory, count },
-    )
-    await page.goto("/")
-
-    const sidebar = page.locator('[data-slot="vertical-tabs-sidebar"]')
-    await expect(sidebar).toHaveCSS("width", "260px")
-    await expect(sidebar.locator("[data-titlebar-tab-slot]")).toHaveCount(count)
-    for (const width of [260, 180, 140]) {
-      if (width !== 260) {
-        const handle = await sidebar.locator('[data-component="resize-handle"]').boundingBox()
-        const bounds = await sidebar.boundingBox()
-        if (!handle || !bounds) throw new Error("vertical tab sidebar has no bounding box")
-        await page.mouse.move(handle.x + handle.width / 2, handle.y + handle.height / 2)
-        await page.mouse.down()
-        await page.mouse.move(handle.x + handle.width / 2 + width - bounds.width, handle.y + handle.height / 2)
-        await page.mouse.up()
-      }
-      await expect(sidebar).toHaveCSS("width", `${width}px`)
-      await testInfo.attach(`navigation-${count}-${width}`, {
-        body: await sidebar.screenshot(),
-        contentType: "image/png",
-      })
-      for (const name of ["Home", "New session"]) {
-        const button = sidebar.getByRole("button", { name, exact: true })
-        const label = button.getByText(name, { exact: true })
-        await expect(label).toBeVisible()
-        await expect
-          .poll(() => label.evaluate((element) => element.scrollWidth - element.clientWidth), { message: name })
-          .toBeLessThanOrEqual(1)
-        await expect(button.locator('[data-slot="icon-svg"]')).toHaveCSS("width", "16px")
-        await button.hover()
-        await expect(button.locator('span[aria-hidden="true"]')).toBeVisible()
-        await expect(button.locator('[data-slot="icon-svg"]')).toHaveCSS("width", "16px")
-        await expect
-          .poll(() => button.evaluate((element) => element.scrollWidth - element.clientWidth))
-          .toBeLessThanOrEqual(1)
-        await page.getByRole("main").hover()
-      }
-    }
-  })
-}
-
 for (const direction of ["ltr", "rtl"]) {
-  test(`vertical tabs keep Status pinned without Settings in ${direction}`, async ({ page }, testInfo) => {
+  test(`vertical tabs keep Settings pinned while scrolling in ${direction}`, async ({ page }, testInfo) => {
    await mockServer(page)
    await page.addInitScript(
      ({ server, sessionA, sessionB, directory }) => {
-        localStorage.setItem(
-          "settings.v3",
-          JSON.stringify({ appearance: { tabLayout: "vertical" }, general: { showStatus: true } }),
-        )
+        localStorage.setItem("settings.v3", JSON.stringify({ appearance: { tabLayout: "vertical" } }))
        localStorage.setItem(
          "opencode.window.browser.dat:tabs",
          JSON.stringify([
@@ -325,27 +254,23 @@ for (const direction of ["ltr", "rtl"]) {
      },
      { server, sessionA: sessionA.id, sessionB: sessionB.id, directory: sessionA.directory },
    )
-    await page.goto(`/server/${base64Encode(server)}/session/${sessionA.id}`)
+    await page.goto("/")

    const sidebar = page.locator('[data-slot="vertical-tabs-sidebar"]')
    const settings = sidebar.getByRole("button", { name: "Settings", exact: true })
-    const status = sidebar.getByRole("button", { name: "Status", exact: true })
    const scroll = sidebar.locator('[data-slot="vertical-tabs-scroll"]')
    const hrefB = `/server/${base64Encode(server)}/session/${sessionB.id}`
    const tabB = sidebar.locator(`[data-titlebar-tab-link][href="${hrefB}"]`)
    await expect(sidebar.locator("[data-titlebar-tab-slot]")).toHaveCount(26)
-    await expect(status).toHaveText("Status")
-    await expect(settings).toHaveCount(0)
-    await expect(status.locator('[data-slot="status-indicator"]')).toBeVisible()
+    await expect(settings).toHaveText("Settings")
    await page.evaluate((direction) => document.documentElement.setAttribute("dir", direction), direction)

    for (const width of [1280, 800]) {
      await page.setViewportSize({ width, height: 360 })
+      await expect(settings).toBeInViewport({ ratio: 1 })
      await expect(sidebar).toHaveCSS("padding-inline-start", "10px")
      await expect(sidebar).toHaveCSS("padding-bottom", "10px")
-      await expect(sidebar.locator('[data-slot="vertical-tabs-footer"]')).toHaveCSS("margin-top", "8px")
-      await expect(status).toBeInViewport({ ratio: 1 })
-      await expect(status).toHaveCSS("height", "28px")
+      await expect(settings).toHaveCSS("margin-top", "8px")
      await expect
        .poll(() =>
          sidebar.locator('[data-slot="vertical-tabs-footer"]').evaluate((element) => {
@@ -360,12 +285,12 @@ for (const direction of ["ltr", "rtl"]) {
      await expect(scroll).toHaveCSS("mask-image", /linear-gradient/)
      await scroll.evaluate((element) => element.scrollTo(0, 0))
      await expect(scroll).toHaveJSProperty("scrollTop", 0)
-      const pinnedStatus = await status.boundingBox()
+      const pinned = await settings.boundingBox()
      await scroll.hover()
      await page.mouse.wheel(0, 200)
      await expect.poll(() => scroll.evaluate((element) => element.scrollTop)).toBeGreaterThan(0)
-      await expect.poll(() => status.boundingBox()).toEqual(pinnedStatus)
-      await testInfo.attach(`vertical-tabs-status-${width}`, {
+      await expect.poll(() => settings.boundingBox()).toEqual(pinned)
+      await testInfo.attach(`vertical-tabs-settings-${width}`, {
        body: await sidebar.screenshot(),
        contentType: "image/png",
      })
@@ -379,14 +304,17 @@ for (const direction of ["ltr", "rtl"]) {
          return !!tab && !!viewport && tab.y + tab.height <= viewport.y + viewport.height - 16
        })
        .toBe(true)
-      await expect.poll(() => status.boundingBox()).toEqual(pinnedStatus)
-      await expect(settings).toHaveCount(0)
+      await expect.poll(() => settings.boundingBox()).toEqual(pinned)
    }

-    await status.click()
-    await expect(status).toHaveAttribute("aria-expanded", "true")
-    await status.press("Escape")
-    await expect(status).toHaveAttribute("aria-expanded", "false")
+    await settings.click()
+    await expect(page.getByTestId("settings-screen")).toBeVisible()
+    await expect(settings).toHaveAttribute("aria-pressed", "true")
+    await sidebar.getByRole("button", { name: "Home", exact: true }).click()
+    await expect(page.getByTestId("settings-screen")).toBeHidden()
+    await settings.focus()
+    await settings.press("Enter")
+    await expect(page.getByTestId("settings-screen")).toBeVisible()
  })
 }

@@ -431,9 +359,9 @@ for (const profile of [
      const hint = button.locator('span[aria-hidden="true"]')
      await expect(hint).toHaveText(row.shortcut)
      await expect(hint.getByText(row.shortcut, { exact: true })).toHaveCSS("direction", "ltr")
-      await expect(hint).toBeHidden()
+      await expect(hint).toHaveCSS("opacity", "0")
      await button.hover()
-      await expect(hint).toBeVisible()
+      await expect(hint).toHaveCSS("opacity", "1")
      await expect
        .poll(() =>
          hint.evaluate((element) => {
@@ -445,7 +373,7 @@ for (const profile of [
        )
        .toBeCloseTo(8, 1)
      await page.getByRole("main").hover()
-      await expect(hint).toBeHidden()
+      await expect(hint).toHaveCSS("opacity", "0")
    }

    const home = sidebar.locator('[data-action="vertical-tabs-home"]')
@@ -453,10 +381,10 @@ for (const profile of [
    await home.focus()
    await page.keyboard.press("Tab")
    await expect(newSession).toBeFocused()
-    await expect(newSession.locator('span[aria-hidden="true"]')).toBeVisible()
+    await expect(newSession.locator('span[aria-hidden="true"]')).toHaveCSS("opacity", "1")
    await page.keyboard.press("Shift+Tab")
    await expect(home).toBeFocused()
-    await expect(home.locator('span[aria-hidden="true"]')).toBeVisible()
+    await expect(home.locator('span[aria-hidden="true"]')).toHaveCSS("opacity", "1")
  })
 }

@@ -632,12 +560,7 @@ async function mockServer(page: Page) {
        url.pathname === "/api/project" ? [project] : { id: project.id, directory: sessionA.directory },
      )
    }
-    if (url.pathname === "/api/location")
-      return json(route, {
-        directory: sessionA.directory,
-        project: { id: sessionA.projectID, directory: sessionA.directory, canonical: sessionA.directory },
-      })
-    if (url.pathname === "/api/worktree") return json(route, [{ directory: sessionA.directory }])
+    if (url.pathname === "/api/location") return json(route, { directory: sessionA.directory })
    if (url.pathname === "/api/vcs")
      return json(route, {
        location: { directory: sessionA.directory },
@@ -67,12 +67,12 @@ for (const theme of ["light", "dark"] as const) {
          await testInfo.attach("workspace-accent", { path, contentType: "image/png" })
        }

-        await expectBackground(view.send, "icon-button-contrast")
+        await expectBackground(view.send, "contrast")
        await view.send.hover()
-        await expectBackground(view.send, "icon-button-contrast")
+        await expectBackground(view.send, "contrast")
        await view.composer.locator('[data-action="composer-model"]').press("Tab")
        await expect(view.send).toBeFocused()
-        await expectBackground(view.send, "icon-button-contrast")
+        await expectBackground(view.send, "contrast")
        const message = page.locator('[data-slot="user-message-text"]')
        await expect(message).toHaveText("Check this fixture workspace.")
        await expectToken(
@@ -92,14 +92,12 @@ for (const theme of ["light", "dark"] as const) {
      const view = await openSession(page, workspace, [{ directory: root }])
      await view.input.fill("Keep this draft while the inventory changes.")
      await expect(view.send).toBeEnabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      const url = page.url()

      const refreshed = page.waitForResponse(
        (response) =>
-          new URL(response.url()).pathname === "/api/worktree" &&
-          new URL(response.url()).searchParams.get("location[directory]") === root &&
-          response.request().method() === "GET",
+          new URL(response.url()).pathname === `/api/worktree/${projectID}` && response.request().method() === "GET",
      )
      view.worktrees.push({ directory: workspace, strategy: "git" })
      view.events.push({
@@ -109,14 +107,14 @@ for (const theme of ["light", "dark"] as const) {
        data: { projectID },
      })
      expect((await refreshed).ok()).toBe(true)
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await expect(page).toHaveURL(url)
      await expect(view.input).toHaveText("Keep this draft while the inventory changes.")
      await expect(view.send).toBeEnabled()

      await view.input.fill("")
      await expect(view.send).toBeDisabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")

      view.events.push({
        id: "evt_workspace_accent_running",
@@ -127,29 +125,29 @@ for (const theme of ["light", "dark"] as const) {
      })
      const stop = view.composer.getByRole("button", { name: "Stop", exact: true })
      await expect(stop).toBeEnabled()
-      await expectBackground(stop, "icon-button-contrast")
+      await expectBackground(stop, "contrast")

      await view.input.fill("Send a follow-up instead of stopping.")
      await expect(view.send).toBeEnabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await expect(page).toHaveURL(url)
    })

    test("new workspace send button stays neutral", async ({ page }) => {
      const view = await openSession(page, root, [...inventory], true)
      await expect(view.send).toBeDisabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await page.getByRole("button", { name: "Local", exact: true }).click()
      await page.getByRole("menuitem", { name: "New worktree", exact: true }).click()
      await expect(page.getByRole("button", { name: "New worktree", exact: true })).toBeVisible()
      await view.input.fill("Inspect this fixture workspace.")
      await expect(view.send).toBeEnabled()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await view.send.hover()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
      await view.composer.locator('[data-action="composer-model"]').press("Tab")
      await expect(view.send).toBeFocused()
-      await expectBackground(view.send, "icon-button-contrast")
+      await expectBackground(view.send, "contrast")
    })
  })
 }
@@ -201,13 +199,10 @@ async function openSession(page: Page, directory: string, worktrees = [...invent
    events: () => events.splice(0),
  })
  // Keep authoritative inventory independent of the raw project's empty sandboxes.
-  await page.route(
-    (url) => url.pathname === "/api/worktree",
-    (route) => {
-      if (route.request().method() !== "GET") return route.fallback()
-      return route.fulfill({ json: worktrees, headers: { "access-control-allow-origin": "*" } })
-    },
-  )
+  await page.route(`**/api/worktree/${projectID}`, (route) => {
+    if (route.request().method() !== "GET") return route.fallback()
+    return route.fulfill({ json: worktrees, headers: { "access-control-allow-origin": "*" } })
+  })
  if (draft)
    await page.addInitScript(
      ({ root, server }) => {
@@ -227,9 +222,7 @@ async function openSession(page: Page, directory: string, worktrees = [...invent
    )
  const loaded = page.waitForResponse(
    (response) =>
-      new URL(response.url()).pathname === "/api/worktree" &&
-      new URL(response.url()).searchParams.get("location[directory]") === root &&
-      response.request().method() === "GET",
+      new URL(response.url()).pathname === `/api/worktree/${projectID}` && response.request().method() === "GET",
  )
  await page.goto(
    draft ? "/new-session?draftId=draft_workspace_accent" : `/server/${base64Encode(server)}/session/${sessionID}`,
@@ -71,23 +71,27 @@ const Group = HttpApiGroup.make("mock")
  .add(HttpApiEndpoint.get("projectList", "/api/project", { success: Json }))
  .add(HttpApiEndpoint.get("projectCurrent", "/api/project/current", { success: Json }))
  .add(
-    HttpApiEndpoint.get("worktreeList", "/api/worktree", {
+    HttpApiEndpoint.get("worktreeList", "/api/worktree/:projectID", {
+      params: { projectID: Schema.String },
      success: Json,
    }),
  )
  .add(
-    HttpApiEndpoint.post("worktreeCreate", "/api/worktree", {
+    HttpApiEndpoint.post("worktreeCreate", "/api/worktree/:projectID", {
+      params: { projectID: Schema.String },
      payload: JsonPayload,
      success: Json,
    }),
  )
  .add(
-    HttpApiEndpoint.delete("worktreeRemove", "/api/worktree", {
+    HttpApiEndpoint.delete("worktreeRemove", "/api/worktree/:projectID", {
+      params: { projectID: Schema.String },
      success: NoContent,
    }),
  )
  .add(
-    HttpApiEndpoint.post("worktreeRefresh", "/api/worktree/refresh", {
+    HttpApiEndpoint.post("worktreeRefresh", "/api/worktree/:projectID/refresh", {
+      params: { projectID: Schema.String },
      success: NoContent,
    }),
  )
@@ -55,8 +55,6 @@ function ComposerStory(props: {
  label?: string
  inspectRequest?: boolean
  continueOnStop?: boolean
-  longLabels?: boolean
-  alternate?: "queue" | "steer"
 }) {
  const [draft, setDraft] = createStore<ComposerPersistedState>({
    prompt: props.prompt ?? [{ type: "text", content: "", start: 0, end: 0 }],
@@ -68,15 +66,11 @@ function ComposerStory(props: {
    activity: props.label ?? "Ready",
    variant: STORY_MODEL.variant,
  })
-  const modelOption = createMemo(() => ({
-    ...selectedModel,
-    name: props.longLabels ? "Claude Sonnet with an unusually long model name" : selectedModel.name,
-  }))
  const modelSelection = {
    ready: Object.assign(() => true, { promise: undefined }),
-    current: () => modelOption(),
-    recent: () => [modelOption()],
-    list: () => [modelOption()],
+    current: () => selectedModel,
+    recent: () => [selectedModel],
+    list: () => [selectedModel],
    cycle() {},
    set() {},
    visible: () => true,
@@ -132,7 +126,7 @@ function ComposerStory(props: {
      placeholder: () => "Ask anything, / for commands, @ for context...",
      agent: {
        options: () => [
-          { id: "build", label: props.longLabels ? "Build agent with an unusually long name" : "build" },
+          { id: "build", label: "build" },
          { id: "review", label: "review" },
        ],
        current: () => "build",
@@ -141,7 +135,7 @@ function ComposerStory(props: {
      variant: {
        options: () => [
          { id: "default", label: "default" },
-          { id: "balanced", label: props.longLabels ? "Balanced reasoning with an extended label" : "balanced" },
+          { id: "balanced", label: "balanced" },
          { id: "high", label: "high" },
        ],
        current: () => story.variant,
@@ -150,17 +144,6 @@ function ComposerStory(props: {
      submit: {
        stopping: () => !!props.stopping,
        working: () => !!props.working,
-        queue: props.alternate
-          ? {
-              count: () => 0,
-              delivery: () => (props.alternate === "queue" ? "steer" : "queue"),
-              alternate: () => props.alternate,
-              editing: () => undefined,
-              confirmEdit() {},
-              cancelEdit() {},
-              editFirst: () => false,
-            }
-          : undefined,
        onSubmit: () => {
          const value = draft.prompt.map((part) => ("content" in part ? part.content : `[${part.filename}]`)).join("")
          const request = props.inspectRequest
@@ -307,21 +290,6 @@ export const NarrowLayout = {
  ),
 }

-export const ToolbarOverflow = {
-  args: { alternate: "queue" },
-  argTypes: { alternate: { control: "select", options: ["none", "queue", "steer"] } },
-  render: (args: { alternate: "none" | "queue" | "steer" }) => (
-    <div class="w-[min(420px,calc(100vw-80px))]">
-      <ComposerStory
-        longLabels
-        working
-        prompt={text("Keep all controls reachable when the toolbar overflows")}
-        alternate={args.alternate === "none" ? undefined : args.alternate}
-      />
-    </div>
-  ),
-}
-
 export const DemoFirstClassSkillIDs = {
  name: "Demo: First-class skill IDs",
  render: () => (
@@ -2,36 +2,12 @@
  content: "\200B";
 }

-/* Masks only cover hidden content; they do not reserve space in the toolbar. */
-[data-slot="composer-controls"][data-overflow-start="true"] {
-  --mask-start: 16px;
-}
-
-[data-slot="composer-controls"][data-overflow-end="true"] {
-  --mask-end: 16px;
-}
-
-[data-slot="composer-controls"]:dir(rtl) {
-  --mask-direction: to left;
-}
-
-[data-slot="composer-controls"]:is([data-overflow-start="true"], [data-overflow-end="true"]) {
-  mask-image: linear-gradient(
-    var(--mask-direction, to right),
-    transparent,
-    black var(--mask-start, 0px),
-    black calc(100% - var(--mask-end, 0px)),
-    transparent
-  );
-}
-
 [data-component="composer"]:not(:hover) .composer-variant-default:not(:focus-visible, [data-expanded]) {
  opacity: 0;
  pointer-events: none;
 }

 [data-color-scheme="dark"] [data-component="composer"][data-dock-border-underlay="true"],
-[data-color-scheme="dark"] [data-component="session-composer-dock"] [data-component="composer"],
 [data-color-scheme="dark"] [data-component="new-session"] [data-component="composer"] {
  background: var(--v2-background-bg-layer-01);
 }
@@ -1,5 +1,4 @@
-import { createEffect, createMemo, createSignal, For, onCleanup, onMount, Show, type JSX } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createEffect, createMemo, createSignal, For, Show, type JSX } from "solid-js"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
@@ -57,23 +56,6 @@ export function ComposerEditor(props: ComposerEditorProps) {
  const view = props.controller.view
  let editor: HTMLDivElement | undefined
  let viewport: HTMLDivElement | undefined
-  let controlsViewport!: HTMLDivElement
-  let controlsContent!: HTMLDivElement
-  const [overflow, setOverflow] = createStore({ start: false, end: false })
-  const updateOverflow = () => {
-    const offset = Math.abs(controlsViewport.scrollLeft)
-    setOverflow({
-      start: offset > 1,
-      end: controlsViewport.scrollWidth - controlsViewport.clientWidth - offset > 1,
-    })
-  }
-  onMount(() => {
-    const observer = new ResizeObserver(updateOverflow)
-    observer.observe(controlsViewport)
-    observer.observe(controlsContent)
-    updateOverflow()
-    onCleanup(() => observer.disconnect())
-  })
  let localInput = false
  const updateCursor = () => {
    if (!editor || !window.getSelection()?.isCollapsed) return
@@ -244,7 +226,7 @@ export function ComposerEditor(props: ComposerEditorProps) {

        <div class="flex h-11 items-center px-2">
          <div
-            class="flex shrink-0 items-center"
+            class="flex min-w-0 flex-1 items-center gap-1"
            aria-hidden={state.mode === "shell"}
            inert={state.mode === "shell" ? true : undefined}
            style={buttons()}
@@ -263,80 +245,64 @@ export function ComposerEditor(props: ComposerEditorProps) {
              onContext={props.controller.openContext}
              onShell={props.controller.openShell}
            />
-          </div>
-          <div
-            ref={controlsViewport}
-            data-slot="composer-controls"
-            data-overflow-start={overflow.start}
-            data-overflow-end={overflow.end}
-            class="ms-1 me-3 h-full min-w-0 flex-1 overflow-x-auto overscroll-x-contain no-scrollbar"
-            onScroll={updateOverflow}
-            aria-hidden={state.mode === "shell"}
-            inert={state.mode === "shell" ? true : undefined}
-            style={buttons()}
-          >
-            <div ref={controlsContent} class="flex h-full w-max min-w-full items-center gap-1">
-              <Show when={view.agent} keyed>
+            <Show when={view.agent} keyed>
+              {(control) => (
+                <ComposerEditorConfiguredSelect
+                  title={i18n.t("ui.promptInput.chooseAgent")}
+                  keybind={["Mod", "."]}
+                  control={control}
+                />
+              )}
+            </Show>
+            <Show when={props.modelControlsVisible ?? true}>
+              {props.modelControl}
+              <Show when={view.variant} keyed>
                {(control) => (
-                  <ComposerEditorConfiguredSelect
-                    title={i18n.t("ui.promptInput.chooseAgent")}
-                    keybind={["Mod", "."]}
-                    control={control}
-                  />
+                  <Show when={control.options().length > 1}>
+                    <ComposerEditorConfiguredSelect
+                      title={i18n.t("ui.promptInput.chooseVariant")}
+                      keybind={["Shift", "Mod", "D"]}
+                      control={control}
+                      class={control.current() === "default" ? "composer-variant-default" : undefined}
+                    />
+                  </Show>
                )}
              </Show>
-              <Show when={props.modelControlsVisible ?? true}>
-                {props.modelControl}
-                <Show when={view.variant} keyed>
-                  {(control) => (
-                    <Show when={control.options().length > 1}>
-                      <ComposerEditorConfiguredSelect
-                        title={i18n.t("ui.promptInput.chooseVariant")}
-                        keybind={["Shift", "Mod", "D"]}
-                        control={control}
-                        class={control.current() === "default" ? "composer-variant-default" : undefined}
-                      />
-                    </Show>
-                  )}
-                </Show>
-              </Show>
-            </div>
+            </Show>
          </div>
-          <div data-slot="composer-actions" class="flex shrink-0 items-center">
-            <Show when={state.mode === "normal"}>
-              <ComposerEditorAlternateDelivery
-                controller={props.controller}
-                keybind={props.alternateKeybind ?? ["Mod", "Enter"]}
-              />
-            </Show>
-            <Show when={state.mode === "shell"}>
-              <Button
-                data-action="composer-exit-shell"
-                type="button"
-                variant="ghost-faint"
-                size="small"
-                class="me-3 gap-1.5 px-1.5"
-                onClick={() => {
-                  props.controller.dispatch({ type: "mode.normal" })
-                  props.controller.restoreFocus()
-                }}
-              >
-                {i18n.t("ui.promptInput.exitShell")}
-                <span class="hidden sm:block">
-                  <Keybind keys={props.exitShellKeybind ?? ["ESC"]} variant="neutral" />
-                </span>
-              </Button>
-            </Show>
-            <ComposerEditorSubmitButton
-              mode={state.mode}
-              stopping={view.submit.stopping()}
-              disabled={!props.controller.canSubmit()}
-              sendLabel={i18n.t("ui.promptInput.send")}
-              stopLabel={i18n.t("ui.promptInput.stop")}
-              onSubmit={() => props.controller.submit()}
-              onStop={props.controller.stop}
+          <Show when={state.mode === "normal"}>
+            <ComposerEditorAlternateDelivery
+              controller={props.controller}
+              keybind={props.alternateKeybind ?? ["Mod", "Enter"]}
            />
-          </div>
+          </Show>
+          <Show when={state.mode === "shell"}>
+            <Button
+              data-action="composer-exit-shell"
+              type="button"
+              variant="ghost-faint"
+              size="small"
+              class="me-3 gap-1.5 px-1.5"
+              onClick={() => {
+                props.controller.dispatch({ type: "mode.normal" })
+                props.controller.restoreFocus()
+              }}
+            >
+              {i18n.t("ui.promptInput.exitShell")}
+              <span class="hidden sm:block">
+                <Keybind keys={props.exitShellKeybind ?? ["ESC"]} variant="neutral" />
+              </span>
+            </Button>
+          </Show>
+          <ComposerEditorSubmitButton
+            mode={state.mode}
+            stopping={view.submit.stopping()}
+            disabled={!props.controller.canSubmit()}
+            sendLabel={i18n.t("ui.promptInput.send")}
+            stopLabel={i18n.t("ui.promptInput.stop")}
+            onSubmit={() => props.controller.submit()}
+            onStop={props.controller.stop}
+          />
        </div>
      </form>
    </div>
@@ -842,7 +808,11 @@ export function ComposerEditorSubmitButton(props: {
        tabIndex={props.mode === "normal" ? undefined : -1}
        icon={<Icon name={props.stopping ? "stop" : props.mode === "shell" ? "arrow-undo-down" : "arrow-up"} />}
        variant="contrast"
-        class="size-7 rounded-md p-[6px] disabled:opacity-50"
+        class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted shadow-[var(--v2-elevation-button-contrast)] disabled:opacity-50"
+        style={{
+          "background-image":
+            "linear-gradient(180deg,var(--v2-alpha-light-20) 0%,var(--v2-alpha-light-0) 100%),linear-gradient(90deg,var(--v2-background-bg-contrast) 0%,var(--v2-background-bg-contrast) 100%)",
+        }}
        aria-label={props.stopping ? props.stopLabel : props.sendLabel}
        onClick={(event) => {
          event.preventDefault()
@@ -34,14 +34,6 @@ export function createHomeController() {
    const conn = list[0]
    if (conn) setSelection({ server: ServerConnection.key(conn) })
  })
-  createEffect(() => {
-    const ctx = focusedServerCtx()
-    const id = selectedProject()?.id
-    if (!ctx || !id || ctx.sdk.connection.status() !== "connected") return
-    // Selecting a project is the demand for its worktree inventory: the session filter spans its worktrees.
-    const root = ctx.sync.data.project.find((project) => project.id === id)?.worktree
-    if (root) void ctx.sync.worktrees.load(root)
-  })

  function setSelection(next: HomeProjectSelection) {
    layout.home.setSelection(next)
@@ -27,7 +27,7 @@ import { sessionLabel, sessionTitle } from "@/session/title"
 import { showToast } from "@/shell/notifications/toast"
 import { archiveHomeSession } from "./archive"
 import type { HomeController } from "../model"
-import { buildHomeSessionRecords, homeProjectForSession, type HomeSessionRecord } from "./records"
+import { buildHomeSessionRecords, type HomeSessionRecord } from "./records"

 export type { HomeSessionRecord } from "./records"

@@ -270,7 +270,14 @@ export function createHomeSessionsController(home: HomeController) {
      },
      create: home.project.openNewSession,
      open: (session: SessionInfo, options?: OpenSessionOptions) => {
-        const project = homeProjectForSession(session, home.project.list())
+        const directoryKey = pathKey(session.location.directory)
+        const project = home.project
+          .list()
+          .find(
+            (item) =>
+              pathKey(item.worktree) === directoryKey ||
+              item.sandboxes?.some((sandbox) => pathKey(sandbox) === directoryKey),
+          )
        const conn = home.server.focused()
        if (!conn) return
        const connKey = ServerConnection.key(conn)
@@ -36,26 +36,4 @@ describe("buildHomeSessionRecords", () => {

    expect(records.map((record) => record.session.id)).toEqual(["a"])
  })
-
-  test("labels a worktree session with its project before that project's inventory has loaded", () => {
-    const records = buildHomeSessionRecords({
-      sessions: () => [session("w", "/repo/a/.worktrees/feature", "project-a")],
-      projectDirectories: () => undefined,
-      projects: () => [{ ...opened, name: "Project A" }],
-    })
-
-    expect(records[0]?.project).toMatchObject({ id: "project-a", worktree: "/repo/a" })
-    expect(records[0]?.projectName).toBe("Project A")
-  })
-
-  test("prefers the added project whose directory matches over a sibling entry with the same ID", () => {
-    const nested = { id: "project-a", worktree: "/repo/a/packages/app", expanded: true } as LocalProject
-    const records = buildHomeSessionRecords({
-      sessions: () => [session("n", "/repo/a/packages/app", "project-a")],
-      projectDirectories: () => undefined,
-      projects: () => [opened, nested],
-    })
-
-    expect(records[0]?.project.worktree).toBe("/repo/a/packages/app")
-  })
 })
@@ -22,7 +22,13 @@ export function buildHomeSessionRecords(input: {
  return [...new Map(sessions.map((session) => [session.id, session] as const)).values()]
    .sort(compareSessionTime)
    .map((session) => {
-      const project = homeProjectForSession(session, input.projects()) ?? {
+      const directory = pathKey(session.location.directory)
+      const project = input
+        .projects()
+        .find(
+          (item) =>
+            pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
+        ) ?? {
        id: session.projectID,
        worktree: session.location.directory,
        expanded: false,
@@ -30,18 +36,3 @@ export function buildHomeSessionRecords(input: {
      return { session, project, projectName: displayName(project) }
    })
 }
-
-// Worktree inventories load on demand, so a worktree session may not match any directory yet;
-// the session's project ID still identifies its added project.
-export function homeProjectForSession<T extends { id?: string; worktree: string; sandboxes?: readonly string[] }>(
-  session: SessionInfo,
-  projects: readonly T[],
-) {
-  const directory = pathKey(session.location.directory)
-  return (
-    projects.find(
-      (item) =>
-        pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
-    ) ?? projects.find((item) => item.id === session.projectID)
-  )
-}
@@ -1,2 +1,2 @@
-/** Allows the prompt to extend 80px beyond each side of the 720px wordmark. */
-export const NEW_SESSION_CONTENT_WIDTH = "w-full max-w-[880px] px-0"
+/** Inline new-session content width — keep in sync with session composer `placement === "inline"`. */
+export const NEW_SESSION_CONTENT_WIDTH = "w-full max-w-[720px] px-0"
@@ -1,6 +1,7 @@
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Icon } from "@opencode-ai/ui/icon"
+import { Wordmark } from "@opencode-ai/ui/wordmark"
 import { Show, createMemo, createSignal } from "solid-js"
 import { Schema } from "effect"
 import createPresence from "solid-presence"
@@ -22,7 +23,6 @@ import { NEW_SESSION_CONTENT_WIDTH } from "@/new-session/layout"
 import { Persist, persisted } from "@/runtime/persistence/storage"
 import { Persistence } from "@/runtime/persistence/schema"
 import type { NewSessionWorkspaceController } from "./workspace/controller"
-import { NewSessionWordmark } from "./wordmark"

 const providerTipDismissalDuration = 30 * 24 * 60 * 60 * 1000

@@ -61,7 +61,7 @@ export function NewSessionView(props: {
        />
        <div class="absolute inset-x-0 top-[25.375%] flex justify-center px-6">
          <div class={NEW_SESSION_CONTENT_WIDTH}>
-            <NewSessionWordmark />
+            <Wordmark class="h-auto w-full text-v2-background-bg-inverse" />
            <div class="mt-8 flex flex-col gap-8">
              <Composer model={props.composer} />
              <Show when={props.project.empty()}>
@@ -1,43 +0,0 @@
-[data-component="new-session-wordmark"] {
-  --wordmark-shimmer-opacity: 0.45;
-
-  .wordmark-shimmer {
-    /* Blend above the base logo's opacity so the sweep only adds light in either theme. */
-    color: white;
-    mix-blend-mode: screen;
-    opacity: 0;
-    mask-image: linear-gradient(to right, transparent 40%, black 50%, transparent 60%);
-    mask-size: 300% 100%;
-    mask-repeat: no-repeat;
-    animation: new-session-wordmark-shimmer 800ms linear both;
-  }
-}
-
-[data-color-scheme="dark"] [data-component="new-session-wordmark"] {
-  /* Preserve the previous dark highlight strength: 0.16 × 0.7 × 0.6. */
-  --wordmark-shimmer-opacity: 0.0672;
-}
-
-/* Oversizing the mask moves its highlight physically left to right, including in RTL. */
-@keyframes new-session-wordmark-shimmer {
-  0% {
-    mask-position: 100% 0;
-    opacity: 0;
-  }
-  20%,
-  80% {
-    opacity: var(--wordmark-shimmer-opacity);
-  }
-  100% {
-    mask-position: 0% 0;
-    opacity: 0;
-  }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  [data-component="new-session-wordmark"] {
-    .wordmark-shimmer {
-      animation: none;
-    }
-  }
-}
@@ -1,11 +0,0 @@
-import { NewSessionWordmark } from "./wordmark"
-
-export default {
-  title: "App/New Session/Wordmark",
-  id: "app-new-session-wordmark",
-  component: NewSessionWordmark,
-}
-
-export const Reveal = {
-  render: () => <NewSessionWordmark />,
-}
@@ -1,17 +0,0 @@
-import { Wordmark } from "@opencode-ai/ui/wordmark"
-import "./wordmark.css"
-
-export function NewSessionWordmark() {
-  return (
-    <div
-      data-component="new-session-wordmark"
-      aria-hidden="true"
-      class="pointer-events-none mx-auto w-full max-w-[720px] text-v2-background-bg-inverse"
-    >
-      <div data-slot="wordmark-reveal" class="relative">
-        <Wordmark fade={false} class="block h-auto w-full opacity-60 [[data-color-scheme=dark]_&]:opacity-50" />
-        <Wordmark fade={false} muted={false} class="wordmark-shimmer absolute inset-0 h-auto w-full" />
-      </div>
-    </div>
-  )
-}
@@ -1,6 +0,0 @@
-import { expect, test } from "bun:test"
-import { popularProviders } from "./order"
-
-test("lists OpenCode Go before Zen and other popular providers", () => {
-  expect(popularProviders.slice(0, 2)).toEqual(["opencode-go", "opencode"])
-})
@@ -1,6 +1,6 @@
 export const popularProviders = [
-  "opencode-go",
  "opencode",
+  "opencode-go",
  "anthropic",
  "github-copilot",
  "openai",
@@ -110,7 +110,7 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
    active: undefined as string | undefined,
    connecting: undefined as string | undefined,
  })
-  const featured = ["opencode-go", "opencode", "anthropic", "openai", "google", "openrouter", "vercel"]
+  const featured = ["opencode", "opencode-go", "anthropic", "openai", "google", "openrouter", "vercel"]
  const custom = () => ({ id: CUSTOM_ID, name: language.t("dialog.provider.custom.label") })
  const all = createMemo(() => {
    language.locale()
@@ -13,7 +13,7 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { ModelTooltip } from "./tooltip"

 type ModelState = ReturnType<typeof useLocal>["model"]
-const featuredProviders = ["opencode-go", "opencode", "openai", "anthropic", "google", "github-copilot"]
+const featuredProviders = ["opencode", "opencode-go", "openai", "anthropic", "google", "github-copilot"]
 const displayModelName = (name: string) => name.replace(/\s+(?:\(free\)|free)$/i, "")

 export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props) => {
@@ -676,7 +676,7 @@ export const dict = {
  "session.error.incompatible.description":
    "{{server}} is running OpenCode {{version}}, which isn't compatible with this app. Upgrade the server to OpenCode V2 to continue.",
  "session.background.moveTasks": "Move {{tasks}} to background",
-  "session.background.moveRunning": "Move to background",
+  "session.background.moveRunning": "Move running work to background",
  "session.background.inBackground": "Running {{tasks}} in background",
  "session.background.moveInline": "Press {{keybind}} to move running work to the background",
  "session.background.running": "Running work in background",
@@ -736,16 +736,6 @@ export const dict = {
  "session.todo.expand": "Expand",
  "session.todo.progress": "{{done}} of {{total}} todos completed",
  "session.question.progress": "{{current}} of {{total}} questions",
-  "session.websearch.title": "Third-party web search",
-  "session.websearch.description": "Select the search provider agents use to search the web",
-  "session.websearch.provider": "Search provider",
-  "session.websearch.any": "Any",
-  "session.websearch.disable": "Don’t use search",
-  "session.websearch.enable": "Enable",
-  "session.websearch.loadFailed": "Could not load search providers.",
-  "session.websearch.empty": "No search providers available.",
-  "session.websearch.failed": "Could not save your choice. Please try again.",
-  "session.websearch.retry": "Retry",
  "session.question.minimize": "Minimize question",
  "session.question.restore": "Restore question",
  "session.question.pending.one": "{{count}} pending question",
@@ -1055,8 +1045,8 @@ export const dict = {
  "settings.general.row.showTerminal.description": "Show the terminal button in the desktop title bar",
  "settings.general.row.showStatus.title": "Server status",
  "settings.general.row.showStatus.description": "Show the server status button in the title bar",
-  "settings.general.row.showProjectIcon.title": "Show project icon",
-  "settings.general.row.showProjectIcon.description": "Show project icon in session header",
+  "settings.general.row.showProjectIcon.title": "Project icon",
+  "settings.general.row.showProjectIcon.description": "Show the project icon in the session header",
  "settings.general.row.mobileTitlebarBottom.title": "Bottom navigation",
  "settings.general.row.mobileTitlebarBottom.description": "Place the title bar at the bottom of the screen on mobile",
  "settings.general.row.mobileDiffWrap.description":
@@ -6,7 +6,6 @@ import { createApiForServer, type ServerApi } from "@/runtime/server/api"
 import { usePlatform } from "@/runtime/platform/platform"
 import { ServerConnection } from "./registry"
 import { createRefCountMap } from "@/runtime/server/refcount"
-import { createRequestQueue } from "@/runtime/server/request-queue"
 import { ServerScope } from "@/runtime/server/scope"
 import { useServer } from "./current"

@@ -115,9 +114,8 @@ export function createServerTransport(input: { http: ServerConnection.HttpBase;
  readonly api: ServerApi
  readonly pty: ReturnType<typeof createPtyClient>
 } {
-  const queue = createRequestQueue({ fetch: input.fetch ?? globalThis.fetch })
  const build = (http: ServerConnection.HttpBase) => {
-    const api = createApiForServer({ server: http, fetch: queue.fetch })
+    const api = createApiForServer({ server: http, fetch: input.fetch })
    return { http, api, pty: createPtyClient(api, { url: http.url }) }
  }
  const state = { current: build(input.http) }
@@ -6,7 +6,9 @@ import { bootstrapGlobal, loadPathQuery, loadProjectsQuery } from "./bootstrap"
 import { ServerScope } from "@/runtime/server/scope"
 import type { ServerApi } from "@/runtime/server/api"
 import type { ServerSync } from "@/runtime/server/sync"
-import { worktreeInventoryKey } from "@/workspaces/inventory"
+
+type ProjectApi = ServerApi["project"]
+type WorktreeApi = ServerApi["worktree"]

 test("bootstraps projects through the native store setter and preserves subsequent updates", async () => {
  const api = OpenCode.make({
@@ -21,6 +23,7 @@ test("bootstraps projects through the native store setter and preserves subseque
          })
        if (url.pathname === "/api/project")
          return Response.json([{ id: "project", canonical: "/repo", time: { created: 1, updated: 1 }, sandboxes: [] }])
+        if (url.pathname === "/api/worktree") return Response.json([{ directory: "/repo" }])
        throw new Error(`Unexpected request: ${url.pathname}`)
      },
      { preconnect() {} },
@@ -47,18 +50,6 @@ test("bootstraps projects through the native store setter and preserves subseque
    await bootstrapGlobal({ serverAPI: api, scope: ServerScope.local, setGlobalStore: setStore, queryClient })
    expect(store.project.map((project) => [project.id, project.worktree])).toEqual([["project", "/repo"]])
    expect(store.config).toEqual({})
-
-    // A refetch keeps the inventory a view already loaded for this project.
-    queryClient.setQueryData(worktreeInventoryKey(ServerScope.local, "/repo/"), [
-      { directory: "/repo" },
-      { directory: "/repo/feature", strategy: "git" },
-    ])
-    await bootstrapGlobal({ serverAPI: api, scope: ServerScope.local, setGlobalStore: setStore, queryClient })
-    expect(store.project[0]?.sandboxes).toEqual(["/repo/feature"])
-    expect(store.project[0]?.worktrees).toEqual([
-      { directory: "/repo" },
-      { directory: "/repo/feature", strategy: "git" },
-    ])
  } finally {
    queryClient.clear()
  }
@@ -88,39 +79,58 @@ describe("query keys", () => {
    expect(result).toMatchObject({ directory: "/repo/subpath", worktree: "/repo" })
  })

-  test("loads project metadata without enumerating any project's worktrees", async () => {
-    const requests: string[] = []
-    const api = OpenCode.make({
-      baseUrl: "http://localhost:3000",
-      fetch: Object.assign(
-        async (input: RequestInfo | URL, init?: RequestInit) => {
-          const url = new URL(new Request(input, init).url)
-          requests.push(url.pathname)
-          if (url.pathname !== "/api/project") throw new Error(`Unexpected request: ${url}`)
-          return Response.json([
-            ...Array.from({ length: 300 }, (_, index) => ({
-              id: `historical-${index.toString().padStart(3, "0")}`,
-              canonical: `/history/${index}`,
-              time: { created: 1, updated: 1 },
-              sandboxes: [],
-            })),
-            { id: "b", canonical: "/b", time: { created: 1, updated: 1 }, sandboxes: [] },
-            { id: "a", canonical: "/a", time: { created: 1, updated: 1 }, sandboxes: ["/a/legacy"] },
-            { id: "test", canonical: "/tmp/opencode-test-1", time: { created: 1, updated: 1 }, sandboxes: [] },
-          ])
-        },
-        { preconnect() {} },
-      ),
-    })
+  test("loads projects from the current endpoint", async () => {
+    const calls: string[] = []
+    const projects = {
+      list: async () => [
+        { id: "b", canonical: "/b", time: { created: 1, updated: 1 }, sandboxes: [] },
+        { id: "a", canonical: "/a", time: { created: 1, updated: 1 }, sandboxes: [] },
+      ],
+    } as unknown as ProjectApi
+    const worktrees = {
+      list: async ({ projectID }: { projectID: string }) => {
+        calls.push(projectID)
+        return [
+          { directory: `/${projectID}` },
+          { directory: `/${projectID}/clone` },
+          { directory: `/${projectID}/copy`, strategy: "git" },
+        ]
+      },
+    } as unknown as WorktreeApi

-    const result = await new QueryClient().fetchQuery(loadProjectsQuery(ServerScope.local, api.project))
+    const result = await new QueryClient().fetchQuery(loadProjectsQuery(ServerScope.local, projects, worktrees))

-    expect(requests).toEqual(["/api/project"])
-    expect(result).toHaveLength(302)
-    expect(result.slice(0, 2)).toMatchObject([
-      { id: "a", worktree: "/a", sandboxes: ["/a/legacy"], worktrees: [{ directory: "/a" }] },
-      { id: "b", worktree: "/b", sandboxes: [], worktrees: [{ directory: "/b" }] },
+    expect(result.map((project) => project.id)).toEqual(["a", "b"])
+    expect(result.map((project) => project.sandboxes)).toEqual([
+      ["/a/clone", "/a/copy"],
+      ["/b/clone", "/b/copy"],
+    ])
+    expect(result.map((project) => project.worktrees)).toEqual([
+      [{ directory: "/a" }, { directory: "/a/clone" }, { directory: "/a/copy", strategy: "git" }],
+      [{ directory: "/b" }, { directory: "/b/clone" }, { directory: "/b/copy", strategy: "git" }],
+    ])
+    expect(calls.toSorted()).toEqual(["a", "b"])
+  })
+
+  test("keeps projects whose directory inventory cannot load", async () => {
+    const projects = {
+      list: async () => [
+        { id: "a", canonical: "/a", time: { created: 1, updated: 1 }, sandboxes: [] },
+        { id: "b", canonical: "/b", time: { created: 1, updated: 1 }, sandboxes: [] },
+      ],
+    } as unknown as ProjectApi
+    const worktrees = {
+      list: async ({ projectID }: { projectID: string }) => {
+        if (projectID === "b") throw new Error("unavailable")
+        return [{ directory: "/a/copy", strategy: "git" as const }]
+      },
+    } as unknown as WorktreeApi
+
+    const result = await new QueryClient().fetchQuery(loadProjectsQuery(ServerScope.local, projects, worktrees))
+
+    expect(result.map((project) => ({ id: project.id, sandboxes: project.sandboxes }))).toEqual([
+      { id: "a", sandboxes: ["/a/copy"] },
+      { id: "b", sandboxes: [] },
    ])
-    expect(result.some((project) => project.id === "test")).toBe(false)
  })
 })
@@ -15,7 +15,8 @@ import { cmp, normalizeProjectInfo } from "./utils"
 import { formatServerError } from "@/runtime/server/errors"
 import { QueryClient, queryOptions } from "@tanstack/solid-query"
 import type { ServerScope } from "@/runtime/server/scope"
-import { withWorktreeInventory, worktreeInventoryKey } from "@/workspaces/inventory"
+import type { ServerApi } from "@/runtime/server/api"
+import { sameDirectory } from "@/workspaces/paths"

 type GlobalStore = {
  path: Path
@@ -63,21 +64,42 @@ type ProjectApi = {
  readonly list: () => Promise<ProjectListOutput>
  readonly current: (input?: ProjectCurrentInput) => Promise<ProjectCurrentOutput>
 }
+type WorktreeApi = Pick<ServerApi["worktree"], "list">
 type LocationApi = { readonly get: (input?: LocationGetInput) => Promise<LocationGetOutput> }

-// Metadata only. Worktree inventories load per project when a view shows it (see workspaces/inventory).
-export const loadProjectsQuery = (scope: ServerScope, projects: ProjectApi) =>
+export const loadProjectsQuery = (scope: ServerScope, projects: ProjectApi, worktrees: WorktreeApi) =>
  queryOptions({
    queryKey: [scope, "project"],
    queryFn: () =>
      retry(() =>
-        projects.list().then((items) =>
-          items
-            .filter((project) => !!project?.id)
-            .map(normalizeProjectInfo)
+        projects.list().then(async (items) => {
+          return (
+            await Promise.all(
+              items
+                .filter((project) => !!project?.id)
+                .map(async (project) => {
+                  const directories = await worktrees
+                    .list({ projectID: project.id })
+                    .catch(() => [
+                      { directory: project.canonical },
+                      ...(project.sandboxes ?? [])
+                        .filter((directory) => !sameDirectory(project.canonical, directory))
+                        .map((directory) => ({ directory })),
+                    ])
+                  return normalizeProjectInfo({
+                    ...project,
+                    sandboxes: directories
+                      .map((item) => item.directory)
+                      .filter((directory) => !sameDirectory(project.canonical, directory)),
+                    worktrees: directories,
+                  })
+                }),
+            )
+          )
            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
-            .sort((a, b) => cmp(a.id, b.id)),
-        ),
+            .slice()
+            .sort((a, b) => cmp(a.id, b.id))
+        }),
      ),
  })

@@ -85,6 +107,7 @@ export async function bootstrapGlobal(input: {
  serverAPI: {
    readonly location: LocationApi
    readonly project: ProjectApi
+    readonly worktree: WorktreeApi
  }
  scope: ServerScope
  setGlobalStore: SetStoreFunction<GlobalStore>
@@ -94,17 +117,9 @@ export async function bootstrapGlobal(input: {
    () => input.queryClient.fetchQuery(loadGlobalConfigQuery(input.scope)),
    () => input.queryClient.fetchQuery(loadPathQuery(input.scope, null, input.serverAPI.location)),
    () =>
-      input.queryClient.fetchQuery(loadProjectsQuery(input.scope, input.serverAPI.project)).then((data) =>
-        input.setGlobalStore(
-          "project",
-          data.map((project) =>
-            withWorktreeInventory(
-              project,
-              input.queryClient.getQueryData(worktreeInventoryKey(input.scope, project.worktree)),
-            ),
-          ),
-        ),
-      ),
+      input.queryClient
+        .fetchQuery(loadProjectsQuery(input.scope, input.serverAPI.project, input.serverAPI.worktree))
+        .then((data) => input.setGlobalStore("project", data)),
  ]
  await runAll(slow)
 }
@@ -1,144 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { createRequestQueue } from "./request-queue"
-
-function setup(input?: { limit?: number; stallMs?: number; headersTimeoutMs?: number }) {
-  const pending: Array<{ url: string; signal: AbortSignal; resolve: () => void }> = []
-  const logs: Array<{ message: string; data: Record<string, unknown> }> = []
-  let clock = 0
-  const queue = createRequestQueue({
-    limit: input?.limit ?? 2,
-    stallMs: input?.stallMs,
-    headersTimeoutMs: input?.headersTimeoutMs,
-    now: () => clock,
-    log: (message, data) => logs.push({ message, data }),
-    fetch: Object.assign(
-      (resource: RequestInfo | URL) =>
-        new Promise<Response>((resolve, reject) => {
-          const request = new Request(resource)
-          request.signal.addEventListener("abort", () => reject(request.signal.reason), { once: true })
-          pending.push({ url: request.url, signal: request.signal, resolve: () => resolve(new Response("ok")) })
-        }),
-      { preconnect() {} },
-    ),
-  })
-  const settle = () => new Promise<void>((resolve) => setTimeout(resolve, 0))
-  return { queue, pending, logs, settle, tick: (ms: number) => (clock += ms) }
-}
-
-describe("createRequestQueue", () => {
-  test("caps concurrent requests and starts queued ones as slots free up", async () => {
-    const input = setup()
-    const responses = ["/api/a", "/api/b", "/api/c"].map((path) => input.queue.fetch(`http://server${path}`))
-    await input.settle()
-    expect(input.pending.map((item) => new URL(item.url).pathname)).toEqual(["/api/a", "/api/b"])
-    expect(input.queue.queued()).toBe(1)
-    input.pending[0]!.resolve()
-    await input.settle()
-    expect(input.pending.map((item) => new URL(item.url).pathname)).toEqual(["/api/a", "/api/b", "/api/c"])
-    input.pending.forEach((item) => item.resolve())
-    await Promise.all(responses)
-    expect(input.queue.inflight()).toBe(0)
-  })
-
-  test("never counts the event stream against the budget", async () => {
-    const input = setup({ limit: 1 })
-    void input.queue.fetch("http://server/api/session")
-    void input.queue.fetch("http://server/api/event")
-    await input.settle()
-    expect(input.pending.map((item) => new URL(item.url).pathname).toSorted()).toEqual(["/api/event", "/api/session"])
-    expect(input.queue.inflight()).toBe(1)
-  })
-
-  test("aborted requests leave the queue without being sent", async () => {
-    const input = setup({ limit: 1 })
-    const controller = new AbortController()
-    void input.queue.fetch("http://server/api/first")
-    const aborted = input.queue.fetch("http://server/api/second", { signal: controller.signal })
-    controller.abort()
-    await input.settle()
-    input.pending[0]!.resolve()
-    await expect(aborted).rejects.toBeInstanceOf(DOMException)
-    expect(input.pending.map((item) => new URL(item.url).pathname)).toEqual(["/api/first"])
-    expect(input.queue.inflight()).toBe(0)
-  })
-
-  test("a request the server never answers times out and frees its slot", async () => {
-    const input = setup({ limit: 1, headersTimeoutMs: 10 })
-    const dead = input.queue.fetch("http://server/api/dead")
-    const next = input.queue.fetch("http://server/api/next")
-    await input.settle()
-    expect(input.queue.queued()).toBe(1)
-    const error = await dead.catch((cause: unknown) => cause)
-    expect(error).toBeInstanceOf(DOMException)
-    expect((error as DOMException).name).toBe("TimeoutError")
-    await input.settle()
-    expect(input.pending.map((item) => new URL(item.url).pathname)).toEqual(["/api/dead", "/api/next"])
-    input.pending[1]!.resolve()
-    await expect(next).resolves.toBeInstanceOf(Response)
-    expect(input.queue.inflight()).toBe(0)
-  })
-
-  test("caller aborts still reach the underlying request", async () => {
-    const input = setup({ limit: 1 })
-    const controller = new AbortController()
-    const request = input.queue.fetch("http://server/api/slow", { signal: controller.signal })
-    await input.settle()
-    expect(input.pending[0]!.signal.aborted).toBe(false)
-    controller.abort()
-    expect(input.pending[0]!.signal.aborted).toBe(true)
-    await expect(request).rejects.toBeInstanceOf(DOMException)
-    expect(input.queue.inflight()).toBe(0)
-  })
-
-  test("a burst that drains promptly is not thrashing", async () => {
-    const input = setup({ stallMs: 5 })
-    const responses = Array.from({ length: 12 }, (_, index) => input.queue.fetch(`http://server/api/${index}`))
-    await input.settle()
-    expect(input.queue.queued()).toBe(10)
-    // Drain two at a time before the stall threshold elapses.
-    for (let round = 0; round < 6; round++) {
-      input.pending.splice(0).forEach((item) => item.resolve())
-      await input.settle()
-    }
-    await Promise.all(responses)
-    await new Promise((resolve) => setTimeout(resolve, 20))
-    expect(input.logs).toEqual([])
-  })
-
-  test("logs what is in flight and queued once per burst after requests stall", async () => {
-    const input = setup({ stallMs: 5 })
-    input.queue.fetch("http://server/api/worktree?location[directory]=%2Fa").catch(() => undefined)
-    input.tick(50)
-    input.queue.fetch("http://server/api/worktree?location[directory]=%2Fb").catch(() => undefined)
-    input.tick(50)
-    input.queue.fetch("http://server/api/worktree?location[directory]=%2Fc").catch(() => undefined)
-    input.tick(100)
-    input.queue.fetch("http://server/api/health").catch(() => undefined)
-    expect(input.logs).toEqual([])
-    input.tick(2_000)
-    await new Promise((resolve) => setTimeout(resolve, 20))
-    expect(input.logs).toEqual([
-      {
-        message: "server thrashing detected",
-        data: {
-          limit: 2,
-          inflight: [
-            { method: "GET", url: "http://server/api/worktree?location[directory]=%2Fa", ms: 2_200 },
-            { method: "GET", url: "http://server/api/worktree?location[directory]=%2Fb", ms: 2_150 },
-          ],
-          queued: [
-            { method: "GET", url: "http://server/api/worktree?location[directory]=%2Fc", ms: 2_100 },
-            { method: "GET", url: "http://server/api/health", ms: 2_000 },
-          ],
-        },
-      },
-    ])
-    // Still stalled within the rate limit: no repeat.
-    input.tick(2_000)
-    await new Promise((resolve) => setTimeout(resolve, 20))
-    expect(input.logs).toHaveLength(1)
-    input.tick(10_000)
-    await new Promise((resolve) => setTimeout(resolve, 20))
-    expect(input.logs).toHaveLength(2)
-  })
-})
@@ -1,100 +0,0 @@
-type Entry = { method: string; url: string; at: number }
-
-// Chromium allows six connections per origin. The event stream holds one for the life of the
-// connection and health probes use their own fetch, so the app's API calls stay below that or
-// a burst stalls probes and user actions inside the browser where nothing can observe it.
-export const requestQueueLimit = 4
-
-// A mount legitimately fires a dozen requests at once; only a request that has waited this long
-// for a slot indicates the server is not keeping up.
-export const requestStallMs = 2_000
-
-// A socket that dies while the device sleeps can leave fetch waiting for response headers until the
-// OS gives up on TCP retransmits, which takes minutes. Bound that so a dead request frees its slot
-// instead of wedging every later API call; the body may still stream for as long as it needs.
-export const requestHeadersTimeoutMs = 60_000
-
-export function createRequestQueue(input: {
-  fetch: typeof globalThis.fetch
-  limit?: number
-  stallMs?: number
-  headersTimeoutMs?: number
-  log?: (message: string, data: Record<string, unknown>) => void
-  now?: () => number
-}) {
-  const limit = input.limit ?? requestQueueLimit
-  const stallMs = input.stallMs ?? requestStallMs
-  const headersTimeoutMs = input.headersTimeoutMs ?? requestHeadersTimeoutMs
-  // Call the browser fetch unbound; `input.fetch(...)` would make `this` the options object.
-  const base = input.fetch
-  const now = input.now ?? Date.now
-  const log = input.log ?? ((message, data) => console.warn(`[server-request-queue] ${message}`, data))
-  const inflight = new Set<Entry>()
-  const waiting: Array<{ entry: Entry; start: () => void }> = []
-  let warned = -Infinity
-  let watcher: ReturnType<typeof setTimeout> | undefined
-
-  const describe = (entry: Entry) => ({ method: entry.method, url: entry.url, ms: now() - entry.at })
-  // Debug exports include the console, so list what the server is busy with while requests wait.
-  const watch = () => {
-    watcher = undefined
-    const oldest = waiting[0]?.entry
-    if (!oldest) return
-    if (now() - oldest.at >= stallMs && now() - warned >= 10_000) {
-      warned = now()
-      log("server thrashing detected", {
-        limit,
-        inflight: [...inflight].map(describe),
-        queued: waiting.map((item) => describe(item.entry)),
-      })
-    }
-    watcher = setTimeout(watch, stallMs)
-  }
-  const release = (entry: Entry) => {
-    inflight.delete(entry)
-    waiting.shift()?.start()
-  }
-  const acquire = (entry: Entry) =>
-    new Promise<void>((resolve) => {
-      const start = () => {
-        entry.at = now()
-        inflight.add(entry)
-        resolve()
-      }
-      if (inflight.size < limit) return start()
-      waiting.push({ entry, start })
-      watcher ??= setTimeout(watch, stallMs)
-    })
-
-  const fetch: typeof globalThis.fetch = Object.assign(
-    async (resource: RequestInfo | URL, init?: RequestInit) => {
-      const request = new Request(resource, init)
-      // The event stream is long-lived; never count it against the request budget.
-      if (new URL(request.url).pathname === "/api/event") return base(request)
-      const entry = { method: request.method, url: request.url, at: now() }
-      await acquire(entry)
-      if (request.signal.aborted) {
-        release(entry)
-        throw request.signal.reason ?? new DOMException("The operation was aborted.", "AbortError")
-      }
-      const controller = new AbortController()
-      request.signal.addEventListener("abort", () => controller.abort(request.signal.reason), { once: true })
-      const timer = setTimeout(
-        () => controller.abort(new DOMException("Timed out waiting for the server to respond", "TimeoutError")),
-        headersTimeoutMs,
-      )
-      return base(new Request(request, { signal: controller.signal })).finally(() => {
-        clearTimeout(timer)
-        release(entry)
-      })
-    },
-    // Bun's fetch type carries preconnect; the browser never calls it.
-    { preconnect: () => {} },
-  )
-
-  return {
-    fetch,
-    inflight: () => inflight.size,
-    queued: () => waiting.length,
-  }
-}
@@ -20,8 +20,6 @@ import { toggleMcp } from "./global-sync/mcp"
 import { createConnectionSync } from "./server-sync/connection"
 import { usePlatform } from "@/runtime/platform/platform"
 import type { Data } from "@opencode-ai/client/solid"
-import { createWorktreeInventory, withWorktreeInventory } from "@/workspaces/inventory"
-import { sameDirectory } from "@/workspaces/paths"

 type GlobalStore = {
  path: Path
@@ -81,17 +79,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
  })

  const queryClient = useQueryClient()
-  const worktrees = createWorktreeInventory({
-    scope: serverSDK.scope,
-    queryClient,
-    api: () => serverSDK.api.worktree,
-    updated: (directory, items) =>
-      setGlobalStore("project", (projects) =>
-        projects.map((project) =>
-          sameDirectory(project.worktree, directory) ? withWorktreeInventory(project, items) : project,
-        ),
-      ),
-  })
  const bootstrap = useQuery(() => ({
    queryKey: [serverSDK.scope, "bootstrap"],
    queryFn: async () => {
@@ -210,27 +197,17 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {

  function applyProjectUpdate(update: Parameters<typeof updateProjectInfo>[1]) {
    setGlobalStore("project", (projects) =>
-      projects.map((project) =>
-        project.id === update.id
-          ? // The wire payload carries no worktrees; keep the inventory this project already loaded.
-            withWorktreeInventory(updateProjectInfo(project, update), worktrees.cached(update.canonical))
-          : project,
-      ),
+      projects.map((project) => (project.id === update.id ? updateProjectInfo(project, update) : project)),
    )
  }

  const unsub = serverSDK.event.listen((event) => {
    connection.handleEvent({ type: event.type })
    if (event.type === "project.updated") applyProjectUpdate(event.data)
-    if (event.type === "worktree.updated") {
-      const root = globalStore.project.find((project) => project.id === event.data.projectID)?.worktree
-      if (root) void worktrees.refresh(root)
-      void bootstrap.refetch()
-      return
-    }

    if (!event.location) {
-      if (event.type === "config.updated" || event.type === "agent.updated") bootstrap.refetch()
+      if (event.type === "config.updated" || event.type === "agent.updated" || event.type === "worktree.updated")
+        bootstrap.refetch()
      return
    }

@@ -239,6 +216,7 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
    if (!children.children[key]) return
    children.mark(key)
    if (event.type === "config.updated" || event.type === "agent.updated") queue.push(key)
+    if (event.type === "worktree.updated") void bootstrap.refetch()
  })

  onCleanup(unsub)
@@ -283,7 +261,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
    // bootstrap,
    updateConfig: updateConfigMutation.mutateAsync,
    project: projectApi,
-    worktrees,
    mcp: {
      toggle: async (directory: string, name: string) => {
        const key = directoryKey(directory)
@@ -2,12 +2,11 @@ import { Show, type JSX } from "solid-js"
 import { useLanguage } from "@/runtime/i18n/language"
 import { SessionPermissionDock } from "@/session/requests/session-permission-dock"
 import { SessionQuestionDock } from "@/session/requests/session-question-dock"
-import { SessionWebSearchDock } from "@/session/requests/session-websearch-dock"
 import type { SessionComposerRegionController } from "./session-composer-region-controller"

 type SessionComposerRegionState = Pick<
  SessionComposerRegionController["state"],
-  "questionRequest" | "websearch" | "permissionRequest" | "permissionResponding" | "decide" | "blocked"
+  "questionRequest" | "permissionRequest" | "permissionResponding" | "decide" | "blocked"
 >

 export type SessionComposerRegionViewController = Pick<
@@ -33,9 +32,6 @@ export function SessionComposerRegion(props: {
          "md:max-w-[1000px] md:mx-auto": controller.centered(),
        }}
      >
-        <Show when={controller.state.websearch.request()}>
-          <SessionWebSearchDock model={controller.state.websearch} onSubmit={controller.onResponseSubmit} />
-        </Show>
        <Show when={controller.state.questionRequest()} keyed>
          {(request) => (
            <div>
@@ -24,11 +24,6 @@ import {
  type FileTreeV2Node,
 } from "@/session/files/file-tree-v2-model"
 import { virtualScrollElement } from "@/session/files/virtual-scroll"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useOpenInApp } from "@/session/files/open-in-app"
-import { OpenInAppContextMenuV2 } from "@/session/files/open-in-app-button"
-import { resolveOpenInAppPath } from "@/session/files/open-in-app-path"
-import { usePlatform } from "@/runtime/platform/platform"

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

@@ -104,7 +99,7 @@ const FileTreeNodeV2 = (
      {...rest}
    >
      {local.children}
-      <span data-slot="file-tree-v2-label" class="flex-1 shrink-0 text-start text-12-medium whitespace-nowrap">
+      <span class="flex-1 min-w-0 text-start text-12-medium whitespace-nowrap truncate">
        <bdi dir="auto">
          {local.node.type === "directory"
            ? normalizeFileTreeV2Path(local.node.path).split("/").at(-1)
@@ -141,9 +136,6 @@ export default function FileTreeV2(props: {
  onFileDoubleClick?: (file: FileNode) => void
 }) {
  const file = useFile()
-  const location = useWorkspaceLocation()
-  const platform = usePlatform()
-  const openIn = platform.platform === "desktop" ? useOpenInApp({ path: () => location().directory }) : undefined
  const live = () => props.allowed === undefined
  const draggable = () => props.draggable ?? true
  const active = () => normalizeFileTreeV2Path(props.active ?? "")
@@ -225,19 +217,6 @@ export default function FileTreeV2(props: {
  )
  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => item.key))

-  createEffect(() => {
-    rows()
-    const element = root()
-    if (!element) return
-    element.style.removeProperty("width")
-    syncFileTreeV2Width(element)
-  })
-
-  createEffect(() => {
-    virtualRowKeys()
-    syncFileTreeV2Width(root())
-  })
-
  return (
    <div
      ref={setRoot}
@@ -256,7 +235,6 @@ export default function FileTreeV2(props: {
                  top: "0",
                  "inset-inline-start": "0",
                  width: "100%",
-                  "min-width": "max-content",
                  height: `${item().size}px`,
                  transform: `translateY(${item().start}px)`,
                }}
@@ -266,36 +244,29 @@ export default function FileTreeV2(props: {
                    <Show
                      when={row().node.type === "directory"}
                      fallback={
-                        <OpenInAppContextMenuV2
-                          state={openIn}
-                          path={() =>
-                            resolveOpenInAppPath(location().directory, row().node.absolute || row().node.originalPath)
-                          }
+                        <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={() => selectFile(row().node, props.onFileClick)}
+                          onDblClick={() => selectFile(row().node, props.onFileDoubleClick)}
                        >
-                          <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={() => selectFile(row().node, props.onFileClick)}
-                            onDblClick={() => selectFile(row().node, props.onFileDoubleClick)}
-                          >
-                            <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>
-                        </OpenInAppContextMenuV2>
+                          <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>
                      }
                    >
                      <FileTreeNodeV2
@@ -332,13 +303,3 @@ export default function FileTreeV2(props: {
    </div>
  )
 }
-
-export function syncFileTreeV2Width(element?: HTMLDivElement) {
-  if (!element) return
-  queueMicrotask(() => {
-    if (!element.isConnected) return
-    const width = Math.max(element.clientWidth, ...Array.from(element.children, (child) => child.scrollWidth))
-    if (width <= element.clientWidth) return
-    element.style.width = `${width}px`
-  })
-}
@@ -2,15 +2,10 @@ import { FileIcon } from "@opencode-ai/ui/file-icon"
 import "@opencode-ai/ui/file-tree.css"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { createEffect, createMemo, createSignal, For, Show } from "solid-js"
-import { kindChange, kindLabel, syncFileTreeV2Width, type Kind } from "@/session/files/file-tree-v2"
+import { kindChange, kindLabel, type Kind } from "@/session/files/file-tree-v2"
 import { normalizePath } from "@/session/review/review-diff-kinds"
 import { createVirtualizer, defaultRangeExtractor } from "@tanstack/solid-virtual"
 import { virtualScrollElement } from "@/session/files/virtual-scroll"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useOpenInApp } from "@/session/files/open-in-app"
-import { OpenInAppContextMenuV2 } from "@/session/files/open-in-app-button"
-import { resolveOpenInAppPath } from "@/session/files/open-in-app-path"
-import { usePlatform } from "@/runtime/platform/platform"

 // Drives the highlight/selection of the flat search-result list from the filter
 // input's keyboard events.
@@ -54,9 +49,6 @@ export function SessionFileList(props: {
  onFileClick: (path: string) => void
  onFileDoubleClick?: (path: string) => void
 }) {
-  const location = useWorkspaceLocation()
-  const platform = usePlatform()
-  const openIn = platform.platform === "desktop" ? useOpenInApp({ path: () => location().directory }) : undefined
  const active = () => normalizePath(props.active ?? "")
  const highlighted = () => normalizePath(props.highlighted ?? "")
  const normalized = createMemo(() => props.files.map(normalizePath))
@@ -97,19 +89,6 @@ export function SessionFileList(props: {
  )
  const virtualRowKeys = createMemo(() => virtualizer.getVirtualItems().map((item) => item.key))

-  createEffect(() => {
-    normalized()
-    const element = root()
-    if (!element) return
-    element.style.removeProperty("width")
-    syncFileTreeV2Width(element)
-  })
-
-  createEffect(() => {
-    virtualRowKeys()
-    syncFileTreeV2Width(root())
-  })
-
  return (
    <div
      ref={setRoot}
@@ -135,48 +114,47 @@ export function SessionFileList(props: {
                  style={{
                    position: "absolute",
                    top: "0",
-                    "inset-inline-start": "0",
+                    left: "0",
                    width: "100%",
-                    "min-width": "max-content",
                    height: `${item().size}px`,
                    transform: `translateY(${item().start}px)`,
                  }}
                >
-                  <OpenInAppContextMenuV2 state={openIn} path={() => resolveOpenInAppPath(location().directory, path)}>
-                    <button
-                      type="button"
-                      id={props.optionID?.(path)}
-                      role={props.role ? "option" : undefined}
-                      aria-selected={props.role ? selected() : undefined}
-                      data-slot="file-tree-v2-row"
-                      data-path={path}
-                      data-selected={selected() ? "" : undefined}
-                      data-highlighted={highlightedRow() ? "" : undefined}
-                      style="padding-inline-start: 8px"
-                      onFocus={() => setFocused(path)}
-                      onBlur={() => setFocused(undefined)}
-                      onClick={() => props.onFileClick(path)}
-                      onDblClick={() => props.onFileDoubleClick?.(path)}
-                    >
-                      <span class="filetree-iconpair size-4">
-                        <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
-                        <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--mono" mono />
-                      </span>
-                      <span data-slot="file-tree-v2-label" class="flex flex-1 shrink-0 items-center whitespace-nowrap">
-                        <Show when={directory()}>
-                          {(value) => <span class="text-12-medium text-text-muted shrink-0">{value()}</span>}
-                        </Show>
-                        <span class="text-12-medium text-text-base shrink-0">{filename()}</span>
-                      </span>
-                      <Show when={kind()}>
+                  <button
+                    type="button"
+                    id={props.optionID?.(path)}
+                    role={props.role ? "option" : undefined}
+                    aria-selected={props.role ? selected() : undefined}
+                    data-slot="file-tree-v2-row"
+                    data-path={path}
+                    data-selected={selected() ? "" : undefined}
+                    data-highlighted={highlightedRow() ? "" : undefined}
+                    style="padding-left: 8px"
+                    onFocus={() => setFocused(path)}
+                    onBlur={() => setFocused(undefined)}
+                    onClick={() => props.onFileClick(path)}
+                    onDblClick={() => props.onFileDoubleClick?.(path)}
+                  >
+                    <span class="filetree-iconpair size-4">
+                      <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
+                      <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 data-slot="file-tree-v2-change" data-change={kindChange(value())}>
-                            {kindLabel(value())}
-                          </span>
+                          <span class="text-12-medium text-text-muted truncate min-w-0 shrink">{value()}</span>
                        )}
                      </Show>
-                    </button>
-                  </OpenInAppContextMenuV2>
+                      <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>
@@ -1,4 +1,4 @@
-import { createSignal, For, Show, type ParentProps } from "solid-js"
+import { For, Show } from "solid-js"
 import { AppIcon } from "@opencode-ai/ui/app-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Spinner } from "@opencode-ai/ui/spinner"
@@ -10,7 +10,7 @@ import { type OpenApp, useOpenInApp } from "@/session/files/open-in-app"

 export function OpenInAppButton(props: { directory: () => string }) {
  const language = useLanguage()
-  const state = useOpenInApp({ path: props.directory })
+  const state = useOpenInApp(props)

  return (
    <Show when={props.directory() && state.canOpen()}>
@@ -25,7 +25,7 @@ export function OpenInAppButton(props: { directory: () => string }) {
            onClick={(event) => {
              event.stopPropagation()
              if (state.opening()) return
-              state.openPath(state.current().id)
+              state.openDir(state.current().id)
            }}
            disabled={state.opening()}
            aria-label={language.t("session.header.open.ariaLabel", { app: state.current().label })}
@@ -52,7 +52,42 @@ export function OpenInAppButton(props: { directory: () => string }) {
          </Menu.Trigger>
          <Menu.Portal>
            <Menu.Content class="open-in-app-v2-menu">
-              <OpenInAppMenuItemsV2 state={state} close={() => state.setMenu("open", false)} />
+              <Menu.Group>
+                <Menu.GroupLabel>{language.t("session.header.openIn")}</Menu.GroupLabel>
+                <Menu.RadioGroup
+                  value={state.current().id}
+                  onChange={(value) => {
+                    state.selectApp(value as OpenApp)
+                  }}
+                >
+                  <For each={state.options()}>
+                    {(option) => (
+                      <Menu.RadioItem
+                        value={option.id}
+                        disabled={state.opening()}
+                        onSelect={() => {
+                          state.selectApp(option.id)
+                          state.setMenu("open", false)
+                          state.openDir(option.id)
+                        }}
+                      >
+                        <AppIcon id={option.icon} />
+                        {option.label}
+                      </Menu.RadioItem>
+                    )}
+                  </For>
+                </Menu.RadioGroup>
+              </Menu.Group>
+              <Menu.Separator />
+              <Menu.Item
+                onSelect={() => {
+                  state.setMenu("open", false)
+                  state.copyPath()
+                }}
+              >
+                <Icon name="copy" size="small" class="text-icon-weak" />
+                {language.t("session.header.open.copyPath")}
+              </Menu.Item>
            </Menu.Content>
          </Menu.Portal>
        </Menu>
@@ -60,116 +95,3 @@ export function OpenInAppButton(props: { directory: () => string }) {
    </Show>
  )
 }
-
-type OpenInAppState = ReturnType<typeof useOpenInApp>
-
-function OpenInAppMenuItemsV2(props: {
-  state: OpenInAppState
-  path?: () => string
-  reveal?: boolean
-  selection?: boolean
-  close?: () => void
-}) {
-  const language = useLanguage()
-  const path = () => props.path?.()
-
-  return (
-    <>
-      <Menu.Group>
-        <Menu.GroupLabel>{language.t("session.header.openIn")}</Menu.GroupLabel>
-        <Show
-          when={props.selection !== false}
-          fallback={
-            <For each={props.state.options()}>
-              {(option) => (
-                <Menu.Item
-                  disabled={props.state.opening()}
-                  onSelect={() => {
-                    props.state.selectApp(option.id)
-                    props.close?.()
-                    props.state.openPath(option.id, path(), props.reveal)
-                  }}
-                >
-                  <AppIcon id={option.icon} />
-                  {option.label}
-                </Menu.Item>
-              )}
-            </For>
-          }
-        >
-          <Menu.RadioGroup
-            value={props.state.current().id}
-            onChange={(value) => {
-              props.state.selectApp(value as OpenApp)
-            }}
-          >
-            <For each={props.state.options()}>
-              {(option) => (
-                <Menu.RadioItem
-                  value={option.id}
-                  closeOnSelect
-                  disabled={props.state.opening()}
-                  onSelect={() => {
-                    props.state.selectApp(option.id)
-                    props.close?.()
-                    props.state.openPath(option.id, path(), props.reveal)
-                  }}
-                >
-                  <AppIcon id={option.icon} />
-                  {option.label}
-                </Menu.RadioItem>
-              )}
-            </For>
-          </Menu.RadioGroup>
-        </Show>
-      </Menu.Group>
-      <Menu.Separator />
-      <Menu.Item
-        onSelect={() => {
-          props.close?.()
-          props.state.copyPath(path())
-        }}
-      >
-        <Icon name="copy" size="small" class="text-icon-weak" />
-        {language.t("session.header.open.copyPath")}
-      </Menu.Item>
-    </>
-  )
-}
-
-export function OpenInAppContextMenuV2(
-  props: ParentProps<{
-    state?: OpenInAppState
-    path: () => string
-  }>,
-) {
-  const state = props.state
-  if (!state) return props.children
-  const [open, setOpen] = createSignal(false)
-
-  return (
-    <Show when={state.canOpen() && props.path()} fallback={props.children}>
-      <Menu.Context modal={false} onOpenChange={setOpen}>
-        <Menu.Context.Trigger
-          as="div"
-          class="h-full w-full min-w-max"
-          data-slot="file-tree-v2-context-trigger"
-          data-context-menu-open={open() ? "" : undefined}
-        >
-          {props.children}
-        </Menu.Context.Trigger>
-        <Menu.Context.Portal>
-          <Menu.Context.Content class="open-in-app-v2-menu">
-            <OpenInAppMenuItemsV2
-              state={state}
-              path={props.path}
-              reveal
-              selection={false}
-              close={() => setOpen(false)}
-            />
-          </Menu.Context.Content>
-        </Menu.Context.Portal>
-      </Menu.Context>
-    </Show>
-  )
-}
@@ -1,36 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { openInAppParentPath, resolveOpenInAppPath } from "./open-in-app-path"
-
-describe("resolveOpenInAppPath", () => {
-  test("joins relative paths using the workspace separator", () => {
-    expect(resolveOpenInAppPath("/workspace/project", "src/file.ts")).toBe("/workspace/project/src/file.ts")
-    expect(resolveOpenInAppPath("C:\\workspace\\project", "src/file.ts")).toBe("C:\\workspace\\project\\src\\file.ts")
-  })
-
-  test("does not duplicate root separators", () => {
-    expect(resolveOpenInAppPath("/workspace/project/", "src/file.ts")).toBe("/workspace/project/src/file.ts")
-    expect(resolveOpenInAppPath("C:/workspace/project/", "src\\file.ts")).toBe("C:/workspace/project/src/file.ts")
-  })
-
-  test("preserves backslashes in POSIX filenames", () => {
-    expect(resolveOpenInAppPath("/workspace", "src\\file.ts")).toBe("/workspace/src\\file.ts")
-    expect(resolveOpenInAppPath("/workspace", "\\file.ts")).toBe("/workspace/\\file.ts")
-  })
-
-  test("preserves absolute POSIX, Windows, and UNC paths", () => {
-    expect(resolveOpenInAppPath("/workspace", "/tmp/file.ts")).toBe("/tmp/file.ts")
-    expect(resolveOpenInAppPath("C:/workspace", "D:\\src\\file.ts")).toBe("D:\\src\\file.ts")
-    expect(resolveOpenInAppPath("C:/workspace", "\\\\server\\share\\file.ts")).toBe("\\\\server\\share\\file.ts")
-    expect(resolveOpenInAppPath("C:/workspace", "\\src\\file.ts")).toBe("\\src\\file.ts")
-  })
-})
-
-describe("openInAppParentPath", () => {
-  test("preserves POSIX and Windows roots", () => {
-    expect(openInAppParentPath("/file.ts")).toBe("/")
-    expect(openInAppParentPath("/workspace/file.ts")).toBe("/workspace")
-    expect(openInAppParentPath("C:\\file.ts")).toBe("C:\\")
-    expect(openInAppParentPath("C:\\workspace\\file.ts")).toBe("C:\\workspace")
-    expect(openInAppParentPath("\\\\server\\share\\file.ts")).toBe("\\\\server\\share")
-  })
-})
@@ -1,19 +0,0 @@
-export function resolveOpenInAppPath(root: string, path: string) {
-  if (!path) return root
-  const windowsRoot = root.startsWith("\\\\") || /^[A-Za-z]:[\\/]/.test(root)
-  if (path.startsWith("/") || (windowsRoot && path.startsWith("\\")) || /^[A-Za-z]:[\\/]/.test(path)) return path
-  if (!root) return path
-
-  const separator = root.includes("\\") ? "\\" : "/"
-  const relative = windowsRoot ? path.replace(/^[\\/]+/, "") : path
-  return `${root.replace(/[\\/]+$/, "")}${separator}${windowsRoot ? relative.replaceAll(separator === "\\" ? "/" : "\\", separator) : relative}`
-}
-
-export function openInAppParentPath(path: string) {
-  const value = path.replace(/[\\/]+$/, "")
-  const index = Math.max(value.lastIndexOf("/"), value.lastIndexOf("\\"))
-  if (index < 0) return path
-  if (index === 0) return value.slice(0, 1)
-  if (index === 2 && /^[A-Za-z]:/.test(value)) return value.slice(0, 3)
-  return value.slice(0, index)
-}
@@ -7,8 +7,6 @@ import { showToast } from "@/shell/notifications/toast"
 import { useServer } from "@/runtime/server/current"
 import { Schema } from "effect"
 import { Persistence } from "@/runtime/persistence/schema"
-import { fileManagerApp } from "@/home/projects/file-manager"
-import { openInAppParentPath } from "@/session/files/open-in-app-path"

 export const OPEN_APPS = [
  "vscode",
@@ -34,8 +32,6 @@ export const OpenAppPreferences = Persistence.struct({
  app: Schema.Literals(OPEN_APPS),
 })

-const appExistence = new Map<string, Promise<boolean>>()
-
 export const MAC_OPEN_APPS = [
  {
    id: "vscode",
@@ -112,7 +108,9 @@ export function detectOpenAppOS(platform: ReturnType<typeof usePlatform>): OpenA
 }

 export function openAppFileManager(os: OpenAppOS) {
-  return fileManagerApp(os)
+  if (os === "macos") return { label: "session.header.open.finder", icon: "finder" as const }
+  if (os === "windows") return { label: "session.header.open.fileExplorer", icon: "file-explorer" as const }
+  return { label: "session.header.open.fileManager", icon: "finder" as const }
 }

 export function openAppsForOS(os: OpenAppOS) {
@@ -129,7 +127,7 @@ const showRequestError = (language: ReturnType<typeof useLanguage>, err: unknown
  })
 }

-export function useOpenInApp(input: { path: () => string }) {
+export function useOpenInApp(input: { directory: () => string }) {
  const platform = usePlatform()
  const server = useServer()
  const language = useLanguage()
@@ -151,7 +149,12 @@ export function useOpenInApp(input: { path: () => string }) {
    setExists(Object.fromEntries(list.map((app) => [app.id, undefined])) as Partial<Record<OpenApp, boolean>>)

    void Promise.all(
-      list.map((app) => checkAppExists(platform, app.openWith).then((ok) => [app.id, ok] as const)),
+      list.map((app) =>
+        Promise.resolve(platform.checkAppExists?.(app.openWith))
+          .then((value) => Boolean(value))
+          .catch(() => false)
+          .then((ok) => [app.id, ok] as const),
+      ),
    ).then((entries) => {
      setExists(Object.fromEntries(entries) as Partial<Record<OpenApp, boolean>>)
    })
@@ -186,35 +189,33 @@ export function useOpenInApp(input: { path: () => string }) {
    setPrefs("app", app)
  }

-  const openPath = (app: OpenApp | "finder", target = input.path(), reveal = false) => {
+  const openDir = (app: OpenApp | "finder") => {
    if (opening() || !canOpen() || !platform.openPath) return
-    if (!target) return
+    const directory = input.directory()
+    if (!directory) return

-    const open = (path: string, openWith?: string) => platform.openPath!(path, openWith)
    const item = options().find((o) => o.id === app)
    const openWith = item && "openWith" in item ? item.openWith : undefined
    setOpenRequest("app", app)
-    const request =
-      app === "finder" && reveal && platform.revealPath
-        ? platform.revealPath(target).then((revealed) => (revealed ? undefined : open(openInAppParentPath(target))))
-        : open(target, openWith)
-    request
+    platform
+      .openPath(directory, openWith)
      .catch((err: unknown) => showRequestError(language, err))
      .finally(() => {
        setOpenRequest("app", undefined)
      })
  }

-  const copyPath = (target = input.path()) => {
-    if (!target) return
+  const copyPath = () => {
+    const directory = input.directory()
+    if (!directory) return
    navigator.clipboard
-      .writeText(target)
+      .writeText(directory)
      .then(() => {
        showToast({
          variant: "success",
          icon: "circle-check",
          title: language.t("common.copied"),
-          description: target,
+          description: directory,
        })
      })
      .catch((err: unknown) => showRequestError(language, err))
@@ -227,18 +228,8 @@ export function useOpenInApp(input: { path: () => string }) {
    options,
    menu,
    setMenu,
-    openPath,
+    openDir,
    selectApp,
    copyPath,
  }
 }
-
-function checkAppExists(platform: ReturnType<typeof usePlatform>, app: string) {
-  const cached = appExistence.get(app)
-  if (cached) return cached
-  const request = Promise.resolve(platform.checkAppExists?.(app))
-    .then(Boolean)
-    .catch(() => false)
-  appExistence.set(app, request)
-  return request
-}
@@ -3,9 +3,11 @@ import { useLocation } from "@solidjs/router"
 import { ComposerEditor } from "@/composer/editor/editor"
 import { setCursorPosition } from "@/composer/editor/dom"
 import { createComposerEditor } from "@/composer/editor/interaction"
+import { useLanguage } from "@/runtime/i18n/language"
 import type { PendingSession } from "@/shell/tabs/tabs"

 export function PreparingComposer(props: { pending: PendingSession }) {
+  const language = useLanguage()
  const location = useLocation()
  let element: HTMLElement | undefined
  const editor = createComposerEditor({
@@ -18,6 +20,7 @@ export function PreparingComposer(props: { pending: PendingSession }) {
    },
    view: {
      draftOnly: true,
+      placeholder: () => language.t("session.new.worktree.draftPlaceholder"),
      submit: { stopping: () => false, onSubmit() {}, onStop() {} },
    },
  })
@@ -7,8 +7,7 @@ import { useServerSDK } from "@/runtime/server/client"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useSettings } from "@/settings/model"
 import { useWorkspaceLocation } from "@/workspaces/location"
-import { sessionPermissionRequest, sessionFormRequest, sessionTreeIDs } from "@/session/requests/session-request-tree"
-import { createWebSearchRequest } from "./websearch"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 import { createSessionBackground } from "@/session/requests/background"
 import { useData } from "@/runtime/server/current"

@@ -25,40 +24,12 @@ export function createSessionRequestModel() {
    void Promise.all([
      data.shell.sync({ directory: sdk().directory }),
      data.session.permission.sync(id),
+      data.session.form.sync(id),
    ]).catch(() => undefined)
  })
-  createEffect(() => {
-    const id = params.id
-    if (!id || serverSDK.connection.status() !== "connected") return
-    void Promise.all(
-      sessionTreeIDs(data.session.list(), id).map((sessionID) => data.session.form.sync(sessionID)),
-    ).catch(() => undefined)
-  })

-  const formRequest = createMemo((): FormInfo | undefined => {
-    return sessionFormRequest(data.session.list(), data.session.form.list, params.id)
-  })
-  const websearch = createWebSearchRequest({
-    owner: () => params.id,
-    connected: () => serverSDK.connection.status() === "connected",
-    request: () => {
-      const form = formRequest()
-      return form?.metadata?.kind === "websearch.provider" ? form : undefined
-    },
-    providers: async (sessionID) => {
-      const session = data.session.get(sessionID) ?? (await serverSDK.api.session.get({ sessionID }))
-      const result = await serverSDK.api.websearch.providers({
-        location: { directory: session.location.directory, workspace: session.location.workspaceID },
-      })
-      return result.data.map((provider) => ({ value: provider.id, label: provider.name }))
-    },
-    reply: (input) => data.session.form.reply(input),
-    events: serverSDK.event,
-  })
-  const questionRequest = createMemo(() => {
-    if (websearch.request()) return
-    const form = formRequest()
-    return form?.metadata?.kind === "question" ? form : undefined
+  const questionRequest = createMemo((): FormInfo | undefined => {
+    return sessionQuestionForm(data.session.list(), data.session.form.list, params.id)
  })

  const permissionRequest = createMemo((): PermissionRequest | undefined => {
@@ -69,7 +40,7 @@ export function createSessionRequestModel() {
  const blocked = createMemo(() => {
    const id = params.id
    if (!id) return false
-    return !!permissionRequest() || !!questionRequest() || !!websearch.request()
+    return !!permissionRequest() || !!questionRequest()
  })

  const primary = () => {
@@ -125,7 +96,6 @@ export function createSessionRequestModel() {
  return {
    blocked,
    questionRequest,
-    websearch,
    permissionRequest,
    permissionResponding,
    background: {
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { FormInfo, PermissionRequest, SessionInfo } from "@opencode-ai/client/promise"
-import { sessionPermissionRequest, sessionFormRequest, sessionTreeIDs } from "@/session/requests/session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"

 const session = (input: { id: string; parentID?: string }) =>
  ({
@@ -23,22 +23,6 @@ const question = (id: string, sessionID: string) =>
    fields: [{ key: "q0", type: "string" }],
  }) as FormInfo

-describe("sessionTreeIDs", () => {
-  test("returns only the current session and its descendants", () => {
-    const sessions = [
-      session({ id: "root" }),
-      session({ id: "child", parentID: "root" }),
-      session({ id: "grand", parentID: "child" }),
-      session({ id: "sibling", parentID: "root" }),
-      session({ id: "other" }),
-    ]
-
-    expect(sessionTreeIDs(sessions, "child")).toEqual(["child", "grand"])
-    expect(sessionTreeIDs(sessions, "root")).toEqual(["root", "child", "sibling", "grand"])
-    expect(sessionTreeIDs(sessions)).toEqual([])
-  })
-})
-
 describe("sessionPermissionRequest", () => {
  test("prefers the current session permission", () => {
    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
@@ -97,7 +81,7 @@ describe("sessionPermissionRequest", () => {
  })
 })

-describe("sessionFormRequest", () => {
+describe("sessionQuestionForm", () => {
  test("prefers the current session question", () => {
    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
    const questions = {
@@ -105,7 +89,7 @@ describe("sessionFormRequest", () => {
      child: [question("q-child", "child")],
    }

-    expect(sessionFormRequest(sessions, questions, "root")?.id).toBe("q-root")
+    expect(sessionQuestionForm(sessions, questions, "root")?.id).toBe("q-root")
  })

  test("returns a nested child question", () => {
@@ -118,29 +102,15 @@ describe("sessionFormRequest", () => {
      grand: [question("q-grand", "grand")],
    }

-    expect(sessionFormRequest(sessions, questions, "root")?.id).toBe("q-grand")
+    expect(sessionQuestionForm(sessions, questions, "root")?.id).toBe("q-grand")
  })

-  test("skips unsupported forms", () => {
+  test("skips forms that are not questions", () => {
    const sessions = [session({ id: "root" })]
    const forms = {
      root: [{ ...question("form", "root"), metadata: { kind: "integration" } }],
    }

-    expect(sessionFormRequest(sessions, forms, "root")).toBeUndefined()
-  })
-
-  test("finds web search consent in a nested child session", () => {
-    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
-    const form = { ...question("search", "child"), metadata: { kind: "websearch.provider" } }
-    expect(sessionFormRequest(sessions, { child: [form] }, "root")).toBe(form)
-  })
-
-  test("preserves request order across questions and web search", () => {
-    const sessions = [session({ id: "root" }), session({ id: "child", parentID: "root" })]
-    const form = { ...question("search", "root"), metadata: { kind: "websearch.provider" } }
-    expect(sessionFormRequest(sessions, { root: [form, question("q", "root")] }, "root")).toBe(form)
-    expect(sessionFormRequest(sessions, { root: [question("q", "root"), form] }, "root")?.id).toBe("q")
-    expect(sessionFormRequest(sessions, { root: [form], child: [question("q", "child")] }, "root")).toBe(form)
+    expect(sessionQuestionForm(sessions, forms, "root")).toBeUndefined()
  })
 })
@@ -6,16 +6,8 @@ function sessionTreeRequest<T>(
  sessionID?: string,
  include: (item: T) => boolean = () => true,
 ) {
-  const ids = sessionTreeIDs(session, sessionID)
-  if (!ids.length) return
-  const list = (id: string) => (typeof request === "function" ? request(id) : request[id])
-  const id = ids.find((id) => list(id)?.some(include))
-  if (!id) return
-  return list(id)?.find(include)
-}
+  if (!sessionID) return

-export function sessionTreeIDs(session: SessionInfo[], sessionID?: string) {
-  if (!sessionID) return []
  const map = session.reduce((acc, item) => {
    if (!item.parentID) return acc
    const list = acc.get(item.parentID)
@@ -35,7 +27,11 @@ export function sessionTreeIDs(session: SessionInfo[], sessionID?: string) {
      ids.push(child)
    }
  }
-  return ids
+
+  const list = (id: string) => (typeof request === "function" ? request(id) : request[id])
+  const id = ids.find((id) => list(id)?.some(include))
+  if (!id) return
+  return list(id)?.find(include)
 }

 export function sessionPermissionRequest(
@@ -47,15 +43,10 @@ export function sessionPermissionRequest(
  return sessionTreeRequest(session, request, sessionID, include)
 }

-export function sessionFormRequest(
+export function sessionQuestionForm(
  session: SessionInfo[],
  request: Record<string, FormInfo[] | undefined> | ((sessionID: string) => FormInfo[] | undefined),
  sessionID?: string,
 ) {
-  return sessionTreeRequest(
-    session,
-    request,
-    sessionID,
-    (item) => item.metadata?.kind === "question" || item.metadata?.kind === "websearch.provider",
-  )
+  return sessionTreeRequest(session, request, sessionID, (item) => item.metadata?.kind === "question")
 }
@@ -1,58 +0,0 @@
-[data-component="session-websearch-dock"] {
-  width: 100%;
-  border: 0.5px solid var(--v2-border-border-base);
-  border-radius: 12px;
-
-  .websearch-body {
-    box-shadow: var(--v2-elevation-raised);
-  }
-
-  .websearch-setting {
-    padding: 16px;
-  }
-
-  .websearch-setting [data-component="settings-row"] {
-    column-gap: 24px;
-    padding-block: 0;
-    border: 0;
-  }
-
-  .websearch-footer {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    gap: 16px;
-    padding: 24px 16px 12px;
-    border: 0;
-  }
-
-  .websearch-status {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    margin-inline-end: auto;
-    color: var(--v2-text-text-base);
-    font-size: 13px;
-    line-height: var(--line-height-compact);
-  }
-
-  .websearch-status:empty {
-    display: none;
-  }
-
-  .websearch-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    gap: 16px;
-  }
-}
-
-[data-component="menu-v2-content"][data-slot="select-v2-content"].websearch-provider-menu {
-  width: max-content;
-  min-width: 0;
-
-  [data-component="menu-v2-item"] {
-    gap: 24px;
-  }
-}
@@ -1,86 +0,0 @@
-import { createMemo, Show } from "solid-js"
-import { Button } from "@opencode-ai/ui/button"
-import { DockShell, DockTray } from "@opencode-ai/ui/dock-surface"
-import { Select } from "@opencode-ai/ui/select"
-import { useLanguage } from "@/runtime/i18n/language"
-import { SettingsRow } from "@/settings/row"
-import type { WebSearchRequestModel } from "./websearch"
-import "./session-websearch-dock.css"
-
-export function SessionWebSearchDock(props: { model: WebSearchRequestModel; onSubmit: () => void }) {
-  const language = useLanguage()
-  const options = createMemo(() => [
-    ...(props.model.specific() ? [] : [{ value: "random", label: language.t("session.websearch.any") }]),
-    ...props.model.options(),
-  ])
-  const current = createMemo(() => options().find((option) => option.value === props.model.selected()))
-  const busy = () => props.model.sending() || !props.model.connected()
-  const status = () => {
-    if (props.model.loading()) return language.t("common.loading")
-    if (props.model.failed()) return language.t("session.websearch.failed")
-    if (!props.model.options().length) return language.t("session.websearch.empty")
-  }
-  const unavailable = () => props.model.loading() || props.model.loadFailed() || !props.model.options().length
-  const submit = (selection: string | false) => {
-    if (busy()) return
-    props.onSubmit()
-    void props.model.submit(selection)
-  }
-
-  return (
-    <section
-      data-component="session-websearch-dock"
-      aria-label={language.t("session.websearch.title")}
-      aria-busy={props.model.sending()}
-    >
-      <DockShell class="websearch-body">
-        <div class="websearch-setting">
-          <SettingsRow
-            title={language.t("session.websearch.title")}
-            description={language.t("session.websearch.description")}
-          >
-            <Select
-              aria-label={language.t("session.websearch.provider")}
-              options={options()}
-              current={current()}
-              value={(option) => option.value}
-              label={(option) => option.label}
-              onSelect={(option) => option && props.model.select(option.value)}
-              disabled={busy() || unavailable()}
-              placeholder={language.t("session.websearch.provider")}
-              contentClass="websearch-provider-menu"
-            />
-          </SettingsRow>
-        </div>
-      </DockShell>
-      <DockTray attach="top" class="websearch-footer">
-        <div class="websearch-status" aria-live="polite">
-          <Show when={props.model.loadFailed()} fallback={status()}>
-            <span>{language.t("session.websearch.loadFailed")}</span>
-            <Button variant="ghost" size="small" onClick={props.model.retry} disabled={busy()}>
-              {language.t("session.websearch.retry")}
-            </Button>
-          </Show>
-        </div>
-        <div class="websearch-actions">
-          <Show when={!props.model.specific()}>
-            <Button variant="ghost" size="small" onClick={() => submit(false)} disabled={busy()}>
-              {language.t("session.websearch.disable")}
-            </Button>
-          </Show>
-          <Button
-            variant="neutral"
-            size="small"
-            onClick={() => {
-              const selected = props.model.selected()
-              if (selected) submit(selected)
-            }}
-            disabled={busy() || unavailable() || !current()}
-          >
-            {language.t("session.websearch.enable")}
-          </Button>
-        </div>
-      </DockTray>
-    </section>
-  )
-}
@@ -1,171 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { FormAnswer, FormCreated, FormReplyInput, OpenCodeEvent } from "@opencode-ai/client/promise"
-import { replyWebSearch } from "./websearch"
-
-const consent: FormCreated["data"]["form"] = {
-  id: "frm_consent",
-  sessionID: "ses_child",
-  title: "Web Search",
-  metadata: { kind: "websearch.provider" },
-  fields: [{ key: "choice", type: "string", required: true, custom: false }],
-}
-const provider: FormCreated["data"]["form"] = {
-  ...consent,
-  id: "frm_provider",
-  fields: [
-    {
-      key: "provider",
-      type: "string",
-      required: true,
-      custom: false,
-      options: [
-        { value: "exa", label: "Exa" },
-        { value: "parallel", label: "Parallel" },
-      ],
-    },
-  ],
-}
-
-function fixture() {
-  const listeners = new Set<(event: OpenCodeEvent) => void>()
-  const replies: FormReplyInput[] = []
-  const abort = new AbortController()
-  const emit = (event: OpenCodeEvent) => listeners.forEach((listener) => listener(event))
-  return {
-    form: consent,
-    signal: abort.signal,
-    abort,
-    listeners,
-    replies,
-    events: {
-      listen(listener: (event: OpenCodeEvent) => void) {
-        listeners.add(listener)
-        return () => {
-          listeners.delete(listener)
-        }
-      },
-    },
-    reply: async (input: FormReplyInput) => {
-      replies.push(input)
-    },
-    create: (form = provider) => emit({ id: "evt_create", created: 0, type: "form.created", data: { form } }),
-    cancel: (id: string) =>
-      emit({
-        id: "evt_cancel",
-        created: 0,
-        type: "form.cancelled",
-        data: { id, sessionID: consent.sessionID },
-      }),
-    answer: (id: string, answer: FormAnswer) =>
-      emit({
-        id: "evt_reply",
-        created: 0,
-        type: "form.replied",
-        data: { id, sessionID: consent.sessionID, answer },
-      }),
-  }
-}
-
-describe("web search desktop consent", () => {
-  test.each([
-    ["random", "allow"],
-    [false, "disable"],
-  ] as const)("submits %s without a second form", async (selection, choice) => {
-    const input = fixture()
-    await replyWebSearch({ ...input, selection })
-    expect(input.replies).toEqual([{ sessionID: consent.sessionID, formID: consent.id, answer: { choice } }])
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("subscribes before the first reply and answers the owning session's provider form", async () => {
-    const input = fixture()
-    await replyWebSearch({
-      ...input,
-      selection: "parallel",
-      reply: async (answer) => {
-        input.replies.push(answer)
-        if (answer.answer.choice === "choose") input.create()
-      },
-    })
-    expect(input.replies).toEqual([
-      { sessionID: consent.sessionID, formID: consent.id, answer: { choice: "choose" } },
-      { sessionID: consent.sessionID, formID: provider.id, answer: { provider: "parallel" } },
-    ])
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("ignores questions, other sessions, and repeated consent forms during handoff", async () => {
-    const input = fixture()
-    const pending = replyWebSearch({ ...input, selection: "exa" })
-    input.create({ ...provider, sessionID: "ses_other" })
-    input.create({ ...provider, metadata: { kind: "question" } })
-    input.create(consent)
-    input.create()
-    await pending
-    expect(input.replies).toHaveLength(2)
-    expect(input.replies[1]?.formID).toBe(provider.id)
-  })
-
-  test("leaves a changed provider list for explicit confirmation", async () => {
-    const input = fixture()
-    const pending = replyWebSearch({ ...input, selection: "removed" })
-    input.create()
-    await pending
-    expect(input.replies).toHaveLength(1)
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("supports direct entry into the provider form", async () => {
-    const input = fixture()
-    await replyWebSearch({ ...input, form: provider, selection: "exa" })
-    expect(input.replies).toEqual([{ sessionID: consent.sessionID, formID: provider.id, answer: { provider: "exa" } }])
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("does not misrepresent cancelling the provider form as disabling search", async () => {
-    const input = fixture()
-    await replyWebSearch({ ...input, form: provider, selection: false })
-    expect(input.replies).toEqual([])
-  })
-
-  test.each(["cancel", "other-client", "abort"])("ends a pending handoff on %s", async (action) => {
-    const input = fixture()
-    const pending = replyWebSearch({ ...input, selection: "exa" })
-    if (action === "cancel") input.cancel(consent.id)
-    if (action === "other-client") input.answer(consent.id, { choice: "disable" })
-    if (action === "abort") input.abort.abort()
-    await pending
-    input.create()
-    expect(input.replies).toHaveLength(1)
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("cleans up after a failed consent submission", async () => {
-    const input = fixture()
-    await expect(
-      replyWebSearch({
-        ...input,
-        selection: "exa",
-        reply: async () => {
-          throw new Error("offline")
-        },
-      }),
-    ).rejects.toThrow("offline")
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("propagates provider submission failures for retry", async () => {
-    const input = fixture()
-    await expect(
-      replyWebSearch({
-        ...input,
-        selection: "exa",
-        reply: async (answer) => {
-          if (answer.formID === provider.id) throw new Error("offline")
-          input.create()
-        },
-      }),
-    ).rejects.toThrow("offline")
-    expect(input.listeners.size).toBe(0)
-  })
-})
@@ -1,154 +0,0 @@
-import type { FormInfo, FormOption, FormReplyInput, FormStringField } from "@opencode-ai/client/promise"
-import { createEffect, createMemo, createResource, on, onCleanup } from "solid-js"
-import { createStore } from "solid-js/store"
-import type { OpenCodeEventStream } from "@/runtime/server/client"
-
-export function webSearchProviderField(form: FormInfo) {
-  return form.fields.find(
-    (field): field is FormStringField => field.type === "string" && field.key === "provider" && !!field.options,
-  )
-}
-
-export function createWebSearchRequest(input: {
-  owner: () => string | undefined
-  connected: () => boolean
-  request: () => FormInfo | undefined
-  providers: (sessionID: string) => Promise<FormOption[]>
-  reply: (input: FormReplyInput) => Promise<unknown>
-  events: Pick<OpenCodeEventStream, "listen">
-}) {
-  const [store, setStore] = createStore({
-    selected: "random",
-    sending: undefined as { form: FormInfo; abort: AbortController } | undefined,
-    error: false,
-  })
-  const [providers, resource] = createResource(input.request, async (form) => {
-    const field = webSearchProviderField(form)
-    if (field) return field.options ?? []
-    return input.providers(form.sessionID)
-  })
-  const request = createMemo(() => store.sending?.form ?? input.request())
-  const specific = createMemo(() => {
-    const form = request()
-    return !!form && !!webSearchProviderField(form)
-  })
-  const options = createMemo(() => (providers.error ? [] : (providers() ?? [])))
-  const selected = createMemo(() => {
-    if (!specific()) return store.selected
-    return options().some((option) => option.value === store.selected) ? store.selected : options()[0]?.value
-  })
-
-  createEffect(
-    on([input.owner, input.connected], () => {
-      store.sending?.abort.abort()
-      setStore({ sending: undefined, selected: "random", error: false })
-    }),
-  )
-  createEffect(
-    on(
-      () => input.request()?.id,
-      () => {
-        const form = input.request()
-        if (!form || store.sending || webSearchProviderField(form)) return
-        setStore({ selected: "random", error: false })
-      },
-    ),
-  )
-  onCleanup(() => store.sending?.abort.abort())
-
-  const submit = async (selection: string | false) => {
-    const form = input.request()
-    if (!form || store.sending || !input.connected()) return
-    if (selection === false && webSearchProviderField(form)) return
-    const sending = { form, abort: new AbortController() }
-    setStore({ sending, error: false })
-    await replyWebSearch({ ...input, form, selection, signal: sending.abort.signal })
-      .catch(() => {
-        if (!sending.abort.signal.aborted) setStore("error", true)
-      })
-      .finally(() => {
-        if (store.sending?.abort === sending.abort) setStore("sending", undefined)
-      })
-  }
-
-  return {
-    request,
-    options,
-    selected,
-    specific,
-    loading: () => providers.loading,
-    loadFailed: () => !!providers.error,
-    failed: () => store.error,
-    sending: () => !!store.sending,
-    connected: input.connected,
-    select: (value: string) => setStore({ selected: value, error: false }),
-    retry: () => void resource.refetch(),
-    submit,
-  }
-}
-
-export type WebSearchRequestModel = ReturnType<typeof createWebSearchRequest>
-
-export async function replyWebSearch(input: {
-  form: FormInfo
-  selection: string | false
-  signal: AbortSignal
-  reply: (input: FormReplyInput) => Promise<unknown>
-  events: Pick<OpenCodeEventStream, "listen">
-}) {
-  if (input.signal.aborted) return
-  if (webSearchProviderField(input.form)) {
-    if (input.selection === false) return
-    return input.reply({
-      sessionID: input.form.sessionID,
-      formID: input.form.id,
-      answer: { provider: input.selection },
-    })
-  }
-  if (input.selection === false || input.selection === "random") {
-    return input.reply({
-      sessionID: input.form.sessionID,
-      formID: input.form.id,
-      answer: { choice: input.selection === false ? "disable" : "allow" },
-    })
-  }
-
-  const next = Promise.withResolvers<FormInfo | undefined>()
-  const stop = input.events.listen((event) => {
-    if (event.type === "form.created") {
-      const form = event.data.form
-      if (
-        form.sessionID !== input.form.sessionID ||
-        form.id === input.form.id ||
-        form.metadata?.kind !== "websearch.provider" ||
-        !webSearchProviderField(form)
-      )
-        return
-      next.resolve(form)
-    }
-    if (event.type === "form.cancelled" && event.data.id === input.form.id) next.resolve(undefined)
-    if (event.type === "form.replied" && event.data.id === input.form.id && event.data.answer.choice !== "choose")
-      next.resolve(undefined)
-  })
-  const cancel = () => next.resolve(undefined)
-  input.signal.addEventListener("abort", cancel, { once: true })
-
-  return Promise.all([
-    input.reply({ sessionID: input.form.sessionID, formID: input.form.id, answer: { choice: "choose" } }),
-    next.promise,
-  ])
-    .then(([, form]) => {
-      if (!form || input.signal.aborted) return
-      const field = webSearchProviderField(form)
-      if (!field?.options?.some((option) => option.value === input.selection)) return
-      return input.reply({
-        sessionID: form.sessionID,
-        formID: form.id,
-        answer: { provider: input.selection },
-      })
-    })
-    .finally(() => {
-      stop()
-      input.signal.removeEventListener("abort", cancel)
-    })
-}
@@ -64,7 +64,7 @@ function PreparingSession(props: { sessionID: string; pending: PendingSession })
          provider: { all: providers.all(), default: providers.default(), connected: [] },
        }}
      >
-        <div data-component="session-preparing" data-workspace-session class="min-h-0 flex-1 overflow-y-auto">
+        <div data-component="session-preparing" class="min-h-0 flex-1 overflow-y-auto">
          <SessionIdentityHeader sessionID={props.sessionID} />
          <div class="mx-auto w-full min-w-0 max-w-[1000px] px-4 pb-5 md:px-5">
            <SessionUserMessage
@@ -2,54 +2,30 @@ import { describe, expect, test } from "bun:test"
 import { createRoot } from "solid-js"
 import { createSessionResolution } from "./session-resolution"

-function store() {
-  const syncs = { session: 0, message: 0, pending: 0 }
-  const sessions = {
-    get: () => undefined,
-    sync: () => {
-      syncs.session++
-      return Promise.resolve()
-    },
-    message: {
-      sync: () => {
-        syncs.message++
-        return Promise.resolve()
-      },
-    },
-    pending: {
-      sync: () => {
-        syncs.pending++
-        return Promise.resolve()
-      },
-    },
-  }
-  return { syncs, sessions }
-}
-
 describe("session resolution", () => {
  test("waits for a route session ID", () => {
    createRoot((dispose) => {
-      const input = store()
+      const syncs = { session: 0, message: 0 }
+      const sessions = {
+        get: () => undefined,
+        sync: () => {
+          syncs.session++
+          return Promise.resolve()
+        },
+        message: {
+          sync: () => {
+            syncs.message++
+            return Promise.resolve()
+          },
+        },
+      }
      const session = createSessionResolution(
        () => undefined,
-        () => input.sessions,
+        () => sessions,
      )

      expect(session()).toBeUndefined()
-      expect(input.syncs).toEqual({ session: 0, message: 0, pending: 0 })
-      dispose()
-    })
-  })
-
-  test("starts the transcript and queued input reads with metadata", () => {
-    createRoot((dispose) => {
-      const input = store()
-      createSessionResolution(
-        () => "ses_open",
-        () => input.sessions,
-        { children: true },
-      )
-      expect(input.syncs).toEqual({ session: 1, message: 1, pending: 1 })
+      expect(syncs).toEqual({ session: 0, message: 0 })
      dispose()
    })
  })
@@ -7,9 +7,6 @@ type SessionStore<T> = {
  message: {
    sync: (id: string) => Promise<unknown>
  }
-  pending: {
-    sync: (id: string) => Promise<unknown>
-  }
 }

 type Resolution<T> = { id: string; store: SessionStore<T> } & (
@@ -55,11 +52,8 @@ export function createSessionResolution<T>(
      onCleanup(() => {
        stale = true
      })
-      // The timeline owns message errors; metadata resolution stays independent. Queued inputs
-      // ride along so a reconnect refreshes them with the transcript instead of leaving the
-      // pre-disconnect queue on screen.
+      // The timeline owns message errors; metadata resolution stays independent.
      void store.message.sync(id).catch(() => undefined)
-      void store.pending.sync(id).catch(() => undefined)
      if (cached() && !options?.children && !options?.connected) {
        setStatus({ id, store, state: "settled" })
        return
@@ -138,26 +138,6 @@ export const QuestionRequest = {
  ),
 }

-export const WebSearchRequest = {
-  render: () => (
-    <SessionPreview
-      title="Search for current documentation"
-      description={description}
-      document={questionPendingDocument}
-      request={{
-        type: "websearch",
-        value: {
-          id: "frm_websearch_preview",
-          sessionID: "ses_websearch_preview",
-          title: "Web Search",
-          metadata: { kind: "websearch.provider" },
-          fields: [{ key: "choice", type: "string", required: true, custom: false }],
-        },
-      }}
-    />
-  ),
-}
-
 export const RetryAndInterruption = {
  render: () => (
    <SessionPreview title="Recover the interrupted run" description={description} document={retryAfterInterruption} />
@@ -23,7 +23,6 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { ReviewPanelView } from "@/session/review/panel"
 import { createReviewPanelState } from "@/session/review/panel-state"
 import { TerminalSurface } from "@/session/terminal/surface"
-import type { WebSearchRequestModel } from "./requests/websearch"

 const modelReady = Object.assign(() => true, { promise: undefined }) satisfies ModelSelection["ready"]
 const storyComposerModel = {
@@ -83,7 +82,7 @@ export type SessionPreviewProps = {
  description: string
  document: SessionDocument
  draft?: string
-  request?: { type: "permission"; value: PermissionRequest } | { type: "question" | "websearch"; value: FormInfo }
+  request?: { type: "permission"; value: PermissionRequest } | { type: "question"; value: FormInfo }
  reviewOpened?: boolean
  child?: { parentID: string }
  terminal?: { title: string; lines: string[] }
@@ -174,12 +173,10 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
    activity: string
    reviewOpened: boolean
    request: SessionPreviewProps["request"]
-    searchProvider: string
  }>({
    activity: "Ready",
    reviewOpened: props.reviewOpened ?? false,
    request: props.request,
-    searchProvider: "random",
  })
  const prompt = createPromptController({
    initial: props.draft ?? "",
@@ -192,27 +189,6 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
  const region = {
    state: {
      questionRequest: () => (state.request?.type === "question" ? state.request.value : undefined),
-      websearch: {
-        request: () => (state.request?.type === "websearch" ? state.request.value : undefined),
-        options: () => [
-          { value: "exa", label: "Exa" },
-          { value: "parallel", label: "Parallel" },
-          { value: "tavily", label: "Tavily" },
-        ],
-        selected: () => state.searchProvider,
-        specific: () => false,
-        loading: () => false,
-        loadFailed: () => false,
-        failed: () => false,
-        sending: () => false,
-        connected: () => true,
-        select: (value) => setState("searchProvider", value),
-        retry() {},
-        submit: async (value) => {
-          setState("request", undefined)
-          setState("activity", `Web search selection (local only): ${value}`)
-        },
-      } satisfies WebSearchRequestModel,
      permissionRequest: () => (state.request?.type === "permission" ? state.request.value : undefined),
      permissionResponding: () => false,
      decide: (response) => {
@@ -58,6 +58,7 @@ export function BackgroundMoveHint(props: { keybind?: string[]; onMove?: () => v
      type="button"
      variant="ghost-faint"
      size="small"
+      icon="outline-arrow-to-corner-top-right"
      class="max-w-full"
      aria-label={language.t("session.background.moveInline", { keybind: keybind() })}
      onClick={() => props.onMove?.()}
@@ -40,7 +40,8 @@ export function SessionWorkspaceMenu(props: {
    if (!open) return
    const sdk = serverSDK
    void sdk.api.worktree
-      .list({ location: { directory: props.directory } })
+      .refresh({ projectID: props.project.id })
+      .then(() => sdk.api.worktree.list({ projectID: props.project.id }))
      .then((items) =>
        setDirectories(
          items.map((item) => item.directory).filter((directory) => !sameDirectory(props.project.worktree, directory)),
@@ -1,4 +1,4 @@
-import { Component, Show } from "solid-js"
+import { Component } from "solid-js"
 import { Select } from "@opencode-ai/ui/select"
 import { Switch } from "@opencode-ai/ui/switch"
 import { useLanguage } from "@/runtime/i18n/language"
@@ -61,22 +61,6 @@ export const SettingsExperimental: Component = () => {
                </Switch>
              </div>
            </SettingsRow>
-            <Show when={import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
-              <SettingsRow
-                title={language.t("settings.general.row.showProjectIcon.title")}
-                description={language.t("settings.general.row.showProjectIcon.description")}
-              >
-                <div data-action="settings-show-project-icon">
-                  <Switch
-                    checked={settings.general.showProjectIcon()}
-                    onChange={settings.general.setShowProjectIcon}
-                    hideLabel
-                  >
-                    {language.t("settings.general.row.showProjectIcon.title")}
-                  </Switch>
-                </div>
-              </SettingsRow>
-            </Show>
          </SettingsList>
        </div>
      </div>
@@ -348,6 +348,20 @@ export const SettingsGeneral: Component<{
          </div>
        </SettingsRow>

+        <Show when={import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
+          <SettingsRow
+            title={language.t("settings.general.row.showProjectIcon.title")}
+            description={language.t("settings.general.row.showProjectIcon.description")}
+          >
+            <div data-action="settings-show-project-icon">
+              <Switch
+                checked={settings.general.showProjectIcon()}
+                onChange={(checked) => settings.general.setShowProjectIcon(checked)}
+              />
+            </div>
+          </SettingsRow>
+        </Show>
+
        <Show when={mobile() && import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
          <SettingsRow
            title={language.t("settings.general.row.mobileTitlebarBottom.title")}
@@ -58,7 +58,6 @@ export const SettingsProviders: Component<{
        (provider) =>
          provider.id !== "opencode" || Object.values(provider.models).some((model) => model.cost.input > 0),
      )
-      .toSorted((a, b) => Number(b.id === "opencode-go") - Number(a.id === "opencode-go"))
  })

  const popular = createMemo(() => {
@@ -65,7 +65,7 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
      Promise.all(
        (await serverSDK.api.project.list()).map(async (project) => {
          const worktrees = await serverSDK.api.worktree
-            .list({ location: { directory: project.canonical } })
+            .list({ projectID: project.id })
            .catch(() => [{ directory: project.canonical }, ...project.sandboxes.map((directory) => ({ directory }))])
          return normalizeProjectInfo({ ...project, worktrees })
        }),
@@ -180,7 +180,7 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
    }
    const removed = await context.sdk.api.worktree
      .remove({
-        location: { directory: workspace.project.worktree },
+        projectID: workspace.project.id,
        directory: workspace.directory,
        force,
      })
@@ -1,6 +1,6 @@
 import { createMemo, type Accessor } from "solid-js"
 import { useGlobal, useServerCtx } from "@/runtime/server/runtime"
-import { sessionPermissionRequest, sessionFormRequest } from "@/session/requests/session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 import { ServerConnection } from "@/runtime/server/registry"
 import { useSettings } from "@/settings/model"

@@ -29,12 +29,12 @@ export function useSessionTabAvatarState(
    if (!ctx) return false
    return !!sessionPermissionRequest(sessions(), ctx.data.session.permission.list, sessionId())
  })
-  const hasForms = createMemo(() => {
+  const hasQuestions = createMemo(() => {
    const data = serverCtx()?.data
    if (!data) return false
-    return !!sessionFormRequest(sessions(), data.session.form.list, sessionId())
+    return !!sessionQuestionForm(sessions(), data.session.form.list, sessionId())
  })
-  const needsAttention = createMemo(() => hasPermissions() || hasForms())
+  const needsAttention = createMemo(() => hasPermissions() || hasQuestions())
  const unread = createMemo(
    () => needsAttention() || (serverCtx()?.notification.session.unseenCount(sessionId()) ?? 0) > 0,
  )
@@ -74,7 +74,7 @@ export default function Layout(props: ParentProps) {
                class="-end-2"
                direction="horizontal"
                size={state.tabsWidth}
-                min={140}
+                min={130}
                max={520}
                onResize={(width) => setState("tabsWidth", width)}
              />
@@ -21,19 +21,6 @@ describe("serverStatusDotClass", () => {
    expect(serverStatusDotClass({ ready: true, serverHealth: false, issue: true })).toBe("bg-icon-critical-base")
  })

-  test("pulses the neutral dot while the event stream is reconnecting", () => {
-    expect(serverStatusDotClass({ ready: true, serverHealth: true, issue: false, connecting: true })).toBe(
-      "bg-border-weak-base animate-pulse",
-    )
-    expect(serverStatusDotClass({ ready: false, serverHealth: undefined, issue: false, connecting: true })).toBe(
-      "bg-border-weak-base animate-pulse",
-    )
-    // A server that is known to be down stays critical rather than looking like a routine reconnect.
-    expect(serverStatusDotClass({ ready: true, serverHealth: false, issue: false, connecting: true })).toBe(
-      "bg-icon-critical-base",
-    )
-  })
-
  test("stays neutral before status is ready", () => {
    expect(serverStatusDotClass({ ready: false, serverHealth: true, issue: false })).toBe("bg-border-weak-base")
    expect(serverStatusDotClass({ ready: false, serverHealth: undefined, issue: false })).toBe("bg-border-weak-base")
@@ -20,12 +20,8 @@ export function serverStatusDotClass(input: {
  serverHealth: boolean | undefined
  attention?: boolean
  issue: boolean
-  connecting?: boolean
 }) {
  if (input.serverHealth === false) return "bg-icon-critical-base"
-  // The event stream is (re)connecting: keep the neutral dot but let it breathe so a stale
-  // session is visibly waiting on the server rather than silently frozen.
-  if (input.connecting) return "bg-border-weak-base animate-pulse"
  if (!input.ready || input.serverHealth === undefined) return "bg-border-weak-base"
  if (input.attention) return "bg-v2-background-bg-accent"
  if (input.issue) return "bg-icon-warning-base"
@@ -20,7 +20,6 @@ export function StatusPopover() {
  const sdk = useWorkspaceLocation()
  const settings = useSettings()
  const desktop = createMediaQuery("(min-width: 768px)")
-  const sidebar = () => desktop() && settings.appearance.tabLayout() === "vertical"
  const [shown, setShown] = createSignal(false)
  const serverHealth = () => global.servers.health[server.key]?.healthy
  const mcp = () => data.location.mcp.server.list({ directory: sdk().directory })
@@ -42,10 +41,8 @@ export function StatusPopover() {
    serverHealth: serverHealth(),
    attention: attention(),
    issue: issue(),
-    connecting: server.ctx.sdk.connection.status() !== "connected",
-    sidebar: sidebar(),
-    placement: sidebar() ? "top-start" : "bottom-end",
-    shift: sidebar() ? 0 : -168,
+    placement: desktop() && settings.appearance.tabLayout() === "vertical" ? "top-start" : "bottom-end",
+    shift: desktop() && settings.appearance.tabLayout() === "vertical" ? 0 : -168,
    label: language.t("status.popover.trigger"),
    onOpenChange: setShown,
    body: () => (
@@ -64,8 +61,6 @@ type StatusPopoverState = {
  serverHealth: boolean | undefined
  attention: boolean
  issue: boolean
-  connecting: boolean
-  sidebar: boolean
  placement: "top-start" | "bottom-end"
  shift: number
  label: string
@@ -98,37 +93,21 @@ function StatusPopoverView(props: { state: StatusPopoverState }) {
    <Popover
      open={props.state.shown}
      onOpenChange={props.state.onOpenChange}
-      triggerAs={props.state.sidebar ? "button" : IconButton}
-      triggerProps={
-        props.state.sidebar
-          ? {
-              type: "button",
-              class:
-                "flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] px-1.5 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base data-[state=pressed]:bg-v2-background-bg-layer-02 data-[state=pressed]:text-v2-text-text-base focus-visible:outline-none focus-visible:bg-v2-background-bg-layer-02 [app-region:no-drag]",
-              "data-state": props.state.shown ? "pressed" : undefined,
-              "aria-label": props.state.label,
-            }
-          : {
-              variant: "ghost-muted",
-              size: "large",
-              class: "!w-9 shrink-0",
-              state: props.state.shown ? "pressed" : undefined,
-              "aria-label": props.state.label,
-            }
-      }
+      triggerAs={IconButton}
+      triggerProps={{
+        variant: "ghost-muted",
+        size: "large",
+        class: "!w-9 shrink-0",
+        state: props.state.shown ? "pressed" : undefined,
+        "aria-label": props.state.label,
+      }}
      trigger={
-        <>
-          <div class="relative size-4 shrink-0">
-            <Icon name={props.state.shown ? "status-active" : "status"} />
-            <div
-              data-slot="status-indicator"
-              class={`absolute -top-1 -end-1 size-2 rounded-full border border-[var(--v2-background-bg-deep)] ${serverStatusDotClass(props.state)}`}
-            />
-          </div>
-          <Show when={props.state.sidebar}>
-            <span class="min-w-0 truncate">{props.state.label}</span>
-          </Show>
-        </>
+        <div class="relative size-4">
+          <Icon name={props.state.shown ? "status-active" : "status"} />
+          <div
+            class={`absolute -top-1 -right-1 size-2 rounded-full border border-[var(--v2-background-bg-deep)] ${serverStatusDotClass(props.state)}`}
+          />
+        </div>
      }
      {...popoverProps}
    >
@@ -38,15 +38,9 @@ export function createTitlebarRightSlot(): TitlebarRightSlot {
  }
 }

-export function TitlebarRightMount(props: { vertical?: boolean }) {
+export function TitlebarRightMount() {
  const slot = useTitlebarRightSlot()
-  return (
-    <div
-      ref={slot.setMount}
-      id="opencode-titlebar-right"
-      class={props.vertical ? "flex w-full shrink-0 flex-col" : "flex shrink-0 items-center justify-end gap-0"}
-    />
-  )
+  return <div ref={slot.setMount} id="opencode-titlebar-right" class="flex shrink-0 items-center justify-end gap-0" />
 }

 export function TitlebarRight(props: ParentProps) {
@@ -356,10 +356,10 @@ export function Titlebar(props: {
                  aria-label={language.t("home.title")}
                  aria-pressed={layout.route().type === "home"}
                >
-                  <Icon name="grid-plus" class="shrink-0" />
+                  <Icon name="grid-plus" />
                  <span class="min-w-0 truncate">{language.t("home.title")}</span>
                  <span
-                    class="ms-auto hidden min-w-0 truncate text-v2-text-text-faint group-hover:block group-focus-visible:block"
+                    class="ms-auto shrink-0 whitespace-nowrap text-v2-text-text-faint opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100"
                    aria-hidden="true"
                  >
                    <bdi dir="ltr">{command.keybind("home.toggle")}</bdi>
@@ -654,10 +654,10 @@ export function Titlebar(props: {
                              onClick={openNewTab}
                              aria-label={language.t("command.session.new")}
                            >
-                              <Icon name="edit" class="shrink-0" />
+                              <Icon name="edit" />
                              <span class="min-w-0 truncate">{language.t("command.session.new")}</span>
                              <span
-                                class="ms-auto hidden min-w-0 truncate text-v2-text-text-faint group-hover:block group-focus-visible:block"
+                                class="ms-auto shrink-0 whitespace-nowrap text-v2-text-text-faint opacity-0 group-hover:opacity-100 group-focus-visible:opacity-100"
                                aria-hidden="true"
                              >
                                <bdi dir="ltr">{command.keybind("tab.new")}</bdi>
@@ -680,8 +680,20 @@ export function Titlebar(props: {
                                onReorder={(keys) => tabsStoreActions.reorder(keys)}
                              />
                            </div>
-                            <div data-slot="vertical-tabs-footer" class="mt-2 flex w-full shrink-0 flex-col">
-                              <TitlebarRightMount vertical />
+                            <button
+                              type="button"
+                              data-action="vertical-tabs-settings"
+                              data-state={layout.route().type === "settings" ? "pressed" : undefined}
+                              class="mt-2 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] px-1.5 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base data-[state=pressed]:bg-v2-background-bg-layer-02 data-[state=pressed]:text-v2-text-text-base focus-visible:outline-none focus-visible:bg-v2-background-bg-layer-02 [app-region:no-drag]"
+                              onClick={openSettings}
+                              aria-label={language.t("sidebar.settings")}
+                              aria-pressed={layout.route().type === "settings"}
+                            >
+                              <Icon name="settings-gear" />
+                              {language.t("sidebar.settings")}
+                            </button>
+                            <div data-slot="vertical-tabs-footer" class="flex w-full shrink-0 items-center gap-1.5">
+                              <TitlebarRightMount />
                            </div>
                          </Portal>
                        )}
@@ -7,27 +7,30 @@ import { createWorktree } from "./create"
 describe("worktree creation", () => {
  test.each(
    [
-      { name: "clone", directory: "/copies/repo", root: "/copies/repo", canonical: "/copies/repo" },
+      { name: "clone", directory: "/copies/repo", root: "/copies/repo", canonical: "/copies/repo", parent: "/copies/" },
      {
        name: "clone subdirectory",
        directory: "/copies/repo/packages/app",
        root: "/copies/repo",
        canonical: "/copies/repo",
+        parent: "/copies/",
      },
      {
        name: "linked worktree subdirectory",
        directory: "/linked/task/packages/app",
        root: "/linked/task",
        canonical: "/copies/repo",
+        parent: "/copies/",
      },
      {
        name: "Windows clone",
        directory: "C:\\copies\\repo\\packages\\app",
        root: "C:\\copies\\repo",
        canonical: "C:\\copies\\repo",
+        parent: "C:/copies/",
      },
    ].flatMap((input) => [true, false].map((cached) => ({ ...input, cached }))),
-  )("uses the server destination and clone-local main for $name (cached: $cached)", async (input) => {
+  )("uses the clone-local main for $name (cached: $cached)", async (input) => {
    const project = { id: "proj_clone", directory: input.root, canonical: input.canonical }
    const requests: Request[] = []
    const api = OpenCode.make({
@@ -63,9 +66,10 @@ describe("worktree creation", () => {
          strategy: "git",
          from: input.canonical,
          branch: "clone-only",
+          directory: input.parent,
        })
        expect(requests.find((request) => request.method === "POST")?.url).toBe(
-          `http://localhost:3000/api/worktree?location%5Bdirectory%5D=${encodeURIComponent(input.directory)}`,
+          "http://localhost:3000/api/worktree/proj_clone",
        )
        expect(
          requests
@@ -1,5 +1,6 @@
 import type { LocationGetOutput, OpenCodeClient } from "@opencode-ai/client/promise"
 import type { Data } from "@opencode-ai/client/solid"
+import { getDirectory } from "@opencode-ai/util/path"

 export async function createWorktree(input: {
  api: Pick<OpenCodeClient, "location" | "worktree">
@@ -10,10 +11,11 @@ export async function createWorktree(input: {
 }) {
  const project = input.project ?? (await input.api.location.get({ location: { directory: input.directory } })).project
  const created = await input.api.worktree.create({
-    location: { directory: input.directory },
+    projectID: project.id,
    strategy: "git",
    from: project.canonical,
    branch: input.branch,
+    directory: getDirectory(project.canonical),
  })
  // Populate the client cache before the destination session mounts.
  await input.data.location.syncInfo({ directory: created.directory })
@@ -1,111 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { QueryClient } from "@tanstack/solid-query"
-import type { WorktreeDirectory } from "@opencode-ai/client/promise"
-import { createWorktreeInventory, withWorktreeInventory, worktreeInventoryKey } from "./inventory"
-import { ServerScope } from "@/runtime/server/scope"
-import { normalizeProjectInfo, updateProjectInfo } from "@/runtime/server/global-sync/utils"
-
-function setup(list: (directory: string) => Promise<WorktreeDirectory[]>) {
-  const client = new QueryClient()
-  const calls: string[] = []
-  const updates: Array<[string, WorktreeDirectory[]]> = []
-  const inventory = createWorktreeInventory({
-    scope: ServerScope.local,
-    queryClient: client,
-    api: () => ({
-      list: (input) => {
-        const directory = input!.location!.directory!
-        calls.push(directory)
-        return list(directory)
-      },
-    }),
-    updated: (directory, items) => updates.push([directory, items]),
-  })
-  return { client, calls, updates, inventory }
-}
-
-describe("createWorktreeInventory", () => {
-  test("loads once per project, shares in-flight work, and publishes the result", async () => {
-    const gate = Promise.withResolvers<void>()
-    const setupResult = setup(async (directory) => {
-      await gate.promise
-      return [{ directory }, { directory: `${directory}/feature`, strategy: "git" }]
-    })
-    const first = setupResult.inventory.load("/repo")
-    const second = setupResult.inventory.load("/repo/")
-    expect(setupResult.calls).toEqual(["/repo"])
-    gate.resolve()
-    expect(await first).toHaveLength(2)
-    expect(await second).toHaveLength(2)
-    await setupResult.inventory.load("/repo")
-    expect(setupResult.calls).toEqual(["/repo"])
-    expect(setupResult.updates).toEqual([
-      ["/repo", [{ directory: "/repo" }, { directory: "/repo/feature", strategy: "git" }]],
-    ])
-    expect(setupResult.inventory.cached("/repo/")).toHaveLength(2)
-    setupResult.client.clear()
-  })
-
-  test("refreshes only inventories a view already loaded", async () => {
-    const setupResult = setup(async (directory) => [{ directory }])
-    await setupResult.inventory.refresh("/never-opened")
-    expect(setupResult.calls).toEqual([])
-    await setupResult.inventory.load("/opened")
-    await setupResult.inventory.refresh("/opened")
-    expect(setupResult.calls).toEqual(["/opened", "/opened"])
-    setupResult.client.clear()
-  })
-
-  test("a failed load is not cached and never rejects the caller", async () => {
-    let fail = true
-    const setupResult = setup(async (directory) => {
-      if (fail) throw new Error("Location unavailable")
-      return [{ directory }]
-    })
-    expect(await setupResult.inventory.load("/repo")).toBeUndefined()
-    expect(setupResult.inventory.cached("/repo")).toBeUndefined()
-    fail = false
-    expect(await setupResult.inventory.load("/repo")).toEqual([{ directory: "/repo" }])
-    expect(setupResult.calls).toEqual(["/repo", "/repo"])
-    setupResult.client.clear()
-  })
-
-  test("keys are partitioned by server and normalized by path", () => {
-    const remote = "https://remote.example" as typeof ServerScope.local
-    expect(worktreeInventoryKey(ServerScope.local, "C:\\Repo\\")).toEqual(
-      worktreeInventoryKey(ServerScope.local, "C:/Repo"),
-    )
-    expect(worktreeInventoryKey(ServerScope.local, "/repo")).not.toEqual(worktreeInventoryKey(remote, "/repo"))
-  })
-})
-
-describe("withWorktreeInventory", () => {
-  const metadata = {
-    id: "project",
-    canonical: "/repo",
-    name: "Before",
-    time: { created: 1, updated: 1 },
-    sandboxes: [],
-  }
-
-  test("derives the workspace list from the inventory, excluding the project root", () => {
-    const worktrees = [
-      { directory: "/repo/" },
-      { directory: "/repo/feature", strategy: "git" },
-      { directory: "/elsewhere" },
-    ]
-    expect(withWorktreeInventory(normalizeProjectInfo(metadata), worktrees)).toMatchObject({
-      worktree: "/repo",
-      sandboxes: ["/repo/feature", "/elsewhere"],
-      worktrees,
-    })
-  })
-
-  test("leaves metadata untouched without an inventory and survives metadata updates", () => {
-    const project = normalizeProjectInfo(metadata)
-    expect(withWorktreeInventory(project, undefined)).toBe(project)
-    const cached = [{ directory: "/repo" }, { directory: "/repo/feature", strategy: "git" }]
-    const updated = updateProjectInfo(withWorktreeInventory(project, cached), { ...metadata, name: "After" })
-    expect(withWorktreeInventory(updated, cached)).toMatchObject({ name: "After", sandboxes: ["/repo/feature"] })
-  })
-})
@@ -1,58 +0,0 @@
-import type { QueryClient } from "@tanstack/solid-query"
-import type { WorktreeDirectory } from "@opencode-ai/client/promise"
-import type { ServerApi } from "@/runtime/server/api"
-import type { ServerScope } from "@/runtime/server/scope"
-import type { Project } from "@/runtime/server/types"
-import { pathKey } from "./path-key"
-import { sameDirectory } from "./paths"
-
-export function worktreeInventoryKey(scope: ServerScope, directory: string) {
-  return [scope, "worktree", pathKey(directory)] as const
-}
-
-// Project metadata arrives without worktrees; a loaded inventory supplies the workspace list.
-export function withWorktreeInventory(project: Project, worktrees: readonly WorktreeDirectory[] | undefined): Project {
-  if (!worktrees) return project
-  return {
-    ...project,
-    worktrees: [...worktrees],
-    sandboxes: worktrees
-      .map((item) => item.directory)
-      .filter((directory) => !sameDirectory(project.worktree, directory)),
-  }
-}
-
-// Listing a project's worktrees boots its Location on the server and runs discovery, so only
-// projects the user is looking at are loaded. Historical projects stay metadata-only.
-export function createWorktreeInventory(input: {
-  scope: ServerScope
-  queryClient: QueryClient
-  api: () => Pick<ServerApi["worktree"], "list">
-  updated: (directory: string, worktrees: WorktreeDirectory[]) => void
-}) {
-  const options = (directory: string) => ({
-    queryKey: worktreeInventoryKey(input.scope, directory),
-    queryFn: () =>
-      input
-        .api()
-        .list({ location: { directory } })
-        .then((items) => {
-          input.updated(directory, items)
-          return items
-        }),
-    // `worktree.updated` and reconnect invalidation drive refreshes; time alone does not re-list.
-    staleTime: Infinity,
-    gcTime: Infinity,
-    retry: false,
-  })
-  return {
-    cached: (directory: string) =>
-      input.queryClient.getQueryData<WorktreeDirectory[]>(worktreeInventoryKey(input.scope, directory)),
-    load: (directory: string) => input.queryClient.fetchQuery(options(directory)).catch(() => undefined),
-    // Only inventories some view already demanded are refreshed.
-    refresh: (directory: string) => {
-      if (!input.queryClient.getQueryState(worktreeInventoryKey(input.scope, directory))) return Promise.resolve()
-      return input.queryClient.fetchQuery({ ...options(directory), staleTime: 0 }).catch(() => undefined)
-    },
-  }
-}
@@ -3,7 +3,7 @@ import type { LocationGetOutput, LocationRef } from "@opencode-ai/client/promise
 import { retry } from "@opencode-ai/util/retry"
 import { type Accessor, createEffect, createMemo, onCleanup } from "solid-js"
 import { type LocationContext, useServerSDK } from "@/runtime/server/client"
-import { useData, useServer } from "@/runtime/server/current"
+import { useData } from "@/runtime/server/current"
 export type { LocationContext } from "@/runtime/server/client"

 export type WorkspaceLocation = LocationContext & {
@@ -15,7 +15,6 @@ const context = createSimpleContext({
  name: "Location",
  init: (props: { directory: string | Accessor<string>; workspaceID?: string | Accessor<string | undefined> }) => {
    const serverSDK = useServerSDK()
-    const server = useServer()
    const data = useData()
    const ref = createMemo(
      () => ({
@@ -41,14 +40,6 @@ const context = createSimpleContext({
        retryIf: () => !stale,
      }).catch(() => undefined)
    })
-    createEffect(() => {
-      const id = current()?.project.id
-      if (!id || serverSDK.connection.status() !== "connected") return
-      // Showing a Location is the demand for its project's worktree inventory (workspace styling, picker).
-      // Key it by the metadata root so the result merges into the same global project record.
-      const root = server.ctx.sync.data.project.find((project) => project.id === id)?.worktree
-      if (root) void server.ctx.sync.worktrees.load(root)
-    })

    const location = createMemo(() => serverSDK.ensureDirSdkContext(current()?.directory ?? ref().directory))
    return createMemo<WorkspaceLocation>(() => ({
@@ -17,11 +17,9 @@ function createFixture(initial: Record<string, Session> = {}) {
  const deferred = new Map<string, PromiseWithResolvers<unknown>>()
  const resolves: string[] = []
  const messages = { syncs: [] as string[], ...Promise.withResolvers<unknown>() }
-  const pending = { syncs: [] as string[] }
  return {
    resolves,
    messages,
-    pending,
    sessions: {
      get: (id: string) => cache()[id],
      sync: (id: string) => {
@@ -36,12 +34,6 @@ function createFixture(initial: Record<string, Session> = {}) {
          return messages.promise
        },
      },
-      pending: {
-        sync: (id: string) => {
-          pending.syncs.push(id)
-          return Promise.resolve()
-        },
-      },
    },
    settle(id: string, directory = `/dir/${id}`) {
      setCache({ ...cache(), [id]: { id, directory } })
@@ -94,7 +86,6 @@ test("refreshes the current session on reconnect while keeping cached content vi
    expect(fixture.resolves).toEqual(["ses_a", "ses_a"])
    expect(current()).toEqual(sessionOf("ses_a"))
    expect(fixture.messages.syncs).toEqual(["ses_a", "ses_a"])
-    expect(fixture.pending.syncs).toEqual(["ses_a", "ses_a"])
    fixture.settle("ses_a", "/worktrees/moved")
    await flush()
    expect(current()?.directory).toBe("/worktrees/moved")
@@ -1,209 +0,0 @@
-import { afterEach, describe, expect, test } from "bun:test"
-import type { FormCreated, FormReplyInput, OpenCodeEvent } from "@opencode-ai/client/promise"
-import { createEffect, createRoot } from "solid-js"
-import { createStore } from "solid-js/store"
-import { createWebSearchRequest } from "@/session/requests/websearch"
-
-const consent: FormCreated["data"]["form"] = {
-  id: "frm_consent",
-  sessionID: "ses_child",
-  title: "Web Search",
-  metadata: { kind: "websearch.provider" },
-  fields: [{ key: "choice", type: "string", required: true, custom: false }],
-}
-const options = [
-  { value: "exa", label: "Exa" },
-  { value: "parallel", label: "Parallel" },
-]
-const provider: FormCreated["data"]["form"] = {
-  ...consent,
-  id: "frm_provider",
-  fields: [{ key: "provider", type: "string", options, required: true, custom: false }],
-}
-
-const cleanups: VoidFunction[] = []
-afterEach(() => cleanups.splice(0).forEach((dispose) => dispose()))
-
-function ready(condition: () => boolean) {
-  return new Promise<void>((resolve) => {
-    createRoot((dispose) => {
-      cleanups.push(dispose)
-      createEffect(() => {
-        if (!condition()) return
-        dispose()
-        resolve()
-      })
-    })
-  })
-}
-
-function fixture(form: FormCreated["data"]["form"] | null = consent) {
-  return createRoot((dispose) => {
-    cleanups.push(dispose)
-    const listeners = new Set<(event: OpenCodeEvent) => void>()
-    const replies: FormReplyInput[] = []
-    const loads: string[] = []
-    const [state, setState] = createStore({
-      request: form ?? undefined,
-      owner: "ses_root",
-      connected: true,
-      loadFails: false,
-      replyFails: false,
-    })
-    const model = createWebSearchRequest({
-      owner: () => state.owner,
-      connected: () => state.connected,
-      request: () => state.request,
-      providers: async (sessionID) => {
-        loads.push(sessionID)
-        if (state.loadFails) throw new Error("offline")
-        return options
-      },
-      reply: async (input) => {
-        replies.push(input)
-        if (state.replyFails) throw new Error("offline")
-        setState("request", undefined)
-      },
-      events: {
-        listen(listener) {
-          listeners.add(listener)
-          return () => {
-            listeners.delete(listener)
-          }
-        },
-      },
-    })
-    return {
-      model,
-      state,
-      setState,
-      replies,
-      loads,
-      dispose,
-      listeners,
-      create(form = provider) {
-        setState("request", form)
-        listeners.forEach((listener) =>
-          listener({
-            id: "evt_create",
-            created: 0,
-            type: "form.created",
-            data: { form },
-          }),
-        )
-      },
-      cancel(id: string) {
-        setState("request", undefined)
-        listeners.forEach((listener) =>
-          listener({
-            id: "evt_cancel",
-            created: 0,
-            type: "form.cancelled",
-            data: { id, sessionID: consent.sessionID },
-          }),
-        )
-      },
-    }
-  })
-}
-
-describe("web search request state", () => {
-  test("loads providers for the form owner, not the viewed parent, and waits for consent", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    expect(input.loads).toEqual(["ses_child"])
-    expect(input.model.selected()).toBe("random")
-    input.model.select("exa")
-    expect(input.replies).toEqual([])
-    await input.model.submit(false)
-    expect(input.replies[0]?.answer).toEqual({ choice: "disable" })
-    expect(input.model.request()).toBeUndefined()
-    expect(input.model.sending()).toBe(false)
-  })
-
-  test("does not load providers when there is no consent request", () => {
-    const input = fixture(null)
-    expect(input.model.request()).toBeUndefined()
-    expect(input.loads).toEqual([])
-  })
-
-  test("holds the card across both forms and prevents duplicate submissions", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    input.model.select("parallel")
-    const pending = input.model.submit("parallel")
-    await input.model.submit("parallel")
-    expect(input.state.request).toBeUndefined()
-    expect(input.model.request()?.id).toBe(consent.id)
-    expect(input.model.sending()).toBe(true)
-    input.create()
-    await pending
-    expect(input.replies.map((reply) => reply.answer)).toEqual([{ choice: "choose" }, { provider: "parallel" }])
-    expect(input.model.request()).toBeUndefined()
-    expect(input.model.sending()).toBe(false)
-    expect(input.listeners.size).toBe(0)
-  })
-
-  test("direct provider requests need confirmation and do not load a different provider list", async () => {
-    const input = fixture(provider)
-    await ready(() => !input.model.loading())
-    expect(input.loads).toEqual([])
-    expect(input.model.specific()).toBe(true)
-    expect(input.model.options()).toEqual(options)
-    expect(input.replies).toEqual([])
-    await input.model.submit("exa")
-    expect(input.replies.map((reply) => reply.answer)).toEqual([{ provider: "exa" }])
-  })
-
-  test("keeps the selected provider after failure and retries only the provider form", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    input.model.select("parallel")
-    const pending = input.model.submit("parallel")
-    input.setState("replyFails", true)
-    input.create()
-    await pending
-    expect(input.model.failed()).toBe(true)
-    expect(input.model.sending()).toBe(false)
-    expect(input.model.request()?.id).toBe(provider.id)
-    expect(input.model.selected()).toBe("parallel")
-    input.setState("replyFails", false)
-    await input.model.submit("parallel")
-    expect(input.replies.map((reply) => reply.answer)).toEqual([
-      { choice: "choose" },
-      { provider: "parallel" },
-      { provider: "parallel" },
-    ])
-    expect(input.model.request()).toBeUndefined()
-  })
-
-  test("can retry loading providers without submitting consent", async () => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    input.setState("loadFails", true)
-    input.model.retry()
-    await ready(() => input.model.loadFailed())
-    expect(input.model.options()).toEqual([])
-    input.setState("loadFails", false)
-    input.model.retry()
-    await ready(() => !input.model.loading())
-    expect(input.model.options()).toEqual(options)
-    expect(input.model.loadFailed()).toBe(false)
-    expect(input.replies).toEqual([])
-  })
-
-  test.each(["navigate", "disconnect", "dispose", "cancel"])("stops automatic replies on %s", async (action) => {
-    const input = fixture()
-    await ready(() => !input.model.loading())
-    const pending = input.model.submit("exa")
-    if (action === "navigate") input.setState("owner", "ses_other")
-    if (action === "disconnect") input.setState("connected", false)
-    if (action === "dispose") input.dispose()
-    if (action === "cancel") input.cancel(consent.id)
-    await pending
-    expect(input.model.sending()).toBe(false)
-    expect(input.listeners.size).toBe(0)
-    input.create()
-    expect(input.replies.map((reply) => reply.answer)).toEqual([{ choice: "choose" }])
-  })
-})
@@ -17,8 +17,8 @@ import {
 } from "./shared"

 const integrationPriority = new Map([
-  ["opencode-go", 0],
-  ["opencode", 1],
+  ["opencode", 0],
+  ["opencode-go", 1],
  ["openai", 2],
  ["github-copilot", 3],
  ["google", 4],
@@ -18,9 +18,7 @@ export const loadIntegrations = Effect.fn("cli.auth.integrations")(function* (cl
  // The model endpoint is the existing public readiness boundary for the initial plugin generation.
  yield* request((signal) => client.model.default({ location }, { signal }))
  return yield* request((signal) => client.integration.list({ location }, { signal })).pipe(
-    Effect.map((response) =>
-      response.data.toSorted((a, b) => Number(b.id === "opencode-go") - Number(a.id === "opencode-go")),
-    ),
+    Effect.map((response) => response.data),
  )
 })

@@ -47,7 +47,7 @@ export default Runtime.handler(Commands, (input) =>
      ),
    )
    const updater = yield* Updater.Service
-    const update = yield* updater.run().pipe(Effect.forkScoped)
+    const update = yield* updater.check().pipe(Effect.forkScoped)
    preflight.loading()
    const config = yield* Config.Service
    const npm = yield* Npm.Service
@@ -92,7 +92,6 @@ export default Runtime.handler(Commands, (input) =>
            ),
            { signal },
          ),
-        check: (signal) => runPromise(Fiber.join(update).pipe(Effect.flatMap(() => updater.check())), { signal }),
        apply: (version) => runPromise(updater.apply(version)),
      },
      packages: {
@@ -167,7 +167,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
      yield* Updater.Service.pipe(
        Effect.flatMap((updater) =>
          Updater.pollUpdates({
-            check: updater.run().pipe(
+            check: updater.check().pipe(
              Effect.flatMap((result) => {
                if (!result) return Effect.void
                if (result.type === "available") return server.updateAvailable(result.version)
@@ -9,12 +9,10 @@ import { action, parseReleaseVersion, type Policy } from "./updater-action"

 export const methods = ["curl", "npm", "pnpm", "bun", "yarn"] as const
 export type Method = (typeof methods)[number]
-export type RunResult = { readonly type: "available" | "installed"; readonly version: string }
-export type CheckResult = RunResult | { readonly type: "unavailable"; readonly message: string }
+export type CheckResult = { readonly type: "available" | "installed"; readonly version: string }

 export interface Interface {
-  readonly run: () => Effect.Effect<RunResult | undefined>
-  readonly check: () => Effect.Effect<CheckResult | undefined, Error>
+  readonly check: () => Effect.Effect<CheckResult | undefined>
  readonly apply: (version: string) => Effect.Effect<void, Error>
  readonly method: () => Effect.Effect<Method | undefined>
  readonly latest: () => Effect.Effect<string, Error>
@@ -75,10 +73,10 @@ const make = Effect.gen(function* () {
        Effect.orElseSucceed(() => undefined),
      ),
    )
-    return values.findLast((value) => value !== undefined) ?? "notify"
+    return values.findLast((value) => value !== undefined) ?? "auto"
  })

-  const exec = Effect.fnUntraced(function* (command: string[], timeout: Duration.Input = "10 seconds") {
+  const run = Effect.fnUntraced(function* (command: string[], timeout: Duration.Input = "10 seconds") {
    return yield* appProcess
      .run(ChildProcess.make(command[0], command.slice(1)), {
        timeout,
@@ -113,7 +111,7 @@ const make = Effect.gen(function* () {
    ]
    const results = yield* Effect.forEach(
      checks,
-      (check) => exec(check.command).pipe(Effect.map((result) => ({ check, result }))),
+      (check) => run(check.command).pipe(Effect.map((result) => ({ check, result }))),
      { concurrency: "unbounded" },
    )
    return results.find((result) => result.result.stdout.includes(installedPackage))?.check.method
@@ -121,12 +119,12 @@ const make = Effect.gen(function* () {

  const release = Effect.fnUntraced(function* () {
    const response = yield* Effect.tryPromise({
-      try: (signal) =>
+      try: () =>
        fetch(
          `https://update.opencode.ai/api/${encodeURIComponent(channel)}/${encodeURIComponent(OPENCODE_ARTIFACT)}/npm`,
          {
            headers: { "User-Agent": `opencode/${OPENCODE_VERSION}` },
-            signal: AbortSignal.any([signal, AbortSignal.timeout(10_000)]),
+            signal: AbortSignal.timeout(10_000),
          },
        ),
      catch: (cause) => new Error("Failed to check for updates", { cause }),
@@ -168,20 +166,17 @@ const make = Effect.gen(function* () {
          // Bun does not prune old versions from its shared package cache.
          yield* fs.makeDirectory(global.cache, { recursive: true })
          const cache = yield* fs.makeTempDirectoryScoped({ directory: global.cache, prefix: "update-" })
-          return yield* exec(["bun", "install", "--global", "--trust", "--cache-dir", cache, target], "5 minutes")
+          return yield* run(["bun", "install", "--global", "--trust", "--cache-dir", cache, target], "5 minutes")
        }
        if (method === "curl") {
          yield* fs.makeDirectory(global.cache, { recursive: true })
          const directory = yield* fs.makeTempDirectoryScoped({ directory: global.cache, prefix: "update-" })
          const installer = path.join(directory, "install")
-          const download = yield* exec(
-            ["curl", "-fsSL", "-o", installer, "https://opencode.ai/v2/install"],
-            "5 minutes",
-          )
+          const download = yield* run(["curl", "-fsSL", "-o", installer, "https://opencode.ai/v2/install"], "5 minutes")
          if (download.code !== 0) return download
-          return yield* exec(["bash", installer, "--version", version, "--no-modify-path"], "5 minutes")
+          return yield* run(["bash", installer, "--version", version, "--no-modify-path"], "5 minutes")
        }
-        return yield* exec(commands[method], "5 minutes")
+        return yield* run(commands[method], "5 minutes")
      }),
    ).pipe(Effect.mapError((cause) => new Error(`Failed to update with ${method}`, { cause })))
    if (result.code === 0) return
@@ -235,25 +230,7 @@ const make = Effect.gen(function* () {
    if (!(yield* install(version))) return yield* Effect.fail(new Error("Installation method not found"))
  })

-  const check = Effect.fn("cli.updater.check")(function* () {
-    if (OPENCODE_LOCAL)
-      return {
-        type: "unavailable" as const,
-        message: "This build runs from a source checkout. Use an installed OpenCode release to check for updates.",
-      }
-    const version = yield* latest()
-    if (!parseReleaseVersion(version)) return yield* Effect.fail(new Error(`Invalid version: ${version}`))
-    const current = yield* Ref.get(installedVersion)
-    if (action(current, version, "auto") === "none") {
-      // An earlier check may have installed the update while this client is still running.
-      return action(OPENCODE_VERSION, current, "auto") === "none"
-        ? undefined
-        : { type: "installed" as const, version: current }
-    }
-    return { type: "available" as const, version }
-  })
-
-  const run = Effect.fn("cli.updater.run")(
+  const check = Effect.fn("cli.updater.check")(
    function* () {
      const result = yield* inspect()
      if (!result) return undefined
@@ -264,7 +241,7 @@ const make = Effect.gen(function* () {
    Effect.catch((error) => Effect.logWarning("update check failed", { error }).pipe(Effect.as(undefined))),
  )

-  return Service.of({ run, check, apply, method, latest, upgrade })
+  return Service.of({ check, apply, method, latest, upgrade })
 })

 export const layer = Layer.effect(Service, make)
@@ -68,36 +68,6 @@ describe("auth command", () => {
    expect(requests.indexOf("/api/model/default")).toBeLessThan(requests.indexOf("/api/integration"))
  })

-  test("lists OpenCode Go before Zen and preserves the remaining integration order", async () => {
-    using server = authServer((request, url) => {
-      if (url.pathname === "/api/integration") {
-        return Response.json(
-          located(
-            [
-              { id: "opencode", name: "OpenCode Zen" },
-              { id: "anthropic", name: "Anthropic" },
-              { id: "opencode-go", name: "OpenCode Go" },
-            ].map((integration) => ({
-              ...integration,
-              methods: [],
-              connections: [{ type: "env", name: "TEST_API_KEY" }],
-            })),
-          ),
-        )
-      }
-      return new Response("Not found", { status: 404 })
-    })
-
-    const result = await cli(["auth", "list", "--server", server.url.toString()])
-    expect({ exitCode: result.exitCode, stderr: result.stderr }).toEqual({ exitCode: 0, stderr: "" })
-    expect(
-      result.stdout
-        .trim()
-        .split("\n")
-        .map((line) => line.split(/\s{2,}/)[0]),
-    ).toEqual(["OpenCode Go", "OpenCode Zen", "Anthropic"])
-  })
-
  test("runs command authentication without interactive input", async () => {
    const requests: Array<{ method: string; path: string }> = []
    using server = authServer((request, url) => {
@@ -12,8 +12,7 @@ await Effect.runPromise(
    process.argv.slice(2),
  ).pipe(
    Effect.provideService(Updater.Service, {
-      run: () => Effect.die("Manual upgrades must not check for automatic updates"),
-      check: () => Effect.die("Manual upgrades must not check for TUI updates"),
+      check: () => Effect.die("Manual upgrades must not check for automatic updates"),
      apply: () => Effect.die("Manual upgrades must not apply TUI updates"),
      method: () =>
        Effect.sync(() => {
@@ -1931,37 +1931,33 @@ export interface ReferenceApi<E = never> {
  readonly list: ReferenceListOperation<E>
 }

-export type WorktreeListInput = {
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-}
+export type WorktreeListInput = { readonly projectID: Project.ID }
 export type WorktreeListOutput = Worktree.List
-export type WorktreeListOperation<E = never> = (input?: WorktreeListInput) => Effect.Effect<WorktreeListOutput, E>
+export type WorktreeListOperation<E = never> = (input: WorktreeListInput) => Effect.Effect<WorktreeListOutput, E>

 export type WorktreeCreateInput = {
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  readonly strategy?: Worktree.StrategyID | undefined
+  readonly projectID: Project.ID
+  readonly strategy: Worktree.StrategyID
  readonly from?: AbsolutePath | undefined
  readonly branch?: string | undefined
-  readonly directory?: AbsolutePath | undefined
+  readonly directory: AbsolutePath
  readonly name?: string | undefined
 }
 export type WorktreeCreateOutput = Worktree.Info
-export type WorktreeCreateOperation<E = never> = (input?: WorktreeCreateInput) => Effect.Effect<WorktreeCreateOutput, E>
+export type WorktreeCreateOperation<E = never> = (input: WorktreeCreateInput) => Effect.Effect<WorktreeCreateOutput, E>

 export type WorktreeRemoveInput = {
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly projectID: Project.ID
  readonly directory: AbsolutePath
  readonly force: boolean
 }
 export type WorktreeRemoveOutput = void
 export type WorktreeRemoveOperation<E = never> = (input: WorktreeRemoveInput) => Effect.Effect<WorktreeRemoveOutput, E>

-export type WorktreeRefreshInput = {
-  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-}
+export type WorktreeRefreshInput = { readonly projectID: Project.ID }
 export type WorktreeRefreshOutput = void
 export type WorktreeRefreshOperation<E = never> = (
-  input?: WorktreeRefreshInput,
+  input: WorktreeRefreshInput,
 ) => Effect.Effect<WorktreeRefreshOutput, E>

 export interface WorktreeApi<E = never> {
@@ -1451,21 +1451,21 @@ const EndpointReferenceList = (raw: RawClient["server.reference"]) => (input?: R

 const adaptGroupReference = (raw: RawClient["server.reference"]) => ({ list: EndpointReferenceList(raw) })

-const EndpointWorktreeList = (raw: RawClient["server.worktree"]) => (input?: WorktreeListInput) =>
+const EndpointWorktreeList = (raw: RawClient["server.worktree"]) => (input: WorktreeListInput) =>
  preserveEffect<WorktreeListOutput>()(
-    raw["worktree.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
+    raw["worktree.list"]({ params: { projectID: input["projectID"] } }).pipe(Effect.mapError(mapClientError)),
  )

-const EndpointWorktreeCreate = (raw: RawClient["server.worktree"]) => (input?: WorktreeCreateInput) =>
+const EndpointWorktreeCreate = (raw: RawClient["server.worktree"]) => (input: WorktreeCreateInput) =>
  preserveEffect<WorktreeCreateOutput>()(
    raw["worktree.create"]({
-      query: { location: input?.["location"] },
+      params: { projectID: input["projectID"] },
      payload: {
-        strategy: input?.["strategy"],
-        from: input?.["from"],
-        branch: input?.["branch"],
-        directory: input?.["directory"],
-        name: input?.["name"],
+        strategy: input["strategy"],
+        from: input["from"],
+        branch: input["branch"],
+        directory: input["directory"],
+        name: input["name"],
      },
    }).pipe(Effect.mapError(mapClientError)),
  )
@@ -1473,14 +1473,14 @@ const EndpointWorktreeCreate = (raw: RawClient["server.worktree"]) => (input?: W
 const EndpointWorktreeRemove = (raw: RawClient["server.worktree"]) => (input: WorktreeRemoveInput) =>
  preserveEffect<WorktreeRemoveOutput>()(
    raw["worktree.remove"]({
-      query: { location: input["location"] },
+      params: { projectID: input["projectID"] },
      payload: { directory: input["directory"], force: input["force"] },
    }).pipe(Effect.mapError(mapClientError)),
  )

-const EndpointWorktreeRefresh = (raw: RawClient["server.worktree"]) => (input?: WorktreeRefreshInput) =>
+const EndpointWorktreeRefresh = (raw: RawClient["server.worktree"]) => (input: WorktreeRefreshInput) =>
  preserveEffect<WorktreeRefreshOutput>()(
-    raw["worktree.refresh"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
+    raw["worktree.refresh"]({ params: { projectID: input["projectID"] } }).pipe(Effect.mapError(mapClientError)),
  )

 const adaptGroupWorktree = (raw: RawClient["server.worktree"]) => ({
@@ -20,7 +20,6 @@ export type WebSearchApi = Client["websearch"]
 export type SessionApi = Client["session"]
 export type SkillApi = Client["skill"]
 export type VcsApi = Client["vcs"]
-export type WorktreeApi = Client["worktree"]

 export interface CatalogApi {
  readonly provider: ProviderApi
@@ -9,7 +9,7 @@ export type { ClientOptions, RequestOptions } from "./generated/client.js"

 export function make(options: ClientOptions) {
  const raw = OpenCode.make(options)
-  const events = SharedEvents.make((signal, onActivity) => raw.event.subscribe({ signal, onActivity }))
+  const events = SharedEvents.make((signal) => raw.event.subscribe({ signal }))
  return {
    ...raw,
    rpc: Object.assign(makeRpc(raw, events), raw.rpc),
@@ -278,8 +278,6 @@ export interface ClientOptions {
 export interface RequestOptions {
  readonly signal?: AbortSignal
  readonly headers?: RequestInit["headers"]
-  /** Reports every chunk a streaming response receives, including keepalive comments that yield no event. */
-  readonly onActivity?: () => void
 }

 interface RequestDescriptor {
@@ -371,7 +369,6 @@ export function make(options: ClientOptions) {
          } catch (cause) {
            throw new ClientError("Transport", { cause })
          }
-          if (!next.done) requestOptions?.onActivity?.()
          buffer += decoder.decode(next.value, { stream: !next.done })
          if (buffer.length > maxSseEventBytes) throw new ClientError("SseEventTooLarge")
          const trailingCarriageReturn = !next.done && buffer.endsWith("\r")
@@ -1971,30 +1968,28 @@ export function make(options: ClientOptions) {
        ),
    },
    worktree: {
-      list: (input?: WorktreeListInput, requestOptions?: RequestOptions) =>
+      list: (input: WorktreeListInput, requestOptions?: RequestOptions) =>
        request<WorktreeListOutput>(
          {
            method: "GET",
-            path: `/api/worktree`,
-            query: { location: input?.["location"] },
+            path: `/api/worktree/${encodeURIComponent(input.projectID)}`,
            successStatus: 200,
            declaredStatuses: [400, 401],
            empty: false,
          },
          requestOptions,
        ),
-      create: (input?: WorktreeCreateInput, requestOptions?: RequestOptions) =>
+      create: (input: WorktreeCreateInput, requestOptions?: RequestOptions) =>
        request<WorktreeCreateOutput>(
          {
            method: "POST",
-            path: `/api/worktree`,
-            query: { location: input?.["location"] },
+            path: `/api/worktree/${encodeURIComponent(input.projectID)}`,
            body: {
-              strategy: input?.["strategy"],
-              from: input?.["from"],
-              branch: input?.["branch"],
-              directory: input?.["directory"],
-              name: input?.["name"],
+              strategy: input["strategy"],
+              from: input["from"],
+              branch: input["branch"],
+              directory: input["directory"],
+              name: input["name"],
            },
            successStatus: 200,
            declaredStatuses: [400, 401],
@@ -2006,8 +2001,7 @@ export function make(options: ClientOptions) {
        request<WorktreeRemoveOutput>(
          {
            method: "DELETE",
-            path: `/api/worktree`,
-            query: { location: input["location"] },
+            path: `/api/worktree/${encodeURIComponent(input.projectID)}`,
            body: { directory: input["directory"], force: input["force"] },
            successStatus: 204,
            declaredStatuses: [400, 401],
@@ -2015,12 +2009,11 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      refresh: (input?: WorktreeRefreshInput, requestOptions?: RequestOptions) =>
+      refresh: (input: WorktreeRefreshInput, requestOptions?: RequestOptions) =>
        request<WorktreeRefreshOutput>(
          {
            method: "POST",
-            path: `/api/worktree/refresh`,
-            query: { location: input?.["location"] },
+            path: `/api/worktree/${encodeURIComponent(input.projectID)}/refresh`,
            successStatus: 204,
            declaredStatuses: [400, 401],
            empty: true,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
R44VC0RP	595cea5f8c	Merge remote-tracking branch 'origin/v2' into tui-drop-path	2026-09-04 17:11:55 +00:00
R44VC0RP	d4dd4639bd	fix: preserve attachment paths throughout model input	2026-09-04 17:11:55 +00:00
R44VC0RP	bc2df982d1	fix(core): expose inline media source paths	2026-09-04 17:06:11 +00:00
R44VC0RP	3f437faba7	fix(tui): retain dropped attachment paths	2026-09-04 16:58:14 +00:00