fix(core): bypass Windows Git lookup

Co-authored-by: Hona <10430890+Hona@users.noreply.github.com>

.changeset/unify-request-envelope.md

@@ -0,0 +1,5 @@
+---
+"@opencode-ai/core": patch
+---
+
+Title generation and compaction summaries now build their model requests through the shared session request boundary, gaining unsupported-media filtering and image bounds while explicitly opting out of session context hooks: plugins that shape the agent conversation do not observe title or compaction requests. Title requests gain the fork-aware session prompt cache key, and compaction summaries in forked sessions reuse the fork root's prompt cache key instead of the fork's own.

.github/workflows/deploy-posts.yml

@@ -0,0 +1,37 @@
+name: deploy-posts
+
+on:
+  push:
+    branches:
+      - v2
+    paths:
+      - packages/posts/**
+      - bun.lock
+      - .github/workflows/deploy-posts.yml
+  workflow_dispatch:
+
+concurrency:
+  group: deploy-posts-${{ github.ref_name }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    if: github.repository == 'anomalyco/opencode' && github.ref_name == 'v2'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+
+      - uses: ./.github/actions/setup-bun
+
+      - name: Build
+        working-directory: packages/posts
+        run: bun run build
+
+      - name: Deploy
+        working-directory: packages/posts
+        run: bun run deploy
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-9IJxoe/MdL6nmoeKvxZop+77HJ/b3HbmpytNUvLqYkc=",
-    "aarch64-linux": "sha256-KR1J102RDTRDZIkAD3jQfXeP1G2DN9Es7KkdKo+daec=",
-    "aarch64-darwin": "sha256-HCgSoq1W6XU6m73Ck3wV8gjB687caUTM3w/EO+V7wsE=",
-    "x86_64-darwin": "sha256-GrKTDvjg0XeDIWbOvayWQjj0SdJd8WPm2+q3IVS17Jg="
+    "x86_64-linux": "sha256-PuNZrtSgh5F3KpXSM+bd+rYQuyzwWd+wCOnMJSDS2Z0=",
+    "aarch64-linux": "sha256-RYy8ZRf59FE/3+gICjvsZv3ekQvn+DTZaT9jefbK+0g=",
+    "aarch64-darwin": "sha256-1AsDK8xNj3RlzX2efbuEDEwaOLAgjFYaEvk7EkQkh4w=",
+    "x86_64-darwin": "sha256-8ONeOu9UmM0GRxVeOO3Uhk1yAOuW6R8tqBYswOVEkME="
   }
 }

package.json

@@ -15,6 +15,7 @@
     "dev:stats": "bun sst shell --stage=production -- bun run --cwd packages/stats/app dev",
     "dev:www": "bun run --cwd packages/www dev",
     "dev:storybook": "bun --cwd packages/storybook storybook",
+    "bench:devex": "bun run --cwd packages/app test:bench:devex",
     "lint": "oxlint",
     "lint:effect-patterns": "ast-grep scan -c script/ast-grep/sgconfig.yml packages/util/src packages/core/src packages/server/src packages/protocol/src packages/cli/src",
     "test:lint-rules": "ast-grep test -c script/ast-grep/sgconfig.yml",
@@ -37,19 +38,19 @@
       "packages/slack"
     ],
     "catalog": {
-      "@effect/opentelemetry": "4.0.0-beta.107",
-      "@effect/platform-node": "4.0.0-beta.107",
-      "@effect/platform-node-shared": "4.0.0-beta.107",
-      "@effect/sql-sqlite-bun": "4.0.0-beta.107",
+      "@effect/opentelemetry": "4.0.0-rc.110",
+      "@effect/platform-node": "4.0.0-rc.110",
+      "@effect/platform-node-shared": "4.0.0-rc.110",
+      "@effect/sql-sqlite-bun": "4.0.0-rc.110",
       "@npmcli/arborist": "9.4.0",
       "@types/bun": "1.3.13",
       "@types/cross-spawn": "6.0.6",
       "@octokit/rest": "22.0.0",
       "@hono/standard-validator": "0.2.0",
       "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.4",
-      "@opentui/keymap": "0.5.4",
-      "@opentui/solid": "0.5.4",
+      "@opentui/core": "0.5.6",
+      "@opentui/keymap": "0.5.6",
+      "@opentui/solid": "0.5.6",
       "@tanstack/solid-virtual": "3.13.32",
       "@shikijs/stream": "4.2.0",
       "@standard-schema/spec": "1.1.0",
@@ -71,7 +72,7 @@
       "dompurify": "3.3.1",
       "drizzle-kit": "1.0.0-rc.2",
       "drizzle-orm": "1.0.0-rc.2",
-      "effect": "4.0.0-beta.107",
+      "effect": "4.0.0-rc.110",
       "ai": "6.0.168",
       "cross-spawn": "7.0.6",
       "hono": "4.10.7",

packages/ai/README.md

@@ -309,7 +309,7 @@ Included providers: OpenAI, Anthropic, Google (Gemini), Google Vertex Gemini and
 
 ### Package-like entrypoints
 
-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`, `body`, and `limits` overlays.
+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 { model } from "@opencode-ai/ai/providers/openai/responses"
@@ -317,7 +317,6 @@ import { model } from "@opencode-ai/ai/providers/openai/responses"
 const selected = model("gpt-5", {
   apiKey: process.env.OPENAI_API_KEY,
   headers: { "x-application": "opencode" },
-  limits: { context: 200_000, output: 64_000 },
 })
 ```
 

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

@@ -31,6 +31,7 @@ import { ToolStream } from "./utils/tool-stream.js"
 const ADAPTER = "anthropic-messages"
 export const DEFAULT_BASE_URL = "https://api.anthropic.com/v1"
 export const PATH = "/messages"
+export const DEFAULT_MAX_TOKENS = 32_000
 
 export type ThinkingInput =
   | {
@@ -233,7 +234,7 @@ export type AnthropicMessagesBody = Schema.Schema.Type<typeof AnthropicMessagesB
 
 const AnthropicUsage = Schema.StructWithRest(
   Schema.Struct({
-    input_tokens: Schema.optional(Schema.Number),
+    input_tokens: optionalNull(Schema.Number),
     output_tokens: Schema.optional(Schema.Number),
     cache_creation_input_tokens: optionalNull(Schema.Number),
     cache_read_input_tokens: optionalNull(Schema.Number),
@@ -624,7 +625,6 @@ const resolveThinking = Effect.fn("AnthropicMessages.resolveThinking")(function*
 const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (request: LLMRequest) {
   const generation = request.generation
   const toolSchemaCompatibility = request.model.compatibility?.toolSchema
-  const outputLimit = request.model.defaults?.limits?.output ?? request.model.route.defaults.limits?.output ?? 4096
   // Allocate the 4-breakpoint budget in invalidation order: tools → system →
   // messages. Tools live highest in the cache hierarchy, so when callers
   // over-mark we keep their tool hints and shed the message-tail ones first.
@@ -663,7 +663,7 @@ const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (reques
     tools,
     tool_choice: toolChoice,
     stream: true as const,
-    max_tokens: generation?.maxTokens ?? outputLimit,
+    max_tokens: generation?.maxTokens ?? DEFAULT_MAX_TOKENS,
     temperature: generation?.temperature,
     top_p: generation?.topP,
     top_k: generation?.topK,
@@ -692,7 +692,7 @@ const mapFinishReason = (reason: string | null | undefined): FinishReason => {
 // expose that subset through `output_tokens_details.thinking_tokens`.
 const mapUsage = (usage: AnthropicUsage | undefined): Usage | undefined => {
   if (!usage) return undefined
-  const nonCached = usage.input_tokens
+  const nonCached = usage.input_tokens ?? undefined
   const cacheRead = usage.cache_read_input_tokens ?? undefined
   const cacheWrite = usage.cache_creation_input_tokens ?? undefined
   const inputTokens = ProviderShared.sumTokens(nonCached, cacheRead, cacheWrite)

packages/ai/src/protocols/gemini.ts

@@ -289,7 +289,9 @@ const lowerMessages = Effect.fn("Gemini.lowerMessages")(function* (request: LLMR
     if (message.role === "system") {
       const part = yield* ProviderShared.wrappedSystemUpdate("Gemini", message)
       const previous = contents.at(-1)
-      if (previous?.role === "user")
+      // Gemini rejects a continuation whose function-response turn carries extra
+      // parts, so an update after a tool result starts its own user turn.
+      if (previous?.role === "user" && !previous.parts.some((item) => "functionResponse" in item))
         contents[contents.length - 1] = { role: "user", parts: [...previous.parts, { text: part.text }] }
       else contents.push({ role: "user", parts: [{ text: part.text }] })
       continue

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

@@ -93,6 +93,8 @@ export const InputItem = Schema.Union([
   Schema.Struct({ role: Schema.tag("developer"), content: Schema.String }),
   Schema.Struct({ role: Schema.tag("user"), content: Schema.Array(OpenResponsesInputContent) }),
   Schema.Struct({
+    type: Schema.tag("message"),
+    id: Schema.optionalKey(Schema.String),
     role: Schema.tag("assistant"),
     content: Schema.Array(OpenResponsesOutputText),
     phase: Schema.optionalKey(MessagePhase),
@@ -101,6 +103,7 @@ export const InputItem = Schema.Union([
   OpenResponsesItemReference,
   Schema.Struct({
     type: Schema.tag("function_call"),
+    id: Schema.optionalKey(Schema.String),
     call_id: Schema.String,
     name: Schema.String,
     arguments: Schema.String,
@@ -115,6 +118,8 @@ type OpenResponsesInputItem = Schema.Schema.Type<typeof InputItem>
 type LoweredInputItem =
   | OpenResponsesInputItem
   | {
+      readonly type: "message"
+      readonly id?: string
       readonly role: "assistant"
       readonly content: ReadonlyArray<{ readonly type: "output_text"; readonly text: string }>
       readonly phase?: MessagePhase | null
@@ -128,8 +133,6 @@ type OpenResponsesReasoningInput = {
   summary: Array<{ type: "summary_text"; text: string }>
   encrypted_content?: string | null
 }
-type OpenResponsesReasoningReplay = Omit<OpenResponsesReasoningInput, "id">
-
 export const Tool = Schema.Struct({
   type: Schema.tag("function"),
   name: Schema.String,
@@ -159,6 +162,14 @@ export const coreFields = {
   tools: optionalArray(Tool),
   tool_choice: Schema.optional(ToolChoice),
   store: Schema.optional(Schema.Boolean),
+  metadata: Schema.optional(Schema.Record(Schema.String, Schema.String)),
+  safety_identifier: Schema.optional(Schema.String),
+  stream_options: Schema.optional(
+    Schema.Struct({
+      include_obfuscation: Schema.optional(Schema.Boolean),
+    }),
+  ),
+  top_logprobs: Schema.optional(Schema.Int.check(Schema.isBetween({ minimum: 0, maximum: 20 }))),
   truncation: Schema.optional(OpenResponsesOptions.TruncationSchema),
   service_tier: Schema.optional(OpenResponsesOptions.ServiceTierSchema),
   prompt_cache_key: Schema.optional(Schema.String),
@@ -179,6 +190,8 @@ export const coreFields = {
   parallel_tool_calls: Schema.optional(Schema.Boolean),
   temperature: Schema.optional(Schema.Number),
   top_p: Schema.optional(Schema.Number),
+  presence_penalty: Schema.optional(Schema.Number),
+  frequency_penalty: Schema.optional(Schema.Number),
 }
 
 const OpenResponsesBody = Schema.Struct({
@@ -288,6 +301,20 @@ export const Event = Schema.StructWithRest(
 )
 export type Event = Schema.Schema.Type<typeof Event>
 
+const RefusalEvent = Schema.Union([
+  Schema.Struct({
+    type: Schema.tag("response.refusal.delta"),
+    item_id: Schema.String,
+    delta: Schema.String,
+  }),
+  Schema.Struct({
+    type: Schema.tag("response.refusal.done"),
+    item_id: Schema.String,
+    refusal: Schema.String,
+  }),
+])
+const isRefusalEvent = Schema.is(RefusalEvent)
+
 export interface Extension {
   readonly id: string
   readonly name: string
@@ -353,34 +380,42 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LL
     tool: (toolName) => ({ type: "function" as const, name: toolName }),
   })
 
-const lowerToolCall = (part: ToolCallPart): OpenResponsesInputItem => ({
-  type: "function_call",
-  call_id: part.id,
-  name: part.name,
-  arguments: ProviderShared.encodeJson(part.input),
-})
+const itemID = (providerMetadata: ProviderMetadata | undefined, providerMetadataKey: string) => {
+  const metadata = providerMetadata?.[providerMetadataKey]
+  return ProviderShared.isRecord(metadata) && typeof metadata.itemId === "string" && metadata.itemId.length > 0
+    ? metadata.itemId
+    : undefined
+}
+
+const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenResponsesInputItem => {
+  const id = itemID(part.providerMetadata, providerMetadataKey)
+  return {
+    type: "function_call",
+    ...(id ? { id } : {}),
+    call_id: part.id,
+    name: part.name,
+    arguments: ProviderShared.encodeJson(part.input),
+  }
+}
 
 const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
   const metadata = part.providerMetadata?.[providerMetadataKey]
-  if (!ProviderShared.isRecord(metadata) || typeof metadata.itemId !== "string" || metadata.itemId.length === 0)
-    return undefined
+  const id = itemID(part.providerMetadata, providerMetadataKey)
+  if (!ProviderShared.isRecord(metadata) || !id) return undefined
   const encryptedContent =
     typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null
       ? metadata.reasoningEncryptedContent
       : undefined
   return {
     type: "reasoning",
-    id: metadata.itemId,
+    id,
     summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
     encrypted_content: encryptedContent,
   }
 }
 
 const hostedToolItemID = (part: ToolResultPart, providerMetadataKey: string) => {
-  const metadata = part.providerMetadata?.[providerMetadataKey]
-  return ProviderShared.isRecord(metadata) && typeof metadata.itemId === "string" && metadata.itemId.length > 0
-    ? metadata.itemId
-    : undefined
+  return itemID(part.providerMetadata, providerMetadataKey)
 }
 
 const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (
@@ -465,24 +500,26 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
 
     if (message.role === "assistant") {
       const content: TextPart[] = []
-      const reasoningItems: Record<string, OpenResponsesReasoningReplay> = {}
+      const reasoningItems: Record<string, OpenResponsesReasoningInput> = {}
       const reasoningReferences = new Set<string>()
       const hostedToolReferences = new Set<string>()
       const flushText = () => {
         if (content.length === 0) return
-        const groups = content.reduce<Array<{ phase: MessagePhase | null | undefined; parts: TextPart[] }>>(
-          (groups, part) => {
-            const metadata = part.providerMetadata?.[providerMetadataKey]
-            const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase, extension) : undefined
-            const group = groups.at(-1)
-            if (group && group.phase === phase) group.parts.push(part)
-            else groups.push({ phase, parts: [part] })
-            return groups
-          },
-          [],
-        )
+        const groups = content.reduce<
+          Array<{ id: string | undefined; phase: MessagePhase | null | undefined; parts: TextPart[] }>
+        >((groups, part) => {
+          const metadata = part.providerMetadata?.[providerMetadataKey]
+          const id = itemID(part.providerMetadata, providerMetadataKey)
+          const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase, extension) : undefined
+          const group = groups.at(-1)
+          if (group && group.id === id && group.phase === phase) group.parts.push(part)
+          else groups.push({ id, phase, parts: [part] })
+          return groups
+        }, [])
         input.push(
           ...groups.map((group) => ({
+            type: "message" as const,
+            ...(group.id === undefined ? {} : { id: group.id }),
             role: "assistant" as const,
             content: group.parts.map((part) => ({ type: "output_text" as const, text: part.text })),
             ...(group.phase === undefined ? {} : { phase: group.phase }),
@@ -511,19 +548,14 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
               existing.encrypted_content = reasoning.encrypted_content
             continue
           }
-          const replay = {
-            type: reasoning.type,
-            summary: reasoning.summary,
-            encrypted_content: reasoning.encrypted_content,
-          }
-          reasoningItems[reasoning.id] = replay
-          input.push(replay)
+          reasoningItems[reasoning.id] = reasoning
+          input.push(reasoning)
           continue
         }
         if (part.type === "tool-call") {
           flushText()
           if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part))
+          input.push(lowerToolCall(part, providerMetadataKey))
           continue
         }
         if (part.type === "tool-result" && part.providerExecuted === true) {
@@ -578,6 +610,12 @@ const lowerOptions = (request: LLMRequest) => {
   return {
     ...(options.instructions ? { instructions: options.instructions } : {}),
     ...(options.store !== undefined ? { store: options.store } : {}),
+    ...(options.metadata ? { metadata: options.metadata } : {}),
+    ...(options.safetyIdentifier ? { safety_identifier: options.safetyIdentifier } : {}),
+    ...(options.streamOptions?.includeObfuscation !== undefined
+      ? { stream_options: { include_obfuscation: options.streamOptions.includeObfuscation } }
+      : {}),
+    ...(options.topLogprobs !== undefined ? { top_logprobs: options.topLogprobs } : {}),
     ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
     ...(options.include ? { include: options.include } : {}),
     ...(options.reasoningEffort || options.reasoningSummary
@@ -627,6 +665,8 @@ export const fromRequestWithExtension = Effect.fn("OpenResponses.fromRequestWith
     max_output_tokens: generation?.maxTokens,
     temperature: generation?.temperature,
     top_p: generation?.topP,
+    presence_penalty: generation?.presencePenalty,
+    frequency_penalty: generation?.frequencyPenalty,
     ...lowerOptions(request),
   }
 })
@@ -695,7 +735,7 @@ const onOutputTextDelta = (state: ParserState, event: Event, id: string): StepRe
   if (!event.delta) return [state, NO_EVENTS]
   const events: LLMEvent[] = []
   const phase = state.messagePhases[id]
-  const metadata = phase === undefined ? undefined : providerMetadata(state, { phase })
+  const metadata = providerMetadata(state, { itemId: id, ...(phase === undefined ? {} : { phase }) })
   const lifecycle = Lifecycle.textStart(state.lifecycle, events, id, metadata)
   return [{ ...state, lifecycle: Lifecycle.textDelta(lifecycle, events, id, event.delta) }, events]
 }
@@ -924,7 +964,7 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
           state.lifecycle,
           events,
           item.id,
-          phase === undefined ? undefined : providerMetadata(state, { phase }),
+          providerMetadata(state, { itemId: item.id, ...(phase === undefined ? {} : { phase }) }),
         ),
         messageItems,
         messagePhases,
@@ -937,7 +977,11 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
     if (!item.id || !item.call_id || !item.name) return [state, NO_EVENTS] satisfies StepResult
     const tools = state.tools[item.id]
       ? state.tools
-      : ToolStream.start(state.tools, item.id, { id: item.call_id, name: item.name })
+      : ToolStream.start(state.tools, item.id, {
+          id: item.call_id,
+          name: item.name,
+          providerMetadata: providerMetadata(state, { itemId: item.id }),
+        })
     const result =
       item.arguments === undefined
         ? yield* ToolStream.finish(state.id, tools, item.id)
@@ -988,11 +1032,19 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
   return [state, NO_EVENTS] satisfies StepResult
 })
 
-const onResponseFinish = (state: ParserState, event: Event): StepResult => {
-  const events: LLMEvent[] = []
+const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (state: ParserState, event: Event) {
+  // Some compatible providers omit output_item.done even after completing the response.
+  const pending =
+    event.type === "response.completed"
+      ? yield* ToolStream.finishAll(state.id, state.tools)
+      : { tools: state.tools, events: NO_EVENTS }
+  const events: LLMEvent[] = [...pending.events]
+  const hasFunctionCall =
+    pending.events.some((event) => LLMEvent.is.toolCall(event) || LLMEvent.is.toolInputError(event)) ||
+    state.hasFunctionCall
   const lifecycle = Lifecycle.finish(state.lifecycle, events, {
     reason: {
-      normalized: mapFinishReason(event, state.hasFunctionCall),
+      normalized: mapFinishReason(event, hasFunctionCall),
       raw: event.response?.incomplete_details?.reason,
     },
     usage: mapUsage(event.response?.usage, state.providerMetadataKey),
@@ -1004,8 +1056,8 @@ const onResponseFinish = (state: ParserState, event: Event): StepResult => {
           })
         : undefined,
   })
-  return [{ ...state, lifecycle }, events]
-}
+  return [{ ...state, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
+})
 
 // Build a single human-readable message from whatever the provider supplied.
 // When both code and message are present, prefix the code so consumers see
@@ -1047,6 +1099,14 @@ export const step = (state: ParserState, event: Event) => {
         : onOutputTextDone(state, event, event.item_id),
     )
   }
+  if (event.type === "response.refusal.delta" || event.type === "response.refusal.done") {
+    if (!isRefusalEvent(event)) return ProviderShared.eventError(state.id, `${event.type} is malformed`)
+    return Effect.succeed(
+      event.type === "response.refusal.delta"
+        ? onOutputTextDelta(state, event, event.item_id)
+        : onOutputTextDone(state, { ...event, text: event.refusal }, event.item_id),
+    )
+  }
   if (event.type === "response.reasoning.delta" || event.type === "response.reasoning_summary_text.delta") {
     if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
     return Effect.succeed(onReasoningDelta(state, event, event.item_id))
@@ -1074,8 +1134,7 @@ export const step = (state: ParserState, event: Event) => {
       return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
     return onOutputItemDone(state, event)
   }
-  if (event.type === "response.completed" || event.type === "response.incomplete")
-    return Effect.succeed(onResponseFinish(state, event))
+  if (event.type === "response.completed" || event.type === "response.incomplete") return onResponseFinish(state, event)
   if (event.type === "response.failed") return providerError(state, event, `${state.name} response failed`)
   if (event.type === "error")
     return decodeKnownErrorEvent(event).pipe(

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

@@ -28,7 +28,7 @@ import { ToolSchemaProjection } from "./utils/tool-schema.js"
 import { ToolStream } from "./utils/tool-stream.js"
 
 const ADAPTER = "openai-chat"
-const RESERVED_REASONING_FIELDS = new Set(["role", "content", "tool_calls"])
+const RESERVED_REASONING_FIELDS = new Set(["role", "content", "refusal", "tool_calls"])
 export const DEFAULT_BASE_URL = "https://api.openai.com/v1"
 export const PATH = "/chat/completions"
 
@@ -194,6 +194,7 @@ type OpenAIChatToolCallDelta = Schema.Schema.Type<typeof OpenAIChatToolCallDelta
 const OpenAIChatDelta = Schema.StructWithRest(
   Schema.Struct({
     content: optionalNull(Schema.String),
+    refusal: optionalNull(Schema.String),
     reasoning_content: optionalNull(Schema.String),
     reasoning: optionalNull(Schema.String),
     reasoning_text: optionalNull(Schema.String),
@@ -709,6 +710,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
     const reasoning = reasoningDelta(delta, state.reasoningField)
     const hasLateContent =
       Boolean(delta?.content) ||
+      Boolean(delta?.refusal) ||
       reasoning !== undefined ||
       (Array.isArray(delta?.reasoning_details) && delta.reasoning_details.length > 0) ||
       toolDeltas.some((tool) => Boolean(tool.id) || Boolean(tool.function?.name) || Boolean(tool.function?.arguments))
@@ -728,7 +730,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
     else if (
       reasoningDetailsObserved &&
       !lifecycle.reasoning.has("reasoning-0") &&
-      (Boolean(delta?.content) || toolDeltas.length > 0)
+      (Boolean(delta?.content) || Boolean(delta?.refusal) || toolDeltas.length > 0)
     )
       lifecycle = Lifecycle.reasoningStart(lifecycle, events, "reasoning-0", deltaMetadata)
     const reasoningEmitted = state.reasoningEmitted || lifecycle.reasoning.has("reasoning-0")
@@ -743,6 +745,16 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
       lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", delta.content)
     }
 
+    if (delta?.refusal) {
+      lifecycle = Lifecycle.reasoningEnd(
+        lifecycle,
+        events,
+        "reasoning-0",
+        reasoningMetadata(reasoningField, reasoningDetailsObserved ? state.reasoningDetails : undefined),
+      )
+      lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", delta.refusal)
+    }
+
     // Compatible providers may omit indexes. Prefer durable identity, then use
     // batch position for parallel deltas or the latest call for sparse chunks.
     for (const [position, tool] of toolDeltas.entries()) {

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

@@ -42,6 +42,8 @@ const OpenAIResponsesToolChoice = Schema.Union([
 
 const OpenAIResponsesInputItem = Schema.Union([
   Schema.Struct({
+    type: Schema.tag("message"),
+    id: Schema.optionalKey(Schema.String),
     role: Schema.tag("assistant"),
     content: Schema.Array(Schema.Struct({ type: Schema.tag("output_text"), text: Schema.String })),
     phase: Schema.optionalKey(Schema.NullOr(OpenResponses.MessagePhase)),

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

@@ -47,9 +47,17 @@ export const AllowedTools = Schema.Struct({
 })
 export type AllowedTools = typeof AllowedTools.Type
 
+export const StreamOptions = Schema.Struct({
+  includeObfuscation: Schema.optional(Schema.Boolean),
+})
+
 export const Options = Schema.Struct({
   instructions: Schema.optional(Schema.String),
   store: Schema.optional(Schema.Boolean),
+  metadata: Schema.optional(Schema.Record(Schema.String, Schema.String)),
+  safetyIdentifier: Schema.optional(Schema.String),
+  streamOptions: Schema.optional(StreamOptions),
+  topLogprobs: Schema.optional(Schema.Int.check(Schema.isBetween({ minimum: 0, maximum: 20 }))),
   reasoningEffort: Schema.optional(ReasoningEffort),
   reasoningSummary: Schema.optional(Schema.Literals(["auto", "concise", "detailed"])),
   include: Schema.optional(Schema.Array(ResponseIncludableSchema)),

packages/ai/src/provider-package.ts

@@ -4,11 +4,6 @@ export interface Settings extends Readonly<Record<string, unknown>> {
   readonly baseURL?: string
   readonly headers?: Readonly<Record<string, string>>
   readonly body?: Readonly<Record<string, unknown>>
-  readonly limits?: {
-    readonly context: number
-    readonly input?: number
-    readonly output: number
-  }
 }
 
 export interface Definition<

packages/ai/src/providers/amazon-bedrock-mantle.ts

@@ -90,7 +90,6 @@ const config = (settings: Settings): Config => {
     credentials: settings.credentials,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
     region: settings.region,
   }

packages/ai/src/providers/amazon-bedrock.ts

@@ -62,7 +62,6 @@ export const model: ProviderPackage.Definition<Settings>["model"] = (modelID, se
     generation: settings.topP === undefined ? undefined : { topP: settings.topP },
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     region: settings.region,
   }).model(modelID)
 }

packages/ai/src/providers/anthropic-compatible.ts

@@ -68,7 +68,6 @@ export const model: ProviderPackage.Definition<Settings, AnthropicMessages.Provi
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     provider: settings.provider,
     providerOptions: settings.providerOptions,
   }).model(modelID)

packages/ai/src/providers/anthropic.ts

@@ -63,7 +63,6 @@ export const model: ProviderPackage.Definition<Settings, AnthropicMessages.Provi
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
   }).model(modelID)
 }

packages/ai/src/providers/azure.ts

@@ -126,7 +126,6 @@ const config = (settings: Settings): Config => {
     apiVersion: settings.apiVersion,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
     queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams },
     useDeploymentBasedUrls: settings.useDeploymentBasedUrls,

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

@@ -75,7 +75,6 @@ export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsIn
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     location: settings.location,
     project: settings.project,
     providerOptions: settings.providerOptions,

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

@@ -110,7 +110,6 @@ export const model: ProviderPackage.Definition<Settings, AnthropicMessages.Provi
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     location: settings.location,
     project: settings.project,
     providerOptions: settings.providerOptions,

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

@@ -80,7 +80,6 @@ export const model: ProviderPackage.Definition<Settings, OpenResponsesProviderOp
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     location: settings.location,
     project: settings.project,
     providerOptions: settings.providerOptions,

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

@@ -119,7 +119,6 @@ export const model: ProviderPackage.Definition<Settings, GeminiProviderOptionsIn
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     location: settings.location,
     project: settings.project,
     providerOptions: settings.providerOptions,

packages/ai/src/providers/google.ts

@@ -63,7 +63,6 @@ export const model: ProviderPackage.Definition<Settings, Gemini.ProviderOptionsI
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
   }).model(modelID)
 

packages/ai/src/providers/openai-compatible-responses.ts

@@ -55,7 +55,6 @@ export const model: ProviderPackage.Definition<Settings, OpenResponsesProviderOp
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     provider: settings.provider,
     providerOptions: settings.providerOptions,
   }).model(modelID)

packages/ai/src/providers/openai-compatible.ts

@@ -74,7 +74,6 @@ export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsIn
     baseURL: settings.baseURL,
     headers: settings.headers === undefined ? undefined : { ...settings.headers },
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     provider: settings.provider,
     providerOptions: settings.providerOptions,
   }).model(modelID)

packages/ai/src/providers/openai.ts

@@ -124,7 +124,6 @@ const config = (settings: Settings): Config => {
     baseURL: settings.baseURL,
     headers: Object.keys(headers).length === 0 ? undefined : headers,
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
     queryParams: settings.queryParams === undefined ? undefined : { ...settings.queryParams },
   }

packages/ai/src/providers/openrouter.ts

@@ -200,6 +200,5 @@ export const model: ProviderPackage.Definition<Settings, OpenRouterProviderOptio
     baseURL: settings.baseURL,
     headers: settings.headers,
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
   }).model(modelID)

packages/ai/src/providers/xai.ts

@@ -101,7 +101,6 @@ export const model: ProviderPackage.Definition<Settings, XAIProviderOptionsInput
     baseURL: settings.baseURL,
     headers: settings.headers,
     http: settings.body === undefined ? undefined : { body: { ...settings.body } },
-    limits: settings.limits,
     providerOptions: settings.providerOptions,
   }).model(modelID)
 export const responses = provider.responses

packages/ai/src/route/client.ts

@@ -16,7 +16,6 @@ import {
   LLMRequest,
   LLMResponse,
   LanguageModel,
-  LanguageModelLimits,
   LLMEvent,
   InvalidProviderOutputReason,
   ProviderID,
@@ -74,7 +73,6 @@ export type RouteRoutedLanguageModelInput = Omit<LanguageModel.Input, "route">
 
 export interface RouteDefaults {
   readonly headers?: Record<string, string>
-  readonly limits?: LanguageModelLimits
   readonly generation?: GenerationOptions
   readonly providerOptions?: ProviderOptions
   readonly http?: HttpOptions
@@ -82,7 +80,6 @@ export interface RouteDefaults {
 
 export interface RouteDefaultsInput {
   readonly headers?: Record<string, string>
-  readonly limits?: LanguageModelLimits.Input
   readonly generation?: GenerationOptions.Input
   readonly providerOptions?: ProviderOptions
   readonly http?: HttpOptions.Input
@@ -119,7 +116,6 @@ const mergeRouteDefaults = (base: RouteDefaults | undefined, patch: RouteDefault
     ...base,
     ...patch,
     headers,
-    limits: patch.limits === undefined ? base?.limits : LanguageModelLimits.make(patch.limits),
     generation: mergeGenerationOptions(generationOptions(base?.generation), generationOptions(patch.generation)),
     providerOptions: mergeProviderOptions(base?.providerOptions, patch.providerOptions),
     http: mergeHttpOptions(

packages/ai/src/schema/options.ts

@@ -114,22 +114,7 @@ export const mergeGenerationOptions = (...items: ReadonlyArray<GenerationOptions
   return Object.values(result).some((value) => value !== undefined) ? result : undefined
 }
 
-export class LanguageModelLimits extends Schema.Class<LanguageModelLimits>("LLM.LanguageModelLimits")({
-  context: Schema.optional(Schema.Number),
-  input: Schema.optional(Schema.Number),
-  output: Schema.optional(Schema.Number),
-}) {}
-
-export namespace LanguageModelLimits {
-  export type Input = LanguageModelLimits | ConstructorParameters<typeof LanguageModelLimits>[0]
-
-  /** Normalize model limit input into the canonical `LanguageModelLimits` class. */
-  export const make = (input: Input | undefined) =>
-    input instanceof LanguageModelLimits ? input : new LanguageModelLimits(input ?? {})
-}
-
 export class LanguageModelDefaults extends Schema.Class<LanguageModelDefaults>("LLM.LanguageModelDefaults")({
-  limits: Schema.optional(LanguageModelLimits),
   generation: Schema.optional(GenerationOptions),
   providerOptions: Schema.optional(ProviderOptions),
   http: Schema.optional(HttpOptions),
@@ -139,7 +124,6 @@ export namespace LanguageModelDefaults {
   export type Input =
     | LanguageModelDefaults
     | {
-        readonly limits?: LanguageModelLimits.Input
         readonly generation?: GenerationOptions.Input
         readonly providerOptions?: ProviderOptions
         readonly http?: HttpOptions.Input
@@ -149,7 +133,6 @@ export namespace LanguageModelDefaults {
   export const make = (input: Input) => {
     if (input instanceof LanguageModelDefaults) return input
     return new LanguageModelDefaults({
-      limits: input.limits === undefined ? undefined : LanguageModelLimits.make(input.limits),
       generation: input.generation === undefined ? undefined : GenerationOptions.make(input.generation),
       providerOptions: input.providerOptions,
       http: input.http === undefined ? undefined : HttpOptions.make(input.http),

packages/ai/test/compile.test.ts

@@ -270,21 +270,20 @@ describe("request option precedence", () => {
     ),
   )
 
-  it.effect("uses model output limits after route limits and before call maxTokens", () =>
+  it.effect("uses the Anthropic default before call maxTokens", () =>
     Effect.gen(function* () {
       const route = AnthropicMessages.route.with({
         endpoint: { baseURL: "https://api.anthropic.test/v1/" },
         auth: Auth.header("x-api-key", "test"),
-        limits: { output: 128 },
       })
-      const model = route.model({ id: "claude-sonnet-4-5", defaults: { limits: { output: 64 } } })
+      const model = route.model({ id: "claude-sonnet-4-5" })
       const withoutMaxTokens = yield* compileRequest(LLM.request({ model, prompt: "Say hello.", cache: "none" }))
       const withMaxTokens = yield* compileRequest(
-        LLM.request({ model, prompt: "Say hello.", cache: "none", generation: { maxTokens: 32 } }),
+        LLM.request({ model, prompt: "Say hello.", cache: "none", generation: { maxTokens: 8_000 } }),
       )
 
-      expect(withoutMaxTokens.body.max_tokens).toBe(64)
-      expect(withMaxTokens.body.max_tokens).toBe(32)
+      expect(withoutMaxTokens.body.max_tokens).toBe(32_000)
+      expect(withMaxTokens.body.max_tokens).toBe(8_000)
     }),
   )
 })

packages/ai/test/fixtures/recordings/openai-responses-websocket/continues-a-tool-call-over-one-socket.json

@@ -0,0 +1,100 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "openai",
+    "protocol": "openai-responses",
+    "transport": "websocket",
+    "model": "gpt-5.5",
+    "tags": [
+      "prefix:openai-responses-websocket",
+      "provider:openai",
+      "protocol:openai-responses",
+      "transport:websocket",
+      "tool",
+      "continuation"
+    ],
+    "name": "openai-responses-websocket/continues-a-tool-call-over-one-socket",
+    "recordedAt": "2026-08-20T00:00:00.000Z"
+  },
+  "interactions": [
+    {
+      "transport": "websocket",
+      "connection": {
+        "sequence": 0,
+        "url": "wss://api.openai.com/v1/responses",
+        "protocols": [],
+        "close": {
+          "code": 1000,
+          "reason": ""
+        }
+      },
+      "events": [
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"role\":\"system\",\"content\":\"Call get_weather once, then reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"What is the weather in Paris?\"}]}],\"tools\":[{\"type\":\"function\",\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"max_output_tokens\":50,\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.created\",\"response\":{\"id\":\"resp_ws_tool_1\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.added\",\"item\":{\"type\":\"function_call\",\"id\":\"fc_ws_weather\",\"call_id\":\"call_ws_weather\",\"name\":\"get_weather\",\"arguments\":\"\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.function_call_arguments.delta\",\"item_id\":\"fc_ws_weather\",\"delta\":\"{\\\"city\\\":\\\"Paris\\\"}\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.done\",\"item\":{\"type\":\"function_call\",\"id\":\"fc_ws_weather\",\"call_id\":\"call_ws_weather\",\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.completed\",\"response\":{\"id\":\"resp_ws_tool_1\"}}"
+        },
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"type\":\"function_call_output\",\"call_id\":\"call_ws_weather\",\"output\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"tools\":[{\"type\":\"function\",\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"max_output_tokens\":50,\"previous_response_id\":\"resp_ws_tool_1\",\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.created\",\"response\":{\"id\":\"resp_ws_tool_2\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.added\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_tool_2\",\"role\":\"assistant\",\"content\":[]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.delta\",\"item_id\":\"msg_ws_tool_2\",\"delta\":\"Paris is sunny.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.done\",\"item_id\":\"msg_ws_tool_2\",\"text\":\"Paris is sunny.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_tool_2\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Paris is sunny.\"}]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.completed\",\"response\":{\"id\":\"resp_ws_tool_2\"}}"
+        }
+      ]
+    }
+  ]
+}

packages/ai/test/fixtures/recordings/openai-responses-websocket/reconstructs-full-context-after-reconnect.json

@@ -0,0 +1,119 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "openai",
+    "protocol": "openai-responses",
+    "transport": "websocket",
+    "model": "gpt-5.5",
+    "tags": [
+      "prefix:openai-responses-websocket",
+      "provider:openai",
+      "protocol:openai-responses",
+      "transport:websocket",
+      "reconnect",
+      "full-context"
+    ],
+    "name": "openai-responses-websocket/reconstructs-full-context-after-reconnect",
+    "recordedAt": "2026-08-20T00:00:00.000Z"
+  },
+  "interactions": [
+    {
+      "transport": "websocket",
+      "connection": {
+        "sequence": 0,
+        "url": "wss://api.openai.com/v1/responses",
+        "protocols": [],
+        "close": {
+          "code": 1000,
+          "reason": ""
+        }
+      },
+      "events": [
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"role\":\"system\",\"content\":\"Follow the user's exact reply instruction.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Alpha.\"}]}],\"store\":false,\"max_output_tokens\":30,\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.created\",\"response\":{\"id\":\"resp_ws_reconnect_1\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.added\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_reconnect_1\",\"role\":\"assistant\",\"content\":[]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.delta\",\"item_id\":\"msg_ws_reconnect_1\",\"delta\":\"Alpha.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.done\",\"item_id\":\"msg_ws_reconnect_1\",\"text\":\"Alpha.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_reconnect_1\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Alpha.\"}]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.completed\",\"response\":{\"id\":\"resp_ws_reconnect_1\"}}"
+        }
+      ]
+    },
+    {
+      "transport": "websocket",
+      "connection": {
+        "sequence": 1,
+        "url": "wss://api.openai.com/v1/responses",
+        "protocols": [],
+        "close": {
+          "code": 1000,
+          "reason": ""
+        }
+      },
+      "events": [
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"role\":\"system\",\"content\":\"Follow the user's exact reply instruction.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Alpha.\"}]},{\"type\":\"message\",\"id\":\"msg_ws_reconnect_1\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Alpha.\"}]},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Beta.\"}]}],\"store\":false,\"max_output_tokens\":30,\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.created\",\"response\":{\"id\":\"resp_ws_reconnect_2\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.added\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_reconnect_2\",\"role\":\"assistant\",\"content\":[]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.delta\",\"item_id\":\"msg_ws_reconnect_2\",\"delta\":\"Beta.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.done\",\"item_id\":\"msg_ws_reconnect_2\",\"text\":\"Beta.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_reconnect_2\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Beta.\"}]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.completed\",\"response\":{\"id\":\"resp_ws_reconnect_2\"}}"
+        }
+      ]
+    }
+  ]
+}

packages/ai/test/fixtures/recordings/openai-responses-websocket/recovers-from-explicit-continuation-rejection.json

@@ -0,0 +1,129 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "openai",
+    "protocol": "openai-responses",
+    "transport": "websocket",
+    "model": "gpt-5.5",
+    "tags": [
+      "prefix:openai-responses-websocket",
+      "provider:openai",
+      "protocol:openai-responses",
+      "transport:websocket",
+      "continuation",
+      "recovery"
+    ],
+    "name": "openai-responses-websocket/recovers-from-explicit-continuation-rejection",
+    "recordedAt": "2026-08-20T00:00:00.000Z"
+  },
+  "interactions": [
+    {
+      "transport": "websocket",
+      "connection": {
+        "sequence": 0,
+        "url": "wss://api.openai.com/v1/responses",
+        "protocols": [],
+        "close": {
+          "code": 1000,
+          "reason": ""
+        }
+      },
+      "events": [
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"role\":\"system\",\"content\":\"Follow the user's exact reply instruction.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Ready.\"}]}],\"store\":false,\"max_output_tokens\":30,\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.created\",\"response\":{\"id\":\"resp_ws_rejection_1\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.added\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_rejection_1\",\"role\":\"assistant\",\"content\":[]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.delta\",\"item_id\":\"msg_ws_rejection_1\",\"delta\":\"Ready.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.done\",\"item_id\":\"msg_ws_rejection_1\",\"text\":\"Ready.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_rejection_1\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Ready.\"}]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.completed\",\"response\":{\"id\":\"resp_ws_rejection_1\"}}"
+        }
+      ]
+    },
+    {
+      "transport": "websocket",
+      "connection": {
+        "sequence": 1,
+        "url": "wss://api.openai.com/v1/responses",
+        "protocols": [],
+        "close": {
+          "code": 1000,
+          "reason": ""
+        }
+      },
+      "events": [
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Recovered.\"}]}],\"store\":false,\"max_output_tokens\":30,\"previous_response_id\":\"resp_ws_rejection_1\",\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"error\",\"error\":{\"code\":\"previous_response_not_found\",\"message\":\"Previous response not found\"}}"
+        },
+        {
+          "direction": "client",
+          "kind": "text",
+          "body": "{\"type\":\"response.create\",\"model\":\"gpt-5.5\",\"input\":[{\"role\":\"system\",\"content\":\"Follow the user's exact reply instruction.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Ready.\"}]},{\"type\":\"message\",\"id\":\"msg_ws_rejection_1\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Ready.\"}]},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Reply exactly: Recovered.\"}]}],\"store\":false,\"max_output_tokens\":30,\"include\":[\"reasoning.encrypted_content\"],\"reasoning\":{\"effort\":\"medium\",\"summary\":\"auto\"},\"text\":{\"verbosity\":\"low\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.created\",\"response\":{\"id\":\"resp_ws_rejection_2\"}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.added\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_rejection_2\",\"role\":\"assistant\",\"content\":[]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.delta\",\"item_id\":\"msg_ws_rejection_2\",\"delta\":\"Recovered.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_text.done\",\"item_id\":\"msg_ws_rejection_2\",\"text\":\"Recovered.\"}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.output_item.done\",\"item\":{\"type\":\"message\",\"id\":\"msg_ws_rejection_2\",\"role\":\"assistant\",\"content\":[{\"type\":\"output_text\",\"text\":\"Recovered.\"}]}}"
+        },
+        {
+          "direction": "server",
+          "kind": "text",
+          "body": "{\"type\":\"response.completed\",\"response\":{\"id\":\"resp_ws_rejection_2\"}}"
+        }
+      ]
+    }
+  ]
+}

packages/ai/test/llm.test.ts

@@ -121,7 +121,6 @@ describe("llm constructors", () => {
     const model = chatRoute.model({
       id: "kimi-k2",
       defaults: {
-        limits: { context: 128_000, output: 8_192 },
         generation: { maxTokens: 1_024, stop: ["END"] },
         providerOptions: { parallelToolCalls: false },
         http: { body: { extra_body: true } },
@@ -130,7 +129,6 @@ describe("llm constructors", () => {
     })
     const request = LLM.request({ model, prompt: "Say hello." })
 
-    expect(request.model.defaults?.limits).toEqual({ context: 128_000, output: 8_192 })
     expect(request.model.defaults?.generation).toEqual({ maxTokens: 1_024, stop: ["END"] })
     expect(request.model.defaults?.providerOptions).toEqual({ parallelToolCalls: false })
     expect(request.model.defaults?.http).toEqual({ body: { extra_body: true } })

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

@@ -43,7 +43,6 @@ describe("provider package entrypoints", () => {
       baseURL: "https://provider.example.test/v1",
       headers: { "x-application": "opencode" },
       body: { service_tier: "priority" },
-      limits: { context: 200_000, output: 64_000 },
     }
     const openrouter = OpenRouter.model("anthropic/claude-sonnet-4", {
       ...settings,
@@ -58,7 +57,6 @@ describe("provider package entrypoints", () => {
       expect(selected.route.endpoint.baseURL).toBe(settings.baseURL)
       expect(selected.route.defaults.headers).toEqual(settings.headers)
       expect(selected.route.defaults.http?.body).toEqual(settings.body)
-      expect(selected.route.defaults.limits).toEqual(settings.limits)
     }
     expect(openrouter.route.defaults.providerOptions).toEqual({ usage: true })
     expect(xai.route.defaults.providerOptions).toMatchObject({ reasoningEffort: "high", store: false })
@@ -70,14 +68,12 @@ describe("provider package entrypoints", () => {
       baseURL: "https://api.openai.test/v1",
       headers: { "x-application": "opencode" },
       body: { service_tier: "priority" },
-      limits: { context: 200_000, output: 64_000 },
       unrelatedInheritedSetting: true,
     })
 
     expect(selected.route.id).toBe("openai-responses")
     expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" })
-    expect(selected.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 })
   })
 
   test("maps OpenAI-compatible Responses settings onto the executable model", async () => {
@@ -88,7 +84,6 @@ describe("provider package entrypoints", () => {
       provider: "example",
       headers: { "x-application": "opencode" },
       body: { service_tier: "priority" },
-      limits: { context: 200_000, output: 64_000 },
       providerOptions: { reasoningEffort: "low", store: true },
     })
 
@@ -100,7 +95,6 @@ describe("provider package entrypoints", () => {
     })
     expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" })
-    expect(selected.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 })
     expect(selected.route.defaults.providerOptions).toEqual({ reasoningEffort: "low", store: true })
   })
 
@@ -112,7 +106,6 @@ describe("provider package entrypoints", () => {
       provider: "example",
       headers: { "x-application": "opencode" },
       body: { metadata: { user_id: "user_1" } },
-      limits: { context: 200_000, output: 64_000 },
       providerOptions: { effort: "low" },
     })
 
@@ -124,7 +117,6 @@ describe("provider package entrypoints", () => {
     })
     expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(selected.route.defaults.http?.body).toEqual({ metadata: { user_id: "user_1" } })
-    expect(selected.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 })
     expect(selected.route.defaults.providerOptions).toEqual({ effort: "low" })
   })
 
@@ -185,7 +177,6 @@ describe("provider package entrypoints", () => {
       resourceName: "opencode-test",
       headers: { "x-application": "opencode" },
       body: { service_tier: "priority" },
-      limits: { context: 200_000, output: 64_000 },
     }
 
     const responses = AzureResponses.model("deployment", settings)
@@ -196,7 +187,6 @@ describe("provider package entrypoints", () => {
     expect(responses.route.endpoint.baseURL).toBe("https://opencode-test.openai.azure.com/openai/v1")
     expect(responses.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(responses.route.defaults.http?.body).toEqual({ service_tier: "priority" })
-    expect(responses.route.defaults.limits).toEqual({ context: 200_000, output: 64_000 })
     expect(chat.route.id).toBe("azure-openai-chat")
   })
 
@@ -228,7 +218,6 @@ describe("provider package entrypoints", () => {
       baseURL: "https://generativelanguage.test/v1beta",
       headers: { "x-application": "opencode" },
       body: { safetySettings: [] },
-      limits: { context: 1_000_000, output: 65_536 },
       providerOptions: { thinkingConfig: { thinkingBudget: 1_024 } },
     })
 
@@ -236,7 +225,6 @@ describe("provider package entrypoints", () => {
     expect(selected.route.endpoint.baseURL).toBe("https://generativelanguage.test/v1beta")
     expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(selected.route.defaults.http?.body).toEqual({ safetySettings: [] })
-    expect(selected.route.defaults.limits).toEqual({ context: 1_000_000, output: 65_536 })
     expect(selected.route.defaults.providerOptions).toEqual({ thinkingConfig: { thinkingBudget: 1_024 } })
   })
 
@@ -250,7 +238,6 @@ describe("provider package entrypoints", () => {
       apiKey: "fixture",
       headers: { "x-application": "opencode" },
       body: { safetySettings: [] },
-      limits: { context: 1_000_000, output: 65_536 },
     })
     const messages = GoogleVertexMessages.model("claude-sonnet-4-6", {
       accessToken: "fixture",
@@ -274,7 +261,6 @@ describe("provider package entrypoints", () => {
     expect(gemini.route.endpoint.baseURL).toBe("https://aiplatform.googleapis.com/v1/publishers/google")
     expect(gemini.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(gemini.route.defaults.http?.body).toEqual({ safetySettings: [] })
-    expect(gemini.route.defaults.limits).toEqual({ context: 1_000_000, output: 65_536 })
     expect(
       GoogleVertex.model("gemini-3.5-flash", {
         accessToken: "fixture",

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

@@ -322,7 +322,7 @@ describe("Anthropic Messages route", () => {
           { role: "user", content: [{ type: "tool_result", tool_use_id: "call_1", content: '{"forecast":"sunny"}' }] },
         ],
         stream: true,
-        max_tokens: 4096,
+        max_tokens: 32_000,
       })
     }),
   )
@@ -640,7 +640,7 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
-  it.effect("maps thinking tokens and preserves unknown Anthropic usage fields", () =>
+  it.effect("maps nullable input tokens and preserves unknown Anthropic usage fields", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(
         Effect.provide(
@@ -663,6 +663,7 @@ describe("Anthropic Messages route", () => {
                 type: "message_delta",
                 delta: { stop_reason: "end_turn" },
                 usage: {
+                  input_tokens: null,
                   output_tokens: 8,
                   server_tool_use: { web_search_requests: 2, terminal_counter: 3 },
                   output_tokens_details: { terminal_detail: "preserved" },
@@ -682,7 +683,7 @@ describe("Anthropic Messages route", () => {
         totalTokens: 15,
         providerMetadata: {
           anthropic: {
-            input_tokens: 5,
+            input_tokens: null,
             cache_read_input_tokens: 2,
             service_tier: "standard",
             cache_creation: { ephemeral_5m_input_tokens: 1 },

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

@@ -139,6 +139,48 @@ describe("Gemini route", () => {
     }),
   )
 
+  it.effect("keeps system updates separate from function responses", () =>
+    Effect.gen(function* () {
+      const prepared = yield* compileRequest(
+        LLM.request({
+          model,
+          messages: [
+            Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: { query: "weather" } })]),
+            Message.tool({ id: "call_1", name: "lookup", result: "done", resultType: "text" }),
+            Message.system("Update."),
+            Message.system("Later update."),
+          ],
+        }),
+      )
+
+      expect(prepared.body.contents).toEqual([
+        {
+          role: "model",
+          parts: [{ functionCall: { id: undefined, name: "lookup", args: { query: "weather" } } }],
+        },
+        {
+          role: "user",
+          parts: [
+            {
+              functionResponse: {
+                id: undefined,
+                name: "lookup",
+                response: { name: "lookup", content: "done" },
+              },
+            },
+          ],
+        },
+        {
+          role: "user",
+          parts: [
+            { text: "<system-update>\nUpdate.\n</system-update>" },
+            { text: "<system-update>\nLater update.\n</system-update>" },
+          ],
+        },
+      ])
+    }),
+  )
+
   it.effect("prepares multimodal user input and tool history", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(

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

@@ -664,6 +664,74 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
+  it.effect("preserves streamed refusals as ordinary assistant text", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              deltaChunk({ role: "assistant", refusal: "I can't" }),
+              deltaChunk({ refusal: " help with that." }),
+              deltaChunk({}, "stop"),
+            ),
+          ),
+        ),
+      )
+
+      expect(response.text).toBe("I can't help with that.")
+      expect(response.finishReason).toEqual({ normalized: "stop", raw: "stop" })
+      expect(response.message.content).toEqual([{ type: "text", text: "I can't help with that." }])
+
+      const replay = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
+      expect(replay.body.messages).toEqual([{ role: "assistant", content: "I can't help with that." }])
+    }),
+  )
+
+  it.effect("orders metadata-only reasoning before refusal output", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              { choices: [{ delta: { reasoning_details: [] } }] },
+              deltaChunk({ refusal: "I can't help with that." }),
+              deltaChunk({}, "stop"),
+            ),
+          ),
+        ),
+      )
+
+      expect(response.message.content).toEqual([
+        { type: "reasoning", text: "", providerMetadata: { openai: { reasoningDetails: [] } } },
+        {
+          type: "text",
+          text: "I can't help with that.",
+        },
+      ])
+    }),
+  )
+
+  it.effect("joins content and refusal deltas into ordinary assistant text", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              deltaChunk({ refusal: "No." }),
+              deltaChunk({ content: " Alternative." }),
+              deltaChunk({ refusal: " Still no." }),
+              deltaChunk({}, "stop"),
+            ),
+          ),
+        ),
+      )
+
+      expect(response.text).toBe("No. Alternative. Still no.")
+      expect(response.events.filter(LLMEvent.is.textStart).map((event) => event.id)).toEqual(["text-0"])
+      expect(response.events.filter(LLMEvent.is.textEnd).map((event) => event.id)).toEqual(["text-0"])
+    }),
+  )
+
   it.effect("parses and replays OpenAI-compatible reasoning fields", () =>
     Effect.gen(function* () {
       const fields = ["reasoning_content", "reasoning", "reasoning_text"] as const

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

@@ -73,7 +73,7 @@ describe("Open Responses-compatible route", () => {
       expect(prepared.body.input).toEqual([
         { role: "user", content: [{ type: "input_text", text: "Before." }] },
         { role: "developer", content: "Operator update." },
-        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
+        { type: "message", role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
   )
@@ -113,11 +113,67 @@ describe("Open Responses-compatible route", () => {
       )
 
       expect(prepared.body).toMatchObject({
-        input: [{ role: "assistant", content: [{ type: "output_text", text: "Unclassified." }] }],
+        input: [{ type: "message", role: "assistant", content: [{ type: "output_text", text: "Unclassified." }] }],
       })
     }),
   )
 
+  it.effect("preserves standard refusal content as ordinary assistant text", () =>
+    Effect.gen(function* () {
+      const model = configure({
+        apiKey: "test-key",
+        baseURL: "https://responses.example.test/v1",
+        provider: "example",
+      }).model("example-model")
+      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Unsafe request" })).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              {
+                type: "response.output_item.added",
+                output_index: 0,
+                item: { type: "message", id: "msg_refusal", content: [] },
+              },
+              {
+                type: "response.refusal.done",
+                item_id: "msg_refusal",
+                refusal: "I can't help with that.",
+              },
+              {
+                type: "response.output_item.done",
+                output_index: 0,
+                item: {
+                  type: "message",
+                  id: "msg_refusal",
+                  content: [{ type: "refusal", refusal: "I can't help with that." }],
+                },
+              },
+              { type: "response.completed", response: { id: "resp_1" } },
+            ),
+          ),
+        ),
+      )
+
+      expect(response.message.content).toEqual([
+        {
+          type: "text",
+          text: "I can't help with that.",
+          providerMetadata: { openresponses: { itemId: "msg_refusal" } },
+        },
+      ])
+
+      const prepared = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
+      expect(prepared.body.input).toEqual([
+        {
+          type: "message",
+          id: "msg_refusal",
+          role: "assistant",
+          content: [{ type: "output_text", text: "I can't help with that." }],
+        },
+      ])
+    }),
+  )
+
   it.effect("reads standard Open Responses options", () =>
     Effect.gen(function* () {
       const model = configure({
@@ -126,6 +182,10 @@ describe("Open Responses-compatible route", () => {
         providerOptions: {
           reasoningEffort: "low",
           store: true,
+          metadata: { environment: "test" },
+          safetyIdentifier: "user_123",
+          streamOptions: { includeObfuscation: false },
+          topLogprobs: 3,
           truncation: "auto",
           allowedTools: { toolNames: ["lookup"] },
           maxToolCalls: 2,
@@ -136,6 +196,7 @@ describe("Open Responses-compatible route", () => {
         LLM.request({
           model,
           prompt: "Think.",
+          generation: { presencePenalty: 0.2, frequencyPenalty: -0.1 },
           tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
         }),
       )
@@ -143,6 +204,12 @@ describe("Open Responses-compatible route", () => {
       expect(prepared.body).toMatchObject({
         reasoning: { effort: "low" },
         store: true,
+        metadata: { environment: "test" },
+        safety_identifier: "user_123",
+        stream_options: { include_obfuscation: false },
+        top_logprobs: 3,
+        presence_penalty: 0.2,
+        frequency_penalty: -0.1,
         truncation: "auto",
         tool_choice: {
           type: "allowed_tools",

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

@@ -0,0 +1,216 @@
+import { describe, expect } from "bun:test"
+import { Effect, Stream } from "effect"
+import { Socket } from "effect/unstable/socket"
+import { LLM, LLMRequest, Message, ToolRuntime } from "../../src/index.js"
+import {
+  LLMClient,
+  WebSocketTransport,
+  type ChannelCheckpoint,
+  type ChannelObservation,
+  type WebSocketChannelExchange,
+  type WebSocketChannelExecutor,
+  type WebSocketConnection,
+} from "../../src/route.js"
+import { configure } from "../../src/providers/openai.js"
+import { decodeJson } from "../../src/protocols/shared.js"
+import { weatherRuntimeTool, weatherTool, weatherToolName } from "../recorded-scenarios.js"
+import { recordedTests } from "../recorded-test.js"
+
+const model = configure({ apiKey: process.env.OPENAI_API_KEY ?? "fixture" }).responses("gpt-5.5")
+const recorded = recordedTests({
+  prefix: "openai-responses-websocket",
+  provider: "openai",
+  protocol: "openai-responses",
+  requires: ["OPENAI_API_KEY"],
+  tags: ["transport:websocket"],
+  metadata: { transport: "websocket", model: model.id },
+})
+
+const observationFrame = (observation: ChannelObservation) => {
+  if (observation.type === "frame" || observation.type === "completed" || observation.type === "incomplete")
+    return Effect.succeed(observation.frame)
+  return Effect.fail(observation.error)
+}
+
+const terminal = (observation: ChannelObservation) => observation.type !== "frame"
+
+// This deliberately models only sequential test traffic. Core owns production connection pooling and recovery.
+const makeChannel = Effect.gen(function* () {
+  const constructor = yield* Socket.WebSocketConstructor
+  let connection: WebSocketConnection | undefined
+  let checkpoint: ChannelCheckpoint | undefined
+  let pending: ChannelCheckpoint | undefined
+  let opens = 0
+  const sent: unknown[] = []
+
+  const close = Effect.suspend(() => {
+    const current = connection
+    connection = undefined
+    return current ? current.close : Effect.void
+  })
+  yield* Effect.addFinalizer(() => close)
+
+  const executor: WebSocketChannelExecutor = {
+    execute: (exchange: WebSocketChannelExchange) =>
+      Effect.gen(function* () {
+        if (!connection) {
+          connection = yield* WebSocketTransport.open(exchange.connect).pipe(
+            Effect.provideService(Socket.WebSocketConstructor, constructor),
+          )
+          opens += 1
+        }
+        const current = connection
+        const create = yield* exchange.driver.create(checkpoint)
+        if (create.mode === "full") checkpoint = undefined
+        pending = undefined
+        sent.push(decodeJson(create.message))
+        yield* current.sendText(create.message)
+        const decoder = new TextDecoder()
+        return {
+          frames: current.messages.pipe(
+            Stream.map((message) => WebSocketTransport.messageText(message, decoder)),
+            Stream.mapEffect((frame) => exchange.driver.observe(create, frame)),
+            Stream.tap((observation) =>
+              Effect.sync(() => {
+                if (!terminal(observation)) return
+                pending = observation.type === "completed" ? observation.checkpoint : undefined
+                if (observation.type !== "completed") checkpoint = undefined
+              }),
+            ),
+            Stream.takeUntil(terminal),
+            Stream.mapEffect(observationFrame),
+          ),
+          complete: Effect.sync(() => {
+            checkpoint = pending
+            pending = undefined
+          }),
+        }
+      }),
+  }
+
+  return {
+    executor,
+    sent,
+    opens: () => opens,
+    reconnect: (preserveCheckpoint = false) =>
+      close.pipe(
+        Effect.andThen(
+          Effect.sync(() => {
+            pending = undefined
+            if (!preserveCheckpoint) checkpoint = undefined
+          }),
+        ),
+      ),
+  }
+})
+
+describe("OpenAI Responses WebSocket recorded", () => {
+  recorded.effect.with("continues a tool call over one socket", { tags: ["tool", "continuation"] }, () =>
+    Effect.gen(function* () {
+      const channel = yield* makeChannel
+      const request = LLM.request({
+        id: "recorded_openai_responses_websocket_tool",
+        model,
+        system: "Call get_weather once, then reply exactly: Paris is sunny.",
+        prompt: "What is the weather in Paris?",
+        tools: [weatherTool],
+        generation: { maxTokens: 50 },
+        cache: "none",
+      })
+      const first = yield* LLMClient.generate(request, { webSocket: channel.executor })
+      const call = first.toolCalls[0]
+      if (!call) yield* Effect.die("Expected get_weather tool call")
+      const result = yield* ToolRuntime.dispatch({ [weatherToolName]: weatherRuntimeTool }, call)
+      const second = yield* LLMClient.generate(
+        LLMRequest.update(request, {
+          messages: [
+            ...request.messages,
+            first.message,
+            Message.tool({ id: call.id, name: call.name, result: result.result }),
+          ],
+        }),
+        { webSocket: channel.executor },
+      )
+
+      expect(second.text).toBe("Paris is sunny.")
+      expect(channel.opens()).toBe(1)
+      expect(channel.sent).toHaveLength(2)
+      expect(channel.sent[1]).toMatchObject({
+        previous_response_id: expect.any(String),
+        input: [{ type: "function_call_output", call_id: call.id, output: expect.any(String) }],
+      })
+    }),
+  )
+
+  recorded.effect.with("reconstructs full context after reconnect", { tags: ["reconnect", "full-context"] }, () =>
+    Effect.gen(function* () {
+      const channel = yield* makeChannel
+      const request = LLM.request({
+        id: "recorded_openai_responses_websocket_reconnect",
+        model,
+        system: "Follow the user's exact reply instruction.",
+        prompt: "Reply exactly: Alpha.",
+        generation: { maxTokens: 30 },
+        cache: "none",
+      })
+      const first = yield* LLMClient.generate(request, { webSocket: channel.executor })
+      yield* channel.reconnect()
+      const second = yield* LLMClient.generate(
+        LLMRequest.update(request, {
+          messages: [...request.messages, first.message, Message.user("Reply exactly: Beta.")],
+        }),
+        { webSocket: channel.executor },
+      )
+
+      expect(first.text).toBe("Alpha.")
+      expect(second.text).toBe("Beta.")
+      expect(channel.opens()).toBe(2)
+      expect(channel.sent[1]).not.toHaveProperty("previous_response_id")
+      expect(channel.sent[1]).toMatchObject({
+        input: [
+          { role: "system", content: "Follow the user's exact reply instruction." },
+          { role: "user", content: [{ type: "input_text", text: "Reply exactly: Alpha." }] },
+          { role: "assistant", content: [{ type: "output_text", text: "Alpha." }] },
+          { role: "user", content: [{ type: "input_text", text: "Reply exactly: Beta." }] },
+        ],
+      })
+    }),
+  )
+
+  recorded.effect.with("recovers from explicit continuation rejection", { tags: ["continuation", "recovery"] }, () =>
+    Effect.gen(function* () {
+      const channel = yield* makeChannel
+      const request = LLM.request({
+        id: "recorded_openai_responses_websocket_rejection",
+        model,
+        system: "Follow the user's exact reply instruction.",
+        prompt: "Reply exactly: Ready.",
+        generation: { maxTokens: 30 },
+        cache: "none",
+      })
+      const first = yield* LLMClient.generate(request, { webSocket: channel.executor })
+      const continuation = LLMRequest.update(request, {
+        messages: [...request.messages, first.message, Message.user("Reply exactly: Recovered.")],
+      })
+      yield* channel.reconnect(true)
+      const rejected = yield* LLMClient.generate(continuation, { webSocket: channel.executor }).pipe(Effect.flip)
+      const recovered = yield* LLMClient.generate(continuation, { webSocket: channel.executor })
+
+      expect(rejected).toMatchObject({
+        reason: { _tag: "Transport", delivery: "rejected", recovery: "retry-full" },
+      })
+      expect(recovered.text).toBe("Recovered.")
+      expect(channel.opens()).toBe(2)
+      expect(channel.sent[1]).toHaveProperty("previous_response_id", expect.any(String))
+      expect(channel.sent[2]).not.toHaveProperty("previous_response_id")
+      expect(channel.sent[2]).toMatchObject({
+        input: [
+          { role: "system", content: "Follow the user's exact reply instruction." },
+          { role: "user", content: [{ type: "input_text", text: "Reply exactly: Ready." }] },
+          { role: "assistant", content: [{ type: "output_text", text: "Ready." }] },
+          { role: "user", content: [{ type: "input_text", text: "Reply exactly: Recovered." }] },
+        ],
+      })
+    }),
+  )
+})

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

@@ -263,7 +263,7 @@ describe("OpenAI Responses route", () => {
       expect(prepared.body.input).toEqual([
         { role: "user", content: [{ type: "input_text", text: "Before." }] },
         { role: "developer", content: "Operator update." },
-        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
+        { type: "message", role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
   )
@@ -485,7 +485,7 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("continues store-false reasoning without replaying the output-only item ID", () =>
+  it.effect("continues store-false reasoning while retaining the output item ID", () =>
     Effect.gen(function* () {
       const firstInput = [{ role: "user", content: [{ type: "input_text", text: "Think" }] }]
       const request = { type: "response.create", model: "gpt-5.2", store: false, input: firstInput }
@@ -515,6 +515,7 @@ describe("OpenAI Responses route", () => {
           ...firstInput,
           {
             type: "reasoning",
+            id: "rs_1",
             summary: [{ type: "summary_text", text: "Thought" }],
             encrypted_content: "encrypted",
           },
@@ -1284,6 +1285,7 @@ describe("OpenAI Responses route", () => {
           model: OpenAI.configure({ baseURL: "https://api.openai.test/v1/", apiKey: "test" }).model("gpt-5.2"),
           prompt: "think",
           promptCacheKey: "session_123",
+          generation: { presencePenalty: 0.25, frequencyPenalty: -0.25 },
           tools: [
             ToolDefinition.make({ name: "read", description: "Read a file", inputSchema: { type: "object" } }),
             ToolDefinition.make({ name: "grep", description: "Search files", inputSchema: { type: "object" } }),
@@ -1293,6 +1295,10 @@ describe("OpenAI Responses route", () => {
             reasoningEffort: "high",
             reasoningSummary: "auto",
             include: ["reasoning.encrypted_content"],
+            metadata: { environment: "test", tenant: "acme" },
+            safetyIdentifier: "user_123",
+            streamOptions: { includeObfuscation: false },
+            topLogprobs: 5,
             truncation: "disabled",
             allowedTools: { toolNames: ["read", "grep"], mode: "required" },
             maxToolCalls: 4,
@@ -1306,6 +1312,12 @@ describe("OpenAI Responses route", () => {
       expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
       expect(prepared.body.reasoning).toEqual({ effort: "high", summary: "auto" })
       expect(prepared.body.text).toEqual({ verbosity: "low" })
+      expect(prepared.body.metadata).toEqual({ environment: "test", tenant: "acme" })
+      expect(prepared.body.safety_identifier).toBe("user_123")
+      expect(prepared.body.stream_options).toEqual({ include_obfuscation: false })
+      expect(prepared.body.top_logprobs).toBe(5)
+      expect(prepared.body.presence_penalty).toBe(0.25)
+      expect(prepared.body.frequency_penalty).toBe(-0.25)
       expect(prepared.body.truncation).toBe("disabled")
       expect(prepared.body.tool_choice).toEqual({
         type: "allowed_tools",
@@ -1473,7 +1485,7 @@ describe("OpenAI Responses route", () => {
       expect(response.text).toBe("Hello!")
       expect(response.events).toEqual([
         { type: "step-start", index: 0 },
-        { type: "text-start", id: "msg_1" },
+        { type: "text-start", id: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
         { type: "text-delta", id: "msg_1", text: "Hello" },
         { type: "text-delta", id: "msg_1", text: "!" },
         { type: "text-end", id: "msg_1" },
@@ -1494,6 +1506,108 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
+  it.effect("preserves standard refusal content as ordinary assistant text", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              {
+                type: "response.output_item.added",
+                output_index: 0,
+                item: { type: "message", id: "msg_refusal", content: [] },
+              },
+              {
+                type: "response.content_part.added",
+                item_id: "msg_refusal",
+                output_index: 0,
+                content_index: 0,
+                part: { type: "refusal", refusal: "" },
+              },
+              {
+                type: "response.refusal.delta",
+                item_id: "msg_refusal",
+                output_index: 0,
+                content_index: 0,
+                delta: "I can't",
+              },
+              {
+                type: "response.refusal.delta",
+                item_id: "msg_refusal",
+                output_index: 0,
+                content_index: 0,
+                delta: " help with that.",
+              },
+              {
+                type: "response.refusal.done",
+                item_id: "msg_refusal",
+                output_index: 0,
+                content_index: 0,
+                refusal: "I can't help with that.",
+              },
+              {
+                type: "response.content_part.done",
+                item_id: "msg_refusal",
+                output_index: 0,
+                content_index: 0,
+                part: { type: "refusal", refusal: "I can't help with that." },
+              },
+              {
+                type: "response.output_item.done",
+                output_index: 0,
+                item: {
+                  type: "message",
+                  id: "msg_refusal",
+                  phase: "final_answer",
+                  content: [{ type: "refusal", refusal: "I can't help with that." }],
+                },
+              },
+              { type: "response.completed", response: { id: "resp_1" } },
+            ),
+          ),
+        ),
+      )
+
+      expect(response.text).toBe("I can't help with that.")
+      expect(response.finishReason).toEqual({ normalized: "stop", raw: undefined })
+      expect(response.message.content).toEqual([
+        {
+          type: "text",
+          text: "I can't help with that.",
+          providerMetadata: { openai: { itemId: "msg_refusal", phase: "final_answer" } },
+        },
+      ])
+
+      const prepared = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
+      expect(prepared.body.input).toEqual([
+        {
+          type: "message",
+          id: "msg_refusal",
+          role: "assistant",
+          content: [{ type: "output_text", text: "I can't help with that." }],
+          phase: "final_answer",
+        },
+      ])
+    }),
+  )
+
+  it.effect("rejects malformed refusal events", () =>
+    Effect.gen(function* () {
+      const events = [
+        { type: "response.refusal.delta", output_index: 0, content_index: 0, delta: "missing item" },
+        { type: "response.refusal.delta", item_id: "msg_1", output_index: 0, content_index: 0 },
+        { type: "response.refusal.done", item_id: "msg_1", output_index: 0, content_index: 0 },
+      ]
+      for (const event of events) {
+        const error = yield* LLMClient.generate(request).pipe(
+          Effect.provide(fixedResponse(sseEvents(event))),
+          Effect.flip,
+        )
+        expect(error.reason._tag).toBe("InvalidProviderOutput")
+      }
+    }),
+  )
+
   it.effect("preserves and replays assistant message phases", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(
@@ -1532,33 +1646,39 @@ describe("OpenAI Responses route", () => {
         {
           type: "text",
           text: "Checking.",
-          providerMetadata: { openai: { phase: "commentary" } },
+          providerMetadata: { openai: { itemId: "msg_commentary", phase: "commentary" } },
         },
         {
           type: "text",
           text: "Finished.",
-          providerMetadata: { openai: { phase: "final_answer" } },
+          providerMetadata: { openai: { itemId: "msg_final", phase: "final_answer" } },
         },
         {
           type: "text",
           text: "Unclassified.",
-          providerMetadata: { openai: { phase: null } },
+          providerMetadata: { openai: { itemId: "msg_null", phase: null } },
         },
       ])
 
       const prepared = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
       expect(prepared.body.input).toEqual([
         {
+          type: "message",
+          id: "msg_commentary",
           role: "assistant",
           content: [{ type: "output_text", text: "Checking." }],
           phase: "commentary",
         },
         {
+          type: "message",
+          id: "msg_final",
           role: "assistant",
           content: [{ type: "output_text", text: "Finished." }],
           phase: "final_answer",
         },
         {
+          type: "message",
+          id: "msg_null",
           role: "assistant",
           content: [{ type: "output_text", text: "Unclassified." }],
           phase: null,
@@ -1652,12 +1772,12 @@ describe("OpenAI Responses route", () => {
       )
 
       expect(response.events.filter((event) => event.type.startsWith("text-"))).toEqual([
-        { type: "text-start", id: "msg_1" },
+        { type: "text-start", id: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
         { type: "text-delta", id: "msg_1", text: "First" },
-        { type: "text-end", id: "msg_1" },
-        { type: "text-start", id: "msg_2" },
+        { type: "text-end", id: "msg_1", providerMetadata: undefined },
+        { type: "text-start", id: "msg_2", providerMetadata: { openai: { itemId: "msg_2" } } },
         { type: "text-delta", id: "msg_2", text: "Second" },
-        { type: "text-end", id: "msg_2" },
+        { type: "text-end", id: "msg_2", providerMetadata: { openai: { itemId: "msg_2" } } },
       ])
     }),
   )
@@ -1689,7 +1809,7 @@ describe("OpenAI Responses route", () => {
       expect(response.events.filter((event) => event.type === "finish")).toHaveLength(1)
       expect(response.message.content).toEqual([
         { type: "reasoning", text: "thinking" },
-        { type: "text", text: "Hello" },
+        { type: "text", text: "Hello", providerMetadata: { openai: { itemId: "msg_1" } } },
       ])
     }),
   )
@@ -1850,6 +1970,7 @@ describe("OpenAI Responses route", () => {
                   { role: "user", content: [{ type: "input_text", text: "What changed?" }] },
                   {
                     type: "reasoning",
+                    id: "rs_1",
                     encrypted_content: "encrypted-state",
                     summary: [{ type: "summary_text", text: "Checked the previous diff." }],
                   },
@@ -1857,7 +1978,6 @@ describe("OpenAI Responses route", () => {
                   { role: "user", content: [{ type: "input_text", text: "Summarize it." }] },
                 ],
               })
-              expect(body.input[1]).not.toHaveProperty("id")
               return input.respond(
                 sseEvents(
                   { type: "response.output_text.delta", item_id: "msg_1", delta: "Parser now round-trips reasoning." },
@@ -1901,13 +2021,14 @@ describe("OpenAI Responses route", () => {
       )
 
       expect(prepared.body.input).toEqual([
-        { role: "assistant", content: [{ type: "output_text", text: "Before." }] },
+        { type: "message", role: "assistant", content: [{ type: "output_text", text: "Before." }] },
         {
           type: "reasoning",
+          id: "rs_1",
           encrypted_content: "encrypted-state",
           summary: [{ type: "summary_text", text: "Checked order." }],
         },
-        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
+        { type: "message", role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
   )
@@ -2039,6 +2160,7 @@ describe("OpenAI Responses route", () => {
       expect(prepared.body.input).toEqual([
         {
           type: "reasoning",
+          id: "rs_1",
           encrypted_content: "encrypted-state",
           summary: [
             { type: "summary_text", text: "First" },
@@ -2171,6 +2293,50 @@ describe("OpenAI Responses route", () => {
           usage,
         },
       ])
+
+      const prepared = yield* compileRequest(LLM.request({ model, messages: [response.message] }))
+      expect(prepared.body.input).toEqual([
+        {
+          type: "function_call",
+          id: "item_1",
+          call_id: "call_1",
+          name: "lookup",
+          arguments: '{"query":"weather"}',
+        },
+      ])
+    }),
+  )
+
+  it.effect("finalizes a pending function call at response completion", () =>
+    Effect.gen(function* () {
+      const body = sseEvents(
+        {
+          type: "response.output_item.added",
+          item: { type: "function_call", id: "item_1", call_id: "call_1", name: "lookup", arguments: "" },
+        },
+        { type: "response.completed", response: { usage: { input_tokens: 5, output_tokens: 1 } } },
+      )
+      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
+
+      expect(response.events.filter((event) => LLMEvent.is.toolInputEnd(event) || LLMEvent.is.toolCall(event))).toEqual(
+        [
+          {
+            type: "tool-input-end",
+            id: "call_1",
+            name: "lookup",
+            providerMetadata: { openai: { itemId: "item_1" } },
+          },
+          {
+            type: "tool-call",
+            id: "call_1",
+            name: "lookup",
+            input: {},
+            providerExecuted: undefined,
+            providerMetadata: { openai: { itemId: "item_1" } },
+          },
+        ],
+      )
+      expect(response.finishReason.normalized).toBe("tool-calls")
     }),
   )
 
@@ -2237,6 +2403,35 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
+  it.effect("retains function call item metadata when output_item.added is absent", () =>
+    Effect.gen(function* () {
+      const response = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              {
+                type: "response.output_item.done",
+                item: {
+                  type: "function_call",
+                  id: "item_1",
+                  call_id: "call_1",
+                  name: "lookup",
+                  arguments: '{"query":"weather"}',
+                },
+              },
+              { type: "response.completed", response: { id: "resp_1" } },
+            ),
+          ),
+        ),
+      )
+
+      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({
+        id: "call_1",
+        providerMetadata: { openai: { itemId: "item_1" } },
+      })
+    }),
+  )
+
   it.effect("decodes web_search_call as provider-executed tool-call + tool-result", () =>
     Effect.gen(function* () {
       const item = {

packages/ai/test/recorded-test.ts

@@ -1,5 +1,7 @@
 import { HttpRecorder } from "@opencode-ai/http-recorder"
+import { NodeSocket } from "@effect/platform-node"
 import { Layer } from "effect"
+import { Socket } from "effect/unstable/socket"
 import * as path from "node:path"
 import { fileURLToPath } from "node:url"
 import { LLMClient, RequestExecutor } from "../src/route.js"
@@ -16,7 +18,7 @@ import {
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const FIXTURES_DIR = path.resolve(__dirname, "fixtures", "recordings")
 
-type RecordedEnv = RequestExecutorService | LLMClientService | ImageClientService
+type RecordedEnv = RequestExecutorService | LLMClientService | ImageClientService | Socket.WebSocketConstructor
 
 type RecordedTestsOptions = RecordedGroupOptions & {
   readonly options?: HttpRecorder.RecorderOptions
@@ -69,7 +71,7 @@ export const recordedTests = (options: RecordedTestsOptions) =>
         ...metadata,
       }
       if (recording) {
-        if (process.env.CI !== undefined) throw new Error("Unset CI before recording HTTP cassettes")
+        if (process.env.CI !== undefined) throw new Error("Unset CI before recording cassettes")
         HttpRecorder.removeCassetteSync(cassette, { directory: FIXTURES_DIR })
       }
       const requestExecutor = RequestExecutor.layer.pipe(
@@ -81,10 +83,16 @@ export const recordedTests = (options: RecordedTestsOptions) =>
           }),
         ),
       )
+      const webSocket = HttpRecorder.layerWebSocketConstructor(cassette, {
+        ...recorderOptions,
+        directory: FIXTURES_DIR,
+        metadata: recorderMetadata,
+      }).pipe(Layer.provide(NodeSocket.layerWebSocketConstructorWS))
       return Layer.mergeAll(
         requestExecutor,
         LLMClient.layer.pipe(Layer.provide(requestExecutor)),
         ImageClient.layer.pipe(Layer.provide(requestExecutor)),
+        webSocket,
       )
     },
   })

packages/app/e2e/performance/README.md

@@ -2,12 +2,34 @@
 
 The app's high-volume performance diagnostics live under `packages/app/e2e/performance` and are excluded from normal local and CI Playwright discovery. The benchmark config builds the app and serves the production bundle before running scenarios serially.
 
+The `devex` category is the explicit exception to the production-build rule. It measures development commands from submission through a user-visible ready state and has its own Playwright configuration.
+
 Run the suite explicitly from `packages/app`:
 
 ```sh
 bun run test:bench
 ```
 
+Run the desktop development startup benchmark from the repository root:
+
+```sh
+bun run bench:devex
+```
+
+It runs five serial samples of the exact `bun dev:desktop` command. Each sample uses a fresh desktop profile, database, service configuration, service registration, and service process; the desktop selects an isolated ephemeral loopback endpoint. It removes desktop build output and the desktop Vite cache before every run; dependencies, Bun's package cache, and Electron remain installed. The harness stops only that sample's service; it does not stop or change the elected global OpenCode service. The measured endpoint is a visible Home page whose empty-state controls pass Playwright actionability checks. The command's Electron installation check remains inside the measured interval.
+
+Set `DESKTOP_STARTUP_RUNS` only for focused diagnostics:
+
+```sh
+DESKTOP_STARTUP_RUNS=1 bun run bench:devex
+```
+
+Set `OPENCODE_PERFORMANCE_TRACE_DIR` to capture the renderer's CDP trace from attachment through actionable Home:
+
+```sh
+DESKTOP_STARTUP_RUNS=1 OPENCODE_PERFORMANCE_TRACE_DIR=/tmp/opencode-desktop-traces bun run bench:devex
+```
+
 PowerShell:
 
 ```powershell

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

@@ -18,9 +18,9 @@ const categories = [
   "disabled-by-default-v8.cpu_profiler",
 ]
 
-export async function startChromeTrace(page: Page, name: string) {
+export async function startChromeTrace(page: Page, name: string): Promise<undefined | (() => Promise<string>)> {
   const directory = process.env.OPENCODE_PERFORMANCE_TRACE_DIR
-  if (!directory) return
+  if (!directory) return undefined
 
   const selectors = process.env.OPENCODE_PERFORMANCE_SELECTOR_TRACE === "1"
   const file = await prepareChromeTrace(directory, name, selectors)

packages/app/e2e/performance/devex/desktop-startup-benchmark.spec.ts

@@ -0,0 +1,26 @@
+import { benchmark } from "../benchmark"
+import {
+  desktopBenchmarkContext,
+  runDesktopStartup,
+  summarizeDesktopStartup,
+  type DesktopStartupSample,
+} from "./desktop-startup"
+
+benchmark.describe("devex: desktop startup", () => {
+  benchmark("opens a cold desktop on Home", async ({ report }, testInfo) => {
+    benchmark.setTimeout(15 * 60_000)
+    const runs = Number(process.env.DESKTOP_STARTUP_RUNS ?? 5)
+    if (!Number.isSafeInteger(runs) || runs < 1) throw new Error("DESKTOP_STARTUP_RUNS must be a positive integer")
+
+    const samples: DesktopStartupSample[] = []
+    const context = await desktopBenchmarkContext(runs)
+    for (let run = 1; run <= runs; run++) {
+      const sample = await runDesktopStartup(run, testInfo).catch((error) => {
+        report(samples.length ? { samples, summary: summarizeDesktopStartup(samples) } : { samples }, context)
+        throw error
+      })
+      samples.push(sample)
+    }
+    report({ samples, summary: summarizeDesktopStartup(samples) }, context)
+  })
+})

packages/app/e2e/performance/devex/desktop-startup.ts

@@ -0,0 +1,526 @@
+import { Service } from "@opencode-ai/client/service"
+import { chromium, expect, type Browser, type Page, type TestInfo } from "@playwright/test"
+import { spawn, spawnSync, type ChildProcess } from "node:child_process"
+import { mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises"
+import { tmpdir } from "node:os"
+import { join, resolve } from "node:path"
+import { startChromeTrace } from "../chrome-trace"
+
+const repository = resolve(import.meta.dirname, "../../../../..")
+const milestones = [
+  "bunRootScript",
+  "bunDesktopScript",
+  "desktopPrepared",
+  "mainBundleReady",
+  "preloadBundleReady",
+  "rendererDevServerReady",
+  "electronSpawnStarted",
+  "debugEndpointReady",
+  "electronStarted",
+  "serviceEnsureStarted",
+  "serviceSpawnRequested",
+  "serviceReady",
+  "backgroundLoadingReady",
+  "rendererViteConnected",
+  "rendererInitializationStarted",
+  "rendererInitializationReady",
+  "windowVisible",
+  "homeReady",
+] as const
+const phases = [
+  "desktopPreparation",
+  "viteMainBundle",
+  "vitePreloadBundle",
+  "rendererServerStartup",
+  "electronStartup",
+  "serviceSpawnWait",
+  "serviceProcessStartup",
+  "rendererStartup",
+  "visibleWindowToHome",
+] as const
+
+type Milestone = (typeof milestones)[number]
+type Phase = (typeof phases)[number]
+type ServiceInfo = { id: string; version: string; url: string; pid: number }
+
+export type DesktopStartupSample = {
+  run: number
+  commandToHomeReadyMs: number
+  milestonesMs: Record<Milestone, number>
+  phasesMs: Record<Phase, number>
+  service: Omit<ServiceInfo, "id">
+}
+
+export async function runDesktopStartup(run: number, testInfo: TestInfo) {
+  const profile = await createColdProfile()
+  const desktop = await Promise.resolve()
+    .then(() => startDesktop(profile))
+    .catch(async (error) => {
+      await rm(profile.root, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 })
+      throw error
+    })
+  try {
+    const page = await desktop.open()
+    const stopTrace = await startChromeTrace(page, `desktop-startup-${run}`)
+    try {
+      await startThemeObservation(page)
+      await waitForHome(page, desktop.mark)
+      await requireStableTheme(page)
+      return await desktop.result(run)
+    } finally {
+      await stopTrace?.()
+    }
+  } finally {
+    await desktop.close(testInfo, run)
+  }
+}
+
+export async function desktopBenchmarkContext(runs: number) {
+  const pkg = JSON.parse(await readFile(join(repository, "packages/desktop/package.json"), "utf8"))
+  const revision = spawnSync("git", ["rev-parse", "HEAD"], { cwd: repository })
+  if (revision.status !== 0) throw new Error("Failed to read the benchmark Git revision")
+  const status = spawnSync("git", ["status", "--porcelain"], { cwd: repository })
+  if (status.status !== 0) throw new Error("Failed to read the benchmark Git status")
+  const bun = spawnSync("bun", ["--version"], { cwd: repository })
+  if (bun.status !== 0) throw new Error("Failed to read the benchmark Bun version")
+  return {
+    arch: process.arch,
+    command: "bun dev:desktop",
+    runs,
+    profile: "fresh",
+    service: "isolated-cold",
+    install: "complete",
+    viteCache: "cold",
+    electronInstall: "present",
+    bunVersion: bun.stdout.toString().trim(),
+    electronVersion: pkg.devDependencies.electron,
+    electronViteVersionRange: pkg.devDependencies["electron-vite"],
+    gitCommit: revision.stdout.toString().trim(),
+    gitDirty: status.stdout.length > 0,
+    trace: Boolean(process.env.OPENCODE_PERFORMANCE_TRACE_DIR),
+  }
+}
+
+export function summarizeDesktopStartup(samples: DesktopStartupSample[]) {
+  return {
+    commandToHomeReadyMs: statistics(samples.map((sample) => sample.commandToHomeReadyMs)),
+    milestonesMs: Object.fromEntries(
+      milestones.map((name) => [name, statistics(samples.map((sample) => sample.milestonesMs[name]))]),
+    ),
+    phasesMs: Object.fromEntries(
+      phases.map((name) => [name, statistics(samples.map((sample) => sample.phasesMs[name]))]),
+    ),
+  }
+}
+
+export function milestoneForLine(line: string): Milestone | undefined {
+  const text = stripAnsi(line)
+  return milestonePatterns.find((item) => text.includes(item.text))?.name
+}
+
+const milestonePatterns: ReadonlyArray<{ name: Milestone; text: string }> = [
+  { name: "bunRootScript", text: "$ bun --cwd packages/desktop dev" },
+  { name: "bunDesktopScript", text: "$ bun ./scripts/dev.ts" },
+  { name: "desktopPrepared", text: "Copied dev icons from" },
+  { name: "mainBundleReady", text: "electron main process built successfully" },
+  { name: "preloadBundleReady", text: "electron preload scripts built successfully" },
+  { name: "rendererDevServerReady", text: "dev server running for the electron renderer process at:" },
+  { name: "electronSpawnStarted", text: "starting electron app..." },
+  { name: "debugEndpointReady", text: "DevTools listening on ws://" },
+  { name: "electronStarted", text: "app starting" },
+  { name: "serviceEnsureStarted", text: "starting v2 background service" },
+  { name: "serviceSpawnRequested", text: "v2 CLI background service starting" },
+  { name: "serviceReady", text: "v2 CLI background service ready" },
+  { name: "backgroundLoadingReady", text: "loading task finished" },
+  { name: "rendererViteConnected", text: "[vite] connected." },
+  { name: "rendererInitializationStarted", text: "awaiting server ready" },
+  { name: "rendererInitializationReady", text: "server ready" },
+  { name: "windowVisible", text: "main window visible" },
+]
+
+async function createColdProfile() {
+  await Promise.all(
+    ["packages/desktop/node_modules/.vite", "packages/desktop/out"].map((path) =>
+      rm(join(repository, path), { recursive: true, force: true }),
+    ),
+  )
+  const root = await mkdtemp(join(tmpdir(), "opencode-desktop-startup-"))
+  return initializeColdProfile(root).catch(async (error) => {
+    await rm(root, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 })
+    throw error
+  })
+}
+
+async function initializeColdProfile(root: string) {
+  await Promise.all(
+    ["data", "config", "cache", "state", "desktop", "session", "home"].map((dir) =>
+      mkdir(join(root, dir), { recursive: true }),
+    ),
+  )
+  await Promise.all([
+    writeFile(
+      join(root, "desktop", "opencode.settings"),
+      JSON.stringify({ firstLaunchOnboardingComplete: true }),
+    ),
+    writeFile(join(root, "desktop", "opencode.global.dat"), JSON.stringify({ language: '{"locale":"en"}' })),
+  ])
+  const registration = join(root, "desktop", "opencode", "service-local.json")
+  await Service.stop({ file: registration })
+  return { root, registration }
+}
+
+function startDesktop(profile: Awaited<ReturnType<typeof createColdProfile>>) {
+  const started = performance.now()
+  const child = spawn("bun", ["dev:desktop"], {
+    cwd: repository,
+    detached: process.platform !== "win32",
+    env: {
+      ...process.env,
+      OPENCODE_CONFIG_DIR: join(profile.root, "config"),
+      OPENCODE_DB: join(profile.root, "data", "opencode.db"),
+      OPENCODE_TEST_HOME: join(profile.root, "home"),
+      OPENCODE_TEST_ONBOARDING: "0",
+      OPENCODE_DESKTOP_TEST_ROOT: profile.root,
+      OPENCODE_DESKTOP_REMOTE_DEBUGGING_PORT: "0",
+      OPENCODE_DESKTOP_DISABLE_PROTOCOL_REGISTRATION: "1",
+    },
+    stdio: ["ignore", "pipe", "pipe"],
+  })
+  if (!child.pid || !child.stdout || !child.stderr) throw new Error("Failed to start the desktop command")
+  const exited = childExit(child)
+  const observed: Partial<Record<Milestone, number>> = {}
+  const endpoint = Promise.withResolvers<string>()
+  const pageErrors: string[] = []
+  let browser: Browser | undefined
+  let service: ServiceInfo | undefined
+  const mark = (name: Milestone) => {
+    observed[name] ??= elapsed(started)
+  }
+  const record = (line: string) => {
+    const milestone = milestoneForLine(line)
+    if (milestone) mark(milestone)
+    const match = stripAnsi(line).match(/DevTools listening on (ws:\/\/\S+)/)
+    if (match?.[1]) endpoint.resolve(match[1])
+  }
+  const stdout = observeOutput(child.stdout, record)
+  const stderr = observeOutput(child.stderr, record)
+
+  return {
+    mark,
+    async open() {
+      const url = await Promise.race([
+        endpoint.promise,
+        exited.then((code) => {
+          throw new Error(`Desktop command exited with code ${code} before opening its debug endpoint`)
+        }),
+        sleep(120_000).then(() => {
+          throw new Error("Timed out waiting for the desktop debug endpoint")
+        }),
+      ])
+      browser = await chromium.connectOverCDP(url, { timeout: 120_000 })
+      const context = browser.contexts()[0]
+      if (!context) throw new Error("Electron did not expose a browser context")
+      await expect.poll(() => context.pages().length, { timeout: 120_000 }).toBeGreaterThan(0)
+      const page = context.pages()[0]
+      if (!page) throw new Error("Electron did not expose a renderer page")
+      page.on("pageerror", (error) => pageErrors.push(error.stack ?? error.message))
+      return page
+    },
+    async result(run: number): Promise<DesktopStartupSample> {
+      if (pageErrors.length) throw new Error(`Desktop renderer reported errors:\n\n${pageErrors.join("\n\n")}`)
+      service = await readService(profile)
+      const milestonesMs = requireMilestones(observed)
+      return {
+        run,
+        commandToHomeReadyMs: milestonesMs.homeReady,
+        milestonesMs,
+        phasesMs: calculatePhases(milestonesMs),
+        service: {
+          version: service.version,
+          url: service.url,
+          pid: service.pid,
+        },
+      }
+    },
+    async close(testInfo: TestInfo, run: number) {
+      const errors: unknown[] = []
+      await browser?.close().catch(() => undefined)
+      await stopProcessTree(child, exited).catch((error) => {
+        errors.push(error)
+        child.stdout?.destroy()
+        child.stderr?.destroy()
+      })
+      const [stdoutText, stderrText] = await Promise.all([stdout, stderr]).catch((error) => {
+        errors.push(error)
+        return ["", ""]
+      })
+      await Promise.all([
+        testInfo.attach(`desktop-startup-${run}-stdout`, { body: stdoutText, contentType: "text/plain" }),
+        testInfo.attach(`desktop-startup-${run}-stderr`, { body: stderrText, contentType: "text/plain" }),
+        pageErrors.length
+          ? testInfo.attach(`desktop-startup-${run}-page-errors`, {
+              body: pageErrors.join("\n\n"),
+              contentType: "text/plain",
+            })
+          : Promise.resolve(),
+      ]).catch((error) => errors.push(error))
+      await Service.stop({ file: profile.registration }).catch((error) => errors.push(error))
+      if (service && processAlive(service.pid))
+        errors.push(new Error(`Desktop service process ${service.pid} did not stop`))
+      await rm(profile.root, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 }).catch((error) =>
+        errors.push(error),
+      )
+      if (errors.length) throw new AggregateError(errors, "Desktop benchmark cleanup failed")
+    },
+  }
+}
+
+async function waitForHome(page: Page, mark: (name: Milestone) => void) {
+  await expect.poll(() => page.evaluate(() => document.visibilityState), { timeout: 120_000 }).toBe("visible")
+
+  const projects = page.getByRole("complementary", { name: "Projects", exact: true })
+  const sessions = page.getByRole("region", { name: "Recent sessions", exact: true })
+  const search = page.getByRole("textbox", { name: "Search sessions", exact: true })
+  const addProject = projects.locator('button[data-action="home-add-project-row"]')
+  await expect(projects).toBeVisible({ timeout: 120_000 })
+  await expect(sessions).toBeVisible()
+  await expect(search).toBeEditable()
+  await expect(sessions.getByText("Nothing here yet", { exact: true })).toBeVisible()
+  await expect(addProject).toHaveCount(1)
+  await addProject.click({ trial: true })
+  mark("homeReady")
+}
+
+type ThemeWindow = Window & {
+  __OPENCODE_THEME_STATES__?: string[]
+  __OPENCODE_THEME_OBSERVER__?: MutationObserver
+}
+
+async function startThemeObservation(page: Page) {
+  await page.addInitScript(installThemeObservation)
+  await page.evaluate(installThemeObservation)
+}
+
+async function requireStableTheme(page: Page) {
+  const states = await page.evaluate(() => {
+    const target = window as ThemeWindow
+    target.__OPENCODE_THEME_OBSERVER__?.disconnect()
+    return target.__OPENCODE_THEME_STATES__ ?? []
+  })
+  if (states.length !== 1) throw new Error(`Desktop theme changed during startup: ${states.join(" -> ")}`)
+}
+
+function installThemeObservation() {
+  const target = window as ThemeWindow
+  const observeRoot = () => {
+    const root = document.documentElement
+    if (!root) return false
+    const state = () => {
+      const theme = root.dataset.theme
+      const scheme = root.dataset.colorScheme
+      return theme && scheme ? `${theme}:${scheme}` : undefined
+    }
+    const initial = state()
+    target.__OPENCODE_THEME_STATES__ = initial ? [initial] : []
+    target.__OPENCODE_THEME_OBSERVER__ = new MutationObserver(() => {
+      const next = state()
+      if (!next) return
+      if (target.__OPENCODE_THEME_STATES__?.at(-1) !== next) target.__OPENCODE_THEME_STATES__?.push(next)
+    })
+    target.__OPENCODE_THEME_OBSERVER__.observe(root, {
+      attributes: true,
+      attributeFilter: ["data-theme", "data-color-scheme"],
+    })
+    return true
+  }
+  if (observeRoot()) return
+  const documentObserver = new MutationObserver(() => {
+    if (!observeRoot()) return
+    documentObserver.disconnect()
+  })
+  target.__OPENCODE_THEME_OBSERVER__ = documentObserver
+  documentObserver.observe(document, { childList: true })
+}
+
+async function observeOutput(stream: NodeJS.ReadableStream, record: (line: string) => void) {
+  const decoder = new TextDecoder()
+  const output: string[] = []
+  let pending = ""
+  for await (const chunk of stream) {
+    const text = typeof chunk === "string" ? chunk : decoder.decode(chunk, { stream: true })
+    output.push(text)
+    pending += text
+    const lines = pending.split(/\r?\n/)
+    pending = lines.pop() ?? ""
+    lines.forEach(record)
+  }
+  const final = decoder.decode()
+  output.push(final)
+  pending += final
+  if (pending) record(pending)
+  return output.join("")
+}
+
+async function readService(profile: Awaited<ReturnType<typeof createColdProfile>>) {
+  const value: unknown = JSON.parse(await readFile(profile.registration, "utf8"))
+  if (!isServiceInfo(value)) throw new Error("Desktop service registration is invalid")
+  const url = new URL(value.url)
+  const port = Number(url.port)
+  if (url.hostname !== "127.0.0.1" || !Number.isInteger(port) || port <= 0)
+    throw new Error(`Desktop service used unexpected endpoint ${value.url}`)
+  if (!value.version.startsWith("2.0.0-local-"))
+    throw new Error(`Desktop service used unexpected version ${value.version}`)
+  return value
+}
+
+function isServiceInfo(value: unknown): value is ServiceInfo {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    "id" in value &&
+    typeof value.id === "string" &&
+    "version" in value &&
+    typeof value.version === "string" &&
+    "url" in value &&
+    typeof value.url === "string" &&
+    "pid" in value &&
+    typeof value.pid === "number"
+  )
+}
+
+function requireMilestones(observed: Partial<Record<Milestone, number>>) {
+  const get = (name: Milestone) => {
+    const value = observed[name]
+    if (value === undefined) throw new Error(`Desktop startup did not report milestone: ${name}`)
+    return round(value)
+  }
+  return {
+    bunRootScript: get("bunRootScript"),
+    bunDesktopScript: get("bunDesktopScript"),
+    desktopPrepared: get("desktopPrepared"),
+    mainBundleReady: get("mainBundleReady"),
+    preloadBundleReady: get("preloadBundleReady"),
+    rendererDevServerReady: get("rendererDevServerReady"),
+    electronSpawnStarted: get("electronSpawnStarted"),
+    debugEndpointReady: get("debugEndpointReady"),
+    electronStarted: get("electronStarted"),
+    serviceEnsureStarted: get("serviceEnsureStarted"),
+    serviceSpawnRequested: get("serviceSpawnRequested"),
+    serviceReady: get("serviceReady"),
+    backgroundLoadingReady: get("backgroundLoadingReady"),
+    rendererViteConnected: get("rendererViteConnected"),
+    rendererInitializationStarted: get("rendererInitializationStarted"),
+    rendererInitializationReady: get("rendererInitializationReady"),
+    windowVisible: get("windowVisible"),
+    homeReady: get("homeReady"),
+  }
+}
+
+function calculatePhases(value: Record<Milestone, number>): Record<Phase, number> {
+  return {
+    desktopPreparation: value.desktopPrepared,
+    viteMainBundle: round(value.mainBundleReady - value.desktopPrepared),
+    vitePreloadBundle: round(value.preloadBundleReady - value.mainBundleReady),
+    rendererServerStartup: round(value.rendererDevServerReady - value.preloadBundleReady),
+    electronStartup: round(value.electronStarted - value.electronSpawnStarted),
+    serviceSpawnWait: round(value.serviceSpawnRequested - value.serviceEnsureStarted),
+    serviceProcessStartup: round(value.serviceReady - value.serviceSpawnRequested),
+    rendererStartup: round(value.homeReady - value.rendererViteConnected),
+    visibleWindowToHome: round(value.homeReady - value.windowVisible),
+  }
+}
+
+function statistics(values: number[]) {
+  if (!values.length) throw new Error("Cannot summarize an empty benchmark")
+  const sorted = values.toSorted((left, right) => left - right)
+  const median = medianOf(sorted)
+  return {
+    min: round(sorted[0]),
+    median: round(median),
+    max: round(sorted.at(-1)!),
+    medianAbsoluteDeviation: round(medianOf(sorted.map((value) => Math.abs(value - median)).toSorted((a, b) => a - b))),
+  }
+}
+
+function medianOf(sorted: number[]) {
+  const middle = Math.floor(sorted.length / 2)
+  if (sorted.length % 2) return sorted[middle]
+  return (sorted[middle - 1] + sorted[middle]) / 2
+}
+
+async function stopProcessTree(child: ChildProcess, exited: Promise<number | null>) {
+  if (!child.pid) throw new Error("Desktop command has no process ID")
+  if (process.platform !== "win32") return stopProcessGroup(child.pid, exited)
+  if (child.exitCode !== null || (await exitsWithin(child, exited, 2_000))) return
+  const kill = spawn("taskkill.exe", ["/PID", String(child.pid), "/T", "/F"], {
+    stdio: "ignore",
+  })
+  await childExit(kill)
+  if (await exitsWithin(child, exited, 10_000)) return
+  if (!(await exitsWithin(child, exited, 5_000))) throw new Error(`Desktop command process ${child.pid} did not stop`)
+}
+
+async function stopProcessGroup(pid: number, exited: Promise<number | null>) {
+  await Promise.race([exited, sleep(2_000)])
+  if (!processGroupAlive(pid)) return
+  process.kill(-pid, "SIGTERM")
+  if (await processGroupStopsWithin(pid, 10_000)) return
+  process.kill(-pid, "SIGKILL")
+  if (!(await processGroupStopsWithin(pid, 5_000))) throw new Error(`Desktop command process group ${pid} did not stop`)
+}
+
+async function processGroupStopsWithin(pid: number, timeout: number) {
+  const deadline = Date.now() + timeout
+  while (Date.now() < deadline) {
+    if (!processGroupAlive(pid)) return true
+    await sleep(50)
+  }
+  return !processGroupAlive(pid)
+}
+
+function processGroupAlive(pid: number) {
+  try {
+    process.kill(-pid, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
+async function exitsWithin(child: ChildProcess, exited: Promise<number | null>, timeout: number) {
+  if (child.exitCode !== null) return true
+  const result = await Promise.race([exited.then(() => true), sleep(timeout).then(() => false)])
+  return result
+}
+
+function childExit(child: ChildProcess) {
+  return new Promise<number | null>((resolve, reject) => {
+    child.once("error", reject)
+    child.once("exit", (code) => resolve(code))
+  })
+}
+
+function sleep(milliseconds: number) {
+  return new Promise<void>((resolve) => setTimeout(resolve, milliseconds))
+}
+
+function processAlive(pid: number) {
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function stripAnsi(value: string) {
+  return value.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "")
+}
+
+function elapsed(started: number) {
+  return round(performance.now() - started)
+}
+
+function round(value: number) {
+  return Math.round(value * 100) / 100
+}

packages/app/e2e/performance/devex/playwright.config.ts

@@ -0,0 +1,17 @@
+import { defineConfig } from "@playwright/test"
+
+process.env.OPENCODE_PERFORMANCE_RUN_ID ??= `${new Date().toISOString().replace(/[:.]/g, "-")}-${process.pid}`
+
+export default defineConfig({
+  testDir: ".",
+  testMatch: "desktop-startup-benchmark.spec.ts",
+  outputDir: "../../test-results/performance-devex",
+  timeout: 15 * 60_000,
+  expect: {
+    timeout: 120_000,
+  },
+  fullyParallel: false,
+  workers: 1,
+  reporter: [["html", { outputFolder: "../../playwright-report/performance-devex", open: "never" }], ["line"]],
+  projects: [{ name: "desktop" }],
+})

packages/app/e2e/performance/playwright.config.ts

@@ -7,7 +7,7 @@ process.env.OPENCODE_PERFORMANCE_RUN_ID ??= `${new Date().toISOString().replace(
 export default {
   ...config,
   testDir: ".",
-  testIgnore: "unit/**",
+  testIgnore: ["unit/**", "devex/**"],
   outputDir: "../test-results/performance",
   fullyParallel: false,
   workers: 1,

packages/app/e2e/performance/unit/desktop-startup.test.ts

@@ -0,0 +1,88 @@
+import { describe, expect, test } from "bun:test"
+import { inlineThemePreload } from "../../../vite.js"
+import { milestoneForLine, summarizeDesktopStartup, type DesktopStartupSample } from "../devex/desktop-startup"
+
+describe("desktop startup benchmark", () => {
+  test.each(["/oc-theme-preload.js", "./oc-theme-preload.js"])("inlines %s before the renderer runs", (path) => {
+    const html = inlineThemePreload(`<script id="oc-theme-preload-script" src="${path}"></script>`)
+    expect(html).not.toContain(" src=")
+    expect(html).toContain("opencode-color-scheme")
+  })
+
+  test("recognizes startup milestones in colored output", () => {
+    const cases = [
+      ["bunRootScript", "$ bun --cwd packages/desktop dev"],
+      ["bunDesktopScript", "$ bun ./scripts/dev.ts"],
+      ["desktopPrepared", "Copied dev icons from"],
+      ["mainBundleReady", "electron main process built successfully"],
+      ["preloadBundleReady", "electron preload scripts built successfully"],
+      ["rendererDevServerReady", "dev server running for the electron renderer process at:"],
+      ["electronSpawnStarted", "starting electron app..."],
+      ["debugEndpointReady", "DevTools listening on ws://"],
+      ["electronStarted", "app starting"],
+      ["serviceEnsureStarted", "starting v2 background service"],
+      ["serviceSpawnRequested", "v2 CLI background service starting"],
+      ["serviceReady", "v2 CLI background service ready"],
+      ["backgroundLoadingReady", "loading task finished"],
+      ["rendererViteConnected", "[vite] connected."],
+      ["rendererInitializationStarted", "awaiting server ready"],
+      ["rendererInitializationReady", "server ready"],
+      ["windowVisible", "main window visible"],
+    ] as const
+    cases.forEach(([milestone, line]) => {
+      expect(milestoneForLine(`\u001b[32m${line}\u001b[39m`)).toBe(milestone)
+    })
+    expect(milestoneForLine("12:30:00.000 › v2 CLI background service ready {")).toBe("serviceReady")
+    expect(milestoneForLine("unrelated output")).toBeUndefined()
+  })
+
+  test("keeps raw samples and reports median absolute deviation", () => {
+    const samples = [24, 20, 22, 28, 26].map((commandToHomeReadyMs, index) => sample(index + 1, commandToHomeReadyMs))
+    expect(summarizeDesktopStartup(samples).commandToHomeReadyMs).toEqual({
+      min: 20,
+      median: 24,
+      max: 28,
+      medianAbsoluteDeviation: 2,
+    })
+  })
+})
+
+function sample(run: number, commandToHomeReadyMs: number): DesktopStartupSample {
+  const milestonesMs = {
+    bunRootScript: 1,
+    bunDesktopScript: 2,
+    desktopPrepared: 3,
+    mainBundleReady: 4,
+    preloadBundleReady: 5,
+    rendererDevServerReady: 6,
+    electronSpawnStarted: 7,
+    debugEndpointReady: 8,
+    electronStarted: 9,
+    serviceEnsureStarted: 10,
+    serviceSpawnRequested: 11,
+    serviceReady: 12,
+    backgroundLoadingReady: 13,
+    rendererViteConnected: 14,
+    rendererInitializationStarted: 15,
+    rendererInitializationReady: 16,
+    windowVisible: 17,
+    homeReady: commandToHomeReadyMs,
+  }
+  return {
+    run,
+    commandToHomeReadyMs,
+    milestonesMs,
+    phasesMs: {
+      desktopPreparation: 3,
+      viteMainBundle: 1,
+      vitePreloadBundle: 1,
+      rendererServerStartup: 1,
+      electronStartup: 2,
+      serviceSpawnWait: 1,
+      serviceProcessStartup: 1,
+      rendererStartup: commandToHomeReadyMs - 14,
+      visibleWindowToHome: commandToHomeReadyMs - 17,
+    },
+    service: { version: "2.0.0-local-test", url: "http://127.0.0.1:3000", pid: run },
+  }
+}

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

@@ -36,6 +36,9 @@ test("preserves the draft when a populated command menu triggers a built-in", as
   await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   const composer = page.locator('[data-component="prompt-input-v2"]')
   const input = composer.locator('[data-component="prompt-input"]')
+  await expect.poll(() => input.evaluate((element) => getComputedStyle(element, "::before").content)).toBe(
+    `"${String.fromCodePoint(0x200b)}"`,
+  )
   await expectAppVisible(composer)
 
   await input.fill("keep me")

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

@@ -19,7 +19,7 @@ test("session settings use the remote server context", async ({ page }) => {
   await configureServers(page)
 
   await page.goto(`/server/${base64Encode(serverB)}/session/${sessionB.id}`)
-  await expect(page.getByText(sessionB.title).first()).toBeVisible()
+  await expect(page.getByRole("heading", { name: sessionB.title, exact: true })).toBeVisible()
   await page.keyboard.press("Control+,")
 
   const dialog = page.locator(".settings-v2-dialog")
@@ -61,7 +61,7 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
 
   const hrefB = `/server/${base64Encode(serverB)}/session/${sessionB.id}`
   await page.goto(`/server/${base64Encode(serverA)}/session/${sessionA.id}`)
-  await expect(page.getByText(sessionA.title).first()).toBeVisible()
+  await expect(page.getByRole("heading", { name: sessionA.title, exact: true })).toBeVisible()
   await page.keyboard.press("Control+,")
   const autoAccept = page.locator(".settings-v2-dialog").locator('[data-action="settings-auto-accept-permissions"]')
   await autoAccept.locator('[data-slot="switch-control"]').click()
@@ -78,7 +78,7 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
 
   await page.locator(`[data-titlebar-tab-slot]:has(a[href="${hrefB}"])`).click()
   await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
-  await expect(page.getByText(sessionB.title).first()).toBeVisible()
+  await expect(page.getByRole("heading", { name: sessionB.title, exact: true })).toBeVisible()
   await transport.waitForConnection()
 
   await transport.send({
@@ -208,7 +208,7 @@ async function mockServers(page: Page, permissionRequests: string[], permissionR
       return json(route, [
         {
           id: remote ? sessionB.projectID : "project-server-a",
-          worktree: directory,
+          canonical: directory,
           vcs: "git",
           time: { created: 1, updated: 1 },
           sandboxes: [],
@@ -216,7 +216,7 @@ async function mockServers(page: Page, permissionRequests: string[], permissionR
       ])
     }
     if (url.pathname === "/api/project/current")
-      return json(route, { id: remote ? sessionB.projectID : "project-server-a", directory })
+      return json(route, { id: remote ? sessionB.projectID : "project-server-a", directory, canonical: directory })
     if (url.pathname === "/api/session")
       return json(route, { data: sessions.map((session) => currentSession(session)), cursor: {} })
     if (url.pathname === "/api/session/active") return json(route, { data: {} })
@@ -237,7 +237,7 @@ function session(id: string, directory: string, title: string) {
     id,
     slug: id,
     projectID: `project-${id}`,
-    directory,
+    location: { directory },
     title,
     version: "dev",
     time: { created: 1, updated: 1 },

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

@@ -76,7 +76,7 @@ test("keeps the review tree and terminal sized when both panels are open", async
       }),
     })
   })
-  await page.route("**/pty*", (route) =>
+  await page.route(/\/api\/pty(?:\?.*)?$/, (route) =>
     route.fulfill({
       status: 200,
       contentType: "application/json",

packages/app/e2e/reproduction/timeline-suspense/main.tsx

@@ -1,7 +1,7 @@
 import { createResource, createSignal, For, onMount, Suspense } from "solid-js"
 import { render } from "solid-js/web"
 import { createVirtualizer, observeElementOffset, observeElementRect } from "@tanstack/solid-virtual"
-import { observeElementOffsetReconnectAware } from "../../../src/pages/session/timeline/observe-element-offset"
+import { observeElementOffsetReconnectAware } from "../../../src/session/timeline/observe-element-offset"
 
 const rowCount = 2_000
 const rowHeight = 40

packages/app/package.json

@@ -5,6 +5,7 @@
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
+    "./desktop": "./src/desktop.ts",
     "./desktop-menu": "./src/desktop-menu.ts",
     "./i18n/desktop-native": "./src/i18n/desktop-native.ts",
     "./updater": "./src/updater.ts",
@@ -28,14 +29,15 @@
     "test:e2e:ui": "playwright test --ui",
     "test:e2e:report": "playwright show-report e2e/playwright-report",
     "test:stability": "bun test ./e2e/performance/unit/visual-stability.test.ts && playwright test --config e2e/performance/timeline-stability/playwright.config.ts",
-    "test:bench": "bun test ./e2e/performance/unit && playwright test --config e2e/performance/playwright.config.ts"
+    "test:bench": "bun test ./e2e/performance/unit && playwright test --config e2e/performance/playwright.config.ts",
+    "test:bench:devex": "bun test ./e2e/performance/unit/desktop-startup.test.ts && playwright test --config e2e/performance/devex/playwright.config.ts"
   },
   "license": "MIT",
   "devDependencies": {
     "@happy-dom/global-registrator": "20.0.11",
     "@playwright/test": "catalog:",
     "@sentry/vite-plugin": "catalog:",
-    "@tailwindcss/vite": "catalog:",
+    "@tailwindcss/vite": "4.3.3",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "catalog:",
     "@types/luxon": "catalog:",
@@ -44,9 +46,9 @@
     "happy-dom": "20.11.1",
     "tw-animate-css": "1.4.0",
     "typescript": "catalog:",
-    "vite": "catalog:",
+    "vite": "8.2.1",
     "vite-plugin-icons-spritesheet": "3.0.1",
-    "vite-plugin-solid": "catalog:"
+    "vite-plugin-solid": "2.11.14"
   },
   "dependencies": {
     "@corvu/drawer": "catalog:",
@@ -85,6 +87,6 @@
     "solid-js": "catalog:",
     "solid-list": "catalog:",
     "solid-presence": "0.2.0",
-    "tailwindcss": "catalog:"
+    "tailwindcss": "4.3.3"
   }
 }

packages/app/src/app.tsx

@@ -1,12 +1,10 @@
 import "@/index.css"
-import * as Sentry from "@sentry/solid"
 import { DialogProvider } from "@opencode-ai/ui/context/dialog"
 import { FileComponentProvider } from "@opencode-ai/ui/context/file"
-import { File } from "@opencode-ai/session-ui/file"
 import { Font } from "@opencode-ai/ui/font"
 import { ThemeProvider } from "@opencode-ai/ui/theme/context"
 import { MetaProvider } from "@solidjs/meta"
-import { type BaseRouterProps, Navigate, Route, Router, useParams, useSearchParams } from "@solidjs/router"
+import { type BaseRouterProps, Route, Router, useParams } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import {
   type Component,
@@ -20,30 +18,37 @@ import {
 } from "solid-js"
 import { Dynamic } from "solid-js/web"
 import { CommandProvider, useCommand, type CommandOption } from "@/context/command"
-import { CommentsProvider } from "@/context/comments"
-import { FileProvider } from "@/context/file"
 import { GlobalProvider, useGlobal } from "@/context/global"
 import { HighlightsProvider } from "@/context/highlights"
 import { LanguageProvider, UiI18nBridge, type Locale, useLanguage } from "@/context/language"
 import { LayoutProvider } from "@/context/layout"
-import { ModelsProvider } from "@/context/models"
 import { usePlatform } from "@/context/platform"
-import { PromptProvider } from "@/context/prompt"
 import { ServerConnection, ServersProvider } from "@/context/servers"
 import { SettingsProvider } from "@/context/settings"
-import { TabsProvider, useTabs, type DraftTab } from "@/context/tabs"
-import { LocationProvider } from "@/context/location"
+import { TabsProvider } from "@/context/tabs"
 import { WslServersProvider } from "@/wsl/context"
-import { SessionUIProvider } from "@/pages/directory-layout"
 import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
 import { requireServerKey } from "./utils/session-route"
 
-import { TargetSessionRouteContent } from "@/pages/session"
 import { Home } from "@/pages/home"
 import { ServerProvider } from "./context/server"
 
-const NewSession = lazy(() => import("@/pages/new-session"))
+const File = lazy(() => import("@opencode-ai/session-ui/file").then((module) => ({ default: module.File })))
+const loadDraftRoute = () => Promise.all([import("@/pages/draft-route"), File.preload()]).then(([module]) => module)
+const loadSessionRoute = () => Promise.all([import("@/session/route"), File.preload()]).then(([module]) => module)
+const DraftRoute = lazy(() => loadDraftRoute().then((module) => ({ default: module.DraftRoute })))
+const TargetSessionRouteContent = lazy(() =>
+  loadSessionRoute().then((module) => ({ default: module.TargetSessionRouteContent })),
+)
+
+export function preloadRoute(url: string) {
+  const pathname = url.split(/[?#]/, 1)[0]
+  if (pathname === "/new-session") return DraftRoute.preload().then(() => undefined)
+  if (/^\/server\/[^/]+\/session\/[^/]+$/.test(pathname))
+    return TargetSessionRouteContent.preload().then(() => undefined)
+  return Promise.resolve()
+}
 
 function TargetServerRoute(props: ParentProps) {
   const params = useParams<{ serverKey: string }>()
@@ -60,45 +65,6 @@ function TargetServerRoute(props: ParentProps) {
   )
 }
 
-function DraftRoute() {
-  const [search] = useSearchParams<{ draftId?: string }>()
-  const tabs = useTabs()
-  return (
-    <Show
-      when={tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === search.draftId)}
-      keyed
-      fallback={tabs.ready() && <Navigate href="/" />}
-    >
-      {(draft) => <ResolvedDraftRoute draft={draft} />}
-    </Show>
-  )
-}
-
-function ResolvedDraftRoute(props: { draft: DraftTab }) {
-  const global = useGlobal()
-  const conn = createMemo(() => global.servers.list().find((item) => ServerConnection.key(item) === props.draft.server))
-
-  return (
-    <Show when={`${props.draft.server}\0${props.draft.directory}`} keyed>
-      <Show when={conn()} keyed>
-        {(conn) => (
-          <ServerProvider conn={conn}>
-            <ModelsProvider directory={props.draft.directory}>
-              <LocationProvider directory={props.draft.directory}>
-                <SessionUIProvider directory={props.draft.directory} server={props.draft.server}>
-                  <DraftProviders>
-                    <NewSession draftId={props.draft.draftID} />
-                  </DraftProviders>
-                </SessionUIProvider>
-              </LocationProvider>
-            </ModelsProvider>
-          </ServerProvider>
-        )}
-      </Show>
-    </Show>
-  )
-}
-
 declare global {
   interface Window {
     __OPENCODE__?: {
@@ -167,22 +133,11 @@ function AppLayout(props: ParentProps) {
   )
 }
 
-// The draft page only renders the prompt composer, so it drops TerminalProvider.
-// FileProvider and CommentsProvider stay because PromptInput uses file search and comment context.
-function DraftProviders(props: ParentProps) {
-  return (
-    <FileProvider>
-      <PromptProvider>
-        <CommentsProvider>{props.children}</CommentsProvider>
-      </PromptProvider>
-    </FileProvider>
-  )
-}
-
 export function AppBaseProviders(
   props: ParentProps<{
     locale?: Locale
     onNativeTranslations?: Parameters<typeof LanguageProvider>[0]["onNativeTranslations"]
+    onThemeApplied?: () => void
   }>,
 ) {
   return (
@@ -191,13 +146,14 @@ export function AppBaseProviders(
       <ThemeProvider
         onThemeApplied={(_, mode, scheme) => {
           void window.api?.setTitlebar?.({ mode, scheme })
+          props.onThemeApplied?.()
         }}
       >
         <LanguageProvider locale={props.locale} onNativeTranslations={props.onNativeTranslations}>
           <UiI18nBridge>
             <ErrorBoundary
               fallback={(error) => {
-                Sentry.captureException(error)
+                void import("@sentry/solid").then(({ captureException }) => captureException(error))
                 return <ErrorPage error={error} />
               }}
             >

packages/app/src/components/command-palette.ts

@@ -12,8 +12,8 @@ import { ServerConnection } from "@/context/servers"
 import { useServerSDK } from "@/context/server-sdk"
 import { useTabs } from "@/context/tabs"
 import { displayName, projectForSession } from "@/pages/layout/helpers"
-import { createSessionTabs } from "@/pages/session/helpers"
-import { useSessionLayout } from "@/pages/session/session-layout"
+import { createSessionTabs } from "@/session/helpers"
+import { useSessionLayout } from "@/session/session-layout"
 import { useServer } from "@/context/server"
 
 export type CommandPaletteEntry = {

packages/app/src/components/prompt-input-v2.tsx

@@ -24,7 +24,7 @@ import { type ImageAttachmentPart, usePrompt } from "@/context/prompt"
 import { usePlatform } from "@/context/platform"
 import { useWorkspaceLocation } from "@/context/location"
 import { useData } from "@/context/server"
-import { createSessionTabs } from "@/pages/session/helpers"
+import { createSessionTabs } from "@/session/helpers"
 import { showToast } from "@/utils/toast"
 import { PromptInputV2, type PromptInputV2Suggestion } from "@opencode-ai/session-ui/v2/prompt-input"
 import {

packages/app/src/components/session/index.ts

@@ -1,5 +0,0 @@
-export { SessionHeader } from "./session-header"
-export { SessionContextTab } from "./session-context-tab"
-export { FileVisual } from "./session-sortable-tab"
-export { SortableTabV2 } from "./session-sortable-tab-v2"
-export { NewSessionView } from "./session-new-view"

packages/app/src/components/terminal.tsx

@@ -15,9 +15,7 @@ import { useServerSDK } from "@/context/server-sdk"
 import { terminalFontFamily, useSettings } from "@/context/settings"
 import type { LocalPTY } from "@/context/terminal"
 import { disposeIfDisposable, getHoveredLinkText, setOptionIfSupported } from "@/utils/runtime-adapters"
-import { terminalConnectToken } from "@/utils/terminal-connect-token"
 import { terminalWriter } from "@/utils/terminal-writer"
-import { terminalWebSocketURL } from "@/utils/terminal-websocket-url"
 
 const TOGGLE_TERMINAL_ID = "terminal.toggle"
 const DEFAULT_TOGGLE_TERMINAL_KEYBIND = "ctrl+`"
@@ -179,7 +177,6 @@ export const Terminal = (props: TerminalProps) => {
   const language = useLanguage()
   // Intentional mount-time capture: the imperative xterm/WebSocket lifecycle needs stable values, and Terminal remounts when the SDK scope changes.
   const directory = sdk().directory
-  const url = serverSDK.url
   let container!: HTMLDivElement
   const [local, others] = splitProps(props, [
     "pty",
@@ -531,14 +528,6 @@ export const Terminal = (props: TerminalProps) => {
           })
       }
 
-      const connectToken = async () => {
-        const result = await terminalConnectToken({ url, id, directory })
-        if (result.ticket) return result.ticket
-        if (result.status === 404 || result.status === 405) return
-        if (result.status === 403) throw new Error(language.t("terminal.connectTicket.csrfError"))
-        throw new Error(language.t("terminal.connectTicket.statusError", { status: result.status }))
-      }
-
       const retry = (err: unknown) => {
         if (disposed) return
         if (reconn !== undefined) return
@@ -562,23 +551,21 @@ export const Terminal = (props: TerminalProps) => {
         if (disposed) return
         drop?.()
 
-        const ticket = await connectToken().catch((err) => {
-          fail(err)
-          return undefined
-        })
-        if (once.value) return
-        if (disposed) return
-
-        const socket = new WebSocket(
-          terminalWebSocketURL({
-            url,
-            id,
-            directory,
+        const socket = await serverSDK.pty
+          .connect({
+            ptyID: id,
+            location: { directory },
             cursor: seek,
-            ticket,
-          }),
-        )
-        socket.binaryType = "arraybuffer"
+          })
+          .catch((err) => {
+            fail(err)
+            return undefined
+          })
+        if (!socket || once.value) return
+        if (disposed) {
+          socket.close(1000)
+          return
+        }
         ws = socket
 
         const handleOpen = () => {

packages/app/src/components/titlebar.tsx

@@ -241,7 +241,11 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
                     sessionId: activeSession.id,
                   }
                   const model = tabs.stateValue<PromptSession>(sessionTab, "prompt")?.model.current()
-                  tabs.newDraft({ server: sessionTab.server, directory: activeSession.location.directory }, "", model)
+                  void tabs.newDraft(
+                    { server: sessionTab.server, directory: activeSession.location.directory },
+                    "",
+                    model,
+                  )
                   return
                 }
                 case "draft": {
@@ -249,7 +253,7 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
                   if (activeTab?.type !== "draft") return
 
                   const model = tabs.stateValue<PromptSession>(activeTab, "prompt")?.model.current()
-                  tabs.newDraft({ server: activeTab.server, directory: activeTab.directory }, "", model)
+                  void tabs.newDraft({ server: activeTab.server, directory: activeTab.directory }, "", model)
                   return
                 }
                 case "home": {
@@ -263,7 +267,7 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
                     projects?.list().find((item) => item.worktree === projects.last()) ??
                     projects?.list()[0]
                   if (conn && project) {
-                    tabs.newDraft({ server: ServerConnection.key(conn), directory: project.worktree }, "")
+                    void tabs.newDraft({ server: ServerConnection.key(conn), directory: project.worktree }, "")
                     return
                   }
                 }
@@ -467,11 +471,14 @@ function ChannelIndicator(props: { debugTools?: { visible: boolean; toggle: () =
     )
   }
 
+  const label = channel && ["local", "beta", "dev"].includes(channel) ? channel.toUpperCase() : undefined
   return (
-    <Show when={["local", "beta", "dev"].includes(channel)}>
-      <div class="bg-icon-interactive-base text-[#FFF] font-medium px-2 rounded-sm uppercase font-mono">
-        {channel.toUpperCase()}
-      </div>
+    <Show when={label}>
+      {(value) => (
+        <div class="bg-icon-interactive-base text-[#FFF] font-medium px-2 rounded-sm uppercase font-mono">
+          {value()}
+        </div>
+      )}
     </Show>
   )
 }

packages/app/src/context/global-sync/home-session-index.test.ts

@@ -20,7 +20,7 @@ const session = (id: string, input: Partial<SessionInfo> = {}) =>
 describe("Home V2 session index", () => {
   test("loads all pages", async () => {
     const first = Array.from({ length: HOME_V2_SESSION_PAGE_LIMIT }, (_, index) => session(`session-${index}`))
-    const calls: Array<{ cursor?: string }> = []
+    const calls: Array<{ cursor?: string; parentID: null }> = []
     const result = await loadHomeSessionIndex(async (input) => {
       calls.push(input)
       if (!input.cursor) return { data: first, cursor: { next: "next" } }
@@ -29,6 +29,7 @@ describe("Home V2 session index", () => {
 
     expect(result).toHaveLength(HOME_V2_SESSION_PAGE_LIMIT + 1)
     expect(calls.map((call) => call.cursor)).toEqual([undefined, "next"])
+    expect(calls.every((call) => call.parentID === null)).toBe(true)
   })
 
   test("keeps only visible roots", () => {

packages/app/src/context/global-sync/home-session-index.ts

@@ -6,7 +6,12 @@ export const HOME_V2_SESSION_PAGE_LIMIT = 5_000
 
 export async function loadHomeSessionIndex(
   list: (
-    input: { limit: number; order: "desc"; cursor?: string },
+    input: {
+      limit: number
+      order: "desc"
+      parentID: null
+      cursor?: string
+    },
     options: { signal?: AbortSignal },
   ) => Promise<SessionsResponse>,
   signal?: AbortSignal,
@@ -19,6 +24,7 @@ export async function loadHomeSessionIndex(
       {
         limit: HOME_V2_SESSION_PAGE_LIMIT,
         order: "desc",
+        parentID: null,
         ...(cursor ? { cursor } : {}),
       },
       { signal },
@@ -29,8 +35,7 @@ export async function loadHomeSessionIndex(
   }
 }
 
-// The V2 API cannot yet filter roots, archives, or several directories, so Home
-// seeds createData from a full scan and derives its visible index there.
+// Keep this filter for locally known sessions merged into the fetched index.
 export function parseHomeSessionIndex(sessions: SessionInfo[]) {
   return sessions.filter((session) => !session.parentID && typeof session.time.archived !== "number")
 }

packages/app/src/context/server-sdk.tsx

@@ -1,5 +1,5 @@
 import type { OpenCodeEvent } from "@opencode-ai/client/promise"
-import { createClientConnection, type ClientConnectionStatus } from "@opencode-ai/client/solid"
+import { createClientConnection, createPtyClient, type ClientConnectionStatus } from "@opencode-ai/client/solid"
 import { createGlobalEmitter } from "@solid-primitives/event-bus"
 import { type Accessor, onCleanup } from "solid-js"
 import { createApiForServer, type ServerApi } from "@/utils/server"
@@ -61,6 +61,7 @@ type ServerSDKBase = {
   scope: ServerScope
   url: string
   api: ServerApi
+  pty: ReturnType<typeof createPtyClient>
   connection: {
     status: Accessor<ServerConnectionStatus>
     attempt: Accessor<number>
@@ -72,6 +73,7 @@ type ServerSDKBase = {
 function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerScope): ServerSDKBase {
   const platform = usePlatform()
   const api = createApiForServer({ server: server.http, fetch: platform.fetch })
+  const pty = createPtyClient(api, { url: server.http.url })
   const events = createOpenCodeEventSource()
 
   const connection = createClientConnection(api, {
@@ -93,6 +95,7 @@ function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerS
     scope,
     url: server.http.url,
     api,
+    pty,
     connection,
     event: events.event,
   }

packages/app/src/desktop.ts

@@ -0,0 +1,9 @@
+export { AppBaseProviders, AppInterface, preloadRoute } from "./app"
+export { ACCEPTED_FILE_EXTENSIONS } from "./constants/file-picker"
+export { useCommand } from "./context/command"
+export { loadLocaleDict, normalizeLocale, type Locale, useLanguage } from "./context/language"
+export { type Platform, PlatformProvider } from "./context/platform"
+export { ServerConnection, useServers } from "./context/servers"
+export { useTabs } from "./context/tabs"
+export { createDraftStore } from "./utils/draft-store"
+export { useWslServers } from "./wsl/context"

packages/app/src/index.ts

@@ -1,4 +1,4 @@
-export { AppBaseProviders, AppInterface } from "./app"
+export { AppBaseProviders, AppInterface, preloadRoute } from "./app"
 export { useLayout } from "./context/layout"
 export { useServerSDK } from "./context/server-sdk"
 export { useServers as useServers } from "./context/servers"

packages/app/src/pages/draft-route.tsx

@@ -0,0 +1,64 @@
+import { Navigate, useSearchParams } from "@solidjs/router"
+import { createMemo, Show, type ParentProps } from "solid-js"
+import { CommentsProvider } from "@/context/comments"
+import { FileProvider } from "@/context/file"
+import { useGlobal } from "@/context/global"
+import { LocationProvider } from "@/context/location"
+import { ModelsProvider } from "@/context/models"
+import { PromptProvider } from "@/context/prompt"
+import { ServerProvider } from "@/context/server"
+import { ServerConnection } from "@/context/servers"
+import { useTabs, type DraftTab } from "@/context/tabs"
+import { SessionUIProvider } from "@/pages/directory-layout"
+import NewSession from "@/pages/new-session"
+
+export function DraftRoute() {
+  const [search] = useSearchParams<{ draftId?: string }>()
+  const tabs = useTabs()
+  return (
+    <Show
+      when={tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === search.draftId)}
+      keyed
+      fallback={tabs.ready() && <Navigate href="/" />}
+    >
+      {(draft) => <ResolvedDraftRoute draft={draft} />}
+    </Show>
+  )
+}
+
+function ResolvedDraftRoute(props: { draft: DraftTab }) {
+  const global = useGlobal()
+  const conn = createMemo(() => global.servers.list().find((item) => ServerConnection.key(item) === props.draft.server))
+
+  return (
+    <Show when={`${props.draft.server}\0${props.draft.directory}`} keyed>
+      <Show when={conn()} keyed>
+        {(conn) => (
+          <ServerProvider conn={conn}>
+            <ModelsProvider directory={props.draft.directory}>
+              <LocationProvider directory={props.draft.directory}>
+                <SessionUIProvider directory={props.draft.directory} server={props.draft.server}>
+                  <DraftProviders>
+                    <NewSession draftId={props.draft.draftID} />
+                  </DraftProviders>
+                </SessionUIProvider>
+              </LocationProvider>
+            </ModelsProvider>
+          </ServerProvider>
+        )}
+      </Show>
+    </Show>
+  )
+}
+
+// The draft page only renders the prompt composer, so it drops TerminalProvider.
+// FileProvider and CommentsProvider stay because PromptInput uses file search and comment context.
+function DraftProviders(props: ParentProps) {
+  return (
+    <FileProvider>
+      <PromptProvider>
+        <CommentsProvider>{props.children}</CommentsProvider>
+      </PromptProvider>
+    </FileProvider>
+  )
+}

packages/app/src/pages/home/home-projects-controller.tsx

@@ -1,10 +1,8 @@
 import { useDirectoryPicker } from "@/components/directory-picker"
 import { useServerActionsController } from "@/components/server/server-management-controller"
 import { useSettingsCommand } from "@/components/settings-dialog"
-import { DialogServerV2 } from "@/components/settings-v2/dialog-server-v2"
 import { type LocalProject } from "@/context/layout"
 import { useLanguage } from "@/context/language"
-import { useNotification } from "@/context/notification"
 import { usePlatform } from "@/context/platform"
 import { ServerConnection } from "@/context/servers"
 import { closeHomeProject, errorMessage, homeProjectDirectories } from "@/pages/layout/helpers"
@@ -63,7 +61,11 @@ export function createHomeProjectsController(home: HomeController) {
         serverManagement.defaults.set(conn ? ServerConnection.key(conn) : null),
       canRemove: (conn: ServerConnection.Any) => serverManagement.connection.canRemove(ServerConnection.key(conn)),
       remove: (conn: ServerConnection.Any) => serverManagement.connection.remove(ServerConnection.key(conn)),
-      edit: (conn: ServerConnection.Http) => dialog.show(() => <DialogServerV2 mode="edit" server={conn} />),
+      edit: (conn: ServerConnection.Http) => {
+        void import("@/components/settings-v2/dialog-server-v2").then(({ DialogServerV2 }) => {
+          void dialog.show(() => <DialogServerV2 mode="edit" server={conn} />)
+        })
+      },
       focus: home.selection.focusServer,
     },
     project: {

packages/app/src/pages/home/home-session-records.ts

@@ -0,0 +1,38 @@
+import type { SessionInfo } from "@opencode-ai/client/promise"
+import type { LocalProject } from "@/context/layout"
+import { compareSessionTime, displayName } from "@/pages/layout/helpers"
+import { pathKey } from "@/utils/path-key"
+
+export type HomeSessionRecord = {
+  session: SessionInfo
+  project: LocalProject
+  projectName: string
+}
+
+export function buildHomeSessionRecords(input: {
+  sessions: () => SessionInfo[]
+  projectDirectories: () => string[] | undefined
+  projects: () => LocalProject[]
+}) {
+  const selected = input.projectDirectories()
+  const directories = selected ? new Set(selected.map(pathKey)) : undefined
+  const sessions = directories
+    ? input.sessions().filter((session) => directories.has(pathKey(session.location.directory)))
+    : input.sessions()
+  return [...new Map(sessions.map((session) => [session.id, session] as const)).values()]
+    .sort(compareSessionTime)
+    .map((session) => {
+      const directory = pathKey(session.location.directory)
+      const project = input
+        .projects()
+        .find(
+          (item) =>
+            pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
+        ) ?? {
+          id: session.projectID,
+          worktree: session.location.directory,
+          expanded: false,
+        }
+      return { session, project, projectName: displayName(project) }
+    })
+}

packages/app/src/pages/home/home-sessions-controller.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, test } from "bun:test"
+import type { SessionInfo } from "@opencode-ai/client/promise"
+import type { LocalProject } from "@/context/layout"
+import { buildHomeSessionRecords } from "./home-session-records"
+
+const session = (id: string, directory: string, projectID: string) =>
+  ({
+    id,
+    projectID,
+    title: id,
+    location: { directory },
+    time: { created: 1, updated: 1 },
+  }) as SessionInfo
+
+describe("buildHomeSessionRecords", () => {
+  const opened = { id: "project-a", worktree: "/repo/a", expanded: true } as LocalProject
+  const sessions = [session("a", "/repo/a", "project-a"), session("b", "/repo/b", "project-b")]
+
+  test("includes sessions outside added projects when unfiltered", () => {
+    const records = buildHomeSessionRecords({
+      sessions: () => sessions,
+      projectDirectories: () => undefined,
+      projects: () => [opened],
+    })
+
+    expect(records.map((record) => record.session.id)).toEqual(["a", "b"])
+    expect(records[1]?.project).toMatchObject({ id: "project-b", worktree: "/repo/b", expanded: false })
+  })
+
+  test("filters sessions when a project is selected", () => {
+    const records = buildHomeSessionRecords({
+      sessions: () => sessions,
+      projectDirectories: () => ["/repo/a"],
+      projects: () => [opened],
+    })
+
+    expect(records.map((record) => record.session.id)).toEqual(["a"])
+  })
+})

packages/app/src/pages/home/home-sessions-controller.tsx

@@ -13,20 +13,19 @@ import type { LocalProject } from "@/context/layout"
 import { useLanguage } from "@/context/language"
 import { ServerConnection } from "@/context/servers"
 import { sessionHasOpenTab, useTabs } from "@/context/tabs"
-import { compareSessionTime, displayName, errorMessage, projectForSession } from "@/pages/layout/helpers"
+import { errorMessage } from "@/pages/layout/helpers"
 import { useSessionTabAvatarState } from "@/pages/layout/project-avatar-state"
 import { pathKey } from "@/utils/path-key"
 import { showToast } from "@/utils/toast"
 import { archiveHomeSession } from "../home-session-archive"
 import type { HomeController } from "./home-controller"
+import { buildHomeSessionRecords, type HomeSessionRecord } from "./home-session-records"
+
+export type { HomeSessionRecord } from "./home-session-records"
 
 const HOME_SESSION_LIMIT = 64
-export type HomeSessionRecord = {
-  session: SessionInfo
-  project: LocalProject
-  projectName: string
-}
-
+// Keep the large immutable result opaque so Solid Query does not recursively unwrap every session on mount.
+const selectSessions = (sessions: SessionInfo[]) => () => sessions
 export type HomeSessionGroup = {
   id: "today" | "yesterday" | "older"
   title: string
@@ -41,13 +40,11 @@ export function createHomeSessionsController(home: HomeController) {
   const dialog = useDialog()
   const language = useLanguage()
   const projectDirectories = createMemo(() => {
+    const selected = home.selection.value().directory
+    if (!selected) return
     const project = home.project.selected()
-    if (!project) return home.project.list().flatMap(directories)
-    return directories(project)
+    return project ? directories(project) : [selected]
   })
-  const projectByID = createMemo(
-    () => new Map(home.project.list().flatMap((project) => (project.id ? [[project.id, project] as const] : []))),
-  )
   const sessionLoad = useQuery(() => {
     const ctx = home.server.focusedContext()
     const conn = home.server.focused()
@@ -61,13 +58,14 @@ export function createHomeSessionsController(home: HomeController) {
       staleTime: 30_000,
       refetchOnMount: true,
       refetchOnReconnect: true,
+      select: selectSessions,
     }
   })
   const indexedSessions = createMemo(() => {
     const ctx = home.server.focusedContext()
     if (!ctx) return []
     return retainHomeSessions(
-      mergeHomeSessionIndex(sessionLoad.data ?? [], ctx.data.session.list()),
+      mergeHomeSessionIndex(sessionLoad.data?.() ?? [], ctx.data.session.list()),
       HOME_SESSION_LIMIT,
       Date.now(),
     )
@@ -77,7 +75,6 @@ export function createHomeSessionsController(home: HomeController) {
       sessions: indexedSessions,
       projectDirectories,
       projects: home.project.list,
-      projectByID,
     }),
   )
   const records = createMemo(() => allRecords().slice(0, HOME_SESSION_LIMIT))
@@ -154,7 +151,7 @@ export function createHomeSessionsController(home: HomeController) {
               (item) =>
                 pathKey(item.worktree) === directoryKey ||
                 item.sandboxes?.some((sandbox) => pathKey(sandbox) === directoryKey),
-            ) ?? projectForSession(session, home.project.list(), projectByID())
+            )
         const conn = home.server.focused()
         if (!conn) return
         const connKey = ServerConnection.key(conn)
@@ -202,30 +199,6 @@ function directories(project: LocalProject) {
   return [project.worktree, ...(project.sandboxes ?? [])]
 }
 
-function buildHomeSessionRecords(input: {
-  sessions: () => SessionInfo[]
-  projectDirectories: () => string[]
-  projects: () => LocalProject[]
-  projectByID: () => Map<string, LocalProject>
-}) {
-  const directories = new Set(input.projectDirectories().map(pathKey))
-  const sessions = input.sessions().filter((session) => directories.has(pathKey(session.location.directory)))
-  return [...new Map(sessions.map((session) => [session.id, session] as const)).values()]
-    .sort(compareSessionTime)
-    .flatMap((session) => {
-      const directory = pathKey(session.location.directory)
-      const project =
-        input
-          .projects()
-          .find(
-            (item) =>
-              pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
-          ) ?? projectForSession(session, input.projects(), input.projectByID())
-      if (!project) return []
-      return { session, project, projectName: displayName(project) }
-    })
-}
-
 export function homeSessionSearchKey(record: HomeSessionRecord) {
   return `${pathKey(record.session.location.directory)}:${record.session.id}`
 }
@@ -266,6 +239,7 @@ export function HomeSessionStatusController(props: {
     () => props.server,
     () => props.record.session.location.directory,
     () => props.record.session.id,
+    () => true,
   )
   return props.render({
     unread: avatar.unread,

packages/app/src/pages/layout.tsx

@@ -1,13 +1,14 @@
-import { Show, Suspense, type ParentProps } from "solid-js"
+import { lazy, Show, Suspense, type ParentProps } from "solid-js"
 import { createStore } from "solid-js/store"
-import { DebugBar } from "@/components/debug-bar"
 import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { usePlatform } from "@/context/platform"
 import { ToastRegion } from "@/utils/toast"
 
+const DebugBar = lazy(() => import("@/components/debug-bar").then((module) => ({ default: module.DebugBar })))
+
 export default function Layout(props: ParentProps) {
   const platform = usePlatform()
-  const [state, setState] = createStore({ debugTools: true })
+  const [state, setState] = createStore({ debugTools: false })
 
   const update: TitlebarUpdate = {
     get version() {
@@ -41,7 +42,9 @@ export default function Layout(props: ParentProps) {
         <Suspense>{props.children}</Suspense>
       </main>
       <Show when={import.meta.env.DEV && state.debugTools}>
-        <DebugBar inline />
+        <Suspense>
+          <DebugBar inline />
+        </Suspense>
       </Show>
       <ToastRegion />
     </div>

packages/app/src/pages/layout/project-avatar-state.ts

@@ -1,33 +1,39 @@
 import { createMemo, type Accessor } from "solid-js"
 import { useGlobal, useServerCtx } from "@/context/global"
-import { sessionPermissionRequest, sessionQuestionForm } from "@/pages/session/composer/session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 import { ServerConnection } from "@/context/servers"
 
 export function useSessionTabAvatarState(
   server: Accessor<ServerConnection.Key>,
   directory: Accessor<string>,
   sessionId: Accessor<string>,
+  root?: Accessor<boolean>,
 ) {
   const global = useGlobal()
   const connection = createMemo(() => global.servers.list().find((item) => ServerConnection.key(item) === server()))
   const serverCtx = useServerCtx(connection)
+  const sessions = createMemo(() => {
+    const data = serverCtx()?.data
+    if (!data) return []
+    if (!root?.()) return data.session.list()
+    const id = sessionId()
+    return [...new Set([id, ...data.session.family(id)])].flatMap((id) => {
+      const info = data.session.get(id)
+      return info ? [info] : []
+    })
+  })
   const hasPermissions = createMemo(() => {
     const ctx = serverCtx()
     if (!ctx) return false
     const permission = ctx.permission
-    return !!sessionPermissionRequest(
-      ctx.data.session.list(),
-      ctx.data.session.permission.list,
-      sessionId(),
-      (item) => {
-        return !permission.autoResponds(item, directory())
-      },
-    )
+    return !!sessionPermissionRequest(sessions(), ctx.data.session.permission.list, sessionId(), (item) => {
+      return !permission.autoResponds(item, directory())
+    })
   })
   const hasQuestions = createMemo(() => {
     const data = serverCtx()?.data
     if (!data) return false
-    return !!sessionQuestionForm(data.session.list(), data.session.form.list, sessionId())
+    return !!sessionQuestionForm(sessions(), data.session.form.list, sessionId())
   })
   const needsAttention = createMemo(() => hasPermissions() || hasQuestions())
   const unread = createMemo(

packages/app/src/pages/new-session/new-session-draft-controller.ts

@@ -4,10 +4,10 @@ import { usePromptInputV2Controller } from "@/components/prompt-input-v2"
 import { useComments } from "@/context/comments"
 import { useLocal } from "@/context/local"
 import { usePrompt } from "@/context/prompt"
-import { createPromptInputController, createPromptProjectControls } from "@/pages/session/composer"
-import { createPromptModelSelection } from "@/pages/session/composer/prompt-model-selection"
-import { useSessionKey } from "@/pages/session/session-layout"
-import { useComposerCommands } from "@/pages/session/use-composer-commands"
+import { createPromptInputController, createPromptProjectControls } from "@/session/composer"
+import { createPromptModelSelection } from "@/session/composer/prompt-model-selection"
+import { useSessionKey } from "@/session/session-layout"
+import { useComposerCommands } from "@/session/commands/use-composer-commands"
 
 export function createNewSessionDraftController(props: {
   worktree: () => string

packages/app/src/pages/new-session/new-session-view.tsx

@@ -17,7 +17,7 @@ import { StatusPopoverV2 } from "@/components/status-popover"
 import { useLanguage } from "@/context/language"
 import { useWorkspaceLocation } from "@/context/location"
 import { useProviders } from "@/hooks/use-providers"
-import { NEW_SESSION_CONTENT_WIDTH } from "@/pages/session/new-session-layout"
+import { NEW_SESSION_CONTENT_WIDTH } from "@/pages/new-session/new-session-layout"
 import { Persist, persisted } from "@/utils/persist"
 import type { NewSessionDraftController } from "./new-session-draft-controller"
 import type { NewSessionWorkspaceController } from "./new-session-workspace-controller"

packages/app/src/pages/new-session/new-session-workspace-controller.test.ts

@@ -39,14 +39,20 @@ describe("new session workspace selection", () => {
     expect(normalizeNewSessionWorktree("main", "C:\\Repo\\", "c:/repo")).toBe("main")
   })
 
-  test("falls back to the local branch for main, create, and unknown worktrees", () => {
+  test("resolves the branch from the active location", () => {
     const branch = (worktree: string) => (worktree === "/project/feature" ? "feature" : undefined)
-    expect(resolveNewSessionBranch({ worktree: "main", local: "dev", worktreeBranch: branch })).toBe("dev")
-    expect(resolveNewSessionBranch({ worktree: "create", local: "dev", worktreeBranch: branch })).toBe("dev")
-    expect(resolveNewSessionBranch({ worktree: "/project/feature", local: "dev", worktreeBranch: branch })).toBe(
+    expect(resolveNewSessionBranch({ worktree: "main", directory: "/project/feature", worktreeBranch: branch })).toBe(
       "feature",
     )
-    expect(resolveNewSessionBranch({ worktree: "/missing", local: "dev", worktreeBranch: branch })).toBe("dev")
+    expect(
+      resolveNewSessionBranch({ worktree: "create", directory: "/project/feature", worktreeBranch: branch }),
+    ).toBe("feature")
+    expect(
+      resolveNewSessionBranch({ worktree: "/project/feature", directory: "/project", worktreeBranch: branch }),
+    ).toBe("feature")
+    expect(resolveNewSessionBranch({ worktree: "/missing", directory: "/project/feature", worktreeBranch: branch })).toBe(
+      undefined,
+    )
   })
 
   test("uses location VCS state when the project inventory is stale", () => {

packages/app/src/pages/new-session/new-session-workspace-controller.ts

@@ -32,11 +32,11 @@ export function normalizeNewSessionWorktree(value: string, directory: string, pr
 
 export function resolveNewSessionBranch(input: {
   worktree: string
-  local?: string
+  directory: string
   worktreeBranch: (worktree: string) => string | undefined
 }) {
-  if (input.worktree === "main" || input.worktree === "create") return input.local
-  return input.worktreeBranch(input.worktree) ?? input.local
+  const directory = input.worktree === "main" || input.worktree === "create" ? input.directory : input.worktree
+  return input.worktreeBranch(directory)
 }
 
 export function resolveNewSessionGit(input: { projectVcs?: string; branch?: string }) {
@@ -95,11 +95,10 @@ export function createNewSessionWorkspaceController(input: {
     const directories = project ? [project.worktree, ...workspaceDirectories(project)] : [sdk().directory]
     directories.forEach((directory) => void data.location.vcs.sync({ directory }).catch(() => undefined))
   })
-  const localBranch = createMemo(() => data.location.vcs.info({ directory: projectRoot() })?.branch.current)
   const branch = createMemo(() =>
     resolveNewSessionBranch({
       worktree: value(),
-      local: localBranch(),
+      directory: sdk().directory,
       worktreeBranch: (worktree) => data.location.vcs.info({ directory: worktree })?.branch.current,
     }),
   )

packages/app/src/pages/session/terminal-panel-v2.tsx

@@ -1,322 +0,0 @@
-import { For, Show, createEffect, createMemo, on, onCleanup, onMount } from "solid-js"
-import { createStore } from "solid-js/store"
-import { makeEventListener } from "@solid-primitives/event-listener"
-import { createMediaQuery } from "@solid-primitives/media"
-import { DragDropProvider, PointerSensor } from "@dnd-kit/solid"
-import { isSortable } from "@dnd-kit/solid/sortable"
-import { Accessibility, AutoScroller, Feedback, PointerActivationConstraints } from "@dnd-kit/dom"
-import { RestrictToHorizontalAxis } from "@dnd-kit/abstract/modifiers"
-import { RestrictToElement } from "@dnd-kit/dom/modifiers"
-import { Tabs } from "@opencode-ai/ui/tabs"
-import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Icon } from "@opencode-ai/ui/icon"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { Keybind } from "@opencode-ai/ui/keybind"
-
-import { SortableTerminalTabV2 } from "@/components/session/session-sortable-terminal-tab-v2"
-import { Terminal } from "@/components/terminal"
-import { useCommand } from "@/context/command"
-import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
-import { useTerminal } from "@/context/terminal"
-import { useWorkspaceLocation } from "@/context/location"
-import { terminalTabLabel } from "@/pages/session/terminal-label"
-import { createSizing, focusTerminalById } from "@/pages/session/helpers"
-import { getTerminalHandoff, setTerminalHandoff } from "@/pages/session/handoff"
-import { useSessionLayout } from "@/pages/session/session-layout"
-
-export function TerminalPanelV2(props: { stacked?: boolean } = {}) {
-  const layout = useLayout()
-  const terminal = useTerminal()
-  const sdk = useWorkspaceLocation()
-  const language = useLanguage()
-  const command = useCommand()
-  const { workspaceKey, view } = useSessionLayout()
-
-  const isDesktop = createMediaQuery("(min-width: 768px)")
-  const opened = createMemo(() => view().terminal.opened())
-  const size = createSizing()
-  const height = createMemo(() => layout.terminal.height())
-  const close = () => view().terminal.close()
-  let root: HTMLDivElement | undefined
-  let tabList: HTMLDivElement | undefined
-
-  onCleanup(() => terminal.cancelFocus())
-
-  const [store, setStore] = createStore({
-    autoCreated: false,
-    recovered: {} as Record<string, boolean>,
-    view: typeof window === "undefined" ? 1000 : (window.visualViewport?.height ?? window.innerHeight),
-  })
-
-  const max = () => store.view * 0.6
-  const pane = () => Math.min(height(), max())
-  const stacked = createMemo(() => isDesktop() && props.stacked)
-  const panelHeight = createMemo(() =>
-    isDesktop() ? (stacked() ? `${pane()}px` : "100%") : opened() ? `${pane()}px` : "0px",
-  )
-  const contentHeight = createMemo(() => (isDesktop() ? (stacked() ? `${pane()}px` : "100%") : `${pane()}px`))
-  const newTerminalKeybind = createMemo(() => command.keybindParts("terminal.new"))
-
-  onMount(() => {
-    if (typeof window === "undefined") return
-
-    const sync = () => setStore("view", window.visualViewport?.height ?? window.innerHeight)
-    const port = window.visualViewport
-
-    sync()
-    makeEventListener(window, "resize", sync)
-    if (port) makeEventListener(port, "resize", sync)
-  })
-
-  createEffect(() => {
-    if (!opened()) {
-      setStore("autoCreated", false)
-      return
-    }
-
-    if (!terminal.ready() || terminal.all().length !== 0 || store.autoCreated) return
-    terminal.new()
-    setStore("autoCreated", true)
-  })
-
-  createEffect(
-    on(
-      () => terminal.all().length,
-      (count, prevCount) => {
-        if (prevCount === undefined || prevCount <= 0 || count !== 0) return
-        if (!opened()) return
-        close()
-      },
-    ),
-  )
-
-  createEffect(
-    on(
-      () => [opened(), terminal.active(), terminal.focusRequested(terminal.active())] as const,
-      ([next, id, requested]) => {
-        if (!next || !id || !requested) return
-        focusTerminalById(id)
-      },
-    ),
-  )
-
-  createEffect(() => {
-    if (opened()) return
-    const active = document.activeElement
-    if (!(active instanceof HTMLElement)) return
-    if (!root?.contains(active)) return
-    active.blur()
-  })
-
-  createEffect(() => {
-    const dir = sdk().directory
-    if (!dir) return
-    if (!terminal.ready()) return
-    language.locale()
-
-    setTerminalHandoff(
-      workspaceKey(),
-      terminal.all().map((pty) =>
-        terminalTabLabel({
-          title: pty.title,
-          titleNumber: pty.titleNumber,
-          t: language.t as (key: string, vars?: Record<string, string | number | boolean>) => string,
-        }),
-      ),
-    )
-  })
-
-  const handoff = createMemo(() => {
-    const dir = sdk().directory
-    if (!dir) return []
-    return getTerminalHandoff(workspaceKey()) ?? []
-  })
-
-  const all = terminal.all
-  const ids = createMemo(() => all().map((pty) => pty.id))
-
-  const recoverTerminal = (key: string, id: string, clone: (id: string) => Promise<void>) => {
-    if (store.recovered[key]) return
-    setStore("recovered", key, true)
-    void clone(id)
-  }
-
-  const terminalRecoveryKey = (pty: { id: string; title: string; titleNumber: number }) => {
-    return String(pty.titleNumber || pty.title || pty.id)
-  }
-
-  const markTerminalConnected = (key: string, id: string, trim: (id: string) => void) => {
-    setStore("recovered", key, false)
-    trim(id)
-  }
-
-  const handleTerminalDragEnd = () => {
-    const activeId = terminal.active()
-    if (!activeId) return
-    requestAnimationFrame(() => {
-      if (terminal.active() !== activeId) return
-      focusTerminalById(activeId)
-    })
-  }
-
-  return (
-    <aside
-      ref={root}
-      id="terminal-panel"
-      role="region"
-      aria-label={language.t("terminal.title")}
-      aria-hidden={!opened()}
-      inert={!opened()}
-      class="relative shrink-0 overflow-hidden bg-v2-background-bg-base"
-      classList={{
-        "w-full": !isDesktop() || stacked(),
-        "min-w-0 h-full flex-1": isDesktop() && opened() && !stacked(),
-        "w-0 h-full pointer-events-none": isDesktop() && !opened(),
-        "rounded-[10px] shadow-[var(--v2-elevation-raised)]": isDesktop(),
-        "transition-[height] duration-200 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-[height] motion-reduce:transition-none":
-          !isDesktop() && !size.active(),
-      }}
-      style={{ height: panelHeight() }}
-    >
-      <div classList={{ "md:hidden": !stacked(), hidden: stacked() }} onPointerDown={() => size.start()}>
-        <ResizeHandle
-          class="-top-1"
-          direction="vertical"
-          size={pane()}
-          min={100}
-          max={max()}
-          collapseThreshold={50}
-          onResize={(next) => {
-            size.touch()
-            layout.terminal.resize(next)
-          }}
-          onCollapse={close}
-        />
-      </div>
-      <div
-        class="absolute inset-0 flex flex-col overflow-hidden"
-        classList={{
-          "border-t border-border-weak-base": opened() && !isDesktop(),
-          "pointer-events-none": !opened(),
-        }}
-        style={{ height: contentHeight() }}
-      >
-        <Show
-          when={terminal.ready()}
-          fallback={
-            <div class="flex flex-col h-full pointer-events-none">
-              <div class="h-10 flex items-center gap-2 px-2 border-b border-border-weaker-base bg-v2-background-bg-base overflow-hidden">
-                <For each={handoff()}>
-                  {(title) => (
-                    <div class="px-2 py-1 rounded-md bg-surface-base text-14-regular text-text-weak truncate max-w-40">
-                      {title}
-                    </div>
-                  )}
-                </For>
-                <div class="flex-1" />
-                <div class="text-text-weak pr-2">
-                  {language.t("common.loading")}
-                  {language.t("common.loading.ellipsis")}
-                </div>
-              </div>
-              <div class="flex-1 flex items-center justify-center text-text-weak">{language.t("terminal.loading")}</div>
-            </div>
-          }
-        >
-          <DragDropProvider
-            sensors={[
-              PointerSensor.configure({
-                activationConstraints: [new PointerActivationConstraints.Distance({ value: 4 })],
-                preventActivation: (event) =>
-                  event.target instanceof Element &&
-                  !!event.target.closest('[data-slot="tabs-trigger-close-button"], input, [contenteditable="true"]'),
-              }),
-            ]}
-            modifiers={[RestrictToHorizontalAxis, RestrictToElement.configure({ element: () => tabList ?? null })]}
-            plugins={(defaults) => [
-              ...defaults.filter((plugin) => plugin !== Accessibility),
-              AutoScroller.configure({ acceleration: 8, threshold: { x: 0.05, y: 0 } }),
-              Feedback.configure({ dropAnimation: null }),
-            ]}
-            onDragEnd={(event) => {
-              const source = event.operation.source
-              if (!event.canceled && isSortable(source) && source.initialIndex !== source.index) {
-                terminal.move(source.id.toString(), source.index)
-              }
-              handleTerminalDragEnd()
-            }}
-          >
-            <div class="flex flex-col h-full">
-              <Tabs
-                variant="panel"
-                value={terminal.active()}
-                onChange={(id) => terminal.open(id)}
-                class="!h-[52px] !flex-none"
-              >
-                <Tabs.List
-                  ref={tabList}
-                  onPointerDown={(event: PointerEvent & { currentTarget: HTMLDivElement }) => {
-                    const active = document.activeElement
-                    if (event.target === active) return
-                    if (active instanceof HTMLInputElement && event.currentTarget.contains(active)) active.blur()
-                  }}
-                >
-                  <For each={all()}>
-                    {(pty, index) => <SortableTerminalTabV2 terminal={pty} index={index()} onClose={close} />}
-                  </For>
-                  <div class="h-full flex items-center justify-center">
-                    <Tooltip
-                      value={
-                        <>
-                          {language.t("command.terminal.new")}
-                          <Show when={newTerminalKeybind().length > 0}>
-                            <Keybind keys={newTerminalKeybind()} variant="neutral" />
-                          </Show>
-                        </>
-                      }
-                      placement="bottom"
-                      class="flex items-center"
-                    >
-                      <IconButton
-                        icon={<Icon name="plus-small" size="large" />}
-                        variant="ghost"
-                        onClick={() => terminal.new({ focus: true })}
-                        aria-label={language.t("command.terminal.new")}
-                      />
-                    </Tooltip>
-                  </div>
-                </Tabs.List>
-              </Tabs>
-              <div class="flex-1 min-h-0 relative">
-                <Show when={opened() && terminal.active()} keyed>
-                  {(id) => {
-                    const ops = terminal.bind()
-                    return (
-                      <Show when={all().find((pty) => pty.id === id)}>
-                        {(pty) => (
-                          <div id={`terminal-wrapper-${id}`} class="absolute inset-0">
-                            <Terminal
-                              pty={pty()}
-                              autoFocus={terminal.focusRequested(id)}
-                              onAutoFocus={() => terminal.consumeFocus(id)}
-                              class="!px-[14px]"
-                              onConnect={() => markTerminalConnected(terminalRecoveryKey(pty()), id, ops.trim)}
-                              onCleanup={ops.update}
-                              onConnectError={() => recoverTerminal(terminalRecoveryKey(pty()), id, ops.clone)}
-                            />
-                          </div>
-                        )}
-                      </Show>
-                    )
-                  }}
-                </Show>
-              </div>
-            </div>
-          </DragDropProvider>
-        </Show>
-      </div>
-    </aside>
-  )
-}

packages/app/src/session/commands/use-composer-commands.tsx

@@ -3,8 +3,8 @@ import { useLanguage } from "@/context/language"
 import { useLocal, type ModelSelection } from "@/context/local"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { getCursorPosition, setCursorPosition } from "@/components/prompt-input/editor-dom"
-import { useSessionLayout } from "./session-layout"
-import { createSessionOwnership } from "./session-ownership"
+import { useSessionLayout } from "@/session/session-layout"
+import { createSessionOwnership } from "@/session/session-ownership"
 
 const withCategory = (category: string) => {
   return (option: Omit<CommandOption, "category">): CommandOption => ({

packages/app/src/session/commands/use-session-commands.tsx

@@ -15,15 +15,15 @@ import { showToast } from "@/utils/toast"
 import { downloadSessionExport, fetchSessionExport, sessionExportFilename } from "@/utils/session-export"
 import { extractPromptComments, extractPromptFromMessage } from "@/utils/prompt"
 import type { SessionMessageUser } from "@opencode-ai/client/promise"
-import type { SessionController } from "./session-controller"
+import type { SessionModel } from "@/session/model"
 
 type SessionCommandSource = {
-  identity: SessionController["identity"]
-  data: Pick<SessionController["data"], "info" | "revertMessageID">
-  history: Pick<SessionController["history"], "userMessages" | "visibleUserMessages">
-  layout: SessionController["layout"]
-  ownership: SessionController["ownership"]
-  tabs: Pick<SessionController["tabs"], "activeFileTab" | "closableTab">
+  identity: SessionModel["identity"]
+  data: Pick<SessionModel["data"], "info" | "revertMessageID">
+  history: Pick<SessionModel["history"], "userMessages" | "visibleUserMessages">
+  layout: SessionModel["layout"]
+  ownership: SessionModel["ownership"]
+  tabs: Pick<SessionModel["tabs"], "activeFileTab" | "closableTab">
 }
 
 export type SessionCommandContext = {
@@ -63,7 +63,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
     owner.run(() => show(value))
   }
   const runCommand = async <T,>(input: {
-    owner: ReturnType<SessionController["ownership"]["capture"]>
+    owner: ReturnType<SessionModel["ownership"]["capture"]>
     prompt: T
     request: () => Promise<unknown>
     updatePrompt: (prompt: T) => void
@@ -116,82 +116,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
     if (sessionID) return permission.isAutoAccepting(sessionID, sdk().directory)
     return permission.isAutoAcceptingDirectory(sdk().directory)
   }
-  const write = async (value: string) => {
-    const body = typeof document === "undefined" ? undefined : document.body
-    if (body) {
-      const textarea = document.createElement("textarea")
-      textarea.value = value
-      textarea.setAttribute("readonly", "")
-      textarea.style.position = "fixed"
-      textarea.style.opacity = "0"
-      textarea.style.pointerEvents = "none"
-      body.appendChild(textarea)
-      textarea.select()
-      const copied = document.execCommand("copy")
-      body.removeChild(textarea)
-      if (copied) return true
-    }
-
-    const clipboard = typeof navigator === "undefined" ? undefined : navigator.clipboard
-    if (!clipboard?.writeText) return false
-    return clipboard.writeText(value).then(
-      () => true,
-      () => false,
-    )
-  }
-
-  const copyShare = async (url: string, existing: boolean) => {
-    if (!(await write(url))) {
-      showToast({
-        title: language.t("toast.session.share.copyFailed.title"),
-        variant: "error",
-      })
-      return
-    }
-
-    showToast({
-      title: existing ? language.t("session.share.copy.copied") : language.t("toast.session.share.success.title"),
-      description: language.t("toast.session.share.success.description"),
-      variant: "success",
-    })
-  }
-
-  const share = async () => {
-    const sessionID = actions.session.identity.params.id
-    if (!sessionID) return
-
-    const existing = undefined
-    if (existing) {
-      await copyShare(existing, true)
-      return
-    }
-
-    // TODO: Restore sharing when the V2 client exposes a session sharing API.
-    const url = undefined
-    if (!url) {
-      showToast({
-        title: language.t("toast.session.share.failed.title"),
-        description: language.t("toast.session.share.failed.description"),
-        variant: "error",
-      })
-      return
-    }
-
-    await copyShare(url, false)
-  }
-
-  const unshare = async () => {
-    const sessionID = actions.session.identity.params.id
-    if (!sessionID) return
-
-    // TODO: Restore unsharing when the V2 client exposes a session sharing API.
-    showToast({
-      title: language.t("toast.session.unshare.failed.title"),
-      description: language.t("toast.session.unshare.failed.description"),
-      variant: "error",
-    })
-  }
-
   const exportSession = async () => {
     const sessionID = actions.session.identity.params.id
     if (!sessionID) return
@@ -373,36 +297,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
     )
   }
 
-  const shareCmds = () => {
-    // TODO: Restore these commands when the V2 client exposes session sharing.
-    // Sharing remains disabled until the current API exposes it.
-    return []
-    /*
-    return [
-      sessionCommand({
-        id: "session.share",
-        title: actions.session.data.info()?.share?.url
-          ? language.t("session.share.copy.copyLink")
-          : language.t("command.session.share"),
-        description: actions.session.data.info()?.share?.url
-          ? language.t("toast.session.share.success.description")
-          : language.t("command.session.share.description"),
-        slash: "share",
-        disabled: !actions.session.identity.params.id,
-        onSelect: share,
-      }),
-      sessionCommand({
-        id: "session.unshare",
-        title: language.t("command.session.unshare"),
-        description: language.t("command.session.unshare.description"),
-        slash: "unshare",
-        disabled: !actions.session.identity.params.id || !actions.session.data.info()?.share?.url,
-        onSelect: unshare,
-      }),
-    ]
-    */
-  }
-
   const sessionCmds = () => [
     sessionCommand({
       id: "session.new",
@@ -594,7 +488,6 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
 
   command.register("session", () => [
     ...sessionCmds(),
-    ...shareCmds(),
     ...fileCmds(),
     ...contextCmds(),
     ...viewCmds(),

packages/app/src/session/composer/active-session.tsx

@@ -0,0 +1,416 @@
+import type { SessionUserActions } from "@opencode-ai/session-ui/message"
+import { SessionMessage } from "@opencode-ai/schema/session-message"
+import { getFilename } from "@opencode-ai/util/path"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { isScrollKeyTarget, scrollKey, scrollKeyOwner } from "@opencode-ai/ui/scroll-view"
+import { useMutation } from "@tanstack/solid-query"
+import { makeEventListener } from "@solid-primitives/event-listener"
+import { useNavigate, useSearchParams } from "@solidjs/router"
+import { createEffect, createMemo, on, onMount, Show, untrack, type Accessor } from "solid-js"
+import { createStore } from "solid-js/store"
+import { PromptInputV2Composer, usePromptInputV2Controller } from "@/components/prompt-input-v2"
+import { setCursorPosition } from "@/components/prompt-input/editor-dom"
+import { promptLength } from "@/components/prompt-input/history"
+import type { FollowupDraft } from "@/components/prompt-input/submit"
+import { useComments } from "@/context/comments"
+import { useCommand } from "@/context/command"
+import { useLanguage } from "@/context/language"
+import { useLocal } from "@/context/local"
+import { usePlatform } from "@/context/platform"
+import { usePrompt } from "@/context/prompt"
+import { useWorkspaceLocation } from "@/context/location"
+import { useServerSDK } from "@/context/server-sdk"
+import { useComposerCommands } from "../commands/use-composer-commands"
+import { useSessionCommands } from "../commands/use-session-commands"
+import type { SessionModel } from "../model"
+import type { SessionScreenLayout } from "../screen-layout"
+import { restorePromptModel, syncPromptModel, syncSessionModel } from "../session-model-helpers"
+import type { SessionTimelineInteraction } from "../timeline/interaction"
+import { Persist, persisted } from "@/utils/persist"
+import { requireServerKey, sessionHref } from "@/utils/session-route"
+import {
+  createPromptInputController,
+  createSessionComposerController,
+  createSessionComposerRegionController,
+  SessionComposerRegion,
+} from "./index"
+
+type FollowupItem = FollowupDraft & { id: string }
+type FollowupEdit = Pick<FollowupItem, "id" | "prompt" | "context">
+const emptyFollowups: FollowupItem[] = []
+
+export function createActiveSessionComposer(input: {
+  session: SessionModel
+  screen: SessionScreenLayout
+  timeline: SessionTimelineInteraction
+  deferRender: Accessor<boolean>
+}) {
+  const comments = useComments()
+  const command = useCommand()
+  const dialog = useDialog()
+  const language = useLanguage()
+  const local = useLocal()
+  const location = useWorkspaceLocation()
+  const navigate = useNavigate()
+  const platform = usePlatform()
+  const prompt = usePrompt()
+  const server = useServerSDK()
+  const [searchParams, setSearchParams] = useSearchParams<{ prompt?: string }>()
+  const state = createSessionComposerController()
+  const controls = createPromptInputController({
+    sessionKey: input.session.identity.sessionKey,
+    sessionID: () => input.session.identity.params.id,
+  })
+  const [view, setView] = createStore({ newSessionWorktree: "main" })
+  const [followup, setFollowup] = persisted(
+    Persist.serverWorkspace(server.scope, location().directory, "followup"),
+    createStore<{
+      items: Record<string, FollowupItem[] | undefined>
+      failed: Record<string, string | undefined>
+      paused: Record<string, boolean | undefined>
+      edit: Record<string, FollowupEdit | undefined>
+    }>({ items: {}, failed: {}, paused: {}, edit: {} }),
+  )
+  let promptRef: HTMLDivElement | undefined
+
+  createEffect(() => {
+    if (!prompt.ready()) return
+    untrack(() => {
+      if (input.session.identity.params.id) return
+      const text = searchParams.prompt
+      if (!text) return
+      prompt.set([{ type: "text", content: text, start: 0, end: text.length }], text.length)
+      setSearchParams({ ...searchParams, prompt: undefined })
+    })
+  })
+  createEffect(
+    on(
+      () => [input.timeline.lastUserMessage(), input.session.data.info()] as const,
+      () => {
+        const message = input.timeline.lastUserMessage()
+        const info = input.session.data.info()
+        const metadata = message?.metadata
+        const agent = typeof metadata?.agent === "string" ? metadata.agent : info?.agent
+        const model = metadata?.model
+        const selected =
+          model &&
+          typeof model === "object" &&
+          !Array.isArray(model) &&
+          typeof model.providerID === "string" &&
+          typeof model.modelID === "string"
+            ? {
+                providerID: model.providerID,
+                modelID: model.modelID,
+                variant: typeof model.variant === "string" ? model.variant : undefined,
+              }
+            : info?.model
+              ? { providerID: info.model.providerID, modelID: info.model.id, variant: info.model.variant }
+              : undefined
+        if (info && agent && selected) syncSessionModel(local, { sessionID: info.id, agent, model: selected })
+      },
+    ),
+  )
+  let restoredModelSession: string | undefined
+  createEffect(() => {
+    const id = input.session.identity.params.id
+    if (!id || !prompt.ready() || !local.session.ready()) return
+    if (restoredModelSession !== id) {
+      restoredModelSession = id
+      if (restorePromptModel(local, prompt)) return
+    }
+    syncPromptModel(local, prompt)
+  })
+  createEffect(
+    on(
+      () => ({ directory: location().directory, id: input.session.identity.params.id }),
+      (next, previous) => {
+        if (!previous || (next.directory === previous.directory && next.id === previous.id)) return
+        if (previous.id && !next.id) local.session.reset()
+      },
+      { defer: true },
+    ),
+  )
+  createEffect(
+    on(
+      () => location().directory,
+      (directory) => {
+        if (directory) setView("newSessionWorktree", "main")
+      },
+      { defer: true },
+    ),
+  )
+  const newSessionWorktree = createMemo(() => {
+    if (view.newSessionWorktree === "create") return "create"
+    const project = input.session.project()
+    if (project && location().directory !== project.worktree) return location().directory
+    return "main"
+  })
+  const queuedFollowups = createMemo(() => {
+    const id = input.session.identity.params.id
+    return id ? (followup.items[id] ?? emptyFollowups) : emptyFollowups
+  })
+  const editingFollowup = createMemo<FollowupEdit | undefined>(() => {
+    const id = input.session.identity.params.id
+    return id ? followup.edit[id] : undefined
+  })
+  const followupMutation = useMutation(() => ({
+    mutationFn: async (request: { sessionID: string; id: string; manual?: boolean }) => {
+      if (!(followup.items[request.sessionID] ?? []).some((entry) => entry.id === request.id)) return
+      if (request.manual) setFollowup("paused", request.sessionID, undefined)
+      setFollowup("failed", request.sessionID, undefined)
+      // TODO: Restore queued followups once submission uses current admission APIs.
+      setFollowup("failed", request.sessionID, request.id)
+    },
+  }))
+  const followupBusy = (sessionID: string) =>
+    followupMutation.isPending && followupMutation.variables?.sessionID === sessionID
+  const sendingFollowup = createMemo<string | undefined>(() => {
+    const id = input.session.identity.params.id
+    return id && followupBusy(id) ? followupMutation.variables?.id : undefined
+  })
+  const followupText = (item: FollowupDraft) => {
+    const text = item.prompt
+      .map((part) => {
+        if (part.type === "image") return `[image:${part.filename}]`
+        if (part.type === "file") return `[file:${part.path}]`
+        if (part.type === "agent") return `@${part.name}`
+        return part.content
+      })
+      .join("")
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .find((line) => !!line)
+    return text || `[${language.t("common.attachment")}]`
+  }
+  const sendFollowup = (sessionID: string, id: string, manual?: boolean) => {
+    if (input.session.shared.data.session.get(sessionID)?.parentID) return Promise.resolve()
+    if (!(followup.items[sessionID] ?? []).some((entry) => entry.id === id) || followupBusy(sessionID)) {
+      return Promise.resolve()
+    }
+    return followupMutation.mutateAsync({ sessionID, id, manual })
+  }
+  const editFollowup = (id: string) => {
+    const sessionID = input.session.identity.params.id
+    if (!sessionID || followupBusy(sessionID)) return
+    const item = queuedFollowups().find((entry) => entry.id === id)
+    if (!item) return
+    setFollowup("items", sessionID, (items) => (items ?? []).filter((entry) => entry.id !== id))
+    setFollowup("failed", sessionID, (value) => (value === id ? undefined : value))
+    setFollowup("edit", sessionID, { id: item.id, prompt: item.prompt, context: item.context })
+  }
+  const openAttachment: NonNullable<SessionUserActions["openAttachment"]> = (file) => {
+    const url = file.source.type === "uri" ? file.source.uri : `data:${file.mime};base64,${file.data}`
+    const download = () => {
+      const anchor = document.createElement("a")
+      anchor.href = url
+      anchor.download = getFilename(file.name) || "attachment"
+      anchor.click()
+    }
+    const path = file.name ?? ""
+    const absolute = path.startsWith("/") || path.startsWith("\\\\") || /^[a-zA-Z]:[\\/]/.test(path)
+    if (!platform.revealPath || !absolute) return download()
+    void platform.revealPath(path).then((revealed) => {
+      if (!revealed) download()
+    }, download)
+  }
+  createEffect(() => {
+    const sessionID = input.session.identity.params.id
+    const item = queuedFollowups()[0]
+    if (!sessionID || !item || followupBusy(sessionID)) return
+    if (followup.failed[sessionID] === item.id || followup.paused[sessionID]) return
+    if (input.session.data.isChild() || state.blocked() || input.session.data.working()) return
+    void sendFollowup(sessionID, item.id)
+  })
+  const focus = () => {
+    if (!input.session.data.isChild()) promptRef?.focus()
+  }
+  createEffect(
+    on(
+      () => input.session.identity.params.id,
+      (id) => {
+        if (!id) requestAnimationFrame(focus)
+      },
+    ),
+  )
+  const editable = (target: EventTarget | null | undefined) => {
+    if (!(target instanceof HTMLElement)) return false
+    return /^(INPUT|TEXTAREA|SELECT|BUTTON)$/.test(target.tagName) || target.isContentEditable
+  }
+  const activeElement = () => {
+    let current: Element | null = document.activeElement
+    while (current instanceof HTMLElement && current.shadowRoot?.activeElement)
+      current = current.shadowRoot.activeElement
+    return current instanceof HTMLElement ? current : undefined
+  }
+  const handleKeyDown = (event: KeyboardEvent) => {
+    const path = event.composedPath()
+    const target = path.find((item): item is HTMLElement => item instanceof HTMLElement)
+    const active = activeElement()
+    if (
+      path.some((item) => item instanceof HTMLElement && item.closest("[data-prevent-autofocus]") !== null) ||
+      editable(target) ||
+      (active && (active.closest("[data-prevent-autofocus]") || editable(active))) ||
+      dialog.active
+    )
+      return
+    if (active === promptRef) {
+      if (event.key === "Escape") promptRef?.blur()
+      return
+    }
+    const key = scrollKey(event)
+    if (key) {
+      const scroller = input.timeline.scroller()
+      if (!scroller || !isScrollKeyTarget(target ?? null, key)) return
+      if (scrollKeyOwner(scroller, target ?? null, key) !== scroller) return
+      input.timeline.view.markGesture(scroller)
+      return
+    }
+    if (event.key.length !== 1 || event.key === "Unidentified" || event.ctrlKey || event.metaKey) return
+    if (state.blocked() || input.session.data.isChild() || !promptRef) return
+    promptRef.focus()
+    setCursorPosition(promptRef, prompt.cursor() ?? promptLength(prompt.current()))
+  }
+  onMount(() => makeEventListener(document, "keydown", handleKeyDown))
+  useComposerCommands()
+  useSessionCommands({
+    session: input.session,
+    background: {
+      blocking: () => state.background.blocking().length > 0,
+      move: state.background.move,
+    },
+    navigateMessageByOffset: input.timeline.actions.navigateMessage,
+    setActiveMessage: input.timeline.actions.setActiveMessage,
+    focusInput: focus,
+  })
+  command.register("session-palette", () => [
+    {
+      id: "command.palette",
+      title: language.t("command.palette"),
+      hidden: true,
+      onSelect: () => command.trigger("file.open", "palette"),
+    },
+  ])
+
+  return {
+    actions: {
+      focus,
+      timeline: { revert: () => undefined, openAttachment } satisfies SessionUserActions,
+    },
+    blocked: state.blocked,
+    background: state.background,
+    newSessionWorktree,
+    queue: {
+      edit: editingFollowup,
+      enabled: () => false,
+      enqueue: (draft: FollowupDraft) => {
+        setFollowup("items", draft.sessionID, (items) => [
+          ...(items ?? []),
+          { id: SessionMessage.ID.create(), ...draft },
+        ])
+        setFollowup("failed", draft.sessionID, undefined)
+        setFollowup("paused", draft.sessionID, undefined)
+      },
+      onEditLoaded: () => {
+        const id = input.session.identity.params.id
+        if (id) setFollowup("edit", id, undefined)
+      },
+      pause: () => {
+        const id = input.session.identity.params.id
+        if (id) setFollowup("paused", id, true)
+      },
+    },
+    region: {
+      centered: input.screen.centered,
+      followup: () =>
+        input.session.identity.params.id && !input.session.data.isChild()
+          ? {
+              items: queuedFollowups().map((item) => ({ id: item.id, text: followupText(item) })),
+              sending: sendingFollowup(),
+              onSend: (id: string) => void sendFollowup(input.session.identity.params.id!, id, true),
+              onEdit: editFollowup,
+            }
+          : undefined,
+      openParent: () => {
+        const id = input.session.data.parentID()
+        if (id) navigate(sessionHref(requireServerKey(input.session.identity.params.serverKey), id))
+      },
+      prompt,
+      ready: () => !input.deferRender() && input.timeline.ready(),
+      setDockRef: input.timeline.view.setDockRef,
+      setPromptRef: (element: HTMLDivElement) => {
+        promptRef = element
+      },
+      state,
+    },
+    input: {
+      controls,
+      setPromptRef: (element: HTMLDivElement) => {
+        promptRef = element
+      },
+    },
+    resetWorktree: () => setView("newSessionWorktree", "main"),
+    submit: () => {
+      comments.clear()
+      input.timeline.actions.resume()
+    },
+    workspaceMoveEligible: createMemo(() => {
+      const id = input.session.identity.params.id
+      if (!id) return false
+      return (
+        (followup.items[id]?.length ?? 0) === 0 && !followup.failed[id] && !followup.paused[id] && !followup.edit[id]
+      )
+    }),
+  }
+}
+
+export type ActiveSessionComposerModel = ReturnType<typeof createActiveSessionComposer>
+
+export function ActiveSessionComposer(props: {
+  model: ActiveSessionComposerModel
+  session: SessionModel
+  accentSubmit: boolean
+  onResponseSubmit: () => void
+}) {
+  const region = createSessionComposerRegionController({
+    state: props.model.region.state,
+    sessionKey: props.session.identity.sessionKey,
+    sessionID: () => props.session.identity.params.id,
+    prompt: props.model.region.prompt,
+    ready: props.model.region.ready,
+    centered: props.model.region.centered,
+    followup: props.model.region.followup,
+    revert: () => undefined,
+    onResponseSubmit: props.onResponseSubmit,
+    openParent: props.model.region.openParent,
+    setPromptRef: props.model.region.setPromptRef,
+    setDockRef: props.model.region.setDockRef,
+  })
+  const promptInput = usePromptInputV2Controller({
+    get controls() {
+      return props.model.input.controls()
+    },
+    ref: props.model.input.setPromptRef,
+    get newSessionWorktree() {
+      return props.model.newSessionWorktree()
+    },
+    onNewSessionWorktreeReset: props.model.resetWorktree,
+    onSubmit: props.model.submit,
+    get edit() {
+      return props.model.queue.edit()
+    },
+    onEditLoaded: props.model.queue.onEditLoaded,
+    shouldQueue: props.model.queue.enabled,
+    onQueue: props.model.queue.enqueue,
+    onAbort: props.model.queue.pause,
+  })
+  return (
+    <Show when={props.session.identity.params.id}>
+      <SessionComposerRegion
+        controller={region}
+        promptInput={
+          <PromptInputV2Composer controller={promptInput} borderUnderlay accentSubmit={props.accentSubmit} />
+        }
+      />
+    </Show>
+  )
+}

packages/app/src/session/composer/session-composer-controls.ts

@@ -1,4 +1,3 @@
-import { useNavigate, useSearchParams } from "@solidjs/router"
 import { type Accessor, createMemo } from "solid-js"
 import type { PromptInputControls } from "@/components/prompt-input/contracts"
 import type { PromptProjectControls } from "@/components/prompt-project-selector"

packages/app/src/session/composer/session-composer-region-controller.ts

@@ -1,7 +1,7 @@
 import { type Accessor, createEffect, createMemo, createResource } from "solid-js"
 import type { PromptInputState } from "@/components/prompt-input"
 import { useData } from "@/context/server"
-import { getSessionHandoff, setSessionHandoff } from "@/pages/session/handoff"
+import { getSessionHandoff, setSessionHandoff } from "@/session/handoff"
 import type { SessionComposerController } from "./session-composer-state"
 
 export type SessionComposerFollowupDock = {

packages/app/src/session/composer/session-composer-region.tsx

@@ -1,10 +1,10 @@
 import { Show, type JSX } from "solid-js"
 import { useLanguage } from "@/context/language"
-import { SessionPermissionDock } from "@/pages/session/composer/session-permission-dock"
-import { SessionQuestionDock } from "@/pages/session/composer/session-question-dock"
-import { SessionFollowupDock } from "@/pages/session/composer/session-followup-dock"
-import { SessionRevertDock } from "@/pages/session/composer/session-revert-dock"
-import { SessionBackgroundDock } from "@/pages/session/composer/session-background-dock"
+import { SessionPermissionDock } from "@/session/requests/session-permission-dock"
+import { SessionQuestionDock } from "@/session/requests/session-question-dock"
+import { SessionFollowupDock } from "@/session/composer/session-followup-dock"
+import { SessionRevertDock } from "@/session/composer/session-revert-dock"
+import { SessionBackgroundDock } from "@/session/requests/session-background-dock"
 import type { SessionComposerRegionController } from "./session-composer-region-controller"
 
 type SessionComposerRegionState = Pick<

packages/app/src/session/composer/session-composer-state.test.ts

@@ -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-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 
 const session = (input: { id: string; parentID?: string }) =>
   ({

packages/app/src/session/composer/session-composer-state.ts

@@ -7,11 +7,9 @@ import { useServerSDK } from "@/context/server-sdk"
 import { useLanguage } from "@/context/language"
 import { usePermission } from "@/context/permission"
 import { useWorkspaceLocation } from "@/context/location"
-import { sessionPermissionRequest, sessionQuestionForm } from "./session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
 import { useData } from "@/context/server"
 
-const idle = { type: "idle" as const }
-
 export function createSessionComposerController() {
   const params = useParams()
   const sdk = useWorkspaceLocation()

packages/app/src/session/composer/session-revert-dock.stories.tsx

@@ -1,7 +1,7 @@
 import { For } from "solid-js"
 import { createStore } from "solid-js/store"
 import { DockShell } from "@opencode-ai/ui/dock-surface"
-import { SessionRevertDock } from "@/pages/session/composer/session-revert-dock"
+import { SessionRevertDock } from "@/session/composer/session-revert-dock"
 import { SettingsProvider } from "@/context/settings"
 
 export default {
@@ -15,7 +15,7 @@ export default {
 Real \`SessionRevertDock\` from app code, rendered above a mock composer card.
 
 ### Source path
-- \`packages/app/src/pages/session/composer/session-revert-dock.tsx\`
+- \`packages/app/src/session/composer/session-revert-dock.tsx\`
 
 ### Why the mock composer
 The live composer overlaps the dock's bottom by 18px (\`session-composer-region-controller.ts\` \`lift()\`).