Merge branch 'v2' into project-save-refresh

fix(app): keep shared project query reactive
chore: update nix node_modules hashes
2026-10-20 12:17:02 +08:00 · 2026-08-26 11:38:33 +08:00 · 2026-08-26 03:37:22 +00:00 · 2026-08-26 03:32:00 +00:00 · 2026-08-25 22:30:14 -05:00 · 2026-08-25 22:26:15 -05:00
80 changed files with 1308 additions and 395 deletions
@@ -347,7 +347,6 @@
        "@ai-sdk/anthropic": "3.0.82",
        "@ai-sdk/azure": "3.0.88",
        "@ai-sdk/cohere": "3.0.27",
-        "@ai-sdk/deepinfra": "2.0.41",
        "@ai-sdk/gateway": "3.0.104",
        "@ai-sdk/google-vertex": "4.0.128",
        "@ai-sdk/groq": "3.0.31",
@@ -1178,8 +1177,6 @@

    "@ai-sdk/deepgram": ["@ai-sdk/deepgram@2.0.52", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@ai-sdk/provider-utils": "4.0.46" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8pcrQvEQCbvrrQKnD6hclBbI0hUgSrgyADykRbabxv/g9vPurfMC6n23J7dD+KZ3EcCoW+qz3IUIfySJ58gBOg=="],

-    "@ai-sdk/deepinfra": ["@ai-sdk/deepinfra@2.0.41", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.37", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-y6RoOP7DGWmDSiSxrUSt5p18sbz+Ixe5lMVPmdE7x+Tr5rlrzvftyHhjWHfqlAtoYERZTGFbP6tPW1OfQcrb4A=="],
-
    "@ai-sdk/deepseek": ["@ai-sdk/deepseek@2.0.47", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@ai-sdk/provider-utils": "4.0.38" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MzcQ321JO8OY+TVLFI81A7cIIuoeLLxrLCDD+8C1E3Ro6UFyfMtRXo9bw9OhTMRSDMo6hgSDOo4Fekz8aJtQYQ=="],

    "@ai-sdk/elevenlabs": ["@ai-sdk/elevenlabs@2.0.52", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@ai-sdk/provider-utils": "4.0.46" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZgkausouWvO9U4ZtowNJ093bSNYOvH8zqls3uLC3+oxzWvbbTZO8SOdmFk0+gGafsXFJvq2yUX9+rEeJPwOJLw=="],
@@ -5910,10 +5907,6 @@

    "@ai-sdk/deepgram/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.46", "", { "dependencies": { "@ai-sdk/provider": "3.0.15", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8", "undici": "^6.28.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-tEtld97plCFiYevsJuOkGkeuhQndeMWFBVrJS4AjnbD5AqrNSXRCe0p+BZ3Cju/sxDeeZ9ym3q9YUV8fASA7aQ=="],

-    "@ai-sdk/deepinfra/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@2.0.37", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.21" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-+POSFVcgiu47BK64dhsI6OpcDC0/VAE2ZSaXdXGNNhpC/ava++uSRJYks0k2bpfY0wwCTgpAWZsXn/dG2Yppiw=="],
-
-    "@ai-sdk/deepinfra/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.21", "", { "dependencies": { "@ai-sdk/provider": "3.0.8", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-MtFUYI1/8mgDvRmaBDjbLJPFFrMG777AvSgyIFQtZHIMzm88R/12vYBBpnk7pfiWLFE1DSZzY4WDYzGbKAcmiw=="],
-
    "@ai-sdk/deepseek/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],

    "@ai-sdk/deepseek/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@4.0.38", "", { "dependencies": { "@ai-sdk/provider": "3.0.14", "@standard-schema/spec": "^1.1.0", "eventsource-parser": "^3.0.8" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-/HHGmtKllqjg1OLc023v9w9kK3laW7Z6TzfZukYQWCsGBbzB9p60zTvvpXFVcs44NZBVXL3viOa1HRKUbeee8g=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-oQnV96kE3lIqsQaaUrH4tiEX8/5xvBWizXMGxayFSHo=",
-    "aarch64-linux": "sha256-Hkl1xdCQ7voAllwtyrm3TjQT9cfej29fvPIP3lH7zVo=",
-    "aarch64-darwin": "sha256-s0WHRB13qcD0KlgWNXO7gLpsDOnfB8xny81GnN5YeQc=",
-    "x86_64-darwin": "sha256-fnYi1AxCrnO3byW9keDfBH2ueCfGZdaweOrV6AerrGs="
+    "x86_64-linux": "sha256-t7k0Nk9Z7FMkAKt2UReI1jD1KoPB+LhQQx1x1p5Htlc=",
+    "aarch64-linux": "sha256-tU7C2zYKiX+RpwBBBLjX7vrqQNLPvDc5Uz9EbgGJvSA=",
+    "aarch64-darwin": "sha256-A3o+2zNuFHV5FZx/azdXBjcKdS5o41b2e2Q1Qq8C1m0=",
+    "x86_64-darwin": "sha256-NXgvteaxJQqBBZIHnQbivghHTJnL2IMZiFPNssGp2Os="
  }
 }
@@ -196,7 +196,7 @@ type LoweredInputItem =
 // multiple streamed summary parts into the same item before flushing.
 type OpenResponsesReasoningInput = {
  type: "reasoning"
-  id: string
+  id?: string
  summary: Array<{ type: "summary_text"; text: string }>
  encrypted_content?: string | null
 }
@@ -372,9 +372,6 @@ export const Event = Schema.StructWithRest(
 )
 export type Event = Schema.Schema.Type<typeof Event>

-// Which lowered input item a persisted item id is about to be attached to.
-export type ItemKind = "message" | "reasoning" | "function-call" | "hosted-tool"
-
 export interface Extension {
  readonly id: string
  readonly name: string
@@ -384,10 +381,6 @@ export interface Extension {
    readonly request: LLMRequest
  }) => MediaInput | undefined
  readonly lowerHostedToolItem?: (item: unknown) => ExtendedHostedToolItem | undefined
-  // Optional grammar check applied before a persisted item id is resent as
-  // part of replayed history. Returning false drops the id; every lowered
-  // item treats a dropped id the same as an absent one.
-  readonly acceptsItemID?: (kind: ItemKind, id: string) => boolean
 }

 const BASE: Extension = { id: ADAPTER, name: NAME }
@@ -447,53 +440,37 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LL
    tool: (toolName) => ({ type: "function" as const, name: toolName }),
  })

-// Servers validate item ids on replayed history, and a malformed or oversized
-// id can fail an otherwise valid request. Only server-issued tokens are worth
-// resending; anything else is treated as absent so the item is resent without
-// an id (or skipped, for items that cannot be expressed without one).
-const ITEM_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/
+// Server-issued item ids need a nonempty prefix and suffix, but the prefix is
+// provider-defined and does not necessarily identify the item's semantic type.
 const itemID = (providerMetadata: ProviderMetadata | undefined, providerMetadataKey: string) => {
  const metadata = providerMetadata?.[providerMetadataKey]
-  return ProviderShared.isRecord(metadata) &&
-    typeof metadata.itemId === "string" &&
-    ITEM_ID_PATTERN.test(metadata.itemId)
-    ? metadata.itemId
-    : undefined
+  if (!ProviderShared.isRecord(metadata) || typeof metadata.itemId !== "string") return undefined
+  const separator = metadata.itemId.indexOf("_")
+  return separator > 0 && separator < metadata.itemId.length - 1 ? metadata.itemId : undefined
 }

-const acceptsItemID = (extension: Extension, kind: ItemKind, id: string | undefined): id is string =>
-  id !== undefined && (extension.acceptsItemID?.(kind, id) ?? true)
-
-const lowerToolCall = (
-  part: ToolCallPart,
-  providerMetadataKey: string,
-  extension: Extension,
-): OpenResponsesInputItem => {
+const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenResponsesInputItem => {
  const id = itemID(part.providerMetadata, providerMetadataKey)
  return {
    type: "function_call",
-    ...(acceptsItemID(extension, "function-call", id) ? { id } : {}),
+    ...(id === undefined ? {} : { id }),
    call_id: part.id,
    name: part.name,
    arguments: ProviderShared.encodeJson(part.input),
  }
 }

-const lowerReasoning = (
-  part: ReasoningPart,
-  providerMetadataKey: string,
-  extension: Extension,
-): OpenResponsesReasoningInput | undefined => {
+const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
  const metadata = part.providerMetadata?.[providerMetadataKey]
+  if (!ProviderShared.isRecord(metadata)) return undefined
  const id = itemID(part.providerMetadata, providerMetadataKey)
-  if (!ProviderShared.isRecord(metadata) || !acceptsItemID(extension, "reasoning", id)) return undefined
  const encryptedContent =
    typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null
      ? metadata.reasoningEncryptedContent
      : undefined
  return {
    type: "reasoning",
-    id,
+    ...(id === undefined ? {} : { id }),
    summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
    encrypted_content: encryptedContent,
  }
@@ -614,8 +591,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
          Array<{ id: string | undefined; phase: MessagePhase | null | undefined; parts: TextPart[] }>
        >((groups, part) => {
          const metadata = part.providerMetadata?.[providerMetadataKey]
-          const rawID = itemID(part.providerMetadata, providerMetadataKey)
-          const id = acceptsItemID(extension, "message", rawID) ? rawID : undefined
+          const id = itemID(part.providerMetadata, providerMetadataKey)
          const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase) : undefined
          const group = groups.at(-1)
          if (group && group.id === id && group.phase === phase) group.parts.push(part)
@@ -640,23 +616,23 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
        }
        if (part.type === "reasoning") {
          flushText()
-          const reasoning = lowerReasoning(part, providerMetadataKey, extension)
+          const reasoning = lowerReasoning(part, providerMetadataKey)
          if (!reasoning) continue
-          const existing = reasoningItems[reasoning.id]
+          const existing = reasoning.id === undefined ? undefined : reasoningItems[reasoning.id]
          if (existing) {
            existing.summary.push(...reasoning.summary)
            if (typeof reasoning.encrypted_content === "string")
              existing.encrypted_content = reasoning.encrypted_content
            continue
          }
-          reasoningItems[reasoning.id] = reasoning
+          if (reasoning.id !== undefined) reasoningItems[reasoning.id] = reasoning
          input.push(reasoning)
          continue
        }
        if (part.type === "tool-call") {
          flushText()
          if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part, providerMetadataKey, extension))
+          input.push(lowerToolCall(part, providerMetadataKey))
          continue
        }
        if (part.type === "tool-result" && part.providerExecuted === true) {
@@ -668,7 +644,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
              : Schema.is(HostedToolItem)(part.result.value)
                ? part.result.value
                : extension.lowerHostedToolItem?.(part.result.value)
-          if (acceptsItemID(extension, "hosted-tool", id) && hosted?.id === id) {
+          if (id !== undefined && hosted?.id === id) {
            if (!hostedToolItems.has(id)) {
              input.push(hosted)
              hostedToolItems.add(id)
@@ -86,28 +86,10 @@ const OpenAIResponsesBody = Schema.Struct({
 })
 export type OpenAIResponsesBody = Schema.Schema.Type<typeof OpenAIResponsesBody>

-// Replayed items are paired with stored server state by id, so a foreign or
-// synthetic token can fail request validation even when `call_id` pairing is
-// intact. Only resend ids in each item kind's own grammar; hosted tool
-// items keep generic validation because every hosted tool mints its own
-// prefix. The same allowlist approach codex uses before resending history
-// (codex-rs core/src/client.rs, `prepare_response_items_for_request`).
-const ITEM_ID_PREFIXES: Record<OpenResponses.ItemKind, ReadonlyArray<string>> = {
-  message: ["msg_"],
-  reasoning: ["rs_"],
-  "function-call": ["fc_"],
-  // Every hosted tool mints its own id prefix, so items keep generic validation.
-  "hosted-tool": [],
-}
-
 const extension = {
  id: ADAPTER,
  name: NAME,
  lowerHostedToolItem: (item: unknown) => (Schema.is(OpenAIResponsesHostedToolItem)(item) ? item : undefined),
-  acceptsItemID: (kind: OpenResponses.ItemKind, id: string) => {
-    const prefixes = ITEM_ID_PREFIXES[kind]
-    return prefixes.length === 0 || prefixes.some((prefix) => id.startsWith(prefix))
-  },
 } satisfies OpenResponses.Extension

 const nativeImageToolInput = (tool: ToolDefinition) => {
@@ -40,15 +40,16 @@ const patterns = [
  /model_context_window_exceeded/i,
  /too many tokens/i,
  /token limit exceeded/i,
+  /request_too_large/i,
 ]

-const payloadPatterns = [/request_too_large/i, /request entity too large/i, /payload too large/i, /request too large/i]
+const payloadPatterns = [/request entity too large/i, /payload too large/i, /request too large/i]

 const exclusions = [/^(throttling error|service unavailable):/i, /rate limit/i, /too many requests/i]

 export const isContextOverflow = (message: string) =>
  !exclusions.some((pattern) => pattern.test(message)) &&
-  (patterns.some((pattern) => pattern.test(message)) || /^400\s*(status code)?\s*\(no body\)/i.test(message))
+  (patterns.some((pattern) => pattern.test(message)) || /^4(?:00|13)\s*(status code)?\s*\(no body\)/i.test(message))

 export const isPayloadTooLarge = (message: string) => payloadPatterns.some((pattern) => pattern.test(message))

@@ -106,6 +107,7 @@ export function classifyProviderFailure(input: ProviderFailure): AIError["reason
    clientScoped &&
    (codes.includes("context_length_exceeded") ||
      codes.includes("model_context_window_exceeded") ||
+      codes.includes("request_too_large") ||
      isContextOverflow(text))
  )
    return new InvalidRequestReason({ ...common, classification: "context-overflow" })
@@ -0,0 +1,61 @@
+import type { ProviderPackage } from "../provider-package.js"
+import { OpenAICompatibleChat } from "../protocols/openai-compatible-chat.js"
+import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
+import type { RouteDefaultsInput } from "../route/client.js"
+import { ProviderID, type ModelID } from "../schema/index.js"
+import { profiles } from "./openai-compatible-profile.js"
+import type { OpenAIProviderOptionsInput } from "./openai-options.js"
+
+export const id = ProviderID.make("deepinfra")
+
+export type LanguageModelOptions = Omit<RouteDefaultsInput, "providerOptions"> &
+  ProviderAuthOption<"optional"> & {
+    readonly baseURL?: string
+    readonly providerOptions?: OpenAIProviderOptionsInput
+  }
+
+export interface Settings extends ProviderPackage.Settings {
+  readonly apiKey?: string
+  readonly baseURL?: string
+  readonly providerOptions?: OpenAIProviderOptionsInput
+}
+
+export const route = OpenAICompatibleChat.route.with({
+  id: "deepinfra-chat",
+  provider: id,
+  endpoint: { baseURL: profiles.deepinfra.baseURL },
+})
+
+export const routes = [route]
+
+export const configure = (input: LanguageModelOptions = {}) => {
+  const { apiKey: _apiKey, auth: _auth, baseURL, ...defaults } = input
+  const root = baseURL?.replace(/\/+$/, "")
+  const configured = route.with({
+    ...defaults,
+    endpoint: {
+      baseURL: root === undefined ? profiles.deepinfra.baseURL : root.endsWith("/openai") ? root : `${root}/openai`,
+    },
+    auth: AuthOptions.bearer(input, "DEEPINFRA_API_KEY"),
+  })
+  return {
+    id,
+    model: (modelID: string | ModelID) =>
+      configured.model<OpenAIProviderOptionsInput>({
+        id: modelID,
+        compatibility: { maxTokensField: "max_tokens", reasoningField: "reasoning_content", supportsStore: false },
+      }),
+    configure,
+  }
+}
+
+export const provider = configure()
+
+export const model: ProviderPackage.Definition<Settings, OpenAIProviderOptionsInput>["model"] = (modelID, settings) =>
+  configure({
+    apiKey: settings.apiKey,
+    baseURL: settings.baseURL,
+    headers: settings.headers === undefined ? undefined : { ...settings.headers },
+    http: settings.body === undefined ? undefined : { body: { ...settings.body } },
+    providerOptions: settings.providerOptions,
+  }).model(modelID)
@@ -6,6 +6,7 @@ export * as Azure from "./azure.js"
 export * as Cerebras from "./cerebras.js"
 export * as Cloudflare from "./cloudflare.js"
 export { CloudflareAIGateway, CloudflareWorkersAI } from "./cloudflare.js"
+export * as DeepInfra from "./deepinfra.js"
 export * as Google from "./google.js"
 export * as GoogleVertex from "./google-vertex.js"
 export * as GoogleVertexChat from "./google-vertex-chat.js"
@@ -211,6 +211,28 @@ describe("RequestExecutor", () => {
    }).pipe(Effect.provide(responsesLayer([new Response("request too large", { status: 413 })]))),
  )

+  it.effect("classifies Anthropic request_too_large as context overflow", () =>
+    Effect.gen(function* () {
+      const executor = yield* RequestExecutor.Service
+      const error = yield* executor.execute(request).pipe(Effect.flip)
+
+      expectAIError(error)
+      expect(error.reason).toMatchObject({
+        _tag: "InvalidRequest",
+        classification: "context-overflow",
+        http: { response: { status: 413 } },
+      })
+    }).pipe(
+      Effect.provide(
+        responsesLayer([
+          new Response('{"error":{"type":"request_too_large","message":"Request exceeds the maximum size"}}', {
+            status: 413,
+          }),
+        ]),
+      ),
+    ),
+  )
+
  it.effect("does not classify ordinary invalid requests as context overflow", () =>
    Effect.gen(function* () {
      const executor = yield* RequestExecutor.Service
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "deepinfra",
+    "route": "deepinfra-chat",
+    "transport": "http",
+    "model": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+    "tags": ["prefix:deepinfra-chat", "provider:deepinfra", "text", "golden"],
+    "name": "deepinfra-chat/deepinfra-llama-3-3-70b-text",
+    "recordedAt": "2026-08-26T00:34:03.019Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://api.deepinfra.com/v1/openai/chat/completions",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"messages\":[{\"role\":\"system\",\"content\":\"You are concise.\"},{\"role\":\"user\",\"content\":\"Reply exactly with: Hello!\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":40,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-RbZ8MyY5pos2MShihSmoXoRe\",\"object\":\"chat.completion.chunk\",\"created\":1787704442,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RbZ8MyY5pos2MShihSmoXoRe\",\"object\":\"chat.completion.chunk\",\"created\":1787704442,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"Hello\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RbZ8MyY5pos2MShihSmoXoRe\",\"object\":\"chat.completion.chunk\",\"created\":1787704442,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"!\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RbZ8MyY5pos2MShihSmoXoRe\",\"object\":\"chat.completion.chunk\",\"created\":1787704442,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":25,\"total_tokens\":28,\"completion_tokens\":3,\"estimated_cost\":null,\"prompt_tokens_details\":null}}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RbZ8MyY5pos2MShihSmoXoRe\",\"object\":\"chat.completion.chunk\",\"created\":1787704442,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[],\"usage\":{\"prompt_tokens\":25,\"total_tokens\":28,\"completion_tokens\":3,\"estimated_cost\":3.46e-6,\"prompt_tokens_details\":null}}\n\ndata: [DONE]\n\n"
+      }
+    }
+  ]
+}
@@ -0,0 +1,32 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "deepinfra",
+    "route": "deepinfra-chat",
+    "transport": "http",
+    "model": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+    "tags": ["prefix:deepinfra-chat", "provider:deepinfra", "tool", "tool-call", "golden"],
+    "name": "deepinfra-chat/deepinfra-llama-3-3-70b-tool-call",
+    "recordedAt": "2026-08-26T00:34:04.173Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://api.deepinfra.com/v1/openai/chat/completions",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"messages\":[{\"role\":\"system\",\"content\":\"Call tools exactly as requested.\"},{\"role\":\"user\",\"content\":\"Call get_weather with city exactly Paris.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"tool_choice\":{\"type\":\"function\",\"function\":{\"name\":\"get_weather\"}},\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-RFOwhlB2PhZrgMLviGrx5BQf\",\"object\":\"chat.completion.chunk\",\"created\":1787704443,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RFOwhlB2PhZrgMLviGrx5BQf\",\"object\":\"chat.completion.chunk\",\"created\":1787704443,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":[{\"index\":0,\"id\":\"call_SMfBjXa8eCmHLyjfeyARxe3a\",\"function\":{\"arguments\":\"{\\\"city\\\": \\\"Paris\\\"}\",\"name\":\"get_weather\"},\"type\":\"function\"}]},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RFOwhlB2PhZrgMLviGrx5BQf\",\"object\":\"chat.completion.chunk\",\"created\":1787704443,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":230,\"total_tokens\":244,\"completion_tokens\":14,\"estimated_cost\":null,\"prompt_tokens_details\":null}}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RFOwhlB2PhZrgMLviGrx5BQf\",\"object\":\"chat.completion.chunk\",\"created\":1787704443,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[],\"usage\":{\"prompt_tokens\":230,\"total_tokens\":244,\"completion_tokens\":14,\"estimated_cost\":0.000027480000000000005,\"prompt_tokens_details\":null}}\n\ndata: [DONE]\n\n"
+      }
+    }
+  ]
+}
@@ -0,0 +1,50 @@
+{
+  "version": 1,
+  "metadata": {
+    "provider": "deepinfra",
+    "route": "deepinfra-chat",
+    "transport": "http",
+    "model": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+    "tags": ["prefix:deepinfra-chat", "provider:deepinfra", "tool", "tool-loop", "golden"],
+    "name": "deepinfra-chat/deepinfra-llama-3-3-70b-tool-loop",
+    "recordedAt": "2026-08-26T00:34:05.656Z"
+  },
+  "interactions": [
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://api.deepinfra.com/v1/openai/chat/completions",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-RxlHFSnlLbUUz6XSxqBQj7TC\",\"object\":\"chat.completion.chunk\",\"created\":1787704444,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxlHFSnlLbUUz6XSxqBQj7TC\",\"object\":\"chat.completion.chunk\",\"created\":1787704444,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":[{\"index\":0,\"id\":\"call_W3stxe7FNHozlB4tDxlTVZou\",\"function\":{\"arguments\":\"{\\\"city\\\": \\\"Paris\\\"}\",\"name\":\"get_weather\"},\"type\":\"function\"}]},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxlHFSnlLbUUz6XSxqBQj7TC\",\"object\":\"chat.completion.chunk\",\"created\":1787704444,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":243,\"total_tokens\":257,\"completion_tokens\":14,\"estimated_cost\":null,\"prompt_tokens_details\":null}}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RxlHFSnlLbUUz6XSxqBQj7TC\",\"object\":\"chat.completion.chunk\",\"created\":1787704444,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[],\"usage\":{\"prompt_tokens\":243,\"total_tokens\":257,\"completion_tokens\":14,\"estimated_cost\":0.000028780000000000002,\"prompt_tokens_details\":null}}\n\ndata: [DONE]\n\n"
+      }
+    },
+    {
+      "transport": "http",
+      "request": {
+        "method": "POST",
+        "url": "https://api.deepinfra.com/v1/openai/chat/completions",
+        "headers": {
+          "content-type": "application/json"
+        },
+        "body": "{\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"},{\"role\":\"assistant\",\"content\":null,\"tool_calls\":[{\"id\":\"call_W3stxe7FNHozlB4tDxlTVZou\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}}],\"reasoning_content\":\"\"},{\"role\":\"tool\",\"tool_call_id\":\"call_W3stxe7FNHozlB4tDxlTVZou\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":80,\"temperature\":0}"
+      },
+      "response": {
+        "status": 200,
+        "headers": {
+          "content-type": "text/event-stream; charset=utf-8"
+        },
+        "body": "data: {\"service_tier\":null,\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"Paris\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\" is\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\" sunny\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\".\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":null}],\"usage\":null}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"reasoning_content\":null,\"tool_calls\":null},\"logprobs\":null,\"finish_reason\":\"stop\"}],\"usage\":{\"prompt_tokens\":276,\"total_tokens\":281,\"completion_tokens\":5,\"estimated_cost\":null,\"prompt_tokens_details\":null}}\n\ndata: {\"service_tier\":\"default\",\"id\":\"chatcmpl-RHESVChSFPybgK1eUj2cLLY0\",\"object\":\"chat.completion.chunk\",\"created\":1787704445,\"model\":\"meta-llama/Llama-3.3-70B-Instruct-Turbo\",\"choices\":[],\"usage\":{\"prompt_tokens\":276,\"total_tokens\":281,\"completion_tokens\":5,\"estimated_cost\":0.0000292,\"prompt_tokens_details\":null}}\n\ndata: [DONE]\n\n"
+      }
+    }
+  ]
+}
@@ -18,13 +18,19 @@ describe("provider error classification", () => {
    expect(messages.every(isContextOverflow)).toBe(true)
  })

-  test("classifies request size failures separately from context overflow", () => {
-    const failures = [
-      classifyProviderFailure({ message: "request too large", status: 413 }),
+  test("classifies Anthropic request_too_large as recoverable overflow", () => {
+    expect(
      classifyProviderFailure({
        message: '{"error":{"type":"request_too_large","message":"Request exceeds the maximum size"}}',
        status: 400,
      }),
+    ).toMatchObject({ _tag: "InvalidRequest", classification: "context-overflow" })
+    expect(isContextOverflow("413 status code (no body)")).toBe(true)
+  })
+
+  test("classifies generic request size failures separately from context overflow", () => {
+    const failures = [
+      classifyProviderFailure({ message: "request too large", status: 413 }),
      classifyProviderFailure({ message: "upstream request entity too large", status: 502 }),
    ]

@@ -33,7 +39,6 @@ describe("provider error classification", () => {
        expect.objectContaining({ _tag: "InvalidRequest", classification: "payload-too-large" }),
      ),
    )
-    expect(isContextOverflow("413 status code (no body)")).toBe(false)
  })

  test("does not classify rate limits as context overflow", () => {
@@ -28,6 +28,7 @@ describe("provider package entrypoints", () => {
      import("@opencode-ai/ai/providers/amazon-bedrock/mantle/responses"),
      import("@opencode-ai/ai/providers/togetherai"),
      import("@opencode-ai/ai/providers/cerebras"),
+      import("@opencode-ai/ai/providers/deepinfra"),
    ])

    for (const module of modules) expect(module.model).toBeFunction()
@@ -37,6 +38,24 @@ describe("provider package entrypoints", () => {
    expect(modules[19].model).toBe(modules[20].model)
  })

+  test("maps DeepInfra package settings onto its native executable model", async () => {
+    const DeepInfra = await import("@opencode-ai/ai/providers/deepinfra")
+    const settings = {
+      apiKey: "fixture",
+      baseURL: "https://provider.example.test/v1/",
+      headers: { "x-application": "opencode" },
+      body: { service_tier: "priority" },
+      providerOptions: { reasoningEffort: "high" as const },
+    }
+    const deepinfra = DeepInfra.model("google/gemma-3-27b-it", settings)
+
+    expect(deepinfra.route.id).toBe("deepinfra-chat")
+    expect(deepinfra.route.endpoint.baseURL).toBe("https://provider.example.test/v1/openai")
+    expect(deepinfra.route.defaults.providerOptions).toEqual(settings.providerOptions)
+    expect(deepinfra.route.defaults.headers).toEqual(settings.headers)
+    expect(deepinfra.route.defaults.http?.body).toEqual(settings.body)
+  })
+
  test("maps OpenRouter and xAI package settings onto executable models", async () => {
    const OpenRouter = await import("@opencode-ai/ai/providers/openrouter")
    const XAI = await import("@opencode-ai/ai/providers/xai")
@@ -1,11 +1,11 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
 import { HttpClientRequest } from "effect/unstable/http"
-import { LLM } from "../../src/index.js"
+import { LLM, Message } from "../../src/index.js"
 import { AmazonBedrockMantle } from "../../src/providers.js"
 import { compileRequest, LLMClient } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
-import { dynamicResponse } from "../lib/http.js"
+import { dynamicResponse, fixedResponse } from "../lib/http.js"
 import { sseEvents } from "../lib/sse.js"
 import { recordedTests } from "../recorded-test.js"

@@ -83,6 +83,39 @@ describe("Amazon Bedrock Mantle provider", () => {
      expect(seen).toEqual([{ url: "https://mantle.test/v1/chat/completions", authorization: "Bearer test-key" }])
    }),
  )
+
+  it.effect("replays reasoning with Mantle's message-prefixed item ids", () =>
+    Effect.gen(function* () {
+      const model = AmazonBedrockMantle.configure({ apiKey: "test-key" }).responses("openai.gpt-oss-120b")
+      const item = { type: "reasoning", id: "msg_95d4d0af4350432a", encrypted_content: "mantle-state" }
+      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think." })).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              { type: "response.output_item.added", item },
+              { type: "response.reasoning_summary_text.delta", item_id: item.id, delta: "Considering." },
+              { type: "response.output_item.done", item },
+              { type: "response.completed", response: { id: "resp_1" } },
+            ),
+          ),
+        ),
+      )
+
+      const prepared = yield* compileRequest(
+        LLM.request({ model, messages: [response.message, Message.user("Continue.")] }),
+      )
+
+      expect(prepared.body.input).toEqual([
+        {
+          type: "reasoning",
+          id: "msg_95d4d0af4350432a",
+          summary: [{ type: "summary_text", text: "Considering." }],
+          encrypted_content: "mantle-state",
+        },
+        { role: "user", content: [{ type: "input_text", text: "Continue." }] },
+      ])
+    }),
+  )
 })

 const recorded = recordedTests({
@@ -1,6 +1,6 @@
 import * as Anthropic from "../../src/providers/anthropic.js"
 import * as AnthropicCompatible from "../../src/providers/anthropic-compatible.js"
-import { Cerebras, TogetherAI } from "../../src/providers/index.js"
+import { Cerebras, DeepInfra, TogetherAI } from "../../src/providers/index.js"
 import { CloudflareAIGateway, CloudflareWorkersAI } from "../../src/providers/cloudflare.js"
 import * as Google from "../../src/providers/google.js"
 import * as OpenAI from "../../src/providers/openai.js"
@@ -55,6 +55,9 @@ const cerebras = Cerebras.configure({ apiKey: process.env.CEREBRAS_API_KEY ?? "f
 const groq = OpenAICompatible.groq
  .configure({ apiKey: process.env.GROQ_API_KEY ?? "fixture" })
  .model("llama-3.3-70b-versatile")
+const deepInfra = DeepInfra.configure({ apiKey: process.env.DEEPINFRA_API_KEY ?? "fixture" }).model(
+  "meta-llama/Llama-3.3-70B-Instruct-Turbo",
+)
 const openRouter = OpenRouter.configure({ apiKey: process.env.OPENROUTER_API_KEY ?? "fixture" })
 const openrouter = openRouter.model("openai/gpt-4o-mini")
 const openrouterGpt55 = openRouter.model("openai/gpt-5.5")
@@ -222,6 +225,13 @@ describeRecordedGoldenScenarios([
    requires: ["GROQ_API_KEY"],
    scenarios: ["text", "tool-call", { id: "tool-loop", timeout: 30_000 }],
  },
+  {
+    name: "DeepInfra Llama 3.3 70B",
+    prefix: "deepinfra-chat",
+    model: deepInfra,
+    requires: ["DEEPINFRA_API_KEY"],
+    scenarios: ["text", "tool-call", { id: "tool-loop", timeout: 30_000 }],
+  },
  {
    name: "OpenRouter gpt-4o-mini",
    prefix: "openai-compatible-chat",
@@ -2,7 +2,7 @@ import { describe, expect } from "bun:test"
 import { ConfigProvider, Effect } from "effect"
 import { HttpClientRequest } from "effect/unstable/http"
 import { LLM, Message, ToolDefinition } from "../../src/index.js"
-import { Cerebras, TogetherAI } from "../../src/providers/index.js"
+import { Cerebras, DeepInfra, TogetherAI } from "../../src/providers/index.js"
 import { compileRequest } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
 import { dynamicResponse } from "../lib/http.js"
@@ -29,6 +29,18 @@ describe("native OpenAI-compatible providers", () => {
    }),
  )

+  it.effect("preserves native DeepInfra provider and route identity", () =>
+    Effect.gen(function* () {
+      const deepinfra = DeepInfra.configure({ apiKey: "fixture" }).model("google/gemma-3-27b-it")
+      expect(deepinfra).toMatchObject({
+        provider: "deepinfra",
+        compatibility: { maxTokensField: "max_tokens", reasoningField: "reasoning_content", supportsStore: false },
+        route: { id: "deepinfra-chat", protocol: "openai-chat" },
+      })
+      expect(deepinfra.route.endpoint.baseURL).toBe("https://api.deepinfra.com/v1/openai")
+    }),
+  )
+
  it.effect("applies native provider request defaults even with a custom gateway URL", () =>
    Effect.gen(function* () {
      const together = yield* compileRequest(
@@ -82,6 +94,21 @@ describe("native OpenAI-compatible providers", () => {
    }),
  )

+  it.effect("normalizes DeepInfra API roots without duplicating the OpenAI path", () =>
+    Effect.gen(function* () {
+      for (const baseURL of [
+        "https://gateway.example/v1",
+        "https://gateway.example/v1/",
+        "https://gateway.example/v1/openai",
+        "https://gateway.example/v1/openai/",
+      ]) {
+        expect(DeepInfra.configure({ apiKey: "fixture", baseURL }).model("gemma").route.endpoint.baseURL).toBe(
+          "https://gateway.example/v1/openai",
+        )
+      }
+    }),
+  )
+
  it.effect("maps package settings onto native executable models", () =>
    Effect.gen(function* () {
      for (const native of [TogetherAI, Cerebras]) {
@@ -122,6 +149,12 @@ describe("native OpenAI-compatible providers", () => {
          token: "cerebras-secret",
          url: "https://api.cerebras.ai/v1/chat/completions",
        },
+        {
+          model: DeepInfra.configure().model("gemma"),
+          env: { DEEPINFRA_API_KEY: "deepinfra-secret" },
+          token: "deepinfra-secret",
+          url: "https://api.deepinfra.com/v1/openai/chat/completions",
+        },
      ]

      yield* Effect.forEach(scenarios, (scenario) =>
@@ -195,15 +195,19 @@ describe("Open Responses-compatible route", () => {
          model,
          messages: [
            Message.assistant([
-              // The baseline does not enforce a provider id grammar, so a
-              // non-OpenAI but well-formed token is resent as-is.
              { type: "text", text: "Kept.", providerMetadata: { openresponses: { itemId: "history_1" } } },
-              // Shape violations are dropped even without a grammar policy.
              {
                type: "text",
-                text: "Dropped.",
-                providerMetadata: { openresponses: { itemId: `m${"a".repeat(64)}` } },
+                text: "Long.",
+                providerMetadata: { openresponses: { itemId: `history_${"a".repeat(64)}` } },
              },
+              {
+                type: "text",
+                text: "Opaque.",
+                providerMetadata: { openresponses: { itemId: "provider_value/with+symbols" } },
+              },
+              { type: "text", text: "No suffix.", providerMetadata: { openresponses: { itemId: "msg_" } } },
+              { type: "text", text: "No prefix.", providerMetadata: { openresponses: { itemId: "_item" } } },
            ]),
          ],
        }),
@@ -218,8 +222,23 @@ describe("Open Responses-compatible route", () => {
        },
        {
          type: "message",
+          id: `history_${"a".repeat(64)}`,
          role: "assistant",
-          content: [{ type: "output_text", text: "Dropped." }],
+          content: [{ type: "output_text", text: "Long." }],
+        },
+        {
+          type: "message",
+          id: "provider_value/with+symbols",
+          role: "assistant",
+          content: [{ type: "output_text", text: "Opaque." }],
+        },
+        {
+          type: "message",
+          role: "assistant",
+          content: [
+            { type: "output_text", text: "No suffix." },
+            { type: "output_text", text: "No prefix." },
+          ],
        },
      ])
    }),
@@ -3150,38 +3150,50 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("drops replayed item ids outside the server's grammar", () =>
+  it.effect("preserves provider-issued item ids and removes malformed ids without dropping items", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
        LLM.request({
          model,
          messages: [
            Message.assistant([
-              // Fails the message id prefix.
              {
                type: "text",
                text: "Hello",
                providerMetadata: { openai: { itemId: "history_1" } },
              },
-              // Oversized for the Responses item id limit.
              {
                type: "text",
                text: "World",
-                providerMetadata: { openai: { itemId: `m${"a".repeat(64)}` } },
+                providerMetadata: { openai: { itemId: `message_${"a".repeat(64)}` } },
              },
-              // Fails the reasoning id prefix, so the whole item is unreplayable
-              // statelessly and is skipped rather than sent malformed.
              {
                type: "reasoning",
                text: "Checked the diff.",
                providerMetadata: { openai: { itemId: "thinking_1", reasoningEncryptedContent: "encrypted-state" } },
              },
+              {
+                type: "reasoning",
+                text: "Missing suffix.",
+                providerMetadata: { openai: { itemId: "rs_", reasoningEncryptedContent: "another-state" } },
+              },
+              {
+                type: "reasoning",
+                text: "No prefix separator.",
+                providerMetadata: { openai: { itemId: "550e8400-e29b-41d4-a716-446655440000" } },
+              },
              ToolCallPart.make({
                id: "call_1",
                name: "lookup",
                input: { query: "weather" },
                providerMetadata: { openai: { itemId: "toolu_01A" } },
              }),
+              ToolCallPart.make({
+                id: "call_2",
+                name: "lookup",
+                input: { query: "news" },
+                providerMetadata: { openai: { itemId: "fc_" } },
+              }),
            ]),
          ],
        }),
@@ -3190,18 +3202,44 @@ describe("OpenAI Responses route", () => {
      expect(prepared.body.input).toEqual([
        {
          type: "message",
+          id: "history_1",
          role: "assistant",
-          content: [
-            { type: "output_text", text: "Hello" },
-            { type: "output_text", text: "World" },
-          ],
+          content: [{ type: "output_text", text: "Hello" }],
+        },
+        {
+          type: "message",
+          id: `message_${"a".repeat(64)}`,
+          role: "assistant",
+          content: [{ type: "output_text", text: "World" }],
+        },
+        {
+          type: "reasoning",
+          id: "thinking_1",
+          summary: [{ type: "summary_text", text: "Checked the diff." }],
+          encrypted_content: "encrypted-state",
+        },
+        {
+          type: "reasoning",
+          summary: [{ type: "summary_text", text: "Missing suffix." }],
+          encrypted_content: "another-state",
+        },
+        {
+          type: "reasoning",
+          summary: [{ type: "summary_text", text: "No prefix separator." }],
        },
        {
          type: "function_call",
+          id: "toolu_01A",
          call_id: "call_1",
          name: "lookup",
          arguments: '{"query":"weather"}',
        },
+        {
+          type: "function_call",
+          call_id: "call_2",
+          name: "lookup",
+          arguments: '{"query":"news"}',
+        },
      ])
    }),
  )
@@ -16,7 +16,6 @@ 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"
-import { beginWorkspaceSetup } from "@/workspaces/setup"

 export function createNewSessionComposerAdapter(props: {
  draftID: string
@@ -47,7 +46,7 @@ export function createNewSessionComposerAdapter(props: {
    async start(selection, submission) {
      const projectDirectory = location().directory
      const worktree = props.worktree()
-      const workspace = await resolveSessionDirectory({
+      const sessionDirectory = await resolveSessionDirectory({
        projectDirectory,
        worktree,
        branch: props.branch(),
@@ -55,8 +54,7 @@ export function createNewSessionComposerAdapter(props: {
        serverSDK,
        language,
      })
-      if (!workspace) return
-      const sessionDirectory = workspace.directory
+      if (!sessionDirectory) return

      const created = data.session.create({
        agent: selection.agent,
@@ -86,7 +84,6 @@ export function createNewSessionComposerAdapter(props: {
        serverSDK.scope,
        SessionRouteKey.fromRoute(base64Encode(sessionDirectory), created.id),
      )
-      if (workspace.initializing) beginWorkspaceSetup(created.id, workspace.ready)
      const cleanupReady = startTransition(() => {
        tabs.updateDraft(props.draftID, { worktree: undefined, branch: undefined })
        local.session.promote(sessionDirectory, created.id, {
@@ -122,7 +119,7 @@ export function createNewSessionComposerAdapter(props: {
              prompt: (input) =>
                data.session.prompt({
                  ...input,
-                  gate: Promise.all([input.gate, afterCreation(async () => undefined), workspace.ready]),
+                  gate: Promise.all([input.gate, afterCreation(async () => undefined)]),
                }),
            },
          },
@@ -171,54 +168,28 @@ async function resolveSessionDirectory(input: {
  serverSDK: ReturnType<typeof useServerSDK>
  language: ReturnType<typeof useLanguage>
 }) {
-  if (input.worktree !== "create") {
-    return {
-      directory: input.worktree === "main" ? input.projectDirectory : input.worktree,
-      ready: Promise.resolve(),
-      initializing: false,
-    }
-  }
+  if (input.worktree === "main") return input.projectDirectory
+  if (input.worktree !== "create") return input.worktree

-  const projectID = input.data.location.info({ directory: input.projectDirectory })?.project.id ?? ""
-  const pending = Promise.withResolvers<
-    { directory: string; ready: Promise<void>; initializing: boolean } | undefined
-  >()
-  const unsubscribe = input.serverSDK.event.on("worktree.updated", (event) => {
-    if (event.data.projectID !== projectID || !event.data.directory) return
-    unsubscribe()
-    pending.resolve({ directory: event.data.directory, ready, initializing: true })
-  })
-  const creation = input.serverSDK.api.worktree
+  return input.serverSDK.api.worktree
    .create({
-      projectID,
+      projectID: input.data.location.info({ directory: input.projectDirectory })?.project.id ?? "",
      strategy: "git",
      branch: input.branch,
      directory: getDirectory(
        input.data.location.info({ directory: input.projectDirectory })?.project.directory ?? input.projectDirectory,
      ),
    })
-    .then(
-      (created) => ({ ok: true as const, created }),
-      (error) => ({ ok: false as const, error }),
-    )
-  const ready = creation.then((result) => {
-    unsubscribe()
-    if (result.ok) {
-      pending.resolve({ directory: result.created.directory, ready: Promise.resolve(), initializing: false })
-      return
-    }
-    showToast({
-      title: input.language.t("prompt.toast.worktreeCreateFailed.title"),
-      description: errorMessage(input.language, result.error),
+    .then(async (created) => {
+      await input.serverSDK.api.location.get({ location: { directory: created.directory } })
+      return created.directory
+    })
+    .catch((error) => {
+      showToast({
+        title: input.language.t("prompt.toast.worktreeCreateFailed.title"),
+        description: errorMessage(input.language, error),
+      })
    })
-    pending.resolve(undefined)
-    throw result.error
-  })
-  void ready.catch(() => undefined)
-  const workspace = await pending.promise
-  if (!workspace) return
-  await input.serverSDK.api.location.get({ location: { directory: workspace.directory } })
-  return workspace
 }

 function errorMessage(language: ReturnType<typeof useLanguage>, error: unknown) {
@@ -312,7 +312,6 @@ export const dict = {
  "prompt.toast.modelAgentRequired.title": "Select an agent and model",
  "prompt.toast.modelAgentRequired.description": "Choose an agent and model before sending a prompt.",
  "prompt.toast.worktreeCreateFailed.title": "Failed to create worktree",
-  "session.workspace.initializing": "Setting up workspace",
  "prompt.toast.sessionCreateFailed.title": "Failed to create session",
  "prompt.toast.shellSendFailed.title": "Failed to send shell command",
  "prompt.toast.commandSendFailed.title": "Failed to send command",
@@ -64,6 +64,25 @@ describe("query keys", () => {
    expect(calls.toSorted()).toEqual(["a", "b"])
  })

+  test("refreshes shared project metadata after invalidation", async () => {
+    let name = "Before"
+    const projects = {
+      list: async () => [{ id: "a", canonical: "/a", name, time: { created: 1, updated: 1 }, sandboxes: [] }],
+    } as unknown as ProjectApi
+    const worktrees = {
+      list: async () => [{ directory: "/a" }],
+    } as unknown as WorktreeApi
+    const queryClient = new QueryClient()
+    const query = loadProjectsQuery(ServerScope.local, projects, worktrees)
+
+    expect((await queryClient.fetchQuery(query))[0]?.name).toBe("Before")
+
+    name = "After"
+    await queryClient.invalidateQueries({ queryKey: query.queryKey, exact: true })
+
+    expect((await queryClient.fetchQuery(query))[0]?.name).toBe("After")
+  })
+
  test("keeps projects whose directory inventory cannot load", async () => {
    const projects = {
      list: async () => [
@@ -1,4 +1,4 @@
-import type { Config, Path, Project, ProviderAuthResponse } from "@/runtime/server/types"
+import type { Config, Path, Project } from "@/runtime/server/types"
 import type {
  LocationGetInput,
  LocationGetOutput,
@@ -18,14 +18,6 @@ import type { ServerScope } from "@/runtime/server/scope"
 import type { ServerApi } from "@/runtime/server/api"
 import { sameDirectory } from "@/workspaces/paths"

-type GlobalStore = {
-  path: Path
-  project: Project[]
-  provider_auth: ProviderAuthResponse
-  config: Config
-  reload: undefined | "pending" | "complete"
-}
-
 function waitForPaint() {
  return new Promise<void>((resolve) => {
    let done = false
@@ -110,16 +102,13 @@ export async function bootstrapGlobal(input: {
    readonly worktree: WorktreeApi
  }
  scope: ServerScope
-  setGlobalStore: SetStoreFunction<GlobalStore>
  queryClient: QueryClient
 }) {
  const slow = [
    () => input.queryClient.fetchQuery(loadGlobalConfigQuery(input.scope)),
    () => input.queryClient.fetchQuery(loadPathQuery(input.scope, null, input.serverAPI.location)),
    () =>
-      input.queryClient
-        .fetchQuery(loadProjectsQuery(input.scope, input.serverAPI.project, input.serverAPI.worktree))
-        .then((data) => input.setGlobalStore("project", data)),
+      input.queryClient.fetchQuery(loadProjectsQuery(input.scope, input.serverAPI.project, input.serverAPI.worktree)),
  ]
  await runAll(slow)
 }
@@ -5,7 +5,13 @@ import { getOwner, onCleanup, untrack } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useLanguage } from "@/runtime/i18n/language"
 import { type ServerSDK } from "./client"
-import { bootstrapDirectory, bootstrapGlobal, loadGlobalConfigQuery, loadPathQuery } from "./global-sync/bootstrap"
+import {
+  bootstrapDirectory,
+  bootstrapGlobal,
+  loadGlobalConfigQuery,
+  loadPathQuery,
+  loadProjectsQuery,
+} from "./global-sync/bootstrap"
 import { createChildStoreManager } from "./global-sync/child-store"
 import type { ProjectMeta } from "./global-sync/types"
 import { formatServerError } from "@/runtime/server/errors"
@@ -61,8 +67,14 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
      { ...queryOptionsApi.path(), enabled: connected() },
    ],
  }))
+  const projectQuery = useQuery(() => ({
+    ...loadProjectsQuery(serverSDK.scope, serverSDK.api.project, serverSDK.api.worktree),
+    enabled: connected(),
+  }))
  const [globalStore, setGlobalStore] = createStore<GlobalStore>({
-    project: [],
+    get project() {
+      return projectQuery.data ?? []
+    },
    provider_auth: {},
    get path() {
      const EMPTY = { state: "", config: "", worktree: "", directory: "", home: "" }
@@ -79,17 +91,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
  })

  const queryClient = useQueryClient()
-  const setProjects = (next: Project[] | ((draft: Project[]) => Project[])) => {
-    setGlobalStore("project", next)
-  }
-
-  const setBootStore = ((...input: unknown[]) => {
-    if (input[0] === "project" && Array.isArray(input[1])) {
-      setProjects(input[1] as Project[])
-      return input[1]
-    }
-    return (setGlobalStore as (...args: unknown[]) => unknown)(...input)
-  }) as typeof setGlobalStore

  const bootstrap = useQuery(() => ({
    queryKey: [serverSDK.scope, "bootstrap"],
@@ -97,7 +98,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
      await bootstrapGlobal({
        serverAPI: serverSDK.api,
        scope: serverSDK.scope,
-        setGlobalStore: setBootStore,
        queryClient,
      })
      return Date.now()
@@ -105,14 +105,6 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
    enabled: connected(),
  }))

-  const set = ((...input: unknown[]) => {
-    if (input[0] === "project" && (Array.isArray(input[1]) || typeof input[1] === "function")) {
-      setProjects(input[1] as Project[] | ((draft: Project[]) => Project[]))
-      return input[1]
-    }
-    return (setGlobalStore as (...args: unknown[]) => unknown)(...input)
-  }) as typeof setGlobalStore
-
  const paused = () => untrack(() => globalStore.reload) !== undefined

  const queue = createRefreshQueue({
@@ -269,7 +261,7 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {

  return {
    data: globalStore,
-    set,
+    set: setGlobalStore,
    child: children.child,
    disableMcp: children.disableMcp,
    // bootstrap,
@@ -30,7 +30,6 @@ import { displayName, getProjectAvatarSource, projectForSession } from "@/shell/
 import { parseCommentNote, readPromptPresentation } from "@/composer/comment-note"
 import { useCommand } from "@/shell/commands/command"
 import { useSettings } from "@/settings/model"
-import { isWorkspaceSetupPending } from "@/workspaces/setup"
 import { SessionTitleHeader } from "../session-identity-header"

 type BackgroundTask = {
@@ -351,7 +350,8 @@ 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 showProjectIcon = () =>
+    import.meta.env.VITE_OPENCODE_CHANNEL !== "prod" && settings.general.showProjectIcon()
  const avatarProject = createMemo(() => {
    if (!showProjectIcon()) return
    const session = props.session.data.info()
@@ -465,8 +465,6 @@ function MessageTimelineView(
    editToolDefaultOpen: props.data.editToolPartsExpanded,
    disclosure: virtualized.disclosure,
    centered: () => props.centered,
-    thinkingLabel: () =>
-      isWorkspaceSetupPending(sessionID() ?? "") ? language.t("session.workspace.initializing") : undefined,
    padding: turnPadding,
    anchor: props.anchor,
  })
@@ -11,7 +11,8 @@ import { useLanguage } from "@/runtime/i18n/language"
 import { getProjectAvatarVariant, type LocalProject } from "@/shell/state/layout"
 import { ServerConnection } from "@/runtime/server/registry"
 import { LocationProvider } from "@/workspaces/location"
-import { displayName, getProjectAvatarSource } from "@/shell/layout/helpers"
+import { displayName } from "@/shell/layout/helpers"
+import { ProjectIcon } from "@/shell/layout/project-icon"
 import { createEditProjectModel } from "./project-model"
 import { ProjectSettingsExtensions } from "./project-extensions"
 import { SettingsServerDataScope } from "@/settings/server-scope"
@@ -57,11 +58,7 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
        <Tabs.List>
          <div class="project-settings-nav">
            <Tabs.Trigger value="general">
-              <ProjectAvatar
-                fallback={projectName()}
-                variant={getProjectAvatarVariant(props.project.icon?.color)}
-                class="!size-4 shrink-0"
-              />
+              <ProjectIcon project={props.project} class="!size-4 shrink-0" />
              <span class="truncate">{projectName()}</span>
            </Tabs.Trigger>
            <Tabs.Trigger value="scripts">
@@ -114,14 +111,14 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
                    onDragLeave={model.dragLeave}
                    onClick={model.iconClick}
                  >
-                    <ProjectAvatar
+                    <ProjectIcon
+                      project={props.project}
                      fallback={model.store.name || model.defaultName()}
-                      src={getProjectAvatarSource(props.project.id, {
+                      icon={{
                        color: model.store.color,
                        url: props.project.icon?.url,
                        override: model.store.iconOverride,
-                      })}
-                      variant={getProjectAvatarVariant(model.store.color)}
+                      }}
                      class="!size-16 [&_[data-slot=project-avatar-surface]]:!rounded-[6px] [&_[data-slot=project-avatar-surface]]:!text-[32px]"
                    />
                    <span
@@ -1,6 +1,6 @@
 import { getFilename } from "@opencode-ai/util/path"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { useMutation } from "@tanstack/solid-query"
+import { useMutation, useQueryClient } from "@tanstack/solid-query"
 import { createMemo } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobal } from "@/runtime/server/runtime"
@@ -10,6 +10,7 @@ import { ServerConnection } from "@/runtime/server/registry"
 export function createEditProjectModel(props: { project: LocalProject; server: ServerConnection.Any }) {
  const dialog = useDialog()
  const global = useGlobal()
+  const queryClient = useQueryClient()
  const serverCtx = createMemo(() => global.ensureServerCtx(props.server))
  const folderName = createMemo(() => getFilename(props.project.worktree))
  const defaultName = createMemo(() => props.project.name || folderName())
@@ -70,13 +71,19 @@ export function createEditProjectModel(props: { project: LocalProject; server: S
      const start = store.startup.trim()

      if (props.project.id && props.project.id !== "global") {
+        const color = store.color ?? ""
+        const override = store.iconOverride ?? ""
+        const colorChanged = color !== (props.project.icon?.color ?? "")
+        const overrideChanged = override !== (props.project.icon?.override ?? "")
+
        await serverCtx().sdk.api.project.update({
          projectID: props.project.id,
-          name,
-          icon: { color: store.color ?? "", override: store.iconOverride ?? "" },
-          commands: { start },
+          ...(name !== (props.project.name ?? "") ? { name } : {}),
+          ...(colorChanged || overrideChanged
+            ? { icon: { ...(colorChanged ? { color } : {}), ...(overrideChanged ? { override } : {}) } }
+            : {}),
+          ...(start !== (props.project.commands?.start ?? "") ? { commands: { start } } : {}),
        })
-        dialog.close()
        return
      }

@@ -85,6 +92,11 @@ export function createEditProjectModel(props: { project: LocalProject; server: S
        icon: { color: store.color || undefined, override: store.iconOverride || undefined },
        commands: { start: start || undefined },
      })
+    },
+    onSuccess: async () => {
+      if (props.project.id && props.project.id !== "global") {
+        await queryClient.invalidateQueries({ queryKey: [serverCtx().sdk.scope, "project"], exact: true })
+      }
      dialog.close()
    },
  }))
@@ -1,13 +1,12 @@
 import { Component, For, Show, createMemo, createSignal } from "solid-js"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Icon } from "@opencode-ai/ui/icon"
-import { ProjectAvatar } from "@opencode-ai/ui/project-avatar"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useGlobal } from "@/runtime/server/runtime"
-import { getProjectAvatarVariant } from "@/shell/state/layout"
 import { ServerConnection, serverName } from "@/runtime/server/registry"
 import { displayName } from "@/shell/layout/helpers"
+import { ProjectIcon } from "@/shell/layout/project-icon"
 import { InlineServerSelect } from "@/settings/server-select"
 import { DialogEditProject } from "./project-dialog"
 import "@/settings/settings.css"
@@ -40,14 +39,13 @@ export const SettingsProjects: Component = () => {

  const ProjectRow: Component<{ project: ProjectItem; server: ServerConnection.Any }> = (props) => {
    const name = () => displayName(props.project)
-    const color = () => getProjectAvatarVariant(props.project.icon?.color)
    return (
      <div
        class="group flex items-center justify-between gap-5 px-4 py-2.5 rounded-lg bg-v2-background-bg-base shadow-[var(--v2-elevation-raised)] cursor-pointer transition-all hover:bg-v2-background-bg-layer-01"
        onClick={() => openProjectSettings(props.project, props.server)}
      >
        <div class="flex items-center gap-2.5 min-w-0 flex-1">
-          <ProjectAvatar fallback={name()} variant={color()} class="shrink-0" />
+          <ProjectIcon project={props.project} class="shrink-0" />
          <span class="text-13-medium text-v2-text-text-base truncate">{name()}</span>
        </div>
        <div class="flex items-center gap-2 shrink-0 opacity-0 group-hover:opacity-100 transition-opacity">
@@ -38,7 +38,7 @@ import {
 } from "@/workspaces/paths"
 import { listAllSessions } from "@/session/list"
 import type { ServerScope } from "@/runtime/server/scope"
-import { normalizeProjectInfo } from "@/runtime/server/global-sync/utils"
+import { loadProjectsQuery } from "@/runtime/server/global-sync/bootstrap"
 import "@/settings/settings.css"

 type Workspace = {
@@ -59,16 +59,7 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
  })

  const projectQuery = useQuery(() => ({
-    queryKey: [serverSDK.scope, "settings-workspace-projects"] as const,
-    queryFn: async () =>
-      Promise.all(
-        (await serverSDK.api.project.list()).map(async (project) => {
-          const worktrees = await serverSDK.api.worktree
-            .list({ projectID: project.id })
-            .catch(() => [{ directory: project.canonical }, ...project.sandboxes.map((directory) => ({ directory }))])
-          return normalizeProjectInfo({ ...project, worktrees })
-        }),
-      ),
+    ...loadProjectsQuery(serverSDK.scope, serverSDK.api.project, serverSDK.api.worktree),
    refetchOnMount: "always",
  }))
  const workspaces = createMemo(() => workspaceInventory(projectQuery.data ?? []))
@@ -0,0 +1,24 @@
+import { ProjectAvatar, type ProjectAvatarProps } from "@opencode-ai/ui/project-avatar"
+import { splitProps } from "solid-js"
+import { displayName, getProjectAvatarSource } from "@/shell/layout/helpers"
+import { getProjectAvatarVariant, type LocalProject } from "@/shell/state/layout"
+
+type ProjectIconProps = Omit<ProjectAvatarProps, "fallback" | "src" | "variant"> & {
+  project: LocalProject
+  fallback?: string
+  icon?: LocalProject["icon"]
+}
+
+export function ProjectIcon(props: ProjectIconProps) {
+  const [local, rest] = splitProps(props, ["project", "fallback", "icon"])
+  const icon = () => local.icon ?? local.project.icon
+
+  return (
+    <ProjectAvatar
+      {...rest}
+      fallback={local.fallback ?? displayName(local.project)}
+      src={getProjectAvatarSource(local.project.id, icon())}
+      variant={getProjectAvatarVariant(icon()?.color)}
+    />
+  )
+}
@@ -1,25 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { beginWorkspaceSetup, isWorkspaceSetupPending } from "./setup"
-
-describe("workspace setup", () => {
-  test("remains pending until the setup script finishes", async () => {
-    const ready = Promise.withResolvers<void>()
-    beginWorkspaceSetup("session-ready", ready.promise)
-
-    expect(isWorkspaceSetupPending("session-ready")).toBe(true)
-    ready.resolve()
-    await ready.promise
-
-    expect(isWorkspaceSetupPending("session-ready")).toBe(false)
-  })
-
-  test("clears pending setup when the script fails", async () => {
-    const ready = Promise.withResolvers<void>()
-    beginWorkspaceSetup("session-failed", ready.promise)
-
-    ready.reject(new Error("setup failed"))
-    await ready.promise.catch(() => undefined)
-
-    expect(isWorkspaceSetupPending("session-failed")).toBe(false)
-  })
-})
@@ -1,15 +0,0 @@
-import { createStore } from "solid-js/store"
-
-const [sessions, setSessions] = createStore<Record<string, boolean | undefined>>({})
-
-export function beginWorkspaceSetup(sessionID: string, ready: Promise<void>) {
-  setSessions(sessionID, true)
-  void ready.then(
-    () => setSessions(sessionID, undefined),
-    () => setSessions(sessionID, undefined),
-  )
-}
-
-export function isWorkspaceSetupPending(sessionID: string) {
-  return sessions[sessionID] === true
-}
@@ -964,7 +964,7 @@ export type WorktreeUpdated = {
  metadata?: { [x: string]: any }
  type: "worktree.updated"
  location?: LocationRef
-  data: { projectID: string; directory?: string }
+  data: { projectID: string }
 }

 export type WorktreeResolved = {
@@ -974,7 +974,7 @@ export type WorktreeResolved = {
  type: "worktree.resolved"
  durable: { aggregateID: string; seq: number; version: 1 }
  location?: LocationRef
-  data: { projectID: string; directory: string; previous: string }
+  data: { projectID: string; directory: string; previous: string; adopted?: Array<string> }
 }

 export type CommandUpdated = {
@@ -617,7 +617,22 @@ export function createData(config: CreateDataInput) {
      }
      case "worktree.resolved": {
        for (const [sessionID, info] of Object.entries(store.session.info)) {
-          const adopted = Worktree.adopt({ projectID: info.projectID, directory: info.location.directory }, event.data)
+          const explicit = event.data.adopted?.includes(info.projectID)
+          const directory = explicit ? store.project.info[info.projectID]?.canonical : info.location.directory
+          if (!directory) {
+            if (info.location.workspaceID) continue
+            result.session.invalidate(sessionID)
+            void result.session.sync(sessionID)
+            continue
+          }
+          const adopted = Worktree.adopt(
+            {
+              projectID: info.projectID,
+              directory,
+              workspaceID: info.location.workspaceID,
+            },
+            event.data,
+          )
          if (!adopted) continue
          setStore("session", "info", sessionID, "projectID", adopted.projectID)
          setStore("session", "info", sessionID, "subpath", adopted.subpath)
@@ -154,6 +154,106 @@ test("updates authoritative cached project metadata from live events", async ()
  }
 })

+test("adopts cached directory-project sessions when their repository is resolved", async () => {
+  const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
+  const refreshed: SessionInfo = {
+    ...session(0),
+    id: "ses_uncached",
+    projectID: "repository",
+    location: { directory: "/unknown-alias" },
+    subpath: "app",
+  }
+  const api = OpenCode.make({
+    baseUrl: "http://opencode.local",
+    fetch: async (input, init) => {
+      const request = input instanceof Request ? input : new Request(input, init)
+      if (!request.url.endsWith("/api/session/ses_uncached")) throw new Error(`Unexpected request: ${request.url}`)
+      return Response.json({ data: refreshed })
+    },
+  })
+  const setup = createRoot((dispose) => ({
+    data: createData({
+      api: () => api,
+      directory: "/repo",
+      event: {
+        on: () => () => {},
+        listen(handler) {
+          listeners.add(handler)
+          return () => listeners.delete(handler)
+        },
+      },
+    }),
+    dispose,
+  }))
+
+  try {
+    const sessions: SessionInfo[] = [
+      { ...session(0), id: "ses_root", projectID: "directory-root", location: { directory: "/repo" } },
+      { ...session(0), id: "ses_nested", projectID: "directory-nested", location: { directory: "/repo/app" } },
+      {
+        ...session(0),
+        id: "ses_alias",
+        projectID: "directory-nested",
+        location: { directory: "/repo/alias/../app" },
+      },
+      { ...session(0), id: "ses_symlink", projectID: "directory-nested", location: { directory: "/shortcut" } },
+      { ...refreshed, projectID: "directory-uncached" },
+      { ...session(0), id: "ses_global", projectID: "global", location: { directory: "/repo/legacy" } },
+      { ...session(0), id: "ses_escaped", projectID: "global", location: { directory: "/repo/../other" } },
+      { ...session(0), id: "ses_other", projectID: "other-repository", location: { directory: "/repo/vendor" } },
+      { ...session(0), id: "ses_sibling", projectID: "global", location: { directory: "/repo-other" } },
+      {
+        ...session(0),
+        id: "ses_remote",
+        projectID: "directory-root",
+        location: { directory: "/repo", workspaceID: "workspace-remote" },
+      },
+    ]
+    sessions.forEach((item) => setup.data.session.remember(item))
+    for (const project of [
+      { id: "directory-root", canonical: "/repo" },
+      { id: "directory-nested", canonical: "/repo/app" },
+    ]) {
+      const updated: OpenCodeEvent = {
+        id: `evt_${project.id}`,
+        created: 0,
+        type: "project.updated",
+        data: { ...project, time: { created: 0, updated: 0 }, sandboxes: [] },
+      }
+      listeners.forEach((listener) => listener({ name: updated.type, details: updated }))
+    }
+
+    const resolved: OpenCodeEvent = {
+      id: "evt_repository_resolved",
+      created: 1,
+      type: "worktree.resolved",
+      durable: { aggregateID: "repository", seq: 0, version: 1 },
+      data: {
+        projectID: "repository",
+        directory: "/repo",
+        previous: "global",
+        adopted: ["directory-root", "directory-nested", "directory-uncached"],
+      },
+    }
+    listeners.forEach((listener) => listener({ name: resolved.type, details: resolved }))
+
+    expect(setup.data.session.get("ses_root")?.projectID).toBe("repository")
+    expect(setup.data.session.get("ses_root")?.subpath).toBeUndefined()
+    expect(setup.data.session.get("ses_nested")).toMatchObject({ projectID: "repository", subpath: "app" })
+    expect(setup.data.session.get("ses_alias")).toMatchObject({ projectID: "repository", subpath: "app" })
+    expect(setup.data.session.get("ses_symlink")).toMatchObject({ projectID: "repository", subpath: "app" })
+    expect(setup.data.session.get("ses_global")).toMatchObject({ projectID: "repository", subpath: "legacy" })
+    expect(setup.data.session.get("ses_escaped")?.projectID).toBe("global")
+    expect(setup.data.session.get("ses_other")?.projectID).toBe("other-repository")
+    expect(setup.data.session.get("ses_sibling")?.projectID).toBe("global")
+    expect(setup.data.session.get("ses_remote")?.projectID).toBe("directory-root")
+    await wait(() => setup.data.session.get("ses_uncached")?.projectID === "repository")
+    expect(setup.data.session.get("ses_uncached")?.subpath).toBe("app")
+  } finally {
+    setup.dispose()
+  }
+})
+
 test("refreshes global credential events across every loaded location and workspace", async () => {
  const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
  const requests: URL[] = []
@@ -0,0 +1,80 @@
+import { describe, expect, test } from "bun:test"
+import { Schema } from "effect"
+import { Worktree } from "@opencode-ai/schema/worktree"
+
+describe("Worktree.adopt", () => {
+  const event = {
+    projectID: "repository",
+    directory: "/repo",
+    previous: "previous",
+    adopted: ["directory-root", "directory-nested"],
+  }
+
+  test("adopts explicitly superseded directory projects", () => {
+    expect(Worktree.adopt({ projectID: "directory-root", directory: "/repo" }, event)).toEqual({
+      projectID: "repository",
+      subpath: undefined,
+    })
+    expect(Worktree.adopt({ projectID: "directory-nested", directory: "/repo/packages/app" }, event)).toEqual({
+      projectID: "repository",
+      subpath: "packages/app",
+    })
+  })
+
+  test("preserves existing previous-project and global adoption", () => {
+    expect(Worktree.adopt({ projectID: "previous", directory: "/repo/packages/app" }, event)).toEqual({
+      projectID: "repository",
+      subpath: "packages/app",
+    })
+    expect(Worktree.adopt({ projectID: "global", directory: "/repo/packages/app" }, event)).toEqual({
+      projectID: "repository",
+      subpath: "packages/app",
+    })
+  })
+
+  test("leaves unrelated projects, sibling directories, and workspaces unchanged", () => {
+    expect(Worktree.adopt({ projectID: "other", directory: "/repo/vendor" }, event)).toBeUndefined()
+    expect(Worktree.adopt({ projectID: "global", directory: "/repo-other" }, event)).toBeUndefined()
+    expect(Worktree.adopt({ projectID: "repository", directory: "/repo" }, event)).toBeUndefined()
+    expect(
+      Worktree.adopt({ projectID: "directory-root", directory: "/repo", workspaceID: "remote" }, event),
+    ).toBeUndefined()
+  })
+
+  test("normalizes Windows directory separators", () => {
+    expect(
+      Worktree.adopt(
+        { projectID: "directory-nested", directory: "C:\\repo\\packages\\app" },
+        { ...event, directory: "C:\\repo" },
+      ),
+    ).toEqual({ projectID: "repository", subpath: "packages/app" })
+    expect(
+      Worktree.adopt(
+        { projectID: "directory-nested", directory: "c:/Repo/packages/App" },
+        { ...event, directory: "C:\\repo" },
+      ),
+    ).toEqual({ projectID: "repository", subpath: "packages/App" })
+  })
+
+  test("normalizes aliases and rejects paths that leave the repository", () => {
+    expect(Worktree.adopt({ projectID: "directory-nested", directory: "/repo/alias/../packages/app" }, event)).toEqual({
+      projectID: "repository",
+      subpath: "packages/app",
+    })
+    expect(Worktree.adopt({ projectID: "global", directory: "/repo/../other" }, event)).toBeUndefined()
+    expect(Worktree.adopt({ projectID: "global", directory: "/app" }, { ...event, directory: "/" })).toEqual({
+      projectID: "repository",
+      subpath: "app",
+    })
+  })
+
+  test("decodes existing durable events without adopted project IDs", () => {
+    expect(
+      Schema.decodeUnknownSync(Worktree.Event.Resolved.data)({
+        projectID: "repository",
+        directory: "/repo",
+        previous: "global",
+      }),
+    ).toEqual({ projectID: "repository", directory: "/repo", previous: "global" })
+  })
+})
@@ -103,7 +103,6 @@
    "@ai-sdk/anthropic": "3.0.82",
    "@ai-sdk/azure": "3.0.88",
    "@ai-sdk/cohere": "3.0.27",
-    "@ai-sdk/deepinfra": "2.0.41",
    "@ai-sdk/gateway": "3.0.104",
    "@ai-sdk/google-vertex": "4.0.128",
    "@ai-sdk/groq": "3.0.31",
@@ -54,9 +54,10 @@ export function map(input: MapInput): Mapping | undefined {
        },
      }
    case "@ai-sdk/cerebras":
+    case "@ai-sdk/deepinfra":
    case "@ai-sdk/togetherai":
      return {
-        package: `@opencode-ai/ai/providers/${input.packageName === "@ai-sdk/cerebras" ? "cerebras" : "togetherai"}`,
+        package: `@opencode-ai/ai/providers/${input.packageName.slice("@ai-sdk/".length)}`,
        settings: {
          ...baseSettings,
          ...mapAPIKey(input.settings),
@@ -334,6 +334,7 @@ function usesAPIKeyAuth(packageName: string | undefined) {
    name === "@ai-sdk/openai" ||
    name === "@ai-sdk/anthropic" ||
    name === "@ai-sdk/cerebras" ||
+    name === "@ai-sdk/deepinfra" ||
    name === "@ai-sdk/openai-compatible" ||
    name === "@ai-sdk/google" ||
    name === "@ai-sdk/togetherai" ||
@@ -345,6 +346,7 @@ function usesAPIKeyAuth(packageName: string | undefined) {
    name === "@opencode-ai/ai/providers/anthropic" ||
    name === "@opencode-ai/ai/providers/anthropic-compatible" ||
    name === "@opencode-ai/ai/providers/cerebras" ||
+    name === "@opencode-ai/ai/providers/deepinfra" ||
    name === "@opencode-ai/ai/providers/openai-compatible" ||
    name === "@opencode-ai/ai/providers/google" ||
    name === "@opencode-ai/ai/providers/togetherai" ||
@@ -6,7 +6,6 @@ import { CerebrasPlugin } from "./provider/cerebras.js"
 import { CloudflareAIGatewayPlugin } from "./provider/cloudflare-ai-gateway.js"
 import { CloudflareWorkersAIPlugin } from "./provider/cloudflare-workers-ai.js"
 import { CoherePlugin } from "./provider/cohere.js"
-import { DeepInfraPlugin } from "./provider/deepinfra.js"
 import { DynamicProviderPlugin } from "./provider/dynamic.js"
 import { GatewayPlugin } from "./provider/gateway.js"
 import { GithubCopilotPlugin } from "./provider/github-copilot.js"
@@ -42,7 +41,6 @@ export const ProviderPlugins: PluginInternal.InternalPlugin[] = [
  CloudflareAIGatewayPlugin,
  CloudflareWorkersAIPlugin,
  CoherePlugin,
-  DeepInfraPlugin,
  GatewayPlugin,
  GithubCopilotPlugin,
  GitLabPlugin,
@@ -1,10 +0,0 @@
-import { createProviderPlugin } from "./factory.js"
-
-export const DeepInfraPlugin = createProviderPlugin({
-  id: "opencode.provider.deepinfra",
-  package: "@ai-sdk/deepinfra",
-  load: async (options) => {
-    const { createDeepInfra } = await import("@ai-sdk/deepinfra")
-    return createDeepInfra(options)
-  },
-})
@@ -2,7 +2,7 @@ export * as Project from "./project.js"

 import { Context, Effect, Layer, Schema } from "effect"
 import { ChildProcess } from "effect/unstable/process"
-import { and, asc, desc, eq } from "drizzle-orm"
+import { and, asc, desc, eq, gte, isNull, lte } from "drizzle-orm"
 import path from "path"
 import { AbsolutePath } from "./schema.js"
 import { Bus } from "./bus.js"
@@ -104,7 +104,12 @@ const layer = Layer.effect(
        .pipe(Effect.orDie)
      yield* upsertProject(db, project).pipe(Effect.orDie)
      if (previous && previous.canonical !== project.canonical) {
-        const row = yield* db.select().from(ProjectTable).where(eq(ProjectTable.id, project.id)).get().pipe(Effect.orDie)
+        const row = yield* db
+          .select()
+          .from(ProjectTable)
+          .where(eq(ProjectTable.id, project.id))
+          .get()
+          .pipe(Effect.orDie)
        if (row) yield* bus.publish(ProjectSchema.Event.Updated, fromRow(row))
      }
      if (!project.vcs) return project
@@ -135,9 +140,38 @@ const layer = Layer.effect(
            .get()
            .pipe(Effect.orDie)
          if (stored) return
+          const directory = AbsolutePath.make(yield* fs.resolve(item.directory))
+          const markerless = yield* db
+            .select({ id: ProjectTable.id, directory: ProjectTable.worktree })
+            .from(ProjectTable)
+            .where(
+              and(
+                isNull(ProjectTable.vcs),
+                gte(ProjectTable.worktree, directory),
+                lte(ProjectTable.worktree, AbsolutePath.make(directory + "\uffff")),
+              ),
+            )
+            .all()
+            .pipe(Effect.orDie)
+          const adopted = yield* Effect.filter(markerless, (candidate) =>
+            Effect.gen(function* () {
+              if (candidate.id === item.projectID) return false
+              if (!FSUtil.contains(directory, candidate.directory)) return false
+              const markers = yield* fs
+                .up({ targets: [".git", ".hg"], start: candidate.directory, stop: directory, mode: "first" })
+                .pipe(Effect.orElseSucceed(() => []))
+              if (!markers[0]) return false
+              return (yield* fs.resolve(path.dirname(markers[0]))) === directory
+            }),
+          )
          yield* bus.publish(
            Worktree.Event.Resolved,
-            { projectID: item.projectID, directory: item.directory, previous: project.previous ?? ID.global },
+            {
+              projectID: item.projectID,
+              directory: item.directory,
+              previous: project.previous ?? ID.global,
+              ...(adopted.length ? { adopted: adopted.map((candidate) => candidate.id) } : {}),
+            },
            {
              commit: () =>
                db
@@ -256,12 +290,7 @@ const layer = Layer.effect(
      return node ? ID.make(node) : undefined
    })

-    const hgDiscover = Effect.fnUntraced(function* (input: AbsolutePath) {
-      const dotHg = yield* fs.up({ targets: [".hg"], start: input, mode: "first" }).pipe(
-        Effect.map((matches) => matches[0]),
-        Effect.orElseSucceed(() => undefined),
-      )
-      if (!dotHg) return undefined
+    const hgDiscover = Effect.fnUntraced(function* (dotHg: AbsolutePath) {
      const worktree = AbsolutePath.make(path.dirname(dotHg))
      const store = AbsolutePath.make(dotHg)
      const previous = yield* cached(store)
@@ -275,7 +304,15 @@ const layer = Layer.effect(
    })

    const resolve = Effect.fn("Project.resolve")(function* (input: AbsolutePath) {
-      const repo = yield* git.repo.discover(input)
+      const directory = AbsolutePath.make(yield* fs.resolve(input))
+      const marker = yield* fs.up({ targets: [".git", ".hg"], start: directory, mode: "first" }).pipe(
+        Effect.map((matches) => matches[0]),
+        Effect.orElseSucceed(() => undefined),
+      )
+      const repo =
+        marker && path.basename(marker) === ".git"
+          ? yield* git.repo.discover(AbsolutePath.make(path.dirname(marker)))
+          : undefined
      if (repo) {
        const previous = yield* cached(repo.commonDirectory)
        const id = (yield* remote(repo)) ?? previous ?? (yield* rootCommit(repo))
@@ -295,10 +332,14 @@ const layer = Layer.effect(
        })
      }

-      const hg = yield* hgDiscover(input)
+      const hg = marker && path.basename(marker) === ".hg" ? yield* hgDiscover(AbsolutePath.make(marker)) : undefined
      if (hg) return yield* persist({ ...hg, canonical: hg.directory })
-      const directory = AbsolutePath.make(path.parse(input).root)
-      return yield* persist({ id: ID.global, directory, canonical: directory, vcs: undefined })
+      return yield* persist({
+        id: ID.make(Hash.fast(`directory:${directory}`)),
+        directory,
+        canonical: directory,
+        vcs: undefined,
+      })
    })

    return Service.of({ list, update, resolve })
@@ -49,6 +49,7 @@ const builtins = new Map<string, () => Promise<unknown>>([
  ["@opencode-ai/ai/providers/azure/chat", () => import("@opencode-ai/ai/providers/azure/chat")],
  ["@opencode-ai/ai/providers/azure/responses", () => import("@opencode-ai/ai/providers/azure/responses")],
  ["@opencode-ai/ai/providers/cerebras", () => import("@opencode-ai/ai/providers/cerebras")],
+  ["@opencode-ai/ai/providers/deepinfra", () => import("@opencode-ai/ai/providers/deepinfra")],
  ["@opencode-ai/ai/providers/google", () => import("@opencode-ai/ai/providers/google")],
  ["@opencode-ai/ai/providers/google-vertex", () => import("@opencode-ai/ai/providers/google-vertex")],
  ["@opencode-ai/ai/providers/google-vertex/gemini", () => import("@opencode-ai/ai/providers/google-vertex/gemini")],
@@ -1,6 +1,6 @@
 export * as SessionProjector from "./projector.js"

-import { and, asc, desc, eq, gt, gte, inArray, lt, lte, sql } from "drizzle-orm"
+import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, lte, or, sql } from "drizzle-orm"
 import { DateTime, Effect, Layer, Schema, Stream } from "effect"
 import path from "path"
 import { Database } from "../database/database.js"
@@ -23,6 +23,7 @@ import { Worktree } from "@opencode-ai/schema/worktree"
 import { Project } from "@opencode-ai/schema/project"
 import { AbsolutePath, RelativePath } from "../schema.js"
 import type { SessionSchema } from "./schema.js"
+import { ProjectTable } from "../project/sql.js"

 type DatabaseService = Database.Interface["db"]
 type CurrentDurableEvent = Extract<SessionEvent.Event, { readonly durable: object }>
@@ -478,18 +479,34 @@ const layer = Layer.effectDiscard(
    // are untouched: the session did not move, its directory got identified.
    yield* bus.project(Worktree.Event.Resolved, (event) =>
      Effect.gen(function* () {
-        const stale = [event.data.previous, Project.ID.global].filter((id) => id !== event.data.projectID)
-        if (stale.length === 0) return
+        const candidates = [
+          ...new Set(
+            [event.data.previous, Project.ID.global, ...(event.data.adopted ?? [])].filter(
+              (id) => id !== event.data.projectID,
+            ),
+          ),
+        ]
+        if (candidates.length === 0) return
        const rows = yield* db
-          .select({ id: SessionTable.id, directory: SessionTable.directory })
+          .select({
+            id: SessionTable.id,
+            directory: SessionTable.directory,
+            projectID: SessionTable.project_id,
+            canonical: ProjectTable.worktree,
+          })
          .from(SessionTable)
+          .innerJoin(ProjectTable, eq(SessionTable.project_id, ProjectTable.id))
          .where(
            and(
-              inArray(SessionTable.project_id, stale),
-              // Lexicographic range narrows the scan to prefix neighbors without
-              // LIKE escaping; FSUtil.contains below decides containment exactly.
-              gte(SessionTable.directory, event.data.directory),
-              lte(SessionTable.directory, AbsolutePath.make(event.data.directory + "\uffff")),
+              inArray(SessionTable.project_id, candidates),
+              isNull(SessionTable.workspace_id),
+              or(
+                event.data.adopted?.length ? inArray(SessionTable.project_id, event.data.adopted) : undefined,
+                and(
+                  gte(SessionTable.directory, event.data.directory),
+                  lte(SessionTable.directory, AbsolutePath.make(event.data.directory + "\uffff")),
+                ),
+              ),
            ),
          )
          .all()
@@ -497,12 +514,15 @@ const layer = Layer.effectDiscard(
        yield* Effect.forEach(
          rows,
          (row) => {
-            if (!FSUtil.contains(event.data.directory, row.directory)) return Effect.void
+            const directory = event.data.adopted?.includes(row.projectID)
+              ? row.canonical
+              : AbsolutePath.make(path.resolve(row.directory))
+            if (!FSUtil.contains(event.data.directory, directory)) return Effect.void
            return db
              .update(SessionTable)
              .set({
                project_id: event.data.projectID,
-                path: RelativePath.make(path.relative(event.data.directory, row.directory).replaceAll("\\", "/")),
+                path: RelativePath.make(path.relative(event.data.directory, directory).replaceAll("\\", "/")),
                // Self-assignment suppresses the column's $onUpdate: adoption is not activity.
                time_updated: sql`${SessionTable.time_updated}`,
              })
@@ -153,12 +153,8 @@ const layer = Layer.effect(
    const bus = yield* Bus.Service
    const processService = yield* AppProcess.Service

-    const changed = Effect.fnUntraced(function* (
-      projectID: ProjectSchema.ID,
-      update: boolean,
-      directory?: AbsolutePath,
-    ) {
-      if (update) yield* bus.publish(Event.Updated, { projectID, directory })
+    const changed = Effect.fnUntraced(function* (projectID: ProjectSchema.ID, update: boolean) {
+      if (update) yield* bus.publish(Event.Updated, { projectID })
    })

    const ops = {
@@ -269,7 +265,6 @@ const layer = Layer.effect(
          directory: result.directory,
          strategy: input.strategy,
        }),
-        result.directory,
      )
      const project = yield* db
        .select({ worktree: ProjectTable.worktree, commands: ProjectTable.commands })
@@ -61,8 +61,8 @@ describe("AISDKNative", () => {
    })
  })

-  test("maps Cerebras and Together AI settings, headers, and reasoning options to native providers", () => {
-    for (const name of ["cerebras", "togetherai"]) {
+  test("maps Cerebras, DeepInfra, and Together AI settings, headers, and reasoning options to native providers", () => {
+    for (const name of ["cerebras", "deepinfra", "togetherai"]) {
      expect(
        map(`@ai-sdk/${name}`, {
          apiKey: "secret",
@@ -885,6 +885,12 @@ describe("ModelResolver", () => {
          { reasoningEffort: "high" },
          { reasoningEffort: "high" },
        ],
+        [
+          "@ai-sdk/deepinfra",
+          "@opencode-ai/ai/providers/deepinfra",
+          { reasoningEffort: "none" },
+          { reasoningEffort: "none" },
+        ],
        [
          "@ai-sdk/openai-compatible",
          "@opencode-ai/ai/providers/openai-compatible",
@@ -963,6 +969,7 @@ describe("ModelResolver", () => {
        ],
        ["@ai-sdk/azure", "@opencode-ai/ai/providers/azure/responses", "api-model"],
        ["@ai-sdk/cerebras", "@opencode-ai/ai/providers/cerebras", "api-model"],
+        ["@ai-sdk/deepinfra", "@opencode-ai/ai/providers/deepinfra", "api-model"],
        ["@ai-sdk/google", "@opencode-ai/ai/providers/google", "api-model"],
        ["@ai-sdk/google-vertex", "@opencode-ai/ai/providers/google-vertex", "api-model"],
        ["@ai-sdk/google-vertex/anthropic", "@opencode-ai/ai/providers/google-vertex/messages", "claude-sonnet-4-6"],
@@ -1087,6 +1094,11 @@ describe("ModelResolver", () => {
      const cerebras = yield* ModelResolver.fromCatalogModel(
        model(Provider.aisdk("@ai-sdk/cerebras"), { settings: { reasoningEffort: "high" } }),
      )
+      const deepinfra = yield* ModelResolver.fromCatalogModel(
+        model(Provider.aisdk("@ai-sdk/deepinfra"), {
+          settings: { baseURL: "https://deepinfra.example/provider-root", reasoningEffort: "none" },
+        }),
+      )
      const togetherai = yield* ModelResolver.fromCatalogModel(
        model(Provider.aisdk("@ai-sdk/togetherai"), { settings: { reasoningEffort: "high" } }),
      )
@@ -1113,6 +1125,10 @@ describe("ModelResolver", () => {
      expect(cerebras.route.id).toBe("cerebras-chat")
      expect(cerebras.route.defaults.providerOptions).toEqual({ reasoningEffort: "high" })
      expect(String(cerebras.provider)).toBe("test-provider")
+      expect(deepinfra.route.id).toBe("deepinfra-chat")
+      expect(deepinfra.route.endpoint.baseURL).toBe("https://deepinfra.example/provider-root/openai")
+      expect(deepinfra.route.defaults.providerOptions).toEqual({ reasoningEffort: "none" })
+      expect(String(deepinfra.provider)).toBe("test-provider")
      expect(togetherai.route.id).toBe("togetherai-chat")
      expect(togetherai.route.defaults.providerOptions).toEqual({ reasoningEffort: "high" })
      expect(String(togetherai.provider)).toBe("test-provider")
@@ -6,7 +6,6 @@ import { Plugin } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { AlibabaPlugin } from "@opencode-ai/core/plugin/provider/alibaba"
 import { CoherePlugin } from "@opencode-ai/core/plugin/provider/cohere"
-import { DeepInfraPlugin } from "@opencode-ai/core/plugin/provider/deepinfra"
 import { GatewayPlugin } from "@opencode-ai/core/plugin/provider/gateway"
 import { GroqPlugin } from "@opencode-ai/core/plugin/provider/groq"
 import { MistralPlugin } from "@opencode-ai/core/plugin/provider/mistral"
@@ -21,7 +20,6 @@ const options = { name: "custom-provider", apiKey: "test", baseURL: "https://exa
 const providers = [
  { id: "alibaba", plugin: AlibabaPlugin, package: "@ai-sdk/alibaba", provider: "alibaba.chat" },
  { id: "cohere", plugin: CoherePlugin, package: "@ai-sdk/cohere", provider: "cohere.chat" },
-  { id: "deepinfra", plugin: DeepInfraPlugin, package: "@ai-sdk/deepinfra", provider: "deepinfra.chat" },
  { id: "gateway", plugin: GatewayPlugin, package: "@ai-sdk/gateway", provider: "gateway" },
  { id: "groq", plugin: GroqPlugin, package: "@ai-sdk/groq", provider: "groq.chat" },
  { id: "mistral", plugin: MistralPlugin, package: "@ai-sdk/mistral", provider: "mistral.chat" },
@@ -100,6 +100,19 @@ describe("Project.update", () => {
        commands: { start: "bun install" },
      })

+      expect(yield* project.update({ projectID: id, name: "Renamed" })).toMatchObject({
+        id,
+        name: "Renamed",
+        icon: { color: "blue", override: "data:image/png;base64,test" },
+        commands: { start: "bun install" },
+      })
+      expect(yield* project.update({ projectID: id, icon: { color: "green" } })).toMatchObject({
+        id,
+        name: "Renamed",
+        icon: { color: "green", override: "data:image/png;base64,test" },
+        commands: { start: "bun install" },
+      })
+
      expect(
        yield* project.update({
          projectID: id,
@@ -145,24 +158,54 @@ async function rootCommit(dir: string) {
 }

 describe("Project.resolve", () => {
-  it.live("returns global for non-git directory", () =>
+  it.live("creates distinct deterministic projects for exact markerless directories", () =>
    Effect.gen(function* () {
      const tmp = yield* Effect.acquireRelease(
        Effect.promise(() => tmpdir()),
        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
      )
      const project = yield* Project.Service
+      const nested = path.join(tmp.path, "notes", "drafts")
+      yield* Effect.promise(() => fs.mkdir(nested, { recursive: true }))

      const result = yield* project.resolve(abs(tmp.path))
+      const repeated = yield* project.resolve(abs(`${tmp.path}${path.sep}.`))
+      const child = yield* project.resolve(abs(nested))

-      expect(result.id).toBe(Project.ID.make("global"))
-      expect(path.resolve(result.directory)).toBe(path.parse(tmp.path).root)
+      expect(result.id).not.toBe(Project.ID.global)
+      expect(repeated.id).toBe(result.id)
+      expect(child.id).not.toBe(result.id)
+      expect(result.directory).toBe(yield* real(tmp.path))
+      expect(child.directory).toBe(yield* real(nested))
      expect(result.canonical).toBe(result.directory)
      expect(result.previous).toBeUndefined()
      expect(result.vcs).toBeUndefined()
    }),
  )

+  it.live("repository markers override markerless directory projects", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      const nested = path.join(tmp.path, "packages", "app")
+      yield* Effect.promise(() => fs.mkdir(nested, { recursive: true }))
+      const project = yield* Project.Service
+      const root = yield* project.resolve(abs(tmp.path))
+      const child = yield* project.resolve(abs(nested))
+
+      yield* Effect.promise(() => initRepo(tmp.path, { commit: true }))
+      const repository = yield* project.resolve(abs(nested))
+
+      expect(root.id).not.toBe(child.id)
+      expect(repository.id).not.toBe(root.id)
+      expect(repository.id).not.toBe(child.id)
+      expect(repository.directory).toBe(yield* real(tmp.path))
+      expect(repository.vcs?.type).toBe("git")
+    }),
+  )
+
  it.live("does not publish project updates for first or repeated resolutions", () =>
    Effect.gen(function* () {
      const tmp = yield* Effect.acquireRelease(
@@ -411,6 +454,48 @@ describe("Project.resolve", () => {
    }),
  )

+  it.live("prefers the nearest mercurial marker over an outer git repository", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      const nested = path.join(tmp.path, "nested")
+      yield* Effect.promise(async () => {
+        await initRepo(tmp.path, { commit: true })
+        await fs.mkdir(path.join(nested, ".hg"), { recursive: true })
+        await fs.mkdir(path.join(nested, "app"))
+      })
+      const project = yield* Project.Service
+
+      const result = yield* project.resolve(abs(path.join(nested, "app")))
+
+      expect(result.vcs?.type).toBe("hg")
+      expect(result.directory).toBe(yield* real(nested))
+    }),
+  )
+
+  it.live("prefers the nearest git marker over an outer mercurial repository", () =>
+    Effect.gen(function* () {
+      const tmp = yield* Effect.acquireRelease(
+        Effect.promise(() => tmpdir()),
+        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
+      )
+      const nested = path.join(tmp.path, "nested")
+      yield* Effect.promise(async () => {
+        await fs.mkdir(path.join(tmp.path, ".hg"))
+        await fs.mkdir(path.join(nested, "app"), { recursive: true })
+        await initRepo(nested, { commit: true })
+      })
+      const project = yield* Project.Service
+
+      const result = yield* project.resolve(abs(path.join(nested, "app")))
+
+      expect(result.vcs?.type).toBe("git")
+      expect(result.directory).toBe(yield* real(nested))
+    }),
+  )
+
  it.live("returns global id for unreadable mercurial metadata", () =>
    Effect.gen(function* () {
      const tmp = yield* Effect.acquireRelease(
@@ -6,6 +6,7 @@ describe("Provider", () => {
  test("loads bundled native provider entrypoints", async () => {
    const packages = [
      "@opencode-ai/ai/providers/cerebras",
+      "@opencode-ai/ai/providers/deepinfra",
      "@opencode-ai/ai/providers/google-vertex",
      "@opencode-ai/ai/providers/google-vertex/gemini",
      "@opencode-ai/ai/providers/google-vertex/chat",
@@ -96,14 +96,37 @@ describe("Session.create", () => {
        const { db } = yield* Database.Service
        const ref = Location.Ref.make({ directory: AbsolutePath.make(directory) })
        const nested = Location.Ref.make({ directory: AbsolutePath.make(path.join(directory, "packages", "app")) })
+        const aliased = Location.Ref.make({
+          directory: AbsolutePath.make([path.join(directory, "alias"), "..", "packages", "app"].join(path.sep)),
+        })
        const created = yield* session.create({ location: ref, title: "Before git" })
        const child = yield* session.create({ location: nested, title: "Nested before git" })
-        const originalUpdated = created.time.updated
+        const alias = yield* session.create({ location: aliased, title: "Aliased before git" })
+        const bus = yield* Bus.Service
+        const store = yield* SessionStore.Service
+        yield* session.prompt({ sessionID: created.id, text: "Preserved history", resume: false })
+        yield* SessionInbox.promote(db, bus, created.id, "steer")
+        const pending = yield* session.prompt({ sessionID: created.id, text: "Preserved inbox", resume: false })
+        yield* store.claim(created.id)
+        const before = yield* db
+          .select()
+          .from(SessionTable)
+          .where(eq(SessionTable.id, created.id))
+          .get()
+          .pipe(Effect.orDie)
+        if (!before) return yield* Effect.die(new Error("created session not found"))

        yield* Effect.promise(async () => {
          await $`git init -q`.cwd(directory)
          await $`git config user.email test@example.com`.cwd(directory)
          await $`git config user.name Test`.cwd(directory)
+        })
+        const unborn = yield* projects.resolve(ref.directory)
+        const unbornRoot = yield* session.get(created.id)
+        const unbornNested = yield* session.get(child.id)
+        const unbornAlias = yield* session.get(alias.id)
+
+        yield* Effect.promise(async () => {
          await fs.writeFile(path.join(directory, "README.md"), "test\n")
          await $`git add README.md`.cwd(directory)
          await $`git commit -qm initial`.cwd(directory)
@@ -114,10 +137,25 @@ describe("Session.create", () => {
        const repeat = yield* projects.resolve(ref.directory)
        const adopted = yield* session.get(created.id)
        const nestedAdopted = yield* session.get(child.id)
+        const aliasAdopted = yield* session.get(alias.id)
        const page = yield* session.list({ project: project.id })
        const log = Array.from(yield* Stream.runCollect(logEvents(session, created.id)))

-        expect(created.projectID).toBe(Project.ID.global)
+        expect(created.projectID).not.toBe(Project.ID.global)
+        expect(child.projectID).not.toBe(created.projectID)
+        expect(alias.projectID).toBe(child.projectID)
+        expect(unborn.id).toBe(Project.ID.global)
+        expect(unbornRoot).toMatchObject({ projectID: Project.ID.global, subpath: undefined })
+        expect(unbornNested).toMatchObject({ projectID: Project.ID.global, subpath: "packages/app" })
+        expect(unbornAlias).toMatchObject({ projectID: Project.ID.global, subpath: "packages/app" })
+        expect(
+          yield* db
+            .select({ data: EventTable.data })
+            .from(EventTable)
+            .where(eq(EventTable.aggregate_id, Project.ID.global))
+            .get()
+            .pipe(Effect.orDie),
+        ).toMatchObject({ data: { adopted: expect.arrayContaining([created.projectID, child.projectID]) } })
        expect(project.id).toBe(Project.ID.make(Hash.fast("git-remote:github.com/owner/adopted")))
        expect(repeat.id).toBe(project.id)
        expect(page.data.map((item) => item.id)).toEqual(expect.arrayContaining([created.id, child.id]))
@@ -125,16 +163,37 @@ describe("Session.create", () => {
          projectID: project.id,
          location: ref,
          subpath: undefined,
-          time: { updated: originalUpdated },
+          time: { updated: DateTime.makeUnsafe(before.time_updated) },
        })
        expect(nestedAdopted).toMatchObject({
          projectID: project.id,
          location: nested,
          subpath: RelativePath.make("packages/app"),
        })
+        expect(aliasAdopted).toMatchObject({
+          projectID: project.id,
+          location: aliased,
+          subpath: RelativePath.make("packages/app"),
+        })
        // Adoption is a project-domain fact; the session log records nothing new.
-        expect(log.map((event) => event.type)).toEqual(["session.created"])
-        expect(yield* session.messages({ sessionID: created.id })).toEqual([])
+        expect(log.map((event) => event.type)).toEqual([
+          "session.created",
+          "session.inbox.enqueued",
+          "session.inbox.delivered",
+          "session.inbox.enqueued",
+        ])
+        expect(yield* session.messages({ sessionID: created.id })).toMatchObject([
+          { id: expect.any(String), type: "user", text: "Preserved history" },
+        ])
+        expect(yield* SessionInbox.find(db, pending.id)).toMatchObject({ payload: { text: "Preserved inbox" } })
+        expect(
+          yield* db.select().from(SessionTable).where(eq(SessionTable.id, created.id)).get().pipe(Effect.orDie),
+        ).toMatchObject({
+          time_created: before.time_created,
+          time_updated: before.time_updated,
+          time_suspended: before.time_suspended,
+          resume_attempts: before.resume_attempts,
+        })
        // Repeated resolution announces the directory's identity exactly once.
        const announced = yield* db
          .select({ type: EventTable.type })
@@ -147,6 +206,46 @@ describe("Session.create", () => {
    ),
  )

+  liveIt.live("does not adopt nested repositories or sessions in another workspace", () =>
+    withTmp((directory) =>
+      Effect.gen(function* () {
+        const session = yield* Session.Service
+        const projects = yield* Project.Service
+        const outer = path.join(directory, "outer")
+        const nested = path.join(outer, "nested")
+        const child = AbsolutePath.make(path.join(nested, "app"))
+        yield* Effect.promise(() => fs.mkdir(child, { recursive: true }))
+
+        const local = yield* session.create({ location: Location.Ref.make({ directory: AbsolutePath.make(outer) }) })
+        const inside = yield* session.create({ location: Location.Ref.make({ directory: child }) })
+        const remote = yield* session.create({
+          location: Location.Ref.make({
+            directory: AbsolutePath.make(outer),
+            workspaceID: Workspace.ID.make("wrk_remote"),
+          }),
+        })
+
+        yield* Effect.promise(async () => {
+          for (const root of [nested, outer]) {
+            await $`git init -q`.cwd(root)
+            await $`git config user.email test@example.com`.cwd(root)
+            await $`git config user.name Test`.cwd(root)
+            await $`git commit --allow-empty -qm initial`.cwd(root)
+          }
+        })
+
+        const parent = yield* projects.resolve(AbsolutePath.make(outer))
+        expect((yield* session.get(local.id)).projectID).toBe(parent.id)
+        expect((yield* session.get(inside.id)).projectID).toBe(inside.projectID)
+        expect((yield* session.get(remote.id)).projectID).toBe(remote.projectID)
+
+        const repository = yield* projects.resolve(AbsolutePath.make(nested))
+        expect((yield* session.get(inside.id)).projectID).toBe(repository.id)
+        expect((yield* session.get(remote.id)).projectID).toBe(remote.projectID)
+      }),
+    ),
+  )
+
  it.effect("persists a missing title until one is generated or supplied", () =>
    Effect.gen(function* () {
      const session = yield* Session.Service
@@ -132,6 +132,7 @@ const it = testEffect(
    LayerNode.group([
      Database.node,
      Bus.node,
+      Project.node,
      SessionProjector.node,
      SessionStore.node,
      Agent.node,
@@ -200,6 +201,7 @@ const setup = Effect.gen(function* () {
  const { db } = yield* Database.Service
  const bus = yield* Bus.Service
  const agents = yield* Agent.Service
+  const projects = yield* Project.Service
  const instructionBuiltIns = yield* InstructionBuiltIns.Service
  yield* agents.transform((draft) =>
    draft.update(Agent.ID.make("build"), (agent) => {
@@ -210,7 +212,7 @@ const setup = Effect.gen(function* () {
    .insert(SessionTable)
    .values({
      id: sessionID,
-      project_id: Project.ID.global,
+      project_id: (yield* projects.resolve(AbsolutePath.make("/project"))).id,
      slug: "generate-test",
      directory: "/project",
      title: "Generate test",
@@ -183,10 +183,7 @@ describe("Worktree", () => {
          { directory: created.directory, strategy: "git" },
        ].toSorted((a, b) => a.directory.localeCompare(b.directory)),
      )
-      expect(Array.from(yield* Fiber.join(fiber))[0]?.data).toEqual({
-        projectID: input.projectID,
-        directory: created.directory,
-      })
+      expect(Array.from(yield* Fiber.join(fiber))[0]?.data).toEqual({ projectID: input.projectID })

      yield* worktree.remove({ projectID: input.projectID, directory: created.directory, force: false })

@@ -199,7 +196,6 @@ describe("Worktree", () => {
    Effect.gen(function* () {
      const input = yield* setup()
      const worktree = yield* Worktree.Service
-      const bus = yield* Bus.Service
      const temp = yield* Effect.promise(() => fs.realpath(path.dirname(input.root.path)))
      const parent = abs(path.join(temp, path.basename(input.root.path) + "-worktree-setup"))
      yield* Effect.addFinalizer(() =>
@@ -216,20 +212,12 @@ describe("Worktree", () => {
        .where(eq(ProjectTable.id, input.projectID))
        .run()
        .pipe(Effect.orDie)
-      const updated = yield* bus
-        .subscribe(Worktree.Event.Updated)
-        .pipe(Stream.take(1), Stream.runCollect, Effect.forkScoped)
-      yield* Effect.yieldNow
-      const creating = yield* worktree
-        .create({
-          projectID: input.projectID,
-          strategy: gitWorktree,
-          directory: parent,
-          name: "worktree",
-        })
-        .pipe(Effect.forkScoped)
-      expect(Array.from(yield* Fiber.join(updated))[0]?.data.directory).toBe(abs(path.join(parent, "worktree")))
-      const created = yield* Fiber.join(creating)
+      const created = yield* worktree.create({
+        projectID: input.projectID,
+        strategy: gitWorktree,
+        directory: parent,
+        name: "worktree",
+      })

      expect(yield* Effect.promise(() => Bun.file(path.join(created.directory, "setup.json")).json())).toEqual([
        input.sourceDirectory,
@@ -47,7 +47,7 @@ export type List = typeof List.Type

 const Updated = ephemeral({
  type: "worktree.updated",
-  schema: { projectID: Project.ID, directory: optional(AbsolutePath) },
+  schema: { projectID: Project.ID },
 })

 const Resolved = durable({
@@ -57,27 +57,46 @@ const Resolved = durable({
    projectID: Project.ID,
    directory: AbsolutePath,
    previous: Project.ID,
+    adopted: optional(Schema.Array(Project.ID)),
  },
 })

 export const Event = { Updated, Resolved, Definitions: inventory(Updated, Resolved) }

 export function adopt(
-  session: { readonly projectID: string; readonly directory: string },
-  event: { readonly projectID: string; readonly directory: string; readonly previous: string },
+  session: { readonly projectID: string; readonly directory: string; readonly workspaceID?: string },
+  event: {
+    readonly projectID: string
+    readonly directory: string
+    readonly previous: string
+    readonly adopted?: ReadonlyArray<string>
+  },
 ) {
-  if (session.projectID !== event.previous && session.projectID !== Project.ID.global) return
+  if (session.workspaceID) return
+  if (
+    session.projectID !== event.previous &&
+    session.projectID !== Project.ID.global &&
+    !event.adopted?.includes(session.projectID)
+  )
+    return
  if (session.projectID === event.projectID) return
-  const inside =
-    session.directory === event.directory ||
-    session.directory.startsWith(event.directory + "/") ||
-    session.directory.startsWith(event.directory + "\\")
-  if (!inside) return
+  const normalize = (value: string) =>
+    value
+      .replaceAll("\\", "/")
+      .split("/")
+      .reduce((result, segment) => {
+        if (!segment || segment === ".") return result
+        if (segment === "..") return result.slice(0, result.lastIndexOf("/"))
+        return `${result}/${segment}`
+      }, "")
+  const directory = normalize(session.directory)
+  const root = normalize(event.directory)
+  const windows = /^\/[a-z]:/i.test(root)
+  const key = windows ? directory.toLowerCase() : directory
+  const parent = windows ? root.toLowerCase() : root
+  if (key !== parent && !key.startsWith(parent + "/")) return
  return {
    projectID: event.projectID,
-    subpath:
-      session.directory === event.directory
-        ? undefined
-        : session.directory.slice(event.directory.length + 1).replaceAll("\\", "/"),
+    subpath: key === parent ? undefined : directory.slice(root.length + 1),
  }
 }
@@ -49,7 +49,6 @@ export function createSessionTimelineRowRenderer(input: {
    set: (key: string, open: boolean) => void
  }
  centered?: Accessor<boolean>
-  thinkingLabel?: Accessor<string | undefined>
  padding?: Accessor<string>
  anchor?: (messageID: string) => string | undefined
 }) {
@@ -506,7 +505,7 @@ export function createSessionTimelineRowRenderer(input: {
                    <div data-slot="basic-tool-tool-info-structured">
                      <div data-slot="basic-tool-tool-info-main">
                        <span data-slot="basic-tool-tool-title">
-                          <TextShimmer text={input.thinkingLabel?.() ?? i18n.t("ui.sessionTurn.status.thinking")} />
+                          <TextShimmer text={i18n.t("ui.sessionTurn.status.thinking")} />
                        </span>
                        <Show when={!input.showReasoningSummaries()}>
                          <span data-slot="basic-tool-tool-subtitle">
@@ -614,7 +614,7 @@ function App(props: { pair?: DialogPairCredentials }) {
        return
      }

-      renderer.setTerminalTitle(`OC | ${title.length > 40 ? title.slice(0, 37) + "..." : title}`)
+      renderer.setTerminalTitle(`OC | ${title.length > 40 ? title.slice(0, 37) + "…" : title}`)
      return
    }

@@ -971,7 +971,7 @@ function App(props: { pair?: DialogPairCredentials }) {
                const restart = client.restart
                if (!restart) return
                dialog.clear()
-                toast.show({ variant: "info", message: "Restarting service...", duration: 30000 })
+                toast.show({ variant: "info", message: "Restarting service…", duration: 30000 })
                // restart resolves once the replacement service is healthy; the
                // event stream reattaches through the reconnect loop.
                await restart()
@@ -86,7 +86,15 @@ export function DevToolsBar() {
  const offEscape = keymap.intercept(
    "key",
    ({ event }) => {
-      if (!panel() || event.name !== "escape") return
+      if (!panel() || keymap.mode.current() !== "base") return
+      if (event.name !== "escape" && !(event.ctrl && event.name === "c")) return
+      if (renderer.getSelection()?.getSelectedText()) {
+        if ((config.data.terminal?.copy ?? (process.platform === "win32" ? "manual" : "select")) !== "select") return
+        renderer.clearSelection()
+        event.preventDefault()
+        event.stopPropagation()
+        return
+      }
      event.preventDefault()
      event.stopPropagation()
      close()
@@ -352,7 +360,7 @@ export function DevToolsBar() {
          <PanelBox>
            <PanelTitle>Tools</PanelTitle>
            <Action onClick={() => void dump()} disabled={dumping()} hoverBackground>
-              {dumping() ? "Writing debug snapshot..." : "Write debug snapshot"}
+              {dumping() ? "Writing debug snapshot…" : "Write debug snapshot"}
            </Action>
            <Show when={dumpPath()}>
              {(file) => (
@@ -352,7 +352,7 @@ function CommandStarting(props: {
    if (!handedOff) closed = true
  })

-  return <CommandView title={props.method.label} output="" message="Starting command..." />
+  return <CommandView title={props.method.label} output="" message="Starting command…" />
 }

 function CommandPending(props: {
@@ -412,7 +412,7 @@ function CommandPending(props: {
    })
  })

-  return <CommandView title={props.title} output={output()} message="Waiting for command to finish..." />
+  return <CommandView title={props.title} output={output()} message="Waiting for command to finish…" />
 }

 function CommandView(props: { title: string; output: string; message: string }) {
@@ -541,7 +541,7 @@ function OAuthStarting(props: {
      })
  })

-  return <OAuthView title={props.method.label} message="Starting authorization..." />
+  return <OAuthView title={props.method.label} message="Starting authorization…" />
 }

 function OAuthAuto(props: {
@@ -629,7 +629,7 @@ function OAuthAuto(props: {
      title={props.title}
      url={props.attempt.url}
      instructions={props.attempt.instructions}
-      message="Waiting for authorization..."
+      message="Waiting for authorization…"
      copy
      open
    />
@@ -953,7 +953,7 @@ async function externalAnswer(
    if (choice === true) return true
    const result = await new Promise<boolean | typeof CANCELLED>((resolve) => {
      dialog.replace(
-        () => <OAuthView title={formLabel(field) || title} message="Opening link..." />,
+        () => <OAuthView title={formLabel(field) || title} message="Opening link…" />,
        () => resolve(CANCELLED),
      )
      void open(field.url).then(
@@ -237,7 +237,7 @@ function buildIssueURL(message: string, stack: string, version: string) {
  // clipped trace is obvious. searchParams.set handles encoding without throwing,
  // so measuring url.toString() is both correct and safe on any input.
  const MAX_URL_LENGTH = 6000
-  const marker = "\n... (truncated)"
+  const marker = "\n… (truncated)"
  const head = `The OpenCode TUI crashed with an unexpected error.\n\n**Error:** ${message}\n\n**Stack trace:**\n`
  const setBody = (body: string) => url.searchParams.set("description", head + "```\n" + body + "\n```")

@@ -759,6 +759,14 @@ export function Autocomplete(props: {
          hide()
        },
      },
+      {
+        id: "prompt.clear",
+        title: "Dismiss autocomplete",
+        group: "Autocomplete",
+        run() {
+          hide(true)
+        },
+      },
      {
        id: "prompt.autocomplete.select",
        title: "Select autocomplete item",
@@ -987,9 +987,19 @@ export function Prompt(props: PromptProps) {

  Keymap.createLayer(() => {
    return {
+      priority: 1,
      target: inputTarget,
      enabled: inputTarget() !== undefined && store.mode === "shell",
-      commands: [{ bind: "escape", title: "Exit shell mode", group: "Prompt", run: () => setStore("mode", "normal") }],
+      commands: [
+        { bind: "escape", title: "Exit shell mode", group: "Prompt", run: () => setStore("mode", "normal") },
+        {
+          bind: "ctrl+c",
+          title: "Exit shell mode",
+          group: "Prompt",
+          enabled: () => store.prompt.text === "",
+          run: () => setStore("mode", "normal"),
+        },
+      ],
    }
  })

@@ -1631,10 +1641,10 @@ export function Prompt(props: PromptProps) {
    const value = (() => {
      if (store.mode === "shell") {
        if (!shell().length) return undefined
-        return `Run a command... "${shell()[store.placeholder % shell().length]}"`
+        return `Run a command… "${shell()[store.placeholder % shell().length]}"`
      }
      if (!list().length) return undefined
-      return `Ask anything... "${list()[store.placeholder % list().length]}"`
+      return `Ask anything… "${list()[store.placeholder % list().length]}"`
    })()
    if (!value) return undefined
    const width = dimensions().width < 44 ? dimensions().width - 5 : Math.min(75, dimensions().width - 4) - 5
@@ -28,7 +28,7 @@ export function Reconnecting(props: { managed?: boolean }) {
        paddingRight={2}
        gap={1}
      >
-        <Spinner color={theme.text.default}>{props.managed ? "Restarting service..." : "Connection lost..."}</Spinner>
+        <Spinner color={theme.text.default}>{props.managed ? "Restarting service…" : "Connection lost…"}</Spinner>
        <text fg={theme.text.subdued}>
          {props.managed
            ? "Your session will resume automatically."
@@ -38,6 +38,7 @@ import { projectName } from "../util/project"
 import { marqueeCycleWidth, marqueeOverflows, marqueeTextParts } from "../util/marquee"
 import { useDialog } from "../ui/dialog"
 import { DialogSessionRename } from "./dialog-session-rename"
+import { Keymap } from "../context/keymap"

 // A long title fades out over its last cells instead of cutting hard.
 const FADE_WIDTH = 4
@@ -266,6 +267,11 @@ function TabContextMenu(props: { state: TabContextMenuState; tabs: SessionTabsCo
  const dimensions = useTerminalDimensions()
  const theme = useTheme("elevated")
  const dialog = useDialog()
+  onCleanup(Keymap.use().mode.push("menu"))
+  Keymap.createLayer(() => ({
+    mode: "menu",
+    commands: [{ bind: "escape,ctrl+c", title: "Close tab menu", group: "Tabs", run: props.onClose }],
+  }))
  const actions = createMemo(() => {
    const sessionID = props.state.sessionID
    return [
@@ -1050,7 +1056,12 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
    if (closeHold() && heldLayout()) {
      const current = untrack(motion.value)
      const seeded = changed
-        ? seedSessionTabMotion(previous.split(":"), layout().tabs.map((tab) => tab.sessionID), current, next)
+        ? seedSessionTabMotion(
+            previous.split(":"),
+            layout().tabs.map((tab) => tab.sessionID),
+            current,
+            next,
+          )
        : current
      if (!seeded) return motion.jump(next)
      motion.jump({ ...seeded, widths: next.widths })
@@ -5,7 +5,7 @@ import { Spinner } from "./spinner"
 export function StartupLoading(props: { ready: () => boolean }) {
  const theme = useTheme("elevated")
  const [show, setShow] = createSignal(false)
-  const text = createMemo(() => (props.ready() ? "Finishing startup..." : "Loading plugins..."))
+  const text = createMemo(() => (props.ready() ? "Finishing startup…" : "Loading plugins…"))
  let wait: NodeJS.Timeout | undefined
  let hold: NodeJS.Timeout | undefined
  let stamp = 0
@@ -423,6 +423,12 @@ function DiffViewer(props: { context: Plugin.Context }) {
      group: "VCS",
      run: close,
    },
+    {
+      id: "app.exit",
+      title: "Close diff viewer",
+      group: "VCS",
+      run: close,
+    },
    {
      id: "diff.down",
      title: "Move diff viewer down",
@@ -99,6 +99,7 @@ export function Composer(props: ComposerProps) {
      { bind: "left", title: "Previous tab", group: "Composer", run: () => switchTab(-1) },
      { bind: "right", title: "Next tab", group: "Composer", run: () => switchTab(1) },
      { bind: "escape", title: "Close composer", group: "Composer", run: close },
+      { bind: "ctrl+c", title: "Close composer", group: "Composer", run: close },
    ],
  }))

@@ -126,10 +126,6 @@ export function SubagentsTab(props: { sessionID: string }) {
          },
        ]
      },
-      onClose: () => {
-        const parentID = session()?.parentID
-        if (parentID) navigate({ type: "session", sessionID: parentID })
-      },
    })
    onCleanup(cleanup)
  })
@@ -75,7 +75,7 @@ export function DialogFork(props: { sessionID: string; messageID?: string; onMov
      when={!pending()}
      fallback={
        <box paddingLeft={2} paddingRight={2} paddingBottom={1}>
-          <Spinner>Forking session...</Spinner>
+          <Spinner>Forking session…</Spinner>
        </box>
      }
    >
@@ -540,6 +540,10 @@ export function FormPrompt(props: { form: FormWithLocation }) {
        run() {
          const text = textarea?.plainText ?? ""
          if (!text) {
+            if (textual()) {
+              cancel()
+              return
+            }
            setStore("editing", false)
            return
          }
@@ -242,6 +242,11 @@ export function Session(props: { verticalTabsWidth: number }) {
    if (sidebar() === "auto" && wide()) return true
    return false
  })
+  Keymap.createLayer(() => ({
+    priority: 10,
+    enabled: () => sidebarOpen() && !wide() && !disabled(),
+    commands: [{ bind: "escape,ctrl+c", title: "Close sidebar", group: "Session", run: () => setSidebarOpen(false) }],
+  }))
  const contentWidth = createMemo(() => availableWidth() - (sidebarVisible() ? 42 : 0) - 4)
  const models = createMemo(() => data.location.model.list(location()) ?? [])

@@ -1294,7 +1299,14 @@ export function Session(props: { verticalTabsWidth: number }) {
                sessionID={route.sessionID}
                open={composer.open || (!!session()?.parentID && forms().length === 0)}
                defaultTab={composer.tab ?? (session()?.parentID ? "subagents" : undefined)}
-                onClose={() => setComposer("open", false)}
+                onClose={() => {
+                  const parent = session()?.parentID
+                  if (parent) {
+                    navigate({ type: "session", sessionID: parent })
+                    return
+                  }
+                  setComposer("open", false)
+                }}
              />
              <Switch>
                <Match when={composer.open || (!!session()?.parentID && forms().length === 0)}>{null}</Match>
@@ -3122,9 +3134,9 @@ function Shell(props: ToolProps) {
          when={command()}
          fallback={
            isRunning() || props.part.state.status === "streaming" ? (
-              <Spinner color={color()}>Writing command...</Spinner>
+              <Spinner color={color()}>Writing command…</Spinner>
            ) : (
-              <text fg={theme.text.subdued}>Writing command...</text>
+              <text fg={theme.text.subdued}>Writing command…</text>
            )
          }
        >
@@ -3171,7 +3183,7 @@ function Write(props: ToolProps) {
        </BlockTool>
      </Match>
      <Match when={true}>
-        <InlineTool icon="←" pending="Preparing write..." complete={stringValue(props.input.path)} part={props.part}>
+        <InlineTool icon="←" pending="Preparing write…" complete={stringValue(props.input.path)} part={props.part}>
          Write {pathFormatter.format(stringValue(props.input.path))}
        </InlineTool>
      </Match>
@@ -3182,7 +3194,7 @@ function Write(props: ToolProps) {
 function Glob(props: ToolProps) {
  const pathFormatter = usePathFormatter()
  return (
-    <InlineTool icon="✱" pending="Finding files..." complete={stringValue(props.input.pattern)} part={props.part}>
+    <InlineTool icon="✱" pending="Finding files…" complete={stringValue(props.input.pattern)} part={props.part}>
      Glob "{stringValue(props.input.pattern)}"{" "}
      <Show when={stringValue(props.input.path)}>in {pathFormatter.format(stringValue(props.input.path))} </Show>
      <Show when={finiteNumber(props.metadata.count)}>
@@ -3206,7 +3218,7 @@ function Read(props: ToolProps) {
    <>
      <InlineTool
        icon="→"
-        pending="Reading file..."
+        pending="Reading file…"
        complete={stringValue(props.input.path)}
        spinner={isRunning()}
        part={props.part}
@@ -3229,7 +3241,7 @@ function Read(props: ToolProps) {
 function Grep(props: ToolProps) {
  const pathFormatter = usePathFormatter()
  return (
-    <InlineTool icon="✱" pending="Searching content..." complete={stringValue(props.input.pattern)} part={props.part}>
+    <InlineTool icon="✱" pending="Searching content…" complete={stringValue(props.input.pattern)} part={props.part}>
      Grep "{stringValue(props.input.pattern)}"{" "}
      <Show when={stringValue(props.input.path)}>in {pathFormatter.format(stringValue(props.input.path))} </Show>
      <Show when={finiteNumber(props.metadata.matches)}>
@@ -3241,7 +3253,7 @@ function Grep(props: ToolProps) {

 function WebFetch(props: ToolProps) {
  return (
-    <InlineTool icon="%" pending="Fetching from the web..." complete={stringValue(props.input.url)} part={props.part}>
+    <InlineTool icon="%" pending="Fetching from the web…" complete={stringValue(props.input.url)} part={props.part}>
      WebFetch {stringValue(props.input.url)}
    </InlineTool>
  )
@@ -3249,7 +3261,7 @@ function WebFetch(props: ToolProps) {

 function WebSearch(props: ToolProps) {
  return (
-    <InlineTool icon="◈" pending="Searching web..." complete={stringValue(props.input.query)} part={props.part}>
+    <InlineTool icon="◈" pending="Searching web…" complete={stringValue(props.input.query)} part={props.part}>
      {webSearchProviderLabel(props.metadata.provider)} "{stringValue(props.input.query)}"
    </InlineTool>
  )
@@ -3271,7 +3283,7 @@ function Subagent(props: ToolProps) {
      icon={continuation() ? "↳" : isRunning() ? "│" : props.part.state.status === "completed" ? "✓" : "│"}
      spinner={!continuation() && isRunning()}
      complete={description()}
-      pending="Delegating..."
+      pending="Delegating…"
      part={props.part}
      onClick={() => {
        const id = sessionID()
@@ -3462,7 +3474,7 @@ function Edit(props: ToolProps) {
              ? { label: "← Edit", value: pathFormatter.format(stringValue(props.input.path)) }
              : undefined
          }
-          title={stringValue(props.input.path) ? undefined : "# Preparing edit..."}
+          title={stringValue(props.input.path) ? undefined : "# Preparing edit…"}
          part={props.part}
          spinner={props.part.state.status === "streaming"}
        />
@@ -3617,7 +3629,7 @@ function Question(props: ToolProps) {
        </BlockTool>
      </Match>
      <Match when={true}>
-        <InlineTool icon="→" pending="Asking questions..." complete={count()} part={props.part}>
+        <InlineTool icon="→" pending="Asking questions…" complete={count()} part={props.part}>
          Asked {count()} question{count() !== 1 ? "s" : ""}
        </InlineTool>
      </Match>
@@ -3628,7 +3640,7 @@ function Question(props: ToolProps) {
 function Skill(props: ToolProps) {
  const name = createMemo(() => stringValue(props.metadata.name) ?? stringValue(props.input.id))
  return (
-    <InlineTool icon="→" pending="Loading skill..." complete={name()} part={props.part}>
+    <InlineTool icon="→" pending="Loading skill…" complete={name()} part={props.part}>
      Skill "{name()}"
    </InlineTool>
  )
@@ -299,7 +299,11 @@ function RejectPrompt(props: {
        id: "app.exit",
        title: "Cancel permission rejection",
        group: "Permission",
-        run() {
+        run(_input, event) {
+          if (event?.ctrl && event.name === "c" && input.plainText) {
+            input.setText("")
+            return
+          }
          props.onCancel()
        },
      },
@@ -436,6 +440,13 @@ export function SessionQuestion<const T extends Record<string, string>>(props: {
  const shortcuts = Keymap.useShortcuts()
  const id = () => props.id ?? "session.permission"
  const group = () => props.group ?? "Permission"
+  const dismiss = () => {
+    if (store.expanded) {
+      setStore("expanded", false)
+      return
+    }
+    if (props.escapeKey) props.onSelect(props.escapeKey)
+  }

  Keymap.createLayer(() => ({
    mode: "base",
@@ -447,7 +458,7 @@ export function SessionQuestion<const T extends Record<string, string>>(props: {
              title: "Reject permission",
              group: group(),
              bind: false as const,
-              run: () => props.onSelect(props.escapeKey!),
+              run: dismiss,
            },
          ]
        : []),
@@ -490,9 +501,7 @@ export function SessionQuestion<const T extends Record<string, string>>(props: {
        group: group(),
        run: () => props.onSelect(store.selected),
      },
-      ...(props.escapeKey
-        ? [{ bind: "escape", title: "Reject permission", group: group(), run: () => props.onSelect(props.escapeKey!) }]
-        : []),
+      ...(props.escapeKey ? [{ bind: "escape", title: "Reject permission", group: group(), run: dismiss }] : []),
    ],
    bindings: [...(props.escapeKey ? ["app.exit"] : []), ...(props.fullscreen ? ["permission.prompt.fullscreen"] : [])],
  }))
@@ -100,11 +100,11 @@ export function DialogPrompt(props: DialogPromptProps) {
          cursorStyle={config.cursor}
        />
        <Show when={props.busy}>
-          <Spinner color={theme.text.subdued}>{props.busyText ?? "Working..."}</Spinner>
+          <Spinner color={theme.text.subdued}>{props.busyText ?? "Working…"}</Spinner>
        </Show>
      </box>
      <box paddingBottom={1} gap={1} flexDirection="row">
-        <Show when={!props.busy} fallback={<text fg={theme.text.subdued}>processing...</text>}>
+        <Show when={!props.busy} fallback={<text fg={theme.text.subdued}>processing…</text>}>
          <Show when={shortcuts.get("dialog.prompt.submit")}>
            <text fg={theme.text.default}>
              {shortcuts.get("dialog.prompt.submit")} <span style={{ fg: theme.text.subdued }}>submit</span>
@@ -2,7 +2,7 @@ import { useRenderer, useTerminalDimensions } from "@opentui/solid"
 import { batch, createContext, createEffect, onCleanup, Show, useContext, type JSX, type ParentProps } from "solid-js"
 import { Keymap } from "../context/keymap"
 import { useTheme } from "../context/theme"
-import { MouseButton, Renderable, RGBA } from "@opentui/core"
+import { InputRenderable, MouseButton, Renderable, RGBA } from "@opentui/core"
 import { createStore } from "solid-js/store"
 import { useToast } from "./toast"
 import { useClipboard } from "../context/clipboard"
@@ -112,7 +112,7 @@ function init() {

  Keymap.createLayer(() => ({
    mode: "modal",
-    enabled: store.stack.length > 0 && !renderer.getSelection()?.getSelectedText(),
+    enabled: store.stack.length > 0,
    commands: [
      {
        bind: "escape",
@@ -121,6 +121,7 @@ function init() {
        run: () => {
          if (renderer.getSelection()) {
            renderer.clearSelection()
+            return
          }
          const current = store.stack.at(-1)
          current?.onClose?.()
@@ -135,6 +136,13 @@ function init() {
        run: () => {
          if (renderer.getSelection()) {
            renderer.clearSelection()
+            return
+          }
+          const editor = renderer.currentFocusedEditor
+          if (editor?.plainText) {
+            if (editor instanceof InputRenderable) editor.value = ""
+            else editor.setText("")
+            return
          }
          const current = store.stack.at(-1)
          current?.onClose?.()
@@ -225,7 +233,9 @@ export function DialogProvider(props: ParentProps) {
          evt.preventDefault()
          evt.stopPropagation()
        }}
-        onMouseUp={copyOnSelectEnabled() ? (event) => copyOnSelectRelease(event, renderer, toast, clipboard) : undefined}
+        onMouseUp={
+          copyOnSelectEnabled() ? (event) => copyOnSelectRelease(event, renderer, toast, clipboard) : undefined
+        }
      >
        <Show when={value.stack.length}>
          <Dialog onClose={() => value.clear()} size={value.size} centered={value.centered}>
@@ -636,3 +636,48 @@ test("configured app bindings execute settings and permission commands", async (
    await server.stop()
  }
 })
+
+test("ctrl+c dismisses autocomplete and shell mode before exiting", async () => {
+  const setup = await createTestRenderer({ width: 100, height: 30, useThread: false, kittyKeyboard: true })
+  setup.renderer.start()
+  const ready = Promise.withResolvers<void>()
+  const events = createEventStream()
+  const calls = createFetch(undefined, events)
+  const server = Bun.serve({ port: 0, fetch: (request) => calls.fetch(request) })
+
+  try {
+    const { run } = await import("../src/app")
+    const task = Effect.runPromise(
+      run({
+        app: { name: "test", version: "test", channel: "test" },
+        server: { endpoint: { url: server.url.toString() } },
+        config: { get: async () => ({ animations: false }), update: async () => ({}) },
+        packages: { resolve: async () => undefined },
+        args: {},
+        terminalHandoff: async () => ({ renderer: setup.renderer, mode: "dark", complete: ready.resolve }),
+        log: () => {},
+      }).pipe(Effect.provide(AppNodeBuilder.build(Global.node)), Effect.provide(FileSystem.layerNoop({}))),
+    )
+
+    await ready.promise
+    await setup.waitForFrame((frame) => frame.includes("commands"))
+    await setup.mockInput.typeText("/theme")
+    await setup.waitForFrame((frame) => frame.includes("Switch theme"))
+
+    setup.mockInput.pressKey("c", { ctrl: true })
+    await setup.waitForFrame((frame) => !frame.includes("Switch theme"))
+    expect(setup.renderer.isDestroyed).toBe(false)
+
+    await setup.mockInput.typeText("!")
+    await setup.waitForFrame((frame) => frame.includes("Shell"))
+    setup.mockInput.pressKey("c", { ctrl: true })
+    await setup.waitForFrame((frame) => !frame.includes("Shell"))
+    expect(setup.renderer.isDestroyed).toBe(false)
+
+    setup.renderer.destroy()
+    await task
+  } finally {
+    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
+    await server.stop()
+  }
+})
@@ -187,6 +187,17 @@ test("configured composer bindings work with a focused textarea", async () => {
  }
 })

+test("ctrl+c closes the active composer", async () => {
+  const composer = await renderComposer("shell", {})
+
+  try {
+    composer.app.mockInput.pressKey("c", { ctrl: true })
+    await composer.app.waitFor(() => composer.closed() === 1)
+  } finally {
+    composer.app.renderer.destroy()
+  }
+})
+
 function session(id: string, title: string, parentID?: string) {
  return {
    id,
@@ -163,6 +163,48 @@ test("budgets option content for constrained and full-width large dialogs", () =
  expect(dialogSelectContentWidth(Math.min(dialogWidth("large"), 100 - 2)) - 7).toBe(69)
 })

+test("ctrl+c clears a dialog filter before closing the dialog", async () => {
+  await using tmp = await tmpdir()
+  const select = await mountSelect(tmp.path, [{ title: "Alpha", value: "alpha" }])
+
+  try {
+    await select.app.mockInput.typeText("alpha")
+    await select.app.waitFor(() => select.app.renderer.currentFocusedEditor?.plainText === "alpha")
+
+    select.app.mockInput.pressKey("c", { ctrl: true })
+    await select.app.waitFor(() => select.app.renderer.currentFocusedEditor?.plainText === "")
+    expect(select.app.captureCharFrame()).toContain("Mutable options")
+
+    select.app.mockInput.pressKey("c", { ctrl: true })
+    await select.app.waitForFrame((frame) => !frame.includes("Mutable options"))
+  } finally {
+    select.app.renderer.destroy()
+  }
+})
+
+test("ctrl+c clears a dialog text selection before closing the dialog", async () => {
+  await using tmp = await tmpdir()
+  const select = await mountSelect(tmp.path, [{ title: "Alpha", value: "alpha" }])
+
+  try {
+    const frame = select.app.captureCharFrame().split("\n")
+    const row = frame.findIndex((line) => line.includes("Alpha"))
+    const column = frame[row]!.indexOf("Alpha") + 1
+    await select.app.mockMouse.click(column, row)
+    await select.app.mockMouse.click(column, row)
+    expect(select.app.renderer.getSelection()?.getSelectedText()).toBe("Alpha")
+
+    select.app.mockInput.pressKey("c", { ctrl: true })
+    await select.app.waitFor(() => !select.app.renderer.getSelection())
+    expect(select.app.captureCharFrame()).toContain("Mutable options")
+
+    select.app.mockInput.pressKey("c", { ctrl: true })
+    await select.app.waitForFrame((frame) => !frame.includes("Mutable options"))
+  } finally {
+    select.app.renderer.destroy()
+  }
+})
+
 test("renders the complete truncated footer within the option row", async () => {
  await using tmp = await tmpdir()
  const title = "Project"
@@ -59,7 +59,7 @@ describe("DiffViewerFileTree", () => {
      <ThemedDiffViewerFileTree width={32} files={[]} loading={false} error={undefined} />
    ))

-    expect(loading).not.toContain("Loading diff...")
+    expect(loading).not.toContain("Loading diff…")
    expect(loading).not.toContain("No files")
    expect(failed).not.toContain("Failed to load diff")
    expect(failed).not.toContain("No files")
@@ -49,6 +49,18 @@ test("closing the diff viewer returns to the route it opened from", async () =>
  }
 })

+test("ctrl+c closes the diff viewer without exiting the application", async () => {
+  const viewer = await renderDiffViewer([])
+
+  try {
+    viewer.app.mockInput.pressKey("c", { ctrl: true })
+    await viewer.app.waitFor(() => viewer.current().type !== "plugin")
+    expect(viewer.current()).toEqual(startRoute)
+  } finally {
+    viewer.app.renderer.destroy()
+  }
+})
+
 test("shows an error instead of an empty diff when loading fails", async () => {
  const viewer = await renderDiffViewer([], { fail: true })
  try {
@@ -606,6 +606,25 @@ test("text fields retain default paste behavior", async () => {
  }
 })

+test("ctrl+c clears a text field before cancelling its form", async () => {
+  await using tmp = await tmpdir()
+  const prompt = await mountForm(tmp.path, 80, [{ key: "notes", type: "string" }])
+
+  try {
+    await prompt.app.mockInput.typeText("draft answer")
+    await prompt.app.waitFor(() => prompt.app.renderer.currentFocusedEditor?.plainText === "draft answer")
+
+    prompt.app.mockInput.pressKey("c", { ctrl: true })
+    await prompt.app.waitFor(() => prompt.app.renderer.currentFocusedEditor?.plainText === "")
+    expect(prompt.cancellations).toEqual([])
+
+    prompt.app.mockInput.pressKey("c", { ctrl: true })
+    await prompt.app.waitFor(() => prompt.cancellations.length === 1)
+  } finally {
+    prompt.app.renderer.destroy()
+  }
+})
+
 test("pasting on a choice without custom answers does not open an editor", async () => {
  await using tmp = await tmpdir()
  const prompt = await mountForm(tmp.path, 80, [
@@ -73,7 +73,7 @@ function Fixture(props: { errorExpanded?: boolean }) {

 function FailedPendingToolFixture() {
  return (
-    <InlineToolRow icon="%" complete={false} pending="Preparing patch..." failed={true} failure="Patch failed">
+    <InlineToolRow icon="%" complete={false} pending="Preparing patch…" failed={true} failure="Patch failed">
      Patch
    </InlineToolRow>
  )
@@ -81,7 +81,7 @@ function FailedPendingToolFixture() {

 function FailedCompleteToolFixture() {
  return (
-    <InlineToolRow icon="→" complete={true} pending="Reading file..." failed={true} failure="Read failed">
+    <InlineToolRow icon="→" complete={true} pending="Reading file…" failed={true} failure="Read failed">
      Read src/index.ts
    </InlineToolRow>
  )
@@ -108,7 +108,9 @@ test("the tab context menu keeps preview tabs open without offering promotion fo
    await app.waitForFrame((frame) => frame.includes("Rename"))
    expect(app.captureCharFrame()).not.toContain("Keep open")

-    await app.mockMouse.click(5, 0)
+    app.mockInput.pressKey("c", { ctrl: true })
+    await app.waitForFrame((frame) => !frame.includes("Rename"))
+
    await app.mockMouse.click(40, 0, MouseButton.RIGHT)
    await app.waitForFrame((frame) => frame.includes("Keep open"))
    const frame = app.captureCharFrame().split("\n")
Author	SHA1	Message	Date
Brendan Allan	d5162d5491	Merge branch 'v2' into project-save-refresh	2026-08-26 11:38:33 +08:00
Brendonovich	e606338468	fix(app): keep shared project query reactive	2026-08-26 03:37:22 +00:00
opencode-agent[bot]	d01ac2069a	chore: update nix node_modules hashes	2026-08-26 03:32:00 +00:00
Aiden Cline	a78d3c5438	fix(ai): recover Anthropic request_too_large as overflow (#45144 )	2026-08-25 22:30:14 -05:00
David Hill	474c3588c1	fix(tui): use unicode ellipses in interface text (#45143 )	2026-08-25 22:26:15 -05:00
Kit Langton	9361117504	feat(core): add directory projects (#45107 )	2026-08-25 23:22:23 -04:00
Aiden Cline	5add6a8e19	fix(ai): preserve provider-defined responses item ids (#45094 )	2026-08-25 22:17:16 -05:00
Aiden Cline	f3c390b89e	feat(ai): add native DeepInfra provider (#45108 )	2026-08-25 22:15:52 -05:00
opencode-agent[bot]	185c3e5136	fix(app): show project logos throughout settings (#45134 ) Co-authored-by: Brendonovich <14191578+Brendonovich@users.noreply.github.com>	2026-08-26 02:43:53 +00:00
Brendonovich	8efdc9028d	refactor(app): use one shared project query	2026-08-26 02:41:38 +00:00
Kit Langton	cb863b8ea5	fix(tui): dismiss the active interaction with ctrl-c (#45111 )	2026-08-25 22:38:50 -04:00
Brendonovich	a562002616	fix(app): refresh saved projects and send partial updates	2026-08-26 02:28:42 +00:00