fix(tui): show the default model for sessions stored without one

Sessions created through the raw API with no model (agent: null, model: null) run fine on the server's default model, but the prompt status line rendered only the stored session model and claimed 'No provider selected - Connect a provider' even with providers connected. The session selection now falls back to GET /api/model/default, gated on the model still being available, so 'No provider selected' appears only when there genuinely is no usable provider.
fix(core): accept null as omitted for optional tool inputs
2026-08-20 06:53:27 -04:00 · 2026-08-19 18:34:40 -04:00 · 2026-08-19 18:31:04 -04:00 · 2026-08-19 18:30:02 -04:00
407 changed files with 16001 additions and 13777 deletions
@@ -1,5 +0,0 @@
---
-"@opencode-ai/core": patch
---
-
-Prompt and synthetic inbox ID reuse is now idempotent: reusing an ID within the same Session succeeds and returns the first admission, ignoring the retried payload, metadata, and delivery mode. Previously reuse with a differing payload failed with a conflict. Cross-Session and cross-type reuse still fail, and control items keep their operation-specific conflict behavior.
@@ -1,5 +0,0 @@
---
-"@opencode-ai/core": patch
---
-
-Apply shared Session model-request preparation to transient generation.
@@ -1,5 +0,0 @@
---
-"@opencode-ai/core": patch
---
-
-Simplify interrupt continuation: the steer-scoped resume decision now lives in SessionExecution as a post-cleanup inbox check, and the run coordinator drops its continuation state machine. Wakes arriving during cancellation cleanup now restart a normal full drain, and interrupting an idle session with continue now resumes pending steering input. Recovery-applied moves now end with the same full wake as inbox-admitted moves, retrying any stranded inbox work at the new location. Interrupting with continue now also resumes a next-in-line control item: between-turn manual compaction and moves run under any drain scope, while queued prompts remain parked.
@@ -176,7 +176,7 @@ const table = sqliteTable("session", {

 - Keep durable events minimal: record irreducible new facts and do not repeat state derivable by folding the ordered aggregate history. Enrich projections and read models with previous or derived state when consumers need self-contained views.
 - Keep durable prompt admission separate from model execution. `Session.prompt(...)` publishes `session.inbox.enqueued`, whose projection inserts one durable `session_inbox` row, before scheduling advisory `SessionExecution.wake(sessionID)` unless `resume: false` requests admit-only behavior. Delivery publishes `session.inbox.delivered`; its projection consumes the inbox row and inserts the visible message in the same transaction. `session_inbox` stores only unconsumed work.
- Reusing a Session ID adopts the existing Session. Reusing a user or synthetic inbox item ID is idempotent when Session and type match: the first admission wins and the retried payload, metadata, and delivery mode are ignored, whether the item is still pending or already delivered (reconciled from the projected message without retained enqueue history). Cross-Session or cross-type reuse fails. Control items keep their operation-specific conflict behavior.
+- Reusing a Session ID adopts the existing Session. While a user or synthetic inbox item is pending, reusing its ID reconciles only when Session, type, complete payload, metadata, and delivery match; conflicting reuse fails. Once delivered, retry reconciliation for those message-producing items uses the projected message and does not require retained enqueue history or the original delivery mode. Control items keep their operation-specific conflict behavior.
 - Keep `SessionExecution` process-global and Session-ID based. Its local implementation owns the process-local Session coordinator and discovers placement through `SessionStore` plus `LocationServiceMap.get(session.location)` only when a drain starts; no layer should take a Session ID. V2 interruption targets the active process-local ownership chain for that Session; interruption of a known but idle or locally unowned Session is a no-op, while the public API rejects an unknown Session.
 - Keep `SessionRunner`, model resolution, tool registry, permissions, and filesystem Location-scoped. Omitted `Location.workspaceID` means implicit-local placement; explicit workspace identity remains reserved for future placement semantics.
 - Preserve one explicit `llm.stream(request)` call per Physical Attempt and reload projected history before durable continuation. A logical Step may use generic pre-output retries, one full-context retry after continuation rejection, incomplete-stream continuation, or one overflow-compaction rebuild. Generic retries retain the logical step number and do not consume another agent-step allowance. Do not delegate orchestration to an in-memory tool loop.
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-JEqi00PCle+o5OfBlJJaZtXd+4sYB3o+rvYiESlN4dY=",
-    "aarch64-linux": "sha256-zk3Uk1SQyeRrQ7BuFwlOnQAptUHIkq+oPdfd+sTEq5U=",
-    "aarch64-darwin": "sha256-3BOd3EcqimoG3rTI6lTHe91YVlCoEi8/68eT1lbOi0c=",
-    "x86_64-darwin": "sha256-X7wGmjiMloF5Zhuc20kAxLC+tl613YNXRgA+dQjP2WM="
+    "x86_64-linux": "sha256-IxkSw0gK/qkMHZGVHqjwgM9BKhzbQX6hyF9SWUNtpzg=",
+    "aarch64-linux": "sha256-YVjpbil0QswVwi6NtVYFq3xCqpsfveG1chlNVCVI0MU=",
+    "aarch64-darwin": "sha256-CdL2mI84pawH2H5i9qu8A6IWbkmKOYHlJS+DI/Mafdw=",
+    "x86_64-darwin": "sha256-NtswwfU5WYv99bEmI4XeLwjhBGcS9ZMYLRo4MQRNtLo="
  }
 }
@@ -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",
@@ -38,10 +37,10 @@
      "packages/slack"
    ],
    "catalog": {
-      "@effect/opentelemetry": "4.0.0-rc.110",
-      "@effect/platform-node": "4.0.0-rc.110",
-      "@effect/platform-node-shared": "4.0.0-rc.110",
-      "@effect/sql-sqlite-bun": "4.0.0-rc.110",
+      "@effect/opentelemetry": "4.0.0-beta.107",
+      "@effect/platform-node": "4.0.0-beta.107",
+      "@effect/platform-node-shared": "4.0.0-beta.107",
+      "@effect/sql-sqlite-bun": "4.0.0-beta.107",
      "@npmcli/arborist": "9.4.0",
      "@types/bun": "1.3.13",
      "@types/cross-spawn": "6.0.6",
@@ -72,7 +71,7 @@
      "dompurify": "3.3.1",
      "drizzle-kit": "1.0.0-rc.2",
      "drizzle-orm": "1.0.0-rc.2",
-      "effect": "4.0.0-rc.110",
+      "effect": "4.0.0-beta.107",
      "ai": "6.0.168",
      "cross-spawn": "7.0.6",
      "hono": "4.10.7",
@@ -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 },
 })
 ```

@@ -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 =
  | {
@@ -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,
@@ -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
@@ -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,
@@ -162,14 +159,6 @@ export const coreFields = {
  tools: optionalArray(Tool),
  tool_choice: Schema.optional(ToolChoice),
  store: Schema.optional(Schema.Boolean),
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.String)),
-  safety_identifier: Schema.optional(Schema.String),
-  stream_options: Schema.optional(
-    Schema.Struct({
-      include_obfuscation: Schema.optional(Schema.Boolean),
-    }),
-  ),
-  top_logprobs: Schema.optional(Schema.Int.check(Schema.isBetween({ minimum: 0, maximum: 20 }))),
  truncation: Schema.optional(OpenResponsesOptions.TruncationSchema),
  service_tier: Schema.optional(OpenResponsesOptions.ServiceTierSchema),
  prompt_cache_key: Schema.optional(Schema.String),
@@ -190,8 +179,6 @@ export const coreFields = {
  parallel_tool_calls: Schema.optional(Schema.Boolean),
  temperature: Schema.optional(Schema.Number),
  top_p: Schema.optional(Schema.Number),
-  presence_penalty: Schema.optional(Schema.Number),
-  frequency_penalty: Schema.optional(Schema.Number),
 }

 const OpenResponsesBody = Schema.Struct({
@@ -301,20 +288,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 +353,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 +465,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 +511,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) {
@@ -610,12 +578,6 @@ const lowerOptions = (request: LLMRequest) => {
  return {
    ...(options.instructions ? { instructions: options.instructions } : {}),
    ...(options.store !== undefined ? { store: options.store } : {}),
-    ...(options.metadata ? { metadata: options.metadata } : {}),
-    ...(options.safetyIdentifier ? { safety_identifier: options.safetyIdentifier } : {}),
-    ...(options.streamOptions?.includeObfuscation !== undefined
-      ? { stream_options: { include_obfuscation: options.streamOptions.includeObfuscation } }
-      : {}),
-    ...(options.topLogprobs !== undefined ? { top_logprobs: options.topLogprobs } : {}),
    ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
    ...(options.include ? { include: options.include } : {}),
    ...(options.reasoningEffort || options.reasoningSummary
@@ -665,8 +627,6 @@ export const fromRequestWithExtension = Effect.fn("OpenResponses.fromRequestWith
    max_output_tokens: generation?.maxTokens,
    temperature: generation?.temperature,
    top_p: generation?.topP,
-    presence_penalty: generation?.presencePenalty,
-    frequency_penalty: generation?.frequencyPenalty,
    ...lowerOptions(request),
  }
 })
@@ -735,7 +695,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 +924,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 +937,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 +988,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 +1004,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 +1047,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 +1074,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(
@@ -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()) {
@@ -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)),
@@ -47,17 +47,9 @@ export const AllowedTools = Schema.Struct({
 })
 export type AllowedTools = typeof AllowedTools.Type

-export const StreamOptions = Schema.Struct({
-  includeObfuscation: Schema.optional(Schema.Boolean),
-})
-
 export const Options = Schema.Struct({
  instructions: Schema.optional(Schema.String),
  store: Schema.optional(Schema.Boolean),
-  metadata: Schema.optional(Schema.Record(Schema.String, Schema.String)),
-  safetyIdentifier: Schema.optional(Schema.String),
-  streamOptions: Schema.optional(StreamOptions),
-  topLogprobs: Schema.optional(Schema.Int.check(Schema.isBetween({ minimum: 0, maximum: 20 }))),
  reasoningEffort: Schema.optional(ReasoningEffort),
  reasoningSummary: Schema.optional(Schema.Literals(["auto", "concise", "detailed"])),
  include: Schema.optional(Schema.Array(ResponseIncludableSchema)),
@@ -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<
@@ -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,
  }
@@ -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)
 }
@@ -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)
@@ -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)
 }
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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)

@@ -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)
@@ -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)
@@ -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 },
  }
@@ -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)
@@ -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
@@ -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(
@@ -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),
@@ -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)
    }),
  )
 })
@@ -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 } })
@@ -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",
@@ -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,
      })
    }),
  )
@@ -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(
@@ -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
@@ -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({
@@ -182,10 +126,6 @@ describe("Open Responses-compatible route", () => {
        providerOptions: {
          reasoningEffort: "low",
          store: true,
-          metadata: { environment: "test" },
-          safetyIdentifier: "user_123",
-          streamOptions: { includeObfuscation: false },
-          topLogprobs: 3,
          truncation: "auto",
          allowedTools: { toolNames: ["lookup"] },
          maxToolCalls: 2,
@@ -196,7 +136,6 @@ describe("Open Responses-compatible route", () => {
        LLM.request({
          model,
          prompt: "Think.",
-          generation: { presencePenalty: 0.2, frequencyPenalty: -0.1 },
          tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
        }),
      )
@@ -204,12 +143,6 @@ describe("Open Responses-compatible route", () => {
      expect(prepared.body).toMatchObject({
        reasoning: { effort: "low" },
        store: true,
-        metadata: { environment: "test" },
-        safety_identifier: "user_123",
-        stream_options: { include_obfuscation: false },
-        top_logprobs: 3,
-        presence_penalty: 0.2,
-        frequency_penalty: -0.1,
        truncation: "auto",
        tool_choice: {
          type: "allowed_tools",
@@ -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",
          },
@@ -1285,7 +1284,6 @@ describe("OpenAI Responses route", () => {
          model: OpenAI.configure({ baseURL: "https://api.openai.test/v1/", apiKey: "test" }).model("gpt-5.2"),
          prompt: "think",
          promptCacheKey: "session_123",
-          generation: { presencePenalty: 0.25, frequencyPenalty: -0.25 },
          tools: [
            ToolDefinition.make({ name: "read", description: "Read a file", inputSchema: { type: "object" } }),
            ToolDefinition.make({ name: "grep", description: "Search files", inputSchema: { type: "object" } }),
@@ -1295,10 +1293,6 @@ describe("OpenAI Responses route", () => {
            reasoningEffort: "high",
            reasoningSummary: "auto",
            include: ["reasoning.encrypted_content"],
-            metadata: { environment: "test", tenant: "acme" },
-            safetyIdentifier: "user_123",
-            streamOptions: { includeObfuscation: false },
-            topLogprobs: 5,
            truncation: "disabled",
            allowedTools: { toolNames: ["read", "grep"], mode: "required" },
            maxToolCalls: 4,
@@ -1312,12 +1306,6 @@ describe("OpenAI Responses route", () => {
      expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
      expect(prepared.body.reasoning).toEqual({ effort: "high", summary: "auto" })
      expect(prepared.body.text).toEqual({ verbosity: "low" })
-      expect(prepared.body.metadata).toEqual({ environment: "test", tenant: "acme" })
-      expect(prepared.body.safety_identifier).toBe("user_123")
-      expect(prepared.body.stream_options).toEqual({ include_obfuscation: false })
-      expect(prepared.body.top_logprobs).toBe(5)
-      expect(prepared.body.presence_penalty).toBe(0.25)
-      expect(prepared.body.frequency_penalty).toBe(-0.25)
      expect(prepared.body.truncation).toBe("disabled")
      expect(prepared.body.tool_choice).toEqual({
        type: "allowed_tools",
@@ -1485,7 +1473,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 +1494,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 +1532,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 +1652,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 +1689,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 +1850,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 +1857,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 +1901,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 +2039,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 +2171,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 +2237,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 = {
@@ -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
@@ -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)
@@ -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)
-  })
-})
@@ -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
-}
@@ -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" }],
-})
@@ -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,
@@ -179,7 +179,7 @@ test.describe("timeline adverse visual stability", () => {
        userMessage(),
        assistantMessage([
          shell(shellID, "completed", wideLines(15)),
-          toolPart(contextIDs[0]!, "read", "completed", { path: "src/a.ts" }),
+          toolPart(contextIDs[0]!, "read", "completed", { filePath: "src/a.ts" }),
          toolPart(contextIDs[1]!, "glob", "completed", { path: ".", pattern: "**/*.ts" }),
          textPart(followingID, "Following responsive timeline content that wraps on narrow screens."),
        ]),
@@ -1,5 +1,4 @@
 import { test } from "@playwright/test"
-import { createTwoFilesPatch } from "diff"
 import {
  defineVisualRegions,
  reportVisualStability,
@@ -19,20 +18,16 @@ import {
 } from "./fixture"

 const profiles = [
-  {
-    name: "edit",
-    tool: "edit",
-    input: { path: "src/edit.ts", oldString: "export const value = 1", newString: "export const value = 2" },
-  },
+  { name: "edit", tool: "edit", input: { filePath: "src/edit.ts" } },
  {
    name: "multi patch",
-    tool: "patch",
-    input: { patchText: "Update generated files" },
+    tool: "apply_patch",
+    input: { files: ["src/a.ts", "src/b.ts", "src/old.ts", "src/moved.ts"] },
  },
 ] as const

 for (const profile of profiles) {
-  test(`stabilizes ${profile.name} streaming to completed`, async ({ page }, testInfo) => {
+  test(`stabilizes ${profile.name} pending to completed`, async ({ page }, testInfo) => {
    const partID = `prt_file_matrix_${profiles.indexOf(profile)}`
    const followingID = `prt_file_matrix_following_${profiles.indexOf(profile)}`
    const timeline = await setupTimeline(page, {
@@ -40,7 +35,7 @@ for (const profile of profiles) {
        userMessage(),
        assistantMessage(
          [
-            toolPart(partID, profile.tool, "streaming", profile.input),
+            toolPart(partID, profile.tool, "pending", profile.input),
            textPart(followingID, `Following ${profile.name}`),
          ],
          { completed: false },
@@ -94,27 +89,34 @@ function completedPart(partID: string, profile: (typeof profiles)[number]) {
  if (profile.tool === "edit") {
    return toolPart(partID, profile.tool, "completed", profile.input, {
      metadata: {
-        files: [patchFile("src/edit.ts", "modified", 50)],
+        filediff: {
+          file: "src/edit.ts",
+          additions: 50,
+          deletions: 50,
+          before: source(50, false),
+          after: source(50, true),
+        },
      },
    })
  }
  const files = [
-    patchFile("src/a.ts", "modified", 20),
-    patchFile("src/b.ts", "added", 20),
-    patchFile("src/old.ts", "deleted", 20),
+    patchFile("src/a.ts", "update"),
+    patchFile("src/b.ts", "add"),
+    patchFile("src/old.ts", "delete"),
+    { ...patchFile("src/moved.ts", "move"), move: "src/new-place.ts" },
  ]
  return toolPart(partID, profile.tool, "completed", profile.input, { metadata: { files } })
 }

-function patchFile(file: string, status: "added" | "modified" | "deleted", lines: number) {
-  const before = status === "added" ? "" : source(lines, false)
-  const after = status === "deleted" ? "" : source(lines, true)
+function patchFile(filePath: string, type: "add" | "update" | "delete" | "move") {
  return {
-    file,
-    status,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
-    additions: status === "deleted" ? 0 : lines,
-    deletions: status === "added" ? 0 : lines,
+    filePath,
+    relativePath: filePath,
+    type,
+    additions: type === "delete" ? 0 : 20,
+    deletions: type === "add" ? 0 : 20,
+    before: type === "add" ? undefined : source(20, false),
+    after: type === "delete" ? undefined : source(20, true),
  }
 }

@@ -1,5 +1,4 @@
 import { expect, test } from "@playwright/test"
-import { createTwoFilesPatch } from "diff"
 import {
  defineVisualRegions,
  reportVisualStability,
@@ -21,13 +20,13 @@ import {
 test("adds patch files incrementally without resetting outer expansion", async ({ page }, testInfo) => {
  const patchID = "prt_incremental_01_patch"
  const followingID = "prt_incremental_02_following"
-  const first = patchFile("src/a.ts", "modified")
+  const first = patchFile("src/a.ts", "update")
  const timeline = await setupTimeline(page, {
    messages: [
      userMessage(),
      assistantMessage(
        [
-          toolPart(patchID, "patch", "running", { patchText: "Update files" }, { metadata: { files: [first] } }),
+          toolPart(patchID, "apply_patch", "running", { files: [first.filePath] }, { metadata: { files: [first] } }),
          textPart(followingID, "Following incremental patch"),
        ],
        { completed: false },
@@ -56,15 +55,15 @@ test("adds patch files incrementally without resetting outer expansion", async (
    },
  })
  await startVisualProbe(page, regions)
-  const second = patchFile("src/b.ts", "added")
-  const third = patchFile("src/old.ts", "deleted")
+  const second = patchFile("src/b.ts", "add")
+  const third = patchFile("src/old.ts", "delete")
  await timeline.send(
    partUpdated(
      toolPart(
        patchID,
-        "patch",
+        "apply_patch",
        "running",
-        { patchText: "Update files" },
+        { files: [first.filePath, second.filePath] },
        { metadata: { files: [first, second] } },
      ),
    ),
@@ -74,9 +73,9 @@ test("adds patch files incrementally without resetting outer expansion", async (
    partUpdated(
      toolPart(
        patchID,
-        "patch",
+        "apply_patch",
        "completed",
-        { patchText: "Update files" },
+        { files: [first.filePath, second.filePath, third.filePath] },
        { metadata: { files: [first, second, third] } },
      ),
    ),
@@ -107,15 +106,15 @@ test("adds patch files incrementally without resetting outer expansion", async (
  await expect(page.locator('[data-scope="apply-patch"] [data-type="delete"]')).toBeVisible()
 })

-function patchFile(file: string, status: "added" | "modified" | "deleted") {
-  const before = status === "added" ? "" : source(false)
-  const after = status === "deleted" ? "" : source(true)
+function patchFile(filePath: string, type: "add" | "update" | "delete") {
  return {
-    file,
-    status,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
-    additions: status === "deleted" ? 0 : 4,
-    deletions: status === "added" ? 0 : 3,
+    filePath,
+    relativePath: filePath,
+    type,
+    additions: type === "delete" ? 0 : 4,
+    deletions: type === "add" ? 0 : 3,
+    before: type === "add" ? undefined : source(false),
+    after: type === "delete" ? undefined : source(true),
  }
 }

@@ -35,7 +35,7 @@ describe("timeline fixture validation", () => {
        userMessage(),
        {
          ...assistantMessage(),
-          content: [{ type: "tool", id: "call_invalid", name: "shell", state: { status: "completed" } }],
+          content: [{ type: "tool", id: "call_invalid", name: "bash", state: { status: "completed" } }],
        } as never,
      ]),
    ).toThrow()
@@ -60,11 +60,12 @@ if (false) {
  const userSeed = { id: "prt_type_user", type: "text", text: "typed" } satisfies PartSeed<"user">
  userMessage([userSeed])

-  // @ts-expect-error Tool completion fields are not valid while streaming.
-  toolPart("prt_invalid_streaming", "shell", "streaming", {}, { output: "impossible" })
-  toolPart("prt_valid_running", "shell", "running", {}, { output: "progressive output" })
+  // @ts-expect-error Tool completion fields are not valid while pending.
+  toolPart("prt_invalid_pending", "bash", "pending", {}, { output: "impossible" })
+  // @ts-expect-error Tool completion fields are not valid while running.
+  toolPart("prt_invalid_running", "bash", "running", {}, { output: "impossible" })
  // @ts-expect-error Tool error fields are not valid after completion.
-  toolPart("prt_invalid_completed", "shell", "completed", {}, { error: "impossible" })
+  toolPart("prt_invalid_completed", "bash", "completed", {}, { error: "impossible" })

  assistantMessage([
    // @ts-expect-error Agent references belong to user messages, not assistant messages.
@@ -60,17 +60,17 @@ type ReasoningSeed = {
 type ToolSeed = {
  id: string
  type: "tool"
-  name: string
+  callID: string
+  tool: string
  messageID?: string
  executed?: boolean
  providerState?: Record<string, unknown>
  providerResultState?: Record<string, unknown>
  state:
-    | { status: "streaming"; input: Record<string, unknown>; raw: string }
+    | { status: "pending"; input: Record<string, unknown>; raw: string }
    | {
        status: "running"
        input: Record<string, unknown>
-        output?: string
        title?: string
        metadata: Record<string, unknown>
        time: { start: number }
@@ -100,10 +100,10 @@ export type PartSeed<Owner extends "user" | "assistant"> = Owner extends "user"
  ? TextSeed | FileSeed | AgentSeed
  : TextSeed | ReasoningSeed | ToolSeed

-type ToolOptions<State extends ToolStatus> = State extends "streaming"
+type ToolOptions<State extends ToolStatus> = State extends "pending"
  ? { output?: never; title?: never; metadata?: never; error?: never }
  : State extends "running"
-    ? { title?: string; metadata?: Record<string, unknown>; output?: string; error?: never }
+    ? { title?: string; metadata?: Record<string, unknown>; output?: never; error?: never }
    : State extends "error"
      ? { error?: string; metadata?: Record<string, unknown>; output?: never; title?: never }
      : { output?: string; title?: string; metadata?: Record<string, unknown>; error?: never }
@@ -371,15 +371,6 @@ export function partUpdated(part: PartSeed<"assistant">): readonly OpenCodeEvent
  }
  if (part.type === "reasoning") {
    startedParts.add(part.id)
-    if (!started && !part.text)
-      return [
-        makeEvent("session.reasoning.started", {
-          sessionID,
-          assistantMessageID: messageID,
-          ordinal: ref.ordinal!,
-          state: jsonRecord(part.metadata),
-        }),
-      ]
    return [
      ...(started
        ? []
@@ -551,9 +542,9 @@ export function reasoningPart(id: string, text: string): ReasoningSeed {
 export function toolPart(
  id: string,
  tool: string,
-  state: "streaming",
+  state: "pending",
  input: Record<string, unknown>,
-  options?: ToolOptions<"streaming">,
+  options?: ToolOptions<"pending">,
 ): ToolSeed
 export function toolPart(
  id: string,
@@ -583,15 +574,14 @@ export function toolPart(
  input: Record<string, unknown>,
  options: ToolOptions<ToolStatus> = {},
 ): ToolSeed {
-  const base = { id, type: "tool" as const, name: tool }
-  if (state === "streaming") return { ...base, state: { status: state, input, raw: "" } }
+  const base = { id, type: "tool" as const, callID: id, tool }
+  if (state === "pending") return { ...base, state: { status: state, input, raw: "" } }
  if (state === "running")
    return {
      ...base,
      state: {
        status: state,
        input,
-        ...(options.output === undefined ? {} : { output: options.output }),
        title: options.title,
        metadata: options.metadata ?? {},
        time: { start: 1700000001000 },
@@ -622,10 +612,12 @@ export function toolPart(
 }

 export function shell(id: string, state: ToolStatus, output = "", command = `echo ${id}`): ToolSeed {
-  if (state === "streaming") return toolPart(id, "shell", state, { command })
-  if (state === "running") return toolPart(id, "shell", state, { command }, { title: command, output })
-  if (state === "error") return toolPart(id, "shell", state, { command }, { error: output || undefined })
-  return toolPart(id, "shell", state, { command }, { title: command, output })
+  if (state === "pending") return toolPart(id, "bash", state, { command })
+  if (state === "running")
+    return toolPart(id, "bash", state, { command }, { title: command, metadata: { command, output } })
+  if (state === "error")
+    return toolPart(id, "bash", state, { command }, { error: output || undefined, metadata: { command, output } })
+  return toolPart(id, "bash", state, { command }, { title: command, output, metadata: { command, output } })
 }

 export function completedAssistantInfo(info: SessionMessageAssistant): SessionMessageAssistant {
@@ -663,7 +655,7 @@ function messageContent(
 ): SessionMessageAssistant["content"][number] {
  if (part.type === "tool") {
    partRefs.set(part.id, { messageID, type: part.type })
-    toolStates.set(part.id, part.state.status)
+    toolStates.set(part.callID, part.state.status)
  } else {
    partRefs.set(part.id, { messageID, type: part.type, ordinal: ordinals[part.type]++ })
    startedParts.add(part.id)
@@ -683,8 +675,8 @@ function messageContent(
  const completed = state.status === "completed" || state.status === "error" ? state.time.end : undefined
  const base = {
    type: "tool" as const,
-    id: part.id,
-    name: part.name,
+    id: part.callID,
+    name: part.tool,
    time: {
      created: time?.start ?? 1700000001000,
      ...(time?.start === undefined ? {} : { ran: time.start }),
@@ -694,18 +686,11 @@ function messageContent(
    ...(part.providerState ? { providerState: jsonRecord(part.providerState) } : {}),
    ...(part.providerResultState ? { providerResultState: jsonRecord(part.providerResultState) } : {}),
  }
-  if (state.status === "streaming") return { ...base, state: { status: "streaming", input: state.raw } }
+  if (state.status === "pending") return { ...base, state: { status: "streaming", input: state.raw } }
  if (state.status === "running")
    return {
      ...base,
-      state: {
-        status: "running",
-        input: jsonRecord(state.input),
-        metadata: jsonRecord({
-          ...state.metadata,
-          ...(state.output === undefined ? {} : { output: state.output }),
-        }),
-      },
+      state: { status: "running", input: jsonRecord(state.input), metadata: jsonRecord(state.metadata) },
    }
  if (state.status === "error")
    return {
@@ -729,7 +714,7 @@ function messageContent(
 }

 function toolEvents(part: ToolSeed, messageID: string): readonly OpenCodeEvent[] {
-  const previous = toolStates.get(part.id)
+  const previous = toolStates.get(part.callID)
  if (previous === "completed" || previous === "error") return []

  const events: OpenCodeEvent[] = []
@@ -738,27 +723,27 @@ function toolEvents(part: ToolSeed, messageID: string): readonly OpenCodeEvent[]
      makeEvent("session.tool.input.started", {
        sessionID,
        assistantMessageID: messageID,
-        id: part.id,
-        name: part.name,
+        id: part.callID,
+        name: part.tool,
      }),
    )
  }
-  if (part.state.status === "streaming") {
-    toolStates.set(part.id, part.state.status)
+  if (part.state.status === "pending") {
+    toolStates.set(part.callID, part.state.status)
    return events
  }
-  if (!previous || previous === "streaming") {
+  if (!previous || previous === "pending") {
    events.push(
      makeEvent("session.tool.input.ended", {
        sessionID,
        assistantMessageID: messageID,
-        id: part.id,
+        id: part.callID,
        text: JSON.stringify(part.state.input),
      }),
      makeEvent("session.tool.called", {
        sessionID,
        assistantMessageID: messageID,
-        id: part.id,
+        id: part.callID,
        input: part.state.input,
        executed: part.executed ?? true,
        state: jsonRecord(part.providerState),
@@ -766,20 +751,16 @@ function toolEvents(part: ToolSeed, messageID: string): readonly OpenCodeEvent[]
    )
  }
  if (part.state.status === "running") {
-    const metadata = {
-      ...part.state.metadata,
-      ...(part.state.output === undefined ? {} : { output: part.state.output }),
-    }
-    if (previous === "running" || Object.keys(metadata).length)
+    if (previous === "running" || Object.keys(part.state.metadata).length)
      events.push(
        makeEvent("session.tool.progress", {
          sessionID,
          assistantMessageID: messageID,
-          id: part.id,
-          metadata: jsonRecord(metadata),
+          id: part.callID,
+          metadata: jsonRecord(part.state.metadata),
        }),
      )
-    toolStates.set(part.id, part.state.status)
+    toolStates.set(part.callID, part.state.status)
    return events
  }
  if (part.state.status === "error") {
@@ -787,28 +768,28 @@ function toolEvents(part: ToolSeed, messageID: string): readonly OpenCodeEvent[]
      makeEvent("session.tool.failed", {
        sessionID,
        assistantMessageID: messageID,
-        id: part.id,
+        id: part.callID,
        error: { type: "ToolError", message: part.state.error },
        metadata: jsonRecord(part.state.metadata),
        executed: part.executed ?? true,
        resultState: jsonRecord(part.providerResultState),
      }),
    )
-    toolStates.set(part.id, part.state.status)
+    toolStates.set(part.callID, part.state.status)
    return events
  }
  events.push(
    makeEvent("session.tool.success", {
      sessionID,
      assistantMessageID: messageID,
-      id: part.id,
+      id: part.callID,
      content: [{ type: "text", text: part.state.output }],
      metadata: jsonRecord(part.state.metadata),
      executed: part.executed ?? true,
      resultState: jsonRecord(part.providerResultState),
    }),
  )
-  toolStates.set(part.id, part.state.status)
+  toolStates.set(part.callID, part.state.status)
  return events
 }

@@ -1,5 +1,4 @@
 import { expect, test } from "@playwright/test"
-import { createTwoFilesPatch } from "diff"
 import {
  defineVisualRegions,
  reportVisualStability,
@@ -59,14 +58,14 @@ test("expands and collapses a long completed shell without overlap", async ({ pa
  await startVisualProbe(page, regions)
  await trigger.click()
  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await waitForVisualSettle(page, [regions.shell.selector, regions.following.selector])
+  await page.waitForTimeout(500)
  const expanded = await stopVisualProbe<keyof typeof regions>(page)
  await reportVisualStability(testInfo, "shell-expand", expanded, plan)

  await startVisualProbe(page, regions)
  await trigger.click()
  await expect(trigger).toHaveAttribute("aria-expanded", "false")
-  await waitForVisualSettle(page, [regions.shell.selector, regions.following.selector])
+  await page.waitForTimeout(500)
  const collapsed = await stopVisualProbe<keyof typeof regions>(page)
  await reportVisualStability(testInfo, "shell-collapse", collapsed, plan)
 })
@@ -84,7 +83,7 @@ test("expands and collapses a completed context group without overlap", async ({
    messages: [
      userMessage(),
      assistantMessage([
-        toolPart(ids[0]!, "read", "completed", { path: "src/a.ts" }),
+        toolPart(ids[0]!, "read", "completed", { filePath: "src/a.ts" }),
        toolPart(ids[1]!, "glob", "completed", { path: ".", pattern: "**/*.ts" }),
        toolPart(ids[2]!, "grep", "completed", { path: ".", pattern: "stable" }),
        toolPart(ids[3]!, "list", "completed", { path: "src" }),
@@ -111,7 +110,7 @@ test("expands and collapses a completed context group without overlap", async ({
    await startVisualProbe(page, regions)
    await trigger.click()
    await expect(trigger).toHaveAttribute("aria-expanded", String(expanded))
-    await waitForVisualSettle(page, [regions.context.selector, regions.following.selector])
+    await page.waitForTimeout(500)
    const trace = await stopVisualProbe<keyof typeof regions>(page)
    await reportVisualStability(
      testInfo,
@@ -143,23 +142,16 @@ test("expands and collapses an edit diff without moving twice", async ({ page },
          editID,
          "edit",
          "completed",
-          { path: "src/edit.ts", oldString: "export const value = 1", newString: "export const value = 2" },
+          { filePath: "src/edit.ts" },
          {
            metadata: {
-              files: [
-                {
-                  file: "src/edit.ts",
-                  patch: createTwoFilesPatch(
-                    "a/src/edit.ts",
-                    "b/src/edit.ts",
-                    source(40, false),
-                    source(40, true),
-                  ),
-                  additions: 40,
-                  deletions: 40,
-                  status: "modified",
-                },
-              ],
+              filediff: {
+                file: "src/edit.ts",
+                additions: 40,
+                deletions: 40,
+                before: source(40, false),
+                after: source(40, true),
+              },
            },
          },
        ),
@@ -190,7 +182,7 @@ test("expands and collapses an edit diff without moving twice", async ({ page },
  await startVisualProbe(page, regions)
  await trigger.click()
  await expect(trigger).toHaveAttribute("aria-expanded", "true")
-  await waitForVisualSettle(page, [regions.edit.selector, regions.following.selector])
+  await page.waitForTimeout(900)
  const trace = await stopVisualProbe<keyof typeof regions>(page)
  await reportVisualStability(
    testInfo,
@@ -17,32 +17,32 @@ import {
  userMessage,
 } from "./fixture"

-test("adds a subagent child-session link without replacing the row", async ({ page }, testInfo) => {
-  const taskID = "prt_subagent_link"
-  const childID = "ses_subagent_child"
-  const input = { description: "Inspect child", agent: "explore", prompt: "Inspect the child Session." }
+test("adds a task child-session link without replacing the task row", async ({ page }, testInfo) => {
+  const taskID = "prt_task_link"
+  const childID = "ses_task_child"
+  const input = { description: "Inspect child", subagent_type: "explore" }
  const timeline = await setupTimeline(page, {
-    messages: [userMessage(), assistantMessage([toolPart(taskID, "subagent", "running", input)], { completed: false })],
+    messages: [userMessage(), assistantMessage([toolPart(taskID, "task", "running", input)], { completed: false })],
    sessions: [session(), session({ id: childID, parentID: sessionID, title: "Inspect child" })],
    cpuRate: 4,
  })
  const regions = defineVisualRegions({
-    subagent: { selector: `[data-timeline-part-id="${renderedPartID(taskID)}"] [data-slot="collapsible-trigger"]` },
+    task: { selector: `[data-timeline-part-id="${renderedPartID(taskID)}"] [data-slot="collapsible-trigger"]` },
  })
  await startVisualProbe(page, regions)
  await timeline.send(
-    partUpdated(toolPart(taskID, "subagent", "completed", input, { metadata: { sessionID: childID } })),
+    partUpdated(toolPart(taskID, "task", "completed", input, { metadata: { sessionId: childID } })),
    500,
  )
  const trace = await stopVisualProbe<keyof typeof regions>(page)
  await reportVisualStability(
    testInfo,
-    "subagent-link",
+    "task-link",
    trace,
    visualPlan(regions, [
-      { type: "required", regions: ["subagent"] },
-      { type: "unique", regions: ["subagent"] },
-      { type: "stable", regions: ["subagent"] },
+      { type: "required", regions: ["task"] },
+      { type: "unique", regions: ["task"] },
+      { type: "stable", regions: ["task"] },
      { type: "opacity", regions: "all" },
      { type: "continuity", regions: "all" },
      { type: "motion", regions: "all", maxPositionReversals: 0 },
@@ -21,30 +21,24 @@ import {
 } from "./fixture"

 test.describe("timeline tool state stability", () => {
-  test("moves lightweight tools through streaming, running, and completed without replacing rows", async ({
+  test("moves lightweight tools through pending, running, and completed without replacing rows", async ({
    page,
  }, testInfo) => {
-    const ids = ["webfetch", "websearch", "subagent", "skill", "custom"] as const
+    const ids = ["webfetch", "websearch", "task", "skill", "custom"] as const
    const inputs = {
      webfetch: { url: "https://example.com/docs" },
      websearch: { query: "timeline stability" },
-      subagent: { description: "Inspect timeline", agent: "explore", prompt: "Inspect the timeline." },
+      task: { description: "Inspect timeline", subagent_type: "explore" },
      skill: { name: "stability" },
      custom: { target: "timeline", depth: 2 },
    }
-    const names = {
-      webfetch: "webfetch",
-      websearch: "websearch",
-      subagent: "subagent",
-      skill: "skill",
-      custom: "mcp_probe",
-    }
+    const names = { webfetch: "webfetch", websearch: "websearch", task: "task", skill: "skill", custom: "mcp_probe" }
    const questionID = "prt_state_question"
    const todoID = "prt_state_todo"
    const initial = [
-      ...ids.map((id) => toolPart(`prt_state_${id}`, names[id], "streaming", inputs[id])),
-      toolPart(questionID, "question", "streaming", questionInput()),
-      toolPart(todoID, "todowrite", "streaming", { todos: [{ content: "Hidden", status: "pending" }] }),
+      ...ids.map((id) => toolPart(`prt_state_${id}`, names[id], "pending", inputs[id])),
+      toolPart(questionID, "question", "pending", questionInput()),
+      toolPart(todoID, "todowrite", "pending", { todos: [{ content: "Hidden", status: "pending" }] }),
      textPart("prt_state_following", "Following lightweight tools"),
    ]
    const childID = "ses_timeline_child"
@@ -61,14 +55,14 @@ test.describe("timeline tool state stability", () => {
    const regionIDs = [
      "prt_state_webfetch",
      "prt_state_websearch",
-      "prt_state_subagent",
+      "prt_state_task",
      "prt_state_skill",
      "prt_state_custom",
    ] as const
    const regions = defineVisualRegions({
      prt_state_webfetch: toolRegion(regionIDs[0]),
      prt_state_websearch: toolRegion(regionIDs[1]),
-      prt_state_subagent: toolRegion(regionIDs[2]),
+      prt_state_task: toolRegion(regionIDs[2]),
      prt_state_skill: toolRegion(regionIDs[3]),
      prt_state_custom: toolRegion(regionIDs[4]),
    })
@@ -79,9 +73,9 @@ test.describe("timeline tool state stability", () => {
        [80, 240, 100, 360, 140][index],
      )
    }
-    for (const [index, id] of ["skill", "webfetch", "custom", "subagent", "websearch"].entries()) {
+    for (const [index, id] of ["skill", "webfetch", "custom", "task", "websearch"].entries()) {
      const key = id as (typeof ids)[number]
-      const metadata = key === "subagent" ? { sessionID: childID } : key === "websearch" ? { provider: "exa" } : {}
+      const metadata = key === "task" ? { sessionId: childID } : key === "websearch" ? { provider: "exa" } : {}
      const output = key === "websearch" ? "Result https://example.com/result" : "Completed"
      await timeline.send(
        partUpdated(toolPart(`prt_state_${key}`, names[key], "completed", inputs[key], { metadata, output })),
@@ -127,12 +121,12 @@ test.describe("timeline tool state stability", () => {
    const ids = ["prt_ctx_01_read", "prt_ctx_02_glob", "prt_ctx_03_grep", "prt_ctx_04_list"]
    const tools = ["read", "glob", "grep", "list"]
    const inputs = [
-      { path: "src/a.ts", offset: 0, limit: 120 },
+      { filePath: "src/a.ts", offset: 0, limit: 120 },
      { path: directory, pattern: "**/*.ts" },
      { path: directory, pattern: "stability", include: "*.ts" },
      { path: "src" },
    ]
-    const context = ids.map((id, index) => toolPart(id, tools[index]!, "streaming", inputs[index]!))
+    const context = ids.map((id, index) => toolPart(id, tools[index]!, "pending", inputs[index]!))
    const timeline = await setupTimeline(page, {
      messages: [
        userMessage(),
@@ -4,7 +4,6 @@ import type { Page } from "@playwright/test"
 import { mockOpenCodeServer } from "../../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../../utils/waits"
 import { expect } from "../benchmark"
-import { createTwoFilesPatch } from "diff"

 const directory = "C:/OpenCode/TimelineStateRegression"
 const projectID = "proj_timeline_state_regression"
@@ -27,29 +26,28 @@ const userMessage = {

 const editPart: ToolSeed = {
  id: editPartID,
+  sessionID,
+  messageID: assistantMessageID,
  type: "tool",
-  name: "edit",
+  callID: "call_edit_regression",
+  tool: "edit",
  state: {
    status: "completed",
-    input: {
-      path: "src/regression.ts",
-      oldString: "export const value = 'before'",
-      newString: "export const value = 'after'",
-    },
-    content: [{ type: "text", text: "Edited src/regression.ts" }],
+    input: { filePath: "src/regression.ts" },
+    output: "Edited src/regression.ts",
+    title: "src/regression.ts",
    metadata: {
-      files: [
-        currentFile(
-          "src/regression.ts",
-          "export const value = 'before'\n",
-          "export const value = 'after'\n",
-          1,
-          1,
-        ),
-      ],
+      filediff: {
+        file: "src/regression.ts",
+        additions: 1,
+        deletions: 1,
+        before: "export const value = 'before'\n",
+        after: "export const value = 'after'\n",
+      },
+      diff: "diff --git a/src/regression.ts b/src/regression.ts\n-export const value = 'before'\n+export const value = 'after'\n",
    },
+    time: { start: 1700000001000, end: 1700000002000 },
  },
-  time: { created: 1700000001000, ran: 1700000001000, completed: 1700000002000 },
 }

 const assistantMessage = {
@@ -206,20 +204,20 @@ function performanceTurn(index: number) {
      ? [
          {
            id: `prt_0000_${suffix}_edit`,
+            sessionID,
+            messageID: assistantID,
            type: "tool",
-            name: "edit",
+            callID: `call_0000_${suffix}_edit`,
+            tool: "edit",
            state: {
              status: "completed",
-              input: { path: `src/history-${index}.ts`, oldString: before, newString: after },
-              content: [{ type: "text", text: `Edited src/history-${index}.ts` }],
+              input: { filePath: `src/history-${index}.ts` },
+              output: `Edited src/history-${index}.ts`,
+              title: `src/history-${index}.ts`,
              metadata: {
-                files: [currentFile(`src/history-${index}.ts`, before, after, 48, 48)],
+                filediff: { file: `src/history-${index}.ts`, additions: 48, deletions: 48, before, after },
              },
-            },
-            time: {
-              created: 1690000001200 + index * 2_000,
-              ran: 1690000001200 + index * 2_000,
-              completed: 1690000001400 + index * 2_000,
+              time: { start: 1690000001200 + index * 2_000, end: 1690000001400 + index * 2_000 },
            },
          },
        ]
@@ -228,18 +226,20 @@ function performanceTurn(index: number) {
      ? [
          {
            id: `prt_0000_${suffix}_write`,
+            sessionID,
+            messageID: assistantID,
            type: "tool",
-            name: "write",
+            callID: `call_0000_${suffix}_write`,
+            tool: "write",
            state: {
              status: "completed",
-              input: { path: `src/generated-${index}.tsx`, content: after },
-              content: [{ type: "text", text: `Wrote src/generated-${index}.tsx` }],
-              metadata: { files: [currentFile(`src/generated-${index}.tsx`, "", after, 32, 0)] },
-            },
-            time: {
-              created: 1690000001400 + index * 2_000,
-              ran: 1690000001400 + index * 2_000,
-              completed: 1690000001500 + index * 2_000,
+              input: { filePath: `src/generated-${index}.tsx`, content: after },
+              output: `Wrote src/generated-${index}.tsx`,
+              title: `src/generated-${index}.tsx`,
+              metadata: {
+                filediff: { file: `src/generated-${index}.tsx`, additions: 32, deletions: 0, before: "", after },
+              },
+              time: { start: 1690000001400 + index * 2_000, end: 1690000001500 + index * 2_000 },
            },
          },
        ]
@@ -248,24 +248,31 @@ function performanceTurn(index: number) {
      ? [
          {
            id: `prt_0000_${suffix}_patch`,
+            sessionID,
+            messageID: assistantID,
            type: "tool",
-            name: "patch",
+            callID: `call_0000_${suffix}_patch`,
+            tool: "apply_patch",
            state: {
              status: "completed",
              input: { patchText: realisticPatch(index) },
-              content: [{ type: "text", text: "Success. Updated src/components/SessionCard.tsx" }],
+              output: "Success. Updated src/components/SessionCard.tsx",
+              title: "src/components/SessionCard.tsx",
              metadata: {
                files: [
                  {
-                    ...currentFile("src/components/SessionCard.tsx", before, after, 8, 3),
+                    filePath: "src/components/SessionCard.tsx",
+                    relativePath: "src/components/SessionCard.tsx",
+                    type: "update",
+                    additions: 8,
+                    deletions: 3,
+                    patch: realisticPatch(index),
+                    before,
+                    after,
                  },
                ],
              },
-            },
-            time: {
-              created: 1690000001500 + index * 2_000,
-              ran: 1690000001500 + index * 2_000,
-              completed: 1690000001700 + index * 2_000,
+              time: { start: 1690000001500 + index * 2_000, end: 1690000001700 + index * 2_000 },
            },
          },
        ]
@@ -302,16 +309,20 @@ function performanceTurn(index: number) {
 }

 type ToolSeed = {
-  id: string
+  id?: string
+  sessionID?: string
+  messageID?: string
  type: "tool"
-  name: string
+  callID: string
+  tool: string
  state: {
-    status: "completed"
+    status: string
    input: Record<string, unknown>
-    content: [{ type: "text"; text: string }]
+    output: string
+    title?: string
    metadata: Record<string, unknown>
+    time: { start: number; end: number }
  }
-  time: { created: number; ran: number; completed: number }
 }

 type ContentSeedBase = { id?: string; sessionID?: string; messageID?: string }
@@ -324,13 +335,13 @@ type ContentSeed =
 function toolContent(part: ToolSeed): SessionMessageAssistant["content"][number] {
  return {
    type: "tool",
-    id: part.id,
-    name: part.name,
-    time: part.time,
+    id: part.callID,
+    name: part.tool,
+    time: { created: part.state.time.start, ran: part.state.time.start, completed: part.state.time.end },
    state: {
      status: "completed",
      input: part.state.input as Record<string, JsonValue>,
-      content: part.state.content,
+      content: [{ type: "text", text: part.state.output }],
      metadata: part.state.metadata as Record<string, JsonValue>,
    },
  }
@@ -411,16 +422,6 @@ export function MessageSummary(props: { messages: Message[]; locale: string }) {
 `
 }

-function currentFile(file: string, before: string, after: string, additions: number, deletions: number) {
-  return {
-    file,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
-    additions,
-    deletions,
-    status: before ? (after ? "modified" : "deleted") : "added",
-  }
-}
-
 function realisticPatch(index: number) {
  return `*** Begin Patch
 *** Update File: src/components/SessionCard.tsx
@@ -1,6 +1,4 @@
 import type { CDPSession, Page } from "@playwright/test"
-import path from "node:path"
-import { mkdir, writeFile } from "node:fs/promises"

 export async function startTimelineProfile(page: Page, options: { cpuThrottle: number; profileCPU: boolean }) {
  const cdp = await page.context().newCDPSession(page)
@@ -14,13 +12,6 @@ export async function startTimelineProfile(page: Page, options: { cpuThrottle: n
    async stop() {
      if (!options.profileCPU) return
      const result = await cdp.send("Profiler.stop")
-      const directory = process.env.TIMELINE_CPU_PROFILE_DIR
-      if (directory) {
-        await mkdir(directory, { recursive: true })
-        const file = path.join(directory, `${process.env.OPENCODE_PERFORMANCE_RUN_ID ?? "manual"}-timeline.cpuprofile`)
-        await writeFile(file, JSON.stringify(result.profile))
-        console.log("timeline cpu profile file", file)
-      }
      const self = new Map<number, number>()
      result.profile.samples?.forEach((id, index) => {
        const duration = (result.profile.timeDeltas?.[index] ?? 0) / 1_000
@@ -1,5 +1,3 @@
-import { createTwoFilesPatch } from "diff"
-
 const words = [
  "alpha",
  "bravo",
@@ -30,21 +28,22 @@ const directory = "C:/OpenCode/SmokeProject"
 const projectID = "proj_smoke_timeline"
 const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }

-type MessagePart =
-  | { id: string; type: "text"; text: string }
-  | { id: string; type: "reasoning"; text: string; time?: { start: number; end?: number } }
-  | {
-      id: string
-      type: "tool"
-      name: string
-      state: {
-        status: "completed"
-        input: Record<string, unknown>
-        content: [{ type: "text"; text: string }]
-        metadata: Record<string, unknown>
-      }
-      time: { created: number; ran: number; completed: number }
-    }
+type MessagePart = {
+  id: string
+  type: "text" | "reasoning" | "tool"
+  text?: string
+  time?: { start: number; end?: number }
+  callID?: string
+  tool?: string
+  state?: {
+    status: "completed"
+    input: Record<string, unknown>
+    output: string
+    title: unknown
+    metadata: Record<string, unknown>
+    time: { start: number; end: number }
+  }
+}

 function lorem(seed: number, length: number) {
  let out = ""
@@ -103,16 +102,17 @@ function messageContent(part: MessagePart): SessionMessageAssistant["content"][n
        ? { created: part.time.start, ...(part.time.end === undefined ? {} : { completed: part.time.end }) }
        : undefined,
    }
+  const state = part.state!
  return {
    type: "tool",
-    id: part.id,
-    name: part.name,
-    time: part.time,
+    id: part.callID ?? part.id,
+    name: part.tool!,
+    time: { created: state.time.start, ran: state.time.start, completed: state.time.end },
    state: {
      status: "completed",
-      input: part.state.input as Record<string, JsonValue>,
-      content: part.state.content,
-      metadata: part.state.metadata as Record<string, JsonValue>,
+      input: state.input as Record<string, JsonValue>,
+      content: [{ type: "text", text: state.output }],
+      metadata: state.metadata as Record<string, JsonValue>,
    },
  }
 }
@@ -149,46 +149,43 @@ function toolPart(
 ): MessagePart {
  const metadata =
    metadataOverride ??
-    (tool === "patch"
-      ? {
-          files: [
-            patchFile(index, "modified"),
-            patchFile(index + 1, index % 2 === 0 ? "added" : "deleted"),
-          ],
-        }
+    (tool === "apply_patch"
+      ? { files: [patchFile(index, "update"), patchFile(index + 1, index % 2 === 0 ? "add" : "delete")] }
      : tool === "edit" || tool === "write"
-        ? { files: [fileDiff(String(input.path ?? `src/generated/file-${index}.ts`), index)] }
+        ? {
+            filediff: fileDiff(String(input.filePath ?? `src/generated/file-${index}.ts`), index),
+            diff: patch(index, outputLength),
+            preview: patch(index + 1, 420),
+          }
        : tool === "question"
          ? { answers: [["Proceed"], ["Keep sample output"]] }
          : {})
  return {
-    id: id(`call_${tool}_${partIndex}`, index),
+    id: id(`prt_tool_${tool}_${partIndex}`, index),
    type: "tool",
-    name: tool,
+    callID: id("call", index * 10 + partIndex),
+    tool,
    state: {
      status: "completed",
      input,
-      content: [{ type: "text", text: lorem(index * 23 + partIndex, outputLength) }],
+      output: lorem(index * 23 + partIndex, outputLength),
+      title: tool === "bash" ? "Verify generated output" : input.filePath || input.path || input.pattern || "completed",
      metadata,
-    },
-    time: {
-      created: 1700000000000 + index * 10_000,
-      ran: 1700000000000 + index * 10_000,
-      completed: 1700000000000 + index * 10_000 + 400,
+      time: { start: 1700000000000 + index * 10_000, end: 1700000000000 + index * 10_000 + 400 },
    },
  }
 }

-function patchFile(seed: number, status: "added" | "modified" | "deleted") {
-  const file = `src/generated/patch-${seed}.ts`
-  const before = status === "added" ? "" : code(seed, 18)
-  const after = status === "deleted" ? "" : code(seed + 1, 24)
+function patchFile(seed: number, type: "add" | "update" | "delete") {
  return {
-    file,
-    status,
-    additions: status === "deleted" ? 0 : (seed % 7) + 1,
-    deletions: status === "added" ? 0 : seed % 4,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
+    filePath: `src/generated/patch-${seed}.ts`,
+    relativePath: `src/generated/patch-${seed}.ts`,
+    type,
+    additions: (seed % 7) + 1,
+    deletions: type === "add" ? 0 : seed % 4,
+    patch: patch(seed, 520),
+    before: type === "add" ? undefined : code(seed, 18),
+    after: type === "delete" ? undefined : code(seed + 1, 24),
  }
 }

@@ -203,13 +200,17 @@ function fileDiff(file: string, seed: number) {
        : before.replace("value4", "updatedValue4").replace("value20", "updatedValue20")
  return {
    file,
-    status: "modified" as const,
    additions: lines === 300 ? 300 : lines === 2 ? 1 : 2,
    deletions: lines === 300 ? 300 : lines === 2 ? 1 : 2,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
+    before,
+    after,
  }
 }

+function patch(seed: number, length: number) {
+  return `diff --git a/src/generated/file-${seed}.ts b/src/generated/file-${seed}.ts\n+${lorem(seed, length).replace(/\n/g, "\n+")}`
+}
+
 function code(seed: number, lines: number, width = 32) {
  return Array.from(
    { length: lines },
@@ -224,24 +225,22 @@ function turn(index: number): SessionMessageInfo[] {
    ...(index % 5 === 0 ? [reasoningPart(index, 0, 420)] : []),
    ...(index % 3 === 0
      ? [
-          toolPart(index, 0, "read", { path: `src/generated/file-${index}.ts`, offset: 0, limit: 80 }, 220),
+          toolPart(index, 0, "read", { filePath: `src/generated/file-${index}.ts`, offset: 0, limit: 80 }, 220),
          toolPart(index, 5, "glob", { path: directory, pattern: `**/*sample-${index}*.ts` }, 140),
          toolPart(index, 1, "grep", { path: directory, pattern: `sample-${index}`, include: "*.ts" }, 180),
          toolPart(index, 6, "list", { path: `src/generated/${index}` }, 120),
        ]
      : []),
    textPart(index, 2, 160 + (index % 6) * 90),
-    ...(index % 4 === 0
-      ? [toolPart(index, 3, "edit", { path: `src/generated/file-${index}.ts`, oldString: "before", newString: "after" }, 700)]
-      : []),
+    ...(index % 4 === 0 ? [toolPart(index, 3, "edit", { filePath: `src/generated/file-${index}.ts` }, 700)] : []),
    ...(index % 6 === 0
-      ? [toolPart(index, 7, "write", { path: `src/generated/write-${index}.ts`, content: code(index, 28) }, 560)]
+      ? [toolPart(index, 7, "write", { filePath: `src/generated/write-${index}.ts`, content: code(index, 28) }, 560)]
      : []),
    ...(index % 8 === 0
-      ? [toolPart(index, 8, "patch", { patchText: `Update generated patch ${index}` }, 620)]
+      ? [toolPart(index, 8, "apply_patch", { files: [`src/generated/patch-${index}.ts`] }, 620)]
      : []),
    ...(index % 7 === 0
-      ? [toolPart(index, 4, "shell", { command: "bun typecheck", description: "Verify generated output" }, 620)]
+      ? [toolPart(index, 4, "bash", { command: "bun typecheck", description: "Verify generated output" }, 620)]
      : []),
    ...(index % 10 === 0 ? [toolPart(index, 9, "webfetch", { url: "https://example.com/docs/sample" }, 120)] : []),
    ...(index % 11 === 0 ? [toolPart(index, 10, "websearch", { query: "sample movement notes" }, 240)] : []),
@@ -257,15 +256,7 @@ function turn(index: number): SessionMessageInfo[] {
        ]
      : []),
    ...(index % 17 === 0
-      ? [
-          toolPart(
-            index,
-            12,
-            "subagent",
-            { description: "Inspect generated fixture", agent: "explore", prompt: "Inspect the fixture." },
-            160,
-          ),
-        ]
+      ? [toolPart(index, 12, "task", { description: "Inspect generated fixture", subagent_type: "explore" }, 160)]
      : []),
  ]
  return [user, assistantMessage(targetID, index, user.id, parts)]
@@ -281,10 +272,10 @@ const sourceMessages = Array.from({ length: 12 }, (_, index) => [
          toolPart(
            index + 1000,
            1,
-            "subagent",
-            { description: "Inspect child navigation", agent: "explore", prompt: "Inspect child navigation." },
+            "task",
+            { description: "Inspect child navigation", subagent_type: "explore" },
            160,
-            { sessionID: childID },
+            { sessionId: childID },
          ),
        ]
      : []),
@@ -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 },
-  }
-}
@@ -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")
@@ -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({
@@ -89,7 +89,7 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
    data: {
      id: "permission-background-a",
      sessionID: sessionA.id,
-      action: "shell",
+      action: "bash",
      resources: ["git status"],
      metadata: {},
      save: [],
@@ -116,7 +116,7 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
    data: {
      id: "permission-background-a-child",
      sessionID: childSessionA.id,
-      action: "shell",
+      action: "bash",
      resources: ["git diff"],
      metadata: {},
      save: [],
@@ -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 },
@@ -85,7 +85,7 @@ test("shows a pending permission dock", async ({ page }) => {
      {
        id: "permission-request",
        sessionID,
-        permission: "shell",
+        permission: "bash",
        patterns: ["git status", "git diff"],
        metadata: {},
        always: [],
@@ -2,7 +2,6 @@ import { expect, test, type Locator, type Page } from "@playwright/test"
 import type { JsonValue, OpenCodeEvent, SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible, expectSessionTitle } from "../utils/waits"
-import { createTwoFilesPatch } from "diff"

 const directory = "C:/OpenCode/TimelineStateRegression"
 const projectID = "proj_timeline_state_regression"
@@ -41,28 +40,18 @@ const editPart = {
  tool: "edit",
  state: {
    status: "completed",
-    input: {
-      path: "src/regression.ts",
-      oldString: "export const value = 'before'",
-      newString: "export const value = 'after'",
-    },
+    input: { filePath: "src/regression.ts" },
    output: "Edited src/regression.ts",
    title: "src/regression.ts",
    metadata: {
-      files: [
-        {
-          file: "src/regression.ts",
-          patch: createTwoFilesPatch(
-            "a/src/regression.ts",
-            "b/src/regression.ts",
-            "export const value = 'before'\n",
-            "export const value = 'after'\n",
-          ),
-          additions: 1,
-          deletions: 1,
-          status: "modified",
-        },
-      ],
+      filediff: {
+        file: "src/regression.ts",
+        additions: 1,
+        deletions: 1,
+        before: "export const value = 'before'\n",
+        after: "export const value = 'after'\n",
+      },
+      diff: "diff --git a/src/regression.ts b/src/regression.ts\n-export const value = 'before'\n+export const value = 'after'\n",
    },
    time: { start: 1700000001000, end: 1700000002000 },
  },
@@ -160,15 +149,13 @@ test.describe("regression: session timeline local row state", () => {
        ...editPart.state,
        metadata: {
          ...editPart.state.metadata,
-          files: [
-            {
-              file: "src/regression.ts",
-              patch: createTwoFilesPatch("a/src/regression.ts", "b/src/regression.ts", lines, after),
-              additions: 5,
-              deletions: 5,
-              status: "modified",
-            },
-          ],
+          filediff: {
+            file: "src/regression.ts",
+            additions: 1,
+            deletions: 1,
+            before: lines,
+            after,
+          },
        },
      },
    }
@@ -78,7 +78,7 @@ test.describe("regression: session timeline context group resize", () => {
            id("msg_assistant", 10),
            ["read", "glob", "grep", "list"][index]!,
            [
-              { path: "src/recent-a.ts" },
+              { filePath: "src/recent-a.ts" },
              { path: directory, pattern: "**/*.ts" },
              { path: directory, pattern: "Explored" },
              { path: "src" },
@@ -213,7 +213,7 @@ function turn(index: number, target: boolean, status: "running" | "completed" =
            contextIDs[0]!,
            assistantID,
            "read",
-            { path: "src/recent-a.ts", offset: 0, limit: 120 },
+            { filePath: "src/recent-a.ts", offset: 0, limit: 120 },
            status,
          ),
        ),
@@ -270,7 +270,7 @@ function contextTool(
      status,
      input,
      output: `Completed ${tool}.\n${"detail line\n".repeat(8)}`,
-      title: input.path || input.pattern || "completed",
+      title: input.filePath || input.path || input.pattern || "completed",
      metadata: {},
      time: { start: 1700000000000, end: 1700000000100 },
    },
@@ -10,7 +10,7 @@ import {
 test("preserves a collapsed context group through count and status updates", async ({ page }) => {
  const ids = ["prt_closed_01_read", "prt_closed_02_glob"]
  const inputs = {
-    read: { path: "src/a.ts", offset: 0, limit: 120 },
+    read: { filePath: "src/a.ts", offset: 0, limit: 120 },
    glob: { path: ".", pattern: "**/*.ts" },
  }
  const timeline = await setupTimeline(page, {
@@ -7,7 +7,7 @@ test("renders completed write content", async ({ page }) => {
    messages: [
      userMessage(),
      assistantMessage([
-        toolPart(id, "write", "completed", { path: "src/write.ts", content: "export const written = true\n" }),
+        toolPart(id, "write", "completed", { filePath: "src/write.ts", content: "export const written = true\n" }),
      ]),
    ],
    settings: { editToolPartsExpanded: true },
@@ -24,19 +24,20 @@ test("renders a completed single-file patch", async ({ page }) => {
      assistantMessage([
        toolPart(
          id,
-          "patch",
+          "apply_patch",
          "completed",
-          { patchText: "Update src/a.ts" },
+          { files: ["src/a.ts"] },
          {
            metadata: {
              files: [
                {
-                  file: "src/a.ts",
-                  status: "modified",
-                  patch:
-                    "diff --git a/src/a.ts b/src/a.ts\n--- a/src/a.ts\n+++ b/src/a.ts\n@@ -1 +1 @@\n-export const value = 1\n+export const value = 2\n",
+                  filePath: "src/a.ts",
+                  relativePath: "src/a.ts",
+                  type: "update",
                  additions: 1,
                  deletions: 1,
+                  before: "export const value = 1\n",
+                  after: "export const value = 2\n",
                },
              ],
            },
@@ -1,19 +1,18 @@
 import { expect, test } from "@playwright/test"
 import { assistantMessage, setupTimeline, toolPart, userMessage } from "../performance/timeline-stability/fixture"
-import { createTwoFilesPatch } from "diff"

 test("preserves nested patch file state through outer collapse and reopen", async ({ page }) => {
  const patchID = "prt_nested_patch"
-  const files = [patchFile("src/a.ts", "modified"), patchFile("src/b.ts", "added"), patchFile("src/old.ts", "deleted")]
+  const files = [patchFile("src/a.ts", "update"), patchFile("src/b.ts", "add"), patchFile("src/old.ts", "delete")]
  await setupTimeline(page, {
    messages: [
      userMessage(),
      assistantMessage([
        toolPart(
          patchID,
-          "patch",
+          "apply_patch",
          "completed",
-          { patchText: "Update three files" },
+          { files: files.map((file) => file.filePath) },
          { metadata: { files } },
        ),
      ]),
@@ -32,15 +31,15 @@ test("preserves nested patch file state through outer collapse and reopen", asyn
  await expect(deleted.getByRole("button")).toHaveAttribute("aria-expanded", "true")
 })

-function patchFile(file: string, status: "added" | "modified" | "deleted") {
-  const before = status === "added" ? "" : source(false)
-  const after = status === "deleted" ? "" : source(true)
+function patchFile(filePath: string, type: "add" | "update" | "delete") {
  return {
-    file,
-    status,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
-    additions: status === "deleted" ? 0 : 4,
-    deletions: status === "added" ? 0 : 3,
+    filePath,
+    relativePath: filePath,
+    type,
+    additions: type === "delete" ? 0 : 4,
+    deletions: type === "add" ? 0 : 3,
+    before: type === "add" ? undefined : source(false),
+    after: type === "delete" ? undefined : source(true),
  }
 }

@@ -11,7 +11,7 @@ for (const profile of [
      messages: [
        userMessage(),
        assistantMessage([
-          toolPart(ids[0]!, "read", "completed", { path: "src/a.ts" }),
+          toolPart(ids[0]!, "read", "completed", { filePath: "src/a.ts" }),
          toolPart(ids[1]!, "glob", "completed", { path: ".", pattern: "**/*.ts" }),
        ]),
      ],
@@ -12,7 +12,7 @@ import {
 test.describe("session timeline projection", () => {
  test("renders every admitted tool family and hides timeline-only exclusions", async ({ page }) => {
    const parts = [
-      toolPart("prt_01_read", "read", "completed", { path: "src/a.ts" }),
+      toolPart("prt_01_read", "read", "completed", { filePath: "src/a.ts" }),
      toolPart("prt_02_glob", "glob", "completed", { path: ".", pattern: "**/*.ts" }),
      toolPart("prt_03_grep", "grep", "completed", { path: ".", pattern: "value" }),
      toolPart("prt_04_list", "list", "completed", { path: "src" }),
@@ -24,20 +24,16 @@ test.describe("session timeline projection", () => {
        { query: "timeline stability" },
        { output: "https://example.com/result" },
      ),
-      toolPart("prt_task", "subagent", "completed", {
-        description: "Inspect timeline",
-        agent: "explore",
-        prompt: "Inspect the timeline implementation.",
-      }),
+      toolPart("prt_task", "task", "completed", { description: "Inspect timeline", subagent_type: "explore" }),
      toolPart(
        "prt_bash",
-        "shell",
+        "bash",
        "completed",
        { command: "printf stable" },
        { output: "stable", title: "printf stable" },
      ),
      editPart("prt_edit"),
-      toolPart("prt_write", "write", "completed", { path: "src/new.ts", content: "export const stable = true\n" }),
+      toolPart("prt_write", "write", "completed", { filePath: "src/new.ts", content: "export const stable = true\n" }),
      patchPart("prt_patch"),
      toolPart("prt_todo", "todowrite", "completed", { todos: [{ content: "Hidden", status: "pending" }] }),
      toolPart(
@@ -179,10 +175,16 @@ function editPart(id: string) {
    id,
    "edit",
    "completed",
-    { path: "src/a.ts", oldString: "export const value = 1", newString: "export const value = 2" },
+    { filePath: "src/a.ts" },
    {
      metadata: {
-        files: [patchFile("src/a.ts", "modified")],
+        filediff: {
+          file: "src/a.ts",
+          additions: 1,
+          deletions: 1,
+          before: "export const value = 1\n",
+          after: "export const value = 2\n",
+        },
      },
    },
  )
@@ -191,33 +193,31 @@ function editPart(id: string) {
 function patchPart(id: string) {
  return toolPart(
    id,
-    "patch",
+    "apply_patch",
    "completed",
-    { patchText: "Update the projected files" },
+    { files: ["src/a.ts", "src/b.ts"] },
    {
      metadata: {
        files: [
-          patchFile("src/a.ts", "modified"),
-          patchFile("src/b.ts", "added"),
-          patchFile("src/old.ts", "deleted"),
+          patchFile("src/a.ts", "update"),
+          patchFile("src/b.ts", "add"),
+          patchFile("src/old.ts", "delete"),
+          { ...patchFile("src/moved.ts", "move"), move: "src/new-place.ts" },
        ],
      },
    },
  )
 }

-function patchFile(file: string, status: "added" | "modified" | "deleted") {
+function patchFile(filePath: string, type: "add" | "update" | "delete" | "move") {
  return {
-    file,
-    status,
-    patch:
-      status === "added"
-        ? "@@ -0,0 +1 @@\n+export const after = true"
-        : status === "deleted"
-          ? "@@ -1 +0,0 @@\n-export const before = true"
-          : "@@ -1 +1 @@\n-export const before = true\n+export const after = true",
-    additions: status === "deleted" ? 0 : 1,
-    deletions: status === "added" ? 0 : 1,
+    filePath,
+    relativePath: filePath,
+    type,
+    additions: type === "delete" ? 0 : 1,
+    deletions: type === "add" ? 0 : 1,
+    before: type === "add" ? undefined : "export const before = true\n",
+    after: type === "delete" ? undefined : "export const after = true\n",
  }
 }

@@ -15,7 +15,7 @@ import {

 test("groups singleton and separated context operations at correct boundaries", async ({ page }) => {
  const parts = [
-    toolPart("prt_boundary_01_read", "read", "completed", { path: "src/a.ts" }),
+    toolPart("prt_boundary_01_read", "read", "completed", { filePath: "src/a.ts" }),
    textPart("prt_boundary_02_text", "Boundary text"),
    toolPart("prt_boundary_03_glob", "glob", "completed", { path: ".", pattern: "**/*.ts" }),
    toolPart("prt_boundary_04_grep", "grep", "completed", { path: ".", pattern: "stable" }),
@@ -67,18 +67,19 @@ for (const deviceScaleFactor of [1.25, 1.5]) {
 test("keeps the patch card inside a fractionally short virtual row", async ({ page }) => {
  const patchID = "prt_patch_outline"
  const file = {
-    file: "src/outline.ts",
-    status: "modified",
-    patch:
-      "diff --git a/src/outline.ts b/src/outline.ts\n--- a/src/outline.ts\n+++ b/src/outline.ts\n@@ -1 +1 @@\n-const outline = false\n+const outline = true\n",
+    filePath: "src/outline.ts",
+    relativePath: "src/outline.ts",
+    type: "update",
    additions: 1,
    deletions: 1,
+    before: "const outline = false\n",
+    after: "const outline = true\n",
  }
  const timeline = await setupTimeline(page, {
    messages: [
      userMessage(),
      assistantMessage([
-        toolPart(patchID, "patch", "completed", { patchText: "Update src/outline.ts" }, { metadata: { files: [file] } }),
+        toolPart(patchID, "apply_patch", "completed", { files: [file.filePath] }, { metadata: { files: [file] } }),
      ]),
    ],
    settings: { editToolPartsExpanded: true },
@@ -8,7 +8,7 @@ import {
 } from "../performance/timeline-stability/fixture"

 test("renders every tool error outcome without leaking hidden tools", async ({ page }) => {
-  const ordinary = ["shell", "edit", "write", "patch", "webfetch", "websearch", "subagent", "skill", "mcp_probe"]
+  const ordinary = ["bash", "edit", "write", "apply_patch", "webfetch", "websearch", "task", "skill", "mcp_probe"]
  const parts = ordinary.map((tool, index) =>
    toolPart(`prt_error_${index}`, tool, "error", errorInput(tool), { error: `${tool} failed visibly` }),
  )
@@ -37,8 +37,8 @@ test("transitions shell and question through running error outcomes", async ({ p
      userMessage(),
      assistantMessage(
        [
-          toolPart(shellID, "shell", "streaming", { command: "exit 1" }),
-          toolPart(questionID, "question", "streaming", questionInput()),
+          toolPart(shellID, "bash", "pending", { command: "exit 1" }),
+          toolPart(questionID, "question", "pending", questionInput()),
        ],
        { completed: false },
      ),
@@ -46,11 +46,11 @@ test("transitions shell and question through running error outcomes", async ({ p
  })
  await timeline.waitForPart(shellID)
  await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toHaveCount(0)
-  await timeline.send(partUpdated(toolPart(shellID, "shell", "running", { command: "exit 1" })), 120)
+  await timeline.send(partUpdated(toolPart(shellID, "bash", "running", { command: "exit 1" })), 120)
  await timeline.send(partUpdated(toolPart(questionID, "question", "running", questionInput())), 180)
  await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toHaveCount(0)
  await timeline.send(
-    partUpdated(toolPart(shellID, "shell", "error", { command: "exit 1" }, { error: "Command exited 1" })),
+    partUpdated(toolPart(shellID, "bash", "error", { command: "exit 1" }, { error: "Command exited 1" })),
    180,
  )
  await timeline.send(
@@ -147,13 +147,12 @@ function questionInput() {
 }

 function errorInput(tool: string) {
-  if (tool === "shell") return { command: "exit 1" }
-  if (["edit", "write"].includes(tool)) return { path: "src/error.ts", content: "" }
-  if (tool === "patch") return { patchText: "Update src/error.ts" }
+  if (tool === "bash") return { command: "exit 1" }
+  if (["edit", "write"].includes(tool)) return { filePath: "src/error.ts", content: "" }
+  if (tool === "apply_patch") return { files: ["src/error.ts"] }
  if (tool === "webfetch") return { url: "https://example.com" }
  if (tool === "websearch") return { query: "failure" }
-  if (tool === "subagent")
-    return { description: "Fail subagent", agent: "explore", prompt: "Inspect the failure." }
+  if (tool === "task") return { description: "Fail task", subagent_type: "explore" }
  if (tool === "skill") return { name: "failure" }
  return { target: "failure" }
 }
@@ -167,14 +167,14 @@ function parentMessages(): SessionMessageInfo[] {
      content: [
        {
          type: "tool",
-          id: "call_subagent_0001",
-          name: "subagent",
+          id: "call_task_0001",
+          name: "task",
          time: { created: 1700000001000, ran: 1700000001000, completed: 1700000002000 },
          state: {
            status: "completed",
-            input: { description: taskDescription, agent: "explore", prompt: "Inspect the delegated work." },
+            input: { description: taskDescription, subagent_type: "explore" },
            content: [{ type: "text", text: "Subagent finished" }],
-            metadata: { sessionID: childID },
+            metadata: { sessionId: childID },
          },
        },
      ],
@@ -1,5 +1,3 @@
-import { createTwoFilesPatch } from "diff"
-
 const words = [
  "alpha",
  "bravo",
@@ -30,21 +28,22 @@ const directory = "C:/OpenCode/SmokeProject"
 const projectID = "proj_smoke_timeline"
 const model = { providerID: "opencode", modelID: "claude-opus-4-6", variant: "max" }

-type MessagePart =
-  | { id: string; type: "text"; text: string }
-  | { id: string; type: "reasoning"; text: string; time?: { start: number; end?: number } }
-  | {
-      id: string
-      type: "tool"
-      name: string
-      state: {
-        status: "completed"
-        input: Record<string, unknown>
-        content: [{ type: "text"; text: string }]
-        metadata: Record<string, unknown>
-      }
-      time: { created: number; ran: number; completed: number }
-    }
+type MessagePart = {
+  id: string
+  type: "text" | "reasoning" | "tool"
+  text?: string
+  time?: { start: number; end?: number }
+  callID?: string
+  tool?: string
+  state?: {
+    status: "completed"
+    input: Record<string, unknown>
+    output: string
+    title: unknown
+    metadata: Record<string, unknown>
+    time: { start: number; end: number }
+  }
+}

 function lorem(seed: number, length: number) {
  let out = ""
@@ -103,16 +102,17 @@ function messageContent(part: MessagePart): SessionMessageAssistant["content"][n
        ? { created: part.time.start, ...(part.time.end === undefined ? {} : { completed: part.time.end }) }
        : undefined,
    }
+  const state = part.state!
  return {
    type: "tool",
-    id: part.id,
-    name: part.name,
-    time: part.time,
+    id: part.callID ?? part.id,
+    name: part.tool!,
+    time: { created: state.time.start, ran: state.time.start, completed: state.time.end },
    state: {
      status: "completed",
-      input: part.state.input as Record<string, JsonValue>,
-      content: part.state.content,
-      metadata: part.state.metadata as Record<string, JsonValue>,
+      input: state.input as Record<string, JsonValue>,
+      content: [{ type: "text", text: state.output }],
+      metadata: state.metadata as Record<string, JsonValue>,
    },
  }
 }
@@ -138,61 +138,60 @@ function toolPart(
  outputLength = 160,
 ): MessagePart {
  const metadata =
-    tool === "patch"
-      ? {
-          files: [
-            patchFile(index, "modified"),
-            patchFile(index + 1, index % 2 === 0 ? "added" : "deleted"),
-          ],
-        }
+    tool === "apply_patch"
+      ? { files: [patchFile(index, "update"), patchFile(index + 1, index % 2 === 0 ? "add" : "delete")] }
      : tool === "edit" || tool === "write"
-        ? { files: [fileDiff(String(input.path ?? `src/generated/file-${index}.ts`), index)] }
+        ? {
+            filediff: fileDiff(String(input.filePath ?? `src/generated/file-${index}.ts`), index),
+            diff: patch(index, outputLength),
+            preview: patch(index + 1, 420),
+          }
        : tool === "question"
          ? { answers: [["Proceed"], ["Keep sample output"]] }
          : {}
  return {
-    id: id(`call_${tool}_${partIndex}`, index),
+    id: id(`prt_tool_${tool}_${partIndex}`, index),
    type: "tool",
-    name: tool,
+    callID: id("call", index * 100 + partIndex),
+    tool,
    state: {
      status: "completed",
      input,
-      content: [{ type: "text", text: lorem(index * 23 + partIndex, outputLength) }],
+      output: lorem(index * 23 + partIndex, outputLength),
+      title: tool === "bash" ? input.command : input.filePath || input.path || input.pattern || "completed",
      metadata,
-    },
-    time: {
-      created: 1700000000000 + index * 10_000,
-      ran: 1700000000000 + index * 10_000,
-      completed: 1700000000000 + index * 10_000 + 400,
+      time: { start: 1700000000000 + index * 10_000, end: 1700000000000 + index * 10_000 + 400 },
    },
  }
 }

-function patchFile(seed: number, status: "added" | "modified" | "deleted") {
-  const file = `src/generated/patch-${seed}.ts`
-  const before = status === "added" ? "" : code(seed, 18)
-  const after = status === "deleted" ? "" : code(seed + 1, 24)
+function patchFile(seed: number, type: "add" | "update" | "delete") {
  return {
-    file,
-    status,
-    additions: status === "deleted" ? 0 : (seed % 7) + 1,
-    deletions: status === "added" ? 0 : seed % 4,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
+    filePath: `src/generated/patch-${seed}.ts`,
+    relativePath: `src/generated/patch-${seed}.ts`,
+    type,
+    additions: (seed % 7) + 1,
+    deletions: type === "add" ? 0 : seed % 4,
+    patch: patch(seed, 520),
+    before: type === "add" ? undefined : code(seed, 18),
+    after: type === "delete" ? undefined : code(seed + 1, 24),
  }
 }

 function fileDiff(file: string, seed: number) {
-  const before = code(seed, 32)
-  const after = code(seed + 1, 38)
  return {
    file,
-    status: "modified" as const,
    additions: (seed % 9) + 1,
    deletions: seed % 4,
-    patch: createTwoFilesPatch(`a/${file}`, `b/${file}`, before, after),
+    before: code(seed, 32),
+    after: code(seed + 1, 38),
  }
 }

+function patch(seed: number, length: number) {
+  return `diff --git a/src/generated/file-${seed}.ts b/src/generated/file-${seed}.ts\n+${lorem(seed, length).replace(/\n/g, "\n+")}`
+}
+
 function code(seed: number, lines: number) {
  return Array.from({ length: lines }, (_, index) => `export const value${index} = "${lorem(seed + index, 32)}"`).join(
    "\n",
@@ -206,23 +205,21 @@ function turn(index: number): SessionMessageInfo[] {
    ...(index % 5 === 0 ? [reasoningPart(index, 0, 420)] : []),
    ...(index % 3 === 0
      ? [
-          toolPart(index, 0, "read", { path: `src/generated/file-${index}.ts`, offset: 0, limit: 80 }, 220),
+          toolPart(index, 0, "read", { filePath: `src/generated/file-${index}.ts`, offset: 0, limit: 80 }, 220),
          toolPart(index, 5, "glob", { path: directory, pattern: `**/*sample-${index}*.ts` }, 140),
          toolPart(index, 1, "grep", { path: directory, pattern: `sample-${index}`, include: "*.ts" }, 180),
          toolPart(index, 6, "list", { path: `src/generated/${index}` }, 120),
        ]
      : []),
    textPart(index, 2, 160 + (index % 6) * 90),
-    ...(index % 4 === 0
-      ? [toolPart(index, 3, "edit", { path: `src/generated/file-${index}.ts`, oldString: "before", newString: "after" }, 700)]
-      : []),
+    ...(index % 4 === 0 ? [toolPart(index, 3, "edit", { filePath: `src/generated/file-${index}.ts` }, 700)] : []),
    ...(index % 6 === 0
-      ? [toolPart(index, 7, "write", { path: `src/generated/write-${index}.ts`, content: code(index, 28) }, 560)]
+      ? [toolPart(index, 7, "write", { filePath: `src/generated/write-${index}.ts`, content: code(index, 28) }, 560)]
      : []),
    ...(index % 8 === 0
-      ? [toolPart(index, 8, "patch", { patchText: `Update generated patch ${index}` }, 620)]
+      ? [toolPart(index, 8, "apply_patch", { files: [`src/generated/patch-${index}.ts`] }, 620)]
      : []),
-    ...(index % 7 === 0 ? [toolPart(index, 4, "shell", { command: "bun typecheck" }, 620)] : []),
+    ...(index % 7 === 0 ? [toolPart(index, 4, "bash", { command: "bun typecheck" }, 620)] : []),
    ...(index % 10 === 0 ? [toolPart(index, 9, "webfetch", { url: "https://example.com/docs/sample" }, 120)] : []),
    ...(index % 11 === 0 ? [toolPart(index, 10, "websearch", { query: "sample movement notes" }, 240)] : []),
    ...(index % 13 === 0
@@ -237,15 +234,7 @@ function turn(index: number): SessionMessageInfo[] {
        ]
      : []),
    ...(index % 17 === 0
-      ? [
-          toolPart(
-            index,
-            12,
-            "subagent",
-            { description: "Inspect generated fixture", agent: "explore", prompt: "Inspect the fixture." },
-            160,
-          ),
-        ]
+      ? [toolPart(index, 12, "task", { description: "Inspect generated fixture", subagent_type: "explore" }, 160)]
      : []),
  ]
  return [user, assistantMessage(targetID, index, user.id, parts)]
@@ -322,7 +311,7 @@ export const fixture = {
    targetPartIDs: targetMessages.flatMap(currentPartIDs),
    expandedShellPartID: targetMessages
      .flatMap((message) => (message.type === "assistant" ? message.content : []))
-      .flatMap((part) => (part.type === "tool" && part.name === "shell" ? [part.id] : []))[0],
+      .flatMap((part) => (part.type === "tool" && part.name === "bash" ? [part.id] : []))[0],
  },
 }

@@ -518,7 +518,7 @@ async function expectCanScrollToStart(
  let current = await timelineState(page)
  let unchangedAtTop = 0

-  for (let attempt = 0; attempt < 800; attempt++) {
+  for (let attempt = 0; attempt < 600; attempt++) {
    collectSeen(current, seenParts, seenMessages)
    samples.push(sampleTraversal(current, seenParts.size, seenMessages.size))
    expectNoSmokeErrors(errors, current.errorToasts, current.forbiddenText)
@@ -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:"
  }
 }
@@ -1,10 +1,14 @@
 import "@/index.css"
+import * as Sentry from "@sentry/solid"
+import { I18nProvider } from "@opencode-ai/ui/context"
+import type { UiI18n } from "@opencode-ai/ui/context/i18n"
 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 +22,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 { LanguageProvider, 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("@/pages/session"), 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 +62,62 @@ 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>
+  )
+}
+
+function UiI18nBridge(props: ParentProps) {
+  const language = useLanguage()
+  return (
+    <I18nProvider
+      value={{
+        locale: language.intl,
+        layoutLocale: language.layoutLocale,
+        t: language.t as UiI18n["t"],
+        plural: language.plural,
+        pluralForm: language.pluralForm,
+      }}
+    >
+      {props.children}
+    </I18nProvider>
+  )
+}
+
 declare global {
  interface Window {
    __OPENCODE__?: {
@@ -133,11 +186,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 +210,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} />
              }}
            >
@@ -0,0 +1,125 @@
+// @ts-nocheck
+import { createStore } from "solid-js/store"
+import { createPromptState } from "@/context/prompt"
+import { createPromptInputHistory, PromptInput } from "./prompt-input"
+
+function createPromptInputStoryRuntime() {
+  const state = createPromptState()
+  return {
+    state,
+    history: createPromptInputHistory(),
+    submission: {
+      abort() {},
+      handleSubmit(event: Event) {
+        event.preventDefault()
+        state.reset()
+      },
+    },
+  }
+}
+
+function PromptInputExample() {
+  const input = createPromptInputStoryRuntime()
+  const [controls, setControls] = createStore({
+    agent: "build",
+    variant: undefined as string | undefined,
+    comments: 0,
+    tabs: [] as string[],
+    activeTab: undefined as string | undefined,
+    reviewOpen: false,
+  })
+  const storyModel = {
+    id: "claude-3-7-sonnet",
+    name: "Claude 3.7 Sonnet",
+    provider: { id: "anthropic", name: "Anthropic" },
+  }
+  const model = {
+    current: () => storyModel,
+    list: () => [storyModel],
+    visible: () => true,
+    set: () => {},
+    variant: {
+      list: () => ["fast", "thinking"],
+      current: () => controls.variant,
+      set: (variant?: string) => setControls("variant", variant),
+    },
+  }
+  const inputControls = {
+    agents: {
+      available: [{ name: "review", hidden: false, mode: "subagent" }],
+      options: ["build", "review", "plan"],
+      get current() {
+        return controls.agent
+      },
+      loading: false,
+      visible: true,
+      select: (agent?: string) => setControls("agent", agent ?? "build"),
+    },
+    model: {
+      selection: model,
+      paid: true,
+      loading: false,
+    },
+    session: {
+      id: "story-session",
+      tabs: {
+        active: () => controls.activeTab,
+        all: () => controls.tabs,
+        open: (tab: string) => setControls("tabs", (tabs) => (tabs.includes(tab) ? tabs : [...tabs, tab])),
+        setActive: (tab: string) => setControls("activeTab", tab),
+      },
+      reviewPanel: {
+        opened: () => controls.reviewOpen,
+        open: () => setControls("reviewOpen", true),
+      },
+    },
+  }
+  const addReviewComment = () => {
+    const comment = controls.comments + 1
+    setControls("comments", comment)
+    input.state.context.add({
+      type: "file",
+      path: "src/components/prompt-input.tsx",
+      selection: {
+        startLine: 84 + comment,
+        startChar: 0,
+        endLine: 84 + comment,
+        endChar: 0,
+      },
+      comment: `Review comment ${comment}`,
+      commentID: `review-comment-${comment}`,
+      commentOrigin: "review",
+      preview: "export const PromptInput = ...",
+    })
+  }
+
+  return (
+    <div class="flex flex-col gap-3">
+      <PromptInput controls={inputControls} {...input} />
+      <div>
+        <button
+          type="button"
+          class="rounded-md border border-border-weak-base bg-background-base px-2.5 py-1.5 text-12-medium text-text-base hover:bg-background-stronger"
+          onClick={addReviewComment}
+        >
+          Add review comment
+        </button>
+      </div>
+    </div>
+  )
+}
+
+export default {
+  title: "App/PromptInput",
+  id: "app-prompt-input",
+  component: PromptInput,
+}
+
+export const Basic = {
+  render: () => (
+    <div class="pt-10">
+      <h1 class="mb-4">Prompt Input</h1>
+      <PromptInputExample />
+    </div>
+  ),
+}
@@ -235,9 +235,6 @@ beforeAll(async () => {
      session: {
        remember: () => undefined,
        setStatus: () => undefined,
-        // Delegates straight to the API client; optimistic admission and
-        // rollback are covered by the data-layer tests in packages/tui.
-        prompt: (input: unknown) => rootClient.api.session.prompt(input as never),
      },
      location: {
        info: () => ({ project: { id: "project", directory: "/repo/main" } }),
@@ -417,9 +414,7 @@ describe("prompt submit worktree selection", () => {
        model: { providerID: "provider", modelID: "model", variant: "high" },
      },
    })
-    // ID minting is delegated to the data layer, which mints a client ID when
-    // none is supplied (covered by the data-layer tests in packages/tui).
-    expect((promptInputs[0] as { id?: string }).id).toBeUndefined()
+    expect((promptInputs[0] as { id?: string }).id).toStartWith("msg_")
  })

  test("restores the prompt when sending fails", async () => {
@@ -11,7 +11,7 @@ import { usePermission } from "@/context/permission"
 import { type ContextItem, type ImageAttachmentPart, type Prompt, type usePrompt } from "@/context/prompt"
 import { useWorkspaceLocation } from "@/context/location"
 import { useServerSDK, type ServerSDK } from "@/context/server-sdk"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
+import { Identifier } from "@/utils/id"
 import { getDirectory } from "@opencode-ai/util/path"
 import { buildPromptRequest } from "./build-prompt-request"
 import { setCursorPosition } from "./editor-dom"
@@ -40,6 +40,7 @@ type FollowupSendInput = {
  data: Data
  session: Accessor<{ agent?: string; model?: { id: string; providerID: string; variant?: string } } | undefined>
  draft: FollowupDraft
+  messageID?: string
  optimisticBusy?: boolean
 }

@@ -68,9 +69,10 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
  ) {
    setBusy()
    try {
+      const messageID = Identifier.ascending("message")
      await input.api.command({
        sessionID: input.draft.sessionID,
-        id: SessionMessage.ID.create(),
+        id: messageID,
        command: cmd,
        arguments: tail.join(" "),
        agent: input.draft.agent,
@@ -93,6 +95,7 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
    }
  }

+  const messageID = input.messageID ?? Identifier.ascending("message")
  const encodedImages = await Promise.all(
    images.map(async (attachment) => ({
      ...attachment,
@@ -129,10 +132,9 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
      })
    }

-    // The data layer admits optimistically under a client-minted ID: the
-    // prompt renders immediately and rolls back if the server rejects it.
-    await input.data.session.prompt({
+    await input.api.prompt({
      sessionID: input.draft.sessionID,
+      id: messageID,
      text: request.text,
      files: request.files.map((file) => ({ uri: file.uri, name: file.name, mention: file.mention })),
      agents: request.agents,
@@ -444,11 +446,12 @@ export function createPromptSubmit(input: PromptSubmitInput) {
          ?.find((command) => command.name === commandName)
        if (customCommand) {
          clearInput()
+          const messageID = Identifier.ascending("message")
          submissionData.session.setStatus(session.id, "running")
          void submissionServerSDK.api.session
            .command({
              sessionID: session.id,
-              id: SessionMessage.ID.create(),
+              id: messageID,
              command: commandName,
              arguments: args.join(" "),
              agent,
@@ -473,6 +476,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      }

      const commentItems = context.filter((item) => item.type === "file" && !!item.comment?.trim())
+      const messageID = Identifier.ascending("message")

      for (const item of commentItems) submission.target().context.remove(item.key)
      clearInput()
@@ -482,6 +486,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        data: submissionData,
        session: () => session,
        draft,
+        messageID,
        optimisticBusy: sessionDirectory === projectDirectory,
      }).catch((err) => {
        if (sessionDirectory === projectDirectory) {
@@ -1,55 +0,0 @@
-import { Show, type JSX } from "solid-js"
-import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Keybind } from "@opencode-ai/ui/keybind"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
-
-export type SessionHeaderV2ActionsState = {
-  status?: { label: string; content: () => JSX.Element }
-  reviewLabel: string
-  reviewKeybind: string[]
-  reviewVisible: boolean
-  reviewOpened: boolean
-  onReviewToggle: () => void
-}
-
-export function SessionHeaderV2Actions(props: { state: SessionHeaderV2ActionsState }) {
-  return (
-    <div class="flex items-center gap-2">
-      <Show when={props.state.status}>
-        {(status) => (
-          <Tooltip appearance="standard" placement="bottom" value={status().label}>
-            {status().content()}
-          </Tooltip>
-        )}
-      </Show>
-      <Show when={props.state.reviewVisible}>
-        <Tooltip
-          class="shrink-0"
-          placement="bottom"
-          value={
-            <>
-              {props.state.reviewLabel}
-              <Show when={props.state.reviewKeybind.length > 0}>
-                <Keybind keys={props.state.reviewKeybind} variant="neutral" />
-              </Show>
-            </>
-          }
-        >
-          <IconButton
-            type="button"
-            variant="ghost-muted"
-            size="large"
-            class="!w-9 shrink-0"
-            state={props.state.reviewOpened ? "pressed" : undefined}
-            onClick={props.state.onReviewToggle}
-            aria-label={props.state.reviewLabel}
-            aria-expanded={props.state.reviewOpened}
-            aria-controls="review-panel"
-            icon={<Icon name="sidebar-right" />}
-          />
-        </Tooltip>
-      </Show>
-    </div>
-  )
-}
@@ -6,9 +6,12 @@ import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { StatusPopoverV2 } from "../status-popover"
+import { IconButton } from "@opencode-ai/ui/icon-button"
+import { Icon } from "@opencode-ai/ui/icon"
+import { Keybind } from "@opencode-ai/ui/keybind"
+import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { reviewTooltipKeybind } from "../command-tooltip-keybind"
 import { useTitlebarRightMount } from "../titlebar"
-import { SessionHeaderV2Actions, type SessionHeaderV2ActionsState } from "./session-header-actions"

 export function SessionHeader() {
  const command = useCommand()
@@ -20,7 +23,8 @@ export function SessionHeader() {
  const isDesktop = createMediaQuery("(min-width: 768px)")

  const v2ActionsState = createMemo<SessionHeaderV2ActionsState>(() => ({
-    status: status() ? { label: language.t("status.popover.trigger"), content: () => <StatusPopoverV2 /> } : undefined,
+    statusVisible: status(),
+    statusLabel: language.t("status.popover.trigger"),
    reviewLabel: language.t("command.review.toggle"),
    reviewKeybind: reviewTooltipKeybind(command),
    reviewVisible: isDesktop(),
@@ -40,3 +44,52 @@ export function SessionHeader() {
    </Show>
  )
 }
+
+type SessionHeaderV2ActionsState = {
+  statusVisible: boolean
+  statusLabel: string
+  reviewLabel: string
+  reviewKeybind: string[]
+  reviewVisible: boolean
+  reviewOpened: boolean
+  onReviewToggle: () => void
+}
+
+function SessionHeaderV2Actions(props: { state: SessionHeaderV2ActionsState }) {
+  return (
+    <div class="flex items-center gap-2">
+      <Show when={props.state.statusVisible}>
+        <Tooltip appearance="standard" placement="bottom" value={props.state.statusLabel}>
+          <StatusPopoverV2 />
+        </Tooltip>
+      </Show>
+      <Show when={props.state.reviewVisible}>
+        <Tooltip
+          class="shrink-0"
+          placement="bottom"
+          value={
+            <>
+              {props.state.reviewLabel}
+              <Show when={props.state.reviewKeybind.length > 0}>
+                <Keybind keys={props.state.reviewKeybind} variant="neutral" />
+              </Show>
+            </>
+          }
+        >
+          <IconButton
+            type="button"
+            variant="ghost-muted"
+            size="large"
+            class="!w-9 shrink-0"
+            state={props.state.reviewOpened ? "pressed" : undefined}
+            onClick={props.state.onReviewToggle}
+            aria-label={props.state.reviewLabel}
+            aria-expanded={props.state.reviewOpened}
+            aria-controls="review-panel"
+            icon={<Icon name="sidebar-right" />}
+          />
+        </Tooltip>
+      </Show>
+    </div>
+  )
+}
@@ -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>
  )
 }
@@ -1,10 +1,8 @@
 import * as i18n from "@solid-primitives/i18n"
-import { createEffect, createMemo, createResource, type JSX } from "solid-js"
+import { createEffect, createMemo, createResource } from "solid-js"
 import { createStore } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import {
-  I18nProvider,
-  type UiI18n,
  pluralCategory,
  type UiI18nPluralLookupKey,
  type UiI18nPluralKey,
@@ -262,20 +260,3 @@ export const { use: useLanguage, provider: LanguageProvider } = createSimpleCont
    }
  },
 })
-
-export function UiI18nBridge(props: { children?: JSX.Element }) {
-  const language = useLanguage()
-  return (
-    <I18nProvider
-      value={{
-        locale: language.intl,
-        layoutLocale: language.layoutLocale,
-        t: language.t as UiI18n["t"],
-        plural: language.plural,
-        pluralForm: language.pluralForm,
-      }}
-    >
-      {props.children}
-    </I18nProvider>
-  )
-}
@@ -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"
@@ -1,10 +0,0 @@
-export const popularProviders = [
-  "opencode",
-  "opencode-go",
-  "anthropic",
-  "github-copilot",
-  "openai",
-  "google",
-  "openrouter",
-  "vercel",
-]
@@ -5,9 +5,17 @@ import { Iterable, pipe } from "effect"
 import { createEffect, createMemo, type Accessor } from "solid-js"
 import { emptyProviderCatalog } from "./provider-catalog"
 import { useIntegrations } from "./use-integrations"
-import { popularProviders } from "./provider-order"

-export { popularProviders } from "./provider-order"
+export const popularProviders = [
+  "opencode",
+  "opencode-go",
+  "anthropic",
+  "github-copilot",
+  "openai",
+  "google",
+  "openrouter",
+  "vercel",
+]
 const popularProviderSet = new Set(popularProviders)

 export function useProviders(directory: Accessor<string | undefined>) {
@@ -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"
@@ -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>
-  )
-}
@@ -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: {
@@ -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>
@@ -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", () => {
@@ -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,
    }),
  )
@@ -1,5 +1,5 @@
+import type { FilePart } from "@/types"
 import type { FileDiffInfo, SessionMessageUser } from "@opencode-ai/client/promise"
-import type { SessionUserActions } from "@opencode-ai/session-ui/message"
 import { getFilename } from "@opencode-ai/util/path"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { createQuery, skipToken, useMutation, useQueryClient } from "@tanstack/solid-query"
@@ -81,7 +81,6 @@ import {
 } from "@/pages/session/session-panel-width"
 import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { sessionPanelLayout } from "@/pages/session/session-panel-layout"
-import { SessionPanelFrame, SessionRouteFrame } from "@/pages/session/session-frame"
 import { SessionReviewEmptyChangesV2 } from "@opencode-ai/session-ui/v2/session-review-empty-changes-v2"
 import { SessionReviewV2SidebarToggle } from "@opencode-ai/session-ui/v2/session-review-v2"
 import { ReviewPanelV2 } from "@/pages/session/v2/review-panel-v2"
@@ -91,7 +90,7 @@ import { TerminalPanelV2 } from "@/pages/session/terminal-panel-v2"
 import { useComposerCommands } from "@/pages/session/use-composer-commands"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
 import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
+import { Identifier } from "@/utils/id"
 import { Persist, persisted } from "@/utils/persist"
 import { formatServerError, isLocalSessionNotFoundError, isSessionNotFoundError } from "@/utils/server-errors"
 import { requireServerKey, sessionHref } from "@/utils/session-route"
@@ -265,6 +264,27 @@ function MarkSessionNotificationsViewed(props: { sessionID?: () => string | unde
  return null
 }

+function SessionRouteFrame(props: ParentProps<{ padded?: boolean }>) {
+  return (
+    <div class="relative size-full overflow-hidden flex flex-col" classList={{ "p-2": props.padded }}>
+      {props.children}
+    </div>
+  )
+}
+
+function SessionPanelFrame(props: ParentProps<{ raised?: boolean }>) {
+  return (
+    <div
+      class="flex-1 min-h-0 flex flex-col bg-v2-background-bg-base rounded-[10px] overflow-hidden"
+      classList={{
+        "shadow-[var(--v2-elevation-raised)]": props.raised,
+      }}
+    >
+      {props.children}
+    </div>
+  )
+}
+
 export default function Page() {
  const data = useData()
  const layout = useLayout()
@@ -1544,7 +1564,7 @@ export default function Page() {
  const queueFollowup = (draft: FollowupDraft) => {
    setFollowup("items", draft.sessionID, (items) => [
      ...(items ?? []),
-      { id: SessionMessage.ID.create(), ...draft },
+      { id: Identifier.ascending("message"), ...draft },
    ])
    setFollowup("failed", draft.sessionID, undefined)
    setFollowup("paused", draft.sessionID, undefined)
@@ -1593,15 +1613,14 @@ export default function Page() {

  // attachment bytes are embedded as a data URL, so downloading always works;
  // revealing requires the on-disk path captured by the client that attached the file
-  const openAttachment: NonNullable<SessionUserActions["openAttachment"]> = (file) => {
-    const url = file.source.type === "uri" ? file.source.uri : `data:${file.mime};base64,${file.data}`
+  const openAttachment = (file: FilePart) => {
    const download = () => {
      const anchor = document.createElement("a")
-      anchor.href = url
-      anchor.download = getFilename(file.name) || "attachment"
+      anchor.href = file.url
+      anchor.download = getFilename(file.filename) || "attachment"
      anchor.click()
    }
-    const path = file.name ?? ""
+    const path = file.filename ?? ""
    const absolute = path.startsWith("/") || path.startsWith("\\\\") || /^[a-zA-Z]:[\\/]/.test(path)
    if (platform.revealPath && absolute) {
      void platform.revealPath(path).then(
@@ -1615,7 +1634,7 @@ export default function Page() {
    download()
  }

-  const actions = { revert, openAttachment } satisfies SessionUserActions
+  const actions = { revert, openAttachment }

  createEffect(() => {
    const sessionID = controller.identity.params.id
@@ -7,32 +7,8 @@ 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<
-  SessionComposerRegionController["state"],
-  "questionRequest" | "permissionRequest" | "permissionResponding" | "decide" | "blocked"
-> & {
-  background: Pick<SessionComposerRegionController["state"]["background"], "blocking" | "tasks" | "move">
-}
-
-export type SessionComposerRegionViewController = Pick<
-  SessionComposerRegionController,
-  | "centered"
-  | "followup"
-  | "revert"
-  | "onResponseSubmit"
-  | "openParent"
-  | "setPromptRef"
-  | "setDockRef"
-  | "parentID"
-  | "child"
-  | "showComposer"
-  | "handoffPrompt"
-  | "promptReady"
-  | "lift"
-> & { state: SessionComposerRegionState }
-
 export function SessionComposerRegion(props: {
-  controller: SessionComposerRegionViewController
+  controller: SessionComposerRegionController
  promptInput: JSX.Element
 }) {
  const language = useLanguage()
@@ -1,22 +0,0 @@
-import type { ParentProps } from "solid-js"
-
-export function SessionRouteFrame(props: ParentProps<{ padded?: boolean }>) {
-  return (
-    <div class="relative flex size-full flex-col overflow-hidden" classList={{ "p-2": props.padded }}>
-      {props.children}
-    </div>
-  )
-}
-
-export function SessionPanelFrame(props: ParentProps<{ raised?: boolean }>) {
-  return (
-    <div
-      class="flex min-h-0 flex-1 flex-col overflow-hidden rounded-[10px] bg-v2-background-bg-base"
-      classList={{
-        "shadow-[var(--v2-elevation-raised)]": props.raised,
-      }}
-    >
-      {props.children}
-    </div>
-  )
-}
@@ -1,157 +0,0 @@
-import {
-  activePermissionRequest,
-  activeQuestionRequest,
-  attachmentsAndCommentsDocument,
-  editThenTestDocument,
-  emptySessionDocument,
-  largeCompletedDocument,
-  pendingAndQueuedDocument,
-  permissionPendingDocument,
-  questionPendingDocument,
-  queuedPrompts,
-  recoveryDocument,
-  thinkingDocument,
-} from "@opencode-ai/session-ui/storybook"
-import { SessionPreview } from "./session-preview"
-
-const description = "opencode · modular-session-ui"
-const implementAndVerify = () => (
-  <SessionPreview
-    title="Update active Session status"
-    description={description}
-    document={editThenTestDocument}
-    draft="Add a browser assertion for the updated status"
-  />
-)
-
-export default {
-  title: "OpenCode/Session/Complete workspace",
-  id: "app-current-session-surface",
-  component: SessionPreview,
-  parameters: {
-    layout: "fullscreen",
-    docs: {
-      description: {
-        component:
-          "A server-free Session workbench for product and design review. It composes the production current timeline, titlebar actions, composer region, prompt input, request docks, queue, and review components.",
-      },
-    },
-  },
-}
-
-export const StartACodingTask = {
-  render: () => (
-    <SessionPreview
-      title="New Session"
-      description={description}
-      document={emptySessionDocument}
-      draft="Find why the Session header shifts after the first streamed response"
-    />
-  ),
-}
-
-export const AgentIsThinking = {
-  render: () => (
-    <SessionPreview title="Fix Session header shift" description={description} document={thinkingDocument} />
-  ),
-}
-
-export const ImplementAndVerifyLight = {
-  globals: { theme: "light" },
-  render: implementAndVerify,
-}
-
-export const ImplementAndVerifyDark = {
-  globals: { theme: "dark" },
-  render: implementAndVerify,
-}
-
-export const QueueAFollowUp = {
-  render: () => (
-    <SessionPreview
-      title="Add deterministic Session stories"
-      description={description}
-      document={pendingAndQueuedDocument}
-      followups={queuedPrompts}
-      backgroundTasks={[{ id: "task_storybook", type: "subagent", label: "Review the current Storybook scenarios" }]}
-    />
-  ),
-}
-
-export const PermissionRequired = {
-  render: () => (
-    <SessionPreview
-      title="Publish canary preview"
-      description={description}
-      document={permissionPendingDocument}
-      request={{ type: "permission", value: activePermissionRequest }}
-    />
-  ),
-}
-
-export const AnswerAProductQuestion = {
-  render: () => (
-    <SessionPreview
-      title="Add the Session review panel"
-      description={description}
-      document={questionPendingDocument}
-      request={{ type: "question", value: activeQuestionRequest }}
-    />
-  ),
-}
-
-export const ReviewChanges = {
-  render: () => (
-    <SessionPreview
-      title="Update active Session status"
-      description={description}
-      document={editThenTestDocument}
-      reviewOpened
-    />
-  ),
-}
-
-export const RecoverFromAFailedTest = {
-  render: () => (
-    <SessionPreview
-      title="Keep tool disclosure stable"
-      description={description}
-      document={recoveryDocument}
-      draft="Also run the App browser test"
-    />
-  ),
-}
-
-export const WorkFromAttachments = {
-  render: () => (
-    <SessionPreview
-      title="Fix narrow Session spacing"
-      description={description}
-      document={attachmentsAndCommentsDocument}
-      draft="Verify the same layout at 360 px"
-    />
-  ),
-}
-
-export const LongRunningSession = {
-  render: () => (
-    <SessionPreview
-      title="Modularize Session rendering"
-      description={description}
-      document={largeCompletedDocument}
-      draft="Summarize the remaining verification"
-    />
-  ),
-}
-
-export const MixedDirectionRtl = {
-  globals: { theme: "dark", direction: "rtl" },
-  render: () => (
-    <SessionPreview
-      title="مراجعة واجهة Session"
-      description="opencode · packages/app/src/session.tsx"
-      document={attachmentsAndCommentsDocument}
-      draft="راجع المسار packages/app/src/session.tsx ثم شغّل bun test"
-    />
-  ),
-}
@@ -1,352 +0,0 @@
-import type { ModelSelection } from "@/context/local"
-import { PromptInputV2Composer, type PromptInputV2ComposerController } from "@/components/prompt-input-v2"
-import { SessionHeaderV2Actions } from "@/components/session/session-header-actions"
-import {
-  SessionComposerRegion,
-  type SessionComposerRegionViewController,
-} from "@/pages/session/composer/session-composer-region"
-import { SessionPanelFrame, SessionRouteFrame } from "@/pages/session/session-frame"
-import type { FormInfo, PermissionRequest, SessionStatus } from "@opencode-ai/client/promise"
-import type { SessionDocument } from "@opencode-ai/session-ui/document"
-import { CurrentSessionProviders, STORY_MODEL } from "@opencode-ai/session-ui/storybook"
-import { SessionTimeline } from "@opencode-ai/session-ui/timeline"
-import { SessionReviewEmptyChangesV2 } from "@opencode-ai/session-ui/v2/session-review-empty-changes-v2"
-import { createPromptInputV2Controller } from "@opencode-ai/session-ui/v2/prompt-input/interaction"
-import type { PromptInputV2PersistedState } from "@opencode-ai/session-ui/v2/prompt-input/types"
-import { Button } from "@opencode-ai/ui/button"
-import { Icon } from "@opencode-ai/ui/icon"
-import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
-import { Show } from "solid-js"
-import { createStore } from "solid-js/store"
-import { useLanguage } from "@/context/language"
-import { ReviewPanelV2View } from "@/pages/session/v2/review-panel-v2"
-import { createReviewPanelV2State } from "@/pages/session/v2/review-panel-v2-state"
-
-const modelReady = Object.assign(() => true, { promise: undefined }) satisfies ModelSelection["ready"]
-const storyComposerModel = {
-  id: STORY_MODEL.id,
-  providerID: STORY_MODEL.providerID,
-  api: { id: STORY_MODEL.id, url: "https://api.anthropic.com", npm: "@ai-sdk/anthropic" },
-  name: "Claude Sonnet 4",
-  family: "claude-sonnet",
-  capabilities: {
-    temperature: true,
-    reasoning: true,
-    attachment: true,
-    toolcall: true,
-    input: { text: true, audio: false, image: true, video: false, pdf: true },
-    output: { text: true, audio: false, image: false, video: false, pdf: false },
-    interleaved: true,
-  },
-  cost: { input: 3, output: 15, cache: { read: 0.3, write: 3.75 } },
-  limit: { context: 200_000, output: 64_000 },
-  status: "active",
-  options: {},
-  headers: {},
-  release_date: "2025-05-22",
-  variants: { balanced: {} },
-  provider: {
-    id: STORY_MODEL.providerID,
-    name: "Anthropic",
-    source: "custom",
-    env: [],
-    options: {},
-    models: {},
-  },
-  latest: true,
-} satisfies NonNullable<ReturnType<ModelSelection["current"]>>
-
-const modelSelection = {
-  ready: modelReady,
-  current: () => storyComposerModel,
-  recent: () => [storyComposerModel],
-  list: () => [storyComposerModel],
-  cycle() {},
-  set() {},
-  visible: () => true,
-  setVisibility() {},
-  variant: {
-    configured: () => STORY_MODEL.variant,
-    selected: () => STORY_MODEL.variant,
-    current: () => STORY_MODEL.variant,
-    list: () => [STORY_MODEL.variant],
-    set() {},
-    cycle() {},
-  },
-} satisfies ModelSelection
-
-export type SessionPreviewProps = {
-  title: string
-  description: string
-  document: SessionDocument
-  draft?: string
-  followups?: { id: string; text: string }[]
-  request?: { type: "permission"; value: PermissionRequest } | { type: "question"; value: FormInfo }
-  reviewOpened?: boolean
-  backgroundTasks?: { id: string; type: "shell" | "subagent"; label: string }[]
-}
-
-export function SessionPreview(props: SessionPreviewProps) {
-  const [state, setState] = createStore({ revision: 1 })
-  const queryClient = new QueryClient({ defaultOptions: { mutations: { retry: false } } })
-  return (
-    <QueryClientProvider client={queryClient}>
-      <Show when={state.revision} keyed>
-        {(revision) => (
-          <div data-story-revision={revision}>
-            <SessionSurfaceState
-              {...props}
-              request={
-                props.request?.type === "question"
-                  ? {
-                      type: "question",
-                      value: { ...props.request.value, id: `${props.request.value.id}:${revision}` },
-                    }
-                  : props.request
-              }
-              onReset={() => setState("revision", (value) => value + 1)}
-            />
-          </div>
-        )}
-      </Show>
-    </QueryClientProvider>
-  )
-}
-
-function createPromptController(input: {
-  initial: string
-  placeholder: string
-  status: () => SessionStatus
-  onActivity: (activity: string) => void
-  onSubmit: (text: string) => void
-  onStop: () => void
-}) {
-  const draft = createStore<PromptInputV2PersistedState>({
-    prompt: [{ type: "text", content: input.initial, start: 0, end: input.initial.length }],
-    cursor: input.initial.length,
-    model: { providerID: STORY_MODEL.providerID, modelID: STORY_MODEL.id, variant: STORY_MODEL.variant },
-    context: { items: [] },
-  })
-  const interaction = createPromptInputV2Controller({
-    store: draft,
-    commands: () => [],
-    context: () => [],
-    searchContextFiles: () => [],
-    view: {
-      placeholder: () => input.placeholder,
-      add: { onAttach: () => input.onActivity("Opened the local attachment picker") },
-      submit: {
-        stopping: () => false,
-        working: () => input.status().type !== "idle",
-        onSubmit: () => {
-          const value = interaction.value().trim()
-          if (!value) return
-          input.onSubmit(value)
-          draft[1]("prompt", [{ type: "text", content: "", start: 0, end: 0 }])
-          draft[1]("cursor", 0)
-        },
-        onStop: input.onStop,
-      },
-      shell: {
-        onOpen: () => input.onActivity("Changed the composer to shell mode"),
-        onClose: () => input.onActivity("Changed the composer to prompt mode"),
-      },
-    },
-  })
-  return {
-    controller: {
-      ...interaction,
-      model: { selection: modelSelection, paid: true, loading: false },
-    } satisfies PromptInputV2ComposerController,
-    setValue(value: string) {
-      draft[1]("prompt", [{ type: "text", content: value, start: 0, end: value.length }])
-      draft[1]("cursor", value.length)
-    },
-  }
-}
-
-function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void }) {
-  const language = useLanguage()
-  const [state, setState] = createStore<{
-    activity: string
-    reviewOpened: boolean
-    followups: { id: string; text: string }[]
-    request: SessionPreviewProps["request"]
-  }>({
-    activity: "Ready",
-    reviewOpened: props.reviewOpened ?? false,
-    followups: props.followups?.map((item) => ({ ...item })) ?? [],
-    request: props.request,
-  })
-  const prompt = createPromptController({
-    initial: props.draft ?? "",
-    placeholder: language.t("prompt.placeholder.normal"),
-    status: () => props.document.status,
-    onActivity: (activity) => setState("activity", activity),
-    onSubmit: (text) => setState("activity", `Submitted locally: ${text}`),
-    onStop: () => setState("activity", "Requested a local stop"),
-  })
-  const removeFollowup = (id: string) => setState("followups", (items) => items.filter((item) => item.id !== id))
-  const region = {
-    state: {
-      questionRequest: () => (state.request?.type === "question" ? state.request.value : undefined),
-      permissionRequest: () => (state.request?.type === "permission" ? state.request.value : undefined),
-      permissionResponding: () => false,
-      decide: (response) => {
-        setState("request", undefined)
-        setState("activity", `Permission response: ${response}`)
-      },
-      background: {
-        blocking: () => [],
-        tasks: () => props.backgroundTasks ?? [],
-        move: async () => {
-          setState("activity", "Requested background execution")
-        },
-      },
-      blocked: () => state.request !== undefined,
-    },
-    centered: () => true,
-    followup: () =>
-      state.followups.length
-        ? {
-            items: state.followups,
-            onSend: (id: string) => {
-              removeFollowup(id)
-              setState("activity", "Requested immediate delivery for the queued message")
-            },
-            onEdit: (id: string) => {
-              const item = state.followups.find((value) => value.id === id)
-              if (item) prompt.setValue(item.text)
-              removeFollowup(id)
-              setState("activity", "Moved the queued message into the composer")
-            },
-          }
-        : undefined,
-    revert: () => undefined,
-    onResponseSubmit: () => {
-      setState("request", undefined)
-      setState("activity", "Submitted the answer locally")
-    },
-    openParent: () => setState("activity", "Opened the parent Session locally"),
-    setPromptRef() {},
-    setDockRef() {},
-    parentID: () => undefined,
-    child: () => false,
-    showComposer: () => true,
-    handoffPrompt: () => undefined,
-    promptReady: () => true,
-    lift: () => 0,
-  } satisfies SessionComposerRegionViewController
-
-  return (
-    <div class="mx-auto h-screen min-h-[640px] w-full max-w-[1440px]">
-      <SessionRouteFrame padded>
-        <SessionPanelFrame raised>
-          <main class="flex min-h-0 flex-1 flex-col">
-            <SessionSurfaceHeader
-              title={props.title}
-              description={props.description}
-              reviewVisible
-              reviewOpened={state.reviewOpened}
-              onReviewToggle={() => setState("reviewOpened", (value) => !value)}
-              onReset={props.onReset}
-            />
-            <CurrentSessionProviders document={props.document}>
-              <div class="flex min-h-0 flex-1">
-                <section
-                  classList={{
-                    "min-w-0 flex-1 flex-col bg-background-base": true,
-                    flex: !state.reviewOpened,
-                    "hidden md:flex": state.reviewOpened,
-                  }}
-                >
-                  <div class="min-h-0 flex-1 overflow-y-auto py-6">
-                    <SessionTimeline
-                      document={props.document}
-                      editToolDefaultOpen
-                      shellToolDefaultOpen
-                      class="mx-auto w-full max-w-[840px]"
-                    />
-                  </div>
-                  <SessionComposerRegion
-                    controller={region}
-                    promptInput={<PromptInputV2Composer controller={prompt.controller} borderUnderlay />}
-                  />
-                </section>
-                <Show when={state.reviewOpened}>
-                  <aside id="review-panel" class="min-w-0 flex-1 border-l border-border-weak-base md:max-w-[52%]">
-                    <SessionReviewPane diffs={props.document.diffs} />
-                  </aside>
-                </Show>
-              </div>
-            </CurrentSessionProviders>
-            <output class="sr-only" aria-live="polite">
-              {state.activity}
-            </output>
-          </main>
-        </SessionPanelFrame>
-      </SessionRouteFrame>
-    </div>
-  )
-}
-
-function SessionSurfaceHeader(props: {
-  title: string
-  description: string
-  reviewVisible: boolean
-  reviewOpened: boolean
-  onReviewToggle: () => void
-  onReset: () => void
-}) {
-  const language = useLanguage()
-  return (
-    <header class="flex min-h-14 shrink-0 items-center justify-between gap-4 border-b border-border-weak-base px-4 py-2">
-      <div class="flex min-w-0 items-center gap-3">
-        <span class="flex size-8 shrink-0 items-center justify-center rounded-md bg-background-stronger text-icon-base">
-          <Icon name="folder" />
-        </span>
-        <div class="min-w-0">
-          <h1 class="truncate text-14-medium text-text-strong">{props.title}</h1>
-          <p class="truncate text-12-regular text-text-weak">{props.description}</p>
-        </div>
-      </div>
-      <div class="flex shrink-0 items-center gap-2">
-        <SessionHeaderV2Actions
-          state={{
-            reviewLabel: language.t("command.review.toggle"),
-            reviewKeybind: [],
-            reviewVisible: props.reviewVisible,
-            reviewOpened: props.reviewOpened,
-            onReviewToggle: props.onReviewToggle,
-          }}
-        />
-        <Button size="small" variant="neutral" onClick={props.onReset}>
-          Reset
-        </Button>
-      </div>
-    </header>
-  )
-}
-
-function SessionReviewPane(props: { diffs: SessionDocument["diffs"] }) {
-  const language = useLanguage()
-  const review = createReviewPanelV2State()
-  const [state, setState] = createStore({
-    active: props.diffs[0]?.file,
-    diffStyle: "unified" as "unified" | "split",
-  })
-  return (
-    <ReviewPanelV2View
-      title={language.t("ui.sessionReview.title.lastTurn")}
-      empty={<SessionReviewEmptyChangesV2 />}
-      diffs={props.diffs}
-      diffsReady
-      activeFile={state.active}
-      onSelectFile={(file) => setState("active", file)}
-      diffStyle={state.diffStyle}
-      onDiffStyleChange={(value) => setState("diffStyle", value)}
-      state={review}
-      fileList="flat"
-    />
-  )
-}
--- a/Show More
+++ b/Show More