refactor(core): move shell tool config into state

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

.changeset/websocket-request-hooks.md

@@ -0,0 +1,6 @@
+---
+"@opencode-ai/plugin": patch
+"@opencode-ai/core": patch
+---
+
+Add transport-neutral Session model request hooks and provider-scoped hook registration so eligible OpenAI Responses requests can prefer WebSocket without bypassing HTTP-only middleware.

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

@@ -1,6 +1,10 @@
 name: "Setup Bun"
 description: "Setup Bun with caching and install dependencies"
 inputs:
+  bun-version:
+    description: "Bun version to install instead of the root packageManager version"
+    required: false
+    default: ""
   install-flags:
     description: "Additional flags to pass to 'bun install'"
     required: false
@@ -20,19 +24,22 @@ runs:
       shell: bash
       run: |
         if [ "$RUNNER_ARCH" = "X64" ]; then
-          V=$(node -p "require('./package.json').packageManager.split('@')[1]")
+          V="${{ inputs.bun-version }}"
+          if [ -z "$V" ]; then V=$(node -p "require('./package.json').packageManager.split('@')[1]"); fi
+          TAG=$([ "$V" = "canary" ] && echo "canary" || echo "bun-v${V}")
           case "$RUNNER_OS" in
             macOS)   OS=darwin ;;
             Linux)   OS=linux ;;
             Windows) OS=windows ;;
           esac
-          echo "url=https://github.com/oven-sh/bun/releases/download/bun-v${V}/bun-${OS}-x64-baseline.zip" >> "$GITHUB_OUTPUT"
+          echo "url=https://github.com/oven-sh/bun/releases/download/${TAG}/bun-${OS}-x64-baseline.zip" >> "$GITHUB_OUTPUT"
         fi
 
     - name: Setup Bun
       uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
       with:
-        bun-version-file: ${{ !steps.bun-url.outputs.url && 'package.json' || '' }}
+        bun-version: ${{ !steps.bun-url.outputs.url && inputs.bun-version || '' }}
+        bun-version-file: ${{ !steps.bun-url.outputs.url && !inputs.bun-version && 'package.json' || '' }}
         bun-download-url: ${{ steps.bun-url.outputs.url }}
 
     - name: Get cache directory

.github/workflows/beta.yml

@@ -1,37 +0,0 @@
-name: beta
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 * * * *"
-
-jobs:
-  sync:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-        with:
-          fetch-depth: 0
-
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-
-      - name: Setup Git Committer
-        id: setup-git-committer
-        uses: ./.github/actions/setup-git-committer
-        with:
-          opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
-          opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
-
-      - name: Install OpenCode
-        run: bun i -g opencode-ai
-
-      - name: Sync beta branch
-        env:
-          GH_TOKEN: ${{ steps.setup-git-committer.outputs.token }}
-          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
-        run: bun script/beta.ts

.github/workflows/generate.yml

@@ -1,52 +0,0 @@
-name: generate
-
-on:
-  push:
-    branches:
-      - dev
-      - v2
-
-jobs:
-  generate:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-
-      - name: Setup git committer
-        id: committer
-        uses: ./.github/actions/setup-git-committer
-        with:
-          opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
-          opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
-
-      - name: Generate
-        run: ./script/generate.ts
-
-      - name: Commit and push
-        run: |
-          if [ -z "$(git status --porcelain)" ]; then
-            echo "No changes to commit"
-            exit 0
-          fi
-          git add -A
-          git commit -m "chore: generate" --allow-empty
-          git push origin HEAD:${{ github.ref_name }} --no-verify
-          # if ! git push origin HEAD:${{ github.event.pull_request.head.ref || github.ref_name }} --no-verify; then
-          #   echo ""
-          #   echo "============================================"
-          #   echo "Failed to push generated code."
-          #   echo "Please run locally and push:"
-          #   echo ""
-          #   echo "  ./script/generate.ts"
-          #   echo "  git add -A && git commit -m \"chore: generate\" && git push"
-          #   echo ""
-          #   echo "============================================"
-          #   exit 1
-          # fi

.github/workflows/publish.yml

@@ -7,6 +7,7 @@ on:
       - ci
       - dev
       - beta
+      - v2
       - fix/npm-native-binary-install
       - snapshot-*
   workflow_dispatch:
@@ -32,7 +33,7 @@ permissions:
   packages: write
 
 env:
-  OPENCODE_CHANNEL: ${{ (github.ref_name == 'v2' && 'next') || '' }}
+  OPENCODE_CHANNEL: ${{ (github.ref_name == 'v2' && 'dev') || '' }}
 
 jobs:
   version:
@@ -45,6 +46,13 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
 
+      - name: Deploy update service
+        if: github.ref_name == 'v2' || github.ref_name == 'beta'
+        working-directory: packages/updates
+        run: bun run deploy
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+
       - name: Setup git committer
         id: committer
         uses: ./.github/actions/setup-git-committer
@@ -74,13 +82,16 @@ jobs:
   build-cli:
     needs: version
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'beta'
+    timeout-minutes: 30
+    if: github.repository == 'anomalyco/opencode'
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           fetch-tags: true
 
       - uses: ./.github/actions/setup-bun
+        with:
+          bun-version: canary # Bun 1.4 until its stable release is published
 
       - name: Setup git committer
         id: committer
@@ -102,6 +113,7 @@ jobs:
         id: build
         run: ./packages/cli/script/build.ts ${{ (github.ref_name == 'beta' && '--sourcemaps') || '' }}
         env:
+          BUN_COMPILE_RELEASE: canary
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
           GH_REPO: ${{ needs.version.outputs.repo }}
@@ -185,7 +197,7 @@ jobs:
 
   build-node-cli:
     needs: version
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'beta'
+    if: github.repository == 'anomalyco/opencode' && false # Temporarily disabled
     strategy:
       fail-fast: false
       matrix:
@@ -335,6 +347,7 @@ jobs:
   build-electron:
     needs:
       - version
+      - sign-cli-macos
     if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2'
     continue-on-error: false
     env:
@@ -373,6 +386,12 @@ jobs:
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
+      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
+        if: github.ref_name == 'beta'
+        with:
+          name: opencode-preview-cli
+          path: packages/cli/dist
+
       - uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93 # v2.0.0
         if: runner.os == 'macOS'
         with:
@@ -431,6 +450,7 @@ jobs:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
           OPENCODE_CLI_TARGET: ${{ matrix.settings.target }}
+          OPENCODE_CLI_DIST: ${{ (github.ref_name == 'beta' && format('{0}/packages/cli/dist', github.workspace)) || '' }}
 
       - name: Build
         run: bun run build
@@ -447,6 +467,7 @@ jobs:
           VITE_SENTRY_ENVIRONMENT: ${{ (github.ref_name == 'beta' && 'beta') || 'production' }}
           VITE_SENTRY_RELEASE: desktop@${{ needs.version.outputs.version }}
           OPENCODE_CLI_TARGET: ${{ matrix.settings.target }}
+          OPENCODE_CLI_DIST: ${{ github.workspace }}/packages/cli/dist
 
       - name: Package
         if: needs.version.outputs.release
@@ -569,13 +590,12 @@ jobs:
           path: packages/opencode/dist
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'beta'
         with:
           name: opencode-preview-cli
           path: packages/cli/dist
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'beta'
+        if: needs.build-node-cli.result == 'success'
         with:
           pattern: opencode-node-cli-*
           path: packages/cli/dist/node

.github/workflows/test.yml

@@ -80,6 +80,8 @@ jobs:
         if: always()
         timeout-minutes: 10
         working-directory: packages/cli
+        env:
+          NODE_OPTIONS: ${{ runner.os == 'Windows' && '--max-old-space-size=4096' || '' }}
         run: |
           bun run script/build.ts --single --skip-install
           bun run script/service-smoke.ts
@@ -94,6 +96,8 @@ jobs:
         if: always()
         timeout-minutes: 15
         working-directory: packages/cli
+        env:
+          NODE_OPTIONS: ${{ runner.os == 'Windows' && '--max-old-space-size=4096' || '' }}
         run: |
           bun run script/build-node.ts --single --skip-install --outdir=dist/node
           bun run script/service-smoke.ts --node

.opencode/skills/opencode-dev/SKILL.md

@@ -0,0 +1,231 @@
+---
+name: opencode-dev
+description: Use when interactively running, debugging, or verifying opencode's own V2 CLI/TUI or server during development in this repo — starting the dev TUI, driving it with termctrl, comparing V2 against the legacy TUI, hitting the V2 server/API directly, reading log files, or attaching Bun's inspector.
+---
+
+# Debugging opencode itself
+
+Workflow for interactively exercising the V2 CLI/TUI and server while developing in this repo. All commands below run from `packages/cli` unless noted otherwise.
+
+## Server/client model
+
+opencode V2 is a client/server system, not a single monolithic process:
+
+- **Server process** runs the Effect HTTP API (`packages/server`) and owns all domain state: sessions, database, plugins, permissions, Location services. It's started by the `serve` command (`packages/cli/src/commands/handlers/serve.ts`).
+- **TUI process** is a separate process that runs no application logic itself — it's an HTTP/SSE client of the server via the generated SDK (`createOpencodeClient` / `sdk.client.v2`).
+- **Discovery**: CLI processes find the shared server through a JSON registration file at `~/.local/state/opencode/service.json` (or `service-local.json` for the local/dev channel) containing `{id, version, url, pid}`. A separate password file under `~/.config/opencode/service.json` provides HTTP Basic auth. Before reusing a registration, the client calls `GET /health` to confirm the server is alive, authenticated, and version-compatible.
+- **Sharing**: because of this registration/health-check dance, many concurrent `opencode`/TUI invocations converge on one shared background daemon rather than each spawning their own. If no compatible healthy daemon is found, a new one is spawned detached (`serve --service`) and registers itself.
+- **`bun dev service start|status|stop|restart`** manages this shared background daemon's lifecycle directly — useful when you need to force a fresh server, confirm one is running, or kill a stuck one.
+- **Standalone mode** (`--standalone`) opts a single invocation out of the shared daemon: it spawns a private one-off `serve --stdio --port 0` child tied to that invocation's lifetime, with its own random password. Use this to isolate a debugging session from your other running opencode sessions.
+- Every log line is tagged `role=server` or `role=cli` and a per-process `run=<id>`, so you can distinguish server-side and client-side activity in one shared log file (see "Logs" below) even when both roles are interleaved from concurrent processes.
+
+## Starting the dev TUI
+
+- This package is the V2 CLI adapter. Run its `dev` script when testing the TUI; do not use the repository-root `bun dev`, which launches the legacy `packages/opencode` CLI.
+- Run commands from `packages/cli`. Use `bun dev` for most debugging so the TUI starts with a private V2 server.
+
+## Interactive debugging with termctrl
+
+- Use `termctrl` for interactive checks instead of starting the TUI as a blocking foreground process. It provides a real PTY, handles OpenTUI's host handshake, and can save reviewable screenshots.
+- Use a dedicated session name and do not reuse or kill an unrelated session.
+
+```bash
+termctrl start opencode-v2-dev --host opentui --cols 112 --rows 34 -- bun dev
+termctrl wait opencode-v2-dev "Ask anything" --timeout 20000
+termctrl show opencode-v2-dev
+```
+
+- Wait for visible text before interacting instead of relying on fixed sleeps. Use the text expected from the screen under test, such as `Ask anything` or `Connect a provider`.
+- Drive the running TUI with `termctrl send`. Prefix typed input with `text:` and send control keys separately so the interaction matches real terminal input.
+
+```bash
+termctrl send opencode-v2-dev 'text:example prompt' enter
+termctrl send opencode-v2-dev ctrl-c
+```
+
+- Use `termctrl show` after each meaningful interaction and inspect the full visible screen for rendering errors, stale state, error toasts, and unexpected exits.
+- Save PNG evidence for every user-visible bug and fix. Do not save text captures; inspect the rendered PNG. Write temporary captures outside the repository unless the artifact is intended to be committed.
+
+```bash
+termctrl save opencode-v2-dev --format png --out /tmp/opencode/v2-tui.png
+```
+
+- For resize-sensitive changes, resize the viewport, wait for the expected content, and capture the screen again:
+
+```bash
+termctrl resize opencode-v2-dev --cols 100 --rows 30
+termctrl show opencode-v2-dev
+```
+
+- Source changes may require restarting the process. Use `termctrl restart opencode-v2-dev` rather than assuming the running TUI reloaded the change.
+- To exercise background-service behavior, use `bun dev service start`, `bun dev service status`, and `bun dev service stop`.
+- Always clean up the Terminal Control session when the check is complete:
+
+```bash
+termctrl stop opencode-v2-dev
+```
+
+## Comparing V2 against the legacy TUI
+
+Run both versions in separate Terminal Control sessions and save PNG-only captures at equivalent states:
+
+```bash
+# From packages/cli: local V2 TUI
+termctrl start opencode-v2-dev --host opentui --cols 112 --rows 34 -- bun dev
+
+# Released legacy TUI behavior reference
+termctrl start opencode-legacy --host opentui --cols 112 --rows 34 -- bunx opencode-ai@latest
+
+termctrl save opencode-v2-dev --format png --out /tmp/opencode/v2.png
+termctrl save opencode-legacy --format png --out /tmp/opencode/legacy.png
+```
+
+- Use the same viewport and send equivalent inputs to both sessions before comparing screenshots. The released CLI is a behavioral reference, not a source of V2 API design; keep the local implementation on V2 endpoints.
+- Stop both sessions after comparison: `termctrl stop opencode-v2-dev` and `termctrl stop opencode-legacy`.
+
+## Server/API debugging
+
+- Use `bun dev api --help` from `packages/cli` to inspect the API debugging command. It sends one request to the V2 server using the same daemon discovery/auth path as the CLI.
+- Use `bun dev api` to introspect the server-side data backing the TUI. This is useful when debugging UI bugs: compare what the screen renders with the raw session, message, event, agent, or health data returned by the API to determine whether the bug is in the server state, the client data layer, or the TUI rendering.
+- `bun dev api` accepts either an OpenAPI operation ID or a raw HTTP method plus path:
+
+```bash
+bun dev api get /health
+bun dev api get /openapi.json
+bun dev api <operationId> --param key=value
+```
+
+- Pass JSON request bodies with `--data`/`-d`; the command sets `content-type: application/json` automatically unless you provide a header. Add extra headers with `--header`/`-H name:value`.
+- If no compatible background server is registered, `bun dev api` starts one through the daemon service. Use `bun dev service status`, `bun dev service restart`, and `bun dev service stop` when you need explicit lifecycle control.
+- Prefer raw method/path calls for quick server debugging and operation IDs when exercising documented OpenAPI routes with path or query parameters.
+
+## Auditing installed `opencode2` sessions
+
+Installed next-channel sessions normally use `~/.local/share/opencode/opencode-next.db` and `~/.local/share/opencode/log/opencode.log`; `OPENCODE_DB` can override the database. Before calling `opencode2 api`, inspect `~/.local/state/opencode/service.json` because the command may start a daemon when none is healthy.
+
+For a supplied `ses_...` ID, compare three sources:
+
+- `opencode2 api get /api/session/active` and the Session/message endpoints for live server state.
+- The database's ordered `event` rows for durable history.
+- `packages/tui/src/context/data.tsx` and the relevant route for client projection and rendering.
+
+Locate an uncertain database without modifying it:
+
+```bash
+SESSION=ses_...
+for db in ~/.local/share/opencode/*.db; do
+  sqlite3 "file:$db?mode=ro" "select 1 from session where id='$SESSION' limit 1" 2>/dev/null | grep -q 1 && printf '%s\n' "$db"
+done
+```
+
+## Logs
+
+- Log files live under `~/.local/share/opencode/log/`. In a local/dev checkout the active file is `opencode-local.log`; `opencode.log` is used for non-local (released) channel installs. Both are append-only, shared across every CLI and server process on the machine.
+- Each line is structured `key=value` text: `timestamp`, `level`, `run=<id>` (per-process run ID), `message`, and a `role=cli` or `role=server` tag. Use `run=` to isolate one process's activity and `role=` to separate client-side from server-side log lines, since a shared daemon interleaves many processes' output in one file.
+- Tail the live file while reproducing an issue instead of guessing from stale output:
+
+```bash
+tail -f ~/.local/share/opencode/log/opencode-local.log
+```
+
+- Filter to one run or role when the file is noisy:
+
+```bash
+grep 'run=8fc3b1d5' ~/.local/share/opencode/log/opencode-local.log
+grep 'role=server' ~/.local/share/opencode/log/opencode-local.log
+```
+
+- `OPENCODE_LOG_LEVEL` controls verbosity (default `INFO`); set it before starting `bun dev` or `serve` to get `DEBUG` output for a specific repro.
+- `OPENCODE_PRINT_LOGS=1` additionally tees log output to stderr of the process that emitted it, which is useful when a process fails before you'd think to check the shared log file.
+- `termctrl logs <session>` surfaces stdout/stderr for a Terminal Control session specifically (e.g. inspector output or startup failures before the TUI renderer starts) — use the log file above for anything emitted by a separate server/daemon process instead.
+
+## Heap snapshots
+
+The CLI installs a `SIGUSR1` listener on non-Windows processes in `packages/cli/src/heap.ts`. Use it to capture the installed `opencode2` server without restarting it or attaching an inspector.
+
+1. Find the processes and inspect their roles and memory:
+
+```bash
+pgrep -a -f 'opencode2\.exe|opencode2'
+ps -o pid,ppid,rss,vsz,lstart,etime,cmd -p <pid>,<pid>
+```
+
+2. Signal the process whose heap needs investigation. For shared-service memory, target the `opencode2.exe serve --service` child, not the short wrapper/TUI process:
+
+```bash
+kill -USR1 <server-pid>
+```
+
+3. Wait for `heap snapshot written` in the channel's log before opening the file. Snapshots are written to the same log directory as `heap-<pid>-<timestamp>.heapsnapshot`; writing a large heap can take several seconds and the file is incomplete until the completion message appears:
+
+```bash
+grep 'heap snapshot' ~/.local/share/opencode/log/opencode.log | tail
+find ~/.local/share/opencode/log -maxdepth 1 -name 'heap-<server-pid>-*.heapsnapshot' -printf '%T@ %s %p\n' | sort -nr | head
+```
+
+Use `opencode-local.log` instead for a local/dev channel process. The log's `path=` field is authoritative.
+
+4. Analyze the snapshot with Chrome DevTools, a V8 heap snapshot parser, or a temporary tool installed outside the repository. Start with the largest retained objects, dominators, object counts grouped by constructor/name, and retainer paths back to GC roots. Relate suspicious names and paths back to the source tree rather than treating large shallow allocations as leaks.
+
+For command-line analysis, install tooling under `/tmp/opencode`, not in the repository. For example, MemLab can rank dominators and trace a reported heap object ID back to a GC root:
+
+```bash
+npm install --prefix /tmp/opencode/heap-analysis @memlab/cli
+/tmp/opencode/heap-analysis/node_modules/.bin/memlab analyze object-size --snapshot <snapshot>
+/tmp/opencode/heap-analysis/node_modules/.bin/memlab analyze shape --snapshot <snapshot>
+/tmp/opencode/heap-analysis/node_modules/.bin/memlab trace --snapshot <snapshot> --node-id=<id>
+```
+
+A single snapshot explains what retains memory at one point in time, but does not by itself prove a leak. For leak confirmation, capture a baseline, perform a controlled repeated workload, allow idle cleanup/GC when possible, capture another snapshot, and compare growth and retainer paths. Also compare snapshot heap size with process RSS: a large difference can indicate native allocations, database mappings, allocator fragmentation, or other memory outside the JavaScript heap.
+
+```bash
+cat /proc/<pid>/smaps_rollup
+pmap -x <pid> | sort -k3 -nr | head -25
+```
+
+Heap serialization itself can temporarily increase RSS and allocator high-water marks, so record `ps`/`smaps_rollup` both before and after capture. Large anonymous mappings with a comparatively small live heap require native-allocation or allocator investigation; they cannot be explained from JavaScript retainer paths alone.
+
+## CPU profiles
+
+The CLI installs a `SIGPROF` listener on non-Windows processes in `packages/cli/src/cpu-profile.ts`. One signal starts a ten-second CPU profile and stops it automatically; additional signals are ignored while a profile is active. There is no CPU profile CLI flag or environment variable.
+
+1. Get the PID from the health endpoint. For shared-service performance, target the server PID returned here rather than the short wrapper or TUI process:
+
+```bash
+opencode2 api get /api/health
+```
+
+Use `bun dev api get /api/health` instead when targeting the local/dev channel.
+
+2. Start the capture:
+
+```bash
+kill -PROF <server-pid>
+```
+
+3. Wait for `CPU profile written` in the channel's log before opening the file. Profiles are written to the same log directory as `cpu-<pid>-<timestamp>.cpuprofile`; the log's `path=` field is authoritative:
+
+```bash
+grep 'CPU profile' ~/.local/share/opencode/log/opencode.log | tail
+find ~/.local/share/opencode/log -maxdepth 1 -name 'cpu-<server-pid>-*.cpuprofile' -printf '%T@ %s %p\n' | sort -nr | head
+```
+
+Use `opencode-local.log` for a local/dev process. Load the completed `.cpuprofile` in Chrome DevTools or another V8 CPU profile viewer and inspect the hottest functions, call stacks, and self time during the controlled workload.
+
+## Debugger
+
+- To debug the V2 CLI or TUI with Bun's inspector, launch the CLI entrypoint through Terminal Control with an inspector URL, then attach a debugger to that URL:
+
+```bash
+termctrl start opencode-v2-debug --host opentui --cols 112 --rows 34 -- \
+  bun run --inspect=ws://localhost:6499/ src/index.ts
+```
+
+- Use `--inspect-wait` or `--inspect-brk` when execution must pause until a debugger attaches.
+- Use `termctrl logs opencode-v2-debug` for inspector output or startup failures emitted before the TUI renderer starts. Use `termctrl show` for the visible full-screen TUI.
+
+## Verification
+
+- Run `bun typecheck` from `packages/cli` after CLI adapter changes.
+- Run `bun typecheck` and `bun test` from `packages/tui` after shared TUI changes. Do not run tests from the repository root.
+- Treat automated checks and Terminal Control smoke tests as complementary. For user-visible changes, verify initial render, the changed interaction, Ctrl-C exit behavior, and save a screenshot of the corrected state.

AGENTS.md

@@ -9,7 +9,7 @@
 
 - Run `bun run dev:live` from a development worktree to test its TUI against the currently elected `opencode2` background server and live sessions.
 - Pass a directory after the script when needed, for example `bun run dev:live /path/to/project`.
-- The script discovers the server with `opencode2 service status`, injects its private local credential from `opencode2 service get password`, and uses the `next` TUI storage channel so tabs and other client-local state match the installed client.
+- The script discovers the server with `opencode2 service status`, injects its private local credential from `opencode2 service get password`, and uses the `dev` TUI storage channel so tabs and other client-local state match the installed client.
 - Prefer `dev:live` over plain `bun run dev` for this workflow. An implicit managed-service connection may replace the live server when the worktree client version differs; explicit `--server` warns and continues without replacing it.
 
 ## V2 TUI Stories

bunfig.toml

@@ -2,7 +2,7 @@
 exact = true
 # Only install newly resolved package versions published at least 3 days ago.
 minimumReleaseAge = 259200
-minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opencode-ai/sdk", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish"]
+minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opencode-ai/sdk", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish", "blume"]
 
 [test]
 root = "./do-not-run-tests-from-root"

install

@@ -15,13 +15,13 @@ Usage: install.sh [options]
 
 Options:
     -h, --help              Display this help message
-    -v, --version <version> Install a specific version (e.g., 0.0.0-next-17236)
+    -v, --version <version> Install a specific version (e.g., 0.0.0-beta-17236)
     -b, --binary <path>     Install from a local binary instead of downloading
         --no-modify-path    Don't modify shell config files (.zshrc, .bashrc, etc.)
 
 Examples:
-    curl -fsSL https://raw.githubusercontent.com/anomalyco/opencode/v2/install | bash
-    curl -fsSL https://raw.githubusercontent.com/anomalyco/opencode/v2/install | bash -s -- --version 0.0.0-next-17236
+    curl -fsSL https://opencode.ai/v2/install | bash
+    curl -fsSL https://opencode.ai/v2/install | bash -s -- --version 0.0.0-beta-17236
     ./install --binary /path/to/opencode2
 EOF
 }
@@ -166,7 +166,7 @@ else
     fi
 
     if [ -z "$requested_version" ]; then
-        metadata=$(curl -fsSL https://registry.npmjs.org/@opencode-ai%2fcli/next || true)
+        metadata=$(curl -fsSL https://registry.npmjs.org/@opencode-ai%2fcli/beta || true)
         specific_version=$(echo "$metadata" | sed -n 's/.*"version":"\([^"]*\)".*/\1/p')
 
         if [ -z "$specific_version" ]; then

package.json

@@ -8,7 +8,7 @@
   "packageManager": "bun@1.3.14",
   "scripts": {
     "dev": "bun run --cwd packages/cli --conditions=browser src/index.ts",
-    "dev:live": "OPENCODE_TUI_CHANNEL=next OPENCODE_PASSWORD=\"$(opencode2 service get password)\" bun run dev --server \"$(opencode2 service status)\"",
+    "dev:live": "OPENCODE_TUI_CHANNEL=dev OPENCODE_PASSWORD=\"$(opencode2 service get password)\" bun run dev --server \"$(opencode2 service status)\"",
     "dev:desktop": "bun --cwd packages/desktop dev",
     "dev:web": "bun --cwd packages/app dev",
     "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
@@ -37,18 +37,19 @@
       "packages/slack"
     ],
     "catalog": {
-      "@effect/opentelemetry": "4.0.0-beta.101",
-      "@effect/platform-node": "4.0.0-beta.101",
-      "@effect/sql-sqlite-bun": "4.0.0-beta.101",
+      "@effect/opentelemetry": "4.0.0-beta.107",
+      "@effect/platform-node": "4.0.0-beta.107",
+      "@effect/platform-node-shared": "4.0.0-beta.107",
+      "@effect/sql-sqlite-bun": "4.0.0-beta.107",
       "@npmcli/arborist": "9.4.0",
       "@types/bun": "1.3.13",
       "@types/cross-spawn": "6.0.6",
       "@octokit/rest": "22.0.0",
       "@hono/standard-validator": "0.2.0",
       "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.3",
-      "@opentui/keymap": "0.5.3",
-      "@opentui/solid": "0.5.3",
+      "@opentui/core": "0.5.4",
+      "@opentui/keymap": "0.5.4",
+      "@opentui/solid": "0.5.4",
       "@tanstack/solid-virtual": "3.13.32",
       "@shikijs/stream": "4.2.0",
       "@standard-schema/spec": "1.1.0",
@@ -70,7 +71,7 @@
       "dompurify": "3.3.1",
       "drizzle-kit": "1.0.0-rc.2",
       "drizzle-orm": "1.0.0-rc.2",
-      "effect": "4.0.0-beta.101",
+      "effect": "4.0.0-beta.107",
       "ai": "6.0.168",
       "cross-spawn": "7.0.6",
       "hono": "4.10.7",
@@ -120,8 +121,7 @@
     "prettier": "3.6.2",
     "semver": "^7.6.0",
     "sst": "catalog:",
-    "turbo": "2.10.2",
-    "vitest": "4.1.10"
+    "turbo": "2.10.2"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.933.0",
@@ -154,6 +154,7 @@
     "@opentui/core": "catalog:",
     "@opentui/keymap": "catalog:",
     "@opentui/solid": "catalog:",
+    "@effect/platform-node-shared": "catalog:",
     "@types/bun": "catalog:",
     "@types/node": "catalog:",
     "effect": "catalog:"
@@ -164,6 +165,7 @@
     "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
     "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
     "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
+    "drizzle-orm@1.0.0-rc.2": "patches/drizzle-orm@1.0.0-rc.2.patch",
     "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
     "@ai-sdk/mistral@3.0.51": "patches/@ai-sdk%2Fmistral@3.0.51.patch",
     "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
@@ -171,7 +173,6 @@
     "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
     "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
     "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
-    "effect@4.0.0-beta.101": "patches/effect@4.0.0-beta.101.patch",
     "@tanstack/virtual-core@3.17.3": "patches/@tanstack%2Fvirtual-core@3.17.3.patch",
     "@ff-labs/fff-bun@0.10.1": "patches/@ff-labs%2Ffff-bun@0.10.1.patch"
   }

packages/ai/AGENTS.md

@@ -193,7 +193,7 @@ If you find yourself copying a 3-to-5-line snippet between two protocols, lift i
 
 `LLMRequest.system` is the initial privileged prompt that applies ahead of the conversation. `Message.system(...)` is a separate, provider-neutral chronological operator update inside `LLMRequest.messages`; it applies only from its position in history onward and accepts text content only.
 
-Native chronological system messages are route/model-specific. Anthropic Messages lowers them natively for Claude Opus 4.8 (`claude-opus-4-8`). Other routes and models intentionally lower the update in place into ordinary user-compatible text using this stable escaped representation:
+Native chronological system messages are route/model-specific. Open Responses lowers them to standard `developer` messages, while Anthropic Messages lowers them to native system messages for Claude Opus 4.8 (`claude-opus-4-8`). Other routes and models intentionally lower the update in place into ordinary user-compatible text using this stable escaped representation:
 
 ```text
 <system-update>

packages/ai/src/protocols/anthropic-messages.ts

@@ -30,7 +30,6 @@ import { ToolSchemaProjection } from "./utils/tool-schema.js"
 import { ToolStream } from "./utils/tool-stream.js"
 
 const ADAPTER = "anthropic-messages"
-const MEDIA_MIMES = new Set<string>([...ProviderShared.IMAGE_MIMES, ...ProviderShared.PDF_MIMES])
 export const DEFAULT_BASE_URL = "https://api.anthropic.com/v1"
 export const PATH = "/messages"
 
@@ -400,7 +399,7 @@ const lowerServerToolResult = Effect.fn("AnthropicMessages.lowerServerToolResult
 })
 
 const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (part: MediaPart) {
-  const media = yield* ProviderShared.validateMedia("Anthropic Messages", part, MEDIA_MIMES)
+  const media = ProviderShared.normalizeMedia(part)
   if (media.mime === "application/pdf")
     return {
       type: "document" as const,
@@ -410,6 +409,8 @@ const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (part: Me
         data: media.base64,
       },
     } satisfies AnthropicDocumentBlock
+  if (!media.mime.startsWith("image/"))
+    return yield* invalid(`Anthropic Messages does not support media type ${part.mediaType}`)
   return {
     type: "image" as const,
     source: {
@@ -436,10 +437,19 @@ const lowerToolResultContent = Effect.fnUntraced(function* (part: ToolResultPart
   return yield* Effect.forEach(content, lowerToolResultContentItem)
 })
 
-// Mid-conversation system messages are a native Claude API feature only for
-// Opus 4.8. Other Anthropic models intentionally use the same visible wrapped-
-// user fallback as non-Anthropic routes rather than sending a role they reject.
-const supportsNativeSystemUpdates = (request: LLMRequest) => String(request.model.id) === "claude-opus-4-8"
+// Mid-conversation system messages became available with Opus 4.8 and version
+// 5 of the other supported Claude families. Treat later family versions as
+// compatible without assuming that every Anthropic Messages model is Claude.
+const supportsNativeSystemUpdates = (request: LLMRequest) => {
+  const match = /(?:^|[./])claude-(fable|haiku|mythos|opus|sonnet)-(\d+)(?:[.-](\d+))?/.exec(
+    String(request.model.id).toLowerCase(),
+  )
+  if (!match) return false
+  const major = Number(match[2])
+  if (match[1] !== "opus") return major >= 5
+  if (major !== 4) return major >= 5
+  return match[3] !== undefined && match[3].length <= 2 && Number(match[3]) >= 8
+}
 
 const endsInServerToolUse = (message: LLMRequest["messages"][number]) => {
   const last = message.content.at(-1)
@@ -895,6 +905,7 @@ const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(f
 
   if (delta?.type === "input_json_delta" && event.index !== undefined) {
     if (!delta.partial_json) return [state, NO_EVENTS] satisfies StepResult
+    if (!state.tools[event.index]) return [state, NO_EVENTS] satisfies StepResult
     const result = ToolStream.appendExisting(
       ADAPTER,
       state.tools,
@@ -956,9 +967,12 @@ const onMessageDelta = (state: ParserState, event: AnthropicEvent): StepResult =
   ]
 }
 
-const onMessageStop = (state: ParserState): StepResult => {
+const onMessageStop = Effect.fn("AnthropicMessages.onMessageStop")(function* (state: ParserState) {
+  const result = yield* ToolStream.finishAll(ADAPTER, state.tools)
   const events: LLMEvent[] = []
-  const lifecycle = Lifecycle.finish(state.lifecycle, events, {
+  const lifecycle = result.events.length ? Lifecycle.stepStart(state.lifecycle, events) : state.lifecycle
+  events.push(...result.events)
+  const finished = Lifecycle.finish(lifecycle, events, {
     reason: state.pendingFinish?.reason ?? {
       normalized: "unknown",
       raw: undefined,
@@ -966,8 +980,8 @@ const onMessageStop = (state: ParserState): StepResult => {
     usage: state.usage,
     providerMetadata: state.pendingFinish?.providerMetadata,
   })
-  return [{ ...state, lifecycle }, events]
-}
+  return [{ ...state, lifecycle: finished, tools: result.tools }, events] satisfies StepResult
+})
 
 // Prefix `error.type` so overloads, rate limits, and quota errors are visible
 // even when the provider message is generic or empty.
@@ -991,7 +1005,7 @@ const step = (state: ParserState, event: AnthropicEvent) => {
   if (event.type === "content_block_delta") return onContentBlockDelta(state, event)
   if (event.type === "content_block_stop") return onContentBlockStop(state, event)
   if (event.type === "message_delta") return Effect.succeed(onMessageDelta(state, event))
-  if (event.type === "message_stop") return Effect.succeed(onMessageStop(state))
+  if (event.type === "message_stop") return onMessageStop(state)
   if (event.type === "error") return onError(event)
   return Effect.succeed<StepResult>([state, NO_EVENTS])
 }

packages/ai/src/protocols/gemini.ts

@@ -24,7 +24,6 @@ import { Lifecycle } from "./utils/lifecycle.js"
 import { ToolSchemaProjection } from "./utils/tool-schema.js"
 
 const ADAPTER = "gemini"
-const MEDIA_MIMES = new Set<string>(ProviderShared.MEDIA_MIMES)
 // Google documents this sentinel for replaying Gemini 3 function calls after their original signature was lost.
 const SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator"
 export const DEFAULT_BASE_URL = "https://generativelanguage.googleapis.com/v1beta"
@@ -93,7 +92,7 @@ const GeminiFunctionCallPart = Schema.Struct({
   functionCall: Schema.Struct({
     id: Schema.optional(Schema.String),
     name: Schema.String,
-    args: Schema.Unknown,
+    args: Schema.optional(Schema.Unknown),
   }),
   thoughtSignature: Schema.optional(Schema.String),
 })
@@ -167,6 +166,7 @@ const GeminiGenerationConfig = Schema.Struct({
 const GeminiBodyFields = {
   cachedContent: Schema.optional(Schema.String),
   contents: Schema.Array(GeminiContent),
+  labels: Schema.optional(Schema.Record(Schema.String, Schema.String)),
   safetySettings: optionalArray(GeminiSafetySetting),
   serviceTier: Schema.optional(Schema.String),
   systemInstruction: Schema.optional(GeminiSystemInstruction),
@@ -191,8 +191,19 @@ const GeminiCandidate = Schema.Struct({
   finishReason: Schema.optional(Schema.String),
 })
 
+const GeminiPromptFeedback = Schema.StructWithRest(
+  Schema.Struct({
+    blockReason: Schema.optional(Schema.String),
+    blockReasonMessage: Schema.optional(Schema.String),
+    safetyRatings: Schema.optional(Schema.Unknown),
+  }),
+  [Schema.Record(Schema.String, Schema.Unknown)],
+)
+type GeminiPromptFeedback = Schema.Schema.Type<typeof GeminiPromptFeedback>
+
 const GeminiEvent = Schema.Struct({
   candidates: optionalArray(GeminiCandidate),
+  promptFeedback: Schema.optional(GeminiPromptFeedback),
   usageMetadata: Schema.optional(GeminiUsage),
 })
 type GeminiEvent = Schema.Schema.Type<typeof GeminiEvent>
@@ -201,6 +212,7 @@ interface ParserState {
   readonly finishReason?: string
   readonly hasToolCalls: boolean
   readonly nextToolCallId: number
+  readonly promptFeedback?: GeminiPromptFeedback
   readonly usage?: Usage
   readonly lifecycle: Lifecycle.State
   readonly reasoningSignature?: string
@@ -248,7 +260,7 @@ const lowerToolConfig = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
 
 const lowerUserPart = Effect.fn("Gemini.lowerUserPart")(function* (part: TextPart | MediaPart) {
   if (part.type === "text") return { text: part.text }
-  const media = yield* ProviderShared.validateMedia("Gemini", part, MEDIA_MIMES)
+  const media = ProviderShared.normalizeMedia(part)
   return { inlineData: { mimeType: media.mime, data: media.base64 } }
 })
 
@@ -353,7 +365,7 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request: LLMR
       const media: GeminiInlineDataPart[] = []
       for (const item of content) {
         if (item.type === "text") continue
-        const value = yield* ProviderShared.validateToolFile("Gemini", item, MEDIA_MIMES)
+        const value = ProviderShared.normalizeToolFile(item)
         media.push({ inlineData: { mimeType: value.mime, data: value.base64 } })
       }
       parts.push({
@@ -504,32 +516,37 @@ const mapFinishReason = (finishReason: string | undefined, hasToolCalls: boolean
   return "unknown"
 }
 
-const finish = (state: ParserState): ReadonlyArray<LLMEvent> =>
-  state.finishReason || state.usage
-    ? (() => {
-        const events: LLMEvent[] = []
-        const lifecycle = state.reasoningSignature
-          ? Lifecycle.reasoningEnd(
-              state.lifecycle,
-              events,
-              "reasoning-0",
-              googleMetadata({ thoughtSignature: state.reasoningSignature }),
-            )
-          : state.lifecycle
-        Lifecycle.finish(lifecycle, events, {
-          reason: {
-            normalized: mapFinishReason(state.finishReason, state.hasToolCalls),
-            raw: state.finishReason,
-          },
-          usage: state.usage,
-        })
-        return events
-      })()
-    : []
+const finish = (state: ParserState): ReadonlyArray<LLMEvent> => {
+  const promptBlockReason = state.finishReason === undefined ? state.promptFeedback?.blockReason : undefined
+  const finishReason = state.finishReason ?? promptBlockReason
+  if (finishReason === undefined && state.usage === undefined) return []
+
+  const events: LLMEvent[] = []
+  const lifecycle = state.reasoningSignature
+    ? Lifecycle.reasoningEnd(
+        state.lifecycle,
+        events,
+        "reasoning-0",
+        googleMetadata({ thoughtSignature: state.reasoningSignature }),
+      )
+    : state.lifecycle
+  Lifecycle.finish(lifecycle, events, {
+    reason: {
+      normalized:
+        promptBlockReason === undefined ? mapFinishReason(finishReason, state.hasToolCalls) : "content-filter",
+      raw: finishReason,
+    },
+    usage: state.usage,
+    providerMetadata:
+      state.promptFeedback === undefined ? undefined : googleMetadata({ promptFeedback: state.promptFeedback }),
+  })
+  return events
+}
 
 const step = (state: ParserState, event: GeminiEvent) => {
   const nextState = {
     ...state,
+    promptFeedback: event.promptFeedback ?? state.promptFeedback,
     usage: event.usageMetadata ? (mapUsage(event.usageMetadata) ?? state.usage) : state.usage,
   }
   const candidate = event.candidates?.[0]
@@ -570,7 +587,7 @@ const step = (state: ParserState, event: GeminiEvent) => {
     }
 
     if ("functionCall" in part) {
-      const input = part.functionCall.args
+      const input = part.functionCall.args === undefined ? {} : part.functionCall.args
       const id = `tool_${nextToolCallId++}`
       const metadata = {
         ...(part.functionCall.id === undefined ? {} : { functionCallId: part.functionCall.id }),

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

@@ -26,7 +26,6 @@ import { ToolStream } from "./utils/tool-stream.js"
 
 const ADAPTER = "open-responses"
 const NAME = "Open Responses"
-const MEDIA_MIMES = new Set<string>([...ProviderShared.IMAGE_MIMES, ...ProviderShared.PDF_MIMES])
 export const PATH = "/responses"
 
 // =============================================================================
@@ -91,6 +90,7 @@ const OpenResponsesFunctionCallOutput = Schema.Union([
 
 export const InputItem = Schema.Union([
   Schema.Struct({ role: Schema.tag("system"), content: Schema.String }),
+  Schema.Struct({ role: Schema.tag("developer"), content: Schema.String }),
   Schema.Struct({ role: Schema.tag("user"), content: Schema.Array(OpenResponsesInputContent) }),
   Schema.Struct({
     role: Schema.tag("assistant"),
@@ -141,6 +141,11 @@ export const Tool = Schema.Struct({
 export const ToolChoice = Schema.Union([
   Schema.Literals(["auto", "none", "required"]),
   Schema.Struct({ type: Schema.tag("function"), name: Schema.String }),
+  Schema.Struct({
+    type: Schema.tag("allowed_tools"),
+    mode: Schema.Literals(["auto", "none", "required"]),
+    tools: Schema.Array(Schema.Struct({ type: Schema.tag("function"), name: Schema.String })),
+  }),
 ])
 
 // Fields shared between the HTTP body and the WebSocket `response.create`
@@ -154,6 +159,7 @@ export const coreFields = {
   tools: optionalArray(Tool),
   tool_choice: Schema.optional(ToolChoice),
   store: Schema.optional(Schema.Boolean),
+  truncation: Schema.optional(OpenResponsesOptions.TruncationSchema),
   service_tier: Schema.optional(OpenResponsesOptions.ServiceTierSchema),
   prompt_cache_key: Schema.optional(Schema.String),
   include: optionalArray(OpenResponsesOptions.ResponseIncludableSchema),
@@ -169,6 +175,8 @@ export const coreFields = {
     }),
   ),
   max_output_tokens: Schema.optional(Schema.Number),
+  max_tool_calls: Schema.optional(Schema.Int),
+  parallel_tool_calls: Schema.optional(Schema.Boolean),
   temperature: Schema.optional(Schema.Number),
   top_p: Schema.optional(Schema.Number),
 }
@@ -285,7 +293,7 @@ export interface Extension {
   readonly name: string
   readonly lowerMedia?: (input: {
     readonly part: MediaPart
-    readonly media: ProviderShared.ValidatedMedia
+    readonly media: ProviderShared.NormalizedMedia
     readonly request: LLMRequest
   }) => MediaInput | undefined
   readonly messagePhase?: (value: unknown) => MessagePhase | null | undefined
@@ -380,13 +388,13 @@ const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (
   request: LLMRequest,
   extension: Extension,
 ) {
-  const media = yield* ProviderShared.validateMedia(extension.name, part, MEDIA_MIMES)
+  const media = ProviderShared.normalizeMedia(part)
   const extended = extension.lowerMedia?.({ part, media, request })
   if (extended) return extended
-  if (media.mime === "application/pdf") {
+  if (!media.mime.startsWith("image/")) {
     return {
       type: "input_file" as const,
-      filename: part.filename ?? "document.pdf",
+      filename: part.filename ?? (media.mime === "application/pdf" ? "document.pdf" : "file"),
       file_data: media.dataUrl,
     }
   }
@@ -440,14 +448,10 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
 
   for (const message of request.messages) {
     if (message.role === "system") {
-      const part = yield* ProviderShared.wrappedSystemUpdate(extension.name, message)
-      const previous = input.at(-1)
-      if (previous && "role" in previous && previous.role === "user")
-        input[input.length - 1] = {
-          role: "user",
-          content: [...previous.content, { type: "input_text", text: part.text }],
-        }
-      else input.push({ role: "user", content: [{ type: "input_text", text: part.text }] })
+      input.push({
+        role: "developer",
+        content: ProviderShared.joinText(yield* ProviderShared.systemUpdateText(extension.name, message)),
+      })
       continue
     }
 
@@ -581,6 +585,19 @@ const lowerOptions = (request: LLMRequest) => {
       : {}),
     ...(options.textVerbosity ? { text: { verbosity: options.textVerbosity } } : {}),
     ...(options.serviceTier ? { service_tier: options.serviceTier } : {}),
+    ...(options.maxToolCalls !== undefined ? { max_tool_calls: options.maxToolCalls } : {}),
+    ...(options.parallelToolCalls !== undefined ? { parallel_tool_calls: options.parallelToolCalls } : {}),
+    ...(options.truncation ? { truncation: options.truncation } : {}),
+  }
+}
+
+const allowedToolChoice = (request: LLMRequest) => {
+  const allowed = OpenResponsesOptions.resolve(request).allowedTools
+  if (!allowed) return undefined
+  return {
+    type: "allowed_tools" as const,
+    mode: allowed.mode,
+    tools: allowed.toolNames.map((name) => ({ type: "function" as const, name })),
   }
 }
 
@@ -603,7 +620,9 @@ export const fromRequestWithExtension = Effect.fn("OpenResponses.fromRequestWith
               ToolSchemaProjection.modelCompatibility(tool.inputSchema, toolSchemaCompatibility),
             ),
           ),
-    tool_choice: request.toolChoice ? yield* lowerToolChoice(extension.name, request.toolChoice) : undefined,
+    tool_choice:
+      allowedToolChoice(request) ??
+      (request.toolChoice ? yield* lowerToolChoice(extension.name, request.toolChoice) : undefined),
     stream: true as const,
     max_output_tokens: generation?.maxTokens,
     temperature: generation?.temperature,

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

@@ -28,7 +28,6 @@ import { ToolSchemaProjection } from "./utils/tool-schema.js"
 import { ToolStream } from "./utils/tool-stream.js"
 
 const ADAPTER = "openai-chat"
-const IMAGE_MIMES = new Set<string>(ProviderShared.IMAGE_MIMES)
 const RESERVED_REASONING_FIELDS = new Set(["role", "content", "tool_calls"])
 export const DEFAULT_BASE_URL = "https://api.openai.com/v1"
 export const PATH = "/chat/completions"
@@ -284,7 +283,9 @@ const lowerToolCall = (part: ToolCallPart): OpenAIChatAssistantToolCall => ({
 })
 
 const lowerMedia = Effect.fn("OpenAIChat.lowerMedia")(function* (part: MediaPart) {
-  const media = yield* ProviderShared.validateMedia("OpenAI Chat", part, IMAGE_MIMES)
+  const media = ProviderShared.normalizeMedia(part)
+  if (!media.mime.startsWith("image/"))
+    return yield* ProviderShared.invalidRequest(`OpenAI Chat does not support media type ${part.mediaType}`)
   return { type: "image_url" as const, image_url: { url: media.dataUrl } }
 })
 

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

@@ -121,7 +121,8 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
         : yield* Effect.forEach(request.tools, (tool) =>
             lowerTool(tool, ToolSchemaProjection.modelCompatibility(tool.inputSchema, toolSchemaCompatibility)),
           ),
-    tool_choice: request.toolChoice ? yield* lowerToolChoice(request.toolChoice, request.tools) : undefined,
+    tool_choice:
+      body.tool_choice ?? (request.toolChoice ? yield* lowerToolChoice(request.toolChoice, request.tools) : undefined),
   } satisfies OpenAIResponsesBody
 })
 

packages/ai/src/protocols/shared.ts

@@ -155,59 +155,24 @@ export const wrappedSystemUpdate = Effect.fn("ProviderShared.wrappedSystemUpdate
 export const parseToolInput = (route: string, name: string, raw: string) =>
   parseJson(route, raw || "{}", `Invalid JSON input for ${route} tool call ${name}`)
 
-export const IMAGE_MIMES = ["image/png", "image/jpeg", "image/gif", "image/webp"] as const
-export const VIDEO_MIMES = ["video/mp4", "video/webm", "video/quicktime"] as const
-export const AUDIO_MIMES = ["audio/wav", "audio/mp3", "audio/aiff", "audio/aac", "audio/ogg", "audio/flac"] as const
-export const PDF_MIMES = ["application/pdf"] as const
-export const MEDIA_MIMES = [...IMAGE_MIMES, ...VIDEO_MIMES, ...AUDIO_MIMES, ...PDF_MIMES] as const
-export const MAX_MEDIA_ENCODED_BYTES = 28 * 1024 * 1024
-export const MAX_MEDIA_DECODED_BYTES = 20 * 1024 * 1024
-
-const base64Pattern = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/
-
-export interface ValidatedMedia {
+export interface NormalizedMedia {
   readonly mime: string
   readonly base64: string
   readonly dataUrl: string
-  readonly bytes: Uint8Array
 }
 
-export const validateMedia = Effect.fn("ProviderShared.validateMedia")(function* (
-  route: string,
-  part: MediaPart,
-  supportedMimes: ReadonlySet<string>,
-) {
+export const normalizeMedia = (part: MediaPart): NormalizedMedia => {
   const mime = part.mediaType.toLowerCase()
-  if (!supportedMimes.has(mime)) return yield* invalidRequest(`${route} does not support media type ${part.mediaType}`)
-
-  let base64: string
   if (typeof part.data !== "string") {
-    if (part.data.byteLength > MAX_MEDIA_DECODED_BYTES)
-      return yield* invalidRequest(`${route} media exceeds the ${MAX_MEDIA_DECODED_BYTES} byte decoded limit`)
-    base64 = Buffer.from(part.data).toString("base64")
-  } else if (part.data.startsWith("data:")) {
-    const match = /^data:([^;,]+);base64,([A-Za-z0-9+/]*={0,2})$/s.exec(part.data)
-    if (!match) return yield* invalidRequest(`${route} media data URL must contain valid base64`)
-    if (match[1]!.toLowerCase() !== mime)
-      return yield* invalidRequest(`${route} media type ${part.mediaType} does not match data URL type ${match[1]}`)
-    base64 = match[2]!
-  } else {
-    base64 = part.data
+    const base64 = Buffer.from(part.data).toString("base64")
+    return { mime, base64, dataUrl: `data:${mime};base64,${base64}` }
   }
+  if (!part.data.startsWith("data:")) return { mime, base64: part.data, dataUrl: `data:${mime};base64,${part.data}` }
+  return { mime, base64: part.data.slice(part.data.indexOf(",") + 1), dataUrl: part.data }
+}
 
-  if (Buffer.byteLength(base64, "utf8") > MAX_MEDIA_ENCODED_BYTES)
-    return yield* invalidRequest(`${route} media exceeds the ${MAX_MEDIA_ENCODED_BYTES} byte encoded limit`)
-  if (!base64 || base64.length % 4 !== 0 || !base64Pattern.test(base64))
-    return yield* invalidRequest(`${route} media must contain valid base64`)
-  const bytes = Buffer.from(base64, "base64")
-  if (bytes.byteLength > MAX_MEDIA_DECODED_BYTES)
-    return yield* invalidRequest(`${route} media exceeds the ${MAX_MEDIA_DECODED_BYTES} byte decoded limit`)
-  if (bytes.toString("base64") !== base64) return yield* invalidRequest(`${route} media must contain canonical base64`)
-  return { mime, base64, dataUrl: `data:${mime};base64,${base64}`, bytes } satisfies ValidatedMedia
-})
-
-export const validateToolFile = (route: string, part: Tool.FileContent, supportedMimes: ReadonlySet<string>) =>
-  validateMedia(route, { type: "media", mediaType: part.mime, data: part.uri, filename: part.name }, supportedMimes)
+export const normalizeToolFile = (part: Tool.FileContent) =>
+  normalizeMedia({ type: "media", mediaType: part.mime, data: part.uri, filename: part.name })
 
 export const trimBaseUrl = (value: string) => value.replace(/\/+$/, "")
 
@@ -237,14 +202,15 @@ export const errorText = (error: unknown) => {
  * decoder, and drops empty / `[DONE]` keep-alive events so the downstream
  * `decodeChunk` sees one JSON string per element. The SSE channel emits a
  * `Retry` control event on its error channel; we drop it here (we don't
- * implement client-driven retries) so the public error channel stays
- * `AIError`.
+ * implement client-driven retries). Decoder failures become provider output
+ * errors so the public error channel stays `AIError`.
  */
 export const sseFraming = (bytes: Stream.Stream<Uint8Array, AIError>): Stream.Stream<string, AIError> =>
   bytes.pipe(
     Stream.decodeText(),
     Stream.pipeThroughChannel(Sse.decode()),
     Stream.catchTag("Retry", () => Stream.empty),
+    Stream.catchTag("SseError", (error) => Stream.fail(eventError("sse", error.message))),
     Stream.filter((event) => event.data.length > 0 && event.data !== "[DONE]"),
     Stream.map((event) => event.data),
   )

packages/ai/src/protocols/utils/bedrock-media.ts

@@ -66,11 +66,7 @@ export const lower = Effect.fn("BedrockMedia.lower")(function* (part: MediaPart)
   const mime = part.mediaType.toLowerCase()
   const imageFormat = IMAGE_FORMATS[mime as keyof typeof IMAGE_FORMATS]
   if (imageFormat) {
-    const media = yield* ProviderShared.validateMedia(
-      "Bedrock Converse",
-      part,
-      new Set<string>(Object.keys(IMAGE_FORMATS)),
-    )
+    const media = ProviderShared.normalizeMedia(part)
     return { image: { format: imageFormat, source: { bytes: media.base64 } } } satisfies ImageBlock
   }
   if (mime.startsWith("image/"))
@@ -79,11 +75,7 @@ export const lower = Effect.fn("BedrockMedia.lower")(function* (part: MediaPart)
   if (documentFormat) {
     if (!part.filename)
       return yield* ProviderShared.invalidRequest("Bedrock Converse document media requires a filename")
-    const media = yield* ProviderShared.validateMedia(
-      "Bedrock Converse",
-      part,
-      new Set<string>(Object.keys(DOCUMENT_FORMATS)),
-    )
+    const media = ProviderShared.normalizeMedia(part)
     return documentBlock(part.filename, documentFormat, media.base64)
   }
   return yield* ProviderShared.invalidRequest(`Bedrock Converse does not support media type ${part.mediaType}`)

packages/ai/src/protocols/utils/open-responses-options.ts

@@ -1,4 +1,4 @@
-import { Schema } from "effect"
+import { Option, Schema } from "effect"
 import { TextVerbosity, type LLMRequest } from "../../schema/index.js"
 
 export const ResponseIncludables = [
@@ -11,52 +11,62 @@ export const ResponseIncludables = [
   "reasoning.encrypted_content",
   "message.output_text.logprobs",
 ] as const
-export type ResponseIncludable = (typeof ResponseIncludables)[number]
+export type ResponseIncludable = (typeof ResponseIncludables)[number] | (string & {})
 
 export const ServiceTiers = ["auto", "default", "flex", "priority"] as const
 export type ServiceTier = (typeof ServiceTiers)[number]
 
-const TEXT_VERBOSITY = new Set<string>(["low", "medium", "high"])
-const INCLUDABLES = new Set<string>(ResponseIncludables)
-const SERVICE_TIERS = new Set<string>(ServiceTiers)
-
-const isTextVerbosity = (value: unknown): value is Schema.Schema.Type<typeof TextVerbosity> =>
-  typeof value === "string" && TEXT_VERBOSITY.has(value)
-
-const isServiceTier = (value: unknown): value is ServiceTier => typeof value === "string" && SERVICE_TIERS.has(value)
+export const Truncations = ["auto", "disabled"] as const
+export type Truncation = (typeof Truncations)[number]
 
 export const ReasoningEffort = Schema.String
 export const TextVerbositySchema = TextVerbosity
-export const ResponseIncludableSchema = Schema.Literals(ResponseIncludables)
+export const ResponseIncludableSchema = Schema.declare<ResponseIncludable>(
+  (value): value is ResponseIncludable => typeof value === "string",
+  { title: "ResponseIncludable" },
+)
 export const ServiceTierSchema = Schema.Literals(ServiceTiers)
+export const TruncationSchema = Schema.Literals(Truncations)
 
-export interface Resolved {
-  readonly instructions?: string
-  readonly store?: boolean
-  readonly reasoningEffort?: string
-  readonly reasoningSummary?: "auto" | "concise" | "detailed"
-  readonly include?: ReadonlyArray<ResponseIncludable>
-  readonly textVerbosity?: Schema.Schema.Type<typeof TextVerbosity>
-  readonly serviceTier?: ServiceTier
+export const AllowedTools = Schema.Struct({
+  toolNames: Schema.Array(Schema.String),
+  mode: Schema.optional(Schema.Literals(["auto", "none", "required"])),
+})
+export type AllowedTools = typeof AllowedTools.Type
+
+export const Options = Schema.Struct({
+  instructions: Schema.optional(Schema.String),
+  store: Schema.optional(Schema.Boolean),
+  reasoningEffort: Schema.optional(ReasoningEffort),
+  reasoningSummary: Schema.optional(Schema.Literals(["auto", "concise", "detailed"])),
+  include: Schema.optional(Schema.Array(ResponseIncludableSchema)),
+  textVerbosity: Schema.optional(TextVerbositySchema),
+  serviceTier: Schema.optional(ServiceTierSchema),
+  truncation: Schema.optional(TruncationSchema),
+  allowedTools: Schema.optional(AllowedTools),
+  maxToolCalls: Schema.optional(Schema.Int),
+  parallelToolCalls: Schema.optional(Schema.Boolean),
+})
+export type Options = typeof Options.Type
+
+export type Resolved = Omit<Options, "allowedTools"> & {
+  readonly allowedTools?: AllowedTools & { readonly mode: NonNullable<AllowedTools["mode"]> }
 }
 
+const decodeOptions = Schema.decodeUnknownOption(Options)
+
 export const resolve = (request: LLMRequest): Resolved => {
-  const input = request.providerOptions?.[request.model.route.providerMetadataKey ?? "openresponses"]
-  const include = Array.isArray(input?.include)
-    ? input.include.filter((entry): entry is ResponseIncludable => INCLUDABLES.has(entry))
-    : []
-  const reasoningSummary = input?.reasoningSummary
+  const input = Option.getOrUndefined(
+    decodeOptions(request.providerOptions?.[request.model.route.providerMetadataKey ?? "openresponses"]),
+  )
+  if (!input) return {}
   return {
-    instructions: typeof input?.instructions === "string" ? input.instructions : undefined,
-    store: typeof input?.store === "boolean" ? input.store : undefined,
-    reasoningEffort: typeof input?.reasoningEffort === "string" ? input.reasoningEffort : undefined,
-    reasoningSummary:
-      reasoningSummary === "auto" || reasoningSummary === "concise" || reasoningSummary === "detailed"
-        ? reasoningSummary
+    ...input,
+    include: input.include?.length ? input.include : undefined,
+    allowedTools:
+      input.allowedTools && input.allowedTools.toolNames.length > 0
+        ? { ...input.allowedTools, mode: input.allowedTools.mode ?? "auto" }
         : undefined,
-    include: include.length > 0 ? include : undefined,
-    textVerbosity: isTextVerbosity(input?.textVerbosity) ? input.textVerbosity : undefined,
-    serviceTier: isServiceTier(input?.serviceTier) ? input.serviceTier : undefined,
   }
 }
 

packages/ai/src/provider-error.ts

@@ -57,7 +57,7 @@ export const isContextOverflowFailure = (failure: unknown) =>
     ? failure.reason._tag === "InvalidRequest" && failure.reason.classification === "context-overflow"
     : Schema.is(ProviderErrorEvent)(failure) && failure.classification === "context-overflow"
 
-const decodeJson = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)
+const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown))
 const QUOTA_CODES = new Set(["insufficient_quota", "usage_not_included", "billing_error"])
 const SERVER_CODES = new Set([
   "api_error",

packages/ai/src/providers/google-vertex.ts

@@ -1,14 +1,21 @@
+import { Effect } from "effect"
 import type { ProviderPackage } from "../provider-package.js"
 import { Gemini } from "../protocols/gemini.js"
+import { ProviderShared } from "../protocols/shared.js"
 import { Auth } from "../route/auth.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Framing } from "../route/framing.js"
-import { ProviderID, type ModelID } from "../schema/index.js"
+import { ProviderID, type LLMRequest, type ModelID, type ProviderOptions } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"
 
-export type GeminiOptionsInput = Gemini.OptionsInput
-export type GeminiProviderOptionsInput = Gemini.ProviderOptionsInput
+export interface GeminiOptionsInput extends Gemini.OptionsInput {
+  readonly labels?: Readonly<Record<string, string>>
+}
+
+export type GeminiProviderOptionsInput = ProviderOptions & {
+  readonly gemini?: GeminiOptionsInput
+}
 
 export const id = ProviderID.make("google-vertex")
 
@@ -17,7 +24,7 @@ export type Config = RouteDefaultsInput &
     readonly baseURL?: string
     readonly location?: string
     readonly project?: string
-    readonly providerOptions?: Gemini.ProviderOptionsInput
+    readonly providerOptions?: GeminiProviderOptionsInput
   }
 
 export type Settings = ProviderPackage.Settings &
@@ -28,14 +35,33 @@ export type Settings = ProviderPackage.Settings &
     readonly baseURL?: string
     readonly location?: string
     readonly project?: string
-    readonly providerOptions?: Gemini.ProviderOptionsInput
+    readonly providerOptions?: GeminiProviderOptionsInput
   }
 
+const fromRequest = Effect.fn("GoogleVertex.fromRequest")(function* (request: LLMRequest) {
+  const body = yield* Gemini.protocol.body.from(request)
+  const value = request.providerOptions?.gemini?.labels
+  const labels = ProviderShared.isRecord(value)
+    ? Object.fromEntries(
+        Object.entries(value).filter((entry): entry is [string, string] => typeof entry[1] === "string"),
+      )
+    : undefined
+  return { ...body, labels }
+})
+
+const protocol = {
+  ...Gemini.protocol,
+  body: {
+    ...Gemini.protocol.body,
+    from: fromRequest,
+  },
+}
+
 const route = Route.make({
   id: "google-vertex-gemini",
   provider: id,
   providerMetadataKey: "google",
-  protocol: Gemini.protocol,
+  protocol,
   endpoint: Endpoint.path(({ request }) => {
     const model = String(request.model.id)
     return `/${model.startsWith("endpoints/") ? model : `models/${model}`}:streamGenerateContent?alt=sse`
@@ -78,7 +104,7 @@ export const configure = (input: Config = {}) => {
   return {
     id,
     model: (modelID: string | ModelID) =>
-      configuredRoute(input, modelID).model<Gemini.ProviderOptionsInput>({ id: modelID }),
+      configuredRoute(input, modelID).model<GeminiProviderOptionsInput>({ id: modelID }),
     configure,
   }
 }
@@ -87,10 +113,7 @@ export const provider = {
   id,
   configure,
 }
-export const model: ProviderPackage.Definition<Settings, Gemini.ProviderOptionsInput>["model"] = (
-  modelID,
-  settings,
-) => {
+export const model: ProviderPackage.Definition<Settings, GeminiProviderOptionsInput>["model"] = (modelID, settings) => {
   if (settings.apiKey !== undefined && settings.accessToken !== undefined)
     throw new Error("Google Vertex apiKey cannot be combined with accessToken or auth")
   return configure({

packages/ai/src/providers/open-responses-options.ts

@@ -1,16 +1,7 @@
-import type { ResponseIncludable, ServiceTier } from "../protocols/utils/open-responses-options.js"
-import type { ProviderOptions, ReasoningEffort, TextVerbosity } from "../schema/index.js"
+import type { Options } from "../protocols/utils/open-responses-options.js"
+import type { ProviderOptions } from "../schema/index.js"
 
-export interface OpenResponsesOptionsInput {
-  readonly [key: string]: unknown
-  readonly instructions?: string
-  readonly store?: boolean
-  readonly reasoningEffort?: ReasoningEffort
-  readonly reasoningSummary?: "auto" | "concise" | "detailed"
-  readonly include?: ReadonlyArray<ResponseIncludable>
-  readonly textVerbosity?: TextVerbosity
-  readonly serviceTier?: ServiceTier
-}
+export type OpenResponsesOptionsInput = Options & { readonly [key: string]: unknown }
 
 export type OpenResponsesProviderOptionsInput = ProviderOptions & {
   readonly openresponses?: OpenResponsesOptionsInput

packages/ai/src/schema/errors.ts

@@ -148,7 +148,7 @@ export const AIErrorReason = Schema.Union([
 ]).pipe(Schema.toTaggedUnion("_tag"))
 export type AIErrorReason = Schema.Schema.Type<typeof AIErrorReason>
 
-export class AIError extends Schema.TaggedErrorClass<AIError>()("AI.Error", {
+export class AIError extends Schema.TaggedError<AIError>()("AI.Error", {
   module: Schema.String,
   method: Schema.String,
   reason: AIErrorReason,

packages/ai/src/testing.ts

@@ -7,6 +7,7 @@ import {
   type FinishReasonDetails,
   type AIError,
   type LLMRequest,
+  type ProviderMetadata,
   type UsageInput,
 } from "./schema/index.js"
 import { Context, Deferred, Effect, Latch, Layer, Queue, Scope, Stream } from "effect"
@@ -33,13 +34,22 @@ export interface LayerOptions {
 export class Service extends Context.Service<Service, Interface>()("@opencode/ai/TestLLM") {}
 
 export const complete = (
-  options: { readonly reason: FinishReasonDetails; readonly usage?: UsageInput },
+  options: {
+    readonly reason: FinishReasonDetails
+    readonly usage?: UsageInput
+    readonly providerMetadata?: ProviderMetadata
+  },
   ...events: readonly LLMEvent[]
 ) => [
   LLMEvent.stepStart({ index: 0 }),
   ...events,
-  LLMEvent.stepFinish({ index: 0, reason: options.reason, usage: options.usage }),
-  LLMEvent.finish({ reason: options.reason }),
+  LLMEvent.stepFinish({
+    index: 0,
+    reason: options.reason,
+    usage: options.usage,
+    providerMetadata: options.providerMetadata,
+  }),
+  LLMEvent.finish({ reason: options.reason, providerMetadata: options.providerMetadata }),
 ]
 
 export const stop = (...events: readonly LLMEvent[]) => complete({ reason: { normalized: "stop" } }, ...events)

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

@@ -136,6 +136,33 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
+  it.effect("supports native chronological system updates on documented and later Claude family versions", () =>
+    Effect.gen(function* () {
+      const ids = [
+        "claude-opus-4-8",
+        "claude-opus-5-1",
+        "claude-sonnet-5",
+        "claude-haiku-5-1",
+        "claude-fable-6",
+        "anthropic/claude-mythos-7.2",
+      ]
+
+      const prepared = yield* Effect.forEach(ids, (id) =>
+        compileRequest(
+          LLM.request({
+            model: AnthropicMessages.route
+              .with({ endpoint: { baseURL: "https://api.anthropic.test/v1/" }, auth: Auth.header("x-api-key", "test") })
+              .model({ id }),
+            messages: [Message.user("Before."), Message.system("Update."), Message.assistant("After.")],
+            cache: "none",
+          }),
+        ),
+      )
+
+      expect(prepared.map((item) => item.body.messages[1]?.role)).toEqual(ids.map(() => "system"))
+    }),
+  )
+
   it.effect("lowers chronological system updates to wrapped user text for unsupported Anthropic models", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
@@ -163,6 +190,34 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
+  it.effect("does not infer native system update support for older or undocumented Claude families", () =>
+    Effect.gen(function* () {
+      const ids = [
+        "claude-opus-4-7",
+        "claude-opus-4-20250514",
+        "claude-sonnet-4-9",
+        "claude-haiku-4-9",
+        "custom-model-7",
+      ]
+
+      const prepared = yield* Effect.forEach(ids, (id) =>
+        compileRequest(
+          LLM.request({
+            model: AnthropicMessages.route
+              .with({ endpoint: { baseURL: "https://api.anthropic.test/v1/" }, auth: Auth.header("x-api-key", "test") })
+              .model({ id }),
+            messages: [Message.user("Before."), Message.system("Update."), Message.assistant("After.")],
+            cache: "none",
+          }),
+        ),
+      )
+
+      expect(prepared.map((item) => item.body.messages.some((message) => message.role === "system"))).toEqual(
+        ids.map(() => false),
+      )
+    }),
+  )
+
   it.effect("rejects non-text chronological system update content before send", () =>
     Effect.gen(function* () {
       const error = yield* compileRequest(
@@ -399,7 +454,7 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
-  it.effect("rejects unsupported media in tool-result content with a clear error", () =>
+  it.effect("rejects tool-result media that cannot be lowered", () =>
     Effect.gen(function* () {
       const error = yield* compileRequest(
         LLM.request({
@@ -418,8 +473,7 @@ describe("Anthropic Messages route", () => {
         }),
       ).pipe(Effect.flip)
 
-      expect(error.message).toContain("Anthropic Messages")
-      expect(error.message).toContain("audio/mpeg")
+      expect(error.message).toContain("Anthropic Messages does not support media type audio/mpeg")
     }),
   )
 
@@ -956,6 +1010,65 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
+  it.effect("ignores tool input deltas without a matching tool start", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              { type: "message_start", message: { usage: { input_tokens: 5 } } },
+              { type: "content_block_start", index: 0, content_block: { type: "text", text: "" } },
+              { type: "content_block_delta", index: 0, delta: { type: "text_delta", text: "Hello" } },
+              {
+                type: "content_block_delta",
+                index: 1,
+                delta: { type: "input_json_delta", partial_json: '{"query":"orphaned"}' },
+              },
+              { type: "content_block_stop", index: 0 },
+              { type: "message_delta", delta: { stop_reason: "end_turn" }, usage: { output_tokens: 1 } },
+              { type: "message_stop" },
+            ),
+          ),
+        ),
+      )
+
+      expect(response.text).toBe("Hello")
+      expect(response.toolCalls).toEqual([])
+      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end_turn" })
+    }),
+  )
+
+  it.effect("settles pending tool calls at message_stop", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              { type: "message_start", message: { usage: { input_tokens: 5 } } },
+              {
+                type: "content_block_start",
+                index: 0,
+                content_block: { type: "tool_use", id: "call_1", name: "lookup" },
+              },
+              {
+                type: "content_block_delta",
+                index: 0,
+                delta: { type: "input_json_delta", partial_json: '{"query":"weather"}' },
+              },
+              { type: "message_delta", delta: { stop_reason: "tool_use" }, usage: { output_tokens: 1 } },
+              { type: "message_stop" },
+            ),
+          ),
+        ),
+      )
+
+      expect(response.toolCalls).toMatchObject([
+        { id: "call_1", name: "lookup", input: { query: "weather" } },
+      ])
+      expect(response.finishReason).toEqual({ normalized: "tool-calls", raw: "tool_use" })
+    }),
+  )
+
   it.effect("assembles and persists multiple tool calls from one Anthropic response", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(

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

@@ -75,7 +75,6 @@ describe("Amazon Bedrock Mantle provider", () => {
             }),
           ),
         ),
-        Effect.flip,
       )
 
       expect(seen).toEqual([{ url: "https://mantle.test/v1/chat/completions", authorization: "Bearer test-key" }])

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

@@ -4,7 +4,6 @@ import { LLM, AIError, LLMRequest, Message, ToolCallPart, ToolDefinition, Usage
 import { Auth, LLMClient } from "../../src/route.js"
 import { compileRequest } from "../../src/route/client.js"
 import * as Gemini from "../../src/protocols/gemini.js"
-import { ProviderShared } from "../../src/protocols/shared.js"
 import { it } from "../lib/effect.js"
 import { fixedResponse } from "../lib/http.js"
 import { sseEvents, sseRaw } from "../lib/sse.js"
@@ -291,35 +290,30 @@ describe("Gemini route", () => {
     }),
   )
 
-  for (const [name, media] of [
-    ["mismatched data URL MIME", { mediaType: "image/png", data: "data:image/jpeg;base64,/9j/" }],
-    ["malformed base64", { mediaType: "image/png", data: "%%%=" }],
-    ["unsupported SVG", { mediaType: "image/svg+xml", data: "PHN2Zz4=" }],
-  ] as const)
-    it.effect(`rejects ${name}`, () =>
-      Effect.gen(function* () {
-        const error = yield* compileRequest(
-          LLM.request({ model, messages: [Message.user({ type: "media", ...media })] }),
-        ).pipe(Effect.flip)
-        expect(error.message).toMatch(/does not support|does not match|valid base64/)
-      }),
-    )
-
-  it.effect("rejects oversized image input", () =>
+  it.effect("passes encoded media through without local validation", () =>
     Effect.gen(function* () {
-      const error = yield* compileRequest(
+      const prepared = yield* compileRequest(
         LLM.request({
           model,
           messages: [
-            Message.user({
-              type: "media",
-              mediaType: "image/png",
-              data: "A".repeat(ProviderShared.MAX_MEDIA_ENCODED_BYTES + 4),
-            }),
+            Message.user([
+              { type: "media", mediaType: "image/png", data: "%%%=" },
+              { type: "media", mediaType: "image/png", data: "data:image/jpeg;base64,/9j/" },
+              { type: "media", mediaType: "image/svg+xml", data: "PHN2Zz4=" },
+            ]),
           ],
         }),
-      ).pipe(Effect.flip)
-      expect(error.message).toContain("encoded limit")
+      )
+      expect(prepared.body.contents).toEqual([
+        {
+          role: "user",
+          parts: [
+            { inlineData: { mimeType: "image/png", data: "%%%=" } },
+            { inlineData: { mimeType: "image/png", data: "/9j/" } },
+            { inlineData: { mimeType: "image/svg+xml", data: "PHN2Zz4=" } },
+          ],
+        },
+      ])
     }),
   )
 
@@ -708,6 +702,80 @@ describe("Gemini route", () => {
     }),
   )
 
+  it.effect("leaves unsigned parallel calls unchanged after a signed Gemini 3 call", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model: gemini3,
+          messages: [
+            Message.assistant([
+              ToolCallPart.make({
+                id: "tool_0",
+                name: "lookup",
+                input: { query: "weather" },
+                providerMetadata: { google: { thoughtSignature: "parallel_signature" } },
+              }),
+              ToolCallPart.make({ id: "tool_1", name: "lookup", input: { query: "news" } }),
+              ToolCallPart.make({ id: "tool_2", name: "lookup", input: { query: "sports" } }),
+            ]),
+          ],
+        }),
+      )
+
+      expect(prepared.body.contents).toEqual([
+        {
+          role: "model",
+          parts: [
+            {
+              functionCall: { id: undefined, name: "lookup", args: { query: "weather" } },
+              thoughtSignature: "parallel_signature",
+            },
+            {
+              functionCall: { id: undefined, name: "lookup", args: { query: "news" } },
+              thoughtSignature: undefined,
+            },
+            {
+              functionCall: { id: undefined, name: "lookup", args: { query: "sports" } },
+              thoughtSignature: undefined,
+            },
+          ],
+        },
+      ])
+    }),
+  )
+
+  it.effect("adds the validator bypass sentinel to every call in an unsigned Gemini 3 batch", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model: gemini3,
+          messages: [
+            Message.assistant([
+              ToolCallPart.make({ id: "tool_0", name: "lookup", input: { query: "weather" } }),
+              ToolCallPart.make({ id: "tool_1", name: "lookup", input: { query: "news" } }),
+            ]),
+          ],
+        }),
+      )
+
+      expect(prepared.body.contents).toEqual([
+        {
+          role: "model",
+          parts: [
+            {
+              functionCall: { id: undefined, name: "lookup", args: { query: "weather" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+            {
+              functionCall: { id: undefined, name: "lookup", args: { query: "news" } },
+              thoughtSignature: "skip_thought_signature_validator",
+            },
+          ],
+        },
+      ])
+    }),
+  )
+
   it.effect("emits streamed tool calls and maps finish reason", () =>
     Effect.gen(function* () {
       const body = sseEvents({
@@ -773,6 +841,31 @@ describe("Gemini route", () => {
     }),
   )
 
+  it.effect("defaults omitted function call args to an empty object", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(
+        LLMRequest.update(request, {
+          tools: [ToolDefinition.make({ name: "ping", description: "Ping", inputSchema: { type: "object" } })],
+        }),
+      ).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents({
+              candidates: [
+                {
+                  content: { role: "model", parts: [{ functionCall: { name: "ping" } }] },
+                  finishReason: "STOP",
+                },
+              ],
+            }),
+          ),
+        ),
+      )
+
+      expect(response.toolCalls).toEqual([{ type: "tool-call", id: "tool_0", name: "ping", input: {} }])
+    }),
+  )
+
   it.effect("maps tool calls without a finish reason", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(
@@ -868,6 +961,51 @@ describe("Gemini route", () => {
     }),
   )
 
+  it.effect("preserves candidate-less prompt safety blocks as content-filter outcomes", () =>
+    Effect.gen(function* () {
+      const blocked = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents({
+              promptFeedback: {
+                blockReason: "FUTURE_SAFETY_REASON",
+                blockReasonMessage: "Prompt blocked",
+                safetyRatings: [{ category: "HARM_CATEGORY_HARASSMENT", blocked: true }],
+              },
+            }),
+          ),
+        ),
+      )
+      const blockedWithUsage = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              { promptFeedback: { blockReason: "SAFETY" } },
+              { usageMetadata: { promptTokenCount: 7, totalTokenCount: 7 } },
+            ),
+          ),
+        ),
+      )
+
+      expect(blocked.events.map((event) => event.type)).toEqual(["step-start", "step-finish", "finish"])
+      expect(blocked.events.at(-1)).toMatchObject({
+        type: "finish",
+        reason: { normalized: "content-filter", raw: "FUTURE_SAFETY_REASON" },
+        providerMetadata: {
+          google: {
+            promptFeedback: {
+              blockReason: "FUTURE_SAFETY_REASON",
+              blockReasonMessage: "Prompt blocked",
+              safetyRatings: [{ category: "HARM_CATEGORY_HARASSMENT", blocked: true }],
+            },
+          },
+        },
+      })
+      expect(blockedWithUsage.finishReason).toEqual({ normalized: "content-filter", raw: "SAFETY" })
+      expect(blockedWithUsage.usage).toMatchObject({ inputTokens: 7, totalTokens: 7 })
+    }),
+  )
+
   it.effect("maps current blocking and invalid-output finish reasons", () =>
     Effect.gen(function* () {
       const reasons = [

packages/ai/test/provider/google-vertex.test.ts

@@ -54,6 +54,27 @@ describe("Google Vertex providers", () => {
     }),
   )
 
+  it.effect("adds billing labels to Vertex Gemini requests", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model: GoogleVertex.configure({
+            accessToken: "vertex-token",
+            project: "vertex-project",
+            providerOptions: {
+              gemini: { labels: { component: "opencode", environment: "test" } },
+            },
+          }).model("gemini-3.5-flash"),
+          prompt: "Say hello.",
+        }),
+      )
+
+      expect(prepared.body).toMatchObject({
+        labels: { component: "opencode", environment: "test" },
+      })
+    }),
+  )
+
   it.effect("projects Anthropic Messages onto the Vertex raw-predict API", () =>
     Effect.gen(function* () {
       const model = GoogleVertexMessages.configure({

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

@@ -527,35 +527,42 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  for (const [name, media] of [
-    ["mismatched data URL MIME", { mediaType: "image/png", data: "data:image/jpeg;base64,/9j/" }],
-    ["malformed base64", { mediaType: "image/png", data: "not-base64" }],
-    ["unsupported SVG", { mediaType: "image/svg+xml", data: "PHN2Zz4=" }],
-  ] as const)
-    it.effect(`rejects ${name}`, () =>
-      Effect.gen(function* () {
-        const error = yield* compileRequest(
-          LLM.request({ model, messages: [Message.user({ type: "media", ...media })] }),
-        ).pipe(Effect.flip)
-        expect(error.message).toMatch(/does not support|does not match|valid base64/)
-      }),
-    )
+  it.effect("passes encoded image media through without local validation", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model,
+          messages: [
+            Message.user([
+              { type: "media", mediaType: "image/png", data: "not-base64" },
+              { type: "media", mediaType: "image/png", data: "data:image/jpeg;base64,/9j/" },
+              { type: "media", mediaType: "image/svg+xml", data: "PHN2Zz4=" },
+            ]),
+          ],
+        }),
+      )
+      expect(prepared.body.messages).toEqual([
+        {
+          role: "user",
+          content: [
+            { type: "image_url", image_url: { url: "data:image/png;base64,not-base64" } },
+            { type: "image_url", image_url: { url: "data:image/jpeg;base64,/9j/" } },
+            { type: "image_url", image_url: { url: "data:image/svg+xml;base64,PHN2Zz4=" } },
+          ],
+        },
+      ])
+    }),
+  )
 
-  it.effect("rejects oversized image input", () =>
+  it.effect("rejects non-image media that cannot be lowered", () =>
     Effect.gen(function* () {
       const error = yield* compileRequest(
         LLM.request({
           model,
-          messages: [
-            Message.user({
-              type: "media",
-              mediaType: "image/png",
-              data: "A".repeat(ProviderShared.MAX_MEDIA_ENCODED_BYTES + 4),
-            }),
-          ],
+          messages: [Message.user({ type: "media", mediaType: "audio/mpeg", data: "AAECAw==" })],
         }),
       ).pipe(Effect.flip)
-      expect(error.message).toContain("encoded limit")
+      expect(error.message).toContain("OpenAI Chat does not support media type audio/mpeg")
     }),
   )
 

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

@@ -1,6 +1,6 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
-import { LLM, LLMEvent, Message } from "../../src/index.js"
+import { LLM, LLMEvent, Message, ToolDefinition } from "../../src/index.js"
 import { configure } from "../../src/providers/openai-compatible-responses.js"
 import { OpenAI } from "../../src/providers.js"
 import { OpenResponses } from "../../src/protocols/open-responses.js"
@@ -56,6 +56,28 @@ describe("Open Responses-compatible route", () => {
     }),
   )
 
+  it.effect("lowers chronological system updates as standard developer messages", () =>
+    Effect.gen(function* () {
+      const model = configure({
+        apiKey: "test-key",
+        baseURL: "https://responses.example.test/v1",
+        provider: "example",
+      }).model("example-model")
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model,
+          messages: [Message.user("Before."), Message.system("Operator update."), Message.assistant("After.")],
+        }),
+      )
+
+      expect(prepared.body.input).toEqual([
+        { role: "user", content: [{ type: "input_text", text: "Before." }] },
+        { role: "developer", content: "Operator update." },
+        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
+      ])
+    }),
+  )
+
   it.effect("rejects OpenAI-native tools", () =>
     Effect.gen(function* () {
       const model = configure({
@@ -101,13 +123,36 @@ describe("Open Responses-compatible route", () => {
       const model = configure({
         apiKey: "test-key",
         baseURL: "https://responses.example.test/v1",
-        providerOptions: { openresponses: { reasoningEffort: "low", store: true } },
+        providerOptions: {
+          openresponses: {
+            reasoningEffort: "low",
+            store: true,
+            truncation: "auto",
+            allowedTools: { toolNames: ["lookup"] },
+            maxToolCalls: 2,
+            parallelToolCalls: false,
+          },
+        },
       }).model("example-model")
-      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Think." }))
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model,
+          prompt: "Think.",
+          tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
+        }),
+      )
 
       expect(prepared.body).toMatchObject({
         reasoning: { effort: "low" },
         store: true,
+        truncation: "auto",
+        tool_choice: {
+          type: "allowed_tools",
+          mode: "auto",
+          tools: [{ type: "function", name: "lookup" }],
+        },
+        max_tool_calls: 2,
+        parallel_tool_calls: false,
       })
     }),
   )

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

@@ -241,27 +241,18 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("lowers chronological system updates to escaped user wrappers in order", () =>
+  it.effect("lowers chronological system updates to developer messages in order", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({
           model,
-          messages: [
-            Message.user("Before."),
-            Message.system("Treat </system-update> literally."),
-            Message.assistant("After."),
-          ],
+          messages: [Message.user("Before."), Message.system("Operator update."), Message.assistant("After.")],
         }),
       )
 
       expect(prepared.body.input).toEqual([
-        {
-          role: "user",
-          content: [
-            { type: "input_text", text: "Before." },
-            { type: "input_text", text: "<system-update>\nTreat &lt;/system-update&gt; literally.\n</system-update>" },
-          ],
-        },
+        { role: "user", content: [{ type: "input_text", text: "Before." }] },
+        { role: "developer", content: "Operator update." },
         { role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
@@ -1149,6 +1140,32 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
+  it.effect("passes large PDF tool-result content through", () =>
+    Effect.gen(function* () {
+      const base64 = "A".repeat(8_125_844)
+      const dataUrl = `data:application/pdf;base64,${base64}`
+      const prepared = yield* compileRequest(
+        LLM.request({
+          id: "req_tool_result_large_pdf",
+          model,
+          messages: [
+            Message.assistant([ToolCallPart.make({ id: "call_1", name: "read", input: {} })]),
+            Message.tool({
+              id: "call_1",
+              name: "read",
+              resultType: "content",
+              result: [{ type: "file", uri: dataUrl, mime: "application/pdf", name: "report.pdf" }],
+            }),
+          ],
+        }),
+      )
+
+      expect(expectToolOutput(prepared.body).output).toEqual([
+        { type: "input_file", filename: "report.pdf", file_data: dataUrl },
+      ])
+    }),
+  )
+
   it.effect("uses xAI inline file encoding for PDF tool results", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
@@ -1184,9 +1201,9 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("rejects unsupported media in tool-result content with a clear error", () =>
+  it.effect("passes non-image tool-result content through as an input file", () =>
     Effect.gen(function* () {
-      const error = yield* compileRequest(
+      const prepared = yield* compileRequest(
         LLM.request({
           id: "req_tool_result_unsupported_media",
           model,
@@ -1200,10 +1217,11 @@ describe("OpenAI Responses route", () => {
             }),
           ],
         }),
-      ).pipe(Effect.flip)
+      )
 
-      expect(error.message).toContain("OpenAI Responses")
-      expect(error.message).toContain("audio/mpeg")
+      expect(expectToolOutput(prepared.body).output).toEqual([
+        { type: "input_file", filename: "file", file_data: "data:audio/mpeg;base64,AAECAw==" },
+      ])
     }),
   )
 
@@ -1256,11 +1274,20 @@ describe("OpenAI Responses route", () => {
           model: OpenAI.configure({ baseURL: "https://api.openai.test/v1/", apiKey: "test" }).model("gpt-5.2"),
           prompt: "think",
           promptCacheKey: "session_123",
+          tools: [
+            ToolDefinition.make({ name: "read", description: "Read a file", inputSchema: { type: "object" } }),
+            ToolDefinition.make({ name: "grep", description: "Search files", inputSchema: { type: "object" } }),
+          ],
+          toolChoice: "none",
           providerOptions: {
             openai: {
               reasoningEffort: "high",
               reasoningSummary: "auto",
               include: ["reasoning.encrypted_content"],
+              truncation: "disabled",
+              allowedTools: { toolNames: ["read", "grep"], mode: "required" },
+              maxToolCalls: 4,
+              parallelToolCalls: false,
             },
           },
         }),
@@ -1271,6 +1298,17 @@ describe("OpenAI Responses route", () => {
       expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
       expect(prepared.body.reasoning).toEqual({ effort: "high", summary: "auto" })
       expect(prepared.body.text).toEqual({ verbosity: "low" })
+      expect(prepared.body.truncation).toBe("disabled")
+      expect(prepared.body.tool_choice).toEqual({
+        type: "allowed_tools",
+        mode: "required",
+        tools: [
+          { type: "function", name: "read" },
+          { type: "function", name: "grep" },
+        ],
+      })
+      expect(prepared.body.max_tool_calls).toBe(4)
+      expect(prepared.body.parallel_tool_calls).toBe(false)
     }),
   )
 
@@ -1296,20 +1334,17 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("filters unknown includable values out of the include array", () =>
+  it.effect("passes forward-compatible includable values through", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({
           model,
           prompt: "hi",
-          // The user passed one invalid entry alongside a valid one. Keep the
-          // valid one so the request still succeeds rather than failing on a
-          // typo from upstream config.
           providerOptions: { openai: { include: ["reasoning.encrypted_content", "bogus.thing"] } },
         }),
       )
 
-      expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
+      expect(prepared.body.include).toEqual(["reasoning.encrypted_content", "bogus.thing"])
     }),
   )
 
@@ -1323,13 +1358,13 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("treats an all-invalid include as no include at all", () =>
+  it.effect("passes an unknown includable value through", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({ model, prompt: "hi", providerOptions: { openai: { include: ["bogus.thing"] } } }),
       )
 
-      expect(prepared.body.include).toBeUndefined()
+      expect(prepared.body.include).toEqual(["bogus.thing"])
     }),
   )
 
@@ -2394,17 +2429,28 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("rejects unsupported user media content", () =>
+  it.effect("passes non-image user media through as an input file", () =>
     Effect.gen(function* () {
-      const error = yield* compileRequest(
+      const prepared = yield* compileRequest(
         LLM.request({
           id: "req_media",
           model,
           messages: [Message.user({ type: "media", mediaType: "application/x-tar", data: "AAECAw==" })],
         }),
-      ).pipe(Effect.flip)
+      )
 
-      expect(error.message).toContain("OpenAI Responses does not support media type application/x-tar")
+      expect(prepared.body.input).toEqual([
+        {
+          role: "user",
+          content: [
+            {
+              type: "input_file",
+              filename: "file",
+              file_data: "data:application/x-tar;base64,AAECAw==",
+            },
+          ],
+        },
+      ])
     }),
   )
 

packages/ai/test/schema.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { Effect, Schema } from "effect"
+import { Effect, Schema, Stream } from "effect"
 import * as OpenAIChat from "../src/protocols/openai-chat.js"
 import * as OpenAIResponses from "../src/protocols/openai-responses.js"
 import {
@@ -90,6 +90,18 @@ describe("AI.Usage", () => {
     expect(ProviderShared.sumTokens()).toBeUndefined()
   })
 
+  test("sseFraming maps decoder failures to AI errors", async () => {
+    const error = await Effect.runPromise(
+      ProviderShared.sseFraming(Stream.make(new TextEncoder().encode(`data: ${"x".repeat(10 * 1024 * 1024)}`))).pipe(
+        Stream.runCollect,
+        Effect.flip,
+      ),
+    )
+
+    expect(error).toBeInstanceOf(AIError)
+    expect(error.reason._tag).toBe("InvalidProviderOutput")
+  })
+
   test("visibleOutputTokens clamps reasoning > output to zero", () => {
     expect(new Usage({ outputTokens: 10, reasoningTokens: 4 }).visibleOutputTokens).toBe(6)
     expect(new Usage({ outputTokens: 10 }).visibleOutputTokens).toBe(10)

packages/app/e2e/performance/chrome-trace.ts

@@ -86,7 +86,7 @@ async function writeProtocolStream(session: CDPSession, handle: string, file: st
   try {
     while (true) {
       const chunk = await session.send("IO.read", { handle })
-      await output.write(chunk.base64Encoded ? Buffer.from(chunk.data, "base64") : chunk.data)
+      await (chunk.base64Encoded ? output.write(Buffer.from(chunk.data, "base64")) : output.write(chunk.data))
       if (chunk.eof) break
     }
   } finally {

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

@@ -9,6 +9,7 @@ import {
 import {
   assistantMessage,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   shell,
   textPart,
@@ -97,13 +98,15 @@ test.describe("timeline adverse visual stability", () => {
       element.scrollTop = 0
     })
     await page.waitForTimeout(300)
-    const trigger = page.locator(`[data-timeline-part-id="${targetID}"] [data-slot="collapsible-trigger"]`)
+    const trigger = page.locator(
+      `[data-timeline-part-id="${renderedPartID(targetID)}"] [data-slot="collapsible-trigger"]`,
+    )
     await expect(trigger).toBeVisible()
     await trigger.click()
     await expect(trigger).toHaveAttribute("aria-expanded", "true")
 
     await scroller.evaluate((element) => (element.scrollTop = element.scrollHeight))
-    await expect(page.locator(`[data-timeline-part-id="${targetID}"]`)).toHaveCount(0)
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(targetID)}"]`)).toHaveCount(0)
     await scroller.evaluate((element) => (element.scrollTop = 0))
     await expect(trigger).toBeVisible()
     await expect(trigger).toHaveAttribute("aria-expanded", "true")
@@ -127,13 +130,16 @@ test.describe("timeline adverse visual stability", () => {
       cpuRate: 4,
     })
     await waitForVisualSettle(page, [
-      `[data-timeline-part-id="${shellID}"]`,
-      `[data-timeline-part-id="${followingID}"]`,
+      `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
     ])
     const regions = defineVisualRegions({
-      shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+      shell: {
+        selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })
@@ -184,10 +190,13 @@ test.describe("timeline adverse visual stability", () => {
     })
     const group = `[data-timeline-part-ids="${contextIDs.join(",")}"]`
     const regions = defineVisualRegions({
-      shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+      shell: {
+        selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
       context: { selector: group, closest: '[data-timeline-row="AssistantPart"]' },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })

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

@@ -1,192 +0,0 @@
-import { expect, test } from "@playwright/test"
-import {
-  defineVisualRegions,
-  reportVisualStability,
-  startVisualProbe,
-  stopVisualProbe,
-  visualPlan,
-} from "../../utils/visual-stability"
-import {
-  assistantID,
-  assistantMessage,
-  event,
-  partUpdated,
-  setupTimeline,
-  textPart,
-  toolPart,
-  userMessage,
-  waitForVisualSettle,
-} from "./fixture"
-
-const inputs = {
-  read: { filePath: "src/a.ts", offset: 0, limit: 120 },
-  glob: { path: ".", pattern: "**/*.ts" },
-  grep: { path: ".", pattern: "stable", include: "*.ts" },
-  list: { path: "src" },
-}
-
-test("appends context operations while the group is expanded", async ({ page }, testInfo) => {
-  const firstID = "prt_append_01_read"
-  const followingID = "prt_append_99_following"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([toolPart(firstID, "read", "running", inputs.read), textPart(followingID, "Following append")], {
-        completed: false,
-      }),
-    ],
-    cpuRate: 4,
-  })
-  const initialGroup = `[data-timeline-part-ids="${firstID}"]`
-  await page.locator(`${initialGroup} [data-slot="collapsible-trigger"]`).click()
-  await waitForVisualSettle(page, [initialGroup, `[data-timeline-part-id="${followingID}"]`])
-  const regions = defineVisualRegions({
-    context: {
-      selector: '[data-timeline-part-ids^="prt_append_01_read"]',
-      closest: '[data-timeline-row="AssistantPart"]',
-    },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-  })
-  await startVisualProbe(page, regions)
-  await timeline.send(partUpdated(toolPart("prt_append_02_glob", "glob", "running", inputs.glob)), 180)
-  await timeline.send(partUpdated(toolPart("prt_append_03_grep", "grep", "completed", inputs.grep)), 240)
-  await timeline.send(partUpdated(toolPart("prt_append_04_list", "list", "completed", inputs.list)), 500)
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(
-    testInfo,
-    "context-append",
-    trace,
-    visualPlan(
-      regions,
-      [
-        { type: "required", regions: ["context", "following"] },
-        { type: "unique", regions: ["context", "following"] },
-        { type: "stable", regions: ["context", "following"] },
-        { type: "opacity", regions: "all" },
-        { type: "continuity", regions: "all" },
-        { type: "motion", regions: ["following"], maxPositionReversals: 0 },
-        { type: "label-stability", regions: "all" },
-        { type: "preserve-bottom-anchor" },
-        { type: "flow", regions: ["context", "following"] },
-      ],
-      { perMarker: true },
-    ),
-  )
-  await expect(
-    page.locator(
-      '[data-timeline-part-ids="prt_append_01_read,prt_append_02_glob,prt_append_03_grep,prt_append_04_list"]',
-    ),
-  ).toBeVisible()
-  await expect(
-    page.locator('[data-timeline-part-ids^="prt_append_01_read"] [data-slot="collapsible-trigger"]'),
-  ).toHaveAttribute("aria-expanded", "true")
-})
-
-test("splits and merges context groups when a middle text part changes", async ({ page }, testInfo) => {
-  const textID = "prt_split_02_text"
-  const followingID = "prt_split_99_following"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([
-        toolPart("prt_split_01_read", "read", "completed", inputs.read),
-        textPart(textID, "Boundary"),
-        toolPart("prt_split_03_glob", "glob", "completed", inputs.glob),
-        textPart(followingID, "Following split groups"),
-      ]),
-    ],
-    cpuRate: 4,
-  })
-  const regions = defineVisualRegions({
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-  })
-  await startVisualProbe(page, regions)
-  await timeline.send(
-    event("message.part.removed", { sessionID: "ses_timeline_stability", messageID: assistantID, partID: textID }),
-    500,
-  )
-  await expect(page.locator('[data-timeline-part-ids="prt_split_01_read,prt_split_03_glob"]')).toBeVisible()
-  await timeline.send(partUpdated(textPart(textID, "Boundary restored")), 500)
-  await expect(page.locator('[data-timeline-part-ids="prt_split_01_read"]')).toBeVisible()
-  await expect(page.locator('[data-timeline-part-ids="prt_split_03_glob"]')).toBeVisible()
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(
-    testInfo,
-    "context-split-merge",
-    trace,
-    visualPlan(
-      regions,
-      [
-        { type: "required", regions: ["following"] },
-        { type: "unique", regions: ["following"] },
-        { type: "stable", regions: ["following"] },
-        { type: "opacity", regions: "all" },
-        { type: "continuity", regions: "all" },
-        { type: "motion", regions: "all", maxPositionReversals: 1 },
-        { type: "label-stability", regions: "all" },
-      ],
-      { perMarker: true },
-    ),
-  )
-})
-
-test("removing the first context member replaces the group once without overlapping following content", async ({
-  page,
-}, testInfo) => {
-  const ids = ["prt_key_01_read", "prt_key_02_glob", "prt_key_03_grep"]
-  const followingID = "prt_key_99_following"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([
-        toolPart(ids[0]!, "read", "completed", inputs.read),
-        toolPart(ids[1]!, "glob", "completed", inputs.glob),
-        toolPart(ids[2]!, "grep", "completed", inputs.grep),
-        textPart(followingID, "Following replaced group"),
-      ]),
-    ],
-    cpuRate: 4,
-  })
-  const original = page.locator(`[data-timeline-part-ids="${ids.join(",")}"]`)
-  const originalRowKey = await original.evaluate((element) =>
-    element.closest("[data-timeline-key]")?.getAttribute("data-timeline-key"),
-  )
-  await original.locator('[data-slot="collapsible-trigger"]').click()
-  await expect(original.locator('[data-slot="collapsible-trigger"]')).toHaveAttribute("aria-expanded", "true")
-  const regions = defineVisualRegions({
-    context: {
-      selector: '[data-timeline-part-ids*="prt_key_02_glob"]',
-      closest: '[data-timeline-row="AssistantPart"]',
-    },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-  })
-  await startVisualProbe(page, regions)
-  await timeline.send(
-    event("message.part.removed", { sessionID: "ses_timeline_stability", messageID: assistantID, partID: ids[0] }),
-    500,
-  )
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(
-    testInfo,
-    "context-first-remove",
-    trace,
-    visualPlan(regions, [
-      { type: "required", regions: ["context", "following"] },
-      { type: "unique", regions: ["context", "following"] },
-      { type: "opacity", regions: "all" },
-      { type: "continuity", regions: "all" },
-      { type: "motion", regions: "all", maxPositionReversals: 0 },
-      { type: "label-stability", regions: "all" },
-      { type: "flow", regions: ["context", "following"] },
-    ]),
-  )
-  await expect(page.locator(`[data-timeline-part-ids="${ids.slice(1).join(",")}"]`)).toBeVisible()
-  expect(
-    await page
-      .locator(`[data-timeline-part-ids="${ids.slice(1).join(",")}"]`)
-      .evaluate((element) => element.closest("[data-timeline-key]")?.getAttribute("data-timeline-key")),
-  ).toBe(originalRowKey)
-  await expect(
-    page.locator(`[data-timeline-part-ids="${ids.slice(1).join(",")}"] [data-slot="collapsible-trigger"]`),
-  ).toHaveAttribute("aria-expanded", "true")
-})

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

@@ -9,6 +9,7 @@ import {
 import {
   assistantMessage,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   shell,
   textPart,
@@ -34,13 +35,16 @@ for (const deviceScaleFactor of [1, 1.25]) {
       seedHistory: true,
     })
     await waitForVisualSettle(page, [
-      `[data-timeline-part-id="${shellID}"]`,
-      `[data-timeline-part-id="${followingID}"]`,
+      `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
     ])
     const regions = defineVisualRegions({
-      shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+      shell: {
+        selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })
@@ -71,13 +75,16 @@ for (const reducedMotion of [true]) {
       seedHistory: true,
     })
     await waitForVisualSettle(page, [
-      `[data-timeline-part-id="${shellID}"]`,
-      `[data-timeline-part-id="${followingID}"]`,
+      `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
     ])
     const regions = defineVisualRegions({
-      shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+      shell: {
+        selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })

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

@@ -9,6 +9,7 @@ import {
 import {
   assistantMessage,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   textPart,
   toolPart,
@@ -43,11 +44,17 @@ for (const profile of profiles) {
       settings: { editToolPartsExpanded: true },
       cpuRate: 4,
     })
-    await waitForVisualSettle(page, [`[data-timeline-part-id="${partID}"]`, `[data-timeline-part-id="${followingID}"]`])
+    await waitForVisualSettle(page, [
+      `[data-timeline-part-id="${renderedPartID(partID)}"]`,
+      `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+    ])
     const regions = defineVisualRegions({
-      tool: { selector: `[data-timeline-part-id="${partID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+      tool: {
+        selector: `[data-timeline-part-id="${renderedPartID(partID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })

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

@@ -9,6 +9,7 @@ import {
 import {
   assistantMessage,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   textPart,
   toolPart,
@@ -35,12 +36,23 @@ test("adds patch files incrementally without resetting outer expansion", async (
     cpuRate: 4,
     seedHistory: true,
   })
-  const trigger = page.locator(`[data-timeline-part-id="${patchID}"] [data-slot="collapsible-trigger"]`).first()
+  const trigger = page
+    .locator(`[data-timeline-part-id="${renderedPartID(patchID)}"] [data-slot="collapsible-trigger"]`)
+    .first()
   await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await waitForVisualSettle(page, [`[data-timeline-part-id="${patchID}"]`, `[data-timeline-part-id="${followingID}"]`])
+  await waitForVisualSettle(page, [
+    `[data-timeline-part-id="${renderedPartID(patchID)}"]`,
+    `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+  ])
   const regions = defineVisualRegions({
-    patch: { selector: `[data-timeline-part-id="${patchID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    patch: {
+      selector: `[data-timeline-part-id="${renderedPartID(patchID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   const second = patchFile("src/b.ts", "add")

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

@@ -17,19 +17,28 @@ describe("timeline fixture validation", () => {
   test("rejects malformed SDK values at runtime", () => {
     expect(() =>
       assistantMessage([], {
-        error: { name: "APIError", data: { message: "failed" } } as never,
+        error: { type: "APIError", message: 1 } as never,
       }),
     ).toThrow()
     expect(() =>
       validateTimelineEvent({
-        directory: "C:/OpenCode/TimelineStability",
-        payload: {
-          id: "evt_invalid_status",
-          type: "session.status",
-          properties: { sessionID: "ses_timeline_stability", status: { type: "retry", attempt: 1 } },
-        },
+        id: "evt_invalid_status",
+        created: 1,
+        type: "session.status",
+        data: { sessionID: "ses_timeline_stability", status: { type: "retry", attempt: 1 } },
       }),
     ).toThrow()
+    expect(() => validateTimelineMessages([{ ...userMessage(), id: "invalid" } as never])).toThrow()
+    expect(() => validateTimelineMessages([{ ...userMessage(), time: { created: "invalid" } } as never])).toThrow()
+    expect(() =>
+      validateTimelineMessages([
+        userMessage(),
+        {
+          ...assistantMessage(),
+          content: [{ type: "tool", id: "call_invalid", name: "bash", state: { status: "completed" } }],
+        } as never,
+      ]),
+    ).toThrow()
   })
 
   test("rejects duplicate IDs and orphan assistants", () => {
@@ -42,8 +51,8 @@ describe("timeline fixture validation", () => {
   test("assigns deterministic event IDs", () => {
     const first = event("session.status", { sessionID: "ses_timeline_stability", status: { type: "busy" } })
     const second = event("session.status", { sessionID: "ses_timeline_stability", status: { type: "idle" } })
-    expect(first.payload.id).toMatch(/^evt_timeline_\d{4}$/)
-    expect(Number(second.payload.id.slice(-4))).toBe(Number(first.payload.id.slice(-4)) + 1)
+    expect(first.id).toMatch(/^evt_timeline_\d{4}$/)
+    expect(Number(second.id.slice(-4))).toBe(Number(first.id.slice(-4)) + 1)
   })
 })
 

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

@@ -1,9 +1,16 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { Event } from "@opencode-ai/schema/event"
-import { SessionStatusEvent } from "@opencode-ai/schema/session-status-event"
-import { SessionV1 } from "@opencode-ai/schema/session-v1"
-import type { SessionInfo, SessionMessageInfo, SessionStatus } from "@opencode-ai/client/promise"
-import type { AssistantMessage, Message, Part, ToolPart, ToolState, UserMessage } from "../../../src/types"
+import { base64Encode } from "@opencode-ai/util/encode"
+import type {
+  JsonValue,
+  OpenCodeEvent,
+  SessionInfo,
+  SessionMessageAssistant,
+  SessionMessageInfo,
+  SessionMessageUser,
+  SessionStatus,
+  SessionStructuredError,
+} from "@opencode-ai/client/promise"
+import { EventManifest } from "@opencode-ai/schema/event-manifest"
+import { SessionMessage } from "@opencode-ai/schema/session-message"
 import { expect, type Page } from "@playwright/test"
 import { Schema } from "effect"
 import { mockOpenCodeServer } from "../../utils/mock-server"
@@ -18,50 +25,80 @@ export const assistantID = "msg_1001_timeline_assistant"
 export const title = "Timeline visual stability"
 export const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }
 
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const tokens = { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } }
+
 type Session = SessionInfo
-type GlobalEvent = {
-  directory: string
-  project?: string
-  workspace?: string
-  payload: {
-    id: string
-    type: string
-    properties: Record<string, unknown>
-  }
+type TextSeed = {
+  id: string
+  type: "text"
+  text: string
+  messageID?: string
+}
+type FileSeed = {
+  id: string
+  type: "file"
+  mime: string
+  filename?: string
+  url: string
+  source?: { type: string; path?: string; text?: { value: string; start: number; end: number } }
+}
+type AgentSeed = {
+  id: string
+  type: "agent"
+  name: string
+  source?: { value: string; start: number; end: number }
+}
+type ReasoningSeed = {
+  id: string
+  type: "reasoning"
+  text: string
+  time?: { start: number; end?: number }
+  metadata?: Record<string, unknown>
+  messageID?: string
+}
+type ToolSeed = {
+  id: string
+  type: "tool"
+  callID: string
+  tool: string
+  messageID?: string
+  executed?: boolean
+  providerState?: Record<string, unknown>
+  providerResultState?: Record<string, unknown>
+  state:
+    | { status: "pending"; input: Record<string, unknown>; raw: string }
+    | {
+        status: "running"
+        input: Record<string, unknown>
+        title?: string
+        metadata: Record<string, unknown>
+        time: { start: number }
+      }
+    | {
+        status: "completed"
+        input: Record<string, unknown>
+        output: string
+        title: string
+        metadata: Record<string, unknown>
+        time: { start: number; end: number }
+      }
+    | {
+        status: "error"
+        input: Record<string, unknown>
+        error: string
+        metadata: Record<string, unknown>
+        time: { start: number; end: number }
+      }
 }
 
-type TimelineProperties = {
-  "message.updated": { sessionID: string; info: Message }
-  "message.removed": { sessionID: string; messageID: string }
-  "message.part.updated": { sessionID: string; part: Part; time: number }
-  "message.part.removed": { sessionID: string; messageID: string; partID: string }
-  "message.part.delta": { sessionID: string; messageID: string; partID: string; field: string; delta: string }
-  "session.status": { sessionID: string; status: SessionStatus }
-}
-type TimelinePayload = {
-  [Type in keyof TimelineProperties]: { id: string; type: Type; properties: TimelineProperties[Type] }
-}[keyof TimelineProperties]
-
-type DeepReadonly<Value> = Value extends readonly unknown[]
-  ? { readonly [Key in keyof Value]: DeepReadonly<Value[Key]> }
-  : Value extends object
-    ? { readonly [Key in keyof Value]: DeepReadonly<Value[Key]> }
-    : Value
-
-export type TimelineEvent = DeepReadonly<Omit<GlobalEvent, "payload"> & { payload: TimelinePayload }>
-export type EventPayload = TimelineEvent
-export type ToolStatus = ToolState["status"]
-export type TimelineMessage = { info: UserMessage; parts: Part[] } | { info: AssistantMessage; parts: Part[] }
-
-type UserPart = Extract<Part, { type: "text" | "file" | "agent" | "subtask" }>
-type AssistantPart = Exclude<Part, { type: "agent" | "subtask" }>
-type OwnedPart<Owner extends Message["role"]> = Owner extends "user" ? UserPart : AssistantPart
-export type PartSeed<Owner extends Message["role"]> =
-  OwnedPart<Owner> extends infer Candidate
-    ? Candidate extends Part
-      ? Omit<Candidate, "sessionID" | "messageID">
-      : never
-    : never
+export type TimelineMessage = SessionMessageUser | SessionMessageAssistant
+export type TimelineEvent = OpenCodeEvent | readonly OpenCodeEvent[]
+export type EventPayload = OpenCodeEvent
+export type ToolStatus = ToolSeed["state"]["status"]
+export type PartSeed<Owner extends "user" | "assistant"> = Owner extends "user"
+  ? TextSeed | FileSeed | AgentSeed
+  : TextSeed | ReasoningSeed | ToolSeed
 
 type ToolOptions<State extends ToolStatus> = State extends "pending"
   ? { output?: never; title?: never; metadata?: never; error?: never }
@@ -71,26 +108,19 @@ type ToolOptions<State extends ToolStatus> = State extends "pending"
       ? { error?: string; metadata?: Record<string, unknown>; output?: never; title?: never }
       : { output?: string; title?: string; metadata?: Record<string, unknown>; error?: never }
 
-const decodeOptions = { errors: "all", onExcessProperty: "error" } as const
-const decodeMessage = Schema.decodeUnknownSync(SessionV1.WithParts)
-const decodePart = Schema.decodeUnknownSync(SessionV1.Part)
-const decodeStatus = Schema.decodeUnknownSync(SessionStatusEvent.Info)
-const timelineEventSchema = Schema.Union([
-  eventSchema("message.updated", SessionV1.Event.MessageUpdated.data),
-  eventSchema("message.removed", SessionV1.Event.MessageRemoved.data),
-  eventSchema("message.part.updated", SessionV1.Event.PartUpdated.data),
-  eventSchema("message.part.removed", SessionV1.Event.PartRemoved.data),
-  eventSchema("message.part.delta", SessionV1.Event.PartDelta.data),
-  eventSchema("session.status", SessionStatusEvent.Status.data),
-])
-const decodeEvent = Schema.decodeUnknownSync(timelineEventSchema)
+type PartRef = { messageID: string; type: "text" | "reasoning" | "tool"; ordinal?: number }
+const partRefs = new Map<string, PartRef>()
+const nextOrdinals = new Map<string, { text: number; reasoning: number }>()
+const startedParts = new Set<string>()
+const toolStates = new Map<string, ToolStatus>()
 let eventSequence = 0
+let durableSequence = -1
 
 export async function setupTimeline(
   page: Page,
   input: {
     messages?: TimelineMessage[]
-    currentMessages?: SessionMessageInfo[]
+    sessionMessages?: SessionMessageInfo[]
     sessionStatus?: Record<string, SessionStatus>
     settings?: Record<string, boolean>
     sessions?: Session[]
@@ -103,40 +133,26 @@ export async function setupTimeline(
     seedHistory?: boolean
   } = {},
 ) {
+  eventSequence = 0
+  durableSequence = -1
   const sessions = input.sessions ?? [session()]
   const messages =
-    input.currentMessages ??
+    input.sessionMessages ??
     validateTimelineMessages([
       ...(input.seedHistory ? historyMessages(18) : []),
       ...(input.messages ?? [userMessage(), assistantMessage()]),
     ])
-  const active = messages.findLast((message) =>
-    "info" in message ? message.info.role === "assistant" : message.type === "assistant",
-  )
-  const initialStatus = decodeStatus(
-    active &&
-      ("info" in active
-        ? active.info.role === "assistant" && active.info.time.completed === undefined
-        : active.type === "assistant" && active.time.completed === undefined)
-      ? { type: "busy" }
-      : { type: "idle" },
-    decodeOptions,
-  )
-  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-  const transport = await installSseTransport<EventPayload>(page, {
-    server,
-    retry: input.eventRetry ?? 20,
-  })
+  const active = messages.findLast((message) => message.type === "assistant")
+  const initialStatus: SessionStatus =
+    active?.type === "assistant" && active.time.completed === undefined ? { type: "busy" } : { type: "idle" }
+  const transport = await installSseTransport(page, { server, retry: input.eventRetry ?? 20 })
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: project(),
     provider: provider(),
     sessions,
     sessionStatus: input.sessionStatus ?? { [sessionID]: initialStatus },
-    pageMessages: () => ({
-      items: messages,
-    }),
+    pageMessages: () => ({ items: messages }),
   })
   await page.addInitScript((settings) => {
     localStorage.setItem(
@@ -151,9 +167,6 @@ export async function setupTimeline(
         },
       }),
     )
-    if (settings.newLayoutDesigns === false) {
-      localStorage.setItem("app-version.v1", JSON.stringify({ version: "1.17.20" }))
-    }
   }, input.settings ?? {})
   if (input.locale) {
     await page.addInitScript((locale) => {
@@ -172,7 +185,7 @@ export async function setupTimeline(
       mobile: false,
     })
   }
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionReady(page, { server, sessionID, title })
   await transport.waitForConnection()
   if (input.cpuRate && input.cpuRate > 1) {
@@ -182,15 +195,25 @@ export async function setupTimeline(
 
   return {
     transport,
-    async send(event: TimelineEvent, delay = 0) {
-      const valid = validateTimelineEvent(event)
-      await transport.send(valid, { marker: describeEvent(valid) })
+    async send(input: TimelineEvent, delay = 0) {
+      const events = timelineEvents(input)
+      if (events.length === 1) await transport.send(events[0]!, { marker: describeEvent(events[0]!) })
+      if (events.length > 1)
+        await transport.burst(
+          events,
+          events.map((item) => ({ marker: describeEvent(item) })),
+        )
       if (delay) await page.waitForTimeout(delay)
     },
     async sendAll(sequence: { event: TimelineEvent; delay: number }[]) {
       for (const item of sequence) {
-        const valid = validateTimelineEvent(item.event)
-        await transport.send(valid, { marker: describeEvent(valid) })
+        const events = timelineEvents(item.event)
+        if (events.length === 1) await transport.send(events[0]!, { marker: describeEvent(events[0]!) })
+        if (events.length > 1)
+          await transport.burst(
+            events,
+            events.map((event) => ({ marker: describeEvent(event) })),
+          )
         await page.waitForTimeout(item.delay)
       }
     },
@@ -210,72 +233,63 @@ export async function setupTimeline(
       )
     },
     async waitForPart(partID: string) {
-      const part = page.locator(`[data-timeline-part-id="${partID}"]`)
+      const part = page.locator(`[data-timeline-part-id="${renderedPartID(partID)}"]`)
       await expect(part).toHaveCount(1)
       await expect(part).toBeVisible()
     },
   }
 }
 
-function describeEvent(event: EventPayload) {
-  if (event.payload.type === "message.part.updated") {
-    const part = event.payload.properties.part
-    return [
-      event.payload.type,
-      part.id,
-      part.type === "tool" ? part.tool : part.type,
-      part.type === "tool" ? part.state.status : undefined,
-    ]
-      .filter(Boolean)
-      .join(":")
-  }
-  if (event.payload.type === "session.status") {
-    const status = event.payload.properties.status
-    return [event.payload.type, status.type, status.type === "retry" ? status.attempt : undefined]
-      .filter((value) => value !== undefined)
-      .join(":")
-  }
-  return event.payload.type
+function timelineEvents(input: TimelineEvent) {
+  return (Array.isArray(input) ? input : [input]).map(validateTimelineEvent)
 }
 
-export function event<const Type extends TimelinePayload["type"]>(
-  type: Type,
-  properties: Extract<TimelinePayload, { type: Type }>["properties"],
-): TimelineEvent
-export function event(type: TimelinePayload["type"], properties: TimelinePayload["properties"]): TimelineEvent {
-  return validateTimelineEvent({
-    directory,
-    payload: { id: `evt_timeline_${String(++eventSequence).padStart(4, "0")}`, type, properties },
-  })
+function describeEvent(event: OpenCodeEvent) {
+  if (event.type.startsWith("session.tool.")) {
+    const data = event.data as { id?: string }
+    return [event.type, data.id].filter(Boolean).join(":")
+  }
+  return event.type
 }
 
-export function validateTimelineEvent(input: unknown): TimelineEvent {
-  return decodeEvent(input, decodeOptions) as TimelineEvent
+export function event(
+  type: "session.status",
+  data: Extract<OpenCodeEvent, { type: "session.status" }>["data"],
+): OpenCodeEvent {
+  return makeEvent(type, data)
+}
+
+export function validateTimelineEvent(input: unknown): OpenCodeEvent {
+  if (!input || typeof input !== "object") throw new Error("Timeline event must be an object")
+  if (!("type" in input) || typeof input.type !== "string") throw new Error("Timeline event requires a type")
+  const definition = EventManifest.ServerDefinitions.find((definition) => definition.type === input.type)
+  if (!definition) throw new Error(`Unknown timeline event: ${input.type}`)
+  return Schema.decodeUnknownSync(definition)(input) as OpenCodeEvent
 }
 
 export function validateTimelineMessages(input: readonly TimelineMessage[]): TimelineMessage[] {
-  input.forEach((message) => decodeMessage(message, decodeOptions))
-  const messages = [...input]
+  const messages = input.map((message): TimelineMessage => {
+    const decoded = Schema.decodeUnknownSync(SessionMessage.Info)(message)
+    if (decoded.type !== "user" && decoded.type !== "assistant")
+      throw new Error(`Unsupported timeline message type: ${decoded.type}`)
+    return message
+  })
   const messageIDs = new Set<string>()
-  const partIDs = new Set<string>()
-  const users = new Set(messages.filter((message) => message.info.role === "user").map((message) => message.info.id))
-
+  let parentID: string | undefined
   messages.forEach((message) => {
-    if (messageIDs.has(message.info.id))
-      throw new Error(`Timeline fixture has duplicate message ID: ${message.info.id}`)
-    messageIDs.add(message.info.id)
-    if (message.info.role === "assistant" && !users.has(message.info.parentID))
-      throw new Error(`Timeline assistant ${message.info.id} must reference a parent user in the fixture`)
-    message.parts.forEach((part) => {
-      if (part.sessionID !== message.info.sessionID || part.messageID !== message.info.id)
-        throw new Error(`Timeline part ${part.id} ownership does not match message ${message.info.id}`)
-      if (message.info.role === "user" && !["text", "file", "agent", "subtask"].includes(part.type))
-        throw new Error(`Timeline user message ${message.info.id} cannot own ${part.type} part ${part.id}`)
-      if (message.info.role === "assistant" && ["agent", "subtask"].includes(part.type))
-        throw new Error(`Timeline assistant message ${message.info.id} cannot own ${part.type} part ${part.id}`)
-      if (partIDs.has(part.id)) throw new Error(`Timeline fixture has duplicate part ID: ${part.id}`)
-      partIDs.add(part.id)
-    })
+    if (messageIDs.has(message.id)) throw new Error(`Timeline fixture has duplicate message ID: ${message.id}`)
+    messageIDs.add(message.id)
+    if (message.type === "user") parentID = message.id
+    if (message.type === "assistant") {
+      const expected = typeof message.metadata?.parentID === "string" ? message.metadata.parentID : parentID
+      if (!expected || expected !== parentID)
+        throw new Error(`Timeline assistant ${message.id} must reference a parent user in the fixture`)
+      message.content.forEach((part) => {
+        if (part.type !== "tool") return
+        if (partRefs.has(part.id) && partRefs.get(part.id)?.messageID !== message.id)
+          throw new Error(`Timeline fixture has duplicate part ID: ${part.id}`)
+      })
+    }
   })
   return messages
 }
@@ -337,55 +351,146 @@ export function historyMessages(count: number): TimelineMessage[] {
   }).flat()
 }
 
-export function partUpdated(part: Part | PartSeed<"assistant">) {
-  const owned = "messageID" in part ? part : { ...part, sessionID, messageID: assistantID }
-  decodePart(owned, decodeOptions)
-  return event("message.part.updated", {
-    sessionID,
-    part: owned,
-    time: 1700000002000,
-  })
+export function partUpdated(part: PartSeed<"assistant">): readonly OpenCodeEvent[] {
+  const messageID = part.messageID ?? assistantID
+  const started = startedParts.has(part.id)
+  const ref = partRef(part.id, messageID, part.type)
+  if (part.type === "text") {
+    startedParts.add(part.id)
+    return [
+      ...(started
+        ? []
+        : [makeEvent("session.text.started", { sessionID, assistantMessageID: messageID, ordinal: ref.ordinal! })]),
+      makeEvent("session.text.ended", {
+        sessionID,
+        assistantMessageID: messageID,
+        ordinal: ref.ordinal!,
+        text: part.text,
+      }),
+    ]
+  }
+  if (part.type === "reasoning") {
+    startedParts.add(part.id)
+    return [
+      ...(started
+        ? []
+        : [
+            makeEvent("session.reasoning.started", {
+              sessionID,
+              assistantMessageID: messageID,
+              ordinal: ref.ordinal!,
+              state: jsonRecord(part.metadata),
+            }),
+          ]),
+      makeEvent("session.reasoning.ended", {
+        sessionID,
+        assistantMessageID: messageID,
+        ordinal: ref.ordinal!,
+        text: part.text,
+        state: jsonRecord(part.metadata),
+      }),
+    ]
+  }
+  return toolEvents(part, messageID)
+}
+
+export function renderedPartID(partID: string) {
+  const ref = partRefs.get(partID)
+  if (!ref || ref.type === "tool") return partID
+  return `${ref.messageID}:${ref.type}:${ref.ordinal}`
 }
 
 export function partDelta(partID: string, delta: string, messageID = assistantID) {
-  return event("message.part.delta", { sessionID, messageID, partID, field: "text", delta })
+  const ref = partRefs.get(partID)
+  if (!ref || ref.type !== "text" || ref.ordinal === undefined) throw new Error(`Unknown text part: ${partID}`)
+  return makeEvent("session.text.delta", {
+    sessionID,
+    assistantMessageID: messageID,
+    ordinal: ref.ordinal,
+    delta,
+  })
 }
 
-export function messageUpdated(info: Message) {
-  return event("message.updated", { sessionID, info })
+export function messageUpdated(info: SessionMessageAssistant) {
+  if (info.error)
+    return makeEvent("session.step.failed", {
+      sessionID,
+      assistantMessageID: info.id,
+      error: info.error,
+      cost: info.cost,
+      tokens: info.tokens,
+    })
+  return makeEvent("session.step.ended", {
+    sessionID,
+    assistantMessageID: info.id,
+    finish: info.finish ?? "stop",
+    cost: info.cost ?? 0,
+    tokens: info.tokens ?? tokens,
+  })
 }
 
 export function status(type: SessionStatus["type"], attempt = 1) {
-  return event("session.status", {
+  if (type === "busy") return makeEvent("session.execution.started", { sessionID })
+  if (type === "idle") return makeEvent("session.execution.succeeded", { sessionID })
+  return makeEvent("session.retry.scheduled", {
     sessionID,
-    status: type === "retry" ? { type, attempt, message: "Rate limited", next: 1700000010000 } : { type },
+    assistantMessageID: assistantID,
+    attempt,
+    at: 1700000010000,
+    error: { type: "provider.error", message: "Rate limited" },
+  })
+}
+
+export function stepStarted(message: SessionMessageAssistant) {
+  return makeEvent("session.step.started", {
+    sessionID,
+    assistantMessageID: message.id,
+    agent: message.agent,
+    model: message.model,
   })
 }
 
 export function userMessage(
   parts?: PartSeed<"user">[],
-  input: { id?: string; summary?: UserMessage["summary"]; created?: number } = {},
-): Extract<TimelineMessage, { info: { role: "user" } }> {
+  input: { id?: string; summary?: unknown; created?: number } = {},
+): SessionMessageUser {
   const id = input.id ?? userID
   const seeds = parts ?? [userText("Build the timeline stability matrix.", { id: `prt_${id}_text` })]
-  const message = {
-    info: {
-      id,
-      sessionID,
-      role: "user",
-      time: { created: input.created ?? 1700000000000 },
-      summary: input.summary ?? { diffs: [] },
-      agent: "build",
-      model,
-    },
-    parts: seeds.map((part) => ({
-      ...part,
-      sessionID,
-      messageID: id,
-    })),
-  } satisfies Extract<TimelineMessage, { info: { role: "user" } }>
-  decodeMessage(message, decodeOptions)
-  return message
+  return {
+    id,
+    type: "user",
+    time: { created: input.created ?? 1700000000000 },
+    text: seeds.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n"),
+    files: seeds.flatMap((part) => {
+      if (part.type !== "file") return []
+      const mention = part.source?.text
+        ? { text: part.source.text.value, start: part.source.text.start, end: part.source.text.end }
+        : undefined
+      return [
+        {
+          data: part.url.match(/^data:[^,]*;base64,(.*)$/)?.[1] ?? "",
+          mime: part.mime,
+          source: part.url.startsWith("data:")
+            ? ({ type: "inline" } as const)
+            : ({ type: "uri", uri: part.source?.path ?? part.url } as const),
+          ...(part.filename ? { name: part.filename } : {}),
+          ...(mention ? { mention } : {}),
+        },
+      ]
+    }),
+    agents: seeds.flatMap((part) => {
+      if (part.type !== "agent") return []
+      return [
+        {
+          name: part.name,
+          ...(part.source
+            ? { mention: { text: part.source.value, start: part.source.start, end: part.source.end } }
+            : {}),
+        },
+      ]
+    }),
+    ...(input.summary === undefined ? {} : { metadata: { summary: input.summary as JsonValue } }),
+  }
 }
 
 export function assistantMessage(
@@ -394,49 +499,43 @@ export function assistantMessage(
     id?: string
     parentID?: string
     completed?: boolean
-    error?: AssistantMessage["error"]
+    error?: SessionStructuredError
     created?: number
   } = {},
-): Extract<TimelineMessage, { info: { role: "assistant" } }> {
+): SessionMessageAssistant {
+  if (input.error && (typeof input.error.type !== "string" || typeof input.error.message !== "string"))
+    throw new Error("Invalid assistant error")
   const id = input.id ?? assistantID
-  const message = {
-    info: {
-      id,
-      sessionID,
-      role: "assistant",
-      time: {
-        created: input.created ?? 1700000001000,
-        ...(input.completed === false ? {} : { completed: (input.created ?? 1700000001000) + 1_000 }),
-      },
-      parentID: input.parentID ?? userID,
-      modelID: model.modelID,
-      providerID: model.providerID,
-      mode: "build",
-      agent: "build",
-      path: { cwd: directory, root: directory },
-      cost: 0.01,
-      tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-      variant: "max",
-      ...(input.error ? { error: input.error } : {}),
-    },
-    parts: parts.map((part) => ({ ...part, sessionID, messageID: id })),
-  } satisfies Extract<TimelineMessage, { info: { role: "assistant" } }>
-  decodeMessage(message, decodeOptions)
-  return message
+  const created = input.created ?? 1700000001000
+  const ordinals = { text: 0, reasoning: 0 }
+  const content = parts.map((part) => messageContent(part, id, ordinals))
+  nextOrdinals.set(id, ordinals)
+  return {
+    id,
+    type: "assistant",
+    metadata: { parentID: input.parentID ?? userID },
+    time: { created, ...(input.completed === false ? {} : { completed: created + 1_000 }) },
+    model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+    agent: "build",
+    content,
+    cost: 0.01,
+    tokens,
+    ...(input.completed === false ? {} : { finish: "stop" as const }),
+    ...(input.error ? { error: input.error } : {}),
+  }
 }
 
-export function userText(
-  text: string,
-  input: Partial<Omit<Extract<PartSeed<"user">, { type: "text" }>, "type" | "text">> = {},
-): Extract<PartSeed<"user">, { type: "text" }> {
+export function userText(text: string, input: Partial<Omit<TextSeed, "type" | "text">> = {}): TextSeed {
   return { id: "prt_user_text", type: "text", text, ...input }
 }
 
-export function textPart(id: string, text: string): Extract<PartSeed<"assistant">, { type: "text" }> {
+export function textPart(id: string, text: string): TextSeed {
+  partRef(id, assistantID, "text")
   return { id, type: "text", text }
 }
 
-export function reasoningPart(id: string, text: string): Extract<PartSeed<"assistant">, { type: "reasoning" }> {
+export function reasoningPart(id: string, text: string): ReasoningSeed {
+  partRef(id, assistantID, "reasoning")
   return { id, type: "reasoning", text, time: { start: 1700000001000 } }
 }
 
@@ -446,35 +545,35 @@ export function toolPart(
   state: "pending",
   input: Record<string, unknown>,
   options?: ToolOptions<"pending">,
-): Omit<ToolPart, "sessionID" | "messageID">
+): ToolSeed
 export function toolPart(
   id: string,
   tool: string,
   state: "running",
   input: Record<string, unknown>,
   options?: ToolOptions<"running">,
-): Omit<ToolPart, "sessionID" | "messageID">
+): ToolSeed
 export function toolPart(
   id: string,
   tool: string,
   state: "completed",
   input: Record<string, unknown>,
   options?: ToolOptions<"completed">,
-): Omit<ToolPart, "sessionID" | "messageID">
+): ToolSeed
 export function toolPart(
   id: string,
   tool: string,
   state: "error",
   input: Record<string, unknown>,
   options?: ToolOptions<"error">,
-): Omit<ToolPart, "sessionID" | "messageID">
+): ToolSeed
 export function toolPart(
   id: string,
   tool: string,
   state: ToolStatus,
   input: Record<string, unknown>,
   options: ToolOptions<ToolStatus> = {},
-): Omit<ToolPart, "sessionID" | "messageID"> {
+): ToolSeed {
   const base = { id, type: "tool" as const, callID: id, tool }
   if (state === "pending") return { ...base, state: { status: state, input, raw: "" } }
   if (state === "running")
@@ -512,12 +611,7 @@ export function toolPart(
   }
 }
 
-export function shell(
-  id: string,
-  state: ToolStatus,
-  output = "",
-  command = `echo ${id}`,
-): Omit<ToolPart, "sessionID" | "messageID"> {
+export function shell(id: string, state: ToolStatus, output = "", command = `echo ${id}`): ToolSeed {
   if (state === "pending") return toolPart(id, "bash", state, { command })
   if (state === "running")
     return toolPart(id, "bash", state, { command }, { title: command, metadata: { command, output } })
@@ -526,7 +620,7 @@ export function shell(
   return toolPart(id, "bash", state, { command }, { title: command, output, metadata: { command, output } })
 }
 
-export function completedAssistantInfo(info: AssistantMessage): AssistantMessage {
+export function completedAssistantInfo(info: SessionMessageAssistant): SessionMessageAssistant {
   return { ...info, time: { ...info.time, completed: 1700000003000 } }
 }
 
@@ -554,16 +648,200 @@ export function session(input: Partial<Session> = {}): Session {
   }
 }
 
-function eventSchema<
-  const Type extends TimelinePayload["type"],
-  const Properties extends Schema.Codec<unknown, unknown>,
->(type: Type, properties: Properties) {
-  return Schema.Struct({
-    directory: Schema.String,
-    project: Schema.optional(Schema.String),
-    workspace: Schema.optional(Schema.String),
-    payload: Schema.Struct({ id: Event.ID, type: Schema.Literal(type), properties }),
-  })
+function messageContent(
+  part: PartSeed<"assistant">,
+  messageID: string,
+  ordinals: { text: number; reasoning: number },
+): SessionMessageAssistant["content"][number] {
+  if (part.type === "tool") {
+    partRefs.set(part.id, { messageID, type: part.type })
+    toolStates.set(part.callID, part.state.status)
+  } else {
+    partRefs.set(part.id, { messageID, type: part.type, ordinal: ordinals[part.type]++ })
+    startedParts.add(part.id)
+  }
+  if (part.type === "text") return { type: "text", text: part.text }
+  if (part.type === "reasoning")
+    return {
+      type: "reasoning",
+      text: part.text,
+      state: jsonRecord(part.metadata),
+      time: part.time
+        ? { created: part.time.start, ...(part.time.end === undefined ? {} : { completed: part.time.end }) }
+        : undefined,
+    }
+  const state = part.state
+  const time = "time" in state ? state.time : undefined
+  const completed = state.status === "completed" || state.status === "error" ? state.time.end : undefined
+  const base = {
+    type: "tool" as const,
+    id: part.callID,
+    name: part.tool,
+    time: {
+      created: time?.start ?? 1700000001000,
+      ...(time?.start === undefined ? {} : { ran: time.start }),
+      ...(completed === undefined ? {} : { completed }),
+    },
+    ...(part.executed === undefined ? {} : { executed: part.executed }),
+    ...(part.providerState ? { providerState: jsonRecord(part.providerState) } : {}),
+    ...(part.providerResultState ? { providerResultState: jsonRecord(part.providerResultState) } : {}),
+  }
+  if (state.status === "pending") return { ...base, state: { status: "streaming", input: state.raw } }
+  if (state.status === "running")
+    return {
+      ...base,
+      state: { status: "running", input: jsonRecord(state.input), metadata: jsonRecord(state.metadata) },
+    }
+  if (state.status === "error")
+    return {
+      ...base,
+      state: {
+        status: "error",
+        input: jsonRecord(state.input),
+        error: { type: "ToolError", message: state.error },
+        metadata: jsonRecord(state.metadata),
+      },
+    }
+  return {
+    ...base,
+    state: {
+      status: "completed",
+      input: jsonRecord(state.input),
+      content: [{ type: "text", text: state.output }],
+      metadata: jsonRecord(state.metadata),
+    },
+  }
+}
+
+function toolEvents(part: ToolSeed, messageID: string): readonly OpenCodeEvent[] {
+  const previous = toolStates.get(part.callID)
+  if (previous === "completed" || previous === "error") return []
+
+  const events: OpenCodeEvent[] = []
+  if (!previous) {
+    events.push(
+      makeEvent("session.tool.input.started", {
+        sessionID,
+        assistantMessageID: messageID,
+        id: part.callID,
+        name: part.tool,
+      }),
+    )
+  }
+  if (part.state.status === "pending") {
+    toolStates.set(part.callID, part.state.status)
+    return events
+  }
+  if (!previous || previous === "pending") {
+    events.push(
+      makeEvent("session.tool.input.ended", {
+        sessionID,
+        assistantMessageID: messageID,
+        id: part.callID,
+        text: JSON.stringify(part.state.input),
+      }),
+      makeEvent("session.tool.called", {
+        sessionID,
+        assistantMessageID: messageID,
+        id: part.callID,
+        input: part.state.input,
+        executed: part.executed ?? true,
+        state: jsonRecord(part.providerState),
+      }),
+    )
+  }
+  if (part.state.status === "running") {
+    if (previous === "running" || Object.keys(part.state.metadata).length)
+      events.push(
+        makeEvent("session.tool.progress", {
+          sessionID,
+          assistantMessageID: messageID,
+          id: part.callID,
+          metadata: jsonRecord(part.state.metadata),
+        }),
+      )
+    toolStates.set(part.callID, part.state.status)
+    return events
+  }
+  if (part.state.status === "error") {
+    events.push(
+      makeEvent("session.tool.failed", {
+        sessionID,
+        assistantMessageID: messageID,
+        id: part.callID,
+        error: { type: "ToolError", message: part.state.error },
+        metadata: jsonRecord(part.state.metadata),
+        executed: part.executed ?? true,
+        resultState: jsonRecord(part.providerResultState),
+      }),
+    )
+    toolStates.set(part.callID, part.state.status)
+    return events
+  }
+  events.push(
+    makeEvent("session.tool.success", {
+      sessionID,
+      assistantMessageID: messageID,
+      id: part.callID,
+      content: [{ type: "text", text: part.state.output }],
+      metadata: jsonRecord(part.state.metadata),
+      executed: part.executed ?? true,
+      resultState: jsonRecord(part.providerResultState),
+    }),
+  )
+  toolStates.set(part.callID, part.state.status)
+  return events
+}
+
+function partRef(id: string, messageID: string, type: PartRef["type"]): PartRef {
+  const current = partRefs.get(id)
+  if (current) return current
+  if (type === "tool") {
+    const ref = { messageID, type } satisfies PartRef
+    partRefs.set(id, ref)
+    return ref
+  }
+  const next = nextOrdinals.get(messageID) ?? { text: 0, reasoning: 0 }
+  const ref = { messageID, type, ordinal: next[type]++ } satisfies PartRef
+  nextOrdinals.set(messageID, next)
+  partRefs.set(id, ref)
+  return ref
+}
+
+function makeEvent<Type extends OpenCodeEvent["type"]>(
+  type: Type,
+  data: Extract<OpenCodeEvent, { type: Type }>["data"],
+): OpenCodeEvent {
+  const id = `evt_timeline_${String(++eventSequence).padStart(4, "0")}`
+  const base = { id, created: 1700000002000 + eventSequence, type, data, location: { directory } }
+  const definition = EventManifest.ServerDefinitions.find((definition) => definition.type === type)
+  if (!definition) throw new Error(`Unknown timeline event: ${type}`)
+  const input =
+    definition.durability === "durable"
+      ? {
+          ...base,
+          durable: { aggregateID: sessionID, seq: ++durableSequence, version: definition.durable.version },
+        }
+      : base
+  return Schema.decodeUnknownSync(definition)(input) as unknown as OpenCodeEvent
+}
+
+function jsonRecord(value: Record<string, unknown> | undefined): Record<string, JsonValue> {
+  if (!value) return {}
+  return Object.fromEntries(
+    Object.entries(value).flatMap(([key, item]) => {
+      const next = jsonValue(item)
+      return next === undefined ? [] : [[key, next]]
+    }),
+  )
+}
+
+function jsonValue(value: unknown): JsonValue | undefined {
+  if (value === null || typeof value === "string" || typeof value === "boolean") return value
+  if (typeof value === "number") return Number.isFinite(value) ? value : null
+  if (Array.isArray(value)) return value.map((item) => jsonValue(item) ?? null)
+  if (!value || typeof value !== "object") return
+  return jsonRecord(value as Record<string, unknown>)
 }
 
 function provider() {

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

@@ -6,7 +6,16 @@ import {
   stopVisualProbe,
   visualPlan,
 } from "../../utils/visual-stability"
-import { assistantMessage, setupTimeline, shell, textPart, toolPart, userMessage, waitForVisualSettle } from "./fixture"
+import {
+  assistantMessage,
+  renderedPartID,
+  setupTimeline,
+  shell,
+  textPart,
+  toolPart,
+  userMessage,
+  waitForVisualSettle,
+} from "./fixture"
 
 test("expands and collapses a long completed shell without overlap", async ({ page }, testInfo) => {
   const shellID = "prt_interaction_01_shell"
@@ -20,11 +29,20 @@ test("expands and collapses a long completed shell without overlap", async ({ pa
     cpuRate: 4,
     seedHistory: true,
   })
-  const trigger = page.locator(`[data-timeline-part-id="${shellID}"] [data-slot="collapsible-trigger"]`)
-  await waitForVisualSettle(page, [`[data-timeline-part-id="${shellID}"]`, `[data-timeline-part-id="${followingID}"]`])
+  const trigger = page.locator(`[data-timeline-part-id="${renderedPartID(shellID)}"] [data-slot="collapsible-trigger"]`)
+  await waitForVisualSettle(page, [
+    `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+    `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+  ])
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   const plan = visualPlan(regions, [
     { type: "required", regions: ["shell", "following"] },
@@ -76,7 +94,7 @@ test("expands and collapses a completed context group without overlap", async ({
     seedHistory: true,
   })
   const trigger = page.locator(`${group} [data-slot="collapsible-trigger"]`)
-  await waitForVisualSettle(page, [group, `[data-timeline-part-id="${followingID}"]`])
+  await waitForVisualSettle(page, [group, `[data-timeline-part-id="${renderedPartID(followingID)}"]`])
   for (const [name, expanded] of [
     ["context-expand", true],
     ["context-collapse", false],
@@ -85,7 +103,7 @@ test("expands and collapses a completed context group without overlap", async ({
     const regions = defineVisualRegions({
       context: { selector: group, closest: '[data-timeline-row="AssistantPart"]' },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })
@@ -144,11 +162,22 @@ test("expands and collapses an edit diff without moving twice", async ({ page },
     cpuRate: 4,
     seedHistory: true,
   })
-  const trigger = page.locator(`[data-timeline-part-id="${editID}"] [data-slot="collapsible-trigger"]`).first()
-  await waitForVisualSettle(page, [`[data-timeline-part-id="${editID}"]`, `[data-timeline-part-id="${followingID}"]`])
+  const trigger = page
+    .locator(`[data-timeline-part-id="${renderedPartID(editID)}"] [data-slot="collapsible-trigger"]`)
+    .first()
+  await waitForVisualSettle(page, [
+    `[data-timeline-part-id="${renderedPartID(editID)}"]`,
+    `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+  ])
   const regions = defineVisualRegions({
-    edit: { selector: `[data-timeline-part-id="${editID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    edit: {
+      selector: `[data-timeline-part-id="${renderedPartID(editID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await trigger.click()
@@ -173,64 +202,6 @@ test("expands and collapses an edit diff without moving twice", async ({ page },
   )
 })
 
-test("shows all and expands historical diff summary without overlap", async ({ page }, testInfo) => {
-  const firstUser = userMessage(undefined, {
-    summary: {
-      diffs: Array.from({ length: 12 }, (_, index) => ({
-        file: `src/diff-${index}.ts`,
-        status: "modified",
-        additions: 1,
-        deletions: 1,
-        patch: `@@ -1 +1 @@\n-export const value = ${index}\n+export const value = ${index + 1}`,
-      })),
-    },
-  })
-  const nextUserID = "msg_2000_diff_interaction_user"
-  await setupTimeline(page, {
-    messages: [
-      firstUser,
-      assistantMessage(),
-      userMessage(undefined, { id: nextUserID, created: 1700000010000 }),
-      assistantMessage([], {
-        id: "msg_2001_diff_interaction_assistant",
-        parentID: nextUserID,
-        created: 1700000011000,
-      }),
-    ],
-    cpuRate: 4,
-  })
-  const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-  await scroller.evaluate((element) => (element.scrollTop = 0))
-  const diff = page.locator('[data-timeline-row="DiffSummary"]')
-  const following = page.locator(`[data-message-id="${nextUserID}"]`).first()
-  await expect(diff).toBeVisible()
-  const regions = defineVisualRegions({
-    diff: { selector: '[data-timeline-row="DiffSummary"]' },
-    following: { selector: `[data-message-id="${nextUserID}"]` },
-  })
-  await startVisualProbe(page, regions)
-  await page.getByText(/show all/i).click()
-  await page.waitForTimeout(500)
-  await diff.locator('[data-slot="session-turn-diff-trigger"]').first().click()
-  await page.waitForTimeout(900)
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(
-    testInfo,
-    "diff-summary-expand",
-    trace,
-    visualPlan(regions, [
-      { type: "required", regions: ["diff", "following"] },
-      { type: "unique", regions: ["diff", "following"] },
-      { type: "stable", regions: ["diff", "following"] },
-      { type: "opacity", regions: "all" },
-      { type: "continuity", regions: "all" },
-      { type: "motion", regions: "all", maxPositionReversals: 1, maxReversals: 2 },
-      { type: "label-stability", regions: "all" },
-      { type: "flow", regions: ["diff", "following"] },
-    ]),
-  )
-})
-
 function lines(count: number) {
   return Array.from({ length: count }, (_, index) => `line ${index + 1}`).join("\n")
 }

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

@@ -14,6 +14,7 @@ import {
   partDelta,
   partUpdated,
   reasoningPart,
+  renderedPartID,
   setupTimeline,
   shell,
   status,
@@ -50,7 +51,7 @@ test.describe("timeline visual lifecycle stability", () => {
       prt_shell_long: shellRegion(ids[2]),
       following: shellRegion(followingID),
     })
-    await waitForVisualSettle(page, [`[data-timeline-part-id="${followingID}"]`])
+    await waitForVisualSettle(page, [`[data-timeline-part-id="${renderedPartID(followingID)}"]`])
     await startVisualProbe(page, regions)
     await timeline.sendAll([
       { event: partUpdated(shell(ids[0]!, "completed", "")), delay: 180 },
@@ -60,7 +61,7 @@ test.describe("timeline visual lifecycle stability", () => {
       { event: partUpdated(shell(ids[1]!, "completed", lines(2))), delay: 260 },
       { event: partUpdated(shell(ids[2]!, "running", lines(50))), delay: 100 },
       { event: partUpdated(shell(ids[2]!, "completed", lines(50))), delay: 450 },
-      { event: messageUpdated(completedAssistantInfo(assistant.info)), delay: 100 },
+      { event: messageUpdated(completedAssistantInfo(assistant)), delay: 100 },
       { event: status("idle"), delay: 700 },
     ])
     const trace = await stopVisualProbe<keyof typeof regions>(page)
@@ -84,9 +85,11 @@ test.describe("timeline visual lifecycle stability", () => {
         { perMarker: true },
       ),
     )
-    await expect(page.locator(`[data-timeline-part-id="${ids[2]}"] [data-slot="bash-pre"]`)).toContainText("line 50")
+    await expect(
+      page.locator(`[data-timeline-part-id="${renderedPartID(ids[2])}"] [data-slot="bash-pre"]`),
+    ).toContainText("line 50")
 
-    const short = page.locator(`[data-timeline-part-id="${ids[1]}"]`)
+    const short = page.locator(`[data-timeline-part-id="${renderedPartID(ids[1])}"]`)
     await short.locator('[data-slot="collapsible-trigger"]').click()
     await expect(short.locator('[data-slot="collapsible-trigger"]')).toHaveAttribute("aria-expanded", "false")
     await timeline.send(partUpdated(textPart("prt_late_sibling", "A later sibling rerender.")), 250)
@@ -106,26 +109,31 @@ test.describe("timeline visual lifecycle stability", () => {
     })
     await timeline.send(status("busy"), 120)
     await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
+    const initialReasoning = reasoningPart(reasoningID, "")
+    const initialText = textPart(textID, "Starting")
 
     const regions = defineVisualRegions({
       thinking: { selector: '[data-timeline-row="Thinking"]' },
       reasoning: {
-        selector: `[data-timeline-part-id="${reasoningID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(reasoningID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
+      text: {
+        selector: `[data-timeline-part-id="${renderedPartID(textID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
-      text: { selector: `[data-timeline-part-id="${textID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
     })
     await startVisualProbe(page, regions)
-    await timeline.send(partUpdated(reasoningPart(reasoningID, "")), 100)
-    await expect(page.locator(`[data-timeline-part-id="${reasoningID}"]`)).toHaveCount(0)
+    await timeline.send(partUpdated(initialReasoning), 100)
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(reasoningID)}"]`)).toHaveCount(0)
     await timeline.send(partUpdated(reasoningPart(reasoningID, "## Planning\n\nChecking the visible timeline.")), 160)
     await timeline.waitForPart(reasoningID)
     await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-    await timeline.send(partUpdated(textPart(textID, "Starting")), 100)
+    await timeline.send(partUpdated(initialText), 100)
     await timeline.send(partDelta(textID, " **stable"), 90)
     await timeline.send(partDelta(textID, " output** with `code` and [a link"), 130)
     await timeline.send(partDelta(textID, "](https://example.com)."), 220)
-    await timeline.send(messageUpdated(completedAssistantInfo(assistant.info)), 120)
+    await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 120)
     await timeline.send(status("idle"), 500)
     const trace = await stopVisualProbe<keyof typeof regions>(page)
     await reportVisualStability(
@@ -144,7 +152,7 @@ test.describe("timeline visual lifecycle stability", () => {
         { type: "flow", regions: ["reasoning", "text"] },
       ]),
     )
-    await expect(page.locator(`[data-timeline-part-id="${textID}"]`)).toContainText("stable output")
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(textID)}"]`)).toContainText("stable output")
   })
 })
 
@@ -153,5 +161,5 @@ function lines(count: number) {
 }
 
 function shellRegion(id: string) {
-  return { selector: `[data-timeline-part-id="${id}"]`, closest: '[data-timeline-row="AssistantPart"]' }
+  return { selector: `[data-timeline-part-id="${renderedPartID(id)}"]`, closest: '[data-timeline-row="AssistantPart"]' }
 }

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

@@ -6,14 +6,14 @@ import {
   stopVisualProbe,
   visualPlan,
 } from "../../utils/visual-stability"
-import { assistantMessage, setupTimeline, textPart, userMessage } from "./fixture"
+import { assistantMessage, renderedPartID, setupTimeline, textPart, userMessage } from "./fixture"
 
 test("detects blanking caused by ancestor opacity", async ({ page }) => {
   const partID = "prt_oracle_ancestor_opacity"
   await setupTimeline(page, { messages: [userMessage(), assistantMessage([textPart(partID, "Visible content")])] })
-  const row = page.locator(`[data-timeline-part-id="${partID}"]`).first()
+  const row = page.locator(`[data-timeline-part-id="${renderedPartID(partID)}"]`).first()
   const regions = defineVisualRegions({
-    content: { selector: `[data-timeline-part-id="${partID}"]` },
+    content: { selector: `[data-timeline-part-id="${renderedPartID(partID)}"]` },
   })
   await startVisualProbe(page, regions)
   await row.evaluate((element) => {
@@ -41,13 +41,13 @@ test("detects blanking caused by ancestor opacity", async ({ page }) => {
 test("detects root opacity when probing descendant opacity", async ({ page }) => {
   const partID = "prt_oracle_descendant_opacity"
   await setupTimeline(page, { messages: [userMessage(), assistantMessage([textPart(partID, "Visible content")])] })
-  const row = page.locator(`[data-timeline-part-id="${partID}"]`).first()
+  const row = page.locator(`[data-timeline-part-id="${renderedPartID(partID)}"]`).first()
   await row.evaluate((element) => {
     element.innerHTML = '<span data-probe-opacity="true">Visible content</span>'
   })
   const regions = defineVisualRegions({
     content: {
-      selector: `[data-timeline-part-id="${partID}"]`,
+      selector: `[data-timeline-part-id="${renderedPartID(partID)}"]`,
       opacitySelectors: ['[data-probe-opacity="true"]'],
     },
   })

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

@@ -9,6 +9,7 @@ import {
 import {
   assistantMessage,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   shell,
   textPart,
@@ -34,8 +35,14 @@ test("does not reverse visible rows when the user wheels during shell remeasurem
   })
   const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await timeline.send(partUpdated(shell(shellID, "running", lines(30))), 80)
@@ -143,8 +150,8 @@ test("tracks keyboard scrolling from a focused timeline descendant", async ({ pa
     reducedMotion: true,
   })
   const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-  const row = page.locator(`[data-timeline-part-id="${shellID}"]`).first()
-  const trigger = page.locator(`[data-timeline-part-id="${shellID}"] [data-slot="collapsible-trigger"]`)
+  const row = page.locator(`[data-timeline-part-id="${renderedPartID(shellID)}"]`).first()
+  const trigger = page.locator(`[data-timeline-part-id="${renderedPartID(shellID)}"] [data-slot="collapsible-trigger"]`)
   await row.evaluate((element) => element.setAttribute("tabindex", "0"))
   await row.focus()
   for (let index = 0; index < 3; index++) {
@@ -182,7 +189,7 @@ test("does not claim keyboard scrolling owned by a nested scrollable", async ({
     seedHistory: true,
   })
   const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-  const nested = page.locator(`[data-timeline-part-id="${shellID}"] [data-scrollable]`)
+  const nested = page.locator(`[data-timeline-part-id="${renderedPartID(shellID)}"] [data-scrollable]`)
   await nested.evaluate((element) => (element.scrollTop = element.scrollHeight))
   await nested.focus()
   await page.waitForFunction(() => {
@@ -209,7 +216,7 @@ test("does not claim keyboard scrolling owned by a nested scrollable", async ({
   await nested.press("PageUp")
   await expect.poll(() => scroller.evaluate((element) => element.scrollTop)).toBeLessThan(boundaryBefore)
 
-  const nonOverflowing = page.locator(`[data-timeline-part-id="${shellID}"]`).first()
+  const nonOverflowing = page.locator(`[data-timeline-part-id="${renderedPartID(shellID)}"]`).first()
   await nonOverflowing.evaluate((element) => {
     element.setAttribute("data-scrollable", "")
     element.setAttribute("tabindex", "0")
@@ -238,12 +245,18 @@ test("jump to latest lands on stable final rows after offscreen growth", async (
   )
   await timeline.send(partUpdated(shell(shellID, "running", lines(50))), 300)
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await page.getByRole("button", { name: /Jump to latest/i }).click()
-  await expect(page.locator(`[data-timeline-part-id="${followingID}"]`)).toBeVisible()
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID(followingID)}"]`)).toBeVisible()
   await page.waitForTimeout(600)
   const trace = await stopVisualProbe<keyof typeof regions>(page)
   await reportVisualStability(
@@ -277,8 +290,14 @@ test("handles a single row taller than the viewport", async ({ page }, testInfo)
     seedHistory: true,
   })
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await timeline.send(partUpdated(shell(shellID, "completed", lines(100))), 700)

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

@@ -9,6 +9,7 @@ import {
 import {
   assistantMessage,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   shell,
   textPart,
@@ -68,13 +69,16 @@ for (const profile of profiles) {
     const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
     await scroller.evaluate((element) => (element.scrollTop = element.scrollHeight))
     await waitForVisualSettle(page, [
-      `[data-timeline-part-id="${shellID}"]`,
-      `[data-timeline-part-id="${followingID}"]`,
+      `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
     ])
     const regions = defineVisualRegions({
-      shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+      shell: {
+        selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+        closest: '[data-timeline-row="AssistantPart"]',
+      },
       following: {
-        selector: `[data-timeline-part-id="${followingID}"]`,
+        selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })
@@ -120,10 +124,19 @@ test("keeps following row stable when a collapsed shell receives 50 lines", asyn
     cpuRate: 4,
     seedHistory: true,
   })
-  await waitForVisualSettle(page, [`[data-timeline-part-id="${shellID}"]`, `[data-timeline-part-id="${followingID}"]`])
+  await waitForVisualSettle(page, [
+    `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+    `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+  ])
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await timeline.send(partUpdated(shell(shellID, "running", lines(50))), 240)
@@ -164,10 +177,19 @@ test("keeps rows stable when a running shell becomes an error", async ({ page },
     cpuRate: 4,
     seedHistory: true,
   })
-  await waitForVisualSettle(page, [`[data-timeline-part-id="${shellID}"]`, `[data-timeline-part-id="${followingID}"]`])
+  await waitForVisualSettle(page, [
+    `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+    `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+  ])
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await timeline.send(
@@ -215,16 +237,20 @@ test("keeps rows stable when later text arrives before shell output", async ({ p
     cpuRate: 4,
     seedHistory: true,
   })
-  await waitForVisualSettle(page, [`[data-timeline-part-id="${shellID}"]`])
+  const following = textPart(followingID, "Later assistant content arrived before shell output.")
+  await waitForVisualSettle(page, [`[data-timeline-part-id="${renderedPartID(shellID)}"]`])
   const regions = defineVisualRegions({
-    shell: { selector: `[data-timeline-part-id="${shellID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    shell: {
+      selector: `[data-timeline-part-id="${renderedPartID(shellID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
     following: {
-      selector: `[data-timeline-part-id="${followingID}"]`,
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
       closest: '[data-timeline-row="AssistantPart"]',
     },
   })
   await startVisualProbe(page, regions)
-  await timeline.send(partUpdated(textPart(followingID, "Later assistant content arrived before shell output.")), 240)
+  await timeline.send(partUpdated(following), 240)
   await timeline.send(partUpdated(shell(shellID, "running", lines(20))), 300)
   await timeline.send(partUpdated(shell(shellID, "completed", lines(20))), 600)
   const trace = await stopVisualProbe<keyof typeof regions>(page)

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

@@ -11,8 +11,8 @@ import {
   partUpdated,
   session,
   sessionID,
+  renderedPartID,
   setupTimeline,
-  textPart,
   toolPart,
   userMessage,
 } from "./fixture"
@@ -27,7 +27,7 @@ test("adds a task child-session link without replacing the task row", async ({ p
     cpuRate: 4,
   })
   const regions = defineVisualRegions({
-    task: { selector: `[data-timeline-part-id="${taskID}"] [data-slot="collapsible-trigger"]` },
+    task: { selector: `[data-timeline-part-id="${renderedPartID(taskID)}"] [data-slot="collapsible-trigger"]` },
   })
   await startVisualProbe(page, regions)
   await timeline.send(
@@ -53,54 +53,3 @@ test("adds a task child-session link without replacing the task row", async ({ p
     page.locator(`a[href$="/session/${childID}"]`, { has: page.locator('[data-component="task-tool-card"]') }),
   ).toBeVisible()
 })
-
-test("changes generic tool arguments without replacing the row", async ({ page }, testInfo) => {
-  const toolID = "prt_generic_mutation"
-  const followingID = "prt_generic_mutation_following"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage(
-        [
-          toolPart(toolID, "mcp_probe", "running", { target: "one", count: 1 }),
-          textPart(followingID, "Following generic tool"),
-        ],
-        { completed: false },
-      ),
-    ],
-    cpuRate: 4,
-  })
-  const regions = defineVisualRegions({
-    tool: { selector: `[data-timeline-part-id="${toolID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-  })
-  await startVisualProbe(page, regions)
-  await timeline.send(
-    partUpdated(toolPart(toolID, "mcp_probe", "running", { target: "two", count: 2, mode: "deep" })),
-    200,
-  )
-  await timeline.send(
-    partUpdated(toolPart(toolID, "mcp_probe", "completed", { target: "two", count: 2, mode: "deep" })),
-    400,
-  )
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(
-    testInfo,
-    "generic-mutation",
-    trace,
-    visualPlan(
-      regions,
-      [
-        { type: "required", regions: ["tool", "following"] },
-        { type: "unique", regions: ["tool", "following"] },
-        { type: "stable", regions: ["tool", "following"] },
-        { type: "opacity", regions: "all" },
-        { type: "continuity", regions: "all" },
-        { type: "motion", regions: "all", maxPositionReversals: 0 },
-        { type: "label-stability", regions: "all" },
-        { type: "flow", regions: ["tool", "following"] },
-      ],
-      { perMarker: true },
-    ),
-  )
-})

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

@@ -12,6 +12,7 @@ import {
   partUpdated,
   session,
   sessionID,
+  renderedPartID,
   setupTimeline,
   status,
   textPart,
@@ -48,8 +49,8 @@ test.describe("timeline tool state stability", () => {
     })
     await timeline.send(status("busy"), 120)
     for (const id of ids) await timeline.waitForPart(`prt_state_${id}`)
-    await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toHaveCount(0)
-    await expect(page.locator(`[data-timeline-part-id="${todoID}"]`)).toHaveCount(0)
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(questionID)}"]`)).toHaveCount(0)
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(todoID)}"]`)).toHaveCount(0)
 
     const regionIDs = [
       "prt_state_webfetch",
@@ -104,8 +105,10 @@ test.describe("timeline tool state stability", () => {
         { type: "label-stability", regions: "all" },
       ]),
     )
-    await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toContainText("Keep it stable")
-    await expect(page.locator(`[data-timeline-part-id="${todoID}"]`)).toHaveCount(0)
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(questionID)}"]`)).toContainText(
+      "Keep it stable",
+    )
+    await expect(page.locator(`[data-timeline-part-id="${renderedPartID(todoID)}"]`)).toHaveCount(0)
     await expect(
       page.locator(`a[href$="/session/${childID}"]`, { has: page.locator('[data-component="task-tool-card"]') }),
     ).toBeVisible()
@@ -145,7 +148,7 @@ test.describe("timeline tool state stability", () => {
       },
       context: { selector: groupSelector, closest: '[data-timeline-row="AssistantPart"]' },
       following: {
-        selector: '[data-timeline-part-id="prt_ctx_following"]',
+        selector: `[data-timeline-part-id="${renderedPartID("prt_ctx_following")}"]`,
         closest: '[data-timeline-row="AssistantPart"]',
       },
     })
@@ -194,5 +197,5 @@ function questionInput() {
 }
 
 function toolRegion(id: string) {
-  return { selector: `[data-timeline-part-id="${id}"]`, closest: '[data-timeline-row="AssistantPart"]' }
+  return { selector: `[data-timeline-part-id="${renderedPartID(id)}"]`, closest: '[data-timeline-row="AssistantPart"]' }
 }

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

@@ -7,13 +7,13 @@ import {
   visualPlan,
 } from "../../utils/visual-stability"
 import {
-  assistantID,
   assistantMessage,
   completedAssistantInfo,
   event,
   messageUpdated,
   partDelta,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   shell,
   status,
@@ -22,35 +22,6 @@ import {
   userMessage,
 } from "./fixture"
 
-test("keeps unchanged siblings stable while a middle part is inserted and removed", async ({ page }, testInfo) => {
-  const firstID = "prt_mutation_01_first"
-  const middleID = "prt_mutation_02_middle"
-  const lastID = "prt_mutation_03_last"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([textPart(firstID, "First stable row"), textPart(lastID, "Last stable row")], {
-        completed: false,
-      }),
-    ],
-    cpuRate: 4,
-  })
-  const regions = defineVisualRegions({
-    first: { selector: `[data-timeline-part-id="${firstID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    last: { selector: `[data-timeline-part-id="${lastID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-  })
-  await startVisualProbe(page, regions)
-  await timeline.send(partUpdated(textPart(middleID, "Inserted middle row. ".repeat(12))), 350)
-  await expect(page.locator(`[data-timeline-part-id="${middleID}"]`)).toBeVisible()
-  await timeline.send(
-    event("message.part.removed", { sessionID: "ses_timeline_stability", messageID: assistantID, partID: middleID }),
-    500,
-  )
-  await expect(page.locator(`[data-timeline-part-id="${middleID}"]`)).toHaveCount(0)
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(testInfo, "middle-insert-remove", trace, stablePairPlan(regions, 1))
-})
-
 test("streams text through growth, canonical replacement, and completion", async ({ page }, testInfo) => {
   const textID = "prt_text_reconcile"
   const followingID = "prt_text_reconcile_following"
@@ -59,14 +30,20 @@ test("streams text through growth, canonical replacement, and completion", async
   })
   const timeline = await setupTimeline(page, { messages: [userMessage(), assistant], cpuRate: 4 })
   const regions = defineVisualRegions({
-    text: { selector: `[data-timeline-part-id="${textID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    following: { selector: `[data-timeline-part-id="${followingID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    text: {
+      selector: `[data-timeline-part-id="${renderedPartID(textID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    following: {
+      selector: `[data-timeline-part-id="${renderedPartID(followingID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await timeline.send(partDelta(textID, " streamed content"), 100)
   await timeline.send(partDelta(textID, "\n\n- item one\n- item two\n- item three"), 180)
   await timeline.send(partUpdated(textPart(textID, "Canonical replacement with a shorter final paragraph.")), 200)
-  await timeline.send(messageUpdated(completedAssistantInfo(assistant.info)), 500)
+  await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 500)
   const trace = await stopVisualProbe<keyof typeof regions>(page)
   await reportVisualStability(
     testInfo,
@@ -105,17 +82,23 @@ test("inserts a completed question between stable rows", async ({ page }, testIn
     ],
     cpuRate: 4,
   })
-  await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toHaveCount(0)
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID(questionID)}"]`)).toHaveCount(0)
   const regions = defineVisualRegions({
-    first: { selector: `[data-timeline-part-id="${firstID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
-    last: { selector: `[data-timeline-part-id="${lastID}"]`, closest: '[data-timeline-row="AssistantPart"]' },
+    first: {
+      selector: `[data-timeline-part-id="${renderedPartID(firstID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
+    last: {
+      selector: `[data-timeline-part-id="${renderedPartID(lastID)}"]`,
+      closest: '[data-timeline-row="AssistantPart"]',
+    },
   })
   await startVisualProbe(page, regions)
   await timeline.send(
     partUpdated(toolPart(questionID, "question", "completed", input, { metadata: { answers: [["Yes"]] } })),
     600,
   )
-  await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toBeVisible()
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID(questionID)}"]`)).toBeVisible()
   const trace = await stopVisualProbe<keyof typeof regions>(page)
   await reportVisualStability(testInfo, "question-insert", trace, stablePairPlan(regions, 0))
 })
@@ -132,8 +115,8 @@ test("replaces thinking with an assistant error without a blank turn", async ({
   await startVisualProbe(page, regions)
   await timeline.send(
     messageUpdated({
-      ...assistant.info,
-      error: { name: "APIError", data: { message: "Provider failed visibly", isRetryable: false } },
+      ...assistant,
+      error: { type: "APIError", message: "Provider failed visibly" },
     }),
     500,
   )
@@ -203,59 +186,6 @@ test("updates retry attempts and long provider messages without remounting the r
   )
 })
 
-test("reducer-hardening: removes a historical turn one message at a time without moving a visible lower anchor twice", async ({
-  page,
-}, testInfo) => {
-  const removeUserID = "msg_0500_remove_user"
-  const removeAssistantID = "msg_0501_remove_assistant"
-  const anchorUserID = "msg_2000_anchor_user"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(undefined, { id: removeUserID, created: 1690000000000 }),
-      assistantMessage([textPart("prt_remove_text", "Removed historical content. ".repeat(15))], {
-        id: removeAssistantID,
-        parentID: removeUserID,
-        created: 1690000001000,
-      }),
-      userMessage(undefined, { id: anchorUserID, created: 1700000000000 }),
-      assistantMessage([textPart("prt_anchor_text", "Visible anchor response")], {
-        id: "msg_2001_anchor_assistant",
-        parentID: anchorUserID,
-        created: 1700000001000,
-      }),
-    ],
-    cpuRate: 4,
-  })
-  const regions = defineVisualRegions({
-    anchor: { selector: `[data-timeline-row="UserMessage"][data-message-id="${anchorUserID}"]` },
-  })
-  await startVisualProbe(page, regions)
-  await timeline.send(
-    event("message.removed", { sessionID: "ses_timeline_stability", messageID: removeAssistantID }),
-    200,
-  )
-  await timeline.send(event("message.removed", { sessionID: "ses_timeline_stability", messageID: removeUserID }), 500)
-  const trace = await stopVisualProbe<keyof typeof regions>(page)
-  await reportVisualStability(
-    testInfo,
-    "historical-turn-remove",
-    trace,
-    visualPlan(
-      regions,
-      [
-        { type: "required", regions: ["anchor"] },
-        { type: "unique", regions: ["anchor"] },
-        { type: "stable", regions: ["anchor"] },
-        { type: "opacity", regions: "all" },
-        { type: "continuity", regions: "all" },
-        { type: "motion", regions: "all", maxPositionReversals: 0 },
-        { type: "label-stability", regions: "all" },
-      ],
-      { perMarker: true },
-    ),
-  )
-})
-
 function stablePairPlan(
   regions: Record<"first" | "last", { selector: string; closest?: string }>,
   maxPositionReversals: number,

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

@@ -48,7 +48,6 @@ benchmark.describe("performance: review pane scaling", () => {
         await setupTimelineBenchmark(page, {
           historyTurns: 0,
           eventBatch: 1,
-          newLayoutDesigns: true,
         })
         await page.route("**/vcs/diff**", (route) =>
           route.fulfill({

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

@@ -1,3 +1,4 @@
+import type { SessionMessageAssistant, SessionMessageInfo, SessionMessageUser } from "@opencode-ai/client/promise"
 import type { Page } from "@playwright/test"
 import { expectSessionTitle } from "../../utils/waits"
 import { mockOpenCodeServer } from "../../utils/mock-server"
@@ -11,42 +12,35 @@ type ParentHydrationBenchmarkMode = "natural" | "candidate"
 const mode = process.env.SESSION_PARENT_HYDRATION_BENCHMARK_MODE ?? "natural"
 if (mode !== "natural" && mode !== "candidate") throw new Error(`Unknown parent hydration benchmark mode: ${mode}`)
 const userID = "msg_parent_hydration_user"
+const userSeed = fixture.messages[fixture.targetID][0] as SessionMessageUser
 const user = {
-  ...fixture.messages[fixture.targetID][0]!,
-  info: { ...fixture.messages[fixture.targetID][0]!.info, id: userID, time: { created: 1700001000000 } },
-  parts: fixture.messages[fixture.targetID][0]!.parts.map((part, index) => ({
-    ...part,
-    id: `prt_parent_hydration_user_${index}`,
-    messageID: userID,
-  })),
-}
-const assistantSeed = fixture.messages[fixture.targetID][3]!
+  ...userSeed,
+  id: userID,
+  time: { created: 1700001000000 },
+} satisfies SessionMessageInfo
+const assistantSeed = fixture.messages[fixture.targetID][3] as SessionMessageAssistant
 const assistants = Array.from({ length: 14 }, (_, index) => {
   const messageID = `msg_parent_hydration_${String(index).padStart(2, "0")}`
   return {
     ...assistantSeed,
-    info: {
-      ...assistantSeed.info,
-      id: messageID,
-      parentID: userID,
-      time: { created: 1700001001000 + index * 1_000, completed: 1700001001500 + index * 1_000 },
-    },
-    parts: assistantSeed.parts.map((part, partIndex) => ({
-      ...part,
-      id: `prt_parent_hydration_${String(index).padStart(2, "0")}_${partIndex}`,
-      messageID,
-    })),
-  }
+    id: messageID,
+    time: { created: 1700001001000 + index * 1_000, completed: 1700001001500 + index * 1_000 },
+    content: assistantSeed.content.map((part, partIndex) =>
+      part.type === "tool"
+        ? { ...part, id: `call_parent_hydration_${String(index).padStart(2, "0")}_${partIndex}` }
+        : part,
+    ),
+  } satisfies SessionMessageInfo
 })
 const messages = [user, ...assistants]
 const target = fixture.sessions.find((session) => session.id === fixture.targetID)!
 const lastID = userID
 const lastAssistant = assistants.at(-1)!
-const lastPart = lastAssistant.parts.at(-1)!
+const lastPart = lastAssistant.content.at(-1)!
 const lastPartID =
   lastPart.type === "tool"
     ? lastPart.id
-    : `${lastAssistant.info.id}:${lastPart.type}:${lastAssistant.parts.filter((part) => part.type === lastPart.type).length - 1}`
+    : `${lastAssistant.id}:${lastPart.type}:${lastAssistant.content.filter((part) => part.type === lastPart.type).length - 1}`
 
 benchmark("hydrates an orphaned latest turn after a cold session click", async ({ browser, report }, testInfo) => {
   benchmark.setTimeout(180_000)
@@ -107,30 +101,25 @@ async function trial(page: Page, mode: ParentHydrationBenchmarkMode) {
     },
     pageMessages: (sessionID, limit, before) => {
       const items = sessionID === fixture.targetID ? messages : fixture.messages[fixture.sourceID]
-      const end = before ? items.findIndex((message) => message.info.id === before) : items.length
+      const end = before ? items.findIndex((message) => message.id === before) : items.length
       const start = Math.max(0, end - limit)
-      return { items: items.slice(start, end), cursor: start > 0 ? items[start]!.info.id : undefined }
+      return { items: items.slice(start, end), cursor: start > 0 ? items[start]!.id : undefined }
     },
   })
-  await page.route(`**/session/${fixture.targetID}`, (route) => {
-    const current = new URL(route.request().url()).pathname.startsWith("/api/")
-    return route.fulfill({
+  await page.route(`**/api/session/${fixture.targetID}`, (route) =>
+    route.fulfill({
       status: 200,
       contentType: "application/json",
-      body: JSON.stringify(
-        current
-          ? {
-              data: {
-                ...target,
-                cost: 0,
-                tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-                location: { directory: target.directory },
-              },
-            }
-          : target,
-      ),
-    })
-  })
+      body: JSON.stringify({
+        data: {
+          ...target,
+          cost: 0,
+          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+          location: { directory: target.directory },
+        },
+      }),
+    }),
+  )
   await installStressSessionTabs(page, { sessionIDs: [fixture.sourceID] })
   await page.goto(stressSessionHref(fixture.sourceID))
   await expectSessionTitle(page, fixture.expected.sourceTitle)
@@ -148,8 +137,8 @@ async function trial(page: Page, mode: ParentHydrationBenchmarkMode) {
     { href, title: target.title },
   )
   const metrics = await measureSessionSwitch(page, {
-    destinationIDs: messages.map((message) => message.info.id),
-    sourceIDs: fixture.messages[fixture.sourceID].map((message) => message.info.id),
+    destinationIDs: messages.map((message) => message.id),
+    sourceIDs: fixture.messages[fixture.sourceID].map((message) => message.id),
     lastID,
     requiredPartID: lastPartID,
     requireBottomAnchor: false,

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

@@ -32,8 +32,8 @@ benchmark("samples cached session repaint after the click", async ({ page, repor
 
   await installCachedRepaintProbe(page, {
     targetHref: stressSessionHref(fixture.targetID),
-    destination: fixture.messages[fixture.targetID].map((message) => message.info.id),
-    source: fixture.messages[fixture.sourceID].map((message) => message.info.id),
+    destination: fixture.messages[fixture.targetID].map((message) => message.id),
+    source: fixture.messages[fixture.sourceID].map((message) => message.id),
     last: fixture.expected.targetMessageIDs.at(-1)!,
     windowMs: 1_000,
   })

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

@@ -13,21 +13,8 @@ import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switc
 
 type Result = Awaited<ReturnType<typeof measureSessionSwitch>>
 
-benchmark("benchmarks cold and hot session tab switching", async ({ browser, report }, testInfo) => {
-  benchmark.setTimeout(180_000)
-  const results = { cold: [] as Result[], hot: [] as Result[] }
-  for (const mode of ["cold", "hot"] as const) {
-    for (let run = 0; run < 5; run++) {
-      results[mode].push(
-        await withBenchmarkPage(browser, `session-tab-switch-${mode}-${run}`, (page) => trial(page, mode), testInfo),
-      )
-    }
-  }
-  report({ results, summary: summarize(results) })
-})
-
 benchmark(
-  "benchmarks v2 session tab switching with and without the review pane",
+  "benchmarks session tab switching with and without the review pane",
   async ({ browser, report }, testInfo) => {
     benchmark.setTimeout(360_000)
     const runs = Number(process.env.SESSION_TAB_SWITCH_RUNS ?? 5)
@@ -41,8 +28,8 @@ benchmark(
           results[reviewPane][mode].push(
             await withBenchmarkPage(
               browser,
-              `session-tab-switch-v2-${reviewPane}-${mode}-${run}`,
-              (page) => trial(page, mode, { newLayoutDesigns: true, reviewPane }),
+              `session-tab-switch-${reviewPane}-${mode}-${run}`,
+              (page) => trial(page, mode, reviewPane),
               testInfo,
             ),
           )
@@ -53,14 +40,10 @@ benchmark(
   },
 )
 
-async function trial(
-  page: Page,
-  mode: "cold" | "hot",
-  options?: { newLayoutDesigns?: boolean; reviewPane?: "closed" | "open" },
-) {
-  const reviewDiffs = options?.newLayoutDesigns ? createReviewDiffs() : undefined
+async function trial(page: Page, mode: "cold" | "hot", reviewPane: "closed" | "open") {
+  const reviewDiffs = createReviewDiffs()
   await mockStressTimeline(page, { vcsDiff: reviewDiffs })
-  if (options?.newLayoutDesigns) await installTimelineSettings(page)
+  await installTimelineSettings(page)
   await installStressSessionTabs(page)
   if (mode === "hot") {
     await page.goto(stressSessionHref(fixture.targetID))
@@ -72,13 +55,13 @@ async function trial(
     await expectSessionTitle(page, fixture.expected.sourceTitle)
   }
   await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
-  if (options?.reviewPane === "open") {
+  if (reviewPane === "open") {
     await openReviewPane(page)
     await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
   }
 
-  const destinationIDs = fixture.messages[fixture.targetID].map((message) => message.info.id)
-  const sourceIDs = fixture.messages[fixture.sourceID].map((message) => message.info.id)
+  const destinationIDs = fixture.messages[fixture.targetID].map((message) => message.id)
+  const sourceIDs = fixture.messages[fixture.sourceID].map((message) => message.id)
   const lastID = fixture.expected.targetMessageIDs.at(-1)!
   const href = stressSessionHref(fixture.targetID)
   const result = await measureSessionSwitch(page, {
@@ -134,8 +117,6 @@ async function openReviewPane(page: Page) {
   await page.getByRole("button", { name: "Toggle review" }).click()
   const panel = page.locator("#review-panel")
   await expect(panel).toBeVisible()
-  // Text-based readiness works across review implementations; the legacy list mounts
-  // diff viewers lazily while V2 mounts the active preview eagerly.
   await page.waitForFunction(() => {
     const panel = document.querySelector<HTMLElement>("#review-panel")
     const text = panel?.textContent ?? ""

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

@@ -25,7 +25,7 @@ async function installSessionSwitchProbe(
     let running = true
     const reviewLevels: Record<string, string> = {
       panel: "#review-panel",
-      tabs: '#review-panel [data-component="tabs"]',
+    tabs: '#review-panel [data-component="tabs"]',
       body: '#review-panel [data-slot="session-review-v2-body"]',
       review: '#review-panel [data-component="session-review-v2"]',
       preview: '#review-panel [data-slot="session-review-v2-preview"]',

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

@@ -1,4 +1,5 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
+import type { JsonValue, OpenCodeEvent, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"
 import type { Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../../utils/waits"
@@ -10,37 +11,20 @@ const sessionID = "ses_timeline_state_regression"
 const userMessageID = "msg_user_regression"
 const assistantMessageID = "msg_assistant_regression"
 const editPartID = "prt_0001_edit"
-export const textPartID = "prt_9999_text"
+export const textPartID = `${assistantMessageID}:text:0`
 const title = "Timeline collapse state regression"
 const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }
 
-type EventPayload = {
-  directory: string
-  payload: Record<string, unknown>
-}
+type EventPayload = OpenCodeEvent
 
 const userMessage = {
-  info: {
-    id: userMessageID,
-    sessionID,
-    role: "user",
-    time: { created: 1700000000000 },
-    summary: { diffs: [] },
-    agent: "build",
-    model,
-  },
-  parts: [
-    {
-      id: "prt_user_text",
-      sessionID,
-      messageID: userMessageID,
-      type: "text",
-      text: "Please edit the file.",
-    },
-  ],
-}
+  id: userMessageID,
+  type: "user",
+  time: { created: 1700000000000 },
+  text: "Please edit the file.",
+} satisfies SessionMessageInfo
 
-const editPart = {
+const editPart: ToolSeed = {
   id: editPartID,
   sessionID,
   messageID: assistantMessageID,
@@ -66,39 +50,22 @@ const editPart = {
   },
 }
 
-const streamedTextPart = {
-  id: textPartID,
-  sessionID,
-  messageID: assistantMessageID,
-  type: "text",
-  text: "Streaming added a later assistant text part.",
-}
-
 const assistantMessage = {
-  info: {
-    id: assistantMessageID,
-    sessionID,
-    role: "assistant",
-    time: { created: 1700000001000 },
-    parentID: userMessageID,
-    modelID: model.modelID,
-    providerID: model.providerID,
-    mode: "build",
-    agent: "build",
-    path: { cwd: directory, root: directory },
-    cost: 0.01,
-    tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-    variant: "max",
-  },
-  parts: [editPart],
-}
+  id: assistantMessageID,
+  type: "assistant",
+  time: { created: 1700000001000 },
+  model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+  agent: "build",
+  cost: 0.01,
+  tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+  content: [toolContent(editPart)],
+} satisfies SessionMessageInfo
 
 export async function setupTimelineBenchmark(
   page: Page,
   options: {
     historyTurns: number
     eventBatch: number
-    newLayoutDesigns?: boolean
     vcsDiff?: unknown[]
     turnDiffs?: unknown[]
   },
@@ -106,7 +73,7 @@ export async function setupTimelineBenchmark(
   const events: EventPayload[] = []
   let eventBatch = options.eventBatch
   const currentUserMessage = options.turnDiffs
-    ? { ...userMessage, info: { ...userMessage.info, summary: { diffs: options.turnDiffs } } }
+    ? { ...userMessage, metadata: { diffs: options.turnDiffs as JsonValue } }
     : userMessage
   await mockOpenCodeServer(page, {
     directory,
@@ -124,26 +91,23 @@ export async function setupTimelineBenchmark(
     events: () => events.splice(0, eventBatch),
     eventRetry: 16,
   })
-  await page.addInitScript(
-    (input) => {
-      localStorage.setItem(
-        "settings.v3",
-        JSON.stringify({
-          general: {
-            newLayoutDesigns: input.newLayoutDesigns,
-            editToolPartsExpanded: true,
-            shellToolPartsExpanded: true,
-            showReasoningSummaries: true,
-          },
-        }),
-      )
-    },
-    { newLayoutDesigns: options.newLayoutDesigns ?? false },
-  )
+  await page.addInitScript(() => {
+    localStorage.setItem(
+      "settings.v3",
+      JSON.stringify({
+        general: {
+          editToolPartsExpanded: true,
+          shellToolPartsExpanded: true,
+          showReasoningSummaries: true,
+        },
+      }),
+    )
+  })
   await page.setViewportSize({ width: 1366, height: 768 })
   const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
   const text = page.locator(`[data-timeline-part-id="${textPartID}"]`).first()
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, title)
   await expectAppVisible(scroller)
   return {
@@ -187,34 +151,27 @@ export async function setupTimelineBenchmark(
   }
 }
 
-export function buildInitialStreamEvent(deltaCount: number): EventPayload {
-  return {
-    directory,
-    payload: {
-      type: "message.part.updated",
-      properties: {
-        part: {
-          ...streamedTextPart,
-          text: `Streaming${streamChunk(0, deltaCount + 1)}\n\n\`\`\`ts\nconst initial = true\n\`\`\``,
-        },
-      },
-    },
-  }
+export function buildInitialStreamEvent(deltaCount: number): EventPayload[] {
+  return [
+    timelineEvent("session.text.started", { sessionID, assistantMessageID, ordinal: 0 }, true),
+    timelineEvent("session.text.delta", {
+      sessionID,
+      assistantMessageID,
+      ordinal: 0,
+      delta: `Streaming${streamChunk(0, deltaCount + 1)}\n\n\`\`\`ts\nconst initial = true\n\`\`\``,
+    }),
+  ]
 }
 
 export function buildStreamDeltaEvents(deltaCount: number): EventPayload[] {
-  return Array.from({ length: deltaCount }, (_, index) => ({
-    directory,
-    payload: {
-      type: "message.part.delta",
-      properties: {
-        messageID: assistantMessageID,
-        partID: textPartID,
-        field: "text",
-        delta: streamChunk(index + 1, deltaCount + 1),
-      },
-    },
-  }))
+  return Array.from({ length: deltaCount }, (_, index) =>
+    timelineEvent("session.text.delta", {
+      sessionID,
+      assistantMessageID,
+      ordinal: 0,
+      delta: streamChunk(index + 1, deltaCount + 1),
+    }),
+  )
 }
 
 function performanceTurn(index: number) {
@@ -320,48 +277,92 @@ function performanceTurn(index: number) {
           },
         ]
       : []),
-  ]
+  ] as unknown as ContentSeed[]
   return [
     {
-      info: {
-        id: userID,
-        sessionID,
-        role: "user",
-        time: { created: 1690000000000 + index * 2_000 },
-        summary: { diffs: [] },
-        agent: "build",
-        model,
-      },
-      parts: [
-        {
-          id: `prt_0000_${suffix}_user`,
-          sessionID,
-          messageID: userID,
-          type: "text",
-          text: `Historical prompt ${index}`,
-        },
-      ],
+      id: userID,
+      type: "user",
+      time: { created: 1690000000000 + index * 2_000 },
+      text: `Historical prompt ${index}`,
     },
     {
-      info: {
-        id: assistantID,
-        sessionID,
-        role: "assistant",
-        time: { created: 1690000001000 + index * 2_000, completed: 1690000001500 + index * 2_000 },
-        parentID: userID,
-        modelID: model.modelID,
-        providerID: model.providerID,
-        mode: "build",
-        agent: "build",
-        path: { cwd: directory, root: directory },
-        cost: 0.01,
-        tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-        variant: "max",
-        finish: "stop",
-      },
-      parts,
+      id: assistantID,
+      type: "assistant",
+      time: { created: 1690000001000 + index * 2_000, completed: 1690000001500 + index * 2_000 },
+      model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+      agent: "build",
+      cost: 0.01,
+      tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+      finish: "stop",
+      content: parts.map((part) => {
+        if (part.type === "text") return { type: "text" as const, text: part.text }
+        if (part.type === "reasoning")
+          return {
+            type: "reasoning" as const,
+            text: part.text,
+            time: { created: part.time.start, completed: part.time.end },
+          }
+        return toolContent(part)
+      }),
     },
-  ]
+  ] satisfies SessionMessageInfo[]
+}
+
+type ToolSeed = {
+  id?: string
+  sessionID?: string
+  messageID?: string
+  type: "tool"
+  callID: string
+  tool: string
+  state: {
+    status: string
+    input: Record<string, unknown>
+    output: string
+    title?: string
+    metadata: Record<string, unknown>
+    time: { start: number; end: number }
+  }
+}
+
+type ContentSeedBase = { id?: string; sessionID?: string; messageID?: string }
+
+type ContentSeed =
+  | (ContentSeedBase & { type: "text"; text: string })
+  | (ContentSeedBase & { type: "reasoning"; text: string; time: { start: number; end: number } })
+  | ToolSeed
+
+function toolContent(part: ToolSeed): SessionMessageAssistant["content"][number] {
+  return {
+    type: "tool",
+    id: part.callID,
+    name: part.tool,
+    time: { created: part.state.time.start, ran: part.state.time.start, completed: part.state.time.end },
+    state: {
+      status: "completed",
+      input: part.state.input as Record<string, JsonValue>,
+      content: [{ type: "text", text: part.state.output }],
+      metadata: part.state.metadata as Record<string, JsonValue>,
+    },
+  }
+}
+
+let eventSequence = 0
+
+function timelineEvent<Type extends "session.text.started" | "session.text.delta">(
+  type: Type,
+  data: Extract<OpenCodeEvent, { type: Type }>["data"],
+  durable = false,
+): Extract<OpenCodeEvent, { type: Type }> {
+  eventSequence++
+  return {
+    id: `evt_timeline_benchmark_${eventSequence}`,
+    created: 1700000002000 + eventSequence,
+    type,
+    data,
+    location: { directory },
+    ...(durable ? { durable: { aggregateID: sessionID, seq: eventSequence, version: 1 } } : {}),
+  } as unknown as Extract<OpenCodeEvent, { type: Type }>
 }
 
 function historicalMarkdown(index: number) {

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

@@ -15,7 +15,6 @@ import {
 } from "./session-timeline-stream-probe"
 
 type TimelineStreamOptions = {
-  newLayoutDesigns?: boolean
   reviewDiffs?: boolean
   reviewPane?: boolean
 }
@@ -45,34 +44,27 @@ benchmark.describe("performance: session timeline streaming", () => {
     report(result.metrics, result.context)
   })
 
-  benchmark("streams assistant text in v2 with review pane closed", async ({ page, report }) => {
+  benchmark("streams assistant text with review diffs and pane closed", async ({ page, report }) => {
     benchmark.setTimeout(Number(process.env.TIMELINE_COMPLETION_TIMEOUT_MS ?? 420_000) + 60_000)
-    const result = await runTimelineStreamBenchmark(page, { newLayoutDesigns: true })
+    const result = await runTimelineStreamBenchmark(page, { reviewDiffs: true })
     report(result.metrics, result.context)
   })
 
-  benchmark("streams assistant text in v2 with review diffs and pane closed", async ({ page, report }) => {
+  benchmark("streams assistant text with review pane open", async ({ page, report }) => {
     benchmark.setTimeout(Number(process.env.TIMELINE_COMPLETION_TIMEOUT_MS ?? 420_000) + 60_000)
-    const result = await runTimelineStreamBenchmark(page, { newLayoutDesigns: true, reviewDiffs: true })
-    report(result.metrics, result.context)
-  })
-
-  benchmark("streams assistant text in v2 with review pane open", async ({ page, report }) => {
-    benchmark.setTimeout(Number(process.env.TIMELINE_COMPLETION_TIMEOUT_MS ?? 420_000) + 60_000)
-    const result = await runTimelineStreamBenchmark(page, { newLayoutDesigns: true, reviewPane: true })
+    const result = await runTimelineStreamBenchmark(page, { reviewPane: true })
     report(result.metrics, result.context)
   })
 })
 
 benchmark.describe("performance: review pane", () => {
-  benchmark("loads v2 review diffs and switches active files", async ({ page, report }) => {
+  benchmark("loads review diffs and switches active files", async ({ page, report }) => {
     benchmark.setTimeout(240_000)
     const historyTurns = Number(process.env.REVIEW_PANE_HISTORY_TURNS ?? 72)
     const diffs = createReviewDiffs()
     const fixture = await setupTimelineBenchmark(page, {
       historyTurns,
       eventBatch: 1,
-      newLayoutDesigns: true,
       vcsDiff: diffs,
     })
 
@@ -112,7 +104,6 @@ async function runTimelineStreamBenchmark(page: Page, options: TimelineStreamOpt
   const fixture = await setupTimelineBenchmark(page, {
     historyTurns,
     eventBatch,
-    newLayoutDesigns: options.newLayoutDesigns,
     // Turn diffs exercise timeline data cost; the pane-open scenario serves the same
     // diffs through the default git mode so it works across review implementations.
     turnDiffs: options.reviewDiffs ? diffs : undefined,
@@ -173,7 +164,6 @@ async function runTimelineStreamBenchmark(page: Page, options: TimelineStreamOpt
       queuedDeltas: deltas.length,
       historyTurns,
       eventBatch,
-      newLayoutDesigns: options.newLayoutDesigns === true,
       reviewPane: options.reviewPane === true ? "open" : "closed",
       reviewDiffs: diffs?.length ?? 0,
     },

packages/app/e2e/performance/timeline/session-timeline-stream-probe.ts

@@ -125,17 +125,20 @@ export async function installTimelineStreamProbe(
       const scrollTo = Element.prototype.scrollTo
       const scrollTop = Object.getOwnPropertyDescriptor(Element.prototype, "scrollTop")!
       if (profileVisual) {
-        Element.prototype.scrollTo = function (...args) {
+        function measuredScrollTo(this: Element, options?: ScrollToOptions): void
+        function measuredScrollTo(this: Element, x: number, y: number): void
+        function measuredScrollTo(this: Element, first?: number | ScrollToOptions, second?: number) {
           state.scroll.calls += 1
-          const top = typeof args[0] === "object" ? args[0]?.top : args[1]
+          const top = typeof first === "object" ? first?.top : second
           if (typeof top === "number") {
             const target = Math.min(top, this.scrollHeight - this.clientHeight)
             if (Math.abs(this.scrollTop - target) < 1) state.scroll.callNoops += 1
           }
           if (state.scroll.lastCallFrame === state.scroll.frame) state.scroll.sameFrameCalls += 1
           state.scroll.lastCallFrame = state.scroll.frame
-          return scrollTo.apply(this, args)
+          Reflect.apply(scrollTo, this, typeof first === "number" ? [first, second] : [first])
         }
+        Element.prototype.scrollTo = measuredScrollTo
         Object.defineProperty(Element.prototype, "scrollTop", {
           configurable: true,
           get: scrollTop.get,

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

@@ -28,9 +28,22 @@ const directory = "C:/OpenCode/SmokeProject"
 const projectID = "proj_smoke_timeline"
 const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }
 
-type MessageInfo = Record<string, unknown> & { id: string; role: "user" | "assistant" }
-type MessagePart = Record<string, unknown> & { id: string; type: string; text?: string; tool?: string }
-type Message = { info: MessageInfo; parts: MessagePart[] }
+type MessagePart = {
+  id: string
+  type: "text" | "reasoning" | "tool"
+  text?: string
+  time?: { start: number; end?: number }
+  callID?: string
+  tool?: string
+  state?: {
+    status: "completed"
+    input: Record<string, unknown>
+    output: string
+    title: unknown
+    metadata: Record<string, unknown>
+    time: { start: number; end: number }
+  }
+}
 
 function lorem(seed: number, length: number) {
   let out = ""
@@ -48,54 +61,59 @@ function id(prefix: string, value: number) {
   return `${prefix}_smoke_${String(value).padStart(4, "0")}`
 }
 
-function userMessage(sessionID: string, index: number, textLength: number, diffs: unknown[] = []): Message {
+function userMessage(_sessionID: string, index: number, textLength: number, diffs: unknown[] = []): SessionMessageInfo {
   const messageID = id("msg_user", index)
   return {
-    info: {
-      id: messageID,
-      sessionID,
-      role: "user",
-      time: { created: 1700000000000 + index * 10_000 },
-      summary: { diffs },
-      agent: "build",
-      model,
-    },
-    parts: [
-      {
-        id: id("prt_user_text", index),
-        sessionID,
-        messageID,
-        type: "text",
-        text: lorem(index, textLength),
-      },
-    ],
+    id: messageID,
+    type: "user",
+    time: { created: 1700000000000 + index * 10_000 },
+    text: lorem(index, textLength),
+    metadata: diffs.length ? { diffs: diffs as JsonValue } : undefined,
   }
 }
 
-function assistantMessage(sessionID: string, index: number, parentID: string, parts: MessagePart[]): Message {
+function assistantMessage(
+  _sessionID: string,
+  index: number,
+  _parentID: string,
+  parts: MessagePart[],
+): SessionMessageInfo {
   const messageID = id("msg_assistant", index)
   return {
-    info: {
-      id: messageID,
-      sessionID,
-      role: "assistant",
-      time: { created: 1700000000000 + index * 10_000 + 1_000, completed: 1700000000000 + index * 10_000 + 8_000 },
-      parentID,
-      modelID: model.modelID,
-      providerID: model.providerID,
-      mode: "build",
-      agent: "build",
-      path: { cwd: directory, root: directory },
-      cost: 0.01,
-      tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-      variant: "max",
-      finish: "stop",
+    id: messageID,
+    type: "assistant",
+    time: { created: 1700000000000 + index * 10_000 + 1_000, completed: 1700000000000 + index * 10_000 + 8_000 },
+    model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+    agent: "build",
+    cost: 0.01,
+    tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+    finish: "stop",
+    content: parts.map(messageContent),
+  }
+}
+
+function messageContent(part: MessagePart): SessionMessageAssistant["content"][number] {
+  if (part.type === "text") return { type: "text", text: part.text ?? "" }
+  if (part.type === "reasoning")
+    return {
+      type: "reasoning",
+      text: part.text ?? "",
+      time: part.time
+        ? { created: part.time.start, ...(part.time.end === undefined ? {} : { completed: part.time.end }) }
+        : undefined,
+    }
+  const state = part.state!
+  return {
+    type: "tool",
+    id: part.callID ?? part.id,
+    name: part.tool!,
+    time: { created: state.time.start, ran: state.time.start, completed: state.time.end },
+    state: {
+      status: "completed",
+      input: state.input as Record<string, JsonValue>,
+      content: [{ type: "text", text: state.output }],
+      metadata: state.metadata as Record<string, JsonValue>,
     },
-    parts: parts.map((part) => ({
-      ...part,
-      sessionID,
-      messageID,
-    })),
   }
 }
 
@@ -200,7 +218,7 @@ function code(seed: number, lines: number, width = 32) {
   ).join("\n")
 }
 
-function turn(index: number): Message[] {
+function turn(index: number): SessionMessageInfo[] {
   const diff = index % 9 === 0 ? [fileDiff(`src/generated/summary-${index}.ts`, index)] : []
   const user = userMessage(targetID, index, 100 + (index % 4) * 80, diff)
   const parts = [
@@ -241,7 +259,7 @@ function turn(index: number): Message[] {
       ? [toolPart(index, 12, "task", { description: "Inspect generated fixture", subagent_type: "explore" }, 160)]
       : []),
   ]
-  return [user, assistantMessage(targetID, index, user.info.id, parts)]
+  return [user, assistantMessage(targetID, index, user.id, parts)]
 }
 
 const targetMessages = Array.from({ length: 72 }, (_, index) => turn(index)).flat()
@@ -267,16 +285,10 @@ const childMessages = Array.from({ length: 4 }, (_, index) => [
   userMessage(childID, index + 2000, 120),
   assistantMessage(childID, index + 2000, id("msg_user", index + 2000), [textPart(index + 2000, 0, 240)]),
 ]).flat()
-
-function renderable(part: MessagePart) {
-  if (part.type === "tool" && part.tool === "todowrite") return false
-  if (part.type === "text") return !!part.text.trim()
-  if (part.type === "reasoning") return !!part.text.trim()
-  return part.type !== "step-start" && part.type !== "step-finish" && part.type !== "patch"
-}
-
-function orderedParts(message: Message) {
-  return message.parts.slice().sort((a, b) => a.id.localeCompare(b.id))
+const messages: Record<string, SessionMessageInfo[]> = {
+  [sourceID]: sourceMessages,
+  [targetID]: targetMessages,
+  [childID]: childMessages,
 }
 
 export const fixture = {
@@ -333,37 +345,39 @@ export const fixture = {
   sourceID,
   targetID,
   childID,
-  messages: { [sourceID]: sourceMessages, [targetID]: targetMessages, [childID]: childMessages },
+  messages,
   expected: {
     sourceTitle: "Uncommitted changes inquiry",
     targetTitle: "Example Game: sample jump movement & sample physics analysis",
     childTitle: "Inspect child navigation",
-    sourceMessageIDs: sourceMessages
-      .filter((message) => message.info.role === "user")
-      .map((message) => message.info.id),
-    targetMessageIDs: targetMessages
-      .filter((message) => message.info.role === "user")
-      .map((message) => message.info.id),
-    childMessageIDs: childMessages.filter((message) => message.info.role === "user").map((message) => message.info.id),
-    targetPartIDs: targetMessages.flatMap((message) =>
-      orderedParts(message)
-        .filter(renderable)
-        .map((part) => part.id),
-    ),
+    sourceMessageIDs: sourceMessages.filter((message) => message.type === "user").map((message) => message.id),
+    targetMessageIDs: targetMessages.filter((message) => message.type === "user").map((message) => message.id),
+    childMessageIDs: childMessages.filter((message) => message.type === "user").map((message) => message.id),
+    targetPartIDs: targetMessages.flatMap((message) => {
+      if (message.type !== "assistant") return []
+      const ordinals = { text: 0, reasoning: 0 }
+      return message.content.flatMap((part) => {
+        if (part.type === "text") return part.text.trim() ? [`${message.id}:text:${ordinals.text++}`] : []
+        if (part.type === "reasoning")
+          return part.text.trim() ? [`${message.id}:reasoning:${ordinals.reasoning++}`] : []
+        return [part.id]
+      })
+    }),
   },
 }
 
 export function pageMessages(sessionID: string, limit: number, before?: string) {
-  const messages = fixture.messages[sessionID as keyof typeof fixture.messages] ?? []
+  const messages = fixture.messages[sessionID] ?? []
   const end = before
     ? Math.max(
         0,
-        messages.findIndex((message) => message.info.id === before),
+        messages.findIndex((message) => message.id === before),
       )
     : messages.length
   const start = Math.max(0, end - limit)
   return {
     items: messages.slice(start, end),
-    cursor: start > 0 ? messages[start]!.info.id : undefined,
+    cursor: start > 0 ? messages[start].id : undefined,
   }
 }
+import type { JsonValue, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"

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

@@ -1,5 +1,5 @@
 import type { Page } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { fixture, pageMessages } from "./session-timeline-stress.fixture"
 
@@ -9,7 +9,6 @@ export async function installTimelineSettings(page: Page) {
       "settings.v3",
       JSON.stringify({
         general: {
-          newLayoutDesigns: true,
           editToolPartsExpanded: true,
           shellToolPartsExpanded: true,
           showReasoningSummaries: true,

packages/app/e2e/performance/unit/mock-server.test.ts

@@ -1,121 +1,6 @@
 import { expect, test } from "bun:test"
-import type { SessionMessageInfo } from "@opencode-ai/client/promise"
 import type { Page, Route } from "@playwright/test"
-import { currentMessage, mockOpenCodeServer } from "../../utils/mock-server"
-
-test("preserves current messages", () => {
-  const message = {
-    id: "msg_current",
-    type: "user",
-    time: { created: 1 },
-    text: "current",
-    files: [{ data: "e30=", mime: "application/json", source: { type: "inline" } }],
-  } satisfies SessionMessageInfo
-
-  expect(currentMessage(message)).toBe(message)
-})
-
-test("converts rich legacy messages to current message types", () => {
-  expect(
-    currentMessage({
-      info: { id: "msg_user", role: "user", time: { created: 1 } },
-      parts: [
-        { type: "text", text: "Use @src/a.ts with @explore" },
-        {
-          type: "file",
-          mime: "application/json",
-          filename: "data.json",
-          url: "data:application/json;base64,e30=",
-        },
-        {
-          type: "file",
-          mime: "text/plain",
-          filename: "a.ts",
-          url: "src/a.ts",
-          source: { type: "file", text: { value: "@src/a.ts", start: 4, end: 13 } },
-        },
-        { type: "agent", name: "explore", source: { value: "@explore", start: 19, end: 27 } },
-      ],
-    }),
-  ).toEqual({
-    id: "msg_user",
-    type: "user",
-    time: { created: 1 },
-    text: "Use @src/a.ts with @explore",
-    files: [
-      { data: "e30=", mime: "application/json", name: "data.json", source: { type: "inline" } },
-      {
-        data: "",
-        mime: "text/plain",
-        name: "a.ts",
-        source: { type: "uri", uri: "src/a.ts" },
-        mention: { text: "@src/a.ts", start: 4, end: 13 },
-      },
-    ],
-    agents: [{ name: "explore", mention: { text: "@explore", start: 19, end: 27 } }],
-  })
-
-  expect(
-    currentMessage({
-      info: {
-        id: "msg_assistant",
-        role: "assistant",
-        time: { created: 2, completed: 5 },
-        agent: "explore",
-        modelID: "model",
-        providerID: "provider",
-        variant: "high",
-        cost: 0.5,
-        tokens: { input: 1, output: 2, reasoning: 3, cache: { read: 4, write: 5 } },
-        finish: "tool-calls",
-        error: { name: "MessageAbortedError", data: { message: "Stopped" } },
-      },
-      parts: [
-        { type: "text", text: "Answer" },
-        { type: "reasoning", text: "Thinking", time: { start: 2, end: 3 } },
-        {
-          id: "prt_tool",
-          callID: "call_tool",
-          type: "tool",
-          tool: "read",
-          state: {
-            status: "completed",
-            input: { filePath: "src/a.ts" },
-            output: "contents",
-            metadata: { title: "a.ts" },
-            time: { start: 3, end: 4 },
-          },
-        },
-      ],
-    }),
-  ).toEqual({
-    id: "msg_assistant",
-    type: "assistant",
-    time: { created: 2, completed: 5 },
-    agent: "explore",
-    model: { id: "model", providerID: "provider", variant: "high" },
-    cost: 0.5,
-    tokens: { input: 1, output: 2, reasoning: 3, cache: { read: 4, write: 5 } },
-    finish: "tool-calls",
-    error: { type: "MessageAbortedError", message: "Stopped" },
-    content: [
-      { type: "text", text: "Answer" },
-      { type: "reasoning", text: "Thinking", time: { created: 2, completed: 3 } },
-      {
-        type: "tool",
-        id: "call_tool",
-        name: "read",
-        time: { created: 3, ran: 3, completed: 4 },
-        state: {
-          status: "completed",
-          input: { filePath: "src/a.ts" },
-          content: [{ type: "text", text: "contents" }],
-          metadata: { title: "a.ts" },
-        },
-      },
-    ],
-  })
-})
+import { mockOpenCodeServer } from "../../utils/mock-server"
 
 test("applies message latency after a list response gate is released", async () => {
   const events: string[] = []

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

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { fixture } from "../timeline/session-timeline-stress.fixture"
 import { stressSessionHref } from "../timeline/timeline-test-helpers"
 

packages/app/e2e/performance/unit/visual-stability.test.ts

@@ -5,7 +5,7 @@ import {
   type VisualStabilityTrace,
 } from "../../utils/visual-stability"
 import { analyzeVisualObservations } from "../../utils/visual-stability/analyzer"
-import { legacyVisualPlan, visualPlan, type VisualInvariant } from "../../utils/visual-stability/invariant"
+import { visualPlan, type VisualInvariant } from "../../utils/visual-stability/invariant"
 import { defineVisualRegions, mapVisualRegions } from "../../utils/visual-stability/regions"
 
 function trace(samples: VisualStabilityTrace["samples"]): VisualStabilityTrace {
@@ -346,19 +346,6 @@ test("evaluates the typed invariant algebra over explicit observations", () => {
   ])
 })
 
-test("legacy plan adapter preserves analyzer messages and order", () => {
-  const input = trace([
-    frame(0, region({ label: "Exploring", opacity: 1, bottom: 40 }), region({ top: 40, bottom: 60 })),
-    frame(16, region({ label: "Explored", opacity: 0.2, bottom: 50 }), region({ top: 49, bottom: 69 })),
-    frame(32, region({ label: "Exploring", opacity: 1, bottom: 50 }), region({ top: 50, bottom: 70 })),
-  ])
-  const options = { flow: ["changing", "following"], stable: ["changing"] }
-
-  expect(analyzeVisualObservations(input.samples, legacyVisualPlan(options))).toEqual(
-    analyzeVisualStability(input, options),
-  )
-})
-
 function frame(
   at: number,
   changing: VisualStabilityTrace["samples"][number]["regions"][string],

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

@@ -1,5 +1,5 @@
 import { expect, test, type Page, type Route } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { currentSession } from "../utils/mock-server"
 import { installSseTransport } from "../utils/sse-transport"
 
@@ -13,7 +13,6 @@ test("closing the active server's last tab opens the remaining server tab", asyn
   await mockServers(page, requests)
   await page.addInitScript(
     ({ serverB, sessionA, sessionB }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
       localStorage.setItem(
         "opencode.window.browser.dat:tabs",
@@ -39,31 +38,6 @@ test("closing the active server's last tab opens the remaining server tab", asyn
   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)
-  expect(
-    requests.some((request) => {
-      const url = new URL(request)
-      return url.origin === serverB && url.searchParams.get("directory") === sessionB.directory
-    }),
-  ).toBe(true)
-})
-
-test("legacy session routes preserve an existing tab's server", async ({ page }) => {
-  await mockServers(page, [])
-  await page.addInitScript(
-    ({ serverB, sessionB }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-      localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server: serverB, sessionId: sessionB }]),
-      )
-    },
-    { serverB, sessionB: sessionB.id },
-  )
-
-  const hrefB = `/server/${base64Encode(serverB)}/session/${sessionB.id}`
-  await page.goto(`/${base64Encode(sessionB.directory)}/session/${sessionB.id}`)
-  await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
 })
 
 function session(id: string, directory: string, title: string) {
@@ -93,40 +67,26 @@ async function mockServers(page: Page, requests: string[]) {
     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 (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
-    if (["/skill", "/command", "/lsp", "/formatter", "/permission", "/question", "/vcs/diff"].includes(url.pathname))
-      return json(route, [])
-    if (url.pathname === "/provider")
-      return json(route, { all: [], connected: [], default: { providerID: "", modelID: "" } })
-    if (url.pathname === "/agent") return json(route, [{ name: "build", mode: "primary" }])
-    if (url.pathname === "/project" || url.pathname === "/project/current") {
+    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" || url.pathname === "/api/project/current") {
       const project = {
         id: current.projectID,
-        worktree: current.directory,
+        canonical: current.directory,
         vcs: "git",
         time: { created: 1, updated: 1 },
         sandboxes: [],
       }
-      return json(route, url.pathname === "/project" ? [project] : project)
+      return json(route, url.pathname === "/api/project" ? [project] : { id: project.id, directory: current.directory })
     }
-    if (url.pathname === "/path")
-      return json(route, {
-        state: current.directory,
-        config: current.directory,
-        worktree: current.directory,
-        directory: current.directory,
-        home: current.directory,
-      })
-    if (url.pathname === "/api/path")
-      return json(route, {
-        state: current.directory,
-        config: current.directory,
-        worktree: current.directory,
-        directory: current.directory,
-        home: current.directory,
-      })
-    if (url.pathname === "/vcs") return json(route, { branch: "main", default_branch: "main" })
+    if (url.pathname === "/api/location") return json(route, { directory: current.directory })
     if (url.pathname === "/api/vcs")
       return json(route, {
         location: { directory: current.directory },

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

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -124,7 +124,6 @@ async function setup(page: Page) {
 
   await page.addInitScript(
     ({ directory, server, sessionID }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/regression/new-session-panel-corner.spec.ts

@@ -28,7 +28,6 @@ test("matches the rounded panel corners to the dark new-session background", asy
   })
   await page.addInitScript(
     ({ directory, draftID, server }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem("opencode-theme-id", "oc-2")
       localStorage.setItem("opencode-color-scheme", "dark")
       localStorage.setItem(

packages/app/e2e/regression/open-file-expand-folder.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -81,10 +81,6 @@ test("expands a folder whose path has a trailing Windows separator", async ({ pa
 
   await page.addInitScript(
     ({ directory, server, sessionID }) => {
-      localStorage.setItem(
-        "settings.v3",
-        JSON.stringify({ general: { newLayoutDesigns: true, shouldDisplayTabsToast: false } }),
-      )
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/regression/project-picker-recent-search.spec.ts

@@ -1,60 +0,0 @@
-import { expect, test } from "@playwright/test"
-import type { Page } from "@playwright/test"
-import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const NAMES = ["alpha-service", "bravo-web", "charlie-api", "delta-tools", "echo-infra", "foxtrot-docs"]
-const worktrees = NAMES.map((name) => `/opencode-demo/${name}`)
-
-// The sixth project sits outside the five-item recent cap, so it is only reachable if the
-// dialog hands every recent project to the list filter instead of a pre-truncated slice.
-const OUTSIDE_CAP = "foxtrot-docs"
-
-// Dialog rows carry data-directory-path; the sidebar project list does not, so this
-// scopes assertions to the picker instead of matching the sidebar entry of the same name.
-const rows = (page: Page) => page.locator("[data-directory-path]")
-const row = (page: Page, name: string) => page.locator(`[data-directory-path*="${name}"]`)
-
-async function openProjectDialog(page: Page) {
-  await mockOpenCodeServer(page, {
-    sessions: fixture.sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-    fileList: () => [],
-    findFiles: () => [],
-  })
-  await page.addInitScript((dirs) => {
-    localStorage.setItem(
-      "opencode.global.dat:server",
-      JSON.stringify({
-        projects: { local: dirs.map((worktree: string) => ({ worktree, expanded: false })) },
-        lastProject: {},
-      }),
-    )
-  }, worktrees)
-  await page.goto("/")
-  const add = page.getByRole("button", { name: "Add project" }).first()
-  await expectAppVisible(add)
-  await add.click()
-  await expect(rows(page)).toHaveCount(5)
-  return page.getByRole("textbox").last()
-}
-
-test("searches every recent project, not just the five most recent", async ({ page }) => {
-  const search = await openProjectDialog(page)
-  await expect(row(page, OUTSIDE_CAP)).toHaveCount(0)
-
-  await search.fill("foxtrot")
-
-  await expect(row(page, OUTSIDE_CAP)).toHaveCount(1)
-})
-
-test("still caps the idle recent list at five projects", async ({ page }) => {
-  await openProjectDialog(page)
-
-  await expect(row(page, NAMES[4])).toHaveCount(1)
-  await expect(row(page, OUTSIDE_CAP)).toHaveCount(0)
-})

packages/app/e2e/regression/prompt-input-v2-command-draft.spec.ts

@@ -1,11 +1,12 @@
 import { expect, test } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible } from "../utils/waits"
 
 const directory = "C:/OpenCode/PromptInputV2Editing"
 const projectID = "proj_prompt_input_v2_editing"
 const sessionID = "ses_prompt_input_v2_editing"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test("preserves the draft when a populated command menu triggers a built-in", async ({ page }) => {
   await mockOpenCodeServer(page, {
@@ -32,11 +33,7 @@ test("preserves the draft when a populated command menu triggers a built-in", as
     ],
     pageMessages: () => ({ items: [] }),
   })
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-  })
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   const composer = page.locator('[data-component="prompt-input-v2"]')
   const input = composer.locator('[data-component="prompt-input"]')
   await expectAppVisible(composer)

packages/app/e2e/regression/prompt-thinking-level.spec.ts

@@ -1,11 +1,12 @@
 import { expect, test, type Page } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible } from "../utils/waits"
 
 const directory = "C:/OpenCode/PromptThinkingLevelRegression"
 const projectID = "proj_prompt_thinking_level_regression"
 const sessionID = "ses_prompt_thinking_level_regression"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test("shows the V2 thinking level control while relevant", async ({ page }) => {
   await mockOpenCodeServer(page, {
@@ -49,11 +50,7 @@ test("shows the V2 thinking level control while relevant", async ({ page }) => {
     ],
     pageMessages: () => ({ items: [] }),
   })
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-  })
-
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   const composer = page.locator('[data-component="prompt-input-v2"]')
   const input = composer.locator('[data-component="prompt-input"]')
   const control = composer.getByRole("button", { name: "Choose model variant" })

packages/app/e2e/regression/remote-session-settings.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test, type Page, type Route } from "@playwright/test"
 import { installSseTransport } from "../utils/sse-transport"
 import { currentSession } from "../utils/mock-server"
@@ -49,7 +49,7 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
   const permissionRequests: string[] = []
   const permissionResponses: PermissionResponse[] = []
   await installSseTransport(page, { server: serverB })
-  const transport = await installSseTransport<{ directory: string; payload: Record<string, unknown> }>(page, {
+  const transport = await installSseTransport(page, {
     server: serverA,
     retry: 20,
   })
@@ -82,18 +82,17 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
   await transport.waitForConnection()
 
   await transport.send({
-    directory: directoryA,
-    payload: {
-      id: "event-permission-background-a",
-      type: "permission.asked",
-      properties: {
-        id: "permission-background-a",
-        sessionID: sessionA.id,
-        permission: "bash",
-        patterns: ["git status"],
-        metadata: {},
-        always: [],
-      },
+    id: "evt_permission_background_a",
+    created: 1700000001000,
+    type: "permission.asked",
+    location: { directory: directoryA },
+    data: {
+      id: "permission-background-a",
+      sessionID: sessionA.id,
+      action: "bash",
+      resources: ["git status"],
+      metadata: {},
+      save: [],
     },
   })
 
@@ -110,18 +109,17 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
     ])
 
   await transport.send({
-    directory: directoryA,
-    payload: {
-      id: "event-permission-background-a-child",
-      type: "permission.asked",
-      properties: {
-        id: "permission-background-a-child",
-        sessionID: childSessionA.id,
-        permission: "bash",
-        patterns: ["git diff"],
-        metadata: {},
-        always: [],
-      },
+    id: "evt_permission_background_a_child",
+    created: 1700000002000,
+    type: "permission.asked",
+    location: { directory: directoryA },
+    data: {
+      id: "permission-background-a-child",
+      sessionID: childSessionA.id,
+      action: "bash",
+      resources: ["git diff"],
+      metadata: {},
+      save: [],
     },
   })
 
@@ -156,7 +154,6 @@ type PermissionResponse = {
 async function configureServers(page: Page, tabs: { type: "session"; server: string; sessionId: string }[] = []) {
   await page.addInitScript(
     ({ serverB, tabs }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
       localStorage.setItem("opencode.window.browser.dat:tabs", JSON.stringify(tabs))
     },
@@ -220,44 +217,14 @@ async function mockServers(page: Page, permissionRequests: string[], permissionR
     }
     if (url.pathname === "/api/project/current")
       return json(route, { id: remote ? sessionB.projectID : "project-server-a", directory })
-    if (url.pathname === "/api/session") return json(route, { data: sessions.map(currentSession), cursor: {} })
+    if (url.pathname === "/api/session")
+      return json(route, { data: sessions.map((session) => currentSession(session)), cursor: {} })
     if (url.pathname === "/api/session/active") return json(route, { data: {} })
     const currentSessionInfo = sessions.find((session) => url.pathname === `/api/session/${session.id}`)
     if (currentSessionInfo) return json(route, { data: currentSession(currentSessionInfo) })
     if (sessions.some((session) => url.pathname === `/api/session/${session.id}/message`))
       return json(route, { data: [], cursor: {} })
-    if (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
-    if (/^\/session\/[^/]+\/message$/.test(url.pathname)) return json(route, [])
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
-    if (url.pathname === "/permission") {
-      permissionRequests.push(url.toString())
-      return json(route, [])
-    }
-    if (["/skill", "/command", "/lsp", "/formatter", "/question", "/vcs/diff", "/pty/shells"].includes(url.pathname))
-      return json(route, [])
-    if (url.pathname === "/provider") return json(route, provider(remote ? "server-b" : "server-a"))
-    if (url.pathname === "/agent") return json(route, [{ name: "build", mode: "primary" }])
-    if (url.pathname === "/project" || url.pathname === "/project/current") {
-      const project = {
-        id: remote ? sessionB.projectID : "project-server-a",
-        worktree: directory,
-        vcs: "git",
-        time: { created: 1, updated: 1 },
-        sandboxes: [],
-      }
-      return json(route, url.pathname === "/project" ? [project] : project)
-    }
-    if (url.pathname === "/path")
-      return json(route, {
-        state: directory,
-        config: directory,
-        worktree: directory,
-        directory,
-        home: directory,
-      })
-    if (url.pathname === "/api/path")
-      return json(route, { state: directory, config: directory, worktree: directory, directory, home: directory })
-    if (url.pathname === "/vcs") return json(route, { branch: "main", default_branch: "main" })
+    if (url.pathname === "/api/location") return json(route, { directory })
     if (url.pathname === "/api/vcs")
       return json(route, { location: { directory }, data: { branch: "main", defaultBranch: "main" } })
     if (url.pathname === "/api/pty/shells") return json(route, { location: { directory }, data: [] })

packages/app/e2e/regression/remote-tab-busy.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test, type Page, type Route } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { currentSession } from "../utils/mock-server"
 
 const serverA = "http://127.0.0.1:4096"
@@ -11,7 +11,6 @@ test("tab busy indicator reflects the tab server's own session status", async ({
   await mockServers(page)
   await page.addInitScript(
     ({ serverA, serverB, sessionA, sessionB }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
       localStorage.setItem(
         "opencode.window.browser.dat:tabs",
@@ -58,47 +57,33 @@ async function mockServers(page: Page) {
     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/event") return sse(route, url.pathname === "/api/event")
+    if (url.pathname === "/api/event") return sse(route)
     if (url.pathname === "/api/health") return json(route, { pid: 1 })
     if (url.pathname === "/api/session/active")
       return json(route, { data: url.origin === serverB ? { [sessionB.id]: { type: "running" } } : {} })
     if (url.pathname === "/api/session") return json(route, { data: [currentSession(current)], cursor: {} })
     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 (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
-    if (["/skill", "/command", "/lsp", "/formatter", "/permission", "/question", "/vcs/diff"].includes(url.pathname))
-      return json(route, [])
-    if (url.pathname === "/provider")
-      return json(route, { all: [], connected: [], default: { providerID: "", modelID: "" } })
-    if (url.pathname === "/agent") return json(route, [{ name: "build", mode: "primary" }])
-    if (url.pathname === "/project" || url.pathname === "/project/current") {
+    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" || url.pathname === "/api/project/current") {
       const project = {
         id: current.projectID,
-        worktree: current.directory,
+        canonical: current.directory,
         vcs: "git",
         time: { created: 1, updated: 1 },
         sandboxes: [],
       }
-      return json(route, url.pathname === "/project" ? [project] : project)
+      return json(route, url.pathname === "/api/project" ? [project] : { id: project.id, directory: current.directory })
     }
-    if (url.pathname === "/path")
-      return json(route, {
-        state: current.directory,
-        config: current.directory,
-        worktree: current.directory,
-        directory: current.directory,
-        home: current.directory,
-      })
-    if (url.pathname === "/api/path")
-      return json(route, {
-        state: current.directory,
-        config: current.directory,
-        worktree: current.directory,
-        directory: current.directory,
-        home: current.directory,
-      })
-    if (url.pathname === "/vcs") return json(route, { branch: "main", default_branch: "main" })
+    if (url.pathname === "/api/location") return json(route, { directory: current.directory })
     if (url.pathname === "/api/vcs")
       return json(route, {
         location: { directory: current.directory },
@@ -117,10 +102,10 @@ function json(route: Route, body: unknown, status = 200) {
   })
 }
 
-function sse(route: Route, current: boolean) {
+function sse(route: Route) {
   return route.fulfill({
     status: 200,
     contentType: "text/event-stream",
-    body: current ? 'data: {"id":"evt_connected","type":"server.connected","data":{}}\n\n' : ": ok\n\n",
+    body: 'data: {"id":"evt_connected","type":"server.connected","data":{}}\n\n',
   })
 }

packages/app/e2e/regression/removed-layout-preference.spec.ts

@@ -1,39 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-const draftID = "draft_removed_layout_preference"
-const directory = "C:/OpenCode/RemovedLayoutPreference"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test("ignores persisted old layout preferences when opening drafts", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_removed_layout_preference",
-      worktree: directory,
-      vcs: "git",
-      name: "removed-layout-preference",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ directory, draftID, server }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: false } }))
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-
-  await page.goto(`/new-session?draftId=${draftID}`)
-
-  await expect(page).toHaveURL(`/new-session?draftId=${draftID}`)
-  await expect(page.locator("body")).toHaveAttribute("data-new-layout", "")
-  await expect(page.getByRole("textbox", { name: "Prompt" })).toBeVisible()
-})

packages/app/e2e/regression/review-image-flash.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test, type Page } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../utils/waits"
 
@@ -7,6 +7,7 @@ const directory = "C:/OpenCode/ReviewImageFlashRegression"
 const sessionID = "ses_review_image_flash_regression"
 const title = "Review image flash regression"
 const imageFile = "assets/preview.png"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test("clicking an image file in the v2 review pane does not blank the panel", async ({ page }) => {
   await openReview(page)
@@ -26,9 +27,6 @@ test("clicking an image file in the v2 review pane does not blank the panel", as
 
 async function openReview(page: Page) {
   await page.setViewportSize({ width: 960, height: 900 })
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-  })
   await mockOpenCodeServer(page, {
     directory,
     project: {
@@ -112,30 +110,16 @@ async function openReview(page: Page) {
     pageMessages: () => ({
       items: [
         {
-          info: {
-            id: "msg_review_image_flash_regression",
-            sessionID,
-            role: "user",
-            time: { created: 1700000000000 },
-            summary: { diffs: [] },
-            agent: "build",
-            model: { providerID: "opencode", modelID: "test" },
-          },
-          parts: [
-            {
-              id: "prt_review_image_flash_regression",
-              sessionID,
-              messageID: "msg_review_image_flash_regression",
-              type: "text",
-              text: "Review this change.",
-            },
-          ],
+          id: "msg_review_image_flash_regression",
+          type: "user",
+          time: { created: 1700000000000 },
+          text: "Review this change.",
         },
       ],
     }),
   })
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, title)
   await page.getByRole("button", { name: "Toggle review" }).click()
   await expectAppVisible(page.locator('#review-panel [data-component="session-review-v2"]'))

packages/app/e2e/regression/review-line-comment.spec.ts

@@ -1,11 +1,12 @@
 import { expect, test, type Page } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../utils/waits"
 
 const directory = "C:/OpenCode/ReviewLineCommentRegression"
 const sessionID = "ses_review_line_comment_regression"
 const title = "Review line comment regression"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test.beforeEach(async ({ page }) => {
   await openReview(page)
@@ -88,7 +89,6 @@ test("stages a submitted line comment in the prompt context", async ({ page }) =
 async function openReview(page: Page) {
   await page.setViewportSize({ width: 700, height: 900 })
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: {
       id: "proj_review_line_comment_regression",
@@ -123,30 +123,16 @@ async function openReview(page: Page) {
     pageMessages: () => ({
       items: [
         {
-          info: {
-            id: "msg_review_line_comment_regression",
-            sessionID,
-            role: "user",
-            time: { created: 1700000000000 },
-            summary: { diffs: [] },
-            agent: "build",
-            model: { providerID: "opencode", modelID: "test" },
-          },
-          parts: [
-            {
-              id: "prt_review_line_comment_regression",
-              sessionID,
-              messageID: "msg_review_line_comment_regression",
-              type: "text",
-              text: "Review this change.",
-            },
-          ],
+          id: "msg_review_line_comment_regression",
+          type: "user",
+          time: { created: 1700000000000 },
+          text: "Review this change.",
         },
       ],
     }),
   })
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, title)
   const changes = page.getByRole("tab", { name: "Changes" })
   const diffResponse = page.waitForResponse(

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

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -14,7 +14,6 @@ test.use({ viewport: { width: 1440, height: 900 } })
 test("opens and searches project files inline", async ({ page }) => {
   const searches: { query: string; dirs?: string; limit?: number }[] = []
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: {
       id: projectID,
@@ -63,7 +62,6 @@ test("opens and searches project files inline", async ({ page }) => {
   })
   await page.addInitScript(
     ({ directory, server, sessionID }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/regression/review-state-persistence.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -54,7 +54,6 @@ async function switchSession(page: Page, title: string) {
 
 async function setup(page: Page) {
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: {
       id: projectID,
@@ -103,7 +102,6 @@ async function setup(page: Page) {
   )
   await page.addInitScript(
     ({ directory, server, sessions }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/regression/review-tab-switch.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../utils/waits"
@@ -103,7 +103,6 @@ async function setup(page: Page) {
 
   await page.addInitScript(
     ({ directory, server, sessions }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/regression/review-terminal-stacked.spec.ts

@@ -6,6 +6,7 @@ const directory = "C:/OpenCode/ReviewTerminalStacked"
 const projectID = "proj_review_terminal_stacked"
 const sessionID = "ses_review_terminal_stacked"
 const title = "Review terminal stacked"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 const branchDiffs = [
   fileDiff(".github/actions/setup-bun/action.yml", 7),
   ...Array.from({ length: 2_739 }, (_, index) =>
@@ -21,7 +22,6 @@ test("keeps the review tree and terminal sized when both panels are open", async
   test.setTimeout(120_000)
   await page.setViewportSize({ width: 1400, height: 900 })
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: {
       id: projectID,
@@ -124,15 +124,13 @@ test("keeps the review tree and terminal sized when both panels are open", async
   )
   await page.routeWebSocket("**/api/pty/pty_review_terminal/connect", () => undefined)
   await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
     localStorage.setItem(
       "opencode.global.dat:layout",
       JSON.stringify({ review: { diffStyle: "split", panelOpened: true } }),
     )
   })
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionReady(page, { server, sessionID, title })
   await expect(page.locator("#review-panel")).toBeVisible()
   await expectTree(page, 2_773, "action.yml")

packages/app/e2e/regression/session-list-path-loading.spec.ts

@@ -16,8 +16,7 @@ test("shows loaded sessions before the directory path request resolves", async (
   const pathBlocked = new Promise<void>((resolve) => {
     releasePath = resolve
   })
-  await page.route("**/api/path?*", async (route) => {
-    if (!new URL(route.request().url()).searchParams.has("location[directory]")) return route.fallback()
+  await page.route("**/api/location*", async (route) => {
     await pathBlocked
     return route.fallback()
   })

packages/app/e2e/regression/session-request-docks.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { installSseTransport } from "../utils/sse-transport"
@@ -8,6 +8,7 @@ const directory = "C:/OpenCode/RequestDocks"
 const projectID = "proj_request_docks"
 const sessionID = "ses_request_docks"
 const title = "Request dock regression"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test("shows a pending question dock", async ({ page }) => {
   await mockServer(page, {
@@ -34,7 +35,7 @@ test("shows a pending question dock", async ({ page }) => {
     ],
   })
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, title)
 
   const question = page.locator('[data-component="dock-prompt"][data-kind="question"]')
@@ -51,7 +52,7 @@ test("shows a pending question dock", async ({ page }) => {
       rejectRequests.push(request.url())
   })
 
-  await question.locator('[data-component="icon-button"][data-icon="chevron-down"]').click()
+  await question.getByRole("button", { name: "Minimize question" }).click()
   await expect(question).toBeVisible()
   await expect(question.getByText("Which implementation should be used?")).toBeVisible()
   await expect(question.getByText("Select one answer")).toBeHidden()
@@ -62,7 +63,7 @@ test("shows a pending question dock", async ({ page }) => {
   await expect(page.locator('[data-component="question-minimized-dock"]')).toHaveCount(0)
   expect(rejectRequests).toEqual([])
 
-  await question.locator('[data-component="icon-button"][data-icon="chevron-down"]').click()
+  await question.getByRole("button", { name: "Restore question" }).click()
   await expect(question).toBeVisible()
   await expect(question.getByText("Which implementation should be used?")).toBeVisible()
   await expect(question.getByRole("radio", { name: /Minimal/ })).toBeVisible()
@@ -92,7 +93,7 @@ test("shows a pending permission dock", async ({ page }) => {
     ],
   })
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, title)
 
   const permission = page.locator('[data-component="dock-prompt"][data-kind="permission"]')
@@ -111,11 +112,11 @@ test("shows a pending permission dock", async ({ page }) => {
 
 test("restores the draft caret before typing after a request dock closes", async ({ page }) => {
   const transport = await installSseTransport(page, {
-    server: `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`,
+    server,
     retry: 20,
   })
   await mockServer(page, { forms: [] })
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await transport.waitForConnection()
   await expectSessionTitle(page, title)
 
@@ -138,26 +139,26 @@ test("restores the draft caret before typing after a request dock closes", async
     )
     .toBe(cursor)
   await transport.send({
-    directory,
-    payload: {
-      type: "form.created",
-      properties: {
-        form: {
-          id: "frm_question_caret",
-          sessionID,
-          title: "Questions",
-          metadata: { kind: "question", tool: { messageID: "message-caret", id: "call-caret" } },
-          fields: [
-            {
-              key: "q0",
-              type: "string",
-              title: "Continue",
-              description: "Continue?",
-              options: [{ value: "yes", label: "Yes", description: "Continue the session" }],
-              custom: true,
-            },
-          ],
-        },
+    id: "evt_form_created",
+    created: 1700000001000,
+    type: "form.created",
+    location: { directory },
+    data: {
+      form: {
+        id: "frm_question_caret",
+        sessionID,
+        title: "Questions",
+        metadata: { kind: "question", tool: { messageID: "message-caret", id: "call-caret" } },
+        fields: [
+          {
+            key: "q0",
+            type: "string",
+            title: "Continue",
+            description: "Continue?",
+            options: [{ value: "yes", label: "Yes", description: "Continue the session" }],
+            custom: true,
+          },
+        ],
       },
     },
   })
@@ -166,11 +167,11 @@ test("restores the draft caret before typing after a request dock closes", async
   await expect(editor).toHaveCount(0)
 
   await transport.send({
-    directory,
-    payload: {
-      type: "form.cancelled",
-      properties: { sessionID, id: "frm_question_caret" },
-    },
+    id: "evt_form_cancelled",
+    created: 1700000002000,
+    type: "form.cancelled",
+    location: { directory },
+    data: { sessionID, id: "frm_question_caret" },
   })
   await expect(question).toHaveCount(0)
   await expect(editor).toBeVisible()
@@ -183,13 +184,11 @@ async function mockServer(
   page: Page,
   requests: {
     permissions?: unknown[] | (() => unknown[])
-    questions?: unknown[] | (() => unknown[])
     forms?: unknown[] | (() => unknown[])
     sessionStatus?: Record<string, unknown>
   },
 ) {
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: {
       id: projectID,
@@ -229,11 +228,7 @@ async function mockServer(
     ],
     pageMessages: () => ({ items: [] }),
     permissions: requests.permissions,
-    questions: requests.questions,
     forms: requests.forms,
     sessionStatus: requests.sessionStatus,
   })
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-  })
 }

packages/app/e2e/regression/session-timeline-collapse-state.spec.ts

@@ -1,4 +1,5 @@
 import { expect, test, type Locator, type Page } from "@playwright/test"
+import type { JsonValue, OpenCodeEvent, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../utils/waits"
 
@@ -8,14 +9,11 @@ const sessionID = "ses_timeline_state_regression"
 const userMessageID = "msg_user_regression"
 const assistantMessageID = "msg_assistant_regression"
 const editPartID = "prt_0001_edit"
-const textPartID = "prt_9999_text"
+const textPartID = `${assistantMessageID}:text:0`
 const title = "Timeline collapse state regression"
 const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }
 
-type EventPayload = {
-  directory: string
-  payload: Record<string, unknown>
-}
+type EventPayload = OpenCodeEvent
 
 declare global {
   interface Window {
@@ -27,25 +25,11 @@ declare global {
 }
 
 const userMessage = {
-  info: {
-    id: userMessageID,
-    sessionID,
-    role: "user",
-    time: { created: 1700000000000 },
-    summary: { diffs: [] },
-    agent: "build",
-    model,
-  },
-  parts: [
-    {
-      id: "prt_user_text",
-      sessionID,
-      messageID: userMessageID,
-      type: "text",
-      text: "Please edit the file.",
-    },
-  ],
-}
+  id: userMessageID,
+  type: "user",
+  time: { created: 1700000000000 },
+  text: "Please edit the file.",
+} satisfies SessionMessageInfo
 
 const editPart = {
   id: editPartID,
@@ -74,31 +58,19 @@ const editPart = {
 }
 
 const streamedTextPart = {
-  id: textPartID,
-  sessionID,
-  messageID: assistantMessageID,
-  type: "text",
   text: "Streaming added a later assistant text part.",
 }
 
 const assistantMessage = {
-  info: {
-    id: assistantMessageID,
-    sessionID,
-    role: "assistant",
-    time: { created: 1700000001000 },
-    parentID: userMessageID,
-    modelID: model.modelID,
-    providerID: model.providerID,
-    mode: "build",
-    agent: "build",
-    path: { cwd: directory, root: directory },
-    cost: 0.01,
-    tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-    variant: "max",
-  },
-  parts: [editPart],
-}
+  id: assistantMessageID,
+  type: "assistant",
+  time: { created: 1700000001000 },
+  model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+  agent: "build",
+  cost: 0.01,
+  tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+  content: [toolContent(editPart)],
+} satisfies SessionMessageInfo
 
 test.describe("regression: session timeline local row state", () => {
   test("keeps a manually collapsed tool collapsed when later assistant content streams", async ({ page }) => {
@@ -106,7 +78,7 @@ test.describe("regression: session timeline local row state", () => {
     await mockServer(page, events)
     await configurePage(page)
 
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+    await page.goto(sessionHref())
     await expectSessionTitle(page, title)
 
     const wrapper = page.locator(`[data-timeline-part-id="${editPartID}"]`).first()
@@ -119,15 +91,11 @@ test.describe("regression: session timeline local row state", () => {
     await wrapper.locator('[data-slot="collapsible-trigger"]').first().click()
     await expectExpanded(wrapper, false)
 
-    events.push({
-      directory,
-      payload: {
-        type: "message.part.updated",
-        properties: { part: streamedTextPart },
-      },
-    })
+    events.push(...textEvents())
 
-    await expect(page.locator(`[data-timeline-part-id="${textPartID}"]`).first()).toBeVisible({ timeout: 10_000 })
+    await expect(page.locator(`[data-timeline-part-id="${assistantMessageID}:text:0"]`).first()).toBeVisible({
+      timeout: 10_000,
+    })
 
     expect(await readToolState(page)).toEqual({
       expanded: false,
@@ -136,13 +104,13 @@ test.describe("regression: session timeline local row state", () => {
     })
   })
 
-  test("does not remount an edit diff when sibling parts or diff counts update", async ({ page }) => {
+  test("does not remount an edit diff when a sibling part arrives", async ({ page }) => {
     const events: EventPayload[] = []
     await installDiffProbe(page)
     await mockServer(page, events)
     await configurePage(page)
 
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+    await page.goto(sessionHref())
     await expectSessionTitle(page, title)
 
     const wrapper = page.locator(`[data-timeline-part-id="${editPartID}"]`).first()
@@ -151,15 +119,11 @@ test.describe("regression: session timeline local row state", () => {
     await expectAppVisible(file)
     await markDiffProbe(page)
 
-    events.push({
-      directory,
-      payload: {
-        type: "message.part.updated",
-        properties: { part: streamedTextPart },
-      },
-    })
+    events.push(...textEvents())
 
-    await expect(page.locator(`[data-timeline-part-id="${textPartID}"]`).first()).toBeVisible({ timeout: 10_000 })
+    await expect(page.locator(`[data-timeline-part-id="${assistantMessageID}:text:0"]`).first()).toBeVisible({
+      timeout: 10_000,
+    })
     const siblingProbe = await readDiffProbe(page)
     expect(siblingProbe).toEqual({
       fileMarker: "before",
@@ -169,27 +133,6 @@ test.describe("regression: session timeline local row state", () => {
       shadowRoots: 0,
       toolMarker: "before",
     })
-
-    await markDiffProbe(page)
-    events.push({
-      directory,
-      payload: {
-        type: "message.part.updated",
-        properties: { part: editPartWithAdditions(2) },
-      },
-    })
-
-    await expect(wrapper.locator('[data-slot="diff-changes-additions"]').filter({ hasText: "+2" }).first()).toBeVisible(
-      { timeout: 10_000 },
-    )
-    expect(await readDiffProbe(page)).toEqual({
-      fileMarker: "before",
-      frameMarker: "before",
-      rowKey: `assistant-part:${userMessageID}:part:${assistantMessageID}:${editPartID}`,
-      rowMarker: "before",
-      shadowRoots: 0,
-      toolMarker: "before",
-    })
   })
 
   test("keeps a sticky edit header aligned with a multi-hunk diff", async ({ page }) => {
@@ -216,10 +159,10 @@ test.describe("regression: session timeline local row state", () => {
         },
       },
     }
-    await mockServer(page, events, [userMessage, { ...assistantMessage, parts: [part] }])
+    await mockServer(page, events, [userMessage, { ...assistantMessage, content: [toolContent(part)] }])
     await configurePage(page)
 
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+    await page.goto(sessionHref())
     await expectSessionTitle(page, title)
 
     const wrapper = page.locator(`[data-timeline-part-id="${editPartID}"]`).first()
@@ -293,7 +236,7 @@ async function readToolState(page: Page) {
         row: element.closest("[data-timeline-row]")?.getAttribute("data-timeline-row"),
         streamedTextVisible: !!document.querySelector(`[data-timeline-part-id="${textPartID}"]`),
       }),
-      textPartID,
+      `${assistantMessageID}:text:0`,
     )
 }
 
@@ -355,22 +298,103 @@ async function readDiffProbe(page: Page) {
     })
 }
 
-function editPartWithAdditions(additions: number) {
+function toolContent(part: typeof editPart): SessionMessageAssistant["content"][number] {
   return {
-    ...editPart,
+    type: "tool",
+    id: part.callID,
+    name: part.tool,
+    time: { created: part.state.time.start, ran: part.state.time.start, completed: part.state.time.end },
     state: {
-      ...editPart.state,
-      metadata: {
-        ...editPart.state.metadata,
-        filediff: {
-          ...editPart.state.metadata.filediff,
-          additions,
-        },
-      },
+      status: "completed",
+      input: part.state.input,
+      content: [{ type: "text", text: part.state.output }],
+      metadata: part.state.metadata as Record<string, JsonValue>,
     },
   }
 }
 
+let eventSequence = -1
+
+function textEvents(): OpenCodeEvent[] {
+  return [
+    eventValue("session.text.started", { sessionID, assistantMessageID, ordinal: 0 }, 1),
+    eventValue(
+      "session.text.ended",
+      {
+        sessionID,
+        assistantMessageID,
+        ordinal: 0,
+        text: streamedTextPart.text,
+      },
+      1,
+    ),
+  ]
+}
+
+function toolEvents(part: typeof editPart): OpenCodeEvent[] {
+  return [
+    eventValue(
+      "session.tool.input.started",
+      {
+        sessionID,
+        assistantMessageID,
+        id: part.callID,
+        name: part.tool,
+      },
+      1,
+    ),
+    eventValue(
+      "session.tool.input.ended",
+      {
+        sessionID,
+        assistantMessageID,
+        id: part.callID,
+        text: JSON.stringify(part.state.input),
+      },
+      1,
+    ),
+    eventValue(
+      "session.tool.called",
+      {
+        sessionID,
+        assistantMessageID,
+        id: part.callID,
+        input: part.state.input,
+        executed: true,
+      },
+      1,
+    ),
+    eventValue(
+      "session.tool.success",
+      {
+        sessionID,
+        assistantMessageID,
+        id: part.callID,
+        content: [{ type: "text", text: part.state.output }],
+        metadata: part.state.metadata as Record<string, JsonValue>,
+        executed: true,
+      },
+      2,
+    ),
+  ]
+}
+
+function eventValue<Type extends OpenCodeEvent["type"]>(
+  type: Type,
+  data: Extract<OpenCodeEvent, { type: Type }>["data"],
+  version: 1 | 2,
+): Extract<OpenCodeEvent, { type: Type }> {
+  eventSequence++
+  return {
+    id: `evt_collapse_${eventSequence}`,
+    created: 1700000002000 + eventSequence,
+    type,
+    data,
+    location: { directory },
+    durable: { aggregateID: sessionID, seq: eventSequence, version },
+  } as unknown as Extract<OpenCodeEvent, { type: Type }>
+}
+
 function readExpanded(element: Element) {
   const trigger = element.querySelector('[data-slot="collapsible-trigger"]')
   const aria = trigger?.getAttribute("aria-expanded")
@@ -385,7 +409,12 @@ function readExpanded(element: Element) {
   return !!content && content.getBoundingClientRect().height > 0
 }
 
-async function mockServer(page: Page, events: EventPayload[], messages = [userMessage, assistantMessage]) {
+async function mockServer(
+  page: Page,
+  events: EventPayload[],
+  messages: SessionMessageInfo[] = [userMessage, assistantMessage],
+) {
+  eventSequence = -1
   await mockOpenCodeServer(page, {
     directory,
     project: project(),
@@ -437,3 +466,8 @@ function provider() {
 function base64Encode(value: string) {
   return Buffer.from(value, "utf8").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
 }
+
+function sessionHref() {
+  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+  return `/server/${base64Encode(server)}/session/${sessionID}`
+}

packages/app/e2e/regression/session-timeline-context-resize.spec.ts

@@ -1,4 +1,5 @@
 import { expect, test, type Page } from "@playwright/test"
+import type { JsonValue, OpenCodeEvent, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../utils/waits"
 import {
@@ -17,11 +18,6 @@ const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "ma
 const contextIDs = ["ctx_0100_read", "ctx_0101_glob", "ctx_0102_grep", "ctx_0103_list"]
 const followingTextID = `${id("msg_assistant", 10)}:text:0`
 
-type Message = {
-  info: Record<string, unknown> & { id: string; role: "user" | "assistant" }
-  parts: Record<string, unknown>[]
-}
-
 const messages = [...Array.from({ length: 8 }, (_, index) => turn(index, false)).flat(), ...turn(10, true)]
 
 test.describe("regression: session timeline context group resize", () => {
@@ -30,7 +26,7 @@ test.describe("regression: session timeline context group resize", () => {
     await mockServer(page)
     await configurePage(page)
 
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+    await page.goto(sessionHref())
     await expectSessionTitle(page, title)
     await expectAppVisible(page.locator(`[data-timeline-part-ids="${contextIDs.join(",")}"]`).first())
     await expectAppVisible(page.locator(`[data-timeline-part-id="${followingTextID}"]`).first())
@@ -45,7 +41,7 @@ test.describe("regression: session timeline context group resize", () => {
   })
 
   test("paints a stable exploring to explored transition", async ({ page }) => {
-    const events: { directory: string; payload: Record<string, unknown> }[] = []
+    const events: OpenCodeEvent[] = []
     await page.setViewportSize({ width: 1400, height: 900 })
     await mockServer(page, events, [
       ...Array.from({ length: 8 }, (_, index) => turn(index, false)).flat(),
@@ -53,7 +49,7 @@ test.describe("regression: session timeline context group resize", () => {
     ])
     await configurePage(page)
 
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+    await page.goto(sessionHref())
     await expectSessionTitle(page, title)
     const devtools = await page.context().newCDPSession(page)
     await devtools.send("Emulation.setCPUThrottlingRate", { rate: 4 })
@@ -75,25 +71,21 @@ test.describe("regression: session timeline context group resize", () => {
     })
     await startVisualProbe(page, regions)
     for (const [index, delay] of [120, 350, 80, 500].entries()) {
-      events.push({
-        directory,
-        payload: {
-          type: "message.part.updated",
-          properties: {
-            part: contextTool(
-              contextIDs[index]!,
-              id("msg_assistant", 10),
-              ["read", "glob", "grep", "list"][index]!,
-              [
-                { filePath: "src/recent-a.ts" },
-                { path: directory, pattern: "**/*.ts" },
-                { path: directory, pattern: "Explored" },
-                { path: "src" },
-              ][index]!,
-            ),
-          },
-        },
-      })
+      events.push(
+        ...toolEvents(
+          contextTool(
+            contextIDs[index]!,
+            id("msg_assistant", 10),
+            ["read", "glob", "grep", "list"][index]!,
+            [
+              { filePath: "src/recent-a.ts" },
+              { path: directory, pattern: "**/*.ts" },
+              { path: directory, pattern: "Explored" },
+              { path: "src" },
+            ][index]!,
+          ),
+        ),
+      )
       await page.waitForTimeout(delay)
     }
 
@@ -211,74 +203,51 @@ async function sampleExpansion(page: Page) {
   )
 }
 
-function turn(index: number, target: boolean, status: "running" | "completed" = "completed"): Message[] {
+function turn(index: number, target: boolean, status: "running" | "completed" = "completed"): SessionMessageInfo[] {
   const userID = id("msg_user", index)
   const assistantID = id("msg_assistant", index)
+  const content: SessionMessageAssistant["content"] = target
+    ? [
+        toolContent(
+          contextTool(
+            contextIDs[0]!,
+            assistantID,
+            "read",
+            { filePath: "src/recent-a.ts", offset: 0, limit: 120 },
+            status,
+          ),
+        ),
+        toolContent(contextTool(contextIDs[1]!, assistantID, "glob", { path: directory, pattern: "**/*.ts" }, status)),
+        toolContent(
+          contextTool(
+            contextIDs[2]!,
+            assistantID,
+            "grep",
+            { path: directory, pattern: "Explored", include: "*.ts" },
+            status,
+          ),
+        ),
+        toolContent(contextTool(contextIDs[3]!, assistantID, "list", { path: "src" }, status)),
+        { type: "text", text: "This assistant text is immediately after the explored context group." },
+      ]
+    : [{ type: "text", text: `Assistant filler ${index}. ${"filler ".repeat(60)}` }]
   return [
     {
-      info: {
-        id: userID,
-        sessionID,
-        role: "user",
-        time: { created: 1700000000000 + index * 10_000 },
-        summary: { diffs: [] },
-        agent: "build",
-        model,
-      },
-      parts: [{ id: id("prt_user", index), sessionID, messageID: userID, type: "text", text: `User message ${index}` }],
+      id: userID,
+      type: "user",
+      time: { created: 1700000000000 + index * 10_000 },
+      text: `User message ${index}`,
     },
     {
-      info: {
-        id: assistantID,
-        sessionID,
-        role: "assistant",
-        time: { created: 1700000000000 + index * 10_000 + 1_000, completed: 1700000000000 + index * 10_000 + 2_000 },
-        parentID: userID,
-        modelID: model.modelID,
-        providerID: model.providerID,
-        mode: "build",
-        agent: "build",
-        path: { cwd: directory, root: directory },
-        cost: 0.01,
-        tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-        variant: "max",
-        finish: "stop",
-      },
-      parts: target
-        ? [
-            contextTool(
-              contextIDs[0]!,
-              assistantID,
-              "read",
-              { filePath: "src/recent-a.ts", offset: 0, limit: 120 },
-              status,
-            ),
-            contextTool(contextIDs[1]!, assistantID, "glob", { path: directory, pattern: "**/*.ts" }, status),
-            contextTool(
-              contextIDs[2]!,
-              assistantID,
-              "grep",
-              { path: directory, pattern: "Explored", include: "*.ts" },
-              status,
-            ),
-            contextTool(contextIDs[3]!, assistantID, "list", { path: "src" }, status),
-            {
-              id: followingTextID,
-              sessionID,
-              messageID: assistantID,
-              type: "text",
-              text: "This assistant text is immediately after the explored context group.",
-            },
-          ]
-        : [
-            {
-              id: id("prt_text", index),
-              sessionID,
-              messageID: assistantID,
-              type: "text",
-              text: `Assistant filler ${index}. ${"filler ".repeat(60)}`,
-            },
-          ],
+      id: assistantID,
+      type: "assistant",
+      time: { created: 1700000000000 + index * 10_000 + 1_000, completed: 1700000000000 + index * 10_000 + 2_000 },
+      model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+      agent: "build",
+      cost: 0.01,
+      tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+      finish: "stop",
+      content,
     },
   ]
 }
@@ -308,11 +277,76 @@ function contextTool(
   }
 }
 
-async function mockServer(
-  page: Page,
-  events: { directory: string; payload: Record<string, unknown> }[] = [],
-  fixtureMessages = messages,
-) {
+type ContextTool = ReturnType<typeof contextTool>
+
+function toolContent(part: ContextTool): SessionMessageAssistant["content"][number] {
+  const base = {
+    type: "tool" as const,
+    id: part.callID,
+    name: part.tool,
+    time: {
+      created: part.state.time.start,
+      ran: part.state.time.start,
+      ...(part.state.status === "completed" ? { completed: part.state.time.end } : {}),
+    },
+  }
+  if (part.state.status === "running")
+    return {
+      ...base,
+      state: {
+        status: "running",
+        input: part.state.input as Record<string, JsonValue>,
+        metadata: part.state.metadata as Record<string, JsonValue>,
+      },
+    }
+  return {
+    ...base,
+    state: {
+      status: "completed",
+      input: part.state.input as Record<string, JsonValue>,
+      content: [{ type: "text", text: part.state.output }],
+      metadata: part.state.metadata as Record<string, JsonValue>,
+    },
+  }
+}
+
+let eventSequence = -1
+
+function toolEvents(part: ContextTool): OpenCodeEvent[] {
+  return [
+    eventValue(
+      "session.tool.success",
+      {
+        sessionID,
+        assistantMessageID: part.messageID,
+        id: part.callID,
+        content: [{ type: "text", text: part.state.output }],
+        metadata: part.state.metadata,
+        executed: true,
+      },
+      2,
+    ),
+  ]
+}
+
+function eventValue<Type extends OpenCodeEvent["type"]>(
+  type: Type,
+  data: Extract<OpenCodeEvent, { type: Type }>["data"],
+  version: 1 | 2,
+): Extract<OpenCodeEvent, { type: Type }> {
+  eventSequence++
+  return {
+    id: `evt_context_resize_${eventSequence}`,
+    created: 1700000002000 + eventSequence,
+    type,
+    data,
+    location: { directory },
+    durable: { aggregateID: sessionID, seq: eventSequence, version },
+  } as unknown as Extract<OpenCodeEvent, { type: Type }>
+}
+
+async function mockServer(page: Page, events: OpenCodeEvent[] = [], fixtureMessages = messages) {
+  eventSequence = -1
   await mockOpenCodeServer(page, {
     directory,
     project: project(),
@@ -372,3 +406,8 @@ function provider() {
 function base64Encode(value: string) {
   return Buffer.from(value, "utf8").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
 }
+
+function sessionHref() {
+  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+  return `/server/${base64Encode(server)}/session/${sessionID}`
+}

packages/app/e2e/regression/session-timeline-file-state.spec.ts

@@ -1,30 +1,5 @@
 import { expect, test } from "@playwright/test"
-import {
-  assistantMessage,
-  partUpdated,
-  setupTimeline,
-  toolPart,
-  userMessage,
-} from "../performance/timeline-stability/fixture"
-
-test("updates edit diagnostics without resetting manual collapse state", async ({ page }) => {
-  const editID = "prt_diagnostics_edit"
-  const base = editPart(editID, [])
-  const timeline = await setupTimeline(page, {
-    messages: [userMessage(), assistantMessage([base])],
-    settings: { editToolPartsExpanded: true },
-  })
-  const trigger = page.locator(`[data-timeline-part-id="${editID}"] [data-slot="collapsible-trigger"]`).first()
-  await trigger.click()
-  await expect(trigger).toHaveAttribute("aria-expanded", "false")
-  await timeline.send(
-    partUpdated(editPart(editID, [diagnostic("First failure", 2), diagnostic("Second failure", 4)])),
-    300,
-  )
-  await expect(trigger).toHaveAttribute("aria-expanded", "false")
-  await timeline.send(partUpdated(editPart(editID, [])), 300)
-  await expect(trigger).toHaveAttribute("aria-expanded", "false")
-})
+import { assistantMessage, setupTimeline, toolPart, userMessage } from "../performance/timeline-stability/fixture"
 
 test("preserves nested patch file state through outer collapse and reopen", async ({ page }) => {
   const patchID = "prt_nested_patch"
@@ -68,25 +43,6 @@ function patchFile(filePath: string, type: "add" | "update" | "delete") {
   }
 }
 
-function editPart(id: string, diagnostics: Record<string, unknown>[]) {
-  return toolPart(
-    id,
-    "edit",
-    "completed",
-    { filePath: "src/edit.ts" },
-    {
-      metadata: {
-        filediff: { file: "src/edit.ts", additions: 1, deletions: 1, before: source(false), after: source(true) },
-        diagnostics,
-      },
-    },
-  )
-}
-
-function diagnostic(message: string, line: number) {
-  return { message, severity: 1, range: { start: { line, character: 0 }, end: { line, character: 2 } } }
-}
-
 function source(changed: boolean) {
   return Array.from({ length: 12 }, (_, index) => `export const value${index} = ${changed ? index + 1 : index}\n`).join(
     "",

packages/app/e2e/regression/session-timeline-history-root.spec.ts

@@ -1,4 +1,5 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
+import type { SessionMessageAssistant } from "@opencode-ai/client/promise"
 import { expect, test, type Page } from "@playwright/test"
 import {
   assistantMessage,
@@ -16,9 +17,9 @@ import { mockOpenCodeServer } from "../utils/mock-server"
 import { installSseTransport } from "../utils/sse-transport"
 import { expectSessionTitle } from "../utils/waits"
 
-const initialPageSize = 20
-const historyPageSize = 200
-const messages = Array.from({ length: initialPageSize + 1 }, (_, index) => {
+const messagePageSize = 200
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const messages = Array.from({ length: messagePageSize / 2 + 1 }, (_, index) => {
   const id = `msg_${String(index + 1001).padStart(4, "0")}_history_root_user`
   return [
     userMessage(undefined, { id, created: 1700000000000 + index * 2_000 }),
@@ -26,23 +27,23 @@ const messages = Array.from({ length: initialPageSize + 1 }, (_, index) => {
       id: `msg_${String(index + 1001).padStart(4, "0")}_history_root_assistant`,
       parentID: id,
       created: 1700000001000 + index * 2_000,
-      completed: index < initialPageSize,
+      completed: index < messagePageSize / 2,
     }),
   ]
 }).flat()
-const assistants = messages.filter((message) => message.info.role === "assistant")
+const assistants = messages.filter((message): message is SessionMessageAssistant => message.type === "assistant")
 const lastAssistant = assistants.at(-1)!
-const lastPartID = `${assistants.at(-1)!.info.id}:text:0`
-const userPartID = `${messages.at(-2)!.info.id}:text:0`
+const lastPartID = `${assistants.at(-1)!.id}:text:0`
+const userPartID = `${messages.at(-2)!.id}:text:0`
 const completed = {
-  ...lastAssistant.info,
-  time: { ...lastAssistant.info.time, completed: lastAssistant.info.time.created + 15_000 },
+  ...lastAssistant,
+  time: { ...lastAssistant.time, completed: lastAssistant.time.created + 15_000 },
 }
 const scenarios = [
   { name: "completion", info: completed, idleFirst: false, interrupted: false },
   {
     name: "interruption",
-    info: { ...completed, error: { name: "MessageAbortedError", data: { message: "Stopped" } } },
+    info: { ...completed, error: { type: "MessageAbortedError", message: "Stopped" } },
     idleFirst: true,
     interrupted: true,
   },
@@ -57,12 +58,11 @@ for (const scenario of scenarios) {
     const roots: { sessionID: string; messageID: string }[] = []
     const sequence: string[] = []
     const history = Promise.withResolvers<void>()
-    const transport = await installSseTransport<{ directory: string; payload: Record<string, unknown> }>(page, {
-      server: `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`,
+    const transport = await installSseTransport(page, {
+      server,
       retry: 20,
     })
     await mockOpenCodeServer(page, {
-      protocol: "v2",
       directory,
       project: project(),
       provider: {
@@ -95,15 +95,15 @@ for (const scenario of scenarios) {
       },
       message: (requestedSessionID, messageID) => {
         if (requestedSessionID !== sessionID) return
-        return messages.find((item) => item.info.id === messageID)
+        return messages.find((item) => item.id === messageID)
       },
       pageMessages: (_, limit, before) => {
         pages.push({ before, limit })
-        const end = before ? messages.findIndex((message) => message.info.id === before) : messages.length
+        const end = before ? messages.findIndex((message) => message.id === before) : messages.length
         const start = Math.max(0, end - limit)
         return {
           items: messages.slice(start, end),
-          cursor: start > 0 ? messages[start]!.info.id : undefined,
+          cursor: start > 0 ? messages[start]!.id : undefined,
         }
       },
     })
@@ -153,28 +153,25 @@ for (const scenario of scenarios) {
       requestAnimationFrame(() => setTimeout(sample, 0))
     })
 
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+    await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
     await transport.waitForConnection()
     await expectSessionTitle(page, title)
     await expect(page.locator(`[data-timeline-part-id="${lastPartID}"]`)).toBeVisible()
     await expect(page.locator(`[data-timeline-part-id="${userPartID}"]`)).toBeVisible()
     const viewport = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
     await viewport.hover()
-    const deadline = Date.now() + 10_000
+    const deadline = Date.now() + 30_000
     while (requests.filter((request) => request.phase === "start").length < 2) {
       if (Date.now() >= deadline) throw new Error("Timed out scrolling to the history boundary")
-      await page.mouse.wheel(0, -240)
+      await page.mouse.wheel(0, -1_200)
       await page.waitForTimeout(20)
     }
     expect(requests.filter((request) => request.phase === "end")).toHaveLength(1)
     expect(sequence.slice(0, 3)).toEqual([
       "messages:start:latest",
       "messages:end:latest",
-      `messages:start:${messages.at(-initialPageSize)!.info.id}`,
+      `messages:start:${messages.at(-messagePageSize)!.id}`,
     ])
-    await expect(page.locator('[data-timeline-part-id*="_history_root_assistant:text:0"]')).toHaveCount(
-      initialPageSize / 2,
-    )
     await page.evaluate(() => {
       ;(
         window as Window & {
@@ -186,15 +183,12 @@ for (const scenario of scenarios) {
     expect(await visibleContentHidden(page)).toBe(false)
     const beforeHistory = await probeSamples(page)
     history.resolve()
-    await expect
-      .poll(() => page.locator('[data-timeline-part-id*="_history_root_assistant:text:0"]').count())
-      .toBeGreaterThan(initialPageSize / 2)
     await expect.poll(() => requests.filter((request) => request.phase === "end").length).toBe(2)
     await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
     await waitForProbeSamples(page, beforeHistory)
     expect(pages).toEqual([
-      { before: undefined, limit: initialPageSize },
-      { before: messages.at(-initialPageSize)!.info.id, limit: historyPageSize },
+      { before: undefined, limit: messagePageSize },
+      { before: messages.at(-messagePageSize)!.id, limit: messagePageSize },
     ])
     expect(roots).toEqual([])
 

packages/app/e2e/regression/session-timeline-lifecycle-state.spec.ts

@@ -5,9 +5,11 @@ import {
   messageUpdated,
   partUpdated,
   reasoningPart,
+  renderedPartID,
   setupTimeline,
   shell,
   status,
+  stepStarted,
   textPart,
   userMessage,
 } from "../performance/timeline-stability/fixture"
@@ -65,7 +67,7 @@ test("transitions thinking and hidden reasoning through busy to idle", async ({
   await timeline.send(partUpdated(shell("prt_reasoning_shell", "running")), 160)
   await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
   await timeline.send(partUpdated(shell("prt_reasoning_shell", "completed", "done")), 180)
-  await timeline.send(messageUpdated(completedAssistantInfo(assistant.info)), 100)
+  await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 100)
   await timeline.send(status("idle"), 300)
   await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
   await expect(page.locator(`[data-timeline-part-id="${reasoningID}"]`)).toHaveCount(0)
@@ -82,6 +84,7 @@ test("moves busy through retry and recovery to final idle content", async ({ pag
               file: "src/retry.ts",
               additions: 1,
               deletions: 1,
+              status: "modified",
               patch: "@@ -1 +1 @@\n-export const retry = false\n+export const retry = true",
             },
           ],
@@ -96,14 +99,16 @@ test("moves busy through retry and recovery to final idle content", async ({ pag
   await timeline.send(status("retry"), 180)
   await expect(page.locator('[data-timeline-row="Retry"]')).toBeVisible()
   await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-  await timeline.send(status("busy", 2), 180)
+  await timeline.send(stepStarted(assistant), 180)
+  await expect(page.locator('[data-timeline-row="Retry"]')).toHaveCount(0)
   await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
   await timeline.send(partUpdated(textPart("prt_recovered", "Recovered response")), 140)
-  await timeline.send(messageUpdated(completedAssistantInfo(assistant.info)), 100)
+  await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 100)
   await timeline.send(status("idle"), 350)
-  await expect(page.locator('[data-timeline-row="Retry"]')).toHaveCount(0)
   await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-  await expect(page.locator('[data-timeline-part-id="prt_recovered"]')).toContainText("Recovered response")
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID("prt_recovered")}"]`)).toContainText(
+    "Recovered response",
+  )
 })
 
 function lines(count: number) {

packages/app/e2e/regression/session-timeline-notices.spec.ts

@@ -1,28 +1,36 @@
 import { expect, test } from "@playwright/test"
-import type { SessionMessageInfo } from "@opencode-ai/client/promise"
-import { session, sessionID, setupTimeline } from "../performance/timeline-stability/fixture"
+import type { SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"
+import { event, session, sessionID, setupTimeline } from "../performance/timeline-stability/fixture"
 
 const user = { id: "msg_user", type: "user", text: "Run it", time: { created: 1 } } satisfies SessionMessageInfo
 
-const assistant = (completed: boolean, tool = false, childID?: string) =>
-  ({
-    id: "msg_assistant",
-    type: "assistant",
-    agent: "build",
-    model: { id: "model", providerID: "provider" },
-    content: tool
-      ? [
-          {
-            type: "tool",
-            id: "call_subagent",
-            name: "subagent",
-            state: { status: "running", input: {}, metadata: childID ? { sessionID: childID } : {} },
-            time: { created: 2 },
+const assistant = (
+  completed: boolean,
+  tool = false,
+  childID?: string,
+  background = false,
+): SessionMessageAssistant => ({
+  id: "msg_assistant",
+  type: "assistant",
+  agent: "build",
+  model: { id: "model", providerID: "provider" },
+  content: tool
+    ? [
+        {
+          type: "tool",
+          id: "call_subagent",
+          name: "subagent",
+          state: {
+            status: "running",
+            input: { description: "Inspect code", ...(background ? { background: true } : {}) },
+            metadata: { status: "running", ...(childID ? { sessionID: childID } : {}) },
           },
-        ]
-      : [{ type: "text", text: "Working" }],
-    time: { created: 2, ...(completed ? { completed: 3 } : {}) },
-  }) satisfies SessionMessageInfo
+          time: { created: 2 },
+        },
+      ]
+    : [{ type: "text", text: "Working" }],
+  time: { created: 2, ...(completed ? { completed: 3 } : {}) },
+})
 
 test("renders current protocol notices in CLI order", async ({ page }) => {
   const ownerWarnings: string[] = []
@@ -31,7 +39,7 @@ test("renders current protocol notices in CLI order", async ({ page }) => {
       ownerWarnings.push(message.text())
   })
   await setupTimeline(page, {
-    currentMessages: [
+    sessionMessages: [
       user,
       { id: "msg_agent", type: "agent-switched", agent: "explore", time: { created: 2 } },
       assistant(true),
@@ -60,12 +68,17 @@ test("renders current protocol notices in CLI order", async ({ page }) => {
   await expect(notices.nth(1)).toContainText("explore finished · Search code")
   await expect(notices.nth(2)).toContainText("Continuing after restart")
   await expect(notices.nth(3)).toContainText("Skill · Review")
+  await expect(notices).toHaveClass([/text-text-weak/, /text-text-weak/, /text-text-weak/, /text-text-weak/])
+  await expect(notices.locator(".text-text-strong")).toHaveCount(0)
   expect(ownerWarnings).toEqual([])
 })
 
 test("moves blocking work to the background with Ctrl+B", async ({ page }) => {
-  await setupTimeline(page, { currentMessages: [user, assistant(false, true)] })
-  await expect(page.locator('[data-component="task-tool-card"]')).toBeVisible()
+  await setupTimeline(page, { sessionMessages: [user, assistant(false, true)] })
+  const card = page.locator('[data-component="task-tool-card"]')
+  await expect(card).toBeVisible()
+  await expect(card).toContainText("Inspect code")
+  await expect(card).not.toContainText("(background)")
   await expect(page.getByText("Called `subagent`", { exact: false })).toHaveCount(0)
   await expect(page.locator('[data-component="background-tool-control"]')).toHaveCount(0)
   await expect(page.locator('[data-action="session-background-toggle"]')).toContainText("Move 1 subagent to background")
@@ -78,10 +91,15 @@ test("moves blocking work to the background with Ctrl+B", async ({ page }) => {
   await request
 })
 
+test("waits for completion before labeling requested background work", async ({ page }) => {
+  await setupTimeline(page, { sessionMessages: [user, assistant(false, true, undefined, true)] })
+  await expect(page.locator('[data-component="task-tool-card"]')).not.toContainText("(background)")
+})
+
 test("navigates from a running subagent card and hides background controls in the child", async ({ page }) => {
   const childID = "ses_running_child"
   await setupTimeline(page, {
-    currentMessages: [user, assistant(false, true, childID)],
+    sessionMessages: [user, assistant(false, true, childID)],
     sessions: [session(), session({ id: childID, parentID: sessionID, title: "Sleep for 5 minutes" })],
     sessionStatus: { [sessionID]: { type: "busy" }, [childID]: { type: "busy" } },
   })
@@ -95,7 +113,7 @@ test("navigates from a running subagent card and hides background controls in th
 test("shows a badge for active background work", async ({ page }) => {
   const childID = "ses_background_child"
   await setupTimeline(page, {
-    currentMessages: [user, assistant(true)],
+    sessionMessages: [user, assistant(true)],
     sessions: [session(), session({ id: childID, parentID: sessionID })],
     sessionStatus: { [childID]: { type: "busy" } },
   })
@@ -106,8 +124,8 @@ test("shows a badge for active background work", async ({ page }) => {
 test("separates blocking and already-backgrounded work into two rows", async ({ page }) => {
   const backgroundID = "ses_background_existing"
   const blockingID = "ses_background_blocking"
-  await setupTimeline(page, {
-    currentMessages: [
+  const timeline = await setupTimeline(page, {
+    sessionMessages: [
       user,
       {
         id: "msg_backgrounded",
@@ -176,9 +194,21 @@ test("separates blocking and already-backgrounded work into two rows", async ({
   })
 
   const dock = page.locator('[data-component="session-background-dock"]')
+  const backgroundCard = page.locator('[data-timeline-part-id="call_backgrounded"]')
   await expect(dock).toContainText("Move 1 subagent to background")
   await expect(dock.getByText("Running 1 shell and 1 subagent in background", { exact: true })).toBeVisible()
+  await expect(backgroundCard).toContainText("Background task (background)")
+  await expect(backgroundCard.locator('[data-component="session-progress-indicator-v2"]')).toBeVisible()
   await expect(
     page.locator('[data-timeline-part-id="call_shell_backgrounded"] [data-component="text-shimmer"]'),
   ).toHaveAttribute("data-active", "true")
+
+  await timeline.transport.send({
+    id: "evt_background_succeeded",
+    created: Date.now(),
+    type: "session.execution.succeeded",
+    data: { sessionID: backgroundID },
+  } as never)
+  await expect(backgroundCard.locator('[data-component="session-progress-indicator-v2"]')).toHaveCount(0)
+  await expect(backgroundCard).toContainText("Background task (background)")
 })

packages/app/e2e/regression/session-timeline-projection.spec.ts

@@ -71,33 +71,20 @@ test.describe("session timeline projection", () => {
   test("projects gaps, dividers, assistant parts, and errors together", async ({ page }) => {
     const firstUser = userMessage(
       [
-        userText("The user made the following comment regarding lines 4 through 8 of src/a.ts: Keep this stable", {
-          id: "prt_comment",
-          synthetic: true,
-          metadata: {
-            opencodeComment: {
-              path: "src/a.ts",
-              selection: { startLine: 4, startChar: 0, endLine: 8, endChar: 0 },
-              comment: "Keep this stable",
-            },
-          },
-        }),
+        userText("Keep this stable", { id: "prt_comment" }),
         userText("Continue after the comment", { id: "prt_visible_user" }),
       ],
       { summary: { diffs: Array.from({ length: 11 }, (_, index) => summaryDiff(index)) } },
     )
     const aborted = assistantMessage([{ id: "prt_before_abort", type: "text", text: "Before interruption" }], {
       id: "msg_1001_assistant_aborted",
-      error: { name: "MessageAbortedError", data: { message: "Stopped" } },
+      error: { type: "MessageAbortedError", message: "Stopped" },
     })
     const failed = assistantMessage([{ id: "prt_after_abort", type: "text", text: "After interruption" }], {
       id: "msg_1002_assistant_failed",
       error: {
-        name: "APIError",
-        data: {
-          message: JSON.stringify({ error: { type: "provider_error", message: "Visible provider failure" } }),
-          isRetryable: false,
-        },
+        type: "APIError",
+        message: "Visible provider failure",
       },
       created: 1700000003000,
     })
@@ -122,52 +109,11 @@ test.describe("session timeline projection", () => {
     await expect(page.locator('[data-timeline-row="TurnGap"]')).toBeVisible()
   })
 
-  test("renders legacy synthetic comments as ordinary V2 user text", async ({ page }) => {
-    const user = userMessage(
-      [
-        userText("The user made the following comment regarding lines 4 through 8 of src/a.ts: Keep this stable", {
-          id: "prt_comment_only",
-          synthetic: true,
-          metadata: {
-            opencodeComment: {
-              path: "src/a.ts",
-              selection: { startLine: 4, startChar: 0, endLine: 8, endChar: 0 },
-              comment: "Keep this stable",
-            },
-          },
-        }),
-        userText("Continue after the comment", { id: "prt_comment_visible" }),
-      ],
-      { summary: { diffs: Array.from({ length: 11 }, (_, index) => summaryDiff(index)) } },
-    )
-    const nextUser = userMessage(undefined, { id: "msg_2000_diff_next_user", created: 1700000010000 })
-    const nextAssistant = assistantMessage([], {
-      id: "msg_2001_diff_next_assistant",
-      parentID: "msg_2000_diff_next_user",
-      created: 1700000011000,
-    })
-    await setupTimeline(page, {
-      messages: [user, assistantMessage(), nextUser, nextAssistant],
-      settings: { newLayoutDesigns: false },
-    })
-    const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-    await scroller.evaluate((element) => (element.scrollTop = 0))
-
-    await expect(
-      page.getByText(
-        "The user made the following comment regarding lines 4 through 8 of src/a.ts: Keep this stable Continue after the comment",
-        { exact: true },
-      ),
-    ).toBeVisible()
-    await expect(page.locator('[data-timeline-row="CommentStrip"]')).toHaveCount(0)
-    await expect(page.locator('[data-timeline-row="DiffSummary"]')).toHaveCount(0)
-  })
-
   test("renders interruption independently when the turn is not compacted", async ({ page }) => {
     const user = userMessage()
     const before = assistantMessage([{ id: "prt_before", type: "text", text: "Before" }], {
       id: "msg_1001_before",
-      error: { name: "MessageAbortedError", data: { message: "Stopped" } },
+      error: { type: "MessageAbortedError", message: "Stopped" },
     })
     const after = assistantMessage([{ id: "prt_after", type: "text", text: "After" }], {
       id: "msg_1002_after",
@@ -280,6 +226,7 @@ function summaryDiff(index: number) {
     file: `src/diff-${index}.ts`,
     additions: 1,
     deletions: 1,
+    status: "modified" as const,
     patch: `@@ -1 +1 @@\n-export const value = ${index}\n+export const value = ${index + 1}`,
   }
 }

packages/app/e2e/regression/session-timeline-reducer-projection.spec.ts

@@ -4,6 +4,7 @@ import {
   completedAssistantInfo,
   messageUpdated,
   partUpdated,
+  renderedPartID,
   setupTimeline,
   shell,
   status,
@@ -23,11 +24,10 @@ test("groups singleton and separated context operations at correct boundaries",
   ]
   await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
 
-  await expect(
-    page.locator('[data-timeline-part-ids="prt_boundary_01_read,prt_boundary_03_glob,prt_boundary_04_grep"]'),
-  ).toBeVisible()
+  await expect(page.locator('[data-timeline-part-ids="prt_boundary_01_read"]')).toBeVisible()
+  await expect(page.locator('[data-timeline-part-ids="prt_boundary_03_glob,prt_boundary_04_grep"]')).toBeVisible()
   await expect(page.locator('[data-timeline-part-ids="prt_boundary_06_list"]')).toBeVisible()
-  await expect(page.locator('[data-timeline-row="AssistantPart"]')).toHaveCount(4)
+  await expect(page.locator('[data-timeline-row="AssistantPart"]')).toHaveCount(5)
 })
 
 test("reducer-hardening: converges when idle arrives before final part and message completion", async ({ page }) => {
@@ -37,8 +37,10 @@ test("reducer-hardening: converges when idle arrives before final part and messa
   await timeline.send(status("busy"), 100)
   await timeline.send(status("idle"), 100)
   await timeline.send(partUpdated(textPart(textID, "Final after early idle")), 120)
-  await timeline.send(messageUpdated(completedAssistantInfo(assistant.info)), 250)
+  await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 250)
 
   await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-  await expect(page.locator(`[data-timeline-part-id="${textID}"]`)).toContainText("Final after early idle")
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID(textID)}"]`)).toContainText(
+    "Final after early idle",
+  )
 })

packages/app/e2e/regression/session-timeline-shell-outline.spec.ts

@@ -13,7 +13,7 @@ for (const deviceScaleFactor of [1.25, 1.5]) {
     const shellID = "prt_shell_outline"
     const timeline = await setupTimeline(page, {
       messages: [userMessage(), assistantMessage([shell(shellID, "completed", "shell output")])],
-      settings: { newLayoutDesigns: true, shellToolPartsExpanded: true },
+      settings: { shellToolPartsExpanded: true },
       reducedMotion: true,
       deviceScaleFactor,
     })
@@ -82,7 +82,7 @@ test("keeps the patch card inside a fractionally short virtual row", async ({ pa
         toolPart(patchID, "apply_patch", "completed", { files: [file.filePath] }, { metadata: { files: [file] } }),
       ]),
     ],
-    settings: { editToolPartsExpanded: true, newLayoutDesigns: true },
+    settings: { editToolPartsExpanded: true },
     reducedMotion: true,
   })
   const part = page.locator(`[data-timeline-part-id="${patchID}"]`)
@@ -131,6 +131,7 @@ test("allows paint rounding for every framed row but not fixed turn gaps", async
               file: "src/summary.ts",
               additions: 1,
               deletions: 1,
+              status: "modified",
               patch: "@@ -1 +1 @@\n-export const value = 1\n+export const value = 2",
             },
           ],

packages/app/e2e/regression/session-timeline-tool-projection.spec.ts

@@ -83,6 +83,65 @@ test("labels all web search provider variants", async ({ page }) => {
   await expect(page.getByRole("button", { name: /^Web Search/ })).toBeVisible()
 })
 
+test("labels completed searches with result counts", async ({ page }) => {
+  const glob = "prt_glob_count"
+  const grep = "prt_grep_count"
+  await setupTimeline(page, {
+    messages: [
+      userMessage(),
+      assistantMessage([
+        toolPart(glob, "glob", "completed", { path: ".", pattern: "**/*.ts" }, { metadata: { count: 1 } }),
+        toolPart(grep, "grep", "completed", { path: ".", pattern: "value" }, { metadata: { matches: 12 } }),
+      ]),
+    ],
+  })
+
+  const group = page.locator(`[data-timeline-part-ids="${glob},${grep}"]`)
+  await group.locator('[data-slot="collapsible-trigger"]').click()
+  const rows = group.locator('[data-component="tool-trigger"]')
+  await expect(rows.nth(0)).toContainText("(1 match)")
+  await expect(rows.nth(1)).toContainText("(12 matches)")
+})
+
+test("labels V2 read tools from their path input", async ({ page }) => {
+  const id = "prt_read_path"
+  await setupTimeline(page, {
+    messages: [userMessage(), assistantMessage([toolPart(id, "read", "completed", { path: "src/a.ts" })])],
+  })
+
+  const group = page.locator(`[data-timeline-part-ids="${id}"]`)
+  await group.locator('[data-slot="collapsible-trigger"]').click()
+  await expect(group.locator('[data-slot="basic-tool-tool-subtitle"]')).toHaveText("a.ts")
+})
+
+test("labels V2 skill tools from IDs and result metadata", async ({ page }) => {
+  const pending = "prt_skill_id"
+  const completed = "prt_skill_name"
+  await setupTimeline(page, {
+    messages: [
+      userMessage(),
+      assistantMessage([
+        toolPart(pending, "skill", "running", { id: "sample-skill" }),
+        toolPart(completed, "skill", "completed", { id: "opencode" }, { metadata: { name: "OpenCode" } }),
+      ]),
+    ],
+  })
+
+  await expect(page.locator(`[data-timeline-part-id="${pending}"] [data-component="text-shimmer"]`)).toHaveAttribute(
+    "aria-label",
+    "sample-skill",
+  )
+  await expect(
+    page.locator(`[data-timeline-part-id="${completed}"] [data-component="text-shimmer"]`),
+  ).toHaveAttribute("aria-label", "OpenCode")
+  for (const id of [pending, completed]) {
+    const skill = page.locator(`[data-timeline-part-id="${id}"]`)
+    await expect(skill.locator('[data-slot="skill-tool-label"]')).toHaveText("Skill")
+    await expect(skill.locator('[data-slot="skill-tool-separator"]')).toHaveText("·")
+    await expect(skill.locator('use[href="#opencode-v2-icon-post-skill"]')).toBeVisible()
+  }
+})
+
 function questionInput() {
   return { questions: [{ header: "Stability", question: "Keep it stable?", options: [] }] }
 }

packages/app/e2e/regression/session-timeline-tool-state.spec.ts

@@ -1,77 +0,0 @@
-import { expect, test } from "@playwright/test"
-import {
-  assistantMessage,
-  partUpdated,
-  setupTimeline,
-  toolPart,
-  userMessage,
-} from "../performance/timeline-stability/fixture"
-
-test("updates expanded web search links without resetting expansion", async ({ page }) => {
-  const searchID = "prt_websearch_mutation"
-  const input = { query: "timeline stability" }
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([toolPart(searchID, "websearch", "completed", input, { output: "https://example.com/one" })]),
-    ],
-  })
-  const wrapper = page.locator(`[data-timeline-part-id="${searchID}"]`)
-  const trigger = wrapper.locator('[data-slot="collapsible-trigger"]')
-  await trigger.click()
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await timeline.send(
-    partUpdated(
-      toolPart(searchID, "websearch", "completed", input, {
-        output: "https://example.com/one\nhttps://example.com/two",
-      }),
-    ),
-    300,
-  )
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await expect(wrapper.locator('a[href="https://example.com/two"]')).toBeVisible()
-})
-
-test("preserves an expanded tool error card across duplicate delivery", async ({ page }) => {
-  const toolID = "prt_duplicate_error"
-  const failed = toolPart(toolID, "bash", "error", { command: "exit 1" }, { error: "Command failed visibly" })
-  const timeline = await setupTimeline(page, { messages: [userMessage(), assistantMessage([failed])] })
-  const wrapper = page.locator(`[data-timeline-part-id="${toolID}"]`)
-  const trigger = wrapper.locator('[data-slot="collapsible-trigger"]')
-  await trigger.click()
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await timeline.send(partUpdated(failed), 150)
-  await timeline.send(partUpdated(failed), 250)
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await expect(wrapper).toContainText("Command failed visibly")
-})
-
-test("renders multiple question answers and preserves open state on answer updates", async ({ page }) => {
-  const questionID = "prt_multi_question"
-  const input = {
-    questions: [
-      { header: "First", question: "First choice?", options: [] },
-      { header: "Second", question: "Second choice?", options: [], multiple: true },
-    ],
-  }
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([
-        toolPart(questionID, "question", "completed", input, { metadata: { answers: [["A"], ["B", "C"]] } }),
-      ]),
-    ],
-  })
-  const wrapper = page.locator(`[data-timeline-part-id="${questionID}"]`)
-  const trigger = wrapper.locator('[data-slot="collapsible-trigger"]')
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await timeline.send(
-    partUpdated(
-      toolPart(questionID, "question", "completed", input, { metadata: { answers: [["Updated"], ["B", "C"]] } }),
-    ),
-    300,
-  )
-  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await expect(wrapper).toContainText("Updated")
-  await expect(wrapper).toContainText("B, C")
-})

packages/app/e2e/regression/session-timeline-transport.spec.ts

@@ -1,43 +1,44 @@
 import { expect, test, type Page } from "@playwright/test"
-import { partUpdated, setupTimeline, textPart } from "../performance/timeline-stability/fixture"
+import { partUpdated, renderedPartID, setupTimeline, textPart } from "../performance/timeline-stability/fixture"
 
 test("keeps one connection open while delivering multiple events", async ({ page }) => {
   const timeline = await setupTimeline(page)
 
-  const first = await timeline.transport.send(partUpdated(textPart("prt_transport_first", "first event")))
-  const second = await timeline.transport.send(partUpdated(textPart("prt_transport_second", "second event")))
+  const first = (await timeline.transport.burst(partUpdated(textPart("prt_transport_first", "first event")))).at(-1)!
+  const second = (await timeline.transport.burst(partUpdated(textPart("prt_transport_second", "second event")))).at(-1)!
 
   await timeline.waitForPart("prt_transport_first")
   await timeline.waitForPart("prt_transport_second")
   expect(first.connectionID).toBe(second.connectionID)
   await expect.poll(async () => (await timeline.transport.connections()).length).toBe(1)
-  expect(await timeline.transport.acknowledgements()).toHaveLength(2)
+  expect(await timeline.transport.acknowledgements()).toHaveLength(4)
 })
 
 test("delivers a burst from one stream chunk", async ({ page }) => {
   const timeline = await setupTimeline(page)
   const acknowledgements = await timeline.transport.burst([
-    partUpdated(textPart("prt_transport_burst_a", "burst a")),
-    partUpdated(textPart("prt_transport_burst_b", "burst b")),
+    ...partUpdated(textPart("prt_transport_burst_a", "burst a")),
+    ...partUpdated(textPart("prt_transport_burst_b", "burst b")),
   ])
 
   await timeline.waitForPart("prt_transport_burst_a")
   await timeline.waitForPart("prt_transport_burst_b")
-  expect(acknowledgements.map((item) => item.chunkCount)).toEqual([1, 1])
-  expect(new Set(acknowledgements.map((item) => item.deliveryID)).size).toBe(2)
+  expect(acknowledgements.map((item) => item.chunkCount)).toEqual([1, 1, 1, 1])
+  expect(new Set(acknowledgements.map((item) => item.deliveryID)).size).toBe(4)
 })
 
 test("parses split JSON and a split multibyte code point", async ({ page }) => {
   const timeline = await setupTimeline(page)
-  const payload = partUpdated(textPart("prt_transport_split", "split snowman \u2603\u2603\u2603"))
+  const [started, payload] = partUpdated(textPart("prt_transport_split", "split snowman \u2603\u2603\u2603"))
+  await timeline.transport.send(started!)
   const encoded = new TextEncoder().encode(`data: ${JSON.stringify(payload)}\n\n`)
   const snowman = new TextEncoder().encode("\u2603")[0]!
   const multibyte = encoded.indexOf(snowman)
 
-  const acknowledgement = await timeline.transport.split(payload, [9, multibyte + 1, multibyte + 2])
+  const acknowledgement = await timeline.transport.split(payload!, [9, multibyte + 1, multibyte + 2])
 
   await timeline.waitForPart("prt_transport_split")
-  await expect(page.locator('[data-timeline-part-id="prt_transport_split"]')).toContainText(
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID("prt_transport_split")}"]`)).toContainText(
     "split snowman \u2603\u2603\u2603",
   )
   expect(acknowledgement.chunkCount).toBe(4)
@@ -46,12 +47,11 @@ test("parses split JSON and a split multibyte code point", async ({ page }) => {
 test("delivers server heartbeat without mutating the timeline", async ({ page }) => {
   const timeline = await setupTimeline(page)
   const partID = "prt_transport_heartbeat_sentinel"
-  const sentinel = await timeline.transport.send(partUpdated(textPart(partID, "heartbeat sentinel")))
+  const sentinel = (await timeline.transport.burst(partUpdated(textPart(partID, "heartbeat sentinel")))).at(-1)!
   await timeline.waitForPart(partID)
-  await expect(page.locator(`[data-timeline-part-id="${partID}"] [data-component="markdown"]`)).toHaveAttribute(
-    "data-markdown-ready",
-    "",
-  )
+  await expect(
+    page.locator(`[data-timeline-part-id="${renderedPartID(partID)}"] [data-component="markdown"]`),
+  ).toHaveAttribute("data-markdown-ready", "")
   const before = await timelineRows(page)
   const heartbeat = await timeline.transport.heartbeat()
 
@@ -66,7 +66,7 @@ test("reconnects after a clean close", async ({ page }) => {
 
   await timeline.transport.close()
   const second = await timeline.transport.waitForConnection({ after: first.id })
-  await timeline.transport.send(partUpdated(textPart("prt_transport_close", "after close")))
+  await timeline.transport.burst(partUpdated(textPart("prt_transport_close", "after close")))
 
   await timeline.waitForPart("prt_transport_close")
   expect(second.id).toBeGreaterThan(first.id)
@@ -79,7 +79,7 @@ test("reconnects after a stream error", async ({ page }) => {
 
   await timeline.transport.error("contract failure")
   const second = await timeline.transport.waitForConnection({ after: first.id })
-  await timeline.transport.send(partUpdated(textPart("prt_transport_error", "after error")))
+  await timeline.transport.burst(partUpdated(textPart("prt_transport_error", "after error")))
 
   await timeline.waitForPart("prt_transport_error")
   await expect.poll(async () => (await timeline.transport.connections()).length).toBe(2)
@@ -89,9 +89,13 @@ test("reconnects after a stream error", async ({ page }) => {
 
 test("does not request replay when reconnecting the volatile V2 event stream", async ({ page }) => {
   const timeline = await setupTimeline(page, { eventRetry: 10 })
-  const first = await timeline.transport.send(partUpdated(textPart("prt_transport_id", "event with id")), {
-    id: "timeline-event-7",
-  })
+  const events = partUpdated(textPart("prt_transport_id", "event with id"))
+  const first = (
+    await timeline.transport.burst(
+      events,
+      events.map((_, index) => (index === events.length - 1 ? { id: "timeline-event-7" } : {})),
+    )
+  ).at(-1)!
   await timeline.waitForPart("prt_transport_id")
 
   await timeline.transport.error("retry with event id")

packages/app/e2e/regression/session-todo-dock-navigation.spec.ts

@@ -1,170 +0,0 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { expect, test, type Page } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:/OpenCode/TodoDockNavigation"
-const projectID = "proj_todo_dock_navigation"
-const sourceID = "ses_todo_dock_source"
-const otherID = "ses_todo_dock_other"
-const sourceTitle = "Todo dock animation"
-const otherTitle = "Separate session"
-
-const activeTodos = [
-  { id: "todo-1", content: "Receive todos in the active session", status: "completed", priority: "high" },
-  { id: "todo-2", content: "Keep the dock visible across tabs", status: "completed", priority: "high" },
-  { id: "todo-3", content: "Close after the final todo", status: "in_progress", priority: "high" },
-]
-
-type EventPayload = {
-  directory: string
-  payload: Record<string, unknown>
-}
-
-test.use({ viewport: { width: 1440, height: 900 }, reducedMotion: "no-preference" })
-
-test("animates todo opening without replaying it across session tabs", async ({ page }) => {
-  test.setTimeout(90_000)
-  const events: EventPayload[] = []
-  const todos: Record<string, typeof activeTodos> = { [sourceID]: [], [otherID]: [] }
-  const sessionStatus: Record<string, { type: "busy" | "idle" }> = {}
-
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "todo-dock-navigation",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: {
-            "claude-opus-4-6": {
-              id: "claude-opus-4-6",
-              name: "Claude Opus 4.6",
-              limit: { context: 200_000 },
-            },
-          },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "claude-opus-4-6" },
-    },
-    sessions: [session(sourceID, sourceTitle, 1700000000000), session(otherID, otherTitle, 1700000001000)],
-    sessionStatus: { [sourceID]: { type: "busy" } },
-    pageMessages: () => ({ items: [] }),
-    events: () => events.splice(0, 1),
-    eventRetry: 16,
-    sessionStatus: () => sessionStatus,
-    todos: (sessionID) => todos[sessionID] ?? [],
-  })
-  await configurePage(page)
-
-  await page.goto(sessionHref(sourceID))
-  await expectSessionTitle(page, sourceTitle)
-  const dock = page.locator('[data-component="session-todo-dock"]')
-  await expect(dock).toHaveCount(0)
-
-  sessionStatus[sourceID] = { type: "busy" }
-  events.push(statusEvent(sourceID, "busy"))
-  await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
-
-  await page.waitForTimeout(700)
-  const opening = sampleDock(page, 1_000)
-  todos[sourceID] = activeTodos
-  events.push(todoEvent(sourceID, activeTodos))
-  await expect(dock).toBeVisible()
-  await expect(dock.locator('[data-state="in_progress"]')).toHaveCount(1)
-  expect((await opening).some((sample) => sample.opacity > 0.05 && sample.opacity < 0.95)).toBe(true)
-
-  await switchSession(page, otherID, otherTitle)
-  await expect(dock).toHaveCount(0)
-
-  await switchSession(page, sourceID, sourceTitle)
-  await expect(dock).toHaveCount(0)
-})
-
-function session(id: string, title: string, created: number) {
-  return {
-    id,
-    slug: id,
-    projectID,
-    directory,
-    title,
-    version: "dev",
-    time: { created, updated: created },
-  }
-}
-
-function statusEvent(sessionID: string, type: "busy" | "idle"): EventPayload {
-  return {
-    directory,
-    payload: { type: "session.status", properties: { sessionID, status: { type } } },
-  }
-}
-
-function todoEvent(sessionID: string, next: typeof activeTodos): EventPayload {
-  return {
-    directory,
-    payload: { type: "todo.updated", properties: { sessionID, todos: next } },
-  }
-}
-
-async function configurePage(page: Page) {
-  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-  await page.addInitScript(
-    ({ directory, dirBase64, server, sessionIDs }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify(sessionIDs.map((sessionId) => ({ type: "session", server, dirBase64, sessionId }))),
-      )
-    },
-    { directory, dirBase64: base64Encode(directory), server, sessionIDs: [sourceID, otherID] },
-  )
-}
-
-function sessionHref(sessionID: string) {
-  const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-  return `/server/${base64Encode(server)}/session/${sessionID}`
-}
-
-async function switchSession(page: Page, sessionID: string, title: string) {
-  const href = sessionHref(sessionID)
-  const tab = page.locator(`[data-slot="titlebar-tabs"] a[href="${href}"]`).first()
-  await expect(tab).toBeVisible()
-  await tab.click()
-  await expectSessionTitle(page, title)
-}
-
-function sampleDock(page: Page, duration: number) {
-  return page.evaluate(async (duration) => {
-    const samples: { present: boolean; height: number; opacity: number }[] = []
-    const start = performance.now()
-    while (performance.now() - start < duration) {
-      const dock = document.querySelector<HTMLElement>('[data-component="session-todo-dock"]')
-      const clip = dock?.parentElement?.parentElement
-      const label = dock?.querySelector<HTMLElement>('[data-action="session-todo-toggle"] span[aria-label]')
-      samples.push({
-        present: !!dock,
-        height: clip?.getBoundingClientRect().height ?? 0,
-        opacity: label ? Number.parseFloat(getComputedStyle(label).opacity) : 0,
-      })
-      await new Promise(requestAnimationFrame)
-    }
-    return samples
-  }, duration)
-}

packages/app/e2e/regression/subagent-child-navigation.spec.ts

@@ -1,4 +1,5 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
+import type { OpenCodeEvent, SessionMessageInfo } from "@opencode-ai/client/promise"
 import { expect, test, type Page } from "@playwright/test"
 import { currentSession, mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -12,8 +13,6 @@ const childTitle = "Subagent child session"
 // Child session pages derive their heading from the task part that spawned them.
 const taskDescription = "Inspect child navigation"
 
-type EventPayload = { directory: string; payload: Record<string, unknown> }
-
 test.use({ viewport: { width: 1440, height: 900 } })
 
 test("navigates to a subagent child session missing from the session list", async ({ page }) => {
@@ -27,7 +26,7 @@ test("navigates to a subagent child session missing from the session list", asyn
   await expect(titlebarRight.getByRole("button", { name: "Toggle review" })).toHaveCount(1)
 })
 
-test("keeps the parent visible while child lineage resolves", async ({ page }) => {
+test("keeps the parent visible while the child session resolves", async ({ page }) => {
   await setup(page)
   const requested = Promise.withResolvers<void>()
   const release = Promise.withResolvers<void>()
@@ -52,14 +51,18 @@ test("keeps the parent visible while child lineage resolves", async ({ page }) =
 })
 
 test("shows the not found fallback when the viewed session is deleted", async ({ page }) => {
-  const events: EventPayload[] = []
+  const events: OpenCodeEvent[] = []
   await setup(page, () => events.splice(0, 1))
   await openChildFromParent(page)
   await expectSessionTitle(page, taskDescription)
 
   events.push({
-    directory,
-    payload: { type: "session.deleted", properties: { info: childSession() } },
+    id: "evt_session_deleted",
+    created: 1700000003000,
+    type: "session.deleted",
+    durable: { aggregateID: childID, seq: 1, version: 2 },
+    location: { directory },
+    data: { sessionID: childID },
   })
 
   await expect(page.getByText("This session cannot be found")).toBeVisible()
@@ -67,7 +70,7 @@ test("shows the not found fallback when the viewed session is deleted", async ({
   await expect(page.getByRole("heading", { name: taskDescription })).toHaveCount(0)
 })
 
-async function setup(page: Page, events?: () => EventPayload[]) {
+async function setup(page: Page, events?: () => OpenCodeEvent[]) {
   await mockOpenCodeServer(page, {
     directory,
     project: {
@@ -142,60 +145,36 @@ function childSession() {
   return session(childID, childTitle, 1700000001000, { parentID })
 }
 
-function parentMessages() {
+function parentMessages(): SessionMessageInfo[] {
   const userID = "msg_user_0001"
   const assistantID = "msg_assistant_0001"
   return [
     {
-      info: {
-        id: userID,
-        sessionID: parentID,
-        role: "user",
-        time: { created: 1700000000000 },
-        agent: "build",
-        model: { providerID: "opencode", modelID: "claude-opus-4-6" },
-      },
-      parts: [
-        {
-          id: "prt_user_text_0001",
-          sessionID: parentID,
-          messageID: userID,
-          type: "text",
-          text: "Delegate work to a subagent",
-        },
-      ],
+      id: userID,
+      type: "user",
+      time: { created: 1700000000000 },
+      text: "Delegate work to a subagent",
     },
     {
-      info: {
-        id: assistantID,
-        sessionID: parentID,
-        role: "assistant",
-        time: { created: 1700000001000, completed: 1700000002000 },
-        parentID: userID,
-        modelID: "claude-opus-4-6",
-        providerID: "opencode",
-        mode: "build",
-        agent: "build",
-        path: { cwd: directory, root: directory },
-        cost: 0.01,
-        tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-        finish: "stop",
-      },
-      parts: [
+      id: assistantID,
+      type: "assistant",
+      time: { created: 1700000001000, completed: 1700000002000 },
+      model: { id: "claude-opus-4-6", providerID: "opencode" },
+      agent: "build",
+      cost: 0.01,
+      tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+      finish: "stop",
+      content: [
         {
-          id: "prt_tool_task_0001",
-          sessionID: parentID,
-          messageID: assistantID,
           type: "tool",
-          callID: "call_task_0001",
-          tool: "task",
+          id: "call_task_0001",
+          name: "task",
+          time: { created: 1700000001000, ran: 1700000001000, completed: 1700000002000 },
           state: {
             status: "completed",
             input: { description: taskDescription, subagent_type: "explore" },
-            output: "Subagent finished",
-            title: taskDescription,
+            content: [{ type: "text", text: "Subagent finished" }],
             metadata: { sessionId: childID },
-            time: { start: 1700000001000, end: 1700000002000 },
           },
         },
       ],
@@ -207,7 +186,6 @@ async function configurePage(page: Page) {
   const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
   await page.addInitScript(
     ({ directory, server, sessionId }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/regression/tab-navigate-mousedown.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test, type Page, type Route } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { currentSession } from "../utils/mock-server"
 
 const server = "http://127.0.0.1:4096"
@@ -12,7 +12,6 @@ test("pressing mouse down on a tab navigates before mouse up", async ({ page })
   await mockServer(page)
   await page.addInitScript(
     ({ server, sessionA, sessionB }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.window.browser.dat:tabs",
         JSON.stringify([
@@ -46,7 +45,6 @@ test("keyboard navigation follows the visible tab order", async ({ page }) => {
   await mockServer(page)
   await page.addInitScript(
     ({ server, sessionA, unresolved, sessionC }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.window.browser.dat:tabs",
         JSON.stringify([
@@ -87,50 +85,38 @@ async function mockServer(page: Page) {
   await page.route("**/*", async (route) => {
     const url = new URL(route.request().url())
     if (url.origin !== server) return route.fallback()
-    if ([`/api/session/${unresolvedSessionID}`, `/session/${unresolvedSessionID}`].includes(url.pathname))
-      return new Promise(() => {})
+    if (url.pathname === `/api/session/${unresolvedSessionID}`) return new Promise(() => {})
     if (url.pathname === "/api/event") return sse(route)
-    if (url.pathname === "/api/session") return json(route, { data: sessions.map(currentSession), cursor: {} })
+    if (url.pathname === "/api/session")
+      return json(route, { data: sessions.map((session) => currentSession(session)), cursor: {} })
     if (url.pathname === "/api/session/active") return json(route, { data: {} })
     const currentSessionInfo = sessions.find((item) => url.pathname === `/api/session/${item.id}`)
     if (currentSessionInfo) return json(route, { data: currentSession(currentSessionInfo) })
     if (sessions.some((item) => url.pathname === `/api/session/${item.id}/message`))
       return json(route, { data: [], cursor: {} })
-    if (/^\/session\/[^/]+$/.test(url.pathname)) return json(route, { name: "NotFoundError" }, 404)
-    if (/^\/session\/[^/]+\/message$/.test(url.pathname)) return json(route, [])
-    if (/^\/session\/[^/]+\/(children|todo|diff)$/.test(url.pathname)) return json(route, [])
-    if (["/skill", "/command", "/lsp", "/formatter", "/permission", "/question", "/vcs/diff"].includes(url.pathname))
-      return json(route, [])
-    if (url.pathname === "/provider")
-      return json(route, { all: [], connected: [], default: { providerID: "", modelID: "" } })
-    if (url.pathname === "/agent") return json(route, [{ name: "build", mode: "primary" }])
-    if (url.pathname === "/project" || url.pathname === "/project/current") {
+    if (["/api/agent", "/api/provider", "/api/model", "/api/command", "/api/reference"].includes(url.pathname))
+      return json(route, { location: { directory: sessionA.directory }, data: [] })
+    if (url.pathname === "/api/model/default")
+      return json(route, { location: { directory: sessionA.directory }, data: null })
+    if (url.pathname === "/api/permission/request" || url.pathname === "/api/question/request")
+      return json(route, { location: { directory: sessionA.directory }, data: [] })
+    if (url.pathname === "/api/mcp") return json(route, { location: { directory: sessionA.directory }, data: [] })
+    if (url.pathname === "/api/mcp/resource")
+      return json(route, { location: { directory: sessionA.directory }, data: { resources: [], templates: [] } })
+    if (url.pathname === "/api/project" || url.pathname === "/api/project/current") {
       const project = {
         id: sessionA.projectID,
-        worktree: sessionA.directory,
+        canonical: sessionA.directory,
         vcs: "git",
         time: { created: 1, updated: 1 },
         sandboxes: [],
       }
-      return json(route, url.pathname === "/project" ? [project] : project)
+      return json(
+        route,
+        url.pathname === "/api/project" ? [project] : { id: project.id, directory: sessionA.directory },
+      )
     }
-    if (url.pathname === "/path")
-      return json(route, {
-        state: sessionA.directory,
-        config: sessionA.directory,
-        worktree: sessionA.directory,
-        directory: sessionA.directory,
-        home: sessionA.directory,
-      })
-    if (url.pathname === "/api/path")
-      return json(route, {
-        state: sessionA.directory,
-        config: sessionA.directory,
-        worktree: sessionA.directory,
-        directory: sessionA.directory,
-        home: sessionA.directory,
-      })
-    if (url.pathname === "/vcs") return json(route, { branch: "main", default_branch: "main" })
+    if (url.pathname === "/api/location") return json(route, { directory: sessionA.directory })
     if (url.pathname === "/api/vcs")
       return json(route, {
         location: { directory: sessionA.directory },

packages/app/e2e/regression/terminal-composer-focus.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode, checksum } from "@opencode-ai/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -8,12 +8,12 @@ const projectID = "proj_terminal_composer_focus"
 const sessionID = "ses_terminal_composer_focus"
 const ptyID = "pty_terminal_composer_focus"
 const newPtyID = "pty_terminal_composer_focus_new"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test.use({ viewport: { width: 1440, height: 900 } })
 
 test.beforeEach(async ({ page }) => {
   await mockOpenCodeServer(page, {
-    protocol: "v2",
     directory,
     project: {
       id: projectID,
@@ -71,13 +71,10 @@ test.beforeEach(async ({ page }) => {
     }),
   )
   await page.routeWebSocket(new RegExp(`/api/pty/${ptyID}/connect`), () => undefined)
-  await page.addInitScript(() => {
-    localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-  })
 })
 
 test("routes typing to the composer unless the open terminal is focused", async ({ page }) => {
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, "Terminal composer focus")
 
   const composer = page.locator('[data-component="prompt-input"]')
@@ -116,7 +113,7 @@ test("keeps composer focus when a cached terminal finishes mounting", async ({ p
   })
   await seedCachedTerminal(page)
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`, { waitUntil: "commit" })
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`, { waitUntil: "commit" })
   await expectSessionTitle(page, "Terminal composer focus")
 
   const composer = page.locator('[data-component="prompt-input"]')
@@ -142,7 +139,7 @@ test("keeps newer composer focus while an explicit terminal open finishes", asyn
     await route.continue()
   })
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, "Terminal composer focus")
 
   const composer = page.locator('[data-component="prompt-input"]')
@@ -187,7 +184,7 @@ test("focuses a terminal created from the new-terminal button", async ({ page })
   )
   await page.routeWebSocket(new RegExp(`/api/pty/${newPtyID}/connect`), () => undefined)
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, "Terminal composer focus")
 
   const composer = page.locator('[data-component="prompt-input"]')
@@ -214,12 +211,18 @@ function seedCachedTerminal(page: Page) {
         }),
       )
     },
-    { terminalKey: `${base64Encode(directory)}/terminal.v1`, ptyID },
+    { terminalKey: terminalStorageKey(), ptyID },
   )
 }
 
+function terminalStorageKey() {
+  const dir = base64Encode(directory)
+  const head = dir.slice(0, 12).replace(/[^a-zA-Z0-9._-]/g, "-")
+  return `opencode.workspace.${head}.${checksum(dir) ?? "0"}.dat:workspace:terminal`
+}
+
 function ptyLocation() {
-  return { directory, project: { id: projectID, directory } }
+  return { directory, project: { id: projectID, directory, canonical: directory } }
 }
 
 function ptyInfo(id: string, title: string) {

packages/app/e2e/regression/terminal-hidden.spec.ts

@@ -6,6 +6,7 @@ const directory = "C:/OpenCode/HiddenTerminalRegression"
 const projectID = "proj_hidden_terminal_regression"
 const sessionID = "ses_hidden_terminal_regression"
 const title = "Hidden terminal regression"
+const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 
 test("unmounts the terminal panel while it is hidden", async ({ page }) => {
   await page.setViewportSize({ width: 1400, height: 900 })
@@ -91,7 +92,7 @@ test("unmounts the terminal panel while it is hidden", async ({ page }) => {
   )
   await page.routeWebSocket("**/api/pty/pty_hidden_terminal/connect", () => undefined)
 
-  await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
+  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, title)
 
   await page.keyboard.press("Control+Backquote")

packages/app/e2e/regression/terminal-tab-switch.spec.ts

@@ -1,4 +1,4 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
+import { base64Encode } from "@opencode-ai/util/encode"
 import { expect, test, type Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectSessionTitle } from "../utils/waits"
@@ -121,7 +121,6 @@ async function setup(page: Page) {
 
   await page.addInitScript(
     ({ directory, server, sessions }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
       localStorage.setItem(
         "opencode.global.dat:server",
         JSON.stringify({

packages/app/e2e/smoke/session-timeline.fixture.ts

@@ -21,16 +21,29 @@ const words = [
   "vector",
 ]
 
-const serverKey = `http://127.0.0.1:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const serverKey = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 const sourceID = "ses_smoke_source"
 const targetID = "ses_smoke_target"
 const directory = "C:/OpenCode/SmokeProject"
 const projectID = "proj_smoke_timeline"
 const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }
 
-type MessageInfo = Record<string, unknown> & { id: string; role: "user" | "assistant" }
-type MessagePart = Record<string, unknown> & { id: string; type: string; text?: string; tool?: string }
-type Message = { info: MessageInfo; parts: MessagePart[] }
+type MessagePart = {
+  id: string
+  type: "text" | "reasoning" | "tool"
+  text?: string
+  time?: { start: number; end?: number }
+  callID?: string
+  tool?: string
+  state?: {
+    status: "completed"
+    input: Record<string, unknown>
+    output: string
+    title: unknown
+    metadata: Record<string, unknown>
+    time: { start: number; end: number }
+  }
+}
 
 function lorem(seed: number, length: number) {
   let out = ""
@@ -48,54 +61,59 @@ function id(prefix: string, value: number) {
   return `${prefix}_smoke_${String(value).padStart(4, "0")}`
 }
 
-function userMessage(sessionID: string, index: number, textLength: number, diffs: unknown[] = []): Message {
+function userMessage(_sessionID: string, index: number, textLength: number, diffs: unknown[] = []): SessionMessageInfo {
   const messageID = id("msg_user", index)
   return {
-    info: {
-      id: messageID,
-      sessionID,
-      role: "user",
-      time: { created: 1700000000000 + index * 10_000 },
-      summary: { diffs },
-      agent: "build",
-      model,
-    },
-    parts: [
-      {
-        id: id("prt_user_text", index),
-        sessionID,
-        messageID,
-        type: "text",
-        text: lorem(index, textLength),
-      },
-    ],
+    id: messageID,
+    type: "user",
+    time: { created: 1700000000000 + index * 10_000 },
+    text: lorem(index, textLength),
+    metadata: diffs.length ? { diffs: diffs as JsonValue } : undefined,
   }
 }
 
-function assistantMessage(sessionID: string, index: number, parentID: string, parts: MessagePart[]): Message {
+function assistantMessage(
+  _sessionID: string,
+  index: number,
+  _parentID: string,
+  parts: MessagePart[],
+): SessionMessageInfo {
   const messageID = id("msg_assistant", index)
   return {
-    info: {
-      id: messageID,
-      sessionID,
-      role: "assistant",
-      time: { created: 1700000000000 + index * 10_000 + 1_000, completed: 1700000000000 + index * 10_000 + 8_000 },
-      parentID,
-      modelID: model.modelID,
-      providerID: model.providerID,
-      mode: "build",
-      agent: "build",
-      path: { cwd: directory, root: directory },
-      cost: 0.01,
-      tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
-      variant: "max",
-      finish: "stop",
+    id: messageID,
+    type: "assistant",
+    time: { created: 1700000000000 + index * 10_000 + 1_000, completed: 1700000000000 + index * 10_000 + 8_000 },
+    model: { id: model.modelID, providerID: model.providerID, variant: model.variant },
+    agent: "build",
+    cost: 0.01,
+    tokens: { input: 100, output: 200, reasoning: 0, cache: { read: 0, write: 0 } },
+    finish: "stop",
+    content: parts.map(messageContent),
+  }
+}
+
+function messageContent(part: MessagePart): SessionMessageAssistant["content"][number] {
+  if (part.type === "text") return { type: "text", text: part.text ?? "" }
+  if (part.type === "reasoning")
+    return {
+      type: "reasoning",
+      text: part.text ?? "",
+      time: part.time
+        ? { created: part.time.start, ...(part.time.end === undefined ? {} : { completed: part.time.end }) }
+        : undefined,
+    }
+  const state = part.state!
+  return {
+    type: "tool",
+    id: part.callID ?? part.id,
+    name: part.tool!,
+    time: { created: state.time.start, ran: state.time.start, completed: state.time.end },
+    state: {
+      status: "completed",
+      input: state.input as Record<string, JsonValue>,
+      content: [{ type: "text", text: state.output }],
+      metadata: state.metadata as Record<string, JsonValue>,
     },
-    parts: parts.map((part) => ({
-      ...part,
-      sessionID,
-      messageID,
-    })),
   }
 }
 
@@ -180,7 +198,7 @@ function code(seed: number, lines: number) {
   )
 }
 
-function turn(index: number): Message[] {
+function turn(index: number): SessionMessageInfo[] {
   const diff = index % 9 === 0 ? [fileDiff(`src/generated/summary-${index}.ts`, index)] : []
   const user = userMessage(targetID, index, 100 + (index % 4) * 80, diff)
   const parts = [
@@ -219,33 +237,26 @@ function turn(index: number): Message[] {
       ? [toolPart(index, 12, "task", { description: "Inspect generated fixture", subagent_type: "explore" }, 160)]
       : []),
   ]
-  return [user, assistantMessage(targetID, index, user.info.id, parts)]
+  return [user, assistantMessage(targetID, index, user.id, parts)]
 }
 
-const targetMessages = Array.from({ length: 72 }, (_, index) => turn(index)).flat()
+const targetMessages = Array.from({ length: 101 }, (_, index) => turn(index)).flat()
 const sourceMessages = Array.from({ length: 12 }, (_, index) => [
   userMessage(sourceID, index + 1000, 120),
   assistantMessage(sourceID, index + 1000, id("msg_user", index + 1000), [textPart(index + 1000, 0, 240)]),
 ]).flat()
+const messages: Record<string, SessionMessageInfo[]> = { [sourceID]: sourceMessages, [targetID]: targetMessages }
 
-function renderable(part: MessagePart) {
-  if (part.type === "tool" && part.tool === "todowrite") return false
-  if (part.type === "text") return !!part.text.trim()
-  if (part.type === "reasoning") return !!part.text.trim()
-  return part.type !== "step-start" && part.type !== "step-finish" && part.type !== "patch"
-}
-
-function currentPartIDs(message: Message) {
+function currentPartIDs(message: SessionMessageInfo) {
+  if (message.type === "user") return message.text.trim() ? [`${message.id}:text:0`] : []
+  if (message.type !== "assistant") return []
   const ordinals = { text: 0, reasoning: 0 }
-  return message.parts
-    .flatMap((part) => {
-      if (!renderable(part)) return []
-      if (part.type === "text") return [`${message.info.id}:text:${ordinals.text++}`]
-      if (part.type === "reasoning") return [`${message.info.id}:reasoning:${ordinals.reasoning++}`]
-      if (part.type === "tool") return [typeof part.callID === "string" ? part.callID : part.id]
-      return []
-    })
-    .sort()
+  return message.content.flatMap((part) => {
+    if (part.type === "text") return part.text.trim() ? [`${message.id}:text:${ordinals.text++}`] : []
+    if (part.type === "reasoning") return part.text.trim() ? [`${message.id}:reasoning:${ordinals.reasoning++}`] : []
+    if (part.type === "tool") return [part.id]
+    return []
+  })
 }
 
 export const fixture = {
@@ -292,30 +303,30 @@ export const fixture = {
   ],
   sourceID,
   targetID,
-  messages: { [sourceID]: sourceMessages, [targetID]: targetMessages },
+  messages,
   expected: {
     sourceTitle: "Uncommitted changes inquiry",
     targetTitle: "Example Game: sample jump movement & sample physics analysis",
-    targetMessageIDs: targetMessages
-      .filter((message) => message.info.role === "user")
-      .map((message) => message.info.id),
+    targetMessageIDs: targetMessages.filter((message) => message.type === "user").map((message) => message.id),
     targetPartIDs: targetMessages.flatMap(currentPartIDs),
-    expandedShellPartID: targetMessages.flatMap((message) => message.parts).find((part) => part.tool === "bash")!
-      .callID,
+    expandedShellPartID: targetMessages
+      .flatMap((message) => (message.type === "assistant" ? message.content : []))
+      .flatMap((part) => (part.type === "tool" && part.name === "bash" ? [part.id] : []))[0],
   },
 }
 
 export function pageMessages(sessionID: string, limit: number, before?: string) {
-  const messages = fixture.messages[sessionID as keyof typeof fixture.messages] ?? []
+  const messages = fixture.messages[sessionID] ?? []
   const end = before
     ? Math.max(
         0,
-        messages.findIndex((message) => message.info.id === before),
+        messages.findIndex((message) => message.id === before),
       )
     : messages.length
   const start = Math.max(0, end - limit)
   return {
     items: messages.slice(start, end),
-    cursor: start > 0 ? messages[start]!.info.id : undefined,
+    cursor: start > 0 ? messages[start].id : undefined,
   }
 }
+import type { JsonValue, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"