fix(app): show workspace setup in thinking row

bun.lock

@@ -347,6 +347,7 @@
         "@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",
@@ -1177,6 +1178,8 @@
 
     "@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=="],
@@ -5907,6 +5910,10 @@
 
     "@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=="],

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-t7k0Nk9Z7FMkAKt2UReI1jD1KoPB+LhQQx1x1p5Htlc=",
-    "aarch64-linux": "sha256-tU7C2zYKiX+RpwBBBLjX7vrqQNLPvDc5Uz9EbgGJvSA=",
-    "aarch64-darwin": "sha256-A3o+2zNuFHV5FZx/azdXBjcKdS5o41b2e2Q1Qq8C1m0=",
-    "x86_64-darwin": "sha256-NXgvteaxJQqBBZIHnQbivghHTJnL2IMZiFPNssGp2Os="
+    "x86_64-linux": "sha256-oQnV96kE3lIqsQaaUrH4tiEX8/5xvBWizXMGxayFSHo=",
+    "aarch64-linux": "sha256-Hkl1xdCQ7voAllwtyrm3TjQT9cfej29fvPIP3lH7zVo=",
+    "aarch64-darwin": "sha256-s0WHRB13qcD0KlgWNXO7gLpsDOnfB8xny81GnN5YeQc=",
+    "x86_64-darwin": "sha256-fnYi1AxCrnO3byW9keDfBH2ueCfGZdaweOrV6AerrGs="
   }
 }

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

@@ -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,6 +372,9 @@ 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
@@ -381,6 +384,10 @@ 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 }
@@ -440,37 +447,53 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LL
     tool: (toolName) => ({ type: "function" as const, name: toolName }),
   })
 
-// 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.
+// 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}$/
 const itemID = (providerMetadata: ProviderMetadata | undefined, providerMetadataKey: string) => {
   const metadata = providerMetadata?.[providerMetadataKey]
-  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
+  return ProviderShared.isRecord(metadata) &&
+    typeof metadata.itemId === "string" &&
+    ITEM_ID_PATTERN.test(metadata.itemId)
+    ? metadata.itemId
+    : undefined
 }
 
-const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenResponsesInputItem => {
+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 id = itemID(part.providerMetadata, providerMetadataKey)
   return {
     type: "function_call",
-    ...(id === undefined ? {} : { id }),
+    ...(acceptsItemID(extension, "function-call", id) ? { id } : {}),
     call_id: part.id,
     name: part.name,
     arguments: ProviderShared.encodeJson(part.input),
   }
 }
 
-const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
+const lowerReasoning = (
+  part: ReasoningPart,
+  providerMetadataKey: string,
+  extension: Extension,
+): 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 === undefined ? {} : { id }),
+    id,
     summary: part.text.length > 0 ? [{ type: "summary_text", text: part.text }] : [],
     encrypted_content: encryptedContent,
   }
@@ -591,7 +614,8 @@ 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 id = itemID(part.providerMetadata, providerMetadataKey)
+          const rawID = itemID(part.providerMetadata, providerMetadataKey)
+          const id = acceptsItemID(extension, "message", rawID) ? rawID : undefined
           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)
@@ -616,23 +640,23 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
         }
         if (part.type === "reasoning") {
           flushText()
-          const reasoning = lowerReasoning(part, providerMetadataKey)
+          const reasoning = lowerReasoning(part, providerMetadataKey, extension)
           if (!reasoning) continue
-          const existing = reasoning.id === undefined ? undefined : reasoningItems[reasoning.id]
+          const existing = reasoningItems[reasoning.id]
           if (existing) {
             existing.summary.push(...reasoning.summary)
             if (typeof reasoning.encrypted_content === "string")
               existing.encrypted_content = reasoning.encrypted_content
             continue
           }
-          if (reasoning.id !== undefined) reasoningItems[reasoning.id] = reasoning
+          reasoningItems[reasoning.id] = reasoning
           input.push(reasoning)
           continue
         }
         if (part.type === "tool-call") {
           flushText()
           if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part, providerMetadataKey))
+          input.push(lowerToolCall(part, providerMetadataKey, extension))
           continue
         }
         if (part.type === "tool-result" && part.providerExecuted === true) {
@@ -644,7 +668,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
               : Schema.is(HostedToolItem)(part.result.value)
                 ? part.result.value
                 : extension.lowerHostedToolItem?.(part.result.value)
-          if (id !== undefined && hosted?.id === id) {
+          if (acceptsItemID(extension, "hosted-tool", id) && hosted?.id === id) {
             if (!hostedToolItems.has(id)) {
               input.push(hosted)
               hostedToolItems.add(id)

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

@@ -86,10 +86,28 @@ 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) => {

packages/ai/src/provider-error.ts

@@ -40,16 +40,15 @@ const patterns = [
   /model_context_window_exceeded/i,
   /too many tokens/i,
   /token limit exceeded/i,
-  /request_too_large/i,
 ]
 
-const payloadPatterns = [/request entity too large/i, /payload too large/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 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)) || /^4(?:00|13)\s*(status code)?\s*\(no body\)/i.test(message))
+  (patterns.some((pattern) => pattern.test(message)) || /^400\s*(status code)?\s*\(no body\)/i.test(message))
 
 export const isPayloadTooLarge = (message: string) => payloadPatterns.some((pattern) => pattern.test(message))
 
@@ -107,7 +106,6 @@ 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" })

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

@@ -1,5 +1,5 @@
 import { Auth } from "../route/auth.js"
-import { Route, type RouteDefaultsInput } from "../route/client.js"
+import type { Route as RouteDef, RouteDefaultsInput } from "../route/client.js"
 import type { ProviderPackage } from "../provider-package.js"
 import { OpenAIChat } from "../protocols/openai-chat.js"
 import { OpenAIResponses } from "../protocols/openai-responses.js"
@@ -26,15 +26,9 @@ export interface Settings extends ProviderPackage.Settings {
   readonly providerOptions?: OpenAIProviderOptionsInput
 }
 
-const responsesRoute = Route.make({
+const responsesRoute = OpenAIResponses.route.with({
   id: "bedrock-mantle-responses",
   provider: id,
-  providerMetadataKey: OpenAIResponses.route.providerMetadataKey,
-  protocol: OpenAIResponses.protocol,
-  endpoint: OpenAIResponses.route.endpoint,
-  auth: OpenAIResponses.route.auth,
-  transport: OpenAIResponses.httpTransport,
-  defaults: OpenAIResponses.route.defaults,
 })
 
 const chatRoute = OpenAIChat.route.with({
@@ -44,7 +38,7 @@ const chatRoute = OpenAIChat.route.with({
 
 export const routes = [responsesRoute, chatRoute]
 
-const configuredRoute = <Body, Prepared>(route: Route<Body, Prepared>, input: Config) => {
+const configuredRoute = <Body, Prepared>(route: RouteDef<Body, Prepared>, input: Config) => {
   const region = input.region ?? input.credentials?.region ?? "us-east-1"
   const credentials = input.credentials === undefined ? undefined : { ...input.credentials, region }
   return route.with({

packages/ai/src/providers/deepinfra.ts

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

packages/ai/src/providers/index.ts

@@ -6,7 +6,6 @@ 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"

packages/ai/test/executor.test.ts

@@ -211,28 +211,6 @@ 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

packages/ai/test/fixtures/recordings/deepinfra-chat/deepinfra-llama-3-3-70b-text.json

@@ -1,32 +0,0 @@
-{
-  "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"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/deepinfra-chat/deepinfra-llama-3-3-70b-tool-call.json

@@ -1,32 +0,0 @@
-{
-  "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"
-      }
-    }
-  ]
-}

packages/ai/test/fixtures/recordings/deepinfra-chat/deepinfra-llama-3-3-70b-tool-loop.json

@@ -1,50 +0,0 @@
-{
-  "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"
-      }
-    }
-  ]
-}

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

@@ -18,19 +18,13 @@ describe("provider error classification", () => {
     expect(messages.every(isContextOverflow)).toBe(true)
   })
 
-  test("classifies Anthropic request_too_large as recoverable overflow", () => {
-    expect(
+  test("classifies request size failures separately from context overflow", () => {
+    const failures = [
+      classifyProviderFailure({ message: "request too large", status: 413 }),
       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 }),
     ]
 
@@ -39,6 +33,7 @@ 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", () => {

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

@@ -28,7 +28,6 @@ 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()
@@ -38,24 +37,6 @@ 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")

packages/ai/test/provider/bedrock-mantle.test.ts

@@ -1,12 +1,11 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
 import { HttpClientRequest } from "effect/unstable/http"
-import { LLM, Message } from "../../src/index.js"
+import { LLM } from "../../src/index.js"
 import { AmazonBedrockMantle } from "../../src/providers.js"
-import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
 import { compileRequest, LLMClient } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
-import { dynamicResponse, fixedResponse } from "../lib/http.js"
+import { dynamicResponse } from "../lib/http.js"
 import { sseEvents } from "../lib/sse.js"
 import { recordedTests } from "../recorded-test.js"
 
@@ -20,7 +19,6 @@ describe("Amazon Bedrock Mantle provider", () => {
   it.effect("uses Chat by default and exposes Responses", () =>
     Effect.gen(function* () {
       const provider = AmazonBedrockMantle.configure({ credentials })
-      expect(provider.responses("openai.gpt-oss-120b").route.transport).toBe(OpenAIResponses.httpTransport)
       const chat = yield* compileRequest(LLM.request({ model: provider.model("openai.gpt-oss-120b"), prompt: "Hi" }))
       const responses = yield* compileRequest(
         LLM.request({ model: provider.responses("openai.gpt-oss-120b"), prompt: "Hi" }),
@@ -85,39 +83,6 @@ 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({

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

@@ -1,6 +1,6 @@
 import * as Anthropic from "../../src/providers/anthropic.js"
 import * as AnthropicCompatible from "../../src/providers/anthropic-compatible.js"
-import { Cerebras, DeepInfra, TogetherAI } from "../../src/providers/index.js"
+import { Cerebras, 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,9 +55,6 @@ 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")
@@ -225,13 +222,6 @@ 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",

packages/ai/test/provider/native-providers.test.ts

@@ -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, DeepInfra, TogetherAI } from "../../src/providers/index.js"
+import { Cerebras, 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,18 +29,6 @@ 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(
@@ -94,21 +82,6 @@ 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]) {
@@ -149,12 +122,6 @@ 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) =>

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

@@ -195,19 +195,15 @@ 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: "Long.",
-                providerMetadata: { openresponses: { itemId: `history_${"a".repeat(64)}` } },
+                text: "Dropped.",
+                providerMetadata: { openresponses: { itemId: `m${"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" } } },
             ]),
           ],
         }),
@@ -222,23 +218,8 @@ describe("Open Responses-compatible route", () => {
         },
         {
           type: "message",
-          id: `history_${"a".repeat(64)}`,
           role: "assistant",
-          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." },
-          ],
+          content: [{ type: "output_text", text: "Dropped." }],
         },
       ])
     }),

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

@@ -3150,50 +3150,38 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("preserves provider-issued item ids and removes malformed ids without dropping items", () =>
+  it.effect("drops replayed item ids outside the server's grammar", () =>
     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: `message_${"a".repeat(64)}` } },
+                providerMetadata: { openai: { itemId: `m${"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_" } },
-              }),
             ]),
           ],
         }),
@@ -3202,44 +3190,18 @@ describe("OpenAI Responses route", () => {
       expect(prepared.body.input).toEqual([
         {
           type: "message",
-          id: "history_1",
           role: "assistant",
-          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." }],
+          content: [
+            { type: "output_text", text: "Hello" },
+            { type: "output_text", text: "World" },
+          ],
         },
         {
           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"}',
-        },
       ])
     }),
   )

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

@@ -24,17 +24,11 @@ test("session settings use the remote server context", async ({ page }) => {
   await configureServers(page)
 
   await page.goto(`/server/${base64Encode(serverB)}/session/${sessionB.id}`)
-  const sessionHeading = page.getByRole("heading", { name: sessionB.title, exact: true, includeHidden: true })
-  await expect(sessionHeading).toBeVisible()
+  await expect(page.getByRole("heading", { name: sessionB.title, exact: true })).toBeVisible()
   await page.keyboard.press("Control+,")
 
-  const settings = page.getByTestId("settings-screen")
-  await expect(settings).toBeVisible()
-  await expect(page.getByRole("dialog")).toHaveCount(0)
-  await expect(settings.getByRole("tablist")).toHaveCSS("width", "328px")
-  await expect(sessionHeading).toBeAttached()
-  await expect(sessionHeading).toBeHidden()
-  const autoAccept = settings.locator('[data-action="settings-auto-accept-permissions"]')
+  const dialog = page.locator(".settings-dialog")
+  const autoAccept = dialog.locator('[data-action="settings-auto-accept-permissions"]')
   const input = autoAccept.getByRole("switch")
   await expect(autoAccept).toBeVisible()
   await expect(input).toBeEnabled()
@@ -61,12 +55,9 @@ test("session settings use the remote server context", async ({ page }) => {
       },
     ])
 
-  await settings.getByRole("tab", { name: "Models" }).click()
-  await expect(settings.getByRole("switch", { name: "Server B Model" })).toBeEnabled()
-  await expect(settings.getByRole("switch", { name: "Server A Model" })).toHaveCount(0)
-  await settings.getByRole("button", { name: "Back to app" }).click()
-  await expect(settings).toBeHidden()
-  await expect(sessionHeading).toBeVisible()
+  await dialog.getByRole("tab", { name: "Models" }).click()
+  await expect(dialog.getByRole("switch", { name: "Server B Model" })).toBeEnabled()
+  await expect(dialog.getByRole("switch", { name: "Server A Model" })).toHaveCount(0)
 })
 
 test("auto-accept responds for an unfocused server session", async ({ page }) => {
@@ -87,7 +78,7 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
   await page.goto(`/server/${base64Encode(serverA)}/session/${sessionA.id}`)
   await expect(page.getByRole("heading", { name: sessionA.title, exact: true })).toBeVisible()
   await page.keyboard.press("Control+,")
-  const autoAccept = page.getByTestId("settings-screen").locator('[data-action="settings-auto-accept-permissions"]')
+  const autoAccept = page.locator(".settings-dialog").locator('[data-action="settings-auto-accept-permissions"]')
   await autoAccept.locator('[data-slot="switch-control"]').click()
   await expect(autoAccept.getByRole("switch")).toBeChecked()
   await expect
@@ -187,7 +178,7 @@ test("auto-accept sweeps again after a reconnect", async ({ page }) => {
   const first = await transport.waitForConnection()
 
   await page.keyboard.press("Control+,")
-  const autoAccept = page.getByTestId("settings-screen").locator('[data-action="settings-auto-accept-permissions"]')
+  const autoAccept = page.locator(".settings-dialog").locator('[data-action="settings-auto-accept-permissions"]')
   await autoAccept.locator('[data-slot="switch-control"]').click()
   await expect(autoAccept.getByRole("switch")).toBeChecked()
   await expect
@@ -243,7 +234,7 @@ test("auto-accept approves a request discovered by opening a session", async ({
   await expect(page.getByRole("heading", { name: sessionA.title, exact: true })).toBeVisible()
 
   await page.keyboard.press("Control+,")
-  const autoAccept = page.getByTestId("settings-screen").locator('[data-action="settings-auto-accept-permissions"]')
+  const autoAccept = page.locator(".settings-dialog").locator('[data-action="settings-auto-accept-permissions"]')
   await autoAccept.locator('[data-slot="switch-control"]').click()
   await expect(autoAccept.getByRole("switch")).toBeChecked()
 

packages/app/e2e/regression/server-dialog-focus.spec.ts

@@ -2,7 +2,7 @@ import { expect, test, type Route } from "@playwright/test"
 
 const server = "http://127.0.0.1:4097"
 
-test("server dialog keeps focus above fullscreen settings", async ({ page }) => {
+test("nested server dialog keeps focus inside the top layer", async ({ page }) => {
   await page.addInitScript((server) => {
     localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [server] }))
   }, server)
@@ -24,9 +24,8 @@ test("server dialog keeps focus above fullscreen settings", async ({ page }) =>
 
   await page.goto("/")
   await page.keyboard.press("Control+,")
-  const settings = page.getByTestId("settings-screen")
+  const settings = page.locator(".settings-dialog")
   await expect(settings).toBeVisible()
-  await expect(page.getByRole("dialog")).toHaveCount(0)
   await settings.getByRole("tab", { name: "Servers" }).click()
   await settings.getByRole("button", { name: "Add server" }).click()
 
@@ -42,9 +41,6 @@ test("server dialog keeps focus above fullscreen settings", async ({ page }) =>
   await expect(password).toBeFocused()
   await password.fill("secret")
   await expect(password).toHaveValue("secret")
-  await page.keyboard.press("Escape")
-  await expect(editor).toBeHidden()
-  await expect(settings).toBeVisible()
 })
 
 function json(route: Route, body: unknown, status = 200) {

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

@@ -9,7 +9,7 @@ test("space activates a focused timeline button instead of scrolling", async ({
     reducedMotion: true,
   })
   const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-  const trigger = page.getByRole("button", { name: "Used Shell" })
+  const trigger = page.locator(`[data-timeline-part-id="${shellID}"] [data-slot="collapsible-trigger"]`)
   await trigger.focus()
   const before = await scroller.evaluate((element) => element.scrollTop)
   await trigger.press("Space")

packages/app/e2e/regression/session-timeline-context-resize.spec.ts

@@ -40,7 +40,7 @@ test.describe("regression: session timeline context group resize", () => {
     expect(samples.at(-1)?.expanded).toBe("true")
   })
 
-  test("keeps a grouped tool summary stable as its calls complete", async ({ page }) => {
+  test("paints a stable exploring to explored transition", async ({ page }) => {
     const events: OpenCodeEvent[] = []
     await page.setViewportSize({ width: 1400, height: 900 })
     await mockServer(page, events, [
@@ -55,12 +55,13 @@ test.describe("regression: session timeline context group resize", () => {
     await devtools.send("Emulation.setCPUThrottlingRate", { rate: 4 })
     const context = page.locator(`[data-timeline-part-ids="${contextIDs.join(",")}"]`).first()
     await expectAppVisible(context)
-    await expect(context.getByRole("button")).toHaveAccessibleName("Used Read, Glob, Grep, List")
+    await expect(context.locator('[data-component="tool-status-title"]')).toHaveAttribute("aria-label", "Exploring")
 
     const contextSelector = `[data-timeline-part-ids="${contextIDs.join(",")}"]`
     const regions = defineVisualRegions({
       status: {
-        selector: `${contextSelector} [data-component="context-tool-group-trigger"]`,
+        selector: `${contextSelector} [data-component="tool-status-title"]`,
+        opacitySelectors: ['[data-slot="tool-status-active"]', '[data-slot="tool-status-done"]'],
       },
       context: { selector: contextSelector, closest: '[data-timeline-row="AssistantPart"]' },
       following: {
@@ -88,7 +89,7 @@ test.describe("regression: session timeline context group resize", () => {
       await page.waitForTimeout(delay)
     }
 
-    await expect(context.getByRole("button")).toHaveAccessibleName("Used Read, Glob, Grep, List")
+    await expect(context.locator('[data-component="tool-status-title"]')).toHaveAttribute("aria-label", "Explored")
     await page.waitForTimeout(700)
     const trace = await stopVisualProbe<keyof typeof regions>(page)
     const labels = trace.samples
@@ -107,7 +108,7 @@ test.describe("regression: session timeline context group resize", () => {
       ]),
     )
 
-    expect(labels).toEqual(["Used Read, Glob, Grep, List"])
+    expect(labels).toEqual(["Exploring", "Explored"])
     expect(issues, JSON.stringify(trace.samples, null, 2)).toEqual([])
   })
 })
@@ -208,7 +209,13 @@ function turn(index: number, target: boolean, status: "running" | "completed" =
   const content: SessionMessageAssistant["content"] = target
     ? [
         toolContent(
-          contextTool(contextIDs[0]!, assistantID, "read", { path: "src/recent-a.ts", offset: 0, limit: 120 }, status),
+          contextTool(
+            contextIDs[0]!,
+            assistantID,
+            "read",
+            { path: "src/recent-a.ts", offset: 0, limit: 120 },
+            status,
+          ),
         ),
         toolContent(contextTool(contextIDs[1]!, assistantID, "glob", { path: directory, pattern: "**/*.ts" }, status)),
         toolContent(

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

@@ -83,7 +83,6 @@ test("keeps an expanded file diff header at the same viewport position", async (
   const before = Array.from({ length: 80 }, (_, index) => `export const value${index} = ${index}\n`).join("")
   const after = before.replaceAll(" = ", " = compute(").replaceAll("\n", ")\n")
   await setupTimeline(page, {
-    settings: { editToolPartsExpanded: true },
     messages: [
       userMessage([userText("Preceding context ".repeat(120))]),
       assistantMessage([

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

@@ -26,9 +26,7 @@ for (const expanded of [false, true]) {
       messages: [userMessage(), assistantMessage([shell(id, "completed", lines(3))])],
       settings: { shellToolPartsExpanded: expanded },
     })
-    const trigger = expanded
-      ? page.locator(`[data-timeline-part-id="${id}"] [data-slot="collapsible-trigger"]`)
-      : page.getByRole("button", { name: "Used Shell" })
+    const trigger = page.locator(`[data-timeline-part-id="${id}"] [data-slot="collapsible-trigger"]`)
     await expect(trigger).toHaveAttribute("aria-expanded", String(expanded))
     await trigger.click()
     await expect(trigger).toHaveAttribute("aria-expanded", String(!expanded))

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

@@ -1,9 +1,12 @@
 import { expect, test } from "@playwright/test"
 import { assistantMessage, setupTimeline, toolPart, userMessage } from "../performance/timeline-stability/fixture"
 
-for (const locale of ["de", "ar"] as const) {
-  test(`projects localized tool names with an English fallback in ${locale}`, async ({ page }) => {
-    const ids = [`prt_locale_${locale}_01_read`, `prt_locale_${locale}_02_glob`]
+for (const profile of [
+  { locale: "de", label: "Erkundung abgeschlossen" },
+  { locale: "ar", label: "تم الاستكشاف" },
+] as const) {
+  test(`projects translated context status in ${profile.locale}`, async ({ page }) => {
+    const ids = [`prt_locale_${profile.locale}_01_read`, `prt_locale_${profile.locale}_02_glob`]
     await setupTimeline(page, {
       messages: [
         userMessage(),
@@ -12,12 +15,11 @@ for (const locale of ["de", "ar"] as const) {
           toolPart(ids[1]!, "glob", "completed", { path: ".", pattern: "**/*.ts" }),
         ]),
       ],
-      locale,
+      locale: profile.locale,
     })
 
     const group = page.locator(`[data-timeline-part-ids="${ids.join(",")}"]`)
-    await expect(group.getByRole("button")).toHaveAccessibleName(/^Used /)
-    await expect(group.locator('[data-component="tag"]')).toHaveText("2")
-    await expect(page.locator("html")).toHaveAttribute("lang", locale)
+    await expect(group.locator('[data-component="tool-status-title"]')).toHaveAttribute("aria-label", profile.label)
+    await expect(page.locator("html")).toHaveAttribute("lang", profile.locale)
   })
 }

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

@@ -53,14 +53,9 @@ test.describe("session timeline projection", () => {
     ]
     await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
 
-    const first = page.locator(
-      '[data-timeline-part-ids="prt_01_read,prt_02_glob,prt_03_grep,prt_04_list,prt_webfetch,prt_websearch,prt_task,prt_bash,prt_edit,prt_write,prt_patch"]',
-    )
-    const second = page.locator('[data-timeline-part-ids="prt_skill,prt_custom"]')
-    await expect(first).toBeVisible()
-    await expect(second).toBeVisible()
-    await first.getByRole("button").click()
-    await second.getByRole("button").click()
+    await expect(
+      page.locator('[data-timeline-part-ids="prt_01_read,prt_02_glob,prt_03_grep,prt_04_list"]'),
+    ).toBeVisible()
     for (const id of [
       "prt_webfetch",
       "prt_websearch",
@@ -83,7 +78,8 @@ test.describe("session timeline projection", () => {
     await expect(patch.locator('[data-slot="message-part-title-filename"]')).toHaveCount(0)
     await expect(patch.locator('[data-slot="message-part-actions"]')).toHaveCount(0)
     const edit = page.locator('[data-timeline-part-id="prt_edit"]')
-    await expect(edit).toContainText("Edit")
+    await expect(edit.locator('[data-component="apply-patch-tool"]')).toBeVisible()
+    await expect(edit.locator('[data-slot="basic-tool-tool-title"]')).toContainText("Edit")
     await expect(page.locator('[data-timeline-part-id="prt_todo"]')).toHaveCount(0)
   })
 
@@ -91,7 +87,6 @@ test.describe("session timeline projection", () => {
     const first = "prt_patch_first"
     const second = "prt_patch_second"
     const timeline = await setupTimeline(page, {
-      settings: { editToolPartsExpanded: true },
       messages: [
         userMessage(),
         assistantMessage([

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

@@ -13,7 +13,7 @@ import {
   userMessage,
 } from "../performance/timeline-stability/fixture"
 
-test("groups every collapsed tool until visible text separates the stack", async ({ page }) => {
+test("groups singleton and separated context operations at correct boundaries", async ({ page }) => {
   const parts = [
     toolPart("prt_boundary_01_read", "read", "completed", { path: "src/a.ts" }),
     textPart("prt_boundary_02_text", "Boundary text"),
@@ -25,112 +25,9 @@ test("groups every collapsed tool until visible text separates the stack", async
   await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
 
   await expect(page.locator('[data-timeline-part-ids="prt_boundary_01_read"]')).toBeVisible()
-  const group = page.locator(
-    '[data-timeline-part-ids="prt_boundary_03_glob,prt_boundary_04_grep,prt_boundary_05_shell,prt_boundary_06_list"]',
-  )
-  await expect(group).toBeVisible()
-  await expect(group.getByRole("button")).toHaveAccessibleName("Used Glob, Grep, Shell, List")
-  await expect(group.locator('[data-component="tag"]')).toHaveText("4")
-  await expect(page.locator('[data-timeline-row="AssistantPart"]')).toHaveCount(3)
-  await expect(page.locator('[data-timeline-spacing="content"]')).toHaveCount(2)
-  await expect(page.locator('[data-timeline-spacing="content"]').nth(0)).toHaveCSS("padding-top", "16px")
-})
-
-test("expands a mixed collapsed tool stack without expanding its individual calls", async ({ page }) => {
-  const parts = [
-    shell("prt_stack_shell_1", "completed", "first"),
-    toolPart("prt_stack_explore", "subagent", "completed", {
-      agent: "explore",
-      description: "Inspect the project",
-      prompt: "Explore the project",
-    }),
-    toolPart("prt_stack_patch", "patch", "completed", { patchText: "Update src/value.ts" }),
-    shell("prt_stack_shell_2", "completed", "second"),
-  ]
-  await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
-
-  const group = page.locator(
-    '[data-timeline-part-ids="prt_stack_shell_1,prt_stack_explore,prt_stack_patch,prt_stack_shell_2"]',
-  )
-  const summary = group.getByRole("button", { name: "Used Shell, Explore, Patch" })
-  await expect(summary).toHaveAttribute("aria-expanded", "false")
-  await expect(summary).toHaveCSS("height", "28px")
-  await expect(group.locator('[data-component="tag"]')).toHaveText("4")
-  await summary.click()
-  await expect(summary).toHaveAttribute("aria-expanded", "true")
-  await expect(group.locator('[data-slot="context-tool-group-item"]')).toHaveCount(4)
-  await expect(group.locator('[data-timeline-part-id="prt_stack_shell_1"]')).toBeVisible()
-  await expect(group.locator('[data-timeline-part-id="prt_stack_patch"]')).toBeVisible()
-  await expect(group.locator('[data-component="context-tool-group-list"]')).toHaveCSS("row-gap", "8px")
-  const content = group.locator(':scope > [data-component="collapsible"] > [data-slot="collapsible-content"]')
-  await expect(content).toHaveCSS("margin-left", "0px")
-  await expect(content).toHaveCSS("padding-left", "12px")
-  await expect.poll(() => content.evaluate((element) => getComputedStyle(element, "::before").content)).toBe("none")
-})
-
-test("leaves tools expanded by settings outside the collapsed stack", async ({ page }) => {
-  const parts = [
-    shell("prt_expanded_shell", "completed", "expanded"),
-    toolPart("prt_collapsed_patch", "patch", "completed", { patchText: "Update src/value.ts" }),
-    toolPart("prt_collapsed_read", "read", "completed", { path: "src/value.ts" }),
-  ]
-  await setupTimeline(page, {
-    messages: [userMessage(), assistantMessage(parts)],
-    settings: { shellToolPartsExpanded: true },
-  })
-
-  await expect(page.locator('[data-timeline-part-id="prt_expanded_shell"]')).toBeVisible()
-  const group = page.locator('[data-timeline-part-ids="prt_collapsed_patch,prt_collapsed_read"]')
-  await expect(group.getByRole("button", { name: "Used Patch, Read" })).toBeVisible()
-  await expect(group.locator('[data-component="tag"]')).toHaveText("2")
-  await expect(page.locator('[data-timeline-spacing="tool"]')).toHaveCSS("padding-top", "8px")
-})
-
-test("keeps failed search calls and their error cards inside the collapsed stack", async ({ page }) => {
-  const parts = [
-    toolPart(
-      "prt_error_glob",
-      "glob",
-      "error",
-      { path: "C:/Users", pattern: "*.ts" },
-      {
-        error: "Invalid tool input",
-      },
-    ),
-    toolPart(
-      "prt_error_grep",
-      "grep",
-      "error",
-      { path: "C:/Users", pattern: "value" },
-      {
-        error: "Search timed out after 30 seconds",
-      },
-    ),
-  ]
-  await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
-
-  const group = page.locator('[data-timeline-part-ids="prt_error_glob,prt_error_grep"]')
-  const summary = group.getByRole("button", { name: "Used Glob, Grep" })
-  await expect(group.locator('[data-component="tag"]')).toHaveText("2")
-  await summary.click()
-  await expect(group.locator('[data-kind="tool-error-card"]')).toHaveCount(2)
-  const glob = group.locator('[data-timeline-part-id="prt_error_glob"]')
-  await expect(glob).toContainText("Invalid tool input")
-  await expect(glob.locator('[data-component="tool-error-card-icon"]')).toBeVisible()
-  await expect(glob.locator('[data-component="tool-error-card-icon"] use')).toHaveAttribute(
-    "href",
-    "#opencode-v2-icon-circle-exclamation",
-  )
-  await expect
-    .poll(() =>
-      glob
-        .locator('[data-kind="tool-error-card"]')
-        .evaluate((element) => getComputedStyle(element, "::before").display),
-    )
-    .toBe("none")
-  await expect(group.locator('[data-timeline-part-id="prt_error_grep"]')).toContainText(
-    "Search timed out after 30 seconds",
-  )
+  await expect(page.locator('[data-timeline-part-ids="prt_boundary_03_glob,prt_boundary_04_grep"]')).toBeVisible()
+  await expect(page.locator('[data-timeline-part-ids="prt_boundary_06_list"]')).toBeVisible()
+  await expect(page.locator('[data-timeline-row="AssistantPart"]')).toHaveCount(5)
 })
 
 test("reducer-hardening: converges when idle arrives before final part and message completion", async ({ page }) => {

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

@@ -21,9 +21,6 @@ test("renders every tool error outcome without leaking hidden tools", async ({ p
   )
   await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
 
-  const group = page.locator(`[data-timeline-part-ids="${ordinary.map((_, index) => `prt_error_${index}`).join(",")}"]`)
-  await expect(group.locator('[data-component="tag"]')).toHaveText(String(ordinary.length))
-  await group.getByRole("button").click()
   await expect(page.locator('[data-kind="tool-error-card"]')).toHaveCount(ordinary.length + 1)
   await expect(page.getByText(/dismissed/i)).toBeVisible()
   await expect(page.locator('[data-timeline-part-id="prt_todo_error"]')).toHaveCount(0)
@@ -36,7 +33,6 @@ test("transitions shell and question through running error outcomes", async ({ p
   const shellID = "prt_transition_error_shell"
   const questionID = "prt_transition_error_question"
   const timeline = await setupTimeline(page, {
-    settings: { shellToolPartsExpanded: true },
     messages: [
       userMessage(),
       assistantMessage(
@@ -48,6 +44,7 @@ test("transitions shell and question through running error outcomes", async ({ p
       ),
     ],
   })
+  await timeline.waitForPart(shellID)
   await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toHaveCount(0)
   await timeline.send(partUpdated(toolPart(shellID, "shell", "running", { command: "exit 1" })), 120)
   await timeline.send(partUpdated(toolPart(questionID, "question", "running", questionInput())), 180)
@@ -71,7 +68,6 @@ test("preserves surviving grouped patch state when its first patch fails", async
   const failed = "prt_grouped_patch_failed"
   const surviving = "prt_grouped_patch_surviving"
   const timeline = await setupTimeline(page, {
-    settings: { editToolPartsExpanded: true },
     messages: [
       userMessage(),
       assistantMessage(
@@ -151,12 +147,10 @@ test("labels all web search provider variants", async ({ page }) => {
     toolPart("prt_search_generic", "websearch", "completed", { query: "generic" }),
   ]
   await setupTimeline(page, { messages: [userMessage(), assistantMessage(parts)] })
-  await page.getByRole("button", { name: "Used Parallel Web Search, Exa Web Search, Web Search" }).click()
 
-  const tools = page.locator('[data-component="context-tool-group-list"]')
-  await expect(tools.getByRole("button", { name: /Parallel Web Search/ })).toBeVisible()
-  await expect(tools.getByRole("button", { name: /Exa Web Search/ })).toBeVisible()
-  await expect(tools.getByRole("button", { name: /^Web Search/ })).toBeVisible()
+  await expect(page.getByRole("button", { name: /Parallel Web Search/ })).toBeVisible()
+  await expect(page.getByRole("button", { name: /Exa Web Search/ })).toBeVisible()
+  await expect(page.getByRole("button", { name: /^Web Search/ })).toBeVisible()
 })
 
 test("labels completed searches with result counts", async ({ page }) => {
@@ -207,11 +201,6 @@ test("labels skill tools from IDs and result metadata", async ({ page }) => {
     ],
   })
 
-  const group = page.locator(`[data-timeline-part-ids="${pending},${completed}"]`)
-  await expect(group.getByRole("button")).toHaveAccessibleName("Used Skill")
-  await expect(group.locator('[data-component="tag"]')).toHaveText("2")
-  await group.getByRole("button").click()
-
   for (const [id, name] of [
     [pending, "frontend-design"],
     [completed, "OpenCode"],

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

@@ -42,7 +42,8 @@ test("shows parent lineage while the child timeline loads", async ({ page }) =>
   const release = Promise.withResolvers<void>()
   await page.route(
     (url) =>
-      url.pathname === `/api/session/${childID}/message` && url.port === (process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"),
+      url.pathname === `/api/session/${childID}/message` &&
+      url.port === (process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"),
     async (route) => {
       requested.resolve()
       await release.promise
@@ -52,7 +53,6 @@ test("shows parent lineage while the child timeline loads", async ({ page }) =>
 
   await page.goto(sessionHref(parentID))
   await expectSessionTitle(page, parentTitle)
-  await page.getByRole("button", { name: "Used Explore" }).click()
   await page.locator(`a[href="${sessionHref(childID)}"]`).click()
   await Promise.all([requested.promise, expect(page).toHaveURL(sessionHref(childID))])
   await Promise.all([
@@ -77,7 +77,6 @@ test("keeps the parent visible while the child session resolves", async ({ page
   await page.goto(sessionHref(parentID))
   await expectSessionTitle(page, parentTitle)
 
-  await page.getByRole("button", { name: "Used Explore" }).click()
   await page.locator(`a[href="${sessionHref(childID)}"]`).click()
   await requested.promise
   await Promise.all([expect(page).toHaveURL(sessionHref(parentID)), expectSessionTitle(page, parentTitle)]).finally(
@@ -195,7 +194,6 @@ async function setup(page: Page, events?: () => OpenCodeEvent[]) {
 async function openChildFromParent(page: Page) {
   await page.goto(sessionHref(parentID))
   await expectSessionTitle(page, parentTitle)
-  await page.getByRole("button", { name: "Used Explore" }).click()
 
   const card = page.locator(`a[href="${sessionHref(childID)}"]`)
   await expect(card).toBeVisible()

packages/app/e2e/regression/tab-navigate-mousedown.spec.ts

@@ -103,127 +103,6 @@ test("cramped tabs only show the close button for the active tab", async ({ page
   await expect(tabB.locator('[data-slot="tab-close"]')).toBeVisible()
 })
 
-test("vertical tabs show project details, resize, and navigate", async ({ page }) => {
-  await mockServer(page)
-  await page.addInitScript(
-    ({ server, sessionA, sessionB }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ appearance: { tabLayout: "vertical" } }))
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([
-          { type: "session", server, sessionId: sessionA },
-          { type: "session", server, sessionId: sessionB },
-        ]),
-      )
-    },
-    { server, sessionA: sessionA.id, sessionB: sessionB.id },
-  )
-
-  const hrefA = `/server/${base64Encode(server)}/session/${sessionA.id}`
-  const hrefB = `/server/${base64Encode(server)}/session/${sessionB.id}`
-  await page.goto(hrefA)
-
-  const sidebar = page.locator('[data-slot="vertical-tabs-sidebar"]')
-  const tabA = sidebar.locator(`[data-titlebar-tab-link][href="${hrefA}"]`)
-  const tabB = sidebar.locator(`[data-titlebar-tab-link][href="${hrefB}"]`)
-  await expect(sidebar).toHaveCSS("width", "260px")
-  await expect(tabA).toContainText(sessionA.title)
-  await expect(tabB).toContainText(sessionB.title)
-  await expect(tabB.locator('[data-slot="tab-project"]')).toHaveText("tab-project")
-  await expect(sidebar.getByRole("button", { name: "New session" })).toBeVisible()
-  await expect(page.locator('[data-slot="titlebar-tabs"]')).toHaveCount(0)
-
-  const handle = sidebar.locator('[data-component="resize-handle"]')
-  await expect(handle).toHaveCSS("cursor", "col-resize")
-  const box = await handle.boundingBox()
-  if (!box) throw new Error("vertical tab resize handle has no bounding box")
-  await page.mouse.move(box.x + box.width / 2, box.y + box.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(box.x + box.width / 2 - 80, box.y + box.height / 2)
-  await page.mouse.up()
-  await expect(sidebar).toHaveCSS("width", "180px")
-  await expect(tabB.locator('[data-slot="tab-project"]')).toHaveText("tab-project")
-
-  const resized = await handle.boundingBox()
-  if (!resized) throw new Error("resized vertical tab handle has no bounding box")
-  await page.mouse.move(resized.x + resized.width / 2, resized.y + resized.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(resized.x - 200, resized.y + resized.height / 2)
-  await page.mouse.up()
-  await expect(sidebar).toHaveCSS("width", "130px")
-
-  await tabB.click()
-  await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
-  await expect(tabB).toBeVisible()
-})
-
-test("appearance experimental setting switches tab orientation", async ({ page }) => {
-  await mockServer(page)
-  await page.addInitScript(
-    ({ server, sessionA }) => {
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server, sessionId: sessionA }]),
-      )
-    },
-    { server, sessionA: sessionA.id },
-  )
-
-  await page.goto("/")
-  await expect(page.locator('[data-slot="titlebar-tabs"] [data-titlebar-tab-link]')).toBeVisible()
-  await page.keyboard.press("Control+,")
-
-  const settings = page.getByTestId("settings-screen")
-  await expect(settings).toBeVisible()
-  await settings.getByRole("tab", { name: "Appearance" }).click()
-  await expect(settings.getByRole("heading", { name: "Experimental" })).toBeVisible()
-
-  const layout = settings.locator('[data-action="settings-tab-layout"]')
-  await expect(layout).toContainText("Horizontal")
-  await layout.click()
-  await page.getByRole("option", { name: "Vertical" }).click()
-
-  await expect(layout).toContainText("Vertical")
-  await expect(page.locator('[data-slot="vertical-tabs-sidebar"]')).toBeVisible()
-  await expect(page.locator('[data-slot="titlebar-tabs"]')).toHaveCount(0)
-  await expect(settings.getByRole("tablist")).toHaveCSS("width", "240px")
-
-  await page.setViewportSize({ width: 920, height: 720 })
-  await expect(page.locator('[data-slot="vertical-tabs-sidebar"]')).toHaveCSS("width", "260px")
-  await expect(settings.getByRole("tablist")).toHaveCSS("width", "160px")
-
-  await page.setViewportSize({ width: 800, height: 720 })
-  await expect(settings.getByRole("tablist")).toHaveCSS("width", "160px")
-})
-
-test("vertical tab preference falls back to horizontal on mobile", async ({ page }) => {
-  await page.setViewportSize({ width: 390, height: 720 })
-  await mockServer(page)
-  await page.addInitScript(
-    ({ server, sessionA }) => {
-      localStorage.setItem("settings.v3", JSON.stringify({ appearance: { tabLayout: "vertical" } }))
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server, sessionId: sessionA }]),
-      )
-    },
-    { server, sessionA: sessionA.id },
-  )
-
-  const href = `/server/${base64Encode(server)}/session/${sessionA.id}`
-  await page.goto(href)
-
-  const tabs = page.locator('[data-slot="titlebar-tabs"]')
-  await expect(tabs.locator(`[data-titlebar-tab-link][href="${href}"]`)).toContainText(sessionA.title)
-  await expect(page.locator('[data-slot="vertical-tabs-sidebar"]')).toHaveCount(0)
-
-  await page.setViewportSize({ width: 1280, height: 720 })
-  await expect(
-    page.locator('[data-slot="vertical-tabs-sidebar"]').locator(`[data-titlebar-tab-link][href="${href}"]`),
-  ).toBeVisible()
-  await expect(page.locator('[data-slot="titlebar-tabs"]')).toHaveCount(0)
-})
-
 function session(id: string, title: string) {
   return {
     id,

packages/app/src/app.tsx

@@ -58,7 +58,7 @@ export function AppBaseProviders(
   props: ParentProps<{
     locale?: Locale
     onNativeTranslations?: Parameters<typeof LanguageProvider>[0]["onNativeTranslations"]
-    onThemeApplied?: (mode: "light" | "dark", scheme: "system" | "light" | "dark") => void
+    onThemeApplied?: () => void
   }>,
 ) {
   return (
@@ -67,7 +67,7 @@ export function AppBaseProviders(
       <ThemeProvider
         onThemeApplied={(_, mode, scheme) => {
           void window.api?.setTitlebar?.({ mode, scheme })
-          props.onThemeApplied?.(mode, scheme)
+          props.onThemeApplied?.()
         }}
       >
         <LanguageProvider locale={props.locale} onNativeTranslations={props.onNativeTranslations}>

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

@@ -16,6 +16,7 @@ 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
@@ -46,7 +47,7 @@ export function createNewSessionComposerAdapter(props: {
     async start(selection, submission) {
       const projectDirectory = location().directory
       const worktree = props.worktree()
-      const sessionDirectory = await resolveSessionDirectory({
+      const workspace = await resolveSessionDirectory({
         projectDirectory,
         worktree,
         branch: props.branch(),
@@ -54,7 +55,8 @@ export function createNewSessionComposerAdapter(props: {
         serverSDK,
         language,
       })
-      if (!sessionDirectory) return
+      if (!workspace) return
+      const sessionDirectory = workspace.directory
 
       const created = data.session.create({
         agent: selection.agent,
@@ -84,6 +86,7 @@ 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, {
@@ -119,7 +122,7 @@ export function createNewSessionComposerAdapter(props: {
               prompt: (input) =>
                 data.session.prompt({
                   ...input,
-                  gate: Promise.all([input.gate, afterCreation(async () => undefined)]),
+                  gate: Promise.all([input.gate, afterCreation(async () => undefined), workspace.ready]),
                 }),
             },
           },
@@ -133,7 +136,7 @@ export function createNewSessionComposerAdapter(props: {
 
   return {
     adapter,
-    project: createComposerProjectControls({ draftId: props.draftID, worktree: props.worktree }),
+    project: createComposerProjectControls({ draftId: props.draftID }),
     model,
     ready: prompt.ready,
   }
@@ -168,28 +171,54 @@ async function resolveSessionDirectory(input: {
   serverSDK: ReturnType<typeof useServerSDK>
   language: ReturnType<typeof useLanguage>
 }) {
-  if (input.worktree === "main") return input.projectDirectory
-  if (input.worktree !== "create") return input.worktree
+  if (input.worktree !== "create") {
+    return {
+      directory: input.worktree === "main" ? input.projectDirectory : input.worktree,
+      ready: Promise.resolve(),
+      initializing: false,
+    }
+  }
 
-  return input.serverSDK.api.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
     .create({
-      projectID: input.data.location.info({ directory: input.projectDirectory })?.project.id ?? "",
+      projectID,
       strategy: "git",
       branch: input.branch,
       directory: getDirectory(
         input.data.location.info({ directory: input.projectDirectory })?.project.directory ?? input.projectDirectory,
       ),
     })
-    .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),
-      })
+    .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),
     })
+    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) {

packages/app/src/new-session/project/controller.ts

@@ -4,11 +4,10 @@ import { useGlobal, useServerCtx } from "@/runtime/server/runtime"
 import { useServerSDK } from "@/runtime/server/client"
 import { serverName, ServerConnection, useServers } from "@/runtime/server/registry"
 import { useWorkspaceLocation } from "@/workspaces/location"
-import { workspaceSelectionDestination } from "@/workspaces/paths"
 import { useTabs } from "@/shell/tabs/tabs"
 import type { PromptProjectControls } from "./selector"
 
-export function createComposerProjectControls(props: { draftId: string; worktree: () => string }) {
+export function createComposerProjectControls(props: { draftId: string }) {
   const servers = useServers()
   const serverSDK = useServerSDK()
   const location = useWorkspaceLocation()
@@ -39,7 +38,7 @@ export function createComposerProjectControls(props: { draftId: string; worktree
     tabs.updateDraft(props.draftId, {
       server: ServerConnection.key(connection),
       directory: worktree,
-      worktree: workspaceSelectionDestination(props.worktree(), location().directory),
+      worktree: undefined,
       branch: undefined,
     })
   }

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

@@ -5,8 +5,6 @@ import { useWorkspaceLocation } from "@/workspaces/location"
 import { useServerSDK } from "@/runtime/server/client"
 import { useData } from "@/runtime/server/current"
 import { useSettings } from "@/settings/model"
-import { useTabs } from "@/shell/tabs/tabs"
-import { ServerConnection } from "@/runtime/server/registry"
 import { normalizeProjectInfo } from "@/runtime/server/global-sync/utils"
 import {
   isWorkspaceDirectory,
@@ -14,7 +12,6 @@ import {
   sameDirectory,
   workspaceDefaultSelection,
   workspaceDirectories,
-  workspaceSelectionDestination,
 } from "@/workspaces/paths"
 
 export function resolveNewSessionWorktree(input: {
@@ -60,7 +57,6 @@ export function createNewSessionWorkspaceController(input: {
   const serverSDK = useServerSDK()
   const data = useData()
   const settings = useSettings()
-  const tabs = useTabs()
   const [state, setState] = createStore({ search: "" })
   const searchBranches = debounce((search: string) => setState("search", search.trim()), 100)
   const currentProject = createMemo(() => {
@@ -125,8 +121,7 @@ export function createNewSessionWorkspaceController(input: {
   const remember = (worktree = value()) => {
     const project = currentProject()
     if (!project) return
-    tabs.initializeDraftWorktrees(ServerConnection.key(serverSDK.server), sdk().directory, fallback())
-    const local = workspaceSelectionDestination(worktree, project.worktree) === "main"
+    const local = worktree === "main" || sameDirectory(worktree, project.worktree)
     settings.workspaces.setLastUsed(serverSDK.scope, project.id, local ? "local" : "workspace")
   }
 
@@ -146,7 +141,6 @@ export function createNewSessionWorkspaceController(input: {
       set: (worktree: string) => {
         input.setSelectedBranch(undefined)
         input.setSelectedWorktree(normalizeNewSessionWorktree(worktree, sdk().directory, currentProject()?.worktree))
-        remember(worktree)
       },
       create: (branch: string) => {
         input.setSelectedBranch(branch)
@@ -166,10 +160,7 @@ export function createNewSessionWorkspaceController(input: {
         const loaded = branches.latest
         const list = loaded?.directory === projectRoot() ? loaded.data : []
         return [
-          ...new Set([
-            ...list,
-            ...(current && current.toLowerCase().includes(state.search.toLowerCase()) ? [current] : []),
-          ]),
+          ...new Set([...list, ...(current && current.toLowerCase().includes(state.search.toLowerCase()) ? [current] : [])]),
         ].slice(0, 50)
       },
       searchBranches,

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

@@ -312,6 +312,7 @@ 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",
@@ -884,7 +885,6 @@ export const dict = {
 
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Server",
-  "settings.backToApp": "Back to app",
   "settings.tab.general": "General",
   "settings.tab.preferences": "Preferences",
   "settings.tab.shortcuts": "Shortcuts",
@@ -893,11 +893,6 @@ export const dict = {
   "settings.tab.extensions": "Extensions",
   "settings.preferences.description": "Customize preferences and theme and default behavior",
   "settings.appearance.description": "Customize theme and fonts",
-  "settings.appearance.section.experimental": "Experimental",
-  "settings.appearance.row.tabs.title": "Tabs",
-  "settings.appearance.row.tabs.description": "Choose how session tabs are arranged",
-  "settings.appearance.row.tabs.horizontal": "Horizontal",
-  "settings.appearance.row.tabs.vertical": "Vertical",
   "settings.notifications.description": "Choose when to receive notifications and hear sounds",
   "settings.shortcuts.description": "Customize shortcuts for common actions",
   "settings.servers.description": "Manage server connections",

packages/app/src/session/composer/queue.test.ts

@@ -1,54 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { SessionInboxInfo } from "@opencode-ai/client/promise"
-import { queuedPromptRows } from "./queue"
-
-const queued = [
-  {
-    id: "msg_original",
-    sessionID: "ses_1",
-    timeCreated: 1,
-    type: "user",
-    delivery: "queue",
-    payload: { text: "original" },
-  },
-  {
-    id: "msg_replacement",
-    sessionID: "ses_1",
-    timeCreated: 2,
-    type: "user",
-    delivery: "queue",
-    payload: { text: "edited" },
-  },
-] satisfies SessionInboxInfo[]
-
-describe("queuedPromptRows", () => {
-  test("keeps the edited prompt to one row while its replacement is admitted", () => {
-    expect(queuedPromptRows(queued, { original: "msg_original", replacement: "msg_replacement" })).toEqual([
-      { id: "msg_replacement", text: "edited", attachments: false },
-    ])
-  })
-
-  test("keeps the original visible until its replacement appears", () => {
-    expect(queuedPromptRows([queued[0]], { original: "msg_original", replacement: "msg_replacement" })).toEqual([
-      { id: "msg_original", text: "original", attachments: false },
-    ])
-  })
-
-  test("retains unrelated queue entries", () => {
-    expect(queuedPromptRows(queued)).toEqual([
-      { id: "msg_original", text: "original", attachments: false },
-      { id: "msg_replacement", text: "edited", attachments: false },
-    ])
-  })
-
-  test("keeps other prompts visible while a mutation replaces the edited prompt", () => {
-    const other = { ...queued[0], id: "msg_other", payload: { text: "other" } }
-
-    expect(
-      queuedPromptRows([queued[0], other, queued[1]], { original: "msg_original", replacement: "msg_replacement" }),
-    ).toEqual([
-      { id: "msg_other", text: "other", attachments: false },
-      { id: "msg_replacement", text: "edited", attachments: false },
-    ])
-  })
-})

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

@@ -1,8 +1,6 @@
 import { createEffect, createMemo, onCleanup, type Accessor } from "solid-js"
 import { createStore } from "solid-js/store"
-import { useMutation } from "@tanstack/solid-query"
 import type { SessionInboxInfo } from "@opencode-ai/client/promise"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
 import type { ComposerDelivery } from "@/composer/adapter"
 import type { ComposerModel } from "@/composer/model"
 import type { ComposerStateTarget } from "@/composer/submission-state"
@@ -36,67 +34,39 @@ export function createSessionQueue(input: {
   const server = useServerSDK()
   const location = useWorkspaceLocation()
   const language = useLanguage()
-  const [state, setState] = createStore<{ editing?: { id: string; stash: EditStash } }>({})
-  const notify = () => showToast({ title: language.t("common.requestFailed") })
-  const mutation = useMutation(() => ({
-    mutationFn: async (
-      change:
-        | { type: "reorder"; inboxIDs: string[] }
-        | {
-            type: "edit"
-            inboxIDs: string[]
-            original: string
-            replacement: string
-            item: QueuedPrompt | undefined
-            prompt: Prompt
-            text: string
-            delivery: ComposerDelivery
-          },
-    ) => {
-      if (change.type === "reorder") return rewrite(change.inboxIDs)
-      const replacement = await editedPromptInput(
-        input.sessionID,
-        location().directory,
-        change.item,
-        change.prompt,
-        change.text,
-      )
-      // Admit before cancelling so a failed replacement never discards the original.
-      const admitted = await data.session.prompt({
-        ...replacement,
-        id: change.replacement,
-        delivery: change.delivery,
-        ...(change.delivery === "queue" ? { resume: false } : {}),
-      })
-      await server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: change.original })
-      cancelEdit()
-      if (change.delivery === "queue")
-        await rewrite(change.inboxIDs.map((id) => (id === change.original ? admitted.id : id)))
-    },
-    onError: notify,
-    onSettled: () => data.session.pending.sync(input.sessionID).catch(() => undefined),
-  }))
+  const [state, setState] = createStore<{ editing?: { id: string; stash: EditStash }; busy: boolean }>({ busy: false })
 
   const queued = createMemo(() =>
     data.session.pending
       .list(input.sessionID)
       .filter((item): item is QueuedPrompt => item.type === "user" && item.delivery === "queue"),
   )
-  const rows = createMemo(() => {
-    const replacement = mutation.isPending ? mutation.variables : undefined
-    return queuedPromptRows(
-      queued(),
-      replacement?.type === "edit" && replacement.delivery === "queue" ? replacement : undefined,
-    )
-  })
+  const rows = createMemo(() =>
+    queued().map((item) => ({
+      id: item.id,
+      text: queuedPromptText(item),
+      attachments: (item.payload.files?.length ?? 0) > 0,
+    })),
+  )
 
   createEffect(() => {
     const editing = state.editing
-    if (!editing || mutation.isPending || queued().some((item) => item.id === editing.id)) return
+    if (!editing || state.busy || queued().some((item) => item.id === editing.id)) return
     setState("editing", undefined)
   })
   onCleanup(() => cancelEdit())
 
+  const notify = () => showToast({ title: language.t("common.requestFailed") })
+  const run = (work: () => Promise<unknown>) => {
+    setState("busy", true)
+    return work()
+      .catch(() => notify())
+      .finally(async () => {
+        await data.session.pending.sync(input.sessionID).catch(() => undefined)
+        setState("busy", false)
+      })
+  }
+
   const rewrite = async (inboxIDs: string[]) => {
     const pending = await server.api.session.inbox.list({ sessionID: input.sessionID })
     if (pending.some((item) => item.delivery === "queue" && item.type !== "user"))
@@ -138,12 +108,12 @@ export function createSessionQueue(input: {
     return server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: id }).catch(() => notify())
   }
   const reorder = (inboxIDs: string[]) => {
-    if (mutation.isPending) return Promise.resolve()
-    return mutation.mutateAsync({ type: "reorder", inboxIDs }).catch(() => undefined)
+    if (state.busy) return Promise.resolve()
+    return run(() => rewrite(inboxIDs))
   }
 
   const edit = (id: string) => {
-    if (mutation.isPending) return false
+    if (state.busy) return false
     if (state.editing?.id === id) return true
     const item = queued().find((entry) => entry.id === id)
     if (!item) return false
@@ -177,22 +147,25 @@ export function createSessionQueue(input: {
   }
   const confirmEdit = (delivery: ComposerDelivery) => {
     const editing = state.editing
-    if (!editing || mutation.isPending) return
+    if (!editing || state.busy) return
     const prompt = clonePrompt(input.draft.current())
     const text = prompt.map((part) => ("content" in part ? part.content : "")).join("")
     if (!text.trim() && !prompt.some((part) => part.type === "image")) return cancelEdit()
     const item = queued().find((entry) => entry.id === editing.id)
     const pristine = item && text.trim() === queuedPromptText(item) && !prompt.some((part) => part.type === "image")
     if (pristine && delivery === "queue") return cancelEdit()
-    mutation.mutate({
-      type: "edit",
-      inboxIDs: queued().map((entry) => entry.id),
-      original: editing.id,
-      replacement: SessionMessage.ID.create(),
-      item,
-      prompt,
-      text,
-      delivery,
+    const inboxIDs = queued().map((entry) => entry.id)
+    void run(async () => {
+      const replacement = await editedPromptInput(input.sessionID, location().directory, item, prompt, text)
+      // Admit before cancelling so a failed replacement never discards the original.
+      const admitted = await data.session.prompt({
+        ...replacement,
+        delivery,
+        ...(delivery === "queue" ? { resume: false } : {}),
+      })
+      await server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: editing.id })
+      cancelEdit()
+      if (delivery === "queue") await rewrite(inboxIDs.map((id) => (id === editing.id ? admitted.id : id)))
     })
   }
   const editFirst = () => {
@@ -214,7 +187,7 @@ export function createSessionQueue(input: {
     cancelEdit,
     editFirst,
     rows,
-    busy: () => mutation.isPending,
+    busy: () => state.busy,
     working: input.working,
     steer,
     remove,
@@ -231,17 +204,6 @@ export type SessionQueueView = Pick<
   "rows" | "editing" | "working" | "busy" | "steer" | "remove" | "edit" | "reorder"
 >
 
-export function queuedPromptRows(items: QueuedPrompt[], replacement?: { original: string; replacement: string }) {
-  const replaced = replacement && items.some((item) => item.id === replacement.replacement)
-  return items
-    .filter((item) => !replaced || item.id !== replacement.original)
-    .map((item) => ({
-      id: item.id,
-      text: queuedPromptText(item),
-      attachments: (item.payload.files?.length ?? 0) > 0,
-    }))
-}
-
 export function queuedPromptText(item: QueuedPrompt) {
   const display = item.payload.metadata?.["displayText"]
   return typeof display === "string" && display.length > 0 ? display : item.payload.text

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

@@ -105,8 +105,6 @@ export function createTimelineController(input: { session: TimelineSessionSource
     sessionMessages: projectedMessages,
     status: input.session.data.status,
     showReasoningSummaries: settings.general.showReasoningSummaries,
-    shellToolDefaultOpen: settings.general.shellToolPartsExpanded,
-    editToolDefaultOpen: settings.general.editToolPartsExpanded,
     pendingUserMessageIDs,
   })
   const [pending, setPending] = createStore({ rename: false })

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

@@ -30,6 +30,7 @@ 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 = {
@@ -342,15 +343,15 @@ function MessageTimelineView(
   const projection = props.data.projection
   const sessionDirectory = createMemo(() => props.session.data.info()?.location.directory ?? sdk().directory)
   const project = createMemo(() => {
-    const session = props.session.data.info()
-    const projects = server.ctx.sync.data.project
-    return session
-      ? projectForSession(session, projects)
-      : projects.find((item) => containsDirectory(item.worktree, sessionDirectory()))
+    const projectID = props.session.data.info()?.projectID
+    const value = projectID
+      ? data.project.get(projectID)
+      : data.project.list().find((item) => containsDirectory(item.canonical, sessionDirectory()))
+    if (!value) return undefined
+    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()
@@ -387,7 +388,7 @@ function MessageTimelineView(
   const pinned = createMemo(() => props.pinned)
   const messageByID = projection.messageByID
   const virtualized = createTimelineVirtualizer({
-    sessionKey: () => `${server.key}/${props.data.sessionID()}`,
+    sessionKey: props.data.sessionKey,
     projection,
     showHeader,
     pinned,
@@ -464,6 +465,8 @@ 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,
   })

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

@@ -8,8 +8,6 @@ export function createTimelineProjection(input: {
   sessionMessages: Accessor<SessionMessageInfo[]>
   status: Accessor<SessionStatus>
   showReasoningSummaries: Accessor<boolean>
-  shellToolDefaultOpen: Accessor<boolean>
-  editToolDefaultOpen: Accessor<boolean>
   pendingUserMessageIDs: Accessor<ReadonlySet<string>>
 }) {
   const sessionMessageByID = createMemo(
@@ -83,8 +81,6 @@ export function createTimelineProjection(input: {
       input.showReasoningSummaries(),
       input.status(),
       input.pendingUserMessageIDs(),
-      input.shellToolDefaultOpen(),
-      input.editToolDefaultOpen(),
     ),
   )
   const activeMessageID = createMemo(() => projection().activeMessageID)

packages/app/src/settings/appearance/appearance.tsx

@@ -9,7 +9,6 @@ import { createAppearanceSettingsController, type AppearanceSettingsController }
 import "@/settings/settings.css"
 
 const schemeOptions: ("system" | "light" | "dark")[] = ["system", "light", "dark"]
-const tabLayoutOptions: ("horizontal" | "vertical")[] = ["horizontal", "vertical"]
 const fontSettings = {
   ui: {
     action: "settings-ui-font",
@@ -127,30 +126,6 @@ export const SettingsAppearance: Component = () => {
             <FontSetting kind="terminal" fonts={appearance.fonts} />
           </SettingsList>
         </div>
-
-        <div class="settings-section">
-          <h3 class="settings-section-title">{language.t("settings.appearance.section.experimental")}</h3>
-          <SettingsList>
-            <SettingsRow
-              title={language.t("settings.appearance.row.tabs.title")}
-              description={language.t("settings.appearance.row.tabs.description")}
-            >
-              <Select
-                data-action="settings-tab-layout"
-                options={tabLayoutOptions}
-                current={tabLayoutOptions.find((option) => option === appearance.tabs.current())}
-                placement="bottom-end"
-                gutter={6}
-                label={(option) =>
-                  option === "horizontal"
-                    ? language.t("settings.appearance.row.tabs.horizontal")
-                    : language.t("settings.appearance.row.tabs.vertical")
-                }
-                onSelect={(option) => option && appearance.tabs.select(option)}
-              />
-            </SettingsRow>
-          </SettingsList>
-        </div>
       </div>
     </>
   )

packages/app/src/settings/command.tsx

@@ -1,10 +1,24 @@
+import { onCleanup } from "solid-js"
 import { useCommand } from "@/shell/commands/command"
 import { useLanguage } from "@/runtime/i18n/language"
-import { useSettingsSurface } from "./surface"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
 
 export function useSettingsDialog(defaultValue?: string) {
-  const settings = useSettingsSurface()
-  return () => settings.open(defaultValue)
+  const dialog = useDialog()
+  let run = 0
+  let dead = false
+
+  onCleanup(() => {
+    dead = true
+  })
+
+  return () => {
+    const current = ++run
+    void import("@/settings/shell").then((module) => {
+      if (dead || run !== current) return
+      void dialog.show(() => <module.DialogSettings defaultValue={defaultValue} />)
+    })
+  }
 }
 
 export function useSettingsCommand() {

packages/app/src/settings/general/controllers.ts

@@ -81,10 +81,6 @@ export function createAppearanceSettingsController() {
       setCode: (value: string) => settings.appearance.setFont(value),
       setTerminal: (value: string) => settings.appearance.setTerminalFont(value),
     },
-    tabs: {
-      current: settings.appearance.tabLayout,
-      select: settings.appearance.setTabLayout,
-    },
   }
 }
 

packages/app/src/settings/model.tsx

@@ -8,7 +8,6 @@ export type WorkspaceDefaultDestination = "last-used" | "local" | "new"
 export type WorkspaceLastUsed = "local" | "workspace"
 export type TerminalPlacement = "side" | "bottom"
 export type FollowUpBehavior = "queue" | "steer"
-export type TabLayout = "horizontal" | "vertical"
 
 export interface NotificationSettings {
   agent: boolean
@@ -48,7 +47,6 @@ export interface Settings {
     mono: string
     sans: string
     terminal: string
-    tabLayout: TabLayout
   }
   keybinds: Record<string, string>
   permissions: {
@@ -137,7 +135,6 @@ const defaultSettings: Settings = {
     mono: "",
     sans: "",
     terminal: "",
-    tabLayout: "horizontal",
   },
   keybinds: {},
   permissions: {
@@ -290,10 +287,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setTerminalFont(value: string) {
           setStore("appearance", "terminal", value.trim() ? value : "")
         },
-        tabLayout: withFallback(() => store.appearance?.tabLayout, defaultSettings.appearance.tabLayout),
-        setTabLayout(value: TabLayout) {
-          setStore("appearance", "tabLayout", value)
-        },
       },
       keybinds: {
         get: (action: string) => store.keybinds?.[action],

packages/app/src/settings/settings.css

@@ -5,90 +5,6 @@
   height: 100%;
 }
 
-.settings-screen {
-  display: flex;
-  width: 100%;
-  height: 100%;
-  min-width: 0;
-  min-height: 0;
-  justify-content: center;
-  overflow: hidden;
-  background: var(--v2-background-bg-deep);
-  outline: none;
-  container: settings-screen / inline-size;
-}
-
-.settings-screen > .settings {
-  display: flex;
-  width: min(100%, 1048px);
-  min-width: 0;
-}
-
-.settings-screen
-  > .settings[data-component="tabs-v2"][data-variant="settings"][data-orientation="vertical"]
-  > [data-slot="tabs-v2-list"] {
-  width: 328px;
-  min-width: 328px;
-  padding-block: 48px;
-  padding-inline-start: 24px;
-  padding-inline-end: 104px;
-  border-inline-end: none;
-  background: transparent;
-}
-
-.settings-screen > .settings > .settings-panel {
-  flex: 1;
-  min-width: 0;
-  max-width: 720px;
-}
-
-.settings-screen .settings-tab-header {
-  padding: 48px 0 32px;
-  background: linear-gradient(to bottom, var(--v2-background-bg-deep) calc(100% - 24px), transparent);
-}
-
-.settings-screen .settings-tab-body {
-  padding-inline: 0;
-}
-
-.settings-nav {
-  display: flex;
-  width: 200px;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.settings-back {
-  display: flex;
-  height: 28px;
-  align-items: center;
-  gap: 6px;
-  padding-inline: 6px;
-  border: 0;
-  border-radius: 4px;
-  background: transparent;
-  color: var(--v2-text-text-muted);
-  font: inherit;
-  line-height: var(--line-height-compact);
-  text-align: start;
-  cursor: pointer;
-}
-
-.settings-back:hover,
-.settings-back:focus-visible {
-  background: var(--v2-background-bg-layer-03);
-  color: var(--v2-text-text-base);
-}
-
-.settings-back:focus-visible {
-  outline: 2px solid var(--v2-border-border-focus);
-  outline-offset: 2px;
-}
-
-[dir="rtl"] .settings-back-icon {
-  transform: scaleX(-1);
-}
-
 [data-component="dialog-v2"][data-variant="settings"] [data-slot="dialog-container"] {
   background: var(--v2-background-bg-base);
 }
@@ -105,7 +21,6 @@
   overflow-y: auto;
   scrollbar-width: none;
   user-select: none;
-  container: settings-panel / inline-size;
 }
 
 .settings-panel :is(input, textarea, [contenteditable="true"]) {
@@ -257,16 +172,12 @@
   width: 100%;
 }
 
-:is([data-component="dialog-v2"][data-variant="settings"], .settings-screen) [data-component="select-v2-root"] {
+[data-component="dialog-v2"][data-variant="settings"] [data-component="select-v2-root"] {
   width: fit-content;
   max-width: 100%;
 }
 
-:is([data-component="dialog-v2"][data-variant="settings"], .settings-screen) [data-component="select-v2"] {
-  max-width: 100%;
-}
-
-:is([data-component="dialog-v2"][data-variant="settings"], .settings-screen) [data-component="button-v2"] {
+[data-component="dialog-v2"][data-variant="settings"] [data-component="button-v2"] {
   width: fit-content;
   max-width: 100%;
 }
@@ -276,93 +187,27 @@
 }
 
 @media (max-width: 639px) {
-  .settings-screen .settings-nav {
-    width: 100%;
-  }
-
-  .settings-screen > .settings > .settings-panel {
-    padding-inline-end: 16px;
-  }
-
-  .settings-screen .settings-tab-header {
-    padding-top: 24px;
-  }
-
   .settings[data-component="tabs-v2"][data-variant="settings"][data-orientation="vertical"]
     > [data-slot="tabs-v2-list"] {
     width: 144px;
     min-width: 144px;
     padding-inline: 8px;
   }
-
-  .settings-screen
-    > .settings[data-component="tabs-v2"][data-variant="settings"][data-orientation="vertical"]
-    > [data-slot="tabs-v2-list"] {
-    width: 160px;
-    min-width: 160px;
-    padding-block: 24px;
-    padding-inline: 12px;
-  }
 }
 
-@container settings-screen (min-width: 800px) and (max-width: 1047px) {
-  .settings-screen > .settings {
-    padding-inline: 24px;
-  }
-
-  .settings-screen
-    > .settings[data-component="tabs-v2"][data-variant="settings"][data-orientation="vertical"]
-    > [data-slot="tabs-v2-list"] {
-    width: 240px;
-    min-width: 240px;
-    padding-inline-start: 16px;
-    padding-inline-end: 24px;
-  }
+.settings-nav-footer {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding: 4px 0 4px 4px;
+  user-select: none;
 }
 
-@container settings-screen (max-width: 799px) {
-  .settings-screen .settings-nav {
-    width: 100%;
-  }
-
-  .settings-screen > .settings > .settings-panel {
-    padding-inline-end: 16px;
-  }
-
-  .settings-screen .settings-tab-header {
-    padding-top: 24px;
-  }
-
-  .settings-screen
-    > .settings[data-component="tabs-v2"][data-variant="settings"][data-orientation="vertical"]
-    > [data-slot="tabs-v2-list"] {
-    width: 160px;
-    min-width: 160px;
-    padding-block: 24px;
-    padding-inline: 12px;
-  }
-}
-
-@container settings-panel (max-width: 520px) {
-  .settings-tab-header-row {
-    flex-wrap: wrap;
-  }
-
-  .settings-tab-header-row [data-component="select-v2-root"] {
-    width: 100%;
-  }
-
-  .settings-tab-header-row [data-component="select-v2"] {
-    width: 100%;
-  }
-
-  [data-component="settings-row"] {
-    flex-wrap: wrap;
-  }
-
-  [data-slot="settings-row-control"] {
-    width: 100%;
-  }
+.settings-nav-footer > span {
+  font-size: 11px;
+  font-weight: 440;
+  line-height: 1;
+  color: var(--v2-text-text-faint);
 }
 
 .settings-provider-row {
@@ -385,12 +230,6 @@
   }
 }
 
-@container settings-panel (max-width: 520px) {
-  .settings-provider-row {
-    flex-wrap: wrap;
-  }
-}
-
 .settings-providers [data-component="provider-icon"] {
   color: var(--v2-icon-icon-base);
 }
@@ -1065,40 +904,6 @@
   }
 }
 
-@container settings-panel (max-width: 520px) {
-  .settings-workspaces-toolbar,
-  .settings-workspaces-main {
-    align-items: flex-start;
-  }
-
-  .settings-workspaces-toolbar {
-    flex-wrap: wrap;
-  }
-
-  .settings-workspaces-toolbar-actions {
-    width: 100%;
-    flex-wrap: wrap;
-    justify-content: space-between;
-  }
-
-  .settings-workspaces-inventory [data-component="settings-list"] {
-    max-height: none;
-    overflow-y: visible;
-    padding: 14px;
-  }
-
-  .settings-workspaces-path {
-    overflow: visible;
-    text-overflow: clip;
-    white-space: normal;
-    overflow-wrap: anywhere;
-  }
-
-  .settings-workspaces-active {
-    display: none;
-  }
-}
-
 [data-component="dialog-v2"].settings-server-dialog [data-slot="dialog-container"] {
   width: 480px;
   max-width: calc(100vw - 32px);
@@ -1144,7 +949,7 @@
 }
 
 .settings-extensions-tabs[data-component="tabs-v2"][data-variant="pill"] > [data-slot="tabs-v2-list"] {
-  width: min(280px, 100%);
+  width: 280px;
   padding-inline: 0 !important;
 }
 

packages/app/src/settings/shell.tsx

@@ -1,7 +1,9 @@
-import { Component, createEffect, createMemo, createSignal, onCleanup, onMount, startTransition } from "solid-js"
+import { Component, createEffect, createMemo, createSignal, startTransition } from "solid-js"
+import { Dialog } from "@opencode-ai/ui/dialog"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { Icon } from "@opencode-ai/ui/icon"
 import { useLanguage } from "@/runtime/i18n/language"
+import { usePlatform } from "@/runtime/platform/platform"
 import { SettingsGeneral } from "./general/general"
 import { SettingsAppearance } from "./appearance/appearance"
 import { SettingsKeybinds } from "./keybinds/keybinds"
@@ -18,32 +20,19 @@ import { useLayout } from "@/shell/state/layout"
 import { useTabs } from "@/shell/tabs/tabs"
 import { useGlobal, useServerCtx } from "@/runtime/server/runtime"
 import { ServerConnection, useServers } from "@/runtime/server/registry"
-import { useCommand } from "@/shell/commands/command"
-import { useSettingsSurface } from "./surface"
 import "@/settings/settings.css"
 
-export const SettingsScreen: Component<{
+export const DialogSettings: Component<{
   defaultValue?: string
 }> = (props) => {
   const language = useLanguage()
+  const platform = usePlatform()
   const dialog = useDialog()
-  const command = useCommand()
-  const surface = useSettingsSurface()
   const layout = useLayout()
   const servers = useServers()
   const tabs = useTabs()
   const global = useGlobal()
   const [tab, setTab] = createSignal(props.defaultValue ?? "general")
-  let root: HTMLDivElement | undefined
-
-  onMount(() => {
-    command.keybinds(false)
-    root?.focus({ preventScroll: true })
-  })
-  onCleanup(() => command.keybinds(true))
-
-  createEffect(() => setTab(props.defaultValue ?? "general"))
-
   const server = createMemo(() => {
     const route = layout.route()
     switch (route.type) {
@@ -78,22 +67,11 @@ export const SettingsScreen: Component<{
   })
 
   const showProviders = () => {
-    dialog.close()
-    setTab("providers")
+    void dialog.show(() => <DialogSettings defaultValue="providers" />)
   }
 
   return (
-    <div
-      ref={root}
-      data-testid="settings-screen"
-      class="settings-screen"
-      tabIndex={-1}
-      onKeyDown={(event) => {
-        if (event.key !== "Escape" || event.defaultPrevented || dialog.active) return
-        event.preventDefault()
-        surface.close()
-      }}
-    >
+    <Dialog size="x-large" variant="settings" class="settings-dialog">
       <Tabs
         orientation="vertical"
         variant="settings"
@@ -102,11 +80,7 @@ export const SettingsScreen: Component<{
         class="settings"
       >
         <Tabs.List>
-          <div class="settings-nav">
-            <button type="button" class="settings-back" onClick={surface.close}>
-              <Icon name="arrow-left" size="small" class="settings-back-icon" />
-              <span>{language.t("settings.backToApp")}</span>
-            </button>
+          <div class="flex flex-col justify-between h-full w-full">
             <div class="flex flex-col gap-4 w-full">
               {/* Group 1: Preferences */}
               <div class="flex flex-col gap-1 w-full">
@@ -160,6 +134,11 @@ export const SettingsScreen: Component<{
                 </Tabs.Trigger>
               </div>
             </div>
+
+            <div class="settings-nav-footer">
+              <span>{language.t("app.name.desktop")}</span>
+              <span>v{platform.version}</span>
+            </div>
           </div>
         </Tabs.List>
 
@@ -196,6 +175,6 @@ export const SettingsScreen: Component<{
           </Tabs.Content>
         </SettingsServerScope>
       </Tabs>
-    </div>
+    </Dialog>
   )
 }

packages/app/src/settings/surface.tsx

@@ -1,32 +0,0 @@
-import { useLocation } from "@solidjs/router"
-import { createEffect, on } from "solid-js"
-import { createStore } from "solid-js/store"
-import { createSimpleContext } from "@opencode-ai/ui/context"
-
-export const { use: useSettingsSurface, provider: SettingsSurfaceProvider } = createSimpleContext({
-  name: "SettingsSurface",
-  gate: false,
-  init: () => {
-    const location = useLocation()
-    const [store, setStore] = createStore({ open: false, tab: "general" })
-    let focus: HTMLElement | undefined
-
-    const close = () => {
-      if (!store.open) return
-      setStore("open", false)
-      if (focus?.isConnected) focus.focus({ preventScroll: true })
-      focus = undefined
-    }
-
-    createEffect(on(() => `${location.pathname}${location.search}`, close, { defer: true }))
-
-    return {
-      store,
-      open(tab = "general") {
-        if (!store.open && document.activeElement instanceof HTMLElement) focus = document.activeElement
-        setStore({ open: true, tab })
-      },
-      close,
-    }
-  },
-})

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

@@ -11,8 +11,7 @@ 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 } from "@/shell/layout/helpers"
-import { ProjectIcon } from "@/shell/layout/project-icon"
+import { displayName, getProjectAvatarSource } from "@/shell/layout/helpers"
 import { createEditProjectModel } from "./project-model"
 import { ProjectSettingsExtensions } from "./project-extensions"
 import { SettingsServerDataScope } from "@/settings/server-scope"
@@ -58,7 +57,11 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
         <Tabs.List>
           <div class="project-settings-nav">
             <Tabs.Trigger value="general">
-              <ProjectIcon project={props.project} class="!size-4 shrink-0" />
+              <ProjectAvatar
+                fallback={projectName()}
+                variant={getProjectAvatarVariant(props.project.icon?.color)}
+                class="!size-4 shrink-0"
+              />
               <span class="truncate">{projectName()}</span>
             </Tabs.Trigger>
             <Tabs.Trigger value="scripts">
@@ -111,14 +114,14 @@ function ProjectSettingsDialog(props: { project: LocalProject; server: ServerCon
                     onDragLeave={model.dragLeave}
                     onClick={model.iconClick}
                   >
-                    <ProjectIcon
-                      project={props.project}
+                    <ProjectAvatar
                       fallback={model.store.name || model.defaultName()}
-                      icon={{
+                      src={getProjectAvatarSource(props.project.id, {
                         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

packages/app/src/settings/workspaces/projects.tsx

@@ -1,12 +1,13 @@
 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"
@@ -17,7 +18,6 @@ export const SettingsProjects: Component = () => {
   const global = useGlobal()
   const [allServers, setAllServers] = createSignal(true)
   const selected = global.settings.server.selected
-  const multiple = createMemo(() => global.servers.list().length > 1)
   const projects = createMemo(() => {
     const server = selected()
     if (!server) return []
@@ -40,13 +40,14 @@ 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)] transition-all hover:bg-v2-background-bg-layer-01"
+        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">
-          <ProjectIcon project={props.project} class="shrink-0" />
+          <ProjectAvatar fallback={name()} variant={color()} 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">
@@ -73,16 +74,14 @@ export const SettingsProjects: Component = () => {
             <h2 class="settings-tab-title">{language.t("settings.projects.title")}</h2>
             <span class="text-11-regular text-v2-text-text-muted">{language.t("settings.projects.description")}</span>
           </div>
-          <Show when={multiple()}>
-            <InlineServerSelect
-              all={{
-                label: language.t("settings.projects.server.all"),
-                selected: allServers,
-                onSelect: () => setAllServers(true),
-              }}
-              onServerSelect={() => setAllServers(false)}
-            />
-          </Show>
+          <InlineServerSelect
+            all={{
+              label: language.t("settings.projects.server.all"),
+              selected: allServers,
+              onSelect: () => setAllServers(true),
+            }}
+            onServerSelect={() => setAllServers(false)}
+          />
         </div>
       </div>
 
@@ -101,14 +100,7 @@ export const SettingsProjects: Component = () => {
               >
                 <Show when={selected()} keyed>
                   {(server) => (
-                    <div class="settings-section">
-                      <Show when={multiple()}>
-                        <h3 class="settings-section-title">{serverName(server) || ServerConnection.key(server)}</h3>
-                      </Show>
-                      <div class="flex flex-col gap-2 w-full">
-                        <For each={projects()}>{(project) => <ProjectRow project={project} server={server} />}</For>
-                      </div>
-                    </div>
+                    <For each={projects()}>{(project) => <ProjectRow project={project} server={server} />}</For>
                   )}
                 </Show>
               </Show>
@@ -127,11 +119,9 @@ export const SettingsProjects: Component = () => {
               <For each={groups()}>
                 {(group) => (
                   <div class="settings-section">
-                    <Show when={multiple()}>
-                      <h3 class="settings-section-title">
-                        {serverName(group.server) || ServerConnection.key(group.server)}
-                      </h3>
-                    </Show>
+                    <h3 class="settings-section-title">
+                      {serverName(group.server) || ServerConnection.key(group.server)}
+                    </h3>
                     <div class="flex flex-col gap-2 w-full">
                       <For each={group.projects}>
                         {(project) => <ProjectRow project={project} server={group.server} />}

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

@@ -278,7 +278,7 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
 
   return (
     <div
-      class="relative flex-1 h-full w-full min-h-0 min-w-0 overflow-y-auto flex flex-col items-center justify-start sm:justify-center p-4 sm:p-8 font-sans"
+      class="relative flex-1 h-screen w-screen min-h-0 overflow-y-auto flex flex-col items-center justify-start sm:justify-center p-4 sm:p-8 font-sans"
       data-tauri-drag-region
     >
       <div class="w-full max-w-3xl flex flex-col items-center justify-center gap-6 sm:gap-8 my-auto">

packages/app/src/shell/layout/helpers.test.ts

@@ -12,7 +12,6 @@ import {
   homeProjectDirectories,
   homeSessionServerStatus,
   latestRootSession,
-  projectForSession,
   sortedRootSessions,
   toggleHomeProjectSelection,
 } from "./helpers"
@@ -168,27 +167,6 @@ describe("layout workspace helpers", () => {
     expect(childSessionOnPath(list, "root", "other")).toBeUndefined()
   })
 
-  test("keeps the enriched workspace inventory when matching a session by project id", () => {
-    const project = {
-      id: "project",
-      worktree: "/repo",
-      sandboxes: ["/workspaces/feature"],
-      worktrees: [{ directory: "/repo" }, { directory: "/workspaces/feature", strategy: "git" }],
-    }
-
-    expect(projectForSession(session({ id: "feature", directory: "/workspaces/feature/packages/app" }), [project])).toBe(
-      project,
-    )
-  })
-
-  test("finds the enriched project for a nested workspace when its session project id is stale", () => {
-    const project = { id: "updated", worktree: "/repo", sandboxes: ["/workspaces/feature"] }
-
-    expect(projectForSession(session({ id: "feature", directory: "/workspaces/feature/packages/app" }), [project])).toBe(
-      project,
-    )
-  })
-
   test("formats fallback project display name", () => {
     expect(displayName({ worktree: "/tmp/app" })).toBe("app")
     expect(displayName({ worktree: "/tmp/app", name: "My App" })).toBe("My App")

packages/app/src/shell/layout/helpers.ts

@@ -1,7 +1,6 @@
 import { getFilename } from "@opencode-ai/util/path"
 import type { SessionInfo } from "@opencode-ai/client/promise"
 import { pathKey } from "@/workspaces/path-key"
-import { isProjectDirectory } from "@/workspaces/paths"
 import type { ServerConnection } from "@/runtime/server/registry"
 import type { HomeProjectSelection } from "@/shell/state/layout"
 
@@ -101,7 +100,11 @@ export function projectForSession<T extends { id?: string; worktree: string; san
 ) {
   const direct = byID.get(session.projectID)
   if (direct) return direct
-  return projects.find((project) => isProjectDirectory(project, session.location.directory))
+  const directory = pathKey(session.location.directory)
+  return projects.find(
+    (project) =>
+      pathKey(project.worktree) === directory || project.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
+  )
 }
 
 export const errorMessage = (err: unknown, fallback: string) => {

packages/app/src/shell/layout/project-icon.tsx

@@ -1,24 +0,0 @@
-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)}
-    />
-  )
-}

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

@@ -6,7 +6,6 @@ import { useGlobal } from "@/runtime/server/runtime"
 import { ServerConnection } from "@/runtime/server/registry"
 import { SessionPanelFrame, SessionRouteFrame } from "@/session/session-frame"
 import { LayoutProvider } from "@/shell/state/layout"
-import { SettingsSurfaceProvider } from "@/settings/surface"
 import Shell from "@/shell/shell"
 import { requireServerKey } from "./session"
 
@@ -70,9 +69,7 @@ function TargetServerRoute(props: ParentProps) {
 function AppLayout(props: ParentProps) {
   return (
     <LayoutProvider>
-      <SettingsSurfaceProvider>
-        <Shell>{props.children}</Shell>
-      </SettingsSurfaceProvider>
+      <Shell>{props.children}</Shell>
     </LayoutProvider>
   )
 }

packages/app/src/shell/shell.tsx

@@ -1,28 +1,15 @@
 import { lazy, Show, Suspense, type ParentProps } from "solid-js"
 import { createStore } from "solid-js/store"
-import { createMediaQuery } from "@solid-primitives/media"
-import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Titlebar, type TitlebarUpdate } from "@/shell/titlebar/titlebar"
 import { usePlatform } from "@/runtime/platform/platform"
 import { ToastRegion } from "@/shell/notifications/toast"
 import { TitlebarRightProvider } from "@/shell/titlebar/right-slot"
-import { useSettingsSurface } from "@/settings/surface"
-import { useSettings } from "@/settings/model"
 
 const DebugBar = lazy(() => import("@/shell/debug/debug-bar").then((module) => ({ default: module.DebugBar })))
-const SettingsScreen = lazy(() => import("@/settings/shell").then((module) => ({ default: module.SettingsScreen })))
 
 export default function Layout(props: ParentProps) {
   const platform = usePlatform()
-  const settings = useSettingsSurface()
-  const preferences = useSettings()
-  const mobile = createMediaQuery("(max-width: 767px)")
-  const [state, setState] = createStore({
-    debugTools: false,
-    tabsWidth: 260,
-    tabsMount: undefined as HTMLElement | undefined,
-  })
-  const verticalTabs = () => preferences.appearance.tabLayout() === "vertical" && !mobile()
+  const [state, setState] = createStore({ debugTools: false })
 
   const update: TitlebarUpdate = {
     get version() {
@@ -47,47 +34,15 @@ export default function Layout(props: ParentProps) {
       >
         <Titlebar
           update={update}
-          verticalTabs={verticalTabs() ? { mount: state.tabsMount } : undefined}
           debugTools={
             import.meta.env.DEV
               ? { visible: state.debugTools, toggle: () => setState("debugTools", (value) => !value) }
               : undefined
           }
         />
-        <div class="flex flex-1 min-h-0 min-w-0 flex-row">
-          <Show when={verticalTabs()}>
-            <aside
-              ref={(element) => setState("tabsMount", element)}
-              data-slot="vertical-tabs-sidebar"
-              class="relative flex min-h-0 shrink-0 flex-col bg-v2-background-bg-deep px-2.5 py-2"
-              style={{ width: `${state.tabsWidth}px` }}
-            >
-              <ResizeHandle
-                class="-end-2"
-                direction="horizontal"
-                size={state.tabsWidth}
-                min={130}
-                max={520}
-                onResize={(width) => setState("tabsWidth", width)}
-              />
-            </aside>
-          </Show>
-          <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-strict">
-            <div
-              class="flex size-full min-h-0 min-w-0 flex-col"
-              hidden={settings.store.open}
-              inert={settings.store.open}
-              aria-hidden={settings.store.open}
-            >
-              <Suspense>{props.children}</Suspense>
-            </div>
-            <Show when={settings.store.open}>
-              <Suspense>
-                <SettingsScreen defaultValue={settings.store.tab} />
-              </Suspense>
-            </Show>
-          </main>
-        </div>
+        <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-strict">
+          <Suspense>{props.children}</Suspense>
+        </main>
         <Show when={import.meta.env.DEV && state.debugTools}>
           <Suspense>
             <DebugBar inline />

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

@@ -245,14 +245,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
           )
         })
       },
-      initializeDraftWorktrees(server: ServerConnection.Key, directory: string, worktree: string) {
-        setStore(
-          (tab) => tab.type === "draft" && tab.server === server && tab.directory === directory && !tab.worktree,
-          produce((tab) => {
-            if (tab.type === "draft") tab.worktree = worktree
-          }),
-        )
-      },
       promoteDraft(draftID: string, session: Omit<SessionTab, "type">) {
         // Keep the replacement and navigation atomic so /new-session never renders
         // after its backing draft tab has been removed from the store.

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

@@ -15,48 +15,6 @@
   background: linear-gradient(var(--tab-overlay), var(--tab-overlay)), var(--tab-base);
 }
 
-[data-titlebar-tab][data-orientation="vertical"]:has([data-slot="project-avatar-slot"]) {
-  height: 45px;
-}
-
-[data-titlebar-tab][data-orientation="vertical"]:has([data-slot="project-avatar-slot"]) [data-slot="tab-link"] {
-  display: grid;
-  grid-template-columns: 16px minmax(0, 1fr);
-  grid-template-rows: repeat(2, var(--line-height-compact));
-  align-content: center;
-  column-gap: 6px;
-  row-gap: 0;
-  font-size: 13px;
-  line-height: var(--line-height-compact);
-}
-
-[data-titlebar-tab][data-orientation="vertical"] [data-slot="project-avatar-slot"] {
-  grid-column: 1;
-  grid-row: 1;
-}
-
-[data-titlebar-tab][data-orientation="vertical"] [data-slot="tab-title"] {
-  grid-column: 2;
-  grid-row: 1;
-}
-
-[data-titlebar-tab][data-orientation="vertical"] [data-slot="tab-project"] {
-  grid-column: 2;
-  grid-row: 2;
-  min-width: 0;
-  overflow: hidden;
-  color: var(--v2-text-text-muted);
-  font-size: 13px;
-  line-height: var(--line-height-compact);
-  white-space: nowrap;
-}
-
-[data-titlebar-tab][data-orientation="vertical"] [data-slot="tab-close"] {
-  top: 0;
-  bottom: 0;
-  margin-block: auto;
-}
-
 [data-titlebar-tab]:is(:hover, :has(> [data-slot="tab-link"]:focus-visible)):not([data-state="pressed"]):not(
     [data-dragging="true"]
   ):not([data-editing="true"]) {
@@ -81,10 +39,6 @@
   gap: 6px;
 }
 
-[data-titlebar-tab-list][data-orientation="vertical"] {
-  gap: 2px;
-}
-
 [data-titlebar-tab-slot] {
   --tab-separator: var(--v2-background-bg-layer-03);
   position: relative;
@@ -114,11 +68,6 @@
   display: none;
 }
 
-[data-titlebar-tab-list][data-orientation="vertical"] [data-titlebar-tab-slot]::before,
-[data-titlebar-tab-slot]:has([data-titlebar-tab][data-orientation="vertical"])::before {
-  display: none;
-}
-
 [data-titlebar-tab][data-title-overflow="true"]:not([data-editing="true"]) [data-slot="tab-link"],
 [data-titlebar-tab]:is(:hover, [data-active="true"]):not([data-editing="true"]) [data-slot="tab-link"] {
   --tab-title-fade-offset: 4px;
@@ -184,21 +133,21 @@
 }
 
 @container (max-width: 64px) {
-  [data-titlebar-tab]:not([data-orientation="vertical"]) [data-titlebar-tab-link] {
+  [data-titlebar-tab-link] {
     justify-content: center;
     gap: 0;
     padding-inline: 0;
   }
 
-  [data-titlebar-tab]:not([data-orientation="vertical"]) [data-titlebar-tab-title] {
+  [data-titlebar-tab-title] {
     display: none;
   }
 
-  [data-titlebar-tab]:not([data-orientation="vertical"]):not([data-active="true"]) [data-slot="tab-close"] {
+  [data-titlebar-tab]:not([data-active="true"]) [data-slot="tab-close"] {
     display: none;
   }
 
-  [data-titlebar-tab]:not([data-orientation="vertical"]) [data-slot="tab-close"] {
+  [data-slot="tab-close"] {
     right: auto;
     left: 50%;
     transform: translateX(-50%);

packages/app/src/shell/titlebar/tab-nav.tsx

@@ -33,7 +33,6 @@ export function TabNavItem(props: {
   dragging?: boolean
   pressed?: boolean
   hidden?: boolean
-  orientation?: "horizontal" | "vertical"
 }) {
   const [editing, setEditing] = createSignal(false)
   const [titleOverflowing, setTitleOverflowing] = createSignal(false)
@@ -181,7 +180,6 @@ export function TabNavItem(props: {
       }}
       data-titlebar-tab
       data-slot="titlebar-tab-item"
-      data-orientation={props.orientation ?? "horizontal"}
       data-title-overflow={titleOverflowing()}
       data-editing={editing()}
       class="group relative flex h-7 w-full min-w-0 select-none flex-row items-center gap-1.5 overflow-hidden whitespace-nowrap rounded-[6px] px-1.5 [container-type:inline-size]"
@@ -280,13 +278,6 @@ export function TabNavItem(props: {
             event.preventDefault()
           }}
         />
-        <Show when={props.orientation === "vertical" && projectName()}>
-          {(name) => (
-            <span data-slot="tab-project" dir="auto">
-              {name()}
-            </span>
-          )}
-        </Show>
       </a>
 
       <div data-slot="tab-close">
@@ -308,7 +299,6 @@ export function TabNavItem(props: {
   return (
     <TabPreviewPopover
       trigger={tab}
-      orientation={props.orientation}
       open={popoverOpen() && !previewBlocked()}
       onOpenChange={(value) => {
         if (value && previewBlocked()) return
@@ -335,7 +325,6 @@ export function DraftTabItem(props: {
   dragging?: boolean
   pressed?: boolean
   hidden?: boolean
-  orientation?: "horizontal" | "vertical"
 }) {
   const language = useLanguage()
   const closeTab = (event: MouseEvent) => {
@@ -348,7 +337,6 @@ export function DraftTabItem(props: {
       ref={(el) => forwardTabRef(props.ref, el)}
       data-titlebar-tab
       data-slot="titlebar-tab-item"
-      data-orientation={props.orientation ?? "horizontal"}
       data-active={props.active}
       data-dragging={props.dragging}
       data-state={props.active || props.pressed ? "pressed" : undefined}

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

@@ -8,7 +8,6 @@
   z-index: 50;
   box-sizing: border-box;
   width: 256px;
-  max-width: calc(100dvw - 24px);
   display: flex;
   flex-direction: column;
   gap: 6px;

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

@@ -1,10 +1,9 @@
 import { HoverCard } from "@kobalte/core/hover-card"
 import { createSignal, Show, type JSXElement } from "solid-js"
-import { useLanguage } from "@/runtime/i18n/language"
 import "./tab-popover.css"
 
 // Initial hover delay before the preview appears, per design.
-const OPEN_DELAY = 750
+const OPEN_DELAY = 2_000
 // Mouse-out delay: begin closing immediately (a brief exit animation plays).
 const CLOSE_DELAY = 0
 // After a preview closes, hovering a neighbouring tab within this window skips
@@ -25,9 +24,7 @@ export function TabPreviewPopover(props: {
   open: boolean
   onOpenChange: (open: boolean) => void
   data: TabPreviewData
-  orientation?: "horizontal" | "vertical"
 }) {
-  const language = useLanguage()
   let triggerEl: HTMLDivElement | undefined
   // When opened during a rapid tab-hopping streak, this preview appears and
   // disappears instantly (no repeated enter/exit animation) — only the first,
@@ -53,13 +50,7 @@ export function TabPreviewPopover(props: {
       // The preview is non-interactive (pointer-events: none), so there is no
       // safe area to traverse — leaving the tab hides it immediately.
       ignoreSafeArea
-      placement={
-        props.orientation === "vertical"
-          ? language.direction() === "rtl"
-            ? "left-start"
-            : "right-start"
-          : "bottom-start"
-      }
+      placement="bottom-start"
       gutter={6}
     >
       <HoverCard.Trigger ref={triggerEl} as="div" data-component="session-tab-popover-trigger" tabIndex={-1}>

packages/app/src/shell/titlebar/tab-strip.tsx

@@ -4,7 +4,7 @@ import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { DragDropProvider, PointerSensor } from "@dnd-kit/solid"
 import { isSortable, useSortable } from "@dnd-kit/solid/sortable"
 import { Accessibility, AutoScroller, Feedback, PointerActivationConstraints } from "@dnd-kit/dom"
-import { RestrictToHorizontalAxis, RestrictToVerticalAxis } from "@dnd-kit/abstract/modifiers"
+import { RestrictToHorizontalAxis } from "@dnd-kit/abstract/modifiers"
 import { RestrictToElement } from "@dnd-kit/dom/modifiers"
 import { arrayMove } from "@dnd-kit/helpers"
 import { tabHref, tabKey, type SessionTab, type Tab } from "@/shell/tabs/tabs"
@@ -27,7 +27,6 @@ function SessionTabSlot(props: {
   index: number
   active: boolean
   forceTruncate: boolean
-  orientation: "horizontal" | "vertical"
   session: SessionInfo | undefined
   fallbackTitle?: string
   onRename: (title: string) => Promise<void>
@@ -50,12 +49,7 @@ function SessionTabSlot(props: {
       data-titlebar-tab-slot
       data-tab-key={props.id}
       data-active={props.active}
-      data-orientation={props.orientation}
-      class="relative flex"
-      classList={{
-        "w-56 min-w-7 max-w-56 flex-shrink": props.orientation === "horizontal",
-        "w-full shrink-0": props.orientation === "vertical",
-      }}
+      class="relative flex w-56 min-w-7 max-w-56 flex-shrink"
     >
       <TabNavItem
         ref={(el) => {
@@ -71,7 +65,6 @@ function SessionTabSlot(props: {
         active={props.active}
         forceTruncate={props.forceTruncate}
         dragging={sortable.isDragSource()}
-        orientation={props.orientation}
       />
     </div>
   )
@@ -83,7 +76,6 @@ function SessionTabEntry(props: {
   index: number
   active: boolean
   forceTruncate: boolean
-  orientation: "horizontal" | "vertical"
   serverCtx: ServerCtx | undefined
   onVisibleChange: (visible: boolean) => void
   onNavigate: (element: HTMLDivElement) => void
@@ -168,7 +160,6 @@ function SessionTabEntry(props: {
         index={props.index}
         active={props.active}
         forceTruncate={props.forceTruncate}
-        orientation={props.orientation}
         session={session()}
         fallbackTitle={persisted()?.title ?? (missingSession() ? language.t("session.tab.unknown") : undefined)}
         onRename={rename}
@@ -184,7 +175,6 @@ function DraftTabSlot(props: {
   id: string
   index: number
   active: boolean
-  orientation: "horizontal" | "vertical"
   title: string
   onNavigate: (element: HTMLDivElement) => void
   onClose: () => void
@@ -205,12 +195,7 @@ function DraftTabSlot(props: {
       data-titlebar-tab-slot
       data-tab-key={props.id}
       data-active={props.active}
-      data-orientation={props.orientation}
-      class="relative flex"
-      classList={{
-        "w-56 min-w-7 max-w-56 flex-shrink": props.orientation === "horizontal",
-        "w-full shrink-0": props.orientation === "vertical",
-      }}
+      class="relative flex w-56 min-w-7 max-w-56 flex-shrink"
     >
       <DraftTabItem
         ref={(el) => {
@@ -222,14 +207,12 @@ function DraftTabSlot(props: {
         onClose={props.onClose}
         active={props.active}
         dragging={sortable.isDragSource()}
-        orientation={props.orientation}
       />
     </div>
   )
 }
 
 export function TitlebarTabStrip(props: {
-  orientation?: "horizontal" | "vertical"
   tabs: Tab[]
   currentTab: Tab | undefined
   forceTruncate: boolean
@@ -241,7 +224,6 @@ export function TitlebarTabStrip(props: {
   const global = useGlobal()
   const language = useLanguage()
   const command = useCommand()
-  const vertical = () => props.orientation === "vertical"
   let scrollRef!: HTMLDivElement
   let listRef!: HTMLDivElement
   let resizeFrame: number | undefined
@@ -277,9 +259,7 @@ export function TitlebarTabStrip(props: {
 
   function refreshOverflow() {
     if (!scrollRef) return
-    props.onOverflowChange(
-      vertical() ? scrollRef.scrollHeight > scrollRef.clientHeight : scrollRef.scrollWidth > scrollRef.clientWidth,
-    )
+    props.onOverflowChange(scrollRef.scrollWidth > scrollRef.clientWidth)
   }
 
   createResizeObserver(
@@ -308,19 +288,10 @@ export function TitlebarTabStrip(props: {
   })
 
   return (
-    <div
-      data-slot={vertical() ? "vertical-tabs" : "titlebar-tabs"}
-      data-orientation={vertical() ? "vertical" : "horizontal"}
-      class="relative min-w-0"
-      classList={{ "min-h-0 overflow-hidden": vertical() }}
-    >
+    <div data-slot="titlebar-tabs" class="relative min-w-0">
       <div
-        data-slot={vertical() ? "vertical-tabs-scroll" : "titlebar-tabs-scroll"}
-        class="flex min-w-0 no-scrollbar [app-region:no-drag]"
-        classList={{
-          "flex-row items-center gap-1.5 overflow-x-auto": !vertical(),
-          "max-h-full flex-col overflow-y-auto overflow-x-hidden": vertical(),
-        }}
+        data-slot="titlebar-tabs-scroll"
+        class="flex min-w-0 flex-row items-center gap-1.5 overflow-x-auto no-scrollbar [app-region:no-drag]"
         ref={scrollRef}
       >
         <DragDropProvider
@@ -333,13 +304,10 @@ export function TitlebarTabStrip(props: {
                 (event.target instanceof Element && !!event.target.closest('[contenteditable="true"]')),
             }),
           ]}
-          modifiers={[
-            vertical() ? RestrictToVerticalAxis : RestrictToHorizontalAxis,
-            RestrictToElement.configure({ element: () => listRef }),
-          ]}
+          modifiers={[RestrictToHorizontalAxis, RestrictToElement.configure({ element: () => listRef })]}
           plugins={(defaults) => [
             ...defaults.filter((plugin) => plugin !== Accessibility),
-            AutoScroller.configure({ acceleration: 8, threshold: vertical() ? { x: 0, y: 0.05 } : { x: 0.05, y: 0 } }),
+            AutoScroller.configure({ acceleration: 8, threshold: { x: 0.05, y: 0 } }),
             Feedback.configure({ dropAnimation: null }),
           ]}
           onDragStart={(event) => {
@@ -367,13 +335,7 @@ export function TitlebarTabStrip(props: {
             }
           }}
         >
-          <div
-            data-titlebar-tab-list
-            data-orientation={vertical() ? "vertical" : "horizontal"}
-            class="flex w-full min-w-0"
-            classList={{ "flex-row items-center": !vertical(), "flex-col items-stretch": vertical() }}
-            ref={listRef}
-          >
+          <div data-titlebar-tab-list class="flex w-full min-w-0 flex-row items-center" ref={listRef}>
             <For each={props.tabs}>
               {(tab) => {
                 const id = tabKey(tab)
@@ -393,7 +355,6 @@ export function TitlebarTabStrip(props: {
                       index={visibleIndex()}
                       active={props.currentTab === tab}
                       forceTruncate={props.forceTruncate}
-                      orientation={vertical() ? "vertical" : "horizontal"}
                       serverCtx={serverCtx()}
                       onVisibleChange={(visible) => setVisibility(id, visible)}
                       onNavigate={(element) => {
@@ -411,7 +372,6 @@ export function TitlebarTabStrip(props: {
                     id={id}
                     index={visibleIndex()}
                     active={props.currentTab === tab}
-                    orientation={vertical() ? "vertical" : "horizontal"}
                     title={language.t("command.session.new")}
                     onNavigate={(element) => {
                       ref = element
@@ -425,18 +385,16 @@ export function TitlebarTabStrip(props: {
           </div>
         </DragDropProvider>
       </div>
-      <Show when={!vertical()}>
-        <div
-          data-slot="titlebar-tabs-fade-left"
-          aria-hidden="true"
-          class="pointer-events-none absolute inset-y-0 left-0 z-10 w-6 bg-[linear-gradient(to_right,var(--v2-background-bg-deep),transparent)]"
-        />
-        <div
-          data-slot="titlebar-tabs-fade-right"
-          aria-hidden="true"
-          class="pointer-events-none absolute inset-y-0 right-0 z-10 w-6 bg-[linear-gradient(to_left,var(--v2-background-bg-deep),transparent)]"
-        />
-      </Show>
+      <div
+        data-slot="titlebar-tabs-fade-left"
+        aria-hidden="true"
+        class="pointer-events-none absolute inset-y-0 left-0 z-10 w-6 bg-[linear-gradient(to_right,var(--v2-background-bg-deep),transparent)]"
+      />
+      <div
+        data-slot="titlebar-tabs-fade-right"
+        aria-hidden="true"
+        class="pointer-events-none absolute inset-y-0 right-0 z-10 w-6 bg-[linear-gradient(to_left,var(--v2-background-bg-deep),transparent)]"
+      />
     </div>
   )
 }

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

@@ -1,6 +1,5 @@
 import { createEffect, createMemo, createResource, Match, createSignal, Show, Switch, untrack } from "solid-js"
 import { createStore } from "solid-js/store"
-import { Portal } from "solid-js/web"
 import { useLocation, useNavigate } from "@solidjs/router"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -37,11 +36,7 @@ export type TitlebarUpdate = {
   install: () => void
 }
 
-export function Titlebar(props: {
-  update?: TitlebarUpdate
-  debugTools?: { visible: boolean; toggle: () => void }
-  verticalTabs?: { mount?: HTMLElement }
-}) {
+export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visible: boolean; toggle: () => void } }) {
   const platform = usePlatform()
   const command = useCommand()
   const language = useLanguage()
@@ -59,7 +54,7 @@ export function Titlebar(props: {
   const titlebarZoom = () => (windows() ? Math.max(zoom(), minTitlebarZoom) : zoom())
   const minHeight = () => {
     if (mac()) return `${titlebarHeight / zoom()}px`
-    if (windows()) return `env(titlebar-area-height, ${titlebarHeight / Math.min(titlebarZoom(), 1)}px)`
+    if (windows()) return `${titlebarHeight / Math.min(titlebarZoom(), 1)}px`
     return undefined
   }
   const windowsControlsWidth = () => `${windowsControlsBaseWidth / Math.max(titlebarZoom(), 1)}px`
@@ -329,7 +324,7 @@ export function Titlebar(props: {
               <div
                 class="h-full flex-1 overflow-hidden flex flex-row items-center gap-1.5 px-2 md:pr-3"
                 classList={{
-                  "pt-2": !bottom() && !windows(),
+                  "pt-2": !bottom(),
                   "pb-2": bottom(),
                   "md:pl-2": macTrafficLights(),
                   "md:pl-4": !macTrafficLights(),
@@ -362,82 +357,40 @@ export function Titlebar(props: {
                   />
                 </Tooltip>
 
-                <Show
-                  when={props.verticalTabs}
-                  fallback={
+                <TitlebarTabStrip
+                  tabs={tabsStore}
+                  currentTab={currentTab()}
+                  forceTruncate={tabsAreOverflowing()}
+                  onOverflowChange={setTabsAreOverflowing}
+                  onNavigate={(tab, el) => {
+                    tabs.select(tab)
+                    el?.scrollIntoView({ behavior: "instant" })
+                  }}
+                  onClose={(tab) => {
+                    const index = tabsStore.findIndex((item) => tabKey(item) === tabKey(tab))
+                    if (index !== -1) tabsStoreActions.closeTab(index)
+                  }}
+                  onReorder={(keys) => tabsStoreActions.reorder(keys)}
+                />
+                <Tooltip
+                  placement="bottom"
+                  value={
                     <>
-                      <TitlebarTabStrip
-                        tabs={tabsStore}
-                        currentTab={currentTab()}
-                        forceTruncate={tabsAreOverflowing()}
-                        onOverflowChange={setTabsAreOverflowing}
-                        onNavigate={(tab, el) => {
-                          tabs.select(tab)
-                          el?.scrollIntoView({ behavior: "instant" })
-                        }}
-                        onClose={(tab) => {
-                          const index = tabsStore.findIndex((item) => tabKey(item) === tabKey(tab))
-                          if (index !== -1) tabsStoreActions.closeTab(index)
-                        }}
-                        onReorder={(keys) => tabsStoreActions.reorder(keys)}
-                      />
-                      <Tooltip
-                        placement="bottom"
-                        value={
-                          <>
-                            {language.t("command.session.new")}
-                            <Keybind keys={newTabTooltipKeybind(command)} variant="neutral" />
-                          </>
-                        }
-                      >
-                        <IconButton
-                          type="button"
-                          variant="ghost-muted"
-                          size="large"
-                          class="shrink-0"
-                          icon={<Icon name="plus" />}
-                          onClick={openNewTab}
-                          aria-label={language.t("command.session.new")}
-                        />
-                      </Tooltip>
+                      {language.t("command.session.new")}
+                      <Keybind keys={newTabTooltipKeybind(command)} variant="neutral" />
                     </>
                   }
                 >
-                  {(vertical) => (
-                    <Show when={vertical().mount} keyed>
-                      {(mount) => (
-                        <Portal mount={mount}>
-                          <TitlebarTabStrip
-                            orientation="vertical"
-                            tabs={tabsStore}
-                            currentTab={currentTab()}
-                            forceTruncate={false}
-                            onOverflowChange={setTabsAreOverflowing}
-                            onNavigate={(tab, el) => {
-                              tabs.select(tab)
-                              el?.scrollIntoView({ behavior: "instant", block: "nearest" })
-                            }}
-                            onClose={(tab) => {
-                              const index = tabsStore.findIndex((item) => tabKey(item) === tabKey(tab))
-                              if (index !== -1) tabsStoreActions.closeTab(index)
-                            }}
-                            onReorder={(keys) => tabsStoreActions.reorder(keys)}
-                          />
-                          <button
-                            type="button"
-                            data-action="vertical-tabs-new-session"
-                            class="mt-1 flex h-7 w-full shrink-0 items-center gap-1.5 rounded-[6px] px-1.5 text-[13px] leading-4 text-v2-text-text-faint hover:bg-v2-background-bg-layer-02 hover:text-v2-text-text-base"
-                            onClick={openNewTab}
-                            aria-label={language.t("command.session.new")}
-                          >
-                            <Icon name="plus" />
-                            {language.t("command.session.new")}
-                          </button>
-                        </Portal>
-                      )}
-                    </Show>
-                  )}
-                </Show>
+                  <IconButton
+                    type="button"
+                    variant="ghost-muted"
+                    size="large"
+                    class="shrink-0"
+                    icon={<Icon name="plus" />}
+                    onClick={openNewTab}
+                    aria-label={language.t("command.session.new")}
+                  />
+                </Tooltip>
                 <div class="flex-1" />
                 <TitlebarRight state={rightState()} />
               </div>

packages/app/src/workspaces/paths.test.ts

@@ -8,7 +8,6 @@ import {
   mergeWorkspaceSessionInventory,
   sessionsForWorkspace,
   workspaceInventory,
-  workspaceSelectionDestination,
 } from "./paths"
 
 describe("isWorkspaceDirectory", () => {
@@ -42,19 +41,6 @@ describe("isWorkspaceSelection", () => {
   })
 })
 
-describe("workspaceSelectionDestination", () => {
-  test("preserves local intent for the main selection and project root", () => {
-    expect(workspaceSelectionDestination("main", "/repo")).toBe("main")
-    expect(workspaceSelectionDestination("/repo/", "/repo")).toBe("main")
-    expect(workspaceSelectionDestination("c:\\repo\\", "C:\\repo")).toBe("main")
-  })
-
-  test("preserves workspace intent without carrying project-specific paths", () => {
-    expect(workspaceSelectionDestination("create", "/repo")).toBe("create")
-    expect(workspaceSelectionDestination("/workspaces/feature", "/repo")).toBe("create")
-  })
-})
-
 test("groups and filters workspace inventory by project", () => {
   const inventory = workspaceInventory([
     {

packages/app/src/workspaces/paths.ts

@@ -106,10 +106,6 @@ export function isWorkspaceSelection(project: WorkspaceProject | undefined, sele
   return isWorkspaceDirectory(project, selection)
 }
 
-export function workspaceSelectionDestination(selection: string, projectWorktree: string) {
-  return selection === "main" || sameDirectory(selection, projectWorktree) ? "main" : "create"
-}
-
 export function workspaceDefaultSelection(
   setting: WorkspaceDefaultDestination,
   lastUsed: WorkspaceLastUsed | undefined,

packages/app/src/workspaces/setup.test.ts

@@ -0,0 +1,25 @@
+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)
+  })
+})

packages/app/src/workspaces/setup.ts

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

packages/client/src/promise/generated/types.ts

@@ -293,7 +293,7 @@ export type McpResourceTemplate = {
   mimeType?: string
 }
 
-export type ProjectVcs = string
+export type ProjectVcs = "git" | "hg"
 
 export type ProjectIcon = { url?: string; override?: string; color?: string }
 
@@ -964,7 +964,7 @@ export type WorktreeUpdated = {
   metadata?: { [x: string]: any }
   type: "worktree.updated"
   location?: LocationRef
-  data: { projectID: string }
+  data: { projectID: string; directory?: 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; adopted?: Array<string> }
+  data: { projectID: string; directory: string; previous: string }
 }
 
 export type CommandUpdated = {

packages/client/src/solid/data.ts

@@ -617,22 +617,7 @@ export function createData(config: CreateDataInput) {
       }
       case "worktree.resolved": {
         for (const [sessionID, info] of Object.entries(store.session.info)) {
-          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,
-          )
+          const adopted = Worktree.adopt({ projectID: info.projectID, directory: info.location.directory }, event.data)
           if (!adopted) continue
           setStore("session", "info", sessionID, "projectID", adopted.projectID)
           setStore("session", "info", sessionID, "subpath", adopted.subpath)

packages/client/test/solid-data.test.ts

@@ -154,106 +154,6 @@ 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[] = []

packages/client/test/worktree.test.ts

@@ -1,80 +0,0 @@
-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" })
-  })
-})

packages/core/package.json

@@ -103,6 +103,7 @@
     "@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",

packages/core/src/aisdk-native.ts

@@ -54,10 +54,9 @@ 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.slice("@ai-sdk/".length)}`,
+        package: `@opencode-ai/ai/providers/${input.packageName === "@ai-sdk/cerebras" ? "cerebras" : "togetherai"}`,
         settings: {
           ...baseSettings,
           ...mapAPIKey(input.settings),

packages/core/src/config/plugin/source.ts

@@ -4,13 +4,12 @@ import { Directory, Document, type Entry } from "@opencode-ai/schema/config"
 import { ConfigPlugin } from "@opencode-ai/schema/config/plugin"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
-import { Context, Effect, Layer, Option, PubSub, Scope, Stream } from "effect"
+import { Context, Effect, Layer, Option, Predicate, PubSub, Schema, Scope, Stream } from "effect"
 import path from "path"
 import { fileURLToPath } from "url"
 import { Config } from "../../config.js"
 import { Watcher } from "../../filesystem/watcher.js"
 import { Location } from "../../location.js"
-import { PluginSourceDirectory } from "../../plugin/source-directory.js"
 
 export type Operation =
   | {
@@ -125,10 +124,7 @@ const scan = Effect.fn("ConfigPluginSource.scan")(function* (
 ) {
   const discovered = yield* Effect.forEach(
     entries.filter((entry): entry is Directory => entry.type === "directory"),
-    (entry) =>
-      PluginSourceDirectory.discover(fs, entry.path).pipe(
-        Effect.map((targets) => targets.map((target): Operation => ({ type: "add", target, options: {} }))),
-      ),
+    (entry) => discoverDirectory(fs, entry.path),
   ).pipe(Effect.map((items) => items.flat()))
   const configured = entries
     .filter((entry): entry is Document => entry.type === "document")
@@ -157,10 +153,75 @@ const scan = Effect.fn("ConfigPluginSource.scan")(function* (
   })
 })
 
+const sourceDirectories = ["plugin", "plugins"] as const
+const Package = Schema.Struct({
+  exports: Schema.optional(Schema.Unknown),
+  module: Schema.optional(Schema.Unknown),
+  main: Schema.optional(Schema.Unknown),
+})
+const decodePackage = Schema.decodeUnknownOption(Package)
+
+function discoverDirectory(fs: FSUtil.Interface, directory: string) {
+  return Effect.gen(function* () {
+    const children = (yield* Effect.forEach(sourceDirectories, (source) =>
+      fs.readDirectoryEntries(path.join(directory, source)).pipe(
+        Effect.orElseSucceed(() => []),
+        Effect.map((entries) =>
+          entries.map((entry) => ({ ...entry, target: path.join(directory, source, entry.name) })),
+        ),
+      ),
+    ))
+      .flat()
+      .sort((a, b) => (a.target < b.target ? -1 : a.target > b.target ? 1 : 0))
+    const targets = yield* Effect.forEach(children, (entry) => discoverChild(fs, entry))
+    return targets.flatMap(Option.toArray).map((target): Operation => ({ type: "add", target, options: {} }))
+  })
+}
+
+function discoverChild(fs: FSUtil.Interface, entry: FSUtil.DirEntry & { target: string }) {
+  return Effect.gen(function* () {
+    const source = entry.target.endsWith(".ts") || entry.target.endsWith(".js")
+    if (entry.type === "file" && source) return Option.some(entry.target)
+    if (entry.type === "directory") return yield* discoverPackage(fs, entry.target)
+    if (entry.type !== "symlink") return Option.none<string>()
+    if (source && (yield* fs.isFile(entry.target))) return Option.some(entry.target)
+    if (yield* fs.isDir(entry.target)) return yield* discoverPackage(fs, entry.target)
+    return Option.none<string>()
+  })
+}
+
+function discoverPackage(fs: FSUtil.Interface, directory: string) {
+  return Effect.gen(function* () {
+    const root = yield* fs.resolve(directory)
+    const manifest = yield* fs
+      .readJson(path.join(directory, "package.json"))
+      .pipe(Effect.map(decodePackage), Effect.orElseSucceed(Option.none))
+    const configured = Option.isSome(manifest)
+      ? [manifest.value.exports, manifest.value.module, manifest.value.main].filter(Predicate.isString)
+      : []
+    return yield* Effect.findFirst(
+      [...configured, "index.ts", "index.js"]
+        .filter((entry) => !path.isAbsolute(entry))
+        .map((entry) => path.resolve(directory, entry))
+        .filter((entry) => FSUtil.contains(directory, entry)),
+      (entry) =>
+        fs
+          .isFile(entry)
+          .pipe(
+            Effect.flatMap((exists) =>
+              exists
+                ? fs.resolve(entry).pipe(Effect.map((resolved) => FSUtil.contains(root, resolved)))
+                : Effect.succeed(false),
+            ),
+          ),
+    )
+  })
+}
+
 function isPluginSource(entries: readonly Entry[], file: string) {
   return entries.some(
     (entry) =>
       entry.type === "directory" &&
-      PluginSourceDirectory.names.some((directory) => FSUtil.contains(path.join(entry.path, directory), file)),
+      sourceDirectories.some((directory) => FSUtil.contains(path.join(entry.path, directory), file)),
   )
 }

packages/core/src/location-mutation.ts

@@ -6,7 +6,6 @@ import { Context, Effect, Layer, Schema } from "effect"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "./location.js"
 import { Project } from "./project.js"
-import { ProjectMarkers } from "./project/markers.js"
 import { AbsolutePath } from "./schema.js"
 
 export const Kind = Schema.Literals(["file", "directory"])
@@ -65,7 +64,6 @@ const layer = Layer.effect(
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
     const location = yield* Location.Service
-    const markers = yield* ProjectMarkers.Service
 
     const resolve = Effect.fnUntraced(function* (input: ResolveInput) {
       const absolute = path.resolve(location.directory, input.path)
@@ -92,10 +90,7 @@ const layer = Layer.effect(
           directory: externalDirectory,
           resource: externalResource,
           save: slash(
-            path.join(
-              (yield* Project.root(fs, AbsolutePath.make(externalDirectory), markers.targets())) ?? externalDirectory,
-              "*",
-            ),
+            path.join((yield* Project.root(fs, AbsolutePath.make(externalDirectory))) ?? externalDirectory, "*"),
           ),
         },
       } satisfies Target
@@ -108,5 +103,5 @@ const layer = Layer.effect(
 export const node = makeLocationNode({
   service: Service,
   layer: layer.pipe(Layer.orDie),
-  deps: [FSUtil.node, Location.node, ProjectMarkers.node],
+  deps: [FSUtil.node, Location.node],
 })

packages/core/src/location.ts

@@ -10,7 +10,6 @@ export { Info, Ref, response }
 
 export interface Interface extends Info {
   readonly vcs?: Project.Vcs
-  readonly vcsBackend?: string
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/Location") {}
@@ -28,7 +27,6 @@ const layer = (ref: Ref) =>
         workspaceID: ref.workspaceID,
         project: { id: resolved.id, directory: resolved.directory, canonical: resolved.canonical },
         vcs: resolved.vcs,
-        vcsBackend: resolved.vcsBackend,
       })
     }),
   )

packages/core/src/model-resolver.ts

@@ -334,7 +334,6 @@ 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" ||
@@ -346,7 +345,6 @@ 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" ||

packages/core/src/plugin/host.ts

@@ -442,7 +442,6 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p
       generate: (input) => runtime.session.generate(input).pipe(Effect.map((text) => ({ text }))),
       command: runtime.session.command,
       rename: runtime.session.rename,
-      move: runtime.session.move,
       synthetic: runtime.session.synthetic,
       interrupt: (input) =>
         runtime.session

packages/core/src/plugin/internal.ts

@@ -287,7 +287,6 @@ export const list = Effect.fn("PluginInternal.list")(function* () {
     plugins.map(
       (plugin): Plugin => ({
         id: plugin.id,
-        vcs: plugin.vcs,
         effect: (host) => plugin.effect(host).pipe(Effect.provide(context)),
       }),
     )

packages/core/src/plugin/module.ts

@@ -1,62 +0,0 @@
-export * as PluginModule from "./module.js"
-
-import type { Plugin } from "@opencode-ai/plugin/effect/plugin"
-import { Npm } from "@opencode-ai/util/npm"
-import { importModule } from "@opencode-ai/util/runtime-import"
-import { Effect, Schema } from "effect"
-import path from "path"
-import { pathToFileURL } from "url"
-import type { ConfigPluginSource } from "../config/plugin/source.js"
-import type { Versioned } from "../plugin.js"
-import { PluginPromise } from "./promise.js"
-
-const Discovery = Schema.Struct({
-  id: Schema.optional(Schema.String),
-  markers: Schema.Array(Schema.String),
-})
-
-const Definition = Schema.Struct({
-  default: Schema.Union([
-    Schema.Struct({
-      id: Schema.String,
-      tui: Schema.optional(Schema.Boolean),
-      vcs: Schema.optional(Discovery),
-      effect: Schema.declare<Plugin["effect"]>((input): input is Plugin["effect"] => typeof input === "function"),
-    }),
-    Schema.Struct({
-      id: Schema.String,
-      tui: Schema.optional(Schema.Boolean),
-      vcs: Schema.optional(Discovery),
-      setup: Schema.declare<Parameters<typeof PluginPromise.fromPromise>[0]["setup"]>(
-        (input): input is Parameters<typeof PluginPromise.fromPromise>[0]["setup"] => typeof input === "function",
-      ),
-    }),
-  ]),
-})
-
-export const load = Effect.fn("PluginModule.load")(function* (
-  operation: Extract<ConfigPluginSource.Operation, { type: "add" }>,
-) {
-  const npm = yield* Npm.Service
-  const entrypoint = path.isAbsolute(operation.target)
-    ? pathToFileURL(operation.target).href
-    : (yield* npm.add(operation.target, { subpaths: ["server", ""], refresh: true })).entrypoint
-  if (!entrypoint) return yield* Effect.fail(new Error(`Plugin entrypoint not found: ${operation.target}`))
-  // Bun currently ignores query parameters when caching file:// imports.
-  const target = typeof Bun !== "undefined" ? operation.target.replaceAll("\\", "/") : entrypoint
-  const source = operation.mtime === undefined ? entrypoint : `${target}?mtime=${operation.mtime}`
-  yield* Effect.log({ msg: "loading plugin", id: operation.target, entrypoint: source })
-  const mod = yield* Effect.promise(() => importModule(source))
-  const value = (yield* Schema.decodeUnknownEffect(Definition)(mod)).default
-  const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
-  return {
-    id: plugin.id,
-    tui: plugin.tui,
-    vcs: plugin.vcs,
-    version: JSON.stringify(operation),
-    source: path.isAbsolute(operation.target)
-      ? { type: "local" as const, path: operation.target }
-      : { type: "package" as const, package: operation.target },
-    effect: (host) => plugin.effect({ ...host, options: operation.options }),
-  } satisfies Versioned
-})

packages/core/src/plugin/provider.ts

@@ -6,6 +6,7 @@ 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"
@@ -41,6 +42,7 @@ export const ProviderPlugins: PluginInternal.InternalPlugin[] = [
   CloudflareAIGatewayPlugin,
   CloudflareWorkersAIPlugin,
   CoherePlugin,
+  DeepInfraPlugin,
   GatewayPlugin,
   GithubCopilotPlugin,
   GitLabPlugin,

packages/core/src/plugin/provider/deepinfra.ts

@@ -0,0 +1,10 @@
+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)
+  },
+})

packages/core/src/plugin/runtime.ts

@@ -20,7 +20,6 @@ export interface Interface {
     | "generate"
     | "command"
     | "rename"
-    | "move"
     | "resume"
     | "switchAgent"
     | "switchModel"
@@ -77,7 +76,6 @@ export const layerWithCell = (cell: Cell) =>
         generate: (input) => require(cell, (runtime) => runtime.session.generate(input)),
         command: (input) => require(cell, (runtime) => runtime.session.command(input)),
         rename: (input) => require(cell, (runtime) => runtime.session.rename(input)),
-        move: (input) => require(cell, (runtime) => runtime.session.move(input)),
         resume: (sessionID) => require(cell, (runtime) => runtime.session.resume(sessionID)),
         switchAgent: (input) => require(cell, (runtime) => runtime.session.switchAgent(input)),
         switchModel: (input) => require(cell, (runtime) => runtime.session.switchModel(input)),

packages/core/src/plugin/source-directory.ts

@@ -1,68 +0,0 @@
-export * as PluginSourceDirectory from "./source-directory.js"
-
-import { FSUtil } from "@opencode-ai/util/fs-util"
-import { Effect, Option, Predicate, Schema } from "effect"
-import path from "path"
-
-export const names = ["plugin", "plugins"] as const
-
-const Package = Schema.Struct({
-  exports: Schema.optional(Schema.Unknown),
-  module: Schema.optional(Schema.Unknown),
-  main: Schema.optional(Schema.Unknown),
-})
-const decodePackage = Schema.decodeUnknownOption(Package)
-
-export const discover = Effect.fn("PluginSourceDirectory.discover")(function* (
-  fs: FSUtil.Interface,
-  directory: string,
-) {
-  const children = (yield* Effect.forEach(names, (source) =>
-    fs.readDirectoryEntries(path.join(directory, source)).pipe(
-      Effect.orElseSucceed(() => []),
-      Effect.map((entries) => entries.map((entry) => ({ ...entry, target: path.join(directory, source, entry.name) }))),
-    ),
-  ))
-    .flat()
-    .sort((a, b) => (a.target < b.target ? -1 : a.target > b.target ? 1 : 0))
-  const targets = yield* Effect.forEach(children, (entry) =>
-    Effect.gen(function* () {
-      const source = entry.target.endsWith(".ts") || entry.target.endsWith(".js")
-      if (entry.type === "file" && source) return Option.some(entry.target)
-      if (entry.type === "directory") return yield* packageEntry(fs, entry.target)
-      if (entry.type !== "symlink") return Option.none<string>()
-      if (source && (yield* fs.isFile(entry.target))) return Option.some(entry.target)
-      if (yield* fs.isDir(entry.target)) return yield* packageEntry(fs, entry.target)
-      return Option.none<string>()
-    }),
-  )
-  return targets.flatMap(Option.toArray)
-})
-
-function packageEntry(fs: FSUtil.Interface, directory: string) {
-  return Effect.gen(function* () {
-    const root = yield* fs.resolve(directory)
-    const manifest = yield* fs
-      .readJson(path.join(directory, "package.json"))
-      .pipe(Effect.map(decodePackage), Effect.orElseSucceed(Option.none))
-    const configured = Option.isSome(manifest)
-      ? [manifest.value.exports, manifest.value.module, manifest.value.main].filter(Predicate.isString)
-      : []
-    return yield* Effect.findFirst(
-      [...configured, "index.ts", "index.js"]
-        .filter((entry) => !path.isAbsolute(entry))
-        .map((entry) => path.resolve(directory, entry))
-        .filter((entry) => FSUtil.contains(directory, entry)),
-      (entry) =>
-        fs
-          .isFile(entry)
-          .pipe(
-            Effect.flatMap((exists) =>
-              exists
-                ? fs.resolve(entry).pipe(Effect.map((resolved) => FSUtil.contains(root, resolved)))
-                : Effect.succeed(false),
-            ),
-          ),
-    )
-  })
-}

packages/core/src/plugin/supervisor.ts

@@ -1,19 +1,41 @@
 export * as PluginSupervisor from "./supervisor.js"
 export { Service, type Interface } from "./supervisor-service.js"
 
+import type { Plugin as PluginDefinition } from "@opencode-ai/plugin/effect/plugin"
 import { Event } from "@opencode-ai/schema/config"
-import { Cause, Effect, Latch, Layer, Stream } from "effect"
+import { Cause, Effect, Latch, Layer, Schema, Stream } from "effect"
 import path from "path"
+import { pathToFileURL } from "url"
 import { ConfigPluginSource } from "../config/plugin/source.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { Bus } from "../bus.js"
 import { Npm } from "@opencode-ai/util/npm"
 import { Plugin } from "../plugin.js"
+import { PluginPromise } from "../plugin/promise.js"
 import { PluginInternal } from "./internal.js"
-import { PluginModule } from "./module.js"
 import { SdkPlugins } from "./sdk.js"
+import { importModule } from "@opencode-ai/util/runtime-import"
 import { Service } from "./supervisor-service.js"
 
+const PluginModule = Schema.Struct({
+  default: Schema.Union([
+    Schema.Struct({
+      id: Schema.String,
+      tui: Schema.optional(Schema.Boolean),
+      effect: Schema.declare<PluginDefinition["effect"]>(
+        (input): input is PluginDefinition["effect"] => typeof input === "function",
+      ),
+    }),
+    Schema.Struct({
+      id: Schema.String,
+      tui: Schema.optional(Schema.Boolean),
+      setup: Schema.declare<Parameters<typeof PluginPromise.fromPromise>[0]["setup"]>(
+        (input): input is Parameters<typeof PluginPromise.fromPromise>[0]["setup"] => typeof input === "function",
+      ),
+    }),
+  ]),
+})
+
 const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
   pre: readonly Plugin.Versioned[],
   post: readonly Plugin.Versioned[],
@@ -47,7 +69,7 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
       continue
     }
 
-    const plugin = yield* PluginModule.load(operation).pipe(
+    const plugin = yield* load(operation).pipe(
       Effect.catchCause((cause) =>
         Effect.logWarning("failed to load plugin", { target: operation.target, cause }).pipe(
           Effect.as({ error: Cause.pretty(cause) }),
@@ -80,6 +102,34 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
   }
 })
 
+const load = Effect.fn("PluginSupervisor.load")(function* (
+  operation: Extract<ConfigPluginSource.Operation, { type: "add" }>,
+) {
+  const npm = yield* Npm.Service
+  const entrypoint = path.isAbsolute(operation.target)
+    ? pathToFileURL(operation.target).href
+    : (yield* npm.add(operation.target, { subpaths: ["server", ""], refresh: true })).entrypoint
+  if (!entrypoint) return yield* Effect.fail(new Error(`Plugin entrypoint not found: ${operation.target}`))
+  // Bun currently ignores query parameters when caching file:// imports.
+  const source =
+    operation.mtime === undefined
+      ? entrypoint
+      : typeof Bun !== "undefined"
+        ? `${operation.target.replaceAll("\\", "/")}?mtime=${operation.mtime}`
+        : `${entrypoint}?mtime=${operation.mtime}`
+  yield* Effect.log({ msg: "loading plugin", id: operation.target, entrypoint: source })
+  const mod = yield* Effect.promise(() => importModule(source))
+  const value = (yield* Schema.decodeUnknownEffect(PluginModule)(mod)).default
+  const plugin = "effect" in value ? value : PluginPromise.fromPromise(value)
+  return {
+    id: plugin.id,
+    tui: plugin.tui,
+    version: JSON.stringify(operation),
+    source: pluginSource(operation.target),
+    effect: (host) => plugin.effect({ ...host, options: operation.options }),
+  } satisfies Plugin.Versioned
+})
+
 export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {

packages/core/src/plugin/vcs/git.ts

@@ -8,18 +8,11 @@ import { BranchList, FileStatus, Info, Mode } from "@opencode-ai/schema/vcs"
 import { AppProcess } from "@opencode-ai/util/process"
 import { Location } from "../../location.js"
 import type { Adapter, BranchOptions, DiffOptions } from "../../vcs.js"
-import {
-  chunksByFile,
-  emptyPatch,
-  MAX_PATCH_BYTES,
-  MAX_TOTAL_PATCH_BYTES,
-  PATCH_CONTEXT_LINES,
-} from "../../vcs/patch.js"
+import { chunksByFile, emptyPatch, MAX_PATCH_BYTES, MAX_TOTAL_PATCH_BYTES, PATCH_CONTEXT_LINES } from "../../vcs/patch.js"
 import type { Patch } from "../../vcs/patch.js"
 
 export const Plugin = define({
   id: "opencode.vcs.git",
-  vcs: { id: "git", markers: [".git"] },
   effect: Effect.fn("VcsGitPlugin")(function* (ctx) {
     const location = yield* Location.Service
     if (location.vcs?.type !== "git") return

packages/core/src/plugin/vcs/hg.ts

@@ -23,7 +23,6 @@ import {
 
 export const Plugin = define({
   id: "opencode.vcs.hg",
-  vcs: { id: "hg", markers: [".hg"] },
   effect: Effect.fn("VcsHgPlugin")(function* (ctx) {
     const location = yield* Location.Service
     if (location.vcs?.type !== "hg") return

packages/core/src/project.ts

@@ -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, gte, isNull, lte } from "drizzle-orm"
+import { and, asc, desc, eq } from "drizzle-orm"
 import path from "path"
 import { AbsolutePath } from "./schema.js"
 import { Bus } from "./bus.js"
@@ -13,7 +13,6 @@ import { Git } from "./git.js"
 import { AppProcess } from "@opencode-ai/util/process"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { Hash } from "@opencode-ai/util/hash"
-import { ProjectMarkers } from "./project/markers.js"
 import { ProjectSchema } from "./project/schema.js"
 import { ProjectTable, upsertProject } from "./project/sql.js"
 import { WorktreeTable } from "./worktree/sql.js"
@@ -43,16 +42,11 @@ export interface Resolved {
   readonly directory: AbsolutePath
   readonly canonical: AbsolutePath
   readonly vcs?: Vcs
-  readonly vcsBackend?: string
 }
 
 // Keep this filesystem-only; permission checks use it and should not execute VCS commands.
-export const root = Effect.fn("Project.root")(function* (
-  fs: FSUtil.Interface,
-  input: AbsolutePath,
-  markers: readonly string[] = [".git", ".hg"],
-) {
-  return yield* fs.up({ targets: [...markers], start: input, mode: "first" }).pipe(
+export const root = Effect.fn("Project.root")(function* (fs: FSUtil.Interface, input: AbsolutePath) {
+  return yield* fs.up({ targets: [".git", ".hg"], start: input, mode: "first" }).pipe(
     Effect.map((matches) => (matches[0] ? AbsolutePath.make(path.dirname(matches[0])) : undefined)),
     Effect.orElseSucceed(() => undefined),
   )
@@ -96,7 +90,6 @@ const layer = Layer.effect(
   Effect.gen(function* () {
     const fs = yield* FSUtil.Service
     const git = yield* Git.Service
-    const markers = yield* ProjectMarkers.Service
     const proc = yield* AppProcess.Service
     const bus = yield* Bus.Service
     const db = (yield* Database.Service).db
@@ -111,12 +104,7 @@ 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
@@ -147,38 +135,9 @@ 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 found = yield* fs
-                .up({ targets: [...markers.targets()], start: candidate.directory, stop: directory, mode: "first" })
-                .pipe(Effect.orElseSucceed(() => []))
-              if (!found[0]) return false
-              return (yield* fs.resolve(path.dirname(found[0]))) === directory
-            }),
-          )
           yield* bus.publish(
             Worktree.Event.Resolved,
-            {
-              projectID: item.projectID,
-              directory: item.directory,
-              previous: project.previous ?? ID.global,
-              ...(adopted.length ? { adopted: adopted.map((candidate) => candidate.id) } : {}),
-            },
+            { projectID: item.projectID, directory: item.directory, previous: project.previous ?? ID.global },
             {
               commit: () =>
                 db
@@ -297,7 +256,12 @@ const layer = Layer.effect(
       return node ? ID.make(node) : undefined
     })
 
-    const hgDiscover = Effect.fnUntraced(function* (dotHg: AbsolutePath) {
+    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 worktree = AbsolutePath.make(path.dirname(dotHg))
       const store = AbsolutePath.make(dotHg)
       const previous = yield* cached(store)
@@ -311,17 +275,8 @@ const layer = Layer.effect(
     })
 
     const resolve = Effect.fn("Project.resolve")(function* (input: AbsolutePath) {
-      const directory = AbsolutePath.make(yield* fs.resolve(input))
-      const marker = yield* markers.discover(directory)
-      const native = yield* fs.up({ targets: [".git", ".hg"], start: directory, mode: "first" }).pipe(
-        Effect.map((matches) => matches[0]),
-        Effect.orElseSucceed(() => undefined),
-      )
-      const repo =
-        native && path.basename(native) === ".git"
-          ? yield* git.repo.discover(AbsolutePath.make(path.dirname(native)))
-          : undefined
-      if (repo && (!marker || FSUtil.contains(marker.directory, repo.worktree))) {
+      const repo = yield* git.repo.discover(input)
+      if (repo) {
         const previous = yield* cached(repo.commonDirectory)
         const id = (yield* remote(repo)) ?? previous ?? (yield* rootCommit(repo))
         const canonical =
@@ -337,36 +292,13 @@ const layer = Layer.effect(
           directory: repo.worktree,
           canonical,
           vcs: { type: "git" as const, store: repo.commonDirectory },
-          ...(marker?.directory === repo.worktree && marker.type !== "git" ? { vcsBackend: marker.type } : {}),
         })
       }
 
-      const hg = native && path.basename(native) === ".hg" ? yield* hgDiscover(AbsolutePath.make(native)) : undefined
-      if (hg && (!marker || FSUtil.contains(marker.directory, hg.directory))) {
-        return yield* persist({
-          ...hg,
-          canonical: hg.directory,
-          ...(marker?.directory === hg.directory && marker.type !== "hg" ? { vcsBackend: marker.type } : {}),
-        })
-      }
-
-      if (marker) {
-        const previous = yield* cached(marker.marker)
-        return yield* persist({
-          previous,
-          id: previous ?? ID.make(Hash.fast(`vcs-repository:${marker.type}:${marker.marker}`)),
-          directory: marker.directory,
-          canonical: marker.directory,
-          vcs: { type: marker.type, store: marker.marker },
-        })
-      }
-
-      return yield* persist({
-        id: ID.make(Hash.fast(`directory:${directory}`)),
-        directory,
-        canonical: directory,
-        vcs: undefined,
-      })
+      const hg = yield* hgDiscover(input)
+      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 Service.of({ list, update, resolve })
@@ -376,5 +308,5 @@ const layer = Layer.effect(
 export const node = makeGlobalNode({
   service: Service,
   layer: layer,
-  deps: [Bus.node, Database.node, FSUtil.node, Git.node, ProjectMarkers.node, AppProcess.node],
+  deps: [Bus.node, Database.node, FSUtil.node, Git.node, AppProcess.node],
 })

packages/core/src/project/markers.ts

@@ -1,176 +0,0 @@
-export * as ProjectMarkers from "./markers.js"
-
-import { FSUtil } from "@opencode-ai/util/fs-util"
-import { Global } from "@opencode-ai/util/global"
-import { Npm } from "@opencode-ai/util/npm"
-import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { Context, Effect, Layer, Option } from "effect"
-import { parse, type ParseError } from "jsonc-parser"
-import path from "path"
-import { fileURLToPath } from "url"
-import type { ConfigPluginSource } from "../config/plugin/source.js"
-import type { Versioned } from "../plugin.js"
-import { PluginModule } from "../plugin/module.js"
-import { PluginSourceDirectory } from "../plugin/source-directory.js"
-import { SdkPlugins } from "../plugin/sdk.js"
-import { AbsolutePath } from "../schema.js"
-
-export interface Match {
-  readonly type: string
-  readonly directory: AbsolutePath
-  readonly marker: AbsolutePath
-}
-
-export interface Interface {
-  readonly discover: (directory: AbsolutePath) => Effect.Effect<Match | undefined>
-  readonly targets: () => readonly string[]
-}
-
-export class Service extends Context.Service<Service, Interface>()("@opencode/ProjectMarkers") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const fs = yield* FSUtil.Service
-    const global = yield* Global.Service
-    const npm = yield* Npm.Service
-    const sdk = yield* SdkPlugins.Service
-    const known = new Set([".git", ".hg"])
-    const loaded = new Map<string, Versioned | undefined>()
-
-    const discover = Effect.fn("ProjectMarkers.discover")(function* (directory: AbsolutePath) {
-      const found = yield* fs
-        .up({ targets: [".opencode", "opencode.json", "opencode.jsonc"], start: directory })
-        .pipe(Effect.orElseSucceed(() => []))
-      const roots = [global.config, ...found.filter((value) => path.basename(value) === ".opencode").toReversed()]
-      const files = [
-        ...["opencode.json", "opencode.jsonc"].map((name) => path.join(global.config, name)),
-        ...found.filter((value) => path.basename(value) !== ".opencode").toReversed(),
-        ...roots.slice(1).flatMap((root) => ["opencode.json", "opencode.jsonc"].map((name) => path.join(root, name))),
-      ]
-      const automatic = yield* Effect.forEach(roots, (root) => PluginSourceDirectory.discover(fs, root)).pipe(
-        Effect.map((entries) => entries.flat()),
-      )
-      const configured = yield* Effect.forEach([...new Set(files)], (file) => read(fs, file)).pipe(
-        Effect.map((entries) => entries.flat()),
-      )
-      const operations = yield* Effect.forEach(
-        [
-          ...automatic.map((target): ConfigPluginSource.Operation => ({ type: "add", target, options: {} })),
-          ...configured,
-        ],
-        (operation) => {
-          if (operation.type === "remove" || !path.isAbsolute(operation.target)) return Effect.succeed(operation)
-          return fs.stat(operation.target).pipe(
-            Effect.map((info) => ({
-              ...operation,
-              mtime: Option.getOrElse(info.mtime, () => new Date(0)).getTime(),
-            })),
-            Effect.orElseSucceed(() => operation),
-          )
-        },
-      )
-      const declarations = new Map<string, { readonly id: string; readonly markers: readonly string[] }>()
-
-      for (const plugin of sdk.all()) {
-        if (!plugin.vcs) continue
-        declarations.set(plugin.id, { id: plugin.vcs.id ?? plugin.id, markers: plugin.vcs.markers })
-      }
-
-      for (const operation of operations) {
-        if (operation.type === "remove") {
-          for (const id of declarations.keys()) {
-            if (
-              operation.target === "*" ||
-              (operation.target.endsWith(".*") ? id.startsWith(operation.target.slice(0, -1)) : operation.target === id)
-            ) {
-              declarations.delete(id)
-            }
-          }
-          continue
-        }
-        if (operation.target === "*" || operation.target.endsWith(".*") || operation.target.startsWith("opencode."))
-          continue
-        const key = JSON.stringify(operation)
-        const plugin = loaded.has(key)
-          ? loaded.get(key)
-          : yield* PluginModule.load(operation).pipe(
-              Effect.provideService(Npm.Service, npm),
-              Effect.catchCause((cause) =>
-                Effect.logDebug("failed to discover plugin repository markers", {
-                  target: operation.target,
-                  cause,
-                }).pipe(Effect.as(undefined)),
-              ),
-              Effect.tap((value) => Effect.sync(() => loaded.set(key, value))),
-            )
-        if (!plugin?.vcs) continue
-        declarations.set(plugin.id, { id: plugin.vcs.id ?? plugin.id, markers: plugin.vcs.markers })
-      }
-
-      const markers = new Map<string, string>()
-      for (const declaration of declarations.values()) {
-        if (!/^[a-z][a-z0-9._-]*$/.test(declaration.id)) continue
-        for (const marker of declaration.markers) {
-          if (!marker || marker === "." || marker === ".." || /[\\/]/.test(marker)) continue
-          known.add(marker)
-          markers.set(marker, declaration.id)
-        }
-      }
-      if (!markers.size) return undefined
-
-      const marker = yield* fs.up({ targets: [...markers.keys()], start: directory, mode: "first" }).pipe(
-        Effect.map((entries) => entries[0]),
-        Effect.orElseSucceed(() => undefined),
-      )
-      if (!marker) return undefined
-      const type = markers.get(path.basename(marker))
-      if (!type) return undefined
-      return {
-        type,
-        directory: AbsolutePath.make(path.dirname(marker)),
-        marker: AbsolutePath.make(marker),
-      } satisfies Match
-    })
-
-    return Service.of({ discover, targets: () => [...known] })
-  }),
-)
-
-function read(fs: FSUtil.Interface, file: string): Effect.Effect<ConfigPluginSource.Operation[]> {
-  return Effect.gen(function* () {
-    const source = yield* fs.readFileStringSafe(file).pipe(Effect.orElseSucceed(() => undefined))
-    if (!source) return []
-    const errors: ParseError[] = []
-    const document: unknown = parse(source, errors, { allowTrailingComma: true })
-    if (errors.length || typeof document !== "object" || document === null || !("plugins" in document)) return []
-    if (!Array.isArray(document.plugins)) return []
-    return document.plugins.flatMap<ConfigPluginSource.Operation>((entry) => {
-      if (typeof entry === "string" && entry.startsWith("-")) {
-        return [{ type: "remove", target: entry.slice(1) }]
-      }
-      if (
-        typeof entry !== "string" &&
-        (typeof entry !== "object" || entry === null || !("package" in entry) || typeof entry.package !== "string")
-      ) {
-        return []
-      }
-      const target = typeof entry === "string" ? entry : entry.package
-      const options =
-        typeof entry !== "string" && "options" in entry && typeof entry.options === "object" && entry.options !== null
-          ? Object.fromEntries(Object.entries(entry.options))
-          : {}
-      if (target.startsWith("file://")) return [{ type: "add", target: fileURLToPath(target), options }]
-      if (target.startsWith("./") || target.startsWith("../")) {
-        return [{ type: "add", target: path.resolve(path.dirname(file), target), options }]
-      }
-      return [{ type: "add", target, options }]
-    })
-  })
-}
-
-export const node = makeGlobalNode({
-  service: Service,
-  layer,
-  deps: [FSUtil.node, Global.node, Npm.node, SdkPlugins.node],
-})

packages/core/src/project/schema.ts

@@ -18,8 +18,14 @@ export type UpdateInput = typeof UpdateInput.Type
 
 export const Event = Project.Event
 
-export const Vcs = Schema.Struct({
-  type: Project.Vcs,
-  store: AbsolutePath,
-})
+export const Vcs = Schema.Union([
+  Schema.Struct({
+    type: Schema.Literal("git"),
+    store: AbsolutePath,
+  }),
+  Schema.Struct({
+    type: Schema.Literal("hg"),
+    store: AbsolutePath,
+  }),
+])
 export type Vcs = typeof Vcs.Type

packages/core/src/project/sql.ts

@@ -12,7 +12,7 @@ type Transaction = Parameters<Parameters<DatabaseClient["transaction"]>[0]>[0]
 export const ProjectTable = sqliteTable("project", {
   id: text().$type<ProjectSchema.ID>().primaryKey(),
   worktree: absoluteColumn().notNull(),
-  vcs: text().$type<ProjectSchema.Vcs["type"]>(),
+  vcs: text().$type<"git" | "hg">(),
   name: text(),
   icon_url: text(),
   icon_url_override: text(),

packages/core/src/provider.ts

@@ -49,7 +49,6 @@ 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")],

packages/core/src/session/projector.ts

@@ -1,6 +1,6 @@
 export * as SessionProjector from "./projector.js"
 
-import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, lte, or, sql } from "drizzle-orm"
+import { and, asc, desc, eq, gt, gte, inArray, lt, lte, sql } from "drizzle-orm"
 import { DateTime, Effect, Layer, Schema, Stream } from "effect"
 import path from "path"
 import { Database } from "../database/database.js"
@@ -23,7 +23,6 @@ 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 }>
@@ -479,34 +478,18 @@ 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 candidates = [
-          ...new Set(
-            [event.data.previous, Project.ID.global, ...(event.data.adopted ?? [])].filter(
-              (id) => id !== event.data.projectID,
-            ),
-          ),
-        ]
-        if (candidates.length === 0) return
+        const stale = [event.data.previous, Project.ID.global].filter((id) => id !== event.data.projectID)
+        if (stale.length === 0) return
         const rows = yield* db
-          .select({
-            id: SessionTable.id,
-            directory: SessionTable.directory,
-            projectID: SessionTable.project_id,
-            canonical: ProjectTable.worktree,
-          })
+          .select({ id: SessionTable.id, directory: SessionTable.directory })
           .from(SessionTable)
-          .innerJoin(ProjectTable, eq(SessionTable.project_id, ProjectTable.id))
           .where(
             and(
-              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")),
-                ),
-              ),
+              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")),
             ),
           )
           .all()
@@ -514,15 +497,12 @@ const layer = Layer.effectDiscard(
         yield* Effect.forEach(
           rows,
           (row) => {
-            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
+            if (!FSUtil.contains(event.data.directory, row.directory)) return Effect.void
             return db
               .update(SessionTable)
               .set({
                 project_id: event.data.projectID,
-                path: RelativePath.make(path.relative(event.data.directory, directory).replaceAll("\\", "/")),
+                path: RelativePath.make(path.relative(event.data.directory, row.directory).replaceAll("\\", "/")),
                 // Self-assignment suppresses the column's $onUpdate: adoption is not activity.
                 time_updated: sql`${SessionTable.time_updated}`,
               })

packages/core/src/vcs.ts

@@ -73,7 +73,7 @@ const layer = Layer.effect(
     })
     const selected = () => {
       const value = state.get()
-      const id = value.selection ?? location.vcsBackend ?? vcs?.type
+      const id = value.selection ?? vcs?.type
       return id ? value.providers.get(id) : undefined
     }
     const protect = <A>(provider: VcsDefinition, operation: string, effect: Effect.Effect<A, unknown>, fallback: A) =>

packages/core/src/worktree.ts

@@ -153,8 +153,12 @@ const layer = Layer.effect(
     const bus = yield* Bus.Service
     const processService = yield* AppProcess.Service
 
-    const changed = Effect.fnUntraced(function* (projectID: ProjectSchema.ID, update: boolean) {
-      if (update) yield* bus.publish(Event.Updated, { projectID })
+    const changed = Effect.fnUntraced(function* (
+      projectID: ProjectSchema.ID,
+      update: boolean,
+      directory?: AbsolutePath,
+    ) {
+      if (update) yield* bus.publish(Event.Updated, { projectID, directory })
     })
 
     const ops = {
@@ -265,6 +269,7 @@ const layer = Layer.effect(
           directory: result.directory,
           strategy: input.strategy,
         }),
+        result.directory,
       )
       const project = yield* db
         .select({ worktree: ProjectTable.worktree, commands: ProjectTable.commands })

packages/core/test/aisdk-native.test.ts

@@ -61,8 +61,8 @@ describe("AISDKNative", () => {
     })
   })
 
-  test("maps Cerebras, DeepInfra, and Together AI settings, headers, and reasoning options to native providers", () => {
-    for (const name of ["cerebras", "deepinfra", "togetherai"]) {
+  test("maps Cerebras and Together AI settings, headers, and reasoning options to native providers", () => {
+    for (const name of ["cerebras", "togetherai"]) {
       expect(
         map(`@ai-sdk/${name}`, {
           apiKey: "secret",

packages/core/test/model-resolver.test.ts

@@ -885,12 +885,6 @@ 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",
@@ -969,7 +963,6 @@ 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"],
@@ -1094,11 +1087,6 @@ 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" } }),
       )
@@ -1125,10 +1113,6 @@ 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")

packages/core/test/plugin/host.ts

@@ -140,7 +140,6 @@ export function host(overrides: Overrides = {}): Plugin.Context {
       generate: overrides.session?.generate ?? (() => Effect.die("unused session.generate")),
       command: overrides.session?.command ?? (() => Effect.die("unused session.command")),
       rename: overrides.session?.rename ?? (() => Effect.die("unused session.rename")),
-      move: overrides.session?.move ?? (() => Effect.die("unused session.move")),
       synthetic: overrides.session?.synthetic ?? (() => Effect.die("unused session.synthetic")),
       interrupt: overrides.session?.interrupt ?? (() => Effect.die("unused session.interrupt")),
       wait: overrides.session?.wait ?? (() => Effect.die("unused session.wait")),

packages/core/test/plugin/promise.test.ts

@@ -137,7 +137,6 @@ describe("fromPromise", () => {
           switchAgent: (input) => Effect.sync(() => seen.push(input)),
           switchModel: (input) => Effect.sync(() => seen.push(input)),
           rename: (input) => Effect.sync(() => seen.push(input)),
-          move: (input) => Effect.sync(() => seen.push(input)),
           wait: (input) => Effect.sync(() => seen.push(input)),
         },
       })
@@ -158,9 +157,6 @@ describe("fromPromise", () => {
               }),
             ).toBeUndefined()
             expect(await ctx.session.rename({ sessionID: "ses_success", title: "Renamed" })).toBeUndefined()
-            expect(
-              await ctx.session.move({ sessionID: "ses_success", directory: "/destination", delivery: "queue" }),
-            ).toBeUndefined()
             expect(await ctx.session.wait({ sessionID: "ses_success" })).toBeUndefined()
           },
         }),
@@ -173,11 +169,6 @@ describe("fromPromise", () => {
           model: { providerID: Provider.ID.make("openai"), id: Model.ID.make("gpt-5") },
         },
         { sessionID: Session.ID.make("ses_success"), title: "Renamed" },
-        {
-          sessionID: Session.ID.make("ses_success"),
-          directory: AbsolutePath.make("/destination"),
-          delivery: "queue",
-        },
         { sessionID: Session.ID.make("ses_success") },
       ])
     }),

packages/core/test/plugin/provider-factory.test.ts

@@ -6,6 +6,7 @@ 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"
@@ -20,6 +21,7 @@ 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" },