fix(core): stop forcing toolChoice none on session.generate (#38557 )

fix(ai): keep tools when Gemini tool choice is none (#38556 )
fix(tui): manage focus in devtools panels (#38555 )
2026-07-23 19:26:15 +00:00 · 2026-07-23 14:12:23 -05:00 · 2026-07-23 14:09:25 -05:00 · 2026-07-23 18:58:02 +00:00 · 2026-07-23 13:52:20 -05:00 · 2026-07-23 13:59:51 -04:00
143 changed files with 1415 additions and 1505 deletions
@@ -124,7 +124,7 @@
        "opencode2": "./bin/opencode2.cjs",
      },
      "dependencies": {
-        "@agentclientprotocol/sdk": "0.21.0",
+        "@agentclientprotocol/sdk": "1.2.1",
        "@effect/platform-node": "catalog:",
        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
@@ -362,7 +362,7 @@
        "@aws-sdk/credential-providers": "3.1057.0",
        "@effect/platform-node": "catalog:",
        "@effect/sql-sqlite-bun": "catalog:",
-        "@ff-labs/fff-bun": "0.9.4",
+        "@ff-labs/fff-bun": "0.10.1",
        "@lydell/node-pty": "catalog:",
        "@modelcontextprotocol/sdk": "1.29.0",
        "@opencode-ai/ai": "workspace:*",
@@ -1173,7 +1173,7 @@

    "@adobe/css-tools": ["@adobe/css-tools@4.5.0", "", {}, "sha512-6OzddxPio9UiWTCemp4N8cYLV2ZN1ncRnV1cVGtve7dhPOtRkleRyx32GQCYSwDYgaHU3USMm84tNsvKzRCa1Q=="],

-    "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@0.21.0", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-ONj+Q8qOdNQp5XbH5jnMwzT9IKZJsSN0p0lkceS4GtUtNOPVLpNzSS8gqQdGMKfBvA0ESbkL8BTaSN1Rc9miEw=="],
+    "@agentclientprotocol/sdk": ["@agentclientprotocol/sdk@1.2.1", "", { "peerDependencies": { "zod": "^3.25.0 || ^4.0.0" } }, "sha512-jwYUdOQR7tc+Zfch53VL4JJyUNK/46q03uUTYb+PjECsmnNl94XFXOfYLJ8RBpMNidXd1rpOAVgb0vqD98xImA=="],

    "@ai-sdk/alibaba": ["@ai-sdk/alibaba@1.0.17", "", { "dependencies": { "@ai-sdk/openai-compatible": "2.0.41", "@ai-sdk/provider": "3.0.8", "@ai-sdk/provider-utils": "4.0.23" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZbE+U5bWz2JBc5DERLowx5+TKbjGBE93LqKZAWvuEn7HOSQMraxFMZuc0ST335QZJAyfBOzh7m1mPQ+y7EaaoA=="],

@@ -1641,23 +1641,25 @@

    "@fastify/busboy": ["@fastify/busboy@2.1.1", "", {}, "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA=="],

-    "@ff-labs/fff-bin-darwin-arm64": ["@ff-labs/fff-bin-darwin-arm64@0.9.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-xyivu2xB++O5xXDx5Qm50JsU2aXt8YgXlGVhH/HE7UMYDrE6L6f1RYdYs8Y0bn0D3D0+bFBrN5ELPszK9E4Wbw=="],
+    "@ff-labs/fff-bin-android-arm64": ["@ff-labs/fff-bin-android-arm64@0.10.1", "", { "os": "android", "cpu": "arm64" }, "sha512-6Bsaa6yKEd2HV1M2WtqSYhoZucKYffIUms6GYoPN48QHP8hZgO8GXJ85/JDxKlkCJsN2hw1ROiwQK0+xUHYhFQ=="],

-    "@ff-labs/fff-bin-darwin-x64": ["@ff-labs/fff-bin-darwin-x64@0.9.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-xLooAhCnTDCipPSMMZz7kGF3lhRHx6aP5fb6DJ0Ipyw/w/UWJb+xITJFszUl/QnIBoJ/qjDc93/FZMo1dk6gVA=="],
+    "@ff-labs/fff-bin-darwin-arm64": ["@ff-labs/fff-bin-darwin-arm64@0.10.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-7yUP+56sG3UTrLg7eepOD16yM2dgiD7g6Ase2XWQB7oXwLV7mBMylPKIli2pP3kHzfw9K+BS3WAwHKHJ2QhxYw=="],

-    "@ff-labs/fff-bin-linux-arm64-gnu": ["@ff-labs/fff-bin-linux-arm64-gnu@0.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-m5+8vA+1veaUUWonwva1WsU6m1HRm8CpYUzr06KDB65mewlmPbqz7+Fh7hjEfiD8C4mHVHe6RysULvAH1yhsdw=="],
+    "@ff-labs/fff-bin-darwin-x64": ["@ff-labs/fff-bin-darwin-x64@0.10.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-9zb+P1xtyqu/jVklm5RKF2zm9doRRsBNbkF/a8S4aSqSJoNlQR8ZF7C129fzOLfffVAjjgcO2l8oJgxOzHYiwQ=="],

-    "@ff-labs/fff-bin-linux-arm64-musl": ["@ff-labs/fff-bin-linux-arm64-musl@0.9.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-EMeWm7CSTVkizy4ZEzUkLDP024tVcbCUthduuIhekFQRDsiaAze0YboIylWb9HBHJCZlCCoZrWAl4nnJbsX7AA=="],
+    "@ff-labs/fff-bin-linux-arm64-gnu": ["@ff-labs/fff-bin-linux-arm64-gnu@0.10.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-KTwr9CUfCJv0vtG2xG+nMxDae/2NJY2/oVmtgSvTnH9baI6JprqsFGphbukx7mdW/QMPwBiYtoO8ZGoC7i92jA=="],

-    "@ff-labs/fff-bin-linux-x64-gnu": ["@ff-labs/fff-bin-linux-x64-gnu@0.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-pglE0uLkhnlE6bStXqfgUjYTSj+2sVwXaPfoA0QksidAsQor6NRt8004mygzC9DPubgHq5B9QezPfEwigKaP9Q=="],
+    "@ff-labs/fff-bin-linux-arm64-musl": ["@ff-labs/fff-bin-linux-arm64-musl@0.10.1", "", { "os": "linux", "cpu": "arm64" }, "sha512-oznmSpV+zjiAPiwqbA4y+SAsMaYvDhGllHiT9L4ebdQnSOfcQzlUwvo45OhBPwHBt47tIois4bkF/MITlDk54A=="],

-    "@ff-labs/fff-bin-linux-x64-musl": ["@ff-labs/fff-bin-linux-x64-musl@0.9.4", "", { "os": "linux", "cpu": "x64" }, "sha512-VNKxgl8qs3aTfXViX7lqRK1aLu311h8dtBFqG4Scv+9Oi7WprybUp5L7IZ8sxKERaDAaiJMXHodXa1c90QdK8w=="],
+    "@ff-labs/fff-bin-linux-x64-gnu": ["@ff-labs/fff-bin-linux-x64-gnu@0.10.1", "", { "os": "linux", "cpu": "x64" }, "sha512-KDpl8lwSEOauP/6FSJIvnARzE+ILm2rVIRQAio9dc5nn56EvlsryBWry0c5V0Tbw1PV0lNrZ+bzcIiPuTacvzw=="],

-    "@ff-labs/fff-bin-win32-arm64": ["@ff-labs/fff-bin-win32-arm64@0.9.4", "", { "os": "win32", "cpu": "arm64" }, "sha512-uFEt0aNL54vQxq1ivjxRuo+thnhS4wLqa4INl4VXnXJUmwB42XXxD+gsj7vzhBLLx4cFf0aWgy/+TVDR8yjZtQ=="],
+    "@ff-labs/fff-bin-linux-x64-musl": ["@ff-labs/fff-bin-linux-x64-musl@0.10.1", "", { "os": "linux", "cpu": "x64" }, "sha512-mZCpojVtGNDr/wdCUEAHdfrl6qORvKHv3Pw35TaOdshnG4wocoA5bBKTGj/zmAU11o0GMK4V+wUhdNrgqoE10w=="],

-    "@ff-labs/fff-bin-win32-x64": ["@ff-labs/fff-bin-win32-x64@0.9.4", "", { "os": "win32", "cpu": "x64" }, "sha512-Yd2Eyxj+slWv+0QDW9/xBpu9FXq+hwD0rXQD5184/88d+xwWCLKhEP2w8I6OO9XCg+kLT79UJb+k0WwXUtBtMw=="],
+    "@ff-labs/fff-bin-win32-arm64": ["@ff-labs/fff-bin-win32-arm64@0.10.1", "", { "os": "win32", "cpu": "arm64" }, "sha512-SbT76ETXC5AgV9J8sVDozKG8wzrrxsOn8lbBprlOtx+O5V5EYmS1W7BlsatTHy6ddQ3uU5oOYO04PWZBuP6wXg=="],

-    "@ff-labs/fff-bun": ["@ff-labs/fff-bun@0.9.4", "", { "optionalDependencies": { "@ff-labs/fff-bin-darwin-arm64": "0.9.4", "@ff-labs/fff-bin-darwin-x64": "0.9.4", "@ff-labs/fff-bin-linux-arm64-gnu": "0.9.4", "@ff-labs/fff-bin-linux-arm64-musl": "0.9.4", "@ff-labs/fff-bin-linux-x64-gnu": "0.9.4", "@ff-labs/fff-bin-linux-x64-musl": "0.9.4", "@ff-labs/fff-bin-win32-arm64": "0.9.4", "@ff-labs/fff-bin-win32-x64": "0.9.4" }, "os": [ "linux", "win32", "darwin", ], "cpu": [ "x64", "arm64", ] }, "sha512-7HUraaK/g5dStAnuKAuzsXVOQvqqX0ylo5G+DxYwsCjCDc42bjoEAAHqz/3Sn3raUNw97KMoz87XR9QyrLEfVw=="],
+    "@ff-labs/fff-bin-win32-x64": ["@ff-labs/fff-bin-win32-x64@0.10.1", "", { "os": "win32", "cpu": "x64" }, "sha512-dcpHUCBEZoXKQCdKa3bADfgcNyeyfM8tatXrILqIFYi9GL8E4GnzKx1rGkgP5ukVtuj0WuoJyyqSvGjpJPIT8w=="],
+
+    "@ff-labs/fff-bun": ["@ff-labs/fff-bun@0.10.1", "", { "optionalDependencies": { "@ff-labs/fff-bin-android-arm64": "0.10.1", "@ff-labs/fff-bin-darwin-arm64": "0.10.1", "@ff-labs/fff-bin-darwin-x64": "0.10.1", "@ff-labs/fff-bin-linux-arm64-gnu": "0.10.1", "@ff-labs/fff-bin-linux-arm64-musl": "0.10.1", "@ff-labs/fff-bin-linux-x64-gnu": "0.10.1", "@ff-labs/fff-bin-linux-x64-musl": "0.10.1", "@ff-labs/fff-bin-win32-arm64": "0.10.1", "@ff-labs/fff-bin-win32-x64": "0.10.1" }, "os": [ "!aix", "!sunos", "!freebsd", "!openbsd", ], "cpu": [ "x64", "arm64", ] }, "sha512-9oUCxypGbf2q3vNfKZ31wdzt5KqjhA9S6TwQaFol/j1lkSHVGvtIa3RvdGHPs1UUuvR/MO7b6pHj054BR9bXPQ=="],

    "@floating-ui/core": ["@floating-ui/core@1.8.0", "", { "dependencies": { "@floating-ui/utils": "^0.2.12" } }, "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ=="],

@@ -155,7 +155,6 @@
    "@types/node": "catalog:"
  },
  "patchedDependencies": {
-    "@ff-labs/fff-bun@0.9.3": "patches/@ff-labs%2Ffff-bun@0.9.3.patch",
    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
@@ -81,7 +81,7 @@ const GENERATE_OBJECT_TOOL_NAME = "generate_object"

 const GENERATE_OBJECT_TOOL_DESCRIPTION = "Return the structured result by calling this tool."

-type GenerateObjectBase = Omit<RequestInput, "tools" | "toolChoice" | "responseFormat">
+type GenerateObjectBase = Omit<RequestInput, "tools" | "toolChoice">

 export class GenerateObjectResponse<T> {
  constructor(
@@ -159,7 +159,7 @@ const AnthropicTool = Schema.Struct({
 type AnthropicTool = Schema.Schema.Type<typeof AnthropicTool>

 const AnthropicToolChoice = Schema.Union([
-  Schema.Struct({ type: Schema.Literals(["auto", "any"]) }),
+  Schema.Struct({ type: Schema.Literals(["auto", "any", "none"]) }),
  Schema.Struct({ type: Schema.tag("tool"), name: Schema.String }),
 ])

@@ -297,7 +297,7 @@ const lowerTool = (breakpoints: Cache.Breakpoints, tool: ToolDefinition, inputSc
 const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
  ProviderShared.matchToolChoice("Anthropic Messages", toolChoice, {
    auto: () => ({ type: "auto" as const }),
-    none: () => undefined,
+    none: () => ({ type: "none" as const }),
    required: () => ({ type: "any" as const }),
    tool: (name) => ({ type: "tool" as const, name }),
  })
@@ -542,7 +542,6 @@ const outputConfig = (request: LLMRequest) => {
 }

 const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (request: LLMRequest) {
-  const toolChoice = request.toolChoice ? yield* lowerToolChoice(request.toolChoice) : undefined
  const generation = request.generation
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
  const outputLimit = request.model.defaults?.limits?.output ?? request.model.route.defaults.limits?.output ?? 4096
@@ -551,7 +550,7 @@ const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (reques
  // over-mark we keep their tool hints and shed the message-tail ones first.
  const breakpoints = Cache.newBreakpoints(ANTHROPIC_BREAKPOINT_CAP)
  const tools =
-    request.tools.length === 0 || request.toolChoice?.type === "none"
+    request.tools.length === 0
      ? undefined
      : request.tools.map((tool) =>
          lowerTool(
@@ -560,6 +559,9 @@ const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (reques
            ToolSchemaProjection.modelCompatibility(tool.inputSchema, toolSchemaCompatibility),
          ),
        )
+  // Anthropic rejects tool_choice when tools are absent; "none" is only meaningful with tools present.
+  const toolChoice =
+    tools === undefined || !request.toolChoice ? undefined : yield* lowerToolChoice(request.toolChoice)
  const system =
    request.system.length === 0
      ? undefined
@@ -313,7 +313,7 @@ const thinkingConfig = (request: LLMRequest) => {
 }

 const fromRequest = Effect.fn("Gemini.fromRequest")(function* (request: LLMRequest) {
-  const toolsEnabled = request.tools.length > 0 && request.toolChoice?.type !== "none"
+  const hasTools = request.tools.length > 0
  const generation = request.generation
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
  const generationConfig = {
@@ -329,7 +329,7 @@ const fromRequest = Effect.fn("Gemini.fromRequest")(function* (request: LLMReque
    contents: yield* lowerMessages(request),
    systemInstruction:
      request.system.length === 0 ? undefined : { parts: [{ text: ProviderShared.joinText(request.system) }] },
-    tools: toolsEnabled
+    tools: hasTools
      ? [
          {
            functionDeclarations: request.tools.map((tool) =>
@@ -338,7 +338,7 @@ const fromRequest = Effect.fn("Gemini.fromRequest")(function* (request: LLMReque
          },
        ]
      : undefined,
-    toolConfig: toolsEnabled && request.toolChoice ? yield* lowerToolConfig(request.toolChoice) : undefined,
+    toolConfig: hasTools && request.toolChoice ? yield* lowerToolConfig(request.toolChoice) : undefined,
    generationConfig: Object.values(generationConfig).some((value) => value !== undefined)
      ? generationConfig
      : undefined,
@@ -261,13 +261,6 @@ export namespace ToolChoice {
  }
 }

-export const ResponseFormat = Schema.Union([
-  Schema.Struct({ type: Schema.Literal("text") }),
-  Schema.Struct({ type: Schema.Literal("json"), schema: JsonSchema }),
-  Schema.Struct({ type: Schema.Literal("tool"), tool: ToolDefinition }),
-]).pipe(Schema.toTaggedUnion("type"))
-export type ResponseFormat = Schema.Schema.Type<typeof ResponseFormat>
-
 export class LLMRequest extends Schema.Class<LLMRequest>("LLM.Request")({
  id: Schema.optional(Schema.String),
  model: ModelSchema,
@@ -278,7 +271,6 @@ export class LLMRequest extends Schema.Class<LLMRequest>("LLM.Request")({
  generation: Schema.optional(GenerationOptions),
  providerOptions: Schema.optional(ProviderOptions),
  http: Schema.optional(HttpOptions),
-  responseFormat: Schema.optional(ResponseFormat),
  cache: Schema.optional(CachePolicy),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
 }) {}
@@ -296,7 +288,6 @@ export namespace LLMRequest {
    generation: request.generation,
    providerOptions: request.providerOptions,
    http: request.http,
-    responseFormat: request.responseFormat,
    cache: request.cache,
    metadata: request.metadata,
  })
@@ -235,6 +235,34 @@ describe("Anthropic Messages route", () => {
    }),
  )

+  it.effect("keeps tools and sends tool_choice none", () =>
+    Effect.gen(function* () {
+      const prepared = yield* LLMClient.prepare<AnthropicMessages.AnthropicMessagesBody>(
+        LLM.request({
+          id: "req_tool_choice_none",
+          model,
+          tools: [{ name: "lookup", description: "Look things up", inputSchema: { type: "object", properties: {} } }],
+          messages: [
+            Message.user("What is the weather?"),
+            Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: { query: "weather" } })]),
+            Message.tool({ id: "call_1", name: "lookup", result: { forecast: "sunny" } }),
+          ],
+          toolChoice: "none",
+          cache: "none",
+        }),
+      )
+
+      expect(prepared.body.tools).toEqual([
+        {
+          name: "lookup",
+          description: "Look things up",
+          input_schema: { type: "object", properties: {} },
+        },
+      ])
+      expect(prepared.body.tool_choice).toEqual({ type: "none" })
+    }),
+  )
+
  // Regression: read tool results must stay structured so base64 media data is
  // not JSON-stringified into `tool_result.content`.
  it.effect("lowers media tool-result content as structured blocks", () =>
@@ -233,11 +233,11 @@ describe("Gemini route", () => {
    }),
  )

-  it.effect("omits tools when tool choice is none", () =>
+  it.effect("keeps tools and sends function calling mode NONE", () =>
    Effect.gen(function* () {
      const prepared = yield* LLMClient.prepare(
        LLM.request({
-          id: "req_no_tools",
+          id: "req_tool_choice_none",
          model,
          prompt: "Say hello.",
          tools: [{ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } }],
@@ -245,8 +245,10 @@ describe("Gemini route", () => {
        }),
      )

-      expect(prepared.body).toEqual({
+      expect(prepared.body).toMatchObject({
        contents: [{ role: "user", parts: [{ text: "Say hello." }] }],
+        tools: [{ functionDeclarations: [{ name: "lookup", description: "Lookup data" }] }],
+        toolConfig: { functionCallingConfig: { mode: "NONE" } },
      })
    }),
  )
@@ -22,7 +22,7 @@
    "typecheck": "tsgo --noEmit"
  },
  "dependencies": {
-    "@agentclientprotocol/sdk": "0.21.0",
+    "@agentclientprotocol/sdk": "1.2.1",
    "@effect/platform-node": "catalog:",
    "@opencode-ai/client": "workspace:*",
    "@opencode-ai/plugin": "workspace:*",
@@ -5,6 +5,7 @@ import {
  type AuthenticateRequest,
  type CancelNotification,
  type CloseSessionRequest,
+  type DeleteSessionRequest,
  type ForkSessionRequest,
  type InitializeRequest,
  type ListSessionsRequest,
@@ -13,7 +14,6 @@ import {
  type PromptRequest,
  type ResumeSessionRequest,
  type SetSessionConfigOptionRequest,
-  type SetSessionModelRequest,
  type SetSessionModeRequest,
 } from "@agentclientprotocol/sdk"
 import type { OpenCodeClient } from "@opencode-ai/client/promise"
@@ -28,12 +28,12 @@ export function create(client: OpenCodeClient, connection: AgentSideConnection)
    newSession: (params: NewSessionRequest) => run(service.newSession(params)),
    loadSession: (params: LoadSessionRequest) => run(service.loadSession(params)),
    listSessions: (params: ListSessionsRequest) => run(service.listSessions(params)),
+    deleteSession: (params: DeleteSessionRequest) => run(service.deleteSession(params)),
    resumeSession: (params: ResumeSessionRequest) => run(service.resumeSession(params)),
    closeSession: (params: CloseSessionRequest) => run(service.closeSession(params)),
    unstable_forkSession: (params: ForkSessionRequest) => run(service.forkSession(params)),
    setSessionConfigOption: (params: SetSessionConfigOptionRequest) => run(service.setSessionConfigOption(params)),
    setSessionMode: (params: SetSessionModeRequest) => run(service.setSessionMode(params)),
-    unstable_setSessionModel: (params: SetSessionModelRequest) => run(service.setSessionModel(params)),
    prompt: (params: PromptRequest) => run(service.prompt(params)),
    cancel: (params: CancelNotification) => run(service.cancel(params)),
  } satisfies Agent
@@ -47,7 +47,7 @@ export async function streamTurn(input: {
  readonly sessionID: string
  readonly cwd: string
  readonly start: TurnStart
-  readonly userMessageID?: string | null
+  readonly writeTextFile: boolean
  readonly submit: (signal: AbortSignal) => Promise<unknown>
  readonly control: TurnControl
 }): Promise<PromptResponse> {
@@ -170,6 +170,7 @@ export async function streamTurn(input: {
        tools.delete(event.data.callID)
        await syncEditedFiles({
          connection: input.connection,
+          writeTextFile: input.writeTextFile,
          sessionID: input.sessionID,
          cwd: input.cwd,
          toolName: current.name,
@@ -231,7 +232,7 @@ export async function streamTurn(input: {
      if (!started) {
        streamController.abort()
        await completed.catch(() => {})
-        return response(undefined, undefined, "interrupted", true, undefined, input.userMessageID)
+        return response(undefined, undefined, "interrupted", true, undefined)
      }
    }
    const terminal = await completed
@@ -246,7 +247,6 @@ export async function streamTurn(input: {
      terminal,
      control.cancelled,
      finish,
-      input.userMessageID,
    )
  } catch (error) {
    streamController.abort()
@@ -400,7 +400,6 @@ function response(
  terminal: "succeeded" | "failed" | "interrupted",
  cancelled: boolean,
  finish: SessionMessageAssistant["finish"],
-  messageID: string | null | undefined,
 ): PromptResponse {
  const error = assistant?.error ?? executionError
  if (error?.type === "provider.auth") throw new ACPError.AuthRequiredError()
@@ -423,7 +422,7 @@ function response(
      }
    : undefined
  const stopReason = resolveStopReason({ terminal, cancelled, finish, error: error?.type })
-  return { stopReason, ...(usage ? { usage } : {}), ...(messageID ? { userMessageId: messageID } : {}), _meta: {} }
+  return { stopReason, ...(usage ? { usage } : {}), _meta: {} }
 }

 function resolveStopReason(input: {
@@ -53,13 +53,14 @@ export async function replyPermission(input: {

 export async function syncEditedFiles(input: {
  readonly connection: Partial<Pick<AgentSideConnection, "writeTextFile">>
+  readonly writeTextFile: boolean
  readonly sessionID: string
  readonly cwd: string
  readonly toolName: string
  readonly toolInput: ToolInput
  readonly structured: Readonly<Record<string, unknown>>
 }) {
-  if (!input.connection.writeTextFile || toToolKind(input.toolName) !== "edit") return
+  if (!input.writeTextFile || !input.connection.writeTextFile || toToolKind(input.toolName) !== "edit") return
  const files = Array.isArray(input.structured.files)
    ? input.structured.files.flatMap((file): string[] => {
        if (!file || typeof file !== "object") return []
@@ -16,6 +16,8 @@ import type {
  CancelNotification,
  CloseSessionRequest,
  CloseSessionResponse,
+  DeleteSessionRequest,
+  DeleteSessionResponse,
  ForkSessionRequest,
  ForkSessionResponse,
  InitializeRequest,
@@ -33,8 +35,6 @@ import type {
  ResumeSessionResponse,
  SetSessionConfigOptionRequest,
  SetSessionConfigOptionResponse,
-  SetSessionModelRequest,
-  SetSessionModelResponse,
  SetSessionModeRequest,
  SetSessionModeResponse,
 } from "@agentclientprotocol/sdk"
@@ -47,7 +47,8 @@ import { ACPError } from "./error"

 export const AuthMethodID = "opencode-login"

-type Connection = Pick<AgentSideConnection, "sessionUpdate" | "requestPermission">
+type Connection = Pick<AgentSideConnection, "sessionUpdate" | "requestPermission"> &
+  Partial<Pick<AgentSideConnection, "writeTextFile">>

 type Catalog = {
  readonly providers: ConfigOptionProvider[]
@@ -83,12 +84,12 @@ export interface Interface {
  newSession(input: NewSessionRequest): Promise<NewSessionResponse>
  loadSession(input: LoadSessionRequest): Promise<LoadSessionResponse>
  listSessions(input: ListSessionsRequest): Promise<ListSessionsResponse>
+  deleteSession(input: DeleteSessionRequest): Promise<DeleteSessionResponse>
  resumeSession(input: ResumeSessionRequest): Promise<ResumeSessionResponse>
  closeSession(input: CloseSessionRequest): Promise<CloseSessionResponse>
  forkSession(input: ForkSessionRequest): Promise<ForkSessionResponse>
  setSessionConfigOption(input: SetSessionConfigOptionRequest): Promise<SetSessionConfigOptionResponse>
  setSessionMode(input: SetSessionModeRequest): Promise<SetSessionModeResponse>
-  setSessionModel(input: SetSessionModelRequest): Promise<SetSessionModelResponse>
  prompt(input: PromptRequest): Promise<PromptResponse>
  cancel(input: CancelNotification): Promise<void>
 }
@@ -98,6 +99,7 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
  const catalogs = new Map<string, Promise<Catalog>>()
  const registeredMcp = new Map<string, Set<string>>()
  const active = new Map<string, TurnControl>()
+  const capabilities = { writeTextFile: false }

  const catalog = (cwd: string) => {
    const cached = catalogs.get(cwd)
@@ -157,6 +159,7 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti

  return {
    initialize: async (params) => {
+      capabilities.writeTextFile = params.clientCapabilities?.fs?.writeTextFile === true
      const authMethod: AuthMethod = {
        description: "Run `opencode auth login` in the terminal",
        name: "Login with opencode",
@@ -173,7 +176,7 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
          loadSession: true,
          mcpCapabilities: { http: true, sse: false },
          promptCapabilities: { embeddedContext: true, image: true },
-          sessionCapabilities: { close: {}, fork: {}, list: {}, resume: {} },
+          sessionCapabilities: { close: {}, delete: {}, fork: {}, list: {}, resume: {} },
        },
        authMethods: [authMethod],
        agentInfo: { name: "OpenCode", version: OPENCODE_VERSION },
@@ -216,6 +219,14 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
        ...(page.cursor.next ? { nextCursor: page.cursor.next } : {}),
      }
    },
+    deleteSession: async (params) => {
+      await input.client.session.remove({ sessionID: params.sessionId }).catch((error) => {
+        if (!isSessionNotFoundError(error)) throw error
+      })
+      sessions.delete(params.sessionId)
+      registeredMcp.delete(params.sessionId)
+      return {}
+    },
    resumeSession: async (params) => {
      const session = await getSession(input.client, params.sessionId)
      const state = await attach(session, session.location.directory, params.mcpServers ?? [])
@@ -270,13 +281,6 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
      await selectMode(input.client, await requireSession(params.sessionId), params.modeId)
      return {}
    },
-    setSessionModel: async (params) => {
-      const state = await requireSession(params.sessionId)
-      const selected = requireModel(state.catalog, params.modelId)
-      state.model = selected
-      await input.client.session.switchModel({ sessionID: state.id, model: selected })
-      return {}
-    },
    prompt: async (params) => {
      const state = await requireSession(params.sessionId)
      if (active.has(state.id)) {
@@ -295,7 +299,7 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
        sessionID: state.id,
        cwd: state.cwd,
        start: prepared.start,
-        userMessageID: params.messageId,
+        writeTextFile: capabilities.writeTextFile,
        control,
        submit: (signal) => submitPrompt(input.client, state, prepared, signal),
      }).finally(() => {
@@ -479,6 +483,7 @@ async function registerMcpServers(

 function mcpConfig(server: McpServer) {
  if ("type" in server) {
+    if (server.type === "acp") throw new Error("MCP-over-ACP is not supported")
    return {
      type: "remote" as const,
      url: server.url,
@@ -140,11 +140,11 @@ export const Commands = Spec.make(typeof OPENCODE_CLI_NAME === "string" ? OPENCO
          Flag.withDefault(false),
        ),
        replay: Flag.boolean("replay").pipe(
-          Flag.withDescription("Replay session history on resume and after resize"),
-          Flag.withDefault(true),
+          Flag.withDescription("Restore session history on resume and resize (disable with --no-replay)"),
+          Flag.optional,
        ),
        replayLimit: Flag.integer("replay-limit").pipe(
-          Flag.withDescription("Cap visible replay to the newest N messages"),
+          Flag.withDescription("Limit replay to the newest N messages (default: 200)"),
          Flag.optional,
        ),
        model: Flag.string("model").pipe(
@@ -28,8 +28,8 @@ export default Runtime.handler(Commands.commands.mini, (input) =>
        model: Option.getOrUndefined(input.model),
        agent: Option.getOrUndefined(input.agent),
        prompt: Option.getOrUndefined(input.prompt),
-        replay: input.replay,
-        replayLimit: Option.getOrUndefined(input.replayLimit),
+        replay: Option.getOrUndefined(input.replay) ?? resolved.mini?.replay ?? true,
+        replayLimit: Option.getOrUndefined(input.replayLimit) ?? resolved.mini?.replay_limit,
        demo: input.demo,
        tuiConfig: resolved,
        config: {
@@ -439,6 +439,7 @@ describe("acp event behavior", () => {
      sessionID: "ses_cancel",
      cwd: "/workspace",
      start: { type: "input", id: "input_cancel" },
+      writeTextFile: false,
      control,
      submit: async (signal) => {
        await fixture.client.session.prompt(
@@ -481,6 +482,7 @@ describe("acp event behavior", () => {
      sessionID: "ses_cancel_admission",
      cwd: "/workspace",
      start: { type: "input", id: "input_cancel_admission" },
+      writeTextFile: false,
      control,
      submit: (signal) =>
        fixture.client.session.prompt(
@@ -566,7 +568,7 @@ function turn(input: {
    sessionID: input.sessionID,
    cwd: "/workspace",
    start: { type: "input", id: input.inputID },
-    userMessageID: `client_${input.inputID}`,
+    writeTextFile: false,
    control: { cancelled: false, admission: new AbortController() },
    submit: (signal) =>
      input.fixture.client.session.prompt({ sessionID: input.sessionID, id: input.inputID, text: "hello" }, { signal }),
@@ -85,7 +85,6 @@ test("acp prompt resolves after ordered turn updates", async () => {

  try {
    const id = "msg_prompt"
-    const userMessageID = "client-message"
    const response = await streamTurn({
      client,
      connection: {
@@ -97,7 +96,7 @@ test("acp prompt resolves after ordered turn updates", async () => {
      sessionID: "ses_test",
      cwd: "/workspace",
      start: { type: "input", id },
-      userMessageID,
+      writeTextFile: false,
      control: { cancelled: false, admission: new AbortController() },
      submit: () => client.session.prompt({ sessionID: "ses_test", id, text: "hi" }),
    })
@@ -112,7 +111,7 @@ test("acp prompt resolves after ordered turn updates", async () => {
        },
      },
    ])
-    expect(response).toMatchObject({ stopReason: "end_turn", userMessageId: userMessageID, usage: { totalTokens: 2 } })
+    expect(response).toMatchObject({ stopReason: "end_turn", usage: { totalTokens: 2 } })
  } finally {
    events?.close()
    await server.stop(true)
@@ -14,6 +14,7 @@ describe("acp initialize/auth subprocess", () => {
    expect(initialized.agentCapabilities?.mcpCapabilities?.sse).toBe(false)
    expect(initialized.agentCapabilities?.loadSession).toBe(true)
    expect(initialized.agentCapabilities?.sessionCapabilities?.close).toEqual({})
+    expect(initialized.agentCapabilities?.sessionCapabilities?.delete).toEqual({})
    expect(initialized.agentCapabilities?.sessionCapabilities?.fork).toEqual({})
    expect(initialized.agentCapabilities?.sessionCapabilities?.list).toEqual({})
    expect(initialized.agentCapabilities?.sessionCapabilities?.resume).toEqual({})
@@ -1,5 +1,6 @@
 import type {
  CloseSessionResponse,
+  DeleteSessionResponse,
  ListSessionsResponse,
  LoadSessionResponse,
  ResumeSessionResponse,
@@ -60,6 +61,20 @@ describe("acp lifecycle subprocess", () => {
    expect(listed.sessions.some((item) => item.sessionId === session.sessionId)).toBe(true)
  }, 60_000)

+  test("delete capability and delete request", async () => {
+    await using fixture = await createAcpFixture()
+    const acp = fixture.spawn()
+    const initialized = await initialize(acp)
+    expect(initialized.agentCapabilities?.sessionCapabilities?.delete).toEqual({})
+    const session = await newSession(acp, fixture.home)
+
+    expect(
+      expectOk(await acp.request<DeleteSessionResponse>("session/delete", { sessionId: session.sessionId })),
+    ).toEqual({})
+    const listed = expectOk(await acp.request<ListSessionsResponse>("session/list", { cwd: fixture.home }))
+    expect(listed.sessions.some((item) => item.sessionId === session.sessionId)).toBe(false)
+  }, 60_000)
+
  test("resume capability advertisement", async () => {
    await using fixture = await createAcpFixture()
    const initialized = await initialize(fixture.spawn())
@@ -4,6 +4,7 @@ import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
 import { streamTurn } from "../../src/acp/event"
+import { syncEditedFiles } from "../../src/acp/permission"
 import { createSseFixture, durableEvent, ephemeralEvent, withTimeout } from "./sse-fixture"

 type SessionUpdateParams = Parameters<AgentSideConnection["sessionUpdate"]>[0]
@@ -12,6 +13,27 @@ type Connection = Pick<AgentSideConnection, "sessionUpdate" | "requestPermission
 type Fixture = ReturnType<typeof createSseFixture>

 describe("acp permission behavior", () => {
+  test("does not sync edits when writeTextFile was not advertised", async () => {
+    const writes: Parameters<AgentSideConnection["writeTextFile"]>[0][] = []
+
+    await syncEditedFiles({
+      connection: {
+        writeTextFile: async (input) => {
+          writes.push(input)
+          return {}
+        },
+      },
+      writeTextFile: false,
+      sessionID: "ses_no_write",
+      cwd: "/workspace",
+      toolName: "edit",
+      toolInput: { filePath: "/workspace/file.ts" },
+      structured: {},
+    })
+
+    expect(writes).toEqual([])
+  })
+
  test("forwards allow-once and allow-always selections to the generated client", async () => {
    const permissionRequests: RequestPermissionRequest[] = []
    const fixture = createSseFixture({
@@ -465,6 +487,7 @@ function startTurn(fixture: Fixture, connection: Connection, sessionID: string,
    sessionID,
    cwd,
    start: { type: "input", id: inputID },
+    writeTextFile: true,
    control: { cancelled: false, admission: new AbortController() },
    submit: (signal) => fixture.client.session.prompt({ sessionID, id: inputID, text: "hello" }, { signal }),
  })
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { McpServer, SessionConfigOption } from "@agentclientprotocol/sdk"
-import { makeACPFixture, makeSession, secondModel, testModel } from "./service-fixture"
+import { makeACPFixture, makeSession, secondModel } from "./service-fixture"

 describe("acp service directory behavior", () => {
  test("creates sessions from a catalog shared by concurrent callers in the same cwd", async () => {
@@ -134,7 +134,6 @@ describe("acp service directory behavior", () => {
      configId: "mode",
      value: "plan",
    })
-    await fixture.service.setSessionModel({ sessionId: session.sessionId, modelId: "test/test-model/high" })
    await fixture.service.setSessionMode({ sessionId: session.sessionId, modeId: "build" })

    expect(currentValue(selectedModel, "model")).toBe("test/second-model")
@@ -148,7 +147,6 @@ describe("acp service directory behavior", () => {
    ).toEqual([
      { model: { providerID: "test", id: secondModel.id } },
      { model: { providerID: "test", id: secondModel.id, variant: "medium" } },
-      { model: { providerID: "test", id: testModel.id, variant: "high" } },
    ])
    expect(
      fixture.requests
@@ -225,6 +225,33 @@ describe("acp service lifecycle", () => {
      "/api/session/missing/interrupt",
    ])
  })
+
+  test("deletes sessions from backing and local storage", async () => {
+    await using fixture = makeACPFixture({
+      fetch(request) {
+        if (request.method === "POST" && request.path === "/api/session") {
+          return Response.json({ data: makeSession("ses_delete") })
+        }
+        if (request.method === "DELETE" && request.path === "/api/session/ses_delete") {
+          return new Response(null, { status: 204 })
+        }
+        return undefined
+      },
+    })
+    const session = await fixture.service.newSession({ cwd: "/workspace", mcpServers: [] })
+
+    expect(await fixture.service.deleteSession({ sessionId: session.sessionId })).toEqual({})
+    expect(fixture.requests).toContainEqual({
+      method: "DELETE",
+      path: "/api/session/ses_delete",
+      query: {},
+      body: undefined,
+    })
+    const missing = await fixture.service
+      .setSessionConfigOption({ sessionId: session.sessionId, configId: "effort", value: "high" })
+      .catch((error: unknown) => error)
+    expect(missing).toMatchObject({ _tag: "ACPSessionNotFoundError", sessionId: session.sessionId })
+  })
 })

 function currentValue(result: { readonly configOptions?: readonly SessionConfigOption[] | null }, id: string) {
@@ -45,17 +45,14 @@ describe("acp service prompt routing and usage", () => {

    const commandResult = await fixture.service.prompt({
      sessionId: session.sessionId,
-      messageId: "client-command",
      prompt: [{ type: "text", text: "/review now" }],
    })
    const skillResult = await fixture.service.prompt({
      sessionId: session.sessionId,
-      messageId: "client-skill",
      prompt: [{ type: "text", text: "/verify" }],
    })
    const compactResult = await fixture.service.prompt({
      sessionId: session.sessionId,
-      messageId: "client-compact",
      prompt: [{ type: "text", text: "/compact" }],
    })

@@ -154,13 +151,11 @@ describe("acp service prompt routing and usage", () => {

    const response = await fixture.service.prompt({
      sessionId: session.sessionId,
-      messageId: "client-message",
      prompt: [{ type: "text", text: "hello" }],
    })

    expect(response).toEqual({
      stopReason: "end_turn",
-      userMessageId: "client-message",
      usage: {
        inputTokens: 100,
        outputTokens: 40,
@@ -214,11 +214,15 @@ describe("mini command", () => {
    expect(result.exitCode).toBe(0)
    expect(result.stdout).toContain("--server string")
    expect(result.stdout).toContain("--prompt string")
+    expect(result.stdout).toContain("--replay")
+    expect(result.stdout).toContain("disable with --no-replay")
+    expect(result.stdout).toContain("--replay-limit integer")
+    expect(result.stdout).toContain("Limit replay to the newest N messages (default: 200)")
    expect(result.stdout).not.toContain("SUBCOMMANDS")
  })

  test("routes local and explicit-server invocations into mini", async () => {
-    for (const args of [["mini"], ["mini", "--server", "http://127.0.0.1:1"]]) {
+    for (const args of [["mini"], ["mini", "--no-replay"], ["mini", "--server", "http://127.0.0.1:1"]]) {
      const result = await cli(args)

      expect(result.exitCode).toBe(1)
@@ -124,190 +124,185 @@ export type Endpoint5_8Input = {
 export type Endpoint5_8Output = EffectValue<ReturnType<RawClient["server.session"]["session.rename"]>>
 export type SessionRenameOperation<E = never> = (input: Endpoint5_8Input) => Effect.Effect<Endpoint5_8Output, E>

-type Endpoint5_9Request = Parameters<RawClient["server.session"]["session.archive"]>[0]
-export type Endpoint5_9Input = { readonly sessionID: Endpoint5_9Request["params"]["sessionID"] }
-export type Endpoint5_9Output = EffectValue<ReturnType<RawClient["server.session"]["session.archive"]>>
-export type SessionArchiveOperation<E = never> = (input: Endpoint5_9Input) => Effect.Effect<Endpoint5_9Output, E>
+type Endpoint5_9Request = Parameters<RawClient["server.session"]["session.move"]>[0]
+export type Endpoint5_9Input = {
+  readonly sessionID: Endpoint5_9Request["params"]["sessionID"]
+  readonly directory: Endpoint5_9Request["payload"]["directory"]
+  readonly workspaceID?: Endpoint5_9Request["payload"]["workspaceID"]
+}
+export type Endpoint5_9Output = EffectValue<ReturnType<RawClient["server.session"]["session.move"]>>
+export type SessionMoveOperation<E = never> = (input: Endpoint5_9Input) => Effect.Effect<Endpoint5_9Output, E>

-type Endpoint5_10Request = Parameters<RawClient["server.session"]["session.move"]>[0]
+type Endpoint5_10Request = Parameters<RawClient["server.session"]["session.prompt"]>[0]
 export type Endpoint5_10Input = {
  readonly sessionID: Endpoint5_10Request["params"]["sessionID"]
-  readonly directory: Endpoint5_10Request["payload"]["directory"]
-  readonly workspaceID?: Endpoint5_10Request["payload"]["workspaceID"]
+  readonly id?: Endpoint5_10Request["payload"]["id"]
+  readonly text: Endpoint5_10Request["payload"]["text"]
+  readonly files?: Endpoint5_10Request["payload"]["files"]
+  readonly agents?: Endpoint5_10Request["payload"]["agents"]
+  readonly metadata?: Endpoint5_10Request["payload"]["metadata"]
+  readonly delivery?: Endpoint5_10Request["payload"]["delivery"]
+  readonly resume?: Endpoint5_10Request["payload"]["resume"]
 }
-export type Endpoint5_10Output = EffectValue<ReturnType<RawClient["server.session"]["session.move"]>>
-export type SessionMoveOperation<E = never> = (input: Endpoint5_10Input) => Effect.Effect<Endpoint5_10Output, E>
+export type Endpoint5_10Output = EffectValue<ReturnType<RawClient["server.session"]["session.prompt"]>>["data"]
+export type SessionPromptOperation<E = never> = (input: Endpoint5_10Input) => Effect.Effect<Endpoint5_10Output, E>

-type Endpoint5_11Request = Parameters<RawClient["server.session"]["session.prompt"]>[0]
+type Endpoint5_11Request = Parameters<RawClient["server.session"]["session.command"]>[0]
 export type Endpoint5_11Input = {
  readonly sessionID: Endpoint5_11Request["params"]["sessionID"]
  readonly id?: Endpoint5_11Request["payload"]["id"]
-  readonly text: Endpoint5_11Request["payload"]["text"]
+  readonly command: Endpoint5_11Request["payload"]["command"]
+  readonly arguments?: Endpoint5_11Request["payload"]["arguments"]
+  readonly agent?: Endpoint5_11Request["payload"]["agent"]
+  readonly model?: Endpoint5_11Request["payload"]["model"]
  readonly files?: Endpoint5_11Request["payload"]["files"]
  readonly agents?: Endpoint5_11Request["payload"]["agents"]
-  readonly metadata?: Endpoint5_11Request["payload"]["metadata"]
  readonly delivery?: Endpoint5_11Request["payload"]["delivery"]
  readonly resume?: Endpoint5_11Request["payload"]["resume"]
 }
-export type Endpoint5_11Output = EffectValue<ReturnType<RawClient["server.session"]["session.prompt"]>>["data"]
-export type SessionPromptOperation<E = never> = (input: Endpoint5_11Input) => Effect.Effect<Endpoint5_11Output, E>
+export type Endpoint5_11Output = EffectValue<ReturnType<RawClient["server.session"]["session.command"]>>["data"]
+export type SessionCommandOperation<E = never> = (input: Endpoint5_11Input) => Effect.Effect<Endpoint5_11Output, E>

-type Endpoint5_12Request = Parameters<RawClient["server.session"]["session.command"]>[0]
+type Endpoint5_12Request = Parameters<RawClient["server.session"]["session.skill"]>[0]
 export type Endpoint5_12Input = {
  readonly sessionID: Endpoint5_12Request["params"]["sessionID"]
  readonly id?: Endpoint5_12Request["payload"]["id"]
-  readonly command: Endpoint5_12Request["payload"]["command"]
-  readonly arguments?: Endpoint5_12Request["payload"]["arguments"]
-  readonly agent?: Endpoint5_12Request["payload"]["agent"]
-  readonly model?: Endpoint5_12Request["payload"]["model"]
-  readonly files?: Endpoint5_12Request["payload"]["files"]
-  readonly agents?: Endpoint5_12Request["payload"]["agents"]
-  readonly delivery?: Endpoint5_12Request["payload"]["delivery"]
+  readonly skill: Endpoint5_12Request["payload"]["skill"]
  readonly resume?: Endpoint5_12Request["payload"]["resume"]
 }
-export type Endpoint5_12Output = EffectValue<ReturnType<RawClient["server.session"]["session.command"]>>["data"]
-export type SessionCommandOperation<E = never> = (input: Endpoint5_12Input) => Effect.Effect<Endpoint5_12Output, E>
+export type Endpoint5_12Output = EffectValue<ReturnType<RawClient["server.session"]["session.skill"]>>
+export type SessionSkillOperation<E = never> = (input: Endpoint5_12Input) => Effect.Effect<Endpoint5_12Output, E>

-type Endpoint5_13Request = Parameters<RawClient["server.session"]["session.skill"]>[0]
+type Endpoint5_13Request = Parameters<RawClient["server.session"]["session.synthetic"]>[0]
 export type Endpoint5_13Input = {
  readonly sessionID: Endpoint5_13Request["params"]["sessionID"]
  readonly id?: Endpoint5_13Request["payload"]["id"]
-  readonly skill: Endpoint5_13Request["payload"]["skill"]
+  readonly text: Endpoint5_13Request["payload"]["text"]
+  readonly description?: Endpoint5_13Request["payload"]["description"]
+  readonly metadata?: Endpoint5_13Request["payload"]["metadata"]
+  readonly delivery?: Endpoint5_13Request["payload"]["delivery"]
  readonly resume?: Endpoint5_13Request["payload"]["resume"]
 }
-export type Endpoint5_13Output = EffectValue<ReturnType<RawClient["server.session"]["session.skill"]>>
-export type SessionSkillOperation<E = never> = (input: Endpoint5_13Input) => Effect.Effect<Endpoint5_13Output, E>
+export type Endpoint5_13Output = EffectValue<ReturnType<RawClient["server.session"]["session.synthetic"]>>["data"]
+export type SessionSyntheticOperation<E = never> = (input: Endpoint5_13Input) => Effect.Effect<Endpoint5_13Output, E>

-type Endpoint5_14Request = Parameters<RawClient["server.session"]["session.synthetic"]>[0]
+type Endpoint5_14Request = Parameters<RawClient["server.session"]["session.shell"]>[0]
 export type Endpoint5_14Input = {
  readonly sessionID: Endpoint5_14Request["params"]["sessionID"]
  readonly id?: Endpoint5_14Request["payload"]["id"]
-  readonly text: Endpoint5_14Request["payload"]["text"]
-  readonly description?: Endpoint5_14Request["payload"]["description"]
-  readonly metadata?: Endpoint5_14Request["payload"]["metadata"]
-  readonly delivery?: Endpoint5_14Request["payload"]["delivery"]
-  readonly resume?: Endpoint5_14Request["payload"]["resume"]
+  readonly command: Endpoint5_14Request["payload"]["command"]
 }
-export type Endpoint5_14Output = EffectValue<ReturnType<RawClient["server.session"]["session.synthetic"]>>["data"]
-export type SessionSyntheticOperation<E = never> = (input: Endpoint5_14Input) => Effect.Effect<Endpoint5_14Output, E>
+export type Endpoint5_14Output = EffectValue<ReturnType<RawClient["server.session"]["session.shell"]>>
+export type SessionShellOperation<E = never> = (input: Endpoint5_14Input) => Effect.Effect<Endpoint5_14Output, E>

-type Endpoint5_15Request = Parameters<RawClient["server.session"]["session.shell"]>[0]
+type Endpoint5_15Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
 export type Endpoint5_15Input = {
  readonly sessionID: Endpoint5_15Request["params"]["sessionID"]
  readonly id?: Endpoint5_15Request["payload"]["id"]
-  readonly command: Endpoint5_15Request["payload"]["command"]
 }
-export type Endpoint5_15Output = EffectValue<ReturnType<RawClient["server.session"]["session.shell"]>>
-export type SessionShellOperation<E = never> = (input: Endpoint5_15Input) => Effect.Effect<Endpoint5_15Output, E>
+export type Endpoint5_15Output = EffectValue<ReturnType<RawClient["server.session"]["session.compact"]>>["data"]
+export type SessionCompactOperation<E = never> = (input: Endpoint5_15Input) => Effect.Effect<Endpoint5_15Output, E>

-type Endpoint5_16Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
-export type Endpoint5_16Input = {
-  readonly sessionID: Endpoint5_16Request["params"]["sessionID"]
-  readonly id?: Endpoint5_16Request["payload"]["id"]
+type Endpoint5_16Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
+export type Endpoint5_16Input = { readonly sessionID: Endpoint5_16Request["params"]["sessionID"] }
+export type Endpoint5_16Output = EffectValue<ReturnType<RawClient["server.session"]["session.wait"]>>
+export type SessionWaitOperation<E = never> = (input: Endpoint5_16Input) => Effect.Effect<Endpoint5_16Output, E>
+
+type Endpoint5_17Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
+export type Endpoint5_17Input = {
+  readonly sessionID: Endpoint5_17Request["params"]["sessionID"]
+  readonly messageID: Endpoint5_17Request["payload"]["messageID"]
+  readonly files?: Endpoint5_17Request["payload"]["files"]
 }
-export type Endpoint5_16Output = EffectValue<ReturnType<RawClient["server.session"]["session.compact"]>>["data"]
-export type SessionCompactOperation<E = never> = (input: Endpoint5_16Input) => Effect.Effect<Endpoint5_16Output, E>
+export type Endpoint5_17Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.stage"]>>["data"]
+export type SessionRevertStageOperation<E = never> = (input: Endpoint5_17Input) => Effect.Effect<Endpoint5_17Output, E>

-type Endpoint5_17Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
-export type Endpoint5_17Input = { readonly sessionID: Endpoint5_17Request["params"]["sessionID"] }
-export type Endpoint5_17Output = EffectValue<ReturnType<RawClient["server.session"]["session.wait"]>>
-export type SessionWaitOperation<E = never> = (input: Endpoint5_17Input) => Effect.Effect<Endpoint5_17Output, E>
+type Endpoint5_18Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
+export type Endpoint5_18Input = { readonly sessionID: Endpoint5_18Request["params"]["sessionID"] }
+export type Endpoint5_18Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.clear"]>>
+export type SessionRevertClearOperation<E = never> = (input: Endpoint5_18Input) => Effect.Effect<Endpoint5_18Output, E>

-type Endpoint5_18Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
-export type Endpoint5_18Input = {
-  readonly sessionID: Endpoint5_18Request["params"]["sessionID"]
-  readonly messageID: Endpoint5_18Request["payload"]["messageID"]
-  readonly files?: Endpoint5_18Request["payload"]["files"]
-}
-export type Endpoint5_18Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.stage"]>>["data"]
-export type SessionRevertStageOperation<E = never> = (input: Endpoint5_18Input) => Effect.Effect<Endpoint5_18Output, E>
-
-type Endpoint5_19Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
+type Endpoint5_19Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
 export type Endpoint5_19Input = { readonly sessionID: Endpoint5_19Request["params"]["sessionID"] }
-export type Endpoint5_19Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.clear"]>>
-export type SessionRevertClearOperation<E = never> = (input: Endpoint5_19Input) => Effect.Effect<Endpoint5_19Output, E>
+export type Endpoint5_19Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.commit"]>>
+export type SessionRevertCommitOperation<E = never> = (input: Endpoint5_19Input) => Effect.Effect<Endpoint5_19Output, E>

-type Endpoint5_20Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
+type Endpoint5_20Request = Parameters<RawClient["server.session"]["session.context"]>[0]
 export type Endpoint5_20Input = { readonly sessionID: Endpoint5_20Request["params"]["sessionID"] }
-export type Endpoint5_20Output = EffectValue<ReturnType<RawClient["server.session"]["session.revert.commit"]>>
-export type SessionRevertCommitOperation<E = never> = (input: Endpoint5_20Input) => Effect.Effect<Endpoint5_20Output, E>
+export type Endpoint5_20Output = EffectValue<ReturnType<RawClient["server.session"]["session.context"]>>["data"]
+export type SessionContextOperation<E = never> = (input: Endpoint5_20Input) => Effect.Effect<Endpoint5_20Output, E>

-type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.context"]>[0]
+type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.pending.list"]>[0]
 export type Endpoint5_21Input = { readonly sessionID: Endpoint5_21Request["params"]["sessionID"] }
-export type Endpoint5_21Output = EffectValue<ReturnType<RawClient["server.session"]["session.context"]>>["data"]
-export type SessionContextOperation<E = never> = (input: Endpoint5_21Input) => Effect.Effect<Endpoint5_21Output, E>
+export type Endpoint5_21Output = EffectValue<ReturnType<RawClient["server.session"]["session.pending.list"]>>["data"]
+export type SessionPendingListOperation<E = never> = (input: Endpoint5_21Input) => Effect.Effect<Endpoint5_21Output, E>

-type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.pending.list"]>[0]
+type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
 export type Endpoint5_22Input = { readonly sessionID: Endpoint5_22Request["params"]["sessionID"] }
-export type Endpoint5_22Output = EffectValue<ReturnType<RawClient["server.session"]["session.pending.list"]>>["data"]
-export type SessionPendingListOperation<E = never> = (input: Endpoint5_22Input) => Effect.Effect<Endpoint5_22Output, E>
-
-type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
-export type Endpoint5_23Input = { readonly sessionID: Endpoint5_23Request["params"]["sessionID"] }
-export type Endpoint5_23Output = EffectValue<
+export type Endpoint5_22Output = EffectValue<
  ReturnType<RawClient["server.session"]["session.instructions.entry.list"]>
 >["data"]
 export type SessionInstructionsEntryListOperation<E = never> = (
+  input: Endpoint5_22Input,
+) => Effect.Effect<Endpoint5_22Output, E>
+
+type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
+export type Endpoint5_23Input = {
+  readonly sessionID: Endpoint5_23Request["params"]["sessionID"]
+  readonly key: Endpoint5_23Request["params"]["key"]
+  readonly value: Endpoint5_23Request["payload"]["value"]
+}
+export type Endpoint5_23Output = EffectValue<ReturnType<RawClient["server.session"]["session.instructions.entry.put"]>>
+export type SessionInstructionsEntryPutOperation<E = never> = (
  input: Endpoint5_23Input,
 ) => Effect.Effect<Endpoint5_23Output, E>

-type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
+type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
 export type Endpoint5_24Input = {
  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
  readonly key: Endpoint5_24Request["params"]["key"]
-  readonly value: Endpoint5_24Request["payload"]["value"]
 }
-export type Endpoint5_24Output = EffectValue<ReturnType<RawClient["server.session"]["session.instructions.entry.put"]>>
-export type SessionInstructionsEntryPutOperation<E = never> = (
-  input: Endpoint5_24Input,
-) => Effect.Effect<Endpoint5_24Output, E>
-
-type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
-export type Endpoint5_25Input = {
-  readonly sessionID: Endpoint5_25Request["params"]["sessionID"]
-  readonly key: Endpoint5_25Request["params"]["key"]
-}
-export type Endpoint5_25Output = EffectValue<
+export type Endpoint5_24Output = EffectValue<
  ReturnType<RawClient["server.session"]["session.instructions.entry.remove"]>
 >
 export type SessionInstructionsEntryRemoveOperation<E = never> = (
-  input: Endpoint5_25Input,
-) => Effect.Effect<Endpoint5_25Output, E>
+  input: Endpoint5_24Input,
+) => Effect.Effect<Endpoint5_24Output, E>

-type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.generate"]>[0]
+type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.generate"]>[0]
+export type Endpoint5_25Input = {
+  readonly sessionID: Endpoint5_25Request["params"]["sessionID"]
+  readonly prompt: Endpoint5_25Request["payload"]["prompt"]
+}
+export type Endpoint5_25Output = EffectValue<ReturnType<RawClient["server.session"]["session.generate"]>>["data"]
+export type SessionGenerateOperation<E = never> = (input: Endpoint5_25Input) => Effect.Effect<Endpoint5_25Output, E>
+
+type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.log"]>[0]
 export type Endpoint5_26Input = {
  readonly sessionID: Endpoint5_26Request["params"]["sessionID"]
-  readonly prompt: Endpoint5_26Request["payload"]["prompt"]
+  readonly after?: Endpoint5_26Request["query"]["after"]
+  readonly follow?: Endpoint5_26Request["query"]["follow"]
 }
-export type Endpoint5_26Output = EffectValue<ReturnType<RawClient["server.session"]["session.generate"]>>["data"]
-export type SessionGenerateOperation<E = never> = (input: Endpoint5_26Input) => Effect.Effect<Endpoint5_26Output, E>
+export type Endpoint5_26Output = StreamValue<EffectValue<ReturnType<RawClient["server.session"]["session.log"]>>>
+export type SessionLogOperation<E = never> = (input: Endpoint5_26Input) => Stream.Stream<Endpoint5_26Output, E>

-type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.log"]>[0]
-export type Endpoint5_27Input = {
-  readonly sessionID: Endpoint5_27Request["params"]["sessionID"]
-  readonly after?: Endpoint5_27Request["query"]["after"]
-  readonly follow?: Endpoint5_27Request["query"]["follow"]
-}
-export type Endpoint5_27Output = StreamValue<EffectValue<ReturnType<RawClient["server.session"]["session.log"]>>>
-export type SessionLogOperation<E = never> = (input: Endpoint5_27Input) => Stream.Stream<Endpoint5_27Output, E>
+type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+export type Endpoint5_27Input = { readonly sessionID: Endpoint5_27Request["params"]["sessionID"] }
+export type Endpoint5_27Output = EffectValue<ReturnType<RawClient["server.session"]["session.interrupt"]>>
+export type SessionInterruptOperation<E = never> = (input: Endpoint5_27Input) => Effect.Effect<Endpoint5_27Output, E>

-type Endpoint5_28Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+type Endpoint5_28Request = Parameters<RawClient["server.session"]["session.background"]>[0]
 export type Endpoint5_28Input = { readonly sessionID: Endpoint5_28Request["params"]["sessionID"] }
-export type Endpoint5_28Output = EffectValue<ReturnType<RawClient["server.session"]["session.interrupt"]>>
-export type SessionInterruptOperation<E = never> = (input: Endpoint5_28Input) => Effect.Effect<Endpoint5_28Output, E>
+export type Endpoint5_28Output = EffectValue<ReturnType<RawClient["server.session"]["session.background"]>>
+export type SessionBackgroundOperation<E = never> = (input: Endpoint5_28Input) => Effect.Effect<Endpoint5_28Output, E>

-type Endpoint5_29Request = Parameters<RawClient["server.session"]["session.background"]>[0]
-export type Endpoint5_29Input = { readonly sessionID: Endpoint5_29Request["params"]["sessionID"] }
-export type Endpoint5_29Output = EffectValue<ReturnType<RawClient["server.session"]["session.background"]>>
-export type SessionBackgroundOperation<E = never> = (input: Endpoint5_29Input) => Effect.Effect<Endpoint5_29Output, E>
-
-type Endpoint5_30Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-export type Endpoint5_30Input = {
-  readonly sessionID: Endpoint5_30Request["params"]["sessionID"]
-  readonly messageID: Endpoint5_30Request["params"]["messageID"]
+type Endpoint5_29Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+export type Endpoint5_29Input = {
+  readonly sessionID: Endpoint5_29Request["params"]["sessionID"]
+  readonly messageID: Endpoint5_29Request["params"]["messageID"]
 }
-export type Endpoint5_30Output = EffectValue<ReturnType<RawClient["server.session"]["session.message"]>>["data"]
-export type SessionMessageOperation<E = never> = (input: Endpoint5_30Input) => Effect.Effect<Endpoint5_30Output, E>
+export type Endpoint5_29Output = EffectValue<ReturnType<RawClient["server.session"]["session.message"]>>["data"]
+export type SessionMessageOperation<E = never> = (input: Endpoint5_29Input) => Effect.Effect<Endpoint5_29Output, E>

 export interface SessionApi<E = never> {
  readonly list: SessionListOperation<E>
@@ -319,7 +314,6 @@ export interface SessionApi<E = never> {
  readonly switchAgent: SessionSwitchAgentOperation<E>
  readonly switchModel: SessionSwitchModelOperation<E>
  readonly rename: SessionRenameOperation<E>
-  readonly archive: SessionArchiveOperation<E>
  readonly move: SessionMoveOperation<E>
  readonly prompt: SessionPromptOperation<E>
  readonly command: SessionCommandOperation<E>
@@ -620,32 +614,21 @@ export interface CredentialApi<E = never> {
 export type Endpoint13_0Output = EffectValue<ReturnType<RawClient["server.project"]["project.list"]>>
 export type ProjectListOperation<E = never> = () => Effect.Effect<Endpoint13_0Output, E>

-type Endpoint13_1Request = Parameters<RawClient["server.project"]["project.update"]>[0]
-export type Endpoint13_1Input = {
-  readonly projectID: Endpoint13_1Request["params"]["projectID"]
-  readonly name?: Endpoint13_1Request["payload"]["name"]
-  readonly icon?: Endpoint13_1Request["payload"]["icon"]
-  readonly commands?: Endpoint13_1Request["payload"]["commands"]
-}
-export type Endpoint13_1Output = EffectValue<ReturnType<RawClient["server.project"]["project.update"]>>
-export type ProjectUpdateOperation<E = never> = (input: Endpoint13_1Input) => Effect.Effect<Endpoint13_1Output, E>
+type Endpoint13_1Request = Parameters<RawClient["server.project"]["project.current"]>[0]
+export type Endpoint13_1Input = { readonly location?: Endpoint13_1Request["query"]["location"] }
+export type Endpoint13_1Output = EffectValue<ReturnType<RawClient["server.project"]["project.current"]>>
+export type ProjectCurrentOperation<E = never> = (input?: Endpoint13_1Input) => Effect.Effect<Endpoint13_1Output, E>

-type Endpoint13_2Request = Parameters<RawClient["server.project"]["project.current"]>[0]
-export type Endpoint13_2Input = { readonly location?: Endpoint13_2Request["query"]["location"] }
-export type Endpoint13_2Output = EffectValue<ReturnType<RawClient["server.project"]["project.current"]>>
-export type ProjectCurrentOperation<E = never> = (input?: Endpoint13_2Input) => Effect.Effect<Endpoint13_2Output, E>
-
-type Endpoint13_3Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
-export type Endpoint13_3Input = {
-  readonly projectID: Endpoint13_3Request["params"]["projectID"]
-  readonly location?: Endpoint13_3Request["query"]["location"]
+type Endpoint13_2Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
+export type Endpoint13_2Input = {
+  readonly projectID: Endpoint13_2Request["params"]["projectID"]
+  readonly location?: Endpoint13_2Request["query"]["location"]
 }
-export type Endpoint13_3Output = EffectValue<ReturnType<RawClient["server.project"]["project.directories"]>>
-export type ProjectDirectoriesOperation<E = never> = (input: Endpoint13_3Input) => Effect.Effect<Endpoint13_3Output, E>
+export type Endpoint13_2Output = EffectValue<ReturnType<RawClient["server.project"]["project.directories"]>>
+export type ProjectDirectoriesOperation<E = never> = (input: Endpoint13_2Input) => Effect.Effect<Endpoint13_2Output, E>

 export interface ProjectApi<E = never> {
  readonly list: ProjectListOperation<E>
-  readonly update: ProjectUpdateOperation<E>
  readonly current: ProjectCurrentOperation<E>
  readonly directories: ProjectDirectoriesOperation<E>
 }
@@ -837,71 +820,55 @@ export interface EventApi<E = never> {
  readonly subscribe: EventSubscribeOperation<E>
 }

-type Endpoint20_0Request = Parameters<RawClient["server.pty"]["pty.shells"]>[0]
+type Endpoint20_0Request = Parameters<RawClient["server.pty"]["pty.list"]>[0]
 export type Endpoint20_0Input = { readonly location?: Endpoint20_0Request["query"]["location"] }
-export type Endpoint20_0Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.shells"]>>
-export type PtyShellsOperation<E = never> = (input?: Endpoint20_0Input) => Effect.Effect<Endpoint20_0Output, E>
+export type Endpoint20_0Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.list"]>>
+export type PtyListOperation<E = never> = (input?: Endpoint20_0Input) => Effect.Effect<Endpoint20_0Output, E>

-type Endpoint20_1Request = Parameters<RawClient["server.pty"]["pty.list"]>[0]
-export type Endpoint20_1Input = { readonly location?: Endpoint20_1Request["query"]["location"] }
-export type Endpoint20_1Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.list"]>>
-export type PtyListOperation<E = never> = (input?: Endpoint20_1Input) => Effect.Effect<Endpoint20_1Output, E>
-
-type Endpoint20_2Request = Parameters<RawClient["server.pty"]["pty.create"]>[0]
-export type Endpoint20_2Input = {
-  readonly location?: Endpoint20_2Request["query"]["location"]
-  readonly command?: Endpoint20_2Request["payload"]["command"]
-  readonly args?: Endpoint20_2Request["payload"]["args"]
-  readonly cwd?: Endpoint20_2Request["payload"]["cwd"]
-  readonly title?: Endpoint20_2Request["payload"]["title"]
-  readonly env?: Endpoint20_2Request["payload"]["env"]
+type Endpoint20_1Request = Parameters<RawClient["server.pty"]["pty.create"]>[0]
+export type Endpoint20_1Input = {
+  readonly location?: Endpoint20_1Request["query"]["location"]
+  readonly command?: Endpoint20_1Request["payload"]["command"]
+  readonly args?: Endpoint20_1Request["payload"]["args"]
+  readonly cwd?: Endpoint20_1Request["payload"]["cwd"]
+  readonly title?: Endpoint20_1Request["payload"]["title"]
+  readonly env?: Endpoint20_1Request["payload"]["env"]
 }
-export type Endpoint20_2Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.create"]>>
-export type PtyCreateOperation<E = never> = (input?: Endpoint20_2Input) => Effect.Effect<Endpoint20_2Output, E>
+export type Endpoint20_1Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.create"]>>
+export type PtyCreateOperation<E = never> = (input?: Endpoint20_1Input) => Effect.Effect<Endpoint20_1Output, E>

-type Endpoint20_3Request = Parameters<RawClient["server.pty"]["pty.get"]>[0]
+type Endpoint20_2Request = Parameters<RawClient["server.pty"]["pty.get"]>[0]
+export type Endpoint20_2Input = {
+  readonly ptyID: Endpoint20_2Request["params"]["ptyID"]
+  readonly location?: Endpoint20_2Request["query"]["location"]
+}
+export type Endpoint20_2Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.get"]>>
+export type PtyGetOperation<E = never> = (input: Endpoint20_2Input) => Effect.Effect<Endpoint20_2Output, E>
+
+type Endpoint20_3Request = Parameters<RawClient["server.pty"]["pty.update"]>[0]
 export type Endpoint20_3Input = {
  readonly ptyID: Endpoint20_3Request["params"]["ptyID"]
  readonly location?: Endpoint20_3Request["query"]["location"]
+  readonly title?: Endpoint20_3Request["payload"]["title"]
+  readonly size?: Endpoint20_3Request["payload"]["size"]
 }
-export type Endpoint20_3Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.get"]>>
-export type PtyGetOperation<E = never> = (input: Endpoint20_3Input) => Effect.Effect<Endpoint20_3Output, E>
+export type Endpoint20_3Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.update"]>>
+export type PtyUpdateOperation<E = never> = (input: Endpoint20_3Input) => Effect.Effect<Endpoint20_3Output, E>

-type Endpoint20_4Request = Parameters<RawClient["server.pty"]["pty.update"]>[0]
+type Endpoint20_4Request = Parameters<RawClient["server.pty"]["pty.remove"]>[0]
 export type Endpoint20_4Input = {
  readonly ptyID: Endpoint20_4Request["params"]["ptyID"]
  readonly location?: Endpoint20_4Request["query"]["location"]
-  readonly title?: Endpoint20_4Request["payload"]["title"]
-  readonly size?: Endpoint20_4Request["payload"]["size"]
 }
-export type Endpoint20_4Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.update"]>>
-export type PtyUpdateOperation<E = never> = (input: Endpoint20_4Input) => Effect.Effect<Endpoint20_4Output, E>
-
-type Endpoint20_5Request = Parameters<RawClient["server.pty"]["pty.remove"]>[0]
-export type Endpoint20_5Input = {
-  readonly ptyID: Endpoint20_5Request["params"]["ptyID"]
-  readonly location?: Endpoint20_5Request["query"]["location"]
-}
-export type Endpoint20_5Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.remove"]>>
-export type PtyRemoveOperation<E = never> = (input: Endpoint20_5Input) => Effect.Effect<Endpoint20_5Output, E>
-
-type Endpoint20_6Request = Parameters<RawClient["server.pty"]["pty.connectToken"]>[0]
-export type Endpoint20_6Input = {
-  readonly ptyID: Endpoint20_6Request["params"]["ptyID"]
-  readonly location?: Endpoint20_6Request["query"]["location"]
-  readonly "x-opencode-ticket"?: Endpoint20_6Request["headers"]["x-opencode-ticket"]
-}
-export type Endpoint20_6Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.connectToken"]>>
-export type PtyConnectTokenOperation<E = never> = (input: Endpoint20_6Input) => Effect.Effect<Endpoint20_6Output, E>
+export type Endpoint20_4Output = EffectValue<ReturnType<RawClient["server.pty"]["pty.remove"]>>
+export type PtyRemoveOperation<E = never> = (input: Endpoint20_4Input) => Effect.Effect<Endpoint20_4Output, E>

 export interface PtyApi<E = never> {
-  readonly shells: PtyShellsOperation<E>
  readonly list: PtyListOperation<E>
  readonly create: PtyCreateOperation<E>
  readonly get: PtyGetOperation<E>
  readonly update: PtyUpdateOperation<E>
  readonly remove: PtyRemoveOperation<E>
-  readonly connectToken: PtyConnectTokenOperation<E>
 }

 type Endpoint21_0Request = Parameters<RawClient["server.shell"]["shell.list"]>[0]
@@ -1044,47 +1011,32 @@ export interface ProjectCopyApi<E = never> {
  readonly refresh: ProjectCopyRefreshOperation<E>
 }

-type Endpoint25_0Request = Parameters<RawClient["server.vcs"]["vcs.get"]>[0]
+type Endpoint25_0Request = Parameters<RawClient["server.vcs"]["vcs.status"]>[0]
 export type Endpoint25_0Input = { readonly location?: Endpoint25_0Request["query"]["location"] }
-export type Endpoint25_0Output = EffectValue<ReturnType<RawClient["server.vcs"]["vcs.get"]>>
-export type VcsGetOperation<E = never> = (input?: Endpoint25_0Input) => Effect.Effect<Endpoint25_0Output, E>
+export type Endpoint25_0Output = EffectValue<ReturnType<RawClient["server.vcs"]["vcs.status"]>>
+export type VcsStatusOperation<E = never> = (input?: Endpoint25_0Input) => Effect.Effect<Endpoint25_0Output, E>

-type Endpoint25_1Request = Parameters<RawClient["server.vcs"]["vcs.status"]>[0]
-export type Endpoint25_1Input = { readonly location?: Endpoint25_1Request["query"]["location"] }
-export type Endpoint25_1Output = EffectValue<ReturnType<RawClient["server.vcs"]["vcs.status"]>>
-export type VcsStatusOperation<E = never> = (input?: Endpoint25_1Input) => Effect.Effect<Endpoint25_1Output, E>
-
-type Endpoint25_2Request = Parameters<RawClient["server.vcs"]["vcs.diff"]>[0]
-export type Endpoint25_2Input = {
-  readonly location?: Endpoint25_2Request["query"]["location"]
-  readonly mode: Endpoint25_2Request["query"]["mode"]
-  readonly context?: Endpoint25_2Request["query"]["context"]
+type Endpoint25_1Request = Parameters<RawClient["server.vcs"]["vcs.diff"]>[0]
+export type Endpoint25_1Input = {
+  readonly location?: Endpoint25_1Request["query"]["location"]
+  readonly mode: Endpoint25_1Request["query"]["mode"]
+  readonly context?: Endpoint25_1Request["query"]["context"]
 }
-export type Endpoint25_2Output = EffectValue<ReturnType<RawClient["server.vcs"]["vcs.diff"]>>
-export type VcsDiffOperation<E = never> = (input: Endpoint25_2Input) => Effect.Effect<Endpoint25_2Output, E>
+export type Endpoint25_1Output = EffectValue<ReturnType<RawClient["server.vcs"]["vcs.diff"]>>
+export type VcsDiffOperation<E = never> = (input: Endpoint25_1Input) => Effect.Effect<Endpoint25_1Output, E>

 export interface VcsApi<E = never> {
-  readonly get: VcsGetOperation<E>
  readonly status: VcsStatusOperation<E>
  readonly diff: VcsDiffOperation<E>
 }

-type Endpoint26_0Request = Parameters<RawClient["server.path"]["path.get"]>[0]
-export type Endpoint26_0Input = { readonly location?: Endpoint26_0Request["query"]["location"] }
-export type Endpoint26_0Output = EffectValue<ReturnType<RawClient["server.path"]["path.get"]>>
-export type PathGetOperation<E = never> = (input?: Endpoint26_0Input) => Effect.Effect<Endpoint26_0Output, E>
+export type Endpoint26_0Output = EffectValue<ReturnType<RawClient["server.debug"]["debug.location"]>>
+export type DebugLocationListOperation<E = never> = () => Effect.Effect<Endpoint26_0Output, E>

-export interface PathApi<E = never> {
-  readonly get: PathGetOperation<E>
-}
-
-export type Endpoint27_0Output = EffectValue<ReturnType<RawClient["server.debug"]["debug.location"]>>
-export type DebugLocationListOperation<E = never> = () => Effect.Effect<Endpoint27_0Output, E>
-
-type Endpoint27_1Request = Parameters<RawClient["server.debug"]["debug.location.evict"]>[0]
-export type Endpoint27_1Input = { readonly location?: Endpoint27_1Request["query"]["location"] }
-export type Endpoint27_1Output = EffectValue<ReturnType<RawClient["server.debug"]["debug.location.evict"]>>
-export type DebugLocationEvictOperation<E = never> = (input?: Endpoint27_1Input) => Effect.Effect<Endpoint27_1Output, E>
+type Endpoint26_1Request = Parameters<RawClient["server.debug"]["debug.location.evict"]>[0]
+export type Endpoint26_1Input = { readonly location?: Endpoint26_1Request["query"]["location"] }
+export type Endpoint26_1Output = EffectValue<ReturnType<RawClient["server.debug"]["debug.location.evict"]>>
+export type DebugLocationEvictOperation<E = never> = (input?: Endpoint26_1Input) => Effect.Effect<Endpoint26_1Output, E>

 export interface DebugApi<E = never> {
  readonly location: { readonly list: DebugLocationListOperation<E>; readonly evict: DebugLocationEvictOperation<E> }
@@ -1117,6 +1069,5 @@ export interface AppApi<E = never> {
  readonly reference: ReferenceApi<E>
  readonly projectCopy: ProjectCopyApi<E>
  readonly vcs: VcsApi<E>
-  readonly path: PathApi<E>
  readonly debug: DebugApi<E>
 }
@@ -151,35 +151,30 @@ const Endpoint5_8 = (raw: RawClient["server.session"]) => (input: Endpoint5_8Inp
    Effect.mapError(mapClientError),
  )

-type Endpoint5_9Request = Parameters<RawClient["server.session"]["session.archive"]>[0]
-type Endpoint5_9Input = { readonly sessionID: Endpoint5_9Request["params"]["sessionID"] }
-const Endpoint5_9 = (raw: RawClient["server.session"]) => (input: Endpoint5_9Input) =>
-  raw["session.archive"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint5_10Request = Parameters<RawClient["server.session"]["session.move"]>[0]
-type Endpoint5_10Input = {
-  readonly sessionID: Endpoint5_10Request["params"]["sessionID"]
-  readonly directory: Endpoint5_10Request["payload"]["directory"]
-  readonly workspaceID?: Endpoint5_10Request["payload"]["workspaceID"]
+type Endpoint5_9Request = Parameters<RawClient["server.session"]["session.move"]>[0]
+type Endpoint5_9Input = {
+  readonly sessionID: Endpoint5_9Request["params"]["sessionID"]
+  readonly directory: Endpoint5_9Request["payload"]["directory"]
+  readonly workspaceID?: Endpoint5_9Request["payload"]["workspaceID"]
 }
-const Endpoint5_10 = (raw: RawClient["server.session"]) => (input: Endpoint5_10Input) =>
+const Endpoint5_9 = (raw: RawClient["server.session"]) => (input: Endpoint5_9Input) =>
  raw["session.move"]({
    params: { sessionID: input["sessionID"] },
    payload: { directory: input["directory"], workspaceID: input["workspaceID"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_11Request = Parameters<RawClient["server.session"]["session.prompt"]>[0]
-type Endpoint5_11Input = {
-  readonly sessionID: Endpoint5_11Request["params"]["sessionID"]
-  readonly id?: Endpoint5_11Request["payload"]["id"]
-  readonly text: Endpoint5_11Request["payload"]["text"]
-  readonly files?: Endpoint5_11Request["payload"]["files"]
-  readonly agents?: Endpoint5_11Request["payload"]["agents"]
-  readonly metadata?: Endpoint5_11Request["payload"]["metadata"]
-  readonly delivery?: Endpoint5_11Request["payload"]["delivery"]
-  readonly resume?: Endpoint5_11Request["payload"]["resume"]
+type Endpoint5_10Request = Parameters<RawClient["server.session"]["session.prompt"]>[0]
+type Endpoint5_10Input = {
+  readonly sessionID: Endpoint5_10Request["params"]["sessionID"]
+  readonly id?: Endpoint5_10Request["payload"]["id"]
+  readonly text: Endpoint5_10Request["payload"]["text"]
+  readonly files?: Endpoint5_10Request["payload"]["files"]
+  readonly agents?: Endpoint5_10Request["payload"]["agents"]
+  readonly metadata?: Endpoint5_10Request["payload"]["metadata"]
+  readonly delivery?: Endpoint5_10Request["payload"]["delivery"]
+  readonly resume?: Endpoint5_10Request["payload"]["resume"]
 }
-const Endpoint5_11 = (raw: RawClient["server.session"]) => (input: Endpoint5_11Input) =>
+const Endpoint5_10 = (raw: RawClient["server.session"]) => (input: Endpoint5_10Input) =>
  raw["session.prompt"]({
    params: { sessionID: input["sessionID"] },
    payload: {
@@ -196,20 +191,20 @@ const Endpoint5_11 = (raw: RawClient["server.session"]) => (input: Endpoint5_11I
    Effect.map((value) => value.data),
  )

-type Endpoint5_12Request = Parameters<RawClient["server.session"]["session.command"]>[0]
-type Endpoint5_12Input = {
-  readonly sessionID: Endpoint5_12Request["params"]["sessionID"]
-  readonly id?: Endpoint5_12Request["payload"]["id"]
-  readonly command: Endpoint5_12Request["payload"]["command"]
-  readonly arguments?: Endpoint5_12Request["payload"]["arguments"]
-  readonly agent?: Endpoint5_12Request["payload"]["agent"]
-  readonly model?: Endpoint5_12Request["payload"]["model"]
-  readonly files?: Endpoint5_12Request["payload"]["files"]
-  readonly agents?: Endpoint5_12Request["payload"]["agents"]
-  readonly delivery?: Endpoint5_12Request["payload"]["delivery"]
-  readonly resume?: Endpoint5_12Request["payload"]["resume"]
+type Endpoint5_11Request = Parameters<RawClient["server.session"]["session.command"]>[0]
+type Endpoint5_11Input = {
+  readonly sessionID: Endpoint5_11Request["params"]["sessionID"]
+  readonly id?: Endpoint5_11Request["payload"]["id"]
+  readonly command: Endpoint5_11Request["payload"]["command"]
+  readonly arguments?: Endpoint5_11Request["payload"]["arguments"]
+  readonly agent?: Endpoint5_11Request["payload"]["agent"]
+  readonly model?: Endpoint5_11Request["payload"]["model"]
+  readonly files?: Endpoint5_11Request["payload"]["files"]
+  readonly agents?: Endpoint5_11Request["payload"]["agents"]
+  readonly delivery?: Endpoint5_11Request["payload"]["delivery"]
+  readonly resume?: Endpoint5_11Request["payload"]["resume"]
 }
-const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12Input) =>
+const Endpoint5_11 = (raw: RawClient["server.session"]) => (input: Endpoint5_11Input) =>
  raw["session.command"]({
    params: { sessionID: input["sessionID"] },
    payload: {
@@ -228,30 +223,30 @@ const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12I
    Effect.map((value) => value.data),
  )

-type Endpoint5_13Request = Parameters<RawClient["server.session"]["session.skill"]>[0]
-type Endpoint5_13Input = {
-  readonly sessionID: Endpoint5_13Request["params"]["sessionID"]
-  readonly id?: Endpoint5_13Request["payload"]["id"]
-  readonly skill: Endpoint5_13Request["payload"]["skill"]
-  readonly resume?: Endpoint5_13Request["payload"]["resume"]
+type Endpoint5_12Request = Parameters<RawClient["server.session"]["session.skill"]>[0]
+type Endpoint5_12Input = {
+  readonly sessionID: Endpoint5_12Request["params"]["sessionID"]
+  readonly id?: Endpoint5_12Request["payload"]["id"]
+  readonly skill: Endpoint5_12Request["payload"]["skill"]
+  readonly resume?: Endpoint5_12Request["payload"]["resume"]
 }
-const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13Input) =>
+const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12Input) =>
  raw["session.skill"]({
    params: { sessionID: input["sessionID"] },
    payload: { id: input["id"], skill: input["skill"], resume: input["resume"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_14Request = Parameters<RawClient["server.session"]["session.synthetic"]>[0]
-type Endpoint5_14Input = {
-  readonly sessionID: Endpoint5_14Request["params"]["sessionID"]
-  readonly id?: Endpoint5_14Request["payload"]["id"]
-  readonly text: Endpoint5_14Request["payload"]["text"]
-  readonly description?: Endpoint5_14Request["payload"]["description"]
-  readonly metadata?: Endpoint5_14Request["payload"]["metadata"]
-  readonly delivery?: Endpoint5_14Request["payload"]["delivery"]
-  readonly resume?: Endpoint5_14Request["payload"]["resume"]
+type Endpoint5_13Request = Parameters<RawClient["server.session"]["session.synthetic"]>[0]
+type Endpoint5_13Input = {
+  readonly sessionID: Endpoint5_13Request["params"]["sessionID"]
+  readonly id?: Endpoint5_13Request["payload"]["id"]
+  readonly text: Endpoint5_13Request["payload"]["text"]
+  readonly description?: Endpoint5_13Request["payload"]["description"]
+  readonly metadata?: Endpoint5_13Request["payload"]["metadata"]
+  readonly delivery?: Endpoint5_13Request["payload"]["delivery"]
+  readonly resume?: Endpoint5_13Request["payload"]["resume"]
 }
-const Endpoint5_14 = (raw: RawClient["server.session"]) => (input: Endpoint5_14Input) =>
+const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13Input) =>
  raw["session.synthetic"]({
    params: { sessionID: input["sessionID"] },
    payload: {
@@ -267,41 +262,41 @@ const Endpoint5_14 = (raw: RawClient["server.session"]) => (input: Endpoint5_14I
    Effect.map((value) => value.data),
  )

-type Endpoint5_15Request = Parameters<RawClient["server.session"]["session.shell"]>[0]
-type Endpoint5_15Input = {
-  readonly sessionID: Endpoint5_15Request["params"]["sessionID"]
-  readonly id?: Endpoint5_15Request["payload"]["id"]
-  readonly command: Endpoint5_15Request["payload"]["command"]
+type Endpoint5_14Request = Parameters<RawClient["server.session"]["session.shell"]>[0]
+type Endpoint5_14Input = {
+  readonly sessionID: Endpoint5_14Request["params"]["sessionID"]
+  readonly id?: Endpoint5_14Request["payload"]["id"]
+  readonly command: Endpoint5_14Request["payload"]["command"]
 }
-const Endpoint5_15 = (raw: RawClient["server.session"]) => (input: Endpoint5_15Input) =>
+const Endpoint5_14 = (raw: RawClient["server.session"]) => (input: Endpoint5_14Input) =>
  raw["session.shell"]({
    params: { sessionID: input["sessionID"] },
    payload: { id: input["id"], command: input["command"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_16Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
-type Endpoint5_16Input = {
-  readonly sessionID: Endpoint5_16Request["params"]["sessionID"]
-  readonly id?: Endpoint5_16Request["payload"]["id"]
+type Endpoint5_15Request = Parameters<RawClient["server.session"]["session.compact"]>[0]
+type Endpoint5_15Input = {
+  readonly sessionID: Endpoint5_15Request["params"]["sessionID"]
+  readonly id?: Endpoint5_15Request["payload"]["id"]
 }
-const Endpoint5_16 = (raw: RawClient["server.session"]) => (input: Endpoint5_16Input) =>
+const Endpoint5_15 = (raw: RawClient["server.session"]) => (input: Endpoint5_15Input) =>
  raw["session.compact"]({ params: { sessionID: input["sessionID"] }, payload: { id: input["id"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint5_17Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
-type Endpoint5_17Input = { readonly sessionID: Endpoint5_17Request["params"]["sessionID"] }
-const Endpoint5_17 = (raw: RawClient["server.session"]) => (input: Endpoint5_17Input) =>
+type Endpoint5_16Request = Parameters<RawClient["server.session"]["session.wait"]>[0]
+type Endpoint5_16Input = { readonly sessionID: Endpoint5_16Request["params"]["sessionID"] }
+const Endpoint5_16 = (raw: RawClient["server.session"]) => (input: Endpoint5_16Input) =>
  raw["session.wait"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_18Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
-type Endpoint5_18Input = {
-  readonly sessionID: Endpoint5_18Request["params"]["sessionID"]
-  readonly messageID: Endpoint5_18Request["payload"]["messageID"]
-  readonly files?: Endpoint5_18Request["payload"]["files"]
+type Endpoint5_17Request = Parameters<RawClient["server.session"]["session.revert.stage"]>[0]
+type Endpoint5_17Input = {
+  readonly sessionID: Endpoint5_17Request["params"]["sessionID"]
+  readonly messageID: Endpoint5_17Request["payload"]["messageID"]
+  readonly files?: Endpoint5_17Request["payload"]["files"]
 }
-const Endpoint5_18 = (raw: RawClient["server.session"]) => (input: Endpoint5_18Input) =>
+const Endpoint5_17 = (raw: RawClient["server.session"]) => (input: Endpoint5_17Input) =>
  raw["session.revert.stage"]({
    params: { sessionID: input["sessionID"] },
    payload: { messageID: input["messageID"], files: input["files"] },
@@ -310,80 +305,80 @@ const Endpoint5_18 = (raw: RawClient["server.session"]) => (input: Endpoint5_18I
    Effect.map((value) => value.data),
  )

-type Endpoint5_19Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
-type Endpoint5_19Input = { readonly sessionID: Endpoint5_19Request["params"]["sessionID"] }
-const Endpoint5_19 = (raw: RawClient["server.session"]) => (input: Endpoint5_19Input) =>
+type Endpoint5_18Request = Parameters<RawClient["server.session"]["session.revert.clear"]>[0]
+type Endpoint5_18Input = { readonly sessionID: Endpoint5_18Request["params"]["sessionID"] }
+const Endpoint5_18 = (raw: RawClient["server.session"]) => (input: Endpoint5_18Input) =>
  raw["session.revert.clear"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_20Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
-type Endpoint5_20Input = { readonly sessionID: Endpoint5_20Request["params"]["sessionID"] }
-const Endpoint5_20 = (raw: RawClient["server.session"]) => (input: Endpoint5_20Input) =>
+type Endpoint5_19Request = Parameters<RawClient["server.session"]["session.revert.commit"]>[0]
+type Endpoint5_19Input = { readonly sessionID: Endpoint5_19Request["params"]["sessionID"] }
+const Endpoint5_19 = (raw: RawClient["server.session"]) => (input: Endpoint5_19Input) =>
  raw["session.revert.commit"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.context"]>[0]
-type Endpoint5_21Input = { readonly sessionID: Endpoint5_21Request["params"]["sessionID"] }
-const Endpoint5_21 = (raw: RawClient["server.session"]) => (input: Endpoint5_21Input) =>
+type Endpoint5_20Request = Parameters<RawClient["server.session"]["session.context"]>[0]
+type Endpoint5_20Input = { readonly sessionID: Endpoint5_20Request["params"]["sessionID"] }
+const Endpoint5_20 = (raw: RawClient["server.session"]) => (input: Endpoint5_20Input) =>
  raw["session.context"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.pending.list"]>[0]
-type Endpoint5_22Input = { readonly sessionID: Endpoint5_22Request["params"]["sessionID"] }
-const Endpoint5_22 = (raw: RawClient["server.session"]) => (input: Endpoint5_22Input) =>
+type Endpoint5_21Request = Parameters<RawClient["server.session"]["session.pending.list"]>[0]
+type Endpoint5_21Input = { readonly sessionID: Endpoint5_21Request["params"]["sessionID"] }
+const Endpoint5_21 = (raw: RawClient["server.session"]) => (input: Endpoint5_21Input) =>
  raw["session.pending.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
-type Endpoint5_23Input = { readonly sessionID: Endpoint5_23Request["params"]["sessionID"] }
-const Endpoint5_23 = (raw: RawClient["server.session"]) => (input: Endpoint5_23Input) =>
+type Endpoint5_22Request = Parameters<RawClient["server.session"]["session.instructions.entry.list"]>[0]
+type Endpoint5_22Input = { readonly sessionID: Endpoint5_22Request["params"]["sessionID"] }
+const Endpoint5_22 = (raw: RawClient["server.session"]) => (input: Endpoint5_22Input) =>
  raw["session.instructions.entry.list"]({ params: { sessionID: input["sessionID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
-type Endpoint5_24Input = {
-  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
-  readonly key: Endpoint5_24Request["params"]["key"]
-  readonly value: Endpoint5_24Request["payload"]["value"]
+type Endpoint5_23Request = Parameters<RawClient["server.session"]["session.instructions.entry.put"]>[0]
+type Endpoint5_23Input = {
+  readonly sessionID: Endpoint5_23Request["params"]["sessionID"]
+  readonly key: Endpoint5_23Request["params"]["key"]
+  readonly value: Endpoint5_23Request["payload"]["value"]
 }
-const Endpoint5_24 = (raw: RawClient["server.session"]) => (input: Endpoint5_24Input) =>
+const Endpoint5_23 = (raw: RawClient["server.session"]) => (input: Endpoint5_23Input) =>
  raw["session.instructions.entry.put"]({
    params: { sessionID: input["sessionID"], key: input["key"] },
    payload: { value: input["value"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
-type Endpoint5_25Input = {
-  readonly sessionID: Endpoint5_25Request["params"]["sessionID"]
-  readonly key: Endpoint5_25Request["params"]["key"]
+type Endpoint5_24Request = Parameters<RawClient["server.session"]["session.instructions.entry.remove"]>[0]
+type Endpoint5_24Input = {
+  readonly sessionID: Endpoint5_24Request["params"]["sessionID"]
+  readonly key: Endpoint5_24Request["params"]["key"]
 }
-const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25Input) =>
+const Endpoint5_24 = (raw: RawClient["server.session"]) => (input: Endpoint5_24Input) =>
  raw["session.instructions.entry.remove"]({ params: { sessionID: input["sessionID"], key: input["key"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.generate"]>[0]
-type Endpoint5_26Input = {
-  readonly sessionID: Endpoint5_26Request["params"]["sessionID"]
-  readonly prompt: Endpoint5_26Request["payload"]["prompt"]
+type Endpoint5_25Request = Parameters<RawClient["server.session"]["session.generate"]>[0]
+type Endpoint5_25Input = {
+  readonly sessionID: Endpoint5_25Request["params"]["sessionID"]
+  readonly prompt: Endpoint5_25Request["payload"]["prompt"]
 }
-const Endpoint5_26 = (raw: RawClient["server.session"]) => (input: Endpoint5_26Input) =>
+const Endpoint5_25 = (raw: RawClient["server.session"]) => (input: Endpoint5_25Input) =>
  raw["session.generate"]({ params: { sessionID: input["sessionID"] }, payload: { prompt: input["prompt"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
  )

-type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.log"]>[0]
-type Endpoint5_27Input = {
-  readonly sessionID: Endpoint5_27Request["params"]["sessionID"]
-  readonly after?: Endpoint5_27Request["query"]["after"]
-  readonly follow?: Endpoint5_27Request["query"]["follow"]
+type Endpoint5_26Request = Parameters<RawClient["server.session"]["session.log"]>[0]
+type Endpoint5_26Input = {
+  readonly sessionID: Endpoint5_26Request["params"]["sessionID"]
+  readonly after?: Endpoint5_26Request["query"]["after"]
+  readonly follow?: Endpoint5_26Request["query"]["follow"]
 }
-const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27Input) =>
+const Endpoint5_26 = (raw: RawClient["server.session"]) => (input: Endpoint5_26Input) =>
  Stream.unwrap(
    raw["session.log"]({
      params: { sessionID: input["sessionID"] },
@@ -394,22 +389,22 @@ const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27I
    ),
  )

-type Endpoint5_28Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
-type Endpoint5_28Input = { readonly sessionID: Endpoint5_28Request["params"]["sessionID"] }
-const Endpoint5_28 = (raw: RawClient["server.session"]) => (input: Endpoint5_28Input) =>
+type Endpoint5_27Request = Parameters<RawClient["server.session"]["session.interrupt"]>[0]
+type Endpoint5_27Input = { readonly sessionID: Endpoint5_27Request["params"]["sessionID"] }
+const Endpoint5_27 = (raw: RawClient["server.session"]) => (input: Endpoint5_27Input) =>
  raw["session.interrupt"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_29Request = Parameters<RawClient["server.session"]["session.background"]>[0]
-type Endpoint5_29Input = { readonly sessionID: Endpoint5_29Request["params"]["sessionID"] }
-const Endpoint5_29 = (raw: RawClient["server.session"]) => (input: Endpoint5_29Input) =>
+type Endpoint5_28Request = Parameters<RawClient["server.session"]["session.background"]>[0]
+type Endpoint5_28Input = { readonly sessionID: Endpoint5_28Request["params"]["sessionID"] }
+const Endpoint5_28 = (raw: RawClient["server.session"]) => (input: Endpoint5_28Input) =>
  raw["session.background"]({ params: { sessionID: input["sessionID"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint5_30Request = Parameters<RawClient["server.session"]["session.message"]>[0]
-type Endpoint5_30Input = {
-  readonly sessionID: Endpoint5_30Request["params"]["sessionID"]
-  readonly messageID: Endpoint5_30Request["params"]["messageID"]
+type Endpoint5_29Request = Parameters<RawClient["server.session"]["session.message"]>[0]
+type Endpoint5_29Input = {
+  readonly sessionID: Endpoint5_29Request["params"]["sessionID"]
+  readonly messageID: Endpoint5_29Request["params"]["messageID"]
 }
-const Endpoint5_30 = (raw: RawClient["server.session"]) => (input: Endpoint5_30Input) =>
+const Endpoint5_29 = (raw: RawClient["server.session"]) => (input: Endpoint5_29Input) =>
  raw["session.message"]({ params: { sessionID: input["sessionID"], messageID: input["messageID"] } }).pipe(
    Effect.mapError(mapClientError),
    Effect.map((value) => value.data),
@@ -425,24 +420,23 @@ const adaptGroup5 = (raw: RawClient["server.session"]) => ({
  switchAgent: Endpoint5_6(raw),
  switchModel: Endpoint5_7(raw),
  rename: Endpoint5_8(raw),
-  archive: Endpoint5_9(raw),
-  move: Endpoint5_10(raw),
-  prompt: Endpoint5_11(raw),
-  command: Endpoint5_12(raw),
-  skill: Endpoint5_13(raw),
-  synthetic: Endpoint5_14(raw),
-  shell: Endpoint5_15(raw),
-  compact: Endpoint5_16(raw),
-  wait: Endpoint5_17(raw),
-  revert: { stage: Endpoint5_18(raw), clear: Endpoint5_19(raw), commit: Endpoint5_20(raw) },
-  context: Endpoint5_21(raw),
-  pending: { list: Endpoint5_22(raw) },
-  instructions: { entry: { list: Endpoint5_23(raw), put: Endpoint5_24(raw), remove: Endpoint5_25(raw) } },
-  generate: Endpoint5_26(raw),
-  log: Endpoint5_27(raw),
-  interrupt: Endpoint5_28(raw),
-  background: Endpoint5_29(raw),
-  message: Endpoint5_30(raw),
+  move: Endpoint5_9(raw),
+  prompt: Endpoint5_10(raw),
+  command: Endpoint5_11(raw),
+  skill: Endpoint5_12(raw),
+  synthetic: Endpoint5_13(raw),
+  shell: Endpoint5_14(raw),
+  compact: Endpoint5_15(raw),
+  wait: Endpoint5_16(raw),
+  revert: { stage: Endpoint5_17(raw), clear: Endpoint5_18(raw), commit: Endpoint5_19(raw) },
+  context: Endpoint5_20(raw),
+  pending: { list: Endpoint5_21(raw) },
+  instructions: { entry: { list: Endpoint5_22(raw), put: Endpoint5_23(raw), remove: Endpoint5_24(raw) } },
+  generate: Endpoint5_25(raw),
+  log: Endpoint5_26(raw),
+  interrupt: Endpoint5_27(raw),
+  background: Endpoint5_28(raw),
+  message: Endpoint5_29(raw),
 })

 type Endpoint6_0Request = Parameters<RawClient["server.message"]["session.messages"]>[0]
@@ -742,30 +736,17 @@ const adaptGroup12 = (raw: RawClient["server.credential"]) => ({ update: Endpoin
 const Endpoint13_0 = (raw: RawClient["server.project"]) => () =>
  raw["project.list"]({}).pipe(Effect.mapError(mapClientError))

-type Endpoint13_1Request = Parameters<RawClient["server.project"]["project.update"]>[0]
-type Endpoint13_1Input = {
-  readonly projectID: Endpoint13_1Request["params"]["projectID"]
-  readonly name?: Endpoint13_1Request["payload"]["name"]
-  readonly icon?: Endpoint13_1Request["payload"]["icon"]
-  readonly commands?: Endpoint13_1Request["payload"]["commands"]
-}
-const Endpoint13_1 = (raw: RawClient["server.project"]) => (input: Endpoint13_1Input) =>
-  raw["project.update"]({
-    params: { projectID: input["projectID"] },
-    payload: { name: input["name"], icon: input["icon"], commands: input["commands"] },
-  }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint13_2Request = Parameters<RawClient["server.project"]["project.current"]>[0]
-type Endpoint13_2Input = { readonly location?: Endpoint13_2Request["query"]["location"] }
-const Endpoint13_2 = (raw: RawClient["server.project"]) => (input?: Endpoint13_2Input) =>
+type Endpoint13_1Request = Parameters<RawClient["server.project"]["project.current"]>[0]
+type Endpoint13_1Input = { readonly location?: Endpoint13_1Request["query"]["location"] }
+const Endpoint13_1 = (raw: RawClient["server.project"]) => (input?: Endpoint13_1Input) =>
  raw["project.current"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint13_3Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
-type Endpoint13_3Input = {
-  readonly projectID: Endpoint13_3Request["params"]["projectID"]
-  readonly location?: Endpoint13_3Request["query"]["location"]
+type Endpoint13_2Request = Parameters<RawClient["server.project"]["project.directories"]>[0]
+type Endpoint13_2Input = {
+  readonly projectID: Endpoint13_2Request["params"]["projectID"]
+  readonly location?: Endpoint13_2Request["query"]["location"]
 }
-const Endpoint13_3 = (raw: RawClient["server.project"]) => (input: Endpoint13_3Input) =>
+const Endpoint13_2 = (raw: RawClient["server.project"]) => (input: Endpoint13_2Input) =>
  raw["project.directories"]({
    params: { projectID: input["projectID"] },
    query: { location: input["location"] },
@@ -773,9 +754,8 @@ const Endpoint13_3 = (raw: RawClient["server.project"]) => (input: Endpoint13_3I

 const adaptGroup13 = (raw: RawClient["server.project"]) => ({
  list: Endpoint13_0(raw),
-  update: Endpoint13_1(raw),
-  current: Endpoint13_2(raw),
-  directories: Endpoint13_3(raw),
+  current: Endpoint13_1(raw),
+  directories: Endpoint13_2(raw),
 })

 type Endpoint14_0Request = Parameters<RawClient["server.form"]["form.request.list"]>[0]
@@ -997,26 +977,21 @@ const Endpoint19_0 = (raw: RawClient["server.event"]) => () =>

 const adaptGroup19 = (raw: RawClient["server.event"]) => ({ subscribe: Endpoint19_0(raw) })

-type Endpoint20_0Request = Parameters<RawClient["server.pty"]["pty.shells"]>[0]
+type Endpoint20_0Request = Parameters<RawClient["server.pty"]["pty.list"]>[0]
 type Endpoint20_0Input = { readonly location?: Endpoint20_0Request["query"]["location"] }
 const Endpoint20_0 = (raw: RawClient["server.pty"]) => (input?: Endpoint20_0Input) =>
-  raw["pty.shells"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint20_1Request = Parameters<RawClient["server.pty"]["pty.list"]>[0]
-type Endpoint20_1Input = { readonly location?: Endpoint20_1Request["query"]["location"] }
-const Endpoint20_1 = (raw: RawClient["server.pty"]) => (input?: Endpoint20_1Input) =>
  raw["pty.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint20_2Request = Parameters<RawClient["server.pty"]["pty.create"]>[0]
-type Endpoint20_2Input = {
-  readonly location?: Endpoint20_2Request["query"]["location"]
-  readonly command?: Endpoint20_2Request["payload"]["command"]
-  readonly args?: Endpoint20_2Request["payload"]["args"]
-  readonly cwd?: Endpoint20_2Request["payload"]["cwd"]
-  readonly title?: Endpoint20_2Request["payload"]["title"]
-  readonly env?: Endpoint20_2Request["payload"]["env"]
+type Endpoint20_1Request = Parameters<RawClient["server.pty"]["pty.create"]>[0]
+type Endpoint20_1Input = {
+  readonly location?: Endpoint20_1Request["query"]["location"]
+  readonly command?: Endpoint20_1Request["payload"]["command"]
+  readonly args?: Endpoint20_1Request["payload"]["args"]
+  readonly cwd?: Endpoint20_1Request["payload"]["cwd"]
+  readonly title?: Endpoint20_1Request["payload"]["title"]
+  readonly env?: Endpoint20_1Request["payload"]["env"]
 }
-const Endpoint20_2 = (raw: RawClient["server.pty"]) => (input?: Endpoint20_2Input) =>
+const Endpoint20_1 = (raw: RawClient["server.pty"]) => (input?: Endpoint20_1Input) =>
  raw["pty.create"]({
    query: { location: input?.["location"] },
    payload: {
@@ -1028,61 +1003,46 @@ const Endpoint20_2 = (raw: RawClient["server.pty"]) => (input?: Endpoint20_2Inpu
    },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint20_3Request = Parameters<RawClient["server.pty"]["pty.get"]>[0]
-type Endpoint20_3Input = {
-  readonly ptyID: Endpoint20_3Request["params"]["ptyID"]
-  readonly location?: Endpoint20_3Request["query"]["location"]
+type Endpoint20_2Request = Parameters<RawClient["server.pty"]["pty.get"]>[0]
+type Endpoint20_2Input = {
+  readonly ptyID: Endpoint20_2Request["params"]["ptyID"]
+  readonly location?: Endpoint20_2Request["query"]["location"]
 }
-const Endpoint20_3 = (raw: RawClient["server.pty"]) => (input: Endpoint20_3Input) =>
+const Endpoint20_2 = (raw: RawClient["server.pty"]) => (input: Endpoint20_2Input) =>
  raw["pty.get"]({ params: { ptyID: input["ptyID"] }, query: { location: input["location"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint20_4Request = Parameters<RawClient["server.pty"]["pty.update"]>[0]
-type Endpoint20_4Input = {
-  readonly ptyID: Endpoint20_4Request["params"]["ptyID"]
-  readonly location?: Endpoint20_4Request["query"]["location"]
-  readonly title?: Endpoint20_4Request["payload"]["title"]
-  readonly size?: Endpoint20_4Request["payload"]["size"]
+type Endpoint20_3Request = Parameters<RawClient["server.pty"]["pty.update"]>[0]
+type Endpoint20_3Input = {
+  readonly ptyID: Endpoint20_3Request["params"]["ptyID"]
+  readonly location?: Endpoint20_3Request["query"]["location"]
+  readonly title?: Endpoint20_3Request["payload"]["title"]
+  readonly size?: Endpoint20_3Request["payload"]["size"]
 }
-const Endpoint20_4 = (raw: RawClient["server.pty"]) => (input: Endpoint20_4Input) =>
+const Endpoint20_3 = (raw: RawClient["server.pty"]) => (input: Endpoint20_3Input) =>
  raw["pty.update"]({
    params: { ptyID: input["ptyID"] },
    query: { location: input["location"] },
    payload: { title: input["title"], size: input["size"] },
  }).pipe(Effect.mapError(mapClientError))

-type Endpoint20_5Request = Parameters<RawClient["server.pty"]["pty.remove"]>[0]
-type Endpoint20_5Input = {
-  readonly ptyID: Endpoint20_5Request["params"]["ptyID"]
-  readonly location?: Endpoint20_5Request["query"]["location"]
+type Endpoint20_4Request = Parameters<RawClient["server.pty"]["pty.remove"]>[0]
+type Endpoint20_4Input = {
+  readonly ptyID: Endpoint20_4Request["params"]["ptyID"]
+  readonly location?: Endpoint20_4Request["query"]["location"]
 }
-const Endpoint20_5 = (raw: RawClient["server.pty"]) => (input: Endpoint20_5Input) =>
+const Endpoint20_4 = (raw: RawClient["server.pty"]) => (input: Endpoint20_4Input) =>
  raw["pty.remove"]({ params: { ptyID: input["ptyID"] }, query: { location: input["location"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-type Endpoint20_6Request = Parameters<RawClient["server.pty"]["pty.connectToken"]>[0]
-type Endpoint20_6Input = {
-  readonly ptyID: Endpoint20_6Request["params"]["ptyID"]
-  readonly location?: Endpoint20_6Request["query"]["location"]
-  readonly "x-opencode-ticket"?: Endpoint20_6Request["headers"]["x-opencode-ticket"]
-}
-const Endpoint20_6 = (raw: RawClient["server.pty"]) => (input: Endpoint20_6Input) =>
-  raw["pty.connectToken"]({
-    params: { ptyID: input["ptyID"] },
-    query: { location: input["location"] },
-    headers: { "x-opencode-ticket": input["x-opencode-ticket"] },
-  }).pipe(Effect.mapError(mapClientError))
-
 const adaptGroup20 = (raw: RawClient["server.pty"]) => ({
-  shells: Endpoint20_0(raw),
-  list: Endpoint20_1(raw),
-  create: Endpoint20_2(raw),
-  get: Endpoint20_3(raw),
-  update: Endpoint20_4(raw),
-  remove: Endpoint20_5(raw),
-  connectToken: Endpoint20_6(raw),
+  list: Endpoint20_0(raw),
+  create: Endpoint20_1(raw),
+  get: Endpoint20_2(raw),
+  update: Endpoint20_3(raw),
+  remove: Endpoint20_4(raw),
 })

 type Endpoint21_0Request = Parameters<RawClient["server.shell"]["shell.list"]>[0]
@@ -1254,50 +1214,34 @@ const adaptGroup24 = (raw: RawClient["server.projectCopy"]) => ({
  refresh: Endpoint24_2(raw),
 })

-type Endpoint25_0Request = Parameters<RawClient["server.vcs"]["vcs.get"]>[0]
+type Endpoint25_0Request = Parameters<RawClient["server.vcs"]["vcs.status"]>[0]
 type Endpoint25_0Input = { readonly location?: Endpoint25_0Request["query"]["location"] }
 const Endpoint25_0 = (raw: RawClient["server.vcs"]) => (input?: Endpoint25_0Input) =>
-  raw["vcs.get"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-type Endpoint25_1Request = Parameters<RawClient["server.vcs"]["vcs.status"]>[0]
-type Endpoint25_1Input = { readonly location?: Endpoint25_1Request["query"]["location"] }
-const Endpoint25_1 = (raw: RawClient["server.vcs"]) => (input?: Endpoint25_1Input) =>
  raw["vcs.status"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-type Endpoint25_2Request = Parameters<RawClient["server.vcs"]["vcs.diff"]>[0]
-type Endpoint25_2Input = {
-  readonly location?: Endpoint25_2Request["query"]["location"]
-  readonly mode: Endpoint25_2Request["query"]["mode"]
-  readonly context?: Endpoint25_2Request["query"]["context"]
+type Endpoint25_1Request = Parameters<RawClient["server.vcs"]["vcs.diff"]>[0]
+type Endpoint25_1Input = {
+  readonly location?: Endpoint25_1Request["query"]["location"]
+  readonly mode: Endpoint25_1Request["query"]["mode"]
+  readonly context?: Endpoint25_1Request["query"]["context"]
 }
-const Endpoint25_2 = (raw: RawClient["server.vcs"]) => (input: Endpoint25_2Input) =>
+const Endpoint25_1 = (raw: RawClient["server.vcs"]) => (input: Endpoint25_1Input) =>
  raw["vcs.diff"]({ query: { location: input["location"], mode: input["mode"], context: input["context"] } }).pipe(
    Effect.mapError(mapClientError),
  )

-const adaptGroup25 = (raw: RawClient["server.vcs"]) => ({
-  get: Endpoint25_0(raw),
-  status: Endpoint25_1(raw),
-  diff: Endpoint25_2(raw),
-})
+const adaptGroup25 = (raw: RawClient["server.vcs"]) => ({ status: Endpoint25_0(raw), diff: Endpoint25_1(raw) })

-type Endpoint26_0Request = Parameters<RawClient["server.path"]["path.get"]>[0]
-type Endpoint26_0Input = { readonly location?: Endpoint26_0Request["query"]["location"] }
-const Endpoint26_0 = (raw: RawClient["server.path"]) => (input?: Endpoint26_0Input) =>
-  raw["path.get"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))
-
-const adaptGroup26 = (raw: RawClient["server.path"]) => ({ get: Endpoint26_0(raw) })
-
-const Endpoint27_0 = (raw: RawClient["server.debug"]) => () =>
+const Endpoint26_0 = (raw: RawClient["server.debug"]) => () =>
  raw["debug.location"]({}).pipe(Effect.mapError(mapClientError))

-type Endpoint27_1Request = Parameters<RawClient["server.debug"]["debug.location.evict"]>[0]
-type Endpoint27_1Input = { readonly location?: Endpoint27_1Request["query"]["location"] }
-const Endpoint27_1 = (raw: RawClient["server.debug"]) => (input?: Endpoint27_1Input) =>
+type Endpoint26_1Request = Parameters<RawClient["server.debug"]["debug.location.evict"]>[0]
+type Endpoint26_1Input = { readonly location?: Endpoint26_1Request["query"]["location"] }
+const Endpoint26_1 = (raw: RawClient["server.debug"]) => (input?: Endpoint26_1Input) =>
  raw["debug.location.evict"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError))

-const adaptGroup27 = (raw: RawClient["server.debug"]) => ({
-  location: { list: Endpoint27_0(raw), evict: Endpoint27_1(raw) },
+const adaptGroup26 = (raw: RawClient["server.debug"]) => ({
+  location: { list: Endpoint26_0(raw), evict: Endpoint26_1(raw) },
 })

 const adaptClient = (raw: RawClient) => ({
@@ -1327,8 +1271,7 @@ const adaptClient = (raw: RawClient) => ({
  reference: adaptGroup23(raw["server.reference"]),
  projectCopy: adaptGroup24(raw["server.projectCopy"]),
  vcs: adaptGroup25(raw["server.vcs"]),
-  path: adaptGroup26(raw["server.path"]),
-  debug: adaptGroup27(raw["server.debug"]),
+  debug: adaptGroup26(raw["server.debug"]),
 })

 export const make = (options?: { readonly baseUrl?: URL | string }) =>
@@ -3,22 +3,13 @@ type Client = ReturnType<typeof import("./generated/client.js").make>
 export type AgentApi = Client["agent"]
 export type CommandApi = Client["command"]
 export type EventApi = Client["event"]
-export type FileApi = Client["file"]
 export type IntegrationApi = Client["integration"]
-export type MessageApi = Client["message"]
-export type McpApi = Client["mcp"]
 export type ModelApi = Client["model"]
 export type PluginApi = Client["plugin"]
-export type PermissionApi = Client["permission"]
-export type PathApi = Client["path"]
-export type ProjectApi = Client["project"]
 export type ProviderApi = Client["provider"]
-export type QuestionApi = Client["question"]
 export type ReferenceApi = Client["reference"]
 export type SessionApi = Client["session"]
 export type SkillApi = Client["skill"]
-export type PtyApi = Client["pty"]
-export type VcsApi = Client["vcs"]

 export interface CatalogApi {
  readonly provider: ProviderApi
@@ -26,8 +26,6 @@ import type {
  SessionSwitchModelOutput,
  SessionRenameInput,
  SessionRenameOutput,
-  SessionArchiveInput,
-  SessionArchiveOutput,
  SessionMoveInput,
  SessionMoveOutput,
  SessionPromptInput,
@@ -121,8 +119,6 @@ import type {
  CredentialRemoveInput,
  CredentialRemoveOutput,
  ProjectListOutput,
-  ProjectUpdateInput,
-  ProjectUpdateOutput,
  ProjectCurrentInput,
  ProjectCurrentOutput,
  ProjectDirectoriesInput,
@@ -166,8 +162,6 @@ import type {
  SkillListInput,
  SkillListOutput,
  EventSubscribeOutput,
-  PtyShellsInput,
-  PtyShellsOutput,
  PtyListInput,
  PtyListOutput,
  PtyCreateInput,
@@ -178,8 +172,6 @@ import type {
  PtyUpdateOutput,
  PtyRemoveInput,
  PtyRemoveOutput,
-  PtyConnectTokenInput,
-  PtyConnectTokenOutput,
  ShellListInput,
  ShellListOutput,
  ShellCreateInput,
@@ -208,14 +200,10 @@ import type {
  ProjectCopyRemoveOutput,
  ProjectCopyRefreshInput,
  ProjectCopyRefreshOutput,
-  VcsGetInput,
-  VcsGetOutput,
  VcsStatusInput,
  VcsStatusOutput,
  VcsDiffInput,
  VcsDiffOutput,
-  PathGetInput,
-  PathGetOutput,
  DebugLocationListOutput,
  DebugLocationEvictInput,
  DebugLocationEvictOutput,
@@ -547,17 +535,6 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      archive: (input: SessionArchiveInput, requestOptions?: RequestOptions) =>
-        request<SessionArchiveOutput>(
-          {
-            method: "POST",
-            path: `/api/session/${encodeURIComponent(input.sessionID)}/archive`,
-            successStatus: 204,
-            declaredStatuses: [404, 400, 401],
-            empty: true,
-          },
-          requestOptions,
-        ),
      move: (input: SessionMoveInput, requestOptions?: RequestOptions) =>
        request<SessionMoveOutput>(
          {
@@ -1172,18 +1149,6 @@ export function make(options: ClientOptions) {
          { method: "GET", path: `/api/project`, successStatus: 200, declaredStatuses: [401, 400], empty: false },
          requestOptions,
        ),
-      update: (input: ProjectUpdateInput, requestOptions?: RequestOptions) =>
-        request<ProjectUpdateOutput>(
-          {
-            method: "PATCH",
-            path: `/api/project/${encodeURIComponent(input.projectID)}`,
-            body: { name: input["name"], icon: input["icon"], commands: input["commands"] },
-            successStatus: 200,
-            declaredStatuses: [404, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
      current: (input?: ProjectCurrentInput, requestOptions?: RequestOptions) =>
        request<ProjectCurrentOutput>(
          {
@@ -1463,18 +1428,6 @@ export function make(options: ClientOptions) {
        ),
    },
    pty: {
-      shells: (input?: PtyShellsInput, requestOptions?: RequestOptions) =>
-        request<PtyShellsOutput>(
-          {
-            method: "GET",
-            path: `/api/pty/shells`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
      list: (input?: PtyListInput, requestOptions?: RequestOptions) =>
        request<PtyListOutput>(
          {
@@ -1543,19 +1496,6 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      connectToken: (input: PtyConnectTokenInput, requestOptions?: RequestOptions) =>
-        request<PtyConnectTokenOutput>(
-          {
-            method: "POST",
-            path: `/api/pty/${encodeURIComponent(input.ptyID)}/connect-token`,
-            query: { location: input["location"] },
-            headers: { "x-opencode-ticket": input["x-opencode-ticket"] },
-            successStatus: 200,
-            declaredStatuses: [403, 404, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
    },
    shell: {
      list: (input?: ShellListInput, requestOptions?: RequestOptions) =>
@@ -1743,18 +1683,6 @@ export function make(options: ClientOptions) {
        ),
    },
    vcs: {
-      get: (input?: VcsGetInput, requestOptions?: RequestOptions) =>
-        request<VcsGetOutput>(
-          {
-            method: "GET",
-            path: `/api/vcs`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
      status: (input?: VcsStatusInput, requestOptions?: RequestOptions) =>
        request<VcsStatusOutput>(
          {
@@ -1780,20 +1708,6 @@ export function make(options: ClientOptions) {
          requestOptions,
        ),
    },
-    path: {
-      get: (input?: PathGetInput, requestOptions?: RequestOptions) =>
-        request<PathGetOutput>(
-          {
-            method: "GET",
-            path: `/api/path`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-    },
    debug: {
      location: {
        list: (requestOptions?: RequestOptions) =>
@@ -501,10 +501,6 @@ export type QuestionTool = { messageID: string; callID: string }

 export type QuestionAnswer = Array<string>

-export type PtyShell = { path: string; name: string; acceptable: boolean }
-
-export type PtyTicketConnectToken = { ticket: string; expires_in: number }
-
 export type ShellInfo1 = {
  id: string
  status: "running" | "exited" | "timeout" | "killed"
@@ -530,8 +526,6 @@ export type ReferenceGitSource = {

 export type ProjectCopyCopy = { directory: string }

-export type VcsInfo = { branch?: string; defaultBranch?: string }
-
 export type VcsFileStatus = {
  file: string
  additions: number
@@ -539,8 +533,6 @@ export type VcsFileStatus = {
  status: "added" | "deleted" | "modified"
 }

-export type PathInfo = { home: string; state: string; config: string; worktree: string; directory: string }
-
 export type SessionMessageModelSelected = {
  id: string
  metadata?: { [x: string]: JsonValue }
@@ -557,7 +549,6 @@ export type CommandInfo = {
  agent?: string
  model?: ModelRef
  subtask?: boolean
-  source?: "command" | "mcp"
 }

 export type ProviderRequest = {
@@ -608,16 +599,6 @@ export type SessionRenamed = {
  data: { sessionID: string; title: string }
 }

-export type SessionArchived = {
-  id: string
-  created: number
-  metadata?: { [x: string]: any }
-  type: "session.archived"
-  durable: { aggregateID: string; seq: number; version: 1 }
-  location?: LocationRef
-  data: { sessionID: string }
-}
-
 export type SessionDeleted = {
  id: string
  created: number
@@ -2221,7 +2202,6 @@ export type SessionEventDurable =
  | SessionModelSelected
  | SessionMoved
  | SessionRenamed
-  | SessionArchived
  | SessionDeleted
  | SessionForked
  | SessionInputPromoted
@@ -2316,7 +2296,6 @@ export type V2Event =
  | SessionModelSelected
  | SessionMoved
  | SessionRenamed
-  | SessionArchived
  | SessionUsageUpdated
  | SessionDeleted
  | SessionForked
@@ -2516,14 +2495,6 @@ export type McpServerNotFoundError = {
 export const isMcpServerNotFoundError = (value: unknown): value is McpServerNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "McpServerNotFoundError"

-export type ProjectNotFoundError = {
-  readonly _tag: "ProjectNotFoundError"
-  readonly projectID: string
-  readonly message: string
-}
-export const isProjectNotFoundError = (value: unknown): value is ProjectNotFoundError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ProjectNotFoundError"
-
 export type FormNotFoundError = { readonly _tag: "FormNotFoundError"; readonly id: string; readonly message: string }
 export const isFormNotFoundError = (value: unknown): value is FormNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "FormNotFoundError"
@@ -2556,10 +2527,6 @@ export type PtyNotFoundError = { readonly _tag: "PtyNotFoundError"; readonly pty
 export const isPtyNotFoundError = (value: unknown): value is PtyNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "PtyNotFoundError"

-export type ForbiddenError = { readonly _tag: "ForbiddenError"; readonly message: string }
-export const isForbiddenError = (value: unknown): value is ForbiddenError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ForbiddenError"
-
 export type ShellNotFoundError = { readonly _tag: "ShellNotFoundError"; readonly id: string; readonly message: string }
 export const isShellNotFoundError = (value: unknown): value is ShellNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ShellNotFoundError"
@@ -2790,10 +2757,6 @@ export type SessionRenameInput = {

 export type SessionRenameOutput = void

-export type SessionArchiveInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
-
-export type SessionArchiveOutput = void
-
 export type SessionMoveInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly directory: { readonly directory: string; readonly workspaceID?: string }["directory"]
@@ -3621,27 +3584,6 @@ export type CredentialRemoveOutput = void

 export type ProjectListOutput = Array<Project>

-export type ProjectUpdateInput = {
-  readonly projectID: { readonly projectID: string }["projectID"]
-  readonly name?: {
-    readonly name?: string
-    readonly icon?: { readonly url?: string; readonly override?: string; readonly color?: string }
-    readonly commands?: { readonly start?: string }
-  }["name"]
-  readonly icon?: {
-    readonly name?: string
-    readonly icon?: { readonly url?: string; readonly override?: string; readonly color?: string }
-    readonly commands?: { readonly start?: string }
-  }["icon"]
-  readonly commands?: {
-    readonly name?: string
-    readonly icon?: { readonly url?: string; readonly override?: string; readonly color?: string }
-    readonly commands?: { readonly start?: string }
-  }["commands"]
-}
-
-export type ProjectUpdateOutput = Project
-
 export type ProjectCurrentInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -4704,17 +4646,6 @@ export type SkillListOutput = {

 export type EventSubscribeOutput = V2Event

-export type PtyShellsInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type PtyShellsOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
-  data: Array<PtyShell>
-}
-
 export type PtyListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -4810,19 +4741,6 @@ export type PtyRemoveInput = {

 export type PtyRemoveOutput = void

-export type PtyConnectTokenInput = {
-  readonly ptyID: { readonly ptyID: string }["ptyID"]
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-  readonly "x-opencode-ticket"?: { readonly "x-opencode-ticket"?: string | undefined }["x-opencode-ticket"]
-}
-
-export type PtyConnectTokenOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
-  data: PtyTicketConnectToken
-}
-
 export type ShellListInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -5000,17 +4918,6 @@ export type ProjectCopyRefreshInput = {

 export type ProjectCopyRefreshOutput = void

-export type VcsGetInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type VcsGetOutput = {
-  location: { directory: string; workspaceID?: string; project: { id: string; directory: string } }
-  data: VcsInfo
-}
-
 export type VcsStatusInput = {
  readonly location?: {
    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
@@ -5045,14 +4952,6 @@ export type VcsDiffOutput = {
  data: Array<FileDiffInfo>
 }

-export type PathGetInput = {
-  readonly location?: {
-    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
-  }["location"]
-}
-
-export type PathGetOutput = PathInfo
-
 export type DebugLocationListOutput = Array<LocationRef>

 export type DebugLocationEvictInput = {
@@ -4,22 +4,13 @@ export type {
  CatalogApi,
  CommandApi,
  EventApi,
-  FileApi,
  IntegrationApi,
-  MessageApi,
-  McpApi,
  ModelApi,
-  PermissionApi,
-  PathApi,
  PluginApi,
-  ProjectApi,
  ProviderApi,
-  QuestionApi,
  ReferenceApi,
  SessionApi,
  SkillApi,
-  PtyApi,
-  VcsApi,
 } from "./api.js"
 export type { EventSubscribeOutput as OpenCodeEvent } from "./generated/types"
 export type OpenCodeClient = ReturnType<typeof import("./generated/client").make>
@@ -31,7 +31,6 @@ test("exposes every standard HTTP API group", () => {
    "reference",
    "projectCopy",
    "vcs",
-    "path",
    "debug",
  ])
  expect(Object.keys(client.debug)).toEqual(["location"])
@@ -43,37 +42,10 @@ test("exposes every standard HTTP API group", () => {
  expect(Object.keys(client.integration.oauth)).toEqual(["connect", "status", "complete", "cancel"])
  expect(Object.keys(client.integration.command)).toEqual(["connect", "status", "cancel"])
  expect(Object.keys(client.file)).toEqual(["read", "list", "find"])
-  expect(Object.keys(client.vcs)).toEqual(["get", "status", "diff"])
-  expect(Object.keys(client.pty)).toEqual(["shells", "list", "create", "get", "update", "remove", "connectToken"])
+  expect(Object.keys(client.vcs)).toEqual(["status", "diff"])
+  expect(Object.keys(client.pty)).toEqual(["list", "create", "get", "update", "remove"])
  expect(Object.keys(client.shell)).toEqual(["list", "create", "get", "timeout", "output", "remove"])
-  expect(Object.keys(client.project)).toEqual(["list", "update", "current", "directories"])
-})
-
-test("PTY connect token sends the required browser header", async () => {
-  let request: Request | undefined
-  const client = OpenCode.make({
-    baseUrl: "http://localhost:3000",
-    fetch: async (input, init) => {
-      request = input instanceof Request ? input : new Request(input, init)
-      return Response.json({
-        location: { directory: "/tmp/project", project: { id: "proj_test", directory: "/tmp/project" } },
-        data: { ticket: "ticket", expires_in: 60 },
-      })
-    },
-  })
-
-  const result = await client.pty.connectToken({
-    ptyID: "pty_test",
-    location: { directory: "/tmp/project" },
-    "x-opencode-ticket": "1",
-  })
-
-  expect(result.data.ticket).toBe("ticket")
-  expect(request?.method).toBe("POST")
-  expect(request?.headers.get("x-opencode-ticket")).toBe("1")
-  expect(request?.url).toBe(
-    "http://localhost:3000/api/pty/pty_test/connect-token?location%5Bdirectory%5D=%2Ftmp%2Fproject",
-  )
+  expect(Object.keys(client.project)).toEqual(["list", "current", "directories"])
 })

 test("server.get uses the public HTTP contract", async () => {
@@ -91,7 +91,7 @@
    "@effect/sql-sqlite-bun": "catalog:",
    "@lydell/node-pty": "catalog:",
    "@modelcontextprotocol/sdk": "1.29.0",
-    "@ff-labs/fff-bun": "0.9.4",
+    "@ff-labs/fff-bun": "0.10.1",
    "@opencode-ai/codemode": "workspace:*",
    "@opencode-ai/effect-drizzle-sqlite": "workspace:*",
    "@opencode-ai/effect-sqlite-node": "workspace:*",
@@ -422,7 +422,6 @@ function callOptions(request: LLMRequest): LanguageModelV3CallOptions {
    presencePenalty: request.generation?.presencePenalty,
    frequencyPenalty: request.generation?.frequencyPenalty,
    seed: request.generation?.seed,
-    responseFormat: responseFormat(request),
    tools: request.tools.map(tool),
    toolChoice: toolChoice(request.toolChoice),
    headers: request.http?.headers,
@@ -527,12 +526,6 @@ function toolChoice(input: LLMRequest["toolChoice"]): LanguageModelV3ToolChoice
  return { type: input.type }
 }

-function responseFormat(request: LLMRequest): LanguageModelV3CallOptions["responseFormat"] {
-  if (request.responseFormat?.type === "json")
-    return { type: "json", schema: request.responseFormat.schema as JSONSchema7 }
-  if (request.responseFormat) return { type: "text" }
-}
-
 function providerOptions(input: LLMRequest["providerOptions"]): SharedV3ProviderOptions | undefined {
  if (!input) return undefined
  return Object.fromEntries(Object.entries(input).map(([key, value]) => [key, jsonObject(value)]))
@@ -116,7 +116,7 @@ const layer = Layer.effect(
                draft.providers.set(providerID, record)
              }
              const model =
-                record.models.get(modelID) ?? (ModelV2.Info.empty(providerID, modelID) as ModelV2.MutableInfo)
+                record.models.get(modelID) ?? (ModelV2.Info.default(providerID, modelID) as ModelV2.MutableInfo)
              if (!record.models.has(modelID)) record.models.set(modelID, model)
              fn(model)
              model.id = modelID
@@ -85,7 +85,6 @@ export const layer = (options?: ShellSelect.Options) => Layer.effect(
          name: mcpCommandName(prompt.server, prompt.name),
          template: "",
          description: prompt.description,
-          source: "mcp",
        }),
      )
    })
@@ -99,10 +98,7 @@ export const layer = (options?: ShellSelect.Options) => Layer.effect(
        return (yield* mcpCommands()).find((command) => command.name === name)
      }),
      list: Effect.fn("CommandV2.list")(function* () {
-        const commands = Array.from(state.get().commands.values()).map((command) => ({
-          ...command,
-          source: command.source ?? "command" as const,
-        }))
+        const commands = Array.from(state.get().commands.values()) as Info[]
        const names = new Set(commands.map((command) => command.name))
        return [
          ...commands,
@@ -135,7 +135,7 @@ function build(id: ModelV2.ID, remote: UsableModel, baseURL: string, previous?:
  const released = previous?.time.released || Date.parse(version)

  return ModelV2.Info.make({
-    ...ModelV2.Info.empty(ProviderV2.ID.githubCopilot, id),
+    ...ModelV2.Info.default(ProviderV2.ID.githubCopilot, id),
    id,
    modelID: ModelV2.ID.make(remote.id),
    providerID: ProviderV2.ID.githubCopilot,
@@ -3,7 +3,7 @@ export * as Project from "./project"

 import { Context, Effect, Layer, Schema } from "effect"
 import { ChildProcess } from "effect/unstable/process"
-import { asc, desc, eq } from "drizzle-orm"
+import { asc, desc } from "drizzle-orm"
 import path from "path"
 import { AbsolutePath } from "./schema"
 import { Database } from "./database/database"
@@ -37,13 +37,6 @@ export type DirectoriesInput = typeof DirectoriesInput.Type
 export const Directories = ProjectSchema.Directories
 export type Directories = typeof Directories.Type

-export const UpdateInput = ProjectSchema.UpdateInput
-export type UpdateInput = typeof UpdateInput.Type
-
-export class NotFoundError extends Schema.TaggedErrorClass<NotFoundError>()("Project.NotFoundError", {
-  projectID: ID,
-}) {}
-
 export interface Resolved {
  readonly previous?: ID
  readonly id: ID
@@ -65,7 +58,6 @@ export const root = Effect.fn("Project.root")(function* (
 export interface Interface {
  readonly list: () => Effect.Effect<ReadonlyArray<Info>>
  readonly directories: (input: DirectoriesInput) => Effect.Effect<Directories>
-  readonly update: (projectID: ID, input: UpdateInput) => Effect.Effect<Info, NotFoundError>
  readonly resolve: (input: AbsolutePath) => Effect.Effect<Resolved>
  /**
   * Temporary bridge method for writing the resolved project ID to the repo-local cache.
@@ -129,25 +121,6 @@ const layer = Layer.effect(
      return yield* projectDirectories.list(input.projectID)
    })

-    const update = Effect.fn("Project.update")(function* (projectID: ID, input: UpdateInput) {
-      const row = yield* db
-        .update(ProjectTable)
-        .set({
-          name: input.name,
-          icon_url: input.icon?.url,
-          icon_url_override: input.icon?.override,
-          icon_color: input.icon?.color,
-          commands: input.commands,
-          time_updated: Date.now(),
-        })
-        .where(eq(ProjectTable.id, projectID))
-        .returning()
-        .get()
-        .pipe(Effect.orDie)
-      if (!row) return yield* new NotFoundError({ projectID })
-      return fromRow(row)
-    })
-
    const cached = Effect.fnUntraced(function* (dir: string) {
      return yield* fs.readFileString(path.join(dir, "opencode")).pipe(
        Effect.map((value) => value.trim()),
@@ -256,7 +229,7 @@ const layer = Layer.effect(
      yield* fs.writeFileString(path.join(input.store, "opencode"), input.id).pipe(Effect.ignore)
    })

-    return Service.of({ list, directories, update, resolve, commit })
+    return Service.of({ list, directories, resolve, commit })
  }),
 )

@@ -22,9 +22,6 @@ export type DirectoriesInput = typeof DirectoriesInput.Type
 export const Directories = Project.Directories
 export type Directories = typeof Directories.Type

-export const UpdateInput = Project.UpdateInput
-export type UpdateInput = typeof UpdateInput.Type
-
 export const Vcs = Schema.Union([
  Schema.Struct({
    type: Schema.Literal("git"),
@@ -78,7 +78,6 @@ export class ExitedError extends Schema.TaggedErrorClass<ExitedError>()("Pty.Exi
 }) {}

 export interface Interface {
-  readonly shells: () => Effect.Effect<ReadonlyArray<Pty.Shell>>
  readonly list: () => Effect.Effect<Info[]>
  readonly get: (id: PtyID) => Effect.Effect<Info, NotFoundError>
  readonly create: (input: CreateInput) => Effect.Effect<Info>
@@ -159,10 +158,6 @@ export const layer = (options?: ShellSelect.Options) => Layer.effect(
      return Array.from(sessions.values()).map((session) => session.info)
    })

-    const shells = Effect.fn("Pty.shells")(function* () {
-      return yield* Effect.promise(() => ShellSelect.list(options))
-    })
-
    const get = Effect.fn("Pty.get")(function* (id: PtyID) {
      return (yield* requireSession(id)).info
    })
@@ -314,7 +309,7 @@ export const layer = (options?: ShellSelect.Options) => Layer.effect(
      }
    })

-    return Service.of({ shells, list, get, create, update, remove, write, attach })
+    return Service.of({ list, get, create, update, remove, write, attach })
  }),
 )

@@ -226,7 +226,6 @@ export interface Interface {
    model: ModelV2.Ref
  }) => Effect.Effect<void, NotFoundError>
  readonly rename: (input: { sessionID: SessionSchema.ID; title: string }) => Effect.Effect<void, NotFoundError>
-  readonly archive: (sessionID: SessionSchema.ID) => Effect.Effect<void, NotFoundError>
  readonly move: (input: {
    sessionID: SessionSchema.ID
    directory: AbsolutePath
@@ -706,11 +705,6 @@ const layer = Layer.effect(
          title: input.title,
        })
      }),
-      archive: Effect.fn("V2Session.archive")(function* (sessionID) {
-        const session = yield* result.get(sessionID)
-        if (session.time.archived) return
-        yield* events.publish(SessionEvent.Archived, { sessionID })
-      }),
      move: Effect.fn("V2Session.move")(function* (input) {
        const current = yield* result.get(input.sessionID)
        const value = input.directory.trim()
@@ -74,7 +74,6 @@ export const layer = Layer.effect(
            system: contextEvent.system,
            messages: contextEvent.messages,
            tools: hookedTools,
-            toolChoice: "none",
          }),
        )
        yield* Effect.logInfo("session generation usage diagnostic", { usage: response.usage })
@@ -53,7 +53,7 @@ export function fromRow(row: typeof SessionTable.$inferSelect): SessionSchema.In
    time: {
      created: DateTime.makeUnsafe(row.time_created),
      updated: DateTime.makeUnsafe(row.time_updated),
-      archived: row.time_archived !== null ? DateTime.makeUnsafe(row.time_archived) : undefined,
+      archived: row.time_archived ? DateTime.makeUnsafe(row.time_archived) : undefined,
    },
  })
 }
@@ -171,7 +171,6 @@ export function update(adapter: Adapter, event: SessionEvent.Event) {
      },
      "session.moved": () => Effect.void,
      "session.renamed": () => Effect.void,
-      "session.archived": () => Effect.void,
      "session.deleted": () => Effect.void,
      "session.forked": () => Effect.void,
      "session.input.promoted": () => Effect.void,
@@ -609,17 +609,6 @@ const layer = Layer.effectDiscard(
        .run()
        .pipe(Effect.orDie),
    )
-    yield* events.project(SessionEvent.Archived, (event) =>
-      db
-        .update(SessionTable)
-        .set({
-          time_archived: DateTime.toEpochMillis(event.created),
-          time_updated: DateTime.toEpochMillis(event.created),
-        })
-        .where(eq(SessionTable.id, event.data.sessionID))
-        .run()
-        .pipe(Effect.orDie),
-    )
    yield* events.project(SessionEvent.UsageRecorded, (event) => applyUsage(db, event.data.sessionID, event.data))
    yield* events.project(SessionEvent.Forked, (event) => projectFork(db, event))
    yield* events.project(SessionEvent.InputPromoted, (event) =>
@@ -2,7 +2,7 @@ export * as Vcs from "./vcs"

 import { Context, Effect, Layer } from "effect"
 import { FileDiff } from "@opencode-ai/schema/file-diff"
-import { FileStatus, Info, Mode } from "@opencode-ai/schema/vcs"
+import { FileStatus, Mode } from "@opencode-ai/schema/vcs"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Location } from "./location"
@@ -10,14 +10,13 @@ import { AppProcess } from "@opencode-ai/util/process"
 import { VcsGit } from "./vcs/git"
 import { VcsHg } from "./vcs/hg"

-export { FileStatus, Info, Mode }
+export { FileStatus, Mode }

 export interface DiffOptions {
  readonly context?: number
 }

 export interface Interface {
-  readonly info: () => Effect.Effect<Info>
  readonly status: () => Effect.Effect<FileStatus[]>
  readonly diff: (mode: Mode, options?: DiffOptions) => Effect.Effect<FileDiff.Info[]>
 }
@@ -41,10 +40,6 @@ const layer = Layer.effect(
    const location = yield* Location.Service
    const impl = adapter(proc, fs, location)
    return Service.of({
-      info: Effect.fn("Vcs.info")(function* () {
-        if (!impl) return {}
-        return yield* impl.info()
-      }),
      status: Effect.fn("Vcs.status")(function* () {
        if (!impl) return []
        return yield* impl.status()
@@ -20,12 +20,6 @@ export function make(proc: AppProcess.Interface, input: { directory: string; wor
  const ctx: Ctx = { git: makeGit(proc), directory: input.directory, worktree: input.worktree }

  return {
-    info: Effect.fn("VcsGit.info")(function* () {
-      const [branch, root] = yield* Effect.all([ctx.git.branch(ctx.directory), ctx.git.defaultBranch(ctx.directory)], {
-        concurrency: 2,
-      })
-      return { branch, defaultBranch: root?.name }
-    }),
    status: Effect.fn("VcsGit.status")(function* () {
      const git = ctx.git
      const ref = (yield* git.hasHead(ctx.directory)) ? "HEAD" : undefined
@@ -73,9 +73,6 @@ export function make(
  })

  return {
-    info: Effect.fn("VcsHg.info")(function* () {
-      return { branch: yield* hg.branch(), defaultBranch: "default" }
-    }),
    status: Effect.fn("VcsHg.status")(function* () {
      const [items, batch] = yield* Effect.all(
        // Zero-context patches are enough to count changed lines.
@@ -12,7 +12,7 @@ const it = testEffect(AISDK.locationLayer)

 const model = (packageName: string, settings: Record<string, unknown> = {}) =>
  ModelV2.Info.make({
-    ...ModelV2.Info.empty(ProviderV2.ID.make("test-provider"), ModelV2.ID.make("catalog-model")),
+    ...ModelV2.Info.default(ProviderV2.ID.make("test-provider"), ModelV2.ID.make("catalog-model")),
    modelID: ModelV2.ID.make("api-model"),
    package: ProviderV2.aisdk(packageName),
    settings,
@@ -59,7 +59,6 @@ describe("CommandV2", () => {
            providerID: ProviderV2.ID.make("anthropic"),
            variant: ModelV2.VariantID.make("high"),
          },
-          source: "command",
        }),
      ])
    }),
@@ -95,10 +95,9 @@ Review files`,
                variant: ModelV2.VariantID.make("high"),
              },
              subtask: true,
-              source: "command",
            }),
-            CommandV2.Info.make({ name: "empty", template: "", source: "command" }),
-            CommandV2.Info.make({ name: "nested/docs", template: "Write docs", source: "command" }),
+            CommandV2.Info.make({ name: "empty", template: "" }),
+            CommandV2.Info.make({ name: "nested/docs", template: "Write docs" }),
          ])

          yield* Effect.promise(() => fs.writeFile(path.join(tmp.path, "commands", "review.md"), "Review again"))
@@ -49,6 +49,86 @@ function withEnv<A, E, R>(vars: Record<string, string | undefined>, effect: () =
 const decode = Schema.decodeUnknownSync(Config.Info)

 describe("ConfigProviderPlugin.Plugin", () => {
+  it.effect("defaults custom models to agent capabilities", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("custom")
+      const modelID = ModelV2.ID.make("chat")
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                providers: {
+                  custom: {
+                    package: "aisdk:@ai-sdk/openai-compatible",
+                    models: { chat: {} },
+                  },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* addPlugin(config)
+
+      const model = required(yield* catalog.model.get(providerID, modelID))
+      expect(model.capabilities).toEqual({ tools: true, input: ["text", "image"], output: ["text"] })
+    }),
+  )
+
+  it.effect("preserves catalog capabilities unless config overrides them", () =>
+    Effect.gen(function* () {
+      const catalog = yield* Catalog.Service
+      const providerID = ProviderV2.ID.make("custom")
+      const inheritedID = ModelV2.ID.make("inherited")
+      const overriddenID = ModelV2.ID.make("overridden")
+      yield* catalog.transform((draft) => {
+        draft.model.update(providerID, inheritedID, (model) => {
+          model.capabilities = { tools: false, input: ["text"], output: ["text"] }
+        })
+        draft.model.update(providerID, overriddenID, (model) => {
+          model.capabilities = { tools: false, input: ["text"], output: ["text"] }
+        })
+      })
+      const config = Config.Service.of({
+        entries: () =>
+          Effect.succeed([
+            new Config.Document({
+              type: "document",
+              info: decode({
+                providers: {
+                  custom: {
+                    package: "aisdk:@ai-sdk/openai-compatible",
+                    models: {
+                      inherited: { name: "Inherited" },
+                      overridden: {
+                        capabilities: { tools: true, input: ["text", "image"], output: ["text"] },
+                      },
+                    },
+                  },
+                },
+              }),
+            }),
+          ]),
+      })
+
+      yield* addPlugin(config)
+
+      expect((yield* catalog.model.get(providerID, inheritedID))?.capabilities).toEqual({
+        tools: false,
+        input: ["text"],
+        output: ["text"],
+      })
+      expect((yield* catalog.model.get(providerID, overriddenID))?.capabilities).toEqual({
+        tools: true,
+        input: ["text", "image"],
+        output: ["text"],
+      })
+    }),
+  )
+
  it.effect("keeps configured model variant bodies unchanged", () =>
    Effect.gen(function* () {
      const catalog = yield* Catalog.Service
@@ -79,7 +79,6 @@ describe("node build", () => {
        return Project.Service.of({
          list: () => Effect.succeed([]),
          directories: () => Effect.succeed([]),
-          update: () => Effect.die("unused"),
          resolve: (directory) => Effect.succeed({ id: Project.ID.global, directory }),
          commit: () => Effect.void,
        })
@@ -13,7 +13,7 @@ import { Effect, Layer, Stream } from "effect"
 import { testEffect } from "./lib/effect"

 const selected = ModelV2.Info.make({
-  ...ModelV2.Info.empty(ProviderV2.ID.make("test-provider"), ModelV2.ID.make("gemini")),
+  ...ModelV2.Info.default(ProviderV2.ID.make("test-provider"), ModelV2.ID.make("gemini")),
  package: ProviderV2.aisdk("@ai-sdk/google"),
 })
 const runtime = Model.make({ id: "gemini", provider: "test-provider", route: OpenAIChat.route })
@@ -49,12 +49,12 @@ test("defensively syncs advertised Copilot models", async () => {

  try {
    const existing = ModelV2.Info.make({
-      ...ModelV2.Info.empty(ProviderV2.ID.githubCopilot, ModelV2.ID.make("gpt-5")),
+      ...ModelV2.Info.default(ProviderV2.ID.githubCopilot, ModelV2.ID.make("gpt-5")),
      modelID: ModelV2.ID.make("gpt-5"),
      name: "GPT-5 local",
    })
    const stale = ModelV2.Info.make({
-      ...ModelV2.Info.empty(ProviderV2.ID.githubCopilot, ModelV2.ID.make("stale")),
+      ...ModelV2.Info.default(ProviderV2.ID.githubCopilot, ModelV2.ID.make("stale")),
      modelID: ModelV2.ID.make("stale"),
    })
    const models = await CopilotModels.get(server.url.origin, {}, [existing, stale])
@@ -14,7 +14,6 @@ const projectLayer = Layer.succeed(
  Project.Service.of({
    list: () => Effect.succeed([]),
    directories: () => Effect.succeed([]),
-    update: () => Effect.die("unused"),
    resolve: () =>
      Effect.succeed({
        id: Project.ID.make("project"),
@@ -108,7 +108,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -134,7 +134,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -169,7 +169,7 @@ describe("AmazonBedrockPlugin", () => {
          yield* addPlugin()
          const result = yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+              ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
              modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
              package: ProviderV2.aisdk("test-provider"),
            }),
@@ -190,7 +190,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -210,7 +210,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -230,7 +230,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -251,7 +251,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -281,7 +281,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -310,7 +310,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")),
            modelID: ModelV2.ID.make("openai.gpt-5.5"),
            package: ProviderV2.aisdk("@ai-sdk/amazon-bedrock/mantle"),
          }),
@@ -338,7 +338,7 @@ describe("AmazonBedrockPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-5.5")),
          modelID: ModelV2.ID.make("openai.gpt-5.5"),
          package: ProviderV2.aisdk("@ai-sdk/amazon-bedrock/mantle"),
        }),
@@ -347,7 +347,7 @@ describe("AmazonBedrockPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-oss-safeguard-120b")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("openai.gpt-oss-safeguard-120b")),
          modelID: ModelV2.ID.make("openai.gpt-oss-safeguard-120b"),
          package: ProviderV2.aisdk("@ai-sdk/amazon-bedrock/mantle"),
        }),
@@ -365,7 +365,7 @@ describe("AmazonBedrockPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("@ai-sdk/amazon-bedrock/anthropic"),
        }),
@@ -393,7 +393,7 @@ describe("AmazonBedrockPlugin", () => {
          yield* addPlugin()
          const result = yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+              ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
              modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
              package: ProviderV2.aisdk("test-provider"),
            }),
@@ -425,7 +425,7 @@ describe("AmazonBedrockPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -434,7 +434,7 @@ describe("AmazonBedrockPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -443,7 +443,7 @@ describe("AmazonBedrockPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("global.anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("global.anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("global.anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -452,7 +452,7 @@ describe("AmazonBedrockPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -461,7 +461,7 @@ describe("AmazonBedrockPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -487,7 +487,7 @@ describe("AmazonBedrockPlugin", () => {
        yield* addPlugin()
        yield* aisdk.runLanguage({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
            modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -574,7 +574,7 @@ describe("AmazonBedrockPlugin", () => {
      for (const item of cases) {
        yield* aisdk.runLanguage({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.amazonBedrock, ModelV2.ID.make(item.modelID)),
+            ...ModelV2.Info.default(ProviderV2.ID.amazonBedrock, ModelV2.ID.make(item.modelID)),
            modelID: ModelV2.ID.make(item.modelID),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -594,7 +594,7 @@ describe("AmazonBedrockPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.openai, ModelV2.ID.make("anthropic.claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("anthropic.claude-sonnet-4-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -63,7 +63,7 @@ describe("AnthropicPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-anthropic"), ModelV2.ID.make("claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-anthropic"), ModelV2.ID.make("claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("claude-sonnet-4-5"),
          package: ProviderV2.aisdk("@ai-sdk/anthropic"),
        }),
@@ -81,7 +81,7 @@ describe("AnthropicPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.anthropic, ModelV2.ID.make("claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.anthropic, ModelV2.ID.make("claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("claude-sonnet-4-5"),
          package: ProviderV2.aisdk("@ai-sdk/anthropic"),
        }),
@@ -121,7 +121,7 @@ describe("AzureCognitiveServicesPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: "aisdk:test-provider",
        }),
@@ -140,7 +140,7 @@ describe("AzureCognitiveServicesPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: "aisdk:test-provider",
        }),
@@ -149,7 +149,7 @@ describe("AzureCognitiveServicesPlugin", () => {
      })
      const ignored = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.openai, ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: "aisdk:test-provider",
        }),
@@ -170,7 +170,7 @@ describe("AzureCognitiveServicesPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("messages-deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("messages-deployment")),
          modelID: ModelV2.ID.make("messages-deployment"),
          package: "aisdk:test-provider",
        }),
@@ -179,7 +179,7 @@ describe("AzureCognitiveServicesPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("chat-deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("chat-deployment")),
          modelID: ModelV2.ID.make("chat-deployment"),
          package: "aisdk:test-provider",
        }),
@@ -188,7 +188,7 @@ describe("AzureCognitiveServicesPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("language-deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("azure-cognitive-services"), ModelV2.ID.make("language-deployment")),
          modelID: ModelV2.ID.make("language-deployment"),
          package: "aisdk:test-provider",
        }),
@@ -148,7 +148,7 @@ describe("AzurePlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
+            ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
            modelID: ModelV2.ID.make("deployment"),
            package: ProviderV2.aisdk("test-provider"),
          }),
@@ -168,7 +168,7 @@ describe("AzurePlugin", () => {
        const exit = yield* aisdk
          .runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
+              ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
              modelID: ModelV2.ID.make("deployment"),
              package: ProviderV2.aisdk("test-provider"),
            }),
@@ -189,7 +189,7 @@ describe("AzurePlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -208,7 +208,7 @@ describe("AzurePlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -227,7 +227,7 @@ describe("AzurePlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: ProviderV2.aisdk("test-provider"),
          body: { useCompletionUrls: true },
@@ -247,7 +247,7 @@ describe("AzurePlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -256,7 +256,7 @@ describe("AzurePlugin", () => {
      })
      const ignored = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.openai, ModelV2.ID.make("deployment")),
          modelID: ModelV2.ID.make("deployment"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -280,7 +280,7 @@ describe("AzurePlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("messages-deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("messages-deployment")),
          modelID: ModelV2.ID.make("messages-deployment"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -289,7 +289,7 @@ describe("AzurePlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.azure, ModelV2.ID.make("language-deployment")),
+          ...ModelV2.Info.default(ProviderV2.ID.azure, ModelV2.ID.make("language-deployment")),
          modelID: ModelV2.ID.make("language-deployment"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -65,7 +65,7 @@ describe("CerebrasPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(
+          ...ModelV2.Info.default(
            ProviderV2.ID.make("custom-cerebras"),
            ModelV2.ID.make("llama-4-scout-17b-16e-instruct"),
          ),
@@ -88,7 +88,7 @@ describe("CerebrasPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(
+          ...ModelV2.Info.default(
            ProviderV2.ID.make("custom-cerebras"),
            ModelV2.ID.make("llama-4-scout-17b-16e-instruct"),
          ),
@@ -110,7 +110,7 @@ describe("CerebrasPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(
+          ...ModelV2.Info.default(
            ProviderV2.ID.make("custom-cerebras"),
            ModelV2.ID.make("llama-4-scout-17b-16e-instruct"),
          ),
@@ -117,7 +117,7 @@ describe("CloudflareAIGatewayPlugin", () => {
          yield* addPlugin()
          const result = yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
              modelID: ModelV2.ID.make("openai/gpt-5"),
              package: "aisdk:test-provider",
            }),
@@ -139,7 +139,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -184,7 +184,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -214,7 +214,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -252,7 +252,7 @@ describe("CloudflareAIGatewayPlugin", () => {

          yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
              modelID: ModelV2.ID.make("openai/gpt-5"),
              package: "aisdk:test-provider",
            }),
@@ -284,7 +284,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -307,7 +307,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -331,7 +331,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -361,7 +361,7 @@ describe("CloudflareAIGatewayPlugin", () => {

          const result = yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
              modelID: ModelV2.ID.make("openai/gpt-5"),
              package: "aisdk:test-provider",
            }),
@@ -385,7 +385,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(
+            ...ModelV2.Info.default(
              ProviderV2.ID.make("cloudflare-ai-gateway"),
              ModelV2.ID.make("anthropic/claude-sonnet-4-5"),
            ),
@@ -417,7 +417,7 @@ describe("CloudflareAIGatewayPlugin", () => {

        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-ai-gateway"), ModelV2.ID.make("openai/gpt-5")),
            modelID: ModelV2.ID.make("openai/gpt-5"),
            package: "aisdk:test-provider",
          }),
@@ -94,7 +94,7 @@ describe("CloudflareWorkersAIPlugin", () => {
        const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("cloudflare-workers-ai")))
        const sdk = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
            modelID: ModelV2.ID.make("@cf/model"),
            package: provider.package,
            settings: provider.settings,
@@ -138,7 +138,7 @@ describe("CloudflareWorkersAIPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
            modelID: ModelV2.ID.make("@cf/model"),
            package: "aisdk:@ai-sdk/openai-compatible",
            settings: { baseURL: "https://proxy.example/v1" },
@@ -178,7 +178,7 @@ describe("CloudflareWorkersAIPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
            modelID: ModelV2.ID.make("@cf/model"),
            package: "aisdk:@ai-sdk/openai-compatible",
            settings: { baseURL: "https://proxy.example/v1" },
@@ -207,7 +207,7 @@ describe("CloudflareWorkersAIPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
            modelID: ModelV2.ID.make("@cf/model"),
            package: "aisdk:@ai-sdk/openai-compatible",
            settings: { baseURL: "https://api.cloudflare.com/client/v4/accounts/${CLOUDFLARE_ACCOUNT_ID}/ai/v1" },
@@ -233,7 +233,7 @@ describe("CloudflareWorkersAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("@cf/api-model"),
          package: "aisdk:test-provider",
        }),
@@ -253,7 +253,7 @@ describe("CloudflareWorkersAIPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("@cf/model")),
            modelID: ModelV2.ID.make("@cf/model"),
            package: "aisdk:@ai-sdk/anthropic",
            settings: { baseURL: "https://proxy.example/v1" },
@@ -53,7 +53,7 @@ describe("DynamicProviderPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")),
          modelID: ModelV2.ID.make("test-model"),
          package: ProviderV2.aisdk(fixtureProvider),
        }),
@@ -72,7 +72,7 @@ describe("DynamicProviderPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("test-model")),
          modelID: ModelV2.ID.make("test-model"),
          package: ProviderV2.aisdk(fixtureProvider),
        }),
@@ -90,7 +90,7 @@ describe("DynamicProviderPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("test-model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("test-model")),
          modelID: ModelV2.ID.make("test-model"),
          package: ProviderV2.aisdk(fixtureProvider),
        }),
@@ -107,7 +107,7 @@ describe("DynamicProviderPlugin", () => {
      yield* addPlugin(npmEntrypoint(fixtureProviderPath))
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("npm-provider"), ModelV2.ID.make("test-model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("npm-provider"), ModelV2.ID.make("test-model")),
          modelID: ModelV2.ID.make("test-model"),
          package: "aisdk:fixture-provider",
        }),
@@ -125,7 +125,7 @@ describe("DynamicProviderPlugin", () => {
      const exit = yield* aisdk
        .language(
          ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("missing-entrypoint"), ModelV2.ID.make("alias")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("missing-entrypoint"), ModelV2.ID.make("alias")),
            modelID: ModelV2.ID.make("alias"),
            package: "aisdk:fixture-provider",
          }),
@@ -143,7 +143,7 @@ describe("DynamicProviderPlugin", () => {
      const exit = yield* aisdk
        .language(
          ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("bad-import"), ModelV2.ID.make("alias")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("bad-import"), ModelV2.ID.make("alias")),
            modelID: ModelV2.ID.make("alias"),
            package: "aisdk:file:///missing/provider-factory.js",
          }),
@@ -163,7 +163,7 @@ describe("DynamicProviderPlugin", () => {
      const exit = yield* aisdk
        .language(
          ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("missing-factory"), ModelV2.ID.make("alias")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("missing-factory"), ModelV2.ID.make("alias")),
            modelID: ModelV2.ID.make("alias"),
            package: "aisdk:fixture-provider",
          }),
@@ -181,7 +181,7 @@ describe("DynamicProviderPlugin", () => {
      yield* addPlugin()
      const language = yield* aisdk.language(
        ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("test-model-api"),
          package: ProviderV2.aisdk(fixtureProvider),
        }),
@@ -41,7 +41,7 @@ providers.forEach((item) =>
      const host = yield* PluginHost.make(plugin)
      yield* item.plugin.effect(host)
      const model = ModelV2.Info.make({
-        ...ModelV2.Info.empty(ProviderV2.ID.make(item.id), modelID),
+        ...ModelV2.Info.default(ProviderV2.ID.make(item.id), modelID),
        modelID,
        package: ProviderV2.aisdk(item.package),
      })
@@ -99,7 +99,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      const ignored = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: "aisdk:test-provider",
        }),
@@ -108,7 +108,7 @@ describe("GithubCopilotPlugin", () => {
      })
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: "aisdk:test-provider",
        }),
@@ -128,7 +128,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("claude-sonnet-4")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("claude-sonnet-4")),
          modelID: ModelV2.ID.make("claude-sonnet-4"),
          package: "aisdk:test-provider",
        }),
@@ -147,7 +147,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("claude-sonnet-4"),
          package: "aisdk:test-provider",
        }),
@@ -166,7 +166,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: "aisdk:test-provider",
        }),
@@ -175,7 +175,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5.1-codex")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5.1-codex")),
          modelID: ModelV2.ID.make("gpt-5.1-codex"),
          package: "aisdk:test-provider",
        }),
@@ -184,7 +184,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-4o")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-4o")),
          modelID: ModelV2.ID.make("gpt-4o"),
          package: "aisdk:test-provider",
        }),
@@ -193,7 +193,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini")),
          modelID: ModelV2.ID.make("gpt-5-mini"),
          package: "aisdk:test-provider",
        }),
@@ -202,7 +202,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini-2025-08-07")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5-mini-2025-08-07")),
          modelID: ModelV2.ID.make("gpt-5-mini-2025-08-07"),
          package: "aisdk:test-provider",
        }),
@@ -227,7 +227,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("mai-code-1-flash-picker")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("mai-code-1-flash-picker")),
          modelID: ModelV2.ID.make("mai-code-1-flash-picker"),
          package: "aisdk:test-provider",
          settings: { endpoint: "responses" },
@@ -237,7 +237,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: "aisdk:test-provider",
          settings: { endpoint: "chat" },
@@ -257,7 +257,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("default")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("default")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: "aisdk:test-provider",
        }),
@@ -266,7 +266,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("small")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("small")),
          modelID: ModelV2.ID.make("gpt-5-mini"),
          package: "aisdk:test-provider",
        }),
@@ -275,7 +275,7 @@ describe("GithubCopilotPlugin", () => {
      })
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("sonnet")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("github-copilot"), ModelV2.ID.make("sonnet")),
          modelID: ModelV2.ID.make("claude-sonnet-4"),
          package: "aisdk:test-provider",
        }),
@@ -324,7 +324,7 @@ describe("GithubCopilotPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: "aisdk:test-provider",
        }),
@@ -69,7 +69,7 @@ describe("GitLabPlugin", () => {
          yield* addPlugin()
          yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
              modelID: ModelV2.ID.make("claude"),
              package: "aisdk:test-provider",
            }),
@@ -107,7 +107,7 @@ describe("GitLabPlugin", () => {
          yield* addPlugin()
          yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
              modelID: ModelV2.ID.make("claude"),
              package: "aisdk:test-provider",
            }),
@@ -133,7 +133,7 @@ describe("GitLabPlugin", () => {
          yield* addPlugin()
          yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
              modelID: ModelV2.ID.make("claude"),
              package: "aisdk:test-provider",
            }),
@@ -175,7 +175,7 @@ describe("GitLabPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
          modelID: ModelV2.ID.make("claude"),
          package: "aisdk:test-provider",
        }),
@@ -195,7 +195,7 @@ describe("GitLabPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")),
          modelID: ModelV2.ID.make("duo-workflow-custom"),
          package: "aisdk:test-provider",
          headers: {},
@@ -229,7 +229,7 @@ describe("GitLabPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-exact")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-exact")),
          modelID: ModelV2.ID.make("duo-workflow-exact"),
          package: "aisdk:test-provider",
        }),
@@ -257,7 +257,7 @@ describe("GitLabPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("duo-workflow-custom")),
          modelID: ModelV2.ID.make("duo-workflow-custom"),
          package: "aisdk:test-provider",
          headers: {},
@@ -284,7 +284,7 @@ describe("GitLabPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("gitlab"), ModelV2.ID.make("claude")),
          modelID: ModelV2.ID.make("claude"),
          package: "aisdk:test-provider",
          headers: { h: "v" },
@@ -116,7 +116,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
          yield* addPlugin(GoogleVertexAnthropicPlugin)
          const result = yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(
+              ...ModelV2.Info.default(
                ProviderV2.ID.make("google-vertex-anthropic"),
                ModelV2.ID.make("claude-sonnet-4-5"),
              ),
@@ -143,7 +143,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
          yield* addPlugin(GoogleVertexAnthropicPlugin)
          const result = yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(
+              ...ModelV2.Info.default(
                ProviderV2.ID.make("google-vertex-anthropic"),
                ModelV2.ID.make("claude-sonnet-4-5"),
              ),
@@ -167,7 +167,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
      yield* addPlugin(GoogleVertexAnthropicPlugin)
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("claude-sonnet-4-5"),
          package: "aisdk:test-provider",
        }),
@@ -187,7 +187,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
      yield* addPlugin(GoogleVertexAnthropicPlugin)
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("claude-sonnet-4-5"),
          package: "aisdk:test-provider",
        }),
@@ -206,7 +206,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
      yield* addPlugin(GoogleVertexAnthropicPlugin)
      const sdkResult = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")),
          modelID: ModelV2.ID.make(" claude-sonnet-4-5 "),
          package: "aisdk:test-provider",
        }),
@@ -215,7 +215,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
      })
      const languageResult = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" claude-sonnet-4-5 ")),
          modelID: ModelV2.ID.make(" claude-sonnet-4-5 "),
          package: "aisdk:test-provider",
        }),
@@ -238,7 +238,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
      yield* addPlugin(GoogleVertexAnthropicPlugin)
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex-anthropic"), ModelV2.ID.make(" claude-sonnet-4-5 ")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex-anthropic"), ModelV2.ID.make(" claude-sonnet-4-5 ")),
          modelID: ModelV2.ID.make(" claude-sonnet-4-5 "),
          package: "aisdk:test-provider",
        }),
@@ -257,7 +257,7 @@ describe("GoogleVertexAnthropicPlugin", () => {
      yield* addPlugin(GoogleVertexAnthropicPlugin)
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("claude-sonnet-4-5")),
          modelID: ModelV2.ID.make("claude-sonnet-4-5"),
          package: "aisdk:test-provider",
        }),
@@ -172,7 +172,7 @@ describe("GoogleVertexPlugin", () => {
          const provider = required(yield* catalog.provider.get(ProviderV2.ID.make("google-vertex")))
          yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")),
              modelID: ModelV2.ID.make("gemini"),
              package: "aisdk:@ai-sdk/google-vertex",
            }),
@@ -294,7 +294,7 @@ describe("GoogleVertexPlugin", () => {
          yield* addPlugin()
          yield* aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")),
              modelID: ModelV2.ID.make("gemini"),
              package: "aisdk:@ai-sdk/google-vertex",
            }),
@@ -339,7 +339,7 @@ describe("GoogleVertexPlugin", () => {
        () =>
          aisdk.runSDK({
            model: ModelV2.Info.make({
-              ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")),
+              ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make("gemini")),
              modelID: ModelV2.ID.make("gemini"),
              package: "aisdk:@ai-sdk/openai-compatible",
            }),
@@ -367,7 +367,7 @@ describe("GoogleVertexPlugin", () => {
      yield* addPlugin()
      yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" gemini-2.5-pro ")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google-vertex"), ModelV2.ID.make(" gemini-2.5-pro ")),
          modelID: ModelV2.ID.make(" gemini-2.5-pro "),
          package: "aisdk:test-provider",
        }),
@@ -26,7 +26,7 @@ describe("GooglePlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("gemini")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("gemini")),
          modelID: ModelV2.ID.make("gemini"),
          package: "aisdk:@ai-sdk/google",
        }),
@@ -45,7 +45,7 @@ describe("GooglePlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("google"), ModelV2.ID.make("gemini")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("google"), ModelV2.ID.make("gemini")),
          modelID: ModelV2.ID.make("gemini"),
          package: "aisdk:@ai-sdk/google",
        }),
@@ -63,7 +63,7 @@ describe("GooglePlugin", () => {
      yield* addPlugin()
      const sdkEvent = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("gemini-api"),
          package: "aisdk:@ai-sdk/google",
        }),
@@ -88,7 +88,7 @@ describe("GooglePlugin", () => {

      const resolved = yield* aisdk.model(
        ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-google"), ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("gemini-api"),
          package: "aisdk:@ai-sdk/google",
          settings: { apiKey: "test" },
@@ -26,7 +26,7 @@ describe("OpenAICompatiblePlugin", () => {
      yield* addPlugin()
      const defaulted = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")),
          modelID: ModelV2.ID.make("model"),
          package: "aisdk:test-provider",
        }),
@@ -35,7 +35,7 @@ describe("OpenAICompatiblePlugin", () => {
      })
      const disabled = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")),
          modelID: ModelV2.ID.make("model"),
          package: "aisdk:test-provider",
        }),
@@ -54,7 +54,7 @@ describe("OpenAICompatiblePlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("model")),
          modelID: ModelV2.ID.make("model"),
          package: "aisdk:test-provider",
        }),
@@ -78,7 +78,7 @@ describe("OpenAICompatiblePlugin", () => {
      )
      yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-provider"), ModelV2.ID.make("model")),
          modelID: ModelV2.ID.make("model"),
          package: "aisdk:test-provider",
        }),
@@ -99,7 +99,7 @@ describe("OpenAICompatiblePlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("model")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("cloudflare-workers-ai"), ModelV2.ID.make("model")),
          modelID: ModelV2.ID.make("model"),
          package: "aisdk:test-provider",
        }),
@@ -68,7 +68,7 @@ describe("OpenAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-openai"), ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-openai"), ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -86,7 +86,7 @@ describe("OpenAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.openai, ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -105,7 +105,7 @@ describe("OpenAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.openai, ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -125,7 +125,7 @@ describe("OpenAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.anthropic, ModelV2.ID.make("gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.anthropic, ModelV2.ID.make("gpt-5")),
          modelID: ModelV2.ID.make("gpt-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -293,7 +293,7 @@ describe("OpencodePlugin", () => {
            package: ProviderV2.aisdk("test-provider"),
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("paid")),
            modelID: ModelV2.ID.make("paid"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(1),
@@ -320,7 +320,7 @@ describe("OpencodePlugin", () => {
            package: ProviderV2.aisdk("test-provider"),
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("free")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("free")),
            modelID: ModelV2.ID.make("free"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(0),
@@ -347,7 +347,7 @@ describe("OpencodePlugin", () => {
            package: ProviderV2.aisdk("test-provider"),
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("output-only")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("output-only")),
            modelID: ModelV2.ID.make("output-only"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(0, 1),
@@ -376,7 +376,7 @@ describe("OpencodePlugin", () => {
            package: ProviderV2.aisdk("test-provider"),
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("paid")),
            modelID: ModelV2.ID.make("paid"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(1),
@@ -410,7 +410,7 @@ describe("OpencodePlugin", () => {
            package: ProviderV2.aisdk("test-provider"),
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("paid")),
            modelID: ModelV2.ID.make("paid"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(1),
@@ -438,7 +438,7 @@ describe("OpencodePlugin", () => {
            settings: { apiKey: "configured" },
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("paid")),
            modelID: ModelV2.ID.make("paid"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(1),
@@ -468,7 +468,7 @@ describe("OpencodePlugin", () => {
            package: ProviderV2.aisdk("test-provider"),
          })
          const model = ModelV2.Info.make({
-            ...ModelV2.Info.empty(provider.id, ModelV2.ID.make("paid")),
+            ...ModelV2.Info.default(provider.id, ModelV2.ID.make("paid")),
            modelID: ModelV2.ID.make("paid"),
            package: ProviderV2.aisdk("test-provider"),
            cost: cost(1),
@@ -54,7 +54,7 @@ describe("OpenRouterPlugin", () => {

      const ignored = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openrouter, ModelV2.ID.make("openai/gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.openrouter, ModelV2.ID.make("openai/gpt-5")),
          modelID: ModelV2.ID.make("openai/gpt-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -65,7 +65,7 @@ describe("OpenRouterPlugin", () => {

      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom"), ModelV2.ID.make("openai/gpt-5")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom"), ModelV2.ID.make("openai/gpt-5")),
          modelID: ModelV2.ID.make("openai/gpt-5"),
          package: ProviderV2.aisdk("test-provider"),
        }),
@@ -48,7 +48,7 @@ function withEnv<A, E, R>(vars: Record<string, string | undefined>, effect: () =

 function model(providerID: string) {
  return ModelV2.Info.make({
-    ...ModelV2.Info.empty(ProviderV2.ID.make(providerID), ModelV2.ID.make("sap-model")),
+    ...ModelV2.Info.default(ProviderV2.ID.make(providerID), ModelV2.ID.make("sap-model")),
    modelID: ModelV2.ID.make("sap-model"),
    package: ProviderV2.aisdk(fixtureProvider),
  })
@@ -58,7 +58,7 @@ describe("SnowflakeCortexPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-4")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("openai"), ModelV2.ID.make("gpt-4")),
          modelID: ModelV2.ID.make("gpt-4"),
          package: "aisdk:test-provider",
        }),
@@ -77,7 +77,7 @@ describe("SnowflakeCortexPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
            modelID: ModelV2.ID.make("claude-sonnet-4-6"),
            package: "aisdk:test-provider",
          }),
@@ -97,7 +97,7 @@ describe("SnowflakeCortexPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
            modelID: ModelV2.ID.make("claude-sonnet-4-6"),
            package: "aisdk:test-provider",
          }),
@@ -121,7 +121,7 @@ describe("SnowflakeCortexPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
            modelID: ModelV2.ID.make("claude-sonnet-4-6"),
            package: "aisdk:test-provider",
          }),
@@ -141,7 +141,7 @@ describe("SnowflakeCortexPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
            modelID: ModelV2.ID.make("claude-sonnet-4-6"),
            package: "aisdk:test-provider",
          }),
@@ -165,7 +165,7 @@ describe("SnowflakeCortexPlugin", () => {
        yield* addPlugin()
        const result = yield* aisdk.runSDK({
          model: ModelV2.Info.make({
-            ...ModelV2.Info.empty(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
+            ...ModelV2.Info.default(ProviderV2.ID.make("snowflake-cortex"), ModelV2.ID.make("claude-sonnet-4-6")),
            modelID: ModelV2.ID.make("claude-sonnet-4-6"),
            package: "aisdk:test-provider",
          }),
@@ -59,7 +59,7 @@ describe("VercelPlugin", () => {
      yield* addPlugin()
      const event = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-vercel"), ModelV2.ID.make("v0-1.0-md")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-vercel"), ModelV2.ID.make("v0-1.0-md")),
          modelID: ModelV2.ID.make("v0-1.0-md"),
          package: "aisdk:@ai-sdk/vercel",
        }),
@@ -62,7 +62,7 @@ describe("XAIPlugin", () => {

      const ignored = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")),
          modelID: ModelV2.ID.make("grok-4"),
          package: "aisdk:@ai-sdk/xai",
        }),
@@ -72,7 +72,7 @@ describe("XAIPlugin", () => {

      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("xai"), ModelV2.ID.make("grok-4")),
          modelID: ModelV2.ID.make("grok-4"),
          package: "aisdk:@ai-sdk/xai",
        }),
@@ -92,7 +92,7 @@ describe("XAIPlugin", () => {

      const result = yield* aisdk.runSDK({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("custom-xai"), ModelV2.ID.make("grok-4")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("custom-xai"), ModelV2.ID.make("grok-4")),
          modelID: ModelV2.ID.make("grok-4"),
          package: "aisdk:@ai-sdk/xai",
        }),
@@ -112,7 +112,7 @@ describe("XAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.make("xai"), ModelV2.ID.make("alias")),
+          ...ModelV2.Info.default(ProviderV2.ID.make("xai"), ModelV2.ID.make("alias")),
          modelID: ModelV2.ID.make("grok-4"),
          package: "aisdk:@ai-sdk/xai",
        }),
@@ -133,7 +133,7 @@ describe("XAIPlugin", () => {
      yield* addPlugin()
      const result = yield* aisdk.runLanguage({
        model: ModelV2.Info.make({
-          ...ModelV2.Info.empty(ProviderV2.ID.openai, ModelV2.ID.make("grok-4")),
+          ...ModelV2.Info.default(ProviderV2.ID.openai, ModelV2.ID.make("grok-4")),
          modelID: ModelV2.ID.make("grok-4"),
          package: "aisdk:@ai-sdk/xai",
        }),
@@ -66,31 +66,6 @@ describe("ProjectV2.list", () => {
  )
 })

-describe("ProjectV2.update", () => {
-  it.effect("updates project metadata", () =>
-    Effect.gen(function* () {
-      const db = (yield* Database.Service).db
-      const project = yield* ProjectV2.Service
-      const id = ProjectV2.ID.make("updated")
-      yield* db
-        .insert(ProjectTable)
-        .values({ id, worktree: abs("/updated"), sandboxes: [], time_created: 1, time_updated: 1 })
-        .run()
-
-      const result = yield* project.update(id, {
-        name: "Updated",
-        icon: { color: "#ffffff" },
-        commands: { start: "bun dev" },
-      })
-
-      expect(result.name).toBe("Updated")
-      expect(result.icon).toEqual({ color: "#ffffff" })
-      expect(result.commands).toEqual({ start: "bun dev" })
-      expect(result.time.updated).toBeGreaterThan(1)
-    }),
-  )
-})
-
 function remoteID(remote: string) {
  return ProjectV2.ID.make(Hash.fast(`git-remote:${remote}`))
 }
@@ -90,18 +90,6 @@ const waitForOutput = (output: Queue.Queue<string>, text: string) =>
    }),
  )

-describe("Pty.shells", () => {
-  it.live("lists available shells", () =>
-    Effect.gen(function* () {
-      const pty = yield* Pty.Service
-      const shells = yield* pty.shells()
-
-      expect(shells.length).toBeGreaterThan(0)
-      expect(shells.every((shell) => shell.path && shell.name && typeof shell.acceptable === "boolean")).toBe(true)
-    }),
-  )
-})
-
 describe("pty", () => {
  it.live("returns typed not found errors for missing sessions", () =>
    Effect.gen(function* () {
@@ -36,7 +36,6 @@ const projects = Layer.succeed(
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
    directories: () => Effect.succeed([]),
-    update: () => Effect.die("unused"),
    commit: () => Effect.void,
  }),
 )
@@ -34,7 +34,6 @@ const projects = Layer.succeed(
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
    directories: () => Effect.succeed([]),
-    update: () => Effect.die("unused"),
    commit: () => Effect.void,
  }),
 )
@@ -661,19 +660,4 @@ describe("SessionV2.create", () => {
      ).toBe("Session.NotFoundError")
    }),
  )
-
-  it.effect("archives a Session through one durable event", () =>
-    Effect.gen(function* () {
-      const session = yield* SessionV2.Service
-      const created = yield* session.create({ location })
-
-      yield* session.archive(created.id)
-      yield* session.archive(created.id)
-
-      expect((yield* session.get(created.id)).time.archived).toBeDefined()
-      const events = Array.from(yield* logEvents(session, created.id).pipe(Stream.runCollect))
-      expect(events.map((event) => event.type)).toContain("session.archived")
-      expect(events.filter((event) => event.type === "session.archived")).toHaveLength(1)
-    }),
-  )
 })
@@ -301,7 +301,7 @@ it.effect("generates from fresh settled Session context without durable mutation
      ),
    ).toEqual(["Settled partial answer"])
    expect(requests[0]?.tools).toMatchObject([{ name: "lookup", description: "Hooked lookup" }])
-    expect(requests[0]?.toolChoice).toMatchObject({ type: "none" })
+    expect(requests[0]?.toolChoice).toBeUndefined()
    expect(yield* durableState(db, sessionID)).toEqual(before)
  }),
 )
@@ -57,7 +57,6 @@ const projects = Layer.succeed(
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
    directories: () => Effect.succeed([]),
-    update: () => Effect.die("unused"),
    commit: () => Effect.void,
  }),
 )
@@ -22,7 +22,6 @@ const projects = Layer.succeed(
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
    directories: () => Effect.succeed([]),
-    update: () => Effect.die("unused"),
    commit: () => Effect.void,
  }),
 )
@@ -19,7 +19,6 @@ const projects = Layer.succeed(
    list: () => Effect.succeed([]),
    resolve: (directory) => Effect.succeed({ id: ProjectV2.ID.global, directory }),
    directories: () => Effect.succeed([]),
-    update: () => Effect.die("unused"),
    commit: () => Effect.void,
  }),
 )
@@ -170,8 +170,8 @@ test("Core reuses the canonical shared schemas", async () => {
  for (const [core, shared] of schemas) expect(core).toBe(shared)

  expect(Agent.Info.empty(Agent.ID.make("test"))).toEqual(AgentV2.Info.empty(AgentV2.ID.make("test")))
-  expect(Model.Info.empty(Provider.ID.make("test"), Model.ID.make("model"))).toEqual(
-    ModelV2.Info.empty(ProviderV2.ID.make("test"), ModelV2.ID.make("model")),
+  expect(Model.Info.default(Provider.ID.make("test"), Model.ID.make("model"))).toEqual(
+    ModelV2.Info.default(ProviderV2.ID.make("test"), ModelV2.ID.make("model")),
  )
  expect(Provider.Info.empty(Provider.ID.make("test"))).toEqual(ProviderV2.Info.empty(ProviderV2.ID.make("test")))
  expect(Skill.Source.key(Skill.DirectorySource.make({ type: "directory", path: AbsolutePath.make("/tmp") }))).toBe(
@@ -152,7 +152,6 @@ describeHg("Vcs mercurial", () => {
          await commitAll(directory, "initial")
        })
        const vcs = yield* Vcs.Service
-        expect(yield* vcs.info()).toEqual({ branch: "default", defaultBranch: "default" })
        expect(yield* vcs.diff("branch")).toEqual([])

        yield* Effect.promise(async () => {
@@ -53,7 +53,6 @@ describe("Vcs", () => {
    withTmp((directory) =>
      Effect.gen(function* () {
        const vcs = yield* Vcs.Service
-        expect(yield* vcs.info()).toEqual({})
        expect(yield* vcs.status()).toEqual([])
        expect(yield* vcs.diff("working")).toEqual([])
        expect(yield* vcs.diff("branch")).toEqual([])
@@ -156,7 +155,6 @@ describe("Vcs", () => {
          await commitAll(directory, "initial")
        })
        const vcs = yield* Vcs.Service
-        expect(yield* vcs.info()).toEqual({ branch: "main", defaultBranch: "main" })
        expect(yield* vcs.diff("branch")).toEqual([])

        yield* Effect.promise(async () => {
@@ -94,9 +94,10 @@ You can also map a friendly catalog ID to a different API model ID with `modelID
 }
 ```

-Here `openai/coding-default` is the selectable catalog reference, while `gpt-5.2` is sent to the provider. When adding a
-model that is not already in the catalog, set accurate `capabilities` and `limit` values so OpenCode can expose tools and
-enforce the correct context limits. Set `disabled: true` on a model entry to hide it from the available catalog.
+Here `openai/coding-default` is the selectable catalog reference, while `gpt-5.2` is sent to the provider. A model that is
+not already in the catalog defaults to tool support, text and image input, and text output. Set accurate `capabilities`
+and `limit` values when those defaults do not match the model or OpenCode needs to enforce its context limits. Set
+`disabled: true` on a model entry to hide it from the available catalog.

 OpenAI-compatible models that stream reasoning through a custom assistant-message field can set
 `compatibility.reasoningField`:
@@ -193,8 +194,9 @@ For an OpenAI-compatible server, define a provider package, endpoint, and at lea
 }
 ```

-Use the server's real model name, limits, modalities, and tool support. OpenCode cannot infer these for a model you add
-manually. If the endpoint requires a key, add `apiKey` to provider `settings` using an environment substitution such as
+Use the server's real model name, limits, modalities, and tool support. OpenCode applies the custom-model capability
+defaults described above but cannot infer the server's actual limits or whether those defaults are accurate. If the
+endpoint requires a key, add `apiKey` to provider `settings` using an environment substitution such as
 `"apiKey": "{env:LOCAL_API_KEY}"`; do not commit secrets.

 ### Model references
@@ -2,7 +2,7 @@

 import { Schema, SchemaAST } from "effect"
 import { format } from "prettier"
-import { ThemeDefinition, ThemeFile } from "../../tui/src/theme/v2/schema"
+import { ThemeDefinition, ThemeDocument } from "../../tui/src/theme/v2/schema"

 const target = import.meta.dir + "/../snippets/generated/theme-tokens.mdx"
 const root = requireObject(ThemeDefinition.ast)
@@ -52,8 +52,8 @@ const example = {
      default: "#101014",
    },
  },
-} satisfies ThemeFile
-Schema.decodeUnknownSync(ThemeFile)(example)
+} satisfies ThemeDocument
+Schema.decodeUnknownSync(ThemeDocument)(example)
 const output = await format(
  `{/* Generated by packages/docs/script/generate-theme-tokens.ts. Do not edit. */}

@@ -30,7 +30,6 @@ import { CredentialGroup } from "./groups/credential.js"
 import { ProjectGroup } from "./groups/project.js"
 import { ProjectCopyGroup } from "./groups/project-copy.js"
 import { VcsGroup } from "./groups/vcs.js"
-import { PathGroup } from "./groups/path.js"

 type LocationGroups<LocationId extends HttpApiMiddleware.AnyId> =
  | HttpApiGroup.AddMiddleware<typeof LocationGroup, LocationId>
@@ -51,7 +50,6 @@ type LocationGroups<LocationId extends HttpApiMiddleware.AnyId> =
  | HttpApiGroup.AddMiddleware<typeof ReferenceGroup, LocationId>
  | HttpApiGroup.AddMiddleware<typeof ProjectCopyGroup, LocationId>
  | HttpApiGroup.AddMiddleware<typeof VcsGroup, LocationId>
-  | HttpApiGroup.AddMiddleware<typeof PathGroup, LocationId>

 type SessionGroups<SessionLocationId extends HttpApiMiddleware.AnyId, SessionLocationService> =
  | ReturnType<typeof makeSessionGroup<SessionLocationId, SessionLocationService>>
@@ -170,7 +168,6 @@ const makeApiFromGroup = <
    .add(ReferenceGroup.middleware(locationMiddleware))
    .add(ProjectCopyGroup.middleware(locationMiddleware))
    .add(VcsGroup.middleware(locationMiddleware))
-    .add(PathGroup.middleware(locationMiddleware))
    .add(DebugGroup)
    .annotateMerge(
      OpenApi.annotations({
@@ -60,8 +60,7 @@ export const groupNames = {
  "server.project": "project",
  "server.projectCopy": "projectCopy",
  "server.vcs": "vcs",
-  "server.path": "path",
 } as const

-export const promiseOmitEndpoints = new Set(["pty.connect"])
-export const effectOmitEndpoints = new Set(["fs.read", "pty.connect"])
+export const promiseOmitEndpoints = new Set(["pty.connect", "pty.connectToken"])
+export const effectOmitEndpoints = new Set(["fs.read", "pty.connect", "pty.connectToken"])
@@ -1,6 +1,5 @@
 import { Schema } from "effect"
 import { Skill } from "@opencode-ai/schema/skill"
-import { Project } from "@opencode-ai/schema/project"

 export class InvalidRequestError extends Schema.TaggedErrorClass<InvalidRequestError>()(
  "InvalidRequestError",
@@ -63,15 +62,6 @@ export class ProviderNotFoundError extends Schema.TaggedErrorClass<ProviderNotFo
  { httpApiStatus: 404 },
 ) {}

-export class ProjectNotFoundError extends Schema.TaggedErrorClass<ProjectNotFoundError>()(
-  "ProjectNotFoundError",
-  {
-    projectID: Project.ID,
-    message: Schema.String,
-  },
-  { httpApiStatus: 404 },
-) {}
-
 export class SessionNotFoundError extends Schema.TaggedErrorClass<SessionNotFoundError>()(
  "SessionNotFoundError",
  {
@@ -1,20 +0,0 @@
-import { Path } from "@opencode-ai/schema/path"
-import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
-import { LocationQuery, locationQueryOpenApi } from "./location.js"
-
-export const PathGroup = HttpApiGroup.make("server.path")
-  .add(
-    HttpApiEndpoint.get("path.get", "/api/path", {
-      query: LocationQuery,
-      success: Path.Info,
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(
-        OpenApi.annotations({
-          identifier: "v2.path.get",
-          summary: "Get paths",
-          description: "Get process and location paths.",
-        }),
-      ),
-  )
-  .annotateMerge(OpenApi.annotations({ title: "path", description: "Location and process paths." }))
@@ -2,7 +2,6 @@ import { Project } from "@opencode-ai/schema/project"
 import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 import { LocationQuery, locationQueryOpenApi } from "./location.js"
-import { ProjectNotFoundError } from "../errors.js"

 const root = "/api/project"

@@ -18,20 +17,6 @@ export const ProjectGroup = HttpApiGroup.make("server.project")
      }),
    ),
  )
-  .add(
-    HttpApiEndpoint.patch("project.update", `${root}/:projectID`, {
-      params: { projectID: Project.ID },
-      payload: Project.UpdateInput,
-      success: Project.Info,
-      error: ProjectNotFoundError,
-    }).annotateMerge(
-      OpenApi.annotations({
-        identifier: "v2.project.update",
-        summary: "Update project",
-        description: "Update project metadata.",
-      }),
-    ),
-  )
  .add(
    HttpApiEndpoint.get("project.current", `${root}/current`, {
      query: LocationQuery,
@@ -19,20 +19,6 @@ export function hasPtyConnectTicketURL(url: URL) {
 }

 export const PtyGroup = HttpApiGroup.make("server.pty")
-  .add(
-    HttpApiEndpoint.get("pty.shells", "/api/pty/shells", {
-      query: LocationQuery,
-      success: Location.response(Schema.Array(Pty.Shell)),
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(
-        OpenApi.annotations({
-          identifier: "v2.pty.shells",
-          summary: "List available shells",
-          description: "List shells available for interactive terminal sessions.",
-        }),
-      ),
-  )
  .add(
    HttpApiEndpoint.get("pty.list", "/api/pty", {
      query: LocationQuery,
@@ -115,14 +101,13 @@ export const PtyGroup = HttpApiGroup.make("server.pty")
    HttpApiEndpoint.post("pty.connectToken", "/api/pty/:ptyID/connect-token", {
      params: { ptyID: Pty.ID },
      query: LocationQuery,
-      headers: Schema.Struct({ [PTY_CONNECT_TOKEN_HEADER]: Schema.optional(Schema.String) }),
      success: Location.response(PtyTicket.ConnectToken),
      error: [ForbiddenError, PtyNotFoundError],
    })
      .annotateMerge(locationQueryOpenApi)
      .annotateMerge(
        OpenApi.annotations({
-          identifier: "v2.pty.connectToken",
+          identifier: "v2.pty.connect.token",
          summary: "Create PTY WebSocket token",
          description: "Create a short-lived single-use ticket for opening a PTY WebSocket connection.",
        }),
@@ -269,21 +269,6 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
          }),
        ),
    )
-    .add(
-      HttpApiEndpoint.post("session.archive", "/api/session/:sessionID/archive", {
-        params: { sessionID: Session.ID },
-        success: HttpApiSchema.NoContent,
-        error: SessionNotFoundError,
-      })
-        .middleware(sessionLocationMiddleware)
-        .annotateMerge(
-          OpenApi.annotations({
-            identifier: "v2.session.archive",
-            summary: "Archive session",
-            description: "Archive a session.",
-          }),
-        ),
-    )
    .add(
      HttpApiEndpoint.post("session.move", "/api/session/:sessionID/move", {
        params: { sessionID: Session.ID },
@@ -13,20 +13,6 @@ const DiffQuery = Schema.Struct({
 })

 export const VcsGroup = HttpApiGroup.make("server.vcs")
-  .add(
-    HttpApiEndpoint.get("vcs.get", "/api/vcs", {
-      query: LocationQuery,
-      success: Location.response(Vcs.Info),
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(
-        OpenApi.annotations({
-          identifier: "v2.vcs.get",
-          summary: "VCS information",
-          description: "Get the current and default branches for the requested location.",
-        }),
-      ),
-  )
  .add(
    HttpApiEndpoint.get("vcs.status", "/api/vcs/status", {
      query: LocationQuery,
@@ -16,7 +16,6 @@ export const Info = Schema.Struct({
  agent: Agent.ID.pipe(optional),
  model: Model.Ref.pipe(optional),
  subtask: Schema.Boolean.pipe(optional),
-  source: Schema.Literals(["command", "mcp"]).pipe(optional),
 }).annotate({ identifier: "Command.Info" })

 export const Event = {
@@ -14,7 +14,6 @@ export { Model } from "./model.js"
 export { Money } from "./money.js"
 export { Permission } from "./permission.js"
 export { PermissionSaved } from "./permission-saved.js"
-export { Path } from "./path.js"
 export { Project } from "./project.js"
 export { ProjectCopy } from "./project-copy.js"
 export { Provider } from "./provider.js"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden ClineandGitHub	8cac010bac	fix(core): stop forcing toolChoice none on session.generate (#38557 )	2026-07-23 14:12:23 -05:00
Aiden ClineandGitHub	193f6be99c	fix(ai): keep tools when Gemini tool choice is none (#38556 )	2026-07-23 14:09:25 -05:00
opencode-agent[bot]GitHub James Long	2a9f8e3a2c	fix(tui): manage focus in devtools panels (#38555 ) Co-authored-by: James Long <17031+jlongster@users.noreply.github.com>	2026-07-23 18:58:02 +00:00
Aiden ClineandGitHub	2c814120c7	fix(ai): keep tools when Anthropic tool_choice is none (#38553 )	2026-07-23 13:52:20 -05:00
opencode-agent[bot]GitHub Kit Langton James Long	18fccac6ff	fix(tui): preserve first message in new sessions (#38542 ) Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: James Long <17031+jlongster@users.noreply.github.com>	2026-07-23 13:59:51 -04:00
opencode-agent[bot]GitHub James Long	360e7b412d	feat(tui): expose debug settings (#38546 ) Co-authored-by: James Long <longster@gmail.com>	2026-07-23 13:37:16 -04:00
opencode-agent[bot]GitHub Aiden Cline	ad596fb42b	chore(core): upgrade fff to 0.10.1 (#38545 ) Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>	2026-07-23 12:34:24 -05:00
opencode-agent[bot]GitHub Aiden Cline	74e92f73e0	refactor(ai): remove unused response format (#38540 ) Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>	2026-07-23 12:32:33 -05:00
James LongandGitHub	8f3465c951	refactor(tui): load native V2 themes (#38430 )	2026-07-23 12:35:29 -04:00
Shoubhit DashandGitHub	466b75b19d	feat(cli): expand acp v1 support (#38325 )	2026-07-23 21:13:46 +05:30
James LongandGitHub	833dd2ed7f	refactor(tui): simplify turn usage reduction (#38514 )	2026-07-23 11:22:00 -04:00
Shoubhit DashandGitHub	bbe985b4d0	chore(cli): upgrade acp sdk (#38316 )	2026-07-23 20:44:14 +05:30
James LongandGitHub	5b1321a8ca	feat(tui): add turn token usage diagnostics (#38398 )	2026-07-23 10:00:51 -04:00
Simon KleeandGitHub	52c98a4eeb	mini: add replay settings to cli config (#38487 )	2026-07-23 12:12:25 +02:00
opencode-agent[bot]GitHub Aiden Cline	b6f85c2250	fix(core): default custom model capabilities (#38449 ) Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com>	2026-07-22 23:20:16 -05:00