fix(core): mark models.dev env providers as integrations

2026-08-04 01:06:16 -04:00 · 2026-07-09 21:58:57 +00:00
313 changed files with 8303 additions and 12067 deletions
@@ -1,5 +1,4 @@
 adamdotdevin
-arvsrn
 Brendonovich
 fwang
 Hona
@@ -8,14 +7,11 @@ jayair
 jlongster
 kitlangton
 kommander
-ludvigrask
 MrMushrooooom
 nexxeln
 R44VC0RP
 rekram1-node
 thdxr
 simonklee
-Slickstef11
-usrnk1
 vimtor
 starptech
@@ -27,7 +27,6 @@ Never bypass Git hooks. Do not use `--no-verify` or otherwise disable, skip, or

 - Keep things in one function unless composable or reusable
 - Do not extract single-use helpers preemptively. Inline the logic at the call site unless the helper is reused, hides a genuinely complex boundary, or has a clear independent name that improves the caller.
- Before adding complexity for a speculative or vanishingly unlikely race or security edge case, explain the concrete failure mode, likelihood, and complexity cost to the user and get their buy-in. Do not silently expand scope for theoretical robustness.
 - Avoid `try`/`catch` where possible
 - Avoid using the `any` type
 - Use Bun APIs when possible, like `Bun.file()`
@@ -155,11 +154,11 @@ const table = sqliteTable("session", {
 ## V2 Session Core

 - Keep durable events minimal: record irreducible new facts and do not repeat state derivable by folding the ordered aggregate history. Enrich projections and read models with previous or derived state when consumers need self-contained views.
- Keep durable prompt admission separate from model execution. `SessionV2.prompt(...)` admits one durable `session_pending` row before scheduling advisory `SessionExecution.wake(sessionID)` unless `resume: false` requests admit-only behavior. The serialized runner promotes admitted inputs into visible user messages at safe boundaries, consuming the pending row in the same event transaction; `session_pending` stores only unconsumed work.
- Reusing a Session ID adopts the existing Session. Reusing a prompt message ID reconciles an exact retry only when Session, prompt, and delivery mode match; conflicting reuse fails. Retry of an already-promoted input reconciles against the projected message and the durable admitted event rather than a retained row.
- Keep `SessionExecution` process-global and Session-ID based. Its local implementation owns the process-local Session coordinator and discovers placement through `SessionStore` plus `LocationServiceMap.get(session.location)` only when a drain starts; no layer should take a Session ID. V2 interruption targets the active process-local ownership chain for that Session; interruption of a known but idle or locally unowned Session is a no-op, while the public API rejects an unknown Session.
+- Keep durable prompt admission separate from model execution. `SessionV2.prompt(...)` admits one durable `session_input` row before scheduling advisory `SessionExecution.wake(sessionID)` unless `resume: false` requests admit-only behavior. The serialized runner promotes admitted inputs into visible user messages at safe boundaries.
+- Reusing a Session ID adopts the existing Session. Reusing a prompt message ID reconciles an exact retry only when Session, prompt, and delivery mode match; conflicting reuse fails. Historical projected prompts lazily synthesize promoted inbox records during exact retry.
+- Keep `SessionExecution` process-global and Session-ID based. Its local implementation owns the process-local Session coordinator and discovers placement through `SessionStore` plus `LocationServiceMap.get(session.location)` only when a drain starts; no layer should take a Session ID. V2 interruption targets the active process-local ownership chain for that Session; idle or missing interruption is a no-op.
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
- Preserve one explicit `llm.stream(request)` call per Physical Attempt and reload projected history before durable continuation. Most Steps have one Physical Attempt; overflow-triggered compaction recovery may rebuild one Step for a second attempt. Do not bridge through legacy `SessionPrompt.loop(...)` or delegate orchestration to an in-memory tool loop.
+- Preserve one explicit `llm.stream(request)` call per step and reload projected history before durable continuation. Do not bridge through legacy `SessionPrompt.loop(...)` or delegate orchestration to an in-memory tool loop.
 - Keep local Session drains process-local until clustering is implemented. `SessionRunCoordinator` joins explicit same-Session resumes, coalesces prompt wakeups, and allows different Sessions to run concurrently. Advisory wakes drain eligible durable inbox rows only; post-crash continuation recovery requires a separate explicit design before it may retry provider work. A drain has no durable identity or transcript boundary.
 - Keep delivery vocabulary explicit. Prompts steer by default and promote at the next safe step boundary while the current drain requires continuation. An explicit `queue` input remains pending until the Session would otherwise become idle; promote one queued input at that boundary, then reevaluate continuation before promoting another. Promoting any new user input resets the selected agent's step allowance; a batch of steers resets it once.
 - One step is one logical LLM call; its durable record covers only the model-visible span. Do not write "provider turn", and do not use bare "turn" for a single call: "turn" is reserved for the future assistant-turn unit containing all steps from prompt promotion until the session would go idle.
@@ -182,12 +182,12 @@ _Avoid_: Response envelope
 - SDK executes Server's assembled `HttpRouter` in memory. It opens no listener and performs no network I/O, while preserving Server routing, middleware, codecs, handlers, and errors.
 - The Effect Client and SDK re-export their decoded datatype facade from Schema so callers do not depend on internal package locations or Core's versioned names.
 - A capability intended for both networked and **Embedded OpenCode** belongs in the authoritative public `HttpApi`; embedded-only same-process capabilities extend **Embedded OpenCode** separately.
- `sessions.log({ sessionID, after, follow })` is the public durable Session event stream. It verifies the Session, replays durable events after the optional aggregate sequence, optionally continues with newly committed durable events, excludes live-only fragments, and is transported as SSE in both networked and embedded modes.
+- `sessions.events({ sessionID, after })` is a public durable Session event stream. It verifies the Session, replays durable events after the optional aggregate sequence, continues with newly committed durable events, excludes live-only fragments, and is transported as SSE in both networked and embedded modes.
 - `events.subscribe()` is a distinct public instance-wide live stream for Session and non-Session activity. It has no replay guarantee and includes connection, heartbeat, and instance-disposal lifecycle events; consumers recover from disconnection by refreshing authoritative state.
 - A Session ID is not an optional filter on `events.subscribe()`: instance-wide live events and durable Session events have different schemas, replay guarantees, cursors, lifecycle events, and failure behavior.
 - The initial common OpenCode Client does not expose server-global event aggregation. `events.subscribe()` is bounded to the connected OpenCode instance or workspace; any future cross-instance administrative stream requires a separately designed API.
 - `events.subscribe()` does not automatically reconnect after transport loss. The live-only stream fails with `ClientError`; consumers refresh authoritative state before explicitly opening a new subscription because events missed during disconnection cannot be replayed.
- `sessions.log({ sessionID, after, follow })` returns the generated HTTP client's cold durable event stream and does not build reconnection policy into the endpoint or client constructor. Transport loss fails the stream with `ClientError`. Callers may compose an explicit resuming stream above it by retaining the last observed durable sequence and opening a new subscription with `after`; any reusable resume helper remains a separate API design question.
+- `sessions.events({ sessionID, after })` returns the generated HTTP client's cold durable event stream and does not build reconnection policy into the endpoint or client constructor. Transport loss fails the stream with `ClientError`. Callers may compose an explicit resuming stream above it by retaining the last observed durable sequence and opening a new subscription with `after`; any reusable resume helper remains a separate API design question.
 - The stable `sessions.list(...)` design returns a **Page** in both networked and **Embedded OpenCode**; embedded execution does not define a separate unbounded array-returning list operation. The beta client currently preserves the existing HTTP `{ data, cursor }` envelope until emitter-level Page projection is implemented.
 - Session list cursors are opaque branded values carrying continuation query and ordering state. Consumers pass them back unchanged and do not inspect storage anchors or encoded filter fields.
 - A Session list continuation accepts only its opaque cursor. Scope, filters, ordering, and page size are fixed by the initial query and carried by that cursor.
@@ -198,7 +198,7 @@ _Avoid_: Response envelope
 - `sessions.context({ sessionID })` preserves the existing message-only operation. It returns projected **Session History**; it does not include or represent the complete **Model Context**, whose system text, **Instruction Baseline**, tools, and step-local additions remain separate.
 - **Open question**: Should a future, separately named operation expose complete **Model Context**, including the instruction baseline, applied instruction metadata, tools, and step-local additions?
 - `sessions.prompt(...)` exposes `resume?: boolean`. Omitting it preserves durable admission followed by an advisory execution wake; `resume: false` requests durable admit-only behavior.
- The public operation remains `sessions.prompt(...)`; `SessionPending.admit` is the internal primitive, while the public `Admission` result and `resume` option express its durable admission semantics.
+- The public operation remains `sessions.prompt(...)`; `SessionInput.admit` is the internal primitive, while the public `Admission` result and `resume` option express its durable admission semantics.
 - `sessions.create(...)` accepts an optional `location`. Omission resolves through the connected OpenCode instance's default or current location; an explicit value selects a known location. Networked and embedded transports use the same handler semantics.
 - `sessions.switchAgent({ sessionID, agent })` is part of the common client alongside `sessions.switchModel(...)`. It affects subsequent Session activity and fails with `SessionNotFoundError` for an unknown Session.
 - The **Embedded OpenCode** Layer delegates to the same scoped creation path; it does not define a second implementation.
@@ -209,13 +209,13 @@ _Avoid_: Response envelope
 - Oversized textual **Model Tool Output** retains a bounded preview in Session history while its complete text moves to managed tool-output storage. Arbitrary structured-result size is a separate concern.
 - One tool settlement receives one aggregate textual limit, using the configured maximum lines or UTF-8 bytes, whichever is reached first. The limit is provider-independent; token pressure belongs to context assembly and compaction.
 - Generic truncation preserves the beginning and end of textual output. Tools may apply a more meaningful strategy before the Tool Registry enforces the final limit.
- A truncated **Model Tool Output** identifies its complete text in the bounded model-visible preview. The Tool Registry also supplies managed paths as internal metadata to tool hooks; Session events do not expose a typed `outputPaths` field.
+- A truncated **Model Tool Output** identifies its complete text both in the bounded model-visible preview and as a typed managed output path. Managed output paths do not modify the tool's validated structured result.
 - A **Managed Tool Output File** is temporary and may expire after its retention period. The bounded **Model Tool Output**, not the file, is the durable replayable record.
- Failure to retain a **Managed Tool Output File** fails settlement operationally. The Session never publishes a successful result whose complete output was lost during generic bounding.
+- Failure to retain a **Managed Tool Output File** does not change a successful tool operation into a failed one. The Session records an explicitly lossy bounded output without a path, while operators receive diagnostics for the storage failure.
 - Once a tool operation succeeds, bounding its **Model Tool Output** and publishing its one durable settlement form an interruption-safe completion region. Raw oversized success is never published before a later correction.
 - When a structured-only result would exceed the **Model Tool Output** limit, its validated structured value remains unchanged for Session consumers while model replay uses a bounded textual JSON preview and optional managed output path.
 - Existing tool-managed output paths survive generic bounding. A fallback file retains exactly the complete projected text received by the Tool Registry and never claims to reconstruct output already discarded by tool-specific shaping.
- **Managed Tool Output Files** use globally unique names in one shared flat directory. They receive no special filesystem authority; each tool applies its ordinary external-path policy.
+- **Managed Tool Output Files** use globally unique names in one shared flat directory. Their absolute paths are readable and searchable by ordinary tools; other absolute paths remain outside Location-scoped filesystem authority.
 - Provider-executed tool results remain provider-native transcript facts outside generic Tool Registry bounding. Their context control requires provider-aware pruning or compaction because some providers require exact structured round-trip payloads.

 ## Client contract architecture
@@ -30,9 +30,8 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
-        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
        "@dnd-kit/dom": "0.5.0",
        "@dnd-kit/helpers": "0.5.0",
@@ -74,7 +73,6 @@
        "shiki": "catalog:",
        "solid-js": "catalog:",
        "solid-list": "catalog:",
-        "solid-presence": "0.2.0",
        "tailwindcss": "catalog:",
      },
      "devDependencies": {
@@ -96,7 +94,7 @@
    },
    "packages/cli": {
      "name": "@opencode-ai/cli",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "bin": {
        "opencode2": "./bin/opencode2.cjs",
      },
@@ -155,7 +153,7 @@
    },
    "packages/codemode": {
      "name": "@opencode-ai/codemode",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -169,7 +167,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -205,7 +203,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -232,7 +230,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/openai": "3.0.48",
@@ -254,7 +252,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -278,7 +276,7 @@
    },
    "packages/console/support": {
      "name": "@opencode-ai/console-support",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode-ai/console-core": "workspace:*",
@@ -298,7 +296,7 @@
    },
    "packages/core": {
      "name": "@opencode-ai/core",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -322,7 +320,7 @@
        "@ai-sdk/provider-utils": "4.0.23",
        "@ai-sdk/togetherai": "2.0.41",
        "@ai-sdk/vercel": "2.0.39",
-        "@ai-sdk/xai": "3.0.102",
+        "@ai-sdk/xai": "3.0.82",
        "@aws-sdk/credential-providers": "3.1057.0",
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -394,7 +392,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "effect": "catalog:",
@@ -454,7 +452,7 @@
    },
    "packages/effect-drizzle-sqlite": {
      "name": "@opencode-ai/effect-drizzle-sqlite",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
@@ -468,7 +466,7 @@
    },
    "packages/effect-sqlite-node": {
      "name": "@opencode-ai/effect-sqlite-node",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "effect": "catalog:",
      },
@@ -480,7 +478,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -512,7 +510,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -528,7 +526,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode-ai/http-recorder",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@effect/platform-node-shared": "4.0.0-beta.83",
      },
@@ -560,7 +558,7 @@
    },
    "packages/llm": {
      "name": "@opencode-ai/llm",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@opencode-ai/schema": "workspace:*",
        "@smithy/eventstream-codec": "4.2.14",
@@ -579,7 +577,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -605,7 +603,7 @@
        "@ai-sdk/provider": "3.0.8",
        "@ai-sdk/togetherai": "2.0.41",
        "@ai-sdk/vercel": "2.0.39",
-        "@ai-sdk/xai": "3.0.102",
+        "@ai-sdk/xai": "3.0.82",
        "@aws-sdk/credential-providers": "3.1057.0",
        "@clack/prompts": "1.0.0-alpha.1",
        "@effect/opentelemetry": "catalog:",
@@ -712,10 +710,12 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode-ai/client": "workspace:*",
+        "@opencode-ai/llm": "workspace:*",
+        "@opencode-ai/protocol": "workspace:*",
        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/sdk": "workspace:*",
        "effect": "catalog:",
@@ -790,8 +790,6 @@
        "effect": "catalog:",
      },
      "devDependencies": {
-        "@opencode-ai/httpapi-codegen": "workspace:*",
-        "@opencode-ai/protocol": "workspace:*",
        "@tsconfig/bun": "catalog:",
        "@types/bun": "catalog:",
        "@typescript/native-preview": "catalog:",
@@ -799,7 +797,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "cross-spawn": "catalog:",
      },
@@ -814,7 +812,7 @@
    },
    "packages/server": {
      "name": "@opencode-ai/server",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -831,7 +829,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode-ai/session-ui",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/core": "workspace:*",
@@ -892,7 +890,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -905,7 +903,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode-ai/stats-app",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@opencode-ai/stats-core": "workspace:*",
@@ -938,7 +936,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode-ai/stats-core",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -957,7 +955,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode-ai/stats-server",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -998,7 +996,7 @@
    },
    "packages/tui": {
      "name": "@opencode-ai/tui",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/core": "workspace:*",
@@ -1029,7 +1027,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -1080,7 +1078,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.17.18",
+      "version": "1.17.15",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1123,7 +1121,6 @@
  ],
  "patchedDependencies": {
    "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
-    "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
    "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
    "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
@@ -1133,6 +1130,7 @@
    "@tanstack/solid-virtual@3.13.28": "patches/@tanstack%2Fsolid-virtual@3.13.28.patch",
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
+    "@ai-sdk/xai@3.0.82": "patches/@ai-sdk%2Fxai@3.0.82.patch",
    "@tanstack/virtual-core@3.17.0": "patches/@tanstack%2Fvirtual-core@3.17.0.patch",
    "pacote@21.5.0": "patches/pacote@21.5.0.patch",
  },
@@ -1145,7 +1143,6 @@
  },
  "catalog": {
    "@cloudflare/workers-types": "4.20251008.0",
-    "@corvu/drawer": "0.2.4",
    "@effect/opentelemetry": "4.0.0-beta.83",
    "@effect/platform-node": "4.0.0-beta.83",
    "@effect/sql-sqlite-bun": "4.0.0-beta.83",
@@ -1271,7 +1268,7 @@

    "@ai-sdk/vercel": ["@ai-sdk/vercel@2.0.39", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8eu3ljJpkCTP4ppcyYB+NcBrkcBoSOFthCSgk5VnjaxnDaOJFaxnPwfddM7wx3RwMk2CiK1O61Px/LlqNc7QkQ=="],

-    "@ai-sdk/xai": ["@ai-sdk/xai@3.0.102", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.56", "@ai-sdk/provider": "3.0.13", "@ai-sdk/provider-utils": "4.0.35" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-NeQyOR7OCqDMgaLS4uNX/ep/HrwUzzFYLzXQSRoqLy2jsnqxAJhsgltRwAwf+ADjyPBIAKEOestWnIQA+LrLrQ=="],
+    "@ai-sdk/xai": ["@ai-sdk/xai@3.0.82", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-A0VFMufnVf4wODcT3SPQUUzvYXiIO1VhFuXj9r6z/vP4rlo+QRDPw3WSTchcz93ROQWSfBE3I6Szqz342OHi5w=="],

    "@alcalzone/ansi-tokenize": ["@alcalzone/ansi-tokenize@0.2.5", "", { "dependencies": { "ansi-styles": "^6.2.1", "is-fullwidth-code-point": "^5.0.0" } }, "sha512-3NX/MpTdroi0aKz134A6RC2Gb2iXVECN4QaAXnvCIxxIm3C3AVB1mkUe8NaaiyvOpDfsrqWhYtj+Q6a62RrTsw=="],

@@ -1555,10 +1552,6 @@

    "@cloudflare/workers-types": ["@cloudflare/workers-types@4.20251008.0", "", {}, "sha512-dZLkO4PbCL0qcCSKzuW7KE4GYe49lI12LCfQ5y9XeSwgYBoAUbwH4gmJ6A0qUIURiTJTkGkRkhVPqpq2XNgYRA=="],

-    "@corvu/dialog": ["@corvu/dialog@0.2.4", "", { "dependencies": { "@corvu/utils": "~0.4.2", "solid-dismissible": "~0.1.1", "solid-focus-trap": "~0.1.8", "solid-presence": "~0.2.0", "solid-prevent-scroll": "~0.1.10" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-n54vJq+fOy8GVrnYBdJpD6JXNuyx7LOeMrRxwzAvZnYGpW8+AA12tnb/P/2emJj/HjOO5otheGKb0breshdFlA=="],
-
-    "@corvu/drawer": ["@corvu/drawer@0.2.4", "", { "dependencies": { "@corvu/dialog": "~0.2.4", "@corvu/utils": "~0.4.2", "@solid-primitives/memo": "^1.4.1", "solid-transition-size": "~0.1.4" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-7jQoGZ8ROB9CmXam2nMY2wEskU3IoFwZQywkF/7vrBc/edGsPv7mOVQ1GN6G+4nd7nrMZ3UtqHAhmRh9V0azlw=="],
-
    "@corvu/utils": ["@corvu/utils@0.4.2", "", { "dependencies": { "@floating-ui/dom": "^1.6.11" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-Ox2kYyxy7NoXdKWdHeDEjZxClwzO4SKM8plAaVwmAJPxHMqA0rLOoAsa+hBDwRLpctf+ZRnAd/ykguuJidnaTA=="],

    "@cspotcode/source-map-support": ["@cspotcode/source-map-support@0.8.1", "", { "dependencies": { "@jridgewell/trace-mapping": "0.3.9" } }, "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="],
@@ -2891,8 +2884,6 @@

    "@solid-primitives/media": ["@solid-primitives/media@2.3.3", "", { "dependencies": { "@solid-primitives/event-listener": "^2.4.3", "@solid-primitives/rootless": "^1.5.2", "@solid-primitives/static-store": "^0.1.2", "@solid-primitives/utils": "^6.3.2" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-hQ4hLOGvfbugQi5Eu1BFWAIJGIAzztq9x0h02xgBGl2l0Jaa3h7tg6bz5tV1NSuNYVGio4rPoa7zVQQLkkx9dA=="],

-    "@solid-primitives/memo": ["@solid-primitives/memo@1.5.1", "", { "dependencies": { "@solid-primitives/scheduled": "^1.5.3", "@solid-primitives/utils": "^6.4.1" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-VDPrkl9epp0tbby9MvsqphGFCYCtDRC5J8FKzTqHbQiG5hhR8n6xv4MfjhTW231IaBxxPHLxS43EE8c5Q23mSQ=="],
-
    "@solid-primitives/props": ["@solid-primitives/props@3.2.3", "", { "dependencies": { "@solid-primitives/utils": "^6.4.0" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-XzG6en9gSFwmvbKcATm2BxL63HegZ+BAG5fmHi8jyBppQHcaths7ffz+6vYvwYy3nlgLa20ufJLj7tst+PcHFA=="],

    "@solid-primitives/refs": ["@solid-primitives/refs@1.1.3", "", { "dependencies": { "@solid-primitives/utils": "^6.4.0" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-aam02fjNKpBteewF/UliPSQCVJsIIGOLEWQOh+ll6R/QePzBOOBMcC4G+5jTaO75JuUS1d/14Q1YXT3X0Ow6iA=="],
@@ -5609,15 +5600,11 @@

    "socks-proxy-agent": ["socks-proxy-agent@8.0.5", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" } }, "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw=="],

-    "solid-dismissible": ["solid-dismissible@0.1.1", "", { "dependencies": { "@corvu/utils": "~0.4.1" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-9kcKBJIMdS+586cA1g63HYWxKh3h89leeNHbPZ1csYjuni+NvPBtNr11l0iEX2AKKEt6FHk6qNhc/gjoYAW1pA=="],
-
-    "solid-focus-trap": ["solid-focus-trap@0.1.9", "", { "dependencies": { "@corvu/utils": "~0.4.2" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-LTyNki6GUJPRLXV5uMWPkYClB07SUMubbr2EkAddiR0CJCF/I283txilMU9RURSr/P8EewMfXWu2o3aWrK7A5A=="],
-
    "solid-js": ["solid-js@1.9.10", "", { "dependencies": { "csstype": "^3.1.0", "seroval": "~1.3.0", "seroval-plugins": "~1.3.0" } }, "sha512-Coz956cos/EPDlhs6+jsdTxKuJDPT7B5SVIWgABwROyxjY7Xbr8wkzD68Et+NxnV7DLJ3nJdAC2r9InuV/4Jew=="],

    "solid-list": ["solid-list@0.3.0", "", { "dependencies": { "@corvu/utils": "~0.4.0" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-t4hx/F/l8Vmq+ib9HtZYl7Z9F1eKxq3eKJTXlvcm7P7yI4Z8O7QSOOEVHb/K6DD7M0RxzVRobK/BS5aSfLRwKg=="],

-    "solid-presence": ["solid-presence@0.2.0", "", { "dependencies": { "@corvu/utils": "~0.4.2" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-YM92o+jvpzX3XGaD4rLYmq/Kc2ZVh47GSCLEufHBFQQIurvZTs8SoGJxO8BJGNDxBKdcS8F3dYhW1SDXp4BNjA=="],
+    "solid-presence": ["solid-presence@0.1.8", "", { "dependencies": { "@corvu/utils": "~0.4.0" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-pWGtXUFWYYUZNbg5YpG5vkQJyOtzn2KXhxYaMx/4I+lylTLYkITOLevaCwMRN+liCVk0pqB6EayLWojNqBFECA=="],

    "solid-prevent-scroll": ["solid-prevent-scroll@0.1.10", "", { "dependencies": { "@corvu/utils": "~0.4.1" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-KplGPX2GHiWJLZ6AXYRql4M127PdYzfwvLJJXMkO+CMb8Np4VxqDAg5S8jLdwlEuBis/ia9DKw2M8dFx5u8Mhw=="],

@@ -5625,8 +5612,6 @@

    "solid-stripe": ["solid-stripe@0.8.1", "", { "peerDependencies": { "@stripe/stripe-js": ">=1.44.1 <8.0.0", "solid-js": "^1.6.0" } }, "sha512-l2SkWoe51rsvk9u1ILBRWyCHODZebChSGMR6zHYJTivTRC0XWrRnNNKs5x1PYXsaIU71KYI6ov5CZB5cOtGLWw=="],

-    "solid-transition-size": ["solid-transition-size@0.1.4", "", { "dependencies": { "@corvu/utils": "~0.3.2" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-ocHVnbfy23CgfaH4cEUR/AFg0Y3CEL8Oh3n9Qv8OHFJgPh+zkmERKZQfi/xH5XvxDCizg8VjPrVUhiHB1Gza8g=="],
-
    "solid-use": ["solid-use@0.9.1", "", { "peerDependencies": { "solid-js": "^1.7" } }, "sha512-UwvXDVPlrrbj/9ewG9ys5uL2IO4jSiwys2KPzK4zsnAcmEl7iDafZWW1Mo4BSEWOmQCGK6IvpmGHo1aou8iOFw=="],

    "sonic-boom": ["sonic-boom@4.2.1", "", { "dependencies": { "atomic-sleep": "^1.0.0" } }, "sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q=="],
@@ -6255,11 +6240,7 @@

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

-    "@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.56", "", { "dependencies": { "@ai-sdk/provider": "3.0.13", "@ai-sdk/provider-utils": "4.0.35" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-cQrN6OUn/jvsY3OdsU6Wn+ss7vp1iwIcakZKSlSRMnYqShBfyT7Qht+eqmgxs7w9ttrw6FAG6o11AiBs+iEsTA=="],
-
-    "@ai-sdk/xai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.13", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-ZPtVYt5QIJzOta1kdUiDuCx4HhFkvNPv/rvmZ2b1iXwybYjJsCnNYR4PAw4kW7rgVfDARvHXcU64efWuqNp6bw=="],
-
-    "@ai-sdk/xai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.35", "", { "dependencies": { "@ai-sdk/provider": "3.0.13", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-bjYld/2KGPLt78kpqbya+fD4LYS7BqVQJyUjE3qAHrYB0FR2Q90BaWEVIBZaguTWXf/A8L6uG1zO1v9TxVlGWg=="],
+    "@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],

    "@alcalzone/ansi-tokenize/ansi-styles": ["ansi-styles@6.2.3", "", {}, "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="],

@@ -6495,8 +6476,6 @@

    "@jsx-email/doiuse-email/htmlparser2": ["htmlparser2@9.1.0", "", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", "domutils": "^3.1.0", "entities": "^4.5.0" } }, "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ=="],

-    "@kobalte/core/solid-presence": ["solid-presence@0.1.8", "", { "dependencies": { "@corvu/utils": "~0.4.0" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-pWGtXUFWYYUZNbg5YpG5vkQJyOtzn2KXhxYaMx/4I+lylTLYkITOLevaCwMRN+liCVk0pqB6EayLWojNqBFECA=="],
-
    "@malept/flatpak-bundler/fs-extra": ["fs-extra@9.1.0", "", { "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" } }, "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="],

    "@mdx-js/mdx/acorn": ["acorn@8.16.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw=="],
@@ -6795,8 +6774,6 @@

    "@slack/web-api/p-queue": ["p-queue@6.6.2", "", { "dependencies": { "eventemitter3": "^4.0.4", "p-timeout": "^3.2.0" } }, "sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="],

-    "@solid-primitives/memo/@solid-primitives/utils": ["@solid-primitives/utils@6.4.1", "", { "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-ISSB5QX1qP2ynrheIpYwc4oKR5Ny4siNuUyf1qZniy+Il+p/PtDB0QK1Dnle8noiHpwRD3gpPdubOC3qI/Zamg=="],
-
    "@solidjs/start/path-to-regexp": ["path-to-regexp@8.4.2", "", {}, "sha512-qRcuIdP69NPm4qbACK+aDogI5CBDMi1jKe0ry5rSQJz8JVLsC7jV8XpiJjGRLLol3N+R5ihGYcrPLTno6pAdBA=="],

    "@solidjs/start/shiki": ["shiki@1.29.2", "", { "dependencies": { "@shikijs/core": "1.29.2", "@shikijs/engine-javascript": "1.29.2", "@shikijs/engine-oniguruma": "1.29.2", "@shikijs/langs": "1.29.2", "@shikijs/themes": "1.29.2", "@shikijs/types": "1.29.2", "@shikijs/vscode-textmate": "^10.0.1", "@types/hast": "^3.0.4" } }, "sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg=="],
@@ -6883,8 +6860,6 @@

    "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@3.0.53", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Wld+Rbc05KaUn08uBt06eEuwcgalcIFtIl32Yp+GxuZXUQwOb6YeAuq+C6da4ch6BurFoqEaLemJVwjBb7x+PQ=="],

-    "ai-gateway-provider/@ai-sdk/xai": ["@ai-sdk/xai@3.0.82", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-A0VFMufnVf4wODcT3SPQUUzvYXiIO1VhFuXj9r6z/vP4rlo+QRDPw3WSTchcz93ROQWSfBE3I6Szqz342OHi5w=="],
-
    "ai-gateway-provider/@openrouter/ai-sdk-provider": ["@openrouter/ai-sdk-provider@2.8.1", "", { "peerDependencies": { "ai": "^6.0.0", "zod": "^3.25.0 || ^4.0.0" } }, "sha512-Y6j3yivgoEUf/kutD/k5GX/mzZfioRFoSx0gbQ+mIOzMaH/vJv1rCkztiuvlLw5xRYQil7oxHUZvmSfXqOx1NQ=="],

    "ajv-keywords/ajv": ["ajv@6.15.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="],
@@ -7243,8 +7218,6 @@

    "socket.io/debug": ["debug@4.3.7", "", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="],

-    "solid-transition-size/@corvu/utils": ["@corvu/utils@0.3.2", "", { "dependencies": { "@floating-ui/dom": "^1.6.7" }, "peerDependencies": { "solid-js": "^1.8" } }, "sha512-ZWlyWEE8qV9+CB9OAyo2bTrZGXQN9ZeM+JfYv89zoR+lRACKTDuoOZEdiyL8Uc7U5dUSH1uTqKhTTnaHWb+wZA=="],
-
    "sort-keys/is-plain-obj": ["is-plain-obj@1.1.0", "", {}, "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="],

    "sst/aws4fetch": ["aws4fetch@1.0.18", "", {}, "sha512-3Cf+YaUl07p24MoQ46rFwulAmiyCwH2+1zw1ZyPAX5OtJ34Hh185DwB8y/qRLb6cYYYtSFJ9pthyLc0MD4e8sQ=="],
@@ -7391,8 +7364,6 @@

    "@ai-sdk/vercel/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],

-    "@ai-sdk/xai/@ai-sdk/provider-utils/@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="],
-
    "@astrojs/check/yargs/cliui": ["cliui@8.0.1", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", "wrap-ansi": "^7.0.0" } }, "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="],

    "@astrojs/check/yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
@@ -7947,8 +7918,6 @@

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

-    "ai-gateway-provider/@ai-sdk/xai/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.41", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-kNAGINk71AlOXx10Dq/PXw4t/9XjdK8uxfpVElRwtSFMdeSiLVt58p9TPx4/FJD+hxZuVhvxYj9r42osxWq79g=="],
-
    "ajv-keywords/ajv/json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],

    "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-JTtn+wXTXg+yklvIMDLcGFaYhTU6ZrCgKT9JTNEQ3gA=",
-    "aarch64-linux": "sha256-gXU6zyhvAZrZirkL/PlHdkHtEof/7PVSPCaE34Jnd4U=",
-    "aarch64-darwin": "sha256-Q0oTG3uzOlD/X2kJingLle529lKFoTpyCW2rHXOZ6iE=",
-    "x86_64-darwin": "sha256-LINvKHxPibTlJeNzfACQx0x+Yj5oROT6Du3I5AtqqXk="
+    "x86_64-linux": "sha256-KTyd2ISQ4n1E3tm1LMEHtz+rKRZga+SONn5J6H0pheQ=",
+    "aarch64-linux": "sha256-ZIeaaqRr4JorEmmwFYuitxfYEAtrP8C6IlD+pmFRko0=",
+    "aarch64-darwin": "sha256-Po8FISoBzUMwJSn6nw243/hLT/gAQCrm5HbwXe2uA0g=",
+    "x86_64-darwin": "sha256-5TZzrCnvg1z00YP6O9U0SXjL04r+VmF7LVrqQ9BbSn4="
  }
 }
@@ -52,7 +52,6 @@
      "@shikijs/stream": "4.2.0",
      "ulid": "3.0.1",
      "@kobalte/core": "0.13.11",
-      "@corvu/drawer": "0.2.4",
      "@types/luxon": "3.7.1",
      "@types/node": "24.12.2",
      "@types/semver": "7.7.1",
@@ -154,7 +153,7 @@
    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
-    "@ai-sdk/xai@3.0.102": "patches/@ai-sdk%2Fxai@3.0.102.patch",
+    "@ai-sdk/xai@3.0.82": "patches/@ai-sdk%2Fxai@3.0.82.patch",
    "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
    "pacote@21.5.0": "patches/pacote@21.5.0.patch",
    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
@@ -1,40 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-const draftID = "draft_legacy_new_session"
-const directory = "C:/OpenCode/LegacyNewSession"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test("redirects a draft to the legacy new-session route", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_legacy_new_session",
-      worktree: directory,
-      vcs: "git",
-      name: "legacy-new-session",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ directory, draftID, server }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: false } }))
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-
-  await page.goto(`/new-session?draftId=${draftID}`)
-
-  await expect(page).toHaveURL(`/${base64Encode(directory)}/session`)
-  await expect(page.locator("header[data-tauri-drag-region]")).toBeVisible()
-  await expect(page.locator('[data-component="prompt-input"]')).toBeVisible()
-})
@@ -1,146 +0,0 @@
-import { base64Encode } from "@opencode-ai/core/util/encode"
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:/OpenCode/ReviewOpenFile"
-const projectID = "proj_review_open_file"
-const sessionID = "ses_review_open_file"
-const title = "Review open file"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test.use({ viewport: { width: 1440, height: 900 } })
-
-test("opens and searches project files inline", async ({ page }) => {
-  const searches: { query: string; dirs?: string; limit?: number }[] = []
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "open-file-project",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "test" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: sessionID,
-        projectID,
-        directory,
-        title,
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    vcsDiff: [fileDiff("src/changed.ts")],
-    fileList: (path) => {
-      if (path) return []
-      return [
-        fileNode("README.md"),
-        { name: "src", path: "src", absolute: `${directory}/src`, type: "directory", ignored: false },
-      ]
-    },
-    fileContent: (path) => ({ type: "text", content: `contents:${path}` }),
-    findFiles: (input) => {
-      searches.push(input)
-      return input.query === "nested" ? ["src/nested.ts"] : []
-    },
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ directory, server, sessionID }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.global.dat:layout",
-        JSON.stringify({ review: { diffStyle: "split", panelOpened: true } }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server, sessionId: sessionID }]),
-      )
-    },
-    { directory, server, sessionID },
-  )
-
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, title)
-
-  const panel = page.locator("#review-panel")
-  const contextButton = page.getByRole("button", { name: "View context usage" })
-  await contextButton.click()
-  await expect(panel.getByRole("tab", { name: "Context" })).toHaveAttribute("data-selected", "")
-  await panel.getByRole("button", { name: "Open file" }).click()
-  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-  await contextButton.click()
-  await expect(panel.getByRole("tab", { name: "Context" })).toHaveAttribute("data-selected", "")
-  await panel.getByRole("button", { name: "Open file" }).click()
-  const filter = panel.getByRole("combobox", { name: "Filter files" })
-  await expect(filter).toBeFocused()
-  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("open-file-project", { exact: true })).toBeVisible()
-
-  await panel.getByRole("button", { name: "README.md" }).click()
-  await expect(panel.getByRole("tab", { name: "README.md" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("contents:README.md", { exact: true })).toBeVisible()
-
-  await panel.getByRole("button", { name: "Open file" }).click()
-  await expect(panel.getByRole("tab", { name: "README.md" })).toHaveCount(0)
-  await filter.fill("nested")
-  const result = panel.getByRole("option", { name: /nested\.ts/ })
-  await expect(result).toBeVisible()
-  const resultID = await result.getAttribute("id")
-  expect(resultID).toBeTruthy()
-  await expect(filter).toHaveAttribute("aria-activedescendant", resultID!)
-  await filter.press("Enter")
-  await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveAttribute("data-selected", "")
-  await expect(panel.getByText("contents:src/nested.ts", { exact: true })).toBeVisible()
-  expect(searches).toContainEqual({ query: "nested", dirs: "false", limit: 200 })
-
-  await panel.getByRole("button", { name: "Open file" }).click()
-  await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveCount(1)
-  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveAttribute("data-selected", "")
-  await page.keyboard.press("Control+w")
-  await expect(panel.getByRole("tab", { name: "Open file" })).toHaveCount(0)
-  await expect(panel.getByRole("tab", { name: "nested.ts" })).toHaveAttribute("data-selected", "")
-})
-
-function fileNode(path: string) {
-  return {
-    name: path,
-    path,
-    absolute: `${directory}/${path}`,
-    type: "file",
-    ignored: false,
-  }
-}
-
-function fileDiff(file: string) {
-  return {
-    file,
-    before: "before\n",
-    after: "after\n",
-    additions: 1,
-    deletions: 1,
-    status: "modified",
-  }
-}
@@ -1,152 +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/ReviewStatePersistence"
-const projectID = "proj_review_state_persistence"
-const sessionA = "ses_review_state_a"
-const sessionB = "ses_review_state_b"
-const titleA = "Alpha review state"
-const titleB = "Beta review state"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test.use({ viewport: { width: 1440, height: 900 } })
-
-test("restores review mode and selected file per session", async ({ page }) => {
-  await setup(page)
-  await page.goto(sessionHref(sessionA))
-  await expectSessionTitle(page, titleA)
-  await page.getByRole("button", { name: "Toggle review" }).click()
-
-  await selectMode(page, "Git changes", "Branch changes")
-  await selectFile(page, "beta.ts")
-
-  await switchSession(page, titleB)
-  await expect(page.getByRole("button", { name: "Git changes" })).toBeVisible()
-  await selectFile(page, "gamma.ts")
-
-  await switchSession(page, titleA)
-  await expect(page.getByRole("button", { name: "Branch changes" })).toBeVisible()
-  await expectSelectedFile(page, "beta.ts")
-  await selectMode(page, "Branch changes", "Git changes")
-  await expectSelectedFile(page, "alpha.ts")
-  await selectMode(page, "Git changes", "Branch changes")
-  await expectSelectedFile(page, "beta.ts")
-
-  await page.reload()
-  await expectSessionTitle(page, titleA)
-  await expect(page.getByRole("button", { name: "Branch changes" })).toBeVisible()
-  await expectSelectedFile(page, "beta.ts")
-
-  await switchSession(page, titleB)
-  await expect(page.getByRole("button", { name: "Git changes" })).toBeVisible()
-  await expectSelectedFile(page, "gamma.ts")
-})
-
-async function selectMode(page: Page, current: string, next: string) {
-  await page.getByRole("button", { name: current }).click()
-  await page.getByRole("option", { name: next }).click()
-}
-
-async function selectFile(page: Page, file: string) {
-  await page.getByRole("button", { name: file }).click()
-  await expectSelectedFile(page, file)
-}
-
-async function expectSelectedFile(page: Page, file: string) {
-  await expect(page.locator('[data-slot="session-review-v2-file-name"]')).toHaveText(file)
-}
-
-async function switchSession(page: Page, title: string) {
-  await page.locator("[data-titlebar-tab-slot]", { hasText: title }).click()
-  await expectSessionTitle(page, title)
-}
-
-async function setup(page: Page) {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "review-state-persistence",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { test: { id: "test", name: "Test", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "test" },
-    },
-    sessions: [session(sessionA, titleA, 1700000000000), session(sessionB, titleB, 1700000001000)],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.route(/\/vcs(?:\?.*)?$/, (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify({ branch: "feature", default_branch: "dev" }),
-    }),
-  )
-  await page.route("**/vcs/diff**", (route) =>
-    route.fulfill({
-      status: 200,
-      contentType: "application/json",
-      body: JSON.stringify(
-        new URL(route.request().url()).searchParams.get("mode") === "branch"
-          ? [diff("src/alpha.ts"), diff("src/beta.ts")]
-          : [diff("src/alpha.ts"), diff("src/gamma.ts")],
-      ),
-    }),
-  )
-  await page.addInitScript(
-    ({ directory, server, sessions }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { newLayoutDesigns: true } }))
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify(sessions.map((sessionId: string) => ({ type: "session", server, sessionId }))),
-      )
-    },
-    { directory, server, sessions: [sessionA, sessionB] },
-  )
-}
-
-function session(id: string, title: string, created: number) {
-  return {
-    id,
-    slug: id,
-    projectID,
-    directory,
-    title,
-    version: "dev",
-    time: { created, updated: created },
-  }
-}
-
-function diff(file: string) {
-  return {
-    file,
-    additions: 1,
-    deletions: 1,
-    status: "modified",
-    patch: `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after'\n`,
-  }
-}
-
-function sessionHref(sessionID: string) {
-  return `/server/${base64Encode(server)}/session/${sessionID}`
-}
@@ -9,19 +9,12 @@ const title = "Review terminal stacked"
 const branchDiffs = [
  fileDiff(".github/actions/setup-bun/action.yml", 7),
  ...Array.from({ length: 2_739 }, (_, index) =>
-    fileDiff(
-      `src/branch/d${String(Math.floor(index / 100)).padStart(5, "0")}/generated-${String(index).padStart(4, "0")}.ts`,
-      100,
-      false,
-    ),
+    fileDiff(`src/branch/generated-${String(index).padStart(4, "0")}.ts`, 100),
  ),
 ]

 test("keeps the review tree and terminal sized when both panels are open", async ({ page }) => {
  test.setTimeout(120_000)
-  const events: Array<{ directory: string; payload: Record<string, unknown> }> = []
-  let detailVersion = 1
-  let detailFailures = 1
  await page.setViewportSize({ width: 1400, height: 900 })
  await mockOpenCodeServer(page, {
    directory,
@@ -55,10 +48,7 @@ test("keeps the review tree and terminal sized when both panels are open", async
        time: { created: 1700000000000, updated: 1700000000000 },
      },
    ],
-    sessionStatus: { [sessionID]: { type: "idle" } },
    pageMessages: () => ({ items: [] }),
-    events: () => events.splice(0, 1),
-    eventRetry: 16,
  })
  await page.route(/\/vcs(?:\?.*)?$/, (route) =>
    route.fulfill({
@@ -67,25 +57,17 @@ test("keeps the review tree and terminal sized when both panels are open", async
      body: JSON.stringify({ branch: "review-pane-performance", default_branch: "dev" }),
    }),
  )
-  await page.route("**/vcs/diff**", (route) => {
-    const url = new URL(route.request().url())
-    const scope = url.searchParams.get("directory")?.replaceAll("\\", "/")
-    const detail = scope?.endsWith("/src/branch/d00027")
-    if (detail && detailFailures-- > 0) return route.fulfill({ status: 500, body: "retry detail" })
-    return route.fulfill({
+  await page.route("**/vcs/diff**", (route) =>
+    route.fulfill({
      status: 200,
      contentType: "application/json",
      body: JSON.stringify(
-        url.searchParams.get("mode") === "branch"
-          ? detail
-            ? branchDiffs
-                .filter((diff) => diff.file.startsWith("src/branch/d00027/"))
-                .map((diff) => fileDiff(diff.file, diff.additions, true, detailVersion))
-            : branchDiffs
+        new URL(route.request().url()).searchParams.get("mode") === "branch"
+          ? branchDiffs
          : Array.from({ length: 7 }, (_, index) => fileDiff(`src/git-${index}.ts`, 1)),
      ),
-    })
-  })
+    }),
+  )
  await page.route("**/pty", (route) =>
    route.fulfill({
      status: 200,
@@ -114,7 +96,7 @@ test("keeps the review tree and terminal sized when both panels are open", async
  await expect(page.getByRole("tab", { name: "Review 2740" })).toBeVisible()
  await page.keyboard.press("Control+Backquote")
  await expect(page.locator("#terminal-panel")).toBeVisible()
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")
  await expectStackGeometry(page)

  const treeViewport = page.locator('#review-panel [data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
@@ -131,65 +113,41 @@ test("keeps the review tree and terminal sized when both panels are open", async
  })
  expect(bottomGap).toBeGreaterThanOrEqual(0)
  expect(bottomGap).toBeLessThanOrEqual(16)
-  const lazyDiff = page.waitForRequest((request) => {
-    const url = new URL(request.url())
-    return (
-      url.pathname === "/vcs/diff" &&
-      url.searchParams.get("directory")?.replaceAll("\\", "/").endsWith("/src/branch/d00027") === true
-    )
-  })
-  await lastFile.click()
-  await lazyDiff
-  const preview = page.locator('[data-slot="session-review-v2-diff-scroll"]')
-  await expect(preview).toContainText("after-1")
-  detailVersion = 2
-  events.push(statusEvent("busy"))
-  await expect(page.getByRole("button", { name: "Stop" })).toBeVisible()
-  const refreshedDiff = page.waitForRequest((request) => {
-    const url = new URL(request.url())
-    return (
-      url.pathname === "/vcs/diff" &&
-      url.searchParams.get("directory")?.replaceAll("\\", "/").endsWith("/src/branch/d00027") === true
-    )
-  })
-  events.push(statusEvent("idle"))
-  await refreshedDiff
-  await expect(preview).toContainText("after-2")
  await selectMode(page, "Branch changes", "Git changes")
  await expectTree(page, 8, "git-0.ts")
-  await page.getByRole("button", { name: "git-0.ts" }).click()
  await selectMode(page, "Git changes", "Branch changes")
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")

  const filter = page.getByRole("searchbox", { name: "Filter files" })
  await filter.fill("generated-2738")
  await expectTree(page, 1, "generated-2738.ts")
  await filter.fill("")
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")

  await page.getByRole("button", { name: "Toggle file tree" }).click()
-  await expect(page.locator('[data-slot="session-review-v2-sidebar"]')).toHaveCount(0)
-  await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(0)
+  await expect(page.locator('[data-slot="session-review-v2-sidebar"]')).toHaveAttribute("aria-hidden", "true")
+  await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(1)
  await page.getByRole("button", { name: "Toggle file tree" }).click()
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")

  await page.keyboard.press("Control+Backquote")
  await expect(page.locator("#terminal-panel")).toHaveCount(0)
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")
  await page.keyboard.press("Control+Backquote")
  await expect(page.locator("#terminal-panel")).toBeVisible()
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")

  await page.getByRole("button", { name: "Toggle review" }).click()
-  await expect(page.locator("#review-panel")).toHaveCount(0)
+  await expect(page.locator("#review-panel")).toHaveAttribute("aria-hidden", "true")
+  await expect(page.locator('#review-panel [data-component="file-tree-v2"]')).toHaveCount(1)
  await page.getByRole("button", { name: "Toggle review" }).click()
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")
  await page.setViewportSize({ width: 1_000, height: 700 })
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")
  await expectStackGeometry(page)
  await page.setViewportSize({ width: 1_000, height: 120 })
  await page.setViewportSize({ width: 1_400, height: 900 })
-  await expectTree(page, 2_773, "action.yml")
+  await expectTree(page, 2_745, "action.yml")
  await expectStackGeometry(page)
 })

@@ -243,21 +201,12 @@ function base64Encode(value: string) {
  return Buffer.from(value, "utf8").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
 }

-function statusEvent(type: "busy" | "idle") {
-  return {
-    directory,
-    payload: { type: "session.status", properties: { sessionID, status: { type } } },
-  }
-}
-
-function fileDiff(file: string, additions: number, loaded = true, version = 1) {
+function fileDiff(file: string, additions: number) {
  return {
    file,
    additions,
    deletions: 0,
    status: "modified",
-    patch: loaded
-      ? `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after-${version}'\n`
-      : `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}`,
+    patch: `diff --git a/${file} b/${file}\n--- a/${file}\n+++ b/${file}\n@@ -1 +1 @@\n-export const value = 'before'\n+export const value = 'after'\n`,
  }
 }
@@ -21,7 +21,6 @@ export interface MockServerConfig {
  questions?: unknown[] | (() => unknown[])
  fileList?: (path: string) => unknown | Promise<unknown>
  fileContent?: (path: string) => unknown | Promise<unknown>
-  findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown
  sessionStatus?: unknown
 }

@@ -66,15 +65,6 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
      return json(route, await config.fileList(url.searchParams.get("path") ?? ""))
    if (path === "/file/content" && config.fileContent)
      return json(route, await config.fileContent(url.searchParams.get("path") ?? ""))
-    if (path === "/find/file" && config.findFiles)
-      return json(
-        route,
-        await config.findFiles({
-          query: url.searchParams.get("query") ?? "",
-          dirs: url.searchParams.get("dirs") ?? undefined,
-          limit: url.searchParams.has("limit") ? Number(url.searchParams.get("limit")) : undefined,
-        }),
-      )
    if (path === "/api/reference")
      return json(route, {
        location: {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.17.18",
+  "version": "1.17.15",
  "description": "",
  "type": "module",
  "exports": {
@@ -47,7 +47,6 @@
    "vite-plugin-solid": "catalog:"
  },
  "dependencies": {
-    "@corvu/drawer": "catalog:",
    "@dnd-kit/abstract": "0.5.0",
    "@dnd-kit/dom": "0.5.0",
    "@dnd-kit/helpers": "0.5.0",
@@ -89,7 +88,6 @@
    "shiki": "catalog:",
    "solid-js": "catalog:",
    "solid-list": "catalog:",
-    "solid-presence": "0.2.0",
    "tailwindcss": "catalog:"
  }
 }
@@ -12,7 +12,6 @@ import { MetaProvider } from "@solidjs/meta"
 import { type BaseRouterProps, Navigate, Route, Router, useNavigate, useParams, useSearchParams } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { Effect } from "effect"
-import { base64Encode } from "@opencode-ai/core/util/encode"
 import {
  type Component,
  createEffect,
@@ -175,7 +174,6 @@ function LegacyServerLayout(props: ParentProps<{ serverScoped?: JSX.Element }>)

 function DraftRoute() {
  const [search] = useSearchParams<{ draftId?: string }>()
-  const settings = useSettings()
  const tabs = useTabs()
  return (
    <Show when={tabs.ready()}>
@@ -184,14 +182,7 @@ function DraftRoute() {
        keyed
        fallback={<Navigate href="/" />}
      >
-        {(draft) => (
-          <Show
-            when={settings.general.newLayoutDesigns()}
-            fallback={<Navigate href={`/${base64Encode(draft.directory)}/session`} />}
-          >
-            <ResolvedDraftRoute draft={draft} />
-          </Show>
-        )}
+        {(draft) => <ResolvedDraftRoute draft={draft} />}
      </Show>
    </Show>
  )
@@ -20,11 +20,14 @@ import {
  uniqueCommandPaletteEntries,
  type CommandPaletteEntry,
 } from "./command-palette"
-import { DialogCommandPaletteV2 } from "./dialog-command-palette-v2"

 const DialogSelectFileV2 = lazy(() =>
  import("./dialog-select-directory-v2").then((module) => ({ default: module.DialogSelectDirectoryV2 })),
 )
+const DialogCommandPaletteV2 = lazy(() =>
+  import("./dialog-command-palette-v2").then((module) => ({ default: module.DialogCommandPaletteV2 })),
+)
+
 type DialogSelectFileMode = "all" | "files"

 export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFile?: (path: string) => void }) {
@@ -1,173 +0,0 @@
-import { DialogBody, DialogHeader, DialogTitle, DialogV2 } from "@opencode-ai/ui/v2/dialog-v2"
-import { Icon } from "@opencode-ai/ui/v2/icon"
-import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
-import { ScrollView } from "@opencode-ai/ui/scroll-view"
-import { Tag } from "@opencode-ai/ui/v2/badge-v2"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { createMemo, onCleanup, onMount, type Component, For, Show } from "solid-js"
-import { useLocal } from "@/context/local"
-import { popularProviders, useProviders } from "@/hooks/use-providers"
-import { decode64 } from "@/utils/base64"
-import { useLanguage } from "@/context/language"
-import { ModelTooltip } from "./model-tooltip"
-
-type ModelState = ReturnType<typeof useLocal>["model"]
-
-export const DialogSelectModelUnpaidV2: Component<{ model?: ModelState }> = (props) => {
-  const local = useLocal()
-  const model = props.model ?? local.model
-  const dialog = useDialog()
-  const directory = () => decode64(local.slug())
-  const providers = useProviders(directory)
-  const language = useLanguage()
-  const modelKey = (item: ReturnType<ModelState["list"]>[number]) => `${item.provider.id}:${item.id}`
-  const currentKey = createMemo(() => {
-    const c = model.current()
-    return c ? `${c.provider.id}:${c.id}` : undefined
-  })
-  const isFree = (item: ReturnType<ModelState["list"]>[number]) =>
-    item.provider.id === "opencode" && (!item.cost || item.cost.input === 0)
-
-  const openProviders = (provider?: string) => {
-    void import("./dialog-connect-provider").then((x) => {
-      const controller = x.useProviderConnectController()
-      controller.select(provider)
-      void dialog.show(() => <x.DialogConnectProvider controller={controller} directory={directory} />)
-    })
-  }
-
-  const selectModel = (item: ReturnType<ModelState["list"]>[number]) => {
-    model.set({ modelID: item.id, providerID: item.provider.id }, { recent: true })
-    dialog.close()
-  }
-
-  // Focus starts on the dialog's close button, outside the list, so listen at the
-  // document level while the dialog is mounted instead of on the list container.
-  let listEl: HTMLDivElement | undefined
-  onMount(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key !== "ArrowDown" && e.key !== "ArrowUp") return
-      if (!listEl) return
-      const buttons = Array.from(listEl.querySelectorAll<HTMLButtonElement>("button"))
-      if (buttons.length === 0) return
-      const index = buttons.indexOf(document.activeElement as HTMLButtonElement)
-      const next =
-        index < 0 ? (e.key === "ArrowDown" ? 0 : buttons.length - 1) : index + (e.key === "ArrowDown" ? 1 : -1)
-      buttons[(next + buttons.length) % buttons.length]?.focus()
-      e.preventDefault()
-    }
-    document.addEventListener("keydown", handleKeyDown)
-    onCleanup(() => document.removeEventListener("keydown", handleKeyDown))
-  })
-
-  return (
-    <DialogV2 containerClass="!h-[min(calc(100vh_-_16px),480px)] !w-[min(calc(100vw_-_16px),560px)]">
-      <DialogHeader closeLabel={language.t("common.close")}>
-        <DialogTitle>{language.t("dialog.model.select.title")}</DialogTitle>
-      </DialogHeader>
-      <div class="h-px w-full shrink-0 bg-v2-border-border-muted" />
-      <DialogBody class="min-h-0 flex-1 gap-0">
-        <ScrollView class="min-h-0 flex-1 w-full">
-          <div ref={listEl} class="flex min-h-full flex-col">
-            <div class="flex h-fit w-full flex-col items-start gap-0.5 px-3.5 pb-3.5 pt-3">
-              <div class="flex h-8 w-full flex-none select-none flex-row items-center gap-2 self-stretch px-2.5 pb-2 pt-1">
-                <div class="flex h-5 flex-none flex-row items-center p-0 font-[440] text-[13px] leading-5 tracking-[-0.04px] text-v2-text-text-faint [font-family:Inter,var(--font-family-sans)] [font-variant-numeric:tabular-nums] [font-variation-settings:'slnt'_0]">
-                  {language.t("dialog.model.unpaid.freeModels.title")}
-                </div>
-              </div>
-              <For each={model.list()}>
-                {(item) => (
-                  <TooltipV2
-                    class="w-full"
-                    placement="right-start"
-                    gutter={6}
-                    openDelay={0}
-                    value={<ModelTooltip model={item} latest={item.latest} free={isFree(item)} v2 />}
-                  >
-                    <button
-                      type="button"
-                      class="flex w-full scroll-my-3.5 flex-row items-center gap-2 rounded-md px-2.5 py-2 text-left text-[13px] font-[530] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0] hover:bg-v2-overlay-simple-overlay-hover focus:bg-v2-overlay-simple-overlay-hover focus:outline-none"
-                      onClick={() => selectModel(item)}
-                    >
-                      <span class="min-w-0 truncate">{item.name}</span>
-                      <Show when={isFree(item)}>
-                        <Tag class="shrink-0">{language.t("model.tag.free")}</Tag>
-                      </Show>
-                      <Show when={item.latest}>
-                        <Tag class="shrink-0">{language.t("model.tag.latest")}</Tag>
-                      </Show>
-                      <Show when={currentKey() === modelKey(item)}>
-                        <Icon name="check" class="ml-auto size-4 shrink-0 text-v2-icon-icon-base" />
-                      </Show>
-                    </button>
-                  </TooltipV2>
-                )}
-              </For>
-            </div>
-
-            <div class="flex w-full flex-col p-2.5 pt-0">
-              <div class="flex h-fit w-full flex-none grow-0 flex-col items-start gap-0.5 self-stretch rounded-lg bg-v2-background-bg-layer-02 p-1 shadow-[var(--v2-elevation-switch-off)]">
-                <div class="flex h-8 w-full flex-none select-none flex-row items-center gap-2 self-stretch px-2.5 py-1.5">
-                  <div class="flex h-5 flex-none flex-row items-center p-0 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint [font-family:Inter,var(--font-family-sans)] [font-variant-numeric:tabular-nums] [font-variation-settings:'slnt'_0]">
-                    {language.t("dialog.model.unpaid.addMore.title")}
-                  </div>
-                </div>
-                <div class="flex w-full flex-col">
-                  <For
-                    each={[...providers.popular()].sort((a, b) => {
-                      if (popularProviders.includes(a.id) && popularProviders.includes(b.id)) {
-                        return popularProviders.indexOf(a.id) - popularProviders.indexOf(b.id)
-                      }
-                      return a.name.localeCompare(b.name)
-                    })}
-                  >
-                    {(provider) => (
-                      <button
-                        type="button"
-                        class="flex w-full scroll-my-3.5 flex-row items-center gap-2 rounded-[6px] px-2.5 py-2 text-left text-[13px] font-[530] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0] hover:bg-v2-overlay-simple-overlay-hover focus:bg-v2-overlay-simple-overlay-hover focus:outline-none"
-                        onClick={() => openProviders(provider.id)}
-                      >
-                        <ProviderIcon id={provider.id} class="size-4 shrink-0 text-v2-icon-icon-muted" />
-                        <span class="min-w-0 truncate">{provider.name}</span>
-                        <Show when={provider.id === "opencode"}>
-                          <span class="min-w-0 truncate text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-muted [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0]">
-                            {language.t("dialog.provider.opencode.tagline")}
-                          </span>
-                          <Tag class="shrink-0">{language.t("dialog.provider.tag.recommended")}</Tag>
-                        </Show>
-                        <Show when={provider.id === "opencode-go"}>
-                          <span class="min-w-0 truncate text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-muted [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0]">
-                            {language.t("dialog.provider.opencodeGo.tagline")}
-                          </span>
-                          <Tag class="shrink-0">{language.t("dialog.provider.tag.recommended")}</Tag>
-                        </Show>
-                        <Show when={provider.id === "anthropic"}>
-                          <span class="min-w-0 truncate text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-muted [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0]">
-                            {language.t("dialog.provider.anthropic.note")}
-                          </span>
-                        </Show>
-                      </button>
-                    )}
-                  </For>
-                  <button
-                    type="button"
-                    class="flex h-9 w-full scroll-my-3.5 flex-row items-center justify-start gap-2 rounded-[6px] px-2.5 py-2 text-left text-[13px] font-[530] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0] hover:bg-v2-overlay-simple-overlay-hover focus:bg-v2-overlay-simple-overlay-hover focus:outline-none"
-                    onClick={() => openProviders()}
-                  >
-                    <span class="flex size-4 shrink-0 items-center justify-center text-v2-icon-icon-muted">
-                      <Icon name="dot-grid" size="small" />
-                    </span>
-                    <span class="min-w-0 truncate text-left text-[13px] font-[530] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:Inter,var(--font-family-sans)] [font-variation-settings:'slnt'_0]">
-                      {language.t("dialog.provider.viewAll")}
-                    </span>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </ScrollView>
-      </DialogBody>
-    </DialogV2>
-  )
-}
@@ -474,7 +474,7 @@ export function ModelSelectorPopoverV2(props: {
                                }}
                                onSelect={() => selectModel(item)}
                              >
-                                <span class="min-w-0 truncate leading-5">{item.name}</span>
+                                <span class="min-w-0 truncate">{item.name}</span>
                                <Show when={isFree(item.provider.id, item.cost)}>
                                  <TagV2 class="shrink-0">{language.t("model.tag.free")}</TagV2>
                                </Show>
@@ -201,7 +201,6 @@ export default function FileTree(props: {
  kinds?: ReadonlyMap<string, Kind>
  draggable?: boolean
  onFileClick?: (file: FileNode) => void
-  onFileDoubleClick?: (file: FileNode) => void

  _filter?: Filter
  _marks?: Set<string>
@@ -441,7 +440,6 @@ export default function FileTree(props: {
                        active={props.active}
                        draggable={props.draggable}
                        onFileClick={props.onFileClick}
-                        onFileDoubleClick={props.onFileDoubleClick}
                        _filter={filter()}
                        _marks={marks()}
                        _deeps={deeps()}
@@ -464,7 +462,6 @@ export default function FileTree(props: {
                  as="button"
                  type="button"
                  onClick={() => props.onFileClick?.(node)}
-                  onDblClick={() => props.onFileDoubleClick?.(node)}
                >
                  <div class="w-4 shrink-0" />
                  <Switch>
@@ -1,144 +1,54 @@
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
+import { Icon } from "@opencode-ai/ui/v2/icon"
+import { Popover } from "@opencode-ai/ui/popover"
 import { createSignal, Show } from "solid-js"
 import { createStore } from "solid-js/store"
-import { Drawer, DrawerClose, DrawerContent } from "@/components/ui/drawer"
-import { usePlatform } from "@/context/platform"
-import introducingTabsVideo from "@/assets/help/introducing-tabs.mp4"
-import { Persist, persisted } from "@/utils/persist"
-
-const helpIcon = (
-  <svg
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    aria-hidden="true"
-    data-slot="icon-svg"
-  >
-    <path
-      d="M6.94235 10.5714V10.4854C6.94617 9.76302 7.01879 9.18777 7.16022 8.75968C7.30546 8.33158 7.50804 7.98567 7.76796 7.72193C8.02787 7.45819 8.34321 7.21548 8.71397 6.99379C8.93948 6.85619 9.14206 6.69374 9.32171 6.50645C9.50518 6.31916 9.64851 6.10511 9.75171 5.86431C9.85874 5.62351 9.91225 5.35404 9.91225 5.0559C9.91225 4.69661 9.82625 4.38509 9.65424 4.12136C9.48607 3.85762 9.26055 3.65504 8.9777 3.51362C8.69486 3.36837 8.38143 3.29575 8.03743 3.29575C7.73165 3.29575 7.43733 3.35882 7.15448 3.48495C6.87546 3.61108 6.6423 3.80984 6.45501 4.08122C6.26772 4.3526 6.15878 4.70425 6.12821 5.13617H4.56299C4.59357 4.47109 4.76557 3.9054 5.07899 3.43908C5.39242 2.96894 5.80522 2.61156 6.31741 2.36694C6.83341 2.12231 7.40675 2 8.03743 2C8.72161 2 9.31789 2.13378 9.82625 2.40134C10.3384 2.66507 10.734 3.0301 11.0131 3.49642C11.2959 3.96273 11.4373 4.49976 11.4373 5.1075C11.4373 5.53177 11.3724 5.914 11.2424 6.25418C11.1124 6.59436 10.9251 6.89823 10.6805 7.16579C10.4397 7.43335 10.1492 7.67033 9.80905 7.87673C9.48033 8.08313 9.21468 8.301 9.0121 8.53034C8.80952 8.75585 8.66237 9.02341 8.57063 9.33302C8.4789 9.64262 8.42921 10.0268 8.42156 10.4854V10.5714H6.94235ZM7.72782 14C7.43351 14 7.17933 13.8949 6.96528 13.6847C6.75506 13.4744 6.64994 13.2203 6.64994 12.9221C6.64994 12.6278 6.75506 12.3755 6.96528 12.1653C7.17933 11.9551 7.43351 11.85 7.72782 11.85C8.02214 11.85 8.27441 11.9551 8.48463 12.1653C8.69868 12.3755 8.8057 12.6278 8.8057 12.9221C8.8057 13.1209 8.75601 13.3024 8.65663 13.4668C8.55726 13.6273 8.4273 13.7573 8.26676 13.8567C8.10623 13.9522 7.92658 14 7.72782 14Z"
-      fill="var(--v2-icon-icon-base)"
-    />
-  </svg>
-)
-
-const triggerClass =
-  "size-7 !rounded-full shrink-0 bg-v2-background-bg-base shadow-[var(--v2-elevation-button-neutral)]"
-
-// TODO: wire to changelog / seen-state when available
-const showPopover = () => true

 export function HelpButton() {
  if (import.meta.env.VITE_OPENCODE_CHANNEL !== "dev") return null

-  const platform = usePlatform()
+  const [state, setState] = /* persisted(Persist.global("help-button"), */ createStore({ dismissed: false }) /* ) */
+  const [shown, setShown] = createSignal(false)

  return (
-    <a
-      href="https://opencode.ai"
-      aria-label="Open the OpenCode website"
-      data-component="icon-button-v2"
-      data-size="large"
-      class={`${triggerClass} fixed bottom-5 right-5 z-50 flex items-center justify-center`}
-      onClick={(event) => {
-        event.preventDefault()
-        platform.openLink(event.currentTarget.href)
-      }}
-    >
-      {helpIcon}
-    </a>
-  )
-}
-
-// can remove this after the tabs rollout has been out for a while
-export function TabsInfoPopup() {
-  if (import.meta.env.VITE_OPENCODE_CHANNEL !== "dev") return null
-
-  const [state, setState] = persisted(Persist.global("tabsInfoPopup"), createStore({ dismissed: false }))
-  // setState({ dismissed: false }) // for testing
-  const [drawerOpen, setDrawerOpen] = createSignal(false)
-
-  return (
-    <Drawer open={drawerOpen()} onOpenChange={setDrawerOpen} side="right">
-      <Show when={!state.dismissed}>
-        <div
-          class="fixed bottom-14 right-5 z-50 h-[240px] w-[192px] rounded-[8px] bg-v2-background-bg-base p-1 shadow-[var(--v2-elevation-floating)]"
-          aria-label="Introducing Tabs. A faster, more intuitive way to work."
+    <Show when={!state.dismissed}>
+      <div class="fixed bottom-4 right-4 z-50 hidden md:block">
+        <Popover
+          open={shown()}
+          onOpenChange={setShown}
+          triggerAs="button"
+          triggerProps={{
+            type: "button",
+            "aria-label": "Help",
+            class:
+              "size-7 rounded-full bg-background-base shadow-[var(--shadow-lg-border-base)] flex items-center justify-center text-text-base hover:text-text-strong transition-colors",
+          }}
+          trigger={<span aria-hidden="true">?</span>}
+          class="[&_[data-slot=popover-body]]:p-0 w-[320px] max-w-[calc(100vw-40px)] bg-transparent border-0 shadow-none rounded-xl"
+          gutter={8}
+          placement="top-end"
        >
-          <button
-            type="button"
-            aria-label="Dismiss Tabs information"
-            class="absolute top-3 right-3 z-10 size-5 flex items-center justify-center rounded-[4px] bg-[rgba(0,0,0,0.4)]"
-            onClick={() => setState("dismissed", true)}
-          >
-            <svg
-              width="16"
-              height="16"
-              viewBox="0 0 16 16"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-              aria-hidden="true"
-            >
-              <path d="M4.25 11.75L11.75 4.25M11.75 11.75L4.25 4.25" stroke="white" />
-            </svg>
-          </button>
-          <button
-            type="button"
-            class="relative block h-[232px] w-[184px] cursor-pointer overflow-hidden rounded-[4px] text-left"
-            onClick={() => {
-              setState("dismissed", true)
-              setDrawerOpen(true)
-            }}
-          >
-            <video
-              src={introducingTabsVideo}
-              class="absolute inset-0 h-full w-full object-cover"
-              loop
-              muted
-              autoplay
-              playsinline
-              aria-hidden="true"
-              onContextMenu={(event) => event.preventDefault()}
-            />
-            <div class="absolute inset-x-0 bottom-0 flex w-full flex-col items-start gap-1.5 bg-[linear-gradient(180deg,rgba(0,0,0,0)_0%,#000000_100%)] px-3 py-5">
-              <p class="w-full select-none text-[13px] font-[530] leading-none tracking-[-0.04px] text-[#FFFFFF]">
-                Introducing Tabs
-              </p>
-              <p class="w-full select-none text-[13px] font-[440] leading-[140%] tracking-[-0.04px] text-[#808080]">
-                A faster, more intuitive way to work.
+          <Show when={shown()}>
+            <div class="relative flex flex-col gap-1 w-[320px] p-4 rounded-xl bg-background-strong shadow-[var(--shadow-lg-border-base)]">
+              <button
+                type="button"
+                aria-label="Close"
+                class="absolute top-3.5 right-3.5 size-6 rounded-md flex items-center justify-center text-text-base hover:text-text-strong hover:bg-surface-raised-base-hover transition-colors"
+                onClick={() => {
+                  setShown(false)
+                  setState("dismissed", true)
+                }}
+              >
+                <Icon name="xmark-small" />
+              </button>
+              <span class="text-14-regular text-text-strong">Lorem ipsum dolor sit amet</span>
+              <p class="text-12-regular text-text-weak">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et
+                dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.
              </p>
            </div>
-          </button>
-        </div>
-      </Show>
-      <DrawerContent>
-        <div class="flex h-[52px] w-full shrink-0 items-center gap-4 self-stretch border-b border-v2-border-border-muted p-4">
-          <p class="min-h-0 min-w-0 flex-1 text-[13px] font-[530] leading-5 tracking-[-0.04px] tabular-nums text-v2-text-text-muted">
-            June 16
-          </p>
-          <DrawerClose
-            as={IconButtonV2}
-            type="button"
-            size="small"
-            variant="ghost-muted"
-            aria-label="Close"
-            icon={<IconV2 name="xmark-small" />}
-          />
-        </div>
-        <div class="relative flex w-full flex-col items-start gap-6 p-8">
-          <p class="w-full shrink-0 self-stretch text-[21px] font-[610] leading-6 tracking-[-0.37px] tabular-nums text-v2-text-text-base">
-            Introducing Tabs Navigation.
-          </p>
-          <p class="w-full flex-1 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base">
-            We've introduced tabs as the primary navigation in OpenCode. Your most important session are now pinned at
-            the top of your screen at all times. No more hunting through menus or losing your place mid-session. Switch
-            contexts instantly, pick up exactly where you left off, and keep your focus where it belongs: on the
-            sessions.
-          </p>
-        </div>
-      </DrawerContent>
-    </Drawer>
+          </Show>
+        </Popover>
+      </div>
+    </Show>
  )
 }
@@ -43,8 +43,6 @@ import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Select } from "@opencode-ai/ui/select"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { ModelSelectorPopover, ModelSelectorPopoverV2 } from "@/components/dialog-select-model"
-import { DialogSelectModelUnpaid } from "@/components/dialog-select-model-unpaid"
-import { DialogSelectModelUnpaidV2 } from "@/components/dialog-select-model-unpaid-v2"
 import { useCommand } from "@/context/command"
 import { Persist, persisted } from "@/utils/persist"
 import { usePermission } from "@/context/permission"
@@ -522,7 +520,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

  const setMode = (mode: "normal" | "shell") => {
    setStore("mode", mode)
-    setStore({ popover: null, slashMenu: false, slashMenuQuery: "" })
+    setStore("popover", null)
    requestAnimationFrame(() => editorRef?.focus())
  }

@@ -556,7 +554,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    },
  ])

-  const closePopover = () => setStore({ popover: null, slashMenu: false, slashMenuQuery: "" })
+  const closePopover = () => setStore("popover", null)

  const resetHistoryNavigation = (force = false) => {
    if (!force && (store.historyIndex < 0 || store.applyingHistory)) return
@@ -802,30 +800,17 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

  const handleSlashSelect = (cmd: SlashCommand | undefined) => {
    if (!cmd) return
-    const menu = store.slashMenu
    closePopover()
    const images = imageAttachments()

    if (cmd.type === "custom") {
      const text = `/${cmd.trigger} `
-      if (menu) {
-        editorRef.focus()
-        setCursorPosition(editorRef, 0)
-        addPart({ type: "text", content: text, start: 0, end: text.length })
-        focusEditorEnd()
-        return
-      }
      setEditorText(text)
      prompt.set([{ type: "text", content: text, start: 0, end: text.length }, ...images], text.length)
      focusEditorEnd()
      return
    }

-    if (menu) {
-      command.trigger(cmd.id, "slash")
-      return
-    }
-
    clearEditor()
    prompt.set([...DEFAULT_PROMPT, ...images], 0)
    command.trigger(cmd.id, "slash")
@@ -1087,10 +1072,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

      if (atMatch) {
        atOnInput(atMatch[1])
-        setStore({ popover: "at", slashMenu: false, slashMenuQuery: "" })
+        setStore("popover", "at")
      } else if (slashMatch) {
        slashOnInput(slashMatch[1])
-        setStore({ popover: "slash", slashMenu: false, slashMenuQuery: "" })
+        setStore("popover", "slash")
      } else {
        closePopover()
      }
@@ -1186,28 +1171,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    return true
  }

-  const openCommands = () => {
-    const populated = prompt.dirty() || commentCount() > 0
-    requestAnimationFrame(() => {
-      if (!populated) {
-        if (!addPart({ type: "text", content: "/", start: 0, end: 0 })) return
-        slashOnInput("")
-        setStore({ popover: "slash", slashMenu: false, slashMenuQuery: "" })
-        return
-      }
-      slashOnInput("")
-      setStore({ popover: "slash", slashMenu: true, slashMenuQuery: "" })
-    })
-  }
-
-  const openContext = () => {
-    requestAnimationFrame(() => {
-      if (!addPart({ type: "text", content: "@", start: 0, end: 0 })) return
-      atOnInput("")
-      setStore({ popover: "at", slashMenu: false, slashMenuQuery: "" })
-    })
-  }
-
  const addToHistory = (prompt: Prompt, mode: "normal" | "shell") => {
    history.add(prompt, mode, mode === "shell" ? [] : historyComments())
  }
@@ -1236,7 +1199,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        }

        setStore("mode", "normal")
-        closePopover()
+        setStore("popover", null)
        setStore("historyIndex", -1)
        setStore("savedPrompt", null)
        prompt.set(edit.prompt, promptLength(edit.prompt))
@@ -1323,10 +1286,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        resetHistoryNavigation(true)
      },
      setMode: (mode) => setStore("mode", mode),
-      setPopover: (popover) => {
-        if (!popover) return closePopover()
-        setStore({ popover, slashMenu: false, slashMenuQuery: "" })
-      },
+      setPopover: (popover) => setStore("popover", popover),
      newSessionWorktree: () => props.newSessionWorktree,
      onNewSessionWorktreeReset: props.onNewSessionWorktreeReset,
      shouldQueue: props.shouldQueue,
@@ -1365,7 +1325,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      const cursorPosition = getCursorPosition(editorRef)
      if (cursorPosition === 0) {
        setStore("mode", "shell")
-        closePopover()
+        setStore("popover", null)
        event.preventDefault()
        return
      }
@@ -1500,29 +1460,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }
  }

-  const handleSlashMenuKeyDown = (event: KeyboardEvent) => {
-    if (event.key === "Escape") {
-      closePopover()
-      requestAnimationFrame(() => editorRef.focus())
-      event.preventDefault()
-      return
-    }
-
-    if (event.key === "Tab") {
-      selectPopoverActive()
-      event.preventDefault()
-      return
-    }
-
-    const ctrl = event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey
-    const nav = event.key === "ArrowUp" || event.key === "ArrowDown" || event.key === "Enter"
-    const ctrlNav = ctrl && (event.key === "n" || event.key === "p")
-    if (!nav && !ctrlNav) return
-    slashOnKeyDown(event)
-    if (event.key === "ArrowUp" || event.key === "ArrowDown" || ctrlNav) scrollSlashActiveIntoView()
-    event.preventDefault()
-  }
-
  const agentsLoading = () => props.controls.agents.loading
  const agentsShouldFadeIn = createMemo<boolean>((prev) => prev ?? agentsLoading())
  const providersLoading = () => props.controls.model.loading
@@ -1551,11 +1488,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    style: control(),
    onClose: restoreFocus,
    onUnpaidClick: () => {
-      if (props.controls.newLayoutDesigns) {
-        dialog.show(() => <DialogSelectModelUnpaidV2 model={props.controls.model.selection} />)
-        return
-      }
-      dialog.show(() => <DialogSelectModelUnpaid model={props.controls.model.selection} />)
+      void import("@/components/dialog-select-model-unpaid").then((x) => {
+        dialog.show(() => <x.DialogSelectModelUnpaid model={props.controls.model.selection} />)
+      })
    },
  }))

@@ -1592,13 +1527,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        slashActive={slashActive() ?? undefined}
        setSlashActive={setSlashActive}
        onSlashSelect={handleSlashSelect}
-        slashMenu={store.slashMenu}
-        slashMenuQuery={store.slashMenuQuery}
-        onSlashMenuInput={(value) => {
-          setStore("slashMenuQuery", value)
-          slashOnInput(value)
-        }}
-        onSlashMenuKeyDown={handleSlashMenuKeyDown}
        commandKeybind={command.keybind}
        commandKeybindParts={command.keybindParts}
        newLayoutDesigns={props.controls.newLayoutDesigns}
@@ -1697,45 +1625,23 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    placement="top"
                    value={
                      <>
-                        {language.t("prompt.menu.addImagesAndFiles")}
+                        {language.t("prompt.action.attachFile")}
                        <KeybindV2 keys={command.keybindParts("file.attach")} variant="neutral" />
                      </>
                    }
                  >
-                    <MenuV2 gutter={6} modal={false} placement="top-start">
-                      <MenuV2.Trigger
-                        as={IconButton}
-                        data-action="prompt-attach"
-                        type="button"
-                        icon="plus"
-                        variant="ghost"
-                        class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted"
-                        style={buttons()}
-                        disabled={store.mode !== "normal"}
-                        tabIndex={store.mode === "normal" ? undefined : -1}
-                        aria-label={language.t("prompt.menu.addImagesAndFiles")}
-                      />
-                      <MenuV2.Portal>
-                        <MenuV2.Content
-                          class="[&_[data-slot=menu-v2-item-shortcut]]:w-5 [&_[data-slot=menu-v2-item-shortcut]]:justify-center"
-                          style={{ "min-width": "180px" }}
-                        >
-                          <MenuV2.Item onSelect={pick} shortcut={command.keybind("file.attach")}>
-                            {language.t("prompt.menu.imagesAndFiles")}
-                          </MenuV2.Item>
-                          <MenuV2.Separator />
-                          <MenuV2.Item onSelect={openCommands} shortcut="/">
-                            {language.t("prompt.menu.commands")}
-                          </MenuV2.Item>
-                          <MenuV2.Item onSelect={openContext} shortcut="@">
-                            {language.t("prompt.menu.context")}
-                          </MenuV2.Item>
-                          <MenuV2.Item onSelect={() => setMode("shell")} shortcut="!">
-                            {language.t("prompt.menu.shellCommand")}
-                          </MenuV2.Item>
-                        </MenuV2.Content>
-                      </MenuV2.Portal>
-                    </MenuV2>
+                    <IconButton
+                      data-action="prompt-attach"
+                      type="button"
+                      icon="plus"
+                      variant="ghost"
+                      class="size-7 rounded-md p-[6px] text-v2-icon-icon-muted"
+                      style={buttons()}
+                      onClick={pick}
+                      disabled={store.mode !== "normal"}
+                      tabIndex={store.mode === "normal" ? undefined : -1}
+                      aria-label={language.t("prompt.action.attachFile")}
+                    />
                  </TooltipV2>
                  <Show when={showAgentControl()}>
                    <ComposerAgentControl state={agentControlState()} />
@@ -1776,7 +1682,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                            class="max-w-[160px] justify-start capitalize"
                            style={control()}
                          >
-                            <span class="truncate leading-5">
+                            <span class="truncate">
                              {props.controls.model.selection.variant.current() ?? language.t("common.default")}
                            </span>
                            <span class="-ml-0.5 -mr-1 flex shrink-0">
@@ -2063,9 +1969,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                                  class="min-w-0 max-w-[320px] text-13-regular text-text-base group"
                                  style={control()}
                                  onClick={() => {
-                                    dialog.show(() => (
-                                      <DialogSelectModelUnpaid model={props.controls.model.selection} />
-                                    ))
+                                    void import("@/components/dialog-select-model-unpaid").then((x) => {
+                                      dialog.show(() => (
+                                        <x.DialogSelectModelUnpaid model={props.controls.model.selection} />
+                                      ))
+                                    })
                                  }}
                                >
                                  <Show when={props.controls.model.selection.current()?.provider?.id}>
@@ -2232,47 +2140,30 @@ function ComposerModelControl(props: { state: ComposerModelControlState }) {
              </>
            }
          >
-            <Show
-              when={props.state.newLayoutDesigns}
-              fallback={
-                <Button
-                  data-action="prompt-model"
-                  as="div"
-                  variant="ghost"
-                  size="normal"
-                  class="min-w-0 max-w-[220px] justify-start text-[13px] font-[440] leading-5 text-v2-text-text-faint group"
-                  classList={{ "animate-in fade-in": props.state.shouldAnimate }}
-                  style={props.state.style}
-                  onClick={props.state.onUnpaidClick}
-                >
-                  <Show when={props.state.providerID}>
-                    {(providerID) => (
-                      <ProviderIcon
-                        id={providerID()}
-                        class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
-                        style={{ "will-change": "opacity", transform: "translateZ(0)" }}
-                      />
-                    )}
-                  </Show>
-                  <span class="truncate">{props.state.modelName}</span>
-                  <span class="-ml-1 shrink-0 flex size-fit">
-                    <Icon name="chevron-down" size="small" class="text-v2-icon-icon-muted" />
-                  </span>
-                </Button>
-              }
+            <Button
+              data-action="prompt-model"
+              as="div"
+              variant="ghost"
+              size="normal"
+              class="min-w-0 max-w-[220px] justify-start text-[13px] font-[440] leading-5 text-v2-text-text-faint group"
+              classList={{ "animate-in fade-in": props.state.shouldAnimate }}
+              style={props.state.style}
+              onClick={props.state.onUnpaidClick}
            >
-              <ButtonV2
-                data-action="prompt-model"
-                variant="ghost-muted"
-                size="normal"
-                class="min-w-0 max-w-[220px] justify-start ![font-weight:440] group"
-                classList={{ "animate-in fade-in": props.state.shouldAnimate }}
-                style={props.state.style}
-                onClick={props.state.onUnpaidClick}
-              >
-                <ModelControlContent state={props.state} v2 />
-              </ButtonV2>
-            </Show>
+              <Show when={props.state.providerID}>
+                {(providerID) => (
+                  <ProviderIcon
+                    id={providerID()}
+                    class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
+                    style={{ "will-change": "opacity", transform: "translateZ(0)" }}
+                  />
+                )}
+              </Show>
+              <span class="truncate">{props.state.modelName}</span>
+              <span class="-ml-1 shrink-0 flex size-fit">
+                <Icon name="chevron-down" size="small" class="text-v2-icon-icon-muted" />
+              </span>
+            </Button>
          </TooltipV2>
        }
      >
@@ -41,10 +41,6 @@ type PromptPopoverProps = {
  slashActive?: string
  setSlashActive: (id: string) => void
  onSlashSelect: (item: SlashCommand) => void
-  slashMenu: boolean
-  slashMenuQuery: string
-  onSlashMenuInput: (value: string) => void
-  onSlashMenuKeyDown: (event: KeyboardEvent) => void
  commandKeybind: (id: string) => string | undefined
  commandKeybindParts: (id: string) => string[]
  newLayoutDesigns: boolean
@@ -258,20 +254,6 @@ export const PromptPopover: Component<PromptPopoverProps> = (props) => {
            </Show>
          </Match>
          <Match when={props.popover === "slash"}>
-            <Show when={props.slashMenu}>
-              <div class="px-2 py-1">
-                <input
-                  ref={(el) => requestAnimationFrame(() => el.focus())}
-                  value={props.slashMenuQuery}
-                  onInput={(event) => props.onSlashMenuInput(event.currentTarget.value)}
-                  onKeyDown={props.onSlashMenuKeyDown}
-                  onMouseDown={(event) => event.stopPropagation()}
-                  aria-label={props.t("prompt.menu.commands")}
-                  placeholder="/"
-                  class="w-full bg-transparent outline-none text-[13px] leading-5 text-v2-text-text-base placeholder:text-v2-text-text-faint"
-                />
-              </div>
-            </Show>
            <Show
              when={props.slashFlat.length > 0}
              fallback={
@@ -4,8 +4,6 @@ import type { PromptHistoryEntry } from "./history"

 export type PromptInputTransientState = {
  popover: "at" | "slash" | null
-  slashMenu: boolean
-  slashMenuQuery: string
  historyIndex: number
  savedPrompt: PromptHistoryEntry | null
  placeholder: number
@@ -18,8 +16,6 @@ export type PromptInputTransientState = {
 function resetPromptInputTransientState(setStore: SetStoreFunction<PromptInputTransientState>) {
  setStore({
    popover: null,
-    slashMenu: false,
-    slashMenuQuery: "",
    historyIndex: -1,
    savedPrompt: null,
    draggingType: null,
@@ -32,8 +28,6 @@ function resetPromptInputTransientState(setStore: SetStoreFunction<PromptInputTr
 export function createPromptInputTransientState(identity: Accessor<unknown>, placeholder: number) {
  const [store, setStore] = createStore<PromptInputTransientState>({
    popover: null,
-    slashMenu: false,
-    slashMenuQuery: "",
    historyIndex: -1,
    savedPrompt: null,
    placeholder,
@@ -4,7 +4,6 @@ import { ProgressCircleV2 } from "@opencode-ai/ui/v2/progress-circle-v2"
 import { Button } from "@opencode-ai/ui/button"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
-import { createMediaQuery } from "@solid-primitives/media"

 import { useFile } from "@/context/file"
 import { useLayout } from "@/context/layout"
@@ -15,7 +14,6 @@ import { useSDK } from "@/context/sdk"
 import { getSessionContext, getSessionTokenTotal } from "@/components/session/session-context-metrics"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
-import { useSettings } from "@/context/settings"

 interface SessionContextUsageProps {
  variant?: "button" | "indicator"
@@ -49,10 +47,8 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  const layout = useLayout()
  const language = useLanguage()
  const sdk = useSDK()
-  const settings = useSettings()
  const providers = useProviders(() => sdk().directory)
  const { params, tabs, view } = useSessionLayout()
-  const isDesktop = createMediaQuery("(min-width: 768px)")

  const variant = createMemo(() => props.variant ?? "button")
  const buttonAppearance = createMemo(() => props.buttonAppearance ?? "default")
@@ -60,7 +56,6 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
    tabs,
    pathFromTab: file.pathFromTab,
    normalizeTab: (tab) => (tab.startsWith("file://") ? file.tab(tab) : tab),
-    fileBrowser: () => settings.general.newLayoutDesigns() && isDesktop() && !!params.id,
  })
  const messages = createMemo(() => (params.id ? (sync().data.message[params.id] ?? []) : []))
  const info = createMemo(() => (params.id ? sync().session.get(params.id) : undefined))
@@ -24,7 +24,6 @@ import { focusTerminalById } from "@/pages/session/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { messageAgentColor } from "@/utils/agent"
 import { decode64 } from "@/utils/base64"
-import { fileManagerApp } from "@/utils/file-manager"
 import { Persist, persisted } from "@/utils/persist"
 import { StatusPopover, StatusPopoverV2 } from "../status-popover"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
@@ -176,7 +175,11 @@ export function SessionHeader() {
    return LINUX_APPS
  })

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

  createEffect(() => {
    if (platform.platform !== "desktop") return
@@ -10,7 +10,7 @@ import { useFile } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { useCommand } from "@/context/command"

-export function FileVisual(props: { path: string; active?: boolean; temporary?: boolean }): JSX.Element {
+export function FileVisual(props: { path: string; active?: boolean }): JSX.Element {
  return (
    <div class="flex items-center gap-x-1.5 min-w-0">
      <Show
@@ -22,19 +22,12 @@ export function FileVisual(props: { path: string; active?: boolean; temporary?:
          <FileIcon node={{ path: props.path, type: "file" }} mono class="absolute inset-0 size-4 tab-fileicon-mono" />
        </span>
      </Show>
-      <span class="text-14-medium truncate" classList={{ italic: props.temporary }}>
-        {getFilename(props.path)}
-      </span>
+      <span class="text-14-medium truncate">{getFilename(props.path)}</span>
    </div>
  )
 }

-export function SortableTab(props: {
-  tab: string
-  temporary?: boolean
-  onTabClose: (tab: string) => void
-  onTabDoubleClick?: (tab: string) => void
-}): JSX.Element {
+export function SortableTab(props: { tab: string; onTabClose: (tab: string) => void }): JSX.Element {
  const file = useFile()
  const language = useLanguage()
  const command = useCommand()
@@ -43,7 +36,7 @@ export function SortableTab(props: {
  const content = createMemo(() => {
    const value = path()
    if (!value) return
-    return <FileVisual path={value} temporary={props.temporary} />
+    return <FileVisual path={value} />
  })
  return (
    <div use:sortable class="h-full flex items-center" classList={{ "opacity-0": sortable.isActiveDraggable }}>
@@ -68,7 +61,6 @@ export function SortableTab(props: {
          }
          hideCloseButton
          onMiddleClick={() => props.onTabClose(props.tab)}
-          onDblClick={() => props.onTabDoubleClick?.(props.tab)}
        >
          <Show when={content()}>{(value) => value()}</Show>
        </Tabs.Trigger>
@@ -4,7 +4,7 @@ import { useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useDialog } from "@opencode-ai/ui/context/dialog"

-export function useSettingsDialog(defaultValue?: string) {
+export function useSettingsDialog() {
  const dialog = useDialog()
  const params = useParams<{ id?: string }>()
  let run = 0
@@ -19,7 +19,7 @@ export function useSettingsDialog(defaultValue?: string) {
    const sessionID = params.id
    void import("@/components/settings-v2").then((module) => {
      if (dead || run !== current) return
-      void dialog.show(() => <module.DialogSettings sessionID={sessionID} defaultValue={defaultValue} />)
+      void dialog.show(() => <module.DialogSettings sessionID={sessionID} />)
    })
  }
 }
@@ -1,119 +0,0 @@
-/**
- * Taken from https://www.solid-ui.com/docs/components/drawer
- * Only used in one place hence not a v2 component yet... can be promoted to ui/v2 later
- */
-
-import type { Component, ComponentProps, JSX, ValidComponent } from "solid-js"
-import { splitProps } from "solid-js"
-import type { ContentProps, DescriptionProps, DynamicProps, LabelProps, OverlayProps } from "@corvu/drawer"
-import DrawerPrimitive from "@corvu/drawer"
-
-const Drawer = DrawerPrimitive
-
-const DrawerTrigger = DrawerPrimitive.Trigger
-
-const DrawerPortal = DrawerPrimitive.Portal
-
-const DrawerClose = DrawerPrimitive.Close
-
-type DrawerOverlayProps<T extends ValidComponent = "div"> = OverlayProps<T> & { class?: string }
-
-const DrawerOverlay = <T extends ValidComponent = "div">(props: DynamicProps<T, DrawerOverlayProps<T>>) => {
-  const [, rest] = splitProps(props as DrawerOverlayProps, ["class"])
-  const drawerContext = DrawerPrimitive.useContext()
-  const overlayStyle = () => {
-    const state = drawerContext.transitionState()
-    if (state === "opening" || state === "closing") return undefined
-    const open = drawerContext.openPercentage()
-    return {
-      opacity: open,
-      "backdrop-filter": `blur(${4 * open}px)`,
-    }
-  }
-  return (
-    <DrawerPrimitive.Overlay
-      class={props.class}
-      classList={{
-        "fixed inset-0 z-[100] bg-v2-overlay-simple-overlay-scrim opacity-0 backdrop-blur-none transition-[opacity,backdrop-filter] duration-300 data-[opening]:opacity-100 data-[opening]:backdrop-blur-[4px] data-[closing]:opacity-0 data-[closing]:backdrop-blur-none": true,
-      }}
-      style={overlayStyle()}
-      {...rest}
-    />
-  )
-}
-
-type DrawerContentProps<T extends ValidComponent = "div"> = ContentProps<T> & {
-  class?: string
-  children?: JSX.Element
-}
-
-const DrawerContent = <T extends ValidComponent = "div">(props: DynamicProps<T, DrawerContentProps<T>>) => {
-  const [, rest] = splitProps(props as DrawerContentProps, ["class", "children"])
-  return (
-    <DrawerPortal>
-      <DrawerOverlay />
-      <DrawerPrimitive.Content
-        class={props.class}
-        classList={{
-          "group/drawer-content fixed inset-y-[6px] right-[6px] left-auto z-[100] flex h-auto max-h-[calc(100vh-12px)] w-[560px] max-w-[calc(100vw-12px)] flex-col items-start rounded-[8px] bg-v2-background-bg-base p-0 shadow-[var(--v2-elevation-overlay)] data-[transitioning]:transition-transform data-[transitioning]:duration-300 md:select-none": true,
-        }}
-        {...rest}
-      >
-        {props.children}
-      </DrawerPrimitive.Content>
-    </DrawerPortal>
-  )
-}
-
-const DrawerHeader: Component<ComponentProps<"div">> = (props) => {
-  const [, rest] = splitProps(props, ["class"])
-  return <div class={props.class} classList={{ "grid gap-1.5 p-4 text-center sm:text-left": true }} {...rest} />
-}
-
-const DrawerFooter: Component<ComponentProps<"div">> = (props) => {
-  const [, rest] = splitProps(props, ["class"])
-  return <div class={props.class} classList={{ "mt-auto flex flex-col gap-2 p-4": true }} {...rest} />
-}
-
-type DrawerTitleProps<T extends ValidComponent = "div"> = LabelProps<T> & { class?: string }
-
-const DrawerTitle = <T extends ValidComponent = "div">(props: DynamicProps<T, DrawerTitleProps<T>>) => {
-  const [, rest] = splitProps(props as DrawerTitleProps, ["class"])
-  return (
-    <DrawerPrimitive.Label
-      class={props.class}
-      classList={{ "text-base font-[530] leading-none tracking-[-0.04px] text-v2-text-text-base": true }}
-      {...rest}
-    />
-  )
-}
-
-type DrawerDescriptionProps<T extends ValidComponent = "div"> = DescriptionProps<T> & {
-  class?: string
-}
-
-const DrawerDescription = <T extends ValidComponent = "div">(props: DynamicProps<T, DrawerDescriptionProps<T>>) => {
-  const [, rest] = splitProps(props as DrawerDescriptionProps, ["class"])
-  return (
-    <DrawerPrimitive.Description
-      class={props.class}
-      classList={{
-        "text-[13px] font-[440] leading-[140%] tracking-[-0.04px] text-v2-text-text-muted": true,
-      }}
-      {...rest}
-    />
-  )
-}
-
-export {
-  Drawer,
-  DrawerPortal,
-  DrawerOverlay,
-  DrawerTrigger,
-  DrawerClose,
-  DrawerContent,
-  DrawerHeader,
-  DrawerFooter,
-  DrawerTitle,
-  DrawerDescription,
-}
@@ -203,15 +203,12 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
      return promise
    }

-    const search = (query: string, dirs: "true" | "false", options?: { limit?: number; signal?: AbortSignal }) =>
+    const search = (query: string, dirs: "true" | "false") =>
      sdk()
-        .client.find.files({ query, dirs, limit: options?.limit }, { signal: options?.signal })
+        .client.find.files({ query, dirs })
        .then(
          (x) => (x.data ?? []).map(path.normalize),
-          (error) => {
-            if (options?.signal?.aborted) throw error
-            return []
-          },
+          () => [],
        )

    const stop = sdk().event.listen((e) => {
@@ -287,8 +284,7 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
      setScrollLeft,
      selectedLines,
      setSelectedLines,
-      searchFiles: (query: string, options?: { limit?: number; signal?: AbortSignal }) =>
-        search(query, "false", options),
+      searchFiles: (query: string) => search(query, "false"),
      searchFilesAndDirectories: (query: string) => search(query, "true"),
    }
  },
@@ -1,82 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import {
-  SESSION_OPEN_FILE_TAB,
-  closeSessionTab,
-  openSessionTab,
-  previewSessionTab,
-  type SessionTabState,
-} from "./layout-tabs"
-
-const state = (all: string[], active?: string, preview?: string): SessionTabState => ({
-  tabs: { all, active },
-  preview,
-})
-
-describe("previewSessionTab", () => {
-  test("appends the Open File placeholder", () => {
-    expect(previewSessionTab(state(["file://a.ts"], "file://a.ts"), SESSION_OPEN_FILE_TAB)).toEqual(
-      state(["file://a.ts", SESSION_OPEN_FILE_TAB], SESSION_OPEN_FILE_TAB, SESSION_OPEN_FILE_TAB),
-    )
-  })
-
-  test("replaces the current preview in place", () => {
-    expect(
-      previewSessionTab(
-        state(["context", SESSION_OPEN_FILE_TAB, "file://b.ts"], SESSION_OPEN_FILE_TAB, SESSION_OPEN_FILE_TAB),
-        "file://a.ts",
-      ),
-    ).toEqual(state(["context", "file://a.ts", "file://b.ts"], "file://a.ts", "file://a.ts"))
-  })
-
-  test("activates a durable tab without duplicating it", () => {
-    expect(
-      previewSessionTab(
-        state(["file://a.ts", SESSION_OPEN_FILE_TAB, "file://b.ts"], SESSION_OPEN_FILE_TAB, SESSION_OPEN_FILE_TAB),
-        "file://b.ts",
-      ),
-    ).toEqual(state(["file://a.ts", "file://b.ts"], "file://b.ts"))
-  })
-
-  test("replaces a restored Open File placeholder", () => {
-    expect(
-      previewSessionTab(state(["file://a.ts", SESSION_OPEN_FILE_TAB], SESSION_OPEN_FILE_TAB), "file://b.ts"),
-    ).toEqual(state(["file://a.ts", "file://b.ts"], "file://b.ts", "file://b.ts"))
-  })
-})
-
-describe("openSessionTab", () => {
-  test("pins the current preview", () => {
-    expect(openSessionTab(state(["file://a.ts"], "file://a.ts", "file://a.ts"), "file://a.ts")).toEqual(
-      state(["file://a.ts"], "file://a.ts"),
-    )
-  })
-
-  test("replaces a preview with a directly opened file", () => {
-    expect(openSessionTab(state(["file://a.ts"], "file://a.ts", "file://a.ts"), "file://b.ts")).toEqual(
-      state(["file://b.ts"], "file://b.ts"),
-    )
-  })
-
-  test("keeps the preview when switching to Review", () => {
-    expect(openSessionTab(state(["file://a.ts"], "file://a.ts", "file://a.ts"), "review")).toEqual(
-      state(["file://a.ts"], "review", "file://a.ts"),
-    )
-  })
-
-  test("replaces a restored Open File placeholder with a direct open", () => {
-    expect(openSessionTab(state(["file://a.ts", SESSION_OPEN_FILE_TAB], SESSION_OPEN_FILE_TAB), "file://b.ts")).toEqual(
-      state(["file://a.ts", "file://b.ts"], "file://b.ts"),
-    )
-  })
-})
-
-describe("closeSessionTab", () => {
-  test("clears preview metadata and selects the left neighbor", () => {
-    expect(
-      closeSessionTab(
-        state(["file://a.ts", "file://b.ts", "file://c.ts"], "file://b.ts", "file://b.ts"),
-        "file://b.ts",
-      ),
-    ).toEqual(state(["file://a.ts", "file://c.ts"], "file://a.ts"))
-  })
-})
@@ -1,103 +0,0 @@
-export const SESSION_OPEN_FILE_TAB = "open-file"
-
-export type SessionTabs = {
-  active?: string
-  all: string[]
-}
-
-export type SessionTabState = {
-  tabs: SessionTabs
-  preview?: string
-}
-
-const sessionTabPreview = (current: SessionTabState) =>
-  current.preview ?? (current.tabs.all.includes(SESSION_OPEN_FILE_TAB) ? SESSION_OPEN_FILE_TAB : undefined)
-
-export function previewSessionTab(current: SessionTabState, tab: string): SessionTabState {
-  const preview = sessionTabPreview(current)
-  const previewIndex = preview ? current.tabs.all.indexOf(preview) : -1
-  const existingIndex = current.tabs.all.indexOf(tab)
-
-  if (existingIndex !== -1) {
-    if (previewIndex === -1 || preview === tab) {
-      return { tabs: { all: current.tabs.all, active: tab }, preview: preview === tab ? tab : undefined }
-    }
-    return {
-      tabs: { all: current.tabs.all.filter((item) => item !== preview), active: tab },
-    }
-  }
-
-  if (previewIndex === -1) {
-    return { tabs: { all: [...current.tabs.all, tab], active: tab }, preview: tab }
-  }
-
-  return {
-    tabs: {
-      all: current.tabs.all.map((item, index) => (index === previewIndex ? tab : item)),
-      active: tab,
-    },
-    preview: tab,
-  }
-}
-
-export function openSessionTab(current: SessionTabState, tab: string): SessionTabState {
-  const preview = sessionTabPreview(current)
-  if (tab === "review") {
-    return {
-      tabs: { all: current.tabs.all.filter((item) => item !== tab), active: tab },
-      preview,
-    }
-  }
-
-  if (tab === "context") {
-    return {
-      tabs: { all: [tab, ...current.tabs.all.filter((item) => item !== tab)], active: tab },
-      preview,
-    }
-  }
-
-  const previewIndex = preview ? current.tabs.all.indexOf(preview) : -1
-  const existingIndex = current.tabs.all.indexOf(tab)
-  if (existingIndex !== -1) {
-    if (previewIndex === -1 || preview === tab) {
-      return { tabs: { all: current.tabs.all, active: tab } }
-    }
-    return {
-      tabs: { all: current.tabs.all.filter((item) => item !== preview), active: tab },
-    }
-  }
-
-  if (previewIndex === -1) {
-    return { tabs: { all: [...current.tabs.all, tab], active: tab } }
-  }
-
-  return {
-    tabs: {
-      all: current.tabs.all.map((item, index) => (index === previewIndex ? tab : item)),
-      active: tab,
-    },
-  }
-}
-
-export function closeSessionTab(current: SessionTabState, tab: string): SessionTabState {
-  if (tab === "review") {
-    if (current.tabs.active !== tab) return current
-    return {
-      tabs: { all: current.tabs.all, active: current.tabs.all[0] },
-      preview: current.preview,
-    }
-  }
-
-  const all = current.tabs.all.filter((item) => item !== tab)
-  const preview = current.preview === tab ? undefined : current.preview
-  if (current.tabs.active !== tab) return { tabs: { ...current.tabs, all }, preview }
-
-  const index = current.tabs.all.indexOf(tab)
-  return {
-    tabs: {
-      all,
-      active: current.tabs.all[index - 1] ?? current.tabs.all[index + 1] ?? all[0],
-    },
-    preview,
-  }
-}
@@ -19,7 +19,6 @@ import { migrateLegacySessionStateKeys, ServerScope, SessionStateKey } from "@/u
 import { createSessionKeyReader, ensureSessionKey, pruneSessionKeys } from "./layout-helpers"
 import { requireServerKey } from "@/utils/session-route"
 import { type DraftTab, useTabs } from "./tabs"
-import { closeSessionTab, openSessionTab, previewSessionTab, type SessionTabs } from "./layout-tabs"

 export { createSessionKeyReader, ensureSessionKey, pruneSessionKeys }

@@ -56,11 +55,14 @@ export function getProjectAvatarVariant(key?: string): ProjectAvatarVariant {
  return "gray"
 }

+type SessionTabs = {
+  active?: string
+  all: string[]
+}
+
 type SessionView = {
  scroll: Record<string, SessionScroll>
  reviewOpen?: string[]
-  reviewMode?: ReviewChangeMode
-  reviewFile?: string
  pendingMessage?: string
  pendingMessageAt?: number
 }
@@ -76,7 +78,6 @@ export type LocalProject = Partial<Project> & { worktree: string; expanded: bool
 export type HomeProjectSelection = { server: ServerConnection.Key; directory?: string }

 export type ReviewDiffStyle = "unified" | "split"
-export type ReviewChangeMode = "git" | "branch" | "turn"
 export type ReviewPanelSource = "context-button" | "other"

 export type LayoutRoute =
@@ -85,6 +86,14 @@ export type LayoutRoute =
  | { type: "dir-new-sesssion"; dir: string; dirBase64: string; server?: ServerConnection.Key }
  | { type: "session"; sessionId: string; server?: ServerConnection.Key }

+function nextSessionTabsForOpen(current: SessionTabs | undefined, tab: string): SessionTabs {
+  const all = current?.all ?? []
+  if (tab === "review") return { all: all.filter((x) => x !== "review"), active: tab }
+  if (tab === "context") return { all: [tab, ...all.filter((x) => x !== tab)], active: tab }
+  if (!all.includes(tab)) return { all: [...all, tab], active: tab }
+  return { all, active: tab }
+}
+
 const sessionPath = (key: string) => {
  const dir = SessionStateKey.route(key).split("/")[0]
  if (!dir) return
@@ -298,7 +307,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    )
    const [ephemeral, setEphemeral] = createStore({
      reviewPanelSource: "other" as ReviewPanelSource,
-      sessionTabPreview: {} as Record<string, string | undefined>,
    })

    const MAX_SESSION_KEYS = 50
@@ -357,12 +365,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(

      scroll.drop(drop)
      dropSessionState(drop)
-      setEphemeral(
-        "sessionTabPreview",
-        produce((draft) => {
-          for (const key of drop) delete draft[key]
-        }),
-      )

      for (const key of drop) {
        usage.used.delete(key)
@@ -788,14 +790,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
      view(sessionKey: string | Accessor<string>) {
        const key = createSessionKeyReader(sessionKey, ensureKey)
        const s = createMemo(() => store.sessionView[key()] ?? { scroll: {} })
-        const reviewMode = createMemo(() => {
-          const mode = s().reviewMode
-          if (mode === "git" || mode === "branch" || mode === "turn") return mode
-        })
-        const reviewFile = createMemo(() => {
-          const file = s().reviewFile
-          if (typeof file === "string") return file
-        })
        const terminalOpened = createMemo(() => store.terminal?.opened ?? false)
        const reviewPanelOpened = createMemo(() => store.review?.panelOpened ?? DEFAULT_REVIEW_PANEL_OPENED)
        const reviewPanelSource = createMemo(() => (reviewPanelOpened() ? ephemeral.reviewPanelSource : "other"))
@@ -867,32 +861,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
            },
          },
          review: {
-            mode: reviewMode,
-            setMode(mode: ReviewChangeMode) {
-              const session = key()
-              const current = store.sessionView[session]
-              if (!current) {
-                setStore("sessionView", session, { scroll: {}, reviewMode: mode })
-                prune(session)
-                return
-              }
-              if (current.reviewMode === mode) return
-              setStore("sessionView", session, "reviewMode", mode)
-              prune(session)
-            },
-            file: reviewFile,
-            setFile(file: string) {
-              const session = key()
-              const current = store.sessionView[session]
-              if (!current) {
-                setStore("sessionView", session, { scroll: {}, reviewFile: file })
-                prune(session)
-                return
-              }
-              if (current.reviewFile === file) return
-              setStore("sessionView", session, "reviewFile", file)
-              prune(session)
-            },
            open: createMemo(() => s().reviewOpen ?? []),
            setOpen(open: string[]) {
              const session = key()
@@ -964,17 +932,10 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        const tabs = createMemo(() => store.sessionTabs[key()] ?? { all: [] })
        const normalize = (tab: string) => normalizeSessionTab(path(), tab)
        const normalizeAll = (all: string[]) => normalizeSessionTabList(path(), all)
-        const apply = (session: string, next: ReturnType<typeof openSessionTab>) => {
-          batch(() => {
-            setStore("sessionTabs", session, next.tabs)
-            setEphemeral("sessionTabPreview", session, next.preview)
-          })
-        }
        return {
          tabs,
          active: createMemo(() => tabs().active),
          all: createMemo(() => tabs().all.filter((tab) => tab !== "review")),
-          preview: createMemo(() => ephemeral.sessionTabPreview[key()]),
          setActive(tab: string | undefined) {
            const session = key()
            const next = tab ? normalize(tab) : tab
@@ -987,44 +948,40 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          setAll(all: string[]) {
            const session = key()
            const next = normalizeAll(all).filter((tab) => tab !== "review")
-            batch(() => {
-              if (!store.sessionTabs[session]) {
-                setStore("sessionTabs", session, { all: next, active: undefined })
-              } else {
-                setStore("sessionTabs", session, "all", next)
-              }
-              const preview = ephemeral.sessionTabPreview[session]
-              if (preview && !next.includes(preview)) setEphemeral("sessionTabPreview", session, undefined)
-            })
+            if (!store.sessionTabs[session]) {
+              setStore("sessionTabs", session, { all: next, active: undefined })
+            } else {
+              setStore("sessionTabs", session, "all", next)
+            }
          },
          async open(tab: string) {
            const session = key()
-            apply(
-              session,
-              openSessionTab(
-                { tabs: store.sessionTabs[session] ?? { all: [] }, preview: ephemeral.sessionTabPreview[session] },
-                normalize(tab),
-              ),
-            )
-          },
-          previewTab(tab: string) {
-            const session = key()
-            apply(
-              session,
-              previewSessionTab(
-                { tabs: store.sessionTabs[session] ?? { all: [] }, preview: ephemeral.sessionTabPreview[session] },
-                normalize(tab),
-              ),
-            )
+            const next = nextSessionTabsForOpen(store.sessionTabs[session], normalize(tab))
+            setStore("sessionTabs", session, next)
          },
          close(tab: string) {
            const session = key()
            const current = store.sessionTabs[session]
            if (!current) return
-            apply(
-              session,
-              closeSessionTab({ tabs: current, preview: ephemeral.sessionTabPreview[session] }, normalize(tab)),
-            )
+
+            if (tab === "review") {
+              if (current.active !== tab) return
+              setStore("sessionTabs", session, "active", current.all[0])
+              return
+            }
+
+            const all = current.all.filter((x) => x !== tab)
+            if (current.active !== tab) {
+              setStore("sessionTabs", session, "all", all)
+              return
+            }
+
+            const index = current.all.findIndex((f) => f === tab)
+            const next = current.all[index - 1] ?? current.all[index + 1] ?? all[0]
+            batch(() => {
+              setStore("sessionTabs", session, "all", all)
+              setStore("sessionTabs", session, "active", next)
+            })
          },
          move(tab: string, to: number) {
            const session = key()
@@ -12,16 +12,6 @@ interface ImportMeta {
  readonly env: ImportMetaEnv
 }

-declare module "*.png" {
-  const src: string
-  export default src
-}
-
-declare module "*.mp4" {
-  const src: string
-  export default src
-}
-
 export declare module "solid-js" {
  namespace JSX {
    interface Directives {
@@ -267,11 +267,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "إزالة الملف النشط من السياق",
  "prompt.context.removeFile": "إزالة الملف من السياق",
  "prompt.action.attachFile": "إرفاق ملف",
-  "prompt.menu.addImagesAndFiles": "إضافة ملفات والمزيد",
-  "prompt.menu.imagesAndFiles": "الصور والملفات",
-  "prompt.menu.commands": "الأوامر",
-  "prompt.menu.context": "السياق",
-  "prompt.menu.shellCommand": "أمر shell",
  "prompt.attachment.remove": "إزالة المرفق",
  "prompt.action.send": "إرسال",
  "prompt.action.stop": "توقف",
@@ -553,7 +548,6 @@ export const dict = {
  "home.sessions.group.today": "اليوم",
  "home.sessions.group.yesterday": "أمس",
  "home.sessions.group.older": "الأقدم",
-  "home.providerTip": "اتصل بأكثر من 75 مزودًا لاستخدام نماذج أخرى، بما فيها Claude وGPT وGemini وغيرها",
  "session.tab.session": "جلسة",
  "session.tab.review": "مراجعة",
  "session.tab.context": "سياق",
@@ -267,11 +267,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Remover arquivo ativo do contexto",
  "prompt.context.removeFile": "Remover arquivo do contexto",
  "prompt.action.attachFile": "Anexar arquivo",
-  "prompt.menu.addImagesAndFiles": "Adicionar arquivos e mais",
-  "prompt.menu.imagesAndFiles": "Imagens e arquivos",
-  "prompt.menu.commands": "Comandos",
-  "prompt.menu.context": "Contexto",
-  "prompt.menu.shellCommand": "Comando shell",
  "prompt.attachment.remove": "Remover anexo",
  "prompt.action.send": "Enviar",
  "prompt.action.stop": "Parar",
@@ -557,8 +552,6 @@ export const dict = {
  "home.sessions.group.today": "Hoje",
  "home.sessions.group.yesterday": "Ontem",
  "home.sessions.group.older": "Mais antigas",
-  "home.providerTip":
-    "Conecte-se a mais de 75 provedores para usar outros modelos, incluindo Claude, GPT, Gemini e muito mais",
  "session.tab.session": "Sessão",
  "session.tab.review": "Revisão",
  "session.tab.context": "Contexto",
@@ -287,11 +287,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Ukloni aktivnu datoteku iz konteksta",
  "prompt.context.removeFile": "Ukloni datoteku iz konteksta",
  "prompt.action.attachFile": "Priloži datoteku",
-  "prompt.menu.addImagesAndFiles": "Dodaj datoteke i više",
-  "prompt.menu.imagesAndFiles": "Slike i datoteke",
-  "prompt.menu.commands": "Komande",
-  "prompt.menu.context": "Kontekst",
-  "prompt.menu.shellCommand": "Shell naredba",
  "prompt.attachment.remove": "Ukloni prilog",
  "prompt.action.send": "Pošalji",
  "prompt.action.stop": "Zaustavi",
@@ -608,8 +603,6 @@ export const dict = {
  "home.sessions.group.today": "Danas",
  "home.sessions.group.yesterday": "Jučer",
  "home.sessions.group.older": "Starije",
-  "home.providerTip":
-    "Povežite se s više od 75 pružalaca usluga kako biste koristili druge modele, uključujući Claude, GPT, Gemini i druge",

  "session.tab.session": "Sesija",
  "session.tab.review": "Pregled",
@@ -285,11 +285,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
  "prompt.context.removeFile": "Fjern fil fra kontekst",
  "prompt.action.attachFile": "Vedhæft fil",
-  "prompt.menu.addImagesAndFiles": "Tilføj filer og mere",
-  "prompt.menu.imagesAndFiles": "Billeder og filer",
-  "prompt.menu.commands": "Kommandoer",
-  "prompt.menu.context": "Kontekst",
-  "prompt.menu.shellCommand": "Shell-kommando",
  "prompt.attachment.remove": "Fjern vedhæftning",
  "prompt.action.send": "Send",
  "prompt.action.stop": "Stop",
@@ -605,8 +600,6 @@ export const dict = {
  "home.sessions.group.today": "I dag",
  "home.sessions.group.yesterday": "I går",
  "home.sessions.group.older": "Ældre",
-  "home.providerTip":
-    "Opret forbindelse til mere end 75 udbydere for at bruge andre modeller, herunder Claude, GPT, Gemini og flere",

  "session.tab.session": "Session",
  "session.tab.review": "Gennemgang",
@@ -272,11 +272,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Aktive Datei aus dem Kontext entfernen",
  "prompt.context.removeFile": "Datei aus dem Kontext entfernen",
  "prompt.action.attachFile": "Datei anhängen",
-  "prompt.menu.addImagesAndFiles": "Dateien und mehr hinzufügen",
-  "prompt.menu.imagesAndFiles": "Bilder und Dateien",
-  "prompt.menu.commands": "Befehle",
-  "prompt.menu.context": "Kontext",
-  "prompt.menu.shellCommand": "Shell-Befehl",
  "prompt.attachment.remove": "Anhang entfernen",
  "prompt.action.send": "Senden",
  "prompt.action.stop": "Stopp",
@@ -565,8 +560,6 @@ export const dict = {
  "home.sessions.group.today": "Heute",
  "home.sessions.group.yesterday": "Gestern",
  "home.sessions.group.older": "Älter",
-  "home.providerTip":
-    "Verbinde dich mit über 75 Anbietern, um weitere Modelle wie Claude, GPT, Gemini und andere zu nutzen",
  "session.tab.session": "Sitzung",
  "session.tab.review": "Überprüfung",
  "session.tab.context": "Kontext",
@@ -287,11 +287,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Remove active file from context",
  "prompt.context.removeFile": "Remove file from context",
  "prompt.action.attachFile": "Add files",
-  "prompt.menu.addImagesAndFiles": "Add files and more",
-  "prompt.menu.imagesAndFiles": "Images and files",
-  "prompt.menu.commands": "Commands",
-  "prompt.menu.context": "Context",
-  "prompt.menu.shellCommand": "Shell command",
  "prompt.attachment.remove": "Remove attachment",
  "prompt.action.send": "Send",
  "prompt.action.stop": "Stop",
@@ -627,7 +622,6 @@ export const dict = {
  "home.sessions.group.today": "Today",
  "home.sessions.group.yesterday": "Yesterday",
  "home.sessions.group.older": "Older",
-  "home.providerTip": "Connect to 75+ providers to use other models, including Claude, GPT, Gemini, etc",

  "session.tab.session": "Session",
  "session.tab.review": "Review",
@@ -705,9 +699,6 @@ export const dict = {
  "session.header.open.finder": "Finder",
  "session.header.open.fileExplorer": "File Explorer",
  "session.header.open.fileManager": "File Manager",
-  "session.header.reveal.finder": "Reveal in Finder",
-  "session.header.reveal.fileExplorer": "Reveal in File Explorer",
-  "session.header.reveal.containingFolder": "Open containing folder",
  "session.header.open.app.vscode": "VS Code",
  "session.header.open.app.cursor": "Cursor",
  "session.header.open.app.zed": "Zed",
@@ -286,11 +286,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Eliminar archivo activo del contexto",
  "prompt.context.removeFile": "Eliminar archivo del contexto",
  "prompt.action.attachFile": "Adjuntar archivo",
-  "prompt.menu.addImagesAndFiles": "Añadir archivos y más",
-  "prompt.menu.imagesAndFiles": "Imágenes y archivos",
-  "prompt.menu.commands": "Comandos",
-  "prompt.menu.context": "Contexto",
-  "prompt.menu.shellCommand": "Comando de shell",
  "prompt.attachment.remove": "Eliminar adjunto",
  "prompt.action.send": "Enviar",
  "prompt.action.stop": "Detener",
@@ -609,8 +604,6 @@ export const dict = {
  "home.sessions.group.today": "Hoy",
  "home.sessions.group.yesterday": "Ayer",
  "home.sessions.group.older": "Anteriores",
-  "home.providerTip":
-    "Conéctate a más de 75 proveedores para usar otros modelos, como Claude, GPT, Gemini y muchos más",

  "session.tab.session": "Sesión",
  "session.tab.review": "Revisión",
@@ -267,11 +267,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Retirer le fichier actif du contexte",
  "prompt.context.removeFile": "Retirer le fichier du contexte",
  "prompt.action.attachFile": "Joindre un fichier",
-  "prompt.menu.addImagesAndFiles": "Ajouter des fichiers et plus encore",
-  "prompt.menu.imagesAndFiles": "Images et fichiers",
-  "prompt.menu.commands": "Commandes",
-  "prompt.menu.context": "Contexte",
-  "prompt.menu.shellCommand": "Commande shell",
  "prompt.attachment.remove": "Supprimer la pièce jointe",
  "prompt.action.send": "Envoyer",
  "prompt.action.stop": "Arrêter",
@@ -562,8 +557,6 @@ export const dict = {
  "home.sessions.group.today": "Aujourd'hui",
  "home.sessions.group.yesterday": "Hier",
  "home.sessions.group.older": "Plus anciennes",
-  "home.providerTip":
-    "Connectez-vous à plus de 75 fournisseurs pour utiliser d’autres modèles, notamment Claude, GPT, Gemini, etc.",
  "session.tab.session": "Session",
  "session.tab.review": "Revue",
  "session.tab.context": "Contexte",
@@ -266,11 +266,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "コンテキストからアクティブなファイルを削除",
  "prompt.context.removeFile": "コンテキストからファイルを削除",
  "prompt.action.attachFile": "ファイルを添付",
-  "prompt.menu.addImagesAndFiles": "ファイルなどを追加",
-  "prompt.menu.imagesAndFiles": "画像とファイル",
-  "prompt.menu.commands": "コマンド",
-  "prompt.menu.context": "コンテキスト",
-  "prompt.menu.shellCommand": "シェルコマンド",
  "prompt.attachment.remove": "添付ファイルを削除",
  "prompt.action.send": "送信",
  "prompt.action.stop": "停止",
@@ -555,7 +550,6 @@ export const dict = {
  "home.sessions.group.today": "今日",
  "home.sessions.group.yesterday": "昨日",
  "home.sessions.group.older": "それ以前",
-  "home.providerTip": "75以上のプロバイダーに接続して、Claude、GPT、Geminiなどの他のモデルを利用できます",
  "session.tab.session": "セッション",
  "session.tab.review": "レビュー",
  "session.tab.context": "コンテキスト",
@@ -254,11 +254,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "컨텍스트에서 활성 파일 제거",
  "prompt.context.removeFile": "컨텍스트에서 파일 제거",
  "prompt.action.attachFile": "파일 첨부",
-  "prompt.menu.addImagesAndFiles": "파일 및 기타 항목 추가",
-  "prompt.menu.imagesAndFiles": "이미지 및 파일",
-  "prompt.menu.commands": "명령어",
-  "prompt.menu.context": "컨텍스트",
-  "prompt.menu.shellCommand": "셸 명령",
  "prompt.attachment.remove": "첨부 파일 제거",
  "prompt.action.send": "전송",
  "prompt.action.stop": "중지",
@@ -949,7 +944,6 @@ export const dict = {
  "home.sessions.group.today": "오늘",
  "home.sessions.group.yesterday": "어제",
  "home.sessions.group.older": "이전",
-  "home.providerTip": "75개 이상의 제공업체에 연결하여 Claude, GPT, Gemini 등의 다른 모델을 사용하세요",

  "session.tab.unknown": "알 수 없는 세션",
  "session.error.notFound": "이 세션을 찾을 수 없습니다",
@@ -277,11 +277,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Fjern aktiv fil fra kontekst",
  "prompt.context.removeFile": "Fjern fil fra kontekst",
  "prompt.action.attachFile": "Legg ved fil",
-  "prompt.menu.addImagesAndFiles": "Legg til filer og mer",
-  "prompt.menu.imagesAndFiles": "Bilder og filer",
-  "prompt.menu.commands": "Kommandoer",
-  "prompt.menu.context": "Kontekst",
-  "prompt.menu.shellCommand": "Shell-kommando",
  "prompt.attachment.remove": "Fjern vedlegg",
  "prompt.action.send": "Send",
  "prompt.action.stop": "Stopp",
@@ -1042,8 +1037,6 @@ export const dict = {
  "home.sessions.group.today": "I dag",
  "home.sessions.group.yesterday": "I går",
  "home.sessions.group.older": "Eldre",
-  "home.providerTip":
-    "Koble til over 75 leverandører for å bruke andre modeller, inkludert Claude, GPT, Gemini og flere",

  "session.tab.unknown": "Ukjent sesjon",
  "session.error.notFound": "Denne sesjonen finnes ikke",
@@ -42,7 +42,7 @@ const domains = [
  },
 ] as const

-describe.skipIf(!!process.env.CI)("i18n parity", () => {
+describe("i18n parity", () => {
  test("non-English locales have every English key", async () => {
    for (const domain of domains) {
      const source = await dictionary(domain.source)
@@ -268,11 +268,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Usuń aktywny plik z kontekstu",
  "prompt.context.removeFile": "Usuń plik z kontekstu",
  "prompt.action.attachFile": "Załącz plik",
-  "prompt.menu.addImagesAndFiles": "Dodaj pliki i inne elementy",
-  "prompt.menu.imagesAndFiles": "Obrazy i pliki",
-  "prompt.menu.commands": "Polecenia",
-  "prompt.menu.context": "Kontekst",
-  "prompt.menu.shellCommand": "Polecenie powłoki",
  "prompt.attachment.remove": "Usuń załącznik",
  "prompt.action.send": "Wyślij",
  "prompt.action.stop": "Zatrzymaj",
@@ -558,8 +553,6 @@ export const dict = {
  "home.sessions.group.today": "Dzisiaj",
  "home.sessions.group.yesterday": "Wczoraj",
  "home.sessions.group.older": "Starsze",
-  "home.providerTip":
-    "Połącz się z ponad 75 dostawcami, aby korzystać z innych modeli, w tym Claude, GPT, Gemini i innych",
  "session.tab.session": "Sesja",
  "session.tab.review": "Przegląd",
  "session.tab.context": "Kontekst",
@@ -286,11 +286,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Удалить активный файл из контекста",
  "prompt.context.removeFile": "Удалить файл из контекста",
  "prompt.action.attachFile": "Прикрепить файл",
-  "prompt.menu.addImagesAndFiles": "Добавить файлы и другое",
-  "prompt.menu.imagesAndFiles": "Изображения и файлы",
-  "prompt.menu.commands": "Команды",
-  "prompt.menu.context": "Контекст",
-  "prompt.menu.shellCommand": "Команда оболочки",
  "prompt.attachment.remove": "Удалить вложение",
  "prompt.action.send": "Отправить",
  "prompt.action.stop": "Остановить",
@@ -609,8 +604,6 @@ export const dict = {
  "home.sessions.group.today": "Сегодня",
  "home.sessions.group.yesterday": "Вчера",
  "home.sessions.group.older": "Ранее",
-  "home.providerTip":
-    "Подключитесь к более чем 75 провайдерам, чтобы использовать другие модели, включая Claude, GPT, Gemini и другие",

  "session.tab.session": "Сессия",
  "session.tab.review": "Обзор",
@@ -286,11 +286,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "เอาไฟล์ที่ใช้งานอยู่ออกจากบริบท",
  "prompt.context.removeFile": "เอาไฟล์ออกจากบริบท",
  "prompt.action.attachFile": "แนบไฟล์",
-  "prompt.menu.addImagesAndFiles": "เพิ่มไฟล์และอื่น ๆ",
-  "prompt.menu.imagesAndFiles": "รูปภาพและไฟล์",
-  "prompt.menu.commands": "คำสั่ง",
-  "prompt.menu.context": "บริบท",
-  "prompt.menu.shellCommand": "คำสั่งเชลล์",
  "prompt.attachment.remove": "เอาไฟล์แนบออก",
  "prompt.action.send": "ส่ง",
  "prompt.action.stop": "หยุด",
@@ -604,7 +599,6 @@ export const dict = {
  "home.sessions.group.today": "วันนี้",
  "home.sessions.group.yesterday": "เมื่อวาน",
  "home.sessions.group.older": "ก่อนหน้านี้",
-  "home.providerTip": "เชื่อมต่อกับผู้ให้บริการกว่า 75 รายเพื่อใช้โมเดลอื่นๆ รวมถึง Claude, GPT, Gemini และอีกมากมาย",

  "session.tab.session": "เซสชัน",
  "session.tab.review": "ตรวจสอบ",
@@ -291,11 +291,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Aktif dosyayı bağlamdan çıkar",
  "prompt.context.removeFile": "Dosyayı bağlamdan çıkar",
  "prompt.action.attachFile": "Dosya ekle",
-  "prompt.menu.addImagesAndFiles": "Dosya ve daha fazlasını ekle",
-  "prompt.menu.imagesAndFiles": "Görseller ve dosyalar",
-  "prompt.menu.commands": "Komutlar",
-  "prompt.menu.context": "Bağlam",
-  "prompt.menu.shellCommand": "Kabuk komutu",
  "prompt.attachment.remove": "Eki kaldır",
  "prompt.action.send": "Gönder",
  "prompt.action.stop": "Durdur",
@@ -613,7 +608,6 @@ export const dict = {
  "home.sessions.group.today": "Bugün",
  "home.sessions.group.yesterday": "Dün",
  "home.sessions.group.older": "Daha eski",
-  "home.providerTip": "Claude, GPT, Gemini ve diğer modelleri kullanmak için 75'ten fazla sağlayıcıya bağlanın",

  "session.tab.session": "Oturum",
  "session.tab.review": "İnceleme",
@@ -288,11 +288,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "Видалити активний файл з контексту",
  "prompt.context.removeFile": "Видалити файл з контексту",
  "prompt.action.attachFile": "Додати файли",
-  "prompt.menu.addImagesAndFiles": "Додати файли та інше",
-  "prompt.menu.imagesAndFiles": "Зображення та файли",
-  "prompt.menu.commands": "Команди",
-  "prompt.menu.context": "Контекст",
-  "prompt.menu.shellCommand": "Команда оболонки",
  "prompt.attachment.remove": "Видалити вкладення",
  "prompt.action.send": "Надіслати",
  "prompt.action.stop": "Зупинити",
@@ -631,8 +626,6 @@ export const dict = {
  "home.sessions.group.today": "Сьогодні",
  "home.sessions.group.yesterday": "Учора",
  "home.sessions.group.older": "Раніше",
-  "home.providerTip":
-    "Підключіться до понад 75 провайдерів, щоб використовувати інші моделі, зокрема Claude, GPT, Gemini та інші",

  "session.tab.session": "Сесія",
  "session.tab.review": "Огляд",
@@ -306,11 +306,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "从上下文移除活动文件",
  "prompt.context.removeFile": "从上下文移除文件",
  "prompt.action.attachFile": "附加文件",
-  "prompt.menu.addImagesAndFiles": "添加文件及更多内容",
-  "prompt.menu.imagesAndFiles": "图片和文件",
-  "prompt.menu.commands": "命令",
-  "prompt.menu.context": "上下文",
-  "prompt.menu.shellCommand": "shell 命令",
  "prompt.attachment.remove": "移除附件",
  "prompt.action.send": "发送",
  "prompt.action.stop": "停止",
@@ -605,7 +600,6 @@ export const dict = {
  "home.sessions.group.today": "今天",
  "home.sessions.group.yesterday": "昨天",
  "home.sessions.group.older": "更早",
-  "home.providerTip": "连接 75 个以上的提供商，使用 Claude、GPT、Gemini 等其他模型",

  "session.tab.session": "会话",
  "session.tab.review": "审查",
@@ -286,11 +286,6 @@ export const dict = {
  "prompt.context.removeActiveFile": "從上下文移除目前檔案",
  "prompt.context.removeFile": "從上下文移除檔案",
  "prompt.action.attachFile": "附加檔案",
-  "prompt.menu.addImagesAndFiles": "新增檔案及更多內容",
-  "prompt.menu.imagesAndFiles": "圖片和檔案",
-  "prompt.menu.commands": "命令",
-  "prompt.menu.context": "上下文",
-  "prompt.menu.shellCommand": "shell 命令",
  "prompt.attachment.remove": "移除附件",
  "prompt.action.send": "傳送",
  "prompt.action.stop": "停止",
@@ -600,7 +595,6 @@ export const dict = {
  "home.sessions.group.today": "今天",
  "home.sessions.group.yesterday": "昨天",
  "home.sessions.group.older": "更早",
-  "home.providerTip": "連接 75 個以上的供應商，使用 Claude、GPT、Gemini 等其他模型",

  "session.tab.session": "工作階段",
  "session.tab.review": "審查",
@@ -68,7 +68,6 @@ import { preloadMarkdown } from "@opencode-ai/session-ui/markdown-cache"
 import { archiveHomeSession } from "./home-session-archive"
 import { shouldOpenSessionInBackground } from "./home-session-open"
 import { showToast } from "@/utils/toast"
-import { fileManagerApp } from "@/utils/file-manager"

 const HOME_SESSION_LIMIT = 64
 const HOME_SESSION_HEADER_STICKY_TOP = 12
@@ -1031,24 +1030,8 @@ function HomeProjectRow(props: {
  language: ReturnType<typeof useLanguage>
 }) {
  const global = useGlobal()
-  const platform = usePlatform()
  const serverUnreachable = () => global.servers.health[ServerConnection.key(props.server)]?.healthy === false
  const [state, setState] = createStore({ menuOpen: false })
-  const canRevealInFileManager = () =>
-    platform.platform === "desktop" && !!platform.openPath && ServerConnection.local(props.server)
-  const fileManagerActionLabel = () =>
-    props.language.t(
-      fileManagerApp(platform.platform === "desktop" ? (platform.os ?? "unknown") : "unknown").actionLabel,
-    )
-  const revealInFileManager = () => {
-    if (!platform.openPath) return
-    platform.openPath(props.project.worktree).catch((err: unknown) =>
-      showToast({
-        title: props.language.t("common.requestFailed"),
-        description: errorMessage(err, props.language.t("common.requestFailed")),
-      }),
-    )
-  }
  return (
    <div class="group/project relative flex h-7 min-w-0 items-center rounded-[6px]">
      <button
@@ -1090,9 +1073,6 @@ function HomeProjectRow(props: {
              <MenuV2.Item onSelect={() => props.editProject(props.server, props.project)}>
                {props.language.t("dialog.project.edit.title")}
              </MenuV2.Item>
-              <Show when={canRevealInFileManager()}>
-                <MenuV2.Item onSelect={revealInFileManager}>{fileManagerActionLabel()}</MenuV2.Item>
-              </Show>
              <MenuV2.Item
                disabled={props.unseenCount === 0}
                onSelect={() => props.clearNotifications(props.server, props.project)}
@@ -1,7 +1,7 @@
 import { createEffect, Suspense, type ParentProps } from "solid-js"
 import { useNavigate } from "@solidjs/router"
 import { DebugBar } from "@/components/debug-bar"
-import { HelpButton, TabsInfoPopup } from "@/components/help-button"
+import { HelpButton } from "@/components/help-button"
 import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { usePlatform } from "@/context/platform"
 import { setNavigate } from "@/utils/notification-click"
@@ -39,7 +39,6 @@ export default function NewLayout(props: ParentProps) {
        <Suspense>{props.children}</Suspense>
      </main>
      {import.meta.env.DEV && <DebugBar inline />}
-      <TabsInfoPopup />
      <HelpButton />
      <ToastRegion v2 />
    </div>
@@ -54,7 +54,7 @@ import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme/context"
 import { useCommand, type CommandOption } from "@/context/command"
 import { ConstrainDragXAxis, getDraggableId } from "@/utils/solid-dnd"
 import { DebugBar } from "@/components/debug-bar"
-import { HelpButton, TabsInfoPopup } from "@/components/help-button"
+import { HelpButton } from "@/components/help-button"
 import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { useDirectoryPicker } from "@/components/directory-picker"
 import { ServerConnection, useServer } from "@/context/server"
@@ -2395,7 +2395,6 @@ export default function LegacyLayout(props: ParentProps) {
        </div>
        {import.meta.env.DEV && import.meta.env.VITE_DISABLE_DEBUG_BAR !== "1" && <DebugBar />}
      </div>
-      <TabsInfoPopup />
      <HelpButton />
      <ToastRegion v2={false} />
    </div>
@@ -1,10 +1,8 @@
-import { Show, createEffect, createMemo, createResource, createSignal, onCleanup, untrack } from "solid-js"
+import { Show, createEffect, createMemo, createResource, untrack } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Portal } from "solid-js/web"
 import { useSearchParams } from "@solidjs/router"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
 import { NewSessionDesignView } from "@/components/session"
 import { PromptInput } from "@/components/prompt-input"
 import { StatusPopoverV2 } from "@/components/status-popover"
@@ -26,14 +24,8 @@ import { useComposerCommands } from "@/pages/session/use-composer-commands"
 import { NEW_SESSION_CONTENT_WIDTH } from "@/pages/session/new-session-layout"
 import { PromptWorkspaceSelector } from "@/components/prompt-workspace-selector"
 import { useTitlebarRightMount } from "@/components/titlebar"
-import { useProviders } from "@/hooks/use-providers"
-import { useSettingsDialog } from "@/components/settings-dialog"
-import { Persist, persisted } from "@/utils/persist"
-import createPresence from "solid-presence"

 const workspaceBarEnabled = import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"
-const providerTipDismissalDuration = 30 * 24 * 60 * 60 * 1000
-const providerTipExitDuration = 250

 /**
 * The `/new-session` draft page. Unlike `session.tsx`, this only renders the prompt
@@ -48,8 +40,6 @@ export default function NewSessionPage() {
  const comments = useComments()
  const language = useLanguage()
  const settings = useSettings()
-  const providers = useProviders(() => sdk().directory)
-  const openProviderSettings = useSettingsDialog("providers")
  const route = useSessionKey()
  const [searchParams, setSearchParams] = useSearchParams<{ draftId?: string; prompt?: string }>()

@@ -184,81 +174,9 @@ export default function NewSessionPage() {
                </Show>
              </div>
            </NewSessionDesignView>
-            <ProviderTip
-              ready={() => serverSync().child(sdk().directory)[0].provider_ready}
-              connected={() => providers.paid().length > 0}
-              openProviders={openProviderSettings}
-            />
          </div>
        </div>
      </div>
    </div>
  )
 }
-
-function ProviderTip(props: { ready: () => boolean; connected: () => boolean; openProviders: () => void }) {
-  const language = useLanguage()
-  const [persistedState, setPersistedState, , persistedReady] = persisted(
-    Persist.global("new-session.provider-tip"),
-    createStore({ dismissedAt: 0 }),
-  )
-  const visible = createMemo(
-    () =>
-      props.ready() &&
-      persistedReady() &&
-      !props.connected() &&
-      Date.now() - persistedState.dismissedAt >= providerTipDismissalDuration,
-  )
-
-  function dismiss() {
-    setPersistedState("dismissedAt", Date.now())
-  }
-
-  const [ref, setRef] = createSignal<HTMLDivElement>()
-  const presence = createPresence({
-    show: () => visible(),
-    element: () => ref() ?? null,
-  })
-
-  return (
-    <Show when={presence.present()}>
-      <div class="pointer-events-none absolute inset-x-0 bottom-4 flex justify-center px-10">
-        <div
-          ref={setRef}
-          data-component="provider-tip"
-          data-visible={visible()}
-          class="group/provider-tip pointer-events-auto relative flex h-6 max-w-full items-center transition-[opacity,transform] duration-[250ms] ease-[cubic-bezier(0.215,0.61,0.355,1)] motion-reduce:transition-none"
-          classList={{
-            "data-[visible=false]:animate-out fade-out slide-out-to-bottom-4": true,
-          }}
-        >
-          <button
-            type="button"
-            class="flex h-6 min-w-0 items-center rounded-[4px] pl-1.5 text-[13px] leading-none tracking-[-0.04px] text-v2-text-text-faint transition-[background-color,color] duration-150 ease-in-out hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-text-text-muted focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-text-text-muted focus-visible:outline-none"
-            onClick={props.openProviders}
-          >
-            <span class="truncate">{language.t("home.providerTip")}</span>
-            <span class="flex size-6 shrink-0 items-center justify-center" aria-hidden="true">
-              <IconV2 name="chevron-down" size="small" class="-rotate-90" />
-            </span>
-          </button>
-          <TooltipV2
-            class="hover-reveal absolute left-full top-0 flex h-6 w-7 items-center justify-end delay-0 duration-0 group-hover/provider-tip:delay-[250ms] group-hover/provider-tip:duration-150 group-hover/provider-tip:opacity-100 focus-within:delay-0 focus-within:duration-0 focus-within:opacity-100"
-            placement="top"
-            openDelay={1000}
-            value={language.t("common.dismiss")}
-          >
-            <button
-              type="button"
-              class="flex size-6 items-center justify-center rounded-[4px] text-v2-icon-icon-muted transition-[background-color,color] duration-150 ease-in-out hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-icon-icon-base focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-icon-icon-base focus-visible:outline-none"
-              aria-label={language.t("common.dismiss")}
-              onClick={dismiss}
-            >
-              <IconV2 name="xmark-small" />
-            </button>
-          </TooltipV2>
-        </div>
-      </div>
-    </Show>
-  )
-}
@@ -1,4 +1,4 @@
-import type { Project, UserMessage, VcsFileDiff } from "@opencode-ai/sdk/v2"
+import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { createQuery, skipToken, useMutation, useQueryClient } from "@tanstack/solid-query"
 import {
@@ -11,7 +11,6 @@ import {
  createMemo,
  createEffect,
  createComputed,
-  createSignal,
  on,
  onMount,
  type ParentProps,
@@ -70,18 +69,12 @@ import { createTimelineModel } from "@/pages/session/timeline/model"
 import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { syncSessionModel } from "@/pages/session/session-model-helpers"
-import {
-  clampSessionPanelWidth,
-  SESSION_PANEL_WIDTH_MIN,
-  sessionPanelWidthMax,
-} from "@/pages/session/session-panel-width"
 import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { sessionPanelLayout } from "@/pages/session/session-panel-layout"
 import { SessionReviewEmptyChangesV2 } from "@opencode-ai/session-ui/v2/session-review-empty-changes-v2"
 import { SessionReviewEmptyNoGitV2 } from "@opencode-ai/session-ui/v2/session-review-empty-no-git-v2"
 import { ReviewPanelV2 } from "@/pages/session/v2/review-panel-v2"
 import { createReviewPanelV2State } from "@/pages/session/v2/review-panel-v2-state"
-import { reviewDiffDirectory, reviewDiffNeedsLoad, reviewRootDirectory } from "@/pages/session/v2/review-diff-kinds"
 import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { TerminalPanelV2 } from "@/pages/session/terminal-panel-v2"
 import { useComposerCommands } from "@/pages/session/use-composer-commands"
@@ -107,6 +100,7 @@ type VcsMode = "git" | "branch"
 const sessionViewState = () => ({
  messageId: undefined as string | undefined,
  mobileTab: "session" as "session" | "changes",
+  changes: "git" as ChangeMode,
 })

 function isCurrentSessionNotFoundError(error: unknown, sessionID: string | undefined) {
@@ -353,8 +347,6 @@ export default function Page() {
  const location = useLocation()
  const navigate = useNavigate()
  const { params, sessionKey, workspaceKey, tabs, view } = useSessionLayout()
-  const reviewMode = () => view().review.mode() ?? "git"
-  const reviewFile = () => view().review.file()
  const sessionOwnership = createSessionOwnership(sessionKey)
  const newSessionDesign = createMemo(() => settings.general.newLayoutDesigns())

@@ -448,39 +440,9 @@ export default function Page() {
    newSessionDesign() ? desktopV2ReviewOpen() || desktopTerminalOpen() : desktopReviewOpen(),
  )
  const desktopSidePanelOpen = createMemo(() => desktopSessionResizeOpen() || desktopFileTreeOpen())
-  let panelRow: HTMLDivElement | undefined
-  const [panelRowWidth, setPanelRowWidth] = createSignal<number>()
-  createResizeObserver(
-    () => panelRow,
-    ({ width }) => setPanelRowWidth(width),
-  )
-  const splitReview = createMemo(
-    () => (newSessionDesign() ? desktopV2ReviewOpen() : desktopReviewOpen()) && layout.review.diffStyle() === "split",
-  )
-  // The observer reports the content-box width, which already excludes the row
-  // padding; only the flex gap between the panels remains to subtract.
-  const sessionPanelAvailable = createMemo(() => {
-    const width = panelRowWidth()
-    if (width === undefined) return undefined
-    return width - (settings.general.newLayoutDesigns() ? 8 : 0)
-  })
-  const sessionPanelMax = createMemo(() => {
-    const available = sessionPanelAvailable()
-    if (available === undefined) return 1000
-    return sessionPanelWidthMax({ available, split: splitReview() })
-  })
-  // Clamp at render time so window or sidebar resizes squeeze the chat panel
-  // instead of the review pane, without overwriting the persisted width.
-  const sessionPanelResizedWidth = createMemo(() =>
-    clampSessionPanelWidth({
-      width: layout.session.width(),
-      available: sessionPanelAvailable(),
-      split: splitReview(),
-    }),
-  )
  const sessionPanelWidth = createMemo(() => {
    if (!desktopSidePanelOpen()) return "100%"
-    if (desktopSessionResizeOpen()) return `${sessionPanelResizedWidth()}px`
+    if (desktopSessionResizeOpen()) return `${layout.session.width()}px`
    return `calc(100% - ${layout.fileTree.width()}px)`
  })
  const centered = createMemo(() => isDesktop() && !desktopReviewOpen())
@@ -642,8 +604,7 @@ export default function Page() {
      : store.mobileTab === "changes",
  )
  const vcsMode = createMemo<VcsMode | undefined>(() => {
-    const mode = reviewMode()
-    if (mode === "git" || mode === "branch") return mode
+    if (store.changes === "git" || store.changes === "branch") return store.changes
  })
  const vcsKey = createMemo(
    () =>
@@ -670,63 +631,17 @@ export default function Page() {
  })
  const refreshVcs = debounce(() => void queryClient.invalidateQueries({ queryKey: vcsKey() }), 100)
  const reviewDiffs = () => {
-    if (reviewMode() === "git" || reviewMode() === "branch")
+    if (store.changes === "git" || store.changes === "branch")
      // avoids suspense
      return vcsQuery.isFetched ? (vcsQuery.data ?? []) : []
    return turnDiffs()
  }
-  const activeReviewFile = () => {
-    const diffs = reviewDiffs()
-    const selected = reviewFile()
-    if (selected && diffs.some((diff) => diff.file === selected)) return selected
-    return diffs[0]?.file
-  }
  const reviewCount = () => reviewDiffs().length
  const hasReview = () => reviewCount() > 0
  const reviewReady = () => {
-    if (reviewMode() === "git" || reviewMode() === "branch") return !vcsQuery.isPending
+    if (store.changes === "git" || store.changes === "branch") return !vcsQuery.isPending
    return true
  }
-  const loadReviewDiff = async (file: string, version?: number): Promise<VcsFileDiff | undefined> => {
-    const mode = vcsMode()
-    if (!mode) return
-    const root = reviewRootDirectory(sync().project?.worktree ?? sdk().directory)
-    const directory = reviewDiffDirectory(root, file)
-    const source = reviewDiffs().find((diff) => diff.file === file)
-    const valid = (diff: VcsFileDiff | undefined) => {
-      if (!diff || !source) return
-      if (diff.additions !== source.additions || diff.deletions !== source.deletions) return
-      if (reviewDiffNeedsLoad(diff)) return
-      return diff
-    }
-    const request = (scope: string, context?: number) =>
-      queryClient
-        .fetchQuery({
-          queryKey: [serverSDK().scope, ...vcsKey(), mode, "directory", scope, context, version] as const,
-          staleTime: Number.POSITIVE_INFINITY,
-          retry: 2,
-          queryFn: () =>
-            sdk()
-              .client.vcs.diff({ mode, directory: scope, context })
-              .then((result) => result.data ?? []),
-        })
-        .then((diffs) => diffs.find((diff) => diff.file === file))
-
-    if (directory !== root) {
-      try {
-        const scoped = valid(await request(directory))
-        if (scoped) return scoped
-      } catch (error) {
-        console.debug("[session-review] failed to load scoped vcs diff", { mode, file, directory, error })
-      }
-    }
-    try {
-      const bounded = valid(await request(root, 3))
-      if (bounded) return bounded
-    } catch (error) {
-      console.debug("[session-review] failed to load bounded vcs diff", { mode, file, root, error })
-    }
-  }

  const newSessionWorktree = createMemo(() => {
    if (store.newSessionWorktree === "create") return "create"
@@ -1009,15 +924,12 @@ export default function Page() {
  }

  createEffect(() => {
-    if (!layout.ready()) return
-    if (sync().status !== "complete") return
    if (!sync().project) return
    const list = changesOptions()
-    const mode = reviewMode()
-    if (list.includes(mode)) return
+    if (list.includes(store.changes)) return
    const next = list[0]
    if (!next) return
-    view().review.setMode(next)
+    setStore("changes", next)
  })

  createEffect(
@@ -1037,6 +949,7 @@ export default function Page() {
  const [tree, setTree] = createStore({
    reviewScroll: undefined as HTMLDivElement | undefined,
    pendingDiff: undefined as string | undefined,
+    activeDiff: undefined as string | undefined,
  })

  createEffect(
@@ -1046,6 +959,7 @@ export default function Page() {
        setTree({
          reviewScroll: undefined,
          pendingDiff: undefined,
+          activeDiff: undefined,
        })
      },
      { defer: true },
@@ -1068,7 +982,6 @@ export default function Page() {
    setActiveMessage,
    focusInput,
    review: reviewTab,
-    fileBrowser: () => newSessionDesign() && isDesktop() && !!params.id,
  })

  const openReviewFile = createOpenReviewFile({
@@ -1093,9 +1006,9 @@ export default function Page() {
    return (
      <Select
        options={changesOptions()}
-        current={reviewMode()}
+        current={store.changes}
        label={changesLabel}
-        onSelect={(option) => option && view().review.setMode(option)}
+        onSelect={(option) => option && setStore("changes", option)}
        variant="ghost"
        size="small"
        valueClass="text-14-medium"
@@ -1112,11 +1025,11 @@ export default function Page() {
      <SelectV2
        appearance="inline"
        options={changesOptions()}
-        current={reviewMode()}
+        current={store.changes}
        label={changesLabel}
        placement="bottom-start"
        gutter={6}
-        onSelect={(option) => option && view().review.setMode(option)}
+        onSelect={(option) => option && setStore("changes", option)}
      />
    )
  }
@@ -1144,18 +1057,18 @@ export default function Page() {
  )

  const reviewEmptyText = createMemo(() => {
-    if (reviewMode() === "git") return language.t("session.review.noUncommittedChanges")
-    if (reviewMode() === "branch") return language.t("session.review.noBranchChanges")
+    if (store.changes === "git") return language.t("session.review.noUncommittedChanges")
+    if (store.changes === "branch") return language.t("session.review.noBranchChanges")
    return language.t("session.review.noChanges")
  })

  const reviewEmpty = (input: { loadingClass: string; emptyClass: string }) => {
-    if (reviewMode() === "git" || reviewMode() === "branch") {
+    if (store.changes === "git" || store.changes === "branch") {
      if (!reviewReady()) return <div class={input.loadingClass}>{language.t("session.review.loadingChanges")}</div>
      return empty(reviewEmptyText())
    }

-    if (reviewMode() === "turn") {
+    if (store.changes === "turn") {
      if (nogit()) return createGit(input)
      return empty(reviewEmptyText())
    }
@@ -1168,10 +1081,10 @@ export default function Page() {
  }

  const reviewEmptyV2 = () => {
-    if ((reviewMode() === "git" || reviewMode() === "branch") && !reviewReady()) {
+    if ((store.changes === "git" || store.changes === "branch") && !reviewReady()) {
      return <div class="px-6 py-4 text-text-weak">{language.t("session.review.loadingChanges")}</div>
    }
-    if (reviewMode() === "turn" && nogit()) {
+    if (store.changes === "turn" && nogit()) {
      return <SessionReviewEmptyNoGitV2 pending={gitMutation.isPending} onInitGit={initGit} />
    }
    return <SessionReviewEmptyChangesV2 />
@@ -1193,7 +1106,7 @@ export default function Page() {
        diffStyle={input.diffStyle}
        onDiffStyleChange={input.onDiffStyleChange}
        onScrollRef={(el) => setTree("reviewScroll", el)}
-        focusedFile={activeReviewFile()}
+        focusedFile={tree.activeDiff}
        onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
        onLineCommentUpdate={updateCommentInContext}
        onLineCommentDelete={removeCommentFromContext}
@@ -1224,12 +1137,8 @@ export default function Page() {
    },
    diffs: reviewDiffs,
    diffsReady: reviewReady,
-    get diffVersion() {
-      return vcsQuery.dataUpdatedAt
-    },
-    loadDiff: loadReviewDiff,
    get activeFile() {
-      return activeReviewFile()
+      return tree.activeDiff
    },
    onSelectFile: focusReviewDiff,
    get diffStyle() {
@@ -1342,8 +1251,7 @@ export default function Page() {
  const focusReviewDiff = (path: string) => {
    openReviewPanel()
    view().review.openPath(path)
-    view().review.setFile(path)
-    setTree("pendingDiff", path)
+    setTree({ activeDiff: path, pendingDiff: path })
  }

  createEffect(() => {
@@ -2140,7 +2048,6 @@ export default function Page() {
    <SessionRouteFrame>
      <SessionHeader />
      <div
-        ref={panelRow}
        class="flex-1 min-h-0 flex flex-col md:flex-row"
        classList={{
          "gap-2 p-2": settings.general.newLayoutDesigns(),
@@ -2179,9 +2086,9 @@ export default function Page() {
                  "-right-1": settings.general.newLayoutDesigns(),
                }}
                direction="horizontal"
-                size={sessionPanelResizedWidth()}
-                min={SESSION_PANEL_WIDTH_MIN}
-                max={sessionPanelMax()}
+                size={layout.session.width()}
+                min={450}
+                max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.45}
                onResize={(width) => {
                  size.touch()
                  layout.session.resize(width)
@@ -2191,7 +2098,7 @@ export default function Page() {
          </Show>
        </div>

-        <Show when={!newSessionDesign() && desktopSidePanelOpen()}>
+        <Show when={!newSessionDesign()}>
          <SessionSidePanel
            canReview={canReview}
            diffs={reviewDiffs}
@@ -2201,7 +2108,7 @@ export default function Page() {
            reviewHasFocusableContent={hasReview}
            reviewCount={reviewCount}
            reviewPanel={reviewPanel}
-            activeDiff={activeReviewFile()}
+            activeDiff={tree.activeDiff}
            focusReviewDiff={focusReviewDiff}
            reviewSnap={ui.reviewSnap}
            size={size}
@@ -2210,8 +2117,13 @@ export default function Page() {
        <Show when={newSessionDesign()}>
          <Show when={isDesktop() ? desktopV2PanelLayout().visible : terminalOpen()}>
            <div class="min-w-0 h-full flex flex-1 flex-col">
-              <Show when={isDesktop() && (desktopV2ReviewOpen() || desktopFileTreeOpen())}>
-                <div class="min-h-0 flex-1">
+              <Show when={isDesktop()}>
+                <div
+                  classList={{
+                    "min-h-0 flex-1": desktopV2ReviewOpen() || desktopFileTreeOpen(),
+                    "size-0 shrink-0 overflow-hidden": !(desktopV2ReviewOpen() || desktopFileTreeOpen()),
+                  }}
+                >
                  <SessionSidePanel
                    canReview={canReview}
                    diffs={reviewDiffs}
@@ -2221,8 +2133,7 @@ export default function Page() {
                    reviewHasFocusableContent={() => hasReview() || reviewV2State.sidebarOpened()}
                    reviewCount={reviewCount}
                    reviewPanel={reviewPanelV2}
-                    fileBrowserState={reviewV2State}
-                    activeDiff={activeReviewFile()}
+                    activeDiff={tree.activeDiff}
                    focusReviewDiff={focusReviewDiff}
                    reviewSnap={ui.reviewSnap}
                    size={size}
@@ -1,118 +0,0 @@
-import { For } from "solid-js"
-import { createStore } from "solid-js/store"
-import { SessionRevertDock } from "@/pages/session/composer/session-revert-dock"
-import { SettingsProvider, useSettings } from "@/context/settings"
-
-export default {
-  title: "Composer/Revert Dock",
-  id: "composer-revert-dock",
-  tags: ["autodocs"],
-  parameters: {
-    docs: {
-      description: {
-        component: `### Overview
-Real \`SessionRevertDock\` from app code, rendered above a mock composer card.
-
-### Source path
- \`packages/app/src/pages/session/composer/session-revert-dock.tsx\`
-
-### Why the mock composer
-The live composer overlaps the dock's bottom by 18px (\`session-composer-region-controller.ts\` \`lift()\`).
-The card below reproduces that overlap so the collapsed/expanded cutoff behavior can be verified in isolation.
-
-### Layout split
-Use the **Layout** button to toggle \`newLayoutDesigns\` and preview both the v2 dock and the legacy (v1) \`DockTray\` fallback.
-
-### Notes
- \`onRestore\` only mutates local story state, so nothing in the real session is affected.
- Click the header to expand/collapse. Click "Restore message" to remove a row.`,
-      },
-    },
-  },
-}
-
-const messages = [
-  "update current branch with latest changes from dev and fix conflicts if any",
-  "investigate why the chat input loses focus after sending a message",
-  "Debug why streaming responses sometimes duplicate the last token",
-  "suggest a better title for this PR based on the diff",
-  "add a storybook story for the revert dock",
-  "reduce re-renders in the timeline component",
-]
-
-const btn = (accent?: boolean) =>
-  ({
-    padding: "6px 12px",
-    "border-radius": "6px",
-    border: "1px solid var(--v2-border-border-base, #0000001a)",
-    background: accent ? "var(--v2-background-bg-contrast, #242424)" : "var(--v2-background-bg-base, #fff)",
-    color: accent ? "var(--v2-text-text-contrast, #fafafa)" : "var(--v2-text-text-base, #161616)",
-    cursor: "pointer",
-    "font-size": "13px",
-  }) as const
-
-function Stage(props: { count: number }) {
-  const settings = useSettings()
-  const seed = () => messages.slice(0, props.count).map((text, index) => ({ id: `rolled-${index}`, text }))
-  const [store, setStore] = createStore({ items: seed() })
-
-  const v2 = () => settings.general.newLayoutDesigns()
-  const reset = () => setStore("items", seed())
-  const restore = (id: string) =>
-    setStore(
-      "items",
-      store.items.filter((item) => item.id !== id),
-    )
-
-  return (
-    <div style={{ display: "grid", gap: "16px", "max-width": "720px" }}>
-      <div style={{ display: "flex", gap: "8px" }}>
-        <button style={btn()} onClick={reset}>
-          Reset ({props.count})
-        </button>
-        <button style={btn(v2())} onClick={() => settings.general.setNewLayoutDesigns(!v2())}>
-          Layout: {v2() ? "v2" : "v1"}
-        </button>
-      </div>
-
-      {/* Reproduce the real composer stack: dock + card overlapping the dock's bottom by lift() = 18px */}
-      <div style={{ display: "flex", "flex-direction": "column" }}>
-        <SessionRevertDock items={store.items} onRestore={restore} />
-        <div
-          style={{ position: "relative", "z-index": 70, "margin-top": "-18px" }}
-          class="min-h-24 w-full rounded-[12px] border border-v2-border-border-base bg-v2-background-bg-base px-4 py-3 text-[13px] text-v2-text-text-faint"
-        >
-          Ask anything...
-        </div>
-      </div>
-
-      <div class="text-[12px] text-v2-text-text-faint">
-        Restored so far:{" "}
-        <For each={seed()}>
-          {(item) => <span>{store.items.some((current) => current.id === item.id) ? "" : `“${item.text}” `}</span>}
-        </For>
-      </div>
-    </div>
-  )
-}
-
-const story = (count: number) => () => (
-  <SettingsProvider>
-    <Stage count={count} />
-  </SettingsProvider>
-)
-
-export const OneMessage = {
-  name: "1 rolled back",
-  render: story(1),
-}
-
-export const ThreeMessages = {
-  name: "3 rolled back",
-  render: story(3),
-}
-
-export const ManyMessages = {
-  name: "6 rolled back (scrolls)",
-  render: story(6),
-}
@@ -3,11 +3,7 @@ import { createStore } from "solid-js/store"
 import { Button } from "@opencode-ai/ui/button"
 import { DockTray } from "@opencode-ai/ui/dock-surface"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { useLanguage } from "@/context/language"
-import { useSettings } from "@/context/settings"

 export function SessionRevertDock(props: {
  items: { id: string; text: string }[]
@@ -16,7 +12,6 @@ export function SessionRevertDock(props: {
  onRestore: (id: string) => void
 }) {
  const language = useLanguage()
-  const settings = useSettings()
  const [store, setStore] = createStore({
    collapsed: true,
  })
@@ -36,153 +31,69 @@ export function SessionRevertDock(props: {
  )
  const preview = createMemo(() => props.items[0]?.text ?? "")

-  const onHeaderKeyDown = (event: KeyboardEvent) => {
-    if (event.key !== "Enter" && event.key !== " ") return
-    event.preventDefault()
-    toggle()
-  }
-
  return (
-    <Show
-      when={settings.general.newLayoutDesigns()}
-      fallback={
-        <DockTray data-component="session-revert-dock">
-          <div
-            class="pl-3 pr-2 py-2 flex items-center gap-2"
-            role="button"
-            tabIndex={0}
-            onClick={toggle}
-            onKeyDown={onHeaderKeyDown}
-          >
-            <span class="shrink-0 text-14-regular text-text-strong cursor-default">{label()}</span>
-            <Show when={store.collapsed && preview()}>
-              <span class="min-w-0 flex-1 truncate text-14-regular text-text-base cursor-default">{preview()}</span>
-            </Show>
-            <div class="ml-auto shrink-0">
-              <IconButton
-                icon="chevron-down"
-                size="normal"
-                variant="ghost"
-                style={{ transform: `rotate(${store.collapsed ? 180 : 0}deg)` }}
-                onMouseDown={(event) => {
-                  event.preventDefault()
-                  event.stopPropagation()
-                }}
-                onClick={(event) => {
-                  event.stopPropagation()
-                  toggle()
-                }}
-                aria-label={
-                  store.collapsed ? language.t("session.revertDock.expand") : language.t("session.revertDock.collapse")
-                }
-              />
-            </div>
-          </div>
-
-          <Show when={store.collapsed}>
-            <div class="h-5" aria-hidden="true" />
-          </Show>
-
-          <Show when={!store.collapsed}>
-            <div class="px-3 pb-7 flex flex-col gap-1.5 max-h-42 overflow-y-auto no-scrollbar">
-              <For each={props.items}>
-                {(item) => (
-                  <div class="flex items-center gap-2 min-w-0 py-1">
-                    <span class="min-w-0 flex-1 truncate text-13-regular text-text-strong">{item.text}</span>
-                    <Button
-                      size="small"
-                      variant="secondary"
-                      class="shrink-0"
-                      disabled={props.disabled || !!props.restoring}
-                      onClick={() => props.onRestore(item.id)}
-                    >
-                      {language.t("session.revertDock.restore")}
-                    </Button>
-                  </div>
-                )}
-              </For>
-            </div>
-          </Show>
-        </DockTray>
-      }
-    >
+    <DockTray data-component="session-revert-dock">
      <div
-        data-component="session-revert-dock"
-        class="w-full overflow-hidden rounded-xl border-[0.5px] border-v2-border-border-base bg-v2-background-bg-layer-01"
+        class="pl-3 pr-2 py-2 flex items-center gap-2"
+        role="button"
+        tabIndex={0}
+        onClick={toggle}
+        onKeyDown={(event) => {
+          if (event.key !== "Enter" && event.key !== " ") return
+          event.preventDefault()
+          toggle()
+        }}
      >
-        <div
-          class="flex h-[42px] items-center gap-2 pl-4 pr-2"
-          role="button"
-          tabIndex={0}
-          onClick={toggle}
-          onKeyDown={onHeaderKeyDown}
-        >
-          <IconV2 name="outline-reset" size="normal" class="text-v2-icon-icon-muted" />
-          <span
-            classList={{
-              "font-[440] shrink-0 cursor-default text-[13px] leading-5 tracking-[-0.04px]": true,
-              "text-v2-text-text-base": !store.collapsed,
-              "text-v2-text-text-muted": store.collapsed,
+        <span class="shrink-0 text-14-regular text-text-strong cursor-default">{label()}</span>
+        <Show when={store.collapsed && preview()}>
+          <span class="min-w-0 flex-1 truncate text-14-regular text-text-base cursor-default">{preview()}</span>
+        </Show>
+        <div class="ml-auto shrink-0">
+          <IconButton
+            data-collapsed={store.collapsed ? "true" : "false"}
+            icon="chevron-down"
+            size="normal"
+            variant="ghost"
+            style={{ transform: `rotate(${store.collapsed ? 180 : 0}deg)` }}
+            onMouseDown={(event) => {
+              event.preventDefault()
+              event.stopPropagation()
            }}
-          >
-            {label()}
-          </span>
-          <Show when={store.collapsed && preview()}>
-            <span class="min-w-0 flex-1 truncate cursor-default text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint">
-              {preview()}
-            </span>
-          </Show>
-          <div class="ml-auto shrink-0">
-            <IconButtonV2
-              icon={<IconV2 name="outline-chevron-down" size="small" />}
-              size="large"
-              variant="ghost-muted"
-              style={{ transform: `rotate(${store.collapsed ? 180 : 0}deg)` }}
-              onMouseDown={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-              }}
-              onClick={(event) => {
-                event.stopPropagation()
-                toggle()
-              }}
-              aria-label={
-                store.collapsed ? language.t("session.revertDock.expand") : language.t("session.revertDock.collapse")
-              }
-            />
-          </div>
+            onClick={(event) => {
+              event.stopPropagation()
+              toggle()
+            }}
+            aria-label={
+              store.collapsed ? language.t("session.revertDock.expand") : language.t("session.revertDock.collapse")
+            }
+          />
        </div>
-
-        {/* Sacrificial space the composer overlaps via its negative lift (18px), so the header stays fully visible */}
-        <Show when={store.collapsed}>
-          <div class="h-[18px]" aria-hidden="true" />
-        </Show>
-
-        <Show when={!store.collapsed}>
-          {/* Scroll viewport ends above the composer; the 18px sacrificial below is what the composer overlaps */}
-          <div class="flex max-h-42 flex-col gap-2 overflow-y-auto px-4 pt-px pb-3 no-scrollbar">
-            <For each={props.items}>
-              {(item) => (
-                <div class="flex h-6 min-w-0 items-center gap-2">
-                  <span class="min-w-0 flex-1 truncate text-[13px] font-[400] leading-5 tracking-[-0.04px] text-v2-text-text-muted">
-                    {item.text}
-                  </span>
-                  <ButtonV2
-                    size="small"
-                    variant="neutral"
-                    class="shrink-0"
-                    disabled={props.disabled || !!props.restoring}
-                    onClick={() => props.onRestore(item.id)}
-                  >
-                    {language.t("session.revertDock.restore")}
-                  </ButtonV2>
-                </div>
-              )}
-            </For>
-          </div>
-          <div class="h-[18px]" aria-hidden="true" />
-        </Show>
      </div>
-    </Show>
+
+      <Show when={store.collapsed}>
+        <div class="h-5" aria-hidden="true" />
+      </Show>
+
+      <Show when={!store.collapsed}>
+        <div class="px-3 pb-7 flex flex-col gap-1.5 max-h-42 overflow-y-auto no-scrollbar">
+          <For each={props.items}>
+            {(item) => (
+              <div class="flex items-center gap-2 min-w-0 py-1">
+                <span class="min-w-0 flex-1 truncate text-13-regular text-text-strong">{item.text}</span>
+                <Button
+                  size="small"
+                  variant="secondary"
+                  class="shrink-0"
+                  disabled={props.disabled || !!props.restoring}
+                  onClick={() => props.onRestore(item.id)}
+                >
+                  {language.t("session.revertDock.restore")}
+                </Button>
+              </div>
+            )}
+          </For>
+        </div>
+      </Show>
+    </DockTray>
  )
 }
@@ -172,14 +172,6 @@ function createScrollSync(input: { tab: () => string; view: ReturnType<typeof us
 }

 export function FileTabContent(props: { tab: string }) {
-  return (
-    <Tabs.Content value={props.tab}>
-      <SessionFileView tab={props.tab} />
-    </Tabs.Content>
-  )
-}
-
-export function SessionFileView(props: { tab: string }) {
  const file = useFile()
  const comments = useComments()
  const language = useLanguage()
@@ -447,8 +439,8 @@ export function SessionFileView(props: { tab: string }) {
    </div>
  )

-  const content = () => (
-    <div class="mt-3 relative h-full min-h-0">
+  return (
+    <Tabs.Content value={props.tab} class="mt-3 relative h-full">
      <ScrollView class="h-full" viewportRef={scrollSync.setViewport} onScroll={scrollSync.handleScroll as any}>
        <Switch>
          <Match when={state()?.loaded}>{renderFile(contents())}</Match>
@@ -458,8 +450,6 @@ export function SessionFileView(props: { tab: string }) {
          <Match when={state()?.error}>{(err) => <div class="px-6 py-4 text-text-weak">{err()}</div>}</Match>
        </Switch>
      </ScrollView>
-    </div>
+    </Tabs.Content>
  )
-
-  return content()
 }
@@ -2,7 +2,6 @@ import { describe, expect, test } from "bun:test"
 import { createMemo, createRoot } from "solid-js"
 import { createStore } from "solid-js/store"
 import {
-  SESSION_OPEN_FILE_TAB,
  createOpenReviewFile,
  createOpenSessionFileTab,
  createSessionTabs,
@@ -166,49 +165,4 @@ describe("createSessionTabs", () => {
      dispose()
    })
  })
-
-  test("exposes the Open File tab without treating it as a file tab", () => {
-    createRoot((dispose) => {
-      const [state] = createStore({
-        active: SESSION_OPEN_FILE_TAB as string | undefined,
-        all: ["file://src/a.ts", SESSION_OPEN_FILE_TAB],
-      })
-      const tabs = createMemo(() => ({ active: () => state.active, all: () => state.all }))
-      const result = createSessionTabs({
-        tabs,
-        pathFromTab: (tab) => (tab.startsWith("file://") ? tab.slice("file://".length) : undefined),
-        normalizeTab: (tab) => tab,
-        fileBrowser: () => true,
-      })
-
-      expect(result.openFileOpen()).toBe(true)
-      expect(result.panelTabs()).toEqual(["file://src/a.ts", SESSION_OPEN_FILE_TAB])
-      expect(result.openedTabs()).toEqual(["file://src/a.ts"])
-      expect(result.activeTab()).toBe(SESSION_OPEN_FILE_TAB)
-      expect(result.activeFileTab()).toBeUndefined()
-      expect(result.closableTab()).toBe(SESSION_OPEN_FILE_TAB)
-      dispose()
-    })
-  })
-
-  test("hides the Open File placeholder when the file browser is unavailable", () => {
-    createRoot((dispose) => {
-      const [state] = createStore({
-        active: SESSION_OPEN_FILE_TAB as string | undefined,
-        all: ["file://src/a.ts", SESSION_OPEN_FILE_TAB],
-      })
-      const tabs = createMemo(() => ({ active: () => state.active, all: () => state.all }))
-      const result = createSessionTabs({
-        tabs,
-        pathFromTab: (tab) => (tab.startsWith("file://") ? tab.slice("file://".length) : undefined),
-        normalizeTab: (tab) => tab,
-        fileBrowser: () => false,
-      })
-
-      expect(result.openFileOpen()).toBe(false)
-      expect(result.panelTabs()).toEqual(["file://src/a.ts"])
-      expect(result.activeTab()).toBe("file://src/a.ts")
-      dispose()
-    })
-  })
 })
@@ -2,9 +2,6 @@ import { batch, createMemo, onCleanup, onMount, type Accessor } from "solid-js"
 import { createStore } from "solid-js/store"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { same } from "@/utils/same"
-import { SESSION_OPEN_FILE_TAB } from "@/context/layout-tabs"
-
-export { SESSION_OPEN_FILE_TAB } from "@/context/layout-tabs"

 const emptyTabs: string[] = []

@@ -19,7 +16,6 @@ type TabsInput = {
  normalizeTab: (tab: string) => string
  review?: Accessor<boolean>
  hasReview?: Accessor<boolean>
-  fileBrowser?: Accessor<boolean>
 }

 export const getSessionKey = (dir: string | undefined, id: string | undefined) => `${dir ?? ""}${id ? `/${id}` : ""}`
@@ -31,14 +27,8 @@ export function shouldShowFileTree(input: { visible: boolean; opened: boolean })
 export const createSessionTabs = (input: TabsInput) => {
  const review = input.review ?? (() => false)
  const hasReview = input.hasReview ?? (() => false)
-  const fileBrowser = input.fileBrowser ?? (() => false)
  const contextOpen = createMemo(() => input.tabs().active() === "context" || input.tabs().all().includes("context"))
-  const openFileOpen = createMemo(
-    () =>
-      fileBrowser() &&
-      (input.tabs().active() === SESSION_OPEN_FILE_TAB || input.tabs().all().includes(SESSION_OPEN_FILE_TAB)),
-  )
-  const panelTabs = createMemo(
+  const openedTabs = createMemo(
    () => {
      const seen = new Set<string>()
      return input
@@ -46,7 +36,6 @@ export const createSessionTabs = (input: TabsInput) => {
        .all()
        .flatMap((tab) => {
          if (tab === "context" || tab === "review") return []
-          if (tab === SESSION_OPEN_FILE_TAB && !fileBrowser()) return []
          const value = input.pathFromTab(tab) ? input.normalizeTab(tab) : tab
          if (seen.has(value)) return []
          seen.add(value)
@@ -56,13 +45,9 @@ export const createSessionTabs = (input: TabsInput) => {
    emptyTabs,
    { equals: same },
  )
-  const openedTabs = createMemo(() => panelTabs().filter((tab) => tab !== SESSION_OPEN_FILE_TAB), emptyTabs, {
-    equals: same,
-  })
  const activeTab = createMemo(() => {
    const active = input.tabs().active()
    if (active === "context") return active
-    if (active === SESSION_OPEN_FILE_TAB && openFileOpen()) return active
    if (active === "review" && review()) return active
    if (active && input.pathFromTab(active)) return input.normalizeTab(active)

@@ -80,15 +65,12 @@ export const createSessionTabs = (input: TabsInput) => {
  const closableTab = createMemo(() => {
    const active = activeTab()
    if (active === "context") return active
-    if (active === SESSION_OPEN_FILE_TAB && openFileOpen()) return active
    if (!openedTabs().includes(active)) return
    return active
  })

  return {
    contextOpen,
-    openFileOpen,
-    panelTabs,
    openedTabs,
    activeTab,
    activeFileTab,
@@ -1,52 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import {
-  clampSessionPanelWidth,
-  REVIEW_PANE_WIDTH_MIN,
-  REVIEW_PANE_WIDTH_MIN_SPLIT,
-  SESSION_PANEL_WIDTH_MIN,
-  sessionPanelWidthMax,
-} from "./session-panel-width"
-
-describe("sessionPanelWidthMax", () => {
-  test("reserves the unified review pane minimum", () => {
-    expect(sessionPanelWidthMax({ available: 1700, split: false })).toBe(1700 - REVIEW_PANE_WIDTH_MIN)
-  })
-
-  test("reserves a larger minimum for split diffs", () => {
-    expect(sessionPanelWidthMax({ available: 1700, split: true })).toBe(1700 - REVIEW_PANE_WIDTH_MIN_SPLIT)
-    expect(REVIEW_PANE_WIDTH_MIN_SPLIT).toBeGreaterThan(REVIEW_PANE_WIDTH_MIN)
-  })
-
-  test("lets the chat panel take everything beyond the review pane minimum", () => {
-    // Regression: the old cap was 45% of the window, forcing the review pane
-    // to at least 55% of the window regardless of content.
-    const available = 3440
-    expect(sessionPanelWidthMax({ available, split: false })).toBeGreaterThan(available * 0.45)
-  })
-
-  test("never drops below the chat panel minimum on small windows", () => {
-    expect(sessionPanelWidthMax({ available: 600, split: true })).toBe(SESSION_PANEL_WIDTH_MIN)
-    expect(sessionPanelWidthMax({ available: 0, split: false })).toBe(SESSION_PANEL_WIDTH_MIN)
-  })
-})
-
-describe("clampSessionPanelWidth", () => {
-  test("keeps widths already within the limit", () => {
-    expect(clampSessionPanelWidth({ width: 800, available: 1700, split: false })).toBe(800)
-  })
-
-  test("forces the width down when the window shrinks", () => {
-    expect(clampSessionPanelWidth({ width: 1600, available: 1700, split: false })).toBe(1700 - REVIEW_PANE_WIDTH_MIN)
-    expect(clampSessionPanelWidth({ width: 1600, available: 1700, split: true })).toBe(
-      1700 - REVIEW_PANE_WIDTH_MIN_SPLIT,
-    )
-  })
-
-  test("holds the chat panel minimum when there is no room for both", () => {
-    expect(clampSessionPanelWidth({ width: 1600, available: 700, split: true })).toBe(SESSION_PANEL_WIDTH_MIN)
-  })
-
-  test("skips clamping before the layout is measured", () => {
-    expect(clampSessionPanelWidth({ width: 1600, available: undefined, split: false })).toBe(1600)
-  })
-})
@@ -1,19 +0,0 @@
-// The review pane has no width of its own: it takes whatever the chat panel
-// leaves behind. Instead of capping the chat panel at a fraction of the window
-// (which forces the review pane to grow with the monitor), reserve a fixed
-// minimum for the review pane and let the chat panel take everything else.
-export const SESSION_PANEL_WIDTH_MIN = 450
-export const REVIEW_PANE_WIDTH_MIN = 480
-export const REVIEW_PANE_WIDTH_MIN_SPLIT = 800
-
-export function sessionPanelWidthMax(input: { available: number; split: boolean }) {
-  const pane = input.split ? REVIEW_PANE_WIDTH_MIN_SPLIT : REVIEW_PANE_WIDTH_MIN
-  return Math.max(SESSION_PANEL_WIDTH_MIN, input.available - pane)
-}
-
-// `available` is undefined until the layout row is first measured; render the
-// stored width untouched until then to avoid a first-frame snap.
-export function clampSessionPanelWidth(input: { width: number; available: number | undefined; split: boolean }) {
-  if (input.available === undefined) return input.width
-  return Math.min(input.width, sessionPanelWidthMax({ available: input.available, split: input.split }))
-}
@@ -3,7 +3,6 @@ import { createStore } from "solid-js/store"
 import { createMediaQuery } from "@solid-primitives/media"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Icon } from "@opencode-ai/ui/icon"
 import { TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Mark } from "@opencode-ai/ui/logo"
@@ -27,7 +26,6 @@ import { useSettings } from "@/context/settings"
 import { createFileTabListSync } from "@/pages/session/file-tab-scroll"
 import { FileTabContent } from "@/pages/session/file-tabs"
 import {
-  SESSION_OPEN_FILE_TAB,
  createOpenSessionFileTab,
  createSessionTabs,
  getTabReorderIndex,
@@ -36,7 +34,6 @@ import {
 } from "@/pages/session/helpers"
 import { setSessionHandoff } from "@/pages/session/handoff"
 import { useSessionLayout } from "@/pages/session/session-layout"
-import { SessionFileBrowserTab, type SessionFileBrowserState } from "@/pages/session/v2/session-file-browser-tab"

 export function SessionSidePanel(props: {
  canReview: () => boolean
@@ -47,7 +44,6 @@ export function SessionSidePanel(props: {
  reviewHasFocusableContent: () => boolean
  reviewCount: () => number
  reviewPanel: () => JSX.Element
-  fileBrowserState?: SessionFileBrowserState
  activeDiff?: string
  focusReviewDiff: (path: string) => void
  reviewSnap: boolean
@@ -75,6 +71,7 @@ export function SessionSidePanel(props: {
      }),
  )
  const open = createMemo(() => reviewOpen() || fileOpen())
+  const rendered = createMemo<boolean>((previous) => previous || open(), false)
  const reviewTab = createMemo(() => isDesktop())
  const panelWidth = createMemo(() => {
    if (!open()) return "0px"
@@ -150,13 +147,15 @@ export function SessionSidePanel(props: {
    normalizeTab,
    review: reviewTab,
    hasReview: props.canReview,
-    fileBrowser: () => !!props.fileBrowserState,
  })
  const contextOpen = tabState.contextOpen
-  const panelTabs = tabState.panelTabs
  const openedTabs = tabState.openedTabs
  const activeTab = tabState.activeTab
  const activeFileTab = tabState.activeFileTab
+  const reviewContentRendered = createMemo<boolean>(
+    (previous) => previous || (reviewOpen() && activeTab() === "review"),
+    false,
+  )

  const fileTreeTab = () => layout.fileTree.tab()

@@ -173,33 +172,6 @@ export function SessionSidePanel(props: {
  const [store, setStore] = createStore({
    activeDraggable: undefined as string | undefined,
  })
-  let fileFilter: HTMLInputElement | undefined
-  const temporaryTab = tabs().preview
-  const previewTab = (value: string) => {
-    const next = normalizeTab(value)
-    tabs().previewTab(next)
-    const path = file.pathFromTab(next)
-    if (path) void file.load(path)
-    openReviewPanel()
-    queueMicrotask(() => tabs().setActive(next))
-  }
-  const openFileBrowser = () => {
-    previewTab(SESSION_OPEN_FILE_TAB)
-    queueMicrotask(() => fileFilter?.focus())
-  }
-  const activateTab = (value: string) => {
-    const next = normalizeTab(value)
-    const path = file.pathFromTab(next)
-    if (path) void file.load(path)
-    openReviewPanel()
-    tabs().setActive(next)
-  }
-  const browserTab = createMemo(() => {
-    if (!props.fileBrowserState) return undefined
-    if (activeTab() === SESSION_OPEN_FILE_TAB) return SESSION_OPEN_FILE_TAB
-    return activeFileTab()
-  })
-  const browserKinds = createMemo(() => new Map([...kinds()].filter(([, kind]) => kind !== "mix")))

  const handleDragStart = (event: unknown) => {
    const id = getDraggableId(event)
@@ -261,220 +233,173 @@ export function SessionSidePanel(props: {
        }}
        style={{ width: panelWidth() }}
      >
-        <Show when={open()}>
+        <Show when={rendered()}>
          <div
            class="size-full flex"
            classList={{
              "border-l border-border-weaker-base": !settings.general.newLayoutDesigns(),
            }}
          >
-            <Show when={reviewOpen()}>
-              <div class="relative min-w-0 h-full flex-1 overflow-hidden bg-background-base">
-                <div class="size-full min-w-0 h-full bg-background-base">
-                  <DragDropProvider
-                    onDragStart={handleDragStart}
-                    onDragEnd={handleDragEnd}
-                    onDragOver={handleDragOver}
-                    collisionDetector={closestCenter}
-                  >
-                    <DragDropSensors />
-                    <ConstrainDragYAxis />
-                    <Tabs value={activeTab()} onChange={activateTab}>
-                      <div class="sticky top-0 shrink-0 flex">
-                        <Tabs.List
-                          ref={(el: HTMLDivElement) => {
-                            const stop = createFileTabListSync({ el, contextOpen })
-                            onCleanup(stop)
-                          }}
-                        >
-                          <Show when={reviewTab() && props.canReview()}>
-                            <Tabs.Trigger
-                              value="review"
-                              id={reviewTabID}
-                              aria-controls={activeTab() === "review" ? reviewTabPanelID : undefined}
-                            >
-                              <div class="flex items-center gap-1.5">
-                                <div>{language.t("session.tab.review")}</div>
-                                <Show when={props.hasReview()}>
-                                  <div>{props.reviewCount()}</div>
-                                </Show>
-                              </div>
-                            </Tabs.Trigger>
-                          </Show>
-                          <Show when={contextOpen()}>
-                            <Tabs.Trigger
-                              value="context"
-                              closeButton={
-                                <TooltipKeybind
-                                  title={language.t("common.closeTab")}
-                                  keybind={command.keybind("tab.close")}
-                                  placement="bottom"
-                                  gutter={10}
-                                >
-                                  <IconButton
-                                    icon="close-small"
-                                    variant="ghost"
-                                    class="h-5 w-5"
-                                    onClick={() => tabs().close("context")}
-                                    aria-label={language.t("common.closeTab")}
-                                  />
-                                </TooltipKeybind>
-                              }
-                              hideCloseButton
-                              onMiddleClick={() => tabs().close("context")}
-                            >
-                              <div class="flex items-center gap-2">
-                                <SessionContextUsage variant="indicator" />
-                                <div>{language.t("session.tab.context")}</div>
-                              </div>
-                            </Tabs.Trigger>
-                          </Show>
-                          <SortableProvider ids={openedTabs()}>
-                            <For each={panelTabs()}>
-                              {(tab) => (
-                                <Show
-                                  when={tab === SESSION_OPEN_FILE_TAB}
-                                  fallback={
-                                    <SortableTab
-                                      tab={tab}
-                                      temporary={temporaryTab() === tab}
-                                      onTabClose={tabs().close}
-                                      onTabDoubleClick={temporaryTab() === tab ? openTab : undefined}
-                                    />
-                                  }
-                                >
-                                  <Tabs.Trigger
-                                    value={SESSION_OPEN_FILE_TAB}
-                                    closeButton={
-                                      <TooltipKeybind
-                                        title={language.t("common.closeTab")}
-                                        keybind={command.keybind("tab.close")}
-                                        placement="bottom"
-                                        gutter={10}
-                                      >
-                                        <IconButton
-                                          icon="close-small"
-                                          variant="ghost"
-                                          class="h-5 w-5"
-                                          onClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
-                                          aria-label={language.t("common.closeTab")}
-                                        />
-                                      </TooltipKeybind>
-                                    }
-                                    hideCloseButton
-                                    onMiddleClick={() => tabs().close(SESSION_OPEN_FILE_TAB)}
-                                  >
-                                    <div class="flex items-center gap-1.5 italic">
-                                      <Icon name="open-file" size="small" />
-                                      <span>{language.t("command.file.open")}</span>
-                                    </div>
-                                  </Tabs.Trigger>
-                                </Show>
-                              )}
-                            </For>
-                          </SortableProvider>
-                          <div class="bg-background-stronger h-full shrink-0 sticky right-0 z-10 flex items-center justify-center pr-3">
-                            <TooltipKeybind
-                              title={language.t("command.file.open")}
-                              keybind={command.keybind("file.open")}
-                              class="flex items-center"
-                            >
-                              <IconButton
-                                icon="plus-small"
-                                variant="ghost"
-                                iconSize="large"
-                                class="!rounded-md"
-                                onClick={() => {
-                                  if (props.fileBrowserState) {
-                                    openFileBrowser()
-                                    return
-                                  }
-                                  void import("@/components/dialog-select-file").then((x) => {
-                                    dialog.show(() => <x.DialogSelectFile mode="files" onOpenFile={showAllFiles} />)
-                                  })
-                                }}
-                                aria-label={language.t("command.file.open")}
-                              />
-                            </TooltipKeybind>
-                          </div>
-                        </Tabs.List>
-                      </div>
-
-                      <Show when={reviewTab() && props.canReview() && activeTab() === "review"}>
-                        <div
-                          id={reviewTabPanelID}
-                          role="tabpanel"
-                          aria-labelledby={reviewTabID}
-                          tabIndex={props.reviewHasFocusableContent() ? undefined : 0}
-                          data-slot="tabs-content"
-                          class="flex flex-col h-full overflow-hidden contain-strict"
-                        >
-                          {props.reviewPanel()}
+            <div
+              aria-hidden={!reviewOpen()}
+              inert={!reviewOpen()}
+              class="relative min-w-0 h-full flex-1 overflow-hidden bg-background-base"
+              classList={{
+                "pointer-events-none": !reviewOpen(),
+              }}
+            >
+              <div class="size-full min-w-0 h-full bg-background-base">
+                <DragDropProvider
+                  onDragStart={handleDragStart}
+                  onDragEnd={handleDragEnd}
+                  onDragOver={handleDragOver}
+                  collisionDetector={closestCenter}
+                >
+                  <DragDropSensors />
+                  <ConstrainDragYAxis />
+                  <Tabs value={activeTab()} onChange={openTab}>
+                    <div class="sticky top-0 shrink-0 flex">
+                      <Tabs.List
+                        ref={(el: HTMLDivElement) => {
+                          const stop = createFileTabListSync({ el, contextOpen })
+                          onCleanup(stop)
+                        }}
+                      >
+                        <Show when={reviewTab() && props.canReview()}>
+                          <Tabs.Trigger
+                            value="review"
+                            id={reviewTabID}
+                            aria-controls={activeTab() === "review" ? reviewTabPanelID : undefined}
+                          >
+                            <div class="flex items-center gap-1.5">
+                              <div>{language.t("session.tab.review")}</div>
+                              <Show when={props.hasReview()}>
+                                <div>{props.reviewCount()}</div>
+                              </Show>
+                            </div>
+                          </Tabs.Trigger>
+                        </Show>
+                        <Show when={contextOpen()}>
+                          <Tabs.Trigger
+                            value="context"
+                            closeButton={
+                              <TooltipKeybind
+                                title={language.t("common.closeTab")}
+                                keybind={command.keybind("tab.close")}
+                                placement="bottom"
+                                gutter={10}
+                              >
+                                <IconButton
+                                  icon="close-small"
+                                  variant="ghost"
+                                  class="h-5 w-5"
+                                  onClick={() => tabs().close("context")}
+                                  aria-label={language.t("common.closeTab")}
+                                />
+                              </TooltipKeybind>
+                            }
+                            hideCloseButton
+                            onMiddleClick={() => tabs().close("context")}
+                          >
+                            <div class="flex items-center gap-2">
+                              <SessionContextUsage variant="indicator" />
+                              <div>{language.t("session.tab.context")}</div>
+                            </div>
+                          </Tabs.Trigger>
+                        </Show>
+                        <SortableProvider ids={openedTabs()}>
+                          <For each={openedTabs()}>{(tab) => <SortableTab tab={tab} onTabClose={tabs().close} />}</For>
+                        </SortableProvider>
+                        <div class="bg-background-stronger h-full shrink-0 sticky right-0 z-10 flex items-center justify-center pr-3">
+                          <TooltipKeybind
+                            title={language.t("command.file.open")}
+                            keybind={command.keybind("file.open")}
+                            class="flex items-center"
+                          >
+                            <IconButton
+                              icon="plus-small"
+                              variant="ghost"
+                              iconSize="large"
+                              class="!rounded-md"
+                              onClick={() => {
+                                void import("@/components/dialog-select-file").then((x) => {
+                                  dialog.show(() => <x.DialogSelectFile mode="files" onOpenFile={showAllFiles} />)
+                                })
+                              }}
+                              aria-label={language.t("command.file.open")}
+                            />
+                          </TooltipKeybind>
                        </div>
-                      </Show>
+                      </Tabs.List>
+                    </div>

+                    <Show when={reviewTab() && props.canReview() && reviewContentRendered()}>
+                      <div
+                        id={reviewTabPanelID}
+                        role="tabpanel"
+                        aria-labelledby={reviewTabID}
+                        aria-hidden={activeTab() !== "review"}
+                        inert={activeTab() !== "review"}
+                        tabIndex={props.reviewHasFocusableContent() ? undefined : 0}
+                        data-slot="tabs-content"
+                        class="flex flex-col h-full overflow-hidden contain-strict"
+                        classList={{ hidden: activeTab() !== "review" }}
+                      >
+                        {props.reviewPanel()}
+                      </div>
+                    </Show>
+
+                    <Tabs.Content value="empty" class="flex flex-col h-full overflow-hidden contain-strict">
                      <Show when={activeTab() === "empty"}>
-                        <Tabs.Content value="empty" class="flex flex-col h-full overflow-hidden contain-strict">
-                          <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
-                            <div class="h-full px-6 pb-42 -mt-4 flex flex-col items-center justify-center text-center gap-6">
-                              <Mark class="w-14 opacity-10" />
-                              <div class="text-14-regular text-text-weak max-w-56">
-                                {language.t("session.files.selectToOpen")}
-                              </div>
+                        <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
+                          <div class="h-full px-6 pb-42 -mt-4 flex flex-col items-center justify-center text-center gap-6">
+                            <Mark class="w-14 opacity-10" />
+                            <div class="text-14-regular text-text-weak max-w-56">
+                              {language.t("session.files.selectToOpen")}
                            </div>
                          </div>
-                        </Tabs.Content>
+                        </div>
                      </Show>
+                    </Tabs.Content>

-                      <Show when={activeTab() === "context"}>
-                        <Tabs.Content value="context" class="flex flex-col h-full overflow-hidden contain-strict">
+                    <Show when={contextOpen()}>
+                      <Tabs.Content value="context" class="flex flex-col h-full overflow-hidden contain-strict">
+                        <Show when={activeTab() === "context"}>
                          <div class="relative pt-2 flex-1 min-h-0 overflow-hidden">
                            <SessionContextTab />
                          </div>
-                        </Tabs.Content>
-                      </Show>
+                        </Show>
+                      </Tabs.Content>
+                    </Show>

-                      <Show when={browserTab()}>
-                        <SessionFileBrowserTab
-                          tab={browserTab()!}
-                          placeholder={browserTab() === SESSION_OPEN_FILE_TAB}
-                          active={file.pathFromTab(browserTab()!)}
-                          kinds={browserKinds()}
-                          state={props.fileBrowserState!}
-                          onSelect={(path) => previewTab(file.tab(path))}
-                          onSelectPermanent={(path) => openTab(file.tab(path))}
-                          filterRef={(element) => (fileFilter = element)}
-                        />
-                      </Show>
-
-                      <Show when={!props.fileBrowserState && activeFileTab()} keyed>
-                        {(tab) => <FileTabContent tab={tab} />}
-                      </Show>
-                    </Tabs>
-                    <DragOverlay>
-                      <Show when={store.activeDraggable} keyed>
-                        {(tab) => {
-                          const path = file.pathFromTab(tab)
-                          return (
-                            <div data-component="tabs-drag-preview">
-                              <Show when={path}>
-                                {(p) => <FileVisual active path={p()} temporary={temporaryTab() === tab} />}
-                              </Show>
-                            </div>
-                          )
-                        }}
-                      </Show>
-                    </DragOverlay>
-                  </DragDropProvider>
-                </div>
+                    <Show when={activeFileTab()} keyed>
+                      {(tab) => <FileTabContent tab={tab} />}
+                    </Show>
+                  </Tabs>
+                  <DragOverlay>
+                    <Show when={store.activeDraggable} keyed>
+                      {(tab) => {
+                        const path = file.pathFromTab(tab)
+                        return (
+                          <div data-component="tabs-drag-preview">
+                            <Show when={path}>{(p) => <FileVisual active path={p()} />}</Show>
+                          </div>
+                        )
+                      }}
+                    </Show>
+                  </DragOverlay>
+                </DragDropProvider>
              </div>
-            </Show>
+            </div>

-            <Show when={fileOpen()}>
+            <Show when={shown()}>
              <div
                id="file-tree-panel"
+                aria-hidden={!fileOpen()}
+                inert={!fileOpen()}
                class="relative min-w-0 h-full shrink-0 overflow-hidden"
                classList={{
+                  "pointer-events-none": !fileOpen(),
                  "transition-[width] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[width] motion-reduce:transition-none":
                    !props.size.active(),
                }}
@@ -502,49 +427,45 @@ export function SessionSidePanel(props: {
                        {language.t("session.files.all")}
                      </Tabs.Trigger>
                    </Tabs.List>
-                    <Show when={fileTreeTab() === "changes"}>
-                      <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
-                        <Switch>
-                          <Match when={props.hasReview() || !props.diffsReady()}>
-                            <Show
-                              when={props.diffsReady()}
-                              fallback={
-                                <div class="px-2 py-2 text-12-regular text-text-weak">
-                                  {language.t("common.loading")}
-                                  {language.t("common.loading.ellipsis")}
-                                </div>
-                              }
-                            >
-                              <FileTree
-                                path=""
-                                class="pt-3"
-                                allowed={diffFiles()}
-                                kinds={kinds()}
-                                draggable={false}
-                                active={props.activeDiff}
-                                onFileClick={(node) => props.focusReviewDiff(node.path)}
-                              />
-                            </Show>
-                          </Match>
-                        </Switch>
-                      </Tabs.Content>
-                    </Show>
-                    <Show when={fileTreeTab() === "all"}>
-                      <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
-                        <Switch>
-                          <Match when={nofiles()}>{empty(language.t("session.files.empty"))}</Match>
-                          <Match when={true}>
+                    <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
+                      <Switch>
+                        <Match when={props.hasReview() || !props.diffsReady()}>
+                          <Show
+                            when={props.diffsReady()}
+                            fallback={
+                              <div class="px-2 py-2 text-12-regular text-text-weak">
+                                {language.t("common.loading")}
+                                {language.t("common.loading.ellipsis")}
+                              </div>
+                            }
+                          >
                            <FileTree
                              path=""
                              class="pt-3"
-                              modified={diffFiles()}
+                              allowed={diffFiles()}
                              kinds={kinds()}
-                              onFileClick={(node) => openTab(file.tab(node.path))}
+                              draggable={false}
+                              active={props.activeDiff}
+                              onFileClick={(node) => props.focusReviewDiff(node.path)}
                            />
-                          </Match>
-                        </Switch>
-                      </Tabs.Content>
-                    </Show>
+                          </Show>
+                        </Match>
+                      </Switch>
+                    </Tabs.Content>
+                    <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
+                      <Switch>
+                        <Match when={nofiles()}>{empty(language.t("session.files.empty"))}</Match>
+                        <Match when={true}>
+                          <FileTree
+                            path=""
+                            class="pt-3"
+                            modified={diffFiles()}
+                            kinds={kinds()}
+                            onFileClick={(node) => openTab(file.tab(node.path))}
+                          />
+                        </Match>
+                      </Switch>
+                    </Tabs.Content>
                  </Tabs>
                </div>
                <Show when={fileOpen()}>
@@ -25,7 +25,6 @@ export type SessionCommandContext = {
  setActiveMessage: (message: UserMessage | undefined) => void
  focusInput: () => void
  review?: () => boolean
-  fileBrowser?: () => boolean
 }

 const withCategory = (category: string) => {
@@ -84,7 +83,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
    normalizeTab,
    review: actions.review,
    hasReview,
-    fileBrowser: actions.fileBrowser,
  })
  const activeFileTab = tabState.activeFileTab
  const closableTab = tabState.closableTab
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { filterReviewFiles, reviewDiffDirectory, reviewDiffKinds, reviewDiffNeedsLoad } from "./review-diff-kinds"
+import { filterReviewFiles, reviewDiffKinds } from "./review-diff-kinds"

 describe("reviewDiffKinds", () => {
  test("maps file and directory kinds", () => {
@@ -28,43 +28,3 @@ describe("filterReviewFiles", () => {
    expect(filterReviewFiles(files, "")).toEqual(files)
  })
 })
-
-describe("reviewDiffNeedsLoad", () => {
-  test("loads changed files whose aggregate patch has no hunks", () => {
-    expect(
-      reviewDiffNeedsLoad({
-        file: "src/a.ts",
-        additions: 1,
-        deletions: 0,
-        patch: "diff --git a/src/a.ts b/src/a.ts\n--- a/src/a.ts\n+++ b/src/a.ts",
-      }),
-    ).toBe(true)
-  })
-
-  test("keeps complete patches and empty changes", () => {
-    expect(
-      reviewDiffNeedsLoad({
-        file: "src/a.ts",
-        additions: 1,
-        deletions: 0,
-        patch: "@@ -0,0 +1 @@\n+value",
-      }),
-    ).toBe(false)
-    expect(reviewDiffNeedsLoad({ file: "empty.txt", additions: 0, deletions: 0 })).toBe(false)
-  })
-})
-
-describe("reviewDiffDirectory", () => {
-  test("scopes nested files to their parent directory", () => {
-    expect(reviewDiffDirectory("/repo", "src/lib/a.ts")).toBe("/repo/src/lib")
-    expect(reviewDiffDirectory("C:\\repo", "src/lib/a.ts")).toBe("C:\\repo\\src\\lib")
-  })
-
-  test("does not rescope root files", () => {
-    expect(reviewDiffDirectory("/repo/", "README.md")).toBe("/repo")
-    expect(reviewDiffDirectory("/", "README.md")).toBe("/")
-    expect(reviewDiffDirectory("C:\\", "README.md")).toBe("C:\\")
-    expect(reviewDiffDirectory("/", "src/a.ts")).toBe("/src")
-    expect(reviewDiffDirectory("C:\\", "src/a.ts")).toBe("C:\\src")
-  })
-})
@@ -8,24 +8,6 @@ export function normalizePath(p: string) {
  return normalizeFileTreeV2Path(p)
 }

-export function reviewDiffNeedsLoad(diff: RenderDiff) {
-  if (diff.additions === 0 && diff.deletions === 0) return false
-  return !diff.patch || !/^@@ /m.test(diff.patch)
-}
-
-export function reviewRootDirectory(root: string) {
-  return root === "/" || /^[A-Za-z]:[/\\]?$/.test(root) ? root : root.replace(/[/\\]+$/, "")
-}
-
-export function reviewDiffDirectory(root: string, file: string) {
-  const path = normalizePath(file)
-  const index = path.lastIndexOf("/")
-  const separator = root.includes("\\") ? "\\" : "/"
-  const base = reviewRootDirectory(root)
-  if (index < 0) return base
-  return `${base.endsWith(separator) ? base : base + separator}${path.slice(0, index).replaceAll("/", separator)}`
-}
-
 export function reviewDiffKinds(diffs: RenderDiff[]) {
  const merge = (a: Kind | undefined, b: Kind) => {
    if (!a) return b
@@ -1,4 +1,4 @@
-import { createMemo, createResource, createSignal, Show, type JSX } from "solid-js"
+import { createMemo, createSignal, Show, type JSX } from "solid-js"
 import type { FileDiffInfo, VcsFileDiff } from "@opencode-ai/sdk/v2"
 import {
  SESSION_REVIEW_V2_SIDEBAR_WIDTH_MAX,
@@ -21,12 +21,7 @@ import type {
 import FileTreeV2 from "@/components/file-tree-v2"
 import { useLanguage } from "@/context/language"
 import { useSDK } from "@/context/sdk"
-import {
-  filterReviewFiles,
-  reviewDiffKinds,
-  reviewDiffNeedsLoad,
-  type RenderDiff,
-} from "@/pages/session/v2/review-diff-kinds"
+import { filterReviewFiles, reviewDiffKinds, type RenderDiff } from "@/pages/session/v2/review-diff-kinds"
 import type { ReviewPanelV2State } from "@/pages/session/v2/review-panel-v2-state"
 import { applyFileListKeyDown, SessionFileListV2 } from "@/pages/session/v2/session-file-list-v2"

@@ -37,8 +32,6 @@ export type ReviewPanelV2Props = {
  empty?: JSX.Element
  diffs: () => ReviewDiff[]
  diffsReady: () => boolean
-  diffVersion?: number
-  loadDiff?: (path: string, version?: number) => Promise<RenderDiff | undefined>
  activeFile?: string
  onSelectFile: (path: string) => void
  diffStyle: SessionReviewDiffStyle
@@ -76,26 +69,7 @@ export function ReviewPanelV2(props: ReviewPanelV2Props) {
    if (active && files.includes(active)) return active
    return files[0]
  })
-  const sourceActiveItem = createMemo(() => diffs().find((diff) => diff.file === activeDiff()))
-  const detailSource = createMemo(() => {
-    const diff = sourceActiveItem()
-    const load = props.loadDiff
-    if (!diff || !load || !reviewDiffNeedsLoad(diff)) return
-    return { diff, load, version: props.diffVersion }
-  })
-  const [loadedDiff] = createResource(detailSource, async ({ diff, load, version }) => {
-    const value = await load(diff.file, version)
-    if (value?.file !== diff.file) return
-    return { source: diff, version, value }
-  })
-
-  const activeItem = createMemo(() => {
-    const source = sourceActiveItem()
-    if (loadedDiff.state !== "ready") return source
-    const loaded = loadedDiff()
-    if (loaded && loaded.source === source && loaded.version === props.diffVersion) return loaded.value
-    return source
-  })
+  const activeItem = createMemo(() => diffs().find((diff) => diff.file === activeDiff()))

  const readFile = async (path: string) =>
    sdk()
@@ -1,193 +0,0 @@
-import { createMemo, createSignal, createUniqueId, Show } from "solid-js"
-import { createQuery } from "@tanstack/solid-query"
-import { Tabs } from "@opencode-ai/ui/tabs"
-import { Icon } from "@opencode-ai/ui/icon"
-import {
-  SessionFilePanelV2,
-  SessionFilePanelV2Empty,
-  SessionFilePanelV2Title,
-} from "@opencode-ai/session-ui/v2/session-file-panel-v2"
-import { SessionReviewV2Sidebar, SessionReviewV2SidebarToggle } from "@opencode-ai/session-ui/v2/session-review-v2"
-import FileTree, { type Kind } from "@/components/file-tree"
-import { useFile } from "@/context/file"
-import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
-import { useSDK } from "@/context/sdk"
-import { displayName } from "@/pages/layout/helpers"
-import { useSessionLayout } from "@/pages/session/session-layout"
-import { SessionFileView } from "@/pages/session/file-tabs"
-import { applyFileListKeyDown, SessionFileListV2 } from "@/pages/session/v2/session-file-list-v2"
-import { pathKey } from "@/utils/path-key"
-
-const emptyFiles: string[] = []
-
-export type SessionFileBrowserState = {
-  sidebarOpened: () => boolean
-  sidebarWidth: () => number
-  resizeSidebar: (width: number) => void
-  toggleSidebar: () => void
-}
-
-export function SessionFileBrowserTab(props: {
-  tab: string
-  placeholder: boolean
-  active?: string
-  kinds: ReadonlyMap<string, Kind>
-  state: SessionFileBrowserState
-  onSelect: (path: string) => void
-  onSelectPermanent: (path: string) => void
-  filterRef?: (element: HTMLInputElement) => void
-}) {
-  const file = useFile()
-  const language = useLanguage()
-  const layout = useLayout()
-  const sdk = useSDK()
-  const { workspaceKey } = useSessionLayout()
-  const resultsID = `session-file-browser-results-${createUniqueId()}`
-  const [filter, setFilter] = createSignal("")
-  const [explicitHighlight, setExplicitHighlight] = createSignal<string>()
-  const query = createMemo(() => filter().trim())
-  const search = createQuery(() => {
-    const value = query()
-    return {
-      queryKey: ["session-open-file", workspaceKey(), value] as const,
-      enabled: value.length > 0,
-      queryFn: ({ signal }) => file.searchFiles(value, { limit: 200, signal }),
-    }
-  })
-  const files = createMemo(() => {
-    if (!query() || search.isPending) return emptyFiles
-    return [...new Set(search.data ?? emptyFiles)]
-  })
-  const highlighted = createMemo(() => {
-    const values = files()
-    if (values.length === 0) return undefined
-    const explicit = explicitHighlight()
-    if (explicit && values.includes(explicit)) return explicit
-    return values[0]
-  })
-  const loading = createMemo(() => query().length > 0 && search.isPending)
-  const project = createMemo(() => {
-    const directory = pathKey(sdk().directory)
-    return layout.projects
-      .list()
-      .find(
-        (item) =>
-          pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
-      )
-  })
-  const title = createMemo(() => displayName(project() ?? { worktree: sdk().directory }))
-  const optionID = (path: string) => `${resultsID}-option-${files().indexOf(path)}`
-
-  const onFilterKeyDown = (event: KeyboardEvent & { currentTarget: HTMLInputElement }) => {
-    if (event.key === "Escape" && query()) {
-      event.preventDefault()
-      setFilter("")
-      return
-    }
-    if (!query()) return
-    applyFileListKeyDown(event, files(), highlighted(), {
-      onHighlight: setExplicitHighlight,
-      onSelect: props.onSelectPermanent,
-    })
-  }
-
-  return (
-    <Tabs.Content value={props.tab} class="h-full min-h-0 overflow-hidden">
-      <SessionFilePanelV2
-        toolbar
-        toolbarStart={
-          <>
-            <SessionReviewV2SidebarToggle opened={props.state.sidebarOpened()} onToggle={props.state.toggleSidebar} />
-            <Show when={!props.state.sidebarOpened()}>
-              <SessionFilePanelV2Title>{title()}</SessionFilePanelV2Title>
-            </Show>
-          </>
-        }
-        sidebar={
-          <SessionReviewV2Sidebar
-            open={props.state.sidebarOpened()}
-            title={<span class="truncate">{title()}</span>}
-            filter={filter()}
-            onFilterChange={setFilter}
-            onFilterKeyDown={onFilterKeyDown}
-            filterAutofocus={props.placeholder}
-            filterRef={props.filterRef}
-            filterControls={resultsID}
-            filterActiveDescendant={highlighted() ? optionID(highlighted()!) : undefined}
-            filterExpanded={query().length > 0 && files().length > 0}
-            width={props.state.sidebarWidth()}
-            onWidthChange={props.state.resizeSidebar}
-          >
-            <Show
-              when={query()}
-              fallback={
-                <FileTree
-                  path=""
-                  class="pt-1"
-                  active={props.active}
-                  kinds={props.kinds}
-                  onFileClick={(node) => props.onSelect(node.path)}
-                  onFileDoubleClick={(node) => props.onSelectPermanent(node.path)}
-                />
-              }
-            >
-              <Show
-                when={!loading()}
-                fallback={
-                  <div role="status" class="px-2 py-2 text-12-regular text-text-weak">
-                    {language.t("common.loading")}
-                    {language.t("common.loading.ellipsis")}
-                  </div>
-                }
-              >
-                <Show
-                  when={files().length > 0}
-                  fallback={
-                    <div role="status" class="px-2 py-2 text-12-regular text-text-weak">
-                      {language.t("palette.empty")}
-                    </div>
-                  }
-                >
-                  <SessionFileListV2
-                    id={resultsID}
-                    role="listbox"
-                    optionID={optionID}
-                    files={files()}
-                    kinds={props.kinds}
-                    active={props.active}
-                    highlighted={highlighted()}
-                    onFileClick={(path) => {
-                      setExplicitHighlight(path)
-                      props.onSelect(path)
-                    }}
-                    onFileDoubleClick={props.onSelectPermanent}
-                  />
-                </Show>
-              </Show>
-            </Show>
-          </SessionReviewV2Sidebar>
-        }
-      >
-        <Show
-          when={!props.placeholder}
-          fallback={
-            <SessionFilePanelV2Empty>
-              <div class="flex flex-col items-center gap-3 text-center text-text-weak">
-                <Icon name="file-tree" size="large" />
-                <div class="text-14-medium text-text-strong">{language.t("command.file.open")}</div>
-                <div class="text-13-regular">{language.t("session.files.selectToOpen")}</div>
-              </div>
-            </SessionFilePanelV2Empty>
-          }
-        >
-          <div class="min-h-0 flex-1">
-            <Show when={props.tab} keyed>
-              {(tab) => <SessionFileView tab={tab} />}
-            </Show>
-          </div>
-        </Show>
-      </SessionFilePanelV2>
-    </Tabs.Content>
-  )
-}
@@ -43,11 +43,7 @@ export function SessionFileListV2(props: {
  active?: string
  highlighted?: string
  kinds?: ReadonlyMap<string, Kind>
-  id?: string
-  role?: "listbox"
-  optionID?: (path: string) => string
  onFileClick: (path: string) => void
-  onFileDoubleClick?: (path: string) => void
 }) {
  const active = () => normalizePath(props.active ?? "")
  const highlighted = () => normalizePath(props.highlighted ?? "")
@@ -92,8 +88,6 @@ export function SessionFileListV2(props: {
  return (
    <div
      ref={setRoot}
-      id={props.id}
-      role={props.role}
      data-component="file-tree-v2"
      data-total-rows={props.files.length}
      style={{ position: "relative", height: `${virtualizer.getTotalSize()}px` }}
@@ -122,9 +116,6 @@ export function SessionFileListV2(props: {
                >
                  <button
                    type="button"
-                    id={props.optionID?.(path)}
-                    role={props.role ? "option" : undefined}
-                    aria-selected={props.role ? selected() : undefined}
                    data-slot="file-tree-v2-row"
                    data-path={path}
                    data-selected={selected() ? "" : undefined}
@@ -133,7 +124,6 @@ export function SessionFileListV2(props: {
                    onFocus={() => setFocused(path)}
                    onBlur={() => setFocused(undefined)}
                    onClick={() => props.onFileClick(path)}
-                    onDblClick={() => props.onFileDoubleClick?.(path)}
                  >
                    <span class="filetree-iconpair size-4">
                      <FileIcon node={{ path, type: "file" }} class="size-4 filetree-icon filetree-icon--color" />
@@ -1,24 +0,0 @@
-export type FileManagerOS = "macos" | "windows" | "linux" | "unknown"
-
-export function fileManagerApp(os: FileManagerOS): {
-  label: "session.header.open.finder" | "session.header.open.fileExplorer" | "session.header.open.fileManager"
-  actionLabel:
-    | "session.header.reveal.finder"
-    | "session.header.reveal.fileExplorer"
-    | "session.header.reveal.containingFolder"
-  icon: "finder" | "file-explorer"
-} {
-  if (os === "macos")
-    return { label: "session.header.open.finder", actionLabel: "session.header.reveal.finder", icon: "finder" }
-  if (os === "windows")
-    return {
-      label: "session.header.open.fileExplorer",
-      actionLabel: "session.header.reveal.fileExplorer",
-      icon: "file-explorer",
-    }
-  return {
-    label: "session.header.open.fileManager",
-    actionLabel: "session.header.reveal.containingFolder",
-    icon: "finder",
-  }
-}
@@ -8,8 +8,6 @@ test("resets transient prompt input state when the prompt session changes", () =
    const [state, setState] = createPromptInputTransientState(identity, 3)
    setState({
      popover: "slash",
-      slashMenu: true,
-      slashMenuQuery: "compact",
      historyIndex: 2,
      savedPrompt: {
        prompt: [{ type: "text", content: "draft-A", start: 0, end: 7 }],
@@ -25,8 +23,6 @@ test("resets transient prompt input state when the prompt session changes", () =

    expect(state).toMatchObject({
      popover: null,
-      slashMenu: false,
-      slashMenuQuery: "",
      historyIndex: -1,
      savedPrompt: null,
      placeholder: 3,
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/cli",
-  "version": "1.17.18",
+  "version": "1.17.15",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -16,7 +16,6 @@
    "dist"
  ],
  "exports": {
-    ".": "./src/promise/index.ts",
    "./promise": "./src/promise/index.ts",
    "./promise/api": "./src/promise/api.ts",
    "./effect": "./src/effect/index.ts",
@@ -226,69 +226,64 @@ export type Endpoint5_20Input = { readonly sessionID: Endpoint5_20Request["param
 export type Endpoint5_20Output = EffectValue<ReturnType<RawClient["server.session"]["session.context"]>>["data"]
 export type SessionContextOperation<E = never> = (input: Endpoint5_20Input) => Effect.Effect<Endpoint5_20Output, E>

-type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.pending.list"]>[0]
+type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
 export type Endpoint5_21Input = { readonly sessionID: Endpoint5_21Request["params"]["sessionID"] }
-export type Endpoint5_21Output = EffectValue<ReturnType<RawClient["server.session"]["session.pending.list"]>>["data"]
-export type SessionPendingListOperation<E = never> = (input: Endpoint5_21Input) => Effect.Effect<Endpoint5_21Output, E>
-
-type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
-export type Endpoint5_22Input = { readonly sessionID: Endpoint5_22Request["params"]["sessionID"] }
-export type Endpoint5_22Output = EffectValue<
+export type Endpoint5_21Output = EffectValue<
  ReturnType<RawClient["server.session"]["session.instructions.entry.list"]>
 >["data"]
 export type SessionInstructionsEntryListOperation<E = never> = (
+  input: Endpoint5_21Input,
+) => Effect.Effect<Endpoint5_21Output, E>
+
+type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
+export type Endpoint5_22Input = {
+  readonly sessionID: Endpoint5_22Request["params"]["sessionID"]
+  readonly key: Endpoint5_22Request["params"]["key"]
+  readonly value: Endpoint5_22Request["payload"]["value"]
+}
+export type Endpoint5_22Output = EffectValue<ReturnType<RawClient["server.session"]["session.instructions.entry.put"]>>
+export type SessionInstructionsEntryPutOperation<E = never> = (
  input: Endpoint5_22Input,
 ) => Effect.Effect<Endpoint5_22Output, E>

-type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
+type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
 export type Endpoint5_23Input = {
  readonly sessionID: Endpoint5_23Request["params"]["sessionID"]
  readonly key: Endpoint5_23Request["params"]["key"]
-  readonly value: Endpoint5_23Request["payload"]["value"]
 }
-export type Endpoint5_23Output = EffectValue<ReturnType<RawClient["server.session"]["session.instructions.entry.put"]>>
-export type SessionInstructionsEntryPutOperation<E = never> = (
-  input: Endpoint5_23Input,
-) => Effect.Effect<Endpoint5_23Output, E>
-
-type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
-export type Endpoint5_24Input = {
-  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
-  readonly key: Endpoint5_24Request["params"]["key"]
-}
-export type Endpoint5_24Output = EffectValue<
+export type Endpoint5_23Output = EffectValue<
  ReturnType<RawClient["server.session"]["session.instructions.entry.remove"]>
 >
 export type SessionInstructionsEntryRemoveOperation<E = never> = (
-  input: Endpoint5_24Input,
-) => Effect.Effect<Endpoint5_24Output, E>
+  input: Endpoint5_23Input,
+) => Effect.Effect<Endpoint5_23Output, E>

-type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.log"]>[0]
-export type Endpoint5_25Input = {
-  readonly sessionID: Endpoint5_25Request["params"]["sessionID"]
-  readonly after?: Endpoint5_25Request["query"]["after"]
-  readonly follow?: Endpoint5_25Request["query"]["follow"]
+type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.log"]>[0]
+export type Endpoint5_24Input = {
+  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
+  readonly after?: Endpoint5_24Request["query"]["after"]
+  readonly follow?: Endpoint5_24Request["query"]["follow"]
 }
-export type Endpoint5_25Output = StreamValue<EffectValue<ReturnType<RawClient["server.session"]["session.log"]>>>
-export type SessionLogOperation<E = never> = (input: Endpoint5_25Input) => Stream.Stream<Endpoint5_25Output, E>
+export type Endpoint5_24Output = StreamValue<EffectValue<ReturnType<RawClient["server.session"]["session.log"]>>>
+export type SessionLogOperation<E = never> = (input: Endpoint5_24Input) => Stream.Stream<Endpoint5_24Output, E>

-type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+export type Endpoint5_25Input = { readonly sessionID: Endpoint5_25Request["params"]["sessionID"] }
+export type Endpoint5_25Output = EffectValue<ReturnType<RawClient["server.session"]["session.interrupt"]>>
+export type SessionInterruptOperation<E = never> = (input: Endpoint5_25Input) => Effect.Effect<Endpoint5_25Output, E>
+
+type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.background"]>[0]
 export type Endpoint5_26Input = { readonly sessionID: Endpoint5_26Request["params"]["sessionID"] }
-export type Endpoint5_26Output = EffectValue<ReturnType<RawClient["server.session"]["session.interrupt"]>>
-export type SessionInterruptOperation<E = never> = (input: Endpoint5_26Input) => Effect.Effect<Endpoint5_26Output, E>
+export type Endpoint5_26Output = EffectValue<ReturnType<RawClient["server.session"]["session.background"]>>
+export type SessionBackgroundOperation<E = never> = (input: Endpoint5_26Input) => Effect.Effect<Endpoint5_26Output, E>

-type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.background"]>[0]
-export type Endpoint5_27Input = { readonly sessionID: Endpoint5_27Request["params"]["sessionID"] }
-export type Endpoint5_27Output = EffectValue<ReturnType<RawClient["server.session"]["session.background"]>>
-export type SessionBackgroundOperation<E = never> = (input: Endpoint5_27Input) => Effect.Effect<Endpoint5_27Output, E>
-
-type Endpoint5_28Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-export type Endpoint5_28Input = {
-  readonly sessionID: Endpoint5_28Request["params"]["sessionID"]
-  readonly messageID: Endpoint5_28Request["params"]["messageID"]
+type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+export type Endpoint5_27Input = {
+  readonly sessionID: Endpoint5_27Request["params"]["sessionID"]
+  readonly messageID: Endpoint5_27Request["params"]["messageID"]
 }
-export type Endpoint5_28Output = EffectValue<ReturnType<RawClient["server.session"]["session.message"]>>["data"]
-export type SessionMessageOperation<E = never> = (input: Endpoint5_28Input) => Effect.Effect<Endpoint5_28Output, E>
+export type Endpoint5_27Output = EffectValue<ReturnType<RawClient["server.session"]["session.message"]>>["data"]
+export type SessionMessageOperation<E = never> = (input: Endpoint5_27Input) => Effect.Effect<Endpoint5_27Output, E>

 export interface SessionApi<E = never> {
  readonly list: SessionListOperation<E>
@@ -314,7 +309,6 @@ export interface SessionApi<E = never> {
    readonly commit: SessionRevertCommitOperation<E>
  }
  readonly context: SessionContextOperation<E>
-  readonly pending: { readonly list: SessionPendingListOperation<E> }
  readonly instructions: {
    readonly entry: {
      readonly list: SessionInstructionsEntryListOperation<E>
@@ -550,7 +544,9 @@ export type Endpoint14_2Input = {
  readonly id?: Endpoint14_2Request["payload"]["id"]
  readonly title: Endpoint14_2Request["payload"]["title"]
  readonly metadata?: Endpoint14_2Request["payload"]["metadata"]
-  readonly fields: Endpoint14_2Request["payload"]["fields"]
+  readonly mode: Endpoint14_2Request["payload"]["mode"]
+  readonly fields?: Endpoint14_2Request["payload"]["fields"]
+  readonly url?: Endpoint14_2Request["payload"]["url"]
 }
 export type Endpoint14_2Output = EffectValue<ReturnType<RawClient["server.form"]["session.form.create"]>>["data"]
 export type FormCreateOperation<E = never> = (input: Endpoint14_2Input) => Effect.Effect<Endpoint14_2Output, E>
@@ -318,51 +318,43 @@ const Endpoint5_20 = (raw: RawClient["server.session"]) => (input: Endpoint5_20I
    Effect.map((value) => value.data),
  )

-type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.pending.list"]>[0]
+type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
 type Endpoint5_21Input = { readonly sessionID: Endpoint5_21Request["params"]["sessionID"] }
 const Endpoint5_21 = (raw: RawClient["server.session"]) => (input: Endpoint5_21Input) =>
-  raw["session.pending.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
-    Effect.mapError(mapClientError),
-    Effect.map((value) => value.data),
-  )
-
-type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
-type Endpoint5_22Input = { readonly sessionID: Endpoint5_22Request["params"]["sessionID"] }
-const Endpoint5_22 = (raw: RawClient["server.session"]) => (input: Endpoint5_22Input) =>
  raw["session.instructions.entry.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
-type Endpoint5_23Input = {
-  readonly sessionID: Endpoint5_23Request["params"]["sessionID"]
-  readonly key: Endpoint5_23Request["params"]["key"]
-  readonly value: Endpoint5_23Request["payload"]["value"]
+type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
+type Endpoint5_22Input = {
+  readonly sessionID: Endpoint5_22Request["params"]["sessionID"]
+  readonly key: Endpoint5_22Request["params"]["key"]
+  readonly value: Endpoint5_22Request["payload"]["value"]
 }
-const Endpoint5_23 = (raw: RawClient["server.session"]) => (input: Endpoint5_23Input) =>
+const Endpoint5_22 = (raw: RawClient["server.session"]) => (input: Endpoint5_22Input) =>
  raw["session.instructions.entry.put"]({
    params: { sessionID: input["sessionID"], key: input["key"] },
    payload: { value: input["value"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
-type Endpoint5_24Input = {
-  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
-  readonly key: Endpoint5_24Request["params"]["key"]
+type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
+type Endpoint5_23Input = {
+  readonly sessionID: Endpoint5_23Request["params"]["sessionID"]
+  readonly key: Endpoint5_23Request["params"]["key"]
 }
-const Endpoint5_24 = (raw: RawClient["server.session"]) => (input: Endpoint5_24Input) =>
+const Endpoint5_23 = (raw: RawClient["server.session"]) => (input: Endpoint5_23Input) =>
  raw["session.instructions.entry.remove"]({ params: { sessionID: input["sessionID"], key: input["key"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.log"]>[0]
-type Endpoint5_25Input = {
-  readonly sessionID: Endpoint5_25Request["params"]["sessionID"]
-  readonly after?: Endpoint5_25Request["query"]["after"]
-  readonly follow?: Endpoint5_25Request["query"]["follow"]
+type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.log"]>[0]
+type Endpoint5_24Input = {
+  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
+  readonly after?: Endpoint5_24Request["query"]["after"]
+  readonly follow?: Endpoint5_24Request["query"]["follow"]
 }
-const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25Input) =>
+const Endpoint5_24 = (raw: RawClient["server.session"]) => (input: Endpoint5_24Input) =>
  Stream.unwrap(
    raw["session.log"]({
      params: { sessionID: input["sessionID"] },
@@ -373,22 +365,22 @@ const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25I
    ),
  )

-type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
-type Endpoint5_26Input = { readonly sessionID: Endpoint5_26Request["params"]["sessionID"] }
-const Endpoint5_26 = (raw: RawClient["server.session"]) => (input: Endpoint5_26Input) =>
+type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+type Endpoint5_25Input = { readonly sessionID: Endpoint5_25Request["params"]["sessionID"] }
+const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25Input) =>
  raw["session.interrupt"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.background"]>[0]
-type Endpoint5_27Input = { readonly sessionID: Endpoint5_27Request["params"]["sessionID"] }
-const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27Input) =>
+type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.background"]>[0]
+type Endpoint5_26Input = { readonly sessionID: Endpoint5_26Request["params"]["sessionID"] }
+const Endpoint5_26 = (raw: RawClient["server.session"]) => (input: Endpoint5_26Input) =>
  raw["session.background"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_28Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-type Endpoint5_28Input = {
-  readonly sessionID: Endpoint5_28Request["params"]["sessionID"]
-  readonly messageID: Endpoint5_28Request["params"]["messageID"]
+type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+type Endpoint5_27Input = {
+  readonly sessionID: Endpoint5_27Request["params"]["sessionID"]
+  readonly messageID: Endpoint5_27Request["params"]["messageID"]
 }
-const Endpoint5_28 = (raw: RawClient["server.session"]) => (input: Endpoint5_28Input) =>
+const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27Input) =>
  raw["session.message"]({ params: { sessionID: input["sessionID"], messageID: input["messageID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
@@ -414,12 +406,11 @@ const adaptGroup5 = (raw: RawClient["server.session"]) => ({
  wait: Endpoint5_16(raw),
  revert: { stage: Endpoint5_17(raw), clear: Endpoint5_18(raw), commit: Endpoint5_19(raw) },
  context: Endpoint5_20(raw),
-  pending: { list: Endpoint5_21(raw) },
-  instructions: { entry: { list: Endpoint5_22(raw), put: Endpoint5_23(raw), remove: Endpoint5_24(raw) } },
-  log: Endpoint5_25(raw),
-  interrupt: Endpoint5_26(raw),
-  background: Endpoint5_27(raw),
-  message: Endpoint5_28(raw),
+  instructions: { entry: { list: Endpoint5_21(raw), put: Endpoint5_22(raw), remove: Endpoint5_23(raw) } },
+  log: Endpoint5_24(raw),
+  interrupt: Endpoint5_25(raw),
+  background: Endpoint5_26(raw),
+  message: Endpoint5_27(raw),
 })

 type Endpoint6_0Request = Parameters<RawClient["server.message"]["session.messages"]>[0]
@@ -655,12 +646,21 @@ type Endpoint14_2Input = {
  readonly id?: Endpoint14_2Request["payload"]["id"]
  readonly title: Endpoint14_2Request["payload"]["title"]
  readonly metadata?: Endpoint14_2Request["payload"]["metadata"]
-  readonly fields: Endpoint14_2Request["payload"]["fields"]
+  readonly mode: Endpoint14_2Request["payload"]["mode"]
+  readonly fields?: Endpoint14_2Request["payload"]["fields"]
+  readonly url?: Endpoint14_2Request["payload"]["url"]
 }
 const Endpoint14_2 = (raw: RawClient["server.form"]) => (input: Endpoint14_2Input) =>
  raw["session.form.create"]({
    params: { sessionID: input["sessionID"] },
-    payload: { id: input["id"], title: input["title"], metadata: input["metadata"], fields: input["fields"] },
+    payload: {
+      id: input["id"],
+      title: input["title"],
+      metadata: input["metadata"],
+      mode: input["mode"],
+      fields: input["fields"],
+      url: input["url"],
+    },
  }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
@@ -38,7 +38,7 @@ export { Question } from "@opencode-ai/schema/question"
 export { Reference } from "@opencode-ai/schema/reference"
 export { AbsolutePath, RelativePath } from "@opencode-ai/schema/schema"
 export { Session } from "@opencode-ai/schema/session"
-export { SessionPending } from "@opencode-ai/schema/session-pending"
+export { SessionInput } from "@opencode-ai/schema/session-input"
 export { SessionMessage } from "@opencode-ai/schema/session-message"
 export { Skill } from "@opencode-ai/schema/skill"
 export { Prompt } from "@opencode-ai/schema/prompt"
@@ -48,8 +48,6 @@ import type {
  SessionRevertCommitOutput,
  SessionContextInput,
  SessionContextOutput,
-  SessionPendingListInput,
-  SessionPendingListOutput,
  SessionInstructionsEntryListInput,
  SessionInstructionsEntryListOutput,
  SessionInstructionsEntryPutInput,
@@ -668,19 +666,6 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ).then((value) => value.data),
-      pending: {
-        list: (input: SessionPendingListInput, requestOptions?: RequestOptions) =>
-          request<{ readonly data: SessionPendingListOutput }>(
-            {
-              method: "GET",
-              path: `/api/session/${encodeURIComponent(input.sessionID)}/pending`,
-              successStatus: 200,
-              declaredStatuses: [404, 400, 401],
-              empty: false,
-            },
-            requestOptions,
-          ).then((value) => value.data),
-      },
      instructions: {
        entry: {
          list: (input: SessionInstructionsEntryListInput, requestOptions?: RequestOptions) =>
@@ -1056,7 +1041,14 @@ export function make(options: ClientOptions) {
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/form`,
-            body: { id: input["id"], title: input["title"], metadata: input["metadata"], fields: input["fields"] },
+            body: {
+              id: input["id"],
+              title: input["title"],
+              metadata: input["metadata"],
+              mode: input["mode"],
+              fields: input["fields"],
+              url: input["url"],
+            },
            successStatus: 200,
            declaredStatuses: [404, 409, 400, 401],
            empty: false,
@@ -1,10 +1,25 @@
 import { expect, test } from "bun:test"
 import { Schema } from "effect"
+import { AgentV2 } from "@opencode-ai/core/agent"
+import { Location as CoreLocation } from "@opencode-ai/core/location"
+import { ModelV2 } from "@opencode-ai/core/model"
+import { ProjectV2 } from "@opencode-ai/core/project"
+import { SessionV2 } from "@opencode-ai/core/session"
+import { SessionInput as CoreSessionInput } from "@opencode-ai/core/session/input"
+import { SessionMessage as CoreSessionMessage } from "@opencode-ai/core/session/message"
 import { Agent } from "@opencode-ai/schema/agent"
+import { Location } from "@opencode-ai/schema/location"
 import { Model } from "@opencode-ai/schema/model"
+import { Project } from "@opencode-ai/schema/project"
+import { Provider } from "@opencode-ai/schema/provider"
 import { Prompt } from "@opencode-ai/schema/prompt"
 import { Session } from "@opencode-ai/schema/session"
+import { SessionInput } from "@opencode-ai/schema/session-input"
 import { SessionMessage } from "@opencode-ai/schema/session-message"
+import { Workspace } from "@opencode-ai/schema/workspace"
+import { Api } from "@opencode-ai/server/api"
+import { compile, emitPromise } from "@opencode-ai/httpapi-codegen"
+import { ClientApi, groupNames, promiseOmitEndpoints } from "../src/contract"

 const Client = await import("../src/effect")

@@ -14,6 +29,34 @@ test("effect entrypoint exposes canonical Schema contracts", () => {
  expect(Client.Session).toBe(Session)
 })

+test("Core and Server reuse the authoritative Schema and Protocol values", () => {
+  expect(AgentV2.ID).toBe(Agent.ID)
+  expect(CoreLocation.Ref).toBe(Location.Ref)
+  expect(ModelV2.Ref).toBe(Model.Ref)
+  expect(SessionV2.Info).toBe(Session.Info)
+  expect(ProjectV2.Current).toBe(Project.Current)
+  expect(ProjectV2.Directory).toBe(Project.Directory)
+  expect(ProjectV2.Directories).toBe(Project.Directories)
+  expect(CoreSessionInput.Message).toBe(SessionInput.Message)
+  expect(CoreSessionInput.User).toBe(SessionInput.User)
+  expect(CoreSessionInput.Synthetic).toBe(SessionInput.Synthetic)
+  expect(CoreSessionMessage.Info).toBe(SessionMessage.Info)
+  expect(Api.groups["server.session"].identifier).toBe("server.session")
+  expect(Api.groups["server.project"].identifier).toBe("server.project")
+  expect(Object.keys(ClientApi.groups)).toEqual(Object.keys(Api.groups))
+  expect(Session.ID.create()).toStartWith("ses_")
+  expect(Project.ID.global).toBe("global")
+  expect(Provider.ID.anthropic).toBe("anthropic")
+  expect(Workspace.ID.create()).toStartWith("wrk_")
+})
+
+test("client and Server contracts generate identically", () => {
+  const server = compile(Api, { groupNames, omitEndpoints: promiseOmitEndpoints })
+  const client = compile(ClientApi, { groupNames, omitEndpoints: promiseOmitEndpoints })
+
+  expect(emitPromise(client)).toEqual(emitPromise(server))
+})
+
 test("shared DTO schemas construct and decode plain objects", () => {
  const made = Prompt.make({ text: "hello" })
  const decoded = Schema.decodeUnknownSync(Prompt)({ text: "hello" })
@@ -24,4 +67,5 @@ test("shared DTO schemas construct and decode plain objects", () => {
  expect(Object.getPrototypeOf(content)).toBe(Object.prototype)
  expect(Prompt.ast.annotations?.identifier).toBe("Prompt")
  expect(SessionMessage.AssistantText.ast.annotations?.identifier).toBe("Session.Message.Assistant.Text")
+  expect(CoreSessionMessage.AssistantText).toBe(SessionMessage.AssistantText)
 })
@@ -12,7 +12,7 @@ const server = resolve(import.meta.dir, "../../server")

 describe("public import boundaries", () => {
  test("isolates each public entrypoint", async () => {
-    const root = await bundleInputs("@opencode-ai/client", "browser")
+    const root = await bundleInputs("@opencode-ai/client/promise", "browser")

    expect(within(root, effect)).toEqual([])
    expect(within(root, schema)).toEqual([])
@@ -227,34 +227,6 @@ test("session instructions methods use the public HTTP contract", async () => {
  ])
 })

-test("session.pending.list uses the public HTTP contract", async () => {
-  const requests: Array<{ method: string; url: string }> = []
-  const pending = [
-    {
-      admittedSeq: 3,
-      id: "msg_pending",
-      sessionID: "ses_test",
-      timeCreated: 1_717_171_717_000,
-      type: "user",
-      data: { text: "Fix the failing tests" },
-      delivery: "steer",
-    },
-  ]
-  const client = OpenCode.make({
-    baseUrl: "http://localhost:3000",
-    fetch: async (input, init) => {
-      const request = input instanceof Request ? input : new Request(input, init)
-      requests.push({ method: request.method, url: request.url })
-      return Response.json({ data: pending })
-    },
-  })
-
-  const result = await client.session.pending.list({ sessionID: "ses_test" })
-
-  expect(result).toEqual(pending)
-  expect(requests).toEqual([{ method: "GET", url: "http://localhost:3000/api/session/ses_test/pending" }])
-})
-
 test("event.subscribe exposes the Promise event stream wire projection", async () => {
  const client = OpenCode.make({
    baseUrl: "http://localhost:3000",
@@ -130,7 +130,6 @@ type Result = Success | Failure
 interface Success {
  readonly ok: true
  readonly value: CodeMode.DataValue
-  readonly warnings?: ReadonlyArray<CodeMode.Diagnostic>
  readonly logs?: ReadonlyArray<string>
  readonly truncated?: boolean
  readonly toolCalls: ReadonlyArray<CodeMode.ToolCall>
@@ -145,7 +144,7 @@ interface Failure {
 }
 ```

-`toolCalls` contains the names of calls admitted by the runtime in call order. It is retained on failure so hosts can audit partial execution without exposing inputs or host failures. A successful execution may also contain `warnings`: runtime-authored, non-fatal diagnostics alongside a valid value - unhandled rejections from promises that failed, un-awaited, before the program returned, or background work interrupted by the timeout after the program returned. Anything still running when the program returns is interrupted - race losers and fire-and-forget calls alike - so a program must await every call whose completion matters. Failure has an `error`; success may have `warnings`; program-authored console output stays in `logs`. Keeping the value on an unhandled rejection is a deliberate divergence from Node's crash-on-unhandled-rejection default: the computed value and the background failure are independently useful to the model, so the result carries both. When warnings are cut by `maxOutputBytes`, a final `Truncated` diagnostic marks the omission in-band, and `truncated` marks any result, warning, or log truncation (see Execution Limits).
+`toolCalls` contains the names of calls admitted by the runtime in call order. It is retained on failure so hosts can audit partial execution without exposing inputs or host failures. `truncated` is present when the value or logs were cut to fit `maxOutputBytes` (see Execution Limits).

 ### Tool-call hooks

@@ -258,11 +257,11 @@ CodeMode is an orchestration language, not a general JavaScript runtime.

 The limits are exactly three knobs:

-| Limit            |              Default | Bounds                                               |
-| ---------------- | -------------------: | ---------------------------------------------------- |
-| `timeoutMs`      |    none - no timeout | Wall-clock execution time.                           |
-| `maxToolCalls`   |     none - unlimited | Tool calls admitted during the execution.            |
-| `maxOutputBytes` | none - no truncation | Retained result value and logs; warnings separately. |
+| Limit            |              Default | Bounds                                                               |
+| ---------------- | -------------------: | -------------------------------------------------------------------- |
+| `timeoutMs`      |    none - no timeout | Wall-clock execution time.                                           |
+| `maxToolCalls`   |     none - unlimited | Tool calls admitted during the execution.                            |
+| `maxOutputBytes` | none - no truncation | Model-facing output: the serialized result value plus captured logs. |

 No limit has a default, on purpose: execution budgets are host policy, not library policy - a host that wants a bound sets one; a host that can interrupt the execution fiber (as OpenCode does on user cancel) may set no timeout, and a host with its own tool-output truncation (as OpenCode has) may leave `maxOutputBytes` unset. A host with neither should set `maxOutputBytes`, or oversized results silently flood model context.

@@ -280,11 +279,9 @@ const runtime = CodeMode.make({

 Limits are safe integers. `timeoutMs` must be at least `1`; the others may be `0`. Invalid configuration throws a `RangeError` when `CodeMode.make` or `CodeMode.execute` is called. An explicitly `undefined` value is the same as leaving the limit unset.

-`maxOutputBytes` is a payload budget, not a strict byte cap on the final rendered tool message. It counts the serialized result value and retained log lines; warning diagnostics are bounded by a separate budget of the same size, so a large value never silences runtime diagnostics. Fixed truncation notices and framing added by a host when it renders the structured result are additional and may make the final message exceed the configured number.
+Exceeding a configured `maxOutputBytes` never fails the execution. An oversized result value is replaced by its truncated serialized text plus an explanatory marker, logs are kept from the start until the remaining budget is exhausted (with a final marker line noting the cut), and the result carries `truncated: true`.

-Exceeding a configured `maxOutputBytes` never fails the execution. An oversized result value is replaced by its truncated serialized text plus an explanatory marker, logs are kept within the remaining budget, warnings are kept within their own budget, omitted entries receive a summary marker, and the result carries `truncated: true`.
-
-When configured, the timeout interrupts in-flight tool Effects, including eagerly started calls the program has not awaited (their fibers are supervised by the execution). The interpreter yields cooperatively between steps, so the timeout also interrupts pure busy loops (`while (true) {}`) - no separate work budget exists. Tool implementations remain responsible for making their external operations interruptible or independently bounded: the timeout bounds when interruption begins, not when the result is delivered, which waits for tool interruption cleanup to finish. If the timeout fires after the program has already returned a valid value - while the runtime is interrupting leftover work and waiting for its cleanup - the result stays successful: the computed value is returned with a `TimeoutExceeded` warning instead of being discarded.
+When configured, the timeout interrupts in-flight tool Effects, including eagerly started calls the program has not awaited (their fibers are supervised by the execution). The interpreter yields cooperatively between steps, so the timeout also interrupts pure busy loops (`while (true) {}`) - no separate work budget exists. Tool implementations remain responsible for making their external operations interruptible or independently bounded.

 Two interpreter internals are fixed constants rather than knobs: at most 8 tool calls run concurrently, and values crossing a data boundary may nest at most 32 levels deep (deeper values fail as `InvalidDataValue`, which reads better than a native stack-overflow error). Neither is part of the public contract.

@@ -292,19 +289,18 @@ Two interpreter internals are fixed constants rather than knobs: at most 8 tool

 Failures are data:

-| Kind                    | Meaning                                                                                                   |
-| ----------------------- | --------------------------------------------------------------------------------------------------------- |
-| `ParseError`            | Source is empty or cannot be parsed.                                                                      |
-| `UnsupportedSyntax`     | Parsed JavaScript is outside the supported subset.                                                        |
-| `UnknownTool`           | A program referenced a tool the host did not provide.                                                     |
-| `InvalidToolInput`      | Tool input failed schema decoding or safe-data copying.                                                   |
-| `InvalidToolOutput`     | Tool output failed schema decoding or safe-data copying.                                                  |
-| `InvalidDataValue`      | Program data violated the plain-data contract (depth, circularity, blocked properties, non-data values).  |
-| `ToolCallLimitExceeded` | Calls exceeded `maxToolCalls`.                                                                            |
-| `TimeoutExceeded`       | Execution exceeded `timeoutMs`; as a warning, background work was interrupted after the program returned. |
-| `ToolFailure`           | A tool refused or failed.                                                                                 |
-| `ExecutionFailure`      | The program threw or another execution error occurred.                                                    |
-| `Truncated`             | Warning-only marker: additional warnings were omitted by `maxOutputBytes`.                                |
+| Kind                    | Meaning                                                                                                  |
+| ----------------------- | -------------------------------------------------------------------------------------------------------- |
+| `ParseError`            | Source is empty or cannot be parsed.                                                                     |
+| `UnsupportedSyntax`     | Parsed JavaScript is outside the supported subset.                                                       |
+| `UnknownTool`           | A program referenced a tool the host did not provide.                                                    |
+| `InvalidToolInput`      | Tool input failed schema decoding or safe-data copying.                                                  |
+| `InvalidToolOutput`     | Tool output failed schema decoding or safe-data copying.                                                 |
+| `InvalidDataValue`      | Program data violated the plain-data contract (depth, circularity, blocked properties, non-data values). |
+| `ToolCallLimitExceeded` | Calls exceeded `maxToolCalls`.                                                                           |
+| `TimeoutExceeded`       | Execution exceeded `timeoutMs`.                                                                          |
+| `ToolFailure`           | A tool refused or failed.                                                                                |
+| `ExecutionFailure`      | The program threw or another execution error occurred.                                                   |

 Unknown host failures, defects, invalid outputs, and copying failures are sanitized. To return a safe operational refusal, fail with `toolError`:

@@ -63,24 +63,13 @@ path lookup, namespace browsing, deterministic ranking, and pagination.

 ### Tool execution

-Every sandbox promise starts eagerly on a run-once fiber owned by the whole CodeMode execution, including tool calls,
-async functions, `Promise.all`, `Promise.allSettled`, `Promise.race`, `Promise.resolve`, and `Promise.reject`. Nested
-functions therefore cannot end the lifetime of work they started. Independent aggregate batches overlap, and rejection
-is observed at the eventual `await`. `Promise.race` uses native non-cancelling settlement semantics: its first result
-wins while losers continue running. At normal completion CodeMode interrupts everything still running - race losers,
-fail-fast `Promise.all` stragglers, and fire-and-forget calls alike: the program has returned, so no future await can
-exist, and work whose completion matters must be awaited by the program. Waiting for any class of leftover instead
-would let it hold the execution open, or deadlock it when queued work needs tool-call permits the leftovers occupy.
-Rejections that settled un-awaited before the return become `Success.warnings` diagnostics. A fatal program failure or
-host interruption closes the execution promise scope and interrupts its active fibers instead. A timeout does the
-same, except that a value the program already returned is preserved alongside a `TimeoutExceeded` warning rather than
-discarded. At most eight tool calls execute concurrently.
+Calling a tool starts its Effect eagerly on a supervised fiber. The returned sandbox promise is run-once and can be
+awaited directly or through the supported `Promise` combinators. At most eight tool calls execute concurrently.
+Unfinished calls are drained before successful program completion, and an unhandled call failure becomes a diagnostic.

 The public execution-policy knobs are `timeoutMs`, `maxToolCalls`, and `maxOutputBytes`. The package supplies no
 defaults because budgets are host policy. The interpreter also enforces fixed internal boundaries for tool-call
-concurrency and data nesting depth. `maxOutputBytes` bounds retained payload bytes, not the complete rendered message;
-warning diagnostics have an equal separate budget so a large value cannot starve them, and fixed truncation notices and
-host-added framing are intentionally outside the budgets.
+concurrency and data nesting depth.

 ### Data, files, and failures

@@ -90,7 +79,7 @@ boundary.

 Unknown host failures and invalid outputs are sanitized. `ToolError` is the explicit channel for a safe message that a
 tool wants the model to see. Diagnostic categories distinguish parsing, unsupported syntax, unknown tools, invalid
-data, tool failures, limits, timeouts, execution failures, and warning truncation.
+data, tool failures, limits, timeouts, and execution failures.

 Files and other attachment content stay outside the interpreter. A host may collect them while child tools execute and
 attach them to the outer result, but the program receives only the structured tool output.
@@ -106,8 +95,7 @@ CodeMode is integrated into V2 through `packages/core/src/tool/registry.ts` and
  normally.
 - When visible deferred tools exist, Core reserves and materializes one `execute` tool. Grouped deferred tools become
  CodeMode namespaces instead of flattened model-facing names.
- Nested calls execute the registered `Tool` values captured for the model request; later registrations affect later
-  requests.
+- Each nested call checks that its captured registration is still current before dispatching it.
 - Authorization and side-effect ordering remain responsibilities of the leaf tool. Catalog visibility is not execution
  authorization.
 - Structured child output enters the interpreter. File parts are collected host-side and attached to the outer result.
@@ -138,18 +126,18 @@ represent accurately rather than guessing semantics.

 ## Decisions and Rationale

-| Decision                                                     | Rationale                                                                                                                                                                                                                |
-| ------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Keep an owned tree-walking interpreter.                      | The product need is bounded tool orchestration, not arbitrary JavaScript. Owning the language surface keeps authority and behavior explicit.                                                                             |
-| Treat schemas as the model-facing interface.                 | Signatures drive correct calls; Effect Schema also provides the runtime validation boundary, while JSON Schema supports adapter interoperability.                                                                        |
-| Keep authority host-owned.                                   | CodeMode can only confine programs to supplied tools. The host chooses those tools, and each tool enforces its own authorization and side-effect policy.                                                                 |
-| Use progressive catalog disclosure plus search.              | Large tool sets should not consume the prompt, but every namespace must remain discoverable and speculative search calls should remain valid.                                                                            |
-| Start promises eagerly and supervise them for the execution. | This preserves normal call-time parallelism and run-once settlement while allowing pending work to be interrupted when the program returns.                                                                              |
-| Keep files outside the sandbox value space.                  | Models should compose structured data without routing binary payloads through generated code or context.                                                                                                                 |
-| Treat `execute` as the model-facing invocation boundary.     | Nested calls are implementation details of one orchestration program. Reusing the outer context and bounding only the final result preserves complete intermediate data without inventing durable child-call identities. |
-| Return expected failures as data.                            | Models need actionable diagnostics without exposing private host causes; host interruption and defects must still propagate correctly.                                                                                   |
-| Leave execution-limit defaults to hosts.                     | Appropriate budgets depend on the surrounding product and its own cancellation, retention, and output-bounding policies.                                                                                                 |
-| Skip unsupported OpenAPI operations.                         | Incorrect parameter encoding, authentication, or transport behavior is worse than a precise `skipped` reason.                                                                                                            |
+| Decision | Rationale |
+| --- | --- |
+| Keep an owned tree-walking interpreter. | The product need is bounded tool orchestration, not arbitrary JavaScript. Owning the language surface keeps authority and behavior explicit. |
+| Treat schemas as the model-facing interface. | Signatures drive correct calls; Effect Schema also provides the runtime validation boundary, while JSON Schema supports adapter interoperability. |
+| Keep authority host-owned. | CodeMode can only confine programs to supplied tools. The host chooses those tools, and each tool enforces its own authorization and side-effect policy. |
+| Use progressive catalog disclosure plus search. | Large tool sets should not consume the prompt, but every namespace must remain discoverable and speculative search calls should remain valid. |
+| Start tool promises eagerly and supervise them. | This preserves normal call-time parallelism while giving each call run-once settlement and interruption safety. |
+| Keep files outside the sandbox value space. | Models should compose structured data without routing binary payloads through generated code or context. |
+| Treat `execute` as the model-facing invocation boundary. | Nested calls are implementation details of one orchestration program. Reusing the outer context and bounding only the final result preserves complete intermediate data without inventing durable child-call identities. |
+| Return expected failures as data. | Models need actionable diagnostics without exposing private host causes; host interruption and defects must still propagate correctly. |
+| Leave execution-limit defaults to hosts. | Appropriate budgets depend on the surrounding product and its own cancellation, retention, and output-bounding policies. |
+| Skip unsupported OpenAPI operations. | Incorrect parameter encoding, authentication, or transport behavior is worse than a precise `skipped` reason. |

 ## Remaining Work

@@ -111,15 +111,13 @@ ultimate source of truth.
 - [x] `Promise.resolve` and `Promise.reject`.
 - [x] `Promise.all`, `Promise.allSettled`, and `Promise.race` over supported collections containing promises and plain
      values.
- [x] `Promise.all` preserves result order and rejects on the first observed failure without cancelling siblings.
+- [x] `Promise.all` preserves result order and rejects on the first observed failure.
 - [x] `Promise.allSettled` returns plain fulfilled/rejected outcome records.
- [x] `Promise.race` settles from the first result without cancelling losers at settlement time.
- [x] Real promise values from `Promise.all`, `Promise.allSettled`, and `Promise.race`; separately constructed
-      combinator batches overlap as in normal JavaScript.
- [x] All still-pending work (race losers, fail-fast `Promise.all` stragglers, and un-awaited calls alike) is
-      interrupted when the program returns; rejections that settled un-awaited become `Success.warnings`
-      diagnostics.
+- [x] `Promise.race` interrupts losing in-flight tool calls.
+- [x] Un-awaited calls are drained before execution ends; unhandled failures become diagnostics.
 - [x] `try`/`catch` can handle awaited tool and promise failures.
+- [ ] Real promise values from `Promise.all`, `Promise.allSettled`, and `Promise.race`. These calls currently settle
+      before returning, so separately constructed combinator batches do not overlap as normal JavaScript promises do.
 - [ ] `Promise.any`.
 - [ ] Promise chaining with `.then`, `.catch`, and `.finally`.
 - [ ] Custom promise construction with `new Promise(...)`.
@@ -271,7 +269,7 @@ ultimate source of truth.

 These are actionable implementation items. Check them off only when behavior and direct tests land.

- [x] Return real promises from `Promise.all`, `Promise.allSettled`, and `Promise.race`.
+- [ ] Return real promises from `Promise.all`, `Promise.allSettled`, and `Promise.race`.
 - [ ] Bound pending tool-call admission/allocation in addition to execution concurrency.
 - [ ] Guarantee every advertised tool path is executable, including dotted and blocked path segments.
 - [ ] Define safe outbound handling for non-finite numbers and `undefined` so invalid values cannot silently become
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/codemode",
-  "version": "1.17.18",
+  "version": "1.17.15",
  "description": "Effect-native confined code execution over schema-described tools",
  "private": true,
  "type": "module",
@@ -13,17 +13,11 @@ export type { ToolCall, ToolCallEnded, ToolCallHooks, ToolCallStarted, ToolDescr

 /** Resource budgets enforced independently during each CodeMode program execution. */
 export type ExecutionLimits = {
-  /**
-   * Wall-clock milliseconds before execution is interrupted; result delivery additionally
-   * waits for tool interruption cleanup. No default: absent means no timeout.
-   */
+  /** Maximum wall-clock execution time in milliseconds. No default: absent means no timeout. */
  readonly timeoutMs?: number
  /** Maximum number of tool calls admitted by the runtime. No default: absent means unlimited. */
  readonly maxToolCalls?: number
-  /**
-   * Maximum UTF-8 bytes retained from the result value and logs; warnings have a separate
-   * budget of the same size. Fixed truncation notices and host formatting are additional.
-   */
+  /** Maximum UTF-8 bytes of model-facing output. No default: absent means no truncation. */
  readonly maxOutputBytes?: number
 }

@@ -81,9 +75,8 @@ export const DiagnosticKind = Schema.Literals([
  "TimeoutExceeded",
  "ToolFailure",
  "ExecutionFailure",
-  "Truncated",
 ])
-/** Stable categories produced by program, schema, tool, limit, and truncation diagnostics. */
+/** Stable categories produced by program, schema, tool, and limit failures. */
 export type DiagnosticKind = typeof DiagnosticKind.Type

 export const Diagnostic = Schema.Struct({
@@ -99,8 +92,6 @@ const ToolCallSchema = Schema.Struct({ name: Schema.String })
 export const Success = Schema.Struct({
  ok: Schema.Literal(true),
  value: Schema.Json,
-  // Runtime-authored non-fatal diagnostics; program console output stays in `logs`.
-  warnings: Schema.optionalKey(Schema.Array(Diagnostic)),
  logs: Schema.optionalKey(Schema.Array(Schema.String)),
  truncated: Schema.optionalKey(Schema.Boolean),
  toolCalls: Schema.Array(ToolCallSchema),
@@ -1,5 +1,5 @@
 import { parse } from "acorn"
-import { Cause, Effect, Exit, Fiber, Scope, Semaphore } from "effect"
+import { Cause, Effect, Exit, Fiber, Semaphore } from "effect"
 import { DiagnosticCategory, ModuleKind, ScriptTarget, flattenDiagnosticMessageText, transpileModule } from "typescript"
 import {
  copyIn,
@@ -219,7 +219,7 @@ const normalizeError = (error: unknown): Diagnostic => {
  }
 }

-// Shared by catch bindings and Promise.allSettled rejection reasons.
+// Shared by catch bindings, Promise.allSettled rejection reasons, and Promise.race losers.
 const caughtErrorValue = (thrown: unknown): unknown => {
  if (thrown instanceof ProgramThrow) return thrown.value
  if (thrown instanceof InterpreterRuntimeError) return createErrorValue(thrown.errorName, thrown.message)
@@ -611,80 +611,6 @@ const collectPatternNames = (pattern: AstNode, out: Array<string> = []): Array<s
  return out
 }

-// Promise work lives until the program returns, while observation only controls whether a
-// settled rejection is reported. Neither extends execution: completion interrupts all work.
-class PromiseRuntime<R> {
-  private readonly active = new Set<SandboxPromise>()
-  private readonly ids = new WeakMap<SandboxPromise, number>()
-  private readonly observed = new WeakSet<SandboxPromise>()
-  private readonly failures = new Map<number, Diagnostic>()
-  private nextID = 0
-
-  constructor(private readonly scope: Scope.Scope) {}
-
-  create(effect: Effect.Effect<unknown, unknown, R>): Effect.Effect<SandboxPromise, never, R> {
-    return Effect.suspend(() => {
-      // Allocated at execution time (not construction) so re-run effects cannot share an id,
-      // and before the fork so diagnostics order by creation: a forked body that immediately
-      // creates promises of its own must sequence after its creator.
-      const id = this.nextID++
-      return Effect.map(Effect.forkIn(effect, this.scope, { startImmediately: true }), (fiber) => {
-        const promise = new SandboxPromise(fiber)
-        this.active.add(promise)
-        this.ids.set(promise, id)
-        fiber.addObserver((exit) => {
-          this.active.delete(promise)
-          if (Exit.isSuccess(exit) || Cause.hasInterruptsOnly(exit.cause) || this.observed.has(promise)) {
-            this.ids.delete(promise)
-            return
-          }
-          const failure = normalizeError(Cause.squash(exit.cause))
-          this.failures.set(id, {
-            ...failure,
-            message: `Unhandled rejection from an un-awaited promise: ${failure.message}`,
-          })
-        })
-        return promise
-      })
-    })
-  }
-
-  // Synchronous on purpose: JS makes a promise "handled" the moment a construct takes
-  // responsibility for it (await, or membership in a combinator call), not when the
-  // consuming fiber later runs. Call sites must invoke this at that moment.
-  markObserved(promise: SandboxPromise): void {
-    this.observed.add(promise)
-    const id = this.ids.get(promise)
-    this.ids.delete(promise)
-    if (id !== undefined) this.failures.delete(id)
-  }
-
-  // Pure settlement subscription: never re-runs work and never affects rejection reporting.
-  await(promise: SandboxPromise): Effect.Effect<Exit.Exit<unknown, unknown>> {
-    return Fiber.await(promise.fiber)
-  }
-
-  // Unobserved rejections that already settled, in creation order.
-  diagnostics(): Array<Diagnostic> {
-    return [...this.failures].sort(([left], [right]) => left - right).map(([, failure]) => failure)
-  }
-
-  // Normal-completion lifecycle: interrupts everything still running and reports the
-  // rejections that already settled un-awaited. interruptAll signals every fiber
-  // synchronously before awaiting termination, so no straggler can spawn new work between
-  // interrupts; the loop re-checks as a backstop because a straggler can create promises
-  // before its interrupt lands.
-  interrupt(): Effect.Effect<Array<Diagnostic>> {
-    const self = this
-    return Effect.gen(function* () {
-      while (self.active.size > 0) {
-        yield* Fiber.interruptAll([...self.active].map((promise) => promise.fiber))
-      }
-      return self.diagnostics()
-    })
-  }
-}
-
 class Interpreter<R> {
  private scopes: Array<Map<string, Binding>>
  private readonly invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>
@@ -694,22 +620,24 @@ class Interpreter<R> {
  private readonly logs: Array<string>
  // Caps how many eagerly forked tool calls run at once (the parallel-call concurrency cap).
  private readonly callPermits: Semaphore.Semaphore
-  private readonly promises: PromiseRuntime<R>
+  // Fiber-backed promises whose settlement no program construct has observed yet. Successful
+  // program completion drains these (like a runtime waiting on in-flight work at exit) and
+  // surfaces a never-awaited failure as an unhandled-rejection diagnostic.
+  private readonly pendingSettlements: Set<SandboxPromise>

  constructor(
    invokeTool: (path: ReadonlyArray<string>, args: Array<unknown>) => Effect.Effect<unknown, unknown, R>,
    toolKeys: (path: ReadonlyArray<string>) => ReadonlyArray<string>,
-    promises: PromiseRuntime<R>,
    logs: Array<string> = [],
-    callPermits: Semaphore.Semaphore = Semaphore.makeUnsafe(TOOL_CALL_CONCURRENCY),
+    shared?: { callPermits: Semaphore.Semaphore; pendingSettlements: Set<SandboxPromise> },
  ) {
    const globalScope = new Map<string, Binding>()
    this.scopes = [globalScope]
    this.invokeTool = invokeTool
    this.toolKeys = toolKeys
    this.logs = logs
-    this.callPermits = callPermits
-    this.promises = promises
+    this.callPermits = shared?.callPermits ?? Semaphore.makeUnsafe(TOOL_CALL_CONCURRENCY)
+    this.pendingSettlements = shared?.pendingSettlements ?? new Set<SandboxPromise>()
    globalScope.set("tools", { mutable: false, value: new ToolReference([]) })
    globalScope.set("Promise", { mutable: false, value: new PromiseNamespace() })
    globalScope.set("undefined", { mutable: false, value: undefined })
@@ -775,12 +703,36 @@ class Interpreter<R> {
      // resolves before crossing the data boundary - `return tools.ns.tool(...)` works
      // without an explicit await, exactly as in JS.
      if (value instanceof SandboxPromise) value = yield* self.settlePromise(value)
+      yield* self.drainPendingSettlements()
      return value
    }).pipe(Effect.ensuring(Effect.sync(() => self.popScope())))
  }

-  // Eagerly starts a tool call in the execution's promise scope (so timeout and teardown
-  // interrupt it) gated by the concurrency semaphore, and wraps the fiber in a
+  // Awaits every fiber-backed promise the program abandoned (fire-and-forget tool calls), so
+  // their work completes before the execution ends - mirroring a JS runtime waiting on
+  // in-flight I/O at exit. A failure nobody could have handled becomes an unhandled-rejection
+  // diagnostic (interrupted calls, e.g. Promise.race losers, are ignored).
+  private drainPendingSettlements(): Effect.Effect<void, unknown, never> {
+    const self = this
+    return Effect.gen(function* () {
+      while (self.pendingSettlements.size > 0) {
+        const promise = self.pendingSettlements.values().next().value
+        if (promise === undefined) break
+        const exit = yield* self.observePromise(promise)
+        if (Exit.isSuccess(exit) || Cause.hasInterruptsOnly(exit.cause)) continue
+        const failure = normalizeError(Cause.squash(exit.cause))
+        throw new InterpreterRuntimeError(
+          `Unhandled rejection from an un-awaited promise: ${failure.message}`,
+          undefined,
+          failure.kind,
+          ["Await promises so failures can be caught and handled."],
+        )
+      }
+    })
+  }
+
+  // Eagerly starts a tool call on a supervised child fiber (so the execution timeout and
+  // scope teardown interrupt it) gated by the concurrency semaphore, and wraps the fiber in a
  // first-class promise value. `startImmediately` makes the runtime admit the call - charging
  // the tool-call budget and firing onToolCallStart - at the call site, before any await.
  private createToolCallPromise(
@@ -791,20 +743,46 @@ class Interpreter<R> {
  }

  private createPromise(effect: Effect.Effect<unknown, unknown, R>): Effect.Effect<SandboxPromise, never, R> {
-    return this.promises.create(effect)
+    return Effect.map(Effect.forkChild(effect, { startImmediately: true }), (fiber) => {
+      const promise = new SandboxPromise(fiber)
+      this.pendingSettlements.add(promise)
+      return promise
+    })
+  }
+
+  // The promise's settlement as an Exit, marking it observed for unhandled-rejection tracking.
+  // Fiber settlement is idempotent, so observing the same promise repeatedly (await twice,
+  // Promise.all([p, p])) never re-runs the underlying call.
+  private observePromise(promise: SandboxPromise): Effect.Effect<Exit.Exit<unknown, unknown>> {
+    this.pendingSettlements.delete(promise)
+    return promise.fiber !== undefined ? Fiber.await(promise.fiber) : Effect.exit(promise.immediate ?? Effect.void)
  }

  // `await promise`: succeed with the fulfilled value or re-raise the failure so try/catch
-  // observes it exactly like a synchronous throw at the await site. Settlement is idempotent
-  // (fiber exits replay), so awaiting the same promise repeatedly never re-runs the call.
-  private settlePromise(promise: SandboxPromise): Effect.Effect<unknown, unknown, never> {
-    const promises = this.promises
-    return Effect.suspend(() => {
-      promises.markObserved(promise)
-      return Effect.flatMap(promises.await(promise), (exit) =>
-        Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause),
+  // observes it exactly like a synchronous throw at the await site.
+  private settlePromise(promise: SandboxPromise, node?: AstNode): Effect.Effect<unknown, unknown, never> {
+    const self = this
+    return Effect.flatMap(this.observePromise(promise), (exit) => self.unwrapPromiseExit(promise, exit, node))
+  }
+
+  private unwrapPromiseExit(
+    promise: SandboxPromise | undefined,
+    exit: Exit.Exit<unknown, unknown>,
+    node?: AstNode,
+  ): Effect.Effect<unknown, unknown> {
+    if (Exit.isSuccess(exit)) return Effect.succeed(exit.value)
+    // A call Promise.race interrupted after losing settles as a catchable program failure;
+    // any other interruption is execution teardown (timeout/host) and must keep propagating
+    // as interruption rather than becoming program-visible data.
+    if (promise?.interrupted === true && Cause.hasInterruptsOnly(exit.cause)) {
+      return Effect.fail(
+        new InterpreterRuntimeError(
+          "This tool call was interrupted because another value settled a Promise.race first.",
+          node,
+        ),
      )
-    })
+    }
+    return Effect.failCause(exit.cause)
  }

  private evaluateStatement(node: AstNode): Effect.Effect<StatementResult, unknown, R> {
@@ -1554,7 +1532,7 @@ class Interpreter<R> {
        // matching real JS semantics for non-thenables.
        const self = this
        return Effect.flatMap(this.evaluateExpression(getNode(node, "argument")), (value) =>
-          value instanceof SandboxPromise ? self.settlePromise(value) : Effect.succeed(value),
+          value instanceof SandboxPromise ? self.settlePromise(value, node) : Effect.succeed(value),
        )
      }
      case "NewExpression":
@@ -2221,116 +2199,145 @@ class Interpreter<R> {

  // Promise.* over ordinary runtime values. Combinators accept ANY array (or spreadable
  // collection) mixing promise values and plain data - built inline, beforehand, via spread,
-  // whatever - because tool calls already run eagerly on their own fibers. Each combinator
-  // returns a real promise whose join runs on its own scope-owned fiber, observing member
-  // settlements; the concurrency cap stays where the work is: the fork semaphore.
+  // whatever - because tool calls already run eagerly on their own fibers; the combinators
+  // only observe settlements. Joining is therefore sequential (no extra fibers) without
+  // costing parallelism, and the concurrency cap stays where the work is: the fork semaphore.
  private invokePromiseMethod(
    ref: PromiseMethodReference,
    args: Array<unknown>,
    node: AstNode,
  ): Effect.Effect<unknown, unknown, R> {
+    const self = this
    if (ref.name === "resolve") {
      // Promise.resolve of a promise is that promise (JS flattens); anything else is a
-      // promise already fulfilled with the value. Pre-settled values still fork a scope-owned
-      // fiber so every promise shares one lifecycle (an abandoned reject is reported, teardown
-      // is uniform).
+      // promise already fulfilled with the value.
      const value = args[0]
-      return value instanceof SandboxPromise ? Effect.succeed(value) : this.createPromise(Effect.succeed(value))
+      return Effect.succeed(
+        value instanceof SandboxPromise ? value : new SandboxPromise(undefined, Effect.succeed(value)),
+      )
    }
    if (ref.name === "reject") {
-      return this.createPromise(Effect.fail(new ProgramThrow(args[0])))
+      return Effect.sync(() => new SandboxPromise(undefined, Effect.fail(new ProgramThrow(args[0]))))
    }

    const items = Array.isArray(args[0]) ? args[0] : spreadItems(args[0])
    if (items === undefined) {
-      return this.createPromise(
-        Effect.fail(
-          new InterpreterRuntimeError(
-            `Promise.${ref.name} expects an array of promises or plain values (e.g. Promise.${ref.name}(items.map((item) => tools.ns.tool(item)))).`,
-            node,
-          ),
-        ),
+      throw new InterpreterRuntimeError(
+        `Promise.${ref.name} expects an array of promises or plain values (e.g. Promise.${ref.name}(items.map((item) => tools.ns.tool(item)))).`,
+        node,
      )
    }

-    // JS makes combinator members "handled" synchronously at the call - their rejections
-    // belong to the aggregate from this moment, even ones settling before it runs.
-    for (const item of items) {
-      if (item instanceof SandboxPromise) this.promises.markObserved(item)
-    }
-
    switch (ref.name) {
      case "all": {
-        // Each observation re-raises its member's failure, so Effect.all rejects on the first
-        // failure without waiting for the rest and preserves input order when all fulfill.
-        // Its failure-time interruption only unsubscribes the sibling waiters: the underlying
-        // fibers stay execution-owned and keep running, as in JS.
-        const observations = items.map((item) =>
+        // Mark every promise element observed up-front (Promise.all handles all of its
+        // members' failures, as in JS), race their settlements for fail-fast rejection, and
+        // preserve input order when they all fulfill. Rejected calls keep draining siblings.
+        const observations = items.map((item, index) =>
          item instanceof SandboxPromise
-            ? Effect.flatMap(this.promises.await(item), (exit) =>
-                Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause),
-              )
-            : Effect.succeed(item),
+            ? Effect.map(this.observePromise(item), (exit) => ({ index, item, exit }))
+            : Effect.succeed({ index, item: undefined, exit: Exit.succeed(item) }),
        )
-        return this.createPromise(Effect.all(observations, { concurrency: "unbounded" }))
+        return Effect.gen(function* () {
+          const remaining = [...observations]
+          const values: Array<unknown> = []
+          values.length = items.length
+          while (remaining.length > 0) {
+            const winner = yield* Effect.raceAll(remaining)
+            const position = remaining.indexOf(observations[winner.index])
+            if (position >= 0) remaining.splice(position, 1)
+            if (Exit.isSuccess(winner.exit)) {
+              values[winner.index] = winner.exit.value
+              continue
+            }
+            yield* self.createPromise(
+              Effect.asVoid(
+                Effect.forEach(
+                  items,
+                  (item) => (item instanceof SandboxPromise ? self.observePromise(item) : Effect.void),
+                  { concurrency: "unbounded" },
+                ),
+              ),
+            )
+            return yield* self.unwrapPromiseExit(winner.item, winner.exit, node)
+          }
+          return values
+        })
      }
      case "allSettled": {
        const observations = items.map((item) =>
-          item instanceof SandboxPromise ? this.promises.await(item) : Effect.succeed(Exit.succeed(item as unknown)),
+          item instanceof SandboxPromise
+            ? Effect.map(this.observePromise(item), (exit) => ({ promise: item as SandboxPromise | undefined, exit }))
+            : Effect.succeed({ promise: undefined as SandboxPromise | undefined, exit: Exit.succeed(item as unknown) }),
        )
-        return this.createPromise(
-          Effect.gen(function* () {
-            const outcomes: Array<unknown> = []
-            for (const observation of observations) {
-              const exit = yield* observation
-              if (Exit.isSuccess(exit)) {
-                outcomes.push(
-                  Object.assign(Object.create(null) as SafeObject, { status: "fulfilled", value: exit.value }),
-                )
-                continue
-              }
-              if (Cause.hasInterruptsOnly(exit.cause)) {
-                // Execution teardown (timeout/host interruption), not a program-level rejection.
-                return yield* Effect.failCause(exit.cause)
-              }
+        return Effect.gen(function* () {
+          const outcomes: Array<unknown> = []
+          for (const observation of observations) {
+            const { exit, promise } = yield* observation
+            if (Exit.isSuccess(exit)) {
              outcomes.push(
-                Object.assign(Object.create(null) as SafeObject, {
-                  status: "rejected",
-                  reason: caughtErrorValue(Cause.squash(exit.cause)),
-                }),
+                Object.assign(Object.create(null) as SafeObject, { status: "fulfilled", value: exit.value }),
              )
+              continue
            }
-            return outcomes
-          }),
-        )
+            const raceInterrupted = promise?.interrupted === true && Cause.hasInterruptsOnly(exit.cause)
+            if (Cause.hasInterruptsOnly(exit.cause) && !raceInterrupted) {
+              // Execution teardown (timeout/host interruption), not a program-level rejection.
+              return yield* Effect.failCause(exit.cause)
+            }
+            const thrown = raceInterrupted
+              ? new InterpreterRuntimeError(
+                  "This tool call was interrupted because another value settled a Promise.race first.",
+                  node,
+                )
+              : Cause.squash(exit.cause)
+            outcomes.push(
+              Object.assign(Object.create(null) as SafeObject, {
+                status: "rejected",
+                reason: caughtErrorValue(thrown),
+              }),
+            )
+          }
+          return outcomes
+        })
      }
      case "race": {
        if (items.length === 0) {
-          return this.createPromise(
-            Effect.fail(
-              new InterpreterRuntimeError(
-                "Promise.race([]) would never settle; provide at least one promise or value.",
-                node,
-              ),
-            ),
+          throw new InterpreterRuntimeError(
+            "Promise.race([]) would never settle; provide at least one promise or value.",
+            node,
          )
        }
-        const observations = items.map((item) =>
-          item instanceof SandboxPromise ? this.promises.await(item) : Effect.succeed(Exit.succeed(item as unknown)),
-        )
-        // First settlement (fulfilled OR rejected) wins; losing work stays execution-owned
-        // and is interrupted at normal completion (already observed) or by teardown.
-        return this.createPromise(
-          Effect.flatMap(Effect.raceAll(observations), (exit) =>
-            Exit.isSuccess(exit) ? Effect.succeed(exit.value) : Effect.failCause(exit.cause),
-          ),
+        const observations = items.map((item, index) =>
+          item instanceof SandboxPromise
+            ? Effect.map(this.observePromise(item), (exit) => ({ index, exit }))
+            : Effect.succeed({ index, exit: Exit.succeed(item as unknown) }),
        )
+        return Effect.gen(function* () {
+          // First settlement (fulfilled OR rejected) wins; the observations never fail, so
+          // racing them yields exactly that. Losing in-flight calls are then interrupted.
+          const winner = yield* Effect.raceAll(observations)
+          for (const [index, item] of items.entries()) {
+            if (index === winner.index || !(item instanceof SandboxPromise) || item.fiber === undefined) continue
+            item.interrupted = true
+            yield* Fiber.interrupt(item.fiber)
+          }
+          const winningItem = items[winner.index]
+          return yield* self.unwrapPromiseExit(
+            winningItem instanceof SandboxPromise ? winningItem : undefined,
+            winner.exit,
+            node,
+          )
+        })
      }
    }
  }

  private invokeFunction(fn: CodeModeFunction, args: Array<unknown>): Effect.Effect<unknown, unknown, R> {
-    const invocation = new Interpreter(this.invokeTool, this.toolKeys, this.promises, this.logs, this.callPermits)
+    const invocation = new Interpreter(this.invokeTool, this.toolKeys, this.logs, {
+      callPermits: this.callPermits,
+      pendingSettlements: this.pendingSettlements,
+    })
    invocation.scopes = [...fn.capturedScopes, new Map<string, Binding>()]
    const run = Effect.gen(function* () {
      // Seed every parameter name into the scope as a TDZ slot first, so a default that
@@ -3477,109 +3484,68 @@ export const executeWithLimits = <const Tools extends Record<string, unknown>>(
  limits: ResolvedExecutionLimits,
  searchIndex: ToolRuntime.DiscoveryPlan["searchIndex"],
 ): Effect.Effect<Result, never, Services<Tools>> => {
+  const hooks = {
+    ...(options.onToolCallStart === undefined ? {} : { onToolCallStart: options.onToolCallStart }),
+    ...(options.onToolCallEnd === undefined ? {} : { onToolCallEnd: options.onToolCallEnd }),
+  }
+  const tools = ToolRuntime.make(
+    (options.tools ?? {}) as HostTools<Services<Tools>>,
+    limits.maxToolCalls,
+    searchIndex,
+    hooks,
+  )
+  const logs: Array<string> = []
+  const logged = () => (logs.length > 0 ? { logs: [...logs] } : {})
+
  if (options.code.trim().length === 0) {
    return Effect.succeed({
      ok: false,
      error: { kind: "ParseError", message: "Code cannot be empty." },
-      toolCalls: [],
+      toolCalls: tools.calls,
    })
  }

-  // Suspended so all per-execution state - tool-call admission budget and audit list, logs,
-  // and the timeout path's completed value - binds at run time: a reused Effect must start
-  // from a clean slate instead of observing a previous run's state.
-  return Effect.suspend(() => {
-    const hooks = {
-      ...(options.onToolCallStart === undefined ? {} : { onToolCallStart: options.onToolCallStart }),
-      ...(options.onToolCallEnd === undefined ? {} : { onToolCallEnd: options.onToolCallEnd }),
-    }
-    const tools = ToolRuntime.make(
-      (options.tools ?? {}) as HostTools<Services<Tools>>,
-      limits.maxToolCalls,
-      searchIndex,
-      hooks,
-    )
-    const logs: Array<string> = []
-    const logged = () => (logs.length > 0 ? { logs: [...logs] } : {})
-    // Set once the program body returned and its value crossed the data boundary, so a timeout
-    // firing during leftover interruption reports "completed with interrupted background work"
-    // instead of discarding the computed value as a plain timeout.
-    let returned: { value: DataValue; promises: PromiseRuntime<Services<Tools>> } | undefined
-
-    const base = Effect.acquireUseRelease(
-      Scope.make("parallel"),
-      (scope) =>
-        Effect.gen(function* () {
-          const program = parseProgram(options.code)
-          const promises = new PromiseRuntime<Services<Tools>>(scope)
-          const interpreter = new Interpreter<Services<Tools>>(tools.invoke, tools.keys, promises, logs)
-          const value = yield* interpreter.run(program)
-          // Validate the result first so an invalid value is a fatal completion that closes
-          // the promise scope directly instead of taking the normal-completion path.
-          const result = copyOut(copyIn(value, "Execution result"), true) as DataValue
-          returned = { value: result, promises }
-          const warnings = yield* promises.interrupt()
-          return {
-            ok: true,
-            value: result,
-            ...(warnings.length > 0 ? { warnings } : {}),
+  const operation = Effect.gen(function* () {
+    const program = parseProgram(options.code)
+    const interpreter = new Interpreter<Services<Tools>>(tools.invoke, tools.keys, logs)
+    const value = yield* interpreter.run(program)
+    const result = copyOut(copyIn(value, "Execution result"), true) as DataValue
+    return {
+      ok: true,
+      value: result,
+      ...logged(),
+      toolCalls: tools.calls,
+    } satisfies Result
+  }).pipe((program) => {
+    const timeoutMs = limits.timeoutMs
+    if (timeoutMs === undefined) return program
+    return program.pipe(
+      Effect.timeoutOrElse({
+        duration: timeoutMs,
+        orElse: () =>
+          Effect.succeed({
+            ok: false,
+            error: { kind: "TimeoutExceeded", message: `Execution timed out after ${timeoutMs}ms.` },
            ...logged(),
            toolCalls: tools.calls,
-          } satisfies Result
-        }),
-      (scope, exit) => Scope.close(scope, exit),
-    )
-    const timeoutMs = limits.timeoutMs
-    const operation =
-      timeoutMs === undefined
-        ? base
-        : base.pipe(
-            Effect.timeoutOrElse({
-              duration: timeoutMs,
-              orElse: () =>
-                Effect.sync(() => {
-                  if (returned === undefined) {
-                    return {
-                      ok: false,
-                      error: { kind: "TimeoutExceeded", message: `Execution timed out after ${timeoutMs}ms.` },
-                      ...logged(),
-                      toolCalls: tools.calls,
-                    } satisfies Result
-                  }
-                  // The timeout warning leads so byte-budget truncation cuts it last.
-                  return {
-                    ok: true,
-                    value: returned.value,
-                    warnings: [
-                      {
-                        kind: "TimeoutExceeded",
-                        message: `The program returned, but background work was still running at the ${timeoutMs}ms timeout and was interrupted. Await all started promises.`,
-                      },
-                      ...returned.promises.diagnostics(),
-                    ],
-                    ...logged(),
-                    toolCalls: tools.calls,
-                  } satisfies Result
-                }),
-            }),
-          )
-
-    return operation.pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause)
-          ? Effect.interrupt
-          : Effect.succeed({
-              ok: false,
-              error: normalizeError(Cause.squash(cause)),
-              ...logged(),
-              toolCalls: tools.calls,
-            } satisfies Result),
-      ),
-      Effect.map((result) =>
-        limits.maxOutputBytes === undefined ? result : boundOutput(result, limits.maxOutputBytes),
-      ),
+          } satisfies Result),
+      }),
    )
  })
+
+  return operation.pipe(
+    Effect.catchCause((cause) =>
+      Cause.hasInterruptsOnly(cause)
+        ? Effect.interrupt
+        : Effect.succeed({
+            ok: false,
+            error: normalizeError(Cause.squash(cause)),
+            ...logged(),
+            toolCalls: tools.calls,
+          } satisfies Result),
+    ),
+    Effect.map((result) => (limits.maxOutputBytes === undefined ? result : boundOutput(result, limits.maxOutputBytes))),
+  )
 }

 const utf8ByteLength = (value: string): number => new TextEncoder().encode(value).byteLength
@@ -3594,10 +3560,9 @@ const utf8Truncate = (value: string, maxBytes: number): string => {
 }

 /**
- * Bounds retained program payload bytes (serialized result value and logs) to `maxOutputBytes`.
- * Warning diagnostics are bounded by a separate budget of the same size so a large value can
- * never starve runtime-authored diagnostics. Fixed truncation notices are added outside those
- * budgets, as is any framing added when a host renders the structured result. Truncation never
+ * Bounds the model-facing output (serialized result value plus logs) to `maxOutputBytes`.
+ * Oversized values are replaced by their truncated serialized text with an explanatory marker,
+ * and logs are kept from the start until the remaining budget is exhausted. Truncation never
 * fails the execution; `truncated: true` marks affected results. Only runs when the host set
 * `maxOutputBytes` - with the limit absent, output passes through unbounded.
 */
@@ -3619,23 +3584,6 @@ const boundOutput = (result: Result, maxOutputBytes: number): Result => {
    }
  }

-  const warnings = result.ok ? (result.warnings ?? []) : []
-  const keptWarnings: Array<Diagnostic> = []
-  let warningBytes = 0
-  for (const warning of warnings) {
-    const bytes = utf8ByteLength(JSON.stringify(warning)) + 1
-    if (warningBytes + bytes > maxOutputBytes) break
-    warningBytes += bytes
-    keptWarnings.push(warning)
-  }
-  if (keptWarnings.length < warnings.length) {
-    truncated = true
-    keptWarnings.push({
-      kind: "Truncated",
-      message: `${warnings.length - keptWarnings.length} additional warnings omitted by the output limit.`,
-    })
-  }
-
  const logs = result.logs ?? []
  const kept: Array<string> = []
  const logBudget = Math.max(0, maxOutputBytes - valueBytes)
@@ -3652,16 +3600,8 @@ const boundOutput = (result: Result, maxOutputBytes: number): Result => {
  }

  if (!truncated) return result
-  const warningsPart = keptWarnings.length > 0 ? { warnings: keptWarnings } : {}
  const logsPart = kept.length > 0 ? { logs: kept } : {}
  return result.ok
-    ? {
-        ok: true,
-        value,
-        ...warningsPart,
-        ...logsPart,
-        truncated: true,
-        toolCalls: result.toolCalls,
-      }
+    ? { ok: true, value, ...logsPart, truncated: true, toolCalls: result.toolCalls }
    : { ok: false, error: result.error, ...logsPart, truncated: true, toolCalls: result.toolCalls }
 }
@@ -602,7 +602,6 @@ export const prepare = <R>(tools: HostTools<R>, catalogBudget = defaultCatalogBu
        "- Filter, aggregate, and transform collections in code - never return them raw or call a tool per item across messages.",
        "- A result typed `Promise<unknown>` may be structured data or text. Before reading fields, check that it is a non-null object and not an array; otherwise handle the returned text or primitive directly.",
        '- Run independent calls in parallel: `await Promise.all(items.map((item) => tools.<namespace>.<tool>(item)))`, or use `tools.<namespace>["tool-name"](item)` when the listed signature uses bracket notation.',
-        "- Execution ends when the program returns; pending promises are interrupted, so await every call whose completion matters.",
        "- `Object.keys(tools)` lists namespaces; `Object.keys(tools.<namespace>)` lists its tools; `for...in` works on both.",
        ...(complete
          ? []
@@ -1,7 +1,11 @@
-import type { Fiber } from "effect"
+import type { Effect, Fiber } from "effect"

 export class SandboxPromise {
-  constructor(readonly fiber: Fiber.Fiber<unknown, unknown>) {}
+  interrupted = false
+  constructor(
+    readonly fiber: Fiber.Fiber<unknown, unknown> | undefined,
+    readonly immediate?: Effect.Effect<unknown, unknown>,
+  ) {}
 }

 export class SandboxDate {
@@ -506,26 +506,6 @@ describe("CodeMode public contract", () => {
    expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(reusable)))).toStrictEqual(reusable)
  })

-  test("a reused execution Effect starts from a clean slate", async () => {
-    const echo = Tool.make({
-      description: "echo",
-      input: Schema.Struct({}),
-      output: Schema.Number,
-      run: () => Effect.succeed(1),
-    })
-    const effect = CodeMode.execute({
-      tools: { host: { echo } },
-      code: `console.log("hi"); return await tools.host.echo({})`,
-      limits: { maxToolCalls: 1 },
-    })
-    const first = await Effect.runPromise(effect)
-    const second = await Effect.runPromise(effect)
-    // Per-execution state (tool-call budget and audit list, logs, timeout bookkeeping) must
-    // bind at run time, so the second run neither exhausts the budget nor leaks run 1's logs.
-    expect(first).toStrictEqual(second)
-    expect(second).toStrictEqual({ ok: true, value: 1, logs: ["hi"], toolCalls: [{ name: "host.echo" }] })
-  })
-
  test("inlines a COMPLETE small catalog and keeps search registered but unadvertised", async () => {
    const runtime = CodeMode.make({ tools })
    expect(runtime.catalog()).toStrictEqual([
@@ -1,906 +0,0 @@
-/*
- * Portions adapted from Test262 at revision 250f204f23a9249ff204be2baec29600faae7b75.
- * Every test names its upstream source; test.failing cases are executable conformance
- * targets for intended Promise behavior that CodeMode does not implement yet.
- *
- * Copyright 2014 Cubane Canada, Inc. All rights reserved.
- * Copyright 2015 Microsoft Corporation. All rights reserved.
- * Copyright 2016 Microsoft, Inc. All rights reserved.
- * Copyright 2017 Caitlin Potter. All rights reserved.
- * Copyright (C) 2016-2020 the V8 project authors. All rights reserved.
- * Copyright (C) 2018-2020 Rick Waldron. All rights reserved.
- * Copyright (C) 2019 Leo Balter. All rights reserved.
- * Test262 portions are governed by the BSD license in LICENSE.test262.
- */
-import { describe, expect, test } from "bun:test"
-import { Effect } from "effect"
-import { CodeMode } from "../src/index.js"
-
-const execute = (code: string) =>
-  Effect.runPromise(CodeMode.execute({ code, tools: {}, limits: { timeoutMs: 1_000 } }))
-
-const value = async (code: string) => {
-  const result = await execute(code)
-  if (!result.ok) throw new Error(`expected success, got ${result.error.kind}: ${result.error.message}`)
-  return result.value
-}
-
-describe("Test262 Promise statics", () => {
-  test("statics are callable and return promises", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/S25.4.4.1_A1.1_T1.js
-    // test/built-ins/Promise/allSettled/is-function.js
-    // test/built-ins/Promise/allSettled/returns-promise.js
-    // test/built-ins/Promise/race/S25.4.4.3_A1.1_T1.js
-    // test/built-ins/Promise/resolve/S25.4.4.5_A1.1_T1.js
-    // test/built-ins/Promise/reject/S25.4.4.4_A1.1_T1.js
-    expect(
-      await value(`
-        const values = [
-          Promise.all([]),
-          Promise.allSettled([]),
-          Promise.race([undefined]),
-          Promise.resolve(),
-          Promise.reject(),
-        ]
-        const callable = [
-          typeof Promise.all,
-          typeof Promise.allSettled,
-          typeof Promise.race,
-          typeof Promise.resolve,
-          typeof Promise.reject,
-        ]
-        try { await values[4] } catch {}
-        return [callable, values.map((item) => item instanceof Promise)]
-      `),
-    ).toEqual([
-      ["function", "function", "function", "function", "function"],
-      [true, true, true, true, true],
-    ])
-  })
-
-  test("Promise.all returns fresh arrays for empty and settled inputs", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/S25.4.4.1_A2.1_T1.js
-    // test/built-ins/Promise/all/S25.4.4.1_A2.3_T1.js
-    // test/built-ins/Promise/all/S25.4.4.1_A2.3_T2.js
-    // test/built-ins/Promise/all/S25.4.4.1_A2.3_T3.js
-    // test/built-ins/Promise/all/S25.4.4.1_A7.1_T1.js
-    expect(
-      await value(`
-        const input = []
-        const emptyPromise = Promise.all(input)
-        const empty = await emptyPromise
-        const onePromise = Promise.all([Promise.resolve(3)])
-        const one = await onePromise
-        return [
-          emptyPromise instanceof Promise,
-          empty instanceof Array,
-          empty.length,
-          empty !== input,
-          onePromise instanceof Promise,
-          one instanceof Array,
-          one.length,
-          one[0],
-        ]
-      `),
-    ).toEqual([true, true, 0, true, true, true, 1, 3])
-  })
-
-  test("Promise.all adopts values and preserves input order and identity", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/resolve-non-thenable.js
-    // test/built-ins/Promise/all/S25.4.4.1_A8.2_T1.js
-    // test/built-ins/Promise/all/S25.4.4.1_A8.2_T2.js
-    const result = await value(`
-      const first = { id: 1 }
-      const second = { id: 2 }
-      const values = await Promise.all([Promise.resolve(3), first, Promise.resolve(second)])
-      const observe = async (promise) => {
-        try { await promise; return "fulfilled" } catch (reason) { return reason }
-      }
-      return [
-        values.length,
-        values[0],
-        values[1] === first,
-        values[2] === second,
-        await observe(Promise.all([Promise.reject(1), Promise.resolve(2)])),
-        await observe(Promise.all([Promise.resolve(1), Promise.reject(2)])),
-      ]
-    `)
-    expect(result).toEqual([3, 3, true, true, 1, 2])
-  })
-
-  test("Promise.allSettled returns fresh arrays and ordered outcome records", async () => {
-    // Sources:
-    // test/built-ins/Promise/allSettled/resolves-empty-array.js
-    // test/built-ins/Promise/allSettled/resolves-to-array.js
-    // test/built-ins/Promise/allSettled/resolved-all-fulfilled.js
-    // test/built-ins/Promise/allSettled/resolved-all-rejected.js
-    // test/built-ins/Promise/allSettled/resolved-all-mixed.js
-    // test/built-ins/Promise/allSettled/resolve-non-thenable.js
-    expect(
-      await value(`
-        const input = []
-        const empty = await Promise.allSettled(input)
-        const reason = { id: 4 }
-        const object = { id: 5 }
-        const outcomes = await Promise.allSettled([
-          Promise.resolve(1),
-          Promise.reject(2),
-          3,
-          Promise.reject(reason),
-          object,
-        ])
-        return [
-          empty instanceof Array,
-          empty.length,
-          empty !== input,
-          outcomes,
-          outcomes[4].value === object,
-          outcomes.map((item) => Object.keys(item)),
-        ]
-      `),
-    ).toEqual([
-      true,
-      0,
-      true,
-      [
-        { status: "fulfilled", value: 1 },
-        { status: "rejected", reason: 2 },
-        { status: "fulfilled", value: 3 },
-        { status: "rejected", reason: { id: 4 } },
-        { status: "fulfilled", value: { id: 5 } },
-      ],
-      true,
-      [
-        ["status", "value"],
-        ["status", "reason"],
-        ["status", "value"],
-        ["status", "reason"],
-        ["status", "value"],
-      ],
-    ])
-  })
-
-  test("Promise.race preserves fulfillment, rejection, and iterable order", async () => {
-    // Sources:
-    // test/built-ins/Promise/race/S25.4.4.3_A6.2_T1.js
-    // test/built-ins/Promise/race/S25.4.4.3_A7.1_T1.js
-    // test/built-ins/Promise/race/S25.4.4.3_A7.2_T1.js
-    // test/built-ins/Promise/race/S25.4.4.3_A7.3_T1.js
-    // test/built-ins/Promise/race/S25.4.4.3_A7.3_T2.js
-    expect(
-      await value(`
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        return await Promise.all([
-          observe(Promise.race([23])),
-          observe(Promise.race([Promise.reject(7)])),
-          observe(Promise.race([Promise.resolve(1), Promise.resolve(2)])),
-          observe(Promise.race([Promise.reject(3), Promise.resolve(4)])),
-        ])
-      `),
-    ).toEqual([
-      ["fulfilled", 23],
-      ["rejected", 7],
-      ["fulfilled", 1],
-      ["rejected", 3],
-    ])
-  })
-
-  test("combinators consume supported string iterables", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/iter-arg-is-string-resolve.js
-    // test/built-ins/Promise/allSettled/iter-arg-is-string-resolve.js
-    // test/built-ins/Promise/race/iter-arg-is-string-resolve.js
-    expect(
-      await value(`
-        return [
-          await Promise.all("abc"),
-          await Promise.allSettled("ab"),
-          await Promise.race("abc"),
-        ]
-      `),
-    ).toEqual([
-      ["a", "b", "c"],
-      [
-        { status: "fulfilled", value: "a" },
-        { status: "fulfilled", value: "b" },
-      ],
-      "a",
-    ])
-  })
-
-  test("Promise.resolve adopts values and preserves sandbox-promise identity", async () => {
-    // Sources:
-    // test/built-ins/Promise/resolve/S25.4.4.5_A2.1_T1.js
-    // test/built-ins/Promise/resolve/resolve-non-obj.js
-    // test/built-ins/Promise/resolve/resolve-non-thenable.js
-    expect(
-      await value(`
-        const object = { id: 1 }
-        const promise = Promise.resolve(1)
-        return [
-          await Promise.resolve(23),
-          await Promise.resolve(Promise.resolve(24)),
-          (await Promise.resolve(object)) === object,
-          [promise].includes(Promise.resolve(promise)),
-        ]
-      `),
-    ).toEqual([23, 24, true, true])
-  })
-
-  test("Promise.reject preserves primitive and object reasons", async () => {
-    // Sources:
-    // test/built-ins/Promise/reject/S25.4.4.4_A2.1_T1.js
-    const result = await value(`
-      const object = { reason: true }
-      const reasons = [undefined, null, false, true, 0, "", 42, object]
-      const observe = async (reason) => {
-        try { await Promise.reject(reason); return false } catch (caught) { return caught === reason }
-      }
-      return await Promise.all(reasons.map(observe))
-    `)
-    expect(result).toEqual([true, true, true, true, true, true, true, true])
-  })
-
-  test("Promise.all resolves duplicate members into every slot", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/invoke-resolve-on-promises-every-iteration-of-promise.js
-    // test/built-ins/Promise/all/invoke-resolve-on-values-every-iteration-of-promise.js
-    // (adapted: CodeMode has no observable Promise.resolve hook, so per-iteration
-    //  handling of a repeated member is asserted through the resolved slots)
-    expect(
-      await value(`
-        const settled = Promise.resolve(3)
-        const computed = (async () => "computed")()
-        return [
-          await Promise.all([settled, settled, settled]),
-          await Promise.all([computed, "plain", computed]),
-        ]
-      `),
-    ).toEqual([
-      [3, 3, 3],
-      ["computed", "plain", "computed"],
-    ])
-  })
-
-  test("Promise.allSettled records duplicate members independently", async () => {
-    // Source: test/built-ins/Promise/allSettled/invoke-resolve-on-promises-every-iteration-of-promise.js
-    // (adapted: per-iteration handling of a repeated member is asserted through the
-    //  outcome records instead of a Promise.resolve hook)
-    expect(
-      await value(`
-        const good = Promise.resolve(1)
-        const bad = Promise.reject(2)
-        return await Promise.allSettled([good, bad, good, bad])
-      `),
-    ).toEqual([
-      { status: "fulfilled", value: 1 },
-      { status: "rejected", reason: 2 },
-      { status: "fulfilled", value: 1 },
-      { status: "rejected", reason: 2 },
-    ])
-  })
-
-  test("combinators adopt members that settled before the call", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/reject-immed.js
-    // test/built-ins/Promise/allSettled/reject-immed.js
-    // test/built-ins/Promise/race/reject-immed.js
-    // (adapted: immediately-rejecting thenables become sandbox promises that settled,
-    //  and were even observed, before the combinator call)
-    expect(
-      await value(`
-        const fulfilled = Promise.resolve("done")
-        const rejected = Promise.reject("failed")
-        try { await rejected } catch {}
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        return [
-          await observe(Promise.all([fulfilled, rejected])),
-          await Promise.allSettled([rejected, fulfilled]),
-          await observe(Promise.race([rejected, fulfilled])),
-        ]
-      `),
-    ).toEqual([
-      ["rejected", "failed"],
-      [
-        { status: "rejected", reason: "failed" },
-        { status: "fulfilled", value: "done" },
-      ],
-      ["rejected", "failed"],
-    ])
-  })
-
-  test("combinator results follow input order, not settlement order", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/resolve-non-thenable.js
-    // test/built-ins/Promise/allSettled/resolved-all-mixed.js
-    // (adapted: members are created, and therefore settle, in reverse of input order;
-    //  deferred settlement is not expressible without host-async work in this corpus)
-    expect(
-      await value(`
-        const third = Promise.resolve("c")
-        const failing = (async () => { throw "b" })()
-        try { await failing } catch {}
-        const second = (async () => "b")()
-        const first = Promise.resolve("a")
-        return [
-          await Promise.all([first, second, third]),
-          await Promise.allSettled([first, failing, third]),
-        ]
-      `),
-    ).toEqual([
-      ["a", "b", "c"],
-      [
-        { status: "fulfilled", value: "a" },
-        { status: "rejected", reason: "b" },
-        { status: "fulfilled", value: "c" },
-      ],
-    ])
-  })
-
-  test("Promise.race ignores a rejected loser once the first contender wins", async () => {
-    // Source: test/built-ins/Promise/race/reject-ignored-immed.js
-    // (adapted: the losing rejection comes from an async function instead of a thenable;
-    //  the exact-equality check also asserts the loser leaves no unhandled-rejection warning)
-    expect(
-      await execute(`
-        const loser = (async () => { throw "lost" })()
-        return await Promise.race([Promise.resolve("won"), loser])
-      `),
-    ).toEqual({ ok: true, value: "won", toolCalls: [] })
-  })
-
-  test("Promise.race([]) returns a promise whose CodeMode failure is catchable", async () => {
-    // Sources:
-    // test/built-ins/Promise/race/S25.4.4.3_A2.1_T1.js
-    // test/built-ins/Promise/race/S25.4.4.3_A5.1_T1.js
-    // (adapted: upstream requires Promise.race([]) to never settle; CodeMode intentionally
-    //  rejects with a catchable diagnostic instead of hanging, so this asserts the sandbox
-    //  divergence rather than the spec never-settles behavior)
-    expect(
-      await value(`
-        const empty = Promise.race([])
-        try {
-          await empty
-          return "settled"
-        } catch (error) {
-          return [empty instanceof Promise, error instanceof Error]
-        }
-      `),
-    ).toEqual([true, true])
-  })
-
-  test("Promise.resolve passes the same sandbox promise through nested chains", async () => {
-    // Source: test/built-ins/Promise/resolve/S25.4.4.5_A2.2_T1.js
-    // (adapted: no executor construction, and identity is observed with Array includes
-    //  because promises are not comparable data values in CodeMode)
-    expect(
-      await value(`
-        const promise = Promise.resolve({ id: 1 })
-        return [
-          [promise].includes(Promise.resolve(promise)),
-          [promise].includes(Promise.resolve(Promise.resolve(promise))),
-          (await Promise.resolve(Promise.resolve(promise))).id,
-        ]
-      `),
-    ).toEqual([true, true, 1])
-  })
-
-  test("Promise.resolve of a rejected promise preserves identity and reason", async () => {
-    // Source: test/built-ins/Promise/resolve/S25.4.4.5_A2.3_T1.js
-    // (adapted: the source promise is already rejected instead of rejected later)
-    expect(
-      await value(`
-        const rejected = Promise.reject("oops")
-        const adopted = Promise.resolve(rejected)
-        const identity = [rejected].includes(adopted)
-        try {
-          await adopted
-          return "fulfilled"
-        } catch (reason) {
-          return [identity, reason]
-        }
-      `),
-    ).toEqual([true, "oops"])
-  })
-
-  test("Promise.reject uses a promise reason without flattening it", async () => {
-    // Sources:
-    // test/built-ins/Promise/reject-via-fn-immed.js
-    // test/built-ins/Promise/reject-via-fn-deferred.js
-    // (adapted: the promise reason goes through Promise.reject instead of executor reject)
-    expect(
-      await value(`
-        const observe = async (reason) => {
-          try {
-            await Promise.reject(reason)
-            return "fulfilled"
-          } catch (caught) {
-            const identity = [reason].includes(caught)
-            try { return [identity, caught instanceof Promise, await caught] }
-            catch (inner) { return [identity, caught instanceof Promise, "rethrew " + inner] }
-          }
-        }
-        return [await observe(Promise.resolve(1)), await observe(Promise.reject("inner"))]
-      `),
-    ).toEqual([
-      [true, true, 1],
-      [true, true, "rethrew inner"],
-    ])
-  })
-})
-
-describe("Test262 async functions and await", () => {
-  test("declaration, expression, and arrow forms return promises", async () => {
-    // Sources:
-    // test/language/statements/async-function/declaration-returns-promise.js
-    // test/language/expressions/async-function/expression-returns-promise.js
-    // test/language/expressions/async-arrow-function/arrow-returns-promise.js
-    expect(
-      await value(`
-        async function declaration() { return 1 }
-        const expression = async function() { return 2 }
-        const arrow = async () => 3
-        const promises = [declaration(), expression(), arrow()]
-        return [promises.map((item) => item instanceof Promise), await Promise.all(promises)]
-      `),
-    ).toEqual([[true, true, true], [1, 2, 3]])
-  })
-
-  test("async bodies adopt returns and reject throws before and after await", async () => {
-    // Sources:
-    // test/language/statements/async-function/evaluation-body.js
-    // test/language/statements/async-function/evaluation-body-that-returns.js
-    // test/language/statements/async-function/evaluation-body-that-returns-after-await.js
-    // test/language/statements/async-function/evaluation-body-that-throws.js
-    // test/language/statements/async-function/evaluation-body-that-throws-after-await.js
-    expect(
-      await value(`
-        const order = []
-        const plain = async () => { order.push("body"); return 42 }
-        const afterAwait = async () => { await Promise.resolve(); return 43 }
-        const throwsBefore = async () => { throw 1 }
-        const throwsAfter = async () => { await Promise.resolve(); throw 2 }
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        const first = plain()
-        return [
-          order,
-          await observe(first),
-          await observe(afterAwait()),
-          await observe(throwsBefore()),
-          await observe(throwsAfter()),
-        ]
-      `),
-    ).toEqual([
-      ["body"],
-      ["fulfilled", 42],
-      ["fulfilled", 43],
-      ["rejected", 1],
-      ["rejected", 2],
-    ])
-  })
-
-  test("default-parameter throws reject instead of escaping the call", async () => {
-    // Source: test/language/statements/async-function/evaluation-default-that-throws.js
-    expect(
-      await value(`
-        const fail = () => { throw new Error("default") }
-        const run = async (value = fail()) => value
-        let returned = false
-        try {
-          const promise = run()
-          returned = promise instanceof Promise
-          await promise
-          return [returned, "fulfilled"]
-        } catch (error) {
-          return [returned, error.message]
-        }
-      `),
-    ).toEqual([true, "default"])
-  })
-
-  test("async try/finally completion records override earlier completion", async () => {
-    // Sources: the try-{return,throw,reject}-finally-{return,throw,reject}.js matrix under
-    // test/language/statements/async-function, test/language/expressions/async-function,
-    // and test/language/expressions/async-arrow-function.
-    expect(
-      await value(`
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        const returnReturn = async () => { try { return "early" } finally { return await Promise.resolve("override") } }
-        const returnThrow = async () => { try { return "early" } finally { throw "override" } }
-        const returnReject = async () => { try { return "early" } finally { await Promise.reject("override") } }
-        const throwReturn = async () => { try { throw "early" } finally { return await Promise.resolve("override") } }
-        const throwThrow = async () => { try { throw "early" } finally { throw "override" } }
-        const throwReject = async () => { try { throw "early" } finally { await Promise.reject("override") } }
-        const rejectReturn = async () => { try { await Promise.reject("early") } finally { return await Promise.resolve("override") } }
-        const rejectThrow = async () => { try { await Promise.reject("early") } finally { throw "override" } }
-        const rejectReject = async () => { try { await Promise.reject("early") } finally { await Promise.reject("override") } }
-        return await Promise.all([
-          observe(returnReturn()), observe(returnThrow()), observe(returnReject()),
-          observe(throwReturn()), observe(throwThrow()), observe(throwReject()),
-          observe(rejectReturn()), observe(rejectThrow()), observe(rejectReject()),
-        ])
-      `),
-    ).toEqual([
-      ["fulfilled", "override"],
-      ["rejected", "override"],
-      ["rejected", "override"],
-      ["fulfilled", "override"],
-      ["rejected", "override"],
-      ["rejected", "override"],
-      ["fulfilled", "override"],
-      ["rejected", "override"],
-      ["rejected", "override"],
-    ])
-  })
-
-  test("await preserves an object whose then property is not callable", async () => {
-    // Source: test/language/expressions/await/await-awaits-thenable-not-callable.js
-    expect(
-      await value(`
-        const thenable = { then: 42 }
-        return (await thenable) === thenable
-      `),
-    ).toBe(true)
-  })
-
-  test("await returns non-promise operands unchanged", async () => {
-    // Source: test/language/expressions/await/await-non-promise.js
-    // (adapted: only value pass-through is asserted here; the spec tick ordering around
-    //  await of non-promises is covered by the failing interleaving test below)
-    expect(
-      await value(`
-        const object = { id: 1 }
-        const array = [1, 2]
-        return [
-          await 1,
-          await "text",
-          await true,
-          (await null) === null,
-          (await undefined) === undefined,
-          (await object) === object,
-          (await array) === array,
-        ]
-      `),
-    ).toEqual([1, "text", true, true, true, true, true])
-  })
-})
-
-describe("Test262 expected Promise conformance", () => {
-  for (const name of ["all", "allSettled", "race"] as const) {
-    test.failing(`Promise.${name} rejects invalid input with TypeError`, async () => {
-      // Sources:
-      // test/built-ins/Promise/all/S25.4.4.1_A3.1_T1.js
-      // test/built-ins/Promise/all/S25.4.4.1_A3.1_T2.js
-      // test/built-ins/Promise/allSettled/iter-arg-is-number-reject.js
-      // test/built-ins/Promise/race/iter-arg-is-number-reject.js
-      expect(
-        await value(`
-          try {
-            const promise = Promise.${name}(42)
-            const returned = promise instanceof Promise
-            await promise
-            return [returned, "fulfilled"]
-          } catch (error) {
-            return [true, error.name]
-          }
-        `),
-      ).toEqual([true, "TypeError"])
-    })
-  }
-
-  test.failing("Promise.all consumes sparse positions as undefined", async () => {
-    // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
-    expect(
-      await value(`
-        const input = []
-        input[1] = 1
-        const result = await Promise.all(input)
-        return [result.length, result[0] === undefined, result[1]]
-      `),
-    ).toEqual([2, true, 1])
-  })
-
-  test.failing("Promise.allSettled consumes sparse positions as undefined", async () => {
-    // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
-    expect(
-      await value(`
-        const input = []
-        input[1] = 1
-        const result = await Promise.allSettled(input)
-        return [result.length, result[0].status, result[0].value === undefined, result[1]]
-      `),
-    ).toEqual([2, "fulfilled", true, { status: "fulfilled", value: 1 }])
-  })
-
-  test.failing("Promise.race consumes a sparse first position as undefined", async () => {
-    // Source: test/built-ins/Array/from/from-array.js (array iterator hole behavior)
-    expect(
-      await value(`
-        const input = []
-        input[1] = 1
-        return (await Promise.race(input)) === undefined
-      `),
-    ).toBe(true)
-  })
-
-  test.failing("Promise.all settles after reactions attached to its inputs", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/S25.4.4.1_A7.2_T1.js
-    // test/built-ins/Promise/all/S25.4.4.1_A8.1_T1.js
-    expect(
-      await value(`
-        const sequence = [1]
-        const input = Promise.resolve(1)
-        const aggregate = Promise.all([input])
-        aggregate.then(() => sequence.push(4))
-        input.then(() => sequence.push(3)).then(() => sequence.push(5))
-        sequence.push(2)
-        await aggregate
-        await Promise.resolve()
-        return sequence
-      `),
-    ).toEqual([1, 2, 3, 4, 5])
-  })
-
-  test.failing("Promise.allSettled settles after reactions attached to its inputs", async () => {
-    // Sources:
-    // test/built-ins/Promise/allSettled/resolved-sequence.js
-    // test/built-ins/Promise/allSettled/resolved-sequence-extra-ticks.js
-    // test/built-ins/Promise/allSettled/resolved-sequence-mixed.js
-    // test/built-ins/Promise/allSettled/resolved-sequence-with-rejections.js
-    expect(
-      await value(`
-        const sequence = [1]
-        const input = Promise.resolve(1)
-        const aggregate = Promise.allSettled([input])
-        aggregate.then(() => sequence.push(4))
-        input.then(() => sequence.push(3)).then(() => sequence.push(5))
-        sequence.push(2)
-        await aggregate
-        await Promise.resolve()
-        return sequence
-      `),
-    ).toEqual([1, 2, 3, 4, 5])
-  })
-
-  test.failing("Promise.race settles in a reaction after its winning input", async () => {
-    // Sources:
-    // test/built-ins/Promise/race/S25.4.4.3_A6.1_T1.js
-    // test/built-ins/Promise/race/resolved-sequence-extra-ticks.js
-    expect(
-      await value(`
-        const sequence = [1]
-        const race = Promise.race([1])
-        race.then(() => sequence.push(4))
-        Promise.resolve().then(() => sequence.push(3)).then(() => sequence.push(5))
-        sequence.push(2)
-        await race
-        await Promise.resolve()
-        return sequence
-      `),
-    ).toEqual([1, 2, 3, 4, 5])
-  })
-
-  test.failing("then reactions route and propagate fulfillment and rejection", async () => {
-    // Sources:
-    // test/built-ins/Promise/prototype/then/prfm-fulfilled.js
-    // test/built-ins/Promise/prototype/then/prfm-rejected.js
-    // test/built-ins/Promise/prototype/then/rxn-handler-identity.js
-    // test/built-ins/Promise/prototype/then/rxn-handler-thrower.js
-    // test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-return-normal.js
-    // test/built-ins/Promise/prototype/then/rxn-handler-fulfilled-return-abrupt.js
-    // test/built-ins/Promise/prototype/then/rxn-handler-rejected-return-normal.js
-    // test/built-ins/Promise/prototype/then/rxn-handler-rejected-return-abrupt.js
-    expect(
-      await value(`
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        return await Promise.all([
-          observe(Promise.resolve(1).then((value) => value + 1)),
-          observe(Promise.reject(2).then(undefined, (reason) => reason + 1)),
-          observe(Promise.resolve(3).then(undefined)),
-          observe(Promise.reject(4).then(undefined)),
-          observe(Promise.resolve(5).then(() => { throw 6 })),
-          observe(Promise.reject(7).then(undefined, () => { throw 8 })),
-        ])
-      `),
-    ).toEqual([
-      ["fulfilled", 2],
-      ["fulfilled", 3],
-      ["fulfilled", 3],
-      ["rejected", 4],
-      ["rejected", 6],
-      ["rejected", 8],
-    ])
-  })
-
-  test.failing("then reactions preserve breadth-first queue order", async () => {
-    // Source: test/built-ins/Promise/prototype/then/S25.4.4_A1.1_T1.js
-    expect(
-      await value(`
-        const sequence = [1]
-        const promise = Promise.resolve()
-        const first = promise.then(() => sequence.push(3)).then(() => sequence.push(5)).then(() => sequence.push(7))
-        const second = promise.then(() => sequence.push(4)).then(() => sequence.push(6)).then(() => sequence.push(8))
-        sequence.push(2)
-        await Promise.all([first, second])
-        return sequence
-      `),
-    ).toEqual([1, 2, 3, 4, 5, 6, 7, 8])
-  })
-
-  test.failing("then rejects direct self-resolution for fulfilled and rejected sources", async () => {
-    // Sources:
-    // test/built-ins/Promise/prototype/then/resolve-settled-fulfilled-self.js
-    // test/built-ins/Promise/prototype/then/resolve-settled-rejected-self.js
-    // test/built-ins/Promise/prototype/then/resolve-pending-fulfilled-self.js
-    // test/built-ins/Promise/prototype/then/resolve-pending-rejected-self.js
-    expect(
-      await value(`
-        const observe = async (promise) => {
-          try { await promise; return "fulfilled" } catch (reason) { return reason.name }
-        }
-        let fulfilled
-        let rejected
-        fulfilled = Promise.resolve().then(() => fulfilled)
-        rejected = Promise.reject().then(undefined, () => rejected)
-        return await Promise.all([observe(fulfilled), observe(rejected)])
-      `),
-    ).toEqual(["TypeError", "TypeError"])
-  })
-
-  test.failing("catch delegates rejection handling and preserves fulfillment", async () => {
-    // Sources:
-    // test/built-ins/Promise/prototype/catch/S25.4.5.1_A2.1_T1.js
-    // test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T1.js
-    // test/built-ins/Promise/prototype/catch/S25.4.5.1_A3.1_T2.js
-    expect(
-      await value(`
-        return [
-          await Promise.resolve(1).catch(() => 2),
-          await Promise.reject(3).catch((reason) => reason + 1),
-        ]
-      `),
-    ).toEqual([1, 4])
-  })
-
-  test.failing("finally preserves or replaces the original settlement", async () => {
-    // Sources:
-    // test/built-ins/Promise/prototype/finally/resolution-value-no-override.js
-    // test/built-ins/Promise/prototype/finally/rejection-reason-no-fulfill.js
-    // test/built-ins/Promise/prototype/finally/rejection-reason-override-with-throw.js
-    expect(
-      await value(`
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        return await Promise.all([
-          observe(Promise.resolve(1).finally(() => 2)),
-          observe(Promise.reject(3).finally(() => 4)),
-          observe(Promise.reject(5).finally(() => { throw 6 })),
-        ])
-      `),
-    ).toEqual([
-      ["fulfilled", 1],
-      ["rejected", 3],
-      ["rejected", 6],
-    ])
-  })
-
-  test.failing("await always resumes in a later reaction and interleaves async functions", async () => {
-    // Sources:
-    // test/language/expressions/await/async-await-interleaved.js
-    // test/language/expressions/await/await-non-promise.js
-    expect(
-      await value(`
-        const sequence = []
-        const first = async () => { sequence.push("first:1"); await 0; sequence.push("first:2") }
-        const second = async () => { sequence.push("second:1"); await 0; sequence.push("second:2") }
-        await Promise.all([first(), second()])
-        return sequence
-      `),
-    ).toEqual(["first:1", "second:1", "first:2", "second:2"])
-  })
-
-  test.failing("an async function rejects when it resolves with its own promise", async () => {
-    // Adapted from the self-resolution requirement represented by:
-    // test/built-ins/Promise/resolve-self.js
-    // test/built-ins/Promise/resolve/S25.4.4.5_A4.1_T1.js
-    expect(
-      await value(`
-        let promise
-        const run = async () => {
-          await Promise.resolve()
-          return promise
-        }
-        promise = run()
-        try {
-          await promise
-          return "fulfilled"
-        } catch (error) {
-          return error.name
-        }
-      `),
-    ).toBe("TypeError")
-  })
-
-  test.failing("Promise.resolve recursively assimilates callable thenables", async () => {
-    // Source: test/built-ins/Promise/resolve/resolve-thenable.js
-    expect(
-      await value(`
-        const value = { id: 1 }
-        const nested = { then: (resolve) => resolve(value) }
-        const thenable = { then: (resolve) => resolve(nested) }
-        return (await Promise.resolve(thenable)) === value
-      `),
-    ).toBe(true)
-  })
-
-  test.failing("Promise combinators assimilate callable thenable inputs", async () => {
-    // Sources:
-    // test/built-ins/Promise/all/reject-immed.js
-    // test/built-ins/Promise/all/reject-ignored-immed.js
-    // test/built-ins/Promise/allSettled/reject-ignored-immed.js
-    // test/built-ins/Promise/race/resolve-thenable.js
-    expect(
-      await value(`
-        const fulfills = { then: (resolve) => resolve(1) }
-        const rejects = { then: (_, reject) => reject(2) }
-        const resolvesFirst = { then: (resolve, reject) => { resolve(3); reject(4) } }
-        const observe = async (promise) => {
-          try { return ["fulfilled", await promise] } catch (reason) { return ["rejected", reason] }
-        }
-        return [
-          await observe(Promise.all([fulfills, rejects])),
-          await Promise.allSettled([fulfills, resolvesFirst]),
-          await observe(Promise.race([rejects])),
-        ]
-      `),
-    ).toEqual([
-      ["rejected", 2],
-      [
-        { status: "fulfilled", value: 1 },
-        { status: "fulfilled", value: 3 },
-      ],
-      ["rejected", 2],
-    ])
-  })
-
-  test.failing("await assimilates callable thenables", async () => {
-    // Source: test/language/expressions/await/await-awaits-thenables.js
-    expect(
-      await value(`
-        const thenable = { then: (resolve) => resolve(42) }
-        return await thenable
-      `),
-    ).toBe(42)
-  })
-
-  test.failing("await rejects when a callable thenable throws", async () => {
-    // Source: test/language/expressions/await/await-awaits-thenables-that-throw.js
-    expect(
-      await value(`
-        const error = { id: 1 }
-        const thenable = { then: () => { throw error } }
-        try {
-          await thenable
-          return false
-        } catch (caught) {
-          return caught === error
-        }
-      `),
-    ).toBe(true)
-  })
-})
@@ -48,13 +48,6 @@ const failingTool = Tool.make({
  run: () => Effect.fail(toolError("Lookup refused")),
 })

-const interruptedTool = Tool.make({
-  description: "Interrupt this call",
-  input: Schema.Struct({}),
-  output: Schema.String,
-  run: () => Effect.interrupt,
-})
-
 const completedTool = (trace: Trace) =>
  Tool.make({
    description: "Return the number of completed sleepy calls",
@@ -63,25 +56,6 @@ const completedTool = (trace: Trace) =>
    run: () => Effect.succeed(trace.completed),
  })

-/** Never settles, and holds interruption cleanup for `cleanupMs` so completion cleanup can outlast a timeout. */
-const stubbornTool = (trace: Trace) =>
-  Tool.make({
-    description: "Never settle; clean up slowly when interrupted",
-    input: Schema.Struct({ cleanupMs: Schema.Number }),
-    output: Schema.Number,
-    run: ({ cleanupMs }) =>
-      Effect.never.pipe(
-        Effect.onInterrupt(() =>
-          Effect.andThen(
-            Effect.sleep(cleanupMs),
-            Effect.sync(() => {
-              trace.interrupted += 1
-            }),
-          ),
-        ),
-      ),
-  })
-
 const run = (
  code: string,
  options: { trace?: Trace; limits?: CodeMode.ExecutionLimits } = {},
@@ -89,15 +63,7 @@ const run = (
  const trace = options.trace ?? makeTrace()
  return Effect.runPromise(
    CodeMode.execute({
-      tools: {
-        host: {
-          sleepy: sleepyTool(trace),
-          fail: failingTool,
-          interrupt: interruptedTool,
-          completed: completedTool(trace),
-          stubborn: stubbornTool(trace),
-        },
-      },
+      tools: { host: { sleepy: sleepyTool(trace), fail: failingTool, completed: completedTool(trace) } },
      code,
      ...(options.limits ? { limits: options.limits } : {}),
    }),
@@ -208,7 +174,8 @@ describe("first-class promise values", () => {
  })

  test("an awaited failure is catchable exactly like a synchronous throw", async () => {
-    const result = await run(`
+    expect(
+      await value(`
      const p = tools.host.fail({})
      try {
        await p
@@ -216,195 +183,57 @@ describe("first-class promise values", () => {
      } catch (e) {
        return e.message
      }
-    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("Lookup refused")
-    expect(result.warnings).toBeUndefined()
+    `),
+    ).toBe("Lookup refused")
  })

-  test("a fire-and-forget call is interrupted when the program returns", async () => {
+  test("a fire-and-forget call completes before the execution ends", async () => {
    const trace = makeTrace()
-    const result = await run(
+    const result = await value(
      `
        tools.host.sleepy({ id: 1, ms: 30 })
        return "done"
      `,
      { trace },
    )
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toBeUndefined()
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
+    expect(result).toBe("done")
+    expect(trace.completed).toBe(1)
+    expect(trace.interrupted).toBe(0)
  })

-  test("a never-awaited failing call preserves the result and reports the rejection", async () => {
-    const result = await run(`
+  test("a never-awaited failing call surfaces as an unhandled-rejection diagnostic", async () => {
+    const diagnostic = await error(`
      tools.host.fail({})
      return "done"
    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toStrictEqual([
-      { kind: "ToolFailure", message: "Unhandled rejection from an un-awaited promise: Lookup refused" },
-    ])
-    expect(Schema.decodeUnknownSync(CodeMode.Result)(JSON.parse(JSON.stringify(result)))).toStrictEqual(result)
+    expect(diagnostic.kind).toBe("ToolFailure")
+    expect(diagnostic.message).toContain("Unhandled rejection from an un-awaited promise")
+    expect(diagnostic.message).toContain("Lookup refused")
+    expect(diagnostic.suggestions?.join(" ")).toContain("Await promises")
  })

-  test("a never-awaited failing async function is reported with a successful result", async () => {
-    const result = await run(`
+  test("a never-awaited failing async function surfaces as an unhandled promise rejection", async () => {
+    const diagnostic = await error(`
      const fail = async () => { throw new Error("boom") }
      fail()
      return "done"
    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toStrictEqual([
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: boom" },
-    ])
+    expect(diagnostic.kind).toBe("ExecutionFailure")
+    expect(diagnostic.message).toContain("Unhandled rejection from an un-awaited promise")
+    expect(diagnostic.message).toContain("boom")
  })

-  test("output truncation bounds warning diagnostics with an in-band marker", async () => {
-    const result = await run(
-      `
-        for (let i = 0; i < 100; i += 1) Promise.reject(new Error("x".repeat(1_000)))
-        return "done"
-      `,
-      { limits: { maxOutputBytes: 64 } },
-    )
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.truncated).toBe(true)
-    expect(result.warnings).toStrictEqual([
-      { kind: "Truncated", message: "100 additional warnings omitted by the output limit." },
-    ])
-  })
-
-  test("a budget-consuming value does not starve warnings", async () => {
-    const result = await run(
-      `
-        Promise.reject(new Error("boom"))
-        return "x".repeat(500)
-      `,
-      { limits: { maxOutputBytes: 128 } },
-    )
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.truncated).toBe(true)
-    expect(typeof result.value).toBe("string")
-    expect(result.warnings).toStrictEqual([
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: boom" },
-    ])
-  })
-
-  test("an un-awaited async function's pending chain is interrupted at the return", async () => {
-    const trace = makeTrace()
-    const result = await run(
-      `
-        const run = async () => {
-          await tools.host.sleepy({ id: 1, ms: 60000 })
-          tools.host.fail({})
-        }
-        run()
-        return "done"
-      `,
-      { trace },
-    )
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toBeUndefined()
-    expect(trace.starts).toEqual([1])
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
-  })
-
-  test("reports every unhandled rejection in promise creation order", async () => {
-    const result = await run(`
-      Promise.reject(new Error("first"))
-      tools.host.fail({})
-      Promise.reject(new Error("third"))
-      return "done"
-    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.warnings).toStrictEqual([
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: first" },
-      { kind: "ToolFailure", message: "Unhandled rejection from an un-awaited promise: Lookup refused" },
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: third" },
-    ])
-  })
-
-  test("orders an async function rejection before promises created inside its body", async () => {
-    const result = await run(`
-      const outer = async () => {
-        Promise.reject(new Error("inner"))
-        throw new Error("outer")
+  test("drains promises started by an async function after an await", async () => {
+    const diagnostic = await error(`
+      const run = async () => {
+        await tools.host.sleepy({ id: 1 })
+        tools.host.fail({})
      }
-      outer()
+      run()
      return "done"
    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.warnings).toStrictEqual([
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: outer" },
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: inner" },
-    ])
-  })
-
-  test("un-awaited interruptions settle without becoming rejections", async () => {
-    const result = await run(`
-      tools.host.interrupt({})
-      Promise.all([tools.host.interrupt({})])
-      return "done"
-    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toBeUndefined()
-  })
-
-  test("a fatal program error cancels outstanding work without reporting unhandled rejections", async () => {
-    const trace = makeTrace()
-    const result = await run(
-      `
-        tools.host.sleepy({ id: 1, ms: 1_000 })
-        throw new Error("boom")
-      `,
-      { trace },
-    )
-    expect(result.ok).toBe(false)
-    if (result.ok) return
-    expect(result.error.message).toBe("Uncaught: boom")
-    expect("warnings" in result).toBe(false)
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
-  })
-
-  test("async-function promises remain owned by the execution after the function returns", async () => {
-    const trace = makeTrace()
-    expect(
-      await value(
-        `
-          const launch = async () => {
-            tools.host.sleepy({ id: 1, ms: 60000 })
-            Promise.all([tools.host.sleepy({ id: 2, ms: 60000 })])
-            return "returned"
-          }
-          return await launch()
-        `,
-        { trace },
-      ),
-    ).toBe("returned")
-    // Both calls outlive launch() itself - they belong to the execution, not the function -
-    // and are interrupted only when the whole program returns.
-    expect(trace.starts).toEqual([1, 2])
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(2)
+    expect(diagnostic.kind).toBe("ToolFailure")
+    expect(diagnostic.message).toContain("Lookup refused")
  })
 })

@@ -422,22 +251,6 @@ describe("promises at data boundaries", () => {
    expect(diagnostic.message).toContain("un-awaited Promise")
  })

-  test("invalid returned data cancels pending work", async () => {
-    const trace = makeTrace()
-    const result = await run(
-      `
-        const pending = tools.host.sleepy({ id: 1, ms: 60_000 })
-        return { pending }
-      `,
-      { trace, limits: { timeoutMs: 100 } },
-    )
-    expect(result.ok).toBe(false)
-    if (result.ok) return
-    expect(result.error.kind).toBe("InvalidDataValue")
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
-  })
-
  test("passing an un-awaited promise as a tool argument is a clear diagnostic", async () => {
    const diagnostic = await error(`return await tools.host.sleepy({ id: tools.host.sleepy({ id: 1 }) })`)
    expect(diagnostic.kind).toBe("InvalidDataValue")
@@ -457,59 +270,6 @@ describe("promises at data boundaries", () => {
 })

 describe("Promise.all over arbitrary arrays", () => {
-  test("combinators return promises that can be assigned and awaited later", async () => {
-    expect(
-      await value(`
-        const all = Promise.all([Promise.resolve(1)])
-        const settled = Promise.allSettled([Promise.reject("no")])
-        const race = Promise.race([Promise.resolve(2)])
-        const promises = [all instanceof Promise, settled instanceof Promise, race instanceof Promise]
-        return [promises, await all, await settled, await race]
-      `),
-    ).toEqual([[true, true, true], [1], [{ status: "rejected", reason: "no" }], 2])
-  })
-
-  test("separately-created aggregate batches overlap before either is awaited", async () => {
-    const trace = makeTrace()
-    expect(
-      await value(
-        `
-          const first = Promise.all([tools.host.sleepy({ id: 1, ms: 40 })])
-          const second = Promise.all([tools.host.sleepy({ id: 2, ms: 40 })])
-          return [await first, await second]
-        `,
-        { trace },
-      ),
-    ).toEqual([[1], [2]])
-    expect(trace.starts).toEqual([1, 2])
-    expect(trace.maxActive).toBeGreaterThan(1)
-  })
-
-  test("an aggregate created before a try block rejects at its later await", async () => {
-    expect(
-      await value(`
-        const aggregate = Promise.all([tools.host.fail({})])
-        try {
-          await aggregate
-          return "no"
-        } catch (error) {
-          return error.message
-        }
-      `),
-    ).toBe("Lookup refused")
-  })
-
-  test("awaiting an aggregate repeatedly does not rerun its members", async () => {
-    const result = await run(`
-      const aggregate = Promise.all([tools.host.sleepy({ id: 7 })])
-      return [await aggregate, await aggregate]
-    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toEqual([[7], [7]])
-    expect(result.toolCalls).toStrictEqual([{ name: "host.sleepy" }])
-  })
-
  test("mixes promises and plain values, preserving order", async () => {
    expect(
      await value(`
@@ -580,18 +340,16 @@ describe("Promise.all over arbitrary arrays", () => {
  })

  test("rejects with the first failure, catchable in-program", async () => {
-    const result = await run(`
+    expect(
+      await value(`
      try {
        await Promise.all([tools.host.sleepy({ id: 1 }), tools.host.fail({})])
        return "no"
      } catch (e) {
        return e.message
      }
-    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("Lookup refused")
-    expect(result.warnings).toBeUndefined()
+    `),
+    ).toBe("Lookup refused")
  })

  test("rejects before an earlier slow promise fulfills", async () => {
@@ -612,55 +370,10 @@ describe("Promise.all over arbitrary arrays", () => {
        { trace },
      ),
    ).toBe(0)
-    // The surviving member is observed (Promise.all handled it), so completion interrupts
-    // it instead of waiting for it.
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
-  })
-
-  test("fail-fast does not cancel a sibling the program still holds and awaits", async () => {
-    const trace = makeTrace()
-    expect(
-      await value(
-        `
-          const slow = tools.host.sleepy({ id: 1, ms: 40 })
-          try {
-            await Promise.all([slow, tools.host.fail({})])
-            return "no"
-          } catch {}
-          return await slow
-        `,
-        { trace },
-      ),
-    ).toBe(1)
    expect(trace.completed).toBe(1)
    expect(trace.interrupted).toBe(0)
  })

-  test("a slower observed sibling is interrupted at completion after failing fast", async () => {
-    const trace = makeTrace()
-    expect(
-      await value(
-        `
-          const failLater = async () => {
-            await tools.host.sleepy({ id: 1, ms: 40 })
-            throw new Error("later")
-          }
-          const aggregate = Promise.all([Promise.reject(new Error("first")), failLater()])
-          try {
-            await aggregate
-            return "no"
-          } catch (error) {
-            return error.message
-          }
-        `,
-        { trace },
-      ),
-    ).toBe("first")
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
-  })
-
  test("a non-collection argument is a clear error", async () => {
    const diagnostic = await error(`return await Promise.all(42)`)
    expect(diagnostic.message).toContain("Promise.all expects an array")
@@ -700,64 +413,50 @@ describe("Promise.allSettled", () => {
      return settled.filter((s) => s.status === "rejected").length
    `)
    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe(2)
-    expect(result.warnings).toBeUndefined()
+    if (result.ok) expect(result.value).toBe(2)
  })
 })

 describe("Promise.race", () => {
-  test("first settlement wins and a direct loser is interrupted at completion", async () => {
+  test("first settlement wins and losers are interrupted", async () => {
    const trace = makeTrace()
    const result = await value(
      `
        const fast = tools.host.sleepy({ id: 1, ms: 10 })
-        const slow = tools.host.sleepy({ id: 2, ms: 40 })
+        const slow = tools.host.sleepy({ id: 2, ms: 5000 })
        return await Promise.race([fast, slow])
      `,
      { trace },
    )
    expect(result).toBe(1)
-    // The loser is observed (the race handled it), so the execution does not wait for it.
-    expect(trace.completed).toBe(1)
    expect(trace.interrupted).toBe(1)
+    expect(trace.completed).toBe(1)
  })

-  test("a direct loser remains awaitable after the race settles", async () => {
+  test("awaiting an interrupted loser afterwards is a catchable program failure", async () => {
    expect(
      await value(`
      const fast = tools.host.sleepy({ id: 1, ms: 10 })
-      const slow = tools.host.sleepy({ id: 2, ms: 40 })
+      const slow = tools.host.sleepy({ id: 2, ms: 5000 })
      const winner = await Promise.race([fast, slow])
-      return { winner, loser: await slow }
+      try {
+        await slow
+        return "no"
+      } catch (e) {
+        return { winner, caught: e.message }
+      }
    `),
-    ).toEqual({ winner: 1, loser: 2 })
-  })
-
-  test("a nested aggregate loser and its members are interrupted at completion", async () => {
-    const trace = makeTrace()
-    expect(
-      await value(
-        `
-          const nested = Promise.all([
-            tools.host.sleepy({ id: 1, ms: 40 }),
-            tools.host.sleepy({ id: 2, ms: 40 }),
-          ])
-          return await Promise.race(["immediate", nested])
-        `,
-        { trace },
-      ),
-    ).toBe("immediate")
-    // The nested aggregate and its members are all observed, so nothing waits for them.
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(2)
+    ).toEqual({
+      winner: 1,
+      caught: "This tool call was interrupted because another value settled a Promise.race first.",
+    })
  })

  test("a rejection can win the race", async () => {
    expect(
      await value(`
      try {
-        await Promise.race([tools.host.fail({}), tools.host.sleepy({ id: 1, ms: 40 })])
+        await Promise.race([tools.host.fail({}), tools.host.sleepy({ id: 1, ms: 5000 })])
        return "no"
      } catch (e) {
        return e.message
@@ -769,20 +468,11 @@ describe("Promise.race", () => {
  test("a plain value wins over pending promises", async () => {
    const trace = makeTrace()
    expect(
-      await value(`return await Promise.race([tools.host.sleepy({ id: 1, ms: 40 }), "immediate"])`, { trace }),
+      await value(`return await Promise.race([tools.host.sleepy({ id: 1, ms: 5000 }), "immediate"])`, { trace }),
    ).toBe("immediate")
-    expect(trace.completed).toBe(0)
    expect(trace.interrupted).toBe(1)
  })

-  test("a rejected race loser is observed by the aggregate", async () => {
-    const result = await run(`return await Promise.race(["winner", tools.host.fail({})])`)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("winner")
-    expect(result.warnings).toBeUndefined()
-  })
-
  test("an empty race is a clear error instead of hanging", async () => {
    const diagnostic = await error(`return await Promise.race([])`)
    expect(diagnostic.message).toContain("never settle")
@@ -794,9 +484,6 @@ describe("Promise.resolve / Promise.reject", () => {
    expect(await value(`return await Promise.resolve(42)`)).toBe(42)
    expect(await value(`return await Promise.resolve(Promise.resolve("nested"))`)).toBe("nested")
    expect(await value(`return await Promise.resolve(tools.host.sleepy({ id: 3 }))`)).toBe(3)
-    expect(await value(`const promise = Promise.resolve(1); return [promise].includes(Promise.resolve(promise))`)).toBe(
-      true,
-    )
  })

  test("reject produces a promise whose await throws the reason", async () => {
@@ -811,34 +498,6 @@ describe("Promise.resolve / Promise.reject", () => {
    `),
    ).toBe("nope")
  })
-
-  test("a rejection observed after settlement is handled", async () => {
-    expect(
-      await value(`
-        const rejected = Promise.reject(new Error("handled"))
-        await tools.host.sleepy({ id: 1 })
-        try {
-          await rejected
-          return "no"
-        } catch (error) {
-          return error.message
-        }
-      `),
-    ).toBe("handled")
-  })
-
-  test("an abandoned rejected promise is reported as unhandled", async () => {
-    const result = await run(`
-      Promise.reject(new Error("abandoned"))
-      return "done"
-    `)
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toStrictEqual([
-      { kind: "ExecutionFailure", message: "Unhandled rejection from an un-awaited promise: Uncaught: abandoned" },
-    ])
-  })
 })

 describe("timeout interruption of forked calls", () => {
@@ -872,67 +531,6 @@ describe("timeout interruption of forked calls", () => {
    expect(result.error.kind).toBe("TimeoutExceeded")
    expect(trace.interrupted).toBe(2)
  })
-
-  test("a non-settling race loser cannot hold the execution to the timeout", async () => {
-    const trace = makeTrace()
-    const result = await run(`return await Promise.race(["winner", tools.host.sleepy({ id: 1, ms: 60000 })])`, {
-      trace,
-      limits: { timeoutMs: 100 },
-    })
-    // Completion interrupts the observed loser immediately; the race result survives.
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("winner")
-    expect(result.warnings).toBeUndefined()
-    expect(trace.starts).toEqual([1])
-    expect(trace.completed).toBe(0)
-    expect(trace.interrupted).toBe(1)
-  })
-
-  test("a timeout during completion cleanup keeps the computed value and warns", async () => {
-    const trace = makeTrace()
-    const result = await run(
-      `
-        tools.host.stubborn({ cleanupMs: 400 })
-        return "done"
-      `,
-      { trace, limits: { timeoutMs: 100 } },
-    )
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toStrictEqual([
-      {
-        kind: "TimeoutExceeded",
-        message:
-          "The program returned, but background work was still running at the 100ms timeout and was interrupted. Await all started promises.",
-      },
-    ])
-    expect(trace.interrupted).toBe(1)
-    expect(trace.completed).toBe(0)
-  })
-
-  test("a timeout during completion cleanup reports the timeout warning before settled rejections", async () => {
-    const result = await run(
-      `
-        tools.host.fail({})
-        tools.host.stubborn({ cleanupMs: 400 })
-        return "done"
-      `,
-      { limits: { timeoutMs: 100 } },
-    )
-    expect(result.ok).toBe(true)
-    if (!result.ok) return
-    expect(result.value).toBe("done")
-    expect(result.warnings).toStrictEqual([
-      {
-        kind: "TimeoutExceeded",
-        message:
-          "The program returned, but background work was still running at the 100ms timeout and was interrupted. Await all started promises.",
-      },
-      { kind: "ToolFailure", message: "Unhandled rejection from an un-awaited promise: Lookup refused" },
-    ])
-  })
 })

 describe("unsupported promise surface", () => {
@@ -0,0 +1,77 @@
+# Test262 Array Coverage
+
+The Array tests adapt Test262 at revision `250f204f23a9249ff204be2baec29600faae7b75`. They cover CodeMode's 35
+exposed instance methods and three static methods using actual arrays, accepted argument types, deterministic behavior,
+and CodeMode's materialized collection conventions. Each executable case names its exact upstream source path.
+`LICENSE.test262` contains the upstream BSD terms.
+
+This is coverage of CodeMode's bounded Array surface, not a claim of ECMAScript or Test262 conformance. One upstream
+file may contain both adapted and inapplicable assertions, so a cited source means only that the represented assertions
+were adapted.
+
+## Inventory
+
+The 38 relevant upstream API directories contain 2,837 files. The executable suite adapts assertions from 83 distinct
+sources.
+
+| API                             | Upstream files | Adapted sources |
+| ------------------------------- | -------------: | --------------: |
+| `Array.prototype.map`           |            216 |               3 |
+| `Array.prototype.filter`        |            242 |               3 |
+| `Array.prototype.find`          |             23 |               4 |
+| `Array.prototype.findIndex`     |             23 |               3 |
+| `Array.prototype.findLast`      |             24 |               3 |
+| `Array.prototype.findLastIndex` |             24 |               3 |
+| `Array.prototype.some`          |            219 |               2 |
+| `Array.prototype.every`         |            218 |               2 |
+| `Array.prototype.includes`      |             30 |               2 |
+| `Array.prototype.join`          |             23 |               2 |
+| `Array.prototype.reduce`        |            260 |               3 |
+| `Array.prototype.reduceRight`   |            260 |               3 |
+| `Array.prototype.flatMap`       |             24 |               2 |
+| `Array.prototype.forEach`       |            190 |               2 |
+| `Array.prototype.sort`          |             54 |               3 |
+| `Array.prototype.toSorted`      |             21 |               4 |
+| `Array.prototype.slice`         |             71 |               1 |
+| `Array.prototype.concat`        |             69 |               3 |
+| `Array.prototype.indexOf`       |            201 |               2 |
+| `Array.prototype.lastIndexOf`   |            198 |               2 |
+| `Array.prototype.at`            |             13 |               3 |
+| `Array.prototype.flat`          |             19 |               2 |
+| `Array.prototype.reverse`       |             18 |               1 |
+| `Array.prototype.toReversed`    |             17 |               2 |
+| `Array.prototype.with`          |             21 |               2 |
+| `Array.prototype.push`          |             24 |               1 |
+| `Array.prototype.pop`           |             23 |               1 |
+| `Array.prototype.shift`         |             20 |               1 |
+| `Array.prototype.unshift`       |             22 |               1 |
+| `Array.prototype.splice`        |             81 |               3 |
+| `Array.prototype.fill`          |             22 |               3 |
+| `Array.prototype.copyWithin`    |             39 |               2 |
+| `Array.prototype.keys`          |             12 |               1 |
+| `Array.prototype.values`        |             12 |               1 |
+| `Array.prototype.entries`       |             12 |               1 |
+| `Array.from`                    |             47 |               3 |
+| `Array.isArray`                 |             29 |               2 |
+| `Array.of`                      |             16 |               1 |
+
+## Exclusions
+
+Assertions are not adapted when they test behavior outside CodeMode's documented Array surface:
+
+- Function metadata, property descriptors, constructibility, prototype mutation, species constructors, or cross-realm
+  identity.
+- Generic receivers, detached methods, `.call`, `.apply`, boxed values, custom coercion objects, Symbols, BigInts,
+  proxies, accessors, frozen arrays, typed arrays, or ArrayBuffers.
+- `Array.from` mappers, custom iterables, constructor substitution, and iterator-closing behavior.
+- Native iterator identity, `.next()`, completion records, or live iterator mutation. CodeMode deliberately materializes
+  `keys`, `values`, and `entries` as arrays.
+- Sparse-array assertions that depend on literal elisions or inherited indexed properties. CodeMode's confined data
+  model does not preserve those prototype and hole semantics at every boundary.
+- Argument coercions outside the accepted schema-like surface. Numeric positions must be numbers and `join` separators
+  must be strings.
+- Exact native error brands where CodeMode exposes a safe runtime error instead.
+- Async/effectful callbacks, circular-data rejection, sandbox-value identity, diagnostics, and host-boundary behavior.
+  Those remain covered by CodeMode-specific tests.
+
+Handwritten tests remain where they specify CodeMode behavior rather than ordinary ECMAScript Array semantics.
@@ -0,0 +1,69 @@
+# Test262 String Coverage
+
+The String tests adapt Test262 at revision `250f204f23a9249ff204be2baec29600faae7b75`. They cover CodeMode's 32
+exposed instance methods and two static methods using primitive receivers, accepted argument types, and deterministic
+behavior. Each executable case names its exact upstream source path. `LICENSE.test262` contains the upstream BSD terms.
+
+This is coverage of CodeMode's bounded String surface, not a claim of ECMAScript or Test262 conformance. One upstream
+file may contain both adapted and inapplicable assertions, so a cited source means only that the represented assertions
+were adapted.
+
+## Inventory
+
+The relevant upstream directories contain 1,048 files: 1,009 core built-in files, 29 Annex B files for exposed methods,
+and 10 Intl `localeCompare` files. The executable suite adapts assertions from 298 distinct sources.
+
+| API | Upstream files | Adapted sources |
+| --- | ---: | ---: |
+| `String.fromCharCode` | 17 | 6 |
+| `String.fromCodePoint` | 11 | 4 |
+| `String.prototype.at` | 11 | 5 |
+| `String.prototype.charAt` | 30 | 9 |
+| `String.prototype.charCodeAt` | 25 | 4 |
+| `String.prototype.codePointAt` | 16 | 6 |
+| `String.prototype.concat` | 22 | 1 |
+| `String.prototype.endsWith` | 27 | 13 |
+| `String.prototype.includes` | 27 | 12 |
+| `String.prototype.indexOf` | 47 | 8 |
+| `String.prototype.lastIndexOf` | 25 | 1 |
+| `String.prototype.localeCompare` | 23 | 1 |
+| `String.prototype.match` | 52 | 9 |
+| `String.prototype.matchAll` | 26 | 1 |
+| `String.prototype.normalize` | 14 | 3 |
+| `String.prototype.padEnd` | 13 | 4 |
+| `String.prototype.padStart` | 13 | 4 |
+| `String.prototype.repeat` | 16 | 4 |
+| `String.prototype.replace` | 56 | 16 |
+| `String.prototype.replaceAll` | 46 | 12 |
+| `String.prototype.search` | 44 | 10 |
+| `String.prototype.slice` | 38 | 11 |
+| `String.prototype.split` | 121 | 50 |
+| `String.prototype.startsWith` | 21 | 7 |
+| `String.prototype.substr` | 15 | 6 |
+| `String.prototype.substring` | 46 | 12 |
+| `String.prototype.toLowerCase` | 30 | 5 |
+| `String.prototype.toString` | 7 | 1 |
+| `String.prototype.toUpperCase` | 26 | 3 |
+| `String.prototype.trim` | 129 | 66 |
+| `String.prototype.trimEnd` | 23 | 2 |
+| `String.prototype.trimLeft` | 4 | 0 |
+| `String.prototype.trimRight` | 4 | 0 |
+| `String.prototype.trimStart` | 23 | 2 |
+
+## Exclusions
+
+Assertions are not adapted when they test behavior outside CodeMode's documented String surface:
+
+- Function metadata, property descriptors, constructibility, prototype mutation, or cross-realm identity.
+- The `trimLeft`/`trimRight` Test262 files assert prototype function identity, which CodeMode does not expose. Their
+  supported call behavior remains covered by CodeMode-specific tests.
+- Boxed strings, generic receivers, custom coercion objects, Symbols, BigInts, or argument types CodeMode rejects.
+- Symbol-based RegExp dispatch, custom matchers, species constructors, or iterator protocol details. CodeMode materializes
+  `matchAll` results instead of exposing iterators.
+- Locale selection and options. CodeMode deliberately uses the host default locale and ignores those arguments.
+- Test262 harness behavior or setup syntax unavailable in the confined interpreter.
+- Function-replacer behavior that is covered by CodeMode-specific tests for sequential callbacks, async tool calls,
+  result coercion, diagnostics, and sandbox boundaries.
+- Assertions requiring an exact native error type when CodeMode deliberately exposes only its safe runtime error.
+
+Handwritten tests remain where they specify CodeMode behavior rather than ordinary ECMAScript String semantics.
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.17.18",
+  "version": "1.17.15",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -86,7 +86,7 @@ export async function handler(
  type CostInfo = ReturnType<typeof calculateCost>

  const MAX_FAILOVER_RETRIES = 3
-  const MAX_RETRYABLE_STATUS_RETRIES = 3
+  const MAX_429_RETRIES = 3
  const dict = i18n(localeFromRequest(input.request))
  const t = (key: Key, params?: Record<string, string | number>) => resolve(dict[key], params)
  const ADMIN_WORKSPACES = [
@@ -213,7 +213,7 @@ export async function handler(
      logger.debug("REQUEST URL: " + reqUrl)
      logger.debug("REQUEST: " + reqBody.substring(0, 300) + "...")
      const isNewInference = providerInfo.id.startsWith("console.") || providerInfo.id.startsWith("console-go.")
-      const res = await fetchWithRetryableStatus(
+      const res = await fetchWith429Retry(
        reqUrl,
        {
          method: "POST",
@@ -246,7 +246,7 @@ export async function handler(
          // abandoned Console requests do not leave orphaned inference work open.
          signal: input.request.signal,
        },
-        { count: isNewInference ? MAX_RETRYABLE_STATUS_RETRIES : 0 },
+        { count: isNewInference ? MAX_429_RETRIES : 0 },
      )

      if (isNewInference) {
@@ -307,7 +307,7 @@ export async function handler(
    logger.debug("STATUS: " + res.status + " " + res.statusText)

    // Handle non-streaming response
-    if (!isStream || [400, 404, 429, 529].includes(res.status)) {
+    if (!isStream || [400, 404, 429].includes(res.status)) {
      const json = await res.json()
      await rateLimiter?.track()
      const usage = providerInfo.extractUsage(json)
@@ -999,11 +999,11 @@ export async function handler(
    providerInfo.apiKey = authInfo.provider.credentials
  }

-  async function fetchWithRetryableStatus(url: string, options: RequestInit, retry = { count: 0 }) {
+  async function fetchWith429Retry(url: string, options: RequestInit, retry = { count: 0 }) {
    const res = await fetch(url, options)
-    if ([429, 529].includes(res.status) && retry.count < MAX_RETRYABLE_STATUS_RETRIES) {
+    if (res.status === 429 && retry.count < MAX_429_RETRIES) {
      await new Promise((resolve) => setTimeout(resolve, Math.pow(2, retry.count) * 500))
-      return fetchWithRetryableStatus(url, options, { count: retry.count + 1 })
+      return fetchWith429Retry(url, options, { count: retry.count + 1 })
    }
    return res
  }
--- a/Show More
+++ b/Show More