fix(app): keep new session open while the worktree list loads (#47734 )

fix(core): remove compatible-provider remapping (#47732 )
refactor(ai): give named providers dedicated modules (#47726 )
2026-09-07 09:26:26 +00:00 · 2026-09-07 05:56:23 +00:00 · 2026-09-07 00:46:37 -05:00 · 2026-09-06 23:56:39 -05:00 · 2026-09-07 04:54:28 +00:00 · 2026-09-07 14:17:34 +10:00
263 changed files with 10821 additions and 2499 deletions
@@ -432,6 +432,7 @@
        "@types/node": "catalog:",
        "@typescript/native-preview": "catalog:",
        "app-builder-lib": "26.15.7",
+        "drizzle-kit": "catalog:",
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
        "electron": "42.10.1",
@@ -1036,12 +1037,9 @@
    },
  },
  "trustedDependencies": [
-    "esbuild",
-    "tree-sitter-powershell",
-    "protobufjs",
    "electron",
-    "web-tree-sitter",
-    "tree-sitter-bash",
+    "esbuild",
+    "protobufjs",
  ],
  "patchedDependencies": {
    "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-bWKV3fV8Yc+3ILaNRChIYajsRcvEG2OkydsD2KMUXCM=",
-    "aarch64-linux": "sha256-zIavB09LW+BU3GOq0PO7Lqfc3MVchkiOUf3trnAjhRM=",
-    "aarch64-darwin": "sha256-Jlvz7QsXsb8GS9Ty4TmUIfGOawiueZWWEYmyEPms3dc=",
-    "x86_64-darwin": "sha256-TzTDtcDtj1c3+eP2WZAHOfkszxIS06J6QUwlnscLaUM="
+    "x86_64-linux": "sha256-T1JUv8gUrXavDI1HdVGqNRal4y2Bh5QavpR4DV+bJdA=",
+    "aarch64-linux": "sha256-wlbWdEUVWAafgxaZis0Q+SAas8k6hu3s0C39CnMZ2gw=",
+    "aarch64-darwin": "sha256-74rRue8KQWKzgMMb540beqMzp1DUShlPte6qklYCVTs=",
+    "x86_64-darwin": "sha256-ihr3DoLd/4Lw6WbyXzSQXMP4hrVGk/UiRkO2aoQn8vg="
  }
 }
@@ -146,10 +146,6 @@
    "esbuild",
    "node-pty",
    "protobufjs",
-    "tree-sitter",
-    "tree-sitter-bash",
-    "tree-sitter-powershell",
-    "web-tree-sitter",
    "electron"
  ],
  "overrides": {
@@ -81,7 +81,7 @@ export const route = Route.make({

 Route defaults are request-shaping defaults such as `headers`, `limits`, `generation`, `providerOptions`, and `http`. Endpoint host/query belongs on the route endpoint. Selected `LanguageModel` values carry only model id, provider id, and the configured route value. Model capability/catalog metadata lives outside this package; protocol support is enforced by request lowering and typed `AIError`s.

-The four-axis decomposition is the reason DeepSeek, TogetherAI, Cerebras, Baseten, Fireworks, and DeepInfra all reuse `OpenAIChat.protocol` verbatim — each provider deployment is a 5-15 line `Route.make(...)` call instead of a 300-400 line route clone. Bug fixes in one protocol propagate to every consumer of that protocol in a single commit.
+The four-axis decomposition is the reason DeepSeek, TogetherAI, Cerebras, Baseten, Fireworks, and DeepInfra all reuse `OpenAIChat.protocol` verbatim — each provider owns a small `Route.make(...)` composition instead of a protocol clone. Bug fixes in one protocol propagate to every consumer of that protocol in a single commit.

 When a provider supports multiple physical transports, selection remains execution policy below its semantic route. `OpenResponsesChannel.transport(...)` owns the provider-neutral Responses WebSocket concept: it prepares one final request, executes HTTP by default, strips WebSocket-disallowed fields, and passes a generic channel exchange to a per-call `WebSocketChannelExecutor` when supplied. Provider-specific Responses routes opt in with handshake and connection-age policy. `Route.streamPrepared` owns decoding and acknowledges channel completion only after successful full consumption.

@@ -115,6 +115,7 @@ Keep provider facades small and explicit:
 - Prefer `apiKey` as provider-specific sugar and `auth` as the explicit override; keep them mutually exclusive in provider option types with `ProviderAuthOption`.
 - Resolve `apiKey` → `Auth` with `AuthOptions.bearer(options, "<PROVIDER>_API_KEY")` (it honors an explicit `auth` override and falls back to `Auth.config(envVar)` so missing keys surface a typed `Authentication` error rather than a runtime crash).
 - Use separate top-level facades for products with different required setup, such as `CloudflareAIGateway` and `CloudflareWorkersAI`.
+- Give every named provider its own file and top-level export. Keep its endpoint, auth defaults, and route setup in that file. Compose shared protocols directly; do not nest named provider presets under generic compatible facades or keep their endpoints in a shared provider profile registry.

 `Provider.make(...)` remains available for simple static provider definitions, but new built-in providers should prefer plain configured facades unless a helper removes real duplication without adding runtime behavior.

@@ -1,6 +1,6 @@
 # @opencode-ai/ai

-Schema-first AI primitives for opencode. Provider quirks live in adapters, not in calling code.
+Schema-first language model and image-generation APIs built with Effect.

 ```ts
 import { Effect, Layer } from "effect"
@@ -255,7 +255,7 @@ over the same implementation, including the legacy live `requests` array. New te

 ## Provider compaction

-Compaction is opt-in. The package supports automatic compaction in OpenAI/Azure Responses and Anthropic Messages (including Claude on Vertex), and explicit compaction calls in OpenAI/Azure/xAI Responses. Model and deployment support still depends on the provider. Bedrock compaction is deferred to a separate follow-up.
+Compaction is opt-in. The package supports automatic compaction in OpenAI/Azure Responses and Anthropic Messages (including Claude on Vertex), and explicit compaction calls in OpenAI/Azure/xAI Responses. Model and deployment support still depends on the provider.

 This is different from prompt caching, server-side history storage, or truncation. Compaction returns provider-owned context that must be replayed to continue the conversation.

@@ -298,7 +298,7 @@ result.responseID
 result.usage
 ```

-This appends a native `compaction_trigger` control item to the full input and sends a normal Responses request. It follows the [Codex V2 request shape](https://github.com/openai/codex/blob/728cb12/codex-rs/core/src/compact_remote_v2_attempt.rs), with tools and instructions retained, `stream: true`, `store: false`, and parallel tool calls enabled. It removes normal-answer text/output-format controls, forced tool choices, output-token/tool-call limits, and automatic `context_management`. Body overlays cannot replace `input` or supply `previous_response_id`/`conversation`; the complete canonical history is required for safe stateless replay. Session/cache identifiers, auth, headers, query parameters, service tier, and supported prompt-cache settings are preserved.
+This appends a native `compaction_trigger` control item to the full input and sends a normal Responses request, with tools and instructions retained, `stream: true`, `store: false`, and parallel tool calls enabled. It removes normal-answer text/output-format controls, forced tool choices, output-token/tool-call limits, and automatic `context_management`. Body overlays cannot replace `input` or supply `previous_response_id`/`conversation`; the complete canonical history is required for safe stateless replay. Request metadata, auth, headers, query parameters, service tier, and supported prompt-cache settings are preserved.

 Only a successful `response.completed` with a response ID and exactly one logical encrypted checkpoint succeeds. Repeated item events are correlated by ID/output slot, including ID-less checkpoints. Other output is ignored, not returned as assistant text or dispatched as tools. Failed, incomplete, malformed, and interrupted responses return errors rather than partial checkpoints.

@@ -372,9 +372,7 @@ providerOptions: {
 - Anthropic can return a compaction block with `content: null` when summarization fails. This becomes a compaction part with `text: null`, which is **not** a successful replacement for prior history. The package never prunes history automatically.
 - `Usage` totals include all reported Anthropic `usage.iterations`, including compaction. `contextTokens` separately reports the final message iteration's inclusive input size, when available. A compaction-only pause does not report a post-compaction context size. Raw iteration usage remains in `providerMetadata`.

-### Ownership and verification
-
-The AI package transports options and typed conversation parts. It does not schedule compaction, persist Session checkpoints, select history, switch providers, or replace Core's existing local compaction policy. Native compaction is not enabled for OpenCode Sessions by this feature; Session integration must persist these parts before enabling it. The AI SDK bridge rejects native compaction parts rather than dropping them. Provider-executed tool APIs and persistence changes are a separate follow-up.
+### Recording tests

 Tests cover serialized round trips, real local HTTP plus a tool loop, WebSocket recovery, provider errors, malformed blocks, and usage accounting. Live provider tests are gated by `RECORD=true` and the relevant API keys:

@@ -393,7 +391,7 @@ Prompt caching is **on by default**. Every `LLMRequest` resolves to `cache: "aut

 ### Auto placement

-`"auto"` places up to four breakpoints — the last tool definition, the first system part, the last system part when distinct, and the final message boundary. These expose successively larger reusable prefixes for tools, the base agent, project instructions, and the active conversation. The rolling final-message boundary advances on every request so recent conversation prefixes remain reusable during tool loops.
+`"auto"` places up to four breakpoints — the last tool definition, the first system part, the last system part when distinct, and the final message boundary. These expose successively larger reusable prefixes for tool definitions, system instructions, and the active conversation. The rolling final-message boundary advances on every request so recent conversation prefixes remain reusable during tool loops.

 Tools precede every system and conversation block in the provider prefix, so tool definitions must remain byte-stable and deterministically ordered for downstream breakpoints to remain reusable.

@@ -461,22 +459,33 @@ const gateway = CloudflareAIGateway.configure({
 }).model("workers-ai/@cf/meta/llama-3.1-8b-instruct")
 ```

-Included providers: OpenAI, Anthropic, Google (Gemini), Google Vertex Gemini and Anthropic, Amazon Bedrock, Azure OpenAI, Cloudflare AI Gateway, Cloudflare Workers AI, GitHub Copilot, OpenRouter, xAI, Z.ai, plus generic OpenAI-compatible Chat and Responses entrypoints and an Anthropic Messages-compatible entrypoint.
+Included LLM providers: OpenAI, Anthropic, Google (Gemini), Google Vertex, Amazon Bedrock, Azure OpenAI, Baseten, Cerebras, Cloudflare AI Gateway, Cloudflare Workers AI, DeepInfra, DeepSeek, Fireworks, Groq, Mistral, OpenRouter, TogetherAI, and xAI. Z.ai currently exposes image generation. Generic Chat Completions, Responses, and Anthropic Messages-compatible entrypoints support custom endpoints.

-### Package-like entrypoints
+Each named provider owns its module, endpoint, authentication, and route setup. Providers with the same wire format compose the shared protocol directly:

-Native catalog integrations load provider behavior through package-like entrypoints. These are export paths from the same `@opencode-ai/ai` npm package, not independently published packages. Each entrypoint exports the same `model(modelID, settings)` contract, and `settings` contains serializable provider configuration plus common `headers` and `body` overlays.
+```ts
+import { DeepSeek, Fireworks } from "@opencode-ai/ai/providers"
+
+const deepseek = DeepSeek.configure({ apiKey }).model("deepseek-chat")
+const fireworks = Fireworks.configure({ apiKey }).model("accounts/fireworks/models/my-model")
+```
+
+The former `OpenAICompatible.baseten`, `.cerebras`, `.deepinfra`, `.deepseek`, `.fireworks`, `.groq`, and `.togetherai` presets are replaced by the top-level `Baseten`, `Cerebras`, `DeepInfra`, `DeepSeek`, `Fireworks`, `Groq`, and `TogetherAI` exports. Use `CloudflareAIGateway` and `CloudflareWorkersAI` directly; each has its own module. `OpenAICompatible` configures generic endpoints with an explicit `baseURL`.
+
+### Provider entrypoints
+
+Provider modules are available through dedicated exports from `@opencode-ai/ai`. Each LLM entrypoint exports `model(modelID, settings)`, where `settings` contains provider configuration plus common `headers` and `body` overlays.

 ```ts
 import { model } from "@opencode-ai/ai/providers/openai/responses"

 const selected = model("gpt-5", {
  apiKey: process.env.OPENAI_API_KEY,
-  headers: { "x-application": "opencode" },
+  headers: { "x-application": "example" },
 })
 ```

-OpenAI Chat and OpenAI Responses are separate semantic entrypoints:
+APIs have separate entrypoints:

 - `@opencode-ai/ai/providers/openai/chat`
 - `@opencode-ai/ai/providers/openai/responses`
@@ -517,9 +526,13 @@ import { model } from "@opencode-ai/ai/providers/google-vertex/messages"
 model("claude-sonnet-4-6", { project: "my-project", location: "global" })
 ```

-Provider facades such as `OpenAI.configure(...).responses(...)` remain the direct application API. Package-like entrypoints are the self-similar loading contract used when a catalog selects behavior by export path.
+Additional provider entrypoints include:

-Other provider exports listed above remain direct facades until they explicitly implement the package-like contract. Exporting a provider facade does not implicitly make it a catalog-loadable provider package.
+- `@opencode-ai/ai/providers/baseten`
+- `@opencode-ai/ai/providers/deepseek`
+- `@opencode-ai/ai/providers/fireworks`
+- `@opencode-ai/ai/providers/cloudflare-ai-gateway`
+- `@opencode-ai/ai/providers/cloudflare-workers-ai`

 ## Provider options & HTTP overlays

@@ -546,7 +559,7 @@ LLM.request({

 ## Routes

-Adding a new model or deployment is usually 5-15 lines using `Route.make({ protocol, endpoint, auth, framing, ... })`. The route owns endpoint/auth/framing and the protocol owns body construction plus stream parsing. Transports are reusable IO templates that receive route endpoint/auth at compile time. Capability/catalog metadata lives outside this low-level package; unsupported request shapes fail during protocol lowering. See `AGENTS.md` for the architectural detail.
+Compose a route with `Route.make({ protocol, endpoint, auth, framing, ... })`. The route owns endpoint/auth/framing and the protocol owns body construction plus stream parsing. Transports receive the route's endpoint and auth when preparing requests. Unsupported request shapes fail during protocol lowering.

 ## Effect

@@ -7,7 +7,8 @@ import { AwsV4Signer } from "aws4fetch"
 import { Config, ConfigProvider, Effect, FileSystem, PlatformError, Redacted } from "effect"
 import { FetchHttpClient, HttpClient, HttpClientRequest, type HttpClientResponse } from "effect/unstable/http"
 import * as ProviderShared from "../src/protocols/shared"
-import * as Cloudflare from "../src/providers/cloudflare"
+import { CloudflareAIGateway } from "../src/providers/cloudflare-ai-gateway.js"
+import { CloudflareWorkersAI } from "../src/providers/cloudflare-workers-ai.js"

 type Provider = {
  readonly id: string
@@ -120,11 +121,11 @@ const PROVIDERS: ReadonlyArray<Provider> = [
    ],
    validate: (env) =>
      validateChat({
-        url: `${Cloudflare.aiGatewayBaseURL({
+        url: `${CloudflareAIGateway.baseURL({
          accountId: env.CLOUDFLARE_ACCOUNT_ID,
          gatewayId: env.CLOUDFLARE_GATEWAY_ID || undefined,
        })}/chat/completions`,
-        token: Redacted.make(envValue(env, Cloudflare.aiGatewayAuthEnvVars)),
+        token: Redacted.make(envValue(env, CloudflareAIGateway.authEnvVars)),
        tokenHeader: "cf-aig-authorization",
        model: "workers-ai/@cf/meta/llama-3.1-8b-instruct",
      }),
@@ -140,8 +141,8 @@ const PROVIDERS: ReadonlyArray<Provider> = [
    ],
    validate: (env) =>
      validateChat({
-        url: `${Cloudflare.workersAIBaseURL({ accountId: env.CLOUDFLARE_ACCOUNT_ID })}/chat/completions`,
-        token: Redacted.make(envValue(env, Cloudflare.workersAIAuthEnvVars)),
+        url: `${CloudflareWorkersAI.baseURL({ accountId: env.CLOUDFLARE_ACCOUNT_ID })}/chat/completions`,
+        token: Redacted.make(envValue(env, CloudflareWorkersAI.authEnvVars)),
        model: "@cf/meta/llama-3.1-8b-instruct",
      }),
  },
@@ -415,10 +415,7 @@ const lowerMessages = Effect.fn("BedrockConverse.lowerMessages")(function* (

 // System prompts share the cache-point convention: emit the text block, then
 // optionally a positional `cachePoint` marker.
-const lowerSystem = (
-  breakpoints: BedrockCache.Breakpoints,
-  system: ReadonlyArray<LLMRequest["system"][number]>,
-) => {
+const lowerSystem = (breakpoints: BedrockCache.Breakpoints, system: ReadonlyArray<LLMRequest["system"][number]>) => {
  const content = system
    .filter((part) => part.text.length > 0)
    .flatMap((part) => textWithCache(breakpoints, part.text, part.cache))
@@ -431,7 +428,7 @@ const fromRequest = Effect.fn("BedrockConverse.fromRequest")(function* (request:
  const generation = request.generation
  // Bedrock-Claude shares Anthropic's 4-breakpoint cap. Spend the budget in
  // tools → system → messages order to favour the highest-impact prefixes.
-  const breakpoints = BedrockCache.breakpoints()
+  const breakpoints = BedrockCache.breakpoints(request.model.id)
  const toolConfig = (() => {
    if (flattened.tools.length === 0) return undefined
    return {
@@ -639,6 +639,14 @@ const step = (state: ParserState, event: GeminiEvent) => {
      : state.usage,
  }
  const candidate = event.candidates?.[0]
+  if (candidate?.finishReason && mapFinishReason(candidate.finishReason, state.hasToolCalls) === "error")
+    return Effect.fail(
+      ProviderShared.eventError(
+        state.route,
+        `Gemini stopped with ${candidate.finishReason}`,
+        ProviderShared.encodeJson(event),
+      ),
+    )
  if (!candidate?.content)
    return Effect.succeed([
      { ...nextState, finishReason: candidate?.finishReason ?? nextState.finishReason },
@@ -9,6 +9,8 @@ import {
  AIError,
  InvalidProviderOutputError,
  LLMEvent,
+  ProviderInternalError,
+  UnknownProviderError,
  Usage,
  type FinishReasonDetails,
  type LLMRequest,
@@ -700,6 +702,16 @@ const step = Effect.fn("MistralChat.step")(function* (state: ParserState, event:
    normalized: mapFinishReason(choice.finish_reason),
    raw: choice.finish_reason,
  }
+  if (finishReason.normalized === "error") {
+    const details = {
+      message: `Mistral Chat stopped with ${finishReason.raw}`,
+      body: ProviderShared.encodeJson(event),
+    }
+    return yield* new AIError({
+      reason:
+        finishReason.raw === "network_error" ? new ProviderInternalError(details) : new UnknownProviderError(details),
+    })
+  }
  const incomplete = finishReason.normalized === "length" || finishReason.normalized === "content-filter"
  if (!incomplete && Object.keys(withTools.pendingTools).length > 0)
    return yield* ProviderShared.eventError(
@@ -1,6 +1,6 @@
 import { Schema } from "effect"
 import type { CacheHint } from "../../schema/index.js"
-import { newBreakpoints, ttlBucket, type Breakpoints } from "./cache.js"
+import { newBreakpoints, ttlBucket } from "./cache.js"

 // Bedrock cache markers are positional: emit a `cachePoint` block immediately
 // after the content the caller wants treated as a cacheable prefix. Bedrock
@@ -13,24 +13,46 @@ export const CachePointBlock = Schema.Struct({
 })
 export type CachePointBlock = Schema.Schema.Type<typeof CachePointBlock>

-// Callers pass a shared counter through every `block()` call site so the
-// four-breakpoint budget is respected across `system`, `messages`, and `tools`.
+const LEGACY_CLAUDE = ["anthropic.claude-instant", "anthropic.claude-v1", "anthropic.claude-v2", "anthropic.claude-3-"]
+
+// These legacy Claude releases support explicit caching, but only for five minutes.
+const CLAUDE_5M = [
+  "anthropic.claude-3-5-sonnet-20241022-v2:0",
+  "anthropic.claude-3-5-haiku-20241022-v1:0",
+  "anthropic.claude-3-7-sonnet-20250219-v1:0",
+  "anthropic.claude-sonnet-4-20250514-v1:0",
+  "anthropic.claude-opus-4-20250514-v1:0",
+  "anthropic.claude-opus-4-1-20250805-v1:0",
+]
+
+// Callers share the four-breakpoint budget across system, messages, and tools.
 export const BEDROCK_BREAKPOINT_CAP = 4

-export type { Breakpoints } from "./cache.js"
-export const breakpoints = () => newBreakpoints(BEDROCK_BREAKPOINT_CAP)
+export const breakpoints = (modelID: string) => {
+  // Substring matching also handles regional prefixes and model-bearing ARNs.
+  const short = CLAUDE_5M.some((id) => modelID.includes(id))
+  return {
+    ...newBreakpoints(BEDROCK_BREAKPOINT_CAP),
+    // Assume modern Claude releases retain caching support; older generations need an explicit exception.
+    // Other model families use implicit caching where available.
+    supported: modelID.includes("anthropic.claude-") && (short || !LEGACY_CLAUDE.some((id) => modelID.includes(id))),
+    ttl1h: !short,
+  }
+}
+export type Breakpoints = ReturnType<typeof breakpoints>

 const DEFAULT_5M: CachePointBlock = { cachePoint: { type: "default" } }
 const DEFAULT_1H: CachePointBlock = { cachePoint: { type: "default", ttl: "1h" } }

 export const block = (breakpoints: Breakpoints, cache: CacheHint | undefined): CachePointBlock | undefined => {
+  if (!breakpoints.supported) return undefined
  if (cache?.type !== "ephemeral" && cache?.type !== "persistent") return undefined
  if (breakpoints.remaining <= 0) {
    breakpoints.dropped += 1
    return undefined
  }
  breakpoints.remaining -= 1
-  return ttlBucket(cache.ttlSeconds) === "1h" ? DEFAULT_1H : DEFAULT_5M
+  return breakpoints.ttl1h && ttlBucket(cache.ttlSeconds) === "1h" ? DEFAULT_1H : DEFAULT_5M
 }

 export * as BedrockCache from "./bedrock-cache.js"
@@ -0,0 +1,60 @@
+import type { ProviderPackage } from "../provider-package.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
+import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
+import type { OpenAIProviderOptionsInput } from "./openai-options.js"
+
+export const id = ProviderID.make("baseten")
+const baseURL = "https://inference.baseten.co/v1"
+
+export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
+  ProviderAuthOption<"optional"> & {
+    readonly baseURL?: string
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export interface Settings extends ProviderPackage.Settings {
+  readonly apiKey?: string
+  readonly baseURL?: string
+  readonly providerOptions?: OpenAIProviderOptionsInput
+}
+
+export const route = Route.make({
+  id: "baseten-chat",
+  provider: id,
+  providerMetadataKey: "baseten",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
+})
+
+export const routes = [route]
+
+export const configure = (input: LanguageModelOptions = {}) => {
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
+  const configured = route.with({
+    ...defaults,
+    endpoint: { baseURL: endpoint ?? baseURL },
+    auth: AuthOptions.bearer(input, "BASETEN_API_KEY"),
+  })
+  return {
+    id,
+    model: (modelID: string | ModelID) => configured.model<OpenAIProviderOptionsInput>({ id: modelID }),
+    configure,
+  }
+}
+
+export const provider = configure()
+
+export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) =>
+  configure({
+    apiKey: settings.apiKey,
+    baseURL: settings.baseURL,
+    headers: settings.headers === undefined ? undefined : { ...settings.headers },
+    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
+    providerOptions: settings.providerOptions,
+  }).model(modelID)
+
+export * as Baseten from "./baseten.js"
@@ -1,12 +1,13 @@
 import type { ProviderPackage } from "../provider-package.js"
-import { OpenAICompatibleChat } from "../protocols/openai-compatible-chat.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
-import type { RouteDefaultsInput } from "../route/client.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
-import { profiles } from "./openai-compatible-profile.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("cerebras")
+const baseURL = "https://api.cerebras.ai/v1"

 export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
  ProviderAuthOption<"optional"> & {
@@ -20,19 +21,22 @@ export interface Settings extends ProviderPackage.Settings {
  readonly providerOptions?: OpenAIProviderOptionsInput
 }

-export const route = OpenAICompatibleChat.route.with({
+export const route = Route.make({
  id: "cerebras-chat",
  provider: id,
-  endpoint: { baseURL: profiles.cerebras.baseURL },
+  providerMetadataKey: "cerebras",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
 })

 export const routes = [route]

 export const configure = (input: LanguageModelOptions = {}) => {
-  const { apiKey: _apiKey, auth: _auth, baseURL, ...defaults } = input
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
  const configured = route.with({
    ...defaults,
-    endpoint: { baseURL: baseURL ?? profiles.cerebras.baseURL },
+    endpoint: { baseURL: endpoint ?? baseURL },
    auth: AuthOptions.bearer(input, "CEREBRAS_API_KEY"),
  })
  return {
@@ -0,0 +1,98 @@
+import type { Config, Redacted } from "effect"
+import type { ProviderPackage } from "../provider-package.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
+import { Auth } from "../route/auth.js"
+import type { AtLeastOne, ProviderAuthOption } from "../route/auth-options.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
+import type { OpenAIProviderOptionsInput } from "./openai-options.js"
+
+export const id = ProviderID.make("cloudflare-ai-gateway")
+export const authEnvVars = ["CLOUDFLARE_API_TOKEN", "CF_AIG_TOKEN"] as const
+
+type GatewayURL = AtLeastOne<{
+  readonly accountId: string
+  readonly baseURL: string
+}> & {
+  readonly gatewayId?: string
+}
+
+export type LanguageModelOptions = GatewayURL &
+  Omit<RouteDefaultsInput, "providerOptions"> &
+  ProviderAuthOption<"optional"> & {
+    /** Cloudflare AI Gateway authentication token. Sent as `cf-aig-authorization`. */
+    readonly gatewayApiKey?: string | Redacted.Redacted | Config.Config<string | Redacted.Redacted>
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export type Settings = ProviderPackage.Settings &
+  GatewayURL & {
+    readonly apiKey?: string
+    readonly gatewayApiKey?: string
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export const baseURL = (input: GatewayURL) => {
+  if (input.baseURL) return input.baseURL
+  if (!input.accountId) throw new Error("CloudflareAIGateway.configure requires accountId unless baseURL is supplied")
+  return `https://gateway.ai.cloudflare.com/v1/${encodeURIComponent(input.accountId)}/${encodeURIComponent(input.gatewayId?.trim() || "default")}/compat`
+}
+
+const auth = (input: LanguageModelOptions) => {
+  if ("auth" in input && input.auth) return input.auth
+  const gateway = Auth.optional(input.gatewayApiKey, "gatewayApiKey")
+    .orElse(Auth.config(authEnvVars[0]))
+    .orElse(Auth.config(authEnvVars[1]))
+    .pipe(Auth.bearerHeader("cf-aig-authorization"))
+  if (!("apiKey" in input) || input.apiKey === undefined) return gateway
+  if (input.gatewayApiKey === undefined) return Auth.bearer(input.apiKey)
+  return Auth.bearerHeader("cf-aig-authorization", input.gatewayApiKey).andThen(Auth.bearer(input.apiKey))
+}
+
+export const route = Route.make({
+  id: "cloudflare-ai-gateway",
+  provider: id,
+  providerMetadataKey: "cloudflare-ai-gateway",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions"),
+  framing: OpenAIChat.framing,
+})
+
+export const routes = [route]
+
+export const configure = (input: LanguageModelOptions) => {
+  const {
+    accountId: _accountId,
+    gatewayId: _gatewayId,
+    apiKey: _apiKey,
+    gatewayApiKey: _gatewayApiKey,
+    baseURL: _baseURL,
+    auth: _auth,
+    ...defaults
+  } = input
+  const configured = route.with({
+    ...defaults,
+    endpoint: { baseURL: baseURL(input) },
+    auth: auth(input),
+  })
+  return {
+    id,
+    model: (modelID: string | ModelID) => configured.model<OpenAIProviderOptionsInput>({ id: modelID }),
+    configure,
+  }
+}
+
+export const provider = { id, configure }
+
+export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) =>
+  configure({
+    apiKey: settings.apiKey,
+    gatewayApiKey: settings.gatewayApiKey,
+    baseURL: baseURL(settings),
+    headers: settings.headers === undefined ? undefined : { ...settings.headers },
+    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
+    providerOptions: settings.providerOptions,
+  }).model(modelID)
+
+export * as CloudflareAIGateway from "./cloudflare-ai-gateway.js"
@@ -0,0 +1,71 @@
+import type { ProviderPackage } from "../provider-package.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
+import { AuthOptions, type AtLeastOne, type ProviderAuthOption } from "../route/auth-options.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
+import type { OpenAIProviderOptionsInput } from "./openai-options.js"
+
+export const id = ProviderID.make("cloudflare-workers-ai")
+export const authEnvVars = ["CLOUDFLARE_API_KEY", "CLOUDFLARE_WORKERS_AI_TOKEN"] as const
+
+type WorkersAIURL = AtLeastOne<{
+  readonly accountId: string
+  readonly baseURL: string
+}>
+
+export type LanguageModelOptions = WorkersAIURL &
+  Omit<RouteDefaultsInput, "providerOptions"> &
+  ProviderAuthOption<"optional"> & {
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export type Settings = ProviderPackage.Settings &
+  WorkersAIURL & {
+    readonly apiKey?: string
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export const baseURL = (input: WorkersAIURL) => {
+  if (input.baseURL) return input.baseURL
+  if (!input.accountId) throw new Error("CloudflareWorkersAI.configure requires accountId unless baseURL is supplied")
+  return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(input.accountId)}/ai/v1`
+}
+
+export const route = Route.make({
+  id: "cloudflare-workers-ai",
+  provider: id,
+  providerMetadataKey: "cloudflare-workers-ai",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions"),
+  framing: OpenAIChat.framing,
+})
+
+export const routes = [route]
+
+export const configure = (input: LanguageModelOptions) => {
+  const { accountId: _accountId, apiKey: _apiKey, auth: _auth, baseURL: _baseURL, ...defaults } = input
+  const configured = route.with({
+    ...defaults,
+    endpoint: { baseURL: baseURL(input) },
+    auth: AuthOptions.bearer(input, authEnvVars),
+  })
+  return {
+    id,
+    model: (modelID: string | ModelID) => configured.model<OpenAIProviderOptionsInput>({ id: modelID }),
+    configure,
+  }
+}
+
+export const provider = { id, configure }
+
+export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) =>
+  configure({
+    apiKey: settings.apiKey,
+    baseURL: baseURL(settings),
+    headers: settings.headers === undefined ? undefined : { ...settings.headers },
+    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
+    providerOptions: settings.providerOptions,
+  }).model(modelID)
+
+export * as CloudflareWorkersAI from "./cloudflare-workers-ai.js"
@@ -1,133 +0,0 @@
-import type { Config, Redacted } from "effect"
-import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat.js"
-import { Auth } from "../route/auth.js"
-import { AuthOptions, type AtLeastOne, type ProviderAuthOption } from "../route/auth-options.js"
-import type { RouteDefaultsInput } from "../route/client.js"
-import { ProviderID, type ModelID } from "../schema/index.js"
-import type { OpenAIProviderOptionsInput } from "./openai-options.js"
-
-export const aiGatewayID = ProviderID.make("cloudflare-ai-gateway")
-export const workersAIID = ProviderID.make("cloudflare-workers-ai")
-export const aiGatewayAuthEnvVars = ["CLOUDFLARE_API_TOKEN", "CF_AIG_TOKEN"] as const
-export const workersAIAuthEnvVars = ["CLOUDFLARE_API_KEY", "CLOUDFLARE_WORKERS_AI_TOKEN"] as const
-
-type CloudflareSecret = string | Redacted.Redacted | Config.Config<string | Redacted.Redacted>
-
-type GatewayURL = AtLeastOne<{
-  readonly accountId: string
-  readonly baseURL: string
-}> & {
-  readonly gatewayId?: string
-}
-
-export type AIGatewayOptions = GatewayURL &
-  Omit<RouteDefaultsInput, "providerOptions"> &
-  ProviderAuthOption<"optional"> & {
-    /** Cloudflare AI Gateway authentication token. Sent as `cf-aig-authorization`. */
-    readonly gatewayApiKey?: CloudflareSecret
-    readonly providerOptions?: OpenAIProviderOptionsInput
-  }
-
-type WorkersAIURL = AtLeastOne<{
-  readonly accountId: string
-  readonly baseURL: string
-}>
-
-export type WorkersAIOptions = WorkersAIURL &
-  Omit<RouteDefaultsInput, "providerOptions"> &
-  ProviderAuthOption<"optional"> & {
-    readonly providerOptions?: OpenAIProviderOptionsInput
-  }
-
-export const aiGatewayBaseURL = (input: GatewayURL) => {
-  if (input.baseURL) return input.baseURL
-  if (!input.accountId) throw new Error("CloudflareAIGateway.configure requires accountId unless baseURL is supplied")
-  return `https://gateway.ai.cloudflare.com/v1/${encodeURIComponent(input.accountId)}/${encodeURIComponent(input.gatewayId?.trim() || "default")}/compat`
-}
-
-const aiGatewayAuth = (input: AIGatewayOptions) => {
-  if ("auth" in input && input.auth) return input.auth
-  const gateway = Auth.optional(input.gatewayApiKey, "gatewayApiKey")
-    .orElse(Auth.config("CLOUDFLARE_API_TOKEN"))
-    .orElse(Auth.config("CF_AIG_TOKEN"))
-    .pipe(Auth.bearerHeader("cf-aig-authorization"))
-  if (!("apiKey" in input) || input.apiKey === undefined) return gateway
-  if (input.gatewayApiKey === undefined) return Auth.bearer(input.apiKey)
-  return Auth.bearerHeader("cf-aig-authorization", input.gatewayApiKey).andThen(Auth.bearer(input.apiKey))
-}
-
-export const workersAIBaseURL = (input: WorkersAIURL) => {
-  if (input.baseURL) return input.baseURL
-  if (!input.accountId) throw new Error("CloudflareWorkersAI.configure requires accountId unless baseURL is supplied")
-  return `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(input.accountId)}/ai/v1`
-}
-
-const workersAIAuth = (input: WorkersAIOptions) => {
-  return AuthOptions.bearer(input, workersAIAuthEnvVars)
-}
-
-export const aiGatewayRoute = OpenAICompatibleChat.route.with({
-  id: "cloudflare-ai-gateway",
-  provider: aiGatewayID,
-})
-
-export const workersAIRoute = OpenAICompatibleChat.route.with({
-  id: "cloudflare-workers-ai",
-  provider: workersAIID,
-})
-
-export const routes = [aiGatewayRoute, workersAIRoute]
-
-const aiGatewayDefaults = (options: AIGatewayOptions) => {
-  const {
-    accountId: _accountId,
-    gatewayId: _gatewayId,
-    apiKey: _apiKey,
-    gatewayApiKey: _gatewayApiKey,
-    baseURL: _baseURL,
-    auth: _auth,
-    ...rest
-  } = options
-  return rest
-}
-
-const workersAIDefaults = (options: WorkersAIOptions) => {
-  const { accountId: _accountId, apiKey: _apiKey, auth: _auth, baseURL: _baseURL, ...rest } = options
-  return rest
-}
-
-const configureAIGateway = (options: AIGatewayOptions) => {
-  const route = aiGatewayRoute.with({
-    ...aiGatewayDefaults(options),
-    endpoint: { baseURL: aiGatewayBaseURL(options) },
-    auth: aiGatewayAuth(options),
-  })
-  return {
-    id: aiGatewayID,
-    model: (modelID: string | ModelID) => route.model<OpenAIProviderOptionsInput>({ id: modelID }),
-    configure: configureAIGateway,
-  }
-}
-
-const configureWorkersAI = (options: WorkersAIOptions) => {
-  const route = workersAIRoute.with({
-    ...workersAIDefaults(options),
-    endpoint: { baseURL: workersAIBaseURL(options) },
-    auth: workersAIAuth(options),
-  })
-  return {
-    id: workersAIID,
-    model: (modelID: string | ModelID) => route.model<OpenAIProviderOptionsInput>({ id: modelID }),
-    configure: configureWorkersAI,
-  }
-}
-
-export const CloudflareAIGateway = {
-  id: aiGatewayID,
-  configure: configureAIGateway,
-}
-
-export const CloudflareWorkersAI = {
-  id: workersAIID,
-  configure: configureWorkersAI,
-}
@@ -1,12 +1,13 @@
 import type { ProviderPackage } from "../provider-package.js"
-import { OpenAICompatibleChat } from "../protocols/openai-compatible-chat.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
-import type { RouteDefaultsInput } from "../route/client.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
-import { profiles } from "./openai-compatible-profile.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("deepinfra")
+const baseURL = "https://api.deepinfra.com/v1/openai"

 export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
  ProviderAuthOption<"optional"> & {
@@ -20,21 +21,24 @@ export interface Settings extends ProviderPackage.Settings {
  readonly providerOptions?: OpenAIProviderOptionsInput
 }

-export const route = OpenAICompatibleChat.route.with({
+export const route = Route.make({
  id: "deepinfra-chat",
  provider: id,
-  endpoint: { baseURL: profiles.deepinfra.baseURL },
+  providerMetadataKey: "deepinfra",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
 })

 export const routes = [route]

 export const configure = (input: LanguageModelOptions = {}) => {
-  const { apiKey: _apiKey, auth: _auth, baseURL, ...defaults } = input
-  const root = baseURL?.replace(/\/+$/, "")
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
+  const root = endpoint?.replace(/\/+$/, "")
  const configured = route.with({
    ...defaults,
    endpoint: {
-      baseURL: root === undefined ? profiles.deepinfra.baseURL : root.endsWith("/openai") ? root : `${root}/openai`,
+      baseURL: root === undefined ? baseURL : root.endsWith("/openai") ? root : `${root}/openai`,
    },
    auth: AuthOptions.bearer(input, "DEEPINFRA_API_KEY"),
  })
@@ -0,0 +1,64 @@
+import type { ProviderPackage } from "../provider-package.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
+import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
+import type { OpenAIProviderOptionsInput } from "./openai-options.js"
+
+export const id = ProviderID.make("deepseek")
+const baseURL = "https://api.deepseek.com/v1"
+
+export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
+  ProviderAuthOption<"optional"> & {
+    readonly baseURL?: string
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export interface Settings extends ProviderPackage.Settings {
+  readonly apiKey?: string
+  readonly baseURL?: string
+  readonly providerOptions?: OpenAIProviderOptionsInput
+}
+
+export const route = Route.make({
+  id: "deepseek-chat",
+  provider: id,
+  providerMetadataKey: "deepseek",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
+})
+
+export const routes = [route]
+
+export const configure = (input: LanguageModelOptions = {}) => {
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
+  const configured = route.with({
+    ...defaults,
+    endpoint: { baseURL: endpoint ?? baseURL },
+    auth: AuthOptions.bearer(input, "DEEPSEEK_API_KEY"),
+  })
+  return {
+    id,
+    model: (modelID: string | ModelID) =>
+      configured.model<OpenAIProviderOptionsInput>({
+        id: modelID,
+        compatibility: { maxTokensField: "max_tokens", supportsStore: false },
+      }),
+    configure,
+  }
+}
+
+export const provider = configure()
+
+export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) =>
+  configure({
+    apiKey: settings.apiKey,
+    baseURL: settings.baseURL,
+    headers: settings.headers === undefined ? undefined : { ...settings.headers },
+    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
+    providerOptions: settings.providerOptions,
+  }).model(modelID)
+
+export * as DeepSeek from "./deepseek.js"
@@ -0,0 +1,60 @@
+import type { ProviderPackage } from "../provider-package.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
+import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
+import type { OpenAIProviderOptionsInput } from "./openai-options.js"
+
+export const id = ProviderID.make("fireworks")
+const baseURL = "https://api.fireworks.ai/inference/v1"
+
+export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
+  ProviderAuthOption<"optional"> & {
+    readonly baseURL?: string
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export interface Settings extends ProviderPackage.Settings {
+  readonly apiKey?: string
+  readonly baseURL?: string
+  readonly providerOptions?: OpenAIProviderOptionsInput
+}
+
+export const route = Route.make({
+  id: "fireworks-chat",
+  provider: id,
+  providerMetadataKey: "fireworks",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
+})
+
+export const routes = [route]
+
+export const configure = (input: LanguageModelOptions = {}) => {
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
+  const configured = route.with({
+    ...defaults,
+    endpoint: { baseURL: endpoint ?? baseURL },
+    auth: AuthOptions.bearer(input, "FIREWORKS_API_KEY"),
+  })
+  return {
+    id,
+    model: (modelID: string | ModelID) => configured.model<OpenAIProviderOptionsInput>({ id: modelID }),
+    configure,
+  }
+}
+
+export const provider = configure()
+
+export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) =>
+  configure({
+    apiKey: settings.apiKey,
+    baseURL: settings.baseURL,
+    headers: settings.headers === undefined ? undefined : { ...settings.headers },
+    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
+    providerOptions: settings.providerOptions,
+  }).model(modelID)
+
+export * as Fireworks from "./fireworks.js"
@@ -1,6 +1,7 @@
 import type { ProviderPackage } from "../provider-package.js"
-import { OpenAICompatibleChat } from "../protocols/openai-compatible-chat.js"
-import type { RouteDefaultsInput } from "../route/client.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"
@@ -24,10 +25,13 @@ export interface Settings extends ProviderPackage.Settings {
  readonly providerOptions?: OpenAIProviderOptionsInput
 }

-const route = OpenAICompatibleChat.route.with({
+const route = Route.make({
  id: "google-vertex-chat",
  provider: id,
  providerMetadataKey: "vertex",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions"),
+  framing: OpenAIChat.framing,
 })

 export const routes = [route]
@@ -1,6 +1,7 @@
 import type { ProviderPackage } from "../provider-package.js"
-import { OpenAICompatibleResponses } from "../protocols/openai-compatible-responses.js"
-import type { RouteDefaultsInput } from "../route/client.js"
+import { OpenResponses } from "../protocols/open-responses.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
 import { GoogleVertexShared } from "./google-vertex-shared.js"
 import type { OpenResponsesProviderOptionsInput } from "./open-responses-options.js"
@@ -24,11 +25,14 @@ export interface Settings extends ProviderPackage.Settings {
  readonly providerOptions?: OpenResponsesProviderOptionsInput
 }

-const route = OpenAICompatibleResponses.route.with({
+const route = Route.make({
  id: "google-vertex-responses",
  provider: id,
  providerMetadataKey: "vertex",
-  providerOptions: { store: false },
+  protocol: OpenResponses.protocol,
+  endpoint: Endpoint.path(OpenResponses.PATH),
+  transport: OpenResponses.httpTransport,
+  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
 })

 export const routes = [route]
@@ -7,10 +7,10 @@ import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Protocol } from "../route/protocol.js"
 import { ProviderID, type ModelID, type LLMRequest } from "../schema/index.js"
-import { profiles } from "./openai-compatible-profile.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("groq")
+const baseURL = "https://api.groq.com/openai/v1"

 export type ProviderOptions = Pick<OpenAIProviderOptionsInput, "reasoningEffort"> & {
  /** Controls visible reasoning on GPT-OSS; other models always use parsed reasoning. */
@@ -73,15 +73,15 @@ export const route = Route.make({
  provider: id,
  providerMetadataKey: "openai",
  protocol,
-  endpoint: Endpoint.path("/chat/completions", { baseURL: profiles.groq.baseURL }),
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
  framing: OpenAIChat.framing,
 })

 export const configure = (input: LanguageModelOptions = {}) => {
-  const { apiKey: _apiKey, auth: _auth, baseURL, ...defaults } = input
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
  const configured = route.with({
    ...defaults,
-    endpoint: { baseURL: baseURL ?? profiles.groq.baseURL },
+    endpoint: { baseURL: endpoint ?? baseURL },
    auth: AuthOptions.bearer(input, "GROQ_API_KEY"),
  })
  return {
@@ -3,10 +3,13 @@ export * as AnthropicCompatible from "./anthropic-compatible.js"
 export * as AmazonBedrock from "./amazon-bedrock.js"
 export * as AmazonBedrockMantle from "./amazon-bedrock-mantle.js"
 export * as Azure from "./azure.js"
+export * as Baseten from "./baseten.js"
 export * as Cerebras from "./cerebras.js"
-export * as Cloudflare from "./cloudflare.js"
-export { CloudflareAIGateway, CloudflareWorkersAI } from "./cloudflare.js"
+export * as CloudflareAIGateway from "./cloudflare-ai-gateway.js"
+export * as CloudflareWorkersAI from "./cloudflare-workers-ai.js"
 export * as DeepInfra from "./deepinfra.js"
+export * as DeepSeek from "./deepseek.js"
+export * as Fireworks from "./fireworks.js"
 export * as Google from "./google.js"
 export * as GoogleVertex from "./google-vertex.js"
 export * as GoogleVertexChat from "./google-vertex-chat.js"
@@ -1,20 +0,0 @@
-export interface OpenAICompatibleProfile {
-  readonly provider: string
-  readonly baseURL: string
-}
-
-export const profiles = {
-  baseten: { provider: "baseten", baseURL: "https://inference.baseten.co/v1" },
-  cerebras: { provider: "cerebras", baseURL: "https://api.cerebras.ai/v1" },
-  deepinfra: { provider: "deepinfra", baseURL: "https://api.deepinfra.com/v1/openai" },
-  deepseek: { provider: "deepseek", baseURL: "https://api.deepseek.com/v1" },
-  fireworks: { provider: "fireworks", baseURL: "https://api.fireworks.ai/inference/v1" },
-  groq: { provider: "groq", baseURL: "https://api.groq.com/openai/v1" },
-  openrouter: { provider: "openrouter", baseURL: "https://openrouter.ai/api/v1" },
-  togetherai: { provider: "togetherai", baseURL: "https://api.together.xyz/v1" },
-  xai: { provider: "xai", baseURL: "https://api.x.ai/v1" },
-} as const satisfies Record<string, OpenAICompatibleProfile>
-
-export const byProvider: Record<string, OpenAICompatibleProfile> = Object.fromEntries(
-  Object.values(profiles).map((profile) => [profile.provider, profile]),
-)
@@ -1,9 +1,8 @@
 import { ProviderID, type ModelID } from "../schema/index.js"
-import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat.js"
+import { OpenAICompatibleChat } from "../protocols/openai-compatible-chat.js"
 import type { RouteDefaultsInput } from "../route/client.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
 import type { ProviderPackage } from "../provider-package.js"
-import { profiles, type OpenAICompatibleProfile } from "./openai-compatible-profile.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("openai-compatible")
@@ -22,12 +21,6 @@ export interface Settings extends ProviderPackage.Settings {
  readonly providerOptions?: OpenAIProviderOptionsInput
 }

-export type FamilyModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
-  ProviderAuthOption<"optional"> & {
-    readonly baseURL?: string
-    readonly providerOptions?: OpenAIProviderOptionsInput
-  }
-
 export const routes = [OpenAICompatibleChat.route]

 export const configure = (input: GenericModelOptions) => {
@@ -47,22 +40,6 @@ export const configure = (input: GenericModelOptions) => {
  }
 }

-const define = (profile: OpenAICompatibleProfile) => {
-  const configureProfile = (input: FamilyModelOptions = {}) => {
-    const facade = configure({
-      ...input,
-      baseURL: input.baseURL ?? profile.baseURL,
-      provider: profile.provider,
-    })
-    return {
-      id: ProviderID.make(profile.provider),
-      model: facade.model,
-      configure: configureProfile,
-    }
-  }
-  return configureProfile()
-}
-
 export const provider = {
  id,
  configure,
@@ -78,10 +55,4 @@ export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsIn
    providerOptions: settings.providerOptions,
  }).model(modelID)

-export const baseten = define(profiles.baseten)
-export const cerebras = define(profiles.cerebras)
-export const deepinfra = define(profiles.deepinfra)
-export const deepseek = define(profiles.deepseek)
-export const fireworks = define(profiles.fireworks)
-export const groq = define(profiles.groq)
-export const togetherai = define(profiles.togetherai)
+export * as OpenAICompatible from "./openai-compatible.js"
@@ -5,13 +5,12 @@ import { Protocol } from "../route/protocol.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
 import { ProviderID, type CacheHint, type ModelID } from "../schema/index.js"
 import type { ProviderPackage } from "../provider-package.js"
-import * as OpenAICompatibleProfiles from "./openai-compatible-profile.js"
-import * as OpenAIChat from "../protocols/openai-chat.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
 import { newBreakpoints, ttlBucket } from "../protocols/utils/cache.js"
 import { isRecord } from "../protocols/shared.js"

-export const profile = OpenAICompatibleProfiles.profiles.openrouter
-export const id = ProviderID.make(profile.provider)
+export const id = ProviderID.make("openrouter")
+const baseURL = "https://openrouter.ai/api/v1"
 const ADAPTER = "openrouter"

 type OpenRouterString<Known extends string> = Known | (string & {})
@@ -162,20 +161,20 @@ const bodyOptions = (input: unknown) => {

 export const route = Route.make({
  id: ADAPTER,
-  provider: profile.provider,
+  provider: id,
  providerMetadataKey: "openrouter",
  protocol,
-  endpoint: Endpoint.path("/chat/completions", { baseURL: profile.baseURL }),
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
  framing: OpenAIChat.framing,
 })

 export const routes = [route]

 const configuredRoute = (input: LanguageModelOptions) => {
-  const { apiKey: _, auth: _auth, baseURL, ...rest } = input
+  const { apiKey: _, auth: _auth, baseURL: endpoint, ...rest } = input
  return route.with({
    ...rest,
-    endpoint: { baseURL: baseURL ?? profile.baseURL },
+    endpoint: { baseURL: endpoint ?? baseURL },
    auth: AuthOptions.bearer(input, "OPENROUTER_API_KEY"),
  })
 }
@@ -1,12 +1,13 @@
 import type { ProviderPackage } from "../provider-package.js"
-import { OpenAICompatibleChat } from "../protocols/openai-compatible-chat.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
-import type { RouteDefaultsInput } from "../route/client.js"
+import { Route, type RouteDefaultsInput } from "../route/client.js"
+import { Endpoint } from "../route/endpoint.js"
 import { ProviderID, type ModelID } from "../schema/index.js"
-import { profiles } from "./openai-compatible-profile.js"
 import type { OpenAIProviderOptionsInput } from "./openai-options.js"

 export const id = ProviderID.make("togetherai")
+const baseURL = "https://api.together.xyz/v1"

 export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
  ProviderAuthOption<"optional"> & {
@@ -20,19 +21,22 @@ export interface Settings extends ProviderPackage.Settings {
  readonly providerOptions?: OpenAIProviderOptionsInput
 }

-export const route = OpenAICompatibleChat.route.with({
+export const route = Route.make({
  id: "togetherai-chat",
  provider: id,
-  endpoint: { baseURL: profiles.togetherai.baseURL },
+  providerMetadataKey: "togetherai",
+  protocol: OpenAIChat.protocol,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
 })

 export const routes = [route]

 export const configure = (input: LanguageModelOptions = {}) => {
-  const { apiKey: _apiKey, auth: _auth, baseURL, ...defaults } = input
+  const { apiKey: _apiKey, auth: _auth, baseURL: endpoint, ...defaults } = input
  const configured = route.with({
    ...defaults,
-    endpoint: { baseURL: baseURL ?? profiles.togetherai.baseURL },
+    endpoint: { baseURL: endpoint ?? baseURL },
    auth: AuthOptions.bearer(input, ["TOGETHER_API_KEY", "TOGETHER_AI_API_KEY"]),
  })
  return {
@@ -2,9 +2,7 @@ import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
 import { HttpOptions, ProviderID, type ModelID } from "../schema/index.js"
-import * as OpenAICompatibleProfiles from "./openai-compatible-profile.js"
-import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat.js"
-import * as OpenAIChat from "../protocols/openai-chat.js"
+import { OpenAIChat } from "../protocols/openai-chat.js"
 import { OpenResponsesChannel } from "../protocols/open-responses-channel.js"
 import { XAIResponses } from "../protocols/xai-responses.js"
 import { XAIImages } from "../protocols/xai-images.js"
@@ -12,6 +10,7 @@ import type { OpenAIOptionsInput } from "./openai-options.js"
 import type { ProviderPackage } from "../provider-package.js"

 export const id = ProviderID.make("xai")
+const baseURL = "https://api.x.ai/v1"

 export type XAIProviderOptionsInput = OpenAIOptionsInput & { readonly contextManagement?: never }

@@ -37,7 +36,7 @@ const responsesRoute = Route.make({
  provider: id,
  providerMetadataKey: "xai",
  protocol: XAIResponses.protocol,
-  endpoint: Endpoint.path("/responses", { baseURL: OpenAICompatibleProfiles.profiles.xai.baseURL }),
+  endpoint: Endpoint.path("/responses", { baseURL }),
  transport: OpenResponsesChannel.transport({
    id: "openai-responses",
    name: "xAI Responses",
@@ -51,8 +50,8 @@ const chatRoute = Route.make({
  provider: id,
  providerMetadataKey: "xai",
  protocol: OpenAIChat.protocol,
-  endpoint: Endpoint.path("/chat/completions", { baseURL: OpenAICompatibleProfiles.profiles.xai.baseURL }),
-  transport: OpenAICompatibleChat.route.transport,
+  endpoint: Endpoint.path("/chat/completions", { baseURL }),
+  framing: OpenAIChat.framing,
  headers: ({ request }): Record<string, string> =>
    request.promptCacheKey ? { "x-grok-conv-id": request.promptCacheKey } : {},
 })
@@ -62,19 +61,19 @@ export const routes = [responsesRoute, chatRoute]
 const auth = (options: ProviderAuthOption<"optional">) => AuthOptions.bearer(options, "XAI_API_KEY")

 const configuredResponsesRoute = (input: LanguageModelOptions) => {
-  const { apiKey: _, auth: _auth, baseURL, ...rest } = input
+  const { apiKey: _, auth: _auth, baseURL: endpoint, ...rest } = input
  return responsesRoute.with({
    ...rest,
-    endpoint: { baseURL: baseURL ?? OpenAICompatibleProfiles.profiles.xai.baseURL },
+    endpoint: { baseURL: endpoint ?? baseURL },
    auth: auth(input),
  })
 }

 const configuredChatRoute = (input: LanguageModelOptions) => {
-  const { apiKey: _, auth: _auth, baseURL, ...rest } = input
+  const { apiKey: _, auth: _auth, baseURL: endpoint, ...rest } = input
  return chatRoute.with({
    ...rest,
-    endpoint: { baseURL: baseURL ?? OpenAICompatibleProfiles.profiles.xai.baseURL },
+    endpoint: { baseURL: endpoint ?? baseURL },
    auth: auth(input),
  })
 }
@@ -88,7 +87,7 @@ export const configure = (input: LanguageModelOptions = {}) => {
    XAIImages.model({
      id: modelID,
      auth: auth(input),
-      baseURL: input.baseURL ?? OpenAICompatibleProfiles.profiles.xai.baseURL,
+      baseURL: input.baseURL ?? baseURL,
      headers: input.headers,
      http: input.http === undefined ? undefined : HttpOptions.make(input.http),
    })
@@ -20,7 +20,7 @@ export interface WebSocketChannelExchange {
  readonly connect: {
    readonly url: string
    readonly headers: Headers.Headers
-    /** Provider-safe connection age after which Core should rotate before sending. */
+    /** Provider-safe connection age after which the channel executor should reconnect before sending. */
    readonly rotateAfterMs?: number
  }
  readonly fallback: () => Stream.Stream<string, AIError>
@@ -6,7 +6,8 @@ import * as AmazonBedrock from "../src/providers/amazon-bedrock.js"
 import * as Anthropic from "../src/providers/anthropic.js"
 import * as AnthropicCompatible from "../src/providers/anthropic-compatible.js"
 import * as Azure from "../src/providers/azure.js"
-import * as Cloudflare from "../src/providers/cloudflare.js"
+import { CloudflareWorkersAI } from "../src/providers/cloudflare-workers-ai.js"
+import { DeepSeek } from "../src/providers/deepseek.js"
 import * as Google from "../src/providers/google.js"
 import * as GoogleVertex from "../src/providers/google-vertex.js"
 import * as GoogleVertexChat from "../src/providers/google-vertex-chat.js"
@@ -263,10 +264,10 @@ XAI.configure({ apiKey: "xai-key" }).responses("grok-4", {})
 // @ts-expect-error xAI Chat selectors only accept model ids.
 XAI.configure({ apiKey: "xai-key" }).chat("grok-4", {})

-OpenAICompatible.deepseek.configure({ apiKey: "deepseek-key" }).model("deepseek-chat")
+DeepSeek.configure({ apiKey: "deepseek-key" }).model("deepseek-chat")
 // @ts-expect-error OpenAI-compatible family selectors only accept model ids.
-OpenAICompatible.deepseek.configure({ apiKey: "deepseek-key" }).model("deepseek-chat", {})
+DeepSeek.configure({ apiKey: "deepseek-key" }).model("deepseek-chat", {})

-Cloudflare.CloudflareWorkersAI.configure({ accountId: "account", apiKey: "cf-key" }).model("@cf/meta/llama")
+CloudflareWorkersAI.configure({ accountId: "account", apiKey: "cf-key" }).model("@cf/meta/llama")
 // @ts-expect-error Cloudflare Workers AI model selectors only accept model ids.
-Cloudflare.CloudflareWorkersAI.configure({ accountId: "account", apiKey: "cf-key" }).model("@cf/meta/llama", {})
+CloudflareWorkersAI.configure({ accountId: "account", apiKey: "cf-key" }).model("@cf/meta/llama", {})
@@ -3,8 +3,11 @@ import { AIError, ImageInput, LanguageModel, LLM, LLMClient, Provider } from "@o
 import { Route, Protocol, WebSocketTransport } from "@opencode-ai/ai/route"
 import { Provider as ProviderSubpath } from "@opencode-ai/ai/provider"
 import {
+  Baseten,
  CloudflareAIGateway,
  CloudflareWorkersAI,
+  DeepSeek,
+  Fireworks,
  OpenAI,
  OpenAICompatible,
  OpenRouter,
@@ -48,7 +51,13 @@ describe("public exports", () => {
    expect(OpenAI.model).toBeFunction()
    expect(OpenAI.provider.responses).toBe(OpenAI.responses)
    expect(OpenAI.configure({ apiKey: "fixture" }).responses).toBeFunction()
-    expect(OpenAICompatible.deepseek.model).toBeFunction()
+    for (const provider of [Baseten, DeepSeek, Fireworks]) {
+      expect(provider.configure).toBeFunction()
+      expect(provider.model).toBeFunction()
+    }
+    for (const name of ["baseten", "cerebras", "deepinfra", "deepseek", "fireworks", "groq", "togetherai"]) {
+      expect(OpenAICompatible).not.toHaveProperty(name)
+    }
    expect(
      OpenAICompatibleResponses.configure({ baseURL: "https://responses.test/v1" }).model("fixture").route.id,
    ).toBe("openai-compatible-responses")
@@ -1,7 +1,7 @@
 import { LLM } from "../../src/index.js"
 import { OpenAICompatible } from "../../src/providers.js"

-const model = OpenAICompatible.deepseek.model("deepseek-chat")
+const model = OpenAICompatible.configure({ baseURL: "https://compatible.example/v1" }).model("test-model")

 LLM.request({ model, prompt: "Hello", providerOptions: { store: false } })

@@ -32,6 +32,11 @@ describe("provider package entrypoints", () => {
      import("@opencode-ai/ai/providers/cerebras"),
      import("@opencode-ai/ai/providers/deepinfra"),
      import("@opencode-ai/ai/providers/groq"),
+      import("@opencode-ai/ai/providers/baseten"),
+      import("@opencode-ai/ai/providers/deepseek"),
+      import("@opencode-ai/ai/providers/fireworks"),
+      import("@opencode-ai/ai/providers/cloudflare-ai-gateway"),
+      import("@opencode-ai/ai/providers/cloudflare-workers-ai"),
    ])

    for (const module of modules) expect(module.model).toBeFunction()
@@ -60,6 +65,27 @@ describe("provider package entrypoints", () => {
    expect(deepinfra.route.defaults.http?.body).toEqual(settings.body)
  })

+  test("maps Cloudflare package settings onto provider-owned models", async () => {
+    const modules = await Promise.all([
+      import("@opencode-ai/ai/providers/cloudflare-ai-gateway"),
+      import("@opencode-ai/ai/providers/cloudflare-workers-ai"),
+    ])
+    for (const provider of modules) {
+      const selected = provider.model("provider-model", {
+        accountId: "account",
+        apiKey: "fixture",
+        headers: { "x-application": "opencode" },
+        body: { custom: true },
+        providerOptions: { reasoningEffort: "high" },
+      })
+      expect(selected.provider).toBe(provider.id)
+      expect(selected.route.endpoint.baseURL).toBe(provider.baseURL({ accountId: "account" }))
+      expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
+      expect(selected.route.defaults.http?.body).toEqual({ custom: true })
+      expect(selected.route.defaults.providerOptions).toEqual({ reasoningEffort: "high" })
+    }
+  })
+
  test("maps OpenRouter and xAI package settings onto executable models", async () => {
    const OpenRouter = await import("@opencode-ai/ai/providers/openrouter")
    const XAI = await import("@opencode-ai/ai/providers/xai")
@@ -0,0 +1,119 @@
+import { describe, expect } from "bun:test"
+import { Effect } from "effect"
+import { CacheHint, LLM, Message, ToolCallPart } from "../../src/index.js"
+import { AmazonBedrock } from "../../src/providers.js"
+import { compileRequest } from "../../src/route/client.js"
+import { it } from "../lib/effect.js"
+
+const bedrock = AmazonBedrock.configure({ apiKey: "fixture" })
+
+describe("Bedrock Converse cache policy", () => {
+  for (const id of [
+    "deepseek.r1-v1:0",
+    "meta.llama3-3-70b-instruct-v1:0",
+    "mistral.mistral-large-2402-v1:0",
+    "qwen.qwen3-coder-480b-a35b-v1:0",
+    "openai.gpt-oss-120b-1:0",
+    "cohere.command-r-v1:0",
+    "anthropic.claude-instant-v1",
+    "anthropic.claude-v1",
+    "anthropic.claude-v2",
+    "anthropic.claude-v2:1",
+    "anthropic.claude-3-haiku-20240307-v1:0",
+    "anthropic.claude-3-sonnet-20240229-v1:0",
+    "anthropic.claude-3-opus-20240229-v1:0",
+    "anthropic.claude-3-5-sonnet-20240620-v1:0",
+    "amazon.nova-lite-v1:0",
+    "global.amazon.nova-2-lite-v1:0",
+    "custom-model",
+    "arn:aws:bedrock:us-east-1:123456789012:application-inference-profile/abc123",
+  ]) {
+    for (const policy of [undefined, "auto", "none", { tools: true, system: true, messages: { tail: 3 } }] as const) {
+      it.effect(`omits checkpoints for ${id} (${JSON.stringify(policy)})`, () =>
+        Effect.gen(function* () {
+          // Exercise both automatic placement and manual hints at every lowering site.
+          const cache = policy === "none" ? new CacheHint({ type: "ephemeral", ttlSeconds: 3600 }) : undefined
+          const prepared = yield* compileRequest(
+            LLM.request({
+              model: bedrock.model(id),
+              cache: policy,
+              system: [{ type: "text", text: "System prefix", cache }],
+              tools: [{ name: "lookup", description: "Lookup", inputSchema: { type: "object" }, cache }],
+              messages: [
+                Message.user([{ type: "text", text: "Question", cache }]),
+                Message.system([{ type: "text", text: "Update", cache }]),
+                Message.assistant([
+                  { type: "text", text: "Answer", cache },
+                  { type: "reasoning", text: "Unsigned reasoning", cache },
+                  ToolCallPart.make({ id: "call_1", name: "lookup", input: {} }),
+                ]),
+                Message.tool({ id: "call_1", name: "lookup", result: "Result", cache }),
+              ],
+            }),
+          )
+
+          expect(JSON.stringify(prepared.body)).not.toContain("cachePoint")
+          expect(prepared.body).toMatchObject({
+            modelId: id,
+            system: [{ text: "System prefix" }],
+            toolConfig: { tools: [{ toolSpec: { name: "lookup" } }] },
+            messages: [
+              { role: "user", content: [{ text: "Question" }, { text: "<system-update>\nUpdate\n</system-update>" }] },
+              {
+                role: "assistant",
+                content: [{ text: "Answer" }, { text: "Unsigned reasoning" }, { toolUse: { name: "lookup" } }],
+              },
+              { role: "user", content: [{ toolResult: { content: [{ json: "Result" }] } }] },
+            ],
+          })
+        }),
+      )
+    }
+  }
+
+  for (const [id, ttl] of [
+    ["anthropic.claude-3-5-sonnet-20241022-v2:0", undefined],
+    ["us.anthropic.claude-3-5-haiku-20241022-v1:0", undefined],
+    ["eu.anthropic.claude-3-7-sonnet-20250219-v1:0", undefined],
+    ["apac.anthropic.claude-sonnet-4-20250514-v1:0", undefined],
+    ["anthropic.claude-opus-4-20250514-v1:0", undefined],
+    ["anthropic.claude-opus-4-1-20250805-v1:0", undefined],
+    ["anthropic.claude-sonnet-4-5-20250929-v1:0", "1h"],
+    ["global.anthropic.claude-sonnet-99", "1h"],
+    ["anthropic.claude-new-family-99", "1h"],
+    ["arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-sonnet-4-6", "1h"],
+    ["arn:aws:bedrock:us-east-1:123456789012:inference-profile/us.anthropic.claude-sonnet-4-6", "1h"],
+  ] as const) {
+    for (const ttlSeconds of [undefined, 3600]) {
+      it.effect(`preserves Claude checkpoints for ${id} (TTL: ${ttlSeconds ?? "default"})`, () =>
+        Effect.gen(function* () {
+          const prepared = yield* compileRequest(
+            LLM.request({
+              model: bedrock.model(id),
+              system: [
+                { type: "text", text: "Agent" },
+                { type: "text", text: "Project" },
+              ],
+              tools: [{ name: "lookup", description: "Lookup", inputSchema: { type: "object" } }],
+              prompt: "Question",
+              cache:
+                ttlSeconds === undefined ? undefined : { tools: true, system: true, messages: { tail: 1 }, ttlSeconds },
+            }),
+          )
+          const marker = {
+            cachePoint: ttlSeconds === undefined || ttl === undefined ? { type: "default" } : { type: "default", ttl },
+          }
+
+          expect(prepared.body).toMatchObject({
+            modelId: id,
+            toolConfig: { tools: [{ toolSpec: { name: "lookup" } }, marker] },
+            system: [{ text: "Agent" }, marker, { text: "Project" }, marker],
+            messages: [{ role: "user", content: [{ text: "Question" }, marker] }],
+          })
+          if (ttlSeconds === undefined || ttl === undefined)
+            expect(JSON.stringify(prepared.body)).not.toContain('"ttl"')
+        }),
+      )
+    }
+  }
+})
@@ -136,7 +136,7 @@ const captureHeaders = (target: LanguageModel) =>
 const model = AmazonBedrock.configure({
  baseURL: "https://bedrock-runtime.test",
  apiKey: "test-bearer",
-}).model("anthropic.claude-3-5-sonnet-20240620-v1:0")
+}).model("anthropic.claude-sonnet-4-5-20250929-v1:0")

 const baseRequest = LLM.request({
  id: "req_1",
@@ -155,7 +155,7 @@ describe("Bedrock Converse route", () => {
      const prepared = yield* compileRequest(baseRequest)

      expect(prepared.body).toEqual({
-        modelId: "anthropic.claude-3-5-sonnet-20240620-v1:0",
+        modelId: "anthropic.claude-sonnet-4-5-20250929-v1:0",
        system: [{ text: "You are concise." }],
        messages: [{ role: "user", content: [{ text: "Say hello." }] }],
        inferenceConfig: { maxTokens: 64, temperature: 0 },
@@ -2,7 +2,8 @@ import { describe, expect, test } from "bun:test"
 import { ConfigProvider, Effect, Schema } from "effect"
 import { HttpClientRequest } from "effect/unstable/http"
 import { LLM, LLMEvent } from "../../src/index.js"
-import { CloudflareAIGateway, CloudflareWorkersAI } from "../../src/providers/cloudflare.js"
+import { CloudflareAIGateway } from "../../src/providers/cloudflare-ai-gateway.js"
+import { CloudflareWorkersAI } from "../../src/providers/cloudflare-workers-ai.js"
 import { compileRequest } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
 import { dynamicResponse } from "../lib/http.js"
@@ -1643,19 +1643,14 @@ describe("Gemini route", () => {
    }),
  )

-  it.effect("maps current blocking and invalid-output finish reasons", () =>
+  it.effect("preserves blocking finishes and rejects invalid-output finish reasons", () =>
    Effect.gen(function* () {
      const reasons = [
        ["MODEL_ARMOR", "content-filter"],
        ["IMAGE_PROHIBITED_CONTENT", "content-filter"],
        ["IMAGE_RECITATION", "content-filter"],
        ["LANGUAGE", "content-filter"],
-        ["UNEXPECTED_TOOL_CALL", "error"],
-        ["NO_IMAGE", "error"],
        ["IMAGE_OTHER", "unknown"],
-        ["TOO_MANY_TOOL_CALLS", "error"],
-        ["MISSING_THOUGHT_SIGNATURE", "error"],
-        ["MALFORMED_RESPONSE", "error"],
      ] as const

      for (const [raw, normalized] of reasons) {
@@ -1666,6 +1661,26 @@ describe("Gemini route", () => {
        )
        expect(response.finishReason).toEqual({ normalized, raw })
      }
+
+      for (const raw of [
+        "MALFORMED_FUNCTION_CALL",
+        "UNEXPECTED_TOOL_CALL",
+        "NO_IMAGE",
+        "TOO_MANY_TOOL_CALLS",
+        "MISSING_THOUGHT_SIGNATURE",
+        "MALFORMED_RESPONSE",
+      ]) {
+        const event = { candidates: [{ finishReason: raw, finishMessage: "Provider detail" }], responseId: "failure" }
+        const error = yield* LLMClient.generate(request).pipe(
+          Effect.provide(fixedResponse(sseEvents(event))),
+          Effect.flip,
+        )
+        expect(error).toMatchObject({
+          _tag: "AI.Error",
+          reason: { _tag: "InvalidProviderOutput", body: JSON.stringify(event), http: { status: 200 } },
+          message: `Gemini stopped with ${raw}`,
+        })
+      }
    }),
  )

@@ -1,7 +1,13 @@
 import * as Anthropic from "../../src/providers/anthropic.js"
 import * as AnthropicCompatible from "../../src/providers/anthropic-compatible.js"
-import { Cerebras, DeepInfra, TogetherAI } from "../../src/providers/index.js"
-import { CloudflareAIGateway, CloudflareWorkersAI } from "../../src/providers/cloudflare.js"
+import {
+  Cerebras,
+  CloudflareAIGateway,
+  CloudflareWorkersAI,
+  DeepInfra,
+  DeepSeek,
+  TogetherAI,
+} from "../../src/providers/index.js"
 import * as Google from "../../src/providers/google.js"
 import * as OpenAI from "../../src/providers/openai.js"
 import * as OpenAICompatible from "../../src/providers/openai-compatible.js"
@@ -45,16 +51,18 @@ const cloudflareAIGatewayWorkers = cloudflareAIGateway.model("workers-ai/@cf/met
 const cloudflareAIGatewayWorkersTools = cloudflareAIGateway.model("workers-ai/@cf/openai/gpt-oss-20b")
 const cloudflareWorkersAI = cloudflareWorkers.model("@cf/meta/llama-3.1-8b-instruct")
 const cloudflareWorkersAITools = cloudflareWorkers.model("@cf/openai/gpt-oss-20b")
-const deepseek = OpenAICompatible.deepseek
-  .configure({ apiKey: process.env.DEEPSEEK_API_KEY ?? "fixture" })
-  .model("deepseek-chat")
+const deepseek = DeepSeek.configure({ apiKey: process.env.DEEPSEEK_API_KEY ?? "fixture" }).model("deepseek-chat")
 const together = TogetherAI.configure({
  apiKey: process.env.TOGETHER_API_KEY ?? process.env.TOGETHER_AI_API_KEY ?? "fixture",
 }).model("meta-llama/Llama-3.3-70B-Instruct-Turbo")
 const cerebras = Cerebras.configure({ apiKey: process.env.CEREBRAS_API_KEY ?? "fixture" }).model("gpt-oss-120b")
-const groq = OpenAICompatible.groq
-  .configure({ apiKey: process.env.GROQ_API_KEY ?? "fixture" })
-  .model("llama-3.3-70b-versatile")
+// These older cassettes exercise generic Chat compatibility. Native Groq request
+// shaping and reasoning are covered by groq.recorded.test.ts.
+const groq = OpenAICompatible.configure({
+  provider: "groq",
+  baseURL: "https://api.groq.com/openai/v1",
+  apiKey: process.env.GROQ_API_KEY ?? "fixture",
+}).model("llama-3.3-70b-versatile")
 const deepInfra = DeepInfra.configure({ apiKey: process.env.DEEPINFRA_API_KEY ?? "fixture" }).model(
  "meta-llama/Llama-3.3-70B-Instruct-Turbo",
 )
@@ -600,7 +600,6 @@ describe("Mistral Chat", () => {
        ["stop", "stop"],
        ["model_length", "length"],
        ["tool_calls", "tool-calls"],
-        ["error", "error"],
        ["future_reason", "unknown"],
      ] as const) {
        const response = yield* LLMClient.generate(request).pipe(
@@ -609,6 +608,22 @@ describe("Mistral Chat", () => {
        expect(response.finishReason).toEqual({ normalized, raw })
      }

+      for (const [raw, tag] of [
+        ["error", "UnknownProvider"],
+        ["network_error", "ProviderInternal"],
+      ] as const) {
+        const event = { ...chunk({}, raw), diagnostics: { trace: "failure" } }
+        const error = yield* LLMClient.generate(request).pipe(
+          Effect.provide(fixedResponse(sseEvents(event))),
+          Effect.flip,
+        )
+        expect(error).toMatchObject({
+          _tag: "AI.Error",
+          reason: { _tag: tag, body: JSON.stringify(event), http: { status: 200 } },
+          message: `Mistral Chat stopped with ${raw}`,
+        })
+      }
+
      const truncated = yield* LLMClient.generate(request).pipe(
        Effect.provide(
          fixedResponse(
@@ -8,10 +8,13 @@ import {
  Anthropic,
  AnthropicCompatible,
  Azure,
+  Baseten,
  Cerebras,
  CloudflareAIGateway,
  CloudflareWorkersAI,
  DeepInfra,
+  DeepSeek,
+  Fireworks,
  Google,
  GoogleVertex,
  GoogleVertexChat,
@@ -57,6 +60,9 @@ describe("native OpenAI-compatible providers", () => {
        "custom",
      ],
      [Cerebras.configure({ apiKey: "test" }).model("model"), "cerebras"],
+      [Baseten.configure({ apiKey: "test" }).model("model"), "baseten"],
+      [DeepSeek.configure({ apiKey: "test" }).model("model"), "deepseek"],
+      [Fireworks.configure({ apiKey: "test" }).model("model"), "fireworks"],
      [DeepInfra.configure({ apiKey: "test" }).model("model"), "deepinfra"],
      [TogetherAI.configure({ apiKey: "test" }).model("model"), "togetherai"],
      [CloudflareAIGateway.configure({ accountId: "account" }).model("model"), "cloudflare-ai-gateway"],
@@ -87,6 +93,36 @@ describe("native OpenAI-compatible providers", () => {
    expect(cerebras.route.endpoint.baseURL).toBe("https://api.cerebras.ai/v1")
  })

+  it.effect("preserves extracted providers' Chat requests and identity through custom endpoints", () =>
+    Effect.gen(function* () {
+      for (const provider of [Baseten, DeepSeek, Fireworks]) {
+        const settings = {
+          apiKey: "fixture",
+          baseURL: "https://gateway.example/v1",
+          providerOptions: { reasoningEffort: "high" },
+        }
+        const selected = provider.configure(settings).model("test-model")
+        expect(selected.provider).toBe(provider.id)
+        expect(selected.route.id).toBe(`${provider.id}-chat`)
+        expect(selected.route.protocol).toBe("openai-chat")
+        expect(selected.route.endpoint.baseURL).toBe(settings.baseURL)
+        const input = {
+          prompt: "Use a tool.",
+          generation: { maxTokens: 48 },
+          tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
+        }
+        const native = yield* compileRequest(LLM.request({ ...input, model: selected }))
+        const generic = yield* compileRequest(
+          LLM.request({
+            ...input,
+            model: OpenAICompatible.configure({ ...settings, provider: provider.id }).model("test-model"),
+          }),
+        )
+        expect(native.body).toEqual(generic.body)
+      }
+    }),
+  )
+
  test("preserves native DeepInfra provider and route identity", () => {
    const deepinfra = DeepInfra.configure({ apiKey: "fixture" }).model("google/gemma-3-27b-it")
    expect(deepinfra).toMatchObject({
@@ -164,7 +200,7 @@ describe("native OpenAI-compatible providers", () => {
  })

  test("maps package settings onto native executable models", () => {
-    for (const native of [TogetherAI, Cerebras]) {
+    for (const native of [Baseten, Cerebras, DeepSeek, Fireworks, TogetherAI]) {
      const selected = native.model("provider-model", {
        apiKey: "fixture",
        baseURL: "https://gateway.example/v1",
@@ -183,6 +219,24 @@ describe("native OpenAI-compatible providers", () => {
  it.effect("resolves provider environment credentials and preserves deprecated Together credentials", () =>
    Effect.gen(function* () {
      const scenarios = [
+        {
+          model: Baseten.configure().model("model"),
+          env: { BASETEN_API_KEY: "baseten-secret" },
+          token: "baseten-secret",
+          url: "https://inference.baseten.co/v1/chat/completions",
+        },
+        {
+          model: DeepSeek.configure().model("deepseek-chat"),
+          env: { DEEPSEEK_API_KEY: "deepseek-secret" },
+          token: "deepseek-secret",
+          url: "https://api.deepseek.com/v1/chat/completions",
+        },
+        {
+          model: Fireworks.configure().model("model"),
+          env: { FIREWORKS_API_KEY: "fireworks-secret" },
+          token: "fireworks-secret",
+          url: "https://api.fireworks.ai/inference/v1/chat/completions",
+        },
        {
          model: TogetherAI.configure().model("llama"),
          env: { TOGETHER_API_KEY: "together-primary", TOGETHER_AI_API_KEY: "together-legacy" },
@@ -4,7 +4,6 @@ import { HttpClientRequest } from "effect/unstable/http"
 import { LLM, LLMRequest, Message, ToolCallPart, ToolChoice, ToolDefinition } from "../../src/index.js"
 import { Auth, LLMClient } from "../../src/route.js"
 import { compileRequest } from "../../src/route/client.js"
-import * as OpenAICompatible from "../../src/providers/openai-compatible.js"
 import * as OpenAICompatibleChat from "../../src/protocols/openai-compatible-chat.js"
 import { it } from "../lib/effect.js"
 import { dynamicResponse, fixedResponse } from "../lib/http.js"
@@ -41,15 +40,6 @@ const usageChunk = (usage: object) => ({
  usage,
 })

-const providerFamilies = [
-  ["baseten", OpenAICompatible.baseten, "https://inference.baseten.co/v1"],
-  ["cerebras", OpenAICompatible.cerebras, "https://api.cerebras.ai/v1"],
-  ["deepinfra", OpenAICompatible.deepinfra, "https://api.deepinfra.com/v1/openai"],
-  ["deepseek", OpenAICompatible.deepseek, "https://api.deepseek.com/v1"],
-  ["fireworks", OpenAICompatible.fireworks, "https://api.fireworks.ai/inference/v1"],
-  ["togetherai", OpenAICompatible.togetherai, "https://api.together.xyz/v1"],
-] as const
-
 describe("OpenAI-compatible Chat route", () => {
  it.effect("prepares generic Chat target", () =>
    Effect.gen(function* () {
@@ -91,39 +81,6 @@ describe("OpenAI-compatible Chat route", () => {
    }),
  )

-  test("provides model helpers for compatible provider families", () => {
-    expect(
-      providerFamilies.map(([provider, family]) => {
-        const model = family.configure({ apiKey: "test-key" }).model(`${provider}-model`)
-        return {
-          id: String(model.id),
-          provider: String(model.provider),
-          route: model.route.id,
-          baseURL: model.route.endpoint.baseURL,
-        }
-      }),
-    ).toEqual(
-      providerFamilies.map(([provider, _, baseURL]) => ({
-        id: `${provider}-model`,
-        provider,
-        route: "openai-compatible-chat",
-        baseURL,
-      })),
-    )
-
-    const custom = OpenAICompatible.deepseek
-      .configure({
-        apiKey: "test-key",
-        baseURL: "https://custom.deepseek.test/v1",
-      })
-      .model("deepseek-chat")
-    expect(custom).toMatchObject({
-      provider: "deepseek",
-      route: { id: "openai-compatible-chat" },
-    })
-    expect(custom.route.endpoint.baseURL).toBe("https://custom.deepseek.test/v1")
-  })
-
  it.effect("matches AI SDK compatible basic request body fixture", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(request)
@@ -34,7 +34,7 @@ const observationFrame = (observation: ChannelObservation) => {

 const terminal = (observation: ChannelObservation) => observation.type !== "frame"

-// This deliberately models only sequential test traffic. Core owns production connection pooling and recovery.
+// This channel fixture supports sequential test traffic.
 const makeChannel = Effect.gen(function* () {
  const constructor = yield* Socket.WebSocketConstructor
  let connection: WebSocketConnection | undefined
@@ -0,0 +1,264 @@
+import { expect, story } from "../../storybook/playwright/story"
+
+story("maps grouped and collapsed switches to the timeline settings", async ({ mount }) => {
+  const component = await mount("settings-timeline-detail--interactive")
+  await component.getByRole("button", { name: "Advanced", exact: true }).click()
+  const shell = component.getByRole("group", { name: "Shell", exact: true })
+  const grouped = shell.getByRole("switch", { name: "Shell grouped", exact: true })
+  const collapsed = shell.getByRole("switch", { name: "Shell collapsed", exact: true })
+  const value = component.locator('[data-slot="timeline-detail-fixture-value"]')
+
+  await expect(component.getByRole("switch")).toHaveCount(9)
+  await expect(component.getByText("Activity", { exact: true })).toHaveCount(0)
+  await expect(grouped).toBeChecked()
+  await expect(collapsed).toBeChecked()
+  await shell.locator('[data-field="placement"] [data-slot="switch-control"]').click()
+  await shell.locator('[data-field="details"] [data-slot="switch-control"]').click()
+  await expect(value).toContainText('"shell":{"placement":"separate","details":"expanded"}')
+  await grouped.focus()
+  await grouped.press("Space")
+  await collapsed.focus()
+  await collapsed.press("Space")
+  await expect(value).toContainText('"shell":{"placement":"grouped","details":"collapsed"}')
+  await expect(component.getByRole("group", { name: "Subagents", exact: true }).getByRole("switch")).toHaveCount(1)
+})
+
+story("replaces hidden switches with solid lines and restores options", async ({ mount, page }) => {
+  const component = await mount("settings-timeline-detail--interactive")
+  await component.getByRole("button", { name: "Advanced", exact: true }).click()
+  const shell = component.getByRole("group", { name: "Shell", exact: true })
+  const visibility = shell.getByRole("button", { name: "Shell visibility" })
+  const label = shell.locator('[data-slot="timeline-detail-activity"] > label')
+  const color = await label.evaluate((element) => getComputedStyle(element).color)
+  const iconColor = await visibility.evaluate((element) => getComputedStyle(element).color)
+  await shell.locator('[data-field="placement"] [data-slot="switch-control"]').click()
+  await shell.locator('[data-field="details"] [data-slot="switch-control"]').click()
+  await visibility.hover()
+  await expect(page.getByRole("tooltip")).toHaveText("Hide")
+  expect(await page.getByRole("tooltip").evaluate((element) => element.getBoundingClientRect().bottom)).toBeLessThan(
+    await visibility.evaluate((element) => element.getBoundingClientRect().top),
+  )
+  await visibility.click()
+
+  await expect(visibility).toHaveAttribute("aria-pressed", "false")
+  await expect(shell.getByRole("switch")).toHaveCount(0)
+  await expect(shell.locator('[data-slot="timeline-detail-unavailable"]')).toHaveCount(2)
+  await expect(shell.locator('[data-slot="timeline-detail-unavailable"]').first()).toHaveCSS(
+    "border-top-style",
+    "solid",
+  )
+  await expect(component.locator('[data-slot="timeline-detail-fixture-value"]')).toContainText(
+    '"shell":{"placement":"hidden","details":"expanded"}',
+  )
+  await expect(label).not.toHaveCSS("color", color)
+  await expect(visibility.locator("use")).toHaveAttribute("href", "#opencode-v2-icon-outline-eye-slash")
+  await component.getByRole("button", { name: "Advanced", exact: true }).hover()
+  await expect(visibility).not.toHaveCSS("color", iconColor)
+  await expect(shell.locator('[data-slot="timeline-detail-unavailable"]').first()).toHaveCSS(
+    "border-top-color",
+    await visibility.evaluate((element) => getComputedStyle(element).color),
+  )
+  await visibility.hover()
+  await expect(page.getByRole("tooltip")).toHaveText("Show")
+  expect(await page.getByRole("tooltip").evaluate((element) => element.getBoundingClientRect().bottom)).toBeLessThan(
+    await visibility.evaluate((element) => element.getBoundingClientRect().top),
+  )
+  await visibility.click()
+
+  await expect(visibility).toHaveAttribute("aria-pressed", "true")
+  await expect(label).toHaveCSS("color", color)
+  await expect(visibility.locator("use")).toHaveAttribute("href", "#opencode-v2-icon-outline-eye")
+  await expect(shell.locator('[data-slot="timeline-detail-unavailable"]')).toHaveCount(0)
+  await expect(shell.getByRole("switch", { name: "Shell grouped", exact: true })).toBeEnabled()
+  await expect(shell.getByRole("switch", { name: "Shell collapsed", exact: true })).toBeEnabled()
+  await expect(shell.getByRole("switch", { name: "Shell grouped", exact: true })).not.toBeChecked()
+  await expect(shell.getByRole("switch", { name: "Shell collapsed", exact: true })).not.toBeChecked()
+})
+
+story("toggles visibility by clicking the activity label", async ({ mount }) => {
+  const component = await mount("settings-timeline-detail--interactive")
+  await component.getByRole("button", { name: "Advanced", exact: true }).click()
+  const shell = component.getByRole("group", { name: "Shell", exact: true })
+  const label = shell.locator('[data-slot="timeline-detail-activity"] > label')
+  const visibility = shell.getByRole("button", { name: "Shell visibility" })
+
+  await expect(label).toHaveCSS("cursor", "default")
+  await label.click()
+  await expect(visibility).toHaveAttribute("aria-pressed", "false")
+  await expect(shell.getByRole("switch")).toHaveCount(0)
+  await expect(shell.locator('[data-slot="timeline-detail-unavailable"]')).toHaveCount(2)
+  await label.click()
+  await expect(visibility).toHaveAttribute("aria-pressed", "true")
+  await expect(shell.getByRole("switch", { name: "Shell grouped", exact: true })).toBeChecked()
+  await expect(shell.getByRole("switch", { name: "Shell collapsed", exact: true })).toBeChecked()
+})
+
+story("only highlights the eye when hovering the icon, not its activity label", async ({ mount }) => {
+  const component = await mount("settings-timeline-detail--interactive")
+  await component.getByRole("button", { name: "Advanced", exact: true }).click()
+  const shell = component.getByRole("group", { name: "Shell", exact: true })
+  const visibility = shell.getByRole("button", { name: "Shell visibility" })
+  const label = shell.locator('[data-slot="timeline-detail-activity"] > label')
+
+  for (const hidden of [false, true]) {
+    if (hidden) await label.click()
+    await visibility.hover()
+    await expect(visibility).not.toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+    await label.hover()
+    await expect(visibility).toHaveCSS("background-color", "rgba(0, 0, 0, 0)")
+  }
+})
+
+story("opens advanced on returning to custom settings but not presets", async ({ mount }) => {
+  const component = await mount("settings-timeline-detail--interactive")
+  const advanced = component.getByRole("button", { name: "Advanced", exact: true })
+  await expect(advanced).toHaveAttribute("aria-expanded", "false")
+  await advanced.click()
+  await component.locator('[data-category="shell"][data-field="placement"] [data-slot="switch-control"]').click()
+  await expect(component.getByRole("slider")).toHaveAttribute("aria-valuetext", "Custom")
+  await advanced.click()
+  await expect(advanced).toHaveAttribute("aria-expanded", "false")
+  await component.getByRole("button", { name: "Leave settings" }).click()
+  await expect(advanced).toHaveCount(0)
+  await component.getByRole("button", { name: "Return to settings" }).click()
+  await expect(advanced).toHaveAttribute("aria-expanded", "true")
+  await expect(component.getByRole("switch", { name: "Shell grouped", exact: true })).not.toBeChecked()
+
+  await component.getByRole("slider").press("End")
+  await expect(component.getByRole("slider")).toHaveAttribute("aria-valuetext", "Everything")
+  await component.getByRole("button", { name: "Leave settings" }).click()
+  await component.getByRole("button", { name: "Return to settings" }).click()
+  await expect(advanced).toHaveAttribute("aria-expanded", "false")
+})
+
+story("keeps visibility and switches in sync with the preset slider", async ({ mount }) => {
+  const component = await mount("settings-timeline-detail--interactive")
+  await component.getByRole("button", { name: "Advanced", exact: true }).click()
+  const slider = component.getByRole("slider", { name: "Timeline detail" })
+  await slider.focus()
+  await slider.press("Home")
+  await expect(slider).toHaveAttribute("aria-valuetext", "Messages only")
+  await expect(component.getByRole("switch")).toHaveCount(0)
+  await expect(component.locator('[data-slot="timeline-detail-unavailable"]')).toHaveCount(9)
+  await expect(component.locator('[data-action="timeline-detail-visibility"][aria-pressed="false"]')).toHaveCount(6)
+  await component.getByRole("button", { name: "Shell visibility" }).click()
+  await expect(component.getByRole("switch", { name: "Shell grouped", exact: true })).toBeChecked()
+  await expect(slider).toHaveAttribute("aria-valuetext", "Custom")
+  await slider.focus()
+  await slider.press("End")
+  await expect(slider).toHaveAttribute("aria-valuetext", "Everything")
+  await expect(component.getByRole("switch")).toHaveCount(9)
+  await expect(component.locator('[data-slot="timeline-detail-unavailable"]')).toHaveCount(0)
+  await expect(component.locator('[data-action="timeline-detail-visibility"][aria-pressed="true"]')).toHaveCount(6)
+  await expect(component.getByRole("switch", { checked: true })).toHaveCount(0)
+})
+
+for (const direction of ["ltr", "rtl"]) {
+  for (const theme of ["light", "dark"]) {
+    story(`fits narrow and wide layouts in ${direction}, ${theme}`, async ({ mount, page }, testInfo) => {
+      await page.setViewportSize({ width: 900, height: 900 })
+      const component = await mount("settings-timeline-detail--interactive", { globals: { direction, theme } })
+      await expect(component.locator('[data-slot="timeline-detail-summary"]')).toHaveCSS(
+        "color",
+        await component
+          .locator('[data-slot="settings-row-title"]')
+          .evaluate((element) => getComputedStyle(element).color),
+      )
+      await component.getByRole("button", { name: "Advanced", exact: true }).click()
+      const track = component.locator('[data-slot="timeline-detail-track"]')
+      await expect(track).toHaveCSS(
+        "--timeline-detail-track-background",
+        await track.evaluate(
+          (element, theme) =>
+            getComputedStyle(element)
+              .getPropertyValue(theme === "light" ? "--v2-background-bg-layer-04" : "--v2-background-bg-layer-03")
+              .trim(),
+          theme,
+        ),
+      )
+      if (theme === "light") {
+        await expect(track.locator("span").first()).toHaveCSS("background-image", "none")
+        await expect(track).toHaveCSS(
+          "--timeline-detail-marker-background",
+          await track.evaluate((element) => getComputedStyle(element).getPropertyValue("--v2-grey-500").trim()),
+        )
+      }
+      if (theme === "dark") {
+        await expect(track.locator("span").first()).not.toHaveCSS("background-image", "none")
+      }
+      await page.screenshot({ path: testInfo.outputPath(`timeline-${theme}-${direction}.png`) })
+      const list = component.locator('[data-slot="timeline-detail-list"]')
+      await expect(component.locator('[data-slot="timeline-detail-categories"]')).toHaveCSS("margin-top", "0px")
+      for (const [column, field] of [
+        [2, "placement"],
+        [3, "details"],
+      ] as const) {
+        const heading = await component
+          .locator(`[data-slot="timeline-detail-columns"] > :nth-child(${column})`)
+          .evaluate((element) => {
+            const rect = element.getBoundingClientRect()
+            return rect.x + rect.width / 2
+          })
+        const toggle = await component
+          .locator(`[data-category="shell"][data-field="${field}"] [data-slot="switch-control"]`)
+          .evaluate((element) => {
+            const rect = element.getBoundingClientRect()
+            return rect.x + rect.width / 2
+          })
+        expect(Math.abs(heading - toggle)).toBeLessThan(1)
+      }
+      await expect(component.locator('[data-slot="timeline-detail-activity"]').first()).toHaveCSS("gap", "12px")
+      for (const width of [900, 320]) {
+        await page.setViewportSize({ width, height: 900 })
+        await expect(component.getByRole("switch", { name: "Shell grouped", exact: true })).toBeVisible()
+        expect(await list.evaluate((element) => element.scrollWidth <= element.clientWidth)).toBe(true)
+        const visibility = component.getByRole("button", { name: "Shell visibility" })
+        await visibility.focus()
+        await visibility.press("Space")
+        await expect(visibility).toHaveAttribute("aria-pressed", "false")
+        await expect(component.getByRole("switch", { name: "Shell grouped", exact: true })).toHaveCount(0)
+        await expect(
+          component
+            .getByRole("group", { name: "Shell", exact: true })
+            .locator('[data-slot="timeline-detail-unavailable"]'),
+        ).toHaveCount(2)
+        await visibility.press("Space")
+        await expect(visibility).toHaveAttribute("aria-pressed", "true")
+
+        const slider = component.getByRole("slider", { name: "Timeline detail" })
+        const track = component.locator('[data-slot="timeline-detail-track"]')
+        expect(await track.evaluate((element) => element.getBoundingClientRect().width)).toBe(
+          await component
+            .locator('[data-slot="timeline-detail-scale"]')
+            .evaluate((element) => element.getBoundingClientRect().width),
+        )
+        await slider.focus()
+        await slider.press("Home")
+        for (const position of [0, 1, 2, 3, 4]) {
+          if (position > 0) await slider.press("ArrowUp")
+          await expect(track).toHaveCSS("--timeline-detail-progress", `${position * 25}%`)
+          const fill = await track.evaluate((element) => {
+            const style = getComputedStyle(element, "::before")
+            return {
+              fraction: parseFloat(style.width) / element.getBoundingClientRect().width,
+              start: style.getPropertyValue("inset-inline-start"),
+              color: style.backgroundColor,
+              remainder: getComputedStyle(element).backgroundColor,
+            }
+          })
+          expect(fill.fraction).toBeCloseTo(position / 4, 2)
+          expect(fill.start).toBe("0px")
+          expect(fill.color).not.toBe(fill.remainder)
+          const marker = await track.locator("span").nth(position).boundingBox()
+          const bounds = await track.boundingBox()
+          expect(marker).not.toBeNull()
+          expect(bounds).not.toBeNull()
+          expect((marker!.x + marker!.width / 2 - bounds!.x) / bounds!.width).toBeCloseTo(
+            direction === "rtl" ? 1 - position / 4 : position / 4,
+            2,
+          )
+        }
+      }
+    })
+  }
+}
@@ -0,0 +1,79 @@
+import { expect, story } from "../../storybook/playwright/story"
+
+story("enables Any only after confirmation and supports resetting the preview", async ({ mount }) => {
+  const component = await mount("app-current-session-surface--web-search-request")
+  const card = component.getByRole("region", { name: "Third-party web search" })
+  await expect(card.getByRole("button", { name: "Enable", exact: true })).toBeEnabled()
+  await expect(card.getByRole("button", { name: "Search provider Any", exact: true })).toBeVisible()
+  await card.getByRole("button", { name: "Enable", exact: true }).click()
+  await expect(component.getByRole("status")).toHaveText("Web search selection (local only): random")
+  await expect(card).toHaveCount(0)
+  await component.getByRole("button", { name: "Reset", exact: true }).click()
+  await expect(card.getByRole("button", { name: "Enable", exact: true })).toBeEnabled()
+})
+
+story("declining search is an explicit disabled selection", async ({ mount }) => {
+  const component = await mount("app-current-session-surface--web-search-request")
+  const card = component.getByRole("region", { name: "Third-party web search" })
+  await card.getByRole("button", { name: "Don’t use search", exact: true }).click()
+  await expect(component.getByRole("status")).toHaveText("Web search selection (local only): false")
+  await expect(card).toHaveCount(0)
+})
+
+story("sizes provider options to their content", async ({ mount, page }) => {
+  const component = await mount("app-current-session-surface--web-search-request")
+  await component.getByRole("button", { name: "Search provider Any", exact: true }).click()
+  const menu = page.getByRole("listbox", { name: "Search provider", exact: true })
+  await expect(menu).toBeVisible()
+  const metrics = await menu.evaluate((listbox) => {
+    const items = Array.from(listbox.querySelectorAll('[data-component="menu-v2-item"]'))
+    const longest = items
+      .flatMap((item) => {
+        const label = item.querySelector('[data-slot="menu-v2-item-content"]')?.getBoundingClientRect()
+        const check = item.querySelector('[data-slot="menu-v2-item-indicator"]')?.getBoundingClientRect()
+        return label && check ? [{ label, check }] : []
+      })
+      .toSorted((a, b) => b.label.width - a.label.width)[0]
+    return {
+      width: listbox.getBoundingClientRect().width,
+      gap: longest ? longest.check.left - longest.label.right : 0,
+    }
+  })
+  expect(metrics.width).toBeLessThan(160)
+  expect(metrics.gap).toBe(24)
+})
+
+for (const width of [360, 1200]) {
+  for (const direction of ["ltr", "rtl"]) {
+    for (const theme of ["light", "dark"]) {
+      story(`selects and confirms a provider at ${width}px in ${direction} ${theme}`, async ({ mount, page }) => {
+        await page.setViewportSize({ width, height: 900 })
+        const component = await mount("app-current-session-surface--web-search-request", {
+          globals: { theme, direction },
+        })
+        const card = component.getByRole("region", { name: "Third-party web search" })
+        const select = card.getByRole("button", { name: /^Search provider/ })
+        await expect(select).toBeEnabled()
+        await expect(card).toHaveCSS("direction", direction)
+        expect(await card.evaluate((node) => node.scrollWidth <= node.clientWidth)).toBe(true)
+        await select.focus()
+        await select.press("Enter")
+        const list = page.getByRole("listbox", { name: "Search provider", exact: true })
+        await expect(list).toHaveCSS("direction", direction)
+        await list.getByRole("option", { name: "Parallel", exact: true }).click()
+        await expect(select).toHaveText("Parallel")
+        await expect(card).toBeVisible()
+        await expect(component.getByRole("status")).toHaveText("Ready")
+        await expect(select).toBeFocused()
+        await select.press("Tab")
+        await expect(card.getByRole("button", { name: "Don’t use search", exact: true })).toBeFocused()
+        await page.keyboard.press("Tab")
+        const enable = card.getByRole("button", { name: "Enable", exact: true })
+        await expect(enable).toBeFocused()
+        await enable.press("Enter")
+        await expect(component.getByRole("status")).toHaveText("Web search selection (local only): parallel")
+        await expect(card).toHaveCount(0)
+      })
+    }
+  }
+}
@@ -43,6 +43,7 @@ The suite contains:
 - home-session click timing split between content and titlebar-tab paint
 - single-session tab close timing through stable home restoration
 - cached session repaint and mutation tracing
+- large-session search scan, first-result reveal, and highlight stabilization
 - streaming timeline throughput, RAF-gap, long-task, geometry, and remount diagnostics
 - retained renderer heap with a large model catalog across repeated session navigation

@@ -0,0 +1,69 @@
+import { benchmark, expect } from "../benchmark"
+import { buildInitialStreamEvent, setupTimelineBenchmark, textPartID } from "./session-timeline-benchmark.fixture"
+import {
+  collectTimelineSearchMetrics,
+  installTimelineSearchProbe,
+  waitForStableTimelineSearch,
+} from "./session-timeline-search-probe"
+
+benchmark("searches a large virtualized session and reveals the first result", async ({ page, report }) => {
+  benchmark.setTimeout(180_000)
+  const historyTurns = Number(process.env.TIMELINE_SEARCH_HISTORY_TURNS ?? 320)
+  const completionTimeout = Number(process.env.TIMELINE_SEARCH_COMPLETION_TIMEOUT_MS ?? 60_000)
+  const query = "Historical prompt"
+  const targetPartID = "msg_0000_0000_a_user:text:0"
+  const expectedCounter = `1/${historyTurns}`
+  const fixture = await setupTimelineBenchmark(page, {
+    historyTurns,
+    eventBatch: 1,
+  })
+
+  fixture.transport.enqueue(buildInitialStreamEvent(1))
+  await expect(fixture.text).toContainText("Implementation plan")
+  await fixture.scrollToBottom()
+  await fixture.waitForStableGeometry()
+  // Chromium reserves the physical shortcut for its native find overlay, so request the same controller path directly.
+  await page.evaluate(() => document.dispatchEvent(new Event("opencode:timeline-search-open")))
+
+  const search = page.locator('[data-component="timeline-search-bar"]')
+  const field = search.getByRole("searchbox", { name: "Find..." })
+  const count = search.locator('[data-slot="timeline-search-count"]')
+  const target = page.locator(`[data-timeline-part-id="${targetPartID}"]`)
+  await expect(field).toBeVisible()
+  await expect(field).toBeFocused()
+  await installTimelineSearchProbe(page, { targetPartID })
+
+  await field.fill(query)
+  await expect(count).toHaveText(expectedCounter)
+  await expect(target).toBeVisible({ timeout: completionTimeout })
+  await waitForStableTimelineSearch(page, { counter: expectedCounter, targetPartID, timeout: completionTimeout })
+  const metrics = await collectTimelineSearchMetrics(page, { counter: expectedCounter, targetPartID })
+
+  expect(metrics.summary.handlerDurationMs).toBeDefined()
+  expect(metrics.summary.firstCountObservedMs).toBeDefined()
+  expect(metrics.summary.firstTargetVisibleMs).toBeDefined()
+  expect(metrics.summary.firstActiveHighlightObservedMs).toBeDefined()
+  expect(metrics.summary.stableResultObservedMs).toBeDefined()
+  expect(metrics.summary.activeHighlightRanges).toBe(1)
+  report(metrics, { historyTurns, query, expectedMatches: historyTurns })
+
+  // Check navigation and the V2 assistant content IDs outside the measured interval.
+  await field.press("Enter")
+  await expect(count).toHaveText(`2/${historyTurns}`)
+  await field.press("Shift+Enter")
+  await expect(count).toHaveText(expectedCounter)
+  await field.fill("Implementation plan")
+  await expect(count).toHaveText("1/1")
+  await expect(fixture.text).toBeInViewport()
+  await expect
+    .poll(() =>
+      page.evaluate(() => {
+        const range = [...(CSS.highlights.get("timeline-search-hit-active") ?? [])][0]
+        return range?.startContainer.parentElement?.closest<HTMLElement>("[data-timeline-part-id]")?.dataset
+          .timelinePartId
+      }),
+    )
+    .toBe(textPartID)
+  await field.press("Escape")
+  await expect(search).toBeHidden()
+})
@@ -0,0 +1,176 @@
+import type { Page } from "@playwright/test"
+
+export type TimelineSearchSample = {
+  observedAtMs: number
+  counter: string
+  targetMounted: boolean
+  targetVisible: boolean
+  targetTopPx?: number
+  activeRanges: number
+  activePartID?: string
+  activeVisible: boolean
+  scrollTopPx: number
+}
+
+type TimelineSearchProbe = {
+  samples: TimelineSearchSample[]
+  handlerDurationMs?: number
+  initialScrollTopPx: number
+  stop: () => void
+}
+
+export async function installTimelineSearchProbe(page: Page, input: { targetPartID: string }) {
+  await page.evaluate(({ targetPartID }) => {
+    const search = document.querySelector<HTMLElement>('[data-component="timeline-search-bar"]')
+    const field = search?.querySelector<HTMLInputElement>('[data-slot="text-input-v2-input"]')
+    const root = [...document.querySelectorAll<HTMLElement>(".scroll-view__viewport")].find((element) =>
+      element.querySelector("[data-timeline-row]"),
+    )
+    if (!search || !field || !root) throw new Error("missing timeline search benchmark nodes")
+
+    const samples: TimelineSearchSample[] = []
+    const initialScrollTopPx = root.scrollTop
+    let startedAt: number | undefined
+    let handlerDurationMs: number | undefined
+    let frame: number | undefined
+    let running = true
+
+    const visibleInRoot = (rect: DOMRect) => {
+      const viewport = root.getBoundingClientRect()
+      return rect.width > 0 && rect.height > 0 && rect.bottom > viewport.top && rect.top < viewport.bottom
+    }
+    const sample = () => {
+      if (!running || startedAt === undefined) return
+      frame = requestAnimationFrame(() => {
+        frame = undefined
+        setTimeout(() => {
+          if (!running || startedAt === undefined) return
+          const target = root.querySelector<HTMLElement>(`[data-timeline-part-id="${targetPartID}"]`)
+          const targetRect = target?.getBoundingClientRect()
+          const highlight = CSS.highlights.get("timeline-search-hit-active")
+          const ranges = highlight ? [...highlight] : []
+          const active = ranges.find((range): range is Range => range instanceof Range)
+          const activeRect = active?.getBoundingClientRect()
+          const activeElement =
+            active?.startContainer instanceof Element ? active.startContainer : active?.startContainer.parentElement
+
+          samples.push({
+            observedAtMs: performance.now() - startedAt,
+            counter:
+              search.querySelector<HTMLElement>('[data-slot="timeline-search-count"]')?.textContent?.trim() ?? "",
+            targetMounted: !!target,
+            targetVisible: !!targetRect && visibleInRoot(targetRect),
+            targetTopPx: targetRect?.top,
+            activeRanges: ranges.length,
+            activePartID: activeElement?.closest<HTMLElement>("[data-timeline-part-id]")?.dataset.timelinePartId,
+            activeVisible: !!activeRect && visibleInRoot(activeRect),
+            scrollTopPx: root.scrollTop,
+          })
+          sample()
+        }, 0)
+      })
+    }
+    const onInputCapture = (event: Event) => {
+      if (event.target !== field || startedAt !== undefined) return
+      startedAt = performance.now()
+      sample()
+    }
+    const onInput = (event: Event) => {
+      if (event.target !== field || startedAt === undefined || handlerDurationMs !== undefined) return
+      handlerDurationMs = performance.now() - startedAt
+    }
+    document.addEventListener("input", onInputCapture, { capture: true })
+    document.addEventListener("input", onInput)
+    ;(window as Window & { __timelineSearchBenchmark?: TimelineSearchProbe }).__timelineSearchBenchmark = {
+      samples,
+      initialScrollTopPx,
+      get handlerDurationMs() {
+        return handlerDurationMs
+      },
+      stop: () => {
+        running = false
+        document.removeEventListener("input", onInputCapture, { capture: true })
+        document.removeEventListener("input", onInput)
+        if (frame !== undefined) cancelAnimationFrame(frame)
+      },
+    }
+  }, input)
+}
+
+export async function waitForStableTimelineSearch(
+  page: Page,
+  input: { counter: string; targetPartID: string; timeout: number },
+) {
+  await page.waitForFunction(
+    ({ counter, targetPartID }) => {
+      const samples = (window as Window & { __timelineSearchBenchmark?: TimelineSearchProbe }).__timelineSearchBenchmark
+        ?.samples
+      if (!samples) return false
+      return samples.some((_, index) => {
+        const stable = samples.slice(index, index + 3)
+        if (stable.length !== 3) return false
+        return stable.every(
+          (sample, sampleIndex) =>
+            sample.counter === counter &&
+            sample.targetVisible &&
+            sample.activeRanges === 1 &&
+            sample.activePartID === targetPartID &&
+            sample.activeVisible &&
+            (sampleIndex === 0 ||
+              (Math.abs(sample.scrollTopPx - stable[sampleIndex - 1]!.scrollTopPx) <= 1 &&
+                Math.abs((sample.targetTopPx ?? Infinity) - (stable[sampleIndex - 1]!.targetTopPx ?? -Infinity)) <= 1)),
+        )
+      })
+    },
+    { counter: input.counter, targetPartID: input.targetPartID },
+    { timeout: input.timeout },
+  )
+}
+
+export async function collectTimelineSearchMetrics(page: Page, input: { counter: string; targetPartID: string }) {
+  const result = await page.evaluate(() => {
+    const probe = (window as Window & { __timelineSearchBenchmark?: TimelineSearchProbe }).__timelineSearchBenchmark
+    if (!probe) throw new Error("missing timeline search benchmark probe")
+    probe.stop()
+    return {
+      samples: probe.samples,
+      handlerDurationMs: probe.handlerDurationMs,
+      initialScrollTopPx: probe.initialScrollTopPx,
+    }
+  })
+  const first = (predicate: (sample: TimelineSearchSample) => boolean) => result.samples.find(predicate)?.observedAtMs
+  const stable = result.samples.findIndex((_, index) => {
+    const samples = result.samples.slice(index, index + 3)
+    if (samples.length !== 3) return false
+    return samples.every(
+      (sample, sampleIndex) =>
+        sample.counter === input.counter &&
+        sample.targetVisible &&
+        sample.activeRanges === 1 &&
+        sample.activePartID === input.targetPartID &&
+        sample.activeVisible &&
+        (sampleIndex === 0 ||
+          (Math.abs(sample.scrollTopPx - samples[sampleIndex - 1]!.scrollTopPx) <= 1 &&
+            Math.abs((sample.targetTopPx ?? Infinity) - (samples[sampleIndex - 1]!.targetTopPx ?? -Infinity)) <= 1)),
+    )
+  })
+  const final = result.samples.at(-1)
+
+  return {
+    summary: {
+      handlerDurationMs: result.handlerDurationMs,
+      firstCountObservedMs: first((sample) => sample.counter === input.counter),
+      firstTargetMountedMs: first((sample) => sample.targetMounted),
+      firstTargetVisibleMs: first((sample) => sample.targetVisible),
+      firstActiveHighlightObservedMs: first(
+        (sample) => sample.activeRanges === 1 && sample.activePartID === input.targetPartID && sample.activeVisible,
+      ),
+      stableResultObservedMs: stable >= 0 ? result.samples[stable + 2]?.observedAtMs : undefined,
+      initialScrollTopPx: result.initialScrollTopPx,
+      finalScrollTopPx: final?.scrollTopPx,
+      scrollDistancePx: final === undefined ? undefined : Math.abs(result.initialScrollTopPx - final.scrollTopPx),
+      activeHighlightRanges: final?.activeRanges,
+    },
+    samples: result.samples,
+  }
+}
@@ -7,11 +7,13 @@ const directory = "C:/OpenCode/OpenFileExpand"
 const projectID = "proj_open_file_expand"
 const sessionID = "ses_open_file_expand"
 const title = "Open file expand"
+const longFilename = "a-very-long-file-name-that-must-overflow-the-file-sidebar-instead-of-being-truncated.ts"
+const longPath = `frontend/${longFilename}`
 const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`

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

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

+  const viewport = sidebar.locator('[data-slot="session-review-v2-sidebar-tree"] .scroll-view__viewport')
+  const longRow = panel.getByRole("button", { name: longFilename })
+  await expect(longRow).toBeVisible()
+  await expect.poll(() => viewport.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeGreaterThan(0)
+  expect(
+    await longRow.evaluate((element) => getComputedStyle(element.querySelector("bdi")!.parentElement!).textOverflow),
+  ).toBe("clip")
+  expect(await longRow.evaluate((element) => element.getBoundingClientRect().width)).toBeGreaterThanOrEqual(
+    await viewport.evaluate((element) => element.clientWidth),
+  )
+  await expect
+    .poll(() =>
+      panel.locator('[data-slot="file-tree-v2-row"]').evaluateAll((rows) => {
+        const widths = rows.map((row) => row.getBoundingClientRect().width)
+        return Math.max(...widths) - Math.min(...widths)
+      }),
+    )
+    .toBeLessThanOrEqual(0.5)
+  await expect(longRow.locator('[data-slot="file-tree-v2-label"]')).toHaveCSS("margin-inline-end", "12px")
+  const status = longRow.locator('[data-slot="file-tree-v2-change"]')
+  await expect(status).toHaveText("A")
+  const statusBox = await status.boundingBox()
+  if (!statusBox) throw new Error("File status has no bounding box")
+  const viewportBox = await viewport.boundingBox()
+  if (!viewportBox) throw new Error("File tree viewport has no bounding box")
+  expect(viewportBox.x + viewportBox.width - statusBox.x - statusBox.width).toBeLessThanOrEqual(24)
+
+  await viewport.hover()
+  const horizontalThumb = sidebar.locator('.scroll-view__thumb[data-orientation="horizontal"]')
+  await expect(horizontalThumb).toHaveCSS("opacity", "1")
+  await page.mouse.wheel(1_000, 0)
+  await expect.poll(() => viewport.evaluate((element) => Math.abs(element.scrollLeft))).toBeGreaterThan(0)
+  await expect(horizontalThumb).toHaveAttribute("data-visible", "true")
+  await expect
+    .poll(() =>
+      status.evaluate((element) => {
+        const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
+        return viewport.right - element.getBoundingClientRect().right
+      }),
+    )
+    .toBeLessThanOrEqual(24)
+
+  const beforeDrag = await viewport.evaluate((element) => Math.abs(element.scrollLeft))
+  const thumbBox = await horizontalThumb.boundingBox()
+  if (!thumbBox) throw new Error("Horizontal scrollbar thumb has no bounding box")
+  await page.mouse.move(thumbBox.x + thumbBox.width / 2, thumbBox.y + thumbBox.height / 2)
+  await page.mouse.down()
+  await page.mouse.move(thumbBox.x + thumbBox.width / 2 - 40, thumbBox.y + thumbBox.height / 2)
+  await page.mouse.up()
+  await expect.poll(() => viewport.evaluate((element) => Math.abs(element.scrollLeft))).toBeLessThan(beforeDrag)
+
+  const filter = panel.getByRole("combobox", { name: "Filter files" })
+  await filter.fill(longFilename)
+  const filteredRow = panel.getByRole("option", { name: longFilename })
+  await expect(filteredRow).toBeVisible()
+  const filteredStatus = filteredRow.locator('[data-slot="file-tree-v2-change"]')
+  await expect(filteredStatus).toHaveText("A")
+  await expect.poll(() => viewport.evaluate((element) => element.scrollWidth - element.clientWidth)).toBeGreaterThan(0)
+
+  await viewport.evaluate((element) => {
+    element.setAttribute("dir", "rtl")
+    element.scrollLeft = 0
+    element.dispatchEvent(new Event("scroll"))
+  })
+  await expect
+    .poll(() =>
+      filteredStatus.evaluate((element) => {
+        const viewport = element.closest<HTMLElement>(".scroll-view__viewport")!.getBoundingClientRect()
+        return element.getBoundingClientRect().left - viewport.left
+      }),
+    )
+    .toBeLessThanOrEqual(24)
+  const rtlThumbBox = await horizontalThumb.boundingBox()
+  if (!rtlThumbBox) throw new Error("RTL horizontal scrollbar thumb has no bounding box")
+  await page.mouse.move(rtlThumbBox.x + rtlThumbBox.width / 2, rtlThumbBox.y + rtlThumbBox.height / 2)
+  await page.mouse.down()
+  await page.mouse.move(rtlThumbBox.x + rtlThumbBox.width / 2 - 40, rtlThumbBox.y + rtlThumbBox.height / 2)
+  await page.mouse.up()
+  await expect.poll(() => viewport.evaluate((element) => element.scrollLeft)).toBeLessThan(0)
+  await viewport.evaluate((element) => {
+    element.removeAttribute("dir")
+    element.scrollLeft = 0
+    element.dispatchEvent(new Event("scroll"))
+  })
+
+  await filter.fill("")
+
  const appRow = panel.locator('[data-slot="file-tree-v2-row"][data-path="frontend/app.ts"]')
  await expect(appRow).toBeVisible()
  await appRow.click()
@@ -53,7 +53,7 @@ for (const direction of ["ltr", "rtl"] as const) {
      await expect(trigger).toBeEnabled()
      await expect(trigger.locator("use")).toHaveAttribute(
        "href",
-        `#opencode-v2-icon-${workspace ? "workspace-isolated" : "monitor"}`,
+        `#opencode-v2-icon-${workspace ? "outline-worktree" : "monitor"}`,
      )
      const background = await trigger.evaluate((element) => getComputedStyle(element).backgroundColor)
      await trigger.hover()
@@ -267,7 +267,7 @@ for (const state of ["closed", "unopened"] as const) {
        messages.resolve()
        await expect(header.getByRole("button", { name: "More options", exact: true })).toBeVisible()
      }
-      await expect(trigger.locator("use")).toHaveAttribute("href", "#opencode-v2-icon-workspace-isolated")
+      await expect(trigger.locator("use")).toHaveAttribute("href", "#opencode-v2-icon-outline-worktree")
      await trigger.click()
      await expect(menu.getByRole("menuitem", { name: fixture.project.name, exact: true })).toBeEnabled()
      await expect(menu.getByRole("menuitem", { name: directory, exact: true })).toBeDisabled()
@@ -23,17 +23,21 @@ test("changes timeline presets and saves custom thinking details", async ({ page
  const slider = settings.getByRole("slider", { name: "Timeline detail", exact: true })
  await expect(slider).toBeEnabled()
  await slider.press("Home")
-  for (const [index, name] of ["Everything", "Detailed", "Compact", "Quiet", "Text only"].entries()) {
+  for (const [index, name] of ["Messages only", "Quiet", "Compact", "Detailed", "Everything"].entries()) {
    if (index) await slider.press("ArrowRight")
    await expect(slider).toHaveValue(String(index))
    await expect(slider).toHaveAttribute("aria-valuetext", name)
  }
-  await slider.press("Home")
+  await slider.press("End")
  await settings.getByRole("button", { name: "Advanced", exact: true }).click()
-  await settings.getByRole("button", { name: "Thinking Placement Separate", exact: true }).click()
-  await page.getByRole("option", { name: "Grouped", exact: true }).click()
-  await settings.getByRole("button", { name: "Thinking Details Expanded", exact: true }).click()
-  await page.getByRole("option", { name: "Collapsed", exact: true }).click()
+  const grouped = settings.getByRole("switch", { name: "Thinking grouped", exact: true })
+  const collapsed = settings.getByRole("switch", { name: "Thinking collapsed", exact: true })
+  await expect(grouped).not.toBeChecked()
+  await expect(collapsed).not.toBeChecked()
+  await settings.locator('[data-category="thinking"][data-field="placement"] [data-slot="switch-control"]').click()
+  await settings.locator('[data-category="thinking"][data-field="details"] [data-slot="switch-control"]').click()
+  await expect(grouped).toBeChecked()
+  await expect(collapsed).toBeChecked()
  await expect(slider).toHaveAttribute("aria-valuetext", "Custom")
  await expect
    .poll(() =>
@@ -154,8 +154,8 @@ test("worktree deletion sends the project location separately from the target",
  const settings = page.getByTestId("settings-screen")
  await settings.getByRole("tab", { name: "Worktrees", exact: true }).click()
  await expect(settings.getByText(sandboxes[0], { exact: true })).toBeVisible()
-  await settings.getByRole("button", { name: 'Delete worktree "workspace-1"?', exact: true }).click()
-  const confirmation = page.getByRole("dialog", { name: "Delete worktree", exact: true })
+  await settings.getByRole("button", { name: "Delete “workspace-1”?", exact: true }).click()
+  const confirmation = page.getByRole("dialog", { name: "Delete “workspace-1”?", exact: true })
  const remove = confirmation.getByRole("button", { name: "Delete worktree", exact: true })
  await expect(remove).toBeEnabled()
  const deleting = page.waitForRequest(
@@ -33,7 +33,7 @@ for (const viewport of [
    const slider = settings.getByRole("slider", { name: "Timeline detail", exact: true })
    await expect(settings).toBeFocused()
    await page.setViewportSize(viewport)
-    await expect(slider).toHaveAccessibleDescription(/Choose how much activity appears in the timeline/)
+    await expect(slider).toHaveAccessibleDescription(/Choose how much detail appears in the session timeline/)
    await expect.poll(() => main.evaluate((el) => el.scrollHeight - el.clientHeight)).toBeLessThanOrEqual(1)

    // Wheel over the outer gutter must not move the entire settings screen.
@@ -7,5 +7,7 @@ export { type FatalRendererErrorLog, type Platform, PlatformProvider } from "./r
 export { ServerConnection, useServers } from "./runtime/server/registry"
 export { useTabs } from "./shell/tabs/tabs"
 export { createDraftStore } from "./runtime/persistence/drafts"
+export { createNamespaceStorage, type NamespaceStorage } from "./runtime/persistence/namespace"
+export { flushPersisted } from "./runtime/persistence/persist"
 export { useWslServers } from "./servers/wsl/context"
 export { type UpdaterPlatform, type UpdaterState } from "./shell/updates/types"
@@ -7,6 +7,7 @@ import { loadInitialLocale } from "@/runtime/i18n/language"
 import { PlatformProvider } from "@/runtime/platform/platform"
 import { createWebPlatform } from "@/runtime/platform/web"
 import { isStandalone, PwaRoutePersistence, restorePwaRoute } from "@/runtime/platform/pwa"
+import { KeyboardInsets } from "@/runtime/platform/keyboard"
 import en from "@/runtime/i18n/en"
 import zh from "@/runtime/i18n/zh"
 import { authFromToken } from "@/runtime/server/api"
@@ -92,6 +93,7 @@ if (root instanceof HTMLElement && root.dataset.opencodeMounted === undefined) {
              canonicalLocalServer={ServerConnection.key(server)}
              servers={[server]}
            >
+              <KeyboardInsets />
              {standalone && <PwaRoutePersistence />}
            </AppInterface>
          </AppBaseProviders>
@@ -165,6 +165,15 @@
    }
  }

+  ::highlight(timeline-search-hit) {
+    background-color: color-mix(in srgb, var(--v2-icon-icon-accent) 28%, transparent);
+  }
+
+  ::highlight(timeline-search-hit-active) {
+    background-color: var(--v2-icon-icon-accent);
+    color: var(--v2-background-bg-deep);
+  }
+
  [data-component="getting-started"] {
    container-type: inline-size;
    container-name: getting-started;
@@ -34,6 +34,8 @@ export const ProviderTipSchema = Persistence.struct({
  dismissedAt: Schema.Finite,
 })

+export const WorkspaceTipSchema = ProviderTipSchema
+
 export function NewSessionView(props: {
  composer: ComposerModel
  project: PromptProjectController
@@ -99,7 +101,15 @@ export function NewSessionView(props: {
            </div>
          </div>
        </div>
-        <ProviderTip />
+        <NewSessionTips
+          workspaceEligible={
+            !!props.project.selected() &&
+            props.workspace.bar.visible() &&
+            props.workspace.selection.value() !== "create" &&
+            props.workspace.project.managed() === 0
+          }
+          onWorkspace={() => select("create")}
+        />
      </div>
    </div>
  )
@@ -118,56 +128,90 @@ export function NewSessionStatus(props: { visible: boolean }) {
  )
 }

-function ProviderTip() {
+function NewSessionTips(props: { workspaceEligible: boolean; onWorkspace: () => void }) {
  const language = useLanguage()
  const dialog = useDialog()
  const sdk = useWorkspaceLocation()
  const providers = useProviders(() => sdk().directory)
-  const [persistedState, setPersistedState, , persistedReady] = persisted(
+  const [providerState, setProviderState, , providerReady] = persisted(
    Persist.global("new-session.provider-tip"),
    ProviderTipSchema,
    { dismissedAt: 0 },
  )
-  const visible = createMemo(
+  const [workspaceState, setWorkspaceState, , workspaceReady] = persisted(
+    Persist.global("new-session.workspace-tip"),
+    WorkspaceTipSchema,
+    { dismissedAt: 0 },
+  )
+  const workspaceVisible = createMemo(
+    () =>
+      props.workspaceEligible &&
+      workspaceReady() &&
+      Date.now() - workspaceState.dismissedAt >= providerTipDismissalDuration,
+  )
+  const providerVisible = createMemo(
    () =>
      providers.ready() &&
-      persistedReady() &&
+      providerReady() &&
      providers.paid().length === 0 &&
-      Date.now() - persistedState.dismissedAt >= providerTipDismissalDuration,
+      Date.now() - providerState.dismissedAt >= providerTipDismissalDuration,
  )
+  const tip = createMemo<"workspace" | "provider" | undefined>(() => {
+    if (providerVisible()) return "provider"
+    if (workspaceVisible()) return "workspace"
+  })
+  const displayed = createMemo<"workspace" | "provider" | undefined>((previous) => tip() ?? previous)
  const [ref, setRef] = createSignal<HTMLDivElement>()
  const presence = createPresence({
-    show: visible,
+    show: () => tip() !== undefined,
    element: () => ref() ?? null,
  })
-  const openProviders = () => {
+  const open = () => {
+    const current = tip()
+    if (!current) return
+    if (current === "workspace") {
+      setWorkspaceState("dismissedAt", Date.now())
+      props.onWorkspace()
+      return
+    }
    void import("@/providers/connect/dialog").then(({ DialogConnectProvider }) => {
      void dialog.show(() => <DialogConnectProvider directory={sdk().directory} />)
    })
  }
+  const dismiss = () => {
+    const current = tip()
+    if (!current) return
+    if (current === "workspace") {
+      setWorkspaceState("dismissedAt", Date.now())
+      return
+    }
+    setProviderState("dismissedAt", Date.now())
+  }

  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"
+          data-component="new-session-tip"
+          data-visible={tip() !== undefined}
+          class="group/new-session-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-text-compact 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={openProviders}
+            onClick={open}
          >
-            <span class="truncate">{language.t("home.providerTip")}</span>
+            <span class="truncate">
+              {language.t(displayed() === "workspace" ? "home.workspaceTip" : "home.providerTip")}
+            </span>
            <span class="flex size-6 shrink-0 items-center justify-center" aria-hidden="true">
              <Icon name="chevron-down" size="small" class="-rotate-90" />
            </span>
          </button>
          <Tooltip
-            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"
+            class="hover-reveal absolute left-full top-0 flex h-6 w-7 items-center justify-end delay-0 duration-0 group-hover/new-session-tip:delay-[250ms] group-hover/new-session-tip:duration-150 group-hover/new-session-tip:opacity-100 focus-within:delay-0 focus-within:duration-0 focus-within:opacity-100"
            placement="top"
            openDelay={1000}
            value={language.t("common.dismiss")}
@@ -176,7 +220,7 @@ function ProviderTip() {
              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={() => setPersistedState("dismissedAt", Date.now())}
+              onClick={dismiss}
            >
              <Icon name="xmark-small" />
            </button>
@@ -1,5 +1,5 @@
 import { debounce } from "@solid-primitives/scheduled"
-import { createEffect, createMemo, createResource } from "solid-js"
+import { createEffect, createMemo, createResource, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { useServerSDK } from "@/runtime/server/client"
@@ -11,8 +11,8 @@ import { normalizeProjectInfo } from "@/runtime/server/global-sync/utils"
 import {
  isWorkspaceDirectory,
  isWorkspaceSelection,
+  sameDirectory,
  workspaceDefaultSelection,
-  workspaceDirectories,
  workspaceSelectionDestination,
 } from "@/workspaces/paths"

@@ -56,6 +56,55 @@ export function createNewSessionWorkspaceController(input: {
    const current = projectID ? data.project.get(projectID) : undefined
    return current ? normalizeProjectInfo(current) : undefined
  })
+  const worktreeSource = createMemo(
+    () => {
+      const project = currentProject()
+      return project ? { projectID: project.id, directory: project.worktree } : undefined
+    },
+    undefined,
+    { equals: (a, b) => a?.projectID === b?.projectID && a?.directory === b?.directory },
+  )
+  const [worktrees, worktreeActions] = createResource(worktreeSource, async (source) => ({
+    projectID: source.projectID,
+    items: await serverSDK.api.worktree
+      .list({ location: { directory: source.directory } })
+      .catch(() => (currentProject()?.id === source.projectID ? currentProject()?.worktrees : undefined) ?? []),
+  }))
+  onCleanup(
+    serverSDK.event.listen((event) => {
+      if (event.type === "worktree.updated") void worktreeActions.refetch()
+    }),
+  )
+  // `latest` only skips Suspense once the resource has resolved at least once. Before that it
+  // behaves like a plain read, which holds the transition that opens the New Session tab until
+  // the worktree list returns.
+  const worktreesLoaded = () => worktrees.state === "ready" || worktrees.state === "refreshing"
+  const worktreeItems = createMemo(() => {
+    const project = currentProject()
+    if (!project) return []
+    if (!worktreesLoaded()) return project.worktrees
+    const loaded = worktrees.latest
+    return loaded?.projectID === project.id ? loaded.items : project.worktrees
+  })
+  const worktreeDirectories = createMemo(() => {
+    const project = currentProject()
+    if (!project) return []
+    const directories = [
+      ...worktreeItems().map((item) => item.directory),
+      ...project.worktrees.map((item) => item.directory),
+      ...(project.sandboxes ?? []),
+    ]
+    return directories
+      .filter((directory) => !sameDirectory(project.worktree, directory))
+      .filter((directory, index, items) => items.findIndex((item) => sameDirectory(item, directory)) === index)
+  })
+  const managedWorktrees = createMemo(() => {
+    const project = currentProject()
+    if (!project) return 0
+    return worktreeItems().filter(
+      (item) => item.strategy !== undefined && !sameDirectory(project.worktree, item.directory),
+    ).length
+  })
  const visible = createMemo(() =>
    resolveNewSessionGit({
      projectVcs: currentProject()?.vcs,
@@ -66,7 +115,11 @@ export function createNewSessionWorkspaceController(input: {
    const project = currentProject()
    const worktree = input.selectedWorktree()
    if (!project || !worktree) return
-    return isWorkspaceSelection(project, worktree) ? worktree : undefined
+    if (isWorkspaceSelection(project, worktree)) return worktree
+    // A saved choice may only exist in the server inventory. Keep it until the list can confirm it,
+    // otherwise the selector falls back to Local while loading and a submit would target the wrong directory.
+    if (!worktreesLoaded()) return worktree
+    return worktreeDirectories().some((item) => sameDirectory(item, worktree)) ? worktree : undefined
  })
  const fallback = createMemo(() => {
    const project = currentProject()
@@ -93,12 +146,19 @@ export function createNewSessionWorkspaceController(input: {
        .catch(() => ({ directory, search, data: [] })),
  )
  createEffect(() => {
-    void Promise.all([data.location.syncInfo({ directory: sdk().directory }), data.project.sync()]).catch(
-      () => undefined,
-    )
-    const project = currentProject()
-    const directories = project ? [project.worktree, ...workspaceDirectories(project)] : [sdk().directory]
-    directories.forEach((directory) => void data.location.vcs.sync({ directory }).catch(() => undefined))
+    void Promise.all([
+      data.location.syncInfo({ directory: sdk().directory }),
+      data.project.sync(),
+      data.location.vcs.sync({ directory: sdk().directory }),
+    ]).catch(() => undefined)
+  })
+  // Only the selected worktree feeds the branch label. Syncing every worktree in the inventory boots
+  // each one on the server, which then emits `agent.updated` and makes the client run the full
+  // catalog fan-out for every directory.
+  createEffect(() => {
+    const selection = value()
+    if (selection === "main" || selection === "create") return
+    void data.location.vcs.sync({ directory: selection }).catch(() => undefined)
  })
  const branch = createMemo(() =>
    resolveNewSessionBranch({
@@ -122,7 +182,10 @@ export function createNewSessionWorkspaceController(input: {
      workspace: createMemo(() => {
        const project = currentProject()
        const current = value()
-        return current === "create" || (!!project && isWorkspaceDirectory(project, current))
+        if (current === "create") return true
+        if (current === "main" || !project) return false
+        if (isWorkspaceDirectory(project, current) || !worktreesLoaded()) return true
+        return worktreeDirectories().some((item) => sameDirectory(item, current))
      }),
      reset: () => {
        input.setSelectedWorktree(undefined)
@@ -142,10 +205,8 @@ export function createNewSessionWorkspaceController(input: {
    },
    project: {
      root: projectRoot,
-      workspaces: () => {
-        const project = currentProject()
-        return project ? workspaceDirectories(project) : []
-      },
+      workspaces: worktreeDirectories,
+      managed: managedWorktrees,
      git: visible,
      branches: () => {
        const current = data.location.vcs.info({ directory: sdk().directory })?.branch.current
@@ -1,5 +1,6 @@
-import { createMemo, For, Show } from "solid-js"
+import { createMemo, createSignal, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
+import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { Menu } from "@opencode-ai/ui/menu"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -25,6 +26,9 @@ export function PromptWorkspaceSelector(props: {
  let searchInput: HTMLInputElement | undefined
  let branchSearchInput: HTMLInputElement | undefined
  let focusSearch = false
+  const branchTruncation = createTruncatedText()
+  const focusWorktreeSearch = () =>
+    requestAnimationFrame(() => requestAnimationFrame(() => searchInput?.focus({ preventScroll: true })))
  let pending: { type: "select"; value: string } | { type: "create"; branch: string } | { type: "viewAll" } | undefined
  const selected = () => (sameDirectory(props.value, props.projectRoot) ? "main" : props.value)
  const workspaces = createMemo(() => {
@@ -34,8 +38,8 @@ export function PromptWorkspaceSelector(props: {
  })
  const icon = () => {
    if (selected() === "main") return "monitor"
-    if (selected() === "create") return "workspace-new"
-    return "workspace-isolated"
+    if (selected() === "create") return "plus"
+    return "outline-worktree"
  }
  const select = (value: string) => {
    pending = { type: "select", value }
@@ -66,13 +70,14 @@ export function PromptWorkspaceSelector(props: {
    <>
      <span class="hidden select-none opacity-50 sm:inline mx-1">/</span>
      <Tooltip
+        appearance={props.onboarding ? "large" : undefined}
        placement="top"
        openDelay={800}
        value={
          props.onboarding ? (
            <div class="flex flex-col gap-1 text-start">
              <div class="flex items-center gap-1.5 font-[530] text-v2-text-text-base">
-                <Icon name="workspace-isolated" size="small" class="shrink-0 text-v2-text-text-accent" />
+                <Icon name="outline-worktree" size="small" class="shrink-0 text-v2-text-text-accent" />
                <span>{language.t("workspace.onboarding.title")}</span>
              </div>
              <span class="font-[440] text-v2-text-text-muted">{language.t("workspace.onboarding.description")}</span>
@@ -89,7 +94,10 @@ export function PromptWorkspaceSelector(props: {
            aria-description={language.t("session.new.workspace.trigger.tooltip")}
            class="flex h-6 min-w-0 max-w-[203px] items-center gap-1.5 rounded-sm px-1.5 hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:outline-none data-[expanded]:bg-v2-overlay-simple-overlay-pressed data-[expanded]:text-v2-text-text-muted"
          >
-            <Icon name={icon()} class="shrink-0 text-v2-icon-icon-muted" />
+            <Icon
+              name={icon()}
+              class={`shrink-0 ${selected() === "main" || selected() === "create" ? "text-v2-icon-icon-muted" : "text-v2-icon-icon-accent"}`}
+            />
            <span class="min-w-0 truncate">{label()}</span>
            <Show when={props.onboarding}>
              <span
@@ -109,14 +117,8 @@ export function PromptWorkspaceSelector(props: {
                  <Tooltip
                    placement="right"
                    openDelay={800}
-                    value={
-                      <span class="flex flex-col gap-0.5">
-                        <span>{language.t("session.new.workspace.local")}</span>
-                        <span class="font-[440] text-v2-text-text-muted">
-                          {language.t("session.new.workspace.local.tooltip")}
-                        </span>
-                      </span>
-                    }
+                    value={language.t("session.new.workspace.local.tooltip")}
+                    contentClass="max-w-[140px]"
                    class="min-w-0 flex-1"
                  >
                    <span class="min-w-0 truncate">{language.t("session.new.workspace.local")}</span>
@@ -126,24 +128,22 @@ export function PromptWorkspaceSelector(props: {
                  </Show>
                </Menu.Item>
                <Menu.Item onSelect={() => select("create")}>
-                  <Icon name="workspace-new" />
-                  <span class="min-w-0 flex-1 truncate">{language.t("workspace.new")}</span>
+                  <Icon name="plus" />
+                  <Tooltip
+                    placement="right"
+                    openDelay={800}
+                    value={language.t("session.new.workspace.new.tooltip")}
+                    contentClass="max-w-[140px]"
+                    class="min-w-0 flex-1"
+                  >
+                    <span class="min-w-0 truncate">{language.t("workspace.new")}</span>
+                  </Tooltip>
                  <Show when={selected() === "create"}>
                    <Icon name="check" size="small" class="shrink-0" />
                  </Show>
                </Menu.Item>
              </Menu.Group>
-              <Show
-                when={props.workspaces.length > 0}
-                fallback={
-                  <>
-                    <Menu.Separator class="h-[0.5px]" />
-                    <Menu.Item onSelect={() => (pending = { type: "viewAll" })}>
-                      <span class="min-w-0 flex-1 truncate">{language.t("common.viewAll")}</span>
-                    </Menu.Item>
-                  </>
-                }
-              >
+              <Show when={props.workspaces.length > 0}>
                <Menu.Separator class="h-[0.5px]" />
                <Menu.Sub
                  gutter={0}
@@ -156,10 +156,11 @@ export function PromptWorkspaceSelector(props: {
                    }
                    if (!focusSearch || props.workspaces.length < 10) return
                    focusSearch = false
-                    requestAnimationFrame(() => searchInput?.focus())
+                    focusWorktreeSearch()
                  }}
                >
                  <Menu.SubTrigger
+                    onClick={focusWorktreeSearch}
                    onKeyDown={(event) => {
                      if (
                        event.key === "ArrowRight" ||
@@ -170,7 +171,7 @@ export function PromptWorkspaceSelector(props: {
                        focusSearch = true
                    }}
                  >
-                    <Icon name="workspace-isolated" />
+                    <Icon name="outline-worktree" />
                    <span class="min-w-0 flex-1 truncate">
                      {language.t("session.new.workspace.existing").replace(/(…|\.{3})$/, "")}
                    </span>
@@ -205,7 +206,7 @@ export function PromptWorkspaceSelector(props: {
                      <For each={workspaces()}>
                        {(workspace) => (
                          <Menu.Item onSelect={() => select(workspace)}>
-                            <Icon name="workspace-isolated" />
+                            <Icon name="outline-worktree" />
                            <span class="min-w-0 flex-1 truncate">{getFilename(workspace)}</span>
                            <Show when={selected() === workspace}>
                              <Icon name="check" size="small" class="shrink-0" />
@@ -213,6 +214,11 @@ export function PromptWorkspaceSelector(props: {
                          </Menu.Item>
                        )}
                      </For>
+                      <Show when={search.workspaces.trim() && workspaces().length === 0}>
+                        <div class="px-3 py-4 text-center text-[13px] font-[440] leading-5 text-v2-text-text-muted">
+                          {language.t("session.new.workspace.search.empty")}
+                        </div>
+                      </Show>
                      <Menu.Separator class="h-[0.5px]" />
                      <Menu.Item onSelect={() => (pending = { type: "viewAll" })}>
                        <span class="min-w-0 flex-1 truncate">{language.t("common.viewAll")}</span>
@@ -232,6 +238,7 @@ export function PromptWorkspaceSelector(props: {
        <Tooltip
          placement="top"
          value={language.t("session.new.workspace.fromBranch", { branch: props.branch! })}
+          disabled={!branchTruncation.truncated()}
          class="ms-1 min-w-0 max-w-[220px]"
          contentClass="max-w-[calc(100vw-32px)] break-all"
        >
@@ -245,7 +252,7 @@ export function PromptWorkspaceSelector(props: {
          >
            <Menu.Trigger class="flex h-6 min-w-0 max-w-[220px] items-center gap-1.5 rounded-full bg-v2-background-bg-layer-02 px-2.5 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:bg-v2-background-bg-layer-03 hover:text-v2-text-text-muted focus-visible:bg-v2-background-bg-layer-03 focus-visible:text-v2-text-text-muted focus-visible:outline-none data-[expanded]:bg-v2-background-bg-layer-03 data-[expanded]:text-v2-text-text-muted">
              <Icon name="branch-out" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-              <span class="min-w-0 truncate">
+              <span ref={branchTruncation.observe} class="min-w-0 truncate">
                {language.t("session.new.workspace.fromBranch", { branch: props.branch! })}
              </span>
              <Icon name="chevron-down" size="small" class="shrink-0 text-v2-icon-icon-muted" />
@@ -319,6 +326,7 @@ export function PromptWorkspaceSelector(props: {

 export function PromptGitStatus(props: { branch?: string; noGit?: boolean; from?: boolean; class?: string }) {
  const language = useLanguage()
+  const truncation = createTruncatedText()
  const label = () => {
    if (props.noGit) return language.t("session.new.git.none")
    if (!props.branch) return undefined
@@ -338,15 +346,27 @@ export function PromptGitStatus(props: { branch?: string; noGit?: boolean; from?
        <Tooltip
          placement="top"
          value={value()}
+          disabled={!truncation.truncated()}
          class={`min-w-0 max-w-[220px] ${props.class ?? ""}`}
          contentClass="max-w-[calc(100vw-32px)] break-all"
        >
          <div class="flex h-6 min-w-0 max-w-[220px] items-center gap-1.5 rounded-full bg-v2-background-bg-layer-02 px-2.5 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint">
            <Icon name={icon()} size="small" class="shrink-0 text-v2-icon-icon-muted" />
-            <span class="min-w-0 truncate">{value()}</span>
+            <span ref={truncation.observe} class="min-w-0 truncate">
+              {value()}
+            </span>
          </div>
        </Tooltip>
      )}
    </Show>
  )
 }
+
+function createTruncatedText() {
+  const [truncated, setTruncated] = createSignal(false)
+  return {
+    truncated,
+    observe: (element: HTMLSpanElement) =>
+      createResizeObserver(element, () => setTruncated(element.scrollWidth > element.clientWidth)),
+  }
+}
@@ -659,6 +659,7 @@ export const dict = {
  "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",
+  "home.workspaceTip": "Start next session in a new workspace to keep changes isolated",

  "session.tab.session": "Session",
  "session.tab.files": "Files",
@@ -676,7 +677,7 @@ export const dict = {
  "session.error.incompatible.description":
    "{{server}} is running OpenCode {{version}}, which isn't compatible with this app. Upgrade the server to OpenCode V2 to continue.",
  "session.background.moveTasks": "Move {{tasks}} to background",
-  "session.background.moveRunning": "Move running work to background",
+  "session.background.moveRunning": "Move to background",
  "session.background.inBackground": "Running {{tasks}} in background",
  "session.background.moveInline": "Press {{keybind}} to move running work to the background",
  "session.background.running": "Running work in background",
@@ -736,6 +737,16 @@ export const dict = {
  "session.todo.expand": "Expand",
  "session.todo.progress": "{{done}} of {{total}} todos completed",
  "session.question.progress": "{{current}} of {{total}} questions",
+  "session.websearch.title": "Third-party web search",
+  "session.websearch.description": "Select the search provider agents use to search the web",
+  "session.websearch.provider": "Search provider",
+  "session.websearch.any": "Any",
+  "session.websearch.disable": "Don’t use search",
+  "session.websearch.enable": "Enable",
+  "session.websearch.loadFailed": "Could not load search providers.",
+  "session.websearch.empty": "No search providers available.",
+  "session.websearch.failed": "Could not save your choice. Please try again.",
+  "session.websearch.retry": "Retry",
  "session.question.minimize": "Minimize question",
  "session.question.restore": "Restore question",
  "session.question.pending.one": "{{count}} pending question",
@@ -759,6 +770,8 @@ export const dict = {

  "session.header.search.placeholder": "Search {{project}}",
  "session.header.searchFiles": "Search files",
+  "session.search.placeholder": "Find...",
+  "session.search.noResults": "No matches",
  "session.header.openIn": "Open in",
  "session.header.open.action": "Open {{app}}",
  "session.header.open.ariaLabel": "Open in {{app}}",
@@ -981,37 +994,36 @@ export const dict = {

  "settings.timeline.title": "Timeline",
  "settings.timeline.detail": "Timeline detail",
-  "settings.timeline.description": "Choose how much activity appears in the timeline. Messages stay visible.",
+  "settings.timeline.description": "Choose how much detail appears in the session timeline.",
+  "settings.timeline.summary": "{{preset}}:",
  "settings.timeline.preset.everything": "Everything",
  "settings.timeline.preset.detailed": "Detailed",
  "settings.timeline.preset.compact": "Compact",
  "settings.timeline.preset.quiet": "Quiet",
-  "settings.timeline.preset.text-only": "Text only",
+  "settings.timeline.preset.text-only": "Messages only",
  "settings.timeline.description.everything": "Show all activity separately. Expand shell output, edits, and thinking.",
  "settings.timeline.description.detailed":
-    "Expand shell output and edits. Show subagents separately and group other activity in Used.",
-  "settings.timeline.description.compact": "Group all activity in Used with details collapsed.",
-  "settings.timeline.description.quiet": "Group edits and subagents in Used. Hide other activity.",
-  "settings.timeline.description.text-only": "Hide all activity. Show only messages.",
-  "settings.timeline.description.custom": "Use your selected placement and details for each activity category.",
+    "Expand shell output and edits. Show subagents separately and group other activity.",
+  "settings.timeline.description.compact": "Group all activity with details collapsed.",
+  "settings.timeline.description.quiet": "Group edits and subagents. Hide other activity.",
+  "settings.timeline.description.text-only": "Hide all activity.",
+  "settings.timeline.description.custom": "Uses advanced settings.",
  "settings.timeline.custom": "Custom",
  "settings.timeline.advanced": "Advanced",
  "settings.timeline.advanced.description": "Set placement and details for each activity category.",
-  "settings.timeline.advanced.explainer": "Grouped activity goes into Used. Details applies after opening the group.",
-  "settings.timeline.activity": "Activity",
+  "settings.timeline.group": "Group",
+  "settings.timeline.collapse": "Collapse",
+  "settings.timeline.visibility.show": "Show",
+  "settings.timeline.visibility.hide": "Hide",
+  "settings.timeline.visibility.label": "{{activity}} visibility",
+  "settings.timeline.grouped.label": "{{activity}} grouped",
+  "settings.timeline.collapsed.label": "{{activity}} collapsed",
  "settings.timeline.category.shell": "Shell",
  "settings.timeline.category.edit": "Edits",
  "settings.timeline.category.thinking": "Thinking",
  "settings.timeline.category.subagents": "Subagents",
  "settings.timeline.category.notices": "Notices",
  "settings.timeline.category.tools": "Other tools",
-  "settings.timeline.placement.title": "Placement",
-  "settings.timeline.placement.separate": "Separate",
-  "settings.timeline.placement.grouped": "Grouped",
-  "settings.timeline.placement.hidden": "Hidden",
-  "settings.timeline.expansion.title": "Details",
-  "settings.timeline.expansion.collapsed": "Collapsed",
-  "settings.timeline.expansion.expanded": "Expanded",

  "settings.general.row.language.title": "Language",
  "settings.general.row.language.description": "Change the display language for OpenCode",
@@ -1238,30 +1250,43 @@ export const dict = {

  "workspace.new": "New worktree",
  "common.viewAll": "View all",
-  "session.new.workspace.local.tooltip": "Use current checkout",
-  "session.new.workspace.new.tooltip": "Create isolated checkout",
+  "session.new.workspace.local.tooltip": "Uses project’s current checkout",
+  "session.new.workspace.new.tooltip": "Creates isolated copy from current checkout",
  "session.new.workspace.fromBranch": "from {{branch}}",
  "session.new.workspace.createFrom": "Create from branch",
  "session.new.workspace.branch.search.placeholder": "Search branches",
  "session.new.workspace.trigger.tooltip": "Select where to run session",
  "session.new.workspace.search.placeholder": "Search worktrees",
+  "session.new.workspace.search.empty": "No matching worktrees",
  "settings.tab.workspaces": "Worktrees",
+  "settings.workspaces.description": "Review worktrees and manage disk usage",
  "settings.workspaces.filter.all": "All projects",
-  "settings.workspaces.empty": "No worktrees",
+  "settings.workspaces.empty": "No worktrees yet",
+  "settings.workspaces.empty.description": "Worktrees created in OpenCode will appear here",
  "settings.workspaces.count.one": "{{count}} worktree",
  "settings.workspaces.count.other": "{{count}} worktrees",
  "settings.workspaces.sessions.one": "{{count}} session in {{project}}",
  "settings.workspaces.sessions.other": "{{count}} sessions in {{project}}",
+  "settings.workspaces.sessions.filtered.one": "{{count}} session",
+  "settings.workspaces.sessions.filtered.other": "{{count}} sessions",
  "settings.workspaces.lastActiveSession": "Last active session",
  "settings.workspaces.deleteAll": "Delete all worktrees",
-  "settings.workspaces.deleteAll.confirm": "Delete all {{count}} worktrees?",
-  "settings.workspaces.delete.warning":
-    "The worktree directory and branch will be permanently removed, including any unmerged changes shown below.",
+  "settings.workspaces.deleteAll.confirm.one": "This will permanently delete {{count}} selected worktree.",
+  "settings.workspaces.deleteAll.confirm.other": "This will permanently delete {{count}} selected worktrees.",
+  "settings.workspaces.deleteWithoutSessions": "Delete worktrees without sessions",
+  "settings.workspaces.deleteWithoutSessions.confirm.one":
+    "This will permanently delete {{count}} worktree without linked sessions.",
+  "settings.workspaces.deleteWithoutSessions.confirm.other":
+    "This will permanently delete {{count}} worktrees without linked sessions.",
+  "settings.workspaces.deleteWithoutSessions.warning":
+    "Worktrees with unmerged changes or active locations will be kept.",
+  "settings.workspaces.delete.button": "Delete worktrees",
+  "settings.workspaces.delete.warning": "This permanently deletes the worktree and its branch.",
  "settings.workspaces.deleteAll.warning":
-    "The {{count}} selected worktrees in {{project}} will be permanently removed only if each is clean, inactive, and has no linked sessions.",
+    "Worktrees with unmerged changes, linked sessions, or active locations will be kept.",
  "settings.workspaces.delete.blocked.active": "The active worktree cannot be deleted.",
  "settings.workspaces.delete.blocked.linked":
-    "Linked sessions will remain, but their working directory will be permanently removed.",
+    "Linked sessions will remain, but their working directory will no longer exist.",
  "settings.workspaces.default.title": "Default environment",
  "settings.workspaces.default.description": "Choose where new sessions start",
  "settings.workspaces.default.lastUsed": "Last used per project",
@@ -1272,9 +1297,10 @@ export const dict = {
  "workspace.move.failed": "Failed to move session",
  "workspace.lifecycle.creating": "Creating worktree",
  "workspace.lifecycle.created": "Worktree created",
+  "workspace.lifecycle.deleting": "Deleting…",
  "workspace.lifecycle.starting": "Starting session",
  "workspace.onboarding.title": "Isolate sessions with worktrees",
-  "workspace.onboarding.description": "Each gets its own checkout, so nothing interferes with your local repository",
+  "workspace.onboarding.description": "Each gets its own checkout",
  "workspace.lifecycle.moving": "Moving to worktree",
  "workspace.lifecycle.set": "Worktree set",
  "session.summary.title": "Session details",
@@ -1293,9 +1319,10 @@ export const dict = {
  "workspace.status.checking": "Checking for unmerged changes…",
  "workspace.status.error": "Unable to verify git status.",
  "workspace.status.clean": "No unmerged changes detected.",
-  "workspace.status.dirty": "Unmerged changes detected in this worktree.",
+  "workspace.status.dirty": "Unmerged changes will be lost.",
  "workspace.delete.title": "Delete worktree",
-  "workspace.delete.confirm": 'Delete worktree "{{name}}"?',
+  "workspace.delete.confirm": "Delete “{{name}}”?",
+  "workspace.delete.location": "Location",
  "workspace.delete.button": "Delete worktree",
  "workspace.reset.title": "Reset worktree",
  "workspace.reset.confirm": 'Reset worktree "{{name}}"?',
@@ -49,6 +49,36 @@ migration rules remain explicit in their schemas.
  invalid entries individually. Valid entries still pass through their codecs.
 - Recovery is not a substitute for an explicit historical shape transformation.

+## Writes
+
+The setter returned by `persisted()` only marks the store dirty (`persist.ts`). The store is
+serialized once per save window (`persistSaveDelay`), on owner cleanup, and when the page
+hides, and the write is skipped when the serialized form did not change. Reactive observers
+therefore see every mutation immediately and a burst of setter calls costs one encode. Call
+`flushPersisted()` when a test or a shutdown path needs the write to have happened; the
+desktop platform calls it before flushing its namespaces on shutdown. A real unsaved local
+change wins over a value arriving from another window, and over a stored value that finishes
+loading after the user already edited. A remote value that arrives while the store is dirty
+is held until the save runs; if the local setter calls turned out not to change the
+serialized form, the remote value is adopted instead of being lost.
+
+## Namespaces
+
+On desktop, `platform.storage(name)` returns a `NamespaceStorage` (`namespace.ts`): the
+in-memory truth for one storage namespace, modelled on VS Code's `Storage` class. The
+namespace is loaded from the host once, reads are Map lookups from then on, and writes
+update the cache immediately while being batched into one host round trip per flush
+window (`namespaceFlushDelay`). `flush()` hands the batch to the driver synchronously, so a
+flush on page hide is on the wire before the page goes away; the desktop platform flushes
+every namespace before the IPC runtime is disposed and whenever the window is hidden. Each
+local write carries a sequence number that is kept until the host accepts that exact write;
+until then neither the initial load, a change from another window (`accept`), nor the retry
+of an older failed batch can replace the key. The host also stamps every update with a
+monotonic revision, returned in the ack and carried by change events and loads, so an event
+that reaches a window after a newer ack or load for the same key is recognised as stale and
+dropped; an event held back during an in-flight write is applied after the ack when the host
+ordered it later.
+
 ## Migrations

 Describe shipped representations with schemas and transform their typed values
@@ -78,3 +108,28 @@ Storage-key relocation (`previousKey`, workspace aliases, draft storage moves)
 remains separate from schema migration. Draft blob externalization and hydration
 also remain in the storage adapter: composer codecs receive hydrated references,
 not raw ID-only blob documents.
+
+## Large draft content
+
+Draft documents never carry large text inline. Any string of `draftTextThreshold`
+characters or more is split into `draftTextChunk`-sized content-addressed blobs and
+stored as `{ blob: { kind: "text", ids: [...] } }`; reads join the chunks again. A
+content-keyed cache means unchanged chunks are not hashed or sent on later saves, so
+typing after a large paste uploads one chunk per save rather than the paste. Chunk
+boundaries never split a surrogate pair, and a failed upload is evicted so the next save
+retries it.
+
+Blob collection is made safe by validation on write, not by timing. A strict document write
+is refused while it references blob ids the store does not hold, so the previous document
+stays visible; the renderer uploads the missing bytes again from the chunk text or the image
+`Blob` it still holds, renames the references to the ids the uploads returned (content hashes
+normally, fresh ids on a store without WebCrypto), and publishes. This covers a chunk another
+tab collected, and an image the composer kept in its history long after its blob was
+collected. The desktop host additionally refreshes `touched_at` for every blob a written
+document references and collects only blobs unreferenced and untouched for `blobGrace`, so
+repairs stay rare.
+`persisted()` hands the draft store the encoded document (`setDocument`) rather than
+a serialized string, so the store does not re-parse the full document to externalize
+it. Both blob collectors (desktop SQL, browser IndexedDB) keep chunk ids alive. This
+follows VS Code's rule that editor content lives in per-resource backups, not in the
+state database.
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import { Schema } from "effect"
-import { WorkspaceOnboardingSchema, ProviderTipSchema } from "@/new-session/view"
+import { WorkspaceOnboardingSchema, ProviderTipSchema, WorkspaceTipSchema } from "@/new-session/view"
 import { ModelSelectionSchema } from "@/providers/models/selection"
 import { Persistence } from "@/runtime/persistence/schema"
 import { FileViewsSchema } from "@/workspaces/files/view-cache"
@@ -12,6 +12,7 @@ describe("persisted consumer schemas", () => {
  test("onboarding and provider tip retain defaults and validate stored values", () => {
    const onboarding = Schema.decodeUnknownSync(Persistence.withInitial(WorkspaceOnboardingSchema, { used: false }))
    const tip = Schema.decodeUnknownSync(Persistence.withInitial(ProviderTipSchema, { dismissedAt: 0 }))
+    const workspaceTip = Schema.decodeUnknownSync(Persistence.withInitial(WorkspaceTipSchema, { dismissedAt: 0 }))
    expect(onboarding({})).toEqual({ used: false })
    expect(onboarding({ used: "true" })).toEqual({ used: false })
    expect(onboarding({ used: true })).toEqual({ used: true })
@@ -19,6 +20,7 @@ describe("persisted consumer schemas", () => {
    expect(tip({ dismissedAt: "yesterday" })).toEqual({ dismissedAt: 0 })
    expect(tip({ dismissedAt: Infinity })).toEqual({ dismissedAt: 0 })
    expect(tip({ dismissedAt: 123 })).toEqual({ dismissedAt: 123 })
+    expect(workspaceTip({ dismissedAt: 123 })).toEqual({ dismissedAt: 123 })
  })

  test("collapse records recover malformed entries without losing valid siblings", () => {
@@ -0,0 +1,232 @@
+import { describe, expect, test } from "bun:test"
+import { createDraftStore, draftTextChunk, draftTextThreshold } from "./drafts"
+
+function memoryDriver() {
+  const documents = new Map<string, string>()
+  const blobs = new Map<string, Blob>()
+  let puts = 0
+  return {
+    documents,
+    blobs,
+    puts: () => puts,
+    driver: {
+      get: async (key: string) => documents.get(key) ?? null,
+      // Like the real stores: report referenced blobs that are not held; a strict write with any
+      // missing is refused.
+      set: async (key: string, value: string, strict: boolean) => {
+        const ids = new Set<string>()
+        JSON.parse(value, (_key, item) => {
+          if (item?.blob && typeof item.blob.id === "string") ids.add(item.blob.id)
+          if (item?.blob && Array.isArray(item.blob.ids)) item.blob.ids.forEach((id: unknown) => ids.add(String(id)))
+          return item
+        })
+        const missing = [...ids].filter((id) => !blobs.has(id))
+        if (!strict || missing.length === 0) documents.set(key, value)
+        return missing
+      },
+      remove: async (key: string) => void documents.delete(key),
+      putBlob: async (blob: Blob) => {
+        puts++
+        const id = `blob-${await blob.text().then((text) => Bun.hash(text).toString(16))}`
+        blobs.set(id, blob)
+        return id
+      },
+      getBlob: async (id: string) => blobs.get(id) ?? null,
+    },
+  }
+}
+
+const large = "x".repeat(draftTextThreshold)
+const paste = Array.from({ length: 3 * draftTextChunk }, (_, i) => String.fromCharCode(97 + (i % 26))).join("")
+
+describe("draft store text externalization", () => {
+  test("large strings become chunk lists and small ones stay inline", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    await store.setDocument("doc", {
+      prompt: [
+        { type: "text", content: paste },
+        { type: "text", content: "hi" },
+      ],
+    })
+    const stored = JSON.parse(memory.documents.get("doc")!)
+    expect(stored.prompt[0].content.blob.kind).toBe("text")
+    expect(stored.prompt[0].content.blob.ids).toHaveLength(3)
+    expect(stored.prompt[1].content).toBe("hi")
+    expect(memory.documents.get("doc")!.length).toBeLessThan(400)
+    const chunks = await Promise.all(
+      stored.prompt[0].content.blob.ids.map((id: string) => memory.blobs.get(id)!.text()),
+    )
+    expect(chunks.join("")).toBe(paste)
+  })
+
+  test("appending to a large string re-uploads only the final chunk", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    await store.setDocument("doc", { prompt: [{ type: "text", content: paste }] })
+    expect(memory.puts()).toBe(3)
+    await store.setDocument("doc", { prompt: [{ type: "text", content: `${paste}!` }] })
+    expect(memory.puts()).toBe(4)
+    await store.setDocument("doc", { prompt: [{ type: "text", content: `${paste}!` }], cursor: 1 })
+    expect(memory.puts()).toBe(4)
+  })
+
+  test("reads join the chunks again and reuse cached content", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    await store.setDocument("doc", { prompt: [{ type: "text", content: paste }] })
+    const fresh = createDraftStore(memory.driver)
+    expect(JSON.parse((await fresh.getItem("doc"))!)).toEqual({ prompt: [{ type: "text", content: paste }] })
+    memory.blobs.clear()
+    expect(JSON.parse((await fresh.getItem("doc"))!)).toEqual({ prompt: [{ type: "text", content: paste }] })
+  })
+
+  test("a missing chunk decodes to empty text instead of failing the document", async () => {
+    const memory = memoryDriver()
+    memory.documents.set(
+      "doc",
+      JSON.stringify({ prompt: [{ type: "text", content: { blob: { kind: "text", ids: ["gone"] } } }] }),
+    )
+    const store = createDraftStore(memory.driver)
+    expect(JSON.parse((await store.getItem("doc"))!)).toEqual({ prompt: [{ type: "text", content: "" }] })
+  })
+
+  test("a cached chunk id the store no longer holds is uploaded again on the next save", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    await store.setDocument("doc", { prompt: [{ type: "text", content: large }] })
+    const [id] = JSON.parse(memory.documents.get("doc")!).prompt[0].content.blob.ids
+    await store.setDocument("doc", { prompt: [{ type: "text", content: `${large}!` }] })
+    // Another tab collected the chunk for `large` while this tab still caches its id.
+    memory.blobs.clear()
+    // Undo republishes the cached id; the write reports it missing and the chunk is uploaded again.
+    await store.setDocument("doc", { prompt: [{ type: "text", content: large }] })
+    expect(memory.puts()).toBe(3)
+    const fresh = createDraftStore(memory.driver)
+    expect(JSON.parse((await fresh.getItem("doc"))!).prompt[0].content).toBe(large)
+    expect(memory.blobs.has(id)).toBe(true)
+  })
+
+  test("an image reference whose blob was collected is restored from its object url", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    const image = await store.putBlob(new Blob([new Uint8Array([1, 2, 3])], { type: "image/png" }))
+    // The composer kept this reference (for example in its history) while the store collected the bytes.
+    memory.blobs.clear()
+    await store.setDocument("doc", { prompt: [{ type: "image", blob: { id: image.id, url: image.url } }] })
+    expect(memory.blobs.has(image.id)).toBe(true)
+    expect(new Uint8Array(await memory.blobs.get(image.id)!.arrayBuffer())).toEqual(new Uint8Array([1, 2, 3]))
+  })
+
+  test("the previous document stays visible until missing blobs are restored", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    await store.setDocument("doc", { prompt: [{ type: "text", content: large }] })
+    await store.setDocument("doc", { prompt: [{ type: "text", content: `${large}!` }] })
+    const before = memory.documents.get("doc")
+    memory.blobs.clear()
+    // Hold the repair upload: while it is pending, another reader must still see the old document.
+    const gate = Promise.withResolvers<void>()
+    const putBlob = memory.driver.putBlob
+    memory.driver.putBlob = async (blob) => {
+      await gate.promise
+      return putBlob(blob)
+    }
+    const saving = store.setDocument("doc", { prompt: [{ type: "text", content: large }] })
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    expect(memory.documents.get("doc")).toBe(before)
+    gate.resolve()
+    await saving
+    expect(JSON.parse(memory.documents.get("doc")!).prompt[0].content.blob.ids).toHaveLength(1)
+    const fresh = createDraftStore(memory.driver)
+    expect(JSON.parse((await fresh.getItem("doc"))!).prompt[0].content).toBe(large)
+  })
+
+  test("references are renamed when a restored blob comes back under a different id", async () => {
+    const memory = memoryDriver()
+    // A store without WebCrypto assigns a fresh id to every upload.
+    let counter = 0
+    memory.driver.putBlob = async (blob) => {
+      const id = `random-${counter++}`
+      memory.blobs.set(id, blob)
+      return id
+    }
+    const store = createDraftStore(memory.driver)
+    const image = await store.putBlob(new Blob([new Uint8Array([7])], { type: "image/png" }))
+    await store.setDocument("doc", {
+      prompt: [
+        { type: "text", content: paste },
+        { type: "image", blob: image },
+      ],
+    })
+    const original = JSON.parse(memory.documents.get("doc")!)
+    memory.blobs.clear()
+    await store.setDocument("doc", {
+      prompt: [
+        { type: "text", content: paste },
+        { type: "image", blob: image },
+      ],
+    })
+    const restored = JSON.parse(memory.documents.get("doc")!)
+    expect(restored.prompt[0].content.blob.ids).not.toEqual(original.prompt[0].content.blob.ids)
+    expect(restored.prompt[1].blob.id).not.toBe(original.prompt[1].blob.id)
+    for (const id of [...restored.prompt[0].content.blob.ids, restored.prompt[1].blob.id])
+      expect(memory.blobs.has(id)).toBe(true)
+    const fresh = createDraftStore(memory.driver)
+    const read = JSON.parse((await fresh.getItem("doc"))!)
+    expect(read.prompt[0].content).toBe(paste)
+    expect(read.prompt[1].blob.id).toBe(restored.prompt[1].blob.id)
+    // The renamed ids are what later encodes publish, so saves of the still-live references (the
+    // composer keeps the original image id) upload nothing and keep one stable image id.
+    const puts = counter
+    for (const cursor of [1, 2, 3]) {
+      await store.setDocument("doc", {
+        prompt: [
+          { type: "text", content: paste },
+          { type: "image", blob: image },
+        ],
+        cursor,
+      })
+      expect(JSON.parse(memory.documents.get("doc")!).prompt[1].blob.id).toBe(restored.prompt[1].blob.id)
+    }
+    expect(counter).toBe(puts)
+  })
+
+  test("chunk boundaries never split a surrogate pair", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    const text = "x".repeat(draftTextChunk - 1) + "😀tail"
+    await store.setDocument("doc", { prompt: [{ type: "text", content: text }] })
+    const stored = JSON.parse(memory.documents.get("doc")!)
+    const bytes = await Promise.all(stored.prompt[0].content.blob.ids.map((id: string) => memory.blobs.get(id)!.text()))
+    expect(bytes.join("")).toBe(text)
+    expect(bytes[0]!.length).toBe(draftTextChunk + 1)
+    const fresh = createDraftStore(memory.driver)
+    expect(JSON.parse((await fresh.getItem("doc"))!).prompt[0].content).toBe(text)
+  })
+
+  test("a failed chunk upload is retried on the next save instead of being reused", async () => {
+    const memory = memoryDriver()
+    let failNext = true
+    const putBlob = memory.driver.putBlob
+    memory.driver.putBlob = async (blob) => {
+      if (failNext) {
+        failNext = false
+        throw new Error("offline")
+      }
+      return putBlob(blob)
+    }
+    const store = createDraftStore(memory.driver)
+    await expect(store.setDocument("doc", { prompt: [{ type: "text", content: paste }] })).rejects.toThrow("offline")
+    await store.setDocument("doc", { prompt: [{ type: "text", content: `${paste}!` }] })
+    const fresh = createDraftStore(memory.driver)
+    expect(JSON.parse((await fresh.getItem("doc"))!).prompt[0].content).toBe(`${paste}!`)
+  })
+
+  test("setItem still accepts a serialized document", async () => {
+    const memory = memoryDriver()
+    const store = createDraftStore(memory.driver)
+    await store.setItem("doc", JSON.stringify({ prompt: [{ type: "text", content: large }] }))
+    expect(JSON.parse(memory.documents.get("doc")!).prompt[0].content.blob.ids).toHaveLength(1)
+  })
+})
@@ -5,20 +5,43 @@ export type BlobReference = { id: string; url: string }

 type Driver = {
  get(key: string): Promise<string | null>
-  set(key: string, value: string): Promise<void>
+  /**
+   * Store the document and report every blob id it references that the store does not hold. A
+   * strict write is refused (nothing stored) when any are missing, so a document is never visible
+   * with dangling references while its blobs are being restored.
+   */
+  set(key: string, value: string, strict: boolean): Promise<readonly string[]>
  remove(key: string): Promise<void>
  putBlob(blob: Blob): Promise<string>
  getBlob(id: string): Promise<Blob | null>
 }

-export type DraftStore = AsyncStorage & { putBlob(blob: Blob): Promise<BlobReference> }
+export type DraftStore = AsyncStorage & {
+  putBlob(blob: Blob): Promise<BlobReference>
+  /** Persist an already-encoded document without re-parsing its serialized form. */
+  setDocument(key: string, document: unknown): Promise<void>
+}
+
+// Strings at least this long leave the document as fixed-size content-addressed chunks. Typing
+// after a large paste changes only the final chunk, so a save uploads one chunk, not the paste.
+export const draftTextThreshold = 16 * 1024
+export const draftTextChunk = 64 * 1024
+const textCacheLimit = 64
+
 const urls = new Map<string, string>()
+// The object URL already pins the Blob for the page's lifetime; keeping the Blob itself lets a
+// collected image be uploaded again without fetching the URL.
+const held = new Map<string, Blob>()
+// Image ids that were restored under a different id (a store without WebCrypto assigns fresh
+// ones); live references still carry the original.
+const aliases = new Map<string, string>()

 function blobUrl(id: string, blob: Blob) {
  const existing = urls.get(id)
  if (existing) return existing
  const url = URL.createObjectURL(blob)
  urls.set(id, url)
+  held.set(id, blob)
  return url
 }

@@ -56,25 +79,82 @@ export function createDraftStore(driver: Driver): DraftStore {
    const id = await driver.putBlob(blob)
    return { id, url: blobUrl(id, blob) }
  }
-  const encode = async (value: unknown): Promise<unknown> => {
-    if (Array.isArray(value)) return Promise.all(value.map(encode))
+  // Keyed by chunk content so unchanged chunks are never hashed or sent again while the draft is
+  // edited. Bounded because each entry pins up to draftTextChunk characters. A hit is safe even if
+  // the store has since collected the blob: the write reports it missing and it is uploaded again.
+  const chunkIds = new Map<string, Promise<string>>()
+  const chunks = new Map<string, string>()
+  const remember = <V>(cache: Map<string, V>, key: string, value: V) => {
+    cache.set(key, value)
+    if (cache.size > textCacheLimit) cache.delete(cache.keys().next().value!)
+    return value
+  }
+  const upload = (chunk: string) => {
+    const id = driver.putBlob(new Blob([chunk])).then(
+      (id) => {
+        remember(chunks, id, chunk)
+        return id
+      },
+      (error: unknown) => {
+        // A failed upload must not be reused as the answer for this content on later saves.
+        if (chunkIds.get(chunk) === id) chunkIds.delete(chunk)
+        throw error
+      },
+    )
+    return remember(chunkIds, chunk, id)
+  }
+  const externalize = (text: string) => Promise.all(split(text).map((chunk) => chunkIds.get(chunk) ?? upload(chunk)))
+  const loadChunk = async (id: string) => {
+    const cached = chunks.get(id)
+    if (cached !== undefined) return cached
+    const blob = await driver.getBlob(id)
+    // A missing chunk loses that text but keeps the rest of the document decodable.
+    return remember(chunks, id, blob ? await blob.text() : "")
+  }
+  // `sources` collects, for every blob id the encoded document references, a way to produce its
+  // bytes again: the chunk text itself, or the image Blob (or object URL) the reference carries.
+  type Sources = Map<string, { blob: () => Promise<Blob>; chunk?: string }>
+  const encode = async (value: unknown, sources: Sources): Promise<unknown> => {
+    if (typeof value === "string" && value.length >= draftTextThreshold) {
+      const pieces = split(value)
+      const ids = await externalize(value)
+      ids.forEach((id, index) =>
+        sources.set(id, { blob: async () => new Blob([pieces[index]!]), chunk: pieces[index] }),
+      )
+      return { blob: { kind: "text", ids } }
+    }
+    if (Array.isArray(value)) return Promise.all(value.map((entry) => encode(entry, sources)))
    if (!value || typeof value !== "object") return value
    const item = value as Record<string, unknown>
    if (item.type === "image" && typeof item.dataUrl === "string") {
      const blob = await fetch(item.dataUrl).then((response) => response.blob())
      const { dataUrl: _, ...rest } = item
-      return { ...rest, blob: { id: await driver.putBlob(blob) } }
+      const id = await driver.putBlob(blob)
+      sources.set(id, { blob: async () => blob })
+      return { ...rest, blob: { id } }
    }
    if ("blob" in item && item.blob && typeof item.blob === "object") {
      const blob = item.blob as Record<string, unknown>
+      if (blob.kind === "text") return item
      if (typeof blob.id === "string" && blob.id.startsWith("data:")) {
        const data = await fetch(blob.id).then((response) => response.blob())
-        return { ...item, blob: { id: await driver.putBlob(data) } }
+        const id = await driver.putBlob(data)
+        sources.set(id, { blob: async () => data })
+        return { ...item, blob: { id } }
+      }
+      if (typeof blob.id === "string") {
+        // A live reference keeps the id it was created with; publish the id its bytes now live under.
+        const id = aliases.get(blob.id) ?? blob.id
+        const kept = held.get(id)
+        const url = typeof blob.url === "string" ? blob.url : urls.get(id)
+        if (kept) sources.set(id, { blob: async () => kept })
+        else if (url) sources.set(id, { blob: () => fetch(url).then((response) => response.blob()) })
+        return { ...item, blob: { id } }
      }
      return { ...item, blob: { id: blob.id } }
    }
    return Object.fromEntries(
-      await Promise.all(Object.entries(item).map(async ([key, entry]) => [key, await encode(entry)])),
+      await Promise.all(Object.entries(item).map(async ([key, entry]) => [key, await encode(entry, sources)])),
    )
  }
  const decode = async (value: unknown): Promise<unknown> => {
@@ -83,6 +163,9 @@ export function createDraftStore(driver: Driver): DraftStore {
    const item = value as Record<string, unknown>
    if (item.blob && typeof item.blob === "object") {
      const ref = item.blob as Record<string, unknown>
+      if (ref.kind === "text" && Array.isArray(ref.ids)) {
+        return (await Promise.all(ref.ids.map((id) => loadChunk(String(id))))).join("")
+      }
      if (typeof ref.id === "string") {
        const url = await loadBlobUrl(ref.id)
        if (url) return { ...item, blob: { id: ref.id, url } }
@@ -92,6 +175,65 @@ export function createDraftStore(driver: Driver): DraftStore {
      await Promise.all(Object.entries(item).map(async ([key, entry]) => [key, await decode(entry)])),
    )
  }
+  // Upload the bytes behind `ids` again and return the ids they were stored under. Ids are
+  // usually content hashes and come back unchanged, but a store without WebCrypto assigns fresh
+  // ones, so callers must rename references rather than assume.
+  const restore = async (ids: readonly string[], sources: Sources) => {
+    const renamed = new Map<string, string>()
+    await Promise.all(
+      ids.map(async (id) => {
+        const source = sources.get(id)
+        if (!source) return
+        const blob = await source.blob()
+        const next = await driver.putBlob(blob)
+        renamed.set(id, next)
+        if (source.chunk !== undefined) {
+          remember(chunkIds, source.chunk, Promise.resolve(next))
+          remember(chunks, next, source.chunk)
+          return
+        }
+        held.set(next, blob)
+        blobUrl(next, blob)
+        if (next === id) return
+        // Later encodes of the still-live reference resolve straight to the new id. Re-point any
+        // earlier alias chain so lookups stay one step.
+        for (const [from, to] of aliases) if (to === id) aliases.set(from, next)
+        aliases.set(id, next)
+      }),
+    )
+    return renamed
+  }
+  const rename = (value: unknown, renamed: Map<string, string>): unknown => {
+    if (Array.isArray(value)) return value.map((entry) => rename(entry, renamed))
+    if (!value || typeof value !== "object") return value
+    const item = value as Record<string, unknown>
+    if (item.blob && typeof item.blob === "object") {
+      const ref = item.blob as Record<string, unknown>
+      if (Array.isArray(ref.ids))
+        return { ...item, blob: { ...ref, ids: ref.ids.map((id) => renamed.get(String(id)) ?? id) } }
+      if (typeof ref.id === "string") return { ...item, blob: { ...ref, id: renamed.get(ref.id) ?? ref.id } }
+    }
+    return Object.fromEntries(Object.entries(item).map(([key, entry]) => [key, rename(entry, renamed)]))
+  }
+  const setDocument = async (key: string, document: unknown) => {
+    const version = (versions.get(key) ?? 0) + 1
+    versions.set(key, version)
+    const sources: Sources = new Map()
+    const encoded = await encode(document, sources)
+    if (versions.get(key) !== version) return
+    // The store refuses the write while any referenced blob is missing, so the previous document
+    // stays visible until the bytes are back. Covers a blob collected while a cache, another tab,
+    // or the composer's history still held its id.
+    const missing = await driver.set(key, JSON.stringify(encoded), true)
+    if (missing.length === 0) return
+    const renamed = await restore(missing, sources)
+    if (versions.get(key) !== version) return
+    const unrestored = missing.filter((id) => !renamed.has(id))
+    if (unrestored.length)
+      console.error(`[persistence] draft ${key} references blobs with no bytes to restore`, unrestored)
+    // Anything still missing has no bytes anywhere; the owning codec drops such references on read.
+    await driver.set(key, JSON.stringify(rename(encoded, renamed)), false)
+  }
  return {
    getItem: async (key) => {
      const value = await driver.get(key)
@@ -101,12 +243,8 @@ export function createDraftStore(driver: Driver): DraftStore {
      if (Option.isNone(parsed)) return value
      return JSON.stringify(await decode(parsed.value))
    },
-    setItem: async (key, value) => {
-      const version = (versions.get(key) ?? 0) + 1
-      versions.set(key, version)
-      const encoded = JSON.stringify(await encode(JSON.parse(value)))
-      if (versions.get(key) === version) await driver.set(key, encoded)
-    },
+    setItem: (key, value) => setDocument(key, JSON.parse(value)),
+    setDocument,
    removeItem: async (key) => {
      versions.set(key, (versions.get(key) ?? 0) + 1)
      await driver.remove(key)
@@ -115,6 +253,20 @@ export function createDraftStore(driver: Driver): DraftStore {
  }
 }

+// Fixed-size pieces, except that a piece never ends between the two halves of a surrogate pair:
+// each piece becomes its own Blob, and an unpaired surrogate would be encoded as U+FFFD.
+function split(text: string) {
+  const pieces: string[] = []
+  for (let start = 0; start < text.length; ) {
+    const end = Math.min(start + draftTextChunk, text.length)
+    const code = text.charCodeAt(end - 1)
+    const stop = end < text.length && code >= 0xd800 && code <= 0xdbff ? end + 1 : end
+    pieces.push(text.slice(start, stop))
+    start = stop
+  }
+  return pieces
+}
+
 export function createBrowserDraftStore(): DraftStore {
  const request = indexedDB.open("opencode-drafts", 1)
  request.addEventListener("upgradeneeded", () => {
@@ -127,11 +279,7 @@ export function createBrowserDraftStore(): DraftStore {
      const transaction = database.transaction(["documents", "blobs"], "readwrite")
      const documents = transaction.objectStore("documents").getAll()
      documents.addEventListener("success", () => {
-        const used = new Set<string>()
-        JSON.parse(`[${documents.result.join(",")}]`, (_key, item) => {
-          if (item?.blob && typeof item.blob.id === "string") used.add(item.blob.id)
-          return item
-        })
+        const used = referenced(`[${documents.result.join(",")}]`)
        const store = transaction.objectStore("blobs")
        const blobs = store.openKeyCursor()
        blobs.addEventListener("success", () => {
@@ -164,7 +312,32 @@ export function createBrowserDraftStore(): DraftStore {
  }
  return createDraftStore({
    get: async (key) => ((await get("documents", key)) as string | undefined) ?? null,
-    set: (key, value) => write("documents", key, value),
+    set: async (key, value, strict) => {
+      // One readwrite transaction over both stores: IndexedDB serialises overlapping readwrite
+      // transactions in creation order, so a later save or removal cannot commit between the
+      // reference check and this write. The put is issued from the last lookup's callback so the
+      // transaction is never left without a pending request.
+      const ids = [...referenced(value)]
+      const transaction = (await db).transaction(["blobs", "documents"], "readwrite")
+      const missing: string[] = []
+      const publish = () => {
+        if (!strict || missing.length === 0) transaction.objectStore("documents").put(value, key)
+      }
+      let remaining = ids.length
+      if (remaining === 0) publish()
+      for (const id of ids) {
+        const lookup = transaction.objectStore("blobs").getKey(id)
+        lookup.addEventListener("success", () => {
+          if (lookup.result === undefined) missing.push(id)
+          if (--remaining === 0) publish()
+        })
+      }
+      return new Promise<string[]>((resolve, reject) => {
+        transaction.addEventListener("complete", () => resolve(missing))
+        transaction.addEventListener("error", () => reject(transaction.error))
+        transaction.addEventListener("abort", () => reject(transaction.error))
+      })
+    },
    remove: (key) => write("documents", key),
    putBlob: async (blob) => {
      const id = await blobID(blob)
@@ -175,6 +348,17 @@ export function createBrowserDraftStore(): DraftStore {
  })
 }

+// Every blob id a serialized document (or array of documents) references.
+function referenced(json: string) {
+  const ids = new Set<string>()
+  JSON.parse(json, (_key, item) => {
+    if (item?.blob && typeof item.blob.id === "string") ids.add(item.blob.id)
+    if (item?.blob && Array.isArray(item.blob.ids)) item.blob.ids.forEach((id: unknown) => ids.add(String(id)))
+    return item
+  })
+  return ids
+}
+
 export async function blobDataUrl(blob: BlobReference, mime: string) {
  const data = await fetch(blob.url).then((response) => response.blob())
  return new Promise<string>((resolve, reject) => {
@@ -0,0 +1,247 @@
+import { describe, expect, test } from "bun:test"
+import { createNamespaceStorage, type NamespaceDriver, type NamespaceStorage } from "./namespace"
+
+const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
+type Call = { kind: string; name: string; insert?: Record<string, string>; remove?: string[] }
+
+// A host with a monotonic revision. Each update is acked to its caller and recorded as an event
+// that the test delivers to other windows whenever it chooses, like the real event stream.
+function host(initial: Record<string, Record<string, string>> = {}) {
+  const data = new Map(Object.entries(initial).map(([name, items]) => [name, new Map(Object.entries(items))]))
+  const calls: Call[] = []
+  const events: { name: string; insert: Record<string, string>; remove: string[]; revision: number }[] = []
+  let revision = 0
+  let fail: (insert: Record<string, string>) => boolean = () => false
+  let gate: Promise<void> | undefined
+  const driver: NamespaceDriver = {
+    items: async (name) => {
+      calls.push({ kind: "items", name })
+      return { items: Object.fromEntries(data.get(name) ?? []), revision }
+    },
+    update: async (name, insert, remove) => {
+      calls.push({ kind: "update", name, insert, remove })
+      await gate
+      if (fail(insert)) throw new Error("disk full")
+      const items = data.get(name) ?? new Map()
+      for (const [key, value] of Object.entries(insert)) items.set(key, value)
+      for (const key of remove) items.delete(key)
+      data.set(name, items)
+      events.push({ name, insert, remove, revision: ++revision })
+      return revision
+    },
+    clear: async (name) => {
+      calls.push({ kind: "clear", name })
+      data.delete(name)
+    },
+  }
+  return {
+    driver,
+    data,
+    calls,
+    events,
+    updates: () => calls.filter((call) => call.kind === "update"),
+    setFail: (value: boolean | ((insert: Record<string, string>) => boolean)) =>
+      (fail = typeof value === "boolean" ? () => value : value),
+    setGate: (value: Promise<void> | undefined) => (gate = value),
+    deliver: (target: NamespaceStorage, index: number) => {
+      const event = events[index]!
+      target.accept(event.insert, event.remove, event.revision)
+    },
+  }
+}
+
+describe("namespace storage", () => {
+  test("loads the namespace once and serves reads from memory", async () => {
+    const h = host({ w: { tabs: "[]", recent: "{}" } })
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10 })
+    expect(await storage.getItem("tabs")).toBe("[]")
+    expect(await storage.getItem("recent")).toBe("{}")
+    expect(await storage.getItem("missing")).toBeNull()
+    expect(await storage.getLength()).toBe(2)
+    expect(h.calls.filter((call) => call.kind === "items")).toHaveLength(1)
+  })
+
+  test("reads its own writes immediately and coalesces them into one update", async () => {
+    const h = host()
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10 })
+    void storage.setItem("tabs", "[1]")
+    void storage.setItem("recent", "{}")
+    void storage.setItem("tabs", "[1,2]")
+    void storage.removeItem("recent")
+    expect(await storage.getItem("tabs")).toBe("[1,2]")
+    expect(await storage.getItem("recent")).toBeNull()
+    expect(h.updates()).toHaveLength(0)
+    await wait(30)
+    expect(h.updates()).toEqual([{ kind: "update", name: "w", insert: { tabs: "[1,2]" }, remove: ["recent"] }])
+  })
+
+  test("writes made while loading win over the loaded snapshot", async () => {
+    const h = host({ w: { tabs: "old" } })
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10 })
+    const read = storage.getItem("tabs")
+    void storage.setItem("tabs", "new")
+    expect(await read).toBe("new")
+  })
+
+  test("flush writes now and resolves after the driver accepted the batch", async () => {
+    const h = host()
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10_000 })
+    void storage.setItem("tabs", "[1]")
+    await storage.flush()
+    expect(h.data.get("w")?.get("tabs")).toBe("[1]")
+    await storage.flush()
+    expect(h.updates()).toHaveLength(1)
+  })
+
+  test("a failed update keeps unsuperseded changes queued for the next flush", async () => {
+    const h = host()
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10_000 })
+    h.setFail(true)
+    void storage.setItem("tabs", "[1]")
+    void storage.setItem("recent", "{}")
+    await storage.flush()
+    expect(h.data.get("w")).toBeUndefined()
+    h.setFail(false)
+    void storage.setItem("tabs", "[2]")
+    await storage.flush()
+    expect(Object.fromEntries(h.data.get("w")!)).toEqual({ tabs: "[2]", recent: "{}" })
+  })
+
+  test("a batch is handed to the driver synchronously, not behind an earlier reply", async () => {
+    const h = host()
+    const first = Promise.withResolvers<void>()
+    h.setGate(first.promise)
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10_000 })
+    void storage.setItem("tabs", "[1]")
+    void storage.flush()
+    void storage.setItem("tabs", "[2]")
+    void storage.flush()
+    // Both batches reached the driver while the first reply is still outstanding.
+    expect(h.updates().map((call) => call.insert)).toEqual([{ tabs: "[1]" }, { tabs: "[2]" }])
+    first.resolve()
+    await storage.flush()
+  })
+
+  test("a pending load or an external change cannot overwrite a value that is in flight", async () => {
+    const loaded = Promise.withResolvers<{ items: Record<string, string>; revision: number }>()
+    const accepted = Promise.withResolvers<number>()
+    const driver: NamespaceDriver = {
+      items: () => loaded.promise,
+      update: () => accepted.promise,
+      clear: async () => undefined,
+    }
+    const storage = createNamespaceStorage(driver, "g", { delay: 10_000 })
+    const read = storage.getItem("model")
+    void storage.setItem("model", "local")
+    void storage.flush()
+    storage.accept({ model: "other-window-older" }, [], 1)
+    loaded.resolve({ items: { model: "snapshot-older" }, revision: 0 })
+    expect(await read).toBe("local")
+    accepted.resolve(2)
+    await storage.flush()
+    expect(await storage.getItem("model")).toBe("local")
+    storage.accept({ model: "other-window-newer" }, [], 3)
+    expect(await storage.getItem("model")).toBe("other-window-newer")
+  })
+
+  test("a failed batch does not requeue a value a later batch already replaced", async () => {
+    const h = host()
+    const first = Promise.withResolvers<void>()
+    h.setGate(first.promise)
+    // The first batch (old) is held at the host and will be rejected; the second (new) succeeds.
+    h.setFail((insert) => insert.tabs === "old")
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10_000 })
+    void storage.setItem("tabs", "old")
+    void storage.flush()
+    h.setGate(undefined)
+    void storage.setItem("tabs", "new")
+    void storage.flush()
+    await wait(0)
+    expect(h.data.get("w")?.get("tabs")).toBe("new")
+    first.resolve()
+    await storage.flush()
+    await storage.flush()
+    expect(h.updates().map((call) => call.insert)).toEqual([{ tabs: "old" }, { tabs: "new" }])
+    expect(h.data.get("w")?.get("tabs")).toBe("new")
+    expect(await storage.getItem("tabs")).toBe("new")
+  })
+
+  test("an event that reaches a window after a newer ack for the same key is ignored", async () => {
+    const h = host({ g: { model: "start" } })
+    const one = createNamespaceStorage(h.driver, "g", { delay: 10_000 })
+    const two = createNamespaceStorage(h.driver, "g", { delay: 10_000 })
+    await one.getItem("model")
+    await two.getItem("model")
+    void one.setItem("model", "A")
+    await one.flush()
+    void two.setItem("model", "B")
+    await two.flush()
+    // Both writes are acked. Now the event for A, which the host applied before B, reaches two.
+    h.deliver(two, 0)
+    expect(await two.getItem("model")).toBe("B")
+    expect(h.data.get("g")?.get("model")).toBe("B")
+    // One still receives B, which is newer than its own ack.
+    h.deliver(one, 1)
+    expect(await one.getItem("model")).toBe("B")
+  })
+
+  test("an event held back during an in-flight write wins after the ack if the host applied it later", async () => {
+    const h = host()
+    const gate = Promise.withResolvers<void>()
+    h.setGate(gate.promise)
+    const storage = createNamespaceStorage(h.driver, "g", { delay: 10_000 })
+    void storage.setItem("model", "mine")
+    void storage.flush()
+    // Another window's write for the same key landed at the host after ours will.
+    storage.accept({ model: "theirs" }, [], 2)
+    expect(await storage.getItem("model")).toBe("mine")
+    gate.resolve()
+    await storage.flush()
+    expect(await storage.getItem("model")).toBe("theirs")
+  })
+
+  test("the initial load removes a key an older event inserted while the load was in flight", async () => {
+    const loaded = Promise.withResolvers<{ items: Record<string, string>; revision: number }>()
+    const driver: NamespaceDriver = { items: () => loaded.promise, update: async () => 0, clear: async () => undefined }
+    const storage = createNamespaceStorage(driver, "g", { delay: 10_000 })
+    const read = storage.getItem("model")
+    // Host history: insert at 41, delete at 42; the snapshot was taken at 42.
+    storage.accept({ model: "inserted" }, [], 41)
+    loaded.resolve({ items: {}, revision: 42 })
+    expect(await read).toBeNull()
+    // The delete event is older than the floor and must stay a no-op either way.
+    storage.accept({}, ["model"], 42)
+    expect(await storage.getItem("model")).toBeNull()
+    // A key inserted by an event newer than the snapshot survives the load.
+    const second = Promise.withResolvers<{ items: Record<string, string>; revision: number }>()
+    const other = createNamespaceStorage({ ...driver, items: () => second.promise }, "g", { delay: 10_000 })
+    const pending = other.getItem("model")
+    other.accept({ model: "after-snapshot" }, [], 43)
+    second.resolve({ items: {}, revision: 42 })
+    expect(await pending).toBe("after-snapshot")
+  })
+
+  test("an event older than the initial load is ignored", async () => {
+    const h = host({ g: { model: "loaded" } })
+    void h.driver.update("g", { model: "loaded" }, [])
+    await wait(0)
+    const storage = createNamespaceStorage(h.driver, "g", { delay: 10_000 })
+    await storage.getItem("model")
+    storage.accept({ model: "before-load" }, [], 1)
+    expect(await storage.getItem("model")).toBe("loaded")
+    storage.accept({}, ["model"], 2)
+    expect(await storage.getItem("model")).toBeNull()
+  })
+
+  test("clear drops the cache and queued changes and clears the driver", async () => {
+    const h = host({ w: { tabs: "[]" } })
+    const storage = createNamespaceStorage(h.driver, "w", { delay: 10_000 })
+    await storage.getItem("tabs")
+    void storage.setItem("recent", "{}")
+    await storage.clear()
+    expect(await storage.getItem("tabs")).toBeNull()
+    expect(await storage.getItem("recent")).toBeNull()
+    expect(h.calls.map((call) => call.kind)).toEqual(["items", "clear"])
+  })
+})
@@ -0,0 +1,159 @@
+import type { AsyncStorage } from "@solid-primitives/storage"
+
+// The host-side store for one namespace: one bulk read, one bulk write. The host stamps every
+// update with a monotonic revision and reports it with reads, acks, and change events.
+export type NamespaceDriver = {
+  items(name: string): Promise<{ items: Record<string, string>; revision: number }>
+  update(name: string, insert: Record<string, string>, remove: string[]): Promise<number>
+  clear(name: string): Promise<void>
+}
+
+export type NamespaceStorage = AsyncStorage & {
+  /** Write every queued change now. Resolves when the driver has accepted it. */
+  flush(): Promise<void>
+  /** Apply a change another window made at `revision`, unless this window already holds something newer. */
+  accept(insert: Record<string, string>, remove: string[], revision: number): void
+}
+
+export const namespaceFlushDelay = 100
+
+// In-memory truth for a namespace. Reads load the namespace once and are Map lookups from then
+// on; writes update the cache immediately and are batched into one driver call per flush window,
+// so a burst of setter calls costs one round trip. Mirrors VS Code's Storage class.
+//
+// Two orderings keep the cache correct. Every local write gets a sequence number that stays
+// recorded until the host acks that exact write; while recorded, nothing external may replace
+// the key. Every value the cache holds also carries the host revision it came from, so an event
+// that reaches this window after a newer ack or load is recognised as stale and dropped. Batches
+// are posted as soon as they are cut, never behind an earlier reply, so a flush on pagehide is
+// on the wire before the page goes away.
+export function createNamespaceStorage(
+  driver: NamespaceDriver,
+  name: string,
+  options: { delay?: number } = {},
+): NamespaceStorage {
+  const delay = options.delay ?? namespaceFlushDelay
+  const cache = new Map<string, string>()
+  const local = new Map<string, { seq: number; value: string | null }>()
+  const dirty = new Set<string>()
+  const inflight = new Set<Promise<void>>()
+  // Host revision behind each cached key, and the revision the initial load reflected for all keys.
+  const applied = new Map<string, number>()
+  let floor = -1
+  // The newest external change for a key that arrived while a local write was still in flight.
+  const deferred = new Map<string, { revision: number; value: string | null }>()
+  let seq = 0
+  let loading: Promise<void> | undefined
+  let timer: ReturnType<typeof setTimeout> | undefined
+
+  const place = (key: string, value: string | null, revision: number) => {
+    if (value === null) cache.delete(key)
+    else cache.set(key, value)
+    applied.set(key, revision)
+  }
+
+  // The snapshot is the whole truth at its revision: a key it lacks was deleted by then, even if
+  // an older event inserted it into the cache while the load was in flight.
+  const load = () =>
+    (loading ??= driver.items(name).then((loaded) => {
+      floor = loaded.revision
+      const stale = (key: string) => !local.has(key) && (applied.get(key) ?? -1) <= loaded.revision
+      for (const key of [...cache.keys()]) {
+        if (!(key in loaded.items) && stale(key)) place(key, null, loaded.revision)
+      }
+      for (const [key, value] of Object.entries(loaded.items)) {
+        if (stale(key)) place(key, value, loaded.revision)
+      }
+    }))
+
+  const write = (key: string, value: string | null) => {
+    if (value === null) cache.delete(key)
+    else cache.set(key, value)
+    local.set(key, { seq: ++seq, value })
+    dirty.add(key)
+    timer ??= setTimeout(() => void flush(), delay)
+  }
+
+  // The host accepted this window's value for `key` at `revision`. A change from another window
+  // that was held back meanwhile wins if the host applied it later than ours.
+  const acknowledge = (key: string, revision: number) => {
+    local.delete(key)
+    const later = deferred.get(key)
+    deferred.delete(key)
+    if (later && later.revision > revision) return place(key, later.value, later.revision)
+    applied.set(key, revision)
+  }
+
+  const flush = () => {
+    clearTimeout(timer)
+    timer = undefined
+    if (dirty.size > 0) {
+      const batch = [...dirty].map((key) => ({ key, ...local.get(key)! }))
+      dirty.clear()
+      const insert = Object.fromEntries(batch.filter((entry) => entry.value !== null).map((e) => [e.key, e.value!]))
+      const remove = batch.filter((entry) => entry.value === null).map((entry) => entry.key)
+      const current = (entry: { key: string; seq: number }) => local.get(entry.key)?.seq === entry.seq
+      const request = driver
+        .update(name, insert, remove)
+        .then((revision) => batch.filter(current).forEach((entry) => acknowledge(entry.key, revision)))
+        .catch((error: unknown) => {
+          // Only a value nothing newer has replaced is worth retrying.
+          batch.filter(current).forEach((entry) => dirty.add(entry.key))
+          console.error(`[persistence] flush failed for ${name}`, error)
+        })
+        .finally(() => inflight.delete(request))
+      inflight.add(request)
+    }
+    return Promise.all(inflight).then(() => undefined)
+  }
+
+  const storage: NamespaceStorage = {
+    getItem: async (key) => {
+      await load()
+      return cache.get(key) ?? null
+    },
+    setItem: async (key, value) => write(key, value),
+    removeItem: async (key) => write(key, null),
+    clear: async () => {
+      clearTimeout(timer)
+      timer = undefined
+      cache.clear()
+      local.clear()
+      dirty.clear()
+      applied.clear()
+      deferred.clear()
+      loading = Promise.resolve()
+      await driver.clear(name)
+    },
+    key: async (index: number) => {
+      await load()
+      return [...cache.keys()][index]
+    },
+    getLength: async () => {
+      await load()
+      return cache.size
+    },
+    get length() {
+      return storage.getLength()
+    },
+    flush,
+    accept(insert, remove, revision) {
+      // The initial load already reflects everything up to `floor`.
+      if (revision <= floor) return
+      const changes = [
+        ...Object.entries(insert).map(([key, value]) => [key, value] as const),
+        ...remove.map((key) => [key, null] as const),
+      ]
+      for (const [key, value] of changes) {
+        if (local.has(key)) {
+          const held = deferred.get(key)
+          if (!held || revision > held.revision) deferred.set(key, { revision, value })
+          continue
+        }
+        if (revision <= (applied.get(key) ?? floor)) continue
+        place(key, value, revision)
+      }
+    },
+  }
+  return storage
+}
@@ -0,0 +1,156 @@
+import { describe, expect, test } from "bun:test"
+import type { AsyncStorage, PersistenceSyncAPI, PersistenceSyncCallback, SyncStorage } from "@solid-primitives/storage"
+import { createRoot } from "solid-js"
+import { createStore } from "solid-js/store"
+import { flushPersisted, persistStore } from "./persist"
+
+const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
+type State = { count: number; label: string }
+
+function setup(input: { initial?: string | null | Promise<string | null>; delay?: number; sync?: PersistenceSyncAPI }) {
+  const writes: string[] = []
+  return createRoot((dispose) => {
+    const [store, setStore] = createStore<State>({ count: 0, label: "" })
+    const persist = persistStore({
+      store,
+      setStore,
+      name: "state",
+      // One fixture serves both the sync and the async storage shape.
+      storage: {
+        getItem: () => input.initial ?? null,
+        setItem: (_key: string, value: string) => {
+          writes.push(value)
+        },
+        removeItem: () => {},
+      } as SyncStorage | AsyncStorage,
+      serialize: JSON.stringify,
+      deserialize: JSON.parse,
+      sync: input.sync,
+      delay: input.delay ?? 10,
+    })
+    return { store, set: persist.setStore, persist, writes, dispose }
+  })
+}
+
+describe("persistStore", () => {
+  test("marks the store dirty on set and writes once after the delay", async () => {
+    const value = setup({})
+    value.set("count", 1)
+    value.set("count", 2)
+    value.set("label", "a")
+    expect(value.store.count).toBe(2)
+    expect(value.writes).toEqual([])
+    await wait(30)
+    expect(value.writes).toEqual([JSON.stringify({ count: 2, label: "a" })])
+    value.dispose()
+  })
+
+  test("skips the write when the serialized value did not change", () => {
+    const value = setup({ delay: 10_000 })
+    value.set("count", 1)
+    value.persist.flush()
+    value.set("count", 1)
+    value.persist.flush()
+    expect(value.writes).toHaveLength(1)
+    value.dispose()
+  })
+
+  test("hydrates synchronously from sync storage without writing back", () => {
+    const value = setup({ initial: JSON.stringify({ count: 5, label: "saved" }), delay: 10_000 })
+    expect(value.store).toEqual({ count: 5, label: "saved" })
+    value.persist.flush()
+    expect(value.writes).toEqual([])
+    value.dispose()
+  })
+
+  test("a set made while async storage loads wins over the loaded value", async () => {
+    const loading = Promise.withResolvers<string | null>()
+    const value = setup({ initial: loading.promise, delay: 10_000 })
+    value.set("count", 9)
+    loading.resolve(JSON.stringify({ count: 1, label: "old" }))
+    await loading.promise
+    expect(value.store.count).toBe(9)
+    value.dispose()
+  })
+
+  test("applies another window's value when clean and ignores it while dirty", () => {
+    const listeners: PersistenceSyncCallback[] = []
+    const sent: string[] = []
+    const value = setup({
+      delay: 10_000,
+      sync: [(subscriber) => listeners.push(subscriber), (_key, next) => sent.push(String(next))],
+    })
+    listeners[0]!({ key: "state", newValue: JSON.stringify({ count: 3, label: "remote" }), timeStamp: 0 })
+    expect(value.store).toEqual({ count: 3, label: "remote" })
+    value.set("label", "local")
+    listeners[0]!({ key: "state", newValue: JSON.stringify({ count: 4, label: "remote-2" }), timeStamp: 0 })
+    expect(value.store).toEqual({ count: 3, label: "local" })
+    value.persist.flush()
+    expect(sent).toEqual([JSON.stringify({ count: 3, label: "local" })])
+    value.dispose()
+  })
+
+  test("a remote value arriving during a no-op local set is adopted when the save finds no change", () => {
+    const listeners: PersistenceSyncCallback[] = []
+    const sent: string[] = []
+    const value = setup({
+      delay: 10_000,
+      sync: [(subscriber) => listeners.push(subscriber), (_key, next) => sent.push(String(next))],
+    })
+    value.set("count", 1)
+    value.persist.flush()
+    // Setting the same value again marks the store dirty without changing it.
+    value.set("count", 1)
+    listeners[0]!({ key: "state", newValue: JSON.stringify({ count: 1, label: "remote" }), timeStamp: 0 })
+    expect(value.store.label).toBe("")
+    value.persist.flush()
+    expect(value.store).toEqual({ count: 1, label: "remote" })
+    expect(value.writes).toHaveLength(1)
+    expect(sent).toHaveLength(1)
+    // A later save must not consider the adopted value a local change.
+    value.set("count", 1)
+    value.persist.flush()
+    expect(value.writes).toHaveLength(1)
+    value.dispose()
+  })
+
+  test("a remote revert to the saved value during a no-op local set clears an earlier held change", () => {
+    const listeners: PersistenceSyncCallback[] = []
+    const value = setup({ delay: 10_000, sync: [(subscriber) => listeners.push(subscriber), () => {}] })
+    value.set("label", "saved")
+    value.persist.flush()
+    value.set("label", "saved")
+    listeners[0]!({ key: "state", newValue: JSON.stringify({ count: 0, label: "changed" }), timeStamp: 0 })
+    listeners[0]!({ key: "state", newValue: JSON.stringify({ count: 0, label: "saved" }), timeStamp: 0 })
+    value.persist.flush()
+    expect(value.store).toEqual({ count: 0, label: "saved" })
+    expect(value.writes).toHaveLength(1)
+    value.dispose()
+  })
+
+  test("a remote value arriving during a real local change is dropped in favour of the local one", () => {
+    const listeners: PersistenceSyncCallback[] = []
+    const value = setup({ delay: 10_000, sync: [(subscriber) => listeners.push(subscriber), () => {}] })
+    value.set("count", 1)
+    listeners[0]!({ key: "state", newValue: JSON.stringify({ count: 9, label: "remote" }), timeStamp: 0 })
+    value.persist.flush()
+    expect(value.store).toEqual({ count: 1, label: "" })
+    expect(value.writes).toEqual([JSON.stringify({ count: 1, label: "" })])
+    value.dispose()
+  })
+
+  test("disposing the owner and flushPersisted both save pending changes", () => {
+    const first = setup({ delay: 10_000 })
+    first.set("count", 1)
+    first.dispose()
+    expect(first.writes).toHaveLength(1)
+
+    const second = setup({ delay: 10_000 })
+    second.set("count", 2)
+    flushPersisted()
+    expect(second.writes).toEqual([JSON.stringify({ count: 2, label: "" })])
+    second.dispose()
+    expect(second.writes).toHaveLength(1)
+  })
+})
@@ -0,0 +1,103 @@
+import type { AsyncStorage, PersistenceSyncAPI, SyncStorage } from "@solid-primitives/storage"
+import { getOwner, onCleanup, untrack } from "solid-js"
+import { reconcile, type SetStoreFunction, type Store } from "solid-js/store"
+
+export const persistSaveDelay = 100
+
+const pending = new Set<() => void>()
+
+/** Serialize and write every store with unsaved changes now. */
+export function flushPersisted() {
+  for (const save of [...pending]) save()
+}
+
+// Covers synchronous web storage. Desktop registers its own pagehide handling earlier than this
+// module loads, so its shutdown path calls flushPersisted() itself before flushing namespaces.
+if (typeof document !== "undefined") {
+  document.addEventListener("visibilitychange", () => {
+    if (document.visibilityState === "hidden") flushPersisted()
+  })
+  window.addEventListener("pagehide", flushPersisted)
+}
+
+// A store whose serialized form is written to storage on a schedule instead of on every setter
+// call. The setter only marks the store dirty; serialization happens once per save window, once
+// per owner cleanup, and when the page hides. Mirrors VS Code's Memento.
+export function persistStore<T extends object>(input: {
+  store: Store<T>
+  setStore: SetStoreFunction<T>
+  name: string
+  storage: SyncStorage | AsyncStorage
+  serialize: (value: T) => string
+  deserialize: (raw: string) => T
+  sync?: PersistenceSyncAPI
+  delay?: number
+  /** Replaces `storage.setItem` for stores whose storage can take the value itself. */
+  write?: (value: T, serialized: string) => void
+}) {
+  const delay = input.delay ?? persistSaveDelay
+  let dirty = false
+  let touched = false
+  let last: string | undefined
+  // The newest value another window wrote while this store was dirty; applied at save time if the
+  // local setter calls turned out not to change anything.
+  let remote: string | undefined
+  let timer: ReturnType<typeof setTimeout> | undefined
+
+  const save = () => {
+    clearTimeout(timer)
+    timer = undefined
+    pending.delete(save)
+    if (!dirty) return
+    dirty = false
+    const held = remote
+    remote = undefined
+    const next = untrack(() => input.serialize(input.store))
+    if (next === last) {
+      if (held !== undefined && held !== last) hydrate(held)
+      return
+    }
+    last = next
+    input.sync?.[1](input.name, next)
+    if (input.write) return input.write(input.store, next)
+    void input.storage.setItem(input.name, next)
+  }
+
+  // Solid's setter overloads are too deep to spread generically; the wrapper only forwards.
+  const apply = input.setStore as unknown as (...values: unknown[]) => void
+  const setStore = ((...values: unknown[]) => {
+    apply(...values)
+    dirty = true
+    touched = true
+    pending.add(save)
+    timer ??= setTimeout(save, delay)
+  }) as unknown as SetStoreFunction<T>
+
+  const hydrate = (raw: string) => {
+    last = raw
+    input.setStore(reconcile(input.deserialize(raw)))
+  }
+  const init = input.storage.getItem(input.name)
+  // A value the user already changed is newer than whatever storage held.
+  if (init instanceof Promise) void init.then((raw) => raw && !touched && hydrate(raw))
+  else if (init) hydrate(init)
+
+  input.sync?.[0]((data) => {
+    if (data.key !== input.name || (data.url ?? location.href) !== location.href) return
+    if (!data.newValue) return
+    // A real unsaved local change wins over another window's write, as in VS Code's storage
+    // service; whether the change is real is only known when the store is serialized. Every
+    // remote value replaces the held one, including a revert to `last`, so the save sees the
+    // other window's final state rather than an intermediate one.
+    if (dirty) {
+      remote = data.newValue
+      return
+    }
+    if (data.newValue === last) return
+    hydrate(data.newValue)
+  })
+
+  if (getOwner()) onCleanup(save)
+
+  return { setStore, init, flush: save }
+}
@@ -1,14 +1,15 @@
 import { Platform, usePlatform } from "@/runtime/platform/platform"
-import { makePersisted, messageSync, type AsyncStorage, type SyncStorage } from "@solid-primitives/storage"
+import { messageSync, type AsyncStorage, type SyncStorage } from "@solid-primitives/storage"
 import { checksum } from "@opencode-ai/util/encode"
 import { createResource, onCleanup, type Accessor } from "solid-js"
 import { createStore, type SetStoreFunction, type Store } from "solid-js/store"
 import { Option, Schema } from "effect"
 import { pathKey } from "@/workspaces/path-key"
 import { ScopedKey, ServerScope } from "@/runtime/server/scope"
+import { persistStore } from "./persist"
 import { Persistence } from "./schema"

-type InitType = Promise<string> | string | null
+type InitType = Promise<string | null> | string | null
 type PersistedWithReady<T> = [
  Store<T>,
  SetStoreFunction<T>,
@@ -483,6 +484,7 @@ export function persisted<S extends Schema.ConstraintCodec<object, unknown>>(
  const initialized = Persistence.withInitial(schema, initial)
  const json = Schema.fromJsonString(initialized)
  const decode = Schema.decodeUnknownOption(json)
+  const encode = Schema.encodeSync(initialized)
  const serialize = Schema.encodeSync(json)
  const normalize = (raw: string) => {
    const value = decode(raw)
@@ -491,10 +493,12 @@ export function persisted<S extends Schema.ConstraintCodec<object, unknown>>(
  const store = createStore<S["Type"]>(Schema.decodeUnknownSync(Schema.toType(initialized))(initial))
  const isDesktop = platform.platform === "desktop" && !!platform.storage
  const draft = config.draft ? platform.draftStore : undefined
+  const prefix = `${config.storage ?? "default"}:`
+  // The newest serialized draft, replayed into storage if a slow load finishes after an edit.
+  let draftLatest: string | undefined

  const currentStorage = (() => {
    if (draft) {
-      const prefix = `${config.storage ?? "default"}:`
      return {
        getItem: (key: string) => draft.getItem(prefix + key),
        setItem: (key: string, value: string) => draft.setItem(prefix + key, value),
@@ -556,7 +560,6 @@ export function persisted<S extends Schema.ConstraintCodec<object, unknown>>(
    ]
      .filter((source): source is { storage: SyncStorage | AsyncStorage; key?: string } => !!source?.storage)
      .map((source) => ({ ...source, storage: toAsyncStorage(source.storage) }))
-    let draftLatest: string | undefined

    const api: AsyncStorage = {
      getItem: async (key) => {
@@ -593,13 +596,29 @@ export function persisted<S extends Schema.ConstraintCodec<object, unknown>>(
      : undefined
  if (channel) onCleanup(() => channel.close())

-  const [state, setState, init] = makePersisted<S["Type"], typeof store>(store, {
+  const persist = persistStore({
+    store: store[0],
+    setStore: store[1],
    name: config.key,
    storage,
    serialize,
    deserialize: Schema.decodeUnknownSync(json),
    sync: channel ? messageSync(channel) : undefined,
+    // Drafts take the encoded document itself so large text is externalized without the store
+    // re-parsing the serialized form on every save.
+    write: draft
+      ? (value, serialized) => {
+          draftLatest = serialized
+          // A failed chunk upload is retried by the next save; see drafts.ts.
+          void draft
+            .setDocument(prefix + config.key, encode(value))
+            .catch((error: unknown) => console.error(`[persistence] draft write failed for ${config.key}`, error))
+        }
+      : undefined,
  })
+  const state = store[0]
+  const setState = persist.setStore
+  const init = persist.init

  const isAsync = init instanceof Promise
  const [ready] = createResource(
@@ -0,0 +1,33 @@
+import { onCleanup, onMount } from "solid-js"
+
+export function KeyboardInsets() {
+  onMount(() => {
+    const viewport = window.visualViewport
+    if (!viewport) return
+    const root = document.documentElement
+    const sync = () => {
+      const active = document.activeElement
+      const editing =
+        active instanceof HTMLElement &&
+        (active.isContentEditable || active.matches("input:not([readonly]), textarea:not([readonly])"))
+      // iOS retains the home-indicator inset above its keyboard. Ignore pinch zoom
+      // and small viewport changes from browser chrome, not just editor focus.
+      const keyboard = editing && root.clientHeight - viewport.height * viewport.scale > 100
+      if (keyboard) root.style.setProperty("--safe-area-inset-bottom", "0px")
+      if (!keyboard) root.style.removeProperty("--safe-area-inset-bottom")
+    }
+    sync()
+    viewport.addEventListener("resize", sync)
+    window.addEventListener("resize", sync)
+    document.addEventListener("focusin", sync)
+    document.addEventListener("focusout", sync)
+    onCleanup(() => {
+      viewport.removeEventListener("resize", sync)
+      window.removeEventListener("resize", sync)
+      document.removeEventListener("focusin", sync)
+      document.removeEventListener("focusout", sync)
+      root.style.removeProperty("--safe-area-inset-bottom")
+    })
+  })
+  return null
+}
@@ -255,7 +255,7 @@ export function createChildStoreManager(input: {
          disposers.set(key, dispose)
          activationToggles.set(key, setInstanceQueriesEnabled)

-          const onPersistedInit = (init: Promise<string> | string | null, run: () => void) => {
+          const onPersistedInit = (init: Promise<string | null> | string | null, run: () => void) => {
            if (!(init instanceof Promise)) return
            void init.then(() => {
              if (children[key] !== child) return
@@ -1,19 +1,30 @@
 import { describe, expect, test } from "bun:test"
-import { createRequestQueue } from "./request-queue"
+import { createRequestQueue, isSetupRequest, isSlowRequest } from "./request-queue"

-function setup(input?: { limit?: number; stallMs?: number }) {
-  const pending: Array<{ url: string; resolve: () => void }> = []
+function setup(input?: {
+  limit?: number
+  slowLimit?: number
+  stallMs?: number
+  headersTimeoutMs?: number
+  setupHeadersTimeoutMs?: number
+}) {
+  const pending: Array<{ url: string; signal: AbortSignal; resolve: () => void }> = []
  const logs: Array<{ message: string; data: Record<string, unknown> }> = []
  let clock = 0
  const queue = createRequestQueue({
    limit: input?.limit ?? 2,
+    slowLimit: input?.slowLimit,
    stallMs: input?.stallMs,
+    headersTimeoutMs: input?.headersTimeoutMs,
+    setupHeadersTimeoutMs: input?.setupHeadersTimeoutMs,
    now: () => clock,
    log: (message, data) => logs.push({ message, data }),
    fetch: Object.assign(
-      (resource: RequestInfo | URL) =>
-        new Promise<Response>((resolve) => {
-          pending.push({ url: new Request(resource).url, resolve: () => resolve(new Response("ok")) })
+      (resource: RequestInfo | URL, init?: RequestInit) =>
+        new Promise<Response>((resolve, reject) => {
+          const request = new Request(resource, init)
+          request.signal.addEventListener("abort", () => reject(request.signal.reason), { once: true })
+          pending.push({ url: request.url, signal: request.signal, resolve: () => resolve(new Response("ok")) })
        }),
      { preconnect() {} },
    ),
@@ -37,6 +48,41 @@ describe("createRequestQueue", () => {
    expect(input.queue.inflight()).toBe(0)
  })

+  test("slow endpoints hold at most their share of slots so small reads go first", async () => {
+    const input = setup({ limit: 4, slowLimit: 2 })
+    const paths = [
+      "/api/vcs?location[directory]=%2Fa",
+      "/api/vcs/diff?location[directory]=%2Fa",
+      "/api/worktree",
+      "/api/session/ses_1",
+    ]
+    const responses = paths.map((path) => input.queue.fetch(`http://server${path}`))
+    await input.settle()
+    const started = () => input.pending.map((item) => new URL(item.url).pathname)
+    // Two slow requests fill the slow share; the worktree read waits while the session read jumps ahead.
+    expect(started()).toEqual(["/api/vcs", "/api/vcs/diff", "/api/session/ses_1"])
+    expect(input.queue.inflight()).toBe(3)
+    expect(input.queue.queued()).toBe(1)
+    // A fast request finishing does not free a slow slot.
+    input.pending[2]!.resolve()
+    await input.settle()
+    expect(started()).toEqual(["/api/vcs", "/api/vcs/diff", "/api/session/ses_1"])
+    input.pending[0]!.resolve()
+    await input.settle()
+    expect(started()).toEqual(["/api/vcs", "/api/vcs/diff", "/api/session/ses_1", "/api/worktree"])
+    input.pending.forEach((item) => item.resolve())
+    await Promise.all(responses)
+    expect(input.queue.inflight()).toBe(0)
+  })
+
+  test("classifies git and worktree endpoints as slow", () => {
+    expect(isSlowRequest("/api/vcs")).toBe(true)
+    expect(isSlowRequest("/api/vcs/branches")).toBe(true)
+    expect(isSlowRequest("/api/worktree")).toBe(true)
+    expect(isSlowRequest("/api/vcsx")).toBe(false)
+    expect(isSlowRequest("/api/session")).toBe(false)
+  })
+
  test("never counts the event stream against the budget", async () => {
    const input = setup({ limit: 1 })
    void input.queue.fetch("http://server/api/session")
@@ -59,6 +105,54 @@ describe("createRequestQueue", () => {
    expect(input.queue.inflight()).toBe(0)
  })

+  test("a request the server never answers times out and frees its slot", async () => {
+    const input = setup({ limit: 1, headersTimeoutMs: 10 })
+    const dead = input.queue.fetch("http://server/api/dead")
+    const next = input.queue.fetch("http://server/api/next")
+    await input.settle()
+    expect(input.queue.queued()).toBe(1)
+    const error = await dead.catch((cause: unknown) => cause)
+    expect(error).toBeInstanceOf(DOMException)
+    expect((error as DOMException).name).toBe("TimeoutError")
+    await input.settle()
+    expect(input.pending.map((item) => new URL(item.url).pathname)).toEqual(["/api/dead", "/api/next"])
+    input.pending[1]!.resolve()
+    await expect(next).resolves.toBeInstanceOf(Response)
+    expect(input.queue.inflight()).toBe(0)
+  })
+
+  test("worktree creation gets the setup deadline while worktree reads keep the normal one", async () => {
+    const input = setup({ limit: 4, headersTimeoutMs: 10, setupHeadersTimeoutMs: 200 })
+    const create = input.queue.fetch("http://server/api/worktree?location[directory]=%2Fa", { method: "POST" })
+    const list = input.queue.fetch("http://server/api/worktree?location[directory]=%2Fa")
+    const listError = await list.catch((cause: unknown) => cause)
+    expect((listError as DOMException).name).toBe("TimeoutError")
+    // Past the normal deadline, the create is still on the wire.
+    expect(input.pending[0]!.signal.aborted).toBe(false)
+    input.pending[0]!.resolve()
+    await expect(create).resolves.toBeInstanceOf(Response)
+    expect(input.queue.inflight()).toBe(0)
+  })
+
+  test("only worktree creation counts as a setup request", () => {
+    expect(isSetupRequest("POST", "/api/worktree")).toBe(true)
+    expect(isSetupRequest("GET", "/api/worktree")).toBe(false)
+    expect(isSetupRequest("POST", "/api/worktree/refresh")).toBe(false)
+    expect(isSetupRequest("DELETE", "/api/worktree")).toBe(false)
+  })
+
+  test("caller aborts still reach the underlying request", async () => {
+    const input = setup({ limit: 1 })
+    const controller = new AbortController()
+    const request = input.queue.fetch("http://server/api/slow", { signal: controller.signal })
+    await input.settle()
+    expect(input.pending[0]!.signal.aborted).toBe(false)
+    controller.abort()
+    expect(input.pending[0]!.signal.aborted).toBe(true)
+    await expect(request).rejects.toBeInstanceOf(DOMException)
+    expect(input.queue.inflight()).toBe(0)
+  })
+
  test("a burst that drains promptly is not thrashing", async () => {
    const input = setup({ stallMs: 5 })
    const responses = Array.from({ length: 12 }, (_, index) => input.queue.fetch(`http://server/api/${index}`))
@@ -1,23 +1,52 @@
-type Entry = { method: string; url: string; at: number }
+type Entry = { method: string; url: string; at: number; slow: boolean }

 // Chromium allows six connections per origin. The event stream holds one for the life of the
 // connection and health probes use their own fetch, so the app's API calls stay below that or
 // a burst stalls probes and user actions inside the browser where nothing can observe it.
 export const requestQueueLimit = 4

+// Endpoints that shell out to git or walk the filesystem take seconds on a large repository. They
+// may hold at most this many slots, so a session mount's small reads never queue behind them.
+export const requestQueueSlowLimit = 2
+export const slowRequestPaths = ["/api/vcs", "/api/worktree"]
+
 // A mount legitimately fires a dozen requests at once; only a request that has waited this long
 // for a slot indicates the server is not keeping up.
 export const requestStallMs = 2_000

+// A socket that dies while the device sleeps can leave fetch waiting for response headers until the
+// OS gives up on TCP retransmits, which takes minutes. Bound that so a dead request frees its slot
+// instead of wedging every later API call; the body may still stream for as long as it needs.
+export const requestHeadersTimeoutMs = 60_000
+
+// Creating a worktree runs the project's setup script (dependency installs, fetches) before the
+// server answers, so it needs a budget measured in minutes rather than seconds. Cutting it off
+// kills the script midway and leaves a registered but half-initialised worktree behind.
+export const setupRequestHeadersTimeoutMs = 10 * 60_000
+
+export function isSlowRequest(pathname: string) {
+  return slowRequestPaths.some((path) => pathname === path || pathname.startsWith(`${path}/`))
+}
+
+export function isSetupRequest(method: string, pathname: string) {
+  return method === "POST" && pathname === "/api/worktree"
+}
+
 export function createRequestQueue(input: {
  fetch: typeof globalThis.fetch
  limit?: number
+  slowLimit?: number
  stallMs?: number
+  headersTimeoutMs?: number
+  setupHeadersTimeoutMs?: number
  log?: (message: string, data: Record<string, unknown>) => void
  now?: () => number
 }) {
  const limit = input.limit ?? requestQueueLimit
+  const slowLimit = input.slowLimit ?? requestQueueSlowLimit
  const stallMs = input.stallMs ?? requestStallMs
+  const headersTimeoutMs = input.headersTimeoutMs ?? requestHeadersTimeoutMs
+  const setupHeadersTimeoutMs = input.setupHeadersTimeoutMs ?? setupRequestHeadersTimeoutMs
  // Call the browser fetch unbound; `input.fetch(...)` would make `this` the options object.
  const base = input.fetch
  const now = input.now ?? Date.now
@@ -43,9 +72,17 @@ export function createRequestQueue(input: {
    }
    watcher = setTimeout(watch, stallMs)
  }
+  const canStart = (entry: Entry) => {
+    if (inflight.size >= limit) return false
+    if (!entry.slow) return true
+    return [...inflight].filter((item) => item.slow).length < slowLimit
+  }
+  // FIFO, except a slow request waits its turn behind faster ones while the slow slots are full.
  const release = (entry: Entry) => {
    inflight.delete(entry)
-    waiting.shift()?.start()
+    const index = waiting.findIndex((item) => canStart(item.entry))
+    if (index === -1) return
+    waiting.splice(index, 1)[0]?.start()
  }
  const acquire = (entry: Entry) =>
    new Promise<void>((resolve) => {
@@ -54,7 +91,7 @@ export function createRequestQueue(input: {
        inflight.add(entry)
        resolve()
      }
-      if (inflight.size < limit) return start()
+      if (canStart(entry)) return start()
      waiting.push({ entry, start })
      watcher ??= setTimeout(watch, stallMs)
    })
@@ -62,15 +99,25 @@ export function createRequestQueue(input: {
  const fetch: typeof globalThis.fetch = Object.assign(
    async (resource: RequestInfo | URL, init?: RequestInit) => {
      const request = new Request(resource, init)
+      const pathname = new URL(request.url).pathname
      // The event stream is long-lived; never count it against the request budget.
-      if (new URL(request.url).pathname === "/api/event") return base(request)
-      const entry = { method: request.method, url: request.url, at: now() }
+      if (pathname === "/api/event") return base(request)
+      const entry = { method: request.method, url: request.url, at: now(), slow: isSlowRequest(pathname) }
      await acquire(entry)
      if (request.signal.aborted) {
        release(entry)
        throw request.signal.reason ?? new DOMException("The operation was aborted.", "AbortError")
      }
-      return base(request).finally(() => release(entry))
+      const controller = new AbortController()
+      request.signal.addEventListener("abort", () => controller.abort(request.signal.reason), { once: true })
+      const timer = setTimeout(
+        () => controller.abort(new DOMException("Timed out waiting for the server to respond", "TimeoutError")),
+        isSetupRequest(request.method, pathname) ? setupHeadersTimeoutMs : headersTimeoutMs,
+      )
+      return base(new Request(request, { signal: controller.signal })).finally(() => {
+        clearTimeout(timer)
+        release(entry)
+      })
    },
    // Bun's fetch type carries preconnect; the browser never calls it.
    { preconnect: () => {} },
@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test"
 import { createRoot, createSignal } from "solid-js"
-import { createConnectionSync } from "./connection"
+import { createConnectionSync, reconnectOrder } from "./connection"

 test("invalidates disconnected data and synchronizes after the handshake", () => {
  const calls: string[] = []
@@ -19,3 +19,9 @@ test("invalidates disconnected data and synchronizes after the handshake", () =>
  })
  dispose()
 })
+
+test("held directories refresh before the rest, otherwise keeping their order", () => {
+  const held = new Set(["/b", "/d"])
+  expect(reconnectOrder(["/a", "/b", "/c", "/d"], (directory) => held.has(directory))).toEqual(["/b", "/d", "/a", "/c"])
+  expect(reconnectOrder(["/a", "/c"], (directory) => held.has(directory))).toEqual(["/a", "/c"])
+})
@@ -20,3 +20,8 @@ export function createConnectionSync(input: {

  return { handleEvent }
 }
+
+// Directories a mounted view holds refresh first; the rest keep their existing order behind them.
+export function reconnectOrder(directories: string[], held: (directory: string) => boolean) {
+  return [...directories.filter(held), ...directories.filter((directory) => !held(directory))]
+}
@@ -17,7 +17,7 @@ import type { ServerScope } from "@/runtime/server/scope"
 import { persisted } from "@/runtime/persistence/storage"
 import type { ServerApi } from "@/runtime/server/api"
 import { toggleMcp } from "./global-sync/mcp"
-import { createConnectionSync } from "./server-sync/connection"
+import { createConnectionSync, reconnectOrder } from "./server-sync/connection"
 import { usePlatform } from "@/runtime/platform/platform"
 import type { Data } from "@opencode-ai/client/solid"
 import { createWorktreeInventory, withWorktreeInventory } from "@/workspaces/inventory"
@@ -162,12 +162,11 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
    },
    connected: (info) => {
      if (bootstrap.data !== undefined && !bootstrap.isFetching) void bootstrap.refetch()
-      Object.keys(children.children)
-        .filter(children.active)
-        .forEach((directory) => {
-          queue.push(directory)
-          void data.location.sync({ directory }).catch(() => undefined)
-        })
+      // The refresh queue re-syncs two directories at a time, held ones first. Syncing every active
+      // directory here as well sent the whole catalog fan-out for all of them at once.
+      reconnectOrder(Object.keys(children.children).filter(children.active), children.pinned).forEach(
+        (directory) => queue.push(directory),
+      )
    },
  })

@@ -2,11 +2,12 @@ import { Show, type JSX } from "solid-js"
 import { useLanguage } from "@/runtime/i18n/language"
 import { SessionPermissionDock } from "@/session/requests/session-permission-dock"
 import { SessionQuestionDock } from "@/session/requests/session-question-dock"
+import { SessionWebSearchDock } from "@/session/requests/session-websearch-dock"
 import type { SessionComposerRegionController } from "./session-composer-region-controller"

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

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

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

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

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

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

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

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

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

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

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

 export function openAppFileManager(os: OpenAppOS) {
-  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 }
+  return fileManagerApp(os)
 }

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

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

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

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

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

-  const copyPath = () => {
-    const directory = input.directory()
-    if (!directory) return
+  const copyPath = (target = input.path()) => {
+    if (!target) return
    navigator.clipboard
-      .writeText(directory)
+      .writeText(target)
      .then(() => {
        showToast({
          variant: "success",
          icon: "circle-check",
          title: language.t("common.copied"),
-          description: directory,
+          description: target,
        })
      })
      .catch((err: unknown) => showRequestError(language, err))
@@ -228,8 +227,18 @@ export function useOpenInApp(input: { directory: () => string }) {
    options,
    menu,
    setMenu,
-    openDir,
+    openPath,
    selectApp,
    copyPath,
  }
 }
+
+function checkAppExists(platform: ReturnType<typeof usePlatform>, app: string) {
+  const cached = appExistence.get(app)
+  if (cached) return cached
+  const request = Promise.resolve(platform.checkAppExists?.(app))
+    .then(Boolean)
+    .catch(() => false)
+  appExistence.set(app, request)
+  return request
+}
@@ -7,7 +7,8 @@ import { useServerSDK } from "@/runtime/server/client"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useSettings } from "@/settings/model"
 import { useWorkspaceLocation } from "@/workspaces/location"
-import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
+import { sessionPermissionRequest, sessionFormRequest, sessionTreeIDs } from "@/session/requests/session-request-tree"
+import { createWebSearchRequest } from "./websearch"
 import { createSessionBackground } from "@/session/requests/background"
 import { useData } from "@/runtime/server/current"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 const modelReady = Object.assign(() => true, { promise: undefined }) satisfies ModelSelection["ready"]
 const storyComposerModel = {
@@ -82,7 +83,7 @@ export type SessionPreviewProps = {
  description: string
  document: SessionDocument
  draft?: string
-  request?: { type: "permission"; value: PermissionRequest } | { type: "question"; value: FormInfo }
+  request?: { type: "permission"; value: PermissionRequest } | { type: "question" | "websearch"; value: FormInfo }
  reviewOpened?: boolean
  child?: { parentID: string }
  terminal?: { title: string; lines: string[] }
@@ -173,10 +174,12 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
    activity: string
    reviewOpened: boolean
    request: SessionPreviewProps["request"]
+    searchProvider: string
  }>({
    activity: "Ready",
    reviewOpened: props.reviewOpened ?? false,
    request: props.request,
+    searchProvider: "random",
  })
  const prompt = createPromptController({
    initial: props.draft ?? "",
@@ -189,6 +192,27 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
  const region = {
    state: {
      questionRequest: () => (state.request?.type === "question" ? state.request.value : undefined),
+      websearch: {
+        request: () => (state.request?.type === "websearch" ? state.request.value : undefined),
+        options: () => [
+          { value: "exa", label: "Exa" },
+          { value: "parallel", label: "Parallel" },
+          { value: "tavily", label: "Tavily" },
+        ],
+        selected: () => state.searchProvider,
+        specific: () => false,
+        loading: () => false,
+        loadFailed: () => false,
+        failed: () => false,
+        sending: () => false,
+        connected: () => true,
+        select: (value) => setState("searchProvider", value),
+        retry() {},
+        submit: async (value) => {
+          setState("request", undefined)
+          setState("activity", `Web search selection (local only): ${value}`)
+        },
+      } satisfies WebSearchRequestModel,
      permissionRequest: () => (state.request?.type === "permission" ? state.request.value : undefined),
      permissionResponding: () => false,
      decide: (response) => {
@@ -24,6 +24,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
      pinned: true,
    },
    refs: {
+      scroller: undefined as HTMLDivElement | undefined,
      content: undefined as HTMLDivElement | undefined,
      dock: undefined as HTMLDivElement | undefined,
    },
@@ -38,7 +39,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
  }
  let scroller: HTMLDivElement | undefined
  let dockHeight = 0
-  let revealMessage = (_id: string) => {}
+  let revealMessage = (_id: string, _partID?: string) => {}
  let scrollToEnd = () => {}
  let scrollMark = 0
  let messageMark = 0
@@ -157,6 +158,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
  }
  const setScrollRef = (element: HTMLDivElement | undefined) => {
    scroller = element
+    setState("refs", "scroller", element)
    if (!element) return
    scheduleScrollState(element)
    fill()
@@ -290,6 +292,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
  return {
    actions: {
      navigateMessage,
+      revealMessage: (id: string, partID?: string) => revealMessage(id, partID),
      resume,
      setActiveMessage,
    },
@@ -297,7 +300,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
    resource: timeline.resource,
    ready: timeline.ready,
    scroll: state.scroll,
-    scroller: () => scroller,
+    scroller: () => state.refs.scroller,
    view: {
      anchor,
      markUserScroll,
@@ -313,7 +316,7 @@ export function createSessionTimelineInteraction(session: SessionModel) {
      setDockRef: (element: HTMLDivElement | undefined) => {
        setState("refs", "dock", element)
      },
-      setRevealMessage: (reveal: (id: string) => void) => {
+      setRevealMessage: (reveal: (id: string, partID?: string) => void) => {
        revealMessage = reveal
      },
      setScrollRef,
@@ -58,7 +58,6 @@ export function BackgroundMoveHint(props: { keybind?: string[]; onMove?: () => v
      type="button"
      variant="ghost-faint"
      size="small"
-      icon="outline-arrow-to-corner-top-right"
      class="max-w-full"
      aria-label={language.t("session.background.moveInline", { keybind: keybind() })}
      onClick={() => props.onMove?.()}
@@ -185,7 +184,7 @@ function WorkspaceMoveAction(props: {
            : "flex h-[46px] w-full items-center gap-2 rounded-b-[6px] px-3 pe-9 pt-2.5 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-muted focus-visible:outline-none"
        }
      >
-        <Icon name="workspace-new" class="shrink-0 text-v2-icon-icon-muted" />
+        <Icon name="outline-worktree" class="shrink-0 text-v2-icon-icon-muted" />
        <span class="min-w-0 truncate">{language.t("workspace.move.title")}</span>
      </SessionWorkspaceMenu>
      <button
@@ -257,7 +256,10 @@ export function SessionSummaryPanel(props: {
          gutter={props.mobile ? 4 : -22}
          class={`${row} hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:outline-none data-[expanded]:bg-v2-overlay-simple-overlay-pressed`}
        >
-          <Icon name={props.local ? "monitor" : "workspace-isolated"} class="shrink-0 text-v2-icon-icon-muted" />
+          <Icon
+            name={props.local ? "monitor" : "outline-worktree"}
+            class={`shrink-0 ${props.local ? "text-v2-icon-icon-muted" : "text-v2-icon-icon-accent"}`}
+          />
          <span dir="auto" class="min-w-0 flex-1 truncate text-start">
            {location()}
          </span>
@@ -354,8 +356,9 @@ type MessageTimelineProps = {
  workspaceMoveEligible: boolean
  onSummaryOpenChange: (open: boolean) => void
  anchor: (id: string) => string
-  setRevealMessage?: (fn: (id: string) => void) => void
+  setRevealMessage?: (fn: (id: string, partID?: string) => void) => void
  setScrollToEnd?: (fn: () => void) => void
+  search?: JSX.Element
 }

 export function MessageTimeline(props: MessageTimelineProps) {
@@ -790,6 +793,7 @@ function MessageTimelineView(
              <Show when={sessionID()} keyed>
                {(id) => (
                  <div class="shrink-0 flex items-center gap-2">
+                    {props.search}
                    <SessionContextUsage placement="bottom" />
                    <Show when={!parentID() && project()}>
                      {(project) => (
@@ -0,0 +1,14 @@
+[data-component="timeline-search-bar"] [data-component="text-input-v2"] {
+  background: var(--v2-background-bg-base);
+  box-shadow: inset 0 0 0 1px var(--v2-border-border-base);
+  outline: none;
+}
+
+[data-component="timeline-search-bar"] [data-component="text-input-v2"]:hover {
+  background: var(--v2-background-bg-base);
+}
+
+[data-component="timeline-search-bar"] [data-component="text-input-v2"]:focus-within {
+  box-shadow: inset 0 0 0 1px var(--v2-border-border-focus);
+  outline: none;
+}
@@ -0,0 +1,72 @@
+import { Icon } from "@opencode-ai/ui/icon"
+import "@opencode-ai/ui/text-input.css"
+import { Show } from "solid-js"
+import type { TimelineSearchController } from "./search-controller"
+import "./search-bar.css"
+
+export function TimelineSearchBar(props: { controller: TimelineSearchController }) {
+  const c = props.controller
+
+  return (
+    <Show when={c.visible()}>
+      <div data-component="timeline-search-bar" class="h-7 w-[200px] max-w-[50vw] shrink-0">
+        <div data-component="text-input-v2" data-appearance="base" data-leading-icon class="!h-7 !w-full max-w-full">
+          <div data-slot="text-input-v2-value">
+            <span data-slot="text-input-v2-leading-icon">
+              <Icon name="magnifying-glass" size="small" />
+            </span>
+            <input
+              ref={c.element.setInput}
+              data-slot="text-input-v2-input"
+              type="search"
+              value={c.query.value()}
+              placeholder={c.query.placeholder()}
+              aria-label={c.query.placeholder()}
+              onInput={(event) => c.query.setValue(event.currentTarget.value)}
+              onKeyDown={(event) => {
+                if (event.key === "Escape") {
+                  event.preventDefault()
+                  c.query.close()
+                  return
+                }
+                if (event.altKey || event.metaKey || event.ctrlKey) return
+                if (event.key === "Enter" && !event.isComposing) {
+                  event.preventDefault()
+                  c.result.move(event.shiftKey ? -1 : 1)
+                  return
+                }
+                if (event.key === "ArrowDown" && !event.isComposing) {
+                  event.preventDefault()
+                  c.result.move(1)
+                  return
+                }
+                if (event.key === "ArrowUp" && !event.isComposing) {
+                  event.preventDefault()
+                  c.result.move(-1)
+                  return
+                }
+              }}
+            />
+          </div>
+          <Show when={c.query.value()}>
+            <span
+              data-slot="timeline-search-count"
+              class="shrink-0 self-center text-[11px] text-v2-text-text-muted [font-weight:440] tabular-nums"
+            >
+              {c.result.count() > 0 ? c.result.activeIndex() + 1 : 0}/{c.result.count()}
+            </span>
+          </Show>
+          <button
+            type="button"
+            class="-me-1 flex size-5 shrink-0 self-center items-center justify-center rounded-[2px] border-0 bg-transparent p-0 text-v2-icon-icon-muted outline outline-1 outline-transparent hover:bg-v2-overlay-simple-overlay-hover active:bg-v2-overlay-simple-overlay-pressed focus-visible:outline-v2-border-border-focus"
+            aria-label={c.query.placeholder()}
+            onMouseDown={(event) => event.preventDefault()}
+            onClick={() => c.query.close()}
+          >
+            <Icon name="xmark-small" />
+          </button>
+        </div>
+      </div>
+    </Show>
+  )
+}
@@ -0,0 +1,275 @@
+import { useCommand } from "@/shell/commands/command"
+import { useLanguage } from "@/runtime/i18n/language"
+import { useData } from "@/runtime/server/current"
+import { Timeline } from "@opencode-ai/session-ui/timeline/projection"
+import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
+import { createStore } from "solid-js/store"
+
+export type TimelineSearchMatch = {
+  messageID: string
+  role: "user" | "assistant"
+  revealID: string
+  partID: string
+  occurrence: number
+  text: string
+}
+
+const HIGHLIGHT_HIT = "timeline-search-hit"
+const HIGHLIGHT_ACTIVE = "timeline-search-hit-active"
+const TEXT_SELECTORS = '[data-slot="text-part-body"], [data-slot="user-message-text"]'
+
+function supportsHighlights() {
+  return typeof CSS !== "undefined" && typeof CSS.highlights === "object" && CSS.highlights !== null
+}
+
+function clearHighlights() {
+  if (!supportsHighlights()) return
+  CSS.highlights.delete(HIGHLIGHT_HIT)
+  CSS.highlights.delete(HIGHLIGHT_ACTIVE)
+}
+
+function collectRanges(
+  root: HTMLElement,
+  query: string,
+  activePartID: string | undefined,
+  activeOccurrence: number | undefined,
+) {
+  const hits: Range[] = []
+  const active: Range[] = []
+  const lower = query.toLowerCase()
+  const bodies = root.querySelectorAll<HTMLElement>(TEXT_SELECTORS)
+  for (const body of bodies) {
+    const part = body.closest("[data-timeline-part-id]")
+    const partID = part?.getAttribute("data-timeline-part-id")
+    const isActivePart = activePartID !== undefined && partID === activePartID
+    let occurrenceInPart = 0
+    const walker = document.createTreeWalker(body, NodeFilter.SHOW_TEXT)
+    let node = walker.nextNode() as Text | null
+    while (node) {
+      const value = node.nodeValue ?? ""
+      const lowerValue = value.toLowerCase()
+      let from = 0
+      let at = lowerValue.indexOf(lower, from)
+      while (at !== -1) {
+        const range = document.createRange()
+        range.setStart(node, at)
+        range.setEnd(node, at + query.length)
+        if (isActivePart && activeOccurrence === occurrenceInPart) active.push(range)
+        else hits.push(range)
+        occurrenceInPart += 1
+        from = at + query.length
+        at = lowerValue.indexOf(lower, from)
+      }
+      node = walker.nextNode() as Text | null
+    }
+  }
+  return { hits, active }
+}
+
+function applyHighlights(
+  root: HTMLElement,
+  query: string,
+  activePartID: string | undefined,
+  activeOccurrence: number | undefined,
+) {
+  if (!supportsHighlights()) return
+  const { hits, active } = collectRanges(root, query, activePartID, activeOccurrence)
+  CSS.highlights.set(HIGHLIGHT_HIT, new Highlight(...hits))
+  CSS.highlights.set(HIGHLIGHT_ACTIVE, new Highlight(...active))
+}
+
+export function createTimelineSearchController(input: {
+  sessionID: () => string | undefined
+  scrollRef: () => HTMLDivElement | undefined
+  revealMessage: (id: string, partID?: string) => void
+  pauseAutoScroll: () => void
+}) {
+  const command = useCommand()
+  const language = useLanguage()
+  const data = useData()
+  const [state, setState] = createStore({ value: "", active: 0, visible: false })
+  const [focusTick, setFocusTick] = createSignal(0)
+  let inputEl: HTMLInputElement | undefined
+
+  const query = createMemo(() => state.value.trim().toLowerCase())
+
+  const matches = createMemo<TimelineSearchMatch[]>(() => {
+    const value = query()
+    if (!value) return []
+    const sessionID = input.sessionID()
+    if (!sessionID) return []
+    const messages = data.session.message.list(sessionID)
+    const result: TimelineSearchMatch[] = []
+    let revealID = ""
+    for (const message of messages) {
+      if (message.type === "user" || message.type === "shell") revealID = message.id
+      if (message.type !== "user" && message.type !== "assistant") continue
+      const visibleParts =
+        message.type === "user"
+          ? [{ id: `${message.id}:text:0`, content: { type: "text" as const, text: message.text } }]
+          : Timeline.contentEntries(message)
+      for (const textPart of visibleParts) {
+        if (textPart.content.type !== "text") continue
+        const text = textPart.content.text
+        if (!text) continue
+        const lower = text.toLowerCase()
+        let from = 0
+        let occurrence = 0
+        let at = lower.indexOf(value, from)
+        while (at !== -1) {
+          result.push({
+            messageID: message.id,
+            role: message.type,
+            revealID,
+            partID: textPart.id,
+            occurrence,
+            text,
+          })
+          occurrence += 1
+          from = at + value.length
+          at = lower.indexOf(value, from)
+        }
+      }
+    }
+    return result
+  })
+
+  const activeIndex = createMemo(() => {
+    const list = matches()
+    if (list.length === 0) return 0
+    if (state.active >= list.length) return 0
+    if (state.active < 0) return 0
+    return state.active
+  })
+
+  const activePartID = createMemo(() => matches()[activeIndex()]?.partID)
+  const activeOccurrence = createMemo(() => matches()[activeIndex()]?.occurrence)
+
+  createEffect(() => {
+    const root = input.scrollRef()
+    const q = query()
+    if (!root || !state.visible || !q) {
+      clearHighlights()
+      return
+    }
+    applyHighlights(root, q, activePartID(), activeOccurrence())
+    let frame: number | undefined
+    const scheduleApply = () => {
+      if (frame !== undefined) return
+      frame = requestAnimationFrame(() => {
+        frame = undefined
+        if (!state.visible) return
+        applyHighlights(root, query(), activePartID(), activeOccurrence())
+      })
+    }
+    const observer = new MutationObserver(scheduleApply)
+    observer.observe(root, { childList: true, subtree: true, characterData: true })
+    onCleanup(() => {
+      observer.disconnect()
+      if (frame !== undefined) cancelAnimationFrame(frame)
+      clearHighlights()
+    })
+  })
+
+  createEffect(
+    on(focusTick, () => {
+      if (!state.visible) return
+      requestAnimationFrame(() => {
+        inputEl?.focus()
+        inputEl?.select()
+      })
+    }),
+  )
+
+  command.register("session.search", () => [
+    {
+      id: "session.search",
+      title: language.t("session.search.placeholder"),
+      keybind: "mod+f",
+      hidden: true,
+      onSelect: () => open(),
+    },
+  ])
+  const onOpenRequest = () => open()
+  document.addEventListener("opencode:timeline-search-open", onOpenRequest)
+  onCleanup(() => document.removeEventListener("opencode:timeline-search-open", onOpenRequest))
+
+  function open() {
+    setState("visible", true)
+    setFocusTick((t) => t + 1)
+  }
+
+  function close() {
+    setState({ value: "", active: 0, visible: false })
+    inputEl?.blur()
+  }
+
+  function setValue(value: string) {
+    setState("value", value)
+    const list = matches()
+    const match = list[0]
+    if (!value.trim() || !match) {
+      setState("active", 0)
+      return
+    }
+    setState("active", 0)
+    input.pauseAutoScroll()
+    input.revealMessage(match.revealID, match.partID)
+    scrollToMatch(match)
+  }
+
+  function scrollToMatch(match: TimelineSearchMatch) {
+    let attempts = 0
+    const seek = () => {
+      if (!state.visible) return
+      const root = input.scrollRef()
+      if (!root) return
+      const { active } = collectRanges(root, query(), match.partID, match.occurrence)
+      if (active.length === 0) {
+        if (attempts++ < 12) requestAnimationFrame(seek)
+        return
+      }
+      const rect = active[0].getBoundingClientRect()
+      const rootRect = root.getBoundingClientRect()
+      const sticky = root.querySelector("[data-session-title]")
+      const inset = sticky instanceof HTMLElement ? sticky.offsetHeight : 0
+      const top = rect.top - rootRect.top + root.scrollTop - inset - (rootRect.height - rect.height) / 2
+      root.scrollTo({ top: Math.max(0, top), behavior: "auto" })
+    }
+    requestAnimationFrame(seek)
+  }
+
+  function move(delta: number) {
+    const list = matches()
+    if (list.length === 0) return
+    const next = (activeIndex() + delta + list.length) % list.length
+    setState("active", next)
+    const match = list[next]
+    if (!match) return
+    input.pauseAutoScroll()
+    input.revealMessage(match.revealID, match.partID)
+    scrollToMatch(match)
+  }
+
+  return {
+    visible: () => state.visible,
+    query: {
+      value: () => state.value,
+      placeholder: () => language.t("session.search.placeholder"),
+      noResults: () => language.t("session.search.noResults"),
+      open,
+      close,
+      setValue,
+    },
+    result: {
+      activeIndex,
+      count: () => matches().length,
+      move,
+    },
+    element: {
+      setInput: (element: HTMLInputElement) => (inputEl = element),
+    },
+  }
+}
+
+export type TimelineSearchController = ReturnType<typeof createTimelineSearchController>
@@ -7,7 +7,6 @@ import type { Project } from "@/runtime/server/types"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useServerSDK } from "@/runtime/server/client"
 import { useData } from "@/runtime/server/current"
-import { useSettingsDialog } from "@/settings/command"
 import { pathKey } from "@/workspaces/path-key"
 import { showToast } from "@/shell/notifications/toast"
 import { containsDirectory, sameDirectory, workspaceDirectories } from "@/workspaces/paths"
@@ -28,7 +27,6 @@ export function SessionWorkspaceMenu(props: {
  const language = useLanguage()
  const serverSDK = useServerSDK()
  const data = useData()
-  const openWorkspaces = useSettingsDialog("workspaces")
  const [store, setStore] = createStore({ selected: undefined as string | undefined })
  const [directories, setDirectories] = createSignal(workspaceDirectories(props.project))
  const blocked = () => props.eligible === false || data.session.status(props.sessionID) === "running"
@@ -99,13 +97,13 @@ export function SessionWorkspaceMenu(props: {
              </Menu.Item>
            </Show>
            <Menu.Item disabled={!!store.selected || blocked()} onSelect={() => void move("create")}>
-              <Icon name="workspace-new" />
+              <Icon name="plus" />
              {language.t("workspace.new")}
            </Menu.Item>
            <Show when={workspaces().length > 0}>
              <Menu.Sub gutter={0} overlap overflowPadding={8}>
                <Menu.SubTrigger>
-                  <Icon name="workspace-isolated" />
+                  <Icon name="outline-worktree" />
                  {language.t("session.new.workspace.existing").replace(/(…|\.{3})$/, "")}
                </Menu.SubTrigger>
                <Menu.Portal>
@@ -113,7 +111,7 @@ export function SessionWorkspaceMenu(props: {
                    <For each={workspaces()}>
                      {(workspace) => (
                        <Menu.Item disabled={!!store.selected || blocked()} onSelect={() => void move(workspace)}>
-                          <Icon name="workspace-isolated" />
+                          <Icon name="outline-worktree" />
                          <span class="min-w-0 flex-1 truncate">{getFilename(workspace)}</span>
                        </Menu.Item>
                      )}
@@ -123,10 +121,6 @@ export function SessionWorkspaceMenu(props: {
              </Menu.Sub>
            </Show>
          </Menu.Group>
-          <Menu.Separator class="h-[0.5px] bg-v2-border-border-base" />
-          <Menu.Item onSelect={() => openWorkspaces()}>
-            <span class="min-w-0 flex-1 truncate">{language.t("common.viewAll")}</span>
-          </Menu.Item>
        </Menu.Content>
      </Menu.Portal>
    </Menu>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Luke Parker	d86c3041c9	fix(app): keep new session open while the worktree list loads (#47734 )	2026-09-07 05:56:23 +00:00
Aiden Cline	3cf197a309	fix(core): remove compatible-provider remapping (#47732 )	2026-09-07 00:46:37 -05:00
Aiden Cline	42bccc301e	refactor(ai): give named providers dedicated modules (#47726 )	2026-09-06 23:56:39 -05:00
David HillandLukeParkerDev	243e81041e	feat(app): refine timeline detail settings (#47226 ) Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>	2026-09-07 04:54:28 +00:00
Luke Parker	5d971e5272	perf(app): externalize large draft text into content-addressed chunks (#47706 )	2026-09-07 14:17:34 +10:00
Dax Raad	7ef9cb68d1	Revert "docs(go): document client session compatibility" This reverts commit `0ff9ccb227`.	2026-09-06 23:42:25 -04:00
opencode-agent[bot]	733f138dae	fix(app): remove bottom safe area while keyboard is open (#47712 )	2026-09-07 13:41:44 +10:00
Dax Raad	0ff9ccb227	docs(go): document client session compatibility	2026-09-06 23:35:26 -04:00
opencode-agent[bot]andHona	5ff8a3f5fa	fix(ui): align unread avatar badges with the corner (#47718 ) Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>	2026-09-07 13:15:48 +10:00
Luke Parker	44513bd0b0	perf(app): serialize persisted stores on a schedule instead of per setter call (#47705 )	2026-09-07 13:01:52 +10:00
Luke Parker	dc46ecfc55	perf(app): cache storage namespaces and batch writes in the renderer (#47704 )	2026-09-07 12:33:09 +10:00
usrnk1andLukeParkerDev	f16acb1c95	feat(desktop): improve worktree ui (#47310 ) Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>	2026-09-07 01:26:11 +00:00
opencode-agent[bot]	d0d3504780	chore: update nix node_modules hashes	2026-09-07 01:05:55 +00:00
Luke Parker	5e3100a46a	fix(desktop): persist renderer state in SQLite instead of electron-store (#47695 )	2026-09-07 10:51:46 +10:00
Luke Parker	69b30acfd4	chore: stop trusting tree-sitter install scripts (#47696 )	2026-09-07 00:09:44 +00:00
Luke Parker	ecb3c88601	fix(app): give worktree creation a setup-length request deadline (#47694 )	2026-09-06 23:44:45 +00:00
opencode-agent[bot]andHona	a5ebf5bf2f	fix(www): regenerate OpenAPI documents (#47693 ) Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>	2026-09-06 23:26:56 +00:00
Luke Parker	f334377c5b	fix(util): bound opencode.log by trimming its head in place (#47676 )	2026-09-07 09:16:09 +10:00
Luke Parker	873d437c12	fix(desktop): emit preload as .cjs so it loads under --no-sandbox (#47691 )	2026-09-07 09:14:38 +10:00
Aiden Cline	13286e883e	fix(ai): raise typed errors for failed finishes (#47688 )	2026-09-06 18:09:49 -05:00
Luke Parker	0d70595338	fix(desktop): export tail of oversized logs in debug bundle (#47672 )	2026-09-07 08:47:30 +10:00
Aiden Cline	a02415a3eb	fix(ai): restrict Bedrock cache checkpoints to Claude (#47660 )	2026-09-06 17:00:12 -05:00
Dax	beca5e8926	feat(project): allow updating canonical directory (#47642 )	2026-09-06 17:52:48 -04:00
Shoubhit Dash	e3c89654d1	feat(core): keep web search providers sticky per session (#47334 )	2026-09-07 03:09:47 +05:30
Dax	33f48f36c9	docs(www): add Console documentation (#47638 )	2026-09-06 12:06:07 -04:00
Dax	58f949d2d0	fix(core): log MCP OAuth and credential lifecycle (#47636 )	2026-09-06 11:56:42 -04:00
Kit Langton	2a895b9e03	fix(core): interrupt sessions before inactivity eviction (#47629 )	2026-09-06 11:11:42 -04:00
Dax Raad	fe506f201d	docs: explain supporting v1 and v2 plugins	2026-09-06 11:08:26 -04:00
Luke Parker	b2cecc6350	fix(desktop): add sidecar credentials from the main process (#47588 )	2026-09-06 07:18:12 +00:00
Luke Parker	63a1074c6c	fix(app): keep slow git reads from filling the request queue (#47564 )	2026-09-06 17:02:03 +10:00
Luke Parker	31ee07e3ae	fix(app): pace directory re-sync after reconnect (#47565 )	2026-09-06 17:01:24 +10:00
Aarav Sareen	370b9965d3	feat(app): cmd+F to search session with highlighting	2026-09-06 16:47:20 +10:00
Dax Raad	8ea99ef9ad	fix(tui): dismiss update notification only on skip	2026-09-06 02:43:21 -04:00
Aarav Sareen	e64b2bc137	feat(app): add horizontal file sidebar scrolling + right click menu	2026-09-06 16:35:14 +10:00
opencode-agent[bot]andrekram1-node	cf1923c238	fix(core): disable default GPT and Claude search filtering (#47586 ) Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>	2026-09-06 01:22:48 -05:00
Luke Parker	bfcb388dd7	feat(app): pulse the status dot while the event stream reconnects (#47574 )	2026-09-06 15:13:38 +10:00
usrnk1	ec46439ef5	feat(desktop): simplify move to background action	2026-09-06 14:45:16 +10:00
Luke Parker	1be3b32a47	fix(client): detect stalled event streams and resync on foreground (#47571 )	2026-09-06 04:43:50 +00:00
Aiden Cline	2823b886d7	feat(core): add independent GPT and Claude tool optimization (#47559 )	2026-09-05 23:43:23 -05:00
Luke Parker	99651b2d50	fix(app): refresh queued inputs when the connection returns (#47573 )	2026-09-06 04:42:27 +00:00
usrnk1	33ef66746b	feat(desktop): add third-party web search consent	2026-09-06 14:38:55 +10:00
Luke Parker	cf212a4235	fix(app): time out requests the server never answers (#47572 )	2026-09-06 14:28:43 +10:00