refactor(core): keep variant policy in plugin

.changeset/unify-request-envelope.md

@@ -1,5 +0,0 @@
----
-"@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

@@ -1,37 +0,0 @@
-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-PuNZrtSgh5F3KpXSM+bd+rYQuyzwWd+wCOnMJSDS2Z0=",
-    "aarch64-linux": "sha256-RYy8ZRf59FE/3+gICjvsZv3ekQvn+DTZaT9jefbK+0g=",
-    "aarch64-darwin": "sha256-1AsDK8xNj3RlzX2efbuEDEwaOLAgjFYaEvk7EkQkh4w=",
-    "x86_64-darwin": "sha256-8ONeOu9UmM0GRxVeOO3Uhk1yAOuW6R8tqBYswOVEkME="
+    "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="
   }
 }

package.json

@@ -15,7 +15,6 @@
     "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",
@@ -48,9 +47,9 @@
       "@octokit/rest": "22.0.0",
       "@hono/standard-validator": "0.2.0",
       "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.6",
-      "@opentui/keymap": "0.5.6",
-      "@opentui/solid": "0.5.6",
+      "@opentui/core": "0.5.4",
+      "@opentui/keymap": "0.5.4",
+      "@opentui/solid": "0.5.4",
       "@tanstack/solid-virtual": "3.13.32",
       "@shikijs/stream": "4.2.0",
       "@standard-schema/spec": "1.1.0",

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` and `body` 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`, `body`, and `limits` overlays.
 
 ```ts
 import { model } from "@opencode-ai/ai/providers/openai/responses"
@@ -317,6 +317,7 @@ 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,7 +31,6 @@ 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 =
   | {
@@ -234,7 +233,7 @@ export type AnthropicMessagesBody = Schema.Schema.Type<typeof AnthropicMessagesB
 
 const AnthropicUsage = Schema.StructWithRest(
   Schema.Struct({
-    input_tokens: optionalNull(Schema.Number),
+    input_tokens: Schema.optional(Schema.Number),
     output_tokens: Schema.optional(Schema.Number),
     cache_creation_input_tokens: optionalNull(Schema.Number),
     cache_read_input_tokens: optionalNull(Schema.Number),
@@ -625,6 +624,7 @@ 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 ?? DEFAULT_MAX_TOKENS,
+    max_tokens: generation?.maxTokens ?? outputLimit,
     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 ?? undefined
+  const nonCached = usage.input_tokens
   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,9 +289,7 @@ 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)
-      // 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))
+      if (previous?.role === "user")
         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,8 +93,6 @@ 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),
@@ -103,7 +101,6 @@ 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,
@@ -118,8 +115,6 @@ 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
@@ -133,6 +128,8 @@ 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,
@@ -301,20 +298,6 @@ 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
@@ -380,42 +363,34 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LL
     tool: (toolName) => ({ type: "function" as const, name: toolName }),
   })
 
-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 lowerToolCall = (part: ToolCallPart): OpenResponsesInputItem => ({
+  type: "function_call",
+  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]
-  const id = itemID(part.providerMetadata, providerMetadataKey)
-  if (!ProviderShared.isRecord(metadata) || !id) return undefined
+  if (!ProviderShared.isRecord(metadata) || typeof metadata.itemId !== "string" || metadata.itemId.length === 0)
+    return undefined
   const encryptedContent =
     typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null
       ? metadata.reasoningEncryptedContent
       : undefined
   return {
     type: "reasoning",
-    id,
+    id: metadata.itemId,
     summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
     encrypted_content: encryptedContent,
   }
 }
 
 const hostedToolItemID = (part: ToolResultPart, providerMetadataKey: string) => {
-  return itemID(part.providerMetadata, providerMetadataKey)
+  const metadata = part.providerMetadata?.[providerMetadataKey]
+  return ProviderShared.isRecord(metadata) && typeof metadata.itemId === "string" && metadata.itemId.length > 0
+    ? metadata.itemId
+    : undefined
 }
 
 const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (
@@ -500,26 +475,24 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
 
     if (message.role === "assistant") {
       const content: TextPart[] = []
-      const reasoningItems: Record<string, OpenResponsesReasoningInput> = {}
+      const reasoningItems: Record<string, OpenResponsesReasoningReplay> = {}
       const reasoningReferences = new Set<string>()
       const hostedToolReferences = new Set<string>()
       const flushText = () => {
         if (content.length === 0) return
-        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
-        }, [])
+        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
+          },
+          [],
+        )
         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 }),
@@ -548,14 +521,19 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
               existing.encrypted_content = reasoning.encrypted_content
             continue
           }
-          reasoningItems[reasoning.id] = reasoning
-          input.push(reasoning)
+          const replay = {
+            type: reasoning.type,
+            summary: reasoning.summary,
+            encrypted_content: reasoning.encrypted_content,
+          }
+          reasoningItems[reasoning.id] = replay
+          input.push(replay)
           continue
         }
         if (part.type === "tool-call") {
           flushText()
           if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part, providerMetadataKey))
+          input.push(lowerToolCall(part))
           continue
         }
         if (part.type === "tool-result" && part.providerExecuted === true) {
@@ -735,7 +713,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 = providerMetadata(state, { itemId: id, ...(phase === undefined ? {} : { phase }) })
+  const metadata = phase === undefined ? undefined : providerMetadata(state, { phase })
   const lifecycle = Lifecycle.textStart(state.lifecycle, events, id, metadata)
   return [{ ...state, lifecycle: Lifecycle.textDelta(lifecycle, events, id, event.delta) }, events]
 }
@@ -964,7 +942,7 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
           state.lifecycle,
           events,
           item.id,
-          providerMetadata(state, { itemId: item.id, ...(phase === undefined ? {} : { phase }) }),
+          phase === undefined ? undefined : providerMetadata(state, { phase }),
         ),
         messageItems,
         messagePhases,
@@ -977,11 +955,7 @@ 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,
-          providerMetadata: providerMetadata(state, { itemId: item.id }),
-        })
+      : ToolStream.start(state.tools, item.id, { id: item.call_id, name: item.name })
     const result =
       item.arguments === undefined
         ? yield* ToolStream.finish(state.id, tools, item.id)
@@ -1032,19 +1006,11 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
   return [state, NO_EVENTS] satisfies StepResult
 })
 
-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 onResponseFinish = (state: ParserState, event: Event): StepResult => {
+  const events: LLMEvent[] = []
   const lifecycle = Lifecycle.finish(state.lifecycle, events, {
     reason: {
-      normalized: mapFinishReason(event, hasFunctionCall),
+      normalized: mapFinishReason(event, state.hasFunctionCall),
       raw: event.response?.incomplete_details?.reason,
     },
     usage: mapUsage(event.response?.usage, state.providerMetadataKey),
@@ -1056,8 +1022,8 @@ const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (
           })
         : undefined,
   })
-  return [{ ...state, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
-})
+  return [{ ...state, lifecycle }, events]
+}
 
 // Build a single human-readable message from whatever the provider supplied.
 // When both code and message are present, prefix the code so consumers see
@@ -1099,14 +1065,6 @@ 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))
@@ -1134,7 +1092,8 @@ 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 onResponseFinish(state, event)
+  if (event.type === "response.completed" || event.type === "response.incomplete")
+    return Effect.succeed(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", "refusal", "tool_calls"])
+const RESERVED_REASONING_FIELDS = new Set(["role", "content", "tool_calls"])
 export const DEFAULT_BASE_URL = "https://api.openai.com/v1"
 export const PATH = "/chat/completions"
 
@@ -194,7 +194,6 @@ 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),
@@ -710,7 +709,6 @@ 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))
@@ -730,7 +728,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
     else if (
       reasoningDetailsObserved &&
       !lifecycle.reasoning.has("reasoning-0") &&
-      (Boolean(delta?.content) || Boolean(delta?.refusal) || toolDeltas.length > 0)
+      (Boolean(delta?.content) || toolDeltas.length > 0)
     )
       lifecycle = Lifecycle.reasoningStart(lifecycle, events, "reasoning-0", deltaMetadata)
     const reasoningEmitted = state.reasoningEmitted || lifecycle.reasoning.has("reasoning-0")
@@ -745,16 +743,6 @@ 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,8 +42,6 @@ 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/provider-package.ts

@@ -4,6 +4,11 @@ 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,6 +90,7 @@ 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,6 +62,7 @@ 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,6 +68,7 @@ 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,6 +63,7 @@ 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,6 +126,7 @@ 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,6 +75,7 @@ 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,6 +110,7 @@ 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,6 +80,7 @@ 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,6 +119,7 @@ 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,6 +63,7 @@ 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,6 +55,7 @@ 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,6 +74,7 @@ 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,6 +124,7 @@ 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,5 +200,6 @@ 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,6 +101,7 @@ 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,6 +16,7 @@ import {
   LLMRequest,
   LLMResponse,
   LanguageModel,
+  LanguageModelLimits,
   LLMEvent,
   InvalidProviderOutputReason,
   ProviderID,
@@ -73,6 +74,7 @@ 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
@@ -80,6 +82,7 @@ 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
@@ -116,6 +119,7 @@ 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,7 +114,22 @@ 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),
@@ -124,6 +139,7 @@ export namespace LanguageModelDefaults {
   export type Input =
     | LanguageModelDefaults
     | {
+        readonly limits?: LanguageModelLimits.Input
         readonly generation?: GenerationOptions.Input
         readonly providerOptions?: ProviderOptions
         readonly http?: HttpOptions.Input
@@ -133,6 +149,7 @@ 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,20 +270,21 @@ describe("request option precedence", () => {
     ),
   )
 
-  it.effect("uses the Anthropic default before call maxTokens", () =>
+  it.effect("uses model output limits after route limits and 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" })
+      const model = route.model({ id: "claude-sonnet-4-5", defaults: { limits: { output: 64 } } })
       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: 8_000 } }),
+        LLM.request({ model, prompt: "Say hello.", cache: "none", generation: { maxTokens: 32 } }),
       )
 
-      expect(withoutMaxTokens.body.max_tokens).toBe(32_000)
-      expect(withMaxTokens.body.max_tokens).toBe(8_000)
+      expect(withoutMaxTokens.body.max_tokens).toBe(64)
+      expect(withMaxTokens.body.max_tokens).toBe(32)
     }),
   )
 })

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

@@ -1,100 +0,0 @@
-{
-  "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

@@ -1,119 +0,0 @@
-{
-  "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

@@ -1,129 +0,0 @@
-{
-  "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,6 +121,7 @@ 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 } },
@@ -129,6 +130,7 @@ 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,6 +43,7 @@ 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,
@@ -57,6 +58,7 @@ 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 })
@@ -68,12 +70,14 @@ 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 () => {
@@ -84,6 +88,7 @@ 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 },
     })
 
@@ -95,6 +100,7 @@ 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 })
   })
 
@@ -106,6 +112,7 @@ 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" },
     })
 
@@ -117,6 +124,7 @@ 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" })
   })
 
@@ -177,6 +185,7 @@ 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)
@@ -187,6 +196,7 @@ 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")
   })
 
@@ -218,6 +228,7 @@ 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 } },
     })
 
@@ -225,6 +236,7 @@ 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 } })
   })
 
@@ -238,6 +250,7 @@ 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",
@@ -261,6 +274,7 @@ 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: 32_000,
+        max_tokens: 4096,
       })
     }),
   )
@@ -640,7 +640,7 @@ describe("Anthropic Messages route", () => {
     }),
   )
 
-  it.effect("maps nullable input tokens and preserves unknown Anthropic usage fields", () =>
+  it.effect("maps thinking tokens and preserves unknown Anthropic usage fields", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(
         Effect.provide(
@@ -663,7 +663,6 @@ 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" },
@@ -683,7 +682,7 @@ describe("Anthropic Messages route", () => {
         totalTokens: 15,
         providerMetadata: {
           anthropic: {
-            input_tokens: null,
+            input_tokens: 5,
             cache_read_input_tokens: 2,
             service_tier: "standard",
             cache_creation: { ephemeral_5m_input_tokens: 1 },

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

@@ -139,48 +139,6 @@ 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,74 +664,6 @@ 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." },
-        { type: "message", role: "assistant", content: [{ type: "output_text", text: "After." }] },
+        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
   )
@@ -113,67 +113,11 @@ describe("Open Responses-compatible route", () => {
       )
 
       expect(prepared.body).toMatchObject({
-        input: [{ type: "message", role: "assistant", content: [{ type: "output_text", text: "Unclassified." }] }],
+        input: [{ 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({

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

@@ -1,216 +0,0 @@
-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." },
-        { type: "message", role: "assistant", content: [{ type: "output_text", text: "After." }] },
+        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
   )
@@ -485,7 +485,7 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("continues store-false reasoning while retaining the output item ID", () =>
+  it.effect("continues store-false reasoning without replaying the output-only 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,7 +515,6 @@ describe("OpenAI Responses route", () => {
           ...firstInput,
           {
             type: "reasoning",
-            id: "rs_1",
             summary: [{ type: "summary_text", text: "Thought" }],
             encrypted_content: "encrypted",
           },
@@ -1485,7 +1484,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", providerMetadata: { openai: { itemId: "msg_1" } } },
+        { type: "text-start", id: "msg_1" },
         { type: "text-delta", id: "msg_1", text: "Hello" },
         { type: "text-delta", id: "msg_1", text: "!" },
         { type: "text-end", id: "msg_1" },
@@ -1506,108 +1505,6 @@ 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(
@@ -1646,39 +1543,33 @@ describe("OpenAI Responses route", () => {
         {
           type: "text",
           text: "Checking.",
-          providerMetadata: { openai: { itemId: "msg_commentary", phase: "commentary" } },
+          providerMetadata: { openai: { phase: "commentary" } },
         },
         {
           type: "text",
           text: "Finished.",
-          providerMetadata: { openai: { itemId: "msg_final", phase: "final_answer" } },
+          providerMetadata: { openai: { phase: "final_answer" } },
         },
         {
           type: "text",
           text: "Unclassified.",
-          providerMetadata: { openai: { itemId: "msg_null", phase: null } },
+          providerMetadata: { openai: { 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,
@@ -1772,12 +1663,12 @@ describe("OpenAI Responses route", () => {
       )
 
       expect(response.events.filter((event) => event.type.startsWith("text-"))).toEqual([
-        { type: "text-start", id: "msg_1", providerMetadata: { openai: { itemId: "msg_1" } } },
+        { type: "text-start", id: "msg_1" },
         { type: "text-delta", id: "msg_1", text: "First" },
-        { type: "text-end", id: "msg_1", providerMetadata: undefined },
-        { type: "text-start", id: "msg_2", providerMetadata: { openai: { itemId: "msg_2" } } },
+        { type: "text-end", id: "msg_1" },
+        { type: "text-start", id: "msg_2" },
         { type: "text-delta", id: "msg_2", text: "Second" },
-        { type: "text-end", id: "msg_2", providerMetadata: { openai: { itemId: "msg_2" } } },
+        { type: "text-end", id: "msg_2" },
       ])
     }),
   )
@@ -1809,7 +1700,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", providerMetadata: { openai: { itemId: "msg_1" } } },
+        { type: "text", text: "Hello" },
       ])
     }),
   )
@@ -1970,7 +1861,6 @@ 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." }],
                   },
@@ -1978,6 +1868,7 @@ 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." },
@@ -2021,14 +1912,13 @@ describe("OpenAI Responses route", () => {
       )
 
       expect(prepared.body.input).toEqual([
-        { type: "message", role: "assistant", content: [{ type: "output_text", text: "Before." }] },
+        { role: "assistant", content: [{ type: "output_text", text: "Before." }] },
         {
           type: "reasoning",
-          id: "rs_1",
           encrypted_content: "encrypted-state",
           summary: [{ type: "summary_text", text: "Checked order." }],
         },
-        { type: "message", role: "assistant", content: [{ type: "output_text", text: "After." }] },
+        { role: "assistant", content: [{ type: "output_text", text: "After." }] },
       ])
     }),
   )
@@ -2160,7 +2050,6 @@ describe("OpenAI Responses route", () => {
       expect(prepared.body.input).toEqual([
         {
           type: "reasoning",
-          id: "rs_1",
           encrypted_content: "encrypted-state",
           summary: [
             { type: "summary_text", text: "First" },
@@ -2293,50 +2182,6 @@ 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")
     }),
   )
 
@@ -2403,35 +2248,6 @@ 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,7 +1,5 @@
 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"
@@ -18,7 +16,7 @@ import {
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const FIXTURES_DIR = path.resolve(__dirname, "fixtures", "recordings")
 
-type RecordedEnv = RequestExecutorService | LLMClientService | ImageClientService | Socket.WebSocketConstructor
+type RecordedEnv = RequestExecutorService | LLMClientService | ImageClientService
 
 type RecordedTestsOptions = RecordedGroupOptions & {
   readonly options?: HttpRecorder.RecorderOptions
@@ -71,7 +69,7 @@ export const recordedTests = (options: RecordedTestsOptions) =>
         ...metadata,
       }
       if (recording) {
-        if (process.env.CI !== undefined) throw new Error("Unset CI before recording cassettes")
+        if (process.env.CI !== undefined) throw new Error("Unset CI before recording HTTP cassettes")
         HttpRecorder.removeCassetteSync(cassette, { directory: FIXTURES_DIR })
       }
       const requestExecutor = RequestExecutor.layer.pipe(
@@ -83,16 +81,10 @@ 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,34 +2,12 @@
 
 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): Promise<undefined | (() => Promise<string>)> {
+export async function startChromeTrace(page: Page, name: string) {
   const directory = process.env.OPENCODE_PERFORMANCE_TRACE_DIR
-  if (!directory) return undefined
+  if (!directory) return
 
   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

@@ -1,26 +0,0 @@
-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

@@ -1,526 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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/**", "devex/**"],
+  testIgnore: "unit/**",
   outputDir: "../test-results/performance",
   fullyParallel: false,
   workers: 1,

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

@@ -1,88 +0,0 @@
-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,9 +36,6 @@ 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.getByRole("heading", { name: sessionB.title, exact: true })).toBeVisible()
+  await expect(page.getByText(sessionB.title).first()).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.getByRole("heading", { name: sessionA.title, exact: true })).toBeVisible()
+  await expect(page.getByText(sessionA.title).first()).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.getByRole("heading", { name: sessionB.title, exact: true })).toBeVisible()
+  await expect(page.getByText(sessionB.title).first()).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",
-          canonical: directory,
+          worktree: 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, canonical: directory })
+      return json(route, { id: remote ? sessionB.projectID : "project-server-a", 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}`,
-    location: { directory },
+    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(/\/api\/pty(?:\?.*)?$/, (route) =>
+  await page.route("**/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/session/timeline/observe-element-offset"
+import { observeElementOffsetReconnectAware } from "../../../src/pages/session/timeline/observe-element-offset"
 
 const rowCount = 2_000
 const rowHeight = 40

packages/app/package.json

@@ -5,7 +5,6 @@
   "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",
@@ -29,15 +28,14 @@
     "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:devex": "bun test ./e2e/performance/unit/desktop-startup.test.ts && playwright test --config e2e/performance/devex/playwright.config.ts"
+    "test:bench": "bun test ./e2e/performance/unit && playwright test --config e2e/performance/playwright.config.ts"
   },
   "license": "MIT",
   "devDependencies": {
     "@happy-dom/global-registrator": "20.0.11",
     "@playwright/test": "catalog:",
     "@sentry/vite-plugin": "catalog:",
-    "@tailwindcss/vite": "4.3.3",
+    "@tailwindcss/vite": "catalog:",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "catalog:",
     "@types/luxon": "catalog:",
@@ -46,9 +44,9 @@
     "happy-dom": "20.11.1",
     "tw-animate-css": "1.4.0",
     "typescript": "catalog:",
-    "vite": "8.2.1",
+    "vite": "catalog:",
     "vite-plugin-icons-spritesheet": "3.0.1",
-    "vite-plugin-solid": "2.11.14"
+    "vite-plugin-solid": "catalog:"
   },
   "dependencies": {
     "@corvu/drawer": "catalog:",
@@ -87,6 +85,6 @@
     "solid-js": "catalog:",
     "solid-list": "catalog:",
     "solid-presence": "0.2.0",
-    "tailwindcss": "4.3.3"
+    "tailwindcss": "catalog:"
   }
 }

packages/app/src/app.tsx

@@ -1,10 +1,12 @@
 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, Route, Router, useParams } from "@solidjs/router"
+import { type BaseRouterProps, Navigate, Route, Router, useParams, useSearchParams } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import {
   type Component,
@@ -18,37 +20,30 @@ 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 } from "@/context/tabs"
+import { TabsProvider, useTabs, type DraftTab } from "@/context/tabs"
+import { LocationProvider } from "@/context/location"
 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 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()
-}
+const NewSession = lazy(() => import("@/pages/new-session"))
 
 function TargetServerRoute(props: ParentProps) {
   const params = useParams<{ serverKey: string }>()
@@ -65,6 +60,45 @@ 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__?: {
@@ -133,11 +167,22 @@ 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 (
@@ -146,14 +191,13 @@ 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) => {
-                void import("@sentry/solid").then(({ captureException }) => captureException(error))
+                Sentry.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 "@/session/helpers"
-import { useSessionLayout } from "@/session/session-layout"
+import { createSessionTabs } from "@/pages/session/helpers"
+import { useSessionLayout } from "@/pages/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 "@/session/helpers"
+import { createSessionTabs } from "@/pages/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-context-usage.tsx

@@ -10,8 +10,8 @@ import { useData } from "@/context/server"
 import { useLanguage } from "@/context/language"
 import { useProviders } from "@/hooks/use-providers"
 import { useWorkspaceLocation } from "@/context/location"
-import { useSessionLayout } from "@/session/session-layout"
-import { createSessionTabs } from "@/session/helpers"
+import { useSessionLayout } from "@/pages/session/session-layout"
+import { createSessionTabs } from "@/pages/session/helpers"
 
 interface SessionContextUsageProps {
   variant?: "button" | "indicator"

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

@@ -0,0 +1,5 @@
+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/session/open-in-app-v2.tsx

@@ -6,9 +6,9 @@ import { Menu } from "@opencode-ai/ui/menu"
 import { SplitButton, SplitButtonAction, SplitButtonMenuTrigger } from "@opencode-ai/ui/split-button"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { useLanguage } from "@/context/language"
-import { type OpenApp, useOpenInApp } from "@/session/files/open-in-app"
+import { type OpenApp, useOpenInApp } from "@/components/session/open-in-app"
 
-export function OpenInAppButton(props: { directory: () => string }) {
+export function OpenInAppV2(props: { directory: () => string }) {
   const language = useLanguage()
   const state = useOpenInApp(props)
 

packages/app/src/components/session/session-context-tab.tsx

@@ -17,7 +17,7 @@ import { useLanguage } from "@/context/language"
 import { useProviders } from "@/hooks/use-providers"
 import { useWorkspaceLocation } from "@/context/location"
 import { useServerSDK } from "@/context/server-sdk"
-import { useSessionLayout } from "@/session/session-layout"
+import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionContextFormatter } from "./session-context-format"
 
 function Stat(props: { label: string; value: JSX.Element }) {

packages/app/src/components/session/session-header-actions.tsx

@@ -4,7 +4,7 @@ import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Keybind } from "@opencode-ai/ui/keybind"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 
-export type SessionHeaderActionsState = {
+export type SessionHeaderV2ActionsState = {
   status?: { label: string; content: () => JSX.Element }
   reviewLabel: string
   reviewKeybind: string[]
@@ -13,7 +13,7 @@ export type SessionHeaderActionsState = {
   onReviewToggle: () => void
 }
 
-export function SessionHeaderActions(props: { state: SessionHeaderActionsState }) {
+export function SessionHeaderV2Actions(props: { state: SessionHeaderV2ActionsState }) {
   return (
     <div class="flex items-center gap-2">
       <Show when={props.state.status}>

packages/app/src/components/session/session-header.tsx

@@ -4,11 +4,11 @@ import { Portal } from "solid-js/web"
 import { useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
-import { useSessionLayout } from "@/session/session-layout"
-import { reviewTooltipKeybind } from "@/components/command-tooltip-keybind"
-import { StatusPopoverV2 } from "@/components/status-popover"
-import { useTitlebarRightMount } from "@/components/titlebar"
-import { SessionHeaderActions, type SessionHeaderActionsState } from "./session-header-actions"
+import { useSessionLayout } from "@/pages/session/session-layout"
+import { StatusPopoverV2 } from "../status-popover"
+import { reviewTooltipKeybind } from "../command-tooltip-keybind"
+import { useTitlebarRightMount } from "../titlebar"
+import { SessionHeaderV2Actions, type SessionHeaderV2ActionsState } from "./session-header-actions"
 
 export function SessionHeader() {
   const command = useCommand()
@@ -19,7 +19,7 @@ export function SessionHeader() {
   const status = settings.visibility.status
   const isDesktop = createMediaQuery("(min-width: 768px)")
 
-  const actions = createMemo<SessionHeaderActionsState>(() => ({
+  const v2ActionsState = createMemo<SessionHeaderV2ActionsState>(() => ({
     status: status() ? { label: language.t("status.popover.trigger"), content: () => <StatusPopoverV2 /> } : undefined,
     reviewLabel: language.t("command.review.toggle"),
     reviewKeybind: reviewTooltipKeybind(command),
@@ -34,7 +34,7 @@ export function SessionHeader() {
     <Show when={rightMount()} keyed>
       {(mount) => (
         <Portal mount={mount}>
-          <SessionHeaderActions state={actions()} />
+          <SessionHeaderV2Actions state={v2ActionsState()} />
         </Portal>
       )}
     </Show>

packages/app/src/components/session/session-sortable-tab-v2.tsx

@@ -9,7 +9,7 @@ import { useLanguage } from "@/context/language"
 import { useCommand } from "@/context/command"
 import { FileVisual } from "./session-sortable-tab"
 
-export function SortableTab(props: {
+export function SortableTabV2(props: {
   tab: string
   index: number
   temporary?: boolean

packages/app/src/components/session/session-sortable-terminal-tab-v2.tsx

@@ -4,12 +4,12 @@ import { createStore } from "solid-js/store"
 import { useSortable } from "@dnd-kit/solid/sortable"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { Menu } from "@opencode-ai/ui/menu"
-import { isDefaultTitle } from "@/context/terminal-title"
+import { isDefaultTitle as isDefaultTerminalTitle } from "@/context/terminal-title"
 import { useTerminal, type LocalPTY } from "@/context/terminal"
 import { useLanguage } from "@/context/language"
-import { focusTerminalById } from "@/session/helpers"
+import { focusTerminalById } from "@/pages/session/helpers"
 
-export function SortableTerminalTab(props: { terminal: LocalPTY; index: number; onClose?: () => void }): JSX.Element {
+export function SortableTerminalTabV2(props: { terminal: LocalPTY; index: number; onClose?: () => void }): JSX.Element {
   const terminal = useTerminal()
   const language = useLanguage()
   const sortable = useSortable({
@@ -29,15 +29,15 @@ export function SortableTerminalTab(props: { terminal: LocalPTY; index: number;
   let blurFrame: number | undefined
   let editRequested = false
 
-  const defaultTitle = () => {
+  const isDefaultTitle = () => {
     const number = props.terminal.titleNumber
     if (!Number.isFinite(number) || number <= 0) return false
-    return isDefaultTitle(props.terminal.title, number)
+    return isDefaultTerminalTitle(props.terminal.title, number)
   }
 
   const label = () => {
     language.locale()
-    if (props.terminal.title && !defaultTitle()) return props.terminal.title
+    if (props.terminal.title && !isDefaultTitle()) return props.terminal.title
 
     const number = props.terminal.titleNumber
     if (Number.isFinite(number) && number > 0) return language.t("terminal.title.numbered", { number })
@@ -131,7 +131,9 @@ export function SortableTerminalTab(props: { terminal: LocalPTY; index: number;
               focus()
             }}
             onMiddleClick={close}
-            closeButton={<Tabs.CloseButton class="h-5 w-5" onClick={close} aria-label={language.t("terminal.close")} />}
+            closeButton={
+              <Tabs.CloseButton class="h-5 w-5" onClick={close} aria-label={language.t("terminal.close")} />
+            }
             hideCloseButton
           >
             <span

packages/app/src/components/terminal.tsx

@@ -15,7 +15,9 @@ 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+`"
@@ -177,6 +179,7 @@ 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",
@@ -528,6 +531,14 @@ 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
@@ -551,21 +562,23 @@ export const Terminal = (props: TerminalProps) => {
         if (disposed) return
         drop?.()
 
-        const socket = await serverSDK.pty
-          .connect({
-            ptyID: id,
-            location: { directory },
+        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,
             cursor: seek,
-          })
-          .catch((err) => {
-            fail(err)
-            return undefined
-          })
-        if (!socket || once.value) return
-        if (disposed) {
-          socket.close(1000)
-          return
-        }
+            ticket,
+          }),
+        )
+        socket.binaryType = "arraybuffer"
         ws = socket
 
         const handleOpen = () => {

packages/app/src/components/titlebar.tsx

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

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; parentID: null }> = []
+    const calls: Array<{ cursor?: string }> = []
     const result = await loadHomeSessionIndex(async (input) => {
       calls.push(input)
       if (!input.cursor) return { data: first, cursor: { next: "next" } }
@@ -29,7 +29,6 @@ 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,12 +6,7 @@ export const HOME_V2_SESSION_PAGE_LIMIT = 5_000
 
 export async function loadHomeSessionIndex(
   list: (
-    input: {
-      limit: number
-      order: "desc"
-      parentID: null
-      cursor?: string
-    },
+    input: { limit: number; order: "desc"; cursor?: string },
     options: { signal?: AbortSignal },
   ) => Promise<SessionsResponse>,
   signal?: AbortSignal,
@@ -24,7 +19,6 @@ export async function loadHomeSessionIndex(
       {
         limit: HOME_V2_SESSION_PAGE_LIMIT,
         order: "desc",
-        parentID: null,
         ...(cursor ? { cursor } : {}),
       },
       { signal },
@@ -35,7 +29,8 @@ export async function loadHomeSessionIndex(
   }
 }
 
-// Keep this filter for locally known sessions merged into the fetched index.
+// 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.
 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, createPtyClient, type ClientConnectionStatus } from "@opencode-ai/client/solid"
+import { createClientConnection, 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,7 +61,6 @@ type ServerSDKBase = {
   scope: ServerScope
   url: string
   api: ServerApi
-  pty: ReturnType<typeof createPtyClient>
   connection: {
     status: Accessor<ServerConnectionStatus>
     attempt: Accessor<number>
@@ -73,7 +72,6 @@ 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, {
@@ -95,7 +93,6 @@ function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerS
     scope,
     url: server.http.url,
     api,
-    pty,
     connection,
     event: events.event,
   }

packages/app/src/desktop.ts

@@ -1,9 +0,0 @@
-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, preloadRoute } from "./app"
+export { AppBaseProviders, AppInterface } 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

@@ -1,64 +0,0 @@
-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,8 +1,10 @@
 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"
@@ -61,11 +63,7 @@ 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) => {
-        void import("@/components/settings-v2/dialog-server-v2").then(({ DialogServerV2 }) => {
-          void dialog.show(() => <DialogServerV2 mode="edit" server={conn} />)
-        })
-      },
+      edit: (conn: ServerConnection.Http) => dialog.show(() => <DialogServerV2 mode="edit" server={conn} />),
       focus: home.selection.focusServer,
     },
     project: {

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

@@ -1,38 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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,19 +13,20 @@ import type { LocalProject } from "@/context/layout"
 import { useLanguage } from "@/context/language"
 import { ServerConnection } from "@/context/servers"
 import { sessionHasOpenTab, useTabs } from "@/context/tabs"
-import { errorMessage } from "@/pages/layout/helpers"
+import { compareSessionTime, displayName, errorMessage, projectForSession } 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
-// Keep the large immutable result opaque so Solid Query does not recursively unwrap every session on mount.
-const selectSessions = (sessions: SessionInfo[]) => () => sessions
+export type HomeSessionRecord = {
+  session: SessionInfo
+  project: LocalProject
+  projectName: string
+}
+
 export type HomeSessionGroup = {
   id: "today" | "yesterday" | "older"
   title: string
@@ -40,11 +41,13 @@ 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()
-    return project ? directories(project) : [selected]
+    if (!project) return home.project.list().flatMap(directories)
+    return directories(project)
   })
+  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()
@@ -58,14 +61,13 @@ 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(),
     )
@@ -75,6 +77,7 @@ export function createHomeSessionsController(home: HomeController) {
       sessions: indexedSessions,
       projectDirectories,
       projects: home.project.list,
+      projectByID,
     }),
   )
   const records = createMemo(() => allRecords().slice(0, HOME_SESSION_LIMIT))
@@ -151,7 +154,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)
@@ -199,6 +202,30 @@ 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}`
 }
@@ -239,7 +266,6 @@ 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,14 +1,13 @@
-import { lazy, Show, Suspense, type ParentProps } from "solid-js"
+import { 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: false })
+  const [state, setState] = createStore({ debugTools: true })
 
   const update: TitlebarUpdate = {
     get version() {
@@ -42,9 +41,7 @@ export default function Layout(props: ParentProps) {
         <Suspense>{props.children}</Suspense>
       </main>
       <Show when={import.meta.env.DEV && state.debugTools}>
-        <Suspense>
-          <DebugBar inline />
-        </Suspense>
+        <DebugBar inline />
       </Show>
       <ToastRegion />
     </div>

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

@@ -1,39 +1,33 @@
 import { createMemo, type Accessor } from "solid-js"
 import { useGlobal, useServerCtx } from "@/context/global"
-import { sessionPermissionRequest, sessionQuestionForm } from "@/session/requests/session-request-tree"
+import { sessionPermissionRequest, sessionQuestionForm } from "@/pages/session/composer/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(sessions(), ctx.data.session.permission.list, sessionId(), (item) => {
-      return !permission.autoResponds(item, directory())
-    })
+    return !!sessionPermissionRequest(
+      ctx.data.session.list(),
+      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(sessions(), data.session.form.list, sessionId())
+    return !!sessionQuestionForm(data.session.list(), 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 "@/session/composer"
-import { createPromptModelSelection } from "@/session/composer/prompt-model-selection"
-import { useSessionKey } from "@/session/session-layout"
-import { useComposerCommands } from "@/session/commands/use-composer-commands"
+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"
 
 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/new-session/new-session-layout"
+import { NEW_SESSION_CONTENT_WIDTH } from "@/pages/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,20 +39,14 @@ describe("new session workspace selection", () => {
     expect(normalizeNewSessionWorktree("main", "C:\\Repo\\", "c:/repo")).toBe("main")
   })
 
-  test("resolves the branch from the active location", () => {
+  test("falls back to the local branch for main, create, and unknown worktrees", () => {
     const branch = (worktree: string) => (worktree === "/project/feature" ? "feature" : undefined)
-    expect(resolveNewSessionBranch({ worktree: "main", directory: "/project/feature", worktreeBranch: branch })).toBe(
+    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(
       "feature",
     )
-    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,
-    )
+    expect(resolveNewSessionBranch({ worktree: "/missing", local: "dev", worktreeBranch: branch })).toBe("dev")
   })
 
   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
-  directory: string
+  local?: string
   worktreeBranch: (worktree: string) => string | undefined
 }) {
-  const directory = input.worktree === "main" || input.worktree === "create" ? input.directory : input.worktree
-  return input.worktreeBranch(directory)
+  if (input.worktree === "main" || input.worktree === "create") return input.local
+  return input.worktreeBranch(input.worktree) ?? input.local
 }
 
 export function resolveNewSessionGit(input: { projectVcs?: string; branch?: string }) {
@@ -95,10 +95,11 @@ 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(),
-      directory: sdk().directory,
+      local: localBranch(),
       worktreeBranch: (worktree) => data.location.vcs.info({ directory: worktree })?.branch.current,
     }),
   )

packages/app/src/pages/session/composer/session-background-dock.tsx

@@ -3,7 +3,7 @@ import { useCommand } from "@/context/command"
 import { Keybind } from "@opencode-ai/ui/keybind"
 import { For, createMemo } from "solid-js"
 import { createStore } from "solid-js/store"
-import { SessionComposerPullout } from "@/session/composer/session-composer-pullout"
+import { SessionComposerPullout } from "./session-composer-pullout"
 
 export function SessionBackgroundDock(props: {
   blocking: { type: "shell" | "subagent"; id?: string; label?: string }[]

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

@@ -1,3 +1,4 @@
+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/pages/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 "@/session/handoff"
+import { getSessionHandoff, setSessionHandoff } from "@/pages/session/handoff"
 import type { SessionComposerController } from "./session-composer-state"
 
 export type SessionComposerFollowupDock = {

packages/app/src/pages/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 "@/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 { 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 type { SessionComposerRegionController } from "./session-composer-region-controller"
 
 type SessionComposerRegionState = Pick<

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