fix(ci): stabilize bun cache keys (#52495)

Co-authored-by: nexxeln <95541290+nexxeln@users.noreply.github.com>

.github/actions/setup-bun/action.yml

@@ -45,14 +45,16 @@ runs:
     - name: Get cache directory
       id: cache
       shell: bash
-      run: echo "dir=$(bun pm cache)" >> "$GITHUB_OUTPUT"
+      run: |
+        echo "dir=$(bun pm cache)" >> "$GITHUB_OUTPUT"
+        echo "version=$(bun --version)" >> "$GITHUB_OUTPUT"
 
     - name: Restore Bun dependencies
       id: bun-cache
       uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ${{ steps.cache.outputs.dir }}
-        key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+        key: ${{ runner.os }}-${{ runner.arch }}-bun-${{ steps.cache.outputs.version }}-${{ hashFiles('bun.lock', 'patches/**') }}
 
     - name: Install setuptools for distutils compatibility
       run: python3 -m pip install setuptools || pip install setuptools || true
@@ -75,4 +77,4 @@ runs:
       uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ${{ steps.cache.outputs.dir }}
-        key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+        key: ${{ steps.bun-cache.outputs.cache-primary-key }}

.github/workflows/compliance-close.yml

@@ -15,7 +15,7 @@ jobs:
   close-non-compliant:
     runs-on: ubuntu-latest
     steps:
-      - name: Close non-compliant issues and PRs after 2 hours
+      - name: Close non-compliant issues and PRs after 72 hours
         uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         with:
           script: |
@@ -33,7 +33,7 @@ jobs:
             }
 
             const now = Date.now();
-            const twoHours = 2 * 60 * 60 * 1000;
+            const seventyTwoHours = 72 * 60 * 60 * 1000;
             const orgMemberAssociations = new Set(['OWNER', 'MEMBER']);
             const agentLogin = 'opencode-agent[bot]';
             const { data: file } = await github.rest.repos.getContent({
@@ -87,14 +87,14 @@ jobs:
               if (!complianceComment) continue;
 
               const commentAge = now - new Date(complianceComment.created_at).getTime();
-              if (commentAge < twoHours) {
-                core.info(`${kind} #${item.number} still within 2-hour window (${Math.round(commentAge / 60000)}m elapsed)`);
+              if (commentAge < seventyTwoHours) {
+                core.info(`${kind} #${item.number} still within 72-hour window (${Math.round(commentAge / 60000)}m elapsed)`);
                 continue;
               }
 
               const closeMessage = isPR
-                ? 'This pull request has been automatically closed because it was not updated to meet our [contributing guidelines](../blob/dev/CONTRIBUTING.md) within the 2-hour window.\n\nFeel free to open a new pull request that follows our guidelines.'
-                : 'This issue has been automatically closed because it was not updated to meet our [contributing guidelines](../blob/dev/CONTRIBUTING.md) within the 2-hour window.\n\nFeel free to open a new issue that follows our issue templates.';
+                ? 'This pull request has been automatically closed because it was not updated to meet our [contributing guidelines](../blob/dev/CONTRIBUTING.md) within the 72-hour window.\n\nFeel free to open a new pull request that follows our guidelines.'
+                : 'This issue has been automatically closed because it was not updated to meet our [contributing guidelines](../blob/dev/CONTRIBUTING.md) within the 72-hour window.\n\nFeel free to open a new issue that follows our issue templates.';
 
               await github.rest.issues.createComment({
                 owner: context.repo.owner,
@@ -129,5 +129,5 @@ jobs:
                 });
               }
 
-              core.info(`Closed non-compliant ${kind} #${item.number} after 2-hour window`);
+              core.info(`Closed non-compliant ${kind} #${item.number} after 72-hour window`);
             }

.github/workflows/duplicate-issues.yml

@@ -107,7 +107,7 @@ jobs:
 
           If the issue is NOT compliant and the author association is not OWNER or MEMBER, start the comment with:
           <!-- issue-compliance -->
-          Then explain what needs to be fixed and that they have 2 hours to edit the issue before it is automatically closed. Also add the label needs:compliance to the issue using: gh issue edit ${{ github.event.issue.number }} --add-label needs:compliance
+          Then explain what needs to be fixed and that they have 72 hours to edit the issue before it is automatically closed. Also add the label needs:compliance to the issue using: gh issue edit ${{ github.event.issue.number }} --add-label needs:compliance
 
           If duplicates were found, include a section about potential duplicates with links.
 
@@ -124,7 +124,7 @@ jobs:
           **What needs to be fixed:**
           - [specific reasons]
 
-          Please edit this issue to address the above within **2 hours**, or it will be automatically closed.
+          Please edit this issue to address the above within **72 hours**, or it will be automatically closed.
 
           [If duplicates found, add:]
           ---

.github/workflows/nix-eval.yml

@@ -37,7 +37,7 @@ jobs:
           echo "=== Flake structure ==="
           nix flake show --all-systems
 
-          SYSTEMS="x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin"
+          SYSTEMS="x86_64-linux aarch64-linux aarch64-darwin"
           PACKAGES="opencode"
           # TODO: move 'desktop' to PACKAGES when #11755 is fixed
           OPTIONAL_PACKAGES="desktop"

.github/workflows/nix-hashes.yml

@@ -34,8 +34,6 @@ jobs:
             runner: blacksmith-4vcpu-ubuntu-2404
           - system: aarch64-linux
             runner: blacksmith-4vcpu-ubuntu-2404-arm
-          - system: x86_64-darwin
-            runner: macos-15-intel
           - system: aarch64-darwin
             runner: macos-latest
     runs-on: ${{ matrix.runner }}
@@ -126,7 +124,7 @@ jobs:
 
           [ -f "$HASH_FILE" ] || echo '{"nodeModules":{}}' > "$HASH_FILE"
 
-          for SYSTEM in x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin; do
+          for SYSTEM in x86_64-linux aarch64-linux aarch64-darwin; do
             FILE="hashes/hash-${SYSTEM}/hash.txt"
             if [ -f "$FILE" ]; then
               HASH="$(tr -d '[:space:]' < "$FILE")"

.github/workflows/pr-standards.yml

@@ -307,7 +307,7 @@ jobs:
             **What needs to be fixed:**
             ${issues.map(i => `- ${i}`).join('\n')}
 
-            Please edit this PR description to address the above within **2 hours**, or it will be automatically closed.
+            Please edit this PR description to address the above within **72 hours**, or it will be automatically closed.
 
             If you believe this was flagged incorrectly, please let a maintainer know.`;
 

.github/workflows/test.yml

@@ -251,6 +251,13 @@ jobs:
         run: bunx playwright test --config e2e/service-worker/playwright.config.ts
         timeout-minutes: 5
 
+      - name: Run session UI component tests
+        if: ${{ !cancelled() && env.E2E_ENABLED == 'true' }}
+        run: bun --cwd packages/session-ui test:components
+        env:
+          CI: true
+        timeout-minutes: 15
+
       - name: Upload Playwright artifacts
         if: always() && env.E2E_ENABLED == 'true'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -261,3 +268,5 @@ jobs:
           path: |
             packages/app/e2e/test-results
             packages/app/e2e/playwright-report
+            packages/session-ui/component-tests/test-results
+            packages/session-ui/component-tests/playwright-report

.oxlintrc.json

@@ -1,5 +1,9 @@
 {
   "$schema": "https://raw.githubusercontent.com/nicolo-ribaudo/oxc-project.github.io/refs/heads/json-schema/src/public/.oxlintrc.schema.json",
+  "jsPlugins": [
+    { "name": "anti-slop", "specifier": "./script/oxlint/anti-slop/index.ts" },
+    { "name": "anti-slop-effect", "specifier": "./script/oxlint/anti-slop/effect/index.ts" }
+  ],
   "categories": {
     "correctness": "off",
     "suspicious": "off",
@@ -18,5 +22,94 @@
       }
     ]
   },
-  "ignorePatterns": ["**/node_modules", "**/dist", "**/.build", "**/.sst", "**/*.d.ts", "**/sdk.gen.ts"]
+  "overrides": [
+    {
+      "files": [
+        "packages/app/**",
+        "packages/desktop/**",
+        "packages/gui-extensions/**",
+        "packages/ui/**",
+        "packages/session-ui/**"
+      ],
+      "rules": {
+        "oxc/no-accumulating-spread": "warn",
+        "anti-slop/no-array-filter-map": "warn",
+        "anti-slop/no-reduce-accumulator-copy": "warn",
+        "anti-slop/no-chained-type-assertions": "warn",
+        "anti-slop/no-conditional-empty-object-spread": "warn",
+        "anti-slop/no-known-value-widening": "warn",
+        "anti-slop/no-module-mocking": "warn",
+        "anti-slop/no-object-parameters": "warn",
+        "anti-slop/no-reflect-apply": "warn",
+        "anti-slop/no-reflect-get": "warn",
+        "anti-slop/no-runtime-typeof": "warn",
+        "anti-slop/no-shape-in-symbol-names": "warn",
+        "anti-slop/no-unknown-parameters": "warn",
+        "anti-slop/no-unknown-returns": "warn",
+        "anti-slop/no-unknown-type-aliases": "warn",
+        "anti-slop/no-unsafe-dictionary-type": "warn",
+        "anti-slop/no-widen-then-assert": "warn",
+        "anti-slop/require-readable-spacing": "warn",
+        "anti-slop/require-safety-comment-for-type-assertion": "warn"
+      }
+    },
+    {
+      "files": ["packages/app/**", "packages/desktop/**", "packages/gui-extensions/**", "packages/session-ui/**"],
+      "rules": {
+        "anti-slop-effect/no-manual-effect-error-tag": "warn",
+        "anti-slop-effect/no-manual-tag-comparison": "warn",
+        "anti-slop-effect/no-manual-tagged-construction": "warn",
+        "anti-slop-effect/no-service-constructor-imports": "warn",
+        "anti-slop-effect/prefer-effect-match": "warn"
+      }
+    },
+    {
+      "files": ["packages/gui-extensions/src/*/**"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              {
+                "regex": "^@opencode/(app|desktop)(/|$)",
+                "message": "GUI extensions never import the app or desktop packages. Use the SDK."
+              },
+              {
+                "regex": "^@/",
+                "message": "GUI extensions never import app internals. Use the SDK."
+              },
+              {
+                "group": ["../*/*", "!../*/contract", "!../sdk/*"],
+                "message": "Import another extension only through its contract.ts."
+              },
+              {
+                "regex": "\\.css$",
+                "message": "Import CSS with ?inline and contribute it with ctx.add(Style, css)."
+              }
+            ]
+          }
+        ]
+      }
+    }
+  ],
+  "ignorePatterns": [
+    "**/node_modules",
+    "**/dist",
+    "**/.build",
+    "**/.sst",
+    "**/*.d.ts",
+    "**/sdk.gen.ts",
+    ".agent/**",
+    ".agents/**",
+    ".claude/**",
+    ".codex/**",
+    ".continue/**",
+    ".cursor/**",
+    ".gemini/**",
+    ".opencode/**",
+    ".pi/**",
+    ".roo/**",
+    ".windsurf/**",
+    "script/oxlint/anti-slop/**"
+  ]
 }

bun.lock

@@ -15,6 +15,7 @@
         "@actions/artifact": "5.0.1",
         "@ast-grep/cli": "0.44.0",
         "@opencode/client": "workspace:*",
+        "@oxlint/plugins": "1.60.0",
         "@tsconfig/bun": "catalog:",
         "@types/mime-types": "3.0.1",
         "@types/react": "19.2.17",
@@ -32,7 +33,7 @@
     },
     "packages/ai": {
       "name": "@opencode/ai",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@aws-sdk/credential-providers": "3.1057.0",
         "@opencode/schema": "workspace:*",
@@ -54,7 +55,7 @@
     },
     "packages/app": {
       "name": "@opencode/app",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@corvu/drawer": "catalog:",
         "@dnd-kit/abstract": "0.5.0",
@@ -64,7 +65,7 @@
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
         "@opencode/client": "workspace:*",
-        "@opencode/plugin-browser": "workspace:*",
+        "@opencode/gui-extensions": "workspace:*",
         "@opencode/schema": "workspace:*",
         "@opencode/session-ui": "workspace:*",
         "@opencode/ui": "workspace:*",
@@ -86,13 +87,11 @@
         "core-js": "3.50.0",
         "effect": "catalog:",
         "fuzzysort": "catalog:",
-        "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1",
         "qr-scanner": "1.4.2",
         "remeda": "catalog:",
         "solid-js": "catalog:",
         "solid-presence": "0.2.0",
         "tailwindcss": "4.3.3",
-        "uqr": "0.1.3",
       },
       "devDependencies": {
         "@happy-dom/global-registrator": "20.0.11",
@@ -103,6 +102,7 @@
         "@types/node": "catalog:",
         "@typescript/native-preview": "catalog:",
         "diff": "catalog:",
+        "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1",
         "happy-dom": "20.11.1",
         "tw-animate-css": "1.4.0",
         "vite": "8.2.2",
@@ -112,7 +112,7 @@
     },
     "packages/cli": {
       "name": "@opencode/cli",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "bin": {
         "opencode": "./bin/opencode.cjs",
         "opencode2": "./bin/opencode2.cjs",
@@ -178,7 +178,7 @@
     },
     "packages/client": {
       "name": "@opencode/client",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/protocol": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -204,7 +204,7 @@
     },
     "packages/codemode": {
       "name": "@opencode/codemode",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "acorn": "8.15.0",
         "effect": "catalog:",
@@ -217,7 +217,7 @@
     },
     "packages/console/app": {
       "name": "@opencode/console-app",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@ibm/plex": "6.4.1",
@@ -253,7 +253,7 @@
     },
     "packages/console/core": {
       "name": "@opencode/console-core",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@aws-sdk/client-sts": "3.782.0",
         "@jsx-email/render": "1.1.1",
@@ -280,7 +280,7 @@
     },
     "packages/console/function": {
       "name": "@opencode/console-function",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@openauthjs/openauth": "0.0.0-20250322224806",
         "@opencode/console-core": "workspace:*",
@@ -297,7 +297,7 @@
     },
     "packages/console/mail": {
       "name": "@opencode/console-mail",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@jsx-email/all": "2.2.3",
         "@jsx-email/cli": "1.4.3",
@@ -321,7 +321,7 @@
     },
     "packages/console/support": {
       "name": "@opencode/console-support",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@cloudflare/vite-plugin": "1.15.2",
         "@opencode/console-core": "workspace:*",
@@ -341,7 +341,7 @@
     },
     "packages/core": {
       "name": "@opencode/core",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@ai-sdk/cohere": "3.0.27",
         "@ai-sdk/gateway": "3.0.104",
@@ -410,7 +410,7 @@
     },
     "packages/desktop": {
       "name": "@opencode/desktop",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@zip.js/zip.js": "2.7.62",
         "electron-context-menu": "5.0.0",
@@ -424,26 +424,22 @@
         "@lydell/node-pty": "catalog:",
         "@opencode/app": "workspace:*",
         "@opencode/client": "workspace:*",
-        "@opencode/plugin-browser": "workspace:*",
+        "@opencode/gui-extensions": "workspace:*",
         "@opencode/schema": "workspace:*",
         "@opencode/ui": "workspace:*",
         "@sentry/solid": "catalog:",
         "@sentry/vite-plugin": "catalog:",
-        "@solid-primitives/storage": "catalog:",
-        "@solidjs/meta": "catalog:",
         "@solidjs/router": "catalog:",
         "@types/bun": "catalog:",
         "@types/node": "catalog:",
         "@typescript/native-preview": "catalog:",
         "app-builder-lib": "26.15.7",
-        "devtools-protocol": "0.0.1687809",
         "drizzle-kit": "catalog:",
         "drizzle-orm": "catalog:",
         "effect": "catalog:",
         "electron": "44.4.5",
         "electron-builder": "26.15.7",
         "electron-vite": "6.0.0-beta.1",
-        "puppeteer-core": "25.9.0",
         "solid-js": "catalog:",
         "typescript": "~5.6.2",
         "vite": "8.2.2",
@@ -459,7 +455,7 @@
     },
     "packages/enterprise": {
       "name": "@opencode/enterprise",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@hono/standard-validator": "catalog:",
         "@opencode-ai/sdk": "1.18.21",
@@ -496,7 +492,7 @@
     },
     "packages/function": {
       "name": "@opencode/function",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@octokit/auth-app": "8.0.1",
         "@octokit/rest": "catalog:",
@@ -510,9 +506,54 @@
         "typescript": "catalog:",
       },
     },
+    "packages/gui-extensions": {
+      "name": "@opencode/gui-extensions",
+      "version": "2.0.20",
+      "dependencies": {
+        "@dnd-kit/abstract": "0.5.0",
+        "@dnd-kit/dom": "0.5.0",
+        "@dnd-kit/solid": "0.5.0",
+        "@effect/platform-node": "catalog:",
+        "@kobalte/core": "catalog:",
+        "@opencode/client": "workspace:*",
+        "@opencode/plugin-browser": "workspace:*",
+        "@opencode/schema": "workspace:*",
+        "@opencode/session-ui": "workspace:*",
+        "@opencode/ui": "workspace:*",
+        "@opencode/util": "workspace:*",
+        "@pierre/trees": "1.0.0-beta.4",
+        "@solid-primitives/event-listener": "catalog:",
+        "@solid-primitives/keyed": "1.5.3",
+        "@solid-primitives/media": "catalog:",
+        "@solid-primitives/resize-observer": "catalog:",
+        "@solid-primitives/scheduled": "1.5.3",
+        "@tanstack/solid-query": "5.91.4",
+        "@tanstack/solid-virtual": "catalog:",
+        "effect": "catalog:",
+        "fuzzysort": "catalog:",
+        "ghostty-web": "github:anomalyco/ghostty-web#83c0a07b8628b748aed073b232cb4b52a6ca11c1",
+        "remeda": "catalog:",
+        "solid-js": "catalog:",
+        "solid-presence": "0.2.0",
+        "uqr": "0.1.3",
+      },
+      "devDependencies": {
+        "@happy-dom/global-registrator": "20.0.11",
+        "@lydell/node-pty": "catalog:",
+        "@tsconfig/node22": "catalog:",
+        "@types/bun": "catalog:",
+        "@types/node": "catalog:",
+        "@typescript/native-preview": "catalog:",
+        "devtools-protocol": "0.0.1687809",
+        "electron": "44.4.5",
+        "electron-updater": "6.8.9",
+        "lighthouse": "13.4.1",
+        "vite": "catalog:",
+      },
+    },
     "packages/http-recorder": {
       "name": "@opencode/http-recorder",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@effect/platform-node-shared": "4.0.0-rc.112",
       },
@@ -531,7 +572,7 @@
     },
     "packages/httpapi-codegen": {
       "name": "@opencode/httpapi-codegen",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "effect": "catalog:",
         "prettier": "3.6.2",
@@ -544,7 +585,7 @@
     },
     "packages/latex": {
       "name": "@opencode/latex",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -558,7 +599,7 @@
     },
     "packages/merman": {
       "name": "@opencode/merman",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opentui/core": "catalog:",
@@ -573,7 +614,7 @@
     },
     "packages/plugin": {
       "name": "@opencode/plugin",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@ai-sdk/provider": "3.0.8",
         "@opencode/ai": "workspace:*",
@@ -599,8 +640,8 @@
       },
       "peerDependencies": {
         "@opencode/theme": "workspace:*",
-        "@opentui/core": ">=0.5.13",
-        "@opentui/solid": ">=0.5.13",
+        "@opentui/core": ">=0.5.14",
+        "@opentui/solid": ">=0.5.14",
         "solid-js": ">=1.9.0",
       },
       "optionalPeers": [
@@ -612,7 +653,7 @@
     },
     "packages/plugin-browser": {
       "name": "@opencode/plugin-browser",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/plugin": "workspace:*",
         "@opencode/schema": "workspace:*",
@@ -642,7 +683,7 @@
     },
     "packages/protocol": {
       "name": "@opencode/protocol",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/schema": "workspace:*",
         "effect": "catalog:",
@@ -657,7 +698,7 @@
     },
     "packages/schema": {
       "name": "@opencode/schema",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@standard-schema/spec": "catalog:",
         "effect": "catalog:",
@@ -681,7 +722,7 @@
     },
     "packages/sdk": {
       "name": "@opencode/sdk",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -702,7 +743,7 @@
     },
     "packages/server": {
       "name": "@opencode/server",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@effect/platform-node": "catalog:",
         "@effect/platform-node-shared": "catalog:",
@@ -724,7 +765,7 @@
     },
     "packages/session-ui": {
       "name": "@opencode/session-ui",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@opencode/client": "workspace:*",
@@ -759,7 +800,7 @@
     },
     "packages/simulation": {
       "name": "@opencode/simulation",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/ai": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -779,7 +820,7 @@
     },
     "packages/stats/app": {
       "name": "@opencode/stats-app",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@ibm/plex": "6.4.1",
         "@kobalte/core": "catalog:",
@@ -813,7 +854,7 @@
     },
     "packages/stats/core": {
       "name": "@opencode/stats-core",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@aws-sdk/client-athena": "3.933.0",
         "@planetscale/database": "1.19.0",
@@ -832,7 +873,7 @@
     },
     "packages/stats/server": {
       "name": "@opencode/stats-server",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@aws-sdk/client-firehose": "3.933.0",
         "@effect/platform-node": "catalog:",
@@ -878,7 +919,7 @@
     },
     "packages/theme": {
       "name": "@opencode/theme",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opentui/core": "catalog:",
         "effect": "catalog:",
@@ -892,7 +933,7 @@
     },
     "packages/tui": {
       "name": "@opencode/tui",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@opencode/client": "workspace:*",
         "@opencode/core": "workspace:*",
@@ -926,7 +967,7 @@
     },
     "packages/ui": {
       "name": "@opencode/ui",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@kobalte/core": "catalog:",
         "@pierre/diffs": "catalog:",
@@ -961,7 +1002,7 @@
     },
     "packages/util": {
       "name": "@opencode/util",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@effect/opentelemetry": "catalog:",
         "@effect/platform-node": "catalog:",
@@ -999,7 +1040,7 @@
     },
     "packages/web": {
       "name": "@opencode/web",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "@astrojs/cloudflare": "12.6.3",
         "@astrojs/markdown-remark": "6.3.1",
@@ -1040,7 +1081,7 @@
     },
     "services/update": {
       "name": "@opencode/update",
-      "version": "2.0.20",
+      "version": "2.0.21",
       "dependencies": {
         "jose": "6.0.11",
         "semver": "catalog:",
@@ -1117,9 +1158,9 @@
     "@npmcli/arborist": "9.4.0",
     "@octokit/rest": "22.0.0",
     "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.5.13",
-    "@opentui/keymap": "0.5.13",
-    "@opentui/solid": "0.5.13",
+    "@opentui/core": "0.5.14",
+    "@opentui/keymap": "0.5.14",
+    "@opentui/solid": "0.5.14",
     "@pierre/diffs": "1.5.1",
     "@playwright/test": "1.59.1",
     "@sentry/solid": "10.71.0",
@@ -2175,6 +2216,8 @@
 
     "@opencode/function": ["@opencode/function@workspace:packages/function"],
 
+    "@opencode/gui-extensions": ["@opencode/gui-extensions@workspace:packages/gui-extensions"],
+
     "@opencode/http-recorder": ["@opencode/http-recorder@workspace:packages/http-recorder"],
 
     "@opencode/httpapi-codegen": ["@opencode/httpapi-codegen@workspace:packages/httpapi-codegen"],
@@ -2255,25 +2298,27 @@
 
     "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.43.0", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],
 
-    "@opentui/core": ["@opentui/core@0.5.13", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.13", "@opentui/core-darwin-x64": "0.5.13", "@opentui/core-linux-arm64": "0.5.13", "@opentui/core-linux-arm64-musl": "0.5.13", "@opentui/core-linux-x64": "0.5.13", "@opentui/core-linux-x64-musl": "0.5.13", "@opentui/core-win32-arm64": "0.5.13", "@opentui/core-win32-x64": "0.5.13" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-3XNXJx3J9I+Ce170oh7GJ3leBZZA7QYv4OAhwiMCPQtKMkhy3Wra99NM26HXcEGme0zjkkJLownwLLnxuc0U/Q=="],
+    "@opentui/core": ["@opentui/core@0.5.14", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.14", "@opentui/core-darwin-x64": "0.5.14", "@opentui/core-linux-arm64": "0.5.14", "@opentui/core-linux-arm64-musl": "0.5.14", "@opentui/core-linux-x64": "0.5.14", "@opentui/core-linux-x64-musl": "0.5.14", "@opentui/core-win32-arm64": "0.5.14", "@opentui/core-win32-x64": "0.5.14" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-tfQ+PWQyeBnYloB3diEcPqbILv14xemH5jjAEICfPuyNDtGBqrjhUtThrhbvFRuPMcj6IEeXrAk6VE8e91h0kg=="],
 
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.13", "", { "os": "darwin", "cpu": "arm64" }, "sha512-5X9U2v5qn4+vKj31zpn0RMoBV3Q9ttdM4t5KN41NPg6XgtIOZgKwox5yOsvBaiQ1KGbuk5wMvXCxfWJ30Mj/nw=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.14", "", { "os": "darwin", "cpu": "arm64" }, "sha512-wWmw41wRMBoI0lN9mgyzGRwYujwwfNkBP6jYM99k4Bx2XkeSZ3sCeu5bwX9vEJPYqjiBShbDhc0NnVSP7NwzVg=="],
 
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.13", "", { "os": "darwin", "cpu": "x64" }, "sha512-9IgQHLKSn3quVsU0gibkRjOPegv1QH4573KWYXQNDmSxBXw84Nd1mDNsbK9f72SblAILhOCYK685pmk3X/z0Ig=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.14", "", { "os": "darwin", "cpu": "x64" }, "sha512-7smHKDH8IhUaBsgYuAClMl2mHWu+yjpMrtdw3wEvBVtCzKMrHi/TJ5PtydO+IfUzR3BXpVubdbR1irD8BTcR/w=="],
 
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.13", "", { "os": "linux", "cpu": "arm64" }, "sha512-jMXGEpB/2Ch/IR0QzYBM5eCr1tUzicxoTP1AbMCbOduJXcGRCHTWqIdQIgRErwPF92gBcDIs4JugSn/Jd0Ki7g=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-xH1hP+NaLySEJeZkl21NlkZBMddMfQ1jU8NeX1AEBc2GNBOvDXU4Ud/xw87SrAvU1xG9K7/9C4oy4AmIMEpVGg=="],
 
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.13", "", { "os": "linux", "cpu": "x64" }, "sha512-7ytcKy7pQxvQer3PADGYNK+HRhSDyhZvp475GRBEhlBJIdhdL8PNU6hjd2R1dnieifiW7Mpc4EiC1kGKe69gYg=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.14", "", { "os": "linux", "cpu": "arm64" }, "sha512-mnBBAuTb92NiRLAjOD755tS8/tNQemDztbg9tMvoCT90G52FtVrRb31Ge6OrYqfm0c9DkZGhEBOhunsId/4zSA=="],
 
-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.13", "", { "os": "linux", "cpu": "x64" }, "sha512-C2ZC7WA7YH/GS+rJnbeVGe6Kxeor0aTD2qcS6l32KmN4XuY7TXm192XJMfxxnKaTA6oKp3mW27ezolJKUcGtMw=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.14", "", { "os": "linux", "cpu": "x64" }, "sha512-Hkk4kaDGMcn9bmJFJPW3/QOGGbPuWe3sCFV/CkiVb4+bCvcTm7EXQr4QTAA63BYy2dKE5bUFUi1zZlyeMkWpnA=="],
 
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.13", "", { "os": "win32", "cpu": "arm64" }, "sha512-IB6eLh6I/gYXrJ0AYxZpD+Dr+yfZJck0ZfLnIapbD+fykaT0umOtvc/BL+CtlC/aSc7jpe0q4eXdn6XIA8HtLw=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.14", "", { "os": "linux", "cpu": "x64" }, "sha512-ngJ+U2grOGEteeQvZdAJNqn09M+At5mfWInauK5aS427bea1yLo+e6hor/CRmbn9SxEEF+SwoyekaOrLPWyU7w=="],
 
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.13", "", { "os": "win32", "cpu": "x64" }, "sha512-FCucDN8A4iFDPdwqLK99ISs42pcbcObkxhN1jtsnmcYM9/Ptron7Hhapx2ObQWYjSrJNnntmfZQd2ewpE8YqTQ=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.14", "", { "os": "win32", "cpu": "arm64" }, "sha512-T9kNqKXg2jysmTsyyZ1A8LBQotFBM+iPjzyRslxyexqrs8a1UcmxbApEo+COtxQuqukMTbvwyqEdAT8vcmxEkQ=="],
 
-    "@opentui/keymap": ["@opentui/keymap@0.5.13", "", { "dependencies": { "@opentui/core": "0.5.13" }, "peerDependencies": { "@opentui/react": "0.5.13", "@opentui/solid": "0.5.13", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-bbpQ5N8000CuvVDhptGuHxUE92sivChjUjLkvYT1VnLlDTiGbQ4mPsHfnqsaEokc7O7jBcoJXJQsLxw7rO/qkg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.14", "", { "os": "win32", "cpu": "x64" }, "sha512-mqKSkab8VdMLSmMdocna7+BTyMoIutkVXOV9lfmPrBO2g7Np5c6c4SJ4QIVZqPvast11XyT0/7FfXOYLKAS72w=="],
 
-    "@opentui/solid": ["@opentui/solid@0.5.13", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.13", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-MGMYQYeoZNn9uq3zsLPqq/G+nBQXgGwpylsrYux0nJ+C+6oflDEE6t8huSTZaAUizC/3WG8sVSVFutczeRbnPg=="],
+    "@opentui/keymap": ["@opentui/keymap@0.5.14", "", { "dependencies": { "@opentui/core": "0.5.14" }, "peerDependencies": { "@opentui/react": "0.5.14", "@opentui/solid": "0.5.14", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-YGTAvRrpQTbRNV7GH0UxRuCSPxwnSooVdB+qPHHP+3ywc93+lhekljgP8dRivl32f3CiMqqm96Uj2PgwKxkC0Q=="],
+
+    "@opentui/solid": ["@opentui/solid@0.5.14", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.14", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-bBRl34mZ0wFGhjHX6y1VNiZmJ3DSm2DVPm0PNSVDpvq9qxRHuywEPTCn/Lgte0C9450tgf11cDqcE3pR9cZwVA=="],
 
     "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],
 
@@ -2475,6 +2520,8 @@
 
     "@oxlint/binding-win32-x64-msvc": ["@oxlint/binding-win32-x64-msvc@1.60.0", "", { "os": "win32", "cpu": "x64" }, "sha512-JOro4ZcfBLamJCyfURQmOQByoorgOdx3ZjAkSqnb/CyG/i+lN3KoV5LAgk5ZAW6DPq7/Cx7n23f8DuTWXTWgyQ=="],
 
+    "@oxlint/plugins": ["@oxlint/plugins@1.60.0", "", {}, "sha512-wxEoVVAS5FQAXiA8jPY+NWTOTKTzbSViMfW7yU5OQ7+f34W0KYfy2iuSLC9o1fiYn5xt3LQLxZBREFJtDlQLRw=="],
+
     "@pagefind/darwin-arm64": ["@pagefind/darwin-arm64@1.5.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-MXpI+7HsAdPkvJ0gk9xj9g541BCqBZOBbdwj9g6lB5LCj6kSV6nqDSjzcAJwvOsfu0fjwvC8hQU+ecfhp+MpiQ=="],
 
     "@pagefind/darwin-x64": ["@pagefind/darwin-x64@1.5.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-IojxFWMEJe0RQ7PQ3KXQsPIImNsbpPYpoZ+QUDrL8fAl/O27IX+LVLs74/UzEZy5uA2LD8Nz1AiwKr72vrkZQw=="],
@@ -6197,6 +6244,8 @@
 
     "@opencode/files/wrangler": ["wrangler@4.110.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.5.0", "@cloudflare/unenv-preset": "2.16.1", "blake3-wasm": "2.1.5", "esbuild": "0.28.1", "miniflare": "4.20260708.1", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.24", "workerd": "1.20260708.1" }, "optionalDependencies": { "fsevents": "2.3.3" }, "peerDependencies": { "@cloudflare/workers-types": "^5.20260708.1" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js", "cf-wrangler": "bin/cf-wrangler.js" } }, "sha512-xZeXKYi7hxQRF5anL+v77RkufJNpF9f3Eqeyqq2QBsETpLZgh0Agj0jJ6JPtkbgn6ukZdh8OK5egsGPWIditgg=="],
 
+    "@opencode/gui-extensions/vite": ["vite@7.3.6", "", { "dependencies": { "esbuild": "^0.27.0 || ^0.28.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg=="],
+
     "@opencode/posts/wrangler": ["wrangler@4.110.0", "", { "dependencies": { "@cloudflare/kv-asset-handler": "0.5.0", "@cloudflare/unenv-preset": "2.16.1", "blake3-wasm": "2.1.5", "esbuild": "0.28.1", "miniflare": "4.20260708.1", "path-to-regexp": "6.3.0", "unenv": "2.0.0-rc.24", "workerd": "1.20260708.1" }, "optionalDependencies": { "fsevents": "2.3.3" }, "peerDependencies": { "@cloudflare/workers-types": "^5.20260708.1" }, "optionalPeers": ["@cloudflare/workers-types"], "bin": { "wrangler": "bin/wrangler.js", "wrangler2": "bin/wrangler.js", "cf-wrangler": "bin/cf-wrangler.js" } }, "sha512-xZeXKYi7hxQRF5anL+v77RkufJNpF9f3Eqeyqq2QBsETpLZgh0Agj0jJ6JPtkbgn6ukZdh8OK5egsGPWIditgg=="],
 
     "@opencode/session-ui/vite": ["vite@7.3.6", "", { "dependencies": { "esbuild": "^0.27.0 || ^0.28.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-4XP60spRGjSZFf1qYH+dJIkK2znL3zQfl9KkOV9MkkRR/3Dls0dxaBsQPTloEc5BLXWPL9vsOxopxyKoMmDueg=="],

flake.nix

@@ -12,7 +12,6 @@
         "aarch64-linux"
         "x86_64-linux"
         "aarch64-darwin"
-        "x86_64-darwin"
       ];
       forEachSystem = f: nixpkgs.lib.genAttrs systems (system: f nixpkgs.legacyPackages.${system});
       rev = self.shortRev or self.dirtyShortRev or "dirty";
@@ -22,7 +21,7 @@
         default = pkgs.mkShell {
           packages = with pkgs; [
             bun
-            nodejs_20
+            nodejs
             pkg-config
             openssl
             git

nix/electron.nix

@@ -7,7 +7,6 @@ in
   aarch64-linux = "20e68d6c4e47f3ebf59de7c6b1f8b8bec6a6ebda6a451132f9b465f3f13ce467";
   x86_64-linux = "2452b27112d92387471fa2488aafac85d79ea3f2ee1216c0abd5150d6c12362b";
   aarch64-darwin = "ac7194a3dfd81930ba35355c01620262c1254752859b42dcb8f4b9e4d174a871";
-  x86_64-darwin = "4489aba55477a0082266cb690db1c829503ba3338048599d8fd243953df37dab";
   # fetchzip hashes the unpacked headers, not the release tarball.
   headers = "sha256-4eUy3BZVvxTl7KUOsxio7769lL6ag/ecbeK+qLURWMI=";
 }

nix/hashes.json

@@ -1,8 +1,7 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-7DgxTpKv6ITKTom0mhlJNPQfdEjtEHK5P8uyCr26HZw=",
-    "aarch64-linux": "sha256-PJxW1Ibfx6oS1neWPSHqzP1Pm1HT9my1TrrHmOb6/no=",
-    "aarch64-darwin": "sha256-VIme5VHfM8JxNiDSOykkr5FytghDLI0FxkhiOXUSyQw=",
-    "x86_64-darwin": "sha256-rQ/j0QkR1vxAq4jgUbr0nY4RDyiLTJqN8q1AfoiEqVQ="
+    "x86_64-linux": "sha256-yCdtDQsXERjfL9bJg7YXNloMBOPwFkPMFVNAzXlarBM=",
+    "aarch64-linux": "sha256-iQ1bLIszETcFoD4CENpoaDZJZF/KBKZFeTp9r7ogJ9Y=",
+    "aarch64-darwin": "sha256-G7oIrTXEFQ5iEF8KSpA4xJPw9xwqRDpbIR472iIoqC4="
   }
 }

nix/node_modules.nix

@@ -81,6 +81,5 @@ stdenvNoCC.mkDerivation {
     "aarch64-linux"
     "x86_64-linux"
     "aarch64-darwin"
-    "x86_64-darwin"
   ];
 }

package.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/package.json",
   "name": "opencode",
   "description": "AI-powered development tool",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "private": true,
   "type": "module",
   "packageManager": "bun@1.4.2",
@@ -18,7 +18,7 @@
     "dev:www": "bun run --cwd services/www dev",
     "dev:storybook": "bun --cwd packages/storybook storybook",
     "bench:devex": "bun run --cwd packages/app test:bench:devex",
-    "lint": "oxlint",
+    "lint": "oxlint && ast-grep scan -c script/ast-grep/gui-extensions/sgconfig.yml",
     "lint:effect-patterns": "ast-grep scan -c script/ast-grep/sgconfig.yml packages/util/src packages/core/src packages/server/src packages/protocol/src packages/cli/src",
     "lint:effect-simplifications": "ast-grep scan -c script/ast-grep/effect-simplifications/sgconfig.yml --off=unused-suppression packages",
     "test:lint-rules": "ast-grep test -c script/ast-grep/sgconfig.yml",
@@ -52,9 +52,9 @@
       "@octokit/rest": "22.0.0",
       "@hono/standard-validator": "0.2.0",
       "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.13",
-      "@opentui/keymap": "0.5.13",
-      "@opentui/solid": "0.5.13",
+      "@opentui/core": "0.5.14",
+      "@opentui/keymap": "0.5.14",
+      "@opentui/solid": "0.5.14",
       "@tanstack/solid-virtual": "3.13.37",
       "@shikijs/stream": "4.4.3",
       "@standard-schema/spec": "1.1.0",
@@ -117,10 +117,11 @@
     "@actions/artifact": "5.0.1",
     "@ast-grep/cli": "0.44.0",
     "@opencode/client": "workspace:*",
-    "@types/react": "19.2.17",
-    "@types/react-dom": "19.2.3",
+    "@oxlint/plugins": "1.60.0",
     "@tsconfig/bun": "catalog:",
     "@types/mime-types": "3.0.1",
+    "@types/react": "19.2.17",
+    "@types/react-dom": "19.2.3",
     "@typescript/native-preview": "catalog:",
     "glob": "13.0.5",
     "husky": "9.1.7",

packages/ai/package.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.20",
+  "version": "2.0.21",
   "name": "@opencode/ai",
   "type": "module",
   "license": "MIT",

packages/ai/src/protocols/openai-responses.ts

@@ -143,14 +143,15 @@ const adapter = {
   restoreHostedToolItem: (item: unknown) => (Schema.is(OpenAIResponsesHostedToolItem)(item) ? item : undefined),
 } satisfies OpenResponses.ProviderAdapter
 
-// GPT-6 Astra, Sol, and Luna accept `configuration_update` only in standard mode (not `reasoning.mode: "pro"` or
-// `-pro` slugs), and never alongside automatic `context_management` compaction.
+// GPT-6 and later default to `configuration_update` support, except in `reasoning.mode: "pro"`
+// or alongside automatic `context_management` compaction.
 const supportsEffortUpdates = (request: LLMRequest) => {
   if (request.providerOptions?.contextManagement !== undefined) return false
   if (Schema.is(Schema.Struct({ mode: Schema.Literal("pro") }))(request.http?.body?.reasoning)) return false
   const override = request.model.compatibility?.supportsEffortUpdates
   if (override !== undefined) return override
-  return /(?:^|\/)gpt-6-(?:astra|sol|luna)$/i.test(request.model.id)
+  const match = /(?:^|\/)gpt-(\d+)(?:\.\d+)?(?:-|$)/i.exec(request.model.id)
+  return match !== null && Number(match[1]) >= 6
 }
 
 const nativeImageToolInput = (tool: ToolDefinition) => {

packages/ai/src/protocols/zai-chat.ts

@@ -41,16 +41,20 @@ const Body = Schema.Struct({
   user_id: Options.fields.userID,
 })
 
+// Tool streaming was introduced in GLM-4.6; later versions inherit support.
+const supportsToolStreaming = (modelID: string) => {
+  const match = /(?:^|\/)glm-(\d+)(?:\.(\d+))?(?:-|$)/i.exec(modelID)
+  return match !== null && (Number(match[1]) > 4 || (Number(match[1]) === 4 && Number(match[2] ?? 0) >= 6))
+}
+
 const fromRequest = Effect.fn("ZAIChat.fromRequest")(function* (request: LLMRequest) {
   const options = yield* ProviderShared.validateWith(Schema.decodeUnknownEffect(Options))(request.providerOptions ?? {})
   const body = yield* OpenAIChat.protocol.body.from(request)
   return {
     ...body,
     thinking: options.thinking,
-    // Tool streaming was introduced in GLM-4.6; older models must not receive the opt-in.
     tool_stream:
-      options.toolStream ??
-      (body.tools?.length && /^glm-(?:4\.[67]|5(?:[.-]|$))/i.test(request.model.id) ? true : undefined),
+      options.toolStream ?? (body.tools?.length && supportsToolStreaming(request.model.id) ? true : undefined),
     do_sample: options.doSample,
     response_format: options.responseFormat,
     request_id: options.requestID,

packages/ai/src/provider-error.ts

@@ -21,12 +21,17 @@ const patterns = [
   /exceeds the context window/i,
   /exceeds (?:the )?(?:model'?s )?maximum context length(?: of [\d,]+ tokens?|\s*\([\d,]+\))/i,
   /input token count.*exceeds the maximum/i,
+  // Amazon Nova on Bedrock reports this as a mid-stream validationException.
+  /number of input tokens exceeds maximum length/i,
   /tokens in request more than max tokens allowed/i,
   /maximum prompt length is \d+/i,
   /reduce the length of the messages/i,
+  // DeepInfra
+  /requested input length \d+ exceeds maximum input length/i,
   /maximum context length is \d+ tokens/i,
   /exceeds (?:the )?maximum allowed input length of [\d,]+ tokens?/i,
-  /input \(\d+ tokens\) is longer than the model'?s context length \(\d+ tokens\)/i,
+  // Novita omits the token counts.
+  /input(?: \(\d+ tokens\))? is longer than the model'?s context length/i,
   /exceeds the limit of \d+/i,
   /exceeds the available context size/i,
   /greater than the context length/i,
@@ -35,7 +40,8 @@ const patterns = [
   /context[_ ]length[_ ]exceeded/i,
   /context length is only \d+ tokens/i,
   /input length.*exceeds.*context length/i,
-  /prompt too long; exceeded (?:max )?context length/i,
+  // Z.ai code 1261 arrives as `Prompt too long` or `Prompt 超长`.
+  /prompt (?:too long|超长)/i,
   /too large for model with \d+ maximum context length/i,
   /prompt has [\d,]+ tokens?, but the configured context size is [\d,]+ tokens?/i,
   /model_context_window_exceeded/i,
@@ -112,7 +118,8 @@ const QUOTA_CODES = new Set([
   "creditlimitexceeded",
 ])
 // Google reports an invalid API key as HTTP 400 INVALID_ARGUMENT with this `details[].reason`.
-const AUTH_CODES = new Set(["authentication_error", "permission_error", "api_key_invalid"])
+// Z.ai's Responses API reports account and plan rejections mid-stream as `permission_denied`.
+const AUTH_CODES = new Set(["authentication_error", "permission_error", "permission_denied", "api_key_invalid"])
 const SERVER_CODES = new Set([
   "api_error",
   "internal_error",
@@ -126,6 +133,7 @@ const SERVER_CODES = new Set([
 ])
 // `invalid_request` is the Vercel AI Gateway's code for an upstream request rejection.
 const INVALID_REQUEST_CODES = new Set([
+  "model_not_found",
   "invalid_prompt",
   "invalid_request",
   "invalid_request_error",
@@ -145,15 +153,19 @@ const CONTENT_POLICY_CODES = new Set([
 // OpenCode Zen replaces upstream codes outside its allow-list but keeps the original
 // as a `[code]` label at the start of the rewritten message.
 const GATEWAY_CODE_LABEL = /^[^:\n]+: \[([A-Za-z0-9_.-]+)\]/
+// xAI reports an invalid API key as HTTP 400 with the generic `invalid-argument` code.
+const AUTH_TEXT = /incorrect api key provided/i
 const RATE_LIMIT_TEXT = /rate increased too quickly|rate[-_\s]?limit|too[_\s]?many[_\s]?requests/i
 // Only consulted on 429, where throttles and account caps share a status.
-const QUOTA_TEXT = /insufficient[-_\s]?quota|quota[-_\s]?exceeded|budget exceeded|usage limit/i
+// Z.ai reports balance, plan expiry, plan limits, and plan model access on 429.
+const QUOTA_TEXT =
+  /insufficient[-_\s]?(?:quota|balance)|quota[-_\s]?exceeded|budget exceeded|usage limit|limit exhausted|package has expired|plan does not yet include/i
 // Policy rejections without a dedicated code, matched against the provider's own
 // explanation only. OpenAI reuses `invalid_prompt` for usage-policy rejections while
 // Bedrock Mantle reuses it for schema validation; Anthropic reports blocked output
 // under `invalid_request_error`.
 const CONTENT_POLICY_TEXT =
-  /violating our usage policy|blocked by content filtering policy|content[-_\s]?policy|rejected as a result of our safety system/i
+  /violating our usage policy|blocked by content filtering policy|content[-_\s]?policy|rejected as a result of our safety system|detected potentially unsafe or sensitive content/i
 const SERVER_ERROR_TEXT =
   /\b(?:try again|(?:please |you can )?retry (?:the |this |your )?request|try (?:the |this |your )?request again|(?:currently |temporarily )?at capacity|overloaded|temporarily unavailable|service[-_\s]?unavailable|(?:server|internal)[-_\s]?error|server (?:is )?busy|provider returned (?:an )?error|resource[-_\s]?exhausted|upstream (?:connect|connection|request)|request buffer limit while retrying upstream)\b/i
 
@@ -244,7 +256,12 @@ export function classifyProviderFailure(input: ProviderFailure): AIError["reason
     (input.status === 429 && QUOTA_TEXT.test(text))
   )
     return new QuotaExceededError(details)
-  if (input.status === 401 || input.status === 403 || codes.some((code) => AUTH_CODES.has(code)))
+  if (
+    input.status === 401 ||
+    input.status === 403 ||
+    codes.some((code) => AUTH_CODES.has(code)) ||
+    (input.status === 400 && AUTH_TEXT.test(text))
+  )
     return new AuthenticationError(details)
   if (
     input.status === 429 ||

packages/ai/src/providers/cloudflare-ai-gateway.ts

@@ -42,14 +42,24 @@ export type Settings = ProviderPackage.Settings &
 
 export const baseURL = (input: GatewayURL) => {
   if (input.baseURL) return input.baseURL
-  if (!input.accountId)
-    throw new ProviderConfigurationError({
-      provider: id,
-      message: "CloudflareAIGateway.configure requires accountId unless baseURL is supplied",
-    })
-  return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(input.accountId)}/ai/v1`
+  return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(requireAccountId(input))}/ai/v1`
 }
 
+// Cloudflare's REST API rejects parts of the Anthropic Messages and OpenAI Responses request shapes, such as
+// system prompt blocks and `minimal` reasoning effort, so these models use the provider-native gateway endpoints.
+const passthroughURL = (input: GatewayURL & GatewayOptions, provider: "anthropic/v1" | "openai") =>
+  `https://gateway.ai.cloudflare.com/v1/${encodeURIComponent(requireAccountId(input))}/${encodeURIComponent(gatewayId(input))}/${provider}`
+
+const requireAccountId = (input: GatewayURL) => {
+  if (input.accountId) return input.accountId
+  throw new ProviderConfigurationError({
+    provider: id,
+    message: "CloudflareAIGateway.configure requires accountId unless baseURL is supplied",
+  })
+}
+
+const gatewayId = (input: GatewayOptions) => input.gatewayId?.trim() || "default"
+
 export const responsesRoute = OpenAIResponses.route.with({
   id: "cloudflare-ai-gateway-responses",
   provider: id,
@@ -70,16 +80,12 @@ export const route = OpenAIChat.route.with({
 
 export const routes = [responsesRoute, messagesRoute, route]
 
-const auth = (input: LanguageModelOptions) => {
-  if ("auth" in input && input.auth) return input.auth
-  return Auth.optional(input.gatewayApiKey ?? ("apiKey" in input ? input.apiKey : undefined), "apiKey")
+const credential = (input: LanguageModelOptions) =>
+  Auth.optional(input.gatewayApiKey ?? ("apiKey" in input ? input.apiKey : undefined), "apiKey")
     .orElse(Auth.config(authEnvVars[0]))
     .orElse(Auth.config(authEnvVars[1]))
-    .bearer()
-}
 
 const headers = (input: LanguageModelOptions) => ({
-  ...(input.gatewayId === undefined ? {} : { "cf-aig-gateway-id": input.gatewayId.trim() || "default" }),
   ...(input.metadata === undefined
     ? {}
     : { "cf-aig-metadata": Schema.encodeSync(Schema.fromJsonString(Schema.Unknown))(input.metadata) }),
@@ -90,31 +96,42 @@ const headers = (input: LanguageModelOptions) => ({
   ...input.headers,
 })
 
-const modelID = (input: string | ModelID) => {
-  const value = String(input)
-  if (value.startsWith("workers-ai/")) return value.slice("workers-ai/".length)
-  if (value.startsWith("anthropic/")) return `anthropic/${value.slice("anthropic/".length).replaceAll(".", "-")}`
-  return value
-}
-
 export const configure = (input: LanguageModelOptions) => {
-  const defaults = {
+  const custom = "auth" in input && input.auth ? input.auth : undefined
+  const rest = {
     endpoint: { baseURL: baseURL(input) },
-    auth: auth(input),
-    headers: headers(input),
+    auth: custom ?? credential(input).bearer(),
+    headers: { "cf-aig-gateway-id": gatewayId(input), ...headers(input) },
     http: input.http,
     providerOptions: input.providerOptions,
   }
-  const responses = responsesRoute.with(defaults)
-  const messages = messagesRoute.with(defaults)
-  const chat = route.with(defaults)
+  // A custom baseURL stands in for the REST API, so every model keeps using it with gateway model IDs.
+  const native = input.baseURL === undefined
+  const passthrough = (provider: "anthropic/v1" | "openai") =>
+    native
+      ? {
+          ...rest,
+          endpoint: { baseURL: passthroughURL(input, provider) },
+          auth: custom ?? Auth.bearerHeader("cf-aig-authorization", credential(input)),
+          headers: headers(input),
+        }
+      : rest
+  const responses = responsesRoute.with(passthrough("openai"))
+  const messages = messagesRoute.with(passthrough("anthropic/v1"))
+  const chat = route.with(rest)
   return {
     id,
     model: (input: string | ModelID) => {
-      const wire = modelID(input)
-      if (String(input).startsWith("openai/")) return responses.model<OpenAIProviderOptionsInput>({ id: wire })
-      if (String(input).startsWith("anthropic/")) return messages.model<OpenAIProviderOptionsInput>({ id: wire })
-      return chat.model<OpenAIProviderOptionsInput>({ id: wire })
+      const value = String(input)
+      if (value.startsWith("openai/"))
+        return responses.model<OpenAIProviderOptionsInput>({ id: native ? value.slice("openai/".length) : value })
+      if (value.startsWith("anthropic/"))
+        return messages.model<OpenAIProviderOptionsInput>({
+          id: native ? value.slice("anthropic/".length).replaceAll(".", "-") : value,
+        })
+      if (value.startsWith("workers-ai/"))
+        return chat.model<OpenAIProviderOptionsInput>({ id: value.slice("workers-ai/".length) })
+      return chat.model<OpenAIProviderOptionsInput>({ id: value })
     },
     configure,
   }

packages/ai/src/tool-history.ts

@@ -6,10 +6,17 @@ const MISSING_TOOL_RESULT = "Tool result missing"
 export function normalizeToolHistory(messages: ReadonlyArray<Message>) {
   const normalized: Message[] = []
   const pending = new Map<string, ToolCallPart>()
+  // System updates cannot sit between a tool call and its results, so they wait until every pending call is answered.
+  const held: Message[] = []
+  const releaseHeld = () => {
+    if (pending.size > 0) return
+    normalized.push(...held)
+    held.length = 0
+  }
   const appendMissingResults = () => {
-    if (pending.size === 0) return
-    normalized.push(missingToolResults(pending.values()))
+    if (pending.size > 0) normalized.push(missingToolResults(pending.values()))
     pending.clear()
+    releaseHeld()
   }
 
   for (const message of messages) {
@@ -18,6 +25,12 @@ export function normalizeToolHistory(messages: ReadonlyArray<Message>) {
     if (message.role === "tool") {
       const tool = normalizeToolMessage(message, pending)
       if (tool) normalized.push(tool)
+      releaseHeld()
+      continue
+    }
+
+    if (message.role === "system" && pending.size > 0) {
+      held.push(message)
       continue
     }
 
@@ -27,6 +40,7 @@ export function normalizeToolHistory(messages: ReadonlyArray<Message>) {
       if (part.type === "tool-call" && part.providerExecuted !== true) pending.set(part.id, part)
     }
   }
+  appendMissingResults()
 
   return normalized.length === messages.length && normalized.every((message, index) => message === messages[index])
     ? messages

packages/ai/test/effort-updates.test.ts

@@ -147,7 +147,7 @@ describe("Anthropic Messages effort updates", () => {
     }),
   )
 
-  it.effect("accepts a marker between a tool call and its result", () =>
+  it.effect("moves a marker between a tool call and its result after the result", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({
@@ -166,8 +166,8 @@ describe("Anthropic Messages effort updates", () => {
       expect(prepared.body.messages).toEqual([
         { role: "user", content: [{ type: "text", text: "Weather?" }] },
         { role: "assistant", content: [{ type: "tool_use", id: "call_1", name: "lookup", input: {} }] },
-        { role: "system", content: [], output_config: { effort: "low" } },
         { role: "user", content: [{ type: "tool_result", tool_use_id: "call_1", content: '{"temp":72}' }] },
+        { role: "system", content: [], output_config: { effort: "low" } },
       ])
     }),
   )
@@ -375,11 +375,24 @@ describe("OpenAI Responses effort updates", () => {
     ["openai/gpt-6-sol", true],
     ["gpt-6-luna", true],
     ["openai/gpt-6-luna", true],
-    ["gpt-6-astra-2026-09-01", false],
-    ["gpt-6-sol-pro", false],
-    ["gpt-6-luna-pro", false],
-    ["gpt-6-sol-fast", false],
+    ["gpt-6", true],
+    ["gpt-6.1-sol", true],
+    ["openai/gpt-6.1-sol", true],
+    ["GPT-6.1-SOL", true],
+    ["gpt-6-astra-2026-09-01", true],
+    ["gpt-6-sol-pro", true],
+    ["gpt-6-luna-pro", true],
+    ["gpt-6-sol-fast", true],
+    ["gpt-7", true],
+    ["openai/gpt-7.2-new-family", true],
+    ["gpt-10.1", true],
+    ["gpt-5", false],
     ["gpt-5.6-sol", false],
+    ["gpt-5.10", false],
+    ["not-gpt-6-sol", false],
+    ["gpt-6foo", false],
+    ["gpt-6.x-sol", false],
+    ["future-model", false],
   ] as const) {
     it.effect(`${supported ? "lowers" : "strips"} markers for ${id}`, () =>
       Effect.gen(function* () {

packages/ai/test/fixtures/recordings/cloudflare-ai-gateway/cloudflare-ai-gateway-claude-haiku-4-5-text.json

@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "cloudflare-ai-gateway",
+    "route": "cloudflare-ai-gateway-messages",
+    "transport": "http",
+    "model": "claude-haiku-4-5",
+    "tags": [
+      "prefix:cloudflare-ai-gateway",
+      "provider:cloudflare-ai-gateway",
+      "text",
+      "golden"
+    ],
+    "name": "cloudflare-ai-gateway/cloudflare-ai-gateway-claude-haiku-4-5-text",
+    "recordedAt": "2026-09-30T04:35:43.657Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/anthropic/v1/messages",
+        "headers": {
+          "anthropic-version": "2023-06-01",
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"claude-haiku-4-5\",\"system\":[{\"type\":\"text\",\"text\":\"You are concise.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Reply exactly with: Hello!\"}]}],\"stream\":true,\"max_tokens\":40,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "event: message_start\ndata: {\"p\": \"6247a7b95b5e3f\", \"type\":\"message_start\",\"message\":{\"model\":\"claude-haiku-4-5-20251001\",\"id\":\"msg_011CfZ16hXSVRfaXBDtUBKis\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":18,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":2,\"service_tier\":\"standard\",\"inference_geo\":\"not_available\"},\"diagnostics\":null}}\n\nevent: content_block_start\ndata: {\"p\": \"f9b\", \"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"text\",\"text\":\"\"}             }\n\nevent: ping\ndata: {\"p\": \"cc76aa8\", \"type\": \"ping\"}\n\nevent: content_block_delta\ndata: {\"p\": \"94f\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\"Hello!\"}              }\n\nevent: content_block_stop\ndata: {\"p\": \"1a9d8\", \"type\":\"content_block_stop\",\"index\":0 }\n\nevent: message_delta\ndata: {\"p\": \"0cb3c23\", \"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"stop_details\":null,\"container\":null},\"usage\":{\"input_tokens\":18,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"output_tokens\":5}              }\n\nevent: message_stop\ndata: {\"p\": \"6ef9de29973ed\", \"type\":\"message_stop\"              }\n\n"
+      }
+    }
+  ]
+}

packages/ai/test/fixtures/recordings/cloudflare-ai-gateway/cloudflare-ai-gateway-claude-haiku-4-5-tool-loop.json

@@ -0,0 +1,58 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "cloudflare-ai-gateway",
+    "route": "cloudflare-ai-gateway-messages",
+    "transport": "http",
+    "model": "claude-haiku-4-5",
+    "tags": [
+      "prefix:cloudflare-ai-gateway",
+      "provider:cloudflare-ai-gateway",
+      "tool",
+      "tool-loop",
+      "golden"
+    ],
+    "name": "cloudflare-ai-gateway/cloudflare-ai-gateway-claude-haiku-4-5-tool-loop",
+    "recordedAt": "2026-09-30T04:35:45.222Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/anthropic/v1/messages",
+        "headers": {
+          "anthropic-version": "2023-06-01",
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"claude-haiku-4-5\",\"system\":[{\"type\":\"text\",\"text\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"What is the weather in Paris?\"}]}],\"tools\":[{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"input_schema\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}],\"stream\":true,\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "event: message_start\ndata: {\"p\": \"f2f6a212\", \"type\":\"message_start\",\"message\":{\"model\":\"claude-haiku-4-5-20251001\",\"id\":\"msg_011CfZ16jzmxrCrHLxeCxrL8\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":593,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":26,\"service_tier\":\"standard\",\"inference_geo\":\"not_available\"},\"diagnostics\":null}    }\n\nevent: content_block_start\ndata: {\"p\": \"7\", \"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"tool_use\",\"id\":\"toolu_019hb1DDwKBNMMeaKjZf1CpS\",\"name\":\"get_weather\",\"input\":{},\"caller\":{\"type\":\"direct\"}}             }\n\nevent: ping\ndata: {\"p\": \"e112b39d9a4869\", \"type\": \"ping\"}\n\nevent: content_block_delta\ndata: {\"p\": \"12d\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"input_json_delta\",\"partial_json\":\"\"}            }\n\nevent: content_block_delta\ndata: {\"p\": \"2\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"input_json_delta\",\"partial_json\":\"{\\\"city\\\"\"} }\n\nevent: content_block_delta\ndata: {\"p\": \"f6bb01e5ae5c1c7\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"input_json_delta\",\"partial_json\":\": \\\"Pari\"}         }\n\nevent: content_block_delta\ndata: {\"p\": \"c26aa17\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"input_json_delta\",\"partial_json\":\"s\\\"}\"}     }\n\nevent: content_block_stop\ndata: {\"p\": \"16f665\", \"type\":\"content_block_stop\",\"index\":0      }\n\nevent: message_delta\ndata: {\"p\": \"e00cc845875\", \"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"tool_use\",\"stop_sequence\":null,\"stop_details\":null,\"container\":null},\"usage\":{\"input_tokens\":593,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"output_tokens\":54}               }\n\nevent: message_stop\ndata: {\"p\": \"5082e73ce8055a\", \"type\":\"message_stop\"    }\n\n"
+      }
+    },
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/anthropic/v1/messages",
+        "headers": {
+          "anthropic-version": "2023-06-01",
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"claude-haiku-4-5\",\"system\":[{\"type\":\"text\",\"text\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"What is the weather in Paris?\"}]},{\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"toolu_019hb1DDwKBNMMeaKjZf1CpS\",\"name\":\"get_weather\",\"input\":{\"city\":\"Paris\"}}]},{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"toolu_019hb1DDwKBNMMeaKjZf1CpS\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}]}],\"tools\":[{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"input_schema\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}],\"stream\":true,\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "event: message_start\ndata: {\"p\": \"ff048fa113d17ffc\", \"type\":\"message_start\",\"message\":{\"model\":\"claude-haiku-4-5-20251001\",\"id\":\"msg_011CfZ16ooU6seiMzxt69doW\",\"type\":\"message\",\"role\":\"assistant\",\"content\":[],\"container\":null,\"stop_reason\":null,\"stop_sequence\":null,\"stop_details\":null,\"usage\":{\"input_tokens\":668,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"cache_creation\":{\"ephemeral_5m_input_tokens\":0,\"ephemeral_1h_input_tokens\":0},\"output_tokens\":1,\"service_tier\":\"standard\",\"inference_geo\":\"not_available\"},\"diagnostics\":null}             }\n\nevent: content_block_start\ndata: {\"p\": \"5172b1\", \"type\":\"content_block_start\",\"index\":0,\"content_block\":{\"type\":\"text\",\"text\":\"\"}              }\n\nevent: ping\ndata: {\"p\": \"d\", \"type\": \"ping\"}\n\nevent: content_block_delta\ndata: {\"p\": \"7f847273c\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\"Paris\"}  }\n\nevent: content_block_delta\ndata: {\"p\": \"1de4\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\" is sunny\"}}\n\nevent: content_block_delta\ndata: {\"p\": \"d61\", \"type\":\"content_block_delta\",\"index\":0,\"delta\":{\"type\":\"text_delta\",\"text\":\".\"}}\n\nevent: content_block_stop\ndata: {\"p\": \"29638a9b46e21ecd\", \"type\":\"content_block_stop\",\"index\":0       }\n\nevent: message_delta\ndata: {\"p\": \"8e5f9442b03f76\", \"type\":\"message_delta\",\"delta\":{\"stop_reason\":\"end_turn\",\"stop_sequence\":null,\"stop_details\":null,\"container\":null},\"usage\":{\"input_tokens\":668,\"cache_creation_input_tokens\":0,\"cache_read_input_tokens\":0,\"output_tokens\":7}         }\n\nevent: message_stop\ndata: {\"p\": \"97d9afcead79c7a\", \"type\":\"message_stop\"    }\n\n"
+      }
+    }
+  ]
+}

packages/ai/test/fixtures/recordings/cloudflare-ai-gateway/cloudflare-ai-gateway-openai-gpt-5-nano-text.json

@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "cloudflare-ai-gateway",
+    "route": "cloudflare-ai-gateway-responses",
+    "transport": "http",
+    "model": "gpt-5-nano",
+    "tags": [
+      "prefix:cloudflare-ai-gateway",
+      "provider:cloudflare-ai-gateway",
+      "text",
+      "golden"
+    ],
+    "name": "cloudflare-ai-gateway/cloudflare-ai-gateway-openai-gpt-5-nano-text",
+    "recordedAt": "2026-09-30T04:36:07.656Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/openai/responses",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"gpt-5-nano\",\"input\":[{\"type\":\"message\",\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly with: Hello!\"}]}],\"instructions\":\"You are concise.\",\"store\":false,\"include\":[\"reasoning.encrypted_content\"],\"max_output_tokens\":2000,\"stream\":true}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "event: response.created\ndata: {\"p\": \"6e564fc3bf3\", \"type\":\"response.created\",\"response\":{\"id\":\"resp_0137cf30a4752bdf016abc91b6263487d19ea9f96c7605459a\",\"object\":\"response\",\"created_at\":1790742966,\"status\":\"in_progress\",\"access_programs\":null,\"background\":false,\"completed_at\":null,\"error\":null,\"frequency_penalty\":0.0,\"incomplete_details\":null,\"instructions\":\"You are concise.\",\"max_output_tokens\":2000,\"max_tool_calls\":null,\"model\":\"gpt-5-nano-2025-08-07\",\"moderation\":null,\"output\":[],\"parallel_tool_calls\":true,\"presence_penalty\":0.0,\"previous_response_id\":null,\"prompt_cache_key\":null,\"prompt_cache_retention\":\"in_memory\",\"reasoning\":{\"context\":\"current_turn\",\"effort\":\"medium\",\"mode\":\"standard\",\"summary\":null},\"safety_identifier\":null,\"service_tier\":\"auto\",\"store\":false,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"},\"verbosity\":\"medium\"},\"tool_choice\":\"auto\",\"tool_usage\":{\"image_gen\":{\"input_tokens\":0,\"input_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"output_tokens\":0,\"output_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"total_tokens\":0},\"web_search\":{\"num_requests\":0}},\"tools\":[],\"top_logprobs\":0,\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}},\"sequence_number\":0}\n\nevent: response.in_progress\ndata: {\"p\": \"f61c4ed2a9768\", \"type\":\"response.in_progress\",\"response\":{\"id\":\"resp_0137cf30a4752bdf016abc91b6263487d19ea9f96c7605459a\",\"object\":\"response\",\"created_at\":1790742966,\"status\":\"in_progress\",\"access_programs\":null,\"background\":false,\"completed_at\":null,\"error\":null,\"frequency_penalty\":0.0,\"incomplete_details\":null,\"instructions\":\"You are concise.\",\"max_output_tokens\":2000,\"max_tool_calls\":null,\"model\":\"gpt-5-nano-2025-08-07\",\"moderation\":null,\"output\":[],\"parallel_tool_calls\":true,\"presence_penalty\":0.0,\"previous_response_id\":null,\"prompt_cache_key\":null,\"prompt_cache_retention\":\"in_memory\",\"reasoning\":{\"context\":\"current_turn\",\"effort\":\"medium\",\"mode\":\"standard\",\"summary\":null},\"safety_identifier\":null,\"service_tier\":\"auto\",\"store\":false,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"},\"verbosity\":\"medium\"},\"tool_choice\":\"auto\",\"tool_usage\":{\"image_gen\":{\"input_tokens\":0,\"input_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"output_tokens\":0,\"output_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"total_tokens\":0},\"web_search\":{\"num_requests\":0}},\"tools\":[],\"top_logprobs\":0,\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}},\"sequence_number\":1}\n\nevent: response.output_item.added\ndata: {\"p\": \"01\", \"type\":\"response.output_item.added\",\"item\":{\"id\":\"rs_0137cf30a4752bdf016abc91b69ae887d1af96950defb06f97\",\"type\":\"reasoning\",\"content\":[],\"encrypted_content\":\"gAAAAABqvJG2MoCXBYbRlRsokydYprE0lt8iLr1a1iUQbNLeerXyd1MY4Fm9MfjJLFaGzGPJy6wwZUZmm6nsZ7LP1VprwIAnv2kfNTBoO57je5cZ78dkzJzOOLYnQyaiSPrbXTXKG8JQfKrrt0qN7x5-eiXD-SIcQa8E9Or_ZugNqIYn7UfiS3YC5Xupjij5eCgl43kmMzNLNoQgBOv5sTQkj4saT7b0NltrY_coexW7o7HA3YJU02_aKqV6YSKKKMzZkVUw8Qt71Jwbg28x-Udpk9Wk6uzqqMSFRchkQJ4oT8HGsFO6MfHo-eLUNqGI24ZJlYcHI_CVW8IkjcpGWtv7dHzoOIAbQ3tTx09taixBP3PvaIcD9Qn5YsUV7dE3NncXID-eAnjgs0WmP9Tz8vvLXZrYiV4Ry0S_gIAUPFKC-3Z9e7yQ395JWPeWk7K1eT9y0FmTGHNZ6MVfzqBahukSbogL1Q1izblwxu6dTVMfQbo0n7IEi6HhfDYIzsHNbpYDDL54yG0ncHNy4fSu4dnYjuZrokgqThIOCrpeYcJq7xTN9cTU5L-AQz9_EEraVt2swKnl-4sJ1V8k6j0eJIZMK8yTAgOAUiI3jFBLscCRGjmmWLft2UDMt8h6SoKFXyDmTyRZJ2Mbm0wBIvKmH-EZM5-xc2T_57XV9vI-BaPZYrbxT7jtOuK8oqnpZRtLGyDKiUYxibnU1J2AUh3HbXz-nMrnjA6WxU9NXCVf-1WnVQyJfFAIRD0Kpbt6c6rXOJw7aMGLHATOFFG4716vVg79CvT-ll9_AsUNQwyby8sRUYi-Y05x4vxPnkegilDuhnytDt6uYqNRFertTCaSCIg-u96yHrg3r8T9zBpy3UqogKq2pkG-WrkNxIwEa0LMOqlwQwrnIDf72eV9wFpg9M67ezVptNFTkCLi3BOB4Gfi4SFkmOBBE4tfjymktfUWGk9g1uAa3VAsRRSBcbMqwbnSS9s1flwOp7NkHffGHdDP6bo66Y-YcsryokhHWi1s3ikK7cvp5n6BdpypWLRQq4za25PGf3uj7c17XKM6YoiV36wuu4AKp6XAX2iJ1cIDIqLETLmPJowSL7bj-Nodly_VatRK8h4yjbCExGdk6WURCo93KaEc1h9lbFKuRWeYGNPIByblnILU4JSoOm40K1aP0DT_KKJ6Gg==\",\"summary\":[]},\"output_index\":0,\"sequence_number\":2}\n\nevent: response.output_item.done\ndata: {\"p\": \"2fe6743f311de\", \"type\":\"response.output_item.done\",\"item\":{\"id\":\"rs_0137cf30a4752bdf016abc91b69ae887d1af96950defb06f97\",\"type\":\"reasoning\",\"content\":[],\"encrypted_content\":\"gAAAAABqvJG3gRV3VHJfHPkeyz8hrmbpzFNdsSUxXsSgIJAc7Z5rVjrK-eBH6uM3cuwf6oFRHDk5gl3tjbkubNIsNuX9QWS5qKZmni4YyzHa00eDWaF0mdEB41BiwcO085Ef-zgU9dsblogPVbaAkCx9AG01rLpeJvmEZrG3ZceeHDer7iebUpvoFSeBLRnuUn192MSKUTF0602CdbtQvzI39HuCijTVGiEh4dWgs5BoAvnD0tfNeWrXZBOueaf_CFInJPuoR4eyAORHV5pTn8fbAEiv8mVqKvHI0OL7GvA0E1Yg7c5rlrLgJj0Ey6P5POAYCL7KOkT3kw1LKbA4glCNOiZC54XWY2V7jI1bgquxOgj0FG3Gstl9B7IMncSTuNgKZONEJ9LWWVWOtLl6kMRq0gLZqhpKUoNqkgKpiS7noUkEQJJ7n-tv1djLIfrHdwWDO2XJhb0ouXC6qgn-TKnu1eBKCaGcWvKLine truncated
+      }
+    }
+  ]
+}

packages/ai/test/fixtures/recordings/cloudflare-ai-gateway/cloudflare-ai-gateway-openai-gpt-5-nano-tool-loop.json

@@ -0,0 +1,56 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "cloudflare-ai-gateway",
+    "route": "cloudflare-ai-gateway-responses",
+    "transport": "http",
+    "model": "gpt-5-nano",
+    "tags": [
+      "prefix:cloudflare-ai-gateway",
+      "provider:cloudflare-ai-gateway",
+      "tool",
+      "tool-loop",
+      "golden"
+    ],
+    "name": "cloudflare-ai-gateway/cloudflare-ai-gateway-openai-gpt-5-nano-tool-loop",
+    "recordedAt": "2026-09-30T04:36:34.984Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/openai/responses",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"gpt-5-nano\",\"input\":[{\"type\":\"message\",\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"What is the weather in Paris?\"}]}],\"instructions\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\",\"tools\":[{\"type\":\"function\",\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"include\":[\"reasoning.encrypted_content\"],\"max_output_tokens\":2000,\"stream\":true}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "event: response.created\ndata: {\"p\": \"d82f1d10b60\", \"type\":\"response.created\",\"response\":{\"id\":\"resp_06bc195765a8c9c7016abc91ce40f887d189169a2d89f2ee42\",\"object\":\"response\",\"created_at\":1790742990,\"status\":\"in_progress\",\"access_programs\":null,\"background\":false,\"completed_at\":null,\"error\":null,\"frequency_penalty\":0.0,\"incomplete_details\":null,\"instructions\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\",\"max_output_tokens\":2000,\"max_tool_calls\":null,\"model\":\"gpt-5-nano-2025-08-07\",\"moderation\":null,\"output\":[],\"parallel_tool_calls\":true,\"presence_penalty\":0.0,\"previous_response_id\":null,\"prompt_cache_key\":null,\"prompt_cache_retention\":\"in_memory\",\"reasoning\":{\"context\":\"current_turn\",\"effort\":\"medium\",\"mode\":\"standard\",\"summary\":null},\"safety_identifier\":null,\"service_tier\":\"auto\",\"store\":false,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"},\"verbosity\":\"medium\"},\"tool_choice\":\"auto\",\"tool_usage\":{\"image_gen\":{\"input_tokens\":0,\"input_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"output_tokens\":0,\"output_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"total_tokens\":0},\"web_search\":{\"num_requests\":0}},\"tools\":[{\"type\":\"function\",\"description\":\"Get current weather for a city.\",\"name\":\"get_weather\",\"output_schema\":null,\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"top_logprobs\":0,\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}},\"sequence_number\":0}\n\nevent: response.in_progress\ndata: {\"p\": \"0b0cb44c44\", \"type\":\"response.in_progress\",\"response\":{\"id\":\"resp_06bc195765a8c9c7016abc91ce40f887d189169a2d89f2ee42\",\"object\":\"response\",\"created_at\":1790742990,\"status\":\"in_progress\",\"access_programs\":null,\"background\":false,\"completed_at\":null,\"error\":null,\"frequency_penalty\":0.0,\"incomplete_details\":null,\"instructions\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\",\"max_output_tokens\":2000,\"max_tool_calls\":null,\"model\":\"gpt-5-nano-2025-08-07\",\"moderation\":null,\"output\":[],\"parallel_tool_calls\":true,\"presence_penalty\":0.0,\"previous_response_id\":null,\"prompt_cache_key\":null,\"prompt_cache_retention\":\"in_memory\",\"reasoning\":{\"context\":\"current_turn\",\"effort\":\"medium\",\"mode\":\"standard\",\"summary\":null},\"safety_identifier\":null,\"service_tier\":\"auto\",\"store\":false,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"},\"verbosity\":\"medium\"},\"tool_choice\":\"auto\",\"tool_usage\":{\"image_gen\":{\"input_tokens\":0,\"input_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"output_tokens\":0,\"output_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"total_tokens\":0},\"web_search\":{\"num_requests\":0}},\"tools\":[{\"type\":\"function\",\"description\":\"Get current weather for a city.\",\"name\":\"get_weather\",\"output_schema\":null,\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"top_logprobs\":0,\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}},\"sequence_number\":1}\n\nevent: response.output_item.added\ndata: {\"p\": \"608c6368a0c703ea\", \"type\":\"response.output_item.added\",\"item\":{\"id\":\"rs_06bc195765a8c9c7016abc91ce881c87d18e71310b9a21b3ca\",\"type\":\"reasoning\",\"content\":[],\"encrypted_content\":\"gAAAAABqvJHOLa_CYgj0Ynl-_tBncVpCPOfdueKV7-3xsbVVIXhZFUdhtEfjPYHW85-TecrFUmkr7jMw4OsT2Zckq7xkxVfZ8kXNObzjU6N6t35hp8hIJ9CbGmJBsxZBQceHHtZgQrOVWCKJ7z1B1k5zsJ8lbSRkLVAahsCEwg-tYDzQAkYUcqlK7VS62sKLLfDMYpSMCvv-y-5v9I4S74P0D2Zr7znJBap72RK0tHjN-d3vdjOaxMMkLP8JlK6-HlOWabzVEPWmsdXFPFzjWuRjAOn5ILrcQzu5T8kPLjon2kW4XuwwcXeI_7UvFmt9yRfkTlVFVr-hRcSad9AjBHHYx3nmvlhM2nVuKggGolqpwdKLR87sccTmbo0kzYp8Av1yHPJ6xKxAIJYZO_XDdvXGK1vu6WFqxe37LXpWIAvJ1BbXo7yMdV2tZshqP2WBiYdILkMiZFV4VDuzuOYEx3_56QyL4sdh0p3_mxXfgjEiLNzloBrq9VtPL1YLucqzAZwCDuhtwKLC3zZ1awSC_exx7thmBbULObOBfOhWN9oIG53MrLbpJVN4MlENvtLoq7l_92k0VbPcOGDgJcmJjYOy-p7P_YDQ_Y9WR0oNpCNRFfarqGBOzegO7_UPRVUEKJeb3xx2e6-9HnrjC9jyAFs4MI54uNfKMbF7a6p55NWaEtvbTn3124XDaUD2qeSChCoAv2KFXxTIIyQeOVgVBQbHW8IamL9Eh0RvjEpg5WZqgRK4QdRZ8fiFL3lLV5stsqVvNz_1LAnGs4bnH69pmmlfO0E2C8LLhLhRVh9hcEXnKwpA6URICdn58uEPKVr9tDmTyaJbiZx_4lPbVSQ_T2ncKL8pL8gK4odQDdhe_XjdqF9i5N_t29H8A3XUDkXOgd5zyMepV1GCfKm7DaJHYXIIIjr_q4xheZFzxMl1KMQX_a9xbc-KRvOj2apHphqo5TsmYOFl5QYyt3wWllpmUZ6c9oSVOg159RFyR7UUdjGJDN8aN9pXlDjxYjR76Q9Xvmun2duw37Abi7TXl2BzJ2Bq9VFLGW_7CB_kv0vxNijP2K2XuD0Ge8tfM7HfU_gFXN-WXym5GdN6DMCxAg7whaBAj9su1wEaI11VQBTF0s41glo-V4DTcLyKTNFjScck_6a_vEnmFE57IEToGK_akhdx_SzKS9rHrA==\",\"summary\":[]},\"output_index\":0,\"sequence_number\":2}\n\neveLine truncated
+      }
+    },
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://gateway.ai.cloudflare.com/v1/{account}/{gateway}/openai/responses",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"gpt-5-nano\",\"input\":[{\"type\":\"message\",\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"What is the weather in Paris?\"}]},{\"type\":\"reasoning\",\"id\":\"rs_06bc195765a8c9c7016abc91ce881c87d18e71310b9a21b3ca\",\"summary\":[],\"encrypted_content\":\"gAAAAABqvJHSN68IWwhWq9YTPxs-e-OeLdOqfdkkIEP_1hc9f7k6yH9tGZKLUC2OPF0avZ7xaJQp8iOR_gPt3z0TGQ1T0e4M9OR6boMFOA_C4TwinAF1POgbZLI-0SUDkAm1PZSaO0Ic7DBh1rRT6biled_-iWs0ke3FP3nFZit5Ve16AI1TdL4c9QERNCcZFsD5neV8eBeABWarZ8SMFfxcYJ5y8QkpDOL1ShqenD22Df7fDy8cdkYWybEEZcAfgXWSfQK2hRwSNYN_BDV9CfKj-cUTePwf0D2vLm-2xd9LGt-KiLPbsp9EpGXP41ra6-qHRLeu7MO64XWIu2vsf9qAflOjp7MOSuTJ3ZvDQoTNRs-pEam8-kRYRC07Hj9IzC0sjreE1NPVzz-Yuw79gqaQokfVmuznok8XoBFKLjQ1Sa9-i8Ano4lXOKz6APnXXBdbbSUBvNV3jlmqvtxhyZ2u901SuIxZcSmPY5aAEsaHiSm2lTIuHXr6f1WZcKOsR88U4ymlI-wSGKMKJT5hh9xxvSw4VQxcbjfMBllDpH6dg3X_AUwmN6JFVWZsl1QFyaTAt3LsbUY6xfuh_IbuO30tPnG5tlUrluJdXGloRCH11NFB7wjLQ3aR1DTSxjlfce9xxfX0OdZsrIeL0Z03kveHI5ZkIjp4xQo_VAGkU-tiQ8Dyx5DYiAR-sCYaOqNwzxKWVc5YYohZKpHjpCBel0pzDgUADDWyube45tOIDVyeefNjIfmRuDnJ9ZZhi45JY4E8kRviu00sFlfVxDdKLwnykuYBEeU6RCQSx6yVr5zxErvtqEbcrz3XvNJhOiNL6n_I8D6dd4muE7j43BrQgI_ae5dakGyvy83JLyeylqZKak5GIwq7KjymQQIWMVdQIfTuF4n6HbaYLcoYZthe9WdGjo3nnBkyn08Voor8OFycbUxS6qm-siAYU_0CgG29fDgorAb9F4DmFEM_Lg0ymYyBAEXsnm9EilD0rndz-tKthJN1e53CvZZlCfhbBKxjU-hTeiBeE49YIsM7KueWdCTNetU_gSeGipB-UU-sDJMvHUR0sclIenUIMC0MSNPuUBGdzTDjQBVKmJZvKUy8NJBghXHYEzCxZRdO_qnn-FIq731ZhqA-G58_48T-tovQF3JlygWW8d-XH4PzjgSR0YK4Ucpo-d8AcY0u-2HsEv6TaxgUvBnot_kPBxFhCpdLj6nbesLCAZkvmM1erBl-ew6ztD1FSt2MIg2Nr9vqOL-cQeH9zGX0OqXrbWWqCrOJkLSoq7ST-Fq6cQhvM_6KUw_mhgWHHuYy-68EgzyzZ7K7lQAx379F2Fiv2U3SR9JCWvtja5YigRBqM7PwxIyYs_o0y4p19UZg5jTx0TyR-pVXw1_CcknqmrGginPv2zKvbRlnRm-cIEO0mWsfwUgN7DzGSKa06zoEStd-aVprHolQ4_l3oFtTUVhymo4SO5VMAWVZLrGuZNn2PRifFZlvYl00Dt1RAMG0FguNGMcLn0-0hzxio-5psReiIguJfurRHnsk3tPyYwYqILmCng1OW5ytJvRUkWYgZ_esuD_9gnHyL58mYyW5MsqFmWeMoOGeDPde9ggHqf1uAZ6NxGbpco7njgxOhPKEKkr0bMXWmn31C1wh7VM2TkwhD2M9apFLQ1eX4wHl6hZsbknl1LdZrY3pLIL_SkAL6xnfxfCcA7hGli6fnlOVhLQC4WEIR-h7zJqeK60SF9-AZt6l3LwnQru5e5aIwKWv0xqS5VLf6mOmCRC0HVAJBdYRKU2CImoih7pey6HV7-JP1nxOTiK2teo5uI2PUrMLTV_oAh-O3SFkvX8eZ0LgGDF3s-AgEq3G-Hs5qNEeX7rcyUWeTZ63HZ2w7e4R1STF0pulnJW91So2vjF9aEBFY2AkpM-rSx2kKl-xYG3UMX-57Gbw0PPTNgnhwbP1AjAlPfG3TAt6Df8ouxUYsCsnA5tZna5e4QOQW1ZcEoesgJxy24QeaJN4OUHRBlmzEQ4d20rtNJL2wsed0HXdLSU427NicPdioL1lYVHXxlnU0tQEbQbLFQzIsh2WJaFqkDsBOTrN6HXTgUfY85cDo39Rm5u6gAEnJpef8NXpeqTim5oBASsqra5hZEjYi5PkFHNcLI663eNzFLlYix73_pVIcMch6YsHg6Z8JWLo7Xhz5vN4IqxEH8Qya_odYAkNpYN_kT1oTeo4MDqs0IpvPmj6tIylYRoW3txAnatsxge0l6HGa4_tG4dP_t91rsTJTzR8wsOsQZpnrKtuYEv5WlfuvpgeITrloDcWQOxq9VeqdYFdNEJPevIwvmEIA-udNoo-Ho31ZxhbODdI9p9nOLQ9lRxBVA__VOCNJisDFVLt_PyDevENtme1qJTe-RvsCuQBhTVffUPTpc4ez7V9V8CiTN37yb2VkMtHcmxcyNYiGdwIaMe3WKS_W9bM7Fqil1LX6mVu-49CnWp7SNRHXlvCeNfFWo_DvKiu8g6aMy-th-kdRSrMjKJ_6R_5ph0GKyGkF5sirhUf6W-S5s2WnV-3yj9Y0IbNWUr8xHK6SXgOXhSLfdLcJbedHNdIXIggd-jzLcAi5F_qkRV67g1W9IKQGwTzIFvoJrlq3gChxHzyrD3gOPYiAirj_6Kh2tO8iyEtEzXPNaIWHqxPnoHC2f79AA6S1rzzt1e0IPLyo0KrCeNWPb1lUsKDKOuxPB8_v6mp1LbSxAw-qWDcgHpHrM6Hve90fw-xSyRY1ZOJ14NsJE85vw2rqSo7AJtBQC2SrIsyKy5Q7rKC2lkQeyWdpCJOEslvHPTbNTftWXs9qZKSGhHXhY2_MCR5_jetBl33KKpIqOvJZs4nkaz2tmyCbFAmfQgcreiOYA1qGNWvPNJWUifd8GZHvDiemO37ZvLew3WCloB2bsn1urkN8OGmK2-NcL3jtVr0T7fRSvGG8BETDPUDtLvg2wAQeV0kGfM6dH37ED8auPcWxygz8cDD1ni8QoPpdlHsH55kL38rEerrgI_fEcAsAGqXacW8-07vKLDt_dJ4cmSVq-DVTIw-EQIrhBOf3gW8W5LP2_sVA2mjchwWP2mZ-v-zEeYVtkzCWznJCqFbeatyxHv5Q2phnWkxj2d-lsELVDHHRXPlB-MqUBsYLAhhPJzRC9n76EoOVdgr5bsfP1XQlYj_WdPdZ13HpGZyj7ZfIPRazmYlw-EBURIYzOHlilo0Hk7pLZ5Im7E5XtLXjb0r4MaUZltViFS7Za7lm1yeVmrA0k-X4T8lgTqaBpr5BnnVVTPUNB2701N4_Z3tPxFxO3Bi_wGVVqB19D1hZGyNCXHqxlvvvPozHi3gV6Oh5ElPb4_wWTJeXJTqPI_gcnExs8Z-AnwTST6Dbw1u4EBUapdXDNcC3PD6YHlQ2Cn0lUD3TMFjGZiTL3UQADwKHEtH8R45QIEadT7O8p1pVWhzFsdOZbNdc160iViD3A920MHSRcJ_pLhxwuyndMEfzJEInv3s7lIxcJtc_VVruYr-ce24eD57jf23TsXgBEkFBsGFvORSUtds_eviuK4_wjijz33Aeydm3SqMi_DfFoy0CDSLe7qnvWBda9IF4MRlvcR-N8qgZW_vjx3OkfiUUF2PDlw1tmXhSuiF1IoPusUWZQ7QD2aEEBD_RXaipdCy_Lh7yDEw9CtdEb332MLvzFgUPBLSWWyrA6gYQwpEiJHFrQMDetsaFFL-A5188dSPLjtXi9KkxGsA5wEbA1FcvABrHOBo_Ws8V3wzIuHl7uo7PO6FGIZB-d0RZiAw7AP5cVjG0udCWmQPpS0WVF5slSNmKgZjr9WD20w9yaliZOiPN_2A2w9Zx_ca4YBceORZ69irPy0xCKQJBlq0HMeZV_WzQATzbV0n8oyfx3CB12oF9JYn_4C5vqC_QnlGmUMFno3F1ZP94Tv7XqyDTt_JTAK_xppfVJEX7018apcF2w40aM5kp6_Clv0lb7AOkGWFKOAI7qOoraTldZh6ik_1DuJqKno7k0Qtc8RnRdQjNRhXJDfb1oqRBYvBfNQkROULiOoNx2yJdp7wvMjqah7WYE1wnKbftTPLjPDQDoc=\"},{\"type\":\"function_call\",\"id\":\"fc_06bc195765a8c9c7016abc91d247ec87d19e4f16354641a20f\",\"call_id\":\"call_RN4tTgQaJ61I5FoTePK9mpHu\",\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"},{\"type\":\"function_call_output\",\"call_id\":\"call_RN4tTgQaJ61I5FoTePK9mpHu\",\"output\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"instructions\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\",\"tools\":[{\"type\":\"function\",\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parametLine truncated
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "event: response.created\ndata: {\"p\": \"aa3530\", \"type\":\"response.created\",\"response\":{\"id\":\"resp_06bc195765a8c9c7016abc91d296d887d1bb460e087f742d90\",\"object\":\"response\",\"created_at\":1790742994,\"status\":\"in_progress\",\"access_programs\":null,\"background\":false,\"completed_at\":null,\"error\":null,\"frequency_penalty\":0.0,\"incomplete_details\":null,\"instructions\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\",\"max_output_tokens\":2000,\"max_tool_calls\":null,\"model\":\"gpt-5-nano-2025-08-07\",\"moderation\":null,\"output\":[],\"parallel_tool_calls\":true,\"presence_penalty\":0.0,\"previous_response_id\":null,\"prompt_cache_key\":null,\"prompt_cache_retention\":\"in_memory\",\"reasoning\":{\"context\":\"current_turn\",\"effort\":\"medium\",\"mode\":\"standard\",\"summary\":null},\"safety_identifier\":null,\"service_tier\":\"auto\",\"store\":false,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"},\"verbosity\":\"medium\"},\"tool_choice\":\"auto\",\"tool_usage\":{\"image_gen\":{\"input_tokens\":0,\"input_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"output_tokens\":0,\"output_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"total_tokens\":0},\"web_search\":{\"num_requests\":0}},\"tools\":[{\"type\":\"function\",\"description\":\"Get current weather for a city.\",\"name\":\"get_weather\",\"output_schema\":null,\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"top_logprobs\":0,\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}},\"sequence_number\":0}\n\nevent: response.in_progress\ndata: {\"p\": \"a6b66d35bc20b2b\", \"type\":\"response.in_progress\",\"response\":{\"id\":\"resp_06bc195765a8c9c7016abc91d296d887d1bb460e087f742d90\",\"object\":\"response\",\"created_at\":1790742994,\"status\":\"in_progress\",\"access_programs\":null,\"background\":false,\"completed_at\":null,\"error\":null,\"frequency_penalty\":0.0,\"incomplete_details\":null,\"instructions\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\",\"max_output_tokens\":2000,\"max_tool_calls\":null,\"model\":\"gpt-5-nano-2025-08-07\",\"moderation\":null,\"output\":[],\"parallel_tool_calls\":true,\"presence_penalty\":0.0,\"previous_response_id\":null,\"prompt_cache_key\":null,\"prompt_cache_retention\":\"in_memory\",\"reasoning\":{\"context\":\"current_turn\",\"effort\":\"medium\",\"mode\":\"standard\",\"summary\":null},\"safety_identifier\":null,\"service_tier\":\"auto\",\"store\":false,\"temperature\":1.0,\"text\":{\"format\":{\"type\":\"text\"},\"verbosity\":\"medium\"},\"tool_choice\":\"auto\",\"tool_usage\":{\"image_gen\":{\"input_tokens\":0,\"input_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"output_tokens\":0,\"output_tokens_details\":{\"image_tokens\":0,\"text_tokens\":0},\"total_tokens\":0},\"web_search\":{\"num_requests\":0}},\"tools\":[{\"type\":\"function\",\"description\":\"Get current weather for a city.\",\"name\":\"get_weather\",\"output_schema\":null,\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"top_logprobs\":0,\"top_p\":1.0,\"truncation\":\"disabled\",\"usage\":null,\"user\":null,\"metadata\":{}},\"sequence_number\":1}\n\nevent: response.output_item.added\ndata: {\"p\": \"169cd8bd840\", \"type\":\"response.output_item.added\",\"item\":{\"id\":\"msg_06bc195765a8c9c7016abc91d2e9dc87d1bc4d4524c7f3037d\",\"type\":\"message\",\"status\":\"in_progress\",\"content\":[],\"role\":\"assistant\"},\"output_index\":0,\"sequence_number\":2}\n\nevent: response.content_part.added\ndata: {\"p\": \"045e323978cf3\", \"type\":\"response.content_part.added\",\"content_index\":0,\"item_id\":\"msg_06bc195765a8c9c7016abc91d2e9dc87d1bc4d4524c7f3037d\",\"output_index\":0,\"part\":{\"type\":\"output_text\",\"annotations\":[],\"logprobs\":[],\"text\":\"\"},\"sequence_number\":3}\n\nevent: response.output_text.delta\ndata: {\"p\": \"42af845ab126d6\", \"type\":\"response.output_text.delta\",\"content_index\":0,\"delta\":\"Paris\",\"item_id\":\"msg_06bc195765a8c9c7016abc91d2e9dc87d1bc4d4524c7f3037d\",\"logprobs\":[],\"obfuscation\":\"WAn5iJo53hF\",\"output_index\":0,\"sequence_number\":4}\n\nevent: response.output_text.delta\ndata: {\"p\": \"aa473d2c7c859\", \"type\":\"response.output_text.delta\",\"content_index\":0,\"delta\":\" is\",\"item_id\":\"msg_06bc195765a8c9c7016abc91d2e9dc87d1bc4d4524c7f3037d\",\"logprobs\":[],\"obfuscation\":\"uH1AD585J0MVU\",\"output_index\":0,\"sequence_number\":5}\n\nevent: response.output_text.delta\ndata: {\"p\": \"8\", \"type\":\"response.output_text.delta\",\"content_index\":0,\"delta\":\" sunny\",\"item_id\":\"msg_06bc195765a8c9c7016abc91d2e9dc87d1bc4d4524c7f3037d\",\"logprobs\":[],\"obfuscaLine truncated
+      }
+    }
+  ]
+}

packages/ai/test/provider-error.test.ts

@@ -7,9 +7,11 @@ describe("provider error classification", () => {
     const messages = [
       "tokens in request more than max tokens allowed",
       "Requested token count exceeds the model's maximum context length of 131072 tokens.",
+      "Requested input length 600010 exceeds maximum input length 131071",
       "Input length (265330) exceeds model's maximum context length (262144).",
       "Input length 131393 exceeds the maximum allowed input length of 131040 tokens.",
       "The input (516368 tokens) is longer than the model's context length (262144 tokens).",
+      "The input is longer than the model's context length trace_id: 39d8c3a5c6c91dbc8dd9055f0b37e084",
       "Prompt has 5,958,968 tokens, but the configured context size is 256,000 tokens",
       "Range of input length should be [1, 129024]",
       "Too many tokens",
@@ -282,6 +284,82 @@ describe("provider error classification", () => {
     ).toEqual(Array(6).fill("QuotaExceeded"))
   })
 
+  test("classifies Z.ai plan and balance limits as quota rather than throttling", () => {
+    const zai = (code: string, message: string) => ({ error: { code, message } })
+    const cases = [
+      zai("1113", "Insufficient balance or no resource package. Please recharge."),
+      zai("1308", "Usage limit reached for 5 hours. Your limit will reset at 2026-10-01 00:00:00"),
+      zai(
+        "1309",
+        "Your GLM Coding Plan package has expired and is temporarily unavailable. You can resume using it after renewing the subscription on the official website.",
+      ),
+      zai("1310", "Weekly/Monthly Limit Exhausted. Your limit will reset at 2026-10-01 00:00:00"),
+      zai("1311", "Your current subscription plan does not yet include access to glm-5"),
+      zai("1314", "Your enterprise package has expired. Please contact your enterprise administrator."),
+      // Z.ai's Anthropic-compatible endpoint wraps the code and request ID into the message.
+      {
+        type: "error",
+        error: {
+          type: "rate_limit_error",
+          code: "1309",
+          message:
+            "[1309][Your GLM Coding Plan package has expired and is temporarily unavailable. You can resume using it after renewing the subscription on the official website.][20260929132151e73af01340d54b58]",
+        },
+      },
+    ]
+    expect(
+      cases.map(
+        (body) =>
+          classifyProviderFailure({ message: body.error.message, status: 429, rawBody: JSON.stringify(body) })._tag,
+      ),
+    ).toEqual(Array(cases.length).fill("QuotaExceeded"))
+  })
+
+  test("classifies Z.ai prompt length rejections as context overflow", () => {
+    const cases = [
+      { error: { code: "1261", message: "Prompt 超长" } },
+      { error: { code: "1261", message: "Prompt too long" } },
+      {
+        type: "error",
+        error: { type: "invalid_request_error", code: "1261", message: "[1261][Prompt too long][2026092913]" },
+      },
+    ]
+    expect(
+      cases.map((body) => {
+        const reason = classifyProviderFailure({
+          message: body.error.message,
+          status: 400,
+          rawBody: JSON.stringify(body),
+        })
+        return reason._tag === "InvalidRequest" ? reason.classification : reason._tag
+      }),
+    ).toEqual(["context-overflow", "context-overflow", "context-overflow"])
+  })
+
+  test("classifies Z.ai sensitive content rejections as content policy", () => {
+    const message =
+      "System detected potentially unsafe or sensitive content in input or generation. Please avoid using prompts that may generate sensitive content. Thank you for your cooperation."
+    expect(
+      classifyProviderFailure({
+        message,
+        status: 400,
+        rawBody: JSON.stringify({ error: { code: "1301", message } }),
+      })._tag,
+    ).toBe("ContentPolicy")
+  })
+
+  test("keeps Z.ai throttling and overload retryable", () => {
+    expect(
+      [
+        { error: { code: "1302", message: "Rate limit reached for requests" } },
+        { error: { code: "1305", message: "The service may be temporarily overloaded, please try again later" } },
+      ].map(
+        (body) =>
+          classifyProviderFailure({ message: body.error.message, status: 429, rawBody: JSON.stringify(body) })._tag,
+      ),
+    ).toEqual(["RateLimit", "RateLimit"])
+  })
+
   test("does not let substituted server codes make a 4xx retryable", () => {
     const openai = { error: { type: "server_error", message: "Upstream request failed: Model is unavailable." } }
     const anthropic = {
@@ -366,7 +444,24 @@ describe("provider error rawBody classification", () => {
     expect(reason._tag === "InvalidRequest" ? reason.classification : reason._tag).toBe("context-overflow")
   })
 
-  test("classifies Google invalid API keys as authentication failures", () => {
+  test("classifies Amazon Nova input token rejections as context overflow", () => {
+    const message =
+      "The model returned the following errors: Input Tokens Exceeded: Number of input tokens exceeds maximum length. Please update the input to try again."
+    const reason = classifyProviderFailure({
+      message,
+      rawBody: JSON.stringify({
+        headers: {
+          ":exception-type": { type: "string", value: "validationException" },
+          ":content-type": { type: "string", value: "application/json" },
+          ":message-type": { type: "string", value: "exception" },
+        },
+        body: JSON.stringify({ message }),
+      }),
+    })
+    expect(reason._tag === "InvalidRequest" ? reason.classification : reason._tag).toBe("context-overflow")
+  })
+
+  test("classifies invalid API keys reported as HTTP 400 as authentication failures", () => {
     const rawBody = JSON.stringify({
       error: {
         code: 400,
@@ -390,6 +485,14 @@ describe("provider error rawBody classification", () => {
       classifyProviderFailure({ message: "API key not valid. Please pass a valid API key.", status: 400, rawBody })
         ._tag,
     ).toBe("Authentication")
+    // xAI
+    expect(
+      classifyProviderFailure({
+        message: "Incorrect API key provided. You can obtain an API key from https://console.x.ai.",
+        status: 400,
+        rawBody: '{"code":"invalid-argument","error":"Incorrect API key provided."}',
+      })._tag,
+    ).toBe("Authentication")
   })
 
   test("classifies overflow signals buried in the raw payload when the summary is vague", () => {
@@ -405,6 +508,19 @@ describe("provider error rawBody classification", () => {
     expect(
       classifyProviderFailure({ message: "Request failed", rawBody: '{"error":{"code":"insufficient_quota"}}' })._tag,
     ).toBe("QuotaExceeded")
+    // Z.ai Responses stream rejections
+    expect(
+      classifyProviderFailure({
+        message: "Unknown Model, please check the model code.",
+        rawBody: '{"type":"response.failed","response":{"error":{"code":"model_not_found"}}}',
+      })._tag,
+    ).toBe("InvalidRequest")
+    expect(
+      classifyProviderFailure({
+        message: "Your GLM Coding Plan package has expired and is temporarily unavailable.",
+        rawBody: '{"type":"response.failed","response":{"error":{"code":"permission_denied"}}}',
+      })._tag,
+    ).toBe("Authentication")
   })
 })
 

packages/ai/test/provider-package.test.ts

@@ -214,7 +214,7 @@ describe("provider package entrypoints", () => {
       })
       expect(selected.provider).toBe(provider.id)
       expect(selected.route.endpoint.baseURL).toBe(provider.baseURL({ accountId: "account" }))
-      expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
+      expect(selected.route.defaults.headers).toMatchObject({ "x-application": "opencode" })
       expect(selected.route.defaults.http?.body).toEqual({ custom: true })
       expect(selected.route.defaults.providerOptions).toEqual({ reasoningEffort: "high" })
     }

packages/ai/test/provider/anthropic-messages.test.ts

@@ -588,9 +588,9 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
-  it.effect("rejects a system update between a local tool call and its result", () =>
+  it.effect("moves a system update between a local tool call and its result after the result", () =>
     Effect.gen(function* () {
-      const error = yield* compileRequest(
+      const prepared = yield* compileRequest(
         LLM.request({
           model: opus48,
           messages: [
@@ -601,9 +601,13 @@ describe("Anthropic Messages route", () => {
           ],
           cache: "none",
         }),
-      ).pipe(Effect.flip)
+      )
 
-      expect(error.message).toContain("system updates cannot split a local tool call from its tool result")
+      expect(prepared.body.messages.slice(1)).toEqual([
+        { role: "assistant", content: [{ type: "tool_use", id: "call_1", name: "lookup", input: {} }] },
+        { role: "user", content: [{ type: "tool_result", tool_use_id: "call_1", content: '"Done."' }] },
+        { role: "system", content: [{ type: "text", text: "Too early.", cache_control: undefined }] },
+      ])
     }),
   )
 

packages/ai/test/provider/bedrock-converse.test.ts

@@ -501,25 +501,23 @@ describe("Bedrock Converse route", () => {
         LLM.request({ model, messages: [Message.assistant([call])], cache: "none" }),
       )
 
-      expect(prepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [
-            {
-              toolUse: {
-                toolUseId: "tool_1",
-                name: "edit",
-                input: {
-                  path: "file.ts",
-                  edits: [{ oldText: "a", newText: "b" }, null, true, 7, "text", ["kept", { nested: { value: "ok" } }]],
-                  nested: { empty: {}, onlyEmpty: {} },
-                  " ": "preserve whitespace key",
-                },
+      expect(prepared.body.messages[0]).toEqual({
+        role: "assistant",
+        content: [
+          {
+            toolUse: {
+              toolUseId: "tool_1",
+              name: "edit",
+              input: {
+                path: "file.ts",
+                edits: [{ oldText: "a", newText: "b" }, null, true, 7, "text", ["kept", { nested: { value: "ok" } }]],
+                nested: { empty: {}, onlyEmpty: {} },
+                " ": "preserve whitespace key",
               },
             },
-          ],
-        },
-      ])
+          },
+        ],
+      })
       expect(input).toEqual(original)
       expect(call.input).toBe(input)
     }),
@@ -540,15 +538,13 @@ describe("Bedrock Converse route", () => {
         }),
       )
 
-      expect(prepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [
-            { toolUse: { toolUseId: "tool_empty_key", name: "first", input: {} } },
-            { toolUse: { toolUseId: "tool_empty_object", name: "second", input: {} } },
-          ],
-        },
-      ])
+      expect(prepared.body.messages[0]).toEqual({
+        role: "assistant",
+        content: [
+          { toolUse: { toolUseId: "tool_empty_key", name: "first", input: {} } },
+          { toolUse: { toolUseId: "tool_empty_object", name: "second", input: {} } },
+        ],
+      })
     }),
   )
 
@@ -1099,6 +1095,12 @@ describe("Bedrock Converse route", () => {
             { toolUse: { toolUseId: "call_1", name: "lookup", input: {} } },
           ],
         },
+        {
+          role: "user",
+          content: [
+            { toolResult: { toolUseId: "call_1", content: [{ text: "Tool result missing" }], status: "error" } },
+          ],
+        },
       ])
     }),
   )

packages/ai/test/provider/cloudflare.test.ts

@@ -39,9 +39,16 @@ describe("Cloudflare", () => {
       )
 
       expect(responses.route).toBe("cloudflare-ai-gateway-responses")
-      expect(responses.body).toMatchObject({ model: "openai/gpt-5.4", stream: true })
+      expect(responses.model.route.endpoint.baseURL).toBe(
+        "https://gateway.ai.cloudflare.com/v1/test-account/test-gateway/openai",
+      )
+      expect(responses.body).toMatchObject({ model: "gpt-5.4", stream: true })
       expect(messages.route).toBe("cloudflare-ai-gateway-messages")
-      expect(messages.body).toMatchObject({ model: "anthropic/claude-haiku-4-5" })
+      expect(messages.model.route.endpoint.baseURL).toBe(
+        "https://gateway.ai.cloudflare.com/v1/test-account/test-gateway/anthropic/v1",
+      )
+      expect(messages.body).toMatchObject({ model: "claude-haiku-4-5" })
+      expect(chat.model.route.endpoint.baseURL).toBe("https://api.cloudflare.com/client/v4/accounts/test-account/ai/v1")
       expect(chat.route).toBe("cloudflare-ai-gateway-chat")
       expect(chat.body).toMatchObject({ model: "xai/grok-4.6", stream: true })
       expect(workers.route).toBe("cloudflare-ai-gateway-chat")
@@ -100,6 +107,54 @@ describe("Cloudflare", () => {
     }),
   )
 
+  it.effect("posts Claude and OpenAI models to the provider-native gateway endpoints", () =>
+    Effect.gen(function* () {
+      const gateway = CloudflareAIGateway.configure({ accountId: "test-account", apiKey: "test-token", cacheTtl: 300 })
+      const requests: Array<Request> = []
+      const capture = dynamicResponse((input) =>
+        Effect.gen(function* () {
+          requests.push(yield* HttpClientRequest.toWeb(input.request).pipe(Effect.orDie))
+          return input.respond("", { status: 500 })
+        }),
+      )
+      yield* LLM.generate(LLM.request({ model: gateway.model("anthropic/claude-sonnet-4.6"), prompt: "Hi" })).pipe(
+        Effect.provide(capture),
+        Effect.ignore,
+      )
+      yield* LLM.generate(LLM.request({ model: gateway.model("openai/gpt-5-nano"), prompt: "Hi" })).pipe(
+        Effect.provide(capture),
+        Effect.ignore,
+      )
+
+      expect(requests.map((request) => request.url)).toEqual([
+        "https://gateway.ai.cloudflare.com/v1/test-account/default/anthropic/v1/messages",
+        "https://gateway.ai.cloudflare.com/v1/test-account/default/openai/responses",
+      ])
+      requests.forEach((request) => {
+        expect(request.headers.get("cf-aig-authorization")).toBe("Bearer test-token")
+        expect(request.headers.get("authorization")).toBeNull()
+        expect(request.headers.get("x-api-key")).toBeNull()
+        expect(request.headers.get("cf-aig-gateway-id")).toBeNull()
+        expect(request.headers.get("cf-aig-cache-ttl")).toBe("300")
+      })
+    }),
+  )
+
+  it.effect("sends the default gateway ID to the REST API", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model: CloudflareAIGateway.configure({ accountId: "test-account", apiKey: "test-token" }).model(
+            "workers-ai/@cf/meta/llama-3.3-70b-instruct",
+          ),
+          prompt: "Say hello.",
+        }),
+      )
+
+      expect(prepared.model.route.defaults.headers).toMatchObject({ "cf-aig-gateway-id": "default" })
+    }),
+  )
+
   it.effect("preserves reasoning details for AI Gateway continuation", () =>
     Effect.gen(function* () {
       const model = CloudflareAIGateway.configure({
@@ -160,12 +215,13 @@ describe("Cloudflare", () => {
           model: CloudflareAIGateway.configure({
             baseURL: "https://gateway.proxy.test/v1",
             apiKey: "test-token",
-          }).model("xai/grok-4.6"),
+          }).model("anthropic/claude-sonnet-4.6"),
           prompt: "Say hello.",
         }),
       )
 
       expect(prepared.model.route.endpoint.baseURL).toBe("https://gateway.proxy.test/v1")
+      expect(prepared.body).toMatchObject({ model: "anthropic/claude-sonnet-4.6" })
     }),
   )
 

packages/ai/test/provider/gemini.test.ts

@@ -1285,25 +1285,23 @@ describe("Gemini route", () => {
         }),
       )
 
-      expect(prepared.body.contents).toEqual([
-        {
-          role: "model",
-          parts: [
-            {
-              functionCall: { id: "tool_0", name: "lookup", args: { query: "weather" } },
-              thoughtSignature: "parallel_signature",
-            },
-            {
-              functionCall: { id: "tool_1", name: "lookup", args: { query: "news" } },
-              thoughtSignature: undefined,
-            },
-            {
-              functionCall: { id: "tool_2", name: "lookup", args: { query: "sports" } },
-              thoughtSignature: undefined,
-            },
-          ],
-        },
-      ])
+      expect(prepared.body.contents[0]).toEqual({
+        role: "model",
+        parts: [
+          {
+            functionCall: { id: "tool_0", name: "lookup", args: { query: "weather" } },
+            thoughtSignature: "parallel_signature",
+          },
+          {
+            functionCall: { id: "tool_1", name: "lookup", args: { query: "news" } },
+            thoughtSignature: undefined,
+          },
+          {
+            functionCall: { id: "tool_2", name: "lookup", args: { query: "sports" } },
+            thoughtSignature: undefined,
+          },
+        ],
+      })
     }),
   )
 
@@ -1321,21 +1319,19 @@ describe("Gemini route", () => {
         }),
       )
 
-      expect(prepared.body.contents).toEqual([
-        {
-          role: "model",
-          parts: [
-            {
-              functionCall: { id: "tool_0", name: "lookup", args: { query: "weather" } },
-              thoughtSignature: "skip_thought_signature_validator",
-            },
-            {
-              functionCall: { id: "tool_1", name: "lookup", args: { query: "news" } },
-              thoughtSignature: "skip_thought_signature_validator",
-            },
-          ],
-        },
-      ])
+      expect(prepared.body.contents[0]).toEqual({
+        role: "model",
+        parts: [
+          {
+            functionCall: { id: "tool_0", name: "lookup", args: { query: "weather" } },
+            thoughtSignature: "skip_thought_signature_validator",
+          },
+          {
+            functionCall: { id: "tool_1", name: "lookup", args: { query: "news" } },
+            thoughtSignature: "skip_thought_signature_validator",
+          },
+        ],
+      })
     }),
   )
 

packages/ai/test/provider/golden.recorded.test.ts

@@ -49,6 +49,8 @@ const cloudflareWorkers = CloudflareWorkersAI.configure({
 })
 const cloudflareAIGatewayWorkers = cloudflareAIGateway.model("workers-ai/@cf/meta/llama-3.1-8b-instruct")
 const cloudflareAIGatewayWorkersTools = cloudflareAIGateway.model("workers-ai/@cf/openai/gpt-oss-20b")
+const cloudflareAIGatewayClaude = cloudflareAIGateway.model("anthropic/claude-haiku-4.5")
+const cloudflareAIGatewayOpenAI = cloudflareAIGateway.model("openai/gpt-5-nano")
 const cloudflareWorkersAI = cloudflareWorkers.model("@cf/meta/llama-3.1-8b-instruct")
 const cloudflareWorkersAITools = cloudflareWorkers.model("@cf/openai/gpt-oss-20b")
 const deepseek = DeepSeek.configure({ apiKey: process.env.DEEPSEEK_API_KEY ?? "fixture" }).model("deepseek-chat")
@@ -76,7 +78,7 @@ const openrouterOpus = OpenRouter.configure({
 const redactCloudflareURL = (url: string) =>
   url
     .replace(/\/client\/v4\/accounts\/[^/]+\/ai\/v1\//, "/client/v4/accounts/{account}/ai/v1/")
-    .replace(/\/v1\/[^/]+\/[^/]+\/compat\//, "/v1/{account}/{gateway}/compat/")
+    .replace(/\/v1\/[^/]+\/[^/]+\/(anthropic|openai)\//, "/v1/{account}/{gateway}/$1/")
 
 const cloudflareOptions = {
   redact: { url: redactCloudflareURL },
@@ -177,6 +179,25 @@ describeRecordedGoldenScenarios([
     options: cloudflareOptions,
     scenarios: [{ id: "tool-call", maxTokens: 120 }],
   },
+  {
+    name: "Cloudflare AI Gateway Claude Haiku 4.5",
+    prefix: "cloudflare-ai-gateway",
+    model: cloudflareAIGatewayClaude,
+    requires: ["CLOUDFLARE_ACCOUNT_ID", "CLOUDFLARE_API_TOKEN"],
+    options: { redact: { url: redactCloudflareURL, allowRequestHeaders: ["anthropic-version"] } },
+    scenarios: ["text", "tool-loop"],
+  },
+  {
+    name: "Cloudflare AI Gateway OpenAI GPT-5 Nano",
+    prefix: "cloudflare-ai-gateway",
+    model: cloudflareAIGatewayOpenAI,
+    requires: ["CLOUDFLARE_ACCOUNT_ID", "CLOUDFLARE_API_TOKEN"],
+    options: cloudflareOptions,
+    scenarios: [
+      { id: "text", temperature: false, maxTokens: 2000 },
+      { id: "tool-loop", temperature: false, maxTokens: 2000, timeout: 30_000 },
+    ],
+  },
   {
     name: "Cloudflare Workers AI Llama 3.1 8B",
     prefix: "cloudflare-workers-ai",

packages/ai/test/provider/mistral-chat.test.ts

@@ -215,13 +215,11 @@ describe("Mistral Chat", () => {
           ],
         }),
       )
-      expect(prepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: "",
-          tool_calls: [{ id: "Ab12Cd34E", type: "function", function: { name: "lookup", arguments: "{}" } }],
-        },
-      ])
+      expect(prepared.body.messages[0]).toEqual({
+        role: "assistant",
+        content: "",
+        tool_calls: [{ id: "Ab12Cd34E", type: "function", function: { name: "lookup", arguments: "{}" } }],
+      })
     }),
   )
 
@@ -315,7 +313,9 @@ describe("Mistral Chat", () => {
       expect(response.reasoning).toBe("Consider")
       expect(response.text).toBe("Answer")
       expect(response.events.find(LLMEvent.is.reasoningStart)?.providerMetadata).toBeUndefined()
-      expect(response.events.filter(LLMEvent.is.reasoningDelta).map((event) => [event.text, event.providerMetadata])).toEqual([
+      expect(
+        response.events.filter(LLMEvent.is.reasoningDelta).map((event) => [event.text, event.providerMetadata]),
+      ).toEqual([
         ["Con", undefined],
         ["sider", undefined],
       ])

packages/ai/test/provider/openai-chat.test.ts

@@ -1257,21 +1257,19 @@ describe("OpenAI Chat route", () => {
       })
 
       const replay = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
-      expect(replay.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: null,
-          reasoning: "thinking",
-          reasoning_details: details,
-          tool_calls: [
-            {
-              id: "call_1",
-              type: "function",
-              function: { name: "lookup", arguments: '{"query":"weather"}' },
-            },
-          ],
-        },
-      ])
+      expect(replay.body.messages[0]).toEqual({
+        role: "assistant",
+        content: null,
+        reasoning: "thinking",
+        reasoning_details: details,
+        tool_calls: [
+          {
+            id: "call_1",
+            type: "function",
+            function: { name: "lookup", arguments: '{"query":"weather"}' },
+          },
+        ],
+      })
     }),
   )
 
@@ -1374,18 +1372,16 @@ describe("OpenAI Chat route", () => {
       })
 
       const replay = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
-      expect(replay.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: null,
-          tool_calls: [{ id: "call_1", type: "function", function: { name: "get_time", arguments: "{}" } }],
-          reasoning_content: "Let me think",
-          reasoning_details: [
-            { type: "summary", summary: "Plan tools" },
-            { type: "encrypted", encrypted: "opaque" },
-          ],
-        },
-      ])
+      expect(replay.body.messages[0]).toEqual({
+        role: "assistant",
+        content: null,
+        tool_calls: [{ id: "call_1", type: "function", function: { name: "get_time", arguments: "{}" } }],
+        reasoning_content: "Let me think",
+        reasoning_details: [
+          { type: "summary", summary: "Plan tools" },
+          { type: "encrypted", encrypted: "opaque" },
+        ],
+      })
     }),
   )
 

packages/ai/test/provider/openai-responses.test.ts

@@ -3804,6 +3804,8 @@ describe("OpenAI Responses route", () => {
           name: "lookup",
           arguments: '{"query":"news"}',
         },
+        { type: "function_call_output", call_id: "call_1", output: "Tool result missing" },
+        { type: "function_call_output", call_id: "call_2", output: "Tool result missing" },
       ])
     }),
   )
@@ -4098,15 +4100,13 @@ describe("OpenAI Responses route", () => {
       ])
 
       const prepared = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
-      expect(prepared.body.input).toEqual([
-        {
-          type: "function_call",
-          id: "fc_item_1",
-          call_id: "call_1",
-          name: "lookup",
-          arguments: '{"query":"weather"}',
-        },
-      ])
+      expect(prepared.body.input[0]).toEqual({
+        type: "function_call",
+        id: "fc_item_1",
+        call_id: "call_1",
+        name: "lookup",
+        arguments: '{"query":"weather"}',
+      })
     }),
   )
 
@@ -4998,11 +4998,11 @@ describe("OpenAI Responses route", () => {
 
   it.effect("retains the token-sharing HTTP 429 body for retry hooks", () =>
     Effect.gen(function* () {
-      const body = JSON.stringify({ error: { code: "subscription_sharing_usage_limit_exceeded", message: "Rate limit exceeded" } })
+      const body = JSON.stringify({
+        error: { code: "subscription_sharing_usage_limit_exceeded", message: "Rate limit exceeded" },
+      })
       const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(body, { status: 429, headers: { "content-type": "application/json" } }),
-        ),
+        Effect.provide(fixedResponse(body, { status: 429, headers: { "content-type": "application/json" } })),
         Effect.flip,
       )
 

packages/ai/test/provider/zai.test.ts

@@ -54,16 +54,28 @@ it.effect("ZAI Chat retains native thinking fields and scopes tool streaming to
         baseURL: "https://gateway.example/custom",
         auth: Auth.header("x-test-key", "fixture"),
       })
-      for (const modelID of [
-        "glm-4.5",
-        "glm-4.5-air",
-        "glm-4.5-x",
-        "glm-4.6",
-        "glm-4.7-flash",
-        "glm-5.3",
-        "glm-5.3-flash",
-        "future-model",
-      ]) {
+      for (const [modelID, supported] of [
+        ["glm-3.9", false],
+        ["glm-4", false],
+        ["glm-4.5", false],
+        ["glm-4.5-air", false],
+        ["glm-4.5-x", false],
+        ["glm-4.6", true],
+        ["glm-4.7-flash", true],
+        ["glm-4.8", true],
+        ["glm-4.10", true],
+        ["glm-5", true],
+        ["glm-5.3", true],
+        ["glm-5.3-flash", true],
+        ["glm-6", true],
+        ["glm-10.1-new-family", true],
+        ["zai/glm-6.1", true],
+        ["GLM-4.6", true],
+        ["not-glm-6", false],
+        ["glm-4.60foo", false],
+        ["glm-6.x", false],
+        ["future-model", false],
+      ] as const) {
         const result = yield* compileRequest(
           LLM.request({
             model: provider.chat(modelID),
@@ -78,9 +90,7 @@ it.effect("ZAI Chat retains native thinking fields and scopes tool streaming to
           max_tokens: 123,
           thinking: { type: "enabled", clear_thinking: false },
         })
-        expect(result.body.tool_stream).toBe(
-          ["glm-4.6", "glm-4.7-flash", "glm-5.3", "glm-5.3-flash"].includes(modelID) ? true : undefined,
-        )
+        expect(result.body.tool_stream).toBe(supported ? true : undefined)
         expect(result.body.max_completion_tokens).toBeUndefined()
         expect(result.body.store).toBeUndefined()
         expect(result.body.tools).toEqual([
@@ -120,6 +130,30 @@ it.effect("ZAI Chat retains native thinking fields and scopes tool streaming to
   }),
 )
 
+it.effect("ZAI tool streaming defaults require tools and preserve explicit overrides", () =>
+  Effect.gen(function* () {
+    for (const configure of [ZAI.configure, ZAICodingPlan.configure]) {
+      const provider = configure({ apiKey: "fixture" })
+      for (const item of [
+        { id: "glm-6.1", tools: [], toolStream: undefined, expected: undefined },
+        { id: "glm-4.5", tools: [tool], toolStream: true, expected: true },
+        { id: "glm-6.1", tools: [tool], toolStream: false, expected: false },
+        { id: "future-model", tools: [tool], toolStream: true, expected: true },
+      ]) {
+        const result = yield* compileRequest(
+          LLM.request({
+            model: provider.chat(item.id),
+            prompt: "Hello",
+            tools: item.tools,
+            providerOptions: { toolStream: item.toolStream },
+          }),
+        )
+        expect(result.body.tool_stream).toBe(item.expected)
+      }
+    }
+  }),
+)
+
 it.effect("ZAI lowers effort using the selected native API without inventing thinking settings", () =>
   Effect.gen(function* () {
     for (const effort of ["none", "minimal", "low", "medium", "high", "xhigh", "max", "future-effort"]) {

packages/ai/test/tool-history.test.ts

@@ -15,12 +15,47 @@ describe("tool history normalization", () => {
       Message.assistant(toolCall("trailing")),
     ])
 
-    expect(normalized.map((message) => message.role)).toEqual(["assistant", "tool", "tool", "user", "assistant"])
+    expect(normalized.map((message) => message.role)).toEqual([
+      "assistant",
+      "tool",
+      "tool",
+      "user",
+      "assistant",
+      "tool",
+    ])
     expect(normalized[1]?.content[0]).toMatchObject({ type: "tool-result", id: "first", name: "first" })
     expect(normalized[2]?.content).toEqual([
       { type: "tool-result", id: "second", name: "second", result: { type: "error", value: "Tool result missing" } },
     ])
     expect(normalized[4]?.content).toEqual([toolCall("trailing")])
+    expect(normalized[5]?.content).toEqual([
+      {
+        type: "tool-result",
+        id: "trailing",
+        name: "trailing",
+        result: { type: "error", value: "Tool result missing" },
+      },
+    ])
+  })
+
+  test("fills missing results for trailing calls without replacing available results", () => {
+    const calls = Message.assistant([toolCall("answered"), toolCall("unanswered")])
+    const answered = toolResult("answered", "done", "answered", "text")
+    const hosted = ToolCallPart.make({ id: "hosted", name: "web_search", input: {}, providerExecuted: true })
+
+    expect(normalizeToolHistory([calls, answered])).toEqual([
+      calls,
+      answered,
+      Message.tool(
+        ToolResultPart.make({
+          id: "unanswered",
+          name: "unanswered",
+          result: "Tool result missing",
+          resultType: "error",
+        }),
+      ),
+    ])
+    expect(normalizeToolHistory([Message.assistant(hosted)])).toEqual([Message.assistant(hosted)])
   })
 
   test("normalizes empty results without changing whitespace or media", () => {
@@ -77,4 +112,51 @@ describe("tool history normalization", () => {
 
     expect(normalized[1]?.content[0]).toMatchObject({ name: "lookup", namespace: undefined })
   })
+
+  test("moves system updates after the results of pending calls", () => {
+    const calls = Message.assistant([toolCall("first"), toolCall("second")])
+    const first = toolResult("first", "one", "first", "text")
+    const second = toolResult("second", "two", "second", "text")
+    const update = Message.system("First update.")
+    const later = Message.system("Second update.")
+    const user = Message.user("Continue.")
+    const missing = (id: string) =>
+      Message.tool(ToolResultPart.make({ id, name: id, result: "Tool result missing", resultType: "error" }))
+
+    expect(normalizeToolHistory([calls, first, update, later, second, user])).toEqual([
+      calls,
+      first,
+      second,
+      update,
+      later,
+      user,
+    ])
+    expect(normalizeToolHistory([Message.assistant(toolCall("first")), update, user])).toEqual([
+      Message.assistant(toolCall("first")),
+      missing("first"),
+      update,
+      user,
+    ])
+    expect(normalizeToolHistory([Message.assistant(toolCall("first")), update])).toEqual([
+      Message.assistant(toolCall("first")),
+      missing("first"),
+      update,
+    ])
+  })
+
+  test("moves effort updates after the results of pending calls", () => {
+    const call = Message.assistant(toolCall("first"))
+    const result = toolResult("first", "one", "first", "text")
+    const effort = Message.effort({ effort: "low", previous: "high" })
+
+    expect(normalizeToolHistory([call, effort, result])).toEqual([call, result, effort])
+  })
+
+  test("keeps system updates in place when no call is pending", () => {
+    const history = [Message.assistant(toolCall("first")), toolResult("first", "one", "first", "text")]
+    const update = Message.system("Update.")
+    const input = [Message.user("Start."), update, ...history, update, Message.user("Continue.")]
+
+    expect(normalizeToolHistory(input)).toBe(input)
+  })
 })

packages/app/AGENTS.md

@@ -43,6 +43,18 @@
 - In translation review notes, name the corpora used and call out uncertain or region-specific terminology so native speakers can focus review where it matters.
 - Also use the relevant language authority or official dictionary for the locale (for example RAE/Fundéu, FranceTerme, Duden, TDK, Kotus/Kielitoimiston sanakirja, Språkrådet/Bokmålsordboka, Rada Języka Polskiego/PWN, the Russian and Arabic language academies, the Ukrainian Orthography, Taiwan MOE dictionaries, or the Royal Society of Thailand). Treat the English dictionary as the semantic source of truth and preserve placeholders, code identifiers, product names, and keyboard labels.
 
+## Tests
+
+A test must pay for its upkeep. Before adding one, answer three questions: which observable contract does it protect, which credible regression makes it fail, and why does no existing test already catch that regression. If any answer is missing, do not add the test.
+
+- One contract, one owner. Test each behavior once, at the strongest boundary that observes it: the area's e2e keeper suite, or the owning module's unit test. Extend an existing table or keeper case before creating a file.
+- Do not unit-test what an e2e keeper already proves, what a dependency does (for example `@pierre/trees`), config that passes values through, or source text (import or string greps). Source text is fair game only when that text is the contract, such as a persisted key.
+- Never add production seams for tests: no test-only exports, parameters such as `now`, `delay` or `budget`, flags, globals, or `data-*` attributes. Control time with `setSystemTime` from `bun:test` and drive the real entry point.
+- A test must be able to fail. Do not assert values the code under test produced, mock the behavior you assert, use soft assertions for the order the test guards, or leave `rejects`/`resolves` un-awaited. A regression test must fail on the code before the fix.
+- Do not repeat a case per theme, text direction, viewport or channel. Use one table, and only when the behavior differs.
+- When you delete or move coverage, name the test that still proves the contract. When you move a contract, mutate its owner once and confirm the new test fails.
+- A contract proven by a `packages/session-ui/component-tests` test does not also get an app e2e copy.
+
 ## Tool Calling
 
 - ALWAYS USE PARALLEL TOOLS WHEN APPLICABLE.

packages/app/component-tests/browser-pane.fixture.tsx

@@ -1,242 +0,0 @@
-import { DialogProvider } from "@opencode/ui/context/dialog"
-import { Browser } from "@opencode/plugin-browser/rpc"
-import { For, Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { Portal, render } from "solid-js/web"
-import { LanguageProvider, UiI18nBridge } from "../src/runtime/i18n/language"
-import type { BrowserPaneEvent, BrowserPaneLayout, BrowserPaneRegistration } from "../src/runtime/platform/browser-pane"
-import type { createSessionBrowser } from "../src/session/browser/model"
-import { SessionBrowserPane, type SessionBrowserComment } from "../src/session/browser/pane"
-
-export function mountBrowserPane() {
-  const host = document.createElement("main")
-  host.dataset.testid = "browser-pane-fixture"
-  host.style.cssText = "position:fixed;inset:0;z-index:1000;background:#181818;color:#eee;padding:24px"
-  document.body.appendChild(host)
-
-  function Fixture() {
-    const [store, setStore] = createStore({
-      session: "Alpha",
-      mounted: true,
-      visible: true,
-      url: undefined as string | undefined,
-      loading: false,
-      generation: 0,
-      delayNavigation: false,
-      pendingURL: undefined as string | undefined,
-      loadErrors: {} as Record<string, string | undefined>,
-      error: undefined as string | undefined,
-      layouts: {} as Record<string, BrowserPaneLayout | undefined>,
-      covered: false,
-      captures: 0,
-      holdCapture: false,
-      picker: {} as Record<string, boolean | undefined>,
-      highlights: [] as string[],
-      comments: [] as SessionBrowserComment[],
-    })
-    // Each capture waits until the fixture releases it, so a spec can observe the pending state.
-    const held: (() => void)[] = []
-    const inspectors = new Set<(event: Extract<BrowserPaneEvent, { type: "inspect" }>) => void>()
-    const emitInspect = (event: Extract<BrowserPaneEvent, { type: "inspect" }>) =>
-      inspectors.forEach((listener) => listener(event))
-    const tabs = ["Alpha", "Beta"].map((name) => ({
-      id: Browser.TabID.make(`tab_${name === "Alpha" ? "11111111" : "22222222"}-1111-1111-1111-111111111111`),
-      title: name,
-      url: `https://${name.toLowerCase()}.example/`,
-      loading: false,
-      canGoBack: false,
-      canGoForward: false,
-      generation: 0,
-    }))
-    // Record the native boundary per registration: hiding Beta cannot hide Alpha's view.
-    const registrations = new Map<string, BrowserPaneRegistration>(
-      tabs.map((tab) => [
-        tab.title,
-        {
-          setLayout: (layout) => setStore("layouts", tab.title, layout),
-          command: async () => undefined,
-          capture: async () => {
-            setStore("captures", (count) => count + 1)
-            if (store.holdCapture) await new Promise<void>((resolve) => held.push(resolve))
-            const canvas = new OffscreenCanvas(4, 4)
-            const paint = canvas.getContext("2d")
-            if (paint) {
-              paint.fillStyle = "#3b82f6"
-              paint.fillRect(0, 0, 4, 4)
-            }
-            return canvas.convertToBlob()
-          },
-          // The desktop confirms each picker change, as the page does once inspect mode is armed.
-          inspect: (tabID, enabled) => {
-            setStore("picker", tab.title, enabled)
-            emitInspect({ type: "inspect", tabID, active: enabled })
-          },
-          highlight: (_tabID, ref) => setStore("highlights", (items) => [...items, ref ?? "clear"]),
-          close: () => undefined,
-        },
-      ]),
-    )
-    const browser: ReturnType<typeof createSessionBrowser> = {
-      available: () => true,
-      attached: () => !!registrations.get(store.session),
-      opened: () => !!registrations.get(store.session),
-      state: () => ({ tabs: tabs.filter((tab) => tab.title === store.session), focusedTabID: null }),
-      tabs: () => tabs.filter((tab) => tab.title === store.session),
-      active: () => {
-        const tab = tabs.find((tab) => tab.title === store.session) ?? tabs[0]
-        return {
-          ...tab,
-          url: store.url ?? tab.url,
-          loading: store.loading,
-          generation: store.generation,
-          loadError: store.loadErrors[store.session],
-        }
-      },
-      registration: () => registrations.get(store.session),
-      error: () => store.error ?? (store.loadErrors[store.session] ? "Request failed" : undefined),
-      suspended: () => false,
-      close: () => undefined,
-      open: () => undefined,
-      command: (command) => {
-        setStore("error", undefined)
-        if (command.type === "navigate" || command.type === "reload") setStore("loadErrors", store.session, undefined)
-        if (command.type === "navigate") {
-          if (store.delayNavigation) {
-            setStore("pendingURL", command.url)
-            return
-          }
-          setStore({ url: command.url, loading: false, generation: store.generation + 1 })
-        }
-        if (command.type === "stop") setStore("loading", false)
-      },
-      onInspect: (listener) => {
-        inspectors.add(listener)
-        return () => inspectors.delete(listener)
-      },
-      reveal: () => undefined,
-    }
-    const pick = () =>
-      emitInspect({
-        type: "inspect",
-        tabID: browser.active().id,
-        active: false,
-        element: {
-          ref: Browser.Ref.make("e7"),
-          selector: "main > button.primary",
-          label: "button.primary",
-          role: "button",
-          name: "Save changes",
-          rect: { x: 48, y: 40, width: 160, height: 36 },
-        },
-      })
-    return (
-      <>
-        <h1 style={{ "font-size": "24px", "margin-bottom": "16px" }}>Browser pane lifecycle</h1>
-        <p>Selected session: {store.session}</p>
-        <nav style={{ display: "flex", gap: "20px", margin: "16px 0" }}>
-          <For each={["Alpha", "Beta", "Empty"]}>
-            {(name) => <button onClick={() => setStore({ session: name, mounted: name !== "Empty" })}>{name}</button>}
-          </For>
-          <button onClick={() => setStore("mounted", false)}>Unmount pane</button>
-          <button onClick={() => setStore({ url: "about:blank", loading: false })}>Blank page</button>
-          <button onClick={() => setStore({ url: "about:blank", loading: true })}>Loading page</button>
-          <button
-            onClick={() =>
-              setStore({ loading: true, generation: store.generation + 1, loadErrors: { [store.session]: undefined } })
-            }
-          >
-            Load current page
-          </button>
-          <button onClick={() => setStore("loadErrors", store.session, "ERR_CONNECTION_REFUSED")}>Failed page</button>
-          <button onClick={() => setStore("delayNavigation", true)}>Delay navigation</button>
-          <button onClick={() => setStore({ error: "ERR_BLOCKED_BY_CLIENT", pendingURL: undefined })}>
-            Block navigation
-          </button>
-          <button
-            onClick={() =>
-              setStore({
-                url: store.pendingURL,
-                pendingURL: undefined,
-                loading: false,
-                generation: store.generation + 1,
-              })
-            }
-          >
-            Complete navigation
-          </button>
-          <button onClick={() => setStore("visible", (visible) => !visible)}>Toggle Review tab</button>
-          <button onClick={() => setStore("holdCapture", true)}>Hold capture</button>
-          <button onClick={() => held.splice(0).forEach((resolve) => resolve())}>Release capture</button>
-          <button onClick={() => setStore("covered", (covered) => !covered)}>Toggle popover</button>
-          <button onClick={pick}>Pick element</button>
-        </nav>
-        <p>Captures: {store.captures}</p>
-        <p>Picker: {store.picker[store.session] ? "on" : "off"}</p>
-        <p>Highlights: {store.highlights.join(",")}</p>
-        <div style={{ position: "relative", width: "640px", height: "360px", border: "1px solid #555" }}>
-          <Show when={store.mounted}>
-            <SessionBrowserPane
-              browser={browser}
-              visible={store.visible}
-              onComment={(comment) => setStore("comments", (items) => [...items, comment])}
-            />
-          </Show>
-        </div>
-        <ul data-testid="fixture-comments">
-          <For each={store.comments}>
-            {(comment) => (
-              <li>
-                {comment.element.label} {comment.element.ref ? `@${comment.element.ref}` : "(no ref)"}:{" "}
-                {comment.comment}
-              </li>
-            )}
-          </For>
-        </ul>
-        <Show when={store.covered}>
-          {/* Floating content portals into <body> like a menu or hover card over the page. */}
-          <Portal mount={document.body}>
-            <div
-              data-popper-positioner
-              data-testid="fixture-popover"
-              style={{
-                position: "fixed",
-                top: "0",
-                left: "0",
-                width: "320px",
-                height: "480px",
-                "z-index": "1001",
-                "pointer-events": "none",
-              }}
-            />
-          </Portal>
-        </Show>
-        <h2 style={{ "font-size": "18px", margin: "20px 0 12px" }}>Native layout recorder</h2>
-        <p>The desktop boundary keeps each session's page visible until its registration is hidden.</p>
-        <For each={tabs}>
-          {(tab) => (
-            <div
-              data-testid={`native-${tab.title}`}
-              data-visible={!!store.layouts[tab.title]?.visible}
-              style={{ padding: "12px", margin: "8px 0", border: "1px solid #555" }}
-            >
-              {tab.title}: {store.layouts[tab.title]?.visible ? "visible" : "hidden"}
-            </div>
-          )}
-        </For>
-      </>
-    )
-  }
-
-  return render(
-    () => (
-      <LanguageProvider locale="en">
-        <UiI18nBridge>
-          <DialogProvider>
-            <Fixture />
-          </DialogProvider>
-        </UiI18nBridge>
-      </LanguageProvider>
-    ),
-    host,
-  )
-}

packages/app/component-tests/browser-pane.spec.ts

@@ -1,46 +1,49 @@
 import { fileURLToPath } from "node:url"
 import { expect, story } from "../../storybook/playwright/story"
 
-const fixture = `/@fs/${fileURLToPath(new URL("./browser-pane.fixture.tsx", import.meta.url)).replaceAll("\\", "/")}`
+const source = (path: string) => `/@fs/${fileURLToPath(new URL(path, import.meta.url)).replaceAll("\\", "/")}`
+const modules = {
+  fixture: source("../../gui-extensions/src/browser/panel.fixture.tsx"),
+  surface: source("../src/runtime/extension/surface.tsx"),
+  language: source("../src/runtime/i18n/language.tsx"),
+}
 
 story.beforeEach(async ({ mount, page }) => {
-  const component = await mount("opencode-composer-flow--mixed-attachments")
-  await expect(component.getByRole("textbox", { name: "Prompt", exact: true })).toBeVisible()
-  await page.evaluate(async (fixture) => {
-    const { mountBrowserPane } = await import(fixture)
-    mountBrowserPane()
-  }, fixture)
+  // Any story loads the app styles; the fixture mounts the pane beside it on the real host surface.
+  await mount("ui-line-comment--editor")
+  await page.evaluate(async (modules) => {
+    const [{ mountBrowserPane }, { createSurfaces }, language] = await Promise.all([
+      import(modules.fixture),
+      import(modules.surface),
+      import(modules.language),
+    ])
+    mountBrowserPane({
+      createSurfaces,
+      LanguageProvider: language.LanguageProvider,
+      UiI18nBridge: language.UiI18nBridge,
+      useLanguage: language.useLanguage,
+    })
+  }, modules)
   await expect(page.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
 })
-
-story("hides the previous registration when the mounted pane switches sessions", async ({ page }, testInfo) => {
+story("hides a native page when another takes the pane, the pane hides, or it unmounts", async ({ page }) => {
   const root = page.getByTestId("browser-pane-fixture")
+  const alpha = root.getByTestId("native-Alpha")
+  const beta = root.getByTestId("native-Beta")
   await root.getByRole("button", { name: "Beta", exact: true }).click()
-  await expect(root.getByTestId("native-Beta")).toHaveAttribute("data-visible", "true")
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
-  await page.screenshot({ path: testInfo.outputPath("session-switch.png") })
-  await root.getByRole("button", { name: "Alpha", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-  await expect(root.getByTestId("native-Beta")).toHaveAttribute("data-visible", "false")
-})
-
-story("hides the outgoing browser when the destination has no browser pane", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
+  await expect(beta).toHaveAttribute("data-visible", "true")
+  await expect(alpha).toHaveAttribute("data-visible", "false")
   await root.getByRole("button", { name: "Empty", exact: true }).click()
   await expect(root.locator("#browser-panel")).toHaveCount(0)
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
+  await expect(beta).toHaveAttribute("data-visible", "false")
   await root.getByRole("button", { name: "Alpha", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
-})
-
-story("hides and restores the same registration for Review tabs and unmount", async ({ page }) => {
-  const root = page.getByTestId("browser-pane-fixture")
+  await expect(alpha).toHaveAttribute("data-visible", "true")
   await root.getByRole("button", { name: "Toggle Review tab", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
+  await expect(alpha).toHaveAttribute("data-visible", "false")
   await root.getByRole("button", { name: "Toggle Review tab", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
+  await expect(alpha).toHaveAttribute("data-visible", "true")
   await root.getByRole("button", { name: "Unmount pane", exact: true }).click()
-  await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
+  await expect(alpha).toHaveAttribute("data-visible", "false")
 })
 
 story("hides the native view immediately while the pane stays mounted", async ({ page }) => {
@@ -58,7 +61,7 @@ story("hides the native view immediately while the pane stays mounted", async ({
   await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
 })
 
-story("keeps a still of the page under floating content that covers it", async ({ page }, testInfo) => {
+story("keeps a still of the page under floating content that covers it", async ({ page }) => {
   const root = page.getByTestId("browser-pane-fixture")
   const still = root.locator("#browser-panel img")
   await root.getByRole("button", { name: "Hold capture", exact: true }).click()
@@ -71,7 +74,6 @@ story("keeps a still of the page under floating content that covers it", async (
   await root.getByRole("button", { name: "Release capture", exact: true }).click()
   await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
   await expect(still).toBeVisible()
-  await page.screenshot({ path: testInfo.outputPath("covered.png") })
 
   await root.getByRole("button", { name: "Toggle popover", exact: true }).click()
   await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "true")
@@ -79,22 +81,26 @@ story("keeps a still of the page under floating content that covers it", async (
   await expect(root.getByText("Captures: 1", { exact: true })).toBeVisible()
 })
 
-story("comments on a picked element over a still of the page", async ({ page }, testInfo) => {
+story("comments on a picked element over a still of the page", async ({ page }) => {
   const root = page.getByTestId("browser-pane-fixture")
   const picker = root.getByRole("button", { name: "Select an element to comment on", exact: true })
   await picker.click()
   await expect(picker).toHaveAttribute("aria-pressed", "true")
   await expect(root.getByText("Picker: on", { exact: true })).toBeVisible()
+  await expect(root.getByRole("status")).toHaveText(
+    "Click an element in the page to comment on it. Press Escape to cancel.",
+  )
 
   await root.getByRole("button", { name: "Pick element", exact: true }).click()
   await expect(picker).toHaveAttribute("aria-pressed", "false")
   const editor = root.locator('[data-slot="browser-comment-editor"] textarea')
   await expect(editor).toBeFocused()
   await expect(root.locator('[data-slot="browser-comment-editor"]')).toContainText("button.primary")
+  // The spotlight frames the picked element in surface pixels.
+  await expect(root.locator('[data-slot="browser-comment-spotlight"]')).toHaveCSS("left", "48px")
   // The native page hides behind its still so the editor can float over it.
   await expect(root.getByTestId("native-Alpha")).toHaveAttribute("data-visible", "false")
   await expect(root.locator("#browser-panel img")).toBeVisible()
-  await page.screenshot({ path: testInfo.outputPath("comment.png") })
 
   await editor.fill("Make this the primary colour")
   await editor.press("Enter")
@@ -146,9 +152,14 @@ story("keeps the comment editor and its actions inside the page", async ({ page
   await editor.locator("textarea").evaluate((element) => {
     element.style.height = "900px"
   })
-  const surface = await root.locator('[data-component="browser-comment"]').boundingBox()
-  const box = await editor.boundingBox()
-  expect(surface && box && box.y + box.height <= surface.y + surface.height).toBe(true)
+  // The editor moves once it has measured its new height.
+  await expect
+    .poll(async () => {
+      const surface = await root.locator('[data-component="browser-comment"]').boundingBox()
+      const box = await editor.boundingBox()
+      return !!surface && !!box && box.y + box.height <= surface.y + surface.height
+    })
+    .toBe(true)
   const submit = editor.getByRole("button", { name: "Comment", exact: true })
   await submit.scrollIntoViewIfNeeded()
   await expect(submit).toBeInViewport()

packages/app/component-tests/extension-host.fixture.tsx

@@ -0,0 +1,62 @@
+import { DialogProvider } from "@opencode/ui/context/dialog"
+import type { Setup } from "@opencode/gui-extensions/sdk"
+import { createSignal } from "solid-js"
+import { render } from "solid-js/web"
+import { ExtensionHostProvider, useExtensionHost } from "../src/runtime/extension/host"
+import { LanguageProvider } from "../src/runtime/i18n/language"
+
+/** Mounts the real extension host with one extension whose every renderer load settles when the test says so. */
+export function mountExtensionHost() {
+  const loads: PromiseWithResolvers<{ default: Setup }>[] = []
+  const [disabled, setDisabled] = createSignal<ReadonlySet<string>>(new Set())
+  const state = { host: undefined as ReturnType<typeof useExtensionHost> | undefined }
+  const container = document.createElement("div")
+  document.body.appendChild(container)
+  function Capture() {
+    state.host = useExtensionHost()
+    return null
+  }
+  const dispose = render(
+    () => (
+      <LanguageProvider locale="en">
+        <DialogProvider>
+          <ExtensionHostProvider
+            definitions={[
+              {
+                id: "fixture",
+                renderer: () => {
+                  const load = Promise.withResolvers<{ default: Setup }>()
+                  loads.push(load)
+                  return load.promise
+                },
+              },
+            ]}
+            disabled={disabled}
+            services={[]}
+          >
+            <Capture />
+          </ExtensionHostProvider>
+        </DialogProvider>
+      </LanguageProvider>
+    ),
+    container,
+  )
+  return {
+    unmount: () => {
+      dispose()
+      container.remove()
+    },
+    /** Resolves the nth renderer load (the first by default) with this setup. */
+    load: (setup: Setup, index = 0) => loads[index].resolve({ default: setup }),
+    /** Rejects the nth renderer load. */
+    fail: (index: number, error: unknown) => loads[index].reject(error),
+    /** Renderer loads requested so far. */
+    count: () => loads.length,
+    reload: () => state.host?.reload("fixture"),
+    disable: () => setDisabled(new Set(["fixture"])),
+    enable: () => setDisabled(new Set<string>()),
+    status: () => state.host?.state.status.fixture,
+    /** Contributions the host holds for a point; readable after the host unmounts. */
+    entries: (point: string) => state.host?.state.entries[point]?.length ?? 0,
+  }
+}

packages/app/component-tests/extension-host.spec.ts

@@ -0,0 +1,139 @@
+import { fileURLToPath } from "node:url"
+import type { Context, Dialogs } from "@opencode/gui-extensions/sdk"
+import { expect, story } from "../../storybook/playwright/story"
+
+const fixture = `/@fs/${fileURLToPath(new URL("./extension-host.fixture.tsx", import.meta.url)).replaceAll("\\", "/")}`
+
+story.beforeEach(async ({ mount }) => {
+  // Any story loads the app; the fixture mounts the real host beside it.
+  await mount("ui-line-comment--editor")
+})
+
+story("an extension that finishes loading after the host unmounts is never set up", async ({ page }) => {
+  const setups = await page.evaluate(async (fixture) => {
+    const { mountExtensionHost } = await import(fixture)
+    const host = mountExtensionHost()
+    const state = { setups: 0 }
+    host.unmount()
+    host.load(() => void state.setups++)
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    return state.setups
+  }, fixture)
+  expect(setups).toBe(0)
+})
+
+story("an async setup that resolves after the host unmounts releases everything it registers", async ({ page }) => {
+  const result = await page.evaluate(async (fixture) => {
+    const { mountExtensionHost } = await import(fixture)
+    const host = mountExtensionHost()
+    const started = Promise.withResolvers<void>()
+    const resume = Promise.withResolvers<void>()
+    const cleaned: string[] = []
+    const point = { kind: "point" as const, id: "fixture-point" }
+    host.load(async (ctx: Context) => {
+      ctx.add(point, "before")
+      started.resolve()
+      await resume.promise
+      ctx.add(point, "after")
+      ctx.cleanup(() => void cleaned.push("registered"))
+      return () => void cleaned.push("returned")
+    })
+    await started.promise
+    const before = host.entries(point.id)
+    host.unmount()
+    resume.resolve()
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    return { before, after: host.entries(point.id), cleaned }
+  }, fixture)
+  expect(result).toEqual({ before: 1, after: 0, cleaned: ["registered", "returned"] })
+})
+
+story("older loads neither set up nor fail over the replacement after reloads", async ({ page }) => {
+  const result = await page.evaluate(async (fixture) => {
+    const { mountExtensionHost } = await import(fixture)
+    const host = mountExtensionHost()
+    const setups: string[] = []
+    host.reload()
+    host.reload()
+    host.load(() => void setups.push("first"), 0)
+    host.fail(1, new Error("second"))
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    host.load(() => void setups.push("third"), 2)
+    await new Promise((resolve) => setTimeout(resolve, 100))
+    const outcome = { setups, status: host.status() }
+    host.unmount()
+    return outcome
+  }, fixture)
+  expect(result).toEqual({ setups: ["third"], status: "active" })
+})
+
+story("a dialog service kept from before a reload opens and closes nothing under the replacement", async ({ page }) => {
+  const result = await page.evaluate(async (fixture) => {
+    const { mountExtensionHost } = await import(fixture)
+    const host = mountExtensionHost()
+    const services: Dialogs[] = []
+    const setup = (ctx: Context) => void services.push(ctx.use({ kind: "host" as const, id: "dialog" }) as Dialogs)
+    const text = (value: string) => () => Object.assign(document.createElement("p"), { textContent: value })
+    const shown = (value: string) => !!document.body.textContent?.includes(value)
+    const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+    host.load(setup, 0)
+    await wait(20)
+    host.reload()
+    host.load(setup, 1)
+    await wait(20)
+    const [stale, fresh] = services
+    stale.push(text("stale dialog"))
+    fresh.push(text("fresh dialog"))
+    await wait(50)
+    stale.close()
+    await wait(300)
+    const outcome = { stale: shown("stale dialog"), fresh: shown("fresh dialog") }
+    host.unmount()
+    return outcome
+  }, fixture)
+  expect(result).toEqual({ stale: false, fresh: true })
+})
+
+story("a dialog pushed in the same tick as a reload never mounts", async ({ page }) => {
+  const shown = await page.evaluate(async (fixture) => {
+    const { mountExtensionHost } = await import(fixture)
+    const host = mountExtensionHost()
+    const services: Dialogs[] = []
+    const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+    host.load((ctx: Context) => void services.push(ctx.use({ kind: "host" as const, id: "dialog" }) as Dialogs), 0)
+    await wait(20)
+    services[0].push(() => Object.assign(document.createElement("p"), { textContent: "same tick dialog" }))
+    host.reload()
+    await wait(300)
+    const outcome = !!document.body.textContent?.includes("same tick dialog")
+    host.unmount()
+    return outcome
+  }, fixture)
+  expect(shown).toBe(false)
+})
+
+story("an extension reloaded while disabled starts when it is enabled again", async ({ page }) => {
+  const result = await page.evaluate(async (fixture) => {
+    const { mountExtensionHost } = await import(fixture)
+    const host = mountExtensionHost()
+    const setups: string[] = []
+    const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+    host.load(() => void setups.push("first"), 0)
+    await wait(20)
+    host.disable()
+    await wait(20)
+    host.reload()
+    const afterReload = host.status()
+    // A load the reload started finishes while the extension is still disabled.
+    if (host.count() > 1) host.load(() => void setups.push("while disabled"), 1)
+    await wait(20)
+    host.enable()
+    await wait(20)
+    host.load(() => void setups.push("enabled"), host.count() - 1)
+    await wait(50)
+    const outcome = { afterReload, setups, status: host.status() }
+    host.unmount()
+    return outcome
+  }, fixture)
+  expect(result).toEqual({ afterReload: "disabled", setups: ["first", "enabled"], status: "active" })
+})

packages/app/create-effect-simplification-spec.md

@@ -1,515 +0,0 @@
-# CreateEffect Simplification Implementation Spec
-
-Reduce reactive misuse across `packages/app`.
-
----
-
-## Context
-
-This work targets `packages/app/src`, which currently has 101 `createEffect` calls across 37 files.
-
-The biggest clusters are `pages/session.tsx` (19), `pages/layout.tsx` (13), `pages/session/file-tabs.tsx` (6), and several context providers that mirror one store into another.
-
-Key issues from the audit:
-
-- Derived state is being written through effects instead of computed directly
-- Session and file resets are handled by watch-and-clear effects instead of keyed state boundaries
-- User-driven actions are hidden inside reactive effects
-- Context layers mirror and hydrate child stores with multiple sync effects
-- Several areas repeat the same imperative trigger pattern in multiple effects
-
-Keep the implementation focused on removing unnecessary effects, not on broad UI redesign.
-
-## Goals
-
-- Cut high-churn `createEffect` usage in the hottest files first
-- Replace effect-driven derived state with reactive derivation
-- Replace reset-on-key effects with keyed ownership boundaries
-- Move event-driven work to direct actions and write paths
-- Remove mirrored store hydration where a single source of truth can exist
-- Leave necessary external sync effects in place, but make them narrower and clearer
-
-## Non-Goals
-
-- Do not rewrite unrelated component structure just to reduce the count
-- Do not change product behavior, navigation flow, or persisted data shape unless required for a cleaner write boundary
-- Do not remove effects that bridge to DOM, editors, polling, or external APIs unless there is a clearly safer equivalent
-- Do not attempt a repo-wide cleanup outside `packages/app`
-
-## Effect Taxonomy And Replacement Rules
-
-Use these rules during implementation.
-
-### Prefer `createMemo`
-
-Use `createMemo` when the target value is pure derived state from other signals or stores.
-
-Do this when an effect only reads reactive inputs and writes another reactive value that could be computed instead.
-
-Apply this to:
-
-- `packages/app/src/pages/session.tsx:141`
-- `packages/app/src/pages/layout.tsx:557`
-- `packages/app/src/components/terminal.tsx:261`
-- `packages/app/src/components/session/session-header.tsx:309`
-
-Rules:
-
-- If no external system is touched, do not use `createEffect`
-- Derive once, then read the memo where needed
-- If normalization is required, prefer normalizing at the write boundary before falling back to a memo
-
-### Prefer Keyed Remounts
-
-Use keyed remounts when local UI state should reset because an identity changed.
-
-Do this with `sessionKey`, `scope()`, or another stable identity instead of watching the key and manually clearing signals.
-
-Apply this to:
-
-- `packages/app/src/pages/session.tsx:325`
-- `packages/app/src/pages/session.tsx:336`
-- `packages/app/src/pages/session.tsx:477`
-- `packages/app/src/pages/session.tsx:869`
-- `packages/app/src/pages/session.tsx:963`
-- `packages/app/src/pages/session/message-timeline.tsx:149`
-- `packages/app/src/context/file.tsx:100`
-
-Rules:
-
-- If the desired behavior is "new identity, fresh local state," key the owner subtree
-- Keep state local to the keyed boundary so teardown and recreation handle the reset naturally
-
-### Prefer Event Handlers And Actions
-
-Use direct handlers, store actions, and async command functions when work happens because a user clicked, selected, reloaded, or navigated.
-
-Do this when an effect is just watching for a flag change, command token, or event-bus signal to trigger imperative logic.
-
-Apply this to:
-
-- `packages/app/src/pages/layout.tsx:484`
-- `packages/app/src/pages/layout.tsx:652`
-- `packages/app/src/pages/layout.tsx:776`
-- `packages/app/src/pages/layout.tsx:1489`
-- `packages/app/src/pages/layout.tsx:1519`
-- `packages/app/src/components/file-tree.tsx:328`
-- `packages/app/src/pages/session/terminal-panel.tsx:55`
-- `packages/app/src/context/global-sync.tsx:148`
-- Duplicated trigger sets in:
-  - `packages/app/src/pages/session/review-tab.tsx:122`
-  - `packages/app/src/pages/session/review-tab.tsx:130`
-  - `packages/app/src/pages/session/review-tab.tsx:138`
-  - `packages/app/src/pages/session/file-tabs.tsx:367`
-  - `packages/app/src/pages/session/file-tabs.tsx:378`
-  - `packages/app/src/pages/session/file-tabs.tsx:389`
-  - `packages/app/src/pages/session/use-session-hash-scroll.ts:144`
-  - `packages/app/src/pages/session/use-session-hash-scroll.ts:149`
-  - `packages/app/src/pages/session/use-session-hash-scroll.ts:167`
-
-Rules:
-
-- If the trigger is user intent, call the action at the source of that intent
-- If the same imperative work is triggered from multiple places, extract one function and call it directly
-
-### Prefer `onMount` And `onCleanup`
-
-Use `onMount` and `onCleanup` for lifecycle-only setup and teardown.
-
-This is the right fit for subscriptions, one-time wiring, timers, and imperative integration that should not rerun for ordinary reactive changes.
-
-Use this when:
-
-- Setup should happen once per owner lifecycle
-- Cleanup should always pair with teardown
-- The work is not conceptually derived state
-
-### Keep `createEffect` When It Is A Real Bridge
-
-Keep `createEffect` when it synchronizes reactive data to an external imperative sink.
-
-Examples that should remain, though they may be narrowed or split:
-
-- DOM/editor sync in `packages/app/src/components/prompt-input.tsx:690`
-- Scroll sync in `packages/app/src/pages/session.tsx:685`
-- Scroll/hash sync in `packages/app/src/pages/session/use-session-hash-scroll.ts:149`
-- External sync in:
-  - `packages/app/src/context/language.tsx:207`
-  - `packages/app/src/context/settings.tsx:110`
-  - `packages/app/src/context/sdk.tsx:26`
-- Polling in:
-  - `packages/app/src/components/status-popover.tsx:59`
-  - `packages/app/src/components/dialog-select-server.tsx:273`
-
-Rules:
-
-- Keep the effect single-purpose
-- Make dependencies explicit and narrow
-- Avoid writing back into the same reactive graph unless absolutely required
-
-## Implementation Plan
-
-### Phase 0: Classification Pass
-
-Before changing code, tag each targeted effect as one of: derive, reset, event, lifecycle, or external bridge.
-
-Acceptance criteria:
-
-- Every targeted effect in this spec is tagged with a replacement strategy before refactoring starts
-- Shared helpers to be introduced are identified up front to avoid repeating patterns
-
-### Phase 1: Derived-State Cleanup
-
-Tackle highest-value, lowest-risk derived-state cleanup first.
-
-Priority items:
-
-- Normalize tabs at write boundaries and remove `packages/app/src/pages/session.tsx:141`
-- Stop syncing `workspaceOrder` in `packages/app/src/pages/layout.tsx:557`
-- Make prompt slash filtering reactive so `packages/app/src/components/prompt-input.tsx:652` can be removed
-- Replace other obvious derived-state effects in terminal and session header
-
-Acceptance criteria:
-
-- No behavior change in tab ordering, prompt filtering, terminal display, or header state
-- Targeted derived-state effects are deleted, not just moved
-
-### Phase 2: Keyed Reset Cleanup
-
-Replace reset-on-key effects with keyed ownership boundaries.
-
-Priority items:
-
-- Key session-scoped UI and state by `sessionKey`
-- Key file-scoped state by `scope()`
-- Remove manual clear-and-reseed effects in session and file context
-
-Acceptance criteria:
-
-- Switching session or file scope recreates the intended local state cleanly
-- No stale state leaks across session or scope changes
-- Target reset effects are deleted
-
-### Phase 3: Event-Driven Work Extraction
-
-Move event-driven work out of reactive effects.
-
-Priority items:
-
-- Replace `globalStore.reload` effect dispatching with direct calls
-- Split mixed-responsibility effect in `packages/app/src/pages/layout.tsx:1489`
-- Collapse duplicated imperative trigger triplets into single functions
-- Move file-tree and terminal-panel imperative work to explicit handlers
-
-Acceptance criteria:
-
-- User-triggered behavior still fires exactly once per intended action
-- No effect remains whose only job is to notice a command-like state and trigger an imperative function
-
-### Phase 4: Context Ownership Cleanup
-
-Remove mirrored child-store hydration patterns.
-
-Priority items:
-
-- Remove child-store hydration mirrors in `packages/app/src/context/global-sync/child-store.ts:184`, `:190`, `:193`
-- Simplify mirror logic in `packages/app/src/context/global-sync.tsx:130`, `:138`
-- Revisit `packages/app/src/context/layout.tsx:424` if it still mirrors instead of deriving
-
-Acceptance criteria:
-
-- There is one clear source of truth for each synced value
-- Child stores no longer need effect-based hydration to stay consistent
-- Initialization and updates both work without manual mirror effects
-
-### Phase 5: Cleanup And Keeper Review
-
-Clean up remaining targeted hotspots and narrow the effects that should stay.
-
-Acceptance criteria:
-
-- Remaining `createEffect` calls in touched files are all true bridges or clearly justified lifecycle sync
-- Mixed-responsibility effects are split into smaller units where still needed
-
-## Detailed Work Items By Area
-
-### 1. Normalize Tab State
-
-Files:
-
-- `packages/app/src/pages/session.tsx:141`
-
-Work:
-
-- Move tab normalization into the functions that create, load, or update tab state
-- Make readers consume already-normalized tab data
-- Remove the effect that rewrites derived tab state after the fact
-
-Rationale:
-
-- Tabs should become valid when written, not be repaired later
-- This removes a feedback loop and makes state easier to trust
-
-Acceptance criteria:
-
-- The effect at `packages/app/src/pages/session.tsx:141` is removed
-- Newly created and restored tabs are normalized before they enter local state
-- Tab rendering still matches current behavior for valid and edge-case inputs
-
-### 2. Key Session-Owned State
-
-Files:
-
-- `packages/app/src/pages/session.tsx:325`
-- `packages/app/src/pages/session.tsx:336`
-- `packages/app/src/pages/session.tsx:477`
-- `packages/app/src/pages/session.tsx:869`
-- `packages/app/src/pages/session.tsx:963`
-- `packages/app/src/pages/session/message-timeline.tsx:149`
-
-Work:
-
-- Identify state that should reset when `sessionKey` changes
-- Move that state under a keyed subtree or keyed owner boundary
-- Remove effects that watch `sessionKey` just to clear local state, refs, or temporary UI flags
-
-Rationale:
-
-- Session identity already defines the lifetime of this UI state
-- Keyed ownership makes reset behavior automatic and easier to reason about
-
-Acceptance criteria:
-
-- The targeted reset effects are removed
-- Changing sessions resets only the intended session-local state
-- Scroll and editor state that should persist are not accidentally reset
-
-### 3. Derive Workspace Order
-
-Files:
-
-- `packages/app/src/pages/layout.tsx:557`
-
-Work:
-
-- Stop writing `workspaceOrder` from live workspace data in an effect
-- Represent user overrides separately from live workspace data
-- Compute effective order from current data plus overrides with a memo or pure helper
-
-Rationale:
-
-- Persisted user intent and live source data should not mirror each other through an effect
-- A computed effective order avoids drift and racey resync behavior
-
-Acceptance criteria:
-
-- The effect at `packages/app/src/pages/layout.tsx:557` is removed
-- Workspace order updates correctly when workspaces appear, disappear, or are reordered by the user
-- User overrides persist without requiring a sync-back effect
-
-### 4. Remove Child-Store Mirrors
-
-Files:
-
-- `packages/app/src/context/global-sync.tsx:130`
-- `packages/app/src/context/global-sync.tsx:138`
-- `packages/app/src/context/global-sync.tsx:148`
-- `packages/app/src/context/global-sync/child-store.ts:184`
-- `packages/app/src/context/global-sync/child-store.ts:190`
-- `packages/app/src/context/global-sync/child-store.ts:193`
-- `packages/app/src/context/layout.tsx:424`
-
-Work:
-
-- Trace the actual ownership of global and child store values
-- Replace hydration and mirror effects with explicit initialization and direct updates
-- Remove the `globalStore.reload` event-bus pattern and call the needed reload paths directly
-
-Rationale:
-
-- Mirrors make it hard to tell which state is authoritative
-- Event-bus style state toggles hide control flow and create accidental reruns
-
-Acceptance criteria:
-
-- Child store hydration no longer depends on effect-based copying
-- Reload work can be followed from the event source to the handler without a reactive relay
-- State remains correct on first load, child creation, and subsequent updates
-
-### 5. Key File-Scoped State
-
-Files:
-
-- `packages/app/src/context/file.tsx:100`
-
-Work:
-
-- Move file-scoped local state under a boundary keyed by `scope()`
-- Remove any effect that watches `scope()` only to reset file-local state
-
-Rationale:
-
-- File scope changes are identity changes
-- Keyed ownership gives a cleaner reset than manual clear logic
-
-Acceptance criteria:
-
-- The effect at `packages/app/src/context/file.tsx:100` is removed
-- Switching scopes resets only scope-local state
-- No previous-scope data appears after a scope change
-
-### 6. Split Layout Side Effects
-
-Files:
-
-- `packages/app/src/pages/layout.tsx:1489`
-- Related event-driven effects near `packages/app/src/pages/layout.tsx:484`, `:652`, `:776`, `:1519`
-
-Work:
-
-- Break the mixed-responsibility effect at `:1489` into direct actions and smaller bridge effects only where required
-- Move user-triggered branches into the actual command or handler that causes them
-- Remove any branch that only exists because one effect is handling unrelated concerns
-
-Rationale:
-
-- Mixed effects hide cause and make reruns hard to predict
-- Smaller units reduce accidental coupling and make future cleanup safer
-
-Acceptance criteria:
-
-- The effect at `packages/app/src/pages/layout.tsx:1489` no longer mixes unrelated responsibilities
-- Event-driven branches execute from direct handlers
-- Remaining effects in this area each have one clear external sync purpose
-
-### 7. Remove Duplicate Triggers
-
-Files:
-
-- `packages/app/src/pages/session/review-tab.tsx:122`
-- `packages/app/src/pages/session/review-tab.tsx:130`
-- `packages/app/src/pages/session/review-tab.tsx:138`
-- `packages/app/src/pages/session/file-tabs.tsx:367`
-- `packages/app/src/pages/session/file-tabs.tsx:378`
-- `packages/app/src/pages/session/file-tabs.tsx:389`
-- `packages/app/src/pages/session/use-session-hash-scroll.ts:144`
-- `packages/app/src/pages/session/use-session-hash-scroll.ts:149`
-- `packages/app/src/pages/session/use-session-hash-scroll.ts:167`
-
-Work:
-
-- Extract one explicit imperative function per behavior
-- Call that function from each source event instead of replicating the same effect pattern multiple times
-- Preserve the scroll-sync effect that is truly syncing with the DOM, but remove duplicate trigger scaffolding around it
-
-Rationale:
-
-- Duplicate triggers make it easy to miss a case or fire twice
-- One named action is easier to test and reason about
-
-Acceptance criteria:
-
-- Repeated imperative effect triplets are collapsed into shared functions
-- Scroll behavior still works, including hash-based navigation
-- No duplicate firing is introduced
-
-### 8. Make Prompt Filtering Reactive
-
-Files:
-
-- `packages/app/src/components/prompt-input.tsx:652`
-- Keep `packages/app/src/components/prompt-input.tsx:690` as needed
-
-Work:
-
-- Convert slash filtering into a pure reactive derivation from the current input and candidate command list
-- Keep only the editor or DOM bridge effect if it is still needed for imperative syncing
-
-Rationale:
-
-- Filtering is classic derived state
-- It should not need an effect if it can be computed from current inputs
-
-Acceptance criteria:
-
-- The effect at `packages/app/src/components/prompt-input.tsx:652` is removed
-- Filtered slash-command results update correctly as the input changes
-- The editor sync effect at `:690` still behaves correctly
-
-### 9. Clean Up Smaller Derived-State Cases
-
-Files:
-
-- `packages/app/src/components/terminal.tsx:261`
-- `packages/app/src/components/session/session-header.tsx:309`
-
-Work:
-
-- Replace effect-written local state with memos or inline derivation
-- Remove intermediate setters when the value can be computed directly
-
-Rationale:
-
-- These are low-risk wins that reinforce the same pattern
-- They also help keep follow-up cleanup consistent
-
-Acceptance criteria:
-
-- Targeted effects are removed
-- UI output remains unchanged under the same inputs
-
-## Verification And Regression Checks
-
-Run focused checks after each phase, not only at the end.
-
-### Suggested Verification
-
-- Switch between sessions rapidly and confirm local session UI resets only where intended
-- Open, close, and reorder tabs and confirm order and normalization remain stable
-- Change workspaces, reload workspace data, and verify effective ordering is correct
-- Change file scope and confirm stale file state does not bleed across scopes
-- Trigger layout actions that previously depended on effects and confirm they still fire once
-- Use slash commands in the prompt and verify filtering updates as you type
-- Test review tab, file tab, and hash-scroll flows for duplicate or missing triggers
-- Verify global sync initialization, reload, and child-store creation paths
-
-### Regression Checks
-
-- No accidental infinite reruns
-- No double-firing network or command actions
-- No lost cleanup for listeners, timers, or scroll handlers
-- No preserved stale state after identity changes
-- No removed effect that was actually bridging to DOM or an external API
-
-If available, add or update tests around pure helpers introduced during this cleanup.
-
-Favor tests for derived ordering, normalization, and action extraction, since those are easiest to lock down.
-
-## Definition Of Done
-
-This work is done when all of the following are true:
-
-- The highest-leverage targets in this spec are implemented
-- Each removed effect has been replaced by a clearer pattern: memo, keyed boundary, direct action, or lifecycle hook
-- The "should remain" effects still exist only where they serve a real external sync purpose
-- Touched files have fewer mixed-responsibility effects and clearer ownership of state
-- Manual verification covers session switching, file scope changes, workspace ordering, prompt filtering, and reload flows
-- No behavior regressions are found in the targeted areas
-
-A reduced raw `createEffect` count is helpful, but it is not the main success metric.
-
-The main success metric is clearer ownership and fewer effect-driven state repairs.
-
-## Risks And Rollout Notes
-
-Main risks:
-
-- Keyed remounts can reset too much if state boundaries are drawn too high
-- Store mirror removal can break initialization order if ownership is not mapped first
-- Moving event work out of effects can accidentally skip triggers that were previously implicit
-
-Rollout notes:
-
-- Land in small phases, with each phase keeping the app behaviorally stable
-- Prefer isolated PRs by phase or by file cluster, especially for context-store changes
-- Review each remaining effect in touched files and leave it only if it clearly bridges to something external

packages/app/e2e/AGENTS.md

@@ -14,3 +14,11 @@
 - Do not retry state-changing actions. Retry idempotent readiness checks, then perform the action once and assert its outcome.
 - Keep action and assertion timeouts adaptive. Do not use short timeouts as readiness probes or rely on retries to hide flakes.
 - Assert exact outcomes and identities so stale state, duplicate rendering, and interactions with the wrong element cannot pass.
+
+## Test Ownership
+
+- Each product area has one keeper suite in `regression/` (for example tabs, settings, review, terminal, timeline history). A new regression is a new case in that suite, not a new spec file.
+- Build pages with the shared harness in `utils/` (`app.ts`, `workspace.ts`, `mock-server.ts` with `mockServers` and the mock PTY). Do not hand-write routing, storage seeding, or fixtures inside a spec. If the harness lacks something, add it to `utils/` once rather than copying setup.
+- Files in `utils/` must not end in `.spec.ts` or `.test.ts`, or Playwright runs them as tests.
+- Assert what the user sees and can do. Assert exact pixels or CSS values only when that measurement is the contract, and then only once, in the owning keeper.
+- `performance/` holds benchmarks that CI does not run. Never prove correctness with a benchmark, and never copy benchmark code into a regression spec; import it from `utils/`.

packages/app/e2e/performance/markdown/lifetime.bench.ts

@@ -1,8 +1,8 @@
 import type { SessionMessageInfo } from "@opencode/client/promise"
 import { benchmark, expect } from "../benchmark"
 import { mockOpenCodeServer } from "../../utils/mock-server"
-import { fixture } from "../timeline/session-timeline-stress.fixture"
-import { installStressSessionTabs, installTimelineSettings, stressSessionHref } from "../timeline/timeline-test-helpers"
+import { fixture, installStressSessionTabs, installTimelineSettings } from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
 import { completedAnswer } from "../../../../session-ui/performance/markdown-lifetime/answer"
 import { installMarkdownGate } from "./probe"
 
@@ -54,22 +54,22 @@ for (const size of ["typical", "large"]) {
     await installStressSessionTabs(page)
     const targetPart = `msg_2_${fixture.targetID}_assistant:text:0`
     const sourcePart = `msg_2_${fixture.sourceID}_assistant:text:0`
-    await installMarkdownGate(page, { answer, targetPart, sourcePart, href: stressSessionHref(fixture.sourceID) })
+    await installMarkdownGate(page, { answer, targetPart, sourcePart, href: sessionHref(fixture.sourceID) })
     const prefetched = page.waitForResponse((response) =>
       new URL(response.url()).pathname.endsWith(`/session/${fixture.targetID}/message`),
     )
-    await page.goto(stressSessionHref(fixture.sourceID))
+    await page.goto(sessionHref(fixture.sourceID))
     await prefetched
     const source = page.locator(`[data-timeline-part-id="${sourcePart}"] [data-component="markdown"]`)
     await expect(source).toHaveAttribute("data-markdown-ready", "")
-    await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(fixture.targetID)}"]`).click()
+    await page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(fixture.targetID)}"]`).click()
     await page.waitForFunction(() => window.markdownGate.held)
     await expect(page.locator(`[data-timeline-part-id="${targetPart}"]`)).toBeAttached()
     const cdp = await page.context().newCDPSession(page)
     await cdp.send("Performance.enable")
     const before = await cdp.send("Performance.getMetrics")
     await page.evaluate(() => window.markdownGate.arm())
-    await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(fixture.sourceID)}"]`).click()
+    await page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(fixture.sourceID)}"]`).click()
     await expect(source).toHaveAttribute("data-markdown-ready", "")
     await expect(source.getByRole("heading", { name: "Current destination" })).toBeVisible()
     await expect(page.locator(`[data-timeline-part-id="${targetPart}"]`)).toHaveCount(0)

packages/app/e2e/performance/tab-switch-server.ts

@@ -1,8 +1,8 @@
 import path from "node:path"
 import { parseArgs } from "node:util"
 import { createMockServerHandler } from "../utils/mock-server"
-import { fixture } from "./timeline/session-timeline-stress.fixture"
-import { messages } from "./timeline/session-tab-switch.fixture"
+import { fixture } from "../utils/session-fixture"
+import { messages } from "../utils/markdown-sessions"
 import { createReviewDiffs } from "./timeline/timeline-test-helpers"
 
 const args = parseArgs({

packages/app/e2e/performance/terminals/probe.ts

@@ -1,5 +1,5 @@
 import { Terminal } from "ghostty-web"
-import { SerializeAddon } from "../../../src/session/terminal/serialize"
+import { SerializeAddon } from "../../../../gui-extensions/src/terminal/serialize"
 
 export type TerminalProbe = {
   term?: Terminal

packages/app/e2e/performance/timeline-stability/adverse.spec.ts

@@ -17,7 +17,7 @@ import {
   userMessage,
   waitForVisualSettle,
   type TimelineMessage,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test.describe("timeline adverse visual stability", () => {
   test("does not pull a scrolled-away user while an active shell grows", async ({ page }, testInfo) => {

packages/app/e2e/performance/timeline-stability/environment-matrix.spec.ts

@@ -15,7 +15,7 @@ import {
   textPart,
   userMessage,
   waitForVisualSettle,
-} from "./fixture"
+} from "../../utils/timeline"
 
 // Fractional scaling exercises different browser rounding than the baseline.
 for (const deviceScaleFactor of [1, 1.25]) {

packages/app/e2e/performance/timeline-stability/file-matrix.spec.ts

@@ -16,7 +16,7 @@ import {
   toolPart,
   userMessage,
   waitForVisualSettle,
-} from "./fixture"
+} from "../../utils/timeline"
 
 const profiles = [
   {

packages/app/e2e/performance/timeline-stability/file-mutation.spec.ts

@@ -16,7 +16,7 @@ import {
   toolPart,
   userMessage,
   waitForVisualSettle,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test("adds patch files incrementally without resetting outer expansion", async ({ page }, testInfo) => {
   const patchID = "prt_incremental_01_patch"

packages/app/e2e/performance/timeline-stability/fixture.test.ts

@@ -7,7 +7,7 @@ import {
   validateTimelineEvent,
   validateTimelineMessages,
   type PartSeed,
-} from "./fixture"
+} from "../../utils/timeline"
 
 describe("timeline fixture validation", () => {
   test("accepts a valid timeline", () => {

packages/app/e2e/performance/timeline-stability/interaction.spec.ts

@@ -16,7 +16,7 @@ import {
   toolPart,
   userMessage,
   waitForVisualSettle,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test("expands and collapses a long completed shell without overlap", async ({ page }, testInfo) => {
   const shellID = "prt_interaction_01_shell"

packages/app/e2e/performance/timeline-stability/lifecycle.spec.ts

@@ -21,7 +21,7 @@ import {
   textPart,
   userMessage,
   waitForVisualSettle,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test.describe("timeline visual lifecycle stability", () => {
   test("streams empty, short, and long parallel shells to staggered completion", async ({ page }, testInfo) => {

packages/app/e2e/performance/timeline-stability/oracle-browser.spec.ts

@@ -6,7 +6,7 @@ import {
   stopVisualProbe,
   visualPlan,
 } from "../../utils/visual-stability"
-import { assistantMessage, renderedPartID, setupTimeline, textPart, userMessage } from "./fixture"
+import { assistantMessage, renderedPartID, setupTimeline, textPart, userMessage } from "../../utils/timeline"
 
 test("detects blanking caused by ancestor opacity", async ({ page }) => {
   const partID = "prt_oracle_ancestor_opacity"

packages/app/e2e/performance/timeline-stability/scroll-interaction.spec.ts

@@ -17,7 +17,7 @@ import {
   toolPart,
   userMessage,
   type TimelineMessage,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test("follows an expanded patch that arrives as the user reaches the bottom", async ({ page }) => {
   const toolID = "prt_bottom_follow_patch"

packages/app/e2e/performance/timeline-stability/shell-matrix.spec.ts

@@ -15,7 +15,7 @@ import {
   textPart,
   userMessage,
   waitForVisualSettle,
-} from "./fixture"
+} from "../../utils/timeline"
 
 const profiles = [
   {

packages/app/e2e/performance/timeline-stability/tool-mutation.spec.ts

@@ -15,7 +15,7 @@ import {
   setupTimeline,
   toolPart,
   userMessage,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test("adds a subagent child-session link without replacing the row", async ({ page }, testInfo) => {
   const taskID = "prt_subagent_link"

packages/app/e2e/performance/timeline-stability/tools.spec.ts

@@ -18,7 +18,7 @@ import {
   textPart,
   toolPart,
   userMessage,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test.describe("timeline tool state stability", () => {
   test("moves lightweight tools through streaming, running, and completed without replacing rows", async ({

packages/app/e2e/performance/timeline-stability/transition-matrix.spec.ts

@@ -20,7 +20,7 @@ import {
   textPart,
   toolPart,
   userMessage,
-} from "./fixture"
+} from "../../utils/timeline"
 
 test("streams text through growth, canonical replacement, and completion", async ({ page }, testInfo) => {
   const textID = "prt_text_reconcile"

packages/app/e2e/performance/timeline/composer-write-batch-benchmark.spec.ts

@@ -2,7 +2,7 @@ import { base64Encode } from "@opencode/util/encode"
 import { benchmark, benchmarkDiagnostics, expect } from "../benchmark"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectSessionTitle } from "../../utils/waits"
-import { fixture } from "./session-timeline-stress.fixture"
+import { fixture } from "../../utils/session-fixture"
 
 const sessionID = "ses_composer_write_batch"
 const title = "Composer persistence workload"

packages/app/e2e/performance/timeline/first-navigation-benchmark.spec.ts

@@ -1,14 +1,13 @@
 import { expectSessionTitle } from "../../utils/waits"
 import { benchmark, expect } from "../benchmark"
 import { measureFirstNavigation } from "./first-navigation-probe"
-import { fixture } from "./session-timeline-stress.fixture"
 import {
+  fixture,
   installStressSessionTabs,
   installTimelineSettings,
   mockStressTimeline,
-  stressDraftHref,
-  stressSessionHref,
-} from "./timeline-test-helpers"
+} from "../../utils/session-fixture"
+import { draftHref, sessionHref } from "../../utils/app"
 import { waitForStableTimeline } from "./session-tab-switch-probe"
 
 const contentSelector = '[data-message-id], [data-component="composer-editor"]'
@@ -17,7 +16,7 @@ const draftID = "draft_first_navigation"
 benchmark.describe("performance: first navigation paint", () => {
   benchmark("opens an unvisited session tab without a blank frame", async ({ page, report }) => {
     await setup(page)
-    const href = stressSessionHref(fixture.targetID)
+    const href = sessionHref(fixture.targetID)
     const result = await measureFirstNavigation(page, {
       href,
       destinationPath: href,
@@ -36,7 +35,7 @@ benchmark.describe("performance: first navigation paint", () => {
 
   benchmark("opens the new session page before its lazy module is used", async ({ page, report }) => {
     await setup(page, draftID)
-    const href = stressDraftHref(draftID)
+    const href = draftHref(draftID)
     const result = await measureFirstNavigation(page, {
       href,
       destinationPath: href,
@@ -59,13 +58,13 @@ benchmark.describe("performance: first navigation paint", () => {
     await installStressSessionTabs(page, { draftID })
     await page.goto("/")
 
-    const draftHref = stressDraftHref(draftID)
-    const draftTab = page.locator(`[data-slot="titlebar-tabs"] a[href="${draftHref}"]`)
+    const draftLink = draftHref(draftID)
+    const draftTab = page.locator(`[data-slot="titlebar-tabs"] a[href="${draftLink}"]`)
     await expect(draftTab).toHaveCount(1)
     await draftTab.click()
     await expect(page.locator('[data-component="new-session"]')).toBeVisible()
 
-    const href = stressSessionHref(fixture.targetID)
+    const href = sessionHref(fixture.targetID)
     const sessionTab = page.locator(`[data-slot="titlebar-tabs"] a[href="${href}"]`)
     await expect(sessionTab).toHaveCount(1)
     const result = await measureFirstNavigation(page, {
@@ -86,7 +85,7 @@ benchmark.describe("performance: first navigation paint", () => {
 
   benchmark("opens a child session without a blank frame", async ({ page, report }) => {
     await setup(page)
-    const href = stressSessionHref(fixture.childID)
+    const href = sessionHref(fixture.childID)
     const result = await measureFirstNavigation(page, {
       href,
       destinationPath: href,
@@ -108,7 +107,7 @@ async function setup(page: Parameters<typeof mockStressTimeline>[0], draft?: str
   await mockStressTimeline(page)
   await installTimelineSettings(page)
   await installStressSessionTabs(page, draft ? { draftID: draft } : undefined)
-  await page.goto(stressSessionHref(fixture.sourceID))
+  await page.goto(sessionHref(fixture.sourceID))
   await expectSessionTitle(page, fixture.expected.sourceTitle)
   await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
 }

packages/app/e2e/performance/timeline/home-session-index-benchmark.spec.ts

@@ -2,7 +2,8 @@ import type { CDPSession, Page } from "@playwright/test"
 import { benchmark, expect } from "../benchmark"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { APP_READY_TIMEOUT } from "../../utils/waits"
-import { fixture as stress } from "./session-timeline-stress.fixture"
+import { SERVER } from "../../utils/app"
+import { fixture as stress } from "../../utils/session-fixture"
 import { createHomeIndexFixture, type HomeIndexFixture } from "./home-session-index.fixture"
 
 // Home fetches the root-session index on mount. These cases hold the visible
@@ -28,7 +29,7 @@ type Probe = {
 
 type ProbeWindow = Window & {
   __homeIndexProbe?: Probe
-  __mockServerStream?: { push: (payloads: unknown[]) => void }
+  __mockServerStreams?: Record<string, { push: (payloads: unknown[]) => void }>
 }
 
 // Interaction-scoped tracing keeps the page-lifetime Chrome trace off unless a
@@ -137,11 +138,12 @@ benchmark.describe("performance: home session index", () => {
         target.time.updated += 1000
         target.time.idle = target.time.updated
         const pushed = await page.evaluate(
-          ({ id, title, event }) => {
+          ({ id, title, event, server }) => {
             const host = window as ProbeWindow
-            if (!host.__homeIndexProbe || !host.__mockServerStream) throw new Error("Missing Home index probe")
+            const stream = host.__mockServerStreams?.[server]
+            if (!host.__homeIndexProbe || !stream) throw new Error("Missing Home index probe")
             host.__homeIndexProbe.pending[id] = title
-            host.__mockServerStream.push([event])
+            stream.push([event])
             return performance.now()
           },
           {
@@ -153,6 +155,7 @@ benchmark.describe("performance: home session index", () => {
               type: "session.execution.succeeded",
               data: { sessionID: target.id },
             },
+            server: SERVER,
           },
         )
         await expect(titleLocator).toHaveText(title)

packages/app/e2e/performance/timeline/home-tab-navigation-benchmark.spec.ts

@@ -1,13 +1,13 @@
 import { benchmark, expect } from "../benchmark"
 import { expectSessionTitle } from "../../utils/waits"
 import { measureNavigationMilestones } from "./navigation-milestones"
-import { fixture } from "./session-timeline-stress.fixture"
 import {
+  fixture,
   installStressSessionTabs,
   installTimelineSettings,
   mockStressTimeline,
-  stressSessionHref,
-} from "./timeline-test-helpers"
+} from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
 import { waitForStableTimeline } from "./session-tab-switch-probe"
 
 const homeRow = '[data-component="home-session-row"]'
@@ -19,7 +19,7 @@ benchmark.describe("performance: home and tab navigation", () => {
     await page.goto("/")
     const row = page.locator(homeRow).filter({ hasText: fixture.expected.targetTitle }).first()
     await expect(row).toBeVisible()
-    const href = stressSessionHref(fixture.targetID)
+    const href = sessionHref(fixture.targetID)
     const result = await measureNavigationMilestones(page, {
       triggerSelector: homeRow,
       milestones: {
@@ -80,7 +80,7 @@ benchmark.describe("performance: home and tab navigation", () => {
 
   benchmark("closes the only session tab and paints home", async ({ page, report }) => {
     await setup(page, [fixture.sourceID])
-    const href = stressSessionHref(fixture.sourceID)
+    const href = sessionHref(fixture.sourceID)
     await page.goto(href)
     await expectSessionTitle(page, fixture.expected.sourceTitle)
     await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)

packages/app/e2e/performance/timeline/inactive-tab-prefetch-benchmark.spec.ts

@@ -1,9 +1,9 @@
 import { benchmark, expect } from "../benchmark"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectSessionTitle } from "../../utils/waits"
-import { fixture } from "./session-timeline-stress.fixture"
-import { messages } from "./session-tab-switch.fixture"
-import { installStressSessionTabs, stressSessionHref } from "./timeline-test-helpers"
+import { fixture, installStressSessionTabs } from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
+import { messages } from "../../utils/markdown-sessions"
 import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"
 
 const sessions = Array.from({ length: 8 }, (_, index) => ({
@@ -87,7 +87,7 @@ for (const close of [false, true]) {
       await installStressSessionTabs(page, { sessionIDs: sessions.map((session) => session.id) })
       const cdp = await page.context().newCDPSession(page)
       await cdp.send("Performance.enable")
-      await page.goto(stressSessionHref(sessions[0].id))
+      await page.goto(sessionHref(sessions[0].id))
       await expectSessionTitle(page, sessions[0].title)
       await waitForStableTimeline(page, pages[sessions[0].id].at(-2)!.id)
       // Every inactive tab's scheduled attention request must finish. This gates on the
@@ -102,7 +102,7 @@ for (const close of [false, true]) {
       if (close) {
         const tab = page
           .locator("[data-titlebar-tab-slot]")
-          .filter({ has: page.locator(`a[href="${stressSessionHref(closed.id)}"]`) })
+          .filter({ has: page.locator(`a[href="${sessionHref(closed.id)}"]`) })
         await tab.getByRole("button", { name: "Close tab", exact: true }).click()
         await expect(tab).toHaveCount(0)
       }
@@ -126,9 +126,9 @@ for (const close of [false, true]) {
         sourceIDs: pages[sessions[0].id].map((message) => message.id),
         lastID: pages[target.id].at(-2)!.id,
         requiredPartID: `${pages[target.id].at(-1)!.id}:text:0`,
-        href: stressSessionHref(target.id),
+        href: sessionHref(target.id),
         switch: async () => {
-          await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(target.id)}"]`).click()
+          await page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(target.id)}"]`).click()
           await expectSessionTitle(page, target.title)
         },
       })

packages/app/e2e/performance/timeline/laggy-session-benchmark.spec.ts

@@ -6,7 +6,7 @@ import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectSessionTitle } from "../../utils/waits"
 import { benchmark, expect } from "../benchmark"
 import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"
-import { stressSessionHref } from "./timeline-test-helpers"
+import { sessionHref } from "../../utils/app"
 import { startChromeTrace } from "../chrome-trace"
 
 const file = process.env.LAGGY_SESSION_FILE
@@ -130,7 +130,7 @@ for (const mode of ["compact", "ungrouped"] as const) {
         dirBase64: base64Encode(directory),
       },
     )
-    await page.goto(stressSessionHref(sourceID))
+    await page.goto(sessionHref(sourceID))
     await expectSessionTitle(page, "Benchmark source")
     await expect(page.locator('[data-slot="user-message-text"]')).toHaveText("Benchmark source")
     await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
@@ -152,9 +152,9 @@ for (const mode of ["compact", "ungrouped"] as const) {
         lastID,
         requiredPartID: history === "paged" && mode === "compact" ? `${lastText.id}:text:0` : undefined,
         requireBottomAnchor: true,
-        href: stressSessionHref(session.info.id),
+        href: sessionHref(session.info.id),
         switch: async () => {
-          await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(session.info.id)}"]`).click()
+          await page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(session.info.id)}"]`).click()
         },
       })
       await stopTrace?.()
@@ -191,7 +191,7 @@ for (const mode of ["compact", "ungrouped"] as const) {
         if (testInfo.repeatEachIndex === 0) await page.screenshot({ path: `${output}/${mode}.png` })
         break
       }
-      await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(sourceID)}"]`).click()
+      await page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(sourceID)}"]`).click()
       await expectSessionTitle(page, "Benchmark source")
       await expect(page.locator('[data-slot="user-message-text"]')).toHaveText("Benchmark source")
       await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()

packages/app/e2e/performance/timeline/provider-memory-benchmark.spec.ts

@@ -1,8 +1,8 @@
 import { benchmark, expect } from "../benchmark"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectSessionTitle } from "../../utils/waits"
-import { fixture, pageMessages } from "./session-timeline-stress.fixture"
-import { installStressSessionTabs, installTimelineSettings, stressSessionHref } from "./timeline-test-helpers"
+import { fixture, installStressSessionTabs, installTimelineSettings, pageMessages } from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
 import { waitForStableTimeline } from "./session-tab-switch-probe"
 import type { ModelUpdated } from "@opencode/client/promise"
 
@@ -12,7 +12,7 @@ benchmark("measures retained renderer memory with a large model catalog", async
   const switches = Number(process.env.PROVIDER_MEMORY_SWITCHES ?? 10)
   const provider = fixture.provider.all[0]
   const selected = { ...provider.models["claude-opus-4-6"] }
-  await mockOpenCodeServer(page, {
+  const mock = await mockOpenCodeServer(page, {
     directory: fixture.directory,
     project: fixture.project,
     sessions: fixture.sessions,
@@ -46,7 +46,7 @@ benchmark("measures retained renderer memory with a large model catalog", async
   })
   await installTimelineSettings(page)
   await installStressSessionTabs(page)
-  await page.goto(stressSessionHref(fixture.sourceID))
+  await page.goto(sessionHref(fixture.sourceID))
   await expectSessionTitle(page, fixture.expected.sourceTitle)
   await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
   await expect(page.locator('[data-action="composer-model"]')).toContainText("Claude Opus 4.6")
@@ -56,7 +56,7 @@ benchmark("measures retained renderer memory with a large model catalog", async
     if (index > 0) {
       const target = index % 2 === 1
       const id = target ? fixture.targetID : fixture.sourceID
-      await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(id)}"]`).click()
+      await page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(id)}"]`).click()
       await expectSessionTitle(page, target ? fixture.expected.targetTitle : fixture.expected.sourceTitle)
       await waitForStableTimeline(
         page,
@@ -75,12 +75,7 @@ benchmark("measures retained renderer memory with a large model catalog", async
   expect(samples).toHaveLength(switches + 1)
   expect(samples.every((sample) => sample.heap.usedSize > 0)).toBe(true)
   selected.name = "Updated catalog model"
-  await page.evaluate(
-    (event) => {
-      const host = window as Window & { __mockServerStream?: { push: (events: ModelUpdated[]) => void } }
-      if (!host.__mockServerStream) throw new Error("Missing fixture event stream")
-      host.__mockServerStream.push([event])
-    },
+  await mock.push([
     {
       id: "evt_model_refresh",
       created: Date.now(),
@@ -88,7 +83,7 @@ benchmark("measures retained renderer memory with a large model catalog", async
       location: { directory: fixture.directory },
       data: {},
     } satisfies ModelUpdated,
-  )
+  ])
   await expect(page.locator('[data-action="composer-model"]')).toContainText(selected.name)
   report(
     { samples },

packages/app/e2e/performance/timeline/review-pane-scaling-benchmark.spec.ts

@@ -1,6 +1,6 @@
 import type { Page } from "@playwright/test"
 import { benchmark, expect } from "../benchmark"
-import { setupTimelineBenchmark } from "./session-timeline-benchmark.fixture"
+import { benchmarkLocation, setupTimelineBenchmark } from "./session-timeline-benchmark.fixture"
 
 const changedLinesPerFile = 100
 const linesPerSide = changedLinesPerFile / 2
@@ -44,7 +44,10 @@ benchmark.describe("performance: review pane scaling", () => {
         const patchByteLimit = Number(process.env.REVIEW_PANE_PATCH_BYTE_LIMIT ?? Number.POSITIVE_INFINITY)
         if (Number.isNaN(patchByteLimit) || patchByteLimit < 0)
           throw new Error(`Invalid REVIEW_PANE_PATCH_BYTE_LIMIT: ${process.env.REVIEW_PANE_PATCH_BYTE_LIMIT}`)
-        const responseBody = JSON.stringify(createScalingDiffs(fileCount, patchByteLimit))
+        const responseBody = JSON.stringify({
+          location: benchmarkLocation,
+          data: createScalingDiffs(fileCount, patchByteLimit),
+        })
         await setupTimelineBenchmark(page, {
           historyTurns: 0,
           eventBatch: 1,

packages/app/e2e/performance/timeline/session-entry-benchmark.spec.ts

@@ -1,8 +1,8 @@
 import { benchmark, benchmarkDiagnostics, expect } from "../benchmark"
 import { measureNavigationMilestones } from "./navigation-milestones"
-import { fixture } from "./session-timeline-stress.fixture"
+import { fixture, installStressSessionTabs, mockStressTimeline } from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
 import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"
-import { installStressSessionTabs, mockStressTimeline, stressSessionHref } from "./timeline-test-helpers"
 
 benchmark.use({
   viewport: { width: 1440, height: 900 },
@@ -16,7 +16,7 @@ for (const entry of ["home", "session"] as const) {
   benchmark(`entry: new session from ${entry}`, async ({ page, report }) => {
     await mockStressTimeline(page)
     await installStressSessionTabs(page, { sessionIDs: entry === "home" ? [] : [fixture.sourceID] })
-    await page.goto(entry === "home" ? "/" : stressSessionHref(fixture.sourceID))
+    await page.goto(entry === "home" ? "/" : sessionHref(fixture.sourceID))
     if (entry === "session") await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
     const trigger = entry === "home" ? '[data-action="home-new-session"]' : 'button[aria-label="New session"]'
     await expect(page.locator(trigger)).toBeVisible()
@@ -68,7 +68,7 @@ benchmark("entry: cold session from Home", async ({ page, report }) => {
   const selector = `[data-component="home-session-row-container"][data-session-id="${fixture.targetID}"] [data-component="home-session-row"]`
   await expect(page.locator(selector)).toBeVisible()
   expect(requests).not.toContain(fixture.targetID)
-  const href = stressSessionHref(fixture.targetID)
+  const href = sessionHref(fixture.targetID)
   await benchmarkDiagnostics(page).startTrace()
   const result = await measureSessionSwitch(page, {
     destinationIDs: fixture.messages[fixture.targetID].map((message) => message.id),

packages/app/e2e/performance/timeline/session-parent-hydration-benchmark.spec.ts

@@ -3,8 +3,8 @@ import type { Page } from "@playwright/test"
 import { expectSessionTitle } from "../../utils/waits"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { benchmark, expect, withBenchmarkPage } from "../benchmark"
-import { fixture } from "./session-timeline-stress.fixture"
-import { installStressSessionTabs, stressSessionHref } from "./timeline-test-helpers"
+import { fixture, installStressSessionTabs } from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
 import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"
 
 type ParentHydrationBenchmarkMode = "natural" | "candidate"
@@ -121,11 +121,11 @@ async function trial(page: Page, mode: ParentHydrationBenchmarkMode) {
     }),
   )
   await installStressSessionTabs(page, { sessionIDs: [fixture.sourceID] })
-  await page.goto(stressSessionHref(fixture.sourceID))
+  await page.goto(sessionHref(fixture.sourceID))
   await expectSessionTitle(page, fixture.expected.sourceTitle)
   await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
 
-  const href = stressSessionHref(fixture.targetID)
+  const href = sessionHref(fixture.targetID)
   await page.evaluate(
     ({ href, title }) => {
       const link = document.createElement("a")

packages/app/e2e/performance/timeline/session-tab-flash.spec.ts

@@ -1,6 +1,5 @@
 import { benchmark, expect } from "../benchmark"
 import { expectSessionTitle } from "../../utils/waits"
-import { fixture } from "./session-timeline-stress.fixture"
 import {
   collectCachedRepaintTrace,
   compressCachedRepaintTrace,
@@ -9,29 +8,30 @@ import {
 } from "./session-tab-repaint-probe"
 import { waitForStableTimeline } from "./session-tab-switch-probe"
 import {
+  fixture,
   installStressSessionTabs,
   installTimelineSettings,
   mockStressTimeline,
-  stressSessionHref,
-} from "./timeline-test-helpers"
+} from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
 
 benchmark("samples cached session repaint after the click", async ({ page, report }) => {
   benchmark.setTimeout(120_000)
   await mockStressTimeline(page)
   await installStressSessionTabs(page)
   await installTimelineSettings(page)
-  await page.goto(stressSessionHref(fixture.targetID))
+  await page.goto(sessionHref(fixture.targetID))
   await expectSessionTitle(page, fixture.expected.targetTitle)
   await waitForStableTimeline(page, fixture.expected.targetMessageIDs.at(-1)!)
   await page
-    .locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(fixture.sourceID)}"]`)
+    .locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(fixture.sourceID)}"]`)
     .first()
     .click()
   await expectSessionTitle(page, fixture.expected.sourceTitle)
   await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
 
   await installCachedRepaintProbe(page, {
-    targetHref: stressSessionHref(fixture.targetID),
+    targetHref: sessionHref(fixture.targetID),
     destination: fixture.messages[fixture.targetID].map((message) => message.id),
     source: fixture.messages[fixture.sourceID].map((message) => message.id),
     last: fixture.expected.targetMessageIDs.at(-1)!,
@@ -39,7 +39,7 @@ benchmark("samples cached session repaint after the click", async ({ page, repor
   })
 
   await page
-    .locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(fixture.targetID)}"]`)
+    .locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(fixture.targetID)}"]`)
     .first()
     .click()
   await Promise.all([expectSessionTitle(page, fixture.expected.targetTitle), waitForCachedRepaintWindow(page, 1_000)])
@@ -64,7 +64,7 @@ benchmark("loads only the selected restored tab's transcript", async ({ page, re
       page.waitForResponse((response) => new URL(response.url()).pathname === `/api/session/${id}/form`),
     ),
   )
-  await page.goto(stressSessionHref(fixture.sourceID))
+  await page.goto(sessionHref(fixture.sourceID))
   await expectSessionTitle(page, fixture.expected.sourceTitle)
 
   await attention

packages/app/e2e/performance/timeline/session-tab-switch-benchmark.spec.ts

@@ -2,14 +2,11 @@ import type { Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectSessionTitle } from "../../utils/waits"
 import { benchmark, benchmarkDiagnostics, expect } from "../benchmark"
-import { fixture } from "./session-timeline-stress.fixture"
-import { expected, messages, workload } from "./session-tab-switch.fixture"
-import {
-  createReviewDiffs,
-  installStressSessionTabs,
-  installTimelineSettings,
-  stressSessionHref,
-} from "./timeline-test-helpers"
+import { fixture, installStressSessionTabs, installTimelineSettings } from "../../utils/session-fixture"
+import { sessionHref } from "../../utils/app"
+import { expected, messages } from "../../utils/markdown-sessions"
+import { workload } from "./session-tab-switch.fixture"
+import { createReviewDiffs } from "./timeline-test-helpers"
 import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"
 
 const scenarios = [
@@ -43,7 +40,7 @@ scenarios.forEach((scenario) => {
       sourceIDs: messages[fixture.sourceID].map((message) => message.id),
       lastID: expected[fixture.targetID].lastID,
       requiredPartID: expected[fixture.targetID].answerID,
-      href: stressSessionHref(fixture.targetID),
+      href: sessionHref(fixture.targetID),
       switch: () => switchSession(page, fixture.targetID, fixture.expected.targetTitle),
     })
 
@@ -97,7 +94,7 @@ async function prepareSessionTabs(page: Page) {
     })
   await installTimelineSettings(page)
   await installStressSessionTabs(page)
-  await page.goto(stressSessionHref(fixture.sourceID))
+  await page.goto(sessionHref(fixture.sourceID))
   await expectSessionTitle(page, fixture.expected.sourceTitle)
   await expectReadyTimeline(page, fixture.sourceID)
   await expect(page.locator(`[data-timeline-part-id="${expected[fixture.targetID].answerID}"]`)).toHaveCount(0)
@@ -120,7 +117,7 @@ async function expectReadyTimeline(page: Page, sessionID: string) {
 }
 
 async function switchSession(page: Page, sessionID: string, title: string) {
-  const tab = page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(sessionID)}"]`)
+  const tab = page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(sessionID)}"]`)
   await expect(tab).toHaveCount(1)
   await tab.click()
   await expectSessionTitle(page, title)

packages/app/e2e/performance/timeline/session-tab-switch.fixture.ts

@@ -1,48 +1,4 @@
-import type { SessionMessageInfo } from "@opencode/client/promise"
-import { fixture } from "./session-timeline-stress.fixture"
-
-export const exchanges = 200
-
-export const messages: Record<string, SessionMessageInfo[]> = Object.fromEntries(
-  [fixture.sourceID, fixture.targetID].map((sessionID) => [
-    sessionID,
-    Array.from({ length: exchanges }, (_, index) => {
-      const seed = fixture.messages[fixture.targetID]
-      const user = seed[(index % (seed.length / 2)) * 2]!
-      const assistant = seed[(index % (seed.length / 2)) * 2 + 1]!
-      if (user.type !== "user" || assistant.type !== "assistant") throw new Error("Expected a user/assistant pair")
-      const suffix = `${sessionID}_${String(index).padStart(4, "0")}`
-      return [
-        {
-          ...user,
-          id: `msg_user_${suffix}`,
-          time: { created: 1700000000000 + index * 10_000 },
-        },
-        {
-          ...assistant,
-          id: `msg_assistant_${suffix}`,
-          time: { created: 1700000001000 + index * 10_000, completed: 1700000008000 + index * 10_000 },
-          content: [
-            ...assistant.content
-              .filter((part) => part.type !== "text")
-              .map((part) => (part.type === "tool" ? { ...part, id: `${part.id}_${suffix}` } : part)),
-            { type: "text", text: complexMarkdown(sessionID, index) },
-          ],
-        },
-      ] satisfies SessionMessageInfo[]
-    }).flat(),
-  ]),
-)
-
-export const expected = Object.fromEntries(
-  [fixture.sourceID, fixture.targetID].map((sessionID) => [
-    sessionID,
-    {
-      lastID: messages[sessionID].at(-2)!.id,
-      answerID: `${messages[sessionID].at(-1)!.id}:text:0`,
-    },
-  ]),
-)
+import { exchanges, messages } from "../../utils/markdown-sessions"
 
 export const workload = {
   fixture: "long-complex-markdown-v1",
@@ -69,75 +25,3 @@ export const workload = {
     ]),
   ),
 }
-
-function complexMarkdown(sessionID: string, index: number) {
-  return `## Renderer review ${sessionID} / ${index}
-
-Preserve **semantic identity**, *measured geometry*, and ~~obsolete estimates~~ when switching sessions. The \`measureElement(node)\` result must agree with the [rendering contract](https://example.com/rendering/${sessionID}/${index}).
-
-> A completed answer contains formatted prose, highlighted source, and structured results.
-> Keep the previous view until the destination is ready, rather than exposing partially formatted content.
-
-### Readiness checklist
-
-- [x] Resolve the destination session and its messages.
-- [x] Parse Markdown and highlight fenced code.
-- [ ] Verify a different panel width.
-  - Preserve the bottom anchor.
-  - Reuse the measured rows when their width matches.
-
-| Stage | Input | Expected result | Verification |
-| :--- | ---: | :--- | :--- |
-${Array.from({ length: 8 }, (_, row) => `| stage-${index}-${row} | ${index * 8 + row} | **ready** with \`row[${row}]\` | stable geometry and visible content |`).join("\n")}
-
-### Implementation
-
-\`\`\`tsx
-import { For, Show, createMemo } from "solid-js"
-
-type Row = { id: string; title: string; ready: boolean; height: number }
-
-export function SessionRows${index}(props: { rows: Row[]; selected: string }) {
-  const visible = createMemo(() => props.rows.filter((row) => row.ready))
-  return (
-    <section aria-label="${sessionID}-${index}">
-      <For each={visible()}>{(row) => (
-        <article data-selected={row.id === props.selected}>
-          <h3>{row.title}</h3>
-          <Show when={row.height > 0} fallback={<span>Measuring</span>}>
-            <output>{row.height.toFixed(2)} pixels</output>
-          </Show>
-        </article>
-      )}</For>
-    </section>
-  )
-}
-\`\`\`
-
-\`\`\`json
-${JSON.stringify({ session: sessionID, exchange: index, stages: ["hydrate", "parse", "highlight", "measure"], viewport: { width: 1440, height: 900 }, cache: { markdown: true, geometry: true } }, null, 2)}
-\`\`\`
-
-\`\`\`sql
-SELECT session_id, COUNT(*) AS messages, MAX(created_at) AS latest
-FROM session_message
-WHERE session_id = '${sessionID}' AND ordinal >= ${index}
-GROUP BY session_id
-ORDER BY latest DESC;
-\`\`\`
-
-### Verification
-
-1. Open the long source session and wait for its final answer.
-2. Select the destination tab, without changing the viewport.
-3. Confirm that **all Markdown is ready** and the bottom anchor is correct.
-
-\`\`\`bash
-bun typecheck
-bunx playwright test --config e2e/performance/playwright.config.ts
-git diff --check # ${sessionID}-${index}
-\`\`\`
-
-**Review complete: ${sessionID} / ${index}.**
-`
-}

packages/app/e2e/performance/timeline/session-timeline-benchmark.fixture.ts

@@ -8,6 +8,8 @@ import { createTwoFilesPatch } from "diff"
 
 const directory = "C:/OpenCode/TimelineStateRegression"
 const projectID = "proj_timeline_state_regression"
+/** The workspace a benchmark response names, in the shape the server's location-scoped routes return. */
+export const benchmarkLocation = { directory, project: { id: projectID, directory, canonical: directory } }
 const sessionID = "ses_timeline_state_regression"
 const userMessageID = "msg_user_regression"
 const assistantMessageID = "msg_assistant_regression"

packages/app/e2e/performance/timeline/timeline-test-helpers.ts

@@ -1,87 +1,3 @@
-import type { Page } from "@playwright/test"
-import { base64Encode } from "@opencode/util/encode"
-import { mockOpenCodeServer } from "../../utils/mock-server"
-import { fixture, pageMessages } from "./session-timeline-stress.fixture"
-
-export async function installTimelineSettings(page: Page) {
-  await page.addInitScript(() => {
-    localStorage.setItem(
-      "settings.v3",
-      JSON.stringify({
-        general: {
-          editToolPartsExpanded: true,
-          shellToolPartsExpanded: true,
-          showReasoningSummaries: true,
-        },
-      }),
-    )
-  })
-}
-
-export function mockStressTimeline(
-  page: Page,
-  input?: {
-    onMessages?: (input: { sessionID: string; before?: string; phase: "start" | "end" }) => void
-    vcsDiff?: unknown[]
-  },
-) {
-  return mockOpenCodeServer(page, {
-    sessions: fixture.sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-    onMessages: input?.onMessages,
-    vcsDiff: input?.vcsDiff,
-  })
-}
-
-export async function installStressSessionTabs(page: Page, input?: { draftID?: string; sessionIDs?: string[] }) {
-  const server = stressServer()
-  await page.addInitScript(
-    ({ directory, sessionIDs, dirBase64, server, draftID }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([
-          ...sessionIDs.map((sessionId) => ({
-            type: "session",
-            server,
-            dirBase64,
-            sessionId,
-          })),
-          ...(draftID ? [{ type: "draft", draftID, server, directory }] : []),
-        ]),
-      )
-    },
-    {
-      directory: fixture.directory,
-      sessionIDs: input?.sessionIDs ?? [fixture.sourceID, fixture.targetID],
-      dirBase64: base64Encode(fixture.directory),
-      server,
-      draftID: input?.draftID,
-    },
-  )
-}
-
-export function stressSessionHref(sessionID: string) {
-  return `/server/${base64Encode(stressServer())}/session/${sessionID}`
-}
-
-export function stressDraftHref(draftID: string) {
-  return `/new-session?draftId=${encodeURIComponent(draftID)}`
-}
-
-function stressServer() {
-  return `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-}
-
 export function createReviewDiffs() {
   return Array.from({ length: Number(process.env.REVIEW_PANE_DIFF_COUNT ?? 72) }, (_, index) => {
     const lines = index % 3 === 0 ? 300 : index % 3 === 1 ? 120 : 38

packages/app/e2e/performance/unit/timeline-test-helpers.test.ts

@@ -1,10 +0,0 @@
-import { expect, test } from "bun:test"
-import { base64Encode } from "@opencode/util/encode"
-import { fixture } from "../timeline/session-timeline-stress.fixture"
-import { stressSessionHref } from "../timeline/timeline-test-helpers"
-
-test("builds stress session links for the benchmark server", () => {
-  expect(stressSessionHref(fixture.sourceID)).toBe(
-    `/server/${base64Encode("http://127.0.0.1:4096")}/session/${fixture.sourceID}`,
-  )
-})

packages/app/e2e/regression/artifact-reopen.spec.ts

@@ -1,87 +0,0 @@
-import type { SessionMessageInfo } from "@opencode/client/promise"
-import { base64Encode } from "@opencode/util/encode"
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:/OpenCode/ArtifactReopen"
-const projectID = "proj_artifact_reopen"
-const sessionID = "ses_artifact_reopen"
-const title = "Artifact reopen"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const messages = [
-  { id: "msg_prompt", type: "user", text: "Write the shopping list", time: { created: 1 } },
-  {
-    id: "msg_reply",
-    type: "assistant",
-    agent: "build",
-    model: { id: "test", providerID: "opencode" },
-    content: [{ type: "text", text: "Updated [shopping.txt](shopping.txt)." }],
-    time: { created: 2, completed: 3 },
-  },
-] satisfies SessionMessageInfo[]
-
-test.use({ viewport: { width: 1440, height: 900 } })
-
-test("rereads a file each time an artifact link opens it", async ({ page }) => {
-  const file = { content: "first draft" }
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      canonical: directory,
-      vcs: "git",
-      name: "artifact-reopen",
-      time: { created: 1, updated: 1 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { test: { id: "test", name: "Test", variants: {}, limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "test" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: "artifact-reopen",
-        projectID,
-        directory,
-        title,
-        agent: "build",
-        model: { id: "test", providerID: "opencode" },
-        version: "dev",
-        time: { created: 1, updated: 3 },
-      },
-    ],
-    fileList: () => [],
-    fileContent: (path) => (path === "shopping.txt" ? file : ""),
-    pageMessages: () => ({ items: messages }),
-  })
-
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, title)
-
-  const link = page.getByRole("link", { name: "shopping.txt", exact: true })
-  const panel = page.locator("#review-panel")
-  const tab = panel.getByRole("tab", { name: "shopping.txt" })
-
-  await link.click()
-  await expect(tab).toHaveAttribute("aria-selected", "true")
-  await expect(panel.getByText("first draft", { exact: true })).toBeVisible()
-
-  file.content = "second draft"
-  await tab.locator("..").getByRole("button", { name: "Close tab" }).click()
-  await expect(tab).toHaveCount(0)
-
-  await link.click()
-  await expect(tab).toHaveAttribute("aria-selected", "true")
-  await expect(panel.getByText("second draft", { exact: true })).toBeVisible()
-  await expect(panel.getByText("first draft", { exact: true })).toHaveCount(0)
-})

packages/app/e2e/regression/background-read-failure.spec.ts

@@ -1,3 +1,4 @@
+import type { OpenCodeEvent } from "@opencode/client/promise"
 import { expect, test } from "@playwright/test"
 import { openCommandPalette, paletteSession } from "../utils/command-palette"
 
@@ -10,19 +11,15 @@ test("failed event-driven reads report an error and recover without an unhandled
   const path = `**/api/session/${paletteSession.id}`
   await page.route(path, (route) => route.abort("failed"))
   const requested = page.waitForRequest(path)
-  await page.evaluate((sessionID) => {
-    const host = window as Window & { __mockServerStream?: { push: (events: unknown[]) => void } }
-    if (!host.__mockServerStream) throw new Error("Missing fixture event stream")
-    host.__mockServerStream.push([
-      {
-        id: "evt_failed_refresh",
-        created: 2,
-        type: "session.viewed",
-        durable: { aggregateID: sessionID, seq: 1, version: 1 },
-        data: { sessionID, idle: 2 },
-      },
-    ])
-  }, paletteSession.id)
+  await palette.push([
+    {
+      id: "evt_failed_refresh",
+      created: 2,
+      type: "session.viewed",
+      durable: { aggregateID: paletteSession.id, seq: 1, version: 1 },
+      data: { sessionID: paletteSession.id, idle: 2 },
+    } as OpenCodeEvent,
+  ])
   await requested
   await expect(page.getByText("Request failed", { exact: true })).toBeVisible()
   await palette.input.fill("copy session")
@@ -32,19 +29,15 @@ test("failed event-driven reads report an error and recover without an unhandled
   )
   await palette.input.press("Escape")
   await page.unroute(path)
-  await page.evaluate((sessionID) => {
-    const host = window as Window & { __mockServerStream?: { push: (events: unknown[]) => void } }
-    if (!host.__mockServerStream) throw new Error("Missing fixture event stream")
-    host.__mockServerStream.push([
-      {
-        id: "evt_recovered_refresh",
-        created: 3,
-        type: "session.renamed",
-        durable: { aggregateID: sessionID, seq: 2, version: 1 },
-        data: { sessionID, title: "Recovered session" },
-      },
-    ])
-  }, paletteSession.id)
+  await palette.push([
+    {
+      id: "evt_recovered_refresh",
+      created: 3,
+      type: "session.renamed",
+      durable: { aggregateID: paletteSession.id, seq: 2, version: 1 },
+      data: { sessionID: paletteSession.id, title: "Recovered session" },
+    } as OpenCodeEvent,
+  ])
   await expect(page.getByRole("heading", { name: "Recovered session", exact: true })).toBeVisible()
   expect(errors).toEqual([])
 })

packages/app/e2e/regression/browser-polyfills.spec.ts

@@ -1,37 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test("loads home and the directory picker without newer browser APIs", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    sessions: fixture.sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-    fileList: () => [],
-  })
-  await page.addInitScript((directory) => {
-    // Safari 16.6 has neither API. Remove them before the web entry runs.
-    delete (Map as Partial<typeof Map>).groupBy
-    delete (Promise as Partial<typeof Promise>).withResolvers
-    localStorage.setItem(
-      "opencode.global.dat:server",
-      JSON.stringify({
-        projects: { local: [{ worktree: directory, expanded: true }] },
-        lastProject: { local: directory },
-      }),
-    )
-  }, fixture.directory)
-
-  await page.goto("/")
-  const row = page.locator('[data-component="home-session-row"]').filter({ hasText: fixture.expected.targetTitle })
-  await expect(row).toBeVisible()
-
-  await page.getByRole("button", { name: "Add project", exact: true }).click()
-  const dialog = page.getByRole("dialog")
-  await expect(dialog.getByRole("button", { name: "Select folder", exact: true })).toBeEnabled()
-  await dialog.getByRole("button", { name: "Cancel", exact: true }).click()
-  await expect(dialog).toBeHidden()
-  await expect(row).toBeVisible()
-})

packages/app/e2e/regression/btw-sidebar.spec.ts

@@ -1,103 +1,32 @@
-import { base64Encode } from "@opencode/util/encode"
 import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
+import { sessionHref } from "../utils/app"
+import { openSession } from "../utils/workspace"
 import { expectSessionTitle } from "../utils/waits"
 
-const directory = "C:/OpenCode/BtwSidebar"
-const projectID = "proj_btw_sidebar"
-const sessionID = "ses_btw_sidebar"
-const otherSessionID = "ses_btw_sidebar_other"
-const title = "Side question session"
-const otherTitle = "Other side question session"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const sessionHref = (id: string) => `/server/${base64Encode(server)}/session/${id}`
-
 test.use({ viewport: { width: 1440, height: 900 } })
 
 test("answers /btw in the side panel without admitting a prompt", async ({ page }) => {
   const generations: { sessionID: string; prompt: string }[] = []
   const prompts: unknown[] = []
   const generated = Promise.withResolvers<void>()
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "btw-sidebar",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "test" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: sessionID,
-        projectID,
-        directory,
-        title,
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-      {
-        id: otherSessionID,
-        slug: otherSessionID,
-        projectID,
-        directory,
-        title: otherTitle,
-        version: "dev",
-        time: { created: 1700000001000, updated: 1700000001000 },
-      },
-    ],
-    pageMessages: () => ({ items: [] }),
-    vcsDiff: [],
+  const main = { id: "ses_btw_sidebar", title: "Side question session" }
+  const other = { id: "ses_btw_sidebar_other", title: "Other side question session" }
+  const { editor } = await openSession(page, {
+    name: "BtwSidebar",
+    sessions: [main, other],
     onPrompt: (input) => prompts.push(input),
     generate: async (input) => {
       generations.push(input)
-      if (input.sessionID === otherSessionID) return { text: "This answer belongs to the **other session**." }
+      if (input.sessionID === other.id) return { text: "This answer belongs to the **other session**." }
       await generated.promise
       return {
         text: "The retry loop uses **exponential backoff** and stops after three attempts.\n\n```ts\nconst delay = 2 ** attempt\n```",
       }
     },
   })
-  await page.addInitScript(
-    ({ directory, server, sessionID, otherSessionID }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([
-          { type: "session", server, sessionId: sessionID },
-          { type: "session", server, sessionId: otherSessionID },
-        ]),
-      )
-    },
-    { directory, server, sessionID, otherSessionID },
-  )
-
-  await page.goto(sessionHref(sessionID))
-  await expectSessionTitle(page, title)
-  const editor = page.locator('[data-component="composer-editor"]')
-  await expect(editor).toBeEditable()
 
   await editor.fill("/btw")
-  const suggestion = page.locator('[data-suggestion-id="session.btw"]')
+  const suggestion = page.locator('[data-suggestion-id="btw.ask"]')
   await expect(suggestion).toBeVisible()
   await suggestion.click()
   await expect(editor).toHaveText("/btw ")
@@ -111,35 +40,33 @@ test("answers /btw in the side panel without admitting a prompt", async ({ page
 
   await editor.fill("/btw how does the retry loop work?")
   await editor.press("Enter")
-
-  const tab = page.getByRole("tab", { name: "/btw" })
   await expect(panel).toBeVisible()
   await expect(panel.getByRole("textbox")).toHaveCount(0)
   await expect(panel.getByRole("status")).toContainText("Working")
-  await expect(tab).toHaveAttribute("data-selected", "")
+  await expect(page.getByRole("tab", { name: "/btw" })).toHaveAttribute("data-selected", "")
   generated.resolve()
   await expect(panel.getByText("how does the retry loop work?", { exact: true })).toBeVisible()
   await expect(panel.getByText("exponential backoff", { exact: false })).toBeVisible()
   await expect(panel.getByText("const delay = 2 ** attempt", { exact: true })).toBeVisible()
   expect(generations).toHaveLength(1)
-  expect(generations[0]?.sessionID).toBe(sessionID)
+  expect(generations[0]?.sessionID).toBe(main.id)
   expect(generations[0]?.prompt).toContain("how does the retry loop work?")
   expect(prompts).toEqual([])
   await expect(editor).toHaveText("")
 
-  await page.locator(`[data-titlebar-tab-link][href="${sessionHref(otherSessionID)}"]`).click()
-  await expectSessionTitle(page, otherTitle)
+  await page.locator(`[data-titlebar-tab-link][href="${sessionHref(other.id)}"]`).click()
+  await expectSessionTitle(page, other.title)
   await editor.fill("/btw what belongs here?")
   await editor.press("Enter")
   await expect(panel.getByText("other session", { exact: false })).toBeVisible()
 
-  await page.locator(`[data-titlebar-tab-link][href="${sessionHref(sessionID)}"]`).click()
-  await expectSessionTitle(page, title)
+  await page.locator(`[data-titlebar-tab-link][href="${sessionHref(main.id)}"]`).click()
+  await expectSessionTitle(page, main.title)
   await expect(panel.getByText("exponential backoff", { exact: false })).toBeVisible()
   await expect(panel.getByText("other session", { exact: false })).toHaveCount(0)
 
   await page.reload()
-  await expectSessionTitle(page, title)
+  await expectSessionTitle(page, main.title)
   await expect(page.getByRole("tab", { name: "/btw" })).toHaveCount(0)
-  await expect(page.locator('[data-slot="session-btw-panel"]')).toHaveCount(0)
+  await expect(panel).toHaveCount(0)
 })

packages/app/e2e/regression/command-palette.spec.ts

@@ -76,6 +76,7 @@ test("appends search results without resetting the selected command", async ({ p
 })
 
 test("keeps the automatically selected file when session results arrive later", async ({ page }) => {
+  const warnings = captureConsoleWarnings(page)
   const { dialog, input } = await openCommandPalette(page)
   const sessions = Promise.withResolvers<void>()
   await page.route("**/api/fs/find?*", (route) =>
@@ -97,6 +98,72 @@ test("keeps the automatically selected file when session results arrive later",
   await expect(file).toHaveAttribute("aria-selected", "true")
   await input.press("Enter")
   await expect(dialog).toHaveCount(0)
-  await expect(page.getByRole("tab", { name: "README.md", exact: true })).toBeVisible()
+  const tab = page.getByRole("tab", { name: "README.md", exact: true })
+  await expect(tab).toBeVisible()
   await expect(page.getByRole("heading", { name: paletteSession.title, exact: true })).toBeVisible()
+  await page
+    .getByRole("complementary", { name: "Review and files" })
+    .getByRole("button", { name: "Close tab", exact: true })
+    .click()
+  await expect(tab).toHaveCount(0)
+  await expect(page.getByRole("heading", { name: paletteSession.title, exact: true })).toBeVisible()
+  // The duplicate command ID warning is DEV-only, so only dev-server runs can catch duplicate tab commands here.
+  expect(warnings).toEqual([])
+})
+
+test("navigation replaces commands without retaining disposed owners", async ({ page }) => {
+  const warnings = captureConsoleWarnings(page)
+  const palette = await openCommandPalette(page, true)
+  await palette.input.press("Escape")
+  await expect(palette.dialog).toHaveCount(0)
+  await page
+    .getByRole("region", { name: "Recent sessions" })
+    .getByRole("button", { name: /Palette fixture session/ })
+    .click()
+  const editor = page.locator('[data-component="composer-editor"]')
+  await expect(editor).toBeEditable()
+  await page.keyboard.press("ControlOrMeta+t")
+  await expect(page).toHaveURL(/\/new-session\?/)
+  await expect(editor).toBeEditable()
+  await editor.blur()
+  await page.keyboard.press("Control+l")
+  await expect(editor).toBeFocused()
+  await page.keyboard.press("ControlOrMeta+Shift+P")
+  const dialog = page.getByRole("dialog")
+  await expect(dialog.getByRole("textbox")).toBeFocused()
+  await expect(dialog.getByRole("textbox")).toHaveAttribute("placeholder", "Search files, commands, and sessions")
+  await dialog.getByRole("textbox").fill("copy session")
+  await expect(dialog.getByRole("option", { name: "Copy Session ID", exact: true })).toHaveCount(0)
+  await dialog.getByRole("textbox").press("Escape")
+  await expect(dialog).toHaveCount(0)
+  const tabs = page.locator("[data-titlebar-tab-link]")
+  await tabs.filter({ hasText: paletteSession.title }).click()
+  await expect(page.getByRole("heading", { name: paletteSession.title, exact: true })).toBeVisible()
+  for (const count of [3, 4]) {
+    await page.getByRole("button", { name: "New session", exact: true }).click()
+    await expect(tabs).toHaveCount(count)
+    await expect(editor).toBeEditable()
+  }
+  await page.setViewportSize({ width: 600, height: 800 })
+  await page.locator('[data-slot="mobile-tabs-trigger"]').click()
+  await expect(page.locator('[data-slot="mobile-tabs-drawer"] [data-titlebar-tab-link]')).toHaveCount(4)
+  await page.setViewportSize({ width: 1280, height: 800 })
+  await expect(page.locator('[data-slot="titlebar-tabs"] [data-titlebar-tab-link]')).toHaveCount(4)
+  const active = new URL(page.url())
+  const closing = page.locator(`[data-titlebar-tab-link][href="${active.pathname}${active.search}"]`)
+  await expect(closing).toHaveCount(1)
+  await page.keyboard.press("ControlOrMeta+w")
+  await expect(tabs).toHaveCount(3)
+  await expect(closing).toHaveCount(0)
+  await expect(tabs.filter({ hasText: paletteSession.title })).toHaveCount(1)
+  await tabs.filter({ hasText: paletteSession.title }).click()
+  await expect(page.getByRole("heading", { name: paletteSession.title, exact: true })).toBeVisible()
+  await page.keyboard.press("ControlOrMeta+Shift+P")
+  await expect(dialog.getByRole("textbox")).toBeFocused()
+  await dialog.getByRole("textbox").fill("copy session")
+  await expect(dialog.getByRole("option", { name: "Copy Session ID", exact: true })).toHaveAttribute(
+    "aria-selected",
+    "true",
+  )
+  expect(warnings).toEqual([])
 })

packages/app/e2e/regression/command-registration.spec.ts

@@ -1,77 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { captureConsoleWarnings, openCommandPalette } from "../utils/command-palette"
-
-test.use({ serviceWorkers: "block", video: "off" })
-
-test("opening and closing files does not duplicate tab commands", async ({ page }) => {
-  const warnings = captureConsoleWarnings(page)
-  const palette = await openCommandPalette(page)
-  await page.route("**/api/fs/find?*", (route) =>
-    route.fulfill({
-      headers: { "access-control-allow-origin": "*" },
-      json: { data: [{ path: "fixture.txt", type: "file" }] },
-    }),
-  )
-  await palette.input.fill("fixture.txt")
-  await palette.dialog.getByRole("option", { name: /fixture\.txt/ }).click()
-  const file = page.getByRole("tab", { name: /fixture\.txt/ })
-  await expect(file).toBeVisible()
-  await expect(palette.dialog).toHaveCount(0)
-  await page
-    .getByRole("complementary", { name: "Review and files" })
-    .getByRole("button", { name: "Close tab", exact: true })
-    .click()
-  await expect(file).toHaveCount(0)
-  await expect(page.getByRole("heading", { name: "Palette fixture session", exact: true })).toBeVisible()
-  expect(warnings).toEqual([])
-})
-
-test("navigation replaces commands without retaining disposed owners", async ({ page }) => {
-  const warnings = captureConsoleWarnings(page)
-  const palette = await openCommandPalette(page, true)
-  await palette.input.press("Escape")
-  await expect(palette.dialog).toHaveCount(0)
-  await page
-    .getByRole("region", { name: "Recent sessions" })
-    .getByRole("button", { name: /Palette fixture session/ })
-    .click()
-  await expect(page.locator('[data-component="composer-editor"]')).toBeEditable()
-  await page.keyboard.press("ControlOrMeta+t")
-  await expect(page).toHaveURL(/\/new-session\?/)
-  await expect(page.locator('[data-component="composer-editor"]')).toBeEditable()
-  await page.locator('[data-component="composer-editor"]').blur()
-  await page.keyboard.press("Control+l")
-  await expect(page.locator('[data-component="composer-editor"]')).toBeFocused()
-  await page.keyboard.press("ControlOrMeta+Shift+P")
-  const dialog = page.getByRole("dialog")
-  await expect(dialog.getByRole("textbox")).toBeFocused()
-  await expect(dialog.getByRole("textbox")).toHaveAttribute("placeholder", "Search files, commands, and sessions")
-  await dialog.getByRole("textbox").fill("copy session")
-  await expect(dialog.getByRole("option", { name: "Copy Session ID", exact: true })).toHaveCount(0)
-  await dialog.getByRole("textbox").press("Escape")
-  await expect(dialog).toHaveCount(0)
-  await page.locator("[data-titlebar-tab-link]").filter({ hasText: "Palette fixture session" }).click()
-  await expect(page.getByRole("heading", { name: "Palette fixture session", exact: true })).toBeVisible()
-  for (const count of [3, 4]) {
-    await page.getByRole("button", { name: "New session", exact: true }).click()
-    await expect(page.locator("[data-titlebar-tab-link]")).toHaveCount(count)
-    await expect(page.locator('[data-component="composer-editor"]')).toBeEditable()
-  }
-  await page.setViewportSize({ width: 600, height: 800 })
-  await page.locator('[data-slot="mobile-tabs-trigger"]').click()
-  await expect(page.locator('[data-slot="mobile-tabs-drawer"] [data-titlebar-tab-link]')).toHaveCount(4)
-  await page.setViewportSize({ width: 1280, height: 800 })
-  await expect(page.locator('[data-slot="titlebar-tabs"] [data-titlebar-tab-link]')).toHaveCount(4)
-  await page.keyboard.press("ControlOrMeta+w")
-  await expect(page.locator("[data-titlebar-tab-link]")).toHaveCount(3)
-  await page.locator("[data-titlebar-tab-link]").filter({ hasText: "Palette fixture session" }).click()
-  await expect(page.getByRole("heading", { name: "Palette fixture session", exact: true })).toBeVisible()
-  await page.keyboard.press("ControlOrMeta+Shift+P")
-  await expect(dialog.getByRole("textbox")).toBeFocused()
-  await dialog.getByRole("textbox").fill("copy session")
-  await expect(dialog.getByRole("option", { name: "Copy Session ID", exact: true })).toHaveAttribute(
-    "aria-selected",
-    "true",
-  )
-  expect(warnings).toEqual([])
-})

packages/app/e2e/regression/composer-command-draft.spec.ts

@@ -1,53 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { base64Encode } from "@opencode/util/encode"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const directory = "C:/OpenCode/ComposerEditing"
-const projectID = "proj_composer_editing"
-const sessionID = "ses_composer_editing"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test("keeps a narrow session composer contained when invoking a built-in", async ({ page }) => {
-  await page.setViewportSize({ width: 800, height: 600 })
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "composer-editing",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [
-      {
-        id: sessionID,
-        slug: "composer-editing",
-        projectID,
-        directory,
-        title: "Composer editing",
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  const composer = page.locator('[data-component="composer"]')
-  const input = composer.locator('[data-component="composer-editor"]')
-  await expect
-    .poll(() => input.evaluate((element) => getComputedStyle(element, "::before").content))
-    .toBe(`"${String.fromCodePoint(0x200b)}"`)
-  await expectAppVisible(composer)
-  await expect(page.locator('[data-slot="session-chat-panel"]')).toHaveCSS("min-width", "0px")
-  await expect.poll(() => page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true)
-
-  await input.fill("keep me")
-  await composer.getByRole("button", { name: "Add images and files" }).click()
-  await page.getByRole("menuitem", { name: "Commands" }).click()
-  await page.locator('[data-suggestion-id="model.choose"]').click()
-
-  await expect(input).toHaveText("keep me")
-})

packages/app/e2e/regression/composer-large-paste.spec.ts

@@ -1,173 +0,0 @@
-import { expect, test, type Locator } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const draftID = "draft_large_paste"
-const directory = "/repo/large-paste"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test.use({ permissions: ["clipboard-read", "clipboard-write"] })
-
-test.beforeEach(async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_large_paste",
-      worktree: directory,
-      vcs: "git",
-      name: "large-paste",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ directory, draftID, server }) => {
-      localStorage.setItem("opencode-theme-id", "oc-2")
-      localStorage.setItem("opencode-color-scheme", "dark")
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-  await page.goto(`/new-session?draftId=${draftID}`)
-  const input = page.locator('[data-component="composer-editor"]')
-  await expectAppVisible(input)
-  await expect(input).toBeEditable()
-  await expect
-    .poll(() => input.evaluate((element) => getComputedStyle(element, "::before").content))
-    .toBe(`"${String.fromCodePoint(0x200b)}"`)
-  await input.click()
-})
-
-for (const lines of [6000, 25000]) {
-  test(`keeps a ${lines}-line crash report editable in a new session`, async ({ page }) => {
-    const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-    const text = "Thread 0 Crashed:\n" + "0   Example  0x0000000100000000 frame + 32\n".repeat(lines) + "End of report"
-    await page.evaluate((text) => navigator.clipboard.writeText(text), text)
-    const events = await input.evaluateHandle((element) => {
-      const events = { count: 0 }
-      element.addEventListener("input", () => events.count++)
-      return events
-    })
-    await page.keyboard.press("ControlOrMeta+V")
-    await expect.poll(async () => (await input.innerText()) === text).toBe(true)
-    expect(await events.evaluate((events) => events.count)).toBe(1)
-    await expect(input).toBeFocused()
-    await expectCaretVisible(input)
-    const scroll = page.locator('[data-component="composer-scroll"]')
-    await expect(scroll.locator(".scroll-view__viewport")).toHaveCSS("scrollbar-width", "none")
-    await expect(scroll.locator(".scroll-view__thumb")).toBeVisible()
-    await page.keyboard.type("!")
-    await expect.poll(async () => (await input.innerText()) === text + "!").toBe(true)
-    await expectCaretVisible(input)
-    const thumb = await scroll.locator(".scroll-view__thumb").boundingBox()
-    const bounds = await scroll.boundingBox()
-    if (!thumb || !bounds) throw new Error("Missing composer scrollbar bounds")
-    await page.mouse.move(thumb.x + thumb.width / 2, thumb.y + thumb.height / 2)
-    await page.mouse.down()
-    await page.mouse.move(thumb.x + thumb.width / 2, bounds.y + 8 + thumb.height / 2)
-    await page.mouse.up()
-    await expect(scroll.locator(".scroll-view__viewport")).toHaveJSProperty("scrollTop", 0)
-    await expect(input).toBeFocused()
-    await page.keyboard.press("ControlOrMeta+Home")
-    await page.keyboard.press("ControlOrMeta+End")
-    await expectCaretVisible(input)
-  })
-}
-
-async function expectCaretVisible(input: Locator) {
-  await expect
-    .poll(() =>
-      input.evaluate((element) => {
-        const selection = window.getSelection()
-        if (!selection?.isCollapsed || !selection.rangeCount || !element.contains(selection.anchorNode)) return false
-        const caret = selection.getRangeAt(0).getBoundingClientRect()
-        const viewport = (element.closest("[data-scrollable]") ?? element).getBoundingClientRect()
-        return caret.height > 0 && caret.top >= viewport.top - 1 && caret.bottom <= viewport.bottom + 1
-      }),
-    )
-    .toBe(true)
-}
-
-for (const width of [390, 1280]) {
-  for (const direction of ["ltr", "rtl"]) {
-    test(`reveals a multiline paste in the middle at ${width}px in ${direction}`, async ({ page }) => {
-      await page.setViewportSize({ width, height: 800 })
-      await page.evaluate((direction) => (document.documentElement.dir = direction), direction)
-      const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-      const suffix = "\nExisting trailing content".repeat(100)
-      await input.fill("Before " + suffix)
-      await input.press("ControlOrMeta+Home")
-      await input.press("ArrowRight")
-      const text = "Pasted line /tmp/example.ts 123 \u0645\u0631\u062d\u0628\u0627\n".repeat(100) + "End of paste"
-      await page.evaluate((text) => navigator.clipboard.writeText(text), text)
-      await page.keyboard.press("ControlOrMeta+V")
-      await expect.poll(() => input.innerText()).toBe("B" + text + "efore " + suffix)
-      await expectCaretVisible(input)
-      await page.keyboard.type("!")
-      await expect.poll(() => input.innerText()).toBe("B" + text + "!efore " + suffix)
-      await expectCaretVisible(input)
-    })
-  }
-}
-
-for (const text of [
-  "single line <b> &amp;",
-  "first\nsecond",
-  "\n\n  indented\ttext  \n\nlast\n\n",
-  'literal <b>bold</b> &amp; & < > "quotes"\n<script>not code</script>\n<img src="example">',
-  "first\r\nsecond\rthird",
-]) {
-  test(`preserves text and native undo: ${JSON.stringify(text)}`, async ({ page }) => {
-    const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-    await page.evaluate((text) => navigator.clipboard.writeText(text), text)
-    await page.keyboard.press("ControlOrMeta+V")
-    const expected = text.replace(/\r\n?/g, "\n")
-    await expect.poll(() => input.innerText()).toBe(expected)
-    await expect(input.locator("b, script, img")).toHaveCount(0)
-    await page.keyboard.press("ControlOrMeta+Z")
-    await expect(input).toBeEmpty()
-    await page.keyboard.press("ControlOrMeta+Shift+Z")
-    await expect.poll(() => input.innerText()).toBe(expected)
-  })
-}
-
-test("replaces only the selected text and leaves the caret after the paste", async ({ page }) => {
-  const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-  await page.evaluate(() => navigator.clipboard.writeText("one\ntwo"))
-  await page.keyboard.type("before replace after")
-  await expect(input).toHaveText("before replace after")
-  await page.evaluate(() => document.fonts.ready)
-  const word = await input.evaluate((element) => {
-    const range = document.createRange()
-    range.setStart(element.firstChild!, 7)
-    range.setEnd(element.firstChild!, 14)
-    const rect = range.getBoundingClientRect()
-    return { x: rect.x, y: rect.y + rect.height / 2, width: rect.width }
-  })
-  await page.mouse.move(word.x, word.y)
-  await page.mouse.down()
-  await page.mouse.move(word.x + word.width, word.y, { steps: 5 })
-  await page.mouse.up()
-  await expect.poll(() => page.evaluate(() => window.getSelection()?.toString())).toBe("replace")
-  await page.keyboard.press("ControlOrMeta+V")
-  await expect.poll(() => input.innerText()).toBe("before one\ntwo after")
-  await page.keyboard.press("ControlOrMeta+Z")
-  await expect(input).toHaveText("before replace after")
-  await page.keyboard.press("ControlOrMeta+Shift+Z")
-  await expect.poll(() => input.innerText()).toBe("before one\ntwo after")
-  await page.keyboard.type("!")
-  await expect.poll(() => input.innerText()).toBe("before one\ntwo! after")
-})

packages/app/e2e/regression/composer.spec.ts

@@ -0,0 +1,271 @@
+import { expect, test, type Locator, type Page } from "@playwright/test"
+import { NO_PROVIDER, T0, provider } from "../utils/app"
+import { openDraft, openSession } from "../utils/workspace"
+
+test.use({ permissions: ["clipboard-read", "clipboard-write"] })
+
+async function draft(page: Page) {
+  const { editor } = await openDraft(page, { name: "ComposerDraft", provider: NO_PROVIDER })
+  await editor.click()
+  return editor
+}
+
+async function expectCaretVisible(input: Locator) {
+  await expect
+    .poll(() =>
+      input.evaluate((element) => {
+        const selection = window.getSelection()
+        if (!selection?.isCollapsed || !selection.rangeCount || !element.contains(selection.anchorNode)) return false
+        const caret = selection.getRangeAt(0).getBoundingClientRect()
+        const viewport = (element.closest("[data-scrollable]") ?? element).getBoundingClientRect()
+        return caret.height > 0 && caret.top >= viewport.top - 1 && caret.bottom <= viewport.bottom + 1
+      }),
+    )
+    .toBe(true)
+}
+
+test("keeps a 25000-line crash report editable in a new session", async ({ page }) => {
+  const input = await draft(page)
+  const text = "Thread 0 Crashed:\n" + "0   Example  0x0000000100000000 frame + 32\n".repeat(25000) + "End of report"
+  await page.evaluate((text) => navigator.clipboard.writeText(text), text)
+  const events = await input.evaluateHandle((element) => {
+    const events = { count: 0 }
+    element.addEventListener("input", () => events.count++)
+    return events
+  })
+  await page.keyboard.press("ControlOrMeta+V")
+  await expect.poll(async () => (await input.innerText()) === text).toBe(true)
+  expect(await events.evaluate((events) => events.count)).toBe(1)
+  await expect(input).toBeFocused()
+  await expectCaretVisible(input)
+  const scroll = page.locator('[data-component="composer-scroll"]')
+  await expect(scroll.locator(".scroll-view__viewport")).toHaveCSS("scrollbar-width", "none")
+  await expect(scroll.locator(".scroll-view__thumb")).toBeVisible()
+  await page.keyboard.type("!")
+  await expect.poll(async () => (await input.innerText()) === text + "!").toBe(true)
+  await expectCaretVisible(input)
+  const thumb = await scroll.locator(".scroll-view__thumb").boundingBox()
+  const bounds = await scroll.boundingBox()
+  if (!thumb || !bounds) throw new Error("Missing composer scrollbar bounds")
+  await page.mouse.move(thumb.x + thumb.width / 2, thumb.y + thumb.height / 2)
+  await page.mouse.down()
+  await page.mouse.move(thumb.x + thumb.width / 2, bounds.y + 8 + thumb.height / 2)
+  await page.mouse.up()
+  await expect(scroll.locator(".scroll-view__viewport")).toHaveJSProperty("scrollTop", 0)
+  await expect(input).toBeFocused()
+  await page.keyboard.press("ControlOrMeta+Home")
+  await page.keyboard.press("ControlOrMeta+End")
+  await expectCaretVisible(input)
+})
+
+for (const [width, direction] of [
+  [390, "rtl"],
+  [1280, "ltr"],
+] as const) {
+  test(`reveals a multiline paste in the middle at ${width}px in ${direction}`, async ({ page }) => {
+    const input = await draft(page)
+    await page.setViewportSize({ width, height: 800 })
+    await page.evaluate((direction) => (document.documentElement.dir = direction), direction)
+    const suffix = "\nExisting trailing content".repeat(100)
+    await input.fill("Before " + suffix)
+    await input.press("ControlOrMeta+Home")
+    await input.press("ArrowRight")
+    const text = "Pasted line /tmp/example.ts 123 \u0645\u0631\u062d\u0628\u0627\n".repeat(100) + "End of paste"
+    await page.evaluate((text) => navigator.clipboard.writeText(text), text)
+    await page.keyboard.press("ControlOrMeta+V")
+    await expect.poll(() => input.innerText()).toBe("B" + text + "efore " + suffix)
+    await expectCaretVisible(input)
+    await page.keyboard.type("!")
+    await expect.poll(() => input.innerText()).toBe("B" + text + "!efore " + suffix)
+    await expectCaretVisible(input)
+  })
+}
+
+test("pastes plain text without markup and keeps native undo", async ({ page }) => {
+  const input = await draft(page)
+  for (const text of [
+    "single line <b> &amp;",
+    "first\nsecond",
+    "\n\n  indented\ttext  \n\nlast\n\n",
+    'literal <b>bold</b> &amp; & < > "quotes"\n<script>not code</script>\n<img src="example">',
+    "first\r\nsecond\rthird",
+  ]) {
+    await page.evaluate((text) => navigator.clipboard.writeText(text), text)
+    await page.keyboard.press("ControlOrMeta+V")
+    const expected = text.replace(/\r\n?/g, "\n")
+    await expect.poll(() => input.innerText()).toBe(expected)
+    await expect(input.locator("b, script, img")).toHaveCount(0)
+    await page.keyboard.press("ControlOrMeta+Z")
+    await expect(input).toBeEmpty()
+    await page.keyboard.press("ControlOrMeta+Shift+Z")
+    await expect.poll(() => input.innerText()).toBe(expected)
+    await page.keyboard.press("ControlOrMeta+Z")
+    await expect(input).toBeEmpty()
+  }
+})
+
+test("replaces only the selected text and leaves the caret after the paste", async ({ page }) => {
+  const input = await draft(page)
+  await page.evaluate(() => navigator.clipboard.writeText("one\ntwo"))
+  await page.keyboard.type("before replace after")
+  await expect(input).toHaveText("before replace after")
+  await page.evaluate(() => document.fonts.ready)
+  const word = await input.evaluate((element) => {
+    const range = document.createRange()
+    range.setStart(element.firstChild!, 7)
+    range.setEnd(element.firstChild!, 14)
+    const rect = range.getBoundingClientRect()
+    return { x: rect.x, y: rect.y + rect.height / 2, width: rect.width }
+  })
+  await page.mouse.move(word.x, word.y)
+  await page.mouse.down()
+  await page.mouse.move(word.x + word.width, word.y, { steps: 5 })
+  await page.mouse.up()
+  await expect.poll(() => page.evaluate(() => window.getSelection()?.toString())).toBe("replace")
+  await page.keyboard.press("ControlOrMeta+V")
+  await expect.poll(() => input.innerText()).toBe("before one\ntwo after")
+  await page.keyboard.press("ControlOrMeta+Z")
+  await expect(input).toHaveText("before replace after")
+  await page.keyboard.press("ControlOrMeta+Shift+Z")
+  await expect.poll(() => input.innerText()).toBe("before one\ntwo after")
+  await page.keyboard.type("!")
+  await expect.poll(() => input.innerText()).toBe("before one\ntwo! after")
+})
+
+test("shows the dropzone and attaches a dropped file", async ({ page }) => {
+  const writes: { path: string; directory: string; body: string }[] = []
+  await openDraft(page, {
+    name: "ComposerDraft",
+    provider: NO_PROVIDER,
+    onFileWrite: (write) => void writes.push(write),
+  })
+  const surface = page.locator('[data-component="new-session"]')
+  const dropzone = page.locator('[data-component="session-dropzone"]')
+  const transfer = await page.evaluateHandle(() => {
+    const value = new DataTransfer()
+    value.items.add(new File(["Dropzone fixture"], "dropzone.txt", { type: "text/plain" }))
+    return value
+  })
+
+  await expect(dropzone).toHaveCount(0)
+  await surface.dispatchEvent("dragover", { dataTransfer: transfer })
+  await expect(dropzone).toHaveAttribute("data-visible", "true")
+  await expect(dropzone).toContainText("Drop files to add")
+
+  await surface.dispatchEvent("drop", { dataTransfer: transfer })
+  await expect(page.locator('[data-component="composer-attachments"]')).toContainText("dropzone.txt")
+  await expect(dropzone).toHaveCount(0)
+  // The file is uploaded to its own directory in the server's temporary directory, then attached by path.
+  await expect
+    .poll(() => writes)
+    .toEqual([
+      {
+        path: expect.stringMatching(/\/uploads\/[0-9a-f-]{36}\/dropzone\.txt$/),
+        directory: "C:/OpenCode/ComposerDraft",
+        body: "Dropzone fixture",
+      },
+    ])
+  await expect(page.locator('[data-component="upload-progress"]')).toHaveCount(0)
+  await expect(page.locator('[data-component="composer-attachments"]')).toContainText("dropzone.txt")
+})
+
+test("keeps a narrow session composer contained when invoking a built-in", async ({ page }) => {
+  await page.setViewportSize({ width: 800, height: 600 })
+  const { editor } = await openSession(page, { name: "ComposerCommand", provider: NO_PROVIDER })
+  const composer = page.locator('[data-component="composer"]')
+  await expect.poll(() => page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true)
+
+  await editor.fill("keep me")
+  await composer.getByRole("button", { name: "Add images and files" }).click()
+  await page.getByRole("menuitem", { name: "Commands" }).click()
+  await page.locator('[data-suggestion-id="model.choose"]').click()
+
+  await expect(editor).toHaveText("keep me")
+})
+
+const followUp = "Add follow-up, / for commands, @ for context…"
+for (const row of [
+  { state: "an idle", copy: "Ask anything, / for commands, @ for context…" },
+  { state: "a running", copy: followUp, sessionStatus: { ses_placeholder: { type: "running" } } },
+  {
+    state: "an idle queued",
+    copy: followUp,
+    inbox: [
+      {
+        id: "inb_placeholder",
+        sessionID: "ses_placeholder",
+        time: { created: T0 },
+        type: "user",
+        payload: { text: "Queued follow-up" },
+        delivery: "queue",
+      },
+    ],
+  },
+]) {
+  test(`shows the placeholder for ${row.state} session and the shell example in shell mode`, async ({ page }) => {
+    const { editor } = await openSession(page, {
+      name: "ComposerPlaceholder",
+      sessions: [{ id: "ses_placeholder", title: "Placeholder" }],
+      sessionStatus: row.sessionStatus,
+      inbox: row.inbox,
+    })
+    const scroll = page.locator('[data-component="composer-scroll"]')
+    await expect(scroll).toHaveText(row.copy)
+    await editor.pressSequentially("!")
+    await expect(scroll).toHaveText("Enter shell command… git status")
+  })
+}
+
+test("shows thinking on hover or a non-default selection while preserving keyboard access", async ({ page }) => {
+  const { editor: input } = await openSession(page, {
+    name: "ComposerThinking",
+    provider: provider({ id: "thinking-model", name: "Thinking Model", variants: { high: {} } }),
+  })
+  const composer = page.locator('[data-component="composer"]')
+  const control = composer.getByRole("button", { name: "Choose model variant" })
+  const option = (name: string) => page.getByRole("menuitemradio", { name, exact: true })
+
+  await page.mouse.move(0, 0)
+  await expect(control).toHaveText("default")
+  await expect(control).toHaveCSS("opacity", "0")
+  await expect(control).toHaveCSS("pointer-events", "none")
+
+  await input.hover()
+  await expect(control).toHaveCSS("opacity", "1")
+
+  // The menu keeps the control visible after the pointer leaves.
+  await control.click()
+  await expect(option("high")).toBeVisible()
+  await page.mouse.move(0, 0)
+  await expect(control).toHaveAttribute("aria-expanded", "true")
+  await expect(control).toHaveCSS("opacity", "1")
+  await option("high").click()
+
+  await input.click()
+  await page.mouse.move(0, 0)
+  await expect(control).toHaveText("high")
+  await expect(control).toHaveCSS("opacity", "1")
+
+  await control.click()
+  await option("default").click()
+  await input.click()
+  await page.mouse.move(0, 0)
+  await expect(control).toHaveText("default")
+  await expect(control).toHaveCSS("opacity", "0")
+
+  // The single-agent fixture has only Add and Model before the thinking trigger.
+  await page.keyboard.press("Tab")
+  await expect(composer.getByRole("button", { name: "Add images and files" })).toBeFocused()
+  await page.keyboard.press("Tab")
+  await expect(composer.getByRole("button", { name: "Thinking Model" })).toBeFocused()
+  await page.keyboard.press("Tab")
+  await expect(control).toBeFocused()
+  await expect(control).toHaveCSS("opacity", "1")
+  await page.keyboard.press("Enter")
+  await expect(option("default")).toBeFocused()
+  await expect(control).toHaveCSS("opacity", "1")
+  await page.keyboard.press("Escape")
+  await expect(control).toBeFocused()
+  await page.keyboard.press("Tab")
+  await expect(control).toHaveCSS("opacity", "0")
+})

packages/app/e2e/regression/cross-server-tab-close.spec.ts

@@ -1,112 +0,0 @@
-import { expect, test, type Page, type Route } from "@playwright/test"
-import { base64Encode } from "@opencode/util/encode"
-import { currentSession } from "../utils/mock-server"
-import { installSseTransport } from "../utils/sse-transport"
-
-const serverA = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const serverB = "http://127.0.0.1:4097"
-const sessionA = session("ses_server_a", "C:/server-a", "Server A session")
-const sessionB = session("ses_server_b", "/home/server-b", "Server B session")
-
-test("closing the active server's last tab opens the remaining server tab", async ({ page }) => {
-  const requests: string[] = []
-  await mockServers(page, requests)
-  await page.addInitScript(
-    ({ serverA, serverB, sessionA, sessionB }) => {
-      localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([
-          { type: "session", server: serverA, sessionId: sessionA },
-          { type: "session", server: serverB, sessionId: sessionB },
-        ]),
-      )
-    },
-    { serverA, serverB, sessionA: sessionA.id, sessionB: sessionB.id },
-  )
-
-  const hrefA = `/server/${base64Encode(serverA)}/session/${sessionA.id}`
-  const hrefB = `/server/${base64Encode(serverB)}/session/${sessionB.id}`
-  await page.goto(hrefA)
-  await expect(page.getByText(sessionA.title).first()).toBeVisible()
-
-  const tabA = page.locator(`[data-titlebar-tab-slot]:has(a[href="${hrefA}"])`)
-  await tabA.locator('[data-slot="tab-close"] button').click()
-
-  await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
-  await expect.poll(() => requests.some((url) => url.startsWith(`${serverB}/api/session/${sessionB.id}`))).toBe(true)
-  await expect(page.getByText(sessionB.title).first()).toBeVisible()
-  const sessionBRequests = requests.filter((url) => url.includes(`/session/${sessionB.id}`))
-  expect(sessionBRequests.every((url) => url.startsWith(serverB))).toBe(true)
-})
-
-function session(id: string, directory: string, title: string) {
-  return {
-    id,
-    slug: id,
-    projectID: `project-${id}`,
-    directory,
-    title,
-    version: "dev",
-    time: { created: 1, updated: 1 },
-  }
-}
-
-async function mockServers(page: Page, requests: string[]) {
-  await installSseTransport(page, { server: serverA })
-  await installSseTransport(page, { server: serverB })
-  await page.route("**/api/**", async (route) => {
-    const url = new URL(route.request().url())
-    if (url.origin !== serverA && url.origin !== serverB) return route.fallback()
-    requests.push(url.toString())
-    const current = url.origin === serverA ? sessionA : sessionB
-    const directory = url.searchParams.get("directory")
-    if (directory && directory !== current.directory) return json(route, { name: "InvalidDirectory" }, 500)
-    if (url.pathname === "/api/info")
-      return json(route, { version: "test", pid: 1, urls: [url.origin], paths: { tmp: "/tmp/opencode" } })
-    if (url.pathname === "/api/session") return json(route, { data: [currentSession(current)], cursor: {} })
-    if (url.pathname === "/api/session/active") return json(route, { data: {} })
-    if (url.pathname === `/api/session/${current.id}`) return json(route, { data: currentSession(current) })
-    if (url.pathname === `/api/session/${current.id}/message`) return json(route, { data: [], cursor: {} })
-    if (["/api/agent", "/api/provider", "/api/model", "/api/command", "/api/reference"].includes(url.pathname))
-      return json(route, { location: { directory: current.directory }, data: [] })
-    if (url.pathname === "/api/model/default")
-      return json(route, { location: { directory: current.directory }, data: null })
-    if (url.pathname === "/api/permission/request" || url.pathname === "/api/question/request")
-      return json(route, { location: { directory: current.directory }, data: [] })
-    if (url.pathname === "/api/mcp") return json(route, { location: { directory: current.directory }, data: [] })
-    if (url.pathname === "/api/mcp/resource")
-      return json(route, { location: { directory: current.directory }, data: { resources: [], templates: [] } })
-    if (url.pathname === "/api/project") {
-      const project = {
-        id: current.projectID,
-        canonical: current.directory,
-        vcs: "git",
-        time: { created: 1, updated: 1 },
-        sandboxes: [],
-      }
-      return json(route, [project])
-    }
-    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/vcs")
-      return json(route, {
-        location: { directory: current.directory },
-        data: { branch: "main", defaultBranch: "main" },
-      })
-    return json(route, {})
-  })
-}
-
-function json(route: Route, body: unknown, status = 200) {
-  return route.fulfill({
-    status,
-    contentType: "application/json",
-    headers: { "access-control-allow-origin": "*" },
-    body: JSON.stringify(body),
-  })
-}

packages/app/e2e/regression/file-browser-sidebar-tab-switch.spec.ts

@@ -1,147 +0,0 @@
-import { base64Encode } from "@opencode/util/encode"
-import { expect, test, type Page } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:/OpenCode/FileBrowserSidebar"
-const projectID = "proj_file_browser_sidebar"
-const sessionID = "ses_file_browser_sidebar"
-const title = "File browser sidebar"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const files = Array.from({ length: 80 }, (_, index) => `file-${String(index).padStart(2, "0")}.ts`)
-// Marks the file-browser sidebar DOM node so a remount (fresh node) is detectable.
-const PROBE = "original"
-
-test.use({ viewport: { width: 1440, height: 900 } })
-
-// The file-browser sidebar must stay mounted across preview/pinned file-tab
-// switches. Remounting resets scroll and filter state.
-test("keeps the file-browser sidebar mounted when switching file tabs", async ({ page }) => {
-  await setup(page)
-
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, title)
-
-  const panel = page.locator("#review-panel")
-  await panel.getByRole("button", { name: "Open file" }).click()
-  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-
-  const sidebar = panel.locator('[data-component="session-review-v2-sidebar-root"]')
-  await expect(sidebar).toBeVisible()
-  await expect(panel.getByRole("button", { name: "file-00.ts" })).toBeVisible()
-
-  await panel.getByRole("button", { name: "file-00.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-00.ts" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("contents:file-00.ts", { exact: true })).toBeVisible()
-
-  const viewport = panel.locator('[data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
-  await viewport.hover()
-  await page.mouse.wheel(0, 100_000)
-  await expect
-    .poll(() => viewport.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-    .toBeLessThanOrEqual(1)
-  const scrolled = await viewport.evaluate((element) => element.scrollTop)
-  expect(scrolled).toBeGreaterThan(0)
-  await writeProbe(page)
-
-  await panel.getByRole("button", { name: "file-79.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-79.ts" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("contents:file-79.ts", { exact: true })).toBeVisible()
-  expect(await readProbe(page)).toBe(PROBE)
-  await expect.poll(() => viewport.evaluate((element) => element.scrollTop)).toBe(scrolled)
-
-  await panel.getByRole("button", { name: "file-78.ts" }).dblclick()
-  await expect(panel.getByRole("tab", { name: "file-78.ts" })).toHaveAttribute("data-selected", "")
-  await panel.getByRole("button", { name: "file-79.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-79.ts" })).toHaveAttribute("data-selected", "")
-  await panel.getByRole("tab", { name: "file-78.ts" }).click()
-  await expect(panel.getByRole("tab", { name: "file-78.ts" })).toHaveAttribute("data-selected", "")
-  expect(await readProbe(page)).toBe(PROBE)
-  await expect.poll(() => viewport.evaluate((element) => element.scrollTop)).toBe(scrolled)
-})
-
-type Probed = HTMLElement & { __e2eProbe?: string }
-
-async function writeProbe(page: Page) {
-  await page.locator('#review-panel [data-component="session-review-v2-sidebar-root"]').evaluate((el, probe) => {
-    ;(el as Probed).__e2eProbe = probe
-  }, PROBE)
-}
-
-async function readProbe(page: Page) {
-  return page
-    .locator('#review-panel [data-component="session-review-v2-sidebar-root"]')
-    .evaluate((el) => (el as Probed).__e2eProbe)
-}
-
-async function setup(page: Page) {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "file-browser-sidebar",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "test" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: sessionID,
-        projectID,
-        directory,
-        title,
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    vcsDiff: [],
-    fileList: (path) => {
-      if (path) return []
-      return files.map((name) => ({
-        name,
-        path: name,
-        absolute: `${directory}/${name}`,
-        type: "file" as const,
-        ignored: false,
-      }))
-    },
-    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
-    pageMessages: () => ({ items: [] }),
-  })
-
-  await page.addInitScript(
-    ({ directory, server, sessionID, tabKey }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem("opencode.global.dat:layout", JSON.stringify({ review: { diffStyle: "split" } }))
-      localStorage.setItem("opencode.window.browser.dat:tabs.panes", JSON.stringify({ [tabKey]: { review: true } }))
-      localStorage.setItem(
-        "opencode.global.dat:review-panel-v2",
-        JSON.stringify({ sidebarOpened: true, sidebarWidth: 240, expandMode: "collapse" }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server, sessionId: sessionID }]),
-      )
-    },
-    { directory, server, sessionID, tabKey: `${server}\n/server/${base64Encode(server)}/session/${sessionID}` },
-  )
-}

packages/app/e2e/regression/home-session-actions.spec.ts

@@ -1,108 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test("renames, exports, and deletes a home session from its context menu", async ({ page }) => {
-  const sessions = fixture.sessions.map((session) => ({ ...session }))
-  await mockOpenCodeServer(page, {
-    sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-  })
-  await page.route("**/api/session/*", async (route) => {
-    if (route.request().method() !== "PATCH") return route.fallback()
-    const sessionID = new URL(route.request().url()).pathname.split("/").at(-1)
-    const session = sessions.find((item) => item.id === sessionID)
-    const payload: unknown = route.request().postDataJSON()
-    if (!payload || typeof payload !== "object" || !("title" in payload) || typeof payload.title !== "string")
-      throw new Error("Invalid rename payload")
-    if (session) session.title = payload.title
-    await route.fulfill({ status: 204, headers: { "access-control-allow-origin": "*" } })
-  })
-  await page.addInitScript((directory) => {
-    localStorage.setItem(
-      "opencode.global.dat:server",
-      JSON.stringify({
-        projects: { local: [{ worktree: directory, expanded: true }] },
-        lastProject: { local: directory },
-      }),
-    )
-  }, fixture.directory)
-
-  await page.goto("/")
-  const row = page.locator('[data-component="home-session-row"]').filter({ hasText: fixture.expected.targetTitle })
-  await expect(row).toBeVisible()
-  const container = page.locator(`[data-component="home-session-row-container"][data-session-id="${fixture.targetID}"]`)
-  const titleBox = await container.locator('[data-component="home-session-title"]').boundingBox()
-  const avatarBox = await container.locator('[data-component="project-avatar-v2"]').boundingBox()
-  await expect(container.getByRole("button", { name: "More options" })).toHaveCount(0)
-
-  await row.focus()
-  await row.press("Shift+F10")
-  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeVisible()
-  await page.keyboard.press("Escape")
-  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeHidden()
-  await expect(row).toBeFocused()
-
-  const rowBox = await row.boundingBox()
-  await row.click({ button: "right", position: { x: 48, y: 12 } })
-  await expect(page).toHaveURL("/")
-  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeVisible()
-  await expect(page.getByRole("menuitem", { name: "Export…" })).toBeVisible()
-  await expect(page.getByRole("menuitem", { name: "Delete…" })).toBeVisible()
-  const menuBox = await page.locator('[data-component="menu-v2-content"]').boundingBox()
-  expect(Math.abs((menuBox?.x ?? 0) - (rowBox?.x ?? 0) - 48)).toBeLessThan(4)
-
-  await page.getByRole("menuitem", { name: "Rename" }).click()
-  const title = page.locator('[data-component="home-session-rename"]')
-  await expect(title).toBeFocused()
-  await expect(title).toHaveValue(fixture.expected.targetTitle)
-  const editorBox = await title.boundingBox()
-  const editingAvatarBox = await container.locator('[data-component="project-avatar-v2"]').boundingBox()
-  expect(editorBox?.x).toBe(titleBox?.x)
-  expect(editingAvatarBox).toEqual(avatarBox)
-  expect(
-    await title.evaluate((element) => ({
-      outline: getComputedStyle(element).outlineStyle,
-      shadow: getComputedStyle(element).boxShadow,
-    })),
-  ).toEqual({ outline: "none", shadow: "none" })
-  expect(await container.evaluate((element) => getComputedStyle(element).outlineStyle)).toBe("none")
-  await title.fill("Renamed from Home")
-  const renamed = page.waitForRequest(
-    (request) =>
-      request.method() === "PATCH" && new URL(request.url()).pathname.endsWith(`/session/${fixture.targetID}`),
-  )
-  await title.press("Enter")
-  expect((await renamed).postDataJSON()).toEqual({ title: "Renamed from Home" })
-  let renamedRow = page.locator('[data-component="home-session-row"]').filter({ hasText: "Renamed from Home" })
-  await expect(renamedRow).toBeVisible()
-
-  await renamedRow.click()
-  await expect(page).toHaveURL(new RegExp(`/session/${fixture.targetID}$`))
-  await expect(page.locator('[data-slot="titlebar-tabs"] a').filter({ hasText: "Renamed from Home" })).toBeVisible()
-  await page.getByRole("button", { name: "Home" }).click()
-  await expect(page).toHaveURL("/")
-  renamedRow = page.locator('[data-component="home-session-row"]').filter({ hasText: "Renamed from Home" })
-  await expect(renamedRow).toBeVisible()
-
-  await renamedRow.click({ button: "right" })
-  const download = page.waitForEvent("download")
-  const exportItem = page.getByRole("menuitem", { name: "Export…" })
-  await exportItem.click()
-  expect((await download).suggestedFilename()).toBe("renamed-from-home.json")
-  await expect(exportItem).toBeHidden()
-
-  await renamedRow.click({ button: "right" })
-  await page.getByRole("menuitem", { name: "Delete…" }).click()
-  const dialog = page.getByRole("dialog")
-  await expect(dialog).toContainText('Delete session "Renamed from Home"?')
-  const removed = page.waitForRequest(
-    (request) => request.method() === "DELETE" && new URL(request.url()).pathname.endsWith(`/${fixture.targetID}`),
-  )
-  await dialog.getByRole("button", { name: "Delete session" }).click()
-  await removed
-  await expect(renamedRow).toBeHidden()
-})

packages/app/e2e/regression/home.spec.ts

@@ -0,0 +1,223 @@
+import { expect, test, type Page } from "@playwright/test"
+import { holdRoute, seed, sessionHref } from "../utils/app"
+import { fixture, mockStressTimeline } from "../utils/session-fixture"
+import { expectAppVisible } from "../utils/waits"
+
+test.use({ serviceWorkers: "block" })
+
+const row = (page: Page, title: string) =>
+  page.locator('[data-component="home-session-row"]').filter({ hasText: title })
+
+async function openHome(page: Page, input: Parameters<typeof mockStressTimeline>[1] = {}) {
+  await mockStressTimeline(page, input)
+  await seed(page, {
+    projects: { local: [{ worktree: fixture.directory, expanded: true }] },
+    lastProject: { local: fixture.directory },
+  })
+  await page.goto("/")
+}
+
+test("the session context menu renames, exports, and deletes a Home session", async ({ page }) => {
+  await openHome(page)
+  const target = row(page, fixture.expected.targetTitle)
+  await expect(target).toBeVisible()
+
+  await target.focus()
+  await target.press("Shift+F10")
+  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeVisible()
+  await page.keyboard.press("Escape")
+  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeHidden()
+  await expect(target).toBeFocused()
+
+  const box = await target.boundingBox()
+  await target.click({ button: "right", position: { x: 48, y: 12 } })
+  await expect(page).toHaveURL("/")
+  await expect(page.getByRole("menuitem")).toHaveText(["Rename", "Export…", "Delete…"])
+  const menu = await page.locator('[data-component="menu-v2-content"]').boundingBox()
+  expect(Math.abs((menu?.x ?? 0) - (box?.x ?? 0) - 48)).toBeLessThan(4)
+
+  await page.getByRole("menuitem", { name: "Rename" }).click()
+  const title = page.locator('[data-component="home-session-rename"]')
+  await expect(title).toBeFocused()
+  await expect(title).toHaveValue(fixture.expected.targetTitle)
+  await title.fill("Renamed from Home")
+  const renamed = page.waitForRequest(
+    (request) =>
+      request.method() === "PATCH" && new URL(request.url()).pathname.endsWith(`/session/${fixture.targetID}`),
+  )
+  await title.press("Enter")
+  expect((await renamed).postDataJSON()).toEqual({ title: "Renamed from Home" })
+  const renamedRow = row(page, "Renamed from Home")
+  await renamedRow.click()
+  await expect(page).toHaveURL(new RegExp(`/session/${fixture.targetID}$`))
+  await expect(page.locator('[data-slot="titlebar-tabs"] a').filter({ hasText: "Renamed from Home" })).toBeVisible()
+  await page.getByRole("button", { name: "Home" }).click()
+  await expect(page).toHaveURL("/")
+
+  await renamedRow.click({ button: "right" })
+  const download = page.waitForEvent("download")
+  await page.getByRole("menuitem", { name: "Export…" }).click()
+  expect((await download).suggestedFilename()).toBe("renamed-from-home.json")
+
+  await renamedRow.click({ button: "right" })
+  await page.getByRole("menuitem", { name: "Delete…" }).click()
+  const dialog = page.getByRole("dialog")
+  await expect(dialog).toContainText('Delete session "Renamed from Home"?')
+  const removed = page.waitForRequest(
+    (request) => request.method() === "DELETE" && new URL(request.url()).pathname.endsWith(`/${fixture.targetID}`),
+  )
+  await dialog.getByRole("button", { name: "Delete session" }).click()
+  await removed
+  await expect(renamedRow).toBeHidden()
+})
+
+test("Home shows loaded sessions before the location request resolves", async ({ page }) => {
+  const location = await holdRoute(page, (url) => url.pathname === "/api/location")
+  await openHome(page)
+  await expectAppVisible(row(page, fixture.expected.sourceTitle))
+  location.release()
+})
+
+test("Home and the directory picker load without newer browser APIs", async ({ page }) => {
+  await page.addInitScript(() => {
+    // Safari 16.6 has none of these APIs. Remove them before the web entry runs.
+    delete (Map as Partial<typeof Map>).groupBy
+    delete (Promise as Partial<typeof Promise>).withResolvers
+    delete (Promise as Partial<typeof Promise>).try
+  })
+  await openHome(page, { fileList: () => [] })
+  const target = row(page, fixture.expected.targetTitle)
+  await expect(target).toBeVisible()
+
+  await page.getByRole("button", { name: "Add project", exact: true }).click()
+  const dialog = page.getByRole("dialog")
+  await expect(dialog.getByRole("button", { name: "Select folder", exact: true })).toBeEnabled()
+  await dialog.getByRole("button", { name: "Cancel", exact: true }).click()
+  await expect(dialog).toBeHidden()
+  await expect(target).toBeVisible()
+})
+
+const recovery = "C:/OpenCode/Worktrees/project-menu-recovery"
+const worktree =
+  "C:/OpenCode/Worktrees/project-42/long-folder-name-for-checking-wrapped-worktree-paths/another-long-folder-name"
+
+for (const state of [
+  { name: "local", directory: fixture.directory, icon: "monitor" },
+  { name: "worktree", directory: worktree, icon: "outline-worktree" },
+  { name: "closed worktree", directory: recovery, icon: "outline-worktree", recovery: "closed" },
+  { name: "unopened worktree", directory: recovery, icon: "outline-worktree", recovery: "unopened" },
+]) {
+  test(`the session project menu opens settings and Home for a ${state.name} project`, async ({ page }) => {
+    await page.setViewportSize({ width: 1440, height: 900 })
+    const workspace = state.directory !== fixture.directory
+    const messages = Promise.withResolvers<void>()
+    await mockStressTimeline(page, {
+      directory: state.directory,
+      // An image icon keeps the avatar initial out of the menu item text.
+      project: {
+        ...fixture.project,
+        sandboxes: workspace ? [state.directory] : [],
+        icon: {
+          url: `data:image/svg+xml,${encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"/>')}`,
+        },
+      },
+      sessions: fixture.sessions.map((item) => ({ ...item, directory: state.directory })),
+      beforeMessagesResponse: (input) =>
+        state.recovery && input.sessionID === fixture.targetID ? messages.promise : Promise.resolve(),
+    })
+    // An unopened project has no stored project list or tabs.
+    if (state.recovery !== "unopened")
+      await seed(page, {
+        projects: { local: [{ worktree: fixture.directory, expanded: true }] },
+        lastProject: { local: fixture.directory },
+        tabs: [fixture.sourceID, fixture.targetID],
+      })
+    const name = fixture.project.name
+    if (state.recovery === "closed") {
+      await page.goto("/")
+      const project = page.locator('[data-component="home-project-row"]').filter({ hasText: name })
+      await project.locator("..").getByRole("button", { name: "More options", exact: true }).click()
+      await page.getByRole("menuitem", { name: "Close", exact: true }).click()
+      await expect(project).toHaveCount(0)
+      await page.locator(`[data-titlebar-tab-link][href="${sessionHref(fixture.targetID)}"]`).click()
+    }
+    if (state.recovery !== "closed") await page.goto(sessionHref(fixture.targetID))
+
+    const header = page.locator("[data-session-title]")
+    const trigger = header.getByRole("button", { name, exact: true })
+    const menu = page.getByRole("menu", { name, exact: true })
+    const projectItem = menu.getByRole("menuitem", { name, exact: true })
+    const pathItem = menu.getByRole("menuitem", { name: state.directory, exact: true })
+    const settings = page.getByTestId("settings-screen")
+    await expect(header.getByRole("heading")).toHaveText(fixture.expected.targetTitle)
+    for (const loaded of state.recovery ? [false, true] : [true]) {
+      if (state.recovery && loaded) {
+        messages.resolve()
+        await expect(header.getByRole("button", { name: "More options", exact: true })).toBeVisible()
+      }
+      await expect(trigger.locator("use")).toHaveAttribute("href", `#opencode-v2-icon-${state.icon}`)
+      await trigger.click()
+      await expect(menu.getByRole("menuitem")).toHaveText([name, state.directory, "Edit project"])
+      await expect(pathItem).toBeDisabled()
+      await page.keyboard.press("Escape")
+      await expect(menu).toBeHidden()
+      await expect(trigger).toBeFocused()
+      await trigger.press("ArrowDown")
+      await expect(projectItem).toBeFocused()
+      await page.keyboard.press("ArrowDown")
+      await expect(pathItem).toBeFocused()
+      for (const key of ["Enter", "Space"]) {
+        await page.keyboard.press(key)
+        await expect(menu).toBeVisible()
+        await expect(pathItem).toBeFocused()
+      }
+      await page.keyboard.press("ArrowDown")
+      await page.keyboard.press("Enter")
+      await expect(settings.getByRole("textbox", { name: "Project name", exact: true })).toHaveValue(name)
+      await settings.getByRole("button", { name: "Back to projects", exact: true }).click()
+      await settings.getByRole("button", { name: "Back to app", exact: true }).click()
+      await expect(settings).toBeHidden()
+    }
+
+    await trigger.click()
+    await projectItem.click()
+    await expect(page).toHaveURL(new URL("/", page.url()).href)
+    const project = page.locator('[data-component="home-project-row"]').filter({ hasText: name })
+    await expect(project).toHaveAttribute("data-selected", "")
+    await expect(
+      page.locator(`[data-component="home-session-row-container"][data-session-id="${fixture.targetID}"]`),
+    ).toBeVisible()
+  })
+}
+
+test("the project menu path arrow has a glyph when the page has an older icon sprite", async ({ page }) => {
+  await mockStressTimeline(page)
+  await seed(page, { projects: { local: [{ worktree: fixture.directory, expanded: true }] }, tabs: [fixture.targetID] })
+  // A page cached before the arrow icon shipped carries a sprite without it.
+  await page.route(
+    (url) => url.pathname === sessionHref(fixture.targetID),
+    async (route) => {
+      const response = await route.fetch()
+      await route.fulfill({
+        response,
+        body: (await response.text()).replace(
+          '<div id="root"',
+          '<svg id="opencode-v2-icon-sprite" width="0" height="0" aria-hidden="true"><symbol id="opencode-v2-icon-monitor" viewBox="0 0 16 16"><path d="M1 1h14v14H1z"/></symbol></svg><div id="root"',
+        ),
+      })
+    },
+  )
+  await page.goto(sessionHref(fixture.targetID))
+  const header = page.locator("[data-session-title]")
+  await expect(header.getByRole("heading")).toHaveText(fixture.expected.targetTitle)
+  await header.getByRole("button", { name: fixture.project.name, exact: true }).click()
+  const arrow = page
+    .getByRole("menu")
+    .getByRole("menuitem", { name: fixture.directory, exact: true })
+    .locator('[data-slot="session-project-open-icon"]')
+  await expect(arrow).toHaveCount(1)
+  await expect
+    .poll(() => arrow.locator("svg").evaluate((element: SVGSVGElement) => element.getBBox().width))
+    .toBeGreaterThan(0)
+  await expect(page.locator("#opencode-v2-icon-sprite")).toHaveCount(1)
+})

packages/app/e2e/regression/inactive-tab-prefetch.spec.ts

@@ -1,75 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-import { fixture } from "../performance/timeline/session-timeline-stress.fixture"
-import { installStressSessionTabs, stressSessionHref } from "../performance/timeline/timeline-test-helpers"
-
-test("inactive tabs load attention, but read transcript and inbox only on selection", async ({ page }) => {
-  const reads: string[] = []
-  const mutations: string[] = []
-  const errors: string[] = []
-  page.on("pageerror", (error) => errors.push(error.message))
-  page.on("response", (response) => {
-    if (new URL(response.url()).pathname.startsWith("/api/") && !response.ok())
-      errors.push(`HTTP ${response.status()}: ${response.url()}`)
-  })
-  const state = { text: "Original fixture answer" }
-  page.on("request", (request) => {
-    const path = new URL(request.url()).pathname
-    if (!path.startsWith("/api/")) return
-    if (request.method() === "GET") reads.push(path)
-    if (request.method() === "DELETE" || /\/(interrupt|prompt)$/.test(path)) mutations.push(path)
-  })
-  await mockOpenCodeServer(page, {
-    ...fixture,
-    pageMessages: (id) => ({
-      items: [
-        { id: `msg_${id}_user`, type: "user", text: "Review the renderer change", time: { created: 1 } },
-        {
-          id: `msg_${id}_assistant`,
-          type: "assistant",
-          agent: "build",
-          model: { id: "claude-opus-4-6", providerID: "opencode" },
-          content: [{ type: "text", text: state.text }],
-          time: { created: 2, completed: 3 },
-        },
-      ],
-    }),
-  })
-  await installStressSessionTabs(page, { sessionIDs: [fixture.sourceID, fixture.targetID, fixture.childID] })
-  const attention = Promise.all(
-    [fixture.targetID, fixture.childID].flatMap((id) =>
-      ["permission", "form"].map((kind) =>
-        page.waitForResponse((response) => new URL(response.url()).pathname === `/api/session/${id}/${kind}`),
-      ),
-    ),
-  )
-  await page.goto(stressSessionHref(fixture.sourceID))
-  await expectSessionTitle(page, fixture.expected.sourceTitle)
-  await expect(page.locator(`[data-timeline-part-id="msg_${fixture.sourceID}_assistant:text:0"]`)).toContainText(
-    state.text,
-  )
-  await attention
-  const child = page
-    .locator("[data-titlebar-tab-slot]")
-    .filter({ has: page.locator(`a[href="${stressSessionHref(fixture.childID)}"]`) })
-  await child.getByRole("button", { name: "Close tab", exact: true }).click()
-  await expect(child).toHaveCount(0)
-  state.text = "Latest fixture answer after tab restoration"
-  await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(fixture.targetID)}"]`).click()
-  await expectSessionTitle(page, fixture.expected.targetTitle)
-  await expect(page.locator(`[data-timeline-part-id="msg_${fixture.targetID}_assistant:text:0"]`)).toContainText(
-    state.text,
-  )
-  for (const id of [fixture.sourceID, fixture.targetID]) {
-    expect(reads.filter((path) => path === `/api/session/${id}/message`)).toHaveLength(1)
-    expect(reads.filter((path) => path === `/api/session/${id}/inbox`)).toHaveLength(1)
-  }
-  expect(
-    reads.filter(
-      (path) => path === `/api/session/${fixture.childID}/message` || path === `/api/session/${fixture.childID}/inbox`,
-    ),
-  ).toEqual([])
-  expect(mutations).toEqual([])
-  expect(errors).toEqual([])
-})

packages/app/e2e/regression/mcp-workspace-toggle.spec.ts

@@ -1,199 +1,141 @@
-import { base64Encode } from "@opencode/util/encode"
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
+import { expect, test, type Page } from "@playwright/test"
+import { NO_PROVIDER, sessionHref } from "../utils/app"
+import type { MockServerConfig } from "../utils/mock-server"
+import { mockWorkspace } from "../utils/workspace"
 import { expectSessionTitle } from "../utils/waits"
 
 const directory = "C:\\OpenCode\\main"
 const workspace = "C:\\OpenCode\\worktree"
-const projectID = "proj_mcp_workspace"
 const sessionID = "ses_mcp_workspace"
 const title = "Workspace MCP routing"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+
+type Surface = "popover" | "dialog"
+
+// A session in a worktree of the project. The harness answers the MCP list for each location directory and stores
+// connect/disconnect results per directory; `requests` records every MCP request and the directory it targeted.
+// The popover belongs to the summary extension; the dialog (Ctrl+;) is the app's own MCP toggle.
+async function open(page: Page, input: { surface: Surface } & Pick<MockServerConfig, "mcp" | "onMcpAction">) {
+  const requests: { path: string; directory: string }[] = []
+  page.on("request", (request) => {
+    const url = new URL(request.url())
+    if (request.method() === "OPTIONS" || !/^\/api\/(?:experimental\/)?mcp(?:\/|$)/.test(url.pathname)) return
+    requests.push({ path: url.pathname, directory: url.searchParams.get("location[directory]") || directory })
+  })
+  await mockWorkspace(page, {
+    name: "mcp-workspace",
+    directory,
+    project: { sandboxes: [workspace] },
+    provider: NO_PROVIDER,
+    sessions: [{ id: sessionID, title, directory: workspace }],
+    seed: { settings: { keybinds: { "mcp.toggle": "ctrl+;" } } },
+    mcp: input.mcp,
+    onMcpAction: input.onMcpAction,
+  })
+  await page.goto(sessionHref(sessionID))
+  await expectSessionTitle(page, title)
+  await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
+  const panel = page.getByRole("dialog", { name: input.surface === "popover" ? "MCP" : "MCPs", exact: true })
+  const show = async () => {
+    if (input.surface === "dialog") return page.keyboard.press("Control+;")
+    await page.getByRole("button", { name: "Session details", exact: true }).click()
+    await page.getByRole("button", { name: "MCP", exact: true }).click()
+  }
+  await show()
+  await expect(panel.getByText("figma-desktop", { exact: true })).toBeVisible()
+  return { requests, panel, show, toggle: panel.getByRole("switch") }
+}
 
 for (const shared of [true, false]) {
   test(`toggles the workspace MCP when the default location ${shared ? "has" : "does not have"} the server`, async ({
     page,
-  }, testInfo) => {
-    const connected = new Set<string>()
-    const requests: { path: string; directory: string }[] = []
-    await mockOpenCodeServer(page, {
-      directory,
-      project: {
-        id: projectID,
-        worktree: directory,
-        vcs: "git",
-        name: "mcp-workspace",
-        time: { created: 1700000000000, updated: 1700000000000 },
-        sandboxes: [workspace],
-      },
-      provider: { all: [], connected: [], default: {} },
-      sessions: [{ id: sessionID, projectID, directory: workspace, title }],
-      pageMessages: () => ({ items: [] }),
+  }) => {
+    const actions: Parameters<NonNullable<MockServerConfig["onMcpAction"]>>[0][] = []
+    const view = await open(page, {
+      surface: "popover",
+      mcp: (target) =>
+        !shared && target !== workspace ? [] : [{ name: "figma-desktop", status: { status: "disabled" } }],
+      onMcpAction: (action) => void actions.push(action),
     })
-    await page.route(/\/api\/(?:experimental\/)?mcp(?:[/?]|$)/, async (route) => {
-      if (route.request().method() === "OPTIONS") return route.fallback()
-      const url = new URL(route.request().url())
-      const target = url.searchParams.get("location[directory]") ?? directory
-      requests.push({ path: url.pathname, directory: target })
-      if (url.pathname === "/api/experimental/mcp/figma-desktop/connect") {
-        connected.add(target)
-        return route.fulfill({ status: 204 })
-      }
-      if (url.pathname === "/api/experimental/mcp/figma-desktop/disconnect") {
-        connected.delete(target)
-        return route.fulfill({ status: 204 })
-      }
-      return route.fulfill({
-        json: {
-          location: { directory: target },
-          data:
-            url.pathname === "/api/mcp/resource"
-              ? { resources: [], templates: [] }
-              : !shared && target !== workspace
-                ? []
-                : [{ name: "figma-desktop", status: { status: connected.has(target) ? "connected" : "disabled" } }],
-        },
-      })
+    await expect(view.toggle).not.toBeChecked()
+    await expect(view.toggle).toBeEnabled()
+    view.requests.length = 0
+
+    await view.panel.locator('[data-slot="switch-control"]').click()
+    await expect(view.toggle).toBeChecked()
+    await expect(view.toggle).toBeEnabled()
+    expect(actions).toEqual([{ server: "figma-desktop", action: "connect", directory: workspace }])
+    expect(view.requests).toContainEqual({ path: "/api/experimental/mcp/figma-desktop/connect", directory: workspace })
+    expect(view.requests).toContainEqual({ path: "/api/mcp/resource", directory: workspace })
+    expect(view.requests.every((request) => request.directory === workspace)).toBe(true)
+
+    view.requests.length = 0
+    await view.panel.getByText("figma-desktop", { exact: true }).click()
+    await expect(view.toggle).not.toBeChecked()
+    await expect(view.toggle).toBeEnabled()
+    expect(actions).toEqual([
+      { server: "figma-desktop", action: "connect", directory: workspace },
+      { server: "figma-desktop", action: "disconnect", directory: workspace },
+    ])
+    expect(view.requests).toContainEqual({
+      path: "/api/experimental/mcp/figma-desktop/disconnect",
+      directory: workspace,
     })
-
-    await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-    await expectSessionTitle(page, title)
-    await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
-    await page.getByRole("button", { name: "Session details", exact: true }).click()
-    await page.getByRole("button", { name: "MCP", exact: true }).click()
-    const dialog = page.getByRole("dialog", { name: "MCP", exact: true })
-    await expect(dialog.getByText("figma-desktop", { exact: true })).toBeVisible()
-    const toggle = dialog.getByRole("switch")
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    requests.length = 0
-
-    await dialog.locator('[data-slot="switch-control"]').click()
-    await expect(toggle).toBeChecked()
-    await expect(toggle).toBeEnabled()
-    expect(connected).toEqual(new Set([workspace]))
-    expect(requests).toContainEqual({ path: "/api/experimental/mcp/figma-desktop/connect", directory: workspace })
-    expect(requests).toContainEqual({ path: "/api/mcp/resource", directory: workspace })
-    expect(requests.every((request) => request.directory === workspace)).toBe(true)
-    await testInfo.attach("workspace-connected", { body: await page.screenshot(), contentType: "image/png" })
-
-    requests.length = 0
-    await dialog.getByText("figma-desktop", { exact: true }).click()
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    expect(connected.size).toBe(0)
-    expect(requests).toContainEqual({ path: "/api/experimental/mcp/figma-desktop/disconnect", directory: workspace })
-    expect(requests.every((request) => request.directory === workspace)).toBe(true)
+    expect(view.requests.every((request) => request.directory === workspace)).toBe(true)
   })
 }
 
 for (const surface of ["popover", "dialog"] as const) {
-  test(`shows connection failures from the MCP ${surface} and allows reconnecting`, async ({ page }, testInfo) => {
+  test(`shows connection failures from the MCP ${surface} and allows reconnecting`, async ({ page }) => {
     const error = "Streamable HTTP error: Error POSTing to endpoint: 404 Not Found"
-    const state = { fail: true, status: surface === "popover" ? "failed" : "disabled" }
-    const requests: { path: string; directory: string }[] = []
-    await page.addInitScript(() => {
-      localStorage.setItem("settings.v3", JSON.stringify({ keybinds: { "mcp.toggle": "ctrl+;" } }))
-    })
-    await mockOpenCodeServer(page, {
-      directory,
-      project: {
-        id: projectID,
-        worktree: directory,
-        vcs: "git",
-        name: "mcp-workspace",
-        time: { created: 1700000000000, updated: 1700000000000 },
-        sandboxes: [workspace],
-      },
-      provider: { all: [], connected: [], default: {} },
-      sessions: [{ id: sessionID, projectID, directory: workspace, title }],
-      pageMessages: () => ({ items: [] }),
-    })
-    await page.route(/\/api\/(?:experimental\/)?mcp(?:[/?]|$)/, async (route) => {
-      if (route.request().method() === "OPTIONS") return route.fallback()
-      const url = new URL(route.request().url())
-      const target = url.searchParams.get("location[directory]") ?? directory
-      requests.push({ path: url.pathname, directory: target })
-      if (url.pathname === "/api/experimental/mcp/figma-desktop/disconnect") {
-        state.status = "disabled"
-        return route.fulfill({ status: 204 })
-      }
-      if (url.pathname === "/api/experimental/mcp/figma-desktop/connect") {
-        state.status = state.fail ? "failed" : "connected"
-        // Connection failures are reported by the refreshed status, not the HTTP response.
-        return route.fulfill({ status: 204 })
-      }
-      return route.fulfill({
-        json: {
-          location: { directory: target },
-          data:
-            url.pathname === "/api/mcp/resource"
-              ? { resources: [], templates: [] }
-              : [
-                  {
-                    name: "figma-desktop",
-                    status: { status: target === workspace ? state.status : "connected", error },
-                  },
-                ],
+    const state = { fail: true }
+    const view = await open(page, {
+      surface,
+      mcp: (target) => [
+        {
+          name: "figma-desktop",
+          status: { status: target !== workspace ? "connected" : surface === "popover" ? "failed" : "disabled", error },
         },
-      })
+      ],
+      // Connection failures are reported by the refreshed status, not the HTTP response.
+      onMcpAction: (input) => (input.action === "connect" && state.fail ? { status: "failed", error } : undefined),
     })
-
-    await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-    await expectSessionTitle(page, title)
-    await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
-    if (surface === "popover") {
-      await page.getByRole("button", { name: "Session details", exact: true }).click()
-      await page.getByRole("button", { name: "MCP", exact: true }).click()
+    // A failed server shows as enabled in the popover; switch it off first.
+    const reset = async () => {
+      if (surface !== "popover") return
+      await expect(view.toggle).toBeChecked()
+      await view.panel.getByText("figma-desktop", { exact: true }).click()
     }
-    if (surface === "dialog") await page.keyboard.press("Control+;")
-    const panel = page.getByRole("dialog", { name: surface === "popover" ? "MCP" : "MCPs", exact: true })
-    const toggle = panel.getByRole("switch")
-    await expect(panel.getByText("figma-desktop", { exact: true })).toBeVisible()
-    await expect(toggle).toBeEnabled()
-    if (surface === "popover") {
-      await expect(toggle).toBeChecked()
-      await panel.getByText("figma-desktop", { exact: true }).click()
-    }
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    requests.length = 0
+    await reset()
+    await expect(view.toggle).not.toBeChecked()
+    await expect(view.toggle).toBeEnabled()
+    view.requests.length = 0
 
-    await panel.locator('[data-slot="switch-control"]').click()
+    await view.panel.locator('[data-slot="switch-control"]').click()
     const toast = page
       .getByRole("listitem", { includeHidden: true })
       .filter({ has: page.getByText("Request failed", { exact: true }) })
     await expect(toast.getByText(`figma-desktop: ${error}`, { exact: true })).toBeVisible()
-    await expect(toggle).toBeChecked({ checked: surface === "popover" })
-    await expect(toggle).toBeEnabled()
-    expect(requests.filter((request) => request.path.endsWith("/connect"))).toEqual([
+    await expect(view.toggle).toBeChecked({ checked: surface === "popover" })
+    await expect(view.toggle).toBeEnabled()
+    expect(view.requests.filter((request) => request.path.endsWith("/connect"))).toEqual([
       { path: "/api/experimental/mcp/figma-desktop/connect", directory: workspace },
     ])
-    expect(requests.every((request) => request.directory === workspace)).toBe(true)
-    await expect(toast).toHaveCSS("opacity", "1")
-    await testInfo.attach("mcp-connection-error", { body: await page.screenshot(), contentType: "image/png" })
+    expect(view.requests.every((request) => request.directory === workspace)).toBe(true)
 
     if (surface === "popover") await page.keyboard.press("Escape")
-    if (surface === "dialog") await panel.getByRole("button", { name: "Close", exact: true }).click()
-    await expect(panel).toBeHidden()
+    if (surface === "dialog") await view.panel.getByRole("button", { name: "Close", exact: true }).click()
+    await expect(view.panel).toBeHidden()
     await toast.getByRole("button", { name: "Dismiss", exact: true }).click()
     await expect(toast).toBeHidden()
     state.fail = false
-    if (surface === "popover") {
-      await expect(page.getByRole("dialog", { name: "Session details", exact: true })).toBeHidden()
-      await page.getByRole("button", { name: "Session details", exact: true }).click()
-      await page.getByRole("button", { name: "MCP", exact: true }).click()
-    }
-    if (surface === "dialog") await page.keyboard.press("Control+;")
-    await expect(toggle).toBeEnabled()
-    if (surface === "popover") {
-      await panel.getByText("figma-desktop", { exact: true }).click()
-      await expect(toggle).not.toBeChecked()
-      await expect(toggle).toBeEnabled()
-    }
-    await panel.locator('[data-slot="switch-control"]').click()
-    await expect(toggle).toBeChecked()
-    await expect(toggle).toBeEnabled()
+    await expect(page.getByRole("dialog", { name: "Session details", exact: true })).toBeHidden()
+    await view.show()
+    await reset()
+    await expect(view.toggle).not.toBeChecked()
+    await expect(view.toggle).toBeEnabled()
+    await view.panel.locator('[data-slot="switch-control"]').click()
+    await expect(view.toggle).toBeChecked()
+    await expect(view.toggle).toBeEnabled()
     await expect(toast).toBeHidden()
   })
 }

packages/app/e2e/regression/mobile-extensions.spec.ts

@@ -0,0 +1,258 @@
+import { expect, test, type Request } from "@playwright/test"
+import { sessionHref } from "../utils/app"
+import { fixture, mockStressTimeline } from "../utils/session-fixture"
+import { fileNode } from "../utils/workspace"
+
+test.use({ viewport: { width: 390, height: 844 } })
+
+test("mobile files browse, comment, search, and close tabs", async ({ page }) => {
+  await mockStressTimeline(page, {
+    fileList: (path) => (path ? [] : ["first.ts", "second.ts"].map((name) => fileNode(fixture.directory, name))),
+    fileContent: (path) => `contents:${path}`,
+    findFiles: ({ query }) =>
+      ["first.ts", "second.ts"].filter((path) => path.includes(query)).map((path) => fileNode(fixture.directory, path)),
+  })
+  await page.goto(sessionHref(fixture.targetID))
+  const navigation = page.getByRole("tablist", { name: "Session view", exact: true })
+  await navigation.getByRole("tab", { name: "Files", exact: true }).click()
+  const files = page.locator('[data-slot="session-mobile-files"]')
+  await files.getByRole("button", { name: "first.ts", exact: true }).click()
+  await expect(files.getByText("contents:first.ts", { exact: true })).toBeVisible()
+  await files.locator('[data-column-number="1"]').click()
+  const editor = files.locator('[data-component="line-comment-v2"][data-variant="editor"]')
+  await expect(editor.getByRole("textbox")).toBeVisible()
+  const fullWidth = async (card: typeof editor) => {
+    const panel = (await files.boundingBox())!
+    const box = await card.boundingBox()
+    return !!box && Math.abs(box.x - panel.x - 12) < 2 && Math.abs(box.width - panel.width + 24) < 2
+  }
+  for (const width of [390, 700]) {
+    await page.setViewportSize({ width, height: 844 })
+    await expect.poll(() => fullWidth(editor)).toBe(true)
+  }
+  await editor.getByRole("textbox").fill("Full-width file comment")
+  await editor.getByRole("button", { name: "Comment", exact: true }).click()
+  const comment = files.locator('[data-component="line-comment-v2"][data-variant="display"]')
+  await expect(comment).toContainText("Full-width file comment")
+  await expect.poll(() => fullWidth(comment)).toBe(true)
+
+  await page.setViewportSize({ width: 390, height: 844 })
+  const filter = files.getByRole("combobox", { name: "Filter files", exact: true })
+  await expect(filter).toBeHidden()
+  await files.getByRole("button", { name: "All files", exact: true }).click()
+  await filter.fill("second")
+  await files.getByRole("option", { name: "second.ts", exact: true }).click()
+  await expect(files.getByText("contents:second.ts", { exact: true })).toBeVisible()
+  const openTabs = files.getByRole("tablist", { name: "Open files", exact: true })
+  await expect(openTabs.getByRole("tab")).toHaveText(["first.ts", "second.ts"])
+  await openTabs.getByRole("tab", { name: "first.ts", exact: true }).click()
+  await expect(files.getByText("contents:first.ts", { exact: true })).toBeVisible()
+  await navigation.getByRole("tab", { name: "Session", exact: true }).click()
+  await navigation.getByRole("tab", { name: "Files", exact: true }).click()
+  await expect(files.getByText("contents:first.ts", { exact: true })).toBeVisible()
+  await files
+    .locator('[data-slot="tabs-v2-trigger-wrapper"]')
+    .filter({ has: page.getByRole("tab", { name: "first.ts", exact: true }) })
+    .getByRole("button", { name: "Close tab", exact: true })
+    .click()
+  await expect(openTabs.getByRole("tab")).toHaveText(["second.ts"])
+  await expect(files.getByText("contents:second.ts", { exact: true })).toBeVisible()
+  await files.getByRole("button", { name: "Close tab", exact: true }).click()
+  await expect(filter).toBeVisible()
+  await expect(openTabs.getByRole("tab")).toHaveCount(0)
+})
+
+test("mobile changes summarize expanded diffs, stage comments, wrap by setting, and open files", async ({ page }) => {
+  const held = Promise.withResolvers<void>()
+  await mockStressTimeline(page, {
+    vcsDiff: [
+      {
+        file: "added.ts",
+        status: "added",
+        additions: 1,
+        deletions: 0,
+        patch:
+          "diff --git a/added.ts b/added.ts\n--- /dev/null\n+++ b/added.ts\n@@ -0,0 +1 @@\n+export const added = 1\n",
+      },
+      {
+        file: "removed.ts",
+        status: "deleted",
+        additions: 0,
+        deletions: 1,
+        patch:
+          "diff --git a/removed.ts b/removed.ts\n--- a/removed.ts\n+++ /dev/null\n@@ -1 +0,0 @@\n-export const removed = 1\n",
+      },
+      {
+        file: "modified.ts",
+        status: "modified",
+        additions: 1,
+        deletions: 1,
+        patch: `diff --git a/modified.ts b/modified.ts\n--- a/modified.ts\n+++ b/modified.ts\n@@ -1 +1 @@\n-export const value = 1\n+export const value = "${"long content ".repeat(30)}"\n`,
+      },
+      {
+        file: "src/review.ts",
+        status: "modified",
+        additions: 1,
+        deletions: 1,
+        patch:
+          "diff --git a/src/review.ts b/src/review.ts\n--- a/src/review.ts\n+++ b/src/review.ts\n@@ -1,3 +1,3 @@\n export const first = 1\n-export const value = 'before'\n+export const value = 'after'\n export const last = 3\n",
+      },
+    ],
+    fileContent: async (path) => {
+      if (path === "modified.ts") await held.promise
+      return `contents:${path}`
+    },
+  })
+  await page.goto(sessionHref(fixture.targetID))
+  const navigation = page.getByRole("tablist", { name: "Session view", exact: true })
+  const files = page.locator('[data-slot="session-mobile-files"]')
+  await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
+  const review = page.locator('[data-component="session-review"]')
+  await expect(review.getByRole("button", { name: "Expand all", exact: true })).toBeVisible()
+  await page.evaluate(() => (document.documentElement.dir = "rtl"))
+
+  for (const change of [
+    { file: "added.ts", status: "Added", additions: "+1", deletions: "-0" },
+    { file: "removed.ts", status: "Removed", additions: "+0", deletions: "-1" },
+    { file: "modified.ts", status: undefined, additions: "+1", deletions: "-1" },
+  ]) {
+    const item = review.locator(`[data-file="${change.file}"]`)
+    const trigger = item.getByRole("button", { name: change.file, exact: true })
+    const summary = item.locator('[data-slot="session-review-change-summary"]')
+    await expect(trigger).toHaveAttribute("aria-expanded", "false")
+    await expect(trigger.locator('[data-component="diff-changes"]')).toHaveCount(0)
+    await expect(trigger.locator('[data-slot="session-review-change"]')).toHaveCount(0)
+    await expect(summary).toHaveCount(0)
+    await trigger.click()
+    await expect(trigger).toHaveAttribute("aria-expanded", "true")
+    await expect(summary.getByRole("button", { name: "Open file", exact: true })).toBeVisible()
+    await expect(summary.locator('[data-slot="diff-changes-additions"]')).toHaveText(change.additions)
+    await expect(summary.locator('[data-slot="diff-changes-deletions"]')).toHaveText(change.deletions)
+    if (change.status) await expect(summary.getByText(change.status, { exact: true })).toBeVisible()
+    await trigger.click()
+    await expect(trigger).toHaveAttribute("aria-expanded", "false")
+    await expect(summary).toHaveCount(0)
+  }
+  await expect(review.locator('[data-slot="session-review-view-button"]')).toHaveCount(0)
+  const modified = review.locator('[data-file="modified.ts"]')
+  await modified.getByRole("button", { name: "modified.ts", exact: true }).click()
+  await expect(modified.locator("[data-line-number-content]")).toHaveText(["1", "1"])
+  await expect(modified.locator("[data-diff]")).not.toHaveAttribute("data-disable-line-numbers")
+  await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "wrap")
+  await expect(review.getByRole("button", { name: "Diff options", exact: true })).toHaveCount(0)
+
+  // A line comment is staged into the composer context without writing anything to the server.
+  const writes: string[] = []
+  const recordWrite = (request: Request) => {
+    if (request.method() !== "GET") writes.push(`${request.method()} ${new URL(request.url()).pathname}`)
+  }
+  page.on("request", recordWrite)
+  const note = "Use the existing value instead"
+  const commented = review.locator('[data-file="src/review.ts"]')
+  await commented.getByRole("button", { expanded: false }).click()
+  await commented.getByText("export const value = 'after'", { exact: true }).click()
+  await expect(commented.locator('[data-slot="line-comment-editor-label"]')).toHaveText("Commenting on line 2")
+  await commented.getByRole("textbox").fill(note)
+  await commented.locator('[data-slot="line-comment-action"][data-variant="primary"]').click()
+  await expect(commented.getByText(note, { exact: true })).toBeVisible()
+  await navigation.getByRole("tab", { name: "Session", exact: true }).click()
+  const attachments = page.locator('[data-component="composer-attachments"]')
+  await expect(attachments.getByText(note, { exact: true })).toBeVisible()
+  await expect(attachments).toContainText("review.ts:2")
+  page.off("request", recordWrite)
+  expect(writes).toEqual([])
+
+  await page.keyboard.press("Control+,")
+  const settings = page.getByTestId("settings-screen")
+  const wrap = settings.getByRole("switch", { name: "Wrap lines", exact: true })
+  const wrapControl = settings.locator('[data-action="settings-mobile-diff-wrap"] [data-slot="switch-control"]')
+  const storedWrap = () =>
+    page.evaluate(() => JSON.parse(localStorage.getItem("settings.v3") ?? "{}").general?.mobileDiffWrap)
+  await expect(wrap).toBeChecked()
+  await wrapControl.click()
+  await expect(wrap).not.toBeChecked()
+  await expect.poll(storedWrap).toBe(false)
+  await settings.getByRole("button", { name: "Back to app", exact: true }).click()
+  await expect(page).toHaveURL(sessionHref(fixture.targetID))
+  await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
+  await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "scroll")
+  await expect
+    .poll(() => modified.locator("[data-code]").evaluate((element) => element.scrollWidth > element.clientWidth))
+    .toBe(true)
+  await modified.locator("[data-code]").evaluate((element) => {
+    element.scrollLeft = 100
+  })
+  await expect
+    .poll(() => modified.locator("[data-code]").evaluate((element) => Math.abs(element.scrollLeft)))
+    .toBeGreaterThan(0)
+  await navigation.getByRole("tab", { name: "Session", exact: true }).click()
+  await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
+  await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "scroll")
+  await page.keyboard.press("Control+,")
+  await expect(wrap).not.toBeChecked()
+  await wrapControl.click()
+  await expect(wrap).toBeChecked()
+  await expect.poll(storedWrap).toBe(true)
+  await settings.getByRole("button", { name: "Back to app", exact: true }).click()
+  await expect(page).toHaveURL(sessionHref(fixture.targetID))
+  await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
+  await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "wrap")
+
+  const openFile = modified.getByRole("button", { name: "Open file", exact: true })
+  await expect
+    .poll(async () => {
+      const button = (await openFile.boundingBox())!
+      const summary = (await modified.locator('[data-slot="session-review-change-summary"]').boundingBox())!
+      return button.x + button.width < summary.x + summary.width / 2
+    })
+    .toBe(true)
+
+  // Opening a changed file selects its tab at once, before a slower file finishes loading; reopening switches back.
+  await review.locator('[data-file="added.ts"]').getByRole("button", { name: "added.ts", exact: true }).click()
+  const selected = files.getByRole("tablist", { name: "Open files", exact: true }).getByRole("tab", { selected: true })
+  for (const file of ["added.ts", "modified.ts", "added.ts", "modified.ts"]) {
+    await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
+    await review.locator(`[data-file="${file}"]`).getByRole("button", { name: "Open file", exact: true }).click()
+    await expect(navigation.getByRole("tab", { name: "Files", exact: true })).toHaveAttribute("aria-selected", "true")
+    await expect(selected).toHaveText([file])
+    await expect(files).toHaveAttribute("data-browsing", "false")
+    if (file === "modified.ts") held.resolve()
+    await expect(files.getByText(`contents:${file}`, { exact: true })).toBeVisible()
+  }
+})
+
+test("summary drawer dismisses by button, backdrop, Escape, and drag", async ({ page }) => {
+  await mockStressTimeline(page)
+  await page.goto(sessionHref(fixture.targetID))
+  const more = page
+    .locator('[data-slot="session-mobile-view-navigation"]')
+    .getByRole("button", { name: "More options", exact: true })
+  const drawer = page.getByRole("dialog", { name: "Session details", exact: true })
+  const overlay = page.locator('[data-slot="mobile-drawer-overlay"]')
+
+  for (const dismissal of ["button", "backdrop", "escape", "drag"] as const) {
+    await more.click()
+    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
+    await expect(drawer.getByRole("button", { name: "MCP", exact: true })).toBeVisible()
+    // Corvu starts opening after paint; the transition flag is also absent
+    // before that callback. Wait for the open position before dismissing.
+    await expect
+      .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42))
+      .toBe(0)
+    await expect(drawer).not.toHaveAttribute("data-transitioning")
+    if (dismissal === "button") await drawer.getByRole("button", { name: "Close", exact: true }).click()
+    if (dismissal === "backdrop") await overlay.click({ position: { x: 10, y: 10 } })
+    if (dismissal === "escape") await page.keyboard.press("Escape")
+    if (dismissal === "drag") {
+      const bounds = (await drawer.locator('[data-slot="mobile-drawer-handle"]').boundingBox())!
+      await page.mouse.move(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2)
+      await page.mouse.down()
+      await page.mouse.move(bounds.x + bounds.width / 2, bounds.y + bounds.height / 2 + 1)
+      await page.mouse.move(bounds.x + bounds.width / 2, 843)
+      await page.mouse.up()
+    }
+    await expect(drawer, `dismissal: ${dismissal}`).toBeHidden()
+    await expect(overlay).toHaveCount(0)
+    await expect(more).toBeFocused()
+  }
+})

packages/app/e2e/regression/mobile-files.spec.ts

@@ -1,110 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture, pageMessages } from "../performance/timeline/session-timeline-stress.fixture"
-import { stressSessionHref } from "../performance/timeline/timeline-test-helpers"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-for (const direction of ["ltr", "rtl"] as const) {
-  test(`mobile files browse, search, switch, and close shared file tabs in ${direction}`, async ({ page }) => {
-    await page.setViewportSize({ width: 390, height: 844 })
-    await mockOpenCodeServer(page, {
-      directory: fixture.directory,
-      project: fixture.project,
-      sessions: fixture.sessions,
-      provider: fixture.provider,
-      pageMessages,
-      fileList: (path) =>
-        path
-          ? []
-          : ["first.ts", "second.ts"].map((name) => ({
-              name,
-              path: name,
-              absolute: `${fixture.directory}/${name}`,
-              type: "file",
-              ignored: false,
-            })),
-      fileContent: (path) => `contents:${path}`,
-      findFiles: ({ query }) => ["first.ts", "second.ts"].filter((path) => path.includes(query)),
-    })
-    await page.goto(stressSessionHref(fixture.targetID))
-    const navigation = page.getByRole("tablist", { name: "Session view", exact: true })
-    await navigation.getByRole("tab", { name: "Files", exact: true }).click()
-    const files = page.locator('[data-slot="session-mobile-files"]')
-    await expect(files.getByRole("button", { name: "first.ts", exact: true })).toBeVisible()
-    await page.evaluate((direction) => (document.documentElement.dir = direction), direction)
-    await expect(files.locator('[data-slot="session-mobile-files-header"]')).toHaveCSS("border-bottom-width", "0px")
-    await expect
-      .poll(() =>
-        files.getByRole("tablist", { name: "Open files", exact: true }).evaluate((element) => {
-          const header = element.closest('[data-slot="session-mobile-files-header"]')!
-          const separator = getComputedStyle(element, "::before")
-          return {
-            height: separator.height,
-            fullWidth: parseFloat(separator.width) === header.clientWidth,
-            start: separator.insetInlineStart,
-            bottom: separator.bottom,
-          }
-        }),
-      )
-      .toEqual({ height: "1px", fullWidth: true, start: "0px", bottom: "0px" })
-    await files.getByRole("button", { name: "first.ts", exact: true }).click()
-    await expect(files.getByText("contents:first.ts", { exact: true })).toBeVisible()
-    await files.locator('[data-column-number="1"]').click()
-    const editor = files.locator('[data-component="line-comment-v2"][data-variant="editor"]')
-    await expect(editor.getByRole("textbox")).toBeVisible()
-    for (const width of [390, 700]) {
-      await page.setViewportSize({ width, height: 844 })
-      await expect
-        .poll(async () => {
-          const panel = await files.boundingBox()
-          const comment = await editor.boundingBox()
-          if (!panel || !comment) return false
-          return Math.abs(comment.x - panel.x - 12) < 2 && Math.abs(comment.width - panel.width + 24) < 2
-        })
-        .toBe(true)
-    }
-    await editor.getByRole("textbox").fill("Full-width file comment")
-    await editor.getByRole("button", { name: "Comment", exact: true }).click()
-    const comment = files.locator('[data-component="line-comment-v2"][data-variant="display"]')
-    await expect(comment).toContainText("Full-width file comment")
-    await expect
-      .poll(async () => {
-        const panel = await files.boundingBox()
-        const card = await comment.boundingBox()
-        if (!panel || !card) return false
-        return Math.abs(card.x - panel.x - 12) < 2 && Math.abs(card.width - panel.width + 24) < 2
-      })
-      .toBe(true)
-    await page.setViewportSize({ width: 390, height: 844 })
-    await expect(files.getByRole("combobox", { name: "Filter files", exact: true })).toBeHidden()
-    await files.getByRole("button", { name: "All files", exact: true }).click()
-    await files.getByRole("combobox", { name: "Filter files", exact: true }).fill("second")
-    await files.getByRole("option", { name: "second.ts", exact: true }).click()
-    await expect(files.getByText("contents:second.ts", { exact: true })).toBeVisible()
-    const openTabs = files.getByRole("tablist", { name: "Open files", exact: true })
-    await expect(openTabs.getByRole("tab")).toHaveText(["first.ts", "second.ts"])
-    await expect
-      .poll(() =>
-        openTabs.getByRole("tab", { name: "second.ts", exact: true }).evaluate((element) => {
-          const tab = element.closest('[data-slot="tabs-v2-trigger-wrapper"]')!
-          const header = element.closest('[data-slot="session-mobile-files-header"]')!
-          return Math.abs(tab.getBoundingClientRect().bottom - header.getBoundingClientRect().bottom) < 1
-        }),
-      )
-      .toBe(true)
-    await openTabs.getByRole("tab", { name: "first.ts", exact: true }).click()
-    await expect(files.getByText("contents:first.ts", { exact: true })).toBeVisible()
-    await navigation.getByRole("tab", { name: "Session", exact: true }).click()
-    await navigation.getByRole("tab", { name: "Files", exact: true }).click()
-    await expect(files.getByText("contents:first.ts", { exact: true })).toBeVisible()
-    await files
-      .locator('[data-slot="tabs-v2-trigger-wrapper"]')
-      .filter({ has: page.getByRole("tab", { name: "first.ts", exact: true }) })
-      .getByRole("button", { name: "Close tab", exact: true })
-      .click()
-    await expect(openTabs.getByRole("tab")).toHaveText(["second.ts"])
-    await expect(files.getByText("contents:second.ts", { exact: true })).toBeVisible()
-    await files.getByRole("button", { name: "Close tab", exact: true }).click()
-    await expect(files.getByRole("combobox", { name: "Filter files", exact: true })).toBeVisible()
-    await expect(openTabs.getByRole("tab")).toHaveCount(0)
-  })
-}

packages/app/e2e/regression/mobile-review-open-file.spec.ts

@@ -1,43 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture, pageMessages } from "../performance/timeline/session-timeline-stress.fixture"
-import { stressSessionHref } from "../performance/timeline/timeline-test-helpers"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test("opening changed files selects the requested tab before file loading completes", async ({ page }) => {
-  await page.setViewportSize({ width: 390, height: 844 })
-  const loading = Promise.withResolvers<void>()
-  await mockOpenCodeServer(page, {
-    directory: fixture.directory,
-    project: fixture.project,
-    sessions: fixture.sessions,
-    provider: fixture.provider,
-    pageMessages,
-    fileList: () => [],
-    fileContent: async (path) => {
-      if (path === "second.ts") await loading.promise
-      return `contents:${path}`
-    },
-    vcsDiff: ["first.ts", "second.ts"].map((file) => ({
-      file,
-      status: "modified",
-      additions: 1,
-      deletions: 1,
-      patch: `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-before\n+after\n`,
-    })),
-  })
-  await page.goto(stressSessionHref(fixture.targetID))
-  const navigation = page.getByRole("tablist", { name: "Session view", exact: true })
-  const files = page.locator('[data-slot="session-mobile-files"]')
-  for (const file of ["first.ts", "second.ts", "first.ts", "second.ts"]) {
-    await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
-    const diff = page.locator(`[data-component="session-review"] [data-file="${file}"]`)
-    const header = diff.getByRole("button", { name: file, exact: true })
-    await expect(header).toBeEnabled()
-    if ((await header.getAttribute("aria-expanded")) === "false") await header.click()
-    await diff.getByRole("button", { name: "Open file", exact: true }).click()
-    await expect(navigation.getByRole("tab", { name: "Files", exact: true })).toHaveAttribute("aria-selected", "true")
-    await expect(files.getByRole("tab", { name: file, exact: true })).toHaveAttribute("aria-selected", "true")
-    if (file === "second.ts") loading.resolve()
-    await expect(files.getByText(`contents:${file}`, { exact: true })).toBeVisible()
-  }
-})

packages/app/e2e/regression/mobile-review-summary.spec.ts

@@ -1,142 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture } from "../performance/timeline/session-timeline-stress.fixture"
-import { mockStressTimeline, stressSessionHref } from "../performance/timeline/timeline-test-helpers"
-
-for (const direction of ["ltr", "rtl"] as const) {
-  test(`mobile change summaries appear only for expanded diffs in ${direction}`, async ({ page }) => {
-    await page.setViewportSize({ width: 390, height: 844 })
-    await mockStressTimeline(page, {
-      vcsDiff: [
-        {
-          file: "added.ts",
-          status: "added",
-          additions: 1,
-          deletions: 0,
-          patch:
-            "diff --git a/added.ts b/added.ts\n--- /dev/null\n+++ b/added.ts\n@@ -0,0 +1 @@\n+export const added = 1\n",
-        },
-        {
-          file: "removed.ts",
-          status: "deleted",
-          additions: 0,
-          deletions: 1,
-          patch:
-            "diff --git a/removed.ts b/removed.ts\n--- a/removed.ts\n+++ /dev/null\n@@ -1 +0,0 @@\n-export const removed = 1\n",
-        },
-        {
-          file: "modified.ts",
-          status: "modified",
-          additions: 1,
-          deletions: 1,
-          patch: `diff --git a/modified.ts b/modified.ts\n--- a/modified.ts\n+++ b/modified.ts\n@@ -1 +1 @@\n-export const value = 1\n+export const value = "${"long content ".repeat(30)}"\n`,
-        },
-      ],
-    })
-    await page.goto(stressSessionHref(fixture.targetID))
-    await page.getByRole("tab", { name: "Changes", exact: true }).click()
-    const review = page.locator('[data-component="session-review"]')
-    await expect(review.getByRole("button", { name: "Expand all", exact: true })).toBeVisible()
-    await page.evaluate((direction) => (document.documentElement.dir = direction), direction)
-
-    await expect(review.locator('[data-file="added.ts"] [data-slot="accordion-trigger"]')).toHaveCSS(
-      "border-top-width",
-      "0px",
-    )
-    await expect(review.locator('[data-file="modified.ts"] [data-slot="accordion-trigger"]')).toHaveCSS(
-      "border-bottom-width",
-      "0px",
-    )
-
-    for (const change of [
-      { file: "added.ts", status: "Added", additions: "+1", deletions: "-0" },
-      { file: "removed.ts", status: "Removed", additions: "+0", deletions: "-1" },
-      { file: "modified.ts", status: undefined, additions: "+1", deletions: "-1" },
-    ]) {
-      const item = review.locator(`[data-file="${change.file}"]`)
-      const trigger = item.getByRole("button", { name: change.file, exact: true })
-      const summary = item.locator('[data-slot="session-review-change-summary"]')
-      await expect(trigger).toHaveAttribute("aria-expanded", "false")
-      await expect(trigger.locator('[data-component="diff-changes"]')).toHaveCount(0)
-      await expect(trigger.locator('[data-slot="session-review-change"]')).toHaveCount(0)
-      await expect(summary).toHaveCount(0)
-      await trigger.click()
-      await expect(trigger).toHaveAttribute("aria-expanded", "true")
-      if (change.file === "modified.ts") {
-        await expect(item.locator('[data-slot="accordion-content"]')).toHaveCSS("border-bottom-width", "0px")
-        await expect(trigger).not.toHaveCSS("border-bottom-width", "0px")
-      }
-      await expect(summary).toBeVisible()
-      await expect(summary.getByRole("button", { name: "Open file", exact: true })).toBeVisible()
-      await expect(summary.locator('[data-slot="diff-changes-additions"]')).toHaveText(change.additions)
-      await expect(summary.locator('[data-slot="diff-changes-deletions"]')).toHaveText(change.deletions)
-      if (change.status) await expect(summary.getByText(change.status, { exact: true })).toBeVisible()
-      await trigger.click()
-      await expect(trigger).toHaveAttribute("aria-expanded", "false")
-      await expect(summary).toHaveCount(0)
-    }
-    await expect(review.locator('[data-slot="session-review-view-button"]')).toHaveCount(0)
-    const modified = review.locator('[data-file="modified.ts"]')
-    await modified.getByRole("button", { name: "modified.ts", exact: true }).click()
-    await expect(modified.locator("[data-line-number-content]")).toHaveText(["1", "1"])
-    await expect(modified.locator("[data-diff]")).not.toHaveAttribute("data-disable-line-numbers")
-    await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "wrap")
-    await expect(review.getByRole("button", { name: "Diff options", exact: true })).toHaveCount(0)
-    await page.keyboard.press("Control+,")
-    const settings = page.getByTestId("settings-screen")
-    const wrap = settings.getByRole("switch", { name: "Wrap lines", exact: true })
-    const wrapControl = settings.locator('[data-action="settings-mobile-diff-wrap"] [data-slot="switch-control"]')
-    await expect(wrap).toBeChecked()
-    await wrapControl.click()
-    await expect(wrap).not.toBeChecked()
-    await expect
-      .poll(() => page.evaluate(() => JSON.parse(localStorage.getItem("settings.v3") ?? "{}").general?.mobileDiffWrap))
-      .toBe(false)
-    await settings.getByRole("button", { name: "Back to app", exact: true }).click()
-    await expect(page).toHaveURL(stressSessionHref(fixture.targetID))
-    await page.getByRole("tab", { name: "Changes", exact: true }).click()
-    await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "scroll")
-    await expect
-      .poll(() => modified.locator("[data-code]").evaluate((element) => element.scrollWidth > element.clientWidth))
-      .toBe(true)
-    await modified.locator("[data-code]").evaluate((element) => {
-      element.scrollLeft = 100
-    })
-    await expect
-      .poll(() => modified.locator("[data-code]").evaluate((element) => Math.abs(element.scrollLeft)))
-      .toBeGreaterThan(0)
-    const navigation = page.getByRole("tablist", { name: "Session view", exact: true })
-    await navigation.getByRole("tab", { name: "Session", exact: true }).click()
-    await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
-    await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "scroll")
-    await page.keyboard.press("Control+,")
-    await expect(wrap).not.toBeChecked()
-    await wrapControl.click()
-    await expect(wrap).toBeChecked()
-    await expect
-      .poll(() => page.evaluate(() => JSON.parse(localStorage.getItem("settings.v3") ?? "{}").general?.mobileDiffWrap))
-      .toBe(true)
-    await settings.getByRole("button", { name: "Back to app", exact: true }).click()
-    await expect(page).toHaveURL(stressSessionHref(fixture.targetID))
-    await navigation.getByRole("tab", { name: "Changes", exact: true }).click()
-    await expect(modified.locator("[data-diff]")).toHaveAttribute("data-overflow", "wrap")
-    const openFile = modified.getByRole("button", { name: "Open file", exact: true })
-    await expect(openFile).toBeVisible()
-    await expect
-      .poll(async () => {
-        const button = await openFile.boundingBox()
-        const summary = await modified.locator('[data-slot="session-review-change-summary"]').boundingBox()
-        if (!button || !summary) return false
-        return direction === "ltr"
-          ? button.x > summary.x + summary.width / 2
-          : button.x + button.width < summary.x + summary.width / 2
-      })
-      .toBe(true)
-    await openFile.click()
-    await expect(
-      page.getByRole("tablist", { name: "Session view", exact: true }).getByRole("tab", { name: "Files", exact: true }),
-    ).toHaveAttribute("aria-selected", "true")
-    const files = page.locator('[data-slot="session-mobile-files"]')
-    await expect(files.getByRole("tab", { name: "modified.ts", exact: true })).toHaveAttribute("aria-selected", "true")
-    await expect(files).toHaveAttribute("data-browsing", "false")
-  })
-}

packages/app/e2e/regression/mobile-session-views.spec.ts

@@ -1,178 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture, pageMessages } from "../performance/timeline/session-timeline-stress.fixture"
-import { installStressSessionTabs, stressSessionHref } from "../performance/timeline/timeline-test-helpers"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-for (const position of ["top", "bottom"] as const) {
-  test(`mobile session tabs switch views and keep the terminal cached with ${position} navigation`, async ({
-    page,
-  }) => {
-    await page.setViewportSize({ width: 390, height: 844 })
-    await mockOpenCodeServer(page, {
-      directory: fixture.directory,
-      project: fixture.project,
-      sessions: fixture.sessions,
-      provider: fixture.provider,
-      pageMessages,
-      fileList: () => [],
-    })
-    await installStressSessionTabs(page)
-    await page.addInitScript(
-      (position) =>
-        localStorage.setItem("settings.v3", JSON.stringify({ general: { mobileTitlebarPosition: position } })),
-      position,
-    )
-    await page.route("**/api/pty*", (route) =>
-      route.fulfill({
-        json: {
-          location: { directory: fixture.directory, project: { id: fixture.project.id, directory: fixture.directory } },
-          data: {
-            id: "pty_mobile_views",
-            title: "Terminal 1",
-            command: "sh",
-            args: [],
-            cwd: fixture.directory,
-            status: "running",
-            pid: 1,
-          },
-        },
-      }),
-    )
-    await page.routeWebSocket("**/api/pty/pty_mobile_views/connect", () => undefined)
-    await page.route("**/api/pty/pty_mobile_views/connect-token*", (route) =>
-      route.fulfill({
-        json: {
-          location: { directory: fixture.directory, project: { id: fixture.project.id, directory: fixture.directory } },
-          data: { ticket: "e2e-ticket", expires_in: 60 },
-        },
-      }),
-    )
-    await page.goto(stressSessionHref(fixture.targetID))
-
-    const tabs = page.getByRole("tablist", { name: "Session view", exact: true })
-    const navigation = page.locator('[data-slot="session-mobile-view-navigation"]')
-    const more = navigation.getByRole("button", { name: "More options", exact: true })
-    const picker = tabs.getByRole("tab", { selected: true })
-    const message = page.locator(
-      `[data-timeline-row="UserMessage"][data-message-id="${fixture.expected.targetMessageIDs.at(-1)}"]`,
-    )
-    const composer = page.getByRole("textbox", { name: "Prompt", exact: true })
-    await expect(picker).toHaveText("Session")
-    await expect(message).toBeVisible()
-    await expect(composer).toBeVisible()
-    await expect(tabs.getByRole("tab")).toHaveText(["Session", "Changes", "Files", "Terminal"])
-    await expect(tabs).toHaveCSS("padding-left", "0px")
-    await expect(tabs).toHaveCSS("padding-right", "0px")
-    await expect
-      .poll(async () => {
-        const bounds = await navigation.boundingBox()
-        return !!bounds && bounds.x >= 8 && bounds.x <= 9 && bounds.width >= 372 && bounds.width <= 374
-      })
-      .toBe(true)
-    await expect
-      .poll(async () => {
-        const bar = await tabs.boundingBox()
-        const input = await composer.boundingBox()
-        const panel = await page.locator('[data-slot="session-chat-panel"]').boundingBox()
-        return !!bar && !!input && !!panel && Math.abs(bar.y - panel.y) <= 1 && bar.y + bar.height <= input.y
-      })
-      .toBe(true)
-    await expect(page.locator("[data-session-title]")).toHaveCount(0)
-    await expect(page.locator('[data-slot="mobile-tabs-trigger"]')).toContainText(fixture.expected.targetTitle)
-    await page.getByRole("button", { name: "Tabs", exact: true }).click()
-    const drawer = page.getByRole("dialog", { name: "Tabs", exact: true })
-    await expect(drawer).toHaveAttribute("data-open", "")
-    await expect(drawer).not.toHaveAttribute("data-transitioning")
-    await expect(drawer.getByRole("button", { name: "Settings", exact: true })).toBeInViewport()
-    await drawer.getByRole("button", { name: "Settings", exact: true }).click()
-    await expect(page.getByTestId("settings-screen")).toBeVisible()
-    await page.getByRole("button", { name: "Back to app", exact: true }).click()
-    await page.getByRole("button", { name: "Tabs", exact: true }).click()
-    await expect(drawer).not.toHaveAttribute("data-transitioning")
-    await expect(drawer.getByRole("button", { name: "Settings", exact: true })).toBeInViewport()
-    await page.keyboard.press("Escape")
-    await expect(drawer).toBeHidden()
-
-    await more.click()
-    await page.getByRole("menuitem", { name: "Usage", exact: true }).click()
-    await expect(picker).toHaveCount(0)
-    await expect(page.getByText("Total Cost", { exact: true })).toBeVisible()
-    const usage = page.locator('[data-slot="session-usage-content"]')
-    await expect(usage).toHaveCSS("padding-top", "16px")
-    await expect(usage).toHaveCSS("padding-inline-start", "16px")
-    await expect(usage).toHaveCSS("padding-inline-end", "16px")
-    await expect(composer).toBeHidden()
-
-    await more.click()
-    await expect(page.getByRole("menuitem", { name: "Status", exact: true })).toHaveCount(0)
-    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
-    const details = page.getByRole("dialog", { name: "Session details", exact: true })
-    await expect(details.getByText(fixture.project.name, { exact: true })).toBeVisible()
-    await expect(details.getByRole("button", { name: "No changes", exact: true })).toBeVisible()
-    await expect(details.getByRole("button", { name: "MCP", exact: true })).toBeVisible()
-    await details.getByRole("button", { name: "Close", exact: true }).click()
-    await expect(details).toBeHidden()
-    await expect(more).toBeFocused()
-    await more.click()
-    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
-    await expect(details.getByRole("button", { name: "No changes", exact: true })).toBeVisible()
-    await expect(details).not.toHaveAttribute("data-transitioning")
-    await page.keyboard.press("Escape")
-    await expect(details).toBeHidden()
-    await expect(more).toBeFocused()
-    await more.click()
-    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
-    await details.getByRole("button", { name: "No changes", exact: true }).click()
-    await expect(details).toBeHidden()
-    await expect(picker).toHaveText("Changes")
-    await expect(page.getByText("No uncommitted changes yet", { exact: true })).toBeVisible()
-    await expect(page.locator('[data-slot="session-review-header"]')).toHaveCSS("height", "40px")
-    await expect(page.locator('[data-slot="session-review-header"]')).toHaveCSS("padding-left", "8px")
-    await expect(composer).toBeHidden()
-
-    await tabs.getByRole("tab", { name: "Files", exact: true }).click()
-    await expect(picker).toHaveText("Files")
-    await expect(page.getByRole("combobox", { name: "Filter files", exact: true })).toBeVisible()
-    await expect(composer).toBeHidden()
-
-    await tabs.getByRole("tab", { name: "Terminal", exact: true }).click()
-    const panel = page.locator("#terminal-panel")
-    await expect(panel).toHaveAttribute("data-opened", "true")
-    await expect(panel.getByRole("tab", { name: /Terminal 1/ })).toBeVisible()
-    await expect(panel.locator('[data-component="terminal"]')).toBeVisible()
-    await expect(panel.locator("textarea")).toBeEditable()
-    await expect(panel).toHaveCount(1)
-    await panel.evaluate((element) => element.setAttribute("data-cache-probe", "original"))
-    await expect(composer).toBeHidden()
-
-    await tabs.getByRole("tab", { name: "Session", exact: true }).click()
-    await expect(message).toBeVisible()
-    await expect(panel).toBeHidden()
-    await expect(panel).toHaveAttribute("inert", "")
-    await expect(panel).toHaveAttribute("data-cache-probe", "original")
-
-    await page.keyboard.press("Control+Backquote")
-    await expect(picker).toHaveText("Terminal")
-    await expect(panel).toBeVisible()
-    await expect(panel).toHaveAttribute("data-cache-probe", "original")
-    await page.keyboard.press("Control+Backquote")
-    await expect(picker).toHaveText("Session")
-
-    await page.keyboard.press("Control+Backquote")
-    await expect(picker).toHaveText("Terminal")
-    await panel.getByRole("button", { name: "Close terminal", exact: true }).click()
-    await expect(picker).toHaveText("Session")
-    await expect(panel).toBeHidden()
-
-    await more.click()
-    await page.getByRole("menuitem", { name: "Usage", exact: true }).click()
-    await expect(page.getByText("Total Cost", { exact: true })).toBeVisible()
-    await page.goto(stressSessionHref(fixture.sourceID))
-    await expect(picker).toHaveText("Session")
-    await expect(page.locator('[data-slot="mobile-tabs-trigger"]')).toContainText(fixture.expected.sourceTitle)
-
-    await page.setViewportSize({ width: 1280, height: 900 })
-    await expect(picker).toBeHidden()
-    await expect(page.locator("[data-session-title]")).toBeVisible()
-  })
-}

packages/app/e2e/regression/mobile-session.spec.ts

@@ -0,0 +1,369 @@
+import { expect, test, type Locator, type Page } from "@playwright/test"
+import { seed, sessionHref, type SeedInput } from "../utils/app"
+import { fixture, mockStressTimeline } from "../utils/session-fixture"
+import { fileNode } from "../utils/workspace"
+
+// The source and target sessions; the child session is not a home row.
+const rows = 2
+
+async function openStress(page: Page, extra: SeedInput = {}) {
+  await seed(page, {
+    projects: { local: [{ worktree: fixture.directory, expanded: true }] },
+    tabs: [fixture.sourceID, fixture.targetID],
+    ...extra,
+  })
+}
+
+for (const position of ["top", "bottom"] as const) {
+  test(`mobile session tabs switch views and keep the terminal cached with ${position} navigation`, async ({
+    page,
+  }) => {
+    await page.setViewportSize({ width: 390, height: 844 })
+    await mockStressTimeline(page, { fileList: () => [], pty: {} })
+    await openStress(page, {
+      lastProject: { local: fixture.directory },
+      settings: { general: { mobileTitlebarPosition: position } },
+    })
+    await page.goto(sessionHref(fixture.targetID))
+
+    const tabs = page.getByRole("tablist", { name: "Session view", exact: true })
+    const navigation = page.locator('[data-slot="session-mobile-view-navigation"]')
+    const more = navigation.getByRole("button", { name: "More options", exact: true })
+    const picker = tabs.getByRole("tab", { selected: true })
+    const message = page.locator(
+      `[data-timeline-row="UserMessage"][data-message-id="${fixture.expected.targetMessageIDs.at(-1)}"]`,
+    )
+    const composer = page.getByRole("textbox", { name: "Prompt", exact: true })
+    await expect(picker).toHaveText("Session")
+    await expect(message).toBeVisible()
+    await expect(composer).toBeVisible()
+    await expect(tabs.getByRole("tab")).toHaveText(["Session", "Changes", "Files", "Terminal"])
+    await expect(tabs).toHaveCSS("padding-left", "0px")
+    await expect(tabs).toHaveCSS("padding-right", "0px")
+    await expect
+      .poll(async () => {
+        const bounds = await navigation.boundingBox()
+        return !!bounds && bounds.x >= 8 && bounds.x <= 9 && bounds.width >= 372 && bounds.width <= 374
+      })
+      .toBe(true)
+    await expect
+      .poll(async () => {
+        const bar = await tabs.boundingBox()
+        const input = await composer.boundingBox()
+        const panel = await page.locator('[data-slot="session-chat-panel"]').boundingBox()
+        return !!bar && !!input && !!panel && Math.abs(bar.y - panel.y) <= 1 && bar.y + bar.height <= input.y
+      })
+      .toBe(true)
+    await expect(page.locator("[data-session-title]")).toHaveCount(0)
+    await expect(page.locator('[data-slot="mobile-tabs-trigger"]')).toContainText(fixture.expected.targetTitle)
+    await page.getByRole("button", { name: "Tabs", exact: true }).click()
+    const drawer = page.getByRole("dialog", { name: "Tabs", exact: true })
+    await expect(drawer).toHaveAttribute("data-open", "")
+    await expect(drawer).not.toHaveAttribute("data-transitioning")
+    await expect(drawer.getByRole("button", { name: "Settings", exact: true })).toBeInViewport()
+    await drawer.getByRole("button", { name: "Settings", exact: true }).click()
+    await expect(page.getByTestId("settings-screen")).toBeVisible()
+    await page.getByRole("button", { name: "Back to app", exact: true }).click()
+    await page.getByRole("button", { name: "Tabs", exact: true }).click()
+    await expect(drawer).not.toHaveAttribute("data-transitioning")
+    await expect(drawer.getByRole("button", { name: "Settings", exact: true })).toBeInViewport()
+    await page.keyboard.press("Escape")
+    await expect(drawer).toBeHidden()
+
+    await more.click()
+    await page.getByRole("menuitem", { name: "Usage", exact: true }).click()
+    await expect(picker).toHaveCount(0)
+    await expect(page.getByText("Total Cost", { exact: true })).toBeVisible()
+    const usage = page.locator('[data-slot="session-usage-content"]')
+    await expect(usage).toHaveCSS("padding-top", "16px")
+    await expect(usage).toHaveCSS("padding-inline-start", "16px")
+    await expect(usage).toHaveCSS("padding-inline-end", "16px")
+    await expect(composer).toBeHidden()
+
+    await more.click()
+    await expect(page.getByRole("menuitem", { name: "Status", exact: true })).toHaveCount(0)
+    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
+    const details = page.getByRole("dialog", { name: "Session details", exact: true })
+    await expect(details.getByText(fixture.project.name, { exact: true })).toBeVisible()
+    await expect(details.getByRole("button", { name: "No changes", exact: true })).toBeVisible()
+    await expect(details.getByRole("button", { name: "MCP", exact: true })).toBeVisible()
+    await details.getByRole("button", { name: "Close", exact: true }).click()
+    await expect(details).toBeHidden()
+    await expect(more).toBeFocused()
+    await more.click()
+    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
+    await expect(details.getByRole("button", { name: "No changes", exact: true })).toBeVisible()
+    await expect(details).not.toHaveAttribute("data-transitioning")
+    await page.keyboard.press("Escape")
+    await expect(details).toBeHidden()
+    await expect(more).toBeFocused()
+    await more.click()
+    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
+    await details.getByRole("button", { name: "No changes", exact: true }).click()
+    await expect(details).toBeHidden()
+    await expect(picker).toHaveText("Changes")
+    await expect(page.getByText("No uncommitted changes yet", { exact: true })).toBeVisible()
+    await expect(page.locator('[data-slot="session-review-header"]')).toHaveCSS("height", "40px")
+    await expect(page.locator('[data-slot="session-review-header"]')).toHaveCSS("padding-left", "8px")
+    await expect(composer).toBeHidden()
+    await more.click()
+    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
+    await details.getByRole("button", { name: "No changes", exact: true }).click()
+    await expect(details).toBeHidden()
+    await expect(picker).toHaveText("Changes")
+    await expect(page.getByText("No uncommitted changes yet", { exact: true })).toBeVisible()
+
+    await tabs.getByRole("tab", { name: "Files", exact: true }).click()
+    await expect(picker).toHaveText("Files")
+    await expect(page.getByRole("combobox", { name: "Filter files", exact: true })).toBeVisible()
+    await expect(composer).toBeHidden()
+
+    await tabs.getByRole("tab", { name: "Terminal", exact: true }).click()
+    const panel = page.locator("#terminal-panel")
+    await expect(panel).toHaveAttribute("data-opened", "true")
+    await expect(panel.getByRole("tab", { name: /Terminal 1/ })).toBeVisible()
+    await expect(panel.locator('[data-component="terminal"]')).toBeVisible()
+    await expect(panel.locator("textarea")).toBeEditable()
+    await expect(panel).toHaveCount(1)
+    await panel.evaluate((element) => element.setAttribute("data-cache-probe", "original"))
+    await expect(composer).toBeHidden()
+
+    await tabs.getByRole("tab", { name: "Session", exact: true }).click()
+    await expect(message).toBeVisible()
+    await expect(panel).toBeHidden()
+    await expect(panel).toHaveAttribute("inert", "")
+    await expect(panel).toHaveAttribute("data-cache-probe", "original")
+
+    await page.keyboard.press("Control+Backquote")
+    await expect(picker).toHaveText("Terminal")
+    await expect(panel).toBeVisible()
+    await expect(panel).toHaveAttribute("data-cache-probe", "original")
+    await page.keyboard.press("Control+Backquote")
+    await expect(picker).toHaveText("Session")
+
+    await page.keyboard.press("Control+Backquote")
+    await expect(picker).toHaveText("Terminal")
+    await panel.getByRole("button", { name: "Close terminal", exact: true }).click()
+    await expect(picker).toHaveText("Session")
+    await expect(panel).toBeHidden()
+
+    // The view resets to Session whenever the routed session changes, including through Home.
+    const trigger = page.locator('[data-slot="mobile-tabs-trigger"]')
+    const openTabs = async () => {
+      await trigger.click()
+      await expect(drawer).not.toHaveAttribute("data-transitioning")
+    }
+    const openTab = async (title: string) => {
+      await openTabs()
+      await drawer.locator('[data-slot="tab-link"]').filter({ hasText: title }).click()
+      await expect(drawer).toBeHidden()
+      await expect(trigger).toContainText(title)
+    }
+    await more.click()
+    await page.getByRole("menuitem", { name: "Usage", exact: true }).click()
+    await expect(page.getByText("Total Cost", { exact: true })).toBeVisible()
+    await openTab(fixture.expected.sourceTitle)
+    await expect(picker).toHaveText("Session")
+    await tabs.getByRole("tab", { name: "Files", exact: true }).click()
+    await expect(picker).toHaveText("Files")
+    await openTab(fixture.expected.targetTitle)
+    await expect(picker).toHaveText("Session")
+    await openTab(fixture.expected.sourceTitle)
+    await expect(picker).toHaveText("Session")
+    await tabs.getByRole("tab", { name: "Files", exact: true }).click()
+    await expect(picker).toHaveText("Files")
+    await openTabs()
+    await drawer.getByRole("button", { name: "Home", exact: true }).click()
+    await expect(page).toHaveURL("/")
+    await expect(drawer).toBeHidden()
+    await openTab(fixture.expected.sourceTitle)
+    await expect(picker).toHaveText("Session")
+
+    await page.setViewportSize({ width: 1280, height: 900 })
+    await expect(picker).toBeHidden()
+    await expect(page.locator("[data-session-title]")).toBeVisible()
+  })
+}
+
+test("the summary's changes row switches the view and keeps the side tabs", async ({ page }) => {
+  await page.setViewportSize({ width: 1280, height: 900 })
+  await mockStressTimeline(page, {
+    fileList: (path) => (path ? [] : [fileNode(fixture.directory, "README.md")]),
+    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
+  })
+  await openStress(page, { lastProject: { local: fixture.directory } })
+  await page.goto(sessionHref(fixture.targetID))
+
+  // One click previews the file in place of the Open file tab.
+  const panel = page.locator("#review-panel")
+  const readme = panel.getByRole("tab", { name: "README.md", exact: true })
+  await page.getByRole("button", { name: "Toggle review", exact: true }).click()
+  await panel.getByRole("button", { name: "Open file", exact: true }).click()
+  await panel.getByRole("button", { name: "README.md", exact: true }).click()
+  await expect(readme).toHaveAttribute("aria-selected", "true")
+  await expect(panel.getByRole("tab", { name: "Open file", exact: true })).toHaveCount(0)
+
+  await page.setViewportSize({ width: 390, height: 844 })
+  const tabs = page.getByRole("tablist", { name: "Session view", exact: true })
+  const details = page.getByRole("dialog", { name: "Session details", exact: true })
+  await page
+    .locator('[data-slot="session-mobile-view-navigation"]')
+    .getByRole("button", { name: "More options", exact: true })
+    .click()
+  await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
+  await details.getByRole("button", { name: "No changes", exact: true }).click()
+  await expect(details).toBeHidden()
+  await expect(tabs.getByRole("tab", { selected: true })).toHaveText("Changes")
+  await tabs.getByRole("tab", { name: "Files", exact: true }).click()
+  await expect(
+    page.getByRole("tablist", { name: "Open files", exact: true }).getByRole("tab", { name: "README.md", exact: true }),
+  ).toHaveAttribute("aria-selected", "true")
+
+  await page.setViewportSize({ width: 1280, height: 900 })
+  await expect(readme).toHaveAttribute("aria-selected", "true")
+})
+
+test.describe("touch", () => {
+  test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true })
+
+  test.beforeEach(async ({ page }) => {
+    await mockStressTimeline(page)
+    await openStress(page)
+    await page.goto("/")
+    await expect(page.locator('[data-component="home-session-row"]')).toHaveCount(rows)
+  })
+
+  test("mobile project selection and drawer navigation preserve session identity", async ({ page }) => {
+    const projects = page.getByRole("button", { name: "Projects", exact: true })
+    await projects.click()
+    const picker = page.getByRole("dialog", { name: "Projects", exact: true })
+    await expect(picker.getByRole("button", { name: "All projects", exact: true })).toBeVisible()
+    await picker.getByRole("button", { name: new RegExp(` ${fixture.project.name}$`) }).click()
+    await expect(picker).toBeHidden()
+    await expect(projects).toContainText(fixture.project.name)
+
+    const trigger = page.locator('[data-slot="mobile-tabs-trigger"]')
+    const drawer = page.locator('[data-slot="mobile-tabs-drawer"]')
+    await trigger.click()
+    await expect(trigger).toHaveAttribute("aria-expanded", "true")
+    await expect(drawer.locator('[data-slot="tab-project"]')).toHaveCount(0)
+    const settings = drawer.getByRole("button", { name: "Settings", exact: true })
+    const help = drawer.getByRole("button", { name: "Help", exact: true })
+    await expect(settings).toBeVisible()
+    await expect(help).toBeVisible()
+    expect((await settings.boundingBox())?.width).toBeGreaterThan((await help.boundingBox())?.width ?? 0)
+
+    await drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle }).click()
+    await expect(page).toHaveURL(new RegExp(`/session/${fixture.sourceID}$`))
+    await expect(drawer).toBeHidden()
+    await expect(trigger).toContainText(fixture.expected.sourceTitle)
+    await trigger.click()
+    await drawer.getByRole("button", { name: "Home", exact: true }).click()
+    await expect(page).toHaveURL("/")
+    await expect(drawer).toBeHidden()
+    await expect(page.locator('[data-component="home-session-row"]')).toHaveCount(rows)
+  })
+
+  test("mobile settings section menu stays above a full-width panel", async ({ page }) => {
+    await page.locator('[data-slot="mobile-tabs-trigger"]').click()
+    await page
+      .locator('[data-slot="mobile-tabs-drawer"]')
+      .getByRole("button", { name: "Settings", exact: true })
+      .click()
+    const settings = page.getByTestId("settings-screen")
+    const menu = settings.getByRole("button", { name: "Preferences", exact: true })
+    const panel = settings.getByRole("tabpanel")
+    await expect(settings.getByRole("heading", { name: "General", exact: true })).toBeVisible()
+    await expect(page).toHaveURL("/settings")
+    await expect(menu).toBeVisible()
+    await menu.click()
+    await expect(page.getByRole("menuitemradio", { name: "Preferences", exact: true })).toBeChecked()
+    await page.keyboard.press("Escape")
+    await expect(page.getByRole("menuitemradio", { name: "Preferences", exact: true })).toBeHidden()
+    await expect(settings).toBeVisible()
+    await menu.click()
+    await page.getByRole("menuitemradio", { name: "Models", exact: true }).click()
+    await expect(settings.getByRole("heading", { name: "Models", exact: true })).toBeVisible()
+    await expect(settings.getByRole("button", { name: "Models", exact: true })).toBeVisible()
+    await expect(settings.getByRole("switch", { name: "Claude Opus 4.6", exact: true })).toBeAttached()
+    await expect
+      .poll(async () => {
+        const navigation = await settings.getByRole("button", { name: "Models", exact: true }).boundingBox()
+        const content = await panel.boundingBox()
+        return !!navigation && !!content && navigation.y + navigation.height <= content.y
+      })
+      .toBe(true)
+    await expect.poll(async () => (await panel.boundingBox())?.width ?? 0).toBeGreaterThan(350)
+    await settings.getByRole("button", { name: "Back to app", exact: true }).click()
+    await expect(page).toHaveURL("/")
+    await expect(settings).toBeHidden()
+    await expect(page.locator('[data-component="home-session-row"]')).toHaveCount(rows)
+  })
+
+  test.describe("tab drawer", () => {
+    test.beforeEach(async ({ page }) => {
+      await page.locator('[data-slot="mobile-tabs-trigger"]').click()
+      await expect(page.locator('[data-slot="mobile-tabs-drawer"]')).toBeVisible()
+      const drawer = page.locator('[data-slot="mobile-drawer-content"]')
+      await expect
+        .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42))
+        .toBe(0)
+      await expect(drawer).not.toHaveAttribute("data-transitioning")
+    })
+
+    test("reorders session tabs with touch", async ({ page }) => {
+      const tabs = page.locator('[data-slot="vertical-tabs"] a')
+      await expect(tabs).toContainText([fixture.expected.sourceTitle, fixture.expected.targetTitle])
+      const target = tabs.filter({ hasText: fixture.expected.targetTitle })
+      const source = tabs.filter({ hasText: fixture.expected.sourceTitle })
+      const targetBox = await target.boundingBox()
+      const sourceBox = await source.boundingBox()
+      expect(targetBox).not.toBeNull()
+      expect(sourceBox).not.toBeNull()
+
+      await touchDrag(page, source, {
+        from: { x: sourceBox!.x + sourceBox!.width / 2, y: sourceBox!.y + sourceBox!.height / 2 },
+        to: { x: targetBox!.x + targetBox!.width / 2, y: targetBox!.y + targetBox!.height / 2 },
+      })
+
+      await expect(tabs).toContainText([fixture.expected.targetTitle, fixture.expected.sourceTitle])
+    })
+
+    test("dismisses a touch context menu by tapping outside", async ({ page }) => {
+      const drawer = page.locator('[data-slot="mobile-tabs-drawer"]')
+      const tab = drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle })
+      const homeBox = await drawer.getByRole("button", { name: "Home", exact: true }).boundingBox()
+      const box = await tab.boundingBox()
+      expect(homeBox).not.toBeNull()
+      expect(box).not.toBeNull()
+      const point = { x: box!.x + box!.width / 2, y: box!.y + box!.height / 2 }
+      const touch = { pointerType: "touch", pointerId: 1, isPrimary: true, clientX: point.x, clientY: point.y }
+
+      await tab.dispatchEvent("pointerdown", touch)
+      const rename = page.getByRole("menuitem", { name: "Rename", exact: true })
+      await expect(rename).toBeVisible()
+      await expect(drawer).toBeVisible()
+      await tab.filter({ visible: true }).dispatchEvent("pointerup", touch)
+
+      await page.touchscreen.tap(homeBox!.x + homeBox!.width / 2, homeBox!.y + homeBox!.height / 2)
+      await expect(rename).toBeHidden()
+      await expect(drawer).toBeVisible()
+    })
+  })
+})
+
+async function touchDrag(
+  page: Page,
+  source: Locator,
+  input: { from: { x: number; y: number }; to: { x: number; y: number } },
+) {
+  const client = await page.context().newCDPSession(page)
+  await client.send("Input.dispatchTouchEvent", { type: "touchStart", touchPoints: [{ ...input.from, id: 1 }] })
+  await client.send("Input.dispatchTouchEvent", {
+    type: "touchMove",
+    touchPoints: [{ x: (input.from.x + input.to.x) / 2, y: (input.from.y + input.to.y) / 2, id: 1 }],
+  })
+  await expect(source).toHaveCount(2)
+  await client.send("Input.dispatchTouchEvent", { type: "touchMove", touchPoints: [{ ...input.to, id: 1 }] })
+  await client.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] })
+}

packages/app/e2e/regression/mobile-shell.spec.ts

@@ -1,94 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true })
-
-test.beforeEach(async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory: fixture.directory,
-    project: fixture.project,
-    provider: fixture.provider,
-    sessions: fixture.sessions,
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ directory, server, sessions }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({ projects: { local: [{ worktree: directory, expanded: true }] } }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify(sessions.map((session) => ({ type: "session", server, sessionId: session.id }))),
-      )
-    },
-    { directory: fixture.directory, server: fixture.serverKey, sessions: fixture.sessions },
-  )
-  await page.goto("/")
-  await expect(page.locator('[data-component="home-session-row"]')).toHaveCount(fixture.sessions.length)
-})
-
-test("mobile project selection and drawer navigation preserve session identity", async ({ page }) => {
-  const projects = page.getByRole("button", { name: "Projects", exact: true })
-  await projects.click()
-  const picker = page.getByRole("dialog", { name: "Projects", exact: true })
-  await expect(picker.getByRole("button", { name: "All projects", exact: true })).toBeVisible()
-  await picker.getByRole("button", { name: new RegExp(` ${fixture.project.name}$`) }).click()
-  await expect(picker).toBeHidden()
-  await expect(projects).toContainText(fixture.project.name)
-
-  const trigger = page.locator('[data-slot="mobile-tabs-trigger"]')
-  const drawer = page.locator('[data-slot="mobile-tabs-drawer"]')
-  await trigger.click()
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await expect(drawer.locator('[data-slot="tab-project"]')).toHaveCount(0)
-  const settings = drawer.getByRole("button", { name: "Settings", exact: true })
-  const help = drawer.getByRole("button", { name: "Help", exact: true })
-  await expect(settings).toBeVisible()
-  await expect(help).toBeVisible()
-  expect((await settings.boundingBox())?.width).toBeGreaterThan((await help.boundingBox())?.width ?? 0)
-
-  await drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle }).click()
-  await expect(page).toHaveURL(new RegExp(`/session/${fixture.sourceID}$`))
-  await expect(drawer).toBeHidden()
-  await expect(trigger).toContainText(fixture.expected.sourceTitle)
-  await trigger.click()
-  await drawer.getByRole("button", { name: "Home", exact: true }).click()
-  await expect(page).toHaveURL("/")
-  await expect(drawer).toBeHidden()
-  await expect(page.locator('[data-component="home-session-row"]')).toHaveCount(fixture.sessions.length)
-})
-
-test("mobile settings section menu stays above a full-width panel", async ({ page }) => {
-  await page.locator('[data-slot="mobile-tabs-trigger"]').click()
-  await page.locator('[data-slot="mobile-tabs-drawer"]').getByRole("button", { name: "Settings", exact: true }).click()
-  const settings = page.getByTestId("settings-screen")
-  const menu = settings.getByRole("button", { name: "Preferences", exact: true })
-  const panel = settings.getByRole("tabpanel")
-  await expect(settings.getByRole("heading", { name: "General", exact: true })).toBeVisible()
-  await expect(page).toHaveURL("/settings")
-  await expect(menu).toBeVisible()
-  await menu.click()
-  await expect(page.getByRole("menuitemradio", { name: "Preferences", exact: true })).toBeChecked()
-  await page.keyboard.press("Escape")
-  await expect(page.getByRole("menuitemradio", { name: "Preferences", exact: true })).toBeHidden()
-  await expect(settings).toBeVisible()
-  await menu.click()
-  await page.getByRole("menuitemradio", { name: "Models", exact: true }).click()
-  await expect(settings.getByRole("heading", { name: "Models", exact: true })).toBeVisible()
-  await expect(settings.getByRole("button", { name: "Models", exact: true })).toBeVisible()
-  await expect(settings.getByRole("switch", { name: "Claude Opus 4.6", exact: true })).toBeAttached()
-  await expect
-    .poll(async () => {
-      const navigation = await settings.getByRole("button", { name: "Models", exact: true }).boundingBox()
-      const content = await panel.boundingBox()
-      return !!navigation && !!content && navigation.y + navigation.height <= content.y
-    })
-    .toBe(true)
-  await expect.poll(async () => (await panel.boundingBox())?.width ?? 0).toBeGreaterThan(350)
-  await settings.getByRole("button", { name: "Back to app", exact: true }).click()
-  await expect(page).toHaveURL("/")
-  await expect(settings).toBeHidden()
-  await expect(page.locator('[data-component="home-session-row"]')).toHaveCount(fixture.sessions.length)
-})

packages/app/e2e/regression/mobile-summary-drawer.spec.ts

@@ -1,43 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture } from "../performance/timeline/session-timeline-stress.fixture"
-import { mockStressTimeline, stressSessionHref } from "../performance/timeline/timeline-test-helpers"
-
-test("summary drawer dismisses and reopens after button, backdrop, Escape, and drag", async ({ page }) => {
-  await page.setViewportSize({ width: 390, height: 844 })
-  await mockStressTimeline(page)
-  await page.goto(stressSessionHref(fixture.targetID))
-  const more = page
-    .locator('[data-slot="session-mobile-view-navigation"]')
-    .getByRole("button", { name: "More options", exact: true })
-  const drawer = page.getByRole("dialog", { name: "Session details", exact: true })
-  const overlay = page.locator('[data-slot="mobile-drawer-overlay"]')
-
-  for (const dismissal of ["button", "backdrop", "escape", "drag", "button"] as const) {
-    await more.click()
-    await expect(page.getByRole("menuitem", { name: "Status", exact: true })).toHaveCount(0)
-    await page.getByRole("menuitem", { name: "Session details", exact: true }).click()
-    await expect(drawer.getByRole("button", { name: "MCP", exact: true })).toBeVisible()
-    // Corvu starts opening after paint; the transition flag is also absent
-    // before that callback. Wait for the open position before dismissing.
-    await expect
-      .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42))
-      .toBe(0)
-    await expect(drawer).not.toHaveAttribute("data-transitioning")
-    if (dismissal === "button") await drawer.getByRole("button", { name: "Close", exact: true }).click()
-    if (dismissal === "backdrop") await overlay.click({ position: { x: 10, y: 10 } })
-    if (dismissal === "escape") await page.keyboard.press("Escape")
-    if (dismissal === "drag") {
-      const handle = drawer.locator('[data-slot="mobile-drawer-handle"]')
-      const bounds = await handle.boundingBox()
-      expect(bounds).not.toBeNull()
-      await page.mouse.move(bounds!.x + bounds!.width / 2, bounds!.y + bounds!.height / 2)
-      await page.mouse.down()
-      await page.mouse.move(bounds!.x + bounds!.width / 2, bounds!.y + bounds!.height / 2 + 1)
-      await page.mouse.move(bounds!.x + bounds!.width / 2, 843)
-      await page.mouse.up()
-    }
-    await expect(drawer, `dismissal: ${dismissal}`).toBeHidden()
-    await expect(overlay).toHaveCount(0)
-    await expect(more).toBeFocused()
-  }
-})

packages/app/e2e/regression/mobile-tab-interactions.spec.ts

@@ -1,110 +0,0 @@
-import { expect, test, type Locator, type Page } from "@playwright/test"
-import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test.use({ viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true })
-
-test.beforeEach(async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    sessions: fixture.sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-  })
-  await page.addInitScript(
-    ({ directory, server, sessions }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({ projects: { local: [{ worktree: directory, expanded: true }] } }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify(sessions.map((session) => ({ type: "session", server, sessionId: session.id }))),
-      )
-    },
-    { directory: fixture.directory, server: fixture.serverKey, sessions: fixture.sessions },
-  )
-  await page.goto("/")
-  await page.locator('[data-slot="mobile-tabs-trigger"]').click()
-  await expect(page.locator('[data-slot="mobile-tabs-drawer"]')).toBeVisible()
-  const drawer = page.locator('[data-slot="mobile-drawer-content"]')
-  await expect
-    .poll(() => drawer.evaluate((element) => new DOMMatrixReadOnly(getComputedStyle(element).transform).m42))
-    .toBe(0)
-  await expect(drawer).not.toHaveAttribute("data-transitioning")
-})
-
-test("reorders session tabs with touch", async ({ page }) => {
-  const tabs = page.locator('[data-slot="vertical-tabs"] a')
-  await expect(tabs).toContainText([fixture.expected.sourceTitle, fixture.expected.targetTitle])
-
-  const target = tabs.filter({ hasText: fixture.expected.targetTitle })
-  const source = tabs.filter({ hasText: fixture.expected.sourceTitle })
-  const targetBox = await target.boundingBox()
-  const sourceBox = await source.boundingBox()
-  expect(targetBox).not.toBeNull()
-  expect(sourceBox).not.toBeNull()
-
-  await touchDrag(page, source, {
-    from: { x: sourceBox!.x + sourceBox!.width / 2, y: sourceBox!.y + sourceBox!.height / 2 },
-    to: { x: targetBox!.x + targetBox!.width / 2, y: targetBox!.y + targetBox!.height / 2 },
-  })
-
-  await expect(tabs).toContainText([fixture.expected.targetTitle, fixture.expected.sourceTitle])
-})
-
-test("dismisses a touch context menu by tapping outside", async ({ page }) => {
-  const drawer = page.locator('[data-slot="mobile-tabs-drawer"]')
-  const tab = drawer.locator('[data-slot="tab-link"]').filter({ hasText: fixture.expected.sourceTitle })
-  const home = drawer.getByRole("button", { name: "Home", exact: true })
-  const homeBox = await home.boundingBox()
-  const box = await tab.boundingBox()
-  expect(homeBox).not.toBeNull()
-  expect(box).not.toBeNull()
-  const point = { x: box!.x + box!.width / 2, y: box!.y + box!.height / 2 }
-
-  await tab.dispatchEvent("pointerdown", {
-    pointerType: "touch",
-    pointerId: 1,
-    isPrimary: true,
-    clientX: point.x,
-    clientY: point.y,
-  })
-  const rename = page.getByRole("menuitem", { name: "Rename", exact: true })
-  await expect(rename).toBeVisible()
-  await expect(drawer).toBeVisible()
-  await tab.filter({ visible: true }).dispatchEvent("pointerup", {
-    pointerType: "touch",
-    pointerId: 1,
-    isPrimary: true,
-    clientX: point.x,
-    clientY: point.y,
-  })
-
-  await page.touchscreen.tap(homeBox!.x + homeBox!.width / 2, homeBox!.y + homeBox!.height / 2)
-  await expect(rename).toBeHidden()
-  await expect(drawer).toBeVisible()
-})
-
-async function touchDrag(
-  page: Page,
-  source: Locator,
-  input: { from: { x: number; y: number }; to: { x: number; y: number } },
-) {
-  const client = await page.context().newCDPSession(page)
-  await client.send("Input.dispatchTouchEvent", {
-    type: "touchStart",
-    touchPoints: [{ ...input.from, id: 1 }],
-  })
-  await client.send("Input.dispatchTouchEvent", {
-    type: "touchMove",
-    touchPoints: [{ x: (input.from.x + input.to.x) / 2, y: (input.from.y + input.to.y) / 2, id: 1 }],
-  })
-  await expect(source).toHaveCount(2)
-  await client.send("Input.dispatchTouchEvent", {
-    type: "touchMove",
-    touchPoints: [{ ...input.to, id: 1 }],
-  })
-  await client.send("Input.dispatchTouchEvent", { type: "touchEnd", touchPoints: [] })
-}