fix(app): align conversation typography

.github/workflows/deploy-www.yml

@@ -27,6 +27,7 @@ jobs:
         working-directory: packages/www
         run: bun run build
         env:
+          BLUME_ENV: ${{ github.ref_name == 'v2' && 'production' || 'dev' }}
           CLOUDFLARE_ENV: ${{ github.ref_name == 'v2' && 'production' || 'dev' }}
 
       - name: Deploy

.github/workflows/publish.yml

@@ -91,7 +91,7 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
         with:
-          bun-version: 1.4.0
+          bun-version: canary # Bun 1.4 until its stable release is published
 
       - name: Setup git committer
         id: committer
@@ -113,7 +113,7 @@ jobs:
         id: build
         run: ./packages/cli/script/build.ts ${{ (github.ref_name == 'beta' && '--sourcemaps') || '' }}
         env:
-          BUN_COMPILE_RELEASE: bun-v1.4.0
+          BUN_COMPILE_RELEASE: canary
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
           GH_REPO: ${{ needs.version.outputs.repo }}
@@ -195,33 +195,9 @@ jobs:
           path: packages/cli/dist/cli-*
           if-no-files-found: error
 
-  build-node-app-archive:
-    needs: version
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    timeout-minutes: 30
-    if: github.repository == 'anomalyco/opencode'
-    steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-
-      - uses: ./.github/actions/setup-bun
-
-      - name: Build app archive
-        run: bun packages/cli/script/build-node.ts --app-archive-only --app-archive=.cache/app-archive.bin --skip-install
-        env:
-          OPENCODE_VERSION: ${{ needs.version.outputs.version }}
-          OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
-
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: opencode-node-app-archive
-          path: packages/cli/.cache/app-archive.bin
-          if-no-files-found: error
-
   build-node-cli:
-    needs:
-      - version
-      - build-node-app-archive
-    if: github.repository == 'anomalyco/opencode'
+    needs: version
+    if: github.repository == 'anomalyco/opencode' && false # Temporarily disabled
     strategy:
       fail-fast: false
       matrix:
@@ -234,7 +210,6 @@ jobs:
             host: macos-26
           - target: windows-arm64
             host: blacksmith-4vcpu-windows-2025
-            bun_install_flags: --cpu=*
           - target: windows-x64
             host: blacksmith-4vcpu-windows-2025
     runs-on: ${{ matrix.settings.host }}
@@ -246,19 +221,14 @@ jobs:
 
       - uses: ./.github/actions/setup-bun
         with:
-          install-flags: ${{ matrix.settings.bun_install_flags }}
+          install-flags: --os=* --cpu=*
 
       - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version: "26.4.0"
 
-      - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        with:
-          name: opencode-node-app-archive
-          path: packages/cli/.cache
-
       - name: Build
-        run: bun packages/cli/script/build-node.ts --target=${{ matrix.settings.target }} --skip-install --outdir=dist/node --app-archive=.cache/app-archive.bin
+        run: bun packages/cli/script/build-node.ts --target=${{ matrix.settings.target }} --skip-install --outdir=dist/node
         env:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
@@ -573,7 +543,6 @@ jobs:
       - version
       - build-cli
       - sign-cli-macos
-      - build-node-app-archive
       - build-node-cli
       - sign-cli-windows
       - build-electron

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-P8AZ2THuXiET4hiSYTwGGdTgbm2l3XGZGJxQwg6lusE=",
-    "aarch64-linux": "sha256-73LxDeDPQspY4Bn/gbGU43j/k7gBZ5ywMMpUjDl3elg=",
-    "aarch64-darwin": "sha256-sc9YyTAFlbWxlFb9vwFYLs6IYd3SRoju9mQufzeQdd8=",
-    "x86_64-darwin": "sha256-nnk637DELjzGB3t9aLDYbHz5h3Dd3nvWcWGdaQk8yPM="
+    "x86_64-linux": "sha256-V1G3RuuwtlVx166oDVCqQ9v7ELWRr5JDYitcCMitbNA=",
+    "aarch64-linux": "sha256-nm/N60X7kdkNIa2oCgqyNp9ewrBrWvr6ES0qhxzypQc=",
+    "aarch64-darwin": "sha256-7UQtp4KrtxuT6MMrz7YYcJcF9/b5ECobkSwzI+yLe0Q=",
+    "x86_64-darwin": "sha256-jrn0GOa7qDskowio97bvhl7rsideXqHVbygSi3M1cf0="
   }
 }

package.json

@@ -49,9 +49,9 @@
       "@octokit/rest": "22.0.0",
       "@hono/standard-validator": "0.2.0",
       "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.7",
-      "@opentui/keymap": "0.5.7",
-      "@opentui/solid": "0.5.7",
+      "@opentui/core": "0.5.6",
+      "@opentui/keymap": "0.5.6",
+      "@opentui/solid": "0.5.6",
       "@tanstack/solid-virtual": "3.13.37",
       "@shikijs/stream": "4.2.0",
       "@standard-schema/spec": "1.1.0",

packages/ai/src/protocols/index.ts

@@ -8,4 +8,3 @@ export * as OpenAICompatibleResponses from "./openai-compatible-responses.js"
 export * as OpenAIResponses from "./openai-responses.js"
 export * as OpenResponses from "./open-responses.js"
 export * as OpenResponsesChannel from "./open-responses-channel.js"
-export * as XAIResponses from "./xai-responses.js"

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

@@ -10,7 +10,6 @@ import {
 } from "../route/transport/index.js"
 import * as ProviderShared from "./shared.js"
 import { OpenResponses } from "./open-responses.js"
-import { OpenResponsesContinuation } from "./open-responses-continuation.js"
 
 const WebSocketResponseCreate = Schema.StructWithRest(Schema.Struct({ type: Schema.tag("response.create") }), [
   Schema.Record(Schema.String, Schema.Unknown),
@@ -26,6 +25,11 @@ export interface Options {
   readonly enabled?: (url: string) => boolean
   readonly url?: (url: string) => string
   readonly headers?: (headers: Headers.Headers) => Headers.Headers
+  readonly driver?: (input: {
+    readonly request: Readonly<Record<string, unknown>>
+    readonly message: string
+    readonly base: WebSocketChannelDriver
+  }) => WebSocketChannelDriver
 }
 
 export interface Prepared {
@@ -154,13 +158,7 @@ export const transport = <Body>(options: Options): Transport<Body, Prepared, str
                   url: yield* WebSocketTransport.toWebSocketUrl(options.url?.(parts.url) ?? parts.url),
                   headers,
                   rotateAfterMs: options.rotateAfterMs,
-                  driver: OpenResponsesContinuation.driver({
-                    id: options.id,
-                    name: options.name,
-                    request: create.request,
-                    message: create.message,
-                    base,
-                  }),
+                  driver: options.driver?.({ request: create.request, message: create.message, base }) ?? base,
                 }
               })
             : undefined

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

@@ -42,12 +42,8 @@ const OpenResponsesInputImage = Schema.Struct({
 const OpenResponsesInputFile = Schema.Struct({
   type: Schema.tag("input_file"),
   filename: Schema.String,
-  file_data: Schema.optional(Schema.String),
-  file_url: Schema.optional(Schema.String),
-})
-const OpenResponsesInputVideo = Schema.Struct({
-  type: Schema.tag("input_video"),
-  video_url: Schema.String,
+  file_data: Schema.String,
+  mime_type: Schema.optional(Schema.String),
 })
 const MediaInput = Schema.Union([OpenResponsesInputImage, OpenResponsesInputFile])
 export type MediaInput = Schema.Schema.Type<typeof MediaInput>
@@ -58,14 +54,9 @@ const OpenResponsesOutputText = Schema.Struct({
   text: Schema.String,
 })
 
-export const MessagePhase = Schema.NullOr(Schema.Literals(["commentary", "final_answer"]))
+export const MessagePhase = Schema.Literals(["commentary", "final_answer"])
 type MessagePhase = Schema.Schema.Type<typeof MessagePhase>
 
-const messagePhase = (value: unknown): MessagePhase | undefined => {
-  if (value === null || value === "commentary" || value === "final_answer") return value
-  return undefined
-}
-
 const OpenResponsesReasoningSummaryText = Schema.Struct({
   type: Schema.tag("summary_text"),
   text: Schema.String,
@@ -90,7 +81,6 @@ const OpenResponsesFunctionCallOutputContent = Schema.Union([
   OpenResponsesInputText,
   OpenResponsesInputImage,
   OpenResponsesInputFile,
-  OpenResponsesInputVideo,
 ])
 
 const OpenResponsesFunctionCallOutput = Schema.Union([
@@ -247,7 +237,6 @@ const OpenResponsesErrorPayload = Schema.Struct({
   message: optionalNull(Schema.String),
   param: optionalNull(Schema.String),
 })
-type OpenResponsesErrorPayload = Schema.Schema.Type<typeof OpenResponsesErrorPayload>
 
 const WebSocketErrorHeader = Schema.Union([Schema.String, Schema.Number, Schema.Boolean])
 export const WebSocketErrorEvent = Schema.StructWithRest(
@@ -312,6 +301,20 @@ export const Event = Schema.StructWithRest(
 )
 export type Event = Schema.Schema.Type<typeof Event>
 
+const RefusalEvent = Schema.Union([
+  Schema.Struct({
+    type: Schema.tag("response.refusal.delta"),
+    item_id: Schema.String,
+    delta: Schema.String,
+  }),
+  Schema.Struct({
+    type: Schema.tag("response.refusal.done"),
+    item_id: Schema.String,
+    refusal: Schema.String,
+  }),
+])
+const isRefusalEvent = Schema.is(RefusalEvent)
+
 export interface Extension {
   readonly id: string
   readonly name: string
@@ -320,6 +323,7 @@ export interface Extension {
     readonly media: ProviderShared.NormalizedMedia
     readonly request: LLMRequest
   }) => MediaInput | undefined
+  readonly messagePhase?: (value: unknown) => MessagePhase | null | undefined
 }
 
 const BASE: Extension = { id: ADAPTER, name: NAME }
@@ -332,6 +336,7 @@ export interface ParserState {
   readonly hasFunctionCall: boolean
   readonly lifecycle: Lifecycle.State
   readonly messageItems: ReadonlySet<string>
+  readonly messagePhase: (value: unknown) => MessagePhase | null | undefined
   readonly messagePhases: Readonly<Record<string, MessagePhase | null>>
   readonly reasoningItems: Readonly<Record<string, ReasoningStreamItem>>
   readonly store: boolean | undefined
@@ -409,29 +414,26 @@ const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenR
   }
 }
 
+const hostedToolItemID = (part: ToolResultPart, providerMetadataKey: string) => {
+  return itemID(part.providerMetadata, providerMetadataKey)
+}
+
 const lowerMedia = Effect.fn("OpenResponses.lowerMedia")(function* (
   part: MediaPart,
   request: LLMRequest,
   extension: Extension,
-  target: "message" | "tool-result",
 ) {
   const media = ProviderShared.normalizeMedia(part)
   const extended = extension.lowerMedia?.({ part, media, request })
   if (extended) return extended
-  const url =
-    typeof part.data === "string" && (part.data.startsWith("https://") || part.data.startsWith("http://"))
-      ? part.data
-      : undefined
   if (!media.mime.startsWith("image/")) {
-    if (target === "tool-result" && media.mime.startsWith("video/"))
-      return { type: "input_video" as const, video_url: url ?? media.dataUrl }
     return {
       type: "input_file" as const,
       filename: part.filename ?? (media.mime === "application/pdf" ? "document.pdf" : "file"),
-      ...(url ? { file_url: url } : { file_data: media.base64 }),
+      file_data: media.dataUrl,
     }
   }
-  return { type: "input_image" as const, image_url: url ?? media.dataUrl }
+  return { type: "input_image" as const, image_url: media.dataUrl }
 })
 
 const lowerUserContent = Effect.fnUntraced(function* (
@@ -440,17 +442,10 @@ const lowerUserContent = Effect.fnUntraced(function* (
   extension: Extension,
 ) {
   if (part.type === "text") return { type: "input_text" as const, text: part.text }
-  if (part.type === "media") return yield* lowerMessageMedia(part, request, extension)
+  if (part.type === "media") return yield* lowerMedia(part, request, extension)
   return yield* ProviderShared.unsupportedContent(extension.name, "user", ["text", "media"])
 })
 
-const lowerMessageMedia = Effect.fnUntraced(function* (part: MediaPart, request: LLMRequest, extension: Extension) {
-  const lowered = yield* lowerMedia(part, request, extension, "message")
-  if (lowered.type === "input_video")
-    return yield* ProviderShared.invalidRequest(`${extension.name} user messages do not support input_video`)
-  return lowered
-})
-
 // Tool results may carry structured text, images, and files. Keep media as provider-native
 // content instead of JSON-stringifying base64 into a prompt string.
 const lowerToolResultContentItem = Effect.fnUntraced(function* (
@@ -463,20 +458,6 @@ const lowerToolResultContentItem = Effect.fnUntraced(function* (
     { type: "media", mediaType: item.mime, data: item.uri, filename: item.name },
     request,
     extension,
-    "tool-result",
-  )
-})
-
-const lowerHostedToolResultContentItem = Effect.fnUntraced(function* (
-  item: Content,
-  request: LLMRequest,
-  extension: Extension,
-) {
-  if (item.type === "text") return { type: "input_text" as const, text: item.text }
-  return yield* lowerMessageMedia(
-    { type: "media", mediaType: item.mime, data: item.uri, filename: item.name },
-    request,
-    extension,
   )
 })
 
@@ -529,7 +510,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
         >((groups, part) => {
           const metadata = part.providerMetadata?.[providerMetadataKey]
           const id = itemID(part.providerMetadata, providerMetadataKey)
-          const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase) : undefined
+          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] })
@@ -579,19 +560,17 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
         }
         if (part.type === "tool-result" && part.providerExecuted === true) {
           flushText()
-          const id = itemID(part.providerMetadata, providerMetadataKey)
-          if (store !== false && id && !hostedToolReferences.has(id))
-            input.push({ type: "item_reference", id })
+          const itemID = hostedToolItemID(part, providerMetadataKey)
+          if (store !== false && itemID && !hostedToolReferences.has(itemID))
+            input.push({ type: "item_reference", id: itemID })
           if (store === false && part.result.type === "content") {
             const content: ReadonlyArray<Content> = part.result.value
             input.push({
               role: "user",
-              content: yield* Effect.forEach(content, (item) =>
-                lowerHostedToolResultContentItem(item, request, extension),
-              ),
+              content: yield* Effect.forEach(content, (item) => lowerToolResultContentItem(item, request, extension)),
             })
           }
-          if (id) hostedToolReferences.add(id)
+          if (itemID) hostedToolReferences.add(itemID)
           continue
         }
         return yield* ProviderShared.unsupportedContent(extension.name, "assistant", [
@@ -803,17 +782,18 @@ const reasoningMetadata = (state: ParserState, item: StreamItem & { id: string }
 // best-effort, not guaranteed.
 const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
   const item = event.item
-  if (item?.type === "message" && item.id) {
-    const phase = messagePhase(item.phase)
+  if (item?.type === "message" && item.id)
     return [
       {
         ...state,
         messageItems: new Set([...state.messageItems, item.id]),
-        messagePhases: phase === undefined ? state.messagePhases : { ...state.messagePhases, [item.id]: phase },
+        messagePhases: (() => {
+          const phase = state.messagePhase(item.phase)
+          return phase === undefined ? state.messagePhases : { ...state.messagePhases, [item.id]: phase }
+        })(),
       },
       NO_EVENTS,
     ]
-  }
   if (item && isReasoningItem(item)) {
     const events: LLMEvent[] = []
     return [
@@ -971,7 +951,7 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
   if (!item) return [state, NO_EVENTS] satisfies StepResult
 
   if (item.type === "message" && item.id) {
-    const itemPhase = messagePhase(item.phase)
+    const itemPhase = state.messagePhase(item.phase)
     const phase = itemPhase === undefined ? state.messagePhases[item.id] : itemPhase
     const events: LLMEvent[] = []
     const messageItems = new Set(state.messageItems)
@@ -1079,26 +1059,22 @@ const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (
   return [{ ...state, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
 })
 
-// Build the prettiest summary available from whatever the provider supplied.
+// Build a single human-readable message from whatever the provider supplied.
 // When both code and message are present, prefix the code so consumers see
 // the failure mode (e.g. `rate_limit_exceeded: Slow down`) instead of just
 // the bare message — production rate limits and context-length failures used
-// to be indistinguishable from generic stream drops. Returns undefined when
-// the payload carries no usable summary.
-const providerErrorMessage = (event: Event, nested: OpenResponsesErrorPayload | undefined): string | undefined => {
+// to be indistinguishable from generic stream drops.
+const providerErrorMessage = (event: Event, fallback: string): string => {
+  const nested = event.error ?? event.response?.error ?? undefined
   const message = event.message || nested?.message || undefined
   const code = event.code || nested?.code || undefined
   if (message && code) return `${code}: ${message}`
-  return message || code
+  return message || code || fallback
 }
 
 export const providerFailure = (id: string, event: Event, fallback: string) => {
-  const nested = event.error ?? event.response?.error ?? undefined
-  const code = event.code || nested?.code || undefined
-  // Keep the full raw payload on the error even when the message is a summary.
-  const body = JSON.stringify(nested ?? event) ?? ""
-  const summary = providerErrorMessage(event, nested)
-  const message = summary ?? (body === "{}" ? fallback : body)
+  const code = event.code || event.error?.code || event.response?.error?.code || undefined
+  const message = providerErrorMessage(event, fallback)
   const status =
     typeof event.status === "number"
       ? event.status
@@ -1108,8 +1084,7 @@ export const providerFailure = (id: string, event: Event, fallback: string) => {
   return new AIError({
     module: id,
     method: "stream",
-    body,
-    reason: classifyProviderFailure({ message, code, status, rawBody: body }),
+    reason: classifyProviderFailure({ message, code, status }),
   })
 }
 
@@ -1125,18 +1100,21 @@ export const step = (state: ParserState, event: Event) => {
     )
   }
   if (event.type === "response.refusal.delta" || event.type === "response.refusal.done") {
-    const value = event.type === "response.refusal.delta" ? event.delta : event.refusal
-    if (!event.item_id || typeof value !== "string") return ProviderShared.eventError(state.id, `${event.type} is malformed`)
+    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: value }, 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))
   }
+  if (event.type === "response.reasoning.done" || event.type === "response.reasoning_summary_text.done") {
+    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
+    return Effect.succeed(onReasoningDone(state, event))
+  }
   if (event.type === "response.reasoning_summary_part.added")
     return event.item_id
       ? Effect.succeed(onReasoningSummaryPartAdded(state, event))
@@ -1181,11 +1159,17 @@ export const initial = (request: LLMRequest, extension: Extension = BASE): Parse
   tools: ToolStream.empty<string>(),
   lifecycle: Lifecycle.initial(),
   messageItems: new Set<string>(),
+  messagePhase: (value) => messagePhase(value, extension),
   messagePhases: {},
   reasoningItems: {},
   store: OpenResponsesOptions.resolve(request).store,
 })
 
+const messagePhase = (value: unknown, extension: Extension): MessagePhase | null | undefined => {
+  if (value === "commentary" || value === "final_answer") return value
+  return extension.messagePhase?.(value)
+}
+
 export const protocol = Protocol.make({
   id: ADAPTER,
   body: {

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

@@ -4,7 +4,7 @@ import { Effect, Option, Schema } from "effect"
 import * as ProviderShared from "./shared.js"
 import { OpenResponses } from "./open-responses.js"
 
-const PROTOCOL = "open-responses.websocket.v1"
+const PROTOCOL = "openai-responses.websocket.v1"
 const VERSION = 1
 const decodeEvent = Schema.decodeUnknownEffect(OpenResponses.protocol.stream.event)
 
@@ -161,4 +161,4 @@ export const driver = (input: DriverInput): WebSocketChannelDriver => {
   }
 }
 
-export const OpenResponsesContinuation = { driver } as const
+export const OpenAIResponsesChannel = { driver } as const

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

@@ -5,13 +5,14 @@ import { Auth } from "../route/auth.js"
 import { Endpoint } from "../route/endpoint.js"
 import { Protocol } from "../route/protocol.js"
 import { HttpTransport } from "../route/transport/index.js"
-import { LLMRequest, type JsonSchema, type ToolDefinition } from "../schema/index.js"
+import { LLMEvent, LLMRequest, type JsonSchema, type ToolDefinition } from "../schema/index.js"
 import { OpenResponses } from "./open-responses.js"
 import { optionalArray, ProviderShared } from "./shared.js"
+import { Lifecycle } from "./utils/lifecycle.js"
 import { OpenAIImage } from "./utils/openai-image.js"
-import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"
 import { ToolSchemaProjection } from "./utils/tool-schema.js"
-import { OpenResponsesChannel } from "./open-responses-channel.js"
+import { OpenResponsesChannel, type Options } from "./open-responses-channel.js"
+import { OpenAIResponsesChannel } from "./openai-responses-channel.js"
 
 const ADAPTER = "openai-responses"
 const NAME = "OpenAI Responses"
@@ -39,8 +40,20 @@ const OpenAIResponsesToolChoice = Schema.Union([
   Schema.Struct({ type: Schema.tag("image_generation") }),
 ])
 
+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)),
+  }),
+  OpenResponses.InputItem,
+])
+
 const OpenAIResponsesCoreFields = {
   ...OpenResponses.coreFields,
+  input: Schema.Array(OpenAIResponsesInputItem),
   tools: optionalArray(OpenAIResponsesTools),
   tool_choice: Schema.optional(OpenAIResponsesToolChoice),
 }
@@ -54,6 +67,16 @@ export type OpenAIResponsesBody = Schema.Schema.Type<typeof OpenAIResponsesBody>
 const extension = {
   id: ADAPTER,
   name: NAME,
+  messagePhase: (value: unknown) => (value === null ? null : undefined),
+  lowerMedia: ({ part, media, request }) => {
+    if (request.model.provider !== "xai" || media.mime !== "application/pdf") return undefined
+    return {
+      type: "input_file",
+      filename: part.filename ?? "document.pdf",
+      file_data: media.base64,
+      mime_type: media.mime,
+    }
+  },
 } satisfies OpenResponses.Extension
 
 const nativeImageToolInput = (tool: ToolDefinition) => {
@@ -105,7 +128,46 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
   } satisfies OpenAIResponsesBody
 })
 
-const hostedToolResult = Effect.fn("OpenAIResponses.hostedToolResult")(function* (item: ResponsesHostedTools.Item) {
+type HostedToolData = OpenResponses.StreamItem & {
+  readonly id: string
+  readonly status?: string
+  readonly action?: unknown
+  readonly queries?: unknown
+  readonly results?: unknown
+  readonly code?: string
+  readonly container_id?: string
+  readonly outputs?: unknown
+  readonly server_label?: string
+  readonly output?: unknown
+  readonly result?: string
+  readonly output_format?: "png" | "jpeg" | "webp"
+  readonly error?: unknown
+}
+
+const HOSTED_TOOLS = {
+  web_search_call: { name: "web_search", input: (item) => item.action ?? {} },
+  web_search_preview_call: { name: "web_search_preview", input: (item) => item.action ?? {} },
+  file_search_call: { name: "file_search", input: (item) => ({ queries: item.queries ?? [] }) },
+  code_interpreter_call: {
+    name: "code_interpreter",
+    input: (item) => ({ code: item.code, container_id: item.container_id }),
+  },
+  computer_use_call: { name: "computer_use", input: (item) => item.action ?? {} },
+  image_generation_call: { name: "image_generation", input: () => ({}) },
+  mcp_call: {
+    name: "mcp",
+    input: (item) => ({ server_label: item.server_label, name: item.name, arguments: item.arguments }),
+  },
+  local_shell_call: { name: "local_shell", input: (item) => item.action ?? {} },
+} as const satisfies Record<string, { readonly name: string; readonly input: (item: HostedToolData) => unknown }>
+
+type HostedToolType = keyof typeof HOSTED_TOOLS
+type HostedToolItem = HostedToolData & { readonly type: HostedToolType }
+
+const isHostedToolItem = (item: OpenResponses.StreamItem): item is HostedToolItem =>
+  item.type in HOSTED_TOOLS && typeof item.id === "string" && item.id.length > 0
+
+const hostedToolResult = Effect.fn("OpenAIResponses.hostedToolResult")(function* (item: HostedToolItem) {
   const isError = item.error !== undefined && item.error !== null
   if (item.type === "image_generation_call" && item.result) {
     yield* Effect.fromResult(Encoding.decodeBase64(item.result)).pipe(
@@ -126,22 +188,32 @@ const hostedToolResult = Effect.fn("OpenAIResponses.hostedToolResult")(function*
   return isError ? { type: "error" as const, value: item.error } : { type: "json" as const, value: item }
 })
 
-const HOSTED_TOOLS = {
-  web_search_call: { name: "web_search", input: (item) => item.action ?? {} },
-  web_search_preview_call: { name: "web_search_preview", input: (item) => item.action ?? {} },
-  file_search_call: { name: "file_search", input: (item) => ({ queries: item.queries ?? [] }) },
-  code_interpreter_call: {
-    name: "code_interpreter",
-    input: (item) => ({ code: item.code, container_id: item.container_id }),
-  },
-  computer_use_call: { name: "computer_use", input: (item) => item.action ?? {} },
-  image_generation_call: { name: "image_generation", input: () => ({}), result: hostedToolResult },
-  mcp_call: {
-    name: "mcp",
-    input: (item) => ({ server_label: item.server_label, name: item.name, arguments: item.arguments }),
-  },
-  local_shell_call: { name: "local_shell", input: (item) => item.action ?? {} },
-} as const satisfies ResponsesHostedTools.Definitions
+const onHostedToolDone = Effect.fn("OpenAIResponses.onHostedToolDone")(function* (
+  state: OpenResponses.ParserState,
+  item: HostedToolItem,
+) {
+  const tool = HOSTED_TOOLS[item.type]
+  const providerMetadata = OpenResponses.providerMetadata(state, { itemId: item.id })
+  const events: LLMEvent[] = []
+  const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
+  events.push(
+    LLMEvent.toolCall({
+      id: item.id,
+      name: tool.name,
+      input: tool.input(item),
+      providerExecuted: true,
+      providerMetadata,
+    }),
+    LLMEvent.toolResult({
+      id: item.id,
+      name: tool.name,
+      result: yield* hostedToolResult(item),
+      providerExecuted: true,
+      providerMetadata,
+    }),
+  )
+  return [{ ...state, lifecycle }, events] satisfies OpenResponses.StepResult
+})
 
 const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
   if (event.type === "response.reasoning_text.delta" || event.type === "response.reasoning_summary.delta")
@@ -152,8 +224,8 @@ const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
     return event.item_id
       ? Effect.succeed(OpenResponses.onReasoningDone(state, event))
       : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
-  if (event.type === "response.output_item.done" && event.item && ResponsesHostedTools.isItem(event.item, HOSTED_TOOLS))
-    return ResponsesHostedTools.onDone(state, event.item, HOSTED_TOOLS)
+  if (event.type === "response.output_item.done" && event.item && isHostedToolItem(event.item))
+    return onHostedToolDone(state, event.item)
   return OpenResponses.step(state, event)
 }
 
@@ -175,7 +247,11 @@ const endpoint = Endpoint.path<OpenAIResponsesBody>(PATH, { baseURL: DEFAULT_BAS
 const auth = Auth.none
 
 export const httpTransport = HttpTransport.sseJson.with<OpenAIResponsesBody>()
-export const channelTransport = OpenResponsesChannel.transport<OpenAIResponsesBody>
+export const channelTransport = (options: Omit<Options, "driver">) =>
+  OpenResponsesChannel.transport<OpenAIResponsesBody>({
+    ...options,
+    driver: (input) => OpenAIResponsesChannel.driver({ id: options.id, name: options.name, ...input }),
+  })
 export const transport = channelTransport({
   id: ADAPTER,
   name: NAME,

packages/ai/src/protocols/utils/responses-hosted-tools.ts

@@ -1,70 +0,0 @@
-import { Effect } from "effect"
-import { LLMEvent, type AIError, type ToolResultPart } from "../../schema/index.js"
-import { OpenResponses } from "../open-responses.js"
-import { Lifecycle } from "./lifecycle.js"
-
-export type Item = OpenResponses.StreamItem & {
-  readonly id: string
-  readonly status?: string
-  readonly action?: unknown
-  readonly queries?: unknown
-  readonly results?: unknown
-  readonly code?: string
-  readonly container_id?: string
-  readonly outputs?: unknown
-  readonly server_label?: string
-  readonly output?: unknown
-  readonly result?: string
-  readonly output_format?: "png" | "jpeg" | "webp"
-  readonly error?: unknown
-}
-
-export interface Definition {
-  readonly name: string
-  readonly input: (item: Item) => unknown
-  readonly result?: (item: Item) => Effect.Effect<ToolResultPart["result"], AIError>
-}
-
-export type Definitions = Readonly<Record<string, Definition>>
-
-export const isItem = <Tools extends Definitions>(item: OpenResponses.StreamItem, tools: Tools): item is Item =>
-  item.type in tools && typeof item.id === "string" && item.id.length > 0
-
-export const onDone: (
-  state: OpenResponses.ParserState,
-  item: Item,
-  tools: Definitions,
-) => Effect.Effect<OpenResponses.StepResult, AIError> = Effect.fn("ResponsesHostedTools.onDone")(function* (
-  state,
-  item,
-  tools,
-) {
-  const tool = tools[item.type]
-  if (!tool) return [state, []] satisfies OpenResponses.StepResult
-  const providerMetadata = OpenResponses.providerMetadata(state, { itemId: item.id })
-  const events: LLMEvent[] = []
-  const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
-  events.push(
-    LLMEvent.toolCall({
-      id: item.id,
-      name: tool.name,
-      input: tool.input(item),
-      providerExecuted: true,
-      providerMetadata,
-    }),
-    LLMEvent.toolResult({
-      id: item.id,
-      name: tool.name,
-      result: tool.result
-        ? yield* tool.result(item)
-        : item.error !== undefined && item.error !== null
-          ? { type: "error", value: item.error }
-          : { type: "json", value: item },
-      providerExecuted: true,
-      providerMetadata,
-    }),
-  )
-  return [{ ...state, lifecycle }, events] satisfies OpenResponses.StepResult
-})
-
-export * as ResponsesHostedTools from "./responses-hosted-tools.js"

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

@@ -1,55 +0,0 @@
-import { Effect } from "effect"
-import { Protocol } from "../route/protocol.js"
-import { OpenResponses } from "./open-responses.js"
-import { ProviderShared } from "./shared.js"
-import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"
-
-const ADAPTER = "xai-responses"
-const NAME = "xAI Responses"
-
-const extension = {
-  id: ADAPTER,
-  name: NAME,
-} satisfies OpenResponses.Extension
-
-const HOSTED_TOOLS = {
-  web_search_call: { name: "web_search", input: (item) => item.action ?? {} },
-  x_search_call: { name: "x_search", input: (item) => item.action ?? {} },
-  file_search_call: { name: "file_search", input: (item) => ({ queries: item.queries ?? [] }) },
-  code_interpreter_call: {
-    name: "code_interpreter",
-    input: (item) => ({ code: item.code, container_id: item.container_id }),
-  },
-  image_generation_call: { name: "image_generation", input: () => ({}) },
-  mcp_call: {
-    name: "mcp",
-    input: (item) => ({ server_label: item.server_label, name: item.name, arguments: item.arguments }),
-  },
-} as const satisfies ResponsesHostedTools.Definitions
-
-const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
-  if (event.type === "response.reasoning_text.delta" || event.type === "response.reasoning_summary.delta")
-    return event.item_id
-      ? Effect.succeed(OpenResponses.onReasoningDelta(state, event, event.item_id))
-      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
-  if (event.type === "response.reasoning_text.done" || event.type === "response.reasoning_summary.done")
-    return event.item_id
-      ? Effect.succeed(OpenResponses.onReasoningDone(state, event))
-      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
-  if (event.type === "response.output_item.done" && event.item && ResponsesHostedTools.isItem(event.item, HOSTED_TOOLS))
-    return ResponsesHostedTools.onDone(state, event.item, HOSTED_TOOLS)
-  return OpenResponses.step(state, event)
-}
-
-export const protocol = Protocol.make({
-  id: ADAPTER,
-  body: OpenResponses.protocol.body,
-  stream: {
-    event: OpenResponses.protocol.stream.event,
-    initial: (request) => OpenResponses.initial(request, extension),
-    step,
-    terminal: OpenResponses.terminal,
-  },
-})
-
-export * as XAIResponses from "./xai-responses.js"

packages/ai/src/provider-error.ts

@@ -80,9 +80,6 @@ export interface ProviderFailure {
   readonly message: string
   readonly status?: number | undefined
   readonly code?: string | undefined
-  // Raw wire payload, scanned for failure signals (codes, overflow phrases)
-  // that the summary message does not carry. Not shown to users.
-  readonly rawBody?: string | undefined
   readonly retryAfterMs?: number | undefined
   readonly rateLimit?: HttpRateLimitDetails | undefined
   readonly http?: HttpContext | undefined
@@ -92,13 +89,11 @@ export interface ProviderFailure {
 // Keep HTTP failures and provider-reported stream failures on one typed path so
 // session retry policy never needs provider-specific string matching.
 export function classifyProviderFailure(input: ProviderFailure): AIError["reason"] {
-  const body = input.http?.body ?? input.rawBody ?? ""
+  const body = input.http?.body ?? ""
   const codes = [input.code, ...providerCodes(body), ...providerCodes(input.message)]
     .filter((code): code is string => code !== undefined)
     .map((code) => code.toLowerCase())
-  // Scan the raw payload too so signals missing from the summary message
-  // (e.g. overflow phrases nested in a JSON error body) still classify.
-  const text = [input.message, body].filter((value) => value.length > 0).join("\n")
+  const text = body || input.message
   const common = { message: input.message, providerMetadata: input.providerMetadata, http: input.http }
   const clientScoped = input.status === undefined || (input.status >= 400 && input.status < 500)
 

packages/ai/src/providers/xai.ts

@@ -5,8 +5,7 @@ import { HttpOptions, ProviderID, type ModelID } from "../schema/index.js"
 import * as OpenAICompatibleProfiles from "./openai-compatible-profile.js"
 import * as OpenAICompatibleChat from "../protocols/openai-compatible-chat.js"
 import * as OpenAIChat from "../protocols/openai-chat.js"
-import { OpenResponsesChannel } from "../protocols/open-responses-channel.js"
-import { XAIResponses } from "../protocols/xai-responses.js"
+import * as OpenAIResponses from "../protocols/openai-responses.js"
 import { XAIImages } from "../protocols/xai-images.js"
 import type { OpenAIOptionsInput } from "./openai-options.js"
 import type { ProviderPackage } from "../provider-package.js"
@@ -35,9 +34,9 @@ const responsesRoute = Route.make({
   id: "openai-responses",
   provider: id,
   providerMetadataKey: "xai",
-  protocol: XAIResponses.protocol,
+  protocol: OpenAIResponses.protocol,
   endpoint: Endpoint.path("/responses", { baseURL: OpenAICompatibleProfiles.profiles.xai.baseURL }),
-  transport: OpenResponsesChannel.transport({
+  transport: OpenAIResponses.channelTransport({
     id: "openai-responses",
     name: "xAI Responses",
     rotateAfterMs: RESPONSES_WEBSOCKET_ROTATE_AFTER_MS,

packages/ai/src/schema/errors.ts

@@ -153,9 +153,6 @@ export class AIError extends Schema.TaggedError<AIError>()("AI.Error", {
   module: Schema.String,
   method: Schema.String,
   reason: AIErrorReason,
-  // Raw provider payload as a string, so classified failures never lose the
-  // original error detail even when the pretty message is a summary.
-  body: Schema.optional(Schema.String),
 }) {
   override readonly cause = this.reason
 

packages/ai/test/fixtures/recordings/pdf/openai-tool-result.json

@@ -1,14 +1,7 @@
 {
   "version": 1,
   "metadata": {
-    "tags": [
-      "prefix:pdf",
-      "pdf",
-      "provider:openai",
-      "protocol:openai-responses",
-      "tool",
-      "tool-result"
-    ],
+    "tags": ["prefix:pdf", "pdf", "provider:openai", "protocol:openai-responses", "tool", "tool-result"],
     "name": "pdf/openai-tool-result",
     "recordedAt": "2026-07-22T18:15:36.438Z"
   },
@@ -21,7 +14,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"gpt-4o-mini\",\"input\":[{\"role\":\"system\",\"content\":\"Read the PDF returned by the tool and follow the user's response format exactly.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]},{\"type\":\"function_call\",\"call_id\":\"call_pdf_1\",\"name\":\"read_pdf\",\"arguments\":\"{}\"},{\"type\":\"function_call_output\",\"call_id\":\"call_pdf_1\",\"output\":[{\"type\":\"input_text\",\"text\":\"PDF read successfully\"},{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"}]}],\"tools\":[{\"type\":\"function\",\"name\":\"read_pdf\",\"description\":\"Read the attached PDF.\",\"parameters\":{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
+        "body": "{\"model\":\"gpt-4o-mini\",\"input\":[{\"role\":\"system\",\"content\":\"Read the PDF returned by the tool and follow the user's response format exactly.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]},{\"type\":\"function_call\",\"call_id\":\"call_pdf_1\",\"name\":\"read_pdf\",\"arguments\":\"{}\"},{\"type\":\"function_call_output\",\"call_id\":\"call_pdf_1\",\"output\":[{\"type\":\"input_text\",\"text\":\"PDF read successfully\"},{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"data:application/pdf;base64,JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"}]}],\"tools\":[{\"type\":\"function\",\"name\":\"read_pdf\",\"description\":\"Read the attached PDF.\",\"parameters\":{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
       },
       "response": {
         "status": 200,

packages/ai/test/fixtures/recordings/pdf/openai-user-input.json

@@ -1,13 +1,7 @@
 {
   "version": 1,
   "metadata": {
-    "tags": [
-      "prefix:pdf",
-      "pdf",
-      "provider:openai",
-      "protocol:openai-responses",
-      "user-input"
-    ],
+    "tags": ["prefix:pdf", "pdf", "provider:openai", "protocol:openai-responses", "user-input"],
     "name": "pdf/openai-user-input",
     "recordedAt": "2026-07-22T18:15:34.867Z"
   },
@@ -20,7 +14,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"gpt-4o-mini\",\"input\":[{\"role\":\"user\",\"content\":[{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"},{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
+        "body": "{\"model\":\"gpt-4o-mini\",\"input\":[{\"role\":\"user\",\"content\":[{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"data:application/pdf;base64,JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"},{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
       },
       "response": {
         "status": 200,

packages/ai/test/fixtures/recordings/pdf/xai-tool-result.json

@@ -1,17 +1,9 @@
 {
   "version": 1,
   "metadata": {
-    "tags": [
-      "prefix:pdf",
-      "pdf",
-      "provider:xai",
-      "protocol:xai-responses",
-      "tool",
-      "tool-result"
-    ],
+    "tags": ["prefix:pdf", "pdf", "provider:xai", "protocol:openai-responses", "tool", "tool-result"],
     "name": "pdf/xai-tool-result",
-    "recordedAt": "2026-07-22T18:15:43.608Z",
-    "protocol": "xai-responses"
+    "recordedAt": "2026-07-22T18:15:43.608Z"
   },
   "interactions": [
     {
@@ -22,7 +14,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"grok-4.5\",\"input\":[{\"role\":\"system\",\"content\":\"Read the PDF returned by the tool and follow the user's response format exactly.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]},{\"type\":\"function_call\",\"call_id\":\"call_pdf_1\",\"name\":\"read_pdf\",\"arguments\":\"{}\"},{\"type\":\"function_call_output\",\"call_id\":\"call_pdf_1\",\"output\":[{\"type\":\"input_text\",\"text\":\"PDF read successfully\"},{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"}]}],\"tools\":[{\"type\":\"function\",\"name\":\"read_pdf\",\"description\":\"Read the attached PDF.\",\"parameters\":{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
+        "body": "{\"model\":\"grok-4.5\",\"input\":[{\"role\":\"system\",\"content\":\"Read the PDF returned by the tool and follow the user's response format exactly.\"},{\"role\":\"user\",\"content\":[{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]},{\"type\":\"function_call\",\"call_id\":\"call_pdf_1\",\"name\":\"read_pdf\",\"arguments\":\"{}\"},{\"type\":\"function_call_output\",\"call_id\":\"call_pdf_1\",\"output\":[{\"type\":\"input_text\",\"text\":\"PDF read successfully\"},{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\",\"mime_type\":\"application/pdf\"}]}],\"tools\":[{\"type\":\"function\",\"name\":\"read_pdf\",\"description\":\"Read the attached PDF.\",\"parameters\":{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false},\"strict\":false}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
       },
       "response": {
         "status": 200,

packages/ai/test/fixtures/recordings/pdf/xai-user-input.json

@@ -1,16 +1,9 @@
 {
   "version": 1,
   "metadata": {
-    "tags": [
-      "prefix:pdf",
-      "pdf",
-      "provider:xai",
-      "protocol:xai-responses",
-      "user-input"
-    ],
+    "tags": ["prefix:pdf", "pdf", "provider:xai", "protocol:openai-responses", "user-input"],
     "name": "pdf/xai-user-input",
-    "recordedAt": "2026-07-22T18:15:42.429Z",
-    "protocol": "xai-responses"
+    "recordedAt": "2026-07-22T18:15:42.429Z"
   },
   "interactions": [
     {
@@ -21,7 +14,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"grok-4.5\",\"input\":[{\"role\":\"user\",\"content\":[{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"},{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
+        "body": "{\"model\":\"grok-4.5\",\"input\":[{\"role\":\"user\",\"content\":[{\"type\":\"input_file\",\"filename\":\"verification.pdf\",\"file_data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\",\"mime_type\":\"application/pdf\"},{\"type\":\"input_text\",\"text\":\"Return only the verification code from the PDF.\"}]}],\"store\":false,\"max_output_tokens\":40,\"temperature\":0,\"stream\":true}"
       },
       "response": {
         "status": 200,

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

@@ -106,20 +106,3 @@ describe("provider error classification", () => {
     expect(classifyProviderFailure({ message: "not-json" })._tag).toBe("UnknownProvider")
   })
 })
-
-describe("provider error rawBody classification", () => {
-  test("classifies overflow signals buried in the raw payload when the summary is vague", () => {
-    const reason = classifyProviderFailure({
-      message: "Request failed",
-      rawBody: '{"error":{"message":"This model\'s maximum context length is 40960 tokens"}}',
-    })
-    expect(reason._tag).toBe("InvalidRequest")
-    expect(reason).toMatchObject({ classification: "context-overflow" })
-  })
-
-  test("extracts nested codes from the raw payload", () => {
-    expect(
-      classifyProviderFailure({ message: "Request failed", rawBody: '{"error":{"code":"insufficient_quota"}}' })._tag,
-    ).toBe("QuotaExceeded")
-  })
-})

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

@@ -93,7 +93,7 @@ describe("Open Responses-compatible route", () => {
     }),
   )
 
-  it.effect("preserves nullable phases in the forgiving Open Responses baseline", () =>
+  it.effect("omits OpenAI-only nullable phases from the Open Responses baseline", () =>
     Effect.gen(function* () {
       const model = configure({
         apiKey: "test-key",
@@ -113,9 +113,7 @@ describe("Open Responses-compatible route", () => {
       )
 
       expect(prepared.body).toMatchObject({
-        input: [
-          { type: "message", role: "assistant", content: [{ type: "output_text", text: "Unclassified." }], phase: null },
-        ],
+        input: [{ type: "message", role: "assistant", content: [{ type: "output_text", text: "Unclassified." }] }],
       })
     }),
   )

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

@@ -28,7 +28,7 @@ import * as Azure from "../../src/providers/azure.js"
 import * as OpenAI from "../../src/providers/openai.js"
 import * as XAI from "../../src/providers/xai.js"
 import * as OpenAIResponses from "../../src/protocols/openai-responses.js"
-import { OpenResponsesContinuation } from "../../src/protocols/open-responses-continuation.js"
+import { OpenAIResponsesChannel } from "../../src/protocols/openai-responses-channel.js"
 import * as ProviderShared from "../../src/protocols/shared.js"
 import { continuationRequest, nativeOpenAIResponsesContinuation } from "../continuation-scenarios.js"
 import { it } from "../lib/effect.js"
@@ -68,7 +68,7 @@ const baseChannelDriver = (message: string): WebSocketChannelDriver => ({
 
 const continuationDriver = (request: Readonly<Record<string, unknown>>) => {
   const message = ProviderShared.encodeJson(request)
-  return OpenResponsesContinuation.driver({
+  return OpenAIResponsesChannel.driver({
     id: "openai-responses",
     name: "OpenAI Responses",
     request,
@@ -1273,7 +1273,7 @@ describe("OpenAI Responses route", () => {
         {
           type: "input_file",
           filename: "report.pdf",
-          file_data: "JVBERi0xLjQ=",
+          file_data: "data:application/pdf;base64,JVBERi0xLjQ=",
         },
       ])
     }),
@@ -1300,12 +1300,12 @@ describe("OpenAI Responses route", () => {
       )
 
       expect(expectToolOutput(prepared.body).output).toEqual([
-        { type: "input_file", filename: "report.pdf", file_data: base64 },
+        { type: "input_file", filename: "report.pdf", file_data: dataUrl },
       ])
     }),
   )
 
-  it.effect("uses standard inline file encoding for xAI PDF tool results", () =>
+  it.effect("uses xAI inline file encoding for PDF tool results", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({
@@ -1334,6 +1334,7 @@ describe("OpenAI Responses route", () => {
           type: "input_file",
           filename: "report.pdf",
           file_data: "JVBERi0xLjQ=",
+          mime_type: "application/pdf",
         },
       ])
     }),
@@ -1358,61 +1359,7 @@ describe("OpenAI Responses route", () => {
       )
 
       expect(expectToolOutput(prepared.body).output).toEqual([
-        { type: "input_file", filename: "file", file_data: "AAECAw==" },
-      ])
-    }),
-  )
-
-  it.effect("lowers remote tool-result media URLs without base64 wrapping", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.assistant([ToolCallPart.make({ id: "call_1", name: "fetch", input: {} })]),
-            Message.tool({
-              id: "call_1",
-              name: "fetch",
-              resultType: "content",
-              result: [
-                { type: "file", uri: "https://example.com/image.png", mime: "image/png" },
-                { type: "file", uri: "https://example.com/report.pdf", mime: "application/pdf", name: "report.pdf" },
-              ],
-            }),
-          ],
-        }),
-      )
-
-      expect(expectToolOutput(prepared.body).output).toEqual([
-        { type: "input_image", image_url: "https://example.com/image.png" },
-        { type: "input_file", filename: "report.pdf", file_url: "https://example.com/report.pdf" },
-      ])
-    }),
-  )
-
-  it.effect("lowers tool-result videos as input_video", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.assistant([ToolCallPart.make({ id: "call_1", name: "record", input: {} })]),
-            Message.tool({
-              id: "call_1",
-              name: "record",
-              resultType: "content",
-              result: [
-                { type: "file", uri: "data:video/mp4;base64,AAECAw==", mime: "video/mp4" },
-                { type: "file", uri: "https://example.com/demo.mp4", mime: "video/mp4" },
-              ],
-            }),
-          ],
-        }),
-      )
-
-      expect(expectToolOutput(prepared.body).output).toEqual([
-        { type: "input_video", video_url: "data:video/mp4;base64,AAECAw==" },
-        { type: "input_video", video_url: "https://example.com/demo.mp4" },
+        { type: "input_file", filename: "file", file_data: "data:audio/mpeg;base64,AAECAw==" },
       ])
     }),
   )
@@ -2765,7 +2712,7 @@ describe("OpenAI Responses route", () => {
             {
               type: "input_file",
               filename: "report.pdf",
-              file_data: "JVBERi0xLjQ=",
+              file_data: "data:application/pdf;base64,JVBERi0xLjQ=",
             },
           ],
         },
@@ -2773,7 +2720,7 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("uses standard inline file encoding for xAI user PDFs", () =>
+  it.effect("uses xAI inline file encoding for user PDFs", () =>
     Effect.gen(function* () {
       const prepared = yield* compileRequest(
         LLM.request({
@@ -2797,6 +2744,7 @@ describe("OpenAI Responses route", () => {
               type: "input_file",
               filename: "report.pdf",
               file_data: "JVBERi0xLjQ=",
+              mime_type: "application/pdf",
             },
           ],
         },
@@ -2821,7 +2769,7 @@ describe("OpenAI Responses route", () => {
             {
               type: "input_file",
               filename: "file",
-              file_data: "AAECAw==",
+              file_data: "data:application/x-tar;base64,AAECAw==",
             },
           ],
         },
@@ -2829,37 +2777,6 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("lowers remote user media URLs without base64 wrapping", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.user([
-              { type: "media", mediaType: "image/png", data: "https://example.com/image.png" },
-              {
-                type: "media",
-                mediaType: "application/pdf",
-                data: "https://example.com/report.pdf",
-                filename: "report.pdf",
-              },
-            ]),
-          ],
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([
-        {
-          role: "user",
-          content: [
-            { type: "input_image", image_url: "https://example.com/image.png" },
-            { type: "input_file", filename: "report.pdf", file_url: "https://example.com/report.pdf" },
-          ],
-        },
-      ])
-    }),
-  )
-
   it.effect("fails with a typed rate limit for provider error frames", () =>
     Effect.gen(function* () {
       const error = yield* LLMClient.generate(request).pipe(
@@ -3016,42 +2933,36 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("falls back to the raw payload when error is null", () =>
+  it.effect("falls back to a stable default when error is null", () =>
     Effect.gen(function* () {
       const error = yield* LLMClient.generate(request).pipe(
         Effect.provide(fixedResponse(sseEvents({ type: "error", error: null }))),
         Effect.flip,
       )
 
-      expect(error.reason).toMatchObject({ _tag: "UnknownProvider" })
-      expect(error.reason.message).toContain('"error":null')
-      expect(error.body).toBe(error.reason.message)
+      expect(error.reason).toMatchObject({ _tag: "UnknownProvider", message: "OpenAI Responses stream error" })
     }),
   )
 
-  it.effect("falls back to the raw payload when both error and response are absent", () =>
+  it.effect("falls back to a stable default when both error and response are absent", () =>
     Effect.gen(function* () {
       const error = yield* LLMClient.generate(request).pipe(
         Effect.provide(fixedResponse(sseEvents({ type: "error" }))),
         Effect.flip,
       )
 
-      expect(error.reason).toMatchObject({ _tag: "UnknownProvider" })
-      expect(error.reason.message).toContain('"type":"error"')
-      expect(error.body).toBe(error.reason.message)
+      expect(error.reason).toMatchObject({ _tag: "UnknownProvider", message: "OpenAI Responses stream error" })
     }),
   )
 
-  it.effect("keeps the raw response payload when response.failed has no error payload", () =>
+  it.effect("falls back to a stable default when response.failed has no error payload", () =>
     Effect.gen(function* () {
       const error = yield* LLMClient.generate(request).pipe(
         Effect.provide(fixedResponse(sseEvents({ type: "response.failed", response: { id: "resp_failed_3" } }))),
         Effect.flip,
       )
 
-      expect(error.reason).toMatchObject({ _tag: "UnknownProvider" })
-      expect(error.reason.message).toContain('"resp_failed_3"')
-      expect(error.body).toBe(error.reason.message)
+      expect(error.reason).toMatchObject({ _tag: "UnknownProvider", message: "OpenAI Responses response failed" })
     }),
   )
 

packages/ai/test/provider/pdf.recorded.test.ts

@@ -64,7 +64,7 @@ const targets: ReadonlyArray<{
     id: "xai",
     name: "xAI Grok 4.5",
     provider: "xai",
-    protocol: "xai-responses",
+    protocol: "openai-responses",
     requires: "XAI_API_KEY",
     filename: "verification.pdf",
     maxTokens: 40,

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

@@ -1,77 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect } from "effect"
-import { LLM, LLMEvent } from "../../src/index.js"
-import { XAI } from "../../src/providers.js"
-import { OpenResponses } from "../../src/protocols/open-responses.js"
-import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
-import { XAIResponses } from "../../src/protocols/xai-responses.js"
-import { LLMClient } from "../../src/route.js"
-import { compileRequest } from "../../src/route/client.js"
-import { it } from "../lib/effect.js"
-import { fixedResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
-
-const model = XAI.configure({ apiKey: "test", baseURL: "https://api.x.ai/v1" }).responses("grok-4.6")
-
-describe("xAI Responses route", () => {
-  it.effect("extends the Open Responses baseline directly", () =>
-    Effect.gen(function* () {
-      expect(XAIResponses.protocol.body).toBe(OpenResponses.protocol.body)
-      expect(XAIResponses.protocol.body).not.toBe(OpenAIResponses.protocol.body)
-
-      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Hello" }))
-      expect(prepared.protocol).toBe("xai-responses")
-    }),
-  )
-
-  it.effect("parses xAI reasoning text events", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think" })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "response.reasoning_text.delta", item_id: "reasoning_1", delta: "Considering." },
-              { type: "response.reasoning_text.done", item_id: "reasoning_1" },
-              {
-                type: "response.output_item.done",
-                item: { type: "reasoning", id: "reasoning_1", encrypted_content: "opaque" },
-              },
-              { type: "response.completed", response: { id: "response_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.message.content.find((part) => part.type === "reasoning")).toMatchObject({
-        type: "reasoning",
-        text: "Considering.",
-        providerMetadata: { xai: { itemId: "reasoning_1", reasoningEncryptedContent: "opaque" } },
-      })
-    }),
-  )
-
-  it.effect("parses xAI hosted tool items", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Search X" })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.done",
-                item: { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } },
-              },
-              { type: "response.completed", response: { id: "response_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({
-        id: "x_search_1",
-        name: "x_search",
-        input: { query: "news" },
-        providerExecuted: true,
-      })
-    }),
-  )
-})

packages/app/AGENTS.md

@@ -19,12 +19,6 @@
 
 - Always prefer `createStore` over multiple `createSignal` calls
 
-## Typography
-
-- Use `--line-height-compact` (`16px`) for `13px` compact UI text and `--line-height-base` (`20px`) for body text.
-- Do not use `leading-none`, `line-height: 1`, or a `13px` line height for normal text. Inter descenders clip inside truncation and overflow containers.
-- Keep control and row heights explicit. Fix font metrics directly rather than using transforms, negative margins, or clip-padding compensation.
-
 ## Localization
 
 - NEVER hardcode user-visible English strings in production code. ALWAYS use an i18n key for visible copy, placeholders, accessible labels, tooltips, menus, dialogs, toasts, empty states, and displayed errors.

packages/app/e2e/performance/timeline-stability/fixture.ts

@@ -259,22 +259,6 @@ export function event(
   return makeEvent(type, data)
 }
 
-export function compactionStarted(data: Extract<OpenCodeEvent, { type: "session.compaction.started" }>["data"]) {
-  return makeEvent("session.compaction.started", data)
-}
-
-export function compactionDelta(data: Extract<OpenCodeEvent, { type: "session.compaction.delta" }>["data"]) {
-  return makeEvent("session.compaction.delta", data)
-}
-
-export function compactionEnded(data: Extract<OpenCodeEvent, { type: "session.compaction.ended" }>["data"]) {
-  return makeEvent("session.compaction.ended", data)
-}
-
-export function compactionFailed(data: Extract<OpenCodeEvent, { type: "session.compaction.failed" }>["data"]) {
-  return makeEvent("session.compaction.failed", data)
-}
-
 export function toolInputStarted(data: Extract<OpenCodeEvent, { type: "session.tool.input.started" }>["data"]) {
   return makeEvent("session.tool.input.started", data)
 }

packages/app/e2e/performance/timeline/first-navigation-benchmark.spec.ts

@@ -53,37 +53,6 @@ benchmark.describe("performance: first navigation paint", () => {
     expect(result.summary.unknownSamples).toBe(0)
   })
 
-  benchmark("opens a session from the new session page without a blank frame", async ({ page, report }) => {
-    await mockStressTimeline(page)
-    await installTimelineSettings(page)
-    await installStressSessionTabs(page, { draftID })
-    await page.goto("/")
-
-    const draftHref = stressDraftHref(draftID)
-    const draftTab = page.locator(`[data-slot="titlebar-tabs"] a[href="${draftHref}"]`)
-    await expect(draftTab).toHaveCount(1)
-    await draftTab.click()
-    await expect(page.locator('[data-component="new-session"]')).toBeVisible()
-
-    const href = stressSessionHref(fixture.targetID)
-    const sessionTab = page.locator(`[data-slot="titlebar-tabs"] a[href="${href}"]`)
-    await expect(sessionTab).toHaveCount(1)
-    const result = await measureFirstNavigation(page, {
-      href,
-      destinationPath: href,
-      sourceSelector: '[data-component="new-session"]',
-      destinationSelector: messageSelector(fixture.expected.targetMessageIDs.at(-1)!),
-      contentSelector,
-      navigate: async () => {
-        await sessionTab.click()
-        await expectSessionTitle(page, fixture.expected.targetTitle)
-      },
-    })
-    report(result)
-    expect(result.summary.blankSamples).toBe(0)
-    expect(result.summary.unknownSamples).toBe(0)
-  })
-
   benchmark("opens a child session without a blank frame", async ({ page, report }) => {
     await setup(page)
     const href = stressSessionHref(fixture.childID)

packages/app/e2e/regression/review-line-comment.spec.ts

@@ -45,17 +45,21 @@ test("opens the comment editor for a line number range", async ({ page }) => {
   await expect(review.locator('[data-slot="line-comment-editor-label"]')).toHaveText("Commenting on lines 1-3")
 })
 
-test("shows a comment button when a diff line is hovered", async ({ page }) => {
+test("shows a comment button when a line number is hovered", async ({ page }) => {
   const review = page.locator('[data-component="session-review"]')
-  const line = review.getByText("export const first = 1", { exact: true })
-  await expectAppVisible(line)
+  const lineNumber = review.locator('[data-column-number="1"]').last()
+  await expectAppVisible(lineNumber)
 
-  const comment = review.getByRole("button", { name: "Comment", exact: true, includeHidden: true })
-  await expect(comment).toHaveCount(1)
-  await line.dispatchEvent("pointermove", { pointerType: "mouse", bubbles: true, composed: true })
-  await expect(comment).toBeVisible()
-  await expect(comment).toHaveCSS("pointer-events", "auto")
-  await comment.dispatchEvent("click")
+  const comment = review.getByRole("button", { name: "Comment", exact: true })
+  await expect(async () => {
+    await lineNumber.hover()
+    await expect(lineNumber).toHaveAttribute("data-hovered", "")
+    await expect(comment).toHaveCount(1)
+    await expect(comment).toHaveCSS("pointer-events", "auto")
+    await comment.focus()
+    await expect(comment).toBeFocused()
+  }).toPass({ timeout: 10_000 })
+  await comment.press("Enter")
   await expect(review.getByRole("textbox")).toBeVisible()
   await expect(review.locator('[data-slot="line-comment-editor-label"]')).toHaveText("Commenting on line 1")
 })

packages/app/e2e/regression/session-timeline-collapse-state.spec.ts

@@ -139,7 +139,7 @@ test.describe("regression: session timeline local row state", () => {
     expect(siblingProbe).toEqual({
       fileMarker: "before",
       frameMarker: "before",
-      rowKey: `assistant-part:part:${assistantMessageID}:${editPartID}`,
+      rowKey: `assistant-part:${userMessageID}:part:${assistantMessageID}:${editPartID}`,
       rowMarker: "before",
       shadowRoots: 0,
       toolMarker: "before",

packages/app/e2e/regression/session-timeline-file-projection.spec.ts

@@ -3,9 +3,9 @@ import { createTwoFilesPatch } from "diff"
 import {
   assistantMessage,
   setupTimeline,
+  textPart,
   toolPart,
   userMessage,
-  userText,
 } from "../performance/timeline-stability/fixture"
 
 test("renders completed write content", async ({ page }) => {
@@ -82,9 +82,9 @@ test("keeps an expanded file diff header at the same viewport position", async (
   const id = "prt_file_projection_anchored_patch"
   const before = Array.from({ length: 80 }, (_, index) => `export const value${index} = ${index}\n`).join("")
   const after = before.replaceAll(" = ", " = compute(").replaceAll("\n", ")\n")
-  await setupTimeline(page, {
+  const timeline = await setupTimeline(page, {
     messages: [
-      userMessage([userText("Preceding context ".repeat(120))]),
+      userMessage(),
       assistantMessage([
         toolPart(
           id,
@@ -105,6 +105,7 @@ test("keeps an expanded file diff header at the same viewport position", async (
             },
           },
         ),
+        textPart("prt_after_anchored_patch", "The diff is ready.\n\n".repeat(4)),
       ]),
     ],
     viewport: { width: 1200, height: 600 },
@@ -112,21 +113,7 @@ test("keeps an expanded file diff header at the same viewport position", async (
 
   const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
   const wrapper = page.locator(`[data-timeline-part-id="${id}"]`)
-  const row = page.locator("[data-timeline-key]", { has: wrapper })
   const trigger = wrapper.getByRole("button")
-  await expect
-    .poll(() =>
-      row.evaluate((element) => {
-        const measured = element.querySelector<HTMLElement>("[data-index]")
-        return measured
-          ? Math.abs(element.getBoundingClientRect().height - measured.getBoundingClientRect().height)
-          : Number.POSITIVE_INFINITY
-      }),
-    )
-    .toBeLessThanOrEqual(1)
-  await expect
-    .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight))
-    .toBeGreaterThan(1)
   await scroller.evaluate((element) => {
     element.scrollTop = element.scrollHeight - element.clientHeight - 0.25
   })
@@ -134,28 +121,11 @@ test("keeps an expanded file diff header at the same viewport position", async (
   await expect
     .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
     .toBeLessThanOrEqual(0.5)
-  const bottomScrollTop = await scroller.evaluate((element) => element.scrollTop)
-  await scroller.hover()
-  await page.mouse.wheel(0, -20)
-  await expect
-    .poll(() => scroller.evaluate((element, bottom) => bottom - element.scrollTop, bottomScrollTop))
-    .toBeGreaterThan(0)
+  await trigger.dispatchEvent("wheel", { deltaY: -1, deltaMode: 0 })
+  await trigger.dispatchEvent("pointerdown")
   const y = await trigger.evaluate((element) => element.getBoundingClientRect().y)
-  const collapsedHeight = await row.evaluate((element) => element.getBoundingClientRect().height)
-  await trigger.click()
+  await trigger.dispatchEvent("click")
   await expect(wrapper.locator('[data-component="apply-patch-file-diff"]')).toBeVisible()
-  await expect
-    .poll(() =>
-      row.evaluate((element, collapsed) => {
-        const measured = element.querySelector<HTMLElement>("[data-index]")
-        const allocatedHeight = element.getBoundingClientRect().height
-        return {
-          grew: allocatedHeight > collapsed + 1,
-          measured: measured ? Math.abs(allocatedHeight - measured.getBoundingClientRect().height) <= 1 : false,
-        }
-      }, collapsedHeight),
-    )
-    .toEqual({ grew: true, measured: true })
   await expect
     .poll(() => trigger.evaluate((element, initialY) => Math.abs(element.getBoundingClientRect().y - initialY), y))
     .toBeLessThanOrEqual(5)
@@ -163,10 +133,9 @@ test("keeps an expanded file diff header at the same viewport position", async (
   const scrollTop = await scroller.evaluate((element) => element.scrollTop)
   await scroller.hover()
   await page.mouse.wheel(0, 200)
-  await expect
-    .poll(() => scroller.evaluate((element, initial) => element.scrollTop - initial, scrollTop))
-    .toBeGreaterThan(50)
+  await timeline.settle(40)
   const scrolled = await scroller.evaluate((element, initial) => element.scrollTop - initial, scrollTop)
+  expect(scrolled).toBeGreaterThan(50)
   expect(scrolled).toBeLessThan(400)
 
   const expandedY = await trigger.evaluate((element) => element.getBoundingClientRect().y)
@@ -181,16 +150,6 @@ test("keeps an expanded file diff header at the same viewport position", async (
 
   await trigger.click()
   await expect(wrapper.locator('[data-component="apply-patch-file-diff"]')).toBeVisible()
-  await expect
-    .poll(() =>
-      row.evaluate((element) => {
-        const measured = element.querySelector<HTMLElement>("[data-index]")
-        return measured
-          ? Math.abs(element.getBoundingClientRect().height - measured.getBoundingClientRect().height)
-          : Number.POSITIVE_INFINITY
-      }),
-    )
-    .toBeLessThanOrEqual(1)
   await expect
     .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
     .toBeLessThanOrEqual(1)

packages/app/e2e/regression/session-timeline-history-root.spec.ts

@@ -17,7 +17,7 @@ import { mockOpenCodeServer } from "../utils/mock-server"
 import { installSseTransport } from "../utils/sse-transport"
 import { expectSessionTitle } from "../utils/waits"
 
-const messagePageSize = 20
+const messagePageSize = 200
 const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 const messages = Array.from({ length: messagePageSize / 2 + 1 }, (_, index) => {
   const id = `msg_${String(index + 1001).padStart(4, "0")}_history_root_user`

packages/app/e2e/regression/session-timeline-notices.spec.ts

@@ -1,15 +1,6 @@
 import { expect, test } from "@playwright/test"
 import type { SessionMessageAssistant, SessionMessageInfo } from "@opencode-ai/client/promise"
-import {
-  compactionDelta,
-  compactionEnded,
-  compactionFailed,
-  compactionStarted,
-  event,
-  session,
-  sessionID,
-  setupTimeline,
-} from "../performance/timeline-stability/fixture"
+import { event, session, sessionID, setupTimeline, toolPart } from "../performance/timeline-stability/fixture"
 
 const user = { id: "msg_user", type: "user", text: "Run it", time: { created: 1 } } satisfies SessionMessageInfo
 
@@ -82,102 +73,23 @@ test("renders current protocol notices in CLI order", async ({ page }) => {
   expect(ownerWarnings).toEqual([])
 })
 
-test("renders a compaction summary while it streams and after completion", async ({ page }) => {
-  const timeline = await setupTimeline(page, { sessionMessages: [user, assistant(true)] })
-
-  await timeline.send(
-    compactionStarted({
-      sessionID,
-      reason: "manual",
-      recent: "",
-    }),
-  )
-
-  const compaction = page.locator('[data-component="session-compaction-message"]')
-  await expect(compaction.getByText("Session compacted", { exact: true })).toBeVisible()
-
-  await timeline.send(
-    compactionDelta({
-      sessionID,
-      text: "## Checkpoint\n\nStreamed implementation details.",
-    }),
-  )
-  await expect(compaction.getByRole("heading", { name: "Checkpoint" })).toBeVisible()
-  await expect(compaction).toContainText("Streamed implementation details.")
-
-  await timeline.send(
-    compactionEnded({
-      sessionID,
-      reason: "manual",
-      text: "## Checkpoint\n\nFinal implementation details.",
-      recent: "",
-    }),
-  )
-  await expect(compaction).toContainText("Final implementation details.")
-  await expect(compaction).not.toContainText("Streamed implementation details.")
-})
-
-test("updates running compactions to failed and cancelled boundaries", async ({ page }) => {
-  const timeline = await setupTimeline(page, { sessionMessages: [user, assistant(true)] })
-
-  await timeline.send(compactionStarted({ sessionID, reason: "auto", recent: "" }))
-  await timeline.send(compactionDelta({ sessionID, text: "Partial summary that should be discarded." }))
-  await timeline.send(
-    compactionFailed({
-      sessionID,
-      reason: "auto",
-      error: {
-        type: "compaction.failed",
-        message: 'Error: {"error":{"type":"ProviderError","message":"The provider rejected the summary."}}',
-      },
-    }),
-  )
-
-  const compactions = page.locator('[data-component="session-compaction-message"]')
-  const failed = compactions.filter({ hasText: "The provider rejected the summary." })
-  await expect(failed.getByText("Session compacted", { exact: true })).toBeVisible()
-  await expect(failed.getByText("ProviderError: The provider rejected the summary.", { exact: true })).toBeVisible()
-  await expect(failed).not.toContainText("Partial summary that should be discarded.")
-
-  await timeline.send(compactionStarted({ sessionID, reason: "manual", recent: "" }))
-  await timeline.send(
-    compactionFailed({
-      sessionID,
-      reason: "manual",
-      error: { type: "aborted", message: "Cancellation detail should stay hidden." },
-    }),
-  )
-
-  await expect(compactions).toHaveCount(2)
-  const cancelled = compactions.filter({ hasNotText: "The provider rejected the summary." })
-  await expect(cancelled.getByText("Session compacted", { exact: true })).toBeVisible()
-  await expect(cancelled).not.toContainText("Cancellation detail should stay hidden.")
-})
-
 test("shows a delegating row while subagent input streams", async ({ page }) => {
   await setupTimeline(page, {
     sessionMessages: [
       user,
       {
         ...assistant(false),
-        content: [
-          {
-            type: "tool",
-            id: "call_subagent",
-            name: "subagent",
-            state: { status: "streaming", input: "" },
-            time: { created: 2 },
-          },
-        ],
+        content: [toolPart("call_subagent", "subagent", "streaming", {})],
       },
     ],
   })
 
   const delegating = page.locator('[data-component="task-tool-delegating"]')
   await expect(delegating).toBeVisible()
-  const shimmer = delegating.locator('[data-component="text-shimmer"]')
-  await expect(shimmer).toHaveAttribute("aria-label", "Delegating agent...")
-  await expect(shimmer).toHaveCSS("line-height", "16px")
+  await expect(delegating.locator('[data-component="text-shimmer"]')).toHaveAttribute(
+    "aria-label",
+    "Delegating agent...",
+  )
   const icon = delegating.locator('[data-slot="icon-svg"]')
   await expect(icon.locator('use[href="#opencode-v2-icon-subagent"]')).toBeVisible()
   await expect(icon).toHaveCSS("color", "rgb(174, 174, 174)")
@@ -215,11 +127,11 @@ test("renders the moved location notice in its compact timeline style", async ({
   await expect(notice).toHaveCSS("padding-bottom", "4px")
   await expect(label).toHaveCSS("font-size", "13px")
   await expect(label).toHaveCSS("font-weight", "530")
-  await expect(label).toHaveCSS("line-height", "16px")
+  await expect(label).toHaveCSS("line-height", "13px")
   await expect(label).toHaveCSS("color", "rgb(128, 128, 128)")
   await expect(value).toHaveCSS("font-size", "13px")
   await expect(value).toHaveCSS("font-weight", "440")
-  await expect(value).toHaveCSS("line-height", "16px")
+  await expect(value).toHaveCSS("line-height", "13px")
   await expect(value).toHaveCSS("color", "rgb(128, 128, 128)")
   await expect(value).toHaveCSS("text-overflow", "ellipsis")
   await expect(value).toHaveCSS("white-space", "nowrap")

packages/app/e2e/regression/session-timeline-tool-projection.spec.ts

@@ -98,9 +98,9 @@ test("labels completed searches with result counts", async ({ page }) => {
 
   const group = page.locator(`[data-timeline-part-ids="${glob},${grep}"]`)
   await group.locator('[data-slot="collapsible-trigger"]').click()
-  const rows = group.locator('[data-component="context-tool-group-list"] [data-component="tool-trigger"]')
-  await expect(rows.filter({ hasText: "Glob" })).toContainText("(1 match)")
-  await expect(rows.filter({ hasText: "Grep" })).toContainText("(12 matches)")
+  const rows = group.locator('[data-component="tool-trigger"]')
+  await expect(rows.nth(0)).toContainText("(1 match)")
+  await expect(rows.nth(1)).toContainText("(12 matches)")
 })
 
 test("labels read tools from their path input", async ({ page }) => {
@@ -111,11 +111,7 @@ test("labels read tools from their path input", async ({ page }) => {
 
   const group = page.locator(`[data-timeline-part-ids="${id}"]`)
   await group.locator('[data-slot="collapsible-trigger"]').click()
-  await expect(
-    group
-      .locator('[data-component="context-tool-group-list"] [data-component="tool-trigger"]')
-      .filter({ hasText: "Read" }),
-  ).toContainText("a.ts")
+  await expect(group.locator('[data-slot="basic-tool-tool-subtitle"]')).toHaveText("a.ts")
 })
 
 test("labels skill tools from IDs and result metadata", async ({ page }) => {
@@ -125,20 +121,19 @@ test("labels skill tools from IDs and result metadata", async ({ page }) => {
     messages: [
       userMessage(),
       assistantMessage([
-        toolPart(pending, "skill", "running", { id: "frontend-design" }),
+        toolPart(pending, "skill", "running", { id: "sample-skill" }),
         toolPart(completed, "skill", "completed", { id: "opencode" }, { metadata: { name: "OpenCode" } }),
       ]),
     ],
   })
 
   for (const [id, name] of [
-    [pending, "frontend-design"],
+    [pending, "sample-skill"],
     [completed, "OpenCode"],
   ] as const) {
     const skill = page.locator(`[data-timeline-part-id="${id}"]`)
     const loaded = skill.locator('[data-component="tool-loaded-item"]')
     await expect(loaded).toHaveAttribute("aria-label", `Loaded ${name} skill`)
-    await expect(loaded).toHaveCSS("line-height", "16px")
     await expect(loaded.locator('[data-slot="tool-loaded-label"]')).toHaveText("Loaded")
     await expect(loaded.locator('[data-slot="tool-loaded-kind"]')).toHaveText("skill")
     await expect(loaded.locator('[data-component="text-shimmer"]')).toHaveAttribute("aria-label", name)

packages/app/e2e/regression/subagent-child-navigation.spec.ts

@@ -26,42 +26,6 @@ test("navigates to a subagent child session missing from the session list", asyn
   await expect(titlebarRight.getByRole("button", { name: "Toggle review" })).toHaveCount(1)
 })
 
-test("returns to the parent session with Escape", async ({ page }) => {
-  await setup(page)
-  await openChildFromParent(page)
-  await expectSessionTitle(page, taskDescription)
-
-  await page.keyboard.press("Escape")
-
-  await Promise.all([expect(page).toHaveURL(sessionHref(parentID)), expectSessionTitle(page, parentTitle)])
-})
-
-test("shows parent lineage while the child timeline loads", async ({ page }) => {
-  await setup(page)
-  const requested = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  await page.route(
-    (url) =>
-      url.pathname === `/api/session/${childID}/message` &&
-      url.port === (process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"),
-    async (route) => {
-      requested.resolve()
-      await release.promise
-      await route.fallback()
-    },
-  )
-
-  await page.goto(sessionHref(parentID))
-  await expectSessionTitle(page, parentTitle)
-  await page.locator(`a[href="${sessionHref(childID)}"]`).click()
-  await Promise.all([requested.promise, expect(page).toHaveURL(sessionHref(childID))])
-  await Promise.all([
-    expect(page.locator('[data-slot="session-title-parent"]')).toHaveText(parentTitle),
-    expect(page.locator('[data-slot="session-title-child"]')).toHaveText(childTitle),
-  ]).finally(() => release.resolve())
-  await expectSessionTitle(page, taskDescription)
-})
-
 test("keeps the parent visible while the child session resolves", async ({ page }) => {
   await setup(page)
   const requested = Promise.withResolvers<void>()
@@ -86,44 +50,6 @@ test("keeps the parent visible while the child session resolves", async ({ page
   await expectSessionTitle(page, taskDescription)
 })
 
-test("keeps the parent tab selected while a loaded child session resolves", async ({ page }) => {
-  await setup(page)
-  await openChildFromParent(page)
-  await expectSessionTitle(page, taskDescription)
-  await page.goBack()
-  await Promise.all([expect(page).toHaveURL(sessionHref(parentID)), expectSessionTitle(page, parentTitle)])
-
-  const requested = Promise.withResolvers<void>()
-  const release = Promise.withResolvers<void>()
-  await page.route(
-    (url) => url.pathname === `/api/session/${childID}` && url.port === (process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"),
-    async (route) => {
-      requested.resolve()
-      await release.promise
-      await route.fallback()
-    },
-  )
-
-  const parentTab = page.locator("[data-titlebar-tab-slot]", {
-    has: page.locator('[data-slot="tab-title"]', { hasText: parentTitle }),
-  })
-  await page.locator(`a[href="${sessionHref(childID)}"]`).click()
-  await Promise.all([requested.promise, expect(page).toHaveURL(sessionHref(childID))])
-  await Promise.all([
-    expect(parentTab).toHaveAttribute("data-active", "true"),
-    expect(page.locator('[data-slot="session-title-parent"]')).toHaveText(parentTitle),
-  ]).finally(() => release.resolve())
-  await expectSessionTitle(page, taskDescription)
-
-  const home = page.getByRole("button", { name: "Home" })
-  await home.click()
-  await expect(page).toHaveURL("/")
-  const childTab = page.locator(`[data-slot="titlebar-tabs"] a[href="${sessionHref(childID)}"]`)
-  await expect(childTab).toHaveCount(1)
-  await childTab.click()
-  await Promise.all([expect(page).toHaveURL(sessionHref(childID)), expectSessionTitle(page, taskDescription)])
-})
-
 test("shows the not found fallback when the viewed session is deleted", async ({ page }) => {
   const events: OpenCodeEvent[] = []
   await setup(page, () => events.splice(0, 1))

packages/app/e2e/regression/terminal-composer-focus.spec.ts

@@ -10,13 +10,11 @@ const ptyID = "pty_terminal_composer_focus"
 const newPtyID = "pty_terminal_composer_focus_new"
 const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 const ptyInput: string[] = []
-let sendPtyOutput: ((data: string) => void) | undefined
 
 test.use({ viewport: { width: 1440, height: 900 } })
 
 test.beforeEach(async ({ page }) => {
   ptyInput.length = 0
-  sendPtyOutput = undefined
   await mockOpenCodeServer(page, {
     directory,
     project: {
@@ -76,7 +74,6 @@ test.beforeEach(async ({ page }) => {
   )
   await page.routeWebSocket(new RegExp(`/api/pty/${ptyID}/connect`), (ws) => {
     ws.onMessage((message) => ptyInput.push(message.toString()))
-    sendPtyOutput = (data) => ws.send(data)
   })
 })
 
@@ -93,33 +90,6 @@ test("clears the terminal line with Command+Delete", async ({ page }) => {
   await expect.poll(() => ptyInput.join("")).toBe("\x15")
 })
 
-test("hides the native contenteditable caret", async ({ page }) => {
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Terminal composer focus")
-
-  await page.keyboard.press("Control+Backquote")
-  const terminal = page.locator('[data-component="terminal"]')
-  await expect(terminal).toHaveAttribute("contenteditable", "true")
-  await expect(terminal).toHaveCSS("caret-color", "rgba(0, 0, 0, 0)")
-})
-
-test("reveals the terminal after its first server output renders", async ({ page }) => {
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Terminal composer focus")
-
-  await page.keyboard.press("Control+Backquote")
-  const terminal = page.locator('[data-component="terminal"]')
-  await expect(terminal).toHaveAttribute("contenteditable", "true")
-  await expect(terminal).toHaveCSS("opacity", "0")
-  await expect.poll(() => sendPtyOutput).toBeDefined()
-
-  sendPtyOutput?.("\x1b[?25h")
-  await expect(terminal).toHaveCSS("opacity", "0")
-
-  sendPtyOutput?.("ready")
-  await expect(terminal).toHaveCSS("opacity", "1")
-})
-
 test("routes typing to the composer unless the open terminal is focused", async ({ page }) => {
   await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
   await expectSessionTitle(page, "Terminal composer focus")

packages/app/e2e/smoke/session-timeline.spec.ts

@@ -358,8 +358,7 @@ test.describe("smoke: session timeline", () => {
     const shellTrigger = shell.locator('[data-slot="collapsible-trigger"]')
     const shellSubtitle = shell.locator('[data-slot="basic-tool-tool-subtitle"]')
     await expect(shellSubtitle).toHaveCount(0)
-    await expect(shell.locator('[data-slot="bash-command"]')).toHaveText("bun typecheck")
-    await expect(shell.locator('[data-slot="bash-result"]')).not.toContainText("bun typecheck")
+    await expect(shell.locator('[data-slot="bash-pre"]')).toContainText("$ bun typecheck")
     await shellTrigger.click()
     await expect(shellTrigger).toHaveAttribute("aria-expanded", "false")
     await expect(shellSubtitle).toHaveText("bun typecheck")

packages/app/package.json

@@ -52,7 +52,6 @@
     "vite-plugin-solid": "2.11.14"
   },
   "dependencies": {
-    "@ibm/plex": "6.4.1",
     "@corvu/drawer": "catalog:",
     "@dnd-kit/abstract": "0.5.0",
     "@dnd-kit/dom": "0.5.0",

packages/app/src/composer/adapter.ts

@@ -1,5 +1,4 @@
 import type { Data } from "@opencode-ai/client/solid"
-import type { SessionMessageUser } from "@opencode-ai/client/promise"
 import type { Accessor } from "solid-js"
 import type { ModelSelection } from "@/providers/models/selection"
 import type { ServerSDK } from "@/runtime/server/client"
@@ -42,10 +41,6 @@ export type ComposerSelection = {
 export type ComposerSession = {
   id: string
   directory: string
-  handoff?: {
-    set: (message: SessionMessageUser) => void
-    clear: (messageID: string) => void
-  }
   api: {
     command: (input: Parameters<ServerSDK["api"]["session"]["command"]>[0]) => Promise<unknown>
     shell: (input: Parameters<ServerSDK["api"]["session"]["shell"]>[0]) => Promise<unknown>
@@ -56,7 +51,6 @@ export type ComposerSession = {
     location: { command: Pick<Data["location"]["command"], "list"> }
     session: {
       prompt: (input: Parameters<Data["session"]["prompt"]>[0]) => Promise<unknown>
-      setStatus: Data["session"]["setStatus"]
     }
   }
   current: Accessor<{ agent?: string; model?: { id: string; providerID: string; variant?: string } } | undefined>
@@ -83,7 +77,7 @@ export type NewSessionComposerAdapter = ComposerAdapterBase & {
   start: (
     selection: ComposerSelection,
     submission: ReturnType<typeof createComposerSubmission>,
-  ) => Promise<{ session: ComposerSession; cleanupReady: Promise<void> } | undefined>
+  ) => Promise<ComposerSession | undefined>
 }
 
 export type ComposerAdapter = ActiveComposerAdapter | NewSessionComposerAdapter

packages/app/src/composer/composer.tsx

@@ -29,7 +29,7 @@ export function Composer(props: {
         accentSubmit={props.accentSubmit}
         borderUnderlay={props.borderUnderlay}
         class={props.class}
-        modelControlsVisible={!props.model.model.loading}
+        variantControlVisible={!props.model.model.loading}
         attachKeybind={command.keybindParts("file.attach")}
         attachShortcut={command.keybind("file.attach")}
         modelControl={

packages/app/src/composer/editor/editor.tsx

@@ -42,7 +42,7 @@ export type ComposerEditorProps = {
   borderUnderlay?: boolean
   class?: string
   modelControl?: JSX.Element
-  modelControlsVisible?: boolean
+  variantControlVisible?: boolean
   attachKeybind?: string[]
   attachShortcut?: string
 }
@@ -162,7 +162,7 @@ export function ComposerEditor(props: ComposerEditorProps) {
             spellcheck={state.mode === "normal"}
             // @ts-expect-error
             autocomplete="off"
-            class="relative z-10 block min-h-[60px] max-h-[180px] w-full overflow-y-auto whitespace-pre-wrap bg-transparent px-4 pt-4 pb-2 text-[13px] font-[440] leading-5 text-v2-text-text-base focus:outline-none [&_[data-mention=file]]:text-syntax-property [&_[data-mention=agent]]:text-syntax-type [&_[data-mention=reference]]:text-syntax-keyword"
+            class="relative z-10 block min-h-[60px] max-h-[180px] w-full overflow-y-auto whitespace-pre-wrap bg-transparent px-4 pt-4 pb-2 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:var(--v2-font-family-sans)] focus:outline-none [&_[data-mention=file]]:text-syntax-property [&_[data-mention=agent]]:text-syntax-type [&_[data-mention=reference]]:text-syntax-keyword"
             classList={{ "font-mono!": state.mode === "shell", "opacity-50": props.disabled }}
             style={{
               "unicode-bidi": state.mode === "normal" ? "plaintext" : undefined,
@@ -233,19 +233,17 @@ export function ComposerEditor(props: ComposerEditorProps) {
                 />
               )}
             </Show>
-            <Show when={props.modelControlsVisible ?? true}>
-              {props.modelControl}
-              <Show when={view.variant} keyed>
-                {(control) => (
-                  <Show when={control.options().length > 1}>
-                    <ComposerEditorConfiguredSelect
-                      title={i18n.t("ui.promptInput.chooseVariant")}
-                      keybind={["Shift", "Mod", "D"]}
-                      control={control}
-                    />
-                  </Show>
-                )}
-              </Show>
+            {props.modelControl}
+            <Show when={(props.variantControlVisible ?? true) && view.variant} keyed>
+              {(control) => (
+                <Show when={control.options().length > 1}>
+                  <ComposerEditorConfiguredSelect
+                    title={i18n.t("ui.promptInput.chooseVariant")}
+                    keybind={["Shift", "Mod", "D"]}
+                    control={control}
+                  />
+                </Show>
+              )}
             </Show>
           </div>
           <ComposerEditorSubmitButton

packages/app/src/composer/submit.test.ts

@@ -1,6 +1,5 @@
 import { describe, expect, test } from "bun:test"
 import type { ModelSelection } from "@/providers/models/selection"
-import type { SessionMessageUser } from "@opencode-ai/client/promise"
 import { Skill } from "@opencode-ai/schema/skill"
 import type { ActiveComposerAdapter, ComposerControls, ComposerSession, NewSessionComposerAdapter } from "./adapter"
 import { createMemoryComposerState } from "./state"
@@ -70,8 +69,6 @@ function submitInput(
 function session(input: {
   calls: string[]
   prompt: (value: Parameters<ComposerSession["data"]["session"]["prompt"]>[0]) => Promise<void>
-  handoff?: ComposerSession["handoff"]
-  statuses?: ("idle" | "running")[]
   current?: ComposerSession["current"]
   admitted?: (messageID: string) => boolean
   shell?: () => Promise<unknown>
@@ -80,7 +77,6 @@ function session(input: {
   return {
     id: "session-1",
     directory: "C:/repo",
-    handoff: input.handoff,
     current: input.current ?? (() => undefined),
     admitted: input.admitted ?? (() => false),
     api: {
@@ -96,7 +92,6 @@ function session(input: {
     data: {
       location: { command: { list: () => [] } },
       session: {
-        setStatus: (_sessionID, status) => input.statuses?.push(status),
         prompt: async (value) => {
           input.calls.push("prompt")
           await input.prompt(value)
@@ -145,12 +140,10 @@ describe("Composer submission", () => {
 
   test("starts and promotes a New Session once before admitting its first prompt", async () => {
     const draft = createMemoryComposerState({ prompt: "first prompt" }).capture()
-    const promoted = createMemoryComposerState({ prompt: "restored draft" }).capture()
+    const promoted = createMemoryComposerState().capture()
     const calls: string[] = []
-    const statuses: ("idle" | "running")[] = []
     const admitted = Promise.withResolvers<Parameters<ComposerSession["data"]["session"]["prompt"]>[0]>()
-    const cleanupReady = Promise.withResolvers<void>()
-    const target = session({ calls, statuses, prompt: async (value) => admitted.resolve(value) })
+    const target = session({ calls, prompt: async (value) => admitted.resolve(value) })
     const adapter: NewSessionComposerAdapter = {
       kind: "new-session",
       state: draft,
@@ -163,70 +156,18 @@ describe("Composer submission", () => {
       async start(_selection, submission) {
         calls.push("start")
         submission.retarget(promoted)
-        return { session: target, cleanupReady: cleanupReady.promise }
-      },
-    }
-
-    const submitted = submitInput(adapter).submit(new Event("submit"))
-    const request = await admitted.promise
-
-    expect(calls).toEqual(["start", "switch-agent", "switch-model", "prompt"])
-    expect(statuses).toEqual(["running"])
-    expect(promoted.current()).toMatchObject([{ type: "text", content: "restored draft" }])
-    cleanupReady.resolve()
-    await submitted
-
-    expect(calls).toEqual(["start", "switch-agent", "switch-model", "prompt", "submitted"])
-    expect(request.delivery).toBe("steer")
-    expect(request.text).toBe("first prompt")
-    expect(draft.current()).toEqual([{ type: "text", content: "", start: 0, end: 0 }])
-    expect(promoted.current()).toEqual([{ type: "text", content: "", start: 0, end: 0 }])
-  })
-
-  test("hands off image-only first prompts before admission", async () => {
-    const draft = createMemoryComposerState().capture()
-    draft.set([
-      { type: "text", content: "", start: 0, end: 0 },
-      {
-        type: "image",
-        id: "attachment",
-        filename: "image.png",
-        mime: "image/png",
-        blob: { id: "attachment", url: "data:image/png;base64,YQ==" },
-      },
-    ])
-    const handedOff = Promise.withResolvers<SessionMessageUser>()
-    const target = session({
-      calls: [],
-      handoff: { set: handedOff.resolve, clear() {} },
-      prompt: async () => undefined,
-    })
-    const adapter: NewSessionComposerAdapter = {
-      kind: "new-session",
-      state: draft,
-      ready: () => true,
-      controls,
-      working: () => false,
-      submitted() {},
-      async start() {
-        return { session: target, cleanupReady: Promise.resolve() }
+        return target
       },
     }
 
     await submitInput(adapter).submit(new Event("submit"))
+    const request = await admitted.promise
 
-    expect(await handedOff.promise).toMatchObject({
-      type: "user",
-      text: "",
-      files: [
-        {
-          data: "",
-          mime: "image/png",
-          source: { type: "uri", uri: "data:image/png;base64,YQ==" },
-          name: "image.png",
-        },
-      ],
-    })
+    expect(calls).toEqual(["start", "submitted", "switch-agent", "switch-model", "prompt"])
+    expect(request.delivery).toBe("steer")
+    expect(request.text).toBe("first prompt")
+    expect(draft.current()).toEqual([{ type: "text", content: "", start: 0, end: 0 }])
+    expect(promoted.current()).toEqual([{ type: "text", content: "", start: 0, end: 0 }])
   })
 
   test("does not restore a prompt already acknowledged by the durable inbox", async () => {
@@ -292,7 +233,7 @@ describe("Composer submission", () => {
       submitted() {},
       async start(_selection, submission) {
         submission.retarget(promoted)
-        return { session: target, cleanupReady: Promise.resolve() }
+        return target
       },
     }
 
@@ -309,12 +250,10 @@ describe("Composer submission", () => {
   test("reuses the message ID when an unacknowledged admission is retried", async () => {
     const state = createMemoryComposerState({ prompt: "retry me" }).capture()
     const attempts: string[] = []
-    const statuses: ("idle" | "running")[] = []
     const first = Promise.withResolvers<void>()
     const second = Promise.withResolvers<void>()
     const target = session({
       calls: [],
-      statuses,
       prompt: async (value) => {
         attempts.push(value.id ?? "")
         throw new Error("network unavailable")
@@ -344,7 +283,6 @@ describe("Composer submission", () => {
 
     expect(attempts).toHaveLength(4)
     expect(new Set(attempts).size).toBe(1)
-    expect(statuses).toEqual(["running", "idle", "running", "idle"])
     expect(state.current()).toMatchObject([{ type: "text", content: "retry me" }])
   })
 

packages/app/src/composer/submit.ts

@@ -1,5 +1,4 @@
 import { SessionMessage } from "@opencode-ai/schema/session-message"
-import type { SessionMessageUser } from "@opencode-ai/client/promise"
 import { Event } from "@opencode-ai/schema/event"
 import type { Accessor } from "solid-js"
 import type { PromptHistoryComment } from "./history/entry"
@@ -66,43 +65,15 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
     const comments = input.comments.capture()
 
     try {
-      const started =
+      const session =
         input.adapter.kind === "active-session"
-          ? { session: input.adapter.session(), cleanupReady: Promise.resolve() }
+          ? input.adapter.session()
           : await input.adapter.start(value.selection, submission)
-      if (!started) return
-      const session = started.session
+      if (!session) return
 
       input.addToHistory(value.prompt, value.mode)
       input.resetHistory()
       const restore = () => restoreSubmission(input, submission, value, comments)
-
-      const command = value.mode === "normal" ? findCommand(session, value.text) : undefined
-      if (value.mode === "normal" && !command) {
-        if (value.images.length > 0) session.handoff?.set(handoffMessage(value))
-        const optimisticBusy = !input.adapter.working()
-        if (optimisticBusy) session.data.session.setStatus(session.id, "running")
-        const sending = sendPrompt(session, value).then(
-          () => ({ ok: true as const }),
-          (error) => ({ ok: false as const, error }),
-        )
-        await started.cleanupReady
-        input.adapter.submitted()
-        submission.context
-          .filter((item) => !!item.comment?.trim())
-          .forEach((item) => submission.target().context.remove(item.key))
-        input.comments.clear()
-        clearSubmission(input, submission)
-        void sending.then((result) => {
-          if (!result.ok)
-            failSubmission(input, session, "prompt", result.error, restore, value.id, () => {
-              if (optimisticBusy) session.data.session.setStatus(session.id, "idle")
-            })
-        })
-        return
-      }
-
-      await started.cleanupReady
       input.adapter.submitted()
 
       if (value.mode === "shell") {
@@ -111,6 +82,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
         return
       }
 
+      const command = findCommand(session, value.text)
       if (command) {
         clearSubmission(input, submission)
         void sendCommand(session, value, command).catch((error) =>
@@ -119,6 +91,14 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
         return
       }
 
+      submission.context
+        .filter((item) => !!item.comment?.trim())
+        .forEach((item) => submission.target().context.remove(item.key))
+      input.comments.clear()
+      clearSubmission(input, submission)
+      void sendPrompt(session, value).catch((error) =>
+        failSubmission(input, session, "prompt", error, restore, value.id),
+      )
     } finally {
       submitting.delete(input.adapter.state)
     }
@@ -130,29 +110,6 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
   }
 }
 
-function handoffMessage(value: ComposerSubmission): SessionMessageUser {
-  return {
-    id: value.id,
-    type: "user",
-    text: value.text,
-    files: value.images.map((image) => ({
-      data: "",
-      mime: image.mime,
-      source: { type: "uri", uri: image.blob.url },
-      name: image.sourcePath ?? image.filename,
-    })),
-    metadata: {
-      displayText: value.text,
-      agent: value.selection.agent,
-      model: {
-        ...value.selection.model,
-        ...(value.selection.variant ? { variant: value.selection.variant } : {}),
-      },
-    },
-    time: { created: Date.now() },
-  }
-}
-
 function readSubmission(
   input: ComposerSubmitInput,
   prompt: Prompt,
@@ -356,11 +313,8 @@ function failSubmission(
   error: unknown,
   restore: () => boolean,
   messageID?: string,
-  rollback?: () => void,
 ) {
   if (messageID && session.admitted(messageID)) return
-  if (messageID) session.handoff?.clear(messageID)
-  rollback?.()
   restore()
   input.notify.failed(kind, error)
 }

packages/app/src/desktop.ts

@@ -1,7 +1,6 @@
 export { AppBaseProviders, AppInterface, preloadRoute } from "./app"
 export { ACCEPTED_FILE_EXTENSIONS } from "./runtime/platform/file-picker"
 export { useCommand } from "./shell/commands/command"
-export { currentRoute, type LayoutRoute, useCurrentRoute } from "./shell/state/layout"
 export { loadLocaleDict, normalizeLocale, type Locale, useLanguage } from "./runtime/i18n/language"
 export { type FatalRendererErrorLog, type Platform, PlatformProvider } from "./runtime/platform/platform"
 export { ServerConnection, useServers } from "./runtime/server/registry"

packages/app/src/entry.tsx

@@ -42,10 +42,6 @@ const clearAuthToken = () => {
 
 const web = createWebPlatform(pkg.version)
 
-if (import.meta.env.PROD && "serviceWorker" in navigator) {
-  window.addEventListener("load", () => void navigator.serviceWorker.register("/sw.js"), { once: true })
-}
-
 if (import.meta.env.VITE_SENTRY_DSN) {
   init({
     dsn: import.meta.env.VITE_SENTRY_DSN,

packages/app/src/home/sessions/command-palette.tsx

@@ -30,7 +30,6 @@ export function HomeCommandPalette(props: {
     opened: server.projects.list,
     stored: () => server.sync.data.project,
     load: (search, signal) => server.sdk.api.session.list({ parentID: null, search, limit: 50 }, { signal }),
-    get: (sessionID, signal) => server.sdk.api.session.get({ sessionID }, { signal }),
     untitled: () => language.t("command.session.new"),
     category: () => language.t("command.category.session"),
   })

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

@@ -137,17 +137,6 @@ export function createHomeSessionsController(home: HomeController) {
       showProjectName: () => !home.project.selected(),
       server: () => home.selection.value().server,
       canCreate: () => !!home.project.newSession(),
-      lookup: async (sessionID: string) => {
-        const ctx = home.server.focusedContext()
-        if (!ctx) return
-        const result = await ctx.sdk.api.session.get({ sessionID })
-        if (result.time.archived) return
-        return buildHomeSessionRecords({
-          sessions: () => [result],
-          projectDirectories,
-          projects: home.project.list,
-        })[0]
-      },
       create: home.project.openNewSession,
       open: (session: SessionInfo, options?: OpenSessionOptions) => {
         const directoryKey = pathKey(session.location.directory)

packages/app/src/home/sessions/search.ts

@@ -8,21 +8,13 @@ import { createMemo, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import type { HomeController } from "../model"
 import { homeSessionSearchKey, type HomeSessionRecord, type HomeSessionsController } from "./controller"
-import { looksLikeSessionID } from "@/session/search"
 
 type HomeSessionSearchSource = Pick<HomeSessionsController, "data" | "session">
 
 export function createHomeSessionSearchController(home: HomeController, sessions: HomeSessionSearchSource) {
   const command = useCommand()
   const language = useLanguage()
-  const [state, setState] = createStore({
-    value: "",
-    focused: false,
-    highlighted: "",
-    exact: undefined as HomeSessionRecord | undefined,
-    lookingUp: false,
-  })
-  let lookup = 0
+  const [state, setState] = createStore({ value: "", focused: false, highlighted: "" })
   let root: HTMLDivElement | undefined
   let input: HTMLInputElement | undefined
   let list: HTMLDivElement | undefined
@@ -30,11 +22,9 @@ export function createHomeSessionSearchController(home: HomeController, sessions
   const results = createMemo(() => {
     const value = query().toLowerCase()
     if (!value) return []
-    const records = sessions.data
+    return sessions.data
       .searchRecords()
       .filter((record) => `${sessionLabel(record.session)} ${record.projectName}`.toLowerCase().includes(value))
-    if (!state.exact || records.some((record) => record.session.id === state.exact?.session.id)) return records
-    return [state.exact, ...records]
   })
   const active = createMemo(() => {
     const records = results()
@@ -60,7 +50,6 @@ export function createHomeSessionSearchController(home: HomeController, sessions
       close()
     }),
   )
-  onCleanup(() => lookup++)
 
   command.register("home.search", () => [
     {
@@ -78,26 +67,7 @@ export function createHomeSessionSearchController(home: HomeController, sessions
   }
 
   function close() {
-    lookup++
-    setState({ value: "", focused: false, exact: undefined, lookingUp: false })
-  }
-
-  function update(value: string) {
-    const current = ++lookup
-    const sessionID = value.trim()
-    setState({ value, highlighted: "", exact: undefined, lookingUp: false })
-    if (!looksLikeSessionID(sessionID)) return
-    setState("lookingUp", true)
-    void sessions.session.lookup(sessionID).then(
-      (record) => {
-        if (current !== lookup) return
-        setState({ exact: record, lookingUp: false })
-      },
-      () => {
-        if (current !== lookup) return
-        setState("lookingUp", false)
-      },
-    )
+    setState({ value: "", focused: false })
   }
 
   function select(record: HomeSessionRecord, options?: { background?: boolean }) {
@@ -111,11 +81,11 @@ export function createHomeSessionSearchController(home: HomeController, sessions
       placeholder,
       open,
       focus,
-      input: update,
+      input: (value: string) => setState({ value, highlighted: "" }),
       close,
     },
     result: {
-      loading: () => sessions.data.loading() || state.lookingUp,
+      loading: sessions.data.loading,
       list: results,
       active,
       noResultsLabel: () => language.t("home.sessions.search.noResults", { query: query() }),

packages/app/src/home/sessions/view.tsx

@@ -509,7 +509,7 @@ function HomeSessionsEmpty(props: { onNewSession?: () => void; language: ReturnT
     <div class="flex min-h-full flex-col items-center gap-4 px-6 pt-[52px] text-center">
       <div
         class={`
-          shrink-0 text-[13px] leading-text-compact tracking-[-0.04px]
+          shrink-0 text-[13px] leading-[13px] tracking-[-0.04px]
           text-v2-text-text-base [font-weight:530]
         `}
       >

packages/app/src/index.css

@@ -17,14 +17,6 @@
   font-style: normal;
 }
 
-@font-face {
-  font-family: "IBM Plex Mono";
-  src: url("@ibm/plex/IBM-Plex-Mono/fonts/complete/woff2/IBMPlexMono-Text.woff2") format("woff2");
-  font-weight: 440;
-  font-style: normal;
-  font-display: swap;
-}
-
 @media (display-mode: standalone) {
   /* WebKit excludes safe-area insets from dvh in installed apps. */
   #root {

packages/app/src/new-session/composer-adapter.ts

@@ -1,6 +1,5 @@
 import { base64Encode } from "@opencode-ai/util/encode"
 import { getDirectory } from "@opencode-ai/util/path"
-import type { SessionMessageUser } from "@opencode-ai/client/promise"
 import { startTransition } from "solid-js"
 import type { NewSessionComposerAdapter } from "@/composer/adapter"
 import { useComposerState } from "@/composer/persistence"
@@ -10,13 +9,11 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { useLocal } from "@/providers/models/selection"
 import { usePermission } from "@/session/requests/permission"
 import { useData, useServer } from "@/runtime/server/current"
-import { type ServerSDK, useServerSDK } from "@/runtime/server/client"
+import { useServerSDK } from "@/runtime/server/client"
 import { useTabs } from "@/shell/tabs/tabs"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { useSessionKey } from "@/session/session-layout"
 import { showToast } from "@/shell/notifications/toast"
-import { SessionRouteKey, SessionStateKey } from "@/runtime/server/scope"
-import { clearSessionMessageHandoff, setSessionMessageHandoff } from "@/session/handoff"
 
 export function createNewSessionComposerAdapter(props: {
   draftID: string
@@ -56,35 +53,26 @@ export function createNewSessionComposerAdapter(props: {
       })
       if (!sessionDirectory) return
 
-      const created = data.session.create({
-        agent: selection.agent,
-        model: {
-          id: selection.model.modelID,
-          providerID: selection.model.providerID,
-          variant: selection.variant,
-        },
-        location: { directory: sessionDirectory },
-      })
-      const creation = created.request.then(
-        () => ({ ok: true as const }),
-        (error) => {
+      const created = await serverSDK.api.session
+        .create({
+          agent: selection.agent,
+          model: {
+            id: selection.model.modelID,
+            providerID: selection.model.providerID,
+            variant: selection.variant,
+          },
+          location: { directory: sessionDirectory },
+        })
+        .catch((error) => {
           showToast({
             title: language.t("prompt.toast.sessionCreateFailed.title"),
             description: errorMessage(language, error),
           })
-          return { ok: false as const, error }
-        },
-      )
-      const afterCreation = async <T,>(run: () => Promise<T>) => {
-        const result = await creation
-        if (!result.ok) throw result.error
-        return run()
-      }
-      const sessionKey = SessionStateKey.from(
-        serverSDK.scope,
-        SessionRouteKey.fromRoute(base64Encode(sessionDirectory), created.id),
-      )
-      const cleanupReady = startTransition(() => {
+        })
+      if (!created) return
+
+      data.session.remember(created)
+      await startTransition(() => {
         tabs.updateDraft(props.draftID, { worktree: undefined })
         if (permission.isAutoAcceptingDirectory(projectDirectory)) {
           permission.enableAutoAccept(created.id, sessionDirectory)
@@ -104,32 +92,13 @@ export function createNewSessionComposerAdapter(props: {
       })
 
       return {
-        cleanupReady,
-        session: {
-          id: created.id,
-          directory: sessionDirectory,
-          handoff: createMessageHandoff(sessionKey, created.id, serverSDK.event),
-          api: {
-            command: (input) => afterCreation(() => serverSDK.api.session.command(input)),
-            shell: (input) => afterCreation(() => serverSDK.api.session.shell(input)),
-            switchAgent: (input) => afterCreation(() => serverSDK.api.session.switchAgent(input)),
-            switchModel: (input) => afterCreation(() => serverSDK.api.session.switchModel(input)),
-          },
-          data: {
-            location: data.location,
-            session: {
-              setStatus: data.session.setStatus,
-              prompt: (input) =>
-                data.session.prompt({
-                  ...input,
-                  gate: Promise.all([input.gate, afterCreation(async () => undefined)]),
-                }),
-            },
-          },
-          current: () => data.session.get(created.id),
-          admitted: (messageID) =>
-            data.session.input.has(created.id, messageID) || !!data.session.message.get(created.id, messageID),
-        },
+        id: created.id,
+        directory: sessionDirectory,
+        api: serverSDK.api.session,
+        data,
+        current: () => data.session.get(created.id) ?? created,
+        admitted: (messageID) =>
+          data.session.input.has(created.id, messageID) || !!data.session.message.get(created.id, messageID),
       }
     },
   }
@@ -142,27 +111,6 @@ export function createNewSessionComposerAdapter(props: {
   }
 }
 
-function createMessageHandoff(key: string, sessionID: string, event: ServerSDK["event"]) {
-  let unsubscribe: VoidFunction | undefined
-  return {
-    set(message: SessionMessageUser) {
-      unsubscribe?.()
-      setSessionMessageHandoff(key, message)
-      unsubscribe = event.on("session.inbox.enqueued", (item) => {
-        if (item.data.sessionID !== sessionID || item.data.inboxID !== message.id) return
-        unsubscribe?.()
-        unsubscribe = undefined
-        clearSessionMessageHandoff(key, message.id)
-      })
-    },
-    clear(messageID: string) {
-      unsubscribe?.()
-      unsubscribe = undefined
-      clearSessionMessageHandoff(key, messageID)
-    },
-  }
-}
-
 async function resolveSessionDirectory(input: {
   projectDirectory: string
   worktree: string

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

@@ -139,7 +139,7 @@ function ProviderTip() {
         >
           <button
             type="button"
-            class="flex h-6 min-w-0 items-center rounded-[4px] pl-1.5 text-[13px] leading-text-compact tracking-[-0.04px] text-v2-text-text-faint transition-[background-color,color] duration-150 ease-in-out hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-text-text-muted focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-text-text-muted focus-visible:outline-none"
+            class="flex h-6 min-w-0 items-center rounded-[4px] pl-1.5 text-[13px] leading-none tracking-[-0.04px] text-v2-text-text-faint transition-[background-color,color] duration-150 ease-in-out hover:bg-v2-overlay-simple-overlay-hover hover:text-v2-text-text-muted focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:text-v2-text-text-muted focus-visible:outline-none"
             onClick={openProviders}
           >
             <span class="truncate">{language.t("home.providerTip")}</span>

packages/app/src/providers/connect/dialog.tsx

@@ -190,7 +190,7 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
             {(group) => (
               <Show when={group.items().length > 0}>
                 <section class="flex flex-col">
-                  <div class="px-3 pb-2 text-[13px] font-[440] leading-text-compact tracking-[-0.04px] text-v2-text-text-muted">
+                  <div class="px-3 pb-2 text-[13px] font-[440] leading-none tracking-[-0.04px] text-v2-text-text-muted">
                     {group.title}
                   </div>
                   <For each={group.items()}>
@@ -198,7 +198,7 @@ function ProviderPicker(props: { directory?: string; onSelect: (provider: string
                       <button
                         type="button"
                         data-provider-id={provider.id}
-                        class="flex min-h-9 w-full items-center gap-2 rounded-md px-3 py-2.5 text-left text-[13px] leading-text-compact tracking-[-0.04px] hover:bg-v2-overlay-simple-overlay-hover focus:bg-v2-overlay-simple-overlay-hover focus:outline-none"
+                        class="flex min-h-9 w-full items-center gap-2 rounded-md px-3 py-2.5 text-left text-[13px] leading-none tracking-[-0.04px] hover:bg-v2-overlay-simple-overlay-hover focus:bg-v2-overlay-simple-overlay-hover focus:outline-none"
                         classList={{ "bg-v2-overlay-simple-overlay-hover": store.active === provider.id }}
                         onMouseEnter={() => setStore("active", provider.id)}
                         disabled={store.connecting !== undefined}

packages/app/src/providers/models/manage.tsx

@@ -7,7 +7,6 @@ import { Switch } from "@opencode-ai/ui/switch"
 import { TextInput } from "@opencode-ai/ui/text-input"
 import { useFilteredList } from "@opencode-ai/ui/hooks"
 import { For, Show, type Component } from "solid-js"
-import { createStore } from "solid-js/store"
 import { useLocal } from "@/providers/models/selection"
 import { popularProviders } from "@/providers/catalog/providers"
 import { useLanguage } from "@/runtime/i18n/language"
@@ -24,7 +23,6 @@ export const DialogManageModels: Component = () => {
   const local = useLocal()
   const language = useLanguage()
   const dialog = useDialog()
-  const [store, setStore] = createStore({ collapsed: {} as Record<string, boolean> })
   const directory = () => decode64(local.slug())
 
   const handleConnectProvider = () => {
@@ -122,38 +120,16 @@ export const DialogManageModels: Component = () => {
                 }
               >
                 <For each={list.grouped.latest}>
-                  {(group) => {
-                    const searching = () => list.filter().length > 0
-                    const expanded = () => searching() || !store.collapsed[group.category]
-
-                    return (
-                      <div
-                        class="settings-section"
-                        data-component="settings-models-provider"
-                        data-expanded={expanded() ? "" : undefined}
-                      >
-                        <div class="settings-models-group-header justify-between">
-                          <button
-                            type="button"
-                            class="settings-models-group-trigger"
-                            aria-expanded={expanded()}
-                            disabled={searching()}
-                            onClick={() => setStore("collapsed", group.category, expanded())}
-                          >
-                            <span class="settings-models-group-chevron">
-                              <Icon
-                                name="chevron-down"
-                                size="small"
-                                classList={{ "-rotate-90 rtl:rotate-90": !expanded() }}
-                              />
-                            </span>
-                            <span class="settings-models-group-label">
-                              <ProviderIcon id={group.category} width={16} height={16} class="shrink-0" />
-                              <span class="settings-section-title">{group.items[0].provider.name}</span>
-                            </span>
-                          </button>
+                  {(group) => (
+                    <div class="settings-section" data-component="settings-models-provider">
+                      <div class="settings-models-group-header justify-between">
+                        <div class="flex min-w-0 items-center gap-2">
+                          <ProviderIcon id={group.category} width={16} height={16} class="ml-4 shrink-0" />
+                          <h3 class="settings-section-title">{group.items[0].provider.name}</h3>
+                        </div>
+                        <div>
                           <Switch
-                            class="me-6"
+                            class="mr-6"
                             checked={providerVisible(group.category)}
                             onChange={(checked) => setProviderVisibility(group.category, checked)}
                             hideLabel
@@ -161,28 +137,26 @@ export const DialogManageModels: Component = () => {
                             {group.items[0].provider.name}
                           </Switch>
                         </div>
-                        <Show when={expanded()}>
-                          <SettingsList>
-                            <For each={group.items}>
-                              {(item) => (
-                                <SettingsRow title={item.name} description="">
-                                  <div>
-                                    <Switch
-                                      checked={local.model.visible({ modelID: item.id, providerID: item.provider.id })}
-                                      onChange={(checked) => setModelVisibility(item, checked)}
-                                      hideLabel
-                                    >
-                                      {item.name}
-                                    </Switch>
-                                  </div>
-                                </SettingsRow>
-                              )}
-                            </For>
-                          </SettingsList>
-                        </Show>
                       </div>
-                    )
-                  }}
+                      <SettingsList>
+                        <For each={group.items}>
+                          {(item) => (
+                            <SettingsRow title={item.name} description="">
+                              <div>
+                                <Switch
+                                  checked={local.model.visible({ modelID: item.id, providerID: item.provider.id })}
+                                  onChange={(checked) => setModelVisibility(item, checked)}
+                                  hideLabel
+                                >
+                                  {item.name}
+                                </Switch>
+                              </div>
+                            </SettingsRow>
+                          )}
+                        </For>
+                      </SettingsList>
+                    </div>
+                  )}
                 </For>
               </Show>
             </Show>

packages/app/src/providers/models/models.tsx

@@ -1,24 +1,44 @@
-import { type Accessor, createMemo } from "solid-js"
+import { type Accessor, createMemo, createResource } from "solid-js"
+import { createStore } from "solid-js/store"
 import { DateTime } from "luxon"
 import { filter, firstBy, flat, groupBy, mapValues, pipe, uniqueBy, values } from "remeda"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useProviders } from "@/providers/catalog/providers"
-import { useGlobal } from "@/runtime/server/runtime"
+import { Persist, persisted } from "@/runtime/persistence/storage"
 
 export type ModelKey = { providerID: string; modelID: string }
 
 type Visibility = "show" | "hide"
+type User = ModelKey & { visibility: Visibility; favorite?: boolean }
+type Store = {
+  user: User[]
+  recent: ModelKey[]
+  variant?: Record<string, string | undefined>
+}
+
 const RECENT_LIMIT = 5
 
 function modelKey(model: ModelKey) {
   return `${model.providerID}:${model.modelID}`
 }
 
+const createModelsPersistedState = () => {
+  const [store, setStore, _, ready] = persisted(
+    Persist.global("model"),
+    createStore<Store>({
+      user: [],
+      recent: [],
+      variant: {},
+    }),
+  )
+
+  return [store, setStore, ready] as const
+}
+
 const createModelsController = (directory: Accessor<string | undefined>) => {
   const providers = useProviders(() => directory())
-  const models = useGlobal().models
-  const store = models.store
-  const setStore = models.set
+
+  const [store, setStore, ready] = createModelsPersistedState()
 
   const available = createMemo(() =>
     providers.connected().flatMap((p) =>
@@ -128,14 +148,23 @@ const createModelsController = (directory: Accessor<string | undefined>) => {
     setStore("variant", key, value)
   }
 
+  const [recentModels] = createResource(
+    async () => {
+      const recent = store.recent
+      await ready.promise
+      return recent
+    },
+    (p) => p,
+    { initialValue: [] },
+  )
   return {
-    ready: models.ready,
+    ready,
     list,
     find,
     visible,
     setVisibility,
     recent: {
-      list: models.recent,
+      list: () => recentModels()!,
       push,
     },
     variant: {

packages/app/src/providers/models/select-dialog.tsx

@@ -10,10 +10,9 @@ import { Dialog, DialogBody, DialogHeader, DialogTitle } from "@opencode-ai/ui/d
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
+import { List } from "@opencode-ai/ui/list"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Menu } from "@opencode-ai/ui/menu"
-import { TextInput } from "@opencode-ai/ui/text-input"
-import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { ModelTooltip } from "./tooltip"
 import { useLanguage } from "@/runtime/i18n/language"
 import { decode64 } from "@/runtime/persistence/base64"
@@ -21,8 +20,6 @@ import { handleDocumentSearchKeydown } from "@/shell/commands/search-keydown"
 import { createMenuDismissController } from "@/shell/commands/menu-dismiss"
 import { createEventListener } from "@solid-primitives/event-listener"
 import { matchesModelSearch } from "./search"
-import { SettingsList } from "@/settings/list"
-import "@/settings/settings.css"
 
 const isFree = (provider: string, cost: { input: number } | undefined) =>
   provider === "opencode" && (!cost || cost.input === 0)
@@ -47,182 +44,70 @@ const sortModelGroups = (a: { category: string; items: ModelItem[] }, b: { categ
 
 const ModelList: Component<{
   provider?: string
+  class?: string
   onSelect: () => void
+  action?: JSX.Element
   model?: ModelState
 }> = (props) => {
+  const model = props.model ?? useLocal().model
   const language = useLanguage()
-  const controller = createModelSelectorController({
-    model: props.model,
-    provider: () => props.provider,
-    onSelect: props.onSelect,
-  })
-  const [store, setStore] = createStore({
-    search: "",
-    active: "",
-    collapsed: {} as Record<string, boolean>,
-  })
-  const models = createMemo(() => controller.models(store.search))
-  const groups = createMemo(() => controller.groups(models()))
-  const expanded = (provider: string) => store.search.length > 0 || !store.collapsed[provider]
-  const visibleModels = () => models().filter((item) => expanded(item.provider.id))
-  let scrollRef: HTMLDivElement | undefined
 
-  const setSearch = (value: string) => {
-    const first = controller.models(value).find((item) => value.length > 0 || !store.collapsed[item.provider.id])
-    setStore({ search: value, active: first ? modelKey(first) : "" })
-  }
-  const moveActive = (delta: number) => {
-    const keys = visibleModels().map(modelKey)
-    if (keys.length === 0) return
-    const index = keys.indexOf(store.active)
-    const start = index === -1 ? (delta > 0 ? -1 : 0) : index
-    setStore("active", keys[(start + delta + keys.length) % keys.length])
-    queueMicrotask(() => {
-      scrollRef
-        ?.querySelector<HTMLElement>(`[data-option-key="${CSS.escape(store.active)}"]`)
-        ?.scrollIntoView({ block: "nearest" })
-    })
-  }
-  const selectActive = () => {
-    const item = visibleModels().find((item) => modelKey(item) === store.active)
-    if (item) controller.select(item)
-  }
+  const models = createMemo(() =>
+    model
+      .list()
+      .filter((m) => model.visible({ modelID: m.id, providerID: m.provider.id }))
+      .filter((m) => (props.provider ? m.provider.id === props.provider : true)),
+  )
 
   return (
-    <div class="flex min-h-0 flex-1 flex-col">
-      <div class="shrink-0 px-4 pt-px pb-3">
-        <div class="relative">
-          <TextInput
-            type="search"
-            appearance="base"
-            class="!w-full self-stretch"
-            placeholder={language.t("dialog.model.search.placeholder")}
-            value={store.search}
-            autofocus
-            spellcheck={false}
-            autocorrect="off"
-            autocomplete="off"
-            autocapitalize="off"
-            onInput={(event) => setSearch(event.currentTarget.value)}
-            onKeyDown={(event) => {
-              if (event.altKey || event.metaKey) return
-              if (event.key === "ArrowDown") {
-                event.preventDefault()
-                moveActive(1)
-                return
-              }
-              if (event.key === "ArrowUp") {
-                event.preventDefault()
-                moveActive(-1)
-                return
-              }
-              if (event.key === "Enter" && !event.isComposing) {
-                event.preventDefault()
-                selectActive()
-              }
-            }}
-            aria-label={language.t("dialog.model.search.placeholder")}
-          />
-          <Show when={store.search}>
-            <IconButton
-              type="button"
-              variant="ghost-muted"
-              size="small"
-              class="settings-tab-search-clear"
-              icon={<Icon name="close" size="large" class="text-v2-icon-icon-muted" />}
-              onClick={() => setSearch("")}
-              aria-label={language.t("common.clear")}
-            />
+    <List
+      class={`flex-1 px-3 min-h-0 [&_[data-slot=list-scroll]]:flex-1 [&_[data-slot=list-scroll]]:min-h-0 ${props.class ?? ""}`}
+      search={{ placeholder: language.t("dialog.model.search.placeholder"), autofocus: true, action: props.action }}
+      emptyMessage={language.t("dialog.model.empty")}
+      key={(x) => `${x.provider.id}:${x.id}`}
+      items={models}
+      current={model.current()}
+      filterKeys={["provider.name", "name", "id"]}
+      sortBy={(a, b) => a.name.localeCompare(b.name)}
+      groupBy={(x) => x.provider.name}
+      sortGroupsBy={(a, b) => {
+        const aProvider = a.items[0].provider.id
+        const bProvider = b.items[0].provider.id
+        if (popularProviders.includes(aProvider) && !popularProviders.includes(bProvider)) return -1
+        if (!popularProviders.includes(aProvider) && popularProviders.includes(bProvider)) return 1
+        return popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
+      }}
+      itemWrapper={(item, node) => (
+        <Tooltip
+          appearance="standard"
+          class="w-full"
+          placement="right-start"
+          gutter={12}
+          openDelay={0}
+          value={<ModelTooltip model={item} latest={item.latest} free={isFree(item.provider.id, item.cost)} />}
+        >
+          {node}
+        </Tooltip>
+      )}
+      onSelect={(x) => {
+        model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
+          recent: true,
+        })
+        props.onSelect()
+      }}
+    >
+      {(i) => (
+        <div class="w-full flex items-center gap-x-2 text-13-regular">
+          <span class="truncate">{i.name}</span>
+          <Show when={isFree(i.provider.id, i.cost)}>
+            <Badge appearance="standard">{language.t("model.tag.free")}</Badge>
+          </Show>
+          <Show when={i.latest}>
+            <Badge appearance="standard">{language.t("model.tag.latest")}</Badge>
           </Show>
         </div>
-      </div>
-      <div class="relative min-h-0 flex-1">
-        <div ref={(element) => (scrollRef = element)} class="settings-panel settings-models h-full px-4 pt-4 pb-4">
-          <Show
-            when={models().length > 0}
-            fallback={<div class="settings-models-status">{language.t("dialog.model.empty")}</div>}
-          >
-            <For each={groups()}>
-              {(group) => {
-                const searching = () => store.search.length > 0
-                const open = () => expanded(group.category)
-
-                return (
-                  <section class="settings-section" data-expanded={open() ? "" : undefined}>
-                    <h3 class="settings-models-group-header">
-                      <button
-                        type="button"
-                        class="settings-models-group-trigger"
-                        aria-expanded={open()}
-                        disabled={searching()}
-                        onClick={() => setStore("collapsed", group.category, open())}
-                      >
-                        <span class="settings-models-group-chevron">
-                          <Icon name="chevron-down" size="small" classList={{ "-rotate-90 rtl:rotate-90": !open() }} />
-                        </span>
-                        <span class="settings-models-group-label">
-                          <ProviderIcon id={group.category} width={16} height={16} class="shrink-0" />
-                          <span class="settings-section-title">{group.items[0].provider.name}</span>
-                        </span>
-                      </button>
-                    </h3>
-                    <Show when={open()}>
-                      <SettingsList>
-                        <For each={group.items}>
-                          {(item) => (
-                            <button
-                              type="button"
-                              data-component="settings-row"
-                              data-option-key={modelKey(item)}
-                              class="-mx-4 w-[calc(100%+32px)] px-4 text-start first:rounded-t-lg last:rounded-b-lg hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:outline-none"
-                              classList={{ "bg-v2-overlay-simple-overlay-hover": store.active === modelKey(item) }}
-                              onMouseEnter={() => setStore("active", modelKey(item))}
-                              onMouseLeave={() => setStore("active", "")}
-                              onClick={() => controller.select(item)}
-                            >
-                              <div data-slot="settings-row-copy">
-                                <div data-slot="settings-row-title" class="flex items-center gap-2">
-                                  <Tooltip
-                                    placement="right-start"
-                                    gutter={12}
-                                    openDelay={0}
-                                    value={
-                                      <ModelTooltip
-                                        model={item}
-                                        latest={item.latest}
-                                        free={isFree(item.provider.id, item.cost)}
-                                        v2
-                                      />
-                                    }
-                                  >
-                                    <span class="min-w-0 truncate">{item.name}</span>
-                                  </Tooltip>
-                                  <Show when={isFree(item.provider.id, item.cost)}>
-                                    <Badge class="shrink-0">{language.t("model.tag.free")}</Badge>
-                                  </Show>
-                                  <Show when={item.latest}>
-                                    <Badge class="shrink-0">{language.t("model.tag.latest")}</Badge>
-                                  </Show>
-                                </div>
-                              </div>
-                              <div data-slot="settings-row-control" class="size-4">
-                                <Show when={controller.current() === modelKey(item)}>
-                                  <Icon name="check" size="small" class="shrink-0 text-v2-icon-icon-base" />
-                                </Show>
-                              </div>
-                            </button>
-                          )}
-                        </For>
-                      </SettingsList>
-                    </Show>
-                  </section>
-                )
-              }}
-            </For>
-          </Show>
-        </div>
-      </div>
-    </div>
+      )}
+    </List>
   )
 }
 
@@ -546,25 +431,18 @@ export const DialogSelectModel: Component<{ provider?: string; model?: ModelStat
   }
 
   return (
-    <Dialog size="large" variant="settings">
-      <DialogHeader hideClose closeLabel={language.t("common.close")}>
+    <Dialog>
+      <DialogHeader hideClose>
         <DialogTitle>{language.t("dialog.model.select.title")}</DialogTitle>
-        <Button icon="plus" onClick={provider}>
+        <Button class="h-7 -my-1 text-14-medium" icon="plus-small" tabIndex={-1} onClick={provider}>
           {language.t("command.provider.connect")}
         </Button>
       </DialogHeader>
-      <DialogBody class="flex min-h-0 flex-1 flex-col">
+      <DialogBody>
         <ModelList provider={props.provider} model={props.model} onSelect={() => dialog.close()} />
-        <div class="shrink-0 border-t border-v2-border-border-muted px-4 py-3">
-          <button
-            type="button"
-            class="flex h-9 w-full items-center gap-2 rounded-md px-3 text-left text-[13px] font-[530] leading-text-compact tracking-[-0.04px] text-v2-text-text-base hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:outline-none"
-            onClick={manage}
-          >
-            <Icon name="outline-sliders" size="small" />
-            <span class="min-w-0 flex-1 truncate">{language.t("dialog.model.manage")}</span>
-          </button>
-        </div>
+        <Button variant="ghost" class="ml-3 mt-5 mb-6 text-text-base self-start" onClick={manage}>
+          {language.t("dialog.model.manage")}
+        </Button>
       </DialogBody>
     </Dialog>
   )

packages/app/src/runtime/i18n/en.ts

@@ -458,8 +458,7 @@ export const dict = {
   "dialog.project.edit.color": "Color",
   "dialog.project.edit.color.select": "Select {{color}} color",
   "dialog.project.edit.worktree.startup": "Workspace startup script",
-  "dialog.project.edit.worktree.startup.description":
-    "Runs after creating a new workspace (worktree). Use $OPENCODE_WORKTREE_BASE for the base worktree and $OPENCODE_WORKTREE_PATH for the new worktree.",
+  "dialog.project.edit.worktree.startup.description": "Runs after creating a new workspace (worktree).",
   "dialog.project.edit.worktree.startup.placeholder": "e.g. bun install",
 
   "dialog.releaseNotes.action.getStarted": "Get started",
@@ -571,13 +570,10 @@ export const dict = {
   "toast.update.action.notYet": "Not yet",
 
   "error.page.title": "Something went wrong",
-  "error.page.title.status": "Server request failed",
   "error.page.description": "An error occurred while loading the application.",
-  "error.page.description.status": "The server returned an HTTP {{status}} response.",
   "error.page.description.localServerStartup": "An error occurred while starting the local server.",
   "error.page.details.label": "Error Details",
   "error.page.action.restart": "Restart",
-  "error.page.action.reload": "Reload",
   "error.page.action.report": "Report Error",
   "error.page.action.reported": "Error Reported",
   "error.page.action.exportLogs": "Export Logs",
@@ -952,8 +948,6 @@ export const dict = {
   "settings.general.row.showTerminal.description": "Show the terminal button in the desktop title bar",
   "settings.general.row.showStatus.title": "Server status",
   "settings.general.row.showStatus.description": "Show the server status button in the title bar",
-  "settings.general.row.showProjectIcon.title": "Project icon",
-  "settings.general.row.showProjectIcon.description": "Show the project icon in the session header",
   "settings.general.row.mobileTitlebarBottom.title": "Bottom navigation",
   "settings.general.row.mobileTitlebarBottom.description":
     "Place the title bar and session tabs at the bottom of the screen on mobile",

packages/app/src/runtime/server/runtime.tsx

@@ -1,5 +1,5 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import { Accessor, createEffect, createMemo, createResource, createRoot, getOwner } from "solid-js"
+import { Accessor, createEffect, createMemo, createRoot, getOwner } from "solid-js"
 import { createStore } from "solid-js/store"
 import { createServerProjects, RECENTLY_CLOSED_DISPLAY_LIMIT, ServerConnection, useServers } from "./registry"
 import { pathKey } from "@/workspaces/path-key"
@@ -10,7 +10,6 @@ import { createData } from "@opencode-ai/client/solid"
 import type { ServerScope } from "@/runtime/server/scope"
 import { createServerPermissionState } from "@/session/requests/server-permission"
 import { createServerNotificationState } from "@/shell/notifications/notification"
-import { Persist, persisted } from "@/runtime/persistence/storage"
 
 export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext({
   name: "Global",
@@ -25,7 +24,6 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext(
         serverKey: undefined as ServerConnection.Key | undefined,
       },
     })
-    const models = createGlobalModels()
 
     const settingsServer = createMemo(() => {
       const list = server.list
@@ -88,7 +86,6 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext(
           },
         },
       },
-      models,
       ensureServerCtx(conn: ServerConnection.Any) {
         return ensureServerCtx(conn)
       },
@@ -96,37 +93,6 @@ export const { use: useGlobal, provider: GlobalProvider } = createSimpleContext(
   },
 })
 
-function createGlobalModels() {
-  const [store, setStore, _, ready] = persisted(
-    Persist.global("model"),
-    createStore<{
-      user: Array<{ providerID: string; modelID: string; visibility: "show" | "hide"; favorite?: boolean }>
-      recent: Array<{ providerID: string; modelID: string }>
-      variant?: Record<string, string | undefined>
-    }>({
-      user: [],
-      recent: [],
-      variant: {},
-    }),
-  )
-  const [recent] = createResource(
-    async () => {
-      const value = store.recent
-      await ready.promise
-      return value
-    },
-    (value) => value,
-    { initialValue: [] },
-  )
-
-  return {
-    store,
-    set: setStore,
-    ready,
-    recent: () => recent()!,
-  }
-}
-
 function createServerController(
   conn: ServerConnection.Any,
   scope: ServerScope,

packages/app/src/servers/wsl/dialog.css

@@ -386,7 +386,7 @@
   padding: 48px 24px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
   text-align: center;
 }

packages/app/src/session/composer/adapter.ts

@@ -16,7 +16,6 @@ export function createActiveComposerAdapter(input: {
   if (!id) throw new Error("Active Composer requires a Session ID")
 
   const prompt = useComposerState()
-  prompt.current()
   const state = prompt.capture()
   const data = useData()
   const server = useServerSDK()

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

@@ -101,10 +101,6 @@ export function createActiveSessionRegion(input: {
   const focus = () => {
     if (!input.session.data.isChild()) promptRef?.focus()
   }
-  const openParent = () => {
-    const id = input.session.data.parentID()
-    if (id) navigate(sessionHref(requireServerKey(input.session.identity.params.serverKey), id))
-  }
   const editable = (target: EventTarget | null | undefined) => {
     if (!(target instanceof HTMLElement)) return false
     return /^(INPUT|TEXTAREA|SELECT|BUTTON)$/.test(target.tagName) || target.isContentEditable
@@ -117,7 +113,6 @@ export function createActiveSessionRegion(input: {
     return current instanceof HTMLElement ? current : undefined
   }
   const handleKeyDown = (event: KeyboardEvent) => {
-    if (event.defaultPrevented) return
     const path = event.composedPath()
     const target = path.find((item): item is HTMLElement => item instanceof HTMLElement)
     const active = activeElement()
@@ -129,11 +124,6 @@ export function createActiveSessionRegion(input: {
     ) {
       return
     }
-    if (event.key === "Escape" && input.session.data.isChild()) {
-      event.preventDefault()
-      openParent()
-      return
-    }
     if (active === promptRef) {
       if (event.key === "Escape") promptRef?.blur()
       return
@@ -182,7 +172,10 @@ export function createActiveSessionRegion(input: {
     },
     region: {
       centered: input.screen.centered,
-      openParent,
+      openParent: () => {
+        const id = input.session.data.parentID()
+        if (id) navigate(sessionHref(requireServerKey(input.session.identity.params.serverKey), id))
+      },
       prompt,
       setDockRef: input.timeline.view.setDockRef,
       setPromptRef: (element: HTMLDivElement) => {
@@ -211,7 +204,9 @@ export function ActiveSessionComposerRegion(props: {
 }) {
   const region = createSessionComposerRegionController({
     state: props.model.region.state,
-    parentID: props.session.data.parentID,
+    sessionKey: props.session.identity.sessionKey,
+    sessionID: () => props.session.identity.params.id,
+    prompt: props.model.region.prompt,
     centered: props.model.region.centered,
     onResponseSubmit: props.onResponseSubmit,
     openParent: props.model.region.openParent,

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

@@ -1,15 +1,47 @@
-import type { Accessor } from "solid-js"
+import { type Accessor, createEffect, createMemo, createResource } from "solid-js"
+import type { useComposerState } from "@/composer/persistence"
+import { useData } from "@/runtime/server/current"
+import { getSessionHandoff, setSessionHandoff } from "@/session/handoff"
 import type { SessionRequestModel } from "../requests/model"
 
 export function createSessionComposerRegionController(input: {
   state: SessionRequestModel
-  parentID: Accessor<string | undefined>
+  sessionKey: Accessor<string>
+  sessionID: Accessor<string | undefined>
+  prompt: ReturnType<typeof useComposerState>
   centered: Accessor<boolean>
   onResponseSubmit: () => void
   openParent: () => void
   setPromptRef: (el: HTMLDivElement) => void
   setDockRef: (el: HTMLDivElement) => void
 }) {
+  const data = useData()
+  createEffect(() => {
+    if (!input.prompt.ready()) return
+    setSessionHandoff(input.sessionKey(), {
+      prompt: input.prompt
+        .current()
+        .map((part) => {
+          if (part.type === "file") return `[file:${part.path}]`
+          if (part.type === "agent") return `@${part.name}`
+          if (part.type === "image") return `[image:${part.filename}]`
+          return part.content
+        })
+        .join("")
+        .trim(),
+    })
+  })
+
+  const parentID = createMemo(() => {
+    const id = input.sessionID()
+    return id ? data.session.get(id)?.parentID : undefined
+  })
+  const ready = Promise.resolve()
+  const [promptReady] = createResource(
+    () => input.prompt.ready.promise ?? ready,
+    (promise) => promise.then(() => true),
+  )
+
   return {
     state: input.state,
     centered: input.centered,
@@ -17,9 +49,11 @@ export function createSessionComposerRegionController(input: {
     openParent: input.openParent,
     setPromptRef: input.setPromptRef,
     setDockRef: input.setDockRef,
-    parentID: input.parentID,
-    child: () => !!input.parentID(),
-    showComposer: () => !input.state.blocked() || !!input.parentID(),
+    parentID,
+    child: () => !!parentID(),
+    showComposer: () => !input.state.blocked() || !!parentID(),
+    handoffPrompt: () => getSessionHandoff(input.sessionKey())?.prompt,
+    promptReady: () => input.prompt.ready() || promptReady(),
   }
 }
 

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

@@ -19,6 +19,8 @@ export type SessionComposerRegionViewController = Pick<
   | "parentID"
   | "child"
   | "showComposer"
+  | "handoffPrompt"
+  | "promptReady"
 > & { state: SessionComposerRegionState }
 
 export function SessionComposerRegion(props: {
@@ -63,32 +65,43 @@ export function SessionComposerRegion(props: {
         </Show>
 
         <Show when={controller.showComposer()}>
-          <div
-            classList={{
-              "relative z-[70]": true,
-            }}
+          <Show
+            when={controller.promptReady()}
+            fallback={
+              <>
+                <div class="w-full min-h-32 md:min-h-40 rounded-md border border-border-weak-base bg-background-base/50 px-4 py-3 text-text-weak whitespace-pre-wrap pointer-events-none">
+                  {controller.handoffPrompt() || language.t("prompt.loading")}
+                </div>
+              </>
+            }
           >
-            <Show
-              when={controller.child()}
-              fallback={<Show when={!controller.state.blocked()}>{props.composer}</Show>}
+            <div
+              classList={{
+                "relative z-[70]": true,
+              }}
             >
-              <div
-                ref={controller.setPromptRef}
-                class="w-full rounded-[12px] border border-border-weak-base bg-background-base p-3 text-16-regular text-text-weak"
+              <Show
+                when={controller.child()}
+                fallback={<Show when={!controller.state.blocked()}>{props.composer}</Show>}
               >
-                <span>{language.t("session.child.promptDisabled")} </span>
-                <Show when={controller.parentID()}>
-                  <button
-                    type="button"
-                    class="text-text-base transition-colors hover:text-text-strong"
-                    onClick={controller.openParent}
-                  >
-                    {language.t("session.child.backToParent")}
-                  </button>
-                </Show>
-              </div>
-            </Show>
-          </div>
+                <div
+                  ref={controller.setPromptRef}
+                  class="w-full rounded-[12px] border border-border-weak-base bg-background-base p-3 text-16-regular text-text-weak"
+                >
+                  <span>{language.t("session.child.promptDisabled")} </span>
+                  <Show when={controller.parentID()}>
+                    <button
+                      type="button"
+                      class="text-text-base transition-colors hover:text-text-strong"
+                      onClick={controller.openParent}
+                    >
+                      {language.t("session.child.backToParent")}
+                    </button>
+                  </Show>
+                </div>
+              </Show>
+            </div>
+          </Show>
         </Show>
       </div>
     </div>

packages/app/src/session/handoff.test.ts

@@ -1,18 +0,0 @@
-import { expect, test } from "bun:test"
-import type { SessionMessageUser } from "@opencode-ai/client/promise"
-import { clearSessionMessageHandoff, getSessionMessageHandoff, setSessionMessageHandoff } from "./handoff"
-
-test("stores and clears a message handoff", () => {
-  const message = {
-    id: "msg_handoff",
-    type: "user",
-    text: "",
-    files: [{ data: "", mime: "image/png", source: { type: "uri", uri: "blob:image" } }],
-    time: { created: 1 },
-  } satisfies SessionMessageUser
-
-  setSessionMessageHandoff("session-key", message)
-  expect(getSessionMessageHandoff("session-key")).toEqual(message)
-  clearSessionMessageHandoff("session-key", message.id)
-  expect(getSessionMessageHandoff("session-key")).toBeUndefined()
-})

packages/app/src/session/handoff.ts

@@ -1,8 +1,7 @@
 import type { SelectedLineRange } from "@/workspaces/files/model"
-import type { SessionMessageUser } from "@opencode-ai/client/promise"
-import { createStore } from "solid-js/store"
 
 type HandoffSession = {
+  prompt: string
   files: Record<string, SelectedLineRange | null>
 }
 
@@ -12,8 +11,6 @@ const store = {
   session: new Map<string, HandoffSession>(),
   terminal: new Map<string, string[]>(),
 }
-const [messages, setMessages] = createStore<Record<string, SessionMessageUser | undefined>>({})
-const messageOrder = new Map<string, true>()
 
 const touch = <K, V>(map: Map<K, V>, key: K, value: V) => {
   map.delete(key)
@@ -26,32 +23,12 @@ const touch = <K, V>(map: Map<K, V>, key: K, value: V) => {
 }
 
 export const setSessionHandoff = (key: string, patch: Partial<HandoffSession>) => {
-  const prev = store.session.get(key) ?? { files: {} }
+  const prev = store.session.get(key) ?? { prompt: "", files: {} }
   touch(store.session, key, { ...prev, ...patch })
 }
 
 export const getSessionHandoff = (key: string) => store.session.get(key)
 
-export const setSessionMessageHandoff = (key: string, message: SessionMessageUser) => {
-  messageOrder.delete(key)
-  messageOrder.set(key, true)
-  setMessages(key, message)
-  while (messageOrder.size > MAX) {
-    const first = messageOrder.keys().next().value
-    if (first === undefined) return
-    messageOrder.delete(first)
-    setMessages(first, undefined)
-  }
-}
-
-export const getSessionMessageHandoff = (key: string) => messages[key]
-
-export const clearSessionMessageHandoff = (key: string, messageID: string) => {
-  if (messages[key]?.id !== messageID) return
-  messageOrder.delete(key)
-  setMessages(key, undefined)
-}
-
 export const setTerminalHandoff = (key: string, value: string[]) => {
   touch(store.terminal, key, value)
 }

packages/app/src/session/model.ts

@@ -15,8 +15,6 @@ import {
 } from "./session-domain"
 import { useSessionLayout } from "./session-layout"
 import { createSessionOwnership } from "./session-ownership"
-import { useTabs } from "@/shell/tabs/tabs"
-import { useServer } from "@/runtime/server/current"
 
 const emptyMessages: SessionMessageInfo[] = []
 const emptyUserMessages: SessionMessageUser[] = []
@@ -25,8 +23,6 @@ const idle = { type: "idle" as const }
 export function useSessionModel() {
   const file = useFile()
   const data = useData()
-  const server = useServer()
-  const shellTabs = useTabs()
   const layout = useSessionLayout()
   const location = useWorkspaceLocation()
   const isDesktop = createMediaQuery("(min-width: 768px)")
@@ -35,16 +31,7 @@ export function useSessionModel() {
     const id = sessionID()
     return id ? data.session.get(id) : undefined
   })
-  const parentID = createMemo(() => {
-    const current = info()?.parentID
-    if (current) return current
-    const id = sessionID()
-    if (!id) return
-    const tab = shellTabs.store.find(
-      (item) => item.type === "session" && item.server === server.key && item.routeSessionId === id,
-    )
-    return tab?.type === "session" ? (tab.routeParentId ?? tab.sessionId) : undefined
-  })
+  const parentID = createMemo(() => info()?.parentID)
   const parent = createMemo(() => {
     const id = parentID()
     return id ? data.session.get(id) : undefined

packages/app/src/session/route.tsx

@@ -15,8 +15,7 @@ import { SessionUIProvider } from "@/shell/routes/session-ui-provider"
 import { useTabs } from "@/shell/tabs/tabs"
 import { requireServerKey } from "@/shell/routes/session"
 import { useSessionModel } from "./model"
-import { SessionPanelFrame } from "./session-frame"
-import { SessionIdentityHeader } from "./session-identity-header"
+import { SessionPanelFrame, SessionRouteFrame } from "./session-frame"
 import { IncompatibleServerPanel } from "./incompatible-server-panel"
 import { SessionErrorFallback } from "./route-error"
 import { createSessionResolution } from "./session-resolution"
@@ -32,7 +31,7 @@ export function TargetSessionRouteContent() {
       <MarkSessionNotificationsViewed sessionID={() => params.id} />
       <ModelsProvider directory={directory}>
         <TargetSessionSettingsCommand />
-        <SessionRouteErrorBoundary sessionID={params.id} serverKey={requireServerKey(params.serverKey)}>
+        <SessionRouteErrorBoundary sessionID={params.id} serverKey={requireServerKey(params.serverKey)} padded>
           <ResolvedTargetSessionRoute />
         </SessionRouteErrorBoundary>
       </ModelsProvider>
@@ -46,14 +45,16 @@ function TargetSessionSettingsCommand() {
 }
 
 function SessionRouteErrorBoundary(
-  props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key }>,
+  props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key; padded?: boolean }>,
 ) {
   return (
     <ErrorBoundary
       fallback={(error) => (
-        <SessionStatePanel>
-          <SessionErrorFallback error={error} sessionID={props.sessionID} serverKey={props.serverKey} />
-        </SessionStatePanel>
+        <SessionRouteFrame padded={props.padded}>
+          <SessionPanelFrame raised={!!props.sessionID}>
+            <SessionErrorFallback error={error} sessionID={props.sessionID} serverKey={props.serverKey} />
+          </SessionPanelFrame>
+        </SessionRouteFrame>
       )}
     >
       {props.children}
@@ -77,14 +78,16 @@ function ResolvedTargetSessionRoute() {
     <Show
       when={!server.health?.incompatible}
       fallback={
-        <SessionStatePanel>
-          <IncompatibleServerPanel
-            onClose={() => tabs.removeSessionTab({ server: server.key, sessionId: params.id })}
-          />
-        </SessionStatePanel>
+        <SessionRouteFrame padded>
+          <SessionPanelFrame raised>
+            <IncompatibleServerPanel
+              onClose={() => tabs.removeSessionTab({ server: server.key, sessionId: params.id })}
+            />
+          </SessionPanelFrame>
+        </SessionRouteFrame>
       }
     >
-      <Show when={directory()} fallback={<PendingSessionState sessionID={params.id} />}>
+      <Show when={directory()}>
         {(value) => (
           <LocationProvider directory={value()}>
             <SessionUIProvider directory={value()} server={server.key}>
@@ -97,22 +100,6 @@ function ResolvedTargetSessionRoute() {
   )
 }
 
-function PendingSessionState(props: { sessionID: string }) {
-  return (
-    <SessionStatePanel>
-      <SessionIdentityHeader sessionID={props.sessionID} />
-    </SessionStatePanel>
-  )
-}
-
-function SessionStatePanel(props: ParentProps) {
-  return (
-    <div class="flex min-h-0 flex-1 p-2">
-      <SessionPanelFrame raised>{props.children}</SessionPanelFrame>
-    </div>
-  )
-}
-
 function TargetSessionPage() {
   const location = useWorkspaceLocation()
   const server = useServerSDK()

packages/app/src/session/screen.tsx

@@ -8,7 +8,7 @@ import { useSettings } from "@/settings/model"
 import { MessageTimeline } from "@/session/timeline/message-timeline"
 import type { SessionModel } from "@/session/model"
 import { SESSION_PANEL_WIDTH_MIN } from "@/session/session-panel-width"
-import { SessionPanelFrame } from "@/session/session-frame"
+import { SessionPanelFrame, SessionRouteFrame } from "@/session/session-frame"
 import { TerminalPanel } from "@/session/terminal/panel"
 import { useUsageExceededDialogs } from "./usage-exceeded-dialogs"
 import { SessionErrorFallback } from "./route-error"
@@ -17,7 +17,6 @@ import { createSessionReview } from "./review/model"
 import { SessionDesktopReview, SessionMobileReview, SessionMobileTabs } from "./review/view"
 import { createSessionTimelineInteraction } from "./timeline/interaction"
 import { ActiveSessionComposerRegion, createActiveSessionRegion } from "./composer/region"
-import { SessionIdentityHeader } from "./session-identity-header"
 
 export function SessionScreen(props: { session: SessionModel }) {
   const session = props.session
@@ -59,31 +58,17 @@ export function SessionScreen(props: { session: SessionModel }) {
 
   const sessionPanelContent = () => (
     <>
+      {timeline.resource() ?? ""}
       <Show when={!isDesktop() && !!session.identity.params.id && !mobileTabsBottom()}>
         <SessionMobileTabs review={review} compact />
       </Show>
-      {/* Surface query errors without suspending session metadata while messages load. */}
-      <Show when={timeline.resource.error}>
-        {(error) => {
-          throw error()
-        }}
-      </Show>
       <div class="flex-1 min-h-0 overflow-hidden">
         <Switch>
           <Match when={session.identity.params.id && review.mobile.changes()}>
             <SessionMobileReview review={review} />
           </Match>
           <Match when={session.identity.params.id}>
-            <Show when={!messagesReady()}>
-              <SessionIdentityHeader
-                sessionID={session.identity.params.id ?? ""}
-                session={session.data.info()}
-              />
-            </Show>
-            <Show
-              when={messagesReady() ? session.identity.params.id : undefined}
-              keyed
-            >
+            <Show when={messagesReady() ? session.identity.params.id : undefined} keyed>
               {(_id) => (
                 <MessageTimeline
                   session={session}
@@ -132,7 +117,7 @@ export function SessionScreen(props: { session: SessionModel }) {
   )
 
   return (
-    <>
+    <SessionRouteFrame>
       <SessionHeader />
       <div class="flex-1 min-h-0 flex flex-col gap-2 p-2">
         <div ref={screen.panel.ref} class="flex-1 min-h-0 flex flex-col md:flex-row gap-2">
@@ -235,6 +220,6 @@ export function SessionScreen(props: { session: SessionModel }) {
           </div>
         </Show>
       </div>
-    </>
+    </SessionRouteFrame>
   )
 }

packages/app/src/session/search.ts

@@ -1,3 +0,0 @@
-export function looksLikeSessionID(value: string) {
-  return value.length > 20 && value.startsWith("ses_")
-}

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

@@ -1,145 +0,0 @@
-import type { SessionInfo } from "@opencode-ai/client/promise"
-import { Icon } from "@opencode-ai/ui/icon"
-import { ProjectAvatar } from "@opencode-ai/ui/project-avatar"
-import { useNavigate } from "@solidjs/router"
-import { createMemo, Show, type ParentProps } from "solid-js"
-import { useServer } from "@/runtime/server/current"
-import { displayName, getProjectAvatarSource, projectForSession } from "@/shell/layout/helpers"
-import { getProjectAvatarVariant } from "@/shell/state/layout"
-import { tabKey, useTabs } from "@/shell/tabs/tabs"
-import { useSettings } from "@/settings/model"
-import { pathKey } from "@/workspaces/path-key"
-import { isWorkspaceDirectory } from "@/workspaces/paths"
-import { sessionHref } from "@/shell/routes/session"
-import { sessionTitle } from "./title"
-
-export function SessionTitleHeader(props: ParentProps) {
-  return (
-    <div
-      data-session-title
-      class="sticky top-0 z-30 w-full bg-[linear-gradient(to_bottom,var(--v2-background-bg-base)_48px,transparent)] pb-4 pe-3 ps-2.5"
-    >
-      {props.children}
-    </div>
-  )
-}
-
-export function SessionIdentityHeader(props: { sessionID: string; session?: SessionInfo }) {
-  const server = useServer()
-  const tabs = useTabs()
-  const settings = useSettings()
-  const navigate = useNavigate()
-  const tab = createMemo(() =>
-    tabs.store.find(
-      (item) =>
-        item.type === "session" &&
-        item.server === server.key &&
-        (item.sessionId === props.sessionID || item.routeSessionId === props.sessionID),
-    ),
-  )
-  const info = createMemo(() => {
-    const current = tab()
-    return current ? tabs.info[tabKey(current)] : undefined
-  })
-  const parentID = createMemo(() => {
-    if (props.session?.parentID) return props.session.parentID
-    const current = tab()
-    if (current?.type !== "session" || current.routeSessionId !== props.sessionID) return
-    return current.routeParentId ?? current.sessionId
-  })
-  const parent = createMemo(() => {
-    const id = parentID()
-    return id ? server.ctx.data.session.get(id) : undefined
-  })
-  const parentTitle = createMemo(() => {
-    const id = parentID()
-    const current = tab()
-    return sessionTitle(parent()?.title ?? (current?.type === "session" && current.sessionId === id ? info()?.title : undefined))
-  })
-  const directory = createMemo(() => props.session?.location.directory ?? info()?.directory)
-  const title = createMemo(() => sessionTitle(props.session?.title ?? (parentID() ? undefined : info()?.title)))
-  const project = createMemo(() => {
-    const projects = server.ctx.projects.list()
-    if (props.session) return projectForSession(props.session, projects)
-    const value = directory()
-    if (!value) return undefined
-    const key = pathKey(value)
-    return projects.find(
-      (item) => pathKey(item.worktree) === key || item.sandboxes?.some((sandbox) => pathKey(sandbox) === key),
-    )
-  })
-  const showProjectIcon = () =>
-    import.meta.env.VITE_OPENCODE_CHANNEL !== "prod" && settings.general.showProjectIcon() && !!directory()
-  const workspaceSession = createMemo(() => isWorkspaceDirectory(project(), directory() ?? ""))
-  const navigateParent = () => {
-    const id = parentID()
-    const current = tab()
-    if (!id || current?.type !== "session") return
-    tabs.rememberSessionRoute(current, id, parent()?.parentID)
-    navigate(sessionHref(server.key, id))
-  }
-
-  return (
-    <Show when={title() || parentTitle() || showProjectIcon()}>
-      <SessionTitleHeader>
-        <div class="flex h-12 w-full items-center justify-between gap-2">
-          <div class="flex min-w-0 flex-1 items-center gap-1">
-            <div class="flex min-w-0 w-full flex-1 items-center">
-              <span
-                classList={{
-                  "flex size-6 shrink-0 items-center justify-center": true,
-                  "text-v2-icon-icon-accent": workspaceSession() && !showProjectIcon(),
-                  "text-v2-icon-icon-muted": !workspaceSession() && !showProjectIcon(),
-                }}
-              >
-                <Show
-                  when={showProjectIcon()}
-                  fallback={<Icon name={workspaceSession() ? "workspace-isolated" : "monitor"} />}
-                >
-                  <ProjectAvatar
-                    fallback={displayName(project() ?? { worktree: directory() ?? "" })}
-                    src={getProjectAvatarSource(project()?.id, project()?.icon)}
-                    variant={getProjectAvatarVariant(project()?.icon?.color)}
-                  />
-                </Show>
-              </span>
-              <Show when={parentTitle()}>
-                {(value) => (
-                  <button
-                    type="button"
-                    data-slot="session-title-parent"
-                    dir="auto"
-                    class="min-w-0 max-w-[40%] truncate pl-2 text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:text-v2-text-text-muted"
-                    onClick={navigateParent}
-                  >
-                    {value()}
-                  </button>
-                )}
-              </Show>
-              <Show when={parentTitle() && title()}>
-                <span
-                  data-slot="session-title-separator"
-                  class="-translate-y-[0.5px] pl-2 pr-1 text-[11px] font-medium text-v2-text-text-faint"
-                  aria-hidden="true"
-                >
-                  /
-                </span>
-              </Show>
-              <Show when={title()}>
-                {(value) => (
-                  <h1
-                    data-slot={parentID() ? "session-title-child" : undefined}
-                    dir="auto"
-                    class="w-fit truncate rounded-[6px] px-2 py-1 text-[13px] font-[530] leading-4 tracking-[-0.04px] text-v2-text-text-base"
-                  >
-                    {value()}
-                  </h1>
-                )}
-              </Show>
-            </div>
-          </div>
-        </div>
-      </SessionTitleHeader>
-    </Show>
-  )
-}

packages/app/src/session/story-model.tsx

@@ -208,6 +208,8 @@ function SessionSurfaceState(props: SessionPreviewProps & { onReset: () => void
     parentID: () => props.child?.parentID,
     child: () => !!props.child,
     showComposer: () => true,
+    handoffPrompt: () => undefined,
+    promptReady: () => true,
   } satisfies SessionComposerRegionViewController
 
   return (

packages/app/src/session/terminal/terminal.tsx

@@ -221,14 +221,6 @@ export const Terminal = (props: TerminalProps) => {
   let drop: VoidFunction | undefined
   let reconn: ReturnType<typeof setTimeout> | undefined
   let tries = 0
-  let revealed = false
-
-  const reveal = () => {
-    if (revealed) return
-    if (!serializeAddon.serializeAsText({ trimWhitespace: true })) return
-    revealed = true
-    container.style.opacity = "1"
-  }
 
   const cleanup = () => {
     if (!cleanups.length) return
@@ -508,7 +500,6 @@ export const Terminal = (props: TerminalProps) => {
 
       if (restore && restoreSize) {
         await write(restore)
-        reveal()
         fit.fit()
         scheduleSize(t.cols, t.rows)
         if (scrollY !== undefined) t.scrollToLine(scrollY)
@@ -518,7 +509,6 @@ export const Terminal = (props: TerminalProps) => {
         scheduleSize(t.cols, t.rows)
         if (restore) {
           await write(restore)
-          reveal()
           if (scrollY !== undefined) t.scrollToLine(scrollY)
         }
         startResize()
@@ -615,7 +605,6 @@ export const Terminal = (props: TerminalProps) => {
           const data = typeof event.data === "string" ? event.data : ""
           if (!data) return
           output?.push(data)
-          if (!revealed) output?.flush(reveal)
           cursor += data.length
           seek = cursor
         }
@@ -696,7 +685,7 @@ export const Terminal = (props: TerminalProps) => {
       dir="ltr"
       data-prevent-autofocus
       tabIndex={-1}
-      style={{ "background-color": terminalColors().background, "caret-color": "transparent", opacity: 0 }}
+      style={{ "background-color": terminalColors().background }}
       classList={{
         ...local.classList,
         "select-text": true,

packages/app/src/session/timeline/controller-projection.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { SessionInboxInfo, SessionMessageInfo } from "@opencode-ai/client/promise"
-import { applyTimelineMessageHandoff, visibleTimelineMessages } from "./controller-projection"
+import { visibleTimelineMessages } from "./controller-projection"
 
 const messages = [
   { id: "msg_1", type: "user", text: "first", time: { created: 1 } },
@@ -41,37 +41,3 @@ describe("visibleTimelineMessages", () => {
     expect(visibleTimelineMessages(messages, [], "msg_0")).toEqual([])
   })
 })
-
-describe("applyTimelineMessageHandoff", () => {
-  const handoff = {
-    id: "msg_image",
-    type: "user",
-    text: "",
-    files: [
-      {
-        data: "",
-        mime: "image/png",
-        source: { type: "uri", uri: "blob:image" },
-        name: "image.png",
-      },
-    ],
-    time: { created: 1 },
-  } satisfies SessionMessageInfo
-
-  test("shows a promoted image-only prompt before client admission", () => {
-    expect(applyTimelineMessageHandoff([], handoff)).toEqual([handoff])
-  })
-
-  test("adds attachments to the client's optimistic row", () => {
-    const optimistic = { id: handoff.id, type: "user", text: "", time: { created: 2 } } satisfies SessionMessageInfo
-    expect(applyTimelineMessageHandoff([optimistic], handoff)).toEqual([{ ...optimistic, files: handoff.files }])
-  })
-
-  test("keeps the durable attachment payload", () => {
-    const durable = {
-      ...handoff,
-      files: [{ data: "YQ==", mime: "image/png", source: { type: "inline" } }],
-    } satisfies SessionMessageInfo
-    expect(applyTimelineMessageHandoff([durable], handoff)).toEqual([durable])
-  })
-})

packages/app/src/session/timeline/controller-projection.ts

@@ -1,13 +1,4 @@
-import type { SessionInboxInfo, SessionMessageInfo, SessionMessageUser } from "@opencode-ai/client/promise"
-
-export function applyTimelineMessageHandoff(messages: SessionMessageInfo[], handoff?: SessionMessageUser) {
-  if (!handoff) return messages
-  const index = messages.findIndex((message) => message.id === handoff.id)
-  if (index < 0) return [...messages, handoff]
-  const message = messages[index]
-  if (message.type !== "user" || message.files?.length) return messages
-  return messages.map((item, current) => (current === index ? { ...message, files: handoff.files } : item))
-}
+import type { SessionInboxInfo, SessionMessageInfo } from "@opencode-ai/client/promise"
 
 export function visibleTimelineMessages(
   messages: SessionMessageInfo[],

packages/app/src/session/timeline/controller.tsx

@@ -16,15 +16,9 @@ import { sessionHref } from "@/shell/routes/session"
 import { sessionTitle } from "@/session/title"
 import { downloadSessionExport, fetchSessionExport, sessionExportFilename } from "@/session/commands/export"
 import { showToast } from "@/shell/notifications/toast"
-import {
-  applyTimelineMessageHandoff,
-  timelineChildTitle,
-  timelineRemovedSessionIDs,
-  visibleTimelineMessages,
-} from "./controller-projection"
+import { timelineChildTitle, timelineRemovedSessionIDs, visibleTimelineMessages } from "./controller-projection"
 import { createTimelineProjection } from "./projection"
 import { useServer } from "@/runtime/server/current"
-import { getSessionMessageHandoff } from "@/session/handoff"
 
 const emptyMessages: SessionMessageInfo[] = []
 const taskDescription = (message: SessionMessageInfo, sessionID: string): string | undefined => {
@@ -58,16 +52,10 @@ export function createTimelineController(input: { session: TimelineSessionSource
   const tabs = useTabs()
   const dialog = useDialog()
   const language = useLanguage()
-  const handedOffMessages = createMemo(() =>
-    applyTimelineMessageHandoff(
-      input.session.history.messages(),
-      getSessionMessageHandoff(input.session.identity.sessionKey()),
-    ),
-  )
   const projectedMessages = createMemo(() => {
     const id = input.session.identity.sessionID()
     return visibleTimelineMessages(
-      handedOffMessages(),
+      input.session.history.messages(),
       id ? data.session.pending.list(id) : [],
       input.session.data.info()?.revert?.messageID,
     )

packages/app/src/session/timeline/interaction.ts

@@ -1,7 +1,7 @@
 import type { SessionMessageUser } from "@opencode-ai/client/promise"
 import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { useLocation } from "@solidjs/router"
-import { createEffect, on, onCleanup } from "solid-js"
+import { createEffect, createSignal, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useLayout } from "@/shell/state/layout"
 import type { SessionModel } from "../model"
@@ -19,10 +19,6 @@ export function createSessionTimelineInteraction(session: SessionModel) {
       overflow: false,
       jump: false,
     },
-    follow: {
-      sessionKey: session.identity.sessionKey(),
-      pinned: true,
-    },
     refs: {
       content: undefined as HTMLDivElement | undefined,
       dock: undefined as HTMLDivElement | undefined,
@@ -30,11 +26,11 @@ export function createSessionTimelineInteraction(session: SessionModel) {
   })
   // The single source of truth for "follow the newest content". The virtualizer pins and unpins
   // it from scroll geometry; everything else only expresses explicit intent.
-  const pinned = () => state.follow.sessionKey !== session.identity.sessionKey() || state.follow.pinned
-  const pin = () => setState("follow", { sessionKey: session.identity.sessionKey(), pinned: true })
+  const [pinned, setPinned] = createSignal(true)
+  const pin = () => setPinned(true)
   const unpin = () => {
     if (!scroller || scroller.scrollHeight - scroller.clientHeight <= 1) return
-    setState("follow", { sessionKey: session.identity.sessionKey(), pinned: false })
+    setPinned(false)
   }
   let scroller: HTMLDivElement | undefined
   let dockHeight = 0
@@ -213,10 +209,8 @@ export function createSessionTimelineInteraction(session: SessionModel) {
     on(
       session.identity.sessionKey,
       () => {
-        pin()
         setState("messageID", undefined)
         setState("pendingMessage", undefined)
-        setState("scroll", { overflow: false, jump: false })
       },
       { defer: true },
     ),

packages/app/src/session/timeline/message-timeline.tsx

@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createSignal, For, on, Show, type Accessor, type JSX } from "solid-js"
+import { createEffect, createMemo, createSignal, For, on, Show, type Accessor } from "solid-js"
 import createPresence from "solid-presence"
 import { createStore } from "solid-js/store"
 import type { SessionUserActions } from "@opencode-ai/session-ui/actions"
@@ -17,7 +17,7 @@ import { getFilename } from "@opencode-ai/util/path"
 import { Popover } from "@kobalte/core/popover"
 import { SessionContextUsage } from "@/session/timeline/session-context-usage"
 import { useLanguage } from "@/runtime/i18n/language"
-import { useData, useServer } from "@/runtime/server/current"
+import { useData } from "@/runtime/server/current"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { Timeline, TimelineRow } from "@opencode-ai/session-ui/timeline/projection"
 import { createSessionTimelineRowRenderer } from "@opencode-ai/session-ui/timeline/row"
@@ -26,11 +26,9 @@ import { createTimelineVirtualizer } from "./virtualizer"
 import { containsDirectory, isWorkspaceDirectory, workspaceDirectories } from "@/workspaces/paths"
 import { SessionWorkspaceMenu } from "@/session/timeline/session-workspace-menu"
 import { getProjectAvatarVariant } from "@/shell/state/layout"
-import { displayName, getProjectAvatarSource, projectForSession } from "@/shell/layout/helpers"
+import { displayName, getProjectAvatarSource } from "@/shell/layout/helpers"
 import { parseCommentNote, readPromptPresentation } from "@/composer/comment-note"
 import { useCommand } from "@/shell/commands/command"
-import { useSettings } from "@/settings/model"
-import { SessionTitleHeader } from "../session-identity-header"
 
 type BackgroundTask = {
   id: string
@@ -56,7 +54,7 @@ export function BackgroundMoveHint(props: { keybind?: string[] }) {
   return (
     <div
       data-component="session-background-hint"
-      class="flex h-6 max-w-full items-center justify-center gap-[3px] overflow-hidden text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-muted"
+      class="flex h-6 max-w-full items-center justify-center gap-[3px] overflow-hidden text-[13px] font-[530] leading-5 tracking-[-0.04px] text-v2-text-text-muted"
       aria-label={language.t("session.background.moveInline", { keybind: keybind() })}
     >
       <span data-slot="session-background-hint-prefix" class="shrink-0">
@@ -182,7 +180,6 @@ function WorkspaceMoveAction(props: {
 
 function SessionSummaryPanel(props: {
   project: Project
-  avatar?: JSX.Element
   directory: string
   local: boolean
   branch?: string
@@ -209,13 +206,11 @@ function SessionSummaryPanel(props: {
     <div data-component="session-summary-panel" class="w-[280px]">
       <div class="relative z-10 flex flex-col gap-1 overflow-hidden rounded-[6px] bg-v2-background-bg-base px-0.5 py-1.5 shadow-[var(--v2-elevation-raised)]">
         <div class={row}>
-          {props.avatar ?? (
-            <ProjectAvatar
-              fallback={displayName(props.project)}
-              src={getProjectAvatarSource(props.project.id, props.project.icon)}
-              variant={getProjectAvatarVariant(props.project.icon?.color)}
-            />
-          )}
+          <ProjectAvatar
+            fallback={displayName(props.project)}
+            src={getProjectAvatarSource(props.project.id, props.project.icon)}
+            variant={getProjectAvatarVariant(props.project.icon?.color)}
+          />
           <span class="min-w-0 flex-1 truncate text-v2-text-text-muted">{displayName(props.project)}</span>
         </div>
         <SessionWorkspaceMenu
@@ -330,8 +325,6 @@ function MessageTimelineView(
 ) {
   const language = useLanguage()
   const data = useData()
-  const server = useServer()
-  const settings = useSettings()
   const sdk = useWorkspaceLocation()
   const sessionID = props.data.sessionID
   const sessionStatus = props.data.status
@@ -350,21 +343,6 @@ function MessageTimelineView(
     return { ...value, worktree: value.canonical, worktrees: [] }
   })
   const workspaceSession = createMemo(() => isWorkspaceDirectory(project(), sessionDirectory()))
-  const showProjectIcon = () =>
-    import.meta.env.VITE_OPENCODE_CHANNEL !== "prod" && settings.general.showProjectIcon()
-  const avatarProject = createMemo(() => {
-    if (!showProjectIcon()) return
-    const session = props.session.data.info()
-    if (!session) return
-    return projectForSession(session, server.ctx.projects.list())
-  })
-  const projectAvatar = () => (
-    <ProjectAvatar
-      fallback={displayName(avatarProject() ?? { worktree: sessionDirectory() })}
-      src={getProjectAvatarSource(avatarProject()?.id, avatarProject()?.icon)}
-      variant={getProjectAvatarVariant(avatarProject()?.icon?.color)}
-    />
-  )
   createEffect(() => {
     const directory = project()?.worktree
     if (!directory) return
@@ -506,7 +484,7 @@ function MessageTimelineView(
               ref={setBackgroundHintRef}
               class="duration-150 motion-reduce:animate-none"
               classList={{
-                [`flex h-9 items-start pt-3 ${turnPadding()}`]: true,
+                [`flex h-8 items-start pt-2 ${turnPadding()}`]: true,
                 "animate-in fade-in": backgroundHintVisibility().animate && backgroundHintVisibility().show,
                 "animate-out fade-out fill-mode-forwards":
                   backgroundHintVisibility().animate && !backgroundHintVisibility().show,
@@ -524,7 +502,10 @@ function MessageTimelineView(
       }}
       renderRow={(row, onSizeChange) => <rowRenderer.Row row={row} onSizeChange={onSizeChange} />}
       header={
-        <SessionTitleHeader>
+        <div
+          data-session-title
+          class="sticky top-0 z-30 bg-[linear-gradient(to_bottom,var(--v2-background-bg-base)_48px,transparent)] w-full pb-4 pr-3 pl-2.5"
+        >
           <div class="h-12 w-full flex items-center justify-between gap-2">
             <div class="flex items-center gap-1 min-w-0 flex-1">
               <div class="flex items-center min-w-0 flex-1 w-full">
@@ -532,9 +513,7 @@ function MessageTimelineView(
                   when={workspaceSession()}
                   fallback={
                     <span class="flex size-6 shrink-0 items-center justify-center text-v2-icon-icon-muted">
-                      <Show when={showProjectIcon()} fallback={<Icon name="monitor" />}>
-                        {projectAvatar()}
-                      </Show>
+                      <Icon name="monitor" />
                     </span>
                   }
                 >
@@ -546,14 +525,9 @@ function MessageTimelineView(
                     <span
                       tabIndex={0}
                       aria-label={sessionDirectory()}
-                      classList={{
-                        "flex size-6 shrink-0 items-center justify-center": true,
-                        "text-v2-icon-icon-accent": !showProjectIcon(),
-                      }}
+                      class="flex size-6 shrink-0 items-center justify-center text-v2-icon-icon-accent"
                     >
-                      <Show when={showProjectIcon()} fallback={<Icon name="workspace-isolated" />}>
-                        {projectAvatar()}
-                      </Show>
+                      <Icon name="workspace-isolated" />
                     </span>
                   </Tooltip>
                 </Show>
@@ -639,7 +613,6 @@ function MessageTimelineView(
                           <Popover.Content class="z-50 border-0 bg-transparent p-0 outline-none">
                             <SessionSummaryPanel
                               project={project()}
-                              avatar={showProjectIcon() ? projectAvatar() : undefined}
                               directory={sessionDirectory()}
                               local={!workspaceSession()}
                               branch={data.location.vcs.info({ directory: sdk().directory })?.branch.current}
@@ -714,7 +687,7 @@ function MessageTimelineView(
               )}
             </Show>
           </div>
-        </SessionTitleHeader>
+        </div>
       }
     />
   )

packages/app/src/session/timeline/model.test.ts

@@ -1,12 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { SessionMessageAssistant, SessionMessageInfo, SessionMessageUser } from "@opencode-ai/client/promise"
-import {
-  enrichLeadingTurn,
-  leadingTurnNeedsParent,
-  loadOlderTimeline,
-  selectUserMessages,
-  selectVisibleUserMessages,
-} from "./model"
+import { loadOlderTimeline, selectUserMessages, selectVisibleUserMessages } from "./model"
 
 const user = (id: string): SessionMessageUser => ({ id, type: "user", text: id, time: { created: 1 } })
 const assistant = (id: string): SessionMessageAssistant => ({
@@ -48,56 +42,6 @@ describe("timeline model", () => {
     expect(anchors).toEqual(["before", "after", true])
   })
 
-  test("recognizes a leading partial assistant turn", () => {
-    expect(leadingTurnNeedsParent([assistant("msg_assistant"), user("msg_next")])).toBe(true)
-    expect(leadingTurnNeedsParent([user("msg_user"), assistant("msg_assistant")])).toBe(false)
-    expect(leadingTurnNeedsParent([user("msg_user")])).toBe(false)
-  })
-
-  test("pauses between bounded history pages until the leading turn has its parent", async () => {
-    const pages: SessionMessageInfo[][] = [[assistant("msg_older")], [user("msg_parent")]]
-    const messages: SessionMessageInfo[] = [assistant("msg_latest"), user("msg_next")]
-    let pauses = 0
-    let loads = 0
-
-    await enrichLeadingTurn({
-      current: () => true,
-      messages: () => messages,
-      more: () => pages.length > 0,
-      loading: () => false,
-      loadMore: async () => {
-        messages.unshift(...pages.shift()!)
-        loads += 1
-      },
-      pause: async () => {
-        pauses += 1
-      },
-      maxPages: 3,
-    })
-
-    expect(loads).toBe(2)
-    expect(pauses).toBe(2)
-    expect(leadingTurnNeedsParent(messages)).toBe(false)
-  })
-
-  test("caps background pages when the parent remains outside the window", async () => {
-    let loads = 0
-
-    await enrichLeadingTurn({
-      current: () => true,
-      messages: () => [assistant("msg_latest")],
-      more: () => true,
-      loading: () => false,
-      loadMore: async () => {
-        loads += 1
-      },
-      pause: async () => undefined,
-      maxPages: 3,
-    })
-
-    expect(loads).toBe(3)
-  })
-
   test("does not restore an anchor after the session changes", async () => {
     let sessionID = "ses_old"
     let restore = 0

packages/app/src/session/timeline/model.ts

@@ -1,11 +1,7 @@
 import { createMemo, createResource, type Accessor } from "solid-js"
-import type { SessionMessageInfo } from "@opencode-ai/client/promise"
 import { useData } from "@/runtime/server/current"
 import type { SessionModel } from "../model"
 
-const leadingTurnPageDelay = 200
-const leadingTurnPageLimit = 3
-
 export {
   selectSessionUserMessages as selectUserMessages,
   selectVisibleSessionUserMessages as selectVisibleUserMessages,
@@ -13,32 +9,12 @@ export {
 
 export function createTimelineModel(input: { session: Pick<SessionModel, "identity" | "history"> }) {
   const data = useData()
-  const prepared = new Set<string>()
 
   const [resource] = createResource(
     () => input.session.identity.sessionID(),
-    async (id) => {
-      if (!id) return
-      const key = input.session.identity.sessionKey()
-      await Promise.all([data.session.message.sync(id), data.session.pending.sync(id)])
-      await enrichLeadingTurn({
-        current: () => input.session.identity.sessionKey() === key,
-        messages: () => data.session.message.list(id),
-        more: () => data.session.message.more(id),
-        loading: () => data.session.message.loading(id),
-        loadMore: () => data.session.message.loadMore(id),
-        pause: () => new Promise((resolve) => setTimeout(resolve, leadingTurnPageDelay)),
-        maxPages: leadingTurnPageLimit,
-      }).catch(() => undefined)
-      if (input.session.identity.sessionKey() === key) prepared.add(key)
-    },
+    (id) => (id ? Promise.all([data.session.message.sync(id), data.session.pending.sync(id)]) : undefined),
   )
-  const ready = createMemo(() => {
-    const id = input.session.identity.sessionID()
-    if (!id || prepared.has(input.session.identity.sessionKey()) || !resource.loading) return true
-    const messages = data.session.message.list(id)
-    return messages.length > 0 && !leadingTurnNeedsParent(messages)
-  })
+  const ready = createMemo(() => !input.session.identity.sessionID() || !resource.loading)
   const more = () => {
     const id = input.session.identity.sessionID()
     return id ? data.session.message.more(id) : false
@@ -52,7 +28,7 @@ export function createTimelineModel(input: { session: Pick<SessionModel, "identi
       sessionID: input.session.identity.sessionID,
       more,
       loading,
-      loadMore: (id) => data.session.message.loadMore(id),
+      loadMore: data.session.message.loadMore,
       before: options?.before,
       after: options?.after,
     })
@@ -68,34 +44,6 @@ export function createTimelineModel(input: { session: Pick<SessionModel, "identi
   }
 }
 
-export async function enrichLeadingTurn(input: {
-  current: Accessor<boolean>
-  messages: Accessor<SessionMessageInfo[]>
-  more: Accessor<boolean>
-  loading: Accessor<boolean>
-  loadMore: () => Promise<void>
-  pause: () => Promise<void>
-  maxPages: number
-}) {
-  const load = async (pages: number): Promise<void> => {
-    if (!input.current() || pages >= input.maxPages || !leadingTurnNeedsParent(input.messages()) || !input.more())
-      return
-    await input.pause()
-    if (!input.current() || !leadingTurnNeedsParent(input.messages()) || !input.more()) return
-    if (input.loading()) return load(pages)
-    await input.loadMore()
-    return load(pages + 1)
-  }
-  return load(0)
-}
-
-export function leadingTurnNeedsParent(messages: SessionMessageInfo[]) {
-  const assistant = messages.findIndex((message) => message.type === "assistant")
-  if (assistant === -1) return false
-  const boundary = messages.findIndex((message) => message.type === "user" || message.type === "shell")
-  return boundary === -1 || assistant < boundary
-}
-
 export async function loadOlderTimeline(input: {
   sessionID: Accessor<string | undefined>
   more: Accessor<boolean>

packages/app/src/session/timeline/projection.ts

@@ -63,8 +63,7 @@ export function createTimelineProjection(input: {
     input.sessionMessages().forEach((message) => {
       if (message.type === "user") userID = message.id
       if (message.type === "shell") userID = undefined
-      if (message.type !== "assistant") return
-      if (!userID) userID = message.id
+      if (message.type !== "assistant" || !userID) return
       const messages = result.get(userID)
       if (messages) {
         messages.push(message)

packages/app/src/session/timeline/virtualizer.tsx

@@ -20,7 +20,6 @@ import { observeElementOffsetReconnectAware } from "./observe-element-offset"
 import { filterVirtualIndexes } from "./virtual-items"
 
 const fallbackItemSize = 60
-const pendingMarkdown = '[data-component="markdown"]:not([data-markdown-ready])'
 // Distance from the bottom that counts as "at the end". Deliberately tight: a collapse clamps
 // exactly to the end, while a one-pixel nudge upward is a deliberate move away from it.
 const endEpsilon = 0.5
@@ -150,13 +149,9 @@ export function createTimelineVirtualizer(input: Input) {
     if (listRoot() && input.pinned()) anchorResizedBottom()
   }
   virtualizer.shouldAdjustScrollPositionOnItemSizeChange = (item, _delta, instance) => {
-    // Prepended rows can resize more than once as deferred content mounts. Keep
-    // compensating while they remain entirely above the visible content fold.
-    if (addedKeys.has(String(item.key)))
-      return (
-        item.end <=
-        (instance.scrollOffset ?? 0) + instance.scrollAdjustments + instance.options.scrollMargin
-      )
+    if (!instance.itemSizeCache.has(item.key) && addedKeys.delete(String(item.key))) {
+      return item.start < (instance.scrollOffset ?? 0) + instance.scrollAdjustments
+    }
     const first = instance.range?.startIndex
     return first !== undefined && item.index < first
   }
@@ -178,48 +173,10 @@ export function createTimelineVirtualizer(input: Input) {
   })
 
   let overscanFrame: number | undefined
-  const pendingMeasurements = () =>
-    virtualizer.getVirtualItems().some((item) => !virtualizer.itemSizeCache.has(item.key))
-  const settleColdBottom = () => {
-    if (input.pinned()) virtualizer.scrollToEnd()
-    if (virtualContent?.querySelector(pendingMarkdown) || pendingMeasurements()) {
-      overscanFrame = requestAnimationFrame(settleColdBottom)
-      return
-    }
-    overscanFrame = requestAnimationFrame(() => {
-      if (input.pinned()) virtualizer.scrollToEnd()
-      if (virtualContent?.querySelector(pendingMarkdown) || pendingMeasurements()) {
-        settleColdBottom()
-        return
-      }
-      overscanFrame = undefined
-      const content = virtualContent
-      if (!content) return
-      if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) {
-        content.style.removeProperty("visibility")
-        return
-      }
-      const animation = ["animate-in", "fade-in", "duration-150"]
-      const clearAnimation = (event: AnimationEvent) => {
-        if (event.target !== content) return
-        content.removeEventListener("animationend", clearAnimation)
-        content.removeEventListener("animationcancel", clearAnimation)
-        content.classList.remove(...animation)
-      }
-      content.addEventListener("animationend", clearAnimation)
-      content.addEventListener("animationcancel", clearAnimation)
-      content.classList.add(...animation)
-      content.style.removeProperty("visibility")
-    })
-  }
   onMount(() => {
     overscanFrame = requestAnimationFrame(() => {
+      overscanFrame = undefined
       if (renderOverscan() < 20) setRenderOverscan(20)
-      if (!coldBottomMount) {
-        overscanFrame = undefined
-        return
-      }
-      settleColdBottom()
     })
   })
 
@@ -406,17 +363,11 @@ export function createTimelineVirtualizer(input: Input) {
           <Show when={input.showHeader()}>{props.header}</Show>
           <div
             data-timeline-virtual-content
-            class="motion-reduce:animate-none"
             ref={(element) => {
               virtualContent = element
               input.setContentRef(element)
             }}
-            style={{
-              height: `${virtualizer.getTotalSize()}px`,
-              position: "relative",
-              width: "100%",
-              visibility: coldBottomMount ? "hidden" : undefined,
-            }}
+            style={{ height: `${virtualizer.getTotalSize()}px`, position: "relative", width: "100%" }}
           >
             <For each={virtualRowKeys()}>{(rowKey) => <VirtualRow rowKey={rowKey} />}</For>
             <Show when={rows().length > 0}>

packages/app/src/settings/general/general.tsx

@@ -338,20 +338,6 @@ export const SettingsGeneral: Component<{
           </div>
         </SettingsRow>
 
-        <Show when={import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
-          <SettingsRow
-            title={language.t("settings.general.row.showProjectIcon.title")}
-            description={language.t("settings.general.row.showProjectIcon.description")}
-          >
-            <div data-action="settings-show-project-icon">
-              <Switch
-                checked={settings.general.showProjectIcon()}
-                onChange={(checked) => settings.general.setShowProjectIcon(checked)}
-              />
-            </div>
-          </SettingsRow>
-        </Show>
-
         <Show when={mobile() && import.meta.env.VITE_OPENCODE_CHANNEL !== "prod"}>
           <SettingsRow
             title={language.t("settings.general.row.mobileTitlebarBottom.title")}

packages/app/src/settings/model.tsx

@@ -31,7 +31,6 @@ export interface Settings {
     showNavigation: boolean
     showSearch: boolean
     showStatus: boolean
-    showProjectIcon: boolean
     showTerminal: boolean
     showReasoningSummaries: boolean
     shellToolPartsExpanded: boolean
@@ -118,7 +117,6 @@ const defaultSettings: Settings = {
     showNavigation: false,
     showSearch: false,
     showStatus: false,
-    showProjectIcon: false,
     showTerminal: false,
     showReasoningSummaries: false,
     shellToolPartsExpanded: false,
@@ -209,10 +207,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setShowStatus(value: boolean) {
           setStore("general", "showStatus", value)
         },
-        showProjectIcon: withFallback(() => store.general?.showProjectIcon, defaultSettings.general.showProjectIcon),
-        setShowProjectIcon(value: boolean) {
-          setStore("general", "showProjectIcon", value)
-        },
         showTerminal: withFallback(() => store.general?.showTerminal, defaultSettings.general.showTerminal),
         setShowTerminal(value: boolean) {
           setStore("general", "showTerminal", value)

packages/app/src/settings/settings.css

@@ -134,7 +134,7 @@
   font-style: normal;
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   letter-spacing: -0.04px;
   color: var(--v2-text-text-base);
   font-variation-settings: "slnt" 0;
@@ -281,7 +281,7 @@
   padding-block: 20px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
 }
 
@@ -289,7 +289,7 @@
   padding-inline-end: 12px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
   opacity: 0;
   transition: opacity 200ms ease;
@@ -307,7 +307,7 @@
   background: transparent;
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-accent);
   cursor: pointer;
   text-align: start;
@@ -329,7 +329,7 @@
   padding-bottom: 0;
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
 }
 
 .settings-providers .settings-section-title + [data-component="settings-list"] {
@@ -478,7 +478,7 @@
   padding-block: 48px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
   text-align: center;
 }
@@ -495,7 +495,7 @@
   padding-bottom: 0;
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
 }
 
 .settings-shortcuts [data-component="settings-list"] {
@@ -525,7 +525,7 @@
 .settings-shortcuts [data-component="settings-list"] > div > span {
   font-weight: 440;
   font-size: 13px;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   letter-spacing: -0.04px;
   color: var(--v2-text-text-base);
   font-variation-settings: "slnt" 0;
@@ -577,7 +577,7 @@
   padding-block: 48px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
   text-align: center;
 }
@@ -654,7 +654,7 @@
 .settings-servers-name {
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-base);
 }
 
@@ -674,7 +674,7 @@
   padding-block: 48px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
   text-align: center;
 }
@@ -784,7 +784,7 @@
   font-family: inherit;
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   letter-spacing: -0.04px;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -796,7 +796,7 @@
 .settings-workspaces-meta {
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-faint);
 }
 
@@ -856,7 +856,7 @@
   padding-block: 48px;
   font-size: 13px;
   font-weight: 440;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-muted);
 }
 
@@ -933,7 +933,7 @@
 .settings-server-dialog-label {
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
   color: var(--v2-text-text-base);
 }
 

packages/app/src/settings/workspaces/project-dialog.css

@@ -124,7 +124,7 @@
   color: var(--v2-text-text-base);
   font-size: 13px;
   font-weight: 530;
-  line-height: var(--line-height-compact);
+  line-height: 1;
 }
 
 .project-settings-extension-section-header > :last-child {

packages/app/src/settings/workspaces/project-dialog.tsx

@@ -96,7 +96,7 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
               </Field>
 
               <div class="flex w-full flex-col gap-2">
-                <div class="select-none text-[13px] font-[530] leading-text-compact tracking-[-0.04px] text-v2-text-text-base">
+                <div class="select-none text-[13px] font-[530] leading-none tracking-[-0.04px] text-v2-text-text-base">
                   {language.t("dialog.project.edit.icon")}
                 </div>
                 <div class="flex items-center gap-3">
@@ -150,7 +150,7 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
 
               <Show when={!model.store.iconOverride}>
                 <div class="flex w-full flex-col gap-2">
-                  <div class="select-none text-[13px] font-[530] leading-text-compact tracking-[-0.04px] text-v2-text-text-base">
+                  <div class="select-none text-[13px] font-[530] leading-none tracking-[-0.04px] text-v2-text-text-base">
                     {language.t("dialog.project.edit.color")}
                   </div>
                   <div class="-ml-1 flex gap-1.5">

packages/app/src/settings/workspaces/project-model.ts

@@ -1,6 +1,7 @@
 import { getFilename } from "@opencode-ai/util/path"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useMutation } from "@tanstack/solid-query"
+import { normalizeProjectInfo } from "@/runtime/server/global-sync/utils"
 import { createMemo } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobal } from "@/runtime/server/runtime"
@@ -8,7 +9,7 @@ import { type LocalProject } from "@/shell/state/layout"
 import { ServerConnection } from "@/runtime/server/registry"
 
 export function createEditProjectModel(props: { project: LocalProject; server: ServerConnection.Any }) {
-  const supported = true
+  const supported = !props.project.id || props.project.id === "global"
   const dialog = useDialog()
   const global = useGlobal()
   const serverCtx = createMemo(() => global.ensureServerCtx(props.server))
@@ -71,14 +72,9 @@ export function createEditProjectModel(props: { project: LocalProject; server: S
       const start = store.startup.trim()
 
       if (props.project.id && props.project.id !== "global") {
-        await serverCtx().sdk.api.project.update({
-          projectID: props.project.id,
-          name,
-          icon: { color: store.color ?? "", override: store.iconOverride ?? "" },
-          commands: { start },
-        })
-        dialog.close()
-        return
+        // TODO: Restore project edits when the V2 client exposes a project update API.
+        // await serverCtx().sdk.api.project.update({ projectID: props.project.id, name, icon, commands })
+        throw new Error(`Project ${props.project.id} cannot be updated`)
       }
 
       serverCtx().sync.project.meta(props.project.worktree, {

packages/app/src/shell/commands/palette.ts

@@ -15,7 +15,6 @@ import { displayName, projectForSession } from "@/shell/layout/helpers"
 import { createSessionTabs } from "@/session/helpers"
 import { useSessionLayout } from "@/session/session-layout"
 import { useServer } from "@/runtime/server/current"
-import { looksLikeSessionID } from "@/session/search"
 
 export type CommandPaletteEntry = {
   id: string
@@ -148,7 +147,6 @@ export function createCommandPaletteModel(props: { filesOnly?: () => boolean; on
     opened: serverCtx.projects.list,
     stored: () => serverCtx.sync.data.project,
     load: (search, signal) => serverSDK.api.session.list({ parentID: null, search, limit: 50 }, { signal }),
-    get: (sessionID, signal) => serverSDK.api.session.get({ sessionID }, { signal }),
     untitled: () => language.t("command.session.new"),
     category: () => language.t("command.category.session"),
   })
@@ -223,7 +221,6 @@ export function createServerSessionEntries(props: {
   opened: () => LocalProject[]
   stored: () => Project[]
   load: (search: string, signal: AbortSignal) => Promise<{ data: SessionInfo[] }>
-  get: (sessionID: string, signal: AbortSignal) => Promise<SessionInfo>
   untitled: () => string
   category: () => string
 }) {
@@ -256,36 +253,28 @@ export function createServerSessionEntries(props: {
     const openedByID = new Map(opened.flatMap((project) => (project.id ? [[project.id, project] as const] : [])))
     const stored = props.stored().map((project) => ({ ...project, expanded: false }))
     const storedByID = new Map(stored.map((project) => [project.id, project] as const))
-    return Promise.all([
-      props.load(search, current.signal).then(
-        (result) => result.data,
-        () => [],
-      ),
-      looksLikeSessionID(search)
-        ? props.get(search, current.signal).then(
-            (result) => [result],
-            () => [],
-          )
-        : Promise.resolve([]),
-    ]).then(([listed, exact]) =>
-      [...new Map([...exact, ...listed].map((session) => [session.id, session] as const)).values()]
-        .filter((session) => !session.time.archived)
-        .map((session) => {
-          const project =
-            projectForSession(session, opened, openedByID) ?? projectForSession(session, stored, storedByID)
-          return {
-            id: `session:${props.server}:${session.id}`,
-            type: "session" as const,
-            title: session.title || props.untitled(),
-            description: project ? displayName(project) : getFilename(session.location.directory),
-            category: props.category(),
-            directory: session.location.directory,
-            sessionID: session.id,
-            server: props.server,
-            project,
-            updated: session.time.updated,
-          }
-        }),
-    )
+    return props
+      .load(search, current.signal)
+      .then((result) =>
+        result.data
+          .filter((session) => !session.time.archived)
+          .map((session) => {
+            const project =
+              projectForSession(session, opened, openedByID) ?? projectForSession(session, stored, storedByID)
+            return {
+              id: `session:${props.server}:${session.id}`,
+              type: "session" as const,
+              title: session.title || props.untitled(),
+              description: project ? displayName(project) : getFilename(session.location.directory),
+              category: props.category(),
+              directory: session.location.directory,
+              sessionID: session.id,
+              server: props.server,
+              project,
+              updated: session.time.updated,
+            }
+          }),
+      )
+      .catch(() => [] as CommandPaletteEntry[])
   }
 }

packages/app/src/shell/debug/debug-bar.tsx

@@ -88,9 +88,9 @@ function Cell(props: {
         </div>
         <div
           classList={{
-            "uppercase font-bold tabular-nums": true,
-            "text-[11px] leading-text-tight": !!props.inline,
-            "text-[13px] leading-text-compact sm:text-[14px]": !props.inline,
+            "uppercase leading-none font-bold tabular-nums": true,
+            "text-[11px]": !!props.inline,
+            "text-[13px] sm:text-[14px]": !props.inline,
             "text-text-on-critical-base": !!props.bad,
             "opacity-70": !!props.dim,
           }}

packages/app/src/shell/errors/description.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { errorDescriptionKey, errorStatus } from "./description"
+import { errorDescriptionKey } from "./description"
 
 describe("error description", () => {
   test("describes local server startup errors", () => {
@@ -15,19 +15,3 @@ describe("error description", () => {
     )
   })
 })
-
-describe("error status", () => {
-  test("finds status codes in an error cause", () => {
-    expect(errorStatus(new Error("UnexpectedStatus", { cause: { status: 502 } }))).toBe(502)
-  })
-
-  test("finds status codes in structured error data", () => {
-    expect(errorStatus({ name: "APIError", data: { statusCode: 401 } })).toBe(401)
-  })
-
-  test("ignores invalid and circular status values", () => {
-    const error: { status: number; cause?: unknown } = { status: 99 }
-    error.cause = error
-    expect(errorStatus(error)).toBeUndefined()
-  })
-})

packages/app/src/shell/errors/description.ts

@@ -9,21 +9,3 @@ export function errorDescriptionKey(error: unknown) {
   }
   return "error.page.description" as const
 }
-
-export function errorStatus(error: unknown) {
-  const seen = new Set<object>()
-  const visit = (value: unknown): number | undefined => {
-    if (typeof value !== "object" || value === null || seen.has(value)) return
-    seen.add(value)
-    const item = value as Record<string, unknown>
-
-    for (const key of ["status", "statusCode"] as const) {
-      const status = item[key]
-      if (typeof status === "number" && Number.isInteger(status) && status >= 100 && status <= 599) return status
-    }
-
-    return visit(item.cause) ?? visit(item.data)
-  }
-
-  return visit(error)
-}

packages/app/src/shell/errors/error.tsx

@@ -7,7 +7,7 @@ import { createStore } from "solid-js/store"
 import { usePlatform } from "@/runtime/platform/platform"
 import { useLanguage } from "@/runtime/i18n/language"
 import { Icon } from "@opencode-ai/ui/icon"
-import { errorDescriptionKey, errorStatus } from "./description"
+import { errorDescriptionKey } from "./description"
 
 export type InitError = {
   name: string
@@ -223,7 +223,6 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
   const platform = usePlatform()
   const language = useLanguage()
   const formattedError = () => formatError(props.error, language.t)
-  const status = () => errorStatus(props.error)
   let recordedFatalError: Promise<void> | undefined
   const [store, setStore] = createStore({
     actionError: undefined as string | undefined,
@@ -278,20 +277,14 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
 
   return (
     <div
-      class="relative flex-1 h-screen w-screen min-h-0 overflow-y-auto flex flex-col items-center justify-start sm:justify-center p-4 sm:p-8 font-sans"
+      class="relative flex-1 h-screen w-screen min-h-0 flex flex-col items-center justify-center font-sans"
       data-tauri-drag-region
     >
-      <div class="w-full max-w-3xl flex flex-col items-center justify-center gap-6 sm:gap-8 my-auto">
-        <Logo class="w-48 sm:w-58.5 opacity-12 shrink-0" />
+      <div class="w-2/3 max-w-3xl flex flex-col items-center justify-center gap-8">
+        <Logo class="w-58.5 opacity-12 shrink-0" />
         <div class="flex flex-col items-center gap-2 text-center">
-          <h1 class="text-lg font-medium text-text-strong">
-            {language.t(status() ? "error.page.title.status" : "error.page.title")}
-          </h1>
-          <p class="text-sm text-text-weak">
-            {status()
-              ? language.t("error.page.description.status", { status: status()! })
-              : language.t(errorDescriptionKey(props.error))}
-          </p>
+          <h1 class="text-lg font-medium text-text-strong">{language.t("error.page.title")}</h1>
+          <p class="text-sm text-text-weak">{language.t(errorDescriptionKey(props.error))}</p>
         </div>
         <TextField
           value={formattedError()}
@@ -304,7 +297,7 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
         />
         <div class="flex flex-row items-center justify-center gap-3 flex-wrap max-w-64">
           <Button size="large" onClick={platform.restart}>
-            {language.t(platform.platform === "web" ? "error.page.action.reload" : "error.page.action.restart")}
+            {language.t("error.page.action.restart")}
           </Button>
           <Show when={platform.platform === "desktop" && platform.exportDebugLogs}>
             <Button size="large" variant="ghost" onClick={exportDebugLogs}>
@@ -355,8 +348,8 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
         <Show when={store.actionError}>
           {(message) => <p class="text-xs text-text-danger-base text-center max-w-2xl">{message()}</p>}
         </Show>
-        <div class="flex flex-col items-center gap-2 text-xs text-center">
-          <div class="flex flex-wrap items-center justify-center gap-1">
+        <div class="flex flex-col items-center gap-2">
+          <div class="flex items-center justify-center gap-1">
             {language.t("error.page.report.prefix")}
             <button
               type="button"

packages/app/src/shell/notifications/notification.tsx

@@ -215,7 +215,7 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
     dispatchEvent(new PopStateEvent("popstate"))
   }
 
-  const handleSessionIdle = (sessionID: string, time: number) => {
+  const handleSessionIdle = (directory: string, sessionID: string, time: number) => {
     void lookup(sessionID).then((session) => {
       if (meta.disposed) return
       if (!session) return
@@ -226,7 +226,7 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
       }
 
       append({
-        directory: session.location.directory,
+        directory,
         time,
         viewed: viewedInCurrentSession(sessionID),
         type: "turn-complete",
@@ -243,6 +243,7 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
   }
 
   const handleSessionError = (
+    directory: string,
     sessionID: string,
     error: ErrorNotification["error"],
     time: number,
@@ -256,7 +257,7 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
       }
 
       append({
-        directory: session?.location.directory,
+        directory,
         time,
         viewed: viewedInCurrentSession(sessionID),
         type: "error",
@@ -274,14 +275,21 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
   }
 
   const unsub = input.sdk.event.listen((event) => {
-    if (event.type !== "session.execution.succeeded" && event.type !== "session.execution.failed") return
+    if (
+      event.type !== "session.execution.succeeded" &&
+      event.type !== "session.execution.interrupted" &&
+      event.type !== "session.execution.failed"
+    )
+      return
 
+    const directory = event.location?.directory
+    if (!directory) return
     const time = Date.now()
     if (event.type === "session.execution.failed") {
-      handleSessionError(event.data.sessionID, event.data.error, time)
+      handleSessionError(directory, event.data.sessionID, event.data.error, time)
       return
     }
-    handleSessionIdle(event.data.sessionID, time)
+    handleSessionIdle(directory, event.data.sessionID, time)
   })
   onCleanup(() => {
     meta.disposed = true

packages/app/src/shell/notifications/sound.ts

@@ -3,7 +3,7 @@ let loads: Record<SoundID, () => Promise<string>> | undefined
 
 function getFiles() {
   if (files) return files
-  files = import.meta.glob("../../../../ui/src/assets/audio/*.aac", { import: "default" }) as Record<
+  files = import.meta.glob("../../../ui/src/assets/audio/*.aac", { import: "default" }) as Record<
     string,
     () => Promise<string>
   >

packages/app/src/shell/routes/routes.tsx

@@ -1,10 +1,9 @@
 import { Route, useParams } from "@solidjs/router"
-import { createMemo, lazy, Show, Suspense, type ParentProps } from "solid-js"
+import { createMemo, lazy, Show, type ParentProps } from "solid-js"
 import { Home } from "@/home/route"
 import { ServerProvider } from "@/runtime/server/current"
 import { useGlobal } from "@/runtime/server/runtime"
 import { ServerConnection } from "@/runtime/server/registry"
-import { SessionPanelFrame, SessionRouteFrame } from "@/session/session-frame"
 import { LayoutProvider } from "@/shell/state/layout"
 import Shell from "@/shell/shell"
 import { requireServerKey } from "./session"
@@ -32,19 +31,9 @@ export function AppRoutes() {
       <Route
         path="/server/:serverKey/session/:id"
         component={() => (
-          <SessionRouteFrame>
-            <Suspense
-              fallback={
-                <div class="flex min-h-0 flex-1 p-2">
-                  <SessionPanelFrame raised />
-                </div>
-              }
-            >
-              <TargetServerRoute>
-                <TargetSessionRouteContent />
-              </TargetServerRoute>
-            </Suspense>
-          </SessionRouteFrame>
+          <TargetServerRoute>
+            <TargetSessionRouteContent />
+          </TargetServerRoute>
         )}
       />
       <Route path="/new-session" component={DraftRoute} />

packages/app/src/shell/routes/session-ui-provider.tsx

@@ -5,7 +5,6 @@ import { LocalProvider } from "@/providers/models/selection"
 import type { ServerConnection } from "@/runtime/server/registry"
 import { sessionHref } from "@/shell/routes/session"
 import { useData } from "@/runtime/server/current"
-import { useTabs } from "@/shell/tabs/tabs"
 
 export function SessionUIProvider(
   props: ParentProps<{
@@ -16,17 +15,9 @@ export function SessionUIProvider(
   const navigate = useNavigate()
   const params = useParams()
   const data = useData()
-  const tabs = useTabs()
   const directory = () => props.directory
   const href = (sessionID: string) => sessionHref(props.server, sessionID)
   const navigateToSession = async (sessionID: string) => {
-    const tab = tabs.store.find(
-      (item) =>
-        item.type === "session" &&
-        item.server === props.server &&
-        (item.sessionId === params.id || item.routeSessionId === params.id),
-    )
-    if (tab?.type === "session") tabs.rememberSessionRoute(tab, sessionID, params.id)
     await data.session.sync(sessionID).catch(() => undefined)
     navigate(href(sessionID))
   }

packages/app/src/shell/tabs/migration.ts

@@ -7,25 +7,8 @@ export function migrateTabs(value: unknown): Tab[] {
     if (!tab || typeof tab !== "object") return []
     if (!("server" in tab) || typeof tab.server !== "string") return []
     const server = tab.server as ServerConnection.Key
-    if (
-      tab.type === "session" &&
-      typeof tab.sessionId === "string" &&
-      (tab.routeSessionId === undefined || typeof tab.routeSessionId === "string") &&
-      (tab.routeParentId === undefined || typeof tab.routeParentId === "string")
-    ) {
-      return [
-        {
-          type: tab.type,
-          server,
-          sessionId: tab.sessionId,
-          ...(tab.routeSessionId && tab.routeSessionId !== tab.sessionId
-            ? {
-                routeSessionId: tab.routeSessionId,
-                ...(tab.routeParentId ? { routeParentId: tab.routeParentId } : {}),
-              }
-            : {}),
-        },
-      ]
+    if (tab.type === "session" && typeof tab.sessionId === "string") {
+      return [{ type: tab.type, server, sessionId: tab.sessionId }]
     }
     if (
       tab.type === "draft" &&

packages/app/src/shell/tabs/tabs.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test"
 import { createRoot, getOwner, onCleanup } from "solid-js"
 import { createTabMemory } from "./memory"
 import { nextTabAfterClose, pushClosedTab, removeClosedTabs, takeClosedTab, type ClosedTab } from "./closed"
-import { tabHref, tabKey, type SessionTab, type Tab } from "./tabs"
+import type { SessionTab, Tab } from "./tabs"
 import { migrateTabs } from "./migration"
 import type { ServerConnection } from "@/runtime/server/registry"
 
@@ -27,24 +27,6 @@ describe("tab migration", () => {
     expect(migrateTabs(null)).toEqual([])
     expect(migrateTabs({})).toEqual([])
   })
-
-  test("preserves the active child route", () => {
-    expect(migrateTabs([{ ...sessionTab("root"), routeSessionId: "child", routeParentId: "parent" }])).toEqual([
-      { ...sessionTab("root"), routeSessionId: "child", routeParentId: "parent" },
-    ])
-  })
-
-  test("drops an invalid child route", () => {
-    expect(migrateTabs([{ ...sessionTab("parent"), routeSessionId: 1 }])).toEqual([])
-  })
-})
-
-test("session tab identity stays rooted while its href follows the child route", () => {
-  const parent = sessionTab("parent")
-  const child = { ...parent, routeSessionId: "child" }
-
-  expect(tabKey(child)).toBe(tabKey(parent))
-  expect(tabHref(child)).toContain("/session/child")
 })
 
 describe("tab memory", () => {

packages/app/src/shell/tabs/tabs.tsx

@@ -19,8 +19,6 @@ export type SessionTab = {
   type: "session"
   server: ServerConnection.Key
   sessionId: string
-  routeSessionId?: string
-  routeParentId?: string
 }
 
 export type DraftTab = {
@@ -45,18 +43,12 @@ type RecentTab = {
 export const draftHref = (draftID: string) => `/new-session?draftId=${encodeURIComponent(draftID)}`
 
 export const tabHref = (tab: Tab) =>
-  tab.type === "draft" ? draftHref(tab.draftID) : sessionHref(tab.server, tab.routeSessionId ?? tab.sessionId)
+  tab.type === "draft" ? draftHref(tab.draftID) : sessionHref(tab.server, tab.sessionId)
 
-export const tabKey = (tab: Tab) =>
-  tab.type === "draft" ? `draft:${tab.draftID}` : `${tab.server}\n${sessionHref(tab.server, tab.sessionId)}`
+export const tabKey = (tab: Tab) => (tab.type === "draft" ? `draft:${tab.draftID}` : `${tab.server}\n${tabHref(tab)}`)
 
 export function sessionHasOpenTab(tabs: Tab[], server: ServerConnection.Key, session: SessionInfo) {
-  return tabs.some(
-    (tab) =>
-      tab.type === "session" &&
-      tab.server === server &&
-      (tab.sessionId === session.id || tab.routeSessionId === session.id),
-  )
+  return tabs.some((tab) => tab.type === "session" && tab.server === server && tab.sessionId === session.id)
 }
 
 export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
@@ -73,10 +65,7 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
       createStore<Tab[]>([]),
     )
     const [recent, setRecent, , recentReady] = persisted(Persist.window("tabs.recent"), createStore<RecentTab>({}))
-    const [info, setInfo, , infoReady] = persisted(
-      Persist.window("tabs.info"),
-      createStore<Record<string, TabInfo>>({}),
-    )
+    const [info, setInfo] = persisted(Persist.window("tabs.info"), createStore<Record<string, TabInfo>>({}))
     const [closed, setClosed, , closedReady] = persisted(Persist.window("tabs.closed"), createStore<ClosedTab[]>([]))
 
     const params = useParams()
@@ -292,10 +281,7 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
       removeSessionTab(input: Omit<SessionTab, "type">) {
         updateClosed((stack) => removeClosedTabs(stack, input.server, [input.sessionId]))
         const index = store.findIndex(
-          (tab) =>
-            tab.type === "session" &&
-            tab.server === input.server &&
-            (tab.sessionId === input.sessionId || tab.routeSessionId === input.sessionId),
+          (tab) => tab.type === "session" && tab.server === input.server && tab.sessionId === input.sessionId,
         )
         if (index !== -1) removeTab(index)
       },
@@ -371,18 +357,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
         const key = tabKey(tab)
         if (recentKey() !== key) setRecentKey(key)
       },
-      rememberSessionRoute(tab: SessionTab, sessionId: string, parentId?: string) {
-        const index = store.findIndex((item) => tabKey(item) === tabKey(tab))
-        if (index === -1) return
-        setStore(
-          index,
-          produce((item) => {
-            if (item.type !== "session") return
-            item.routeSessionId = sessionId === item.sessionId ? undefined : sessionId
-            item.routeParentId = sessionId === item.sessionId ? undefined : parentId
-          }),
-        )
-      },
       toggleHome(input: { home: boolean; current?: Tab }) {
         if (input.home) {
           const tab = store.find((tab) => tabKey(tab) === recentKey())
@@ -404,6 +378,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
       },
     }
 
-    return { ...actions, store, info, ready, infoReady, recentReady }
+    return { ...actions, store, info, ready, recentReady }
   },
 })

packages/app/src/shell/titlebar/tab-popover.css

@@ -88,7 +88,7 @@
   [data-slot="server"] {
     font-weight: 440;
     font-size: 13px;
-    line-height: var(--line-height-compact);
+    line-height: 1;
     letter-spacing: -0.04px;
     color: var(--v2-text-text-muted);
     overflow: hidden;

packages/app/src/shell/titlebar/titlebar.tsx

@@ -151,24 +151,15 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
             const tabs = useTabs()
             const tabsStore = tabs.store
             const tabsStoreActions = tabs
-            const [loadedSession] = createResource(
+            const [session] = createResource(
               () => {
                 const route = layout.route()
                 if (route.type !== "session") return undefined
                 const conn = global.servers.list().find((item) => ServerConnection.key(item) === route.server)
-                return conn ? { route, ctx: global.ensureServerCtx(conn) } : undefined
+                return conn ? { route, sdk: global.ensureServerCtx(conn).sdk } : undefined
               },
-              ({ route, ctx }) => ctx.sdk.api.session.get({ sessionID: route.sessionId }).catch(() => {}),
+              ({ route, sdk }) => sdk.api.session.get({ sessionID: route.sessionId }).catch(() => {}),
             )
-            const session = createMemo(() => {
-              const route = layout.route()
-              if (route.type !== "session") return
-              const conn = global.servers.list().find((item) => ServerConnection.key(item) === route.server)
-              const cached = conn ? global.ensureServerCtx(conn).data.session.get(route.sessionId) : undefined
-              if (cached) return cached
-              const loaded = loadedSession()
-              return loaded?.id === route.sessionId ? loaded : undefined
-            })
 
             const matchRoute = (route: LayoutRoute) => {
               if (route.type === "home") return
@@ -178,9 +169,7 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
               if (route.type === "session") {
                 const main = tabsStore.find(
                   (item) =>
-                    item.type === "session" &&
-                    item.server === route.server &&
-                    (item.sessionId === route.sessionId || item.routeSessionId === route.sessionId),
+                    item.type === "session" && item.server === route.server && item.sessionId === route.sessionId,
                 )
                 if (main) return main
                 const s = session()
@@ -201,14 +190,6 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
               if (!tabs.ready()) return
               const tab = currentTab()
               if (tab) {
-                const current = session()
-                if (
-                  route.type === "session" &&
-                  tab.type === "session" &&
-                  (route.sessionId === tab.sessionId || current?.id === route.sessionId)
-                ) {
-                  tabs.rememberSessionRoute(tab, route.sessionId, current?.parentID)
-                }
                 tabs.remember(tab)
                 return
               }