test(acp): keep only end-to-end slash command coverage

test(app): return a command outcome from the workspace e2e mock
fix(acp): preserve slash command prompt lifecycle
2026-09-17 14:26:26 +00:00 · 2026-09-16 16:57:54 +05:30 · 2026-09-16 16:30:04 +05:30 · 2026-09-16 16:30:04 +05:30
219 changed files with 1640 additions and 2976 deletions
@@ -54,7 +54,7 @@ Review endpoints in document order. For each endpoint, select one disposition an
 ### [x] `GET /api/health` and `GET /api/server`

 - **Decision:** Merge and rename
- **Replacement:** `GET /api/info` with operation ID `server.info`.
+- **Replacement:** `GET /api/status` with operation ID `server.status`.
 - **Notes:** Returns `version`, `pid`, and connection `urls`; readiness is conveyed by HTTP status.

 ### [x] `GET /api/project/current`
@@ -74,7 +74,7 @@ Review endpoints in document order. For each endpoint, select one disposition an

 | Done | Method | Path | Operation ID | Decision | Notes |
 |---|---|---|---|---|---|
-| [x] 001–002 | `GET` | `/api/info` | `server.info` | Keep | Replaces the former health and server endpoints. |
+| [x] 001–002 | `GET` | `/api/status` | `server.status` | Keep | Replaces the former health and server endpoints. |
 | [x] 003 | `GET` | `/api/location` | `location.get` | Keep | Workspace selectors and response fields removed until workspace support ships. |
 | [x] 004 | `GET` | `/api/project` | `project.list` | Keep | Removed unused `time.initialized`; the database column remains for migration data. |
 | [x] 005 | `PATCH` | `/api/project/{projectID}` | `project.update` | Keep | Request and response accepted as-is. |
@@ -32,7 +32,7 @@
    },
    "packages/ai": {
      "name": "@opencode/ai",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@aws-sdk/credential-providers": "3.1057.0",
        "@opencode/schema": "workspace:*",
@@ -54,7 +54,7 @@
    },
    "packages/app": {
      "name": "@opencode/app",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@corvu/drawer": "catalog:",
        "@dnd-kit/abstract": "0.5.0",
@@ -113,7 +113,7 @@
    },
    "packages/cli": {
      "name": "@opencode/cli",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "bin": {
        "opencode2": "./bin/opencode2.cjs",
      },
@@ -177,7 +177,7 @@
    },
    "packages/client": {
      "name": "@opencode/client",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/protocol": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -203,7 +203,7 @@
    },
    "packages/codemode": {
      "name": "@opencode/codemode",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "acorn": "8.15.0",
        "effect": "catalog:",
@@ -217,7 +217,7 @@
    },
    "packages/console/app": {
      "name": "@opencode/console-app",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -253,7 +253,7 @@
    },
    "packages/console/core": {
      "name": "@opencode/console-core",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -280,7 +280,7 @@
    },
    "packages/console/function": {
      "name": "@opencode/console-function",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@openauthjs/openauth": "0.0.0-20250322224806",
        "@opencode/console-core": "workspace:*",
@@ -297,7 +297,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode/console-mail",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -321,7 +321,7 @@
    },
    "packages/console/support": {
      "name": "@opencode/console-support",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@opencode/console-core": "workspace:*",
@@ -341,7 +341,7 @@
    },
    "packages/core": {
      "name": "@opencode/core",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@ai-sdk/cohere": "3.0.27",
        "@ai-sdk/gateway": "3.0.104",
@@ -409,7 +409,7 @@
    },
    "packages/desktop": {
      "name": "@opencode/desktop",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@zip.js/zip.js": "2.7.62",
        "electron-context-menu": "4.1.2",
@@ -461,7 +461,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode/enterprise",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@hono/standard-validator": "catalog:",
        "@opencode-ai/sdk": "1.18.21",
@@ -498,7 +498,7 @@
    },
    "packages/function": {
      "name": "@opencode/function",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -514,7 +514,7 @@
    },
    "packages/http-recorder": {
      "name": "@opencode/http-recorder",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@effect/platform-node-shared": "4.0.0-rc.112",
      },
@@ -533,7 +533,7 @@
    },
    "packages/httpapi-codegen": {
      "name": "@opencode/httpapi-codegen",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "effect": "catalog:",
        "prettier": "3.6.2",
@@ -546,7 +546,7 @@
    },
    "packages/latex": {
      "name": "@opencode/latex",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -560,7 +560,7 @@
    },
    "packages/merman": {
      "name": "@opencode/merman",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opentui/core": "catalog:",
@@ -575,7 +575,7 @@
    },
    "packages/plugin": {
      "name": "@opencode/plugin",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@ai-sdk/provider": "3.0.8",
        "@opencode/ai": "workspace:*",
@@ -614,7 +614,7 @@
    },
    "packages/plugin-browser": {
      "name": "@opencode/plugin-browser",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/plugin": "workspace:*",
        "@opencode/schema": "workspace:*",
@@ -644,7 +644,7 @@
    },
    "packages/protocol": {
      "name": "@opencode/protocol",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/schema": "workspace:*",
        "effect": "catalog:",
@@ -659,7 +659,7 @@
    },
    "packages/schema": {
      "name": "@opencode/schema",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@standard-schema/spec": "catalog:",
        "effect": "catalog:",
@@ -683,7 +683,7 @@
    },
    "packages/sdk": {
      "name": "@opencode/sdk",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -704,7 +704,7 @@
    },
    "packages/server": {
      "name": "@opencode/server",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@effect/platform-node": "catalog:",
        "@effect/platform-node-shared": "catalog:",
@@ -726,7 +726,7 @@
    },
    "packages/session-ui": {
      "name": "@opencode/session-ui",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode/client": "workspace:*",
@@ -761,7 +761,7 @@
    },
    "packages/simulation": {
      "name": "@opencode/simulation",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/ai": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -781,7 +781,7 @@
    },
    "packages/stats/app": {
      "name": "@opencode/stats-app",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@ibm/plex": "6.4.1",
        "@kobalte/core": "catalog:",
@@ -815,7 +815,7 @@
    },
    "packages/stats/core": {
      "name": "@opencode/stats-core",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@aws-sdk/client-athena": "3.933.0",
        "@planetscale/database": "1.19.0",
@@ -834,7 +834,7 @@
    },
    "packages/stats/server": {
      "name": "@opencode/stats-server",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@aws-sdk/client-firehose": "3.933.0",
        "@effect/platform-node": "catalog:",
@@ -880,7 +880,7 @@
    },
    "packages/theme": {
      "name": "@opencode/theme",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opentui/core": "catalog:",
        "effect": "catalog:",
@@ -894,7 +894,7 @@
    },
    "packages/tui": {
      "name": "@opencode/tui",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@opencode/client": "workspace:*",
        "@opencode/core": "workspace:*",
@@ -929,7 +929,7 @@
    },
    "packages/ui": {
      "name": "@opencode/ui",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@pierre/diffs": "catalog:",
@@ -964,7 +964,7 @@
    },
    "packages/util": {
      "name": "@opencode/util",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@effect/opentelemetry": "catalog:",
        "@effect/platform-node": "catalog:",
@@ -997,7 +997,7 @@
    },
    "packages/web": {
      "name": "@opencode/web",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -1038,7 +1038,7 @@
    },
    "services/update": {
      "name": "@opencode/update",
-      "version": "2.0.5",
+      "version": "2.0.4",
      "dependencies": {
        "jose": "6.0.11",
        "semver": "catalog:",
@@ -2,7 +2,7 @@
  "$schema": "https://json.schemastore.org/package.json",
  "name": "opencode",
  "description": "AI-powered development tool",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "private": true,
  "type": "module",
  "packageManager": "bun@1.4.2",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "name": "@opencode/ai",
  "type": "module",
  "license": "MIT",
@@ -336,18 +336,12 @@ export type OutputItem = StreamItem & { readonly id: string }
 // Responses-compatible providers put streaming error details at the top level or
 // under `error`, and response failures under `response.error`. Accept all three shapes.
 // https://www.openresponses.org/specification
-const OpenResponsesErrorObject = Schema.Struct({
+const OpenResponsesErrorPayload = Schema.Struct({
  type: optionalNull(Schema.String),
  code: optionalNull(Schema.String),
  message: optionalNull(Schema.String),
  param: optionalNull(Schema.String),
 })
-const OpenResponsesErrorPayload = Schema.Union([Schema.String, OpenResponsesErrorObject]).pipe(
-  Schema.decodeTo(OpenResponsesErrorObject, {
-    decode: SchemaGetter.transform((error) => (typeof error === "string" ? { message: error } : error)),
-    encode: SchemaGetter.passthrough(),
-  }),
-)
 type OpenResponsesErrorPayload = Schema.Schema.Type<typeof OpenResponsesErrorPayload>

 const WebSocketErrorHeader = Schema.Union([Schema.String, Schema.Number, Schema.Boolean])
@@ -440,9 +434,7 @@ export const decodeChannelEvent = (frame: string) =>
  decodeFrame(frame).pipe(
    Effect.flatMap((value) =>
      decodeEventValue(
-        ProviderShared.isRecord(value) &&
-          value.type === undefined &&
-          (typeof value.error === "string" || ProviderShared.isRecord(value.error))
+        ProviderShared.isRecord(value) && value.type === undefined && ProviderShared.isRecord(value.error)
          ? { ...value, type: "error" }
          : value,
      ),
@@ -59,15 +59,7 @@ export const isContextOverflowFailure = (failure: unknown) =>
    : Schema.is(ProviderErrorEvent)(failure) && failure.classification === "context-overflow"

 const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown))
-// OpenCode Zen reports account caps as typed 429/402 errors that are not throttles.
-const QUOTA_CODES = new Set([
-  "insufficient_quota",
-  "usage_not_included",
-  "billing_error",
-  "gousagelimiterror",
-  "freeusagelimiterror",
-  "creditlimitexceeded",
-])
+const QUOTA_CODES = new Set(["insufficient_quota", "usage_not_included", "billing_error"])
 const AUTH_CODES = new Set(["authentication_error", "permission_error"])
 const SERVER_CODES = new Set([
  "api_error",
@@ -95,8 +87,7 @@ const CONTENT_POLICY_CODES = new Set([
 // as a `[code]` label at the start of the rewritten message.
 const GATEWAY_CODE_LABEL = /^[^:\n]+: \[([A-Za-z0-9_.-]+)\]/
 const RATE_LIMIT_TEXT = /rate increased too quickly|rate[-_\s]?limit|too[_\s]?many[_\s]?requests/i
-// Only consulted on 429, where throttles and account caps share a status.
-const QUOTA_TEXT = /insufficient[-_\s]?quota|quota[-_\s]?exceeded|budget exceeded|usage limit/i
+const QUOTA_TEXT = /insufficient[-_\s]?quota|quota[-_\s]?exceeded/i
 // Policy rejections without a dedicated code, matched against the provider's own
 // explanation only. OpenAI reuses `invalid_prompt` for usage-policy rejections while
 // Bedrock Mantle reuses it for schema validation; Anthropic reports blocked output
@@ -152,11 +143,7 @@ export function classifyProviderFailure(input: ProviderFailure): AIError["reason
    return new InvalidRequestError({ ...details, classification: "payload-too-large" })
  if (codes.some((code) => CONTENT_POLICY_CODES.has(code)) || (clientScoped && CONTENT_POLICY_TEXT.test(input.message)))
    return new ContentPolicyError(details)
-  if (
-    input.status === 402 ||
-    codes.some((code) => QUOTA_CODES.has(code)) ||
-    (input.status === 429 && QUOTA_TEXT.test(text))
-  )
+  if (codes.some((code) => QUOTA_CODES.has(code)) || (input.status === 429 && QUOTA_TEXT.test(text)))
    return new QuotaExceededError(details)
  if (input.status === 401 || input.status === 403 || codes.some((code) => AUTH_CODES.has(code)))
    return new AuthenticationError(details)
@@ -176,12 +163,10 @@ export function classifyProviderFailure(input: ProviderFailure): AIError["reason
    input.status === 408 ||
    input.status === 409 ||
    (input.status !== undefined && input.status >= 500) ||
-    // Server codes and phrasing only decide when no HTTP status contradicts them:
-    // gateways such as OpenCode Zen substitute `server_error` for codes they do
-    // not forward, so a 4xx with a server code is still a rejected request.
    ((input.status === undefined || input.status < 400) &&
-      ((!codes.some((code) => INVALID_REQUEST_CODES.has(code)) && SERVER_ERROR_TEXT.test(text)) ||
-        codes.some((code) => SERVER_CODES.has(code) || code.includes("exhausted") || code.includes("unavailable"))))
+      !codes.some((code) => INVALID_REQUEST_CODES.has(code)) &&
+      SERVER_ERROR_TEXT.test(text)) ||
+    codes.some((code) => SERVER_CODES.has(code) || code.includes("exhausted") || code.includes("unavailable"))
  )
    return new ProviderInternalError({
      ...details,
@@ -309,7 +309,7 @@ describe("RequestExecutor", () => {
    }),
  )

-  it.effect("does not let server codes override a 4xx rejection", () =>
+  it.effect("classifies provider overloads hidden behind HTTP 400", () =>
    Effect.gen(function* () {
      const classify = (body: string) =>
        Effect.gen(function* () {
@@ -317,11 +317,11 @@ describe("RequestExecutor", () => {
          const error = yield* executor.execute(request).pipe(Effect.flip)

          expectAIError(error)
-          expect(error.reason).toMatchObject({ _tag: "InvalidRequest" })
+          expect(error.reason).toMatchObject({ _tag: "ProviderInternal" })
        }).pipe(Effect.provide(fixedResponse(body, { status: 400 })))

      yield* classify('{"code":"resource_exhausted"}')
-      yield* classify('{"error":{"type":"server_error","message":"Upstream request failed: Model is unavailable."}}')
+      yield* classify('{"code":"service_unavailable"}')
    }),
  )

@@ -249,54 +249,10 @@ describe("provider error classification", () => {

  test("classifies any remaining 4xx status as an invalid request", () => {
    expect(
-      [400, 404, 418, 422, 451].map((status) => classifyProviderFailure({ message: `HTTP ${status}`, status })._tag),
-    ).toEqual(Array(5).fill("InvalidRequest"))
-  })
-
-  test("classifies 402 as exhausted quota", () => {
-    expect(classifyProviderFailure({ message: "Payment Required", status: 402 })._tag).toBe("QuotaExceeded")
-  })
-
-  test("classifies OpenCode Zen account limits as quota rather than throttling", () => {
-    const typed = (type: string, message: string) => ({ type: "error", error: { type, message } })
-    const substituted = (message: string) => ({
-      error: { type: "server_error", message: `Upstream request failed: ${message}` },
-    })
-    const cases: ReadonlyArray<[number, { error: { message: string } }]> = [
-      [429, typed("GoUsageLimitError", "Go usage limit exceeded")],
-      [429, typed("FreeUsageLimitError", "Rate limit exceeded. Please try again later.")],
-      [402, typed("CreditLimitExceeded", "Credit limit exceeded.")],
-      [402, substituted("Insufficient account funds")],
-      [402, substituted("Account invoice is overdue")],
-      [429, substituted("Account budget exceeded")],
-    ]
-    expect(
-      cases.map(
-        ([status, body]) =>
-          classifyProviderFailure({ message: body.error.message, status, rawBody: JSON.stringify(body) })._tag,
+      [400, 402, 404, 418, 422, 451].map(
+        (status) => classifyProviderFailure({ message: `HTTP ${status}`, status })._tag,
      ),
-    ).toEqual(Array(6).fill("QuotaExceeded"))
-  })
-
-  test("does not let substituted server codes make a 4xx retryable", () => {
-    const openai = { error: { type: "server_error", message: "Upstream request failed: Model is unavailable." } }
-    const anthropic = {
-      type: "error",
-      error: { type: "api_error", message: "Upstream request failed: Model is unavailable." },
-    }
-    expect(
-      [openai, anthropic].map(
-        (body) =>
-          classifyProviderFailure({ message: body.error.message, status: 400, rawBody: JSON.stringify(body) })._tag,
-      ),
-    ).toEqual(["InvalidRequest", "InvalidRequest"])
-    // Without a contradicting status the same codes still mark provider trouble.
-    expect(classifyProviderFailure({ message: openai.error.message, rawBody: JSON.stringify(openai) })._tag).toBe(
-      "ProviderInternal",
-    )
-    expect(
-      classifyProviderFailure({ message: openai.error.message, status: 200, rawBody: JSON.stringify(openai) })._tag,
-    ).toBe("ProviderInternal")
+    ).toEqual(Array(6).fill("InvalidRequest"))
  })

  test("classifies nested provider codes when a top-level code is also present", () => {
@@ -1,9 +1,8 @@
 import { expect } from "bun:test"
-import { Effect, Schema, Stream } from "effect"
+import { Effect, Schema } from "effect"
 import { LLM, LLMClient } from "../../src/index.js"
 import { OpenResponses } from "../../src/protocols/open-responses.js"
-import { Azure, Meta, OpenAI, XAI } from "../../src/providers/index.js"
-import { WebSocketTransport } from "../../src/route.js"
+import { Meta } from "../../src/providers/index.js"
 import { configure } from "../../src/providers/openai-compatible-responses.js"
 import { it } from "../lib/effect.js"
 import { fixedResponse } from "../lib/http.js"
@@ -45,59 +44,11 @@ it.effect("normalizes flat errors in shared SSE and WebSocket decoding", () =>

 it.effect("continues to normalize untyped xAI WebSocket errors", () =>
  Effect.gen(function* () {
-    const message = "gRPC error: Response with id=resp_missing not found"
-    for (const error of [{ type: "api_error", message }, message]) {
-      expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify({ error }))).toEqual({
-        type: "error",
-        error: typeof error === "string" ? { message } : error,
-      })
-    }
+    const frame = { error: { type: "api_error", message: "gRPC error: Response with id=resp_missing not found" } }
+    expect(yield* OpenResponses.decodeChannelEvent(JSON.stringify(frame))).toEqual({ ...frame, type: "error" })
  }),
 )

-it.effect("normalizes string errors in shared SSE and WebSocket decoding", () =>
-  Effect.gen(function* () {
-    for (const decode of [decodeEvent, OpenResponses.decodeChannelEvent]) {
-      expect(yield* decode(JSON.stringify({ type: "error", error: "Gateway failed" }))).toEqual({
-        type: "error",
-        error: { message: "Gateway failed" },
-      })
-      expect(
-        yield* decode(
-          JSON.stringify({ type: "response.failed", response: { id: "resp_failed", error: "Gateway failed" } }),
-        ),
-      ).toEqual({
-        type: "response.failed",
-        response: { id: "resp_failed", error: { message: "Gateway failed" } },
-      })
-    }
-  }),
-)
-
-for (const model of [
-  OpenAI.configure({ apiKey: "fixture" }).responses("gpt-5.6-sol"),
-  XAI.configure({ apiKey: "fixture" }).responses("grok-4.6"),
-  Azure.configure({ apiKey: "fixture", resourceName: "fixture" }).responses("deployment"),
-]) {
-  it.effect(`preserves string error messages and raw bodies through ${model.provider} Responses`, () =>
-    Effect.gen(function* () {
-      const raw = '{ "type": "error", "error": "Gateway rejected the request", "trace": "original" }'
-      const webSocket = WebSocketTransport.makeDirect({
-        open: () => Effect.succeed({ sendText: () => Effect.void, messages: Stream.make(raw), close: Effect.void }),
-      })
-      for (const options of [{ webSocket }, {}]) {
-        const error = yield* LLMClient.generate(LLM.request({ model, prompt: "Hello" }), options).pipe(
-          Effect.provide(fixedResponse(sseEvents(raw))),
-          Effect.flip,
-        )
-        expect(error.reason._tag).toBe("UnknownProvider")
-        expect(error.message).toBe("Gateway rejected the request")
-        expect(error.reason.body).toBe(raw)
-      }
-    }),
-  )
-}
-
 it.effect("retains classification and original error bodies through Meta and generic Responses routes", () =>
  Effect.gen(function* () {
    const raw = `{
@@ -62,8 +62,7 @@ async function mockServers(page: Page, requests: string[]) {
    const current = url.origin === serverA ? sessionA : sessionB
    const directory = url.searchParams.get("directory")
    if (directory && directory !== current.directory) return json(route, { name: "InvalidDirectory" }, 500)
-    if (url.pathname === "/api/info")
-      return json(route, { version: "test", pid: 1, urls: [url.origin], paths: { tmp: "/tmp/opencode" } })
+    if (url.pathname === "/api/status") return json(route, { version: "test", pid: 1, urls: [url.origin] })
    if (url.pathname === "/api/session") return json(route, { data: [currentSession(current)], cursor: {} })
    if (url.pathname === "/api/session/active") return json(route, { data: {} })
    if (url.pathname === `/api/session/${current.id}`) return json(route, { data: currentSession(current) })
@@ -405,7 +405,12 @@ test("executes a selected slash command after creating its worktree", async ({ p
        item: { type: "user", payload: { text: expanded }, delivery: "steer" },
      },
    })
-    await route.fulfill({ status: 204, headers })
+    await route.fulfill({
+      status: 200,
+      headers,
+      contentType: "application/json",
+      body: JSON.stringify({ data: { type: "prompt", inboxID: "msg_workspace_review" } }),
+    })
  })
  const editor = page.locator('[data-component="composer-editor"]')
  await editor.fill("/review")
@@ -16,13 +16,8 @@ test("server dialog keeps focus above fullscreen settings", async ({ page }) =>
        body: 'data: {"id":"evt_connected","type":"server.connected","data":{}}\n\n',
      })
    }
-    if (url.pathname === "/api/info") {
-      return json(route, {
-        version: "2.0.0",
-        pid: 1,
-        urls: [url.origin],
-        paths: { tmp: "/tmp/opencode" },
-      })
+    if (url.pathname === "/api/status") {
+      return json(route, { version: "2.0.0", pid: 1, urls: [url.origin] })
    }
    return json(route, {})
  })
@@ -138,14 +138,7 @@ test("MCP authentication starts before a slow resource catalog finishes", async
 test("multiple desktop connections show the session's server name", async ({ page }) => {
  await mockStressTimeline(page)
  await page.route("http://secondary.test/**", (route) =>
-    route.fulfill({
-      json: {
-        version: "2.0.0",
-        pid: 1,
-        urls: ["http://secondary.test"],
-        paths: { tmp: "/tmp/opencode" },
-      },
-    }),
+    route.fulfill({ json: { version: "2.0.0", pid: 1, urls: ["http://secondary.test"] } }),
  )
  await page.addInitScript(
    ({ directory, server }) => {
@@ -109,11 +109,11 @@ test("passes through non-event fetches", async ({ page }) => {
  const timeline = await setupTimeline(page)

  const health = await page.evaluate(async () => {
-    const response = await fetch("/api/info")
+    const response = await fetch("/api/status")
    return response.json()
  })

-  expect(health).toEqual({ version: "2.0.0", pid: 1, urls: [], paths: { tmp: "/tmp/opencode" } })
+  expect(health).toEqual({ version: "2.0.0", pid: 1, urls: [] })
  await expect.poll(async () => (await timeline.transport.connections()).length).toBe(1)
 })

@@ -172,6 +172,64 @@ test("Models and Shortcuts autofocus their filters on normal navigation", async
  await expect(result).toBeFocused()
 })

+for (const count of [7, 8]) {
+  test(`Projects search uses the full list threshold with ${count} projects`, async ({ page }) => {
+    await page.route("**/api/project", (route) => route.fulfill({ json: projectList(count) }))
+    await page.reload()
+    const view = ui(page)
+    await view.search.fill("OpenCode")
+    await expect(view.results.getByRole("option")).toHaveCount(count)
+    await view.search.clear()
+    await view.settings.getByRole("tab", { name: "Projects", exact: true }).click()
+    const search = view.settings.getByRole("searchbox", { name: "Search projects", exact: true })
+    const projects = view.settings.getByRole("button", { name: /^OpenCode / })
+    await expect(projects).toHaveCount(count)
+    if (count === 7) {
+      await expect(search).toHaveCount(0)
+      return
+    }
+    await expect(search).toBeFocused()
+    await search.fill("  CODE 06  ")
+    await expect(projects).toHaveCount(1)
+    await expect(projects).toHaveAccessibleName("OpenCode 06")
+    await expect(search).toBeVisible()
+    await search.fill("missing-project")
+    await expect(projects).toHaveCount(0)
+    await expect(view.settings.getByText("No projects found", { exact: true })).toBeVisible()
+    await view.settings.getByRole("button", { name: "Clear", exact: true }).click()
+    await expect(search).toBeFocused()
+    await expect(projects).toHaveCount(count)
+    await view.settings.getByRole("tab", { name: "Models", exact: true }).click()
+    await view.settings.getByRole("tab", { name: "Projects", exact: true }).click()
+    await expect(search).toBeFocused()
+    await search.fill("OpenCode 06")
+    await projects.click()
+    await expect(view.settings.getByRole("heading", { name: "OpenCode 06", exact: true })).toBeVisible()
+  })
+}
+
+test("Projects search focuses when the qualifying inventory arrives after opening", async ({ page }) => {
+  const inventory = Promise.withResolvers<void>()
+  await page.route("**/api/project", async (route) => {
+    await inventory.promise
+    await route.fulfill({ json: projectList(8) })
+  })
+  const requested = page.waitForRequest((request) => new URL(request.url()).pathname === "/api/project")
+  await page.reload()
+  await requested
+  const view = ui(page)
+  const search = view.settings.getByRole("searchbox", { name: "Search projects", exact: true })
+  try {
+    await view.settings.getByRole("tab", { name: "Projects", exact: true }).click()
+    await expect(view.settings.getByRole("heading", { name: "Projects", exact: true })).toBeVisible()
+    await expect(search).toHaveCount(0)
+  } finally {
+    inventory.resolve()
+  }
+  await expect(search).toBeFocused()
+  await expect(view.settings.getByRole("button", { name: /^OpenCode / })).toHaveCount(8)
+})
+
 test("all indexed client controls resolve to visible production controls", async ({ page }) => {
  const view = ui(page)
  for (const entry of clientSettings.filter((entry) => entry.target && !entry.available)) {
@@ -81,10 +81,10 @@ const fixture = test.extend<{ site: Site }, { builds: Record<string, Record<stri
      response.setHeader("cache-control", "no-store")
      if (path === "/observer.html")
        return void response.writeHead(200, { "content-type": "text/html" }).end("<title>Worker observer</title>")
-      if (path === "/api/info")
+      if (path === "/api/status")
        return void response
          .writeHead(200, { "content-type": "application/json" })
-          .end(`{"version":"test","pid":1,"urls":["${url.origin}"],"paths":{"tmp":"/tmp/opencode"}}`)
+          .end(`{"version":"test","pid":1,"urls":["${url.origin}"]}`)
      if (path === "/sw.js" && state.legacy && state.version === "old") {
        // Model the shipped worker's shared precache name and cache-first navigation behavior.
        const urls = Object.keys(builds.old).filter(
@@ -334,13 +334,8 @@ fixture("upgrades the legacy shared precache only after old tabs close", async (

 fixture("does not substitute cached HTML for API or missing asset navigations", async ({ page, site }) => {
  await install(page, site.url)
-  const api = await page.goto(`${site.url}/api/info`)
-  expect(await api?.json()).toEqual({
-    version: "test",
-    pid: 1,
-    urls: ["http://localhost"],
-    paths: { tmp: "/tmp/opencode" },
-  })
+  const api = await page.goto(`${site.url}/api/status`)
+  expect(await api?.json()).toEqual({ version: "test", pid: 1, urls: ["http://localhost"] })
  expect(api?.fromServiceWorker()).toBe(false)
  const asset = await page.goto(`${site.url}/_assets/missing.js`)
  expect(asset?.status()).toBe(404)
@@ -33,7 +33,7 @@ export class MockBadRequest extends Schema.TaggedError<MockBadRequest>()("MockBa
 }) {}

 const Group = HttpApiGroup.make("mock")
-  .add(HttpApiEndpoint.get("info", "/api/info", { success: Json }))
+  .add(HttpApiEndpoint.get("status", "/api/status", { success: Json }))
  .add(
    HttpApiEndpoint.get("event", "/api/event", {
      success: Schema.String.pipe(HttpApiSchema.asText({ contentType: "text/event-stream" })),
@@ -219,13 +219,7 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map<string, st
        }),
      )
      .handleAll({
-        info: () =>
-          Effect.succeed({
-            version: "2.0.0",
-            pid: 1,
-            urls: config.server ? [config.server] : [],
-            paths: { tmp: "/tmp/opencode" },
-          }),
+        status: () => Effect.succeed({ version: "2.0.0", pid: 1, urls: config.server ? [config.server] : [] }),
        config: () => Effect.succeed(configEntries),
        reference: () =>
          Effect.succeed({
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/app",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "description": "",
  "type": "module",
  "exports": {
@@ -1,19 +0,0 @@
-import { expect, test } from "bun:test"
-import { shouldHandlePasteAsAttachment } from "./interaction"
-
-test("leaves paste to the browser when web clipboard data is unavailable", () => {
-  expect(shouldHandlePasteAsAttachment(clipboard(), false)).toBe(false)
-})
-
-test("uses native image reading only when the clipboard has no text", () => {
-  expect(shouldHandlePasteAsAttachment(clipboard(), true)).toBe(true)
-  expect(shouldHandlePasteAsAttachment(clipboard(["text/plain"]), true)).toBe(false)
-})
-
-test("handles clipboard files as attachments", () => {
-  expect(shouldHandlePasteAsAttachment(clipboard([], [{ kind: "file" }]), false)).toBe(true)
-})
-
-function clipboard(types: string[] = [], items: Array<{ kind: string }> = []) {
-  return { types, items } as unknown as DataTransfer
-}
@@ -384,20 +384,20 @@ export function createComposerEditor(input: {
    },
    onPaste(event: ClipboardEvent) {
      const clipboard = event.clipboardData
-      const text = clipboard?.getData("text/plain")
-      if (attachments && shouldHandlePasteAsAttachment(clipboard, !!input.attachments?.readClipboardImage)) {
+      if (
+        attachments &&
+        (Array.from(clipboard?.items ?? []).some((item) => item.kind === "file") || !clipboard?.getData("text/plain"))
+      ) {
        void attachments.handlePaste(event)
        return
      }
+      const text = clipboard?.getData("text/plain").replace(/\r\n?/g, "\n")
      if (!text) return
      event.preventDefault()
      // insertText emits input events per line, repeatedly parsing and saving the draft.
      // Escaped HTML inserts multiline text once and preserves native selection and undo.
-      const normalized = text.replace(/\r\n?/g, "\n")
-      const multiline = normalized.includes("\n")
-      const value = multiline
-        ? normalized.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")
-        : normalized
+      const multiline = text.includes("\n")
+      const value = multiline ? text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;") : text
      if (
        typeof document.execCommand === "function" &&
        document.execCommand(multiline ? "insertHTML" : "insertText", false, value)
@@ -408,13 +408,13 @@ export function createComposerEditor(input: {
      if (!(target instanceof HTMLElement) || !selection?.rangeCount || !target.contains(selection.anchorNode)) return
      const range = selection.getRangeAt(0)
      range.deleteContents()
-      const node = document.createTextNode(normalized)
+      const node = document.createTextNode(text)
      range.insertNode(node)
      range.setStartAfter(node)
      range.collapse(true)
      selection.removeAllRanges()
      selection.addRange(range)
-      target.dispatchEvent(new InputEvent("input", { bubbles: true, inputType: "insertFromPaste", data: normalized }))
+      target.dispatchEvent(new InputEvent("input", { bubbles: true, inputType: "insertFromPaste", data: text }))
    },
    onDragEnter(event: DragEvent) {
      event.preventDefault()
@@ -450,12 +450,6 @@ export function createComposerEditor(input: {

 export type ComposerEditorModel = ReturnType<typeof createComposerEditor>

-export function shouldHandlePasteAsAttachment(clipboard: DataTransfer | null, readClipboardImage: boolean) {
-  if (Array.from(clipboard?.items ?? []).some((item) => item.kind === "file")) return true
-  if (Array.from(clipboard?.types ?? []).some((type) => type.startsWith("text/"))) return false
-  return readClipboardImage
-}
-
 function canNavigateHistory(direction: "up" | "down", text: string, cursor: number, inHistory: boolean) {
  const position = Math.max(0, Math.min(cursor, text.length))
  if (inHistory) return position === 0 || position === text.length
@@ -15,7 +15,6 @@ export type {
  BrowserPaneTarget,
 } from "./runtime/platform/browser-pane"
 export { ServerConnection, useServers } from "./runtime/server/registry"
-export { useGlobal } from "./runtime/server/runtime"
 export { useTabs } from "./shell/tabs/tabs"
 export { createDraftStore } from "./runtime/persistence/drafts"
 export { createNamespaceStorage, type NamespaceStorage } from "./runtime/persistence/namespace"
@@ -90,12 +90,7 @@ test("rotates HTTP and PTY clients together", async () => {
  const fetch = (async (input: string | URL | Request, init?: RequestInit) => {
    const request = input instanceof Request ? input : new Request(input, init)
    requests.push({ url: request.url, authorization: request.headers.get("authorization") })
-    return Response.json({
-      version: "2.0.0-test",
-      pid: 1,
-      urls: [request.url],
-      paths: { tmp: "/tmp/opencode" },
-    })
+    return Response.json({ version: "2.0.0-test", pid: 1, urls: [request.url] })
  }) as typeof globalThis.fetch
  const transport = createServerTransport({
    http: { url: "http://127.0.0.1:4100", password: "first" },
@@ -103,23 +98,23 @@ test("rotates HTTP and PTY clients together", async () => {
  })
  const initialPty = transport.pty

-  await transport.api.server.info()
+  await transport.api.server.status()
  const replacement = transport.update({
    url: "http://127.0.0.1:4200",
    password: "second",
  })
-  await transport.api.server.info()
+  await transport.api.server.status()

  expect(replacement).toBe(transport.api)
  expect(transport.pty).not.toBe(initialPty)
  expect(transport.url).toBe("http://127.0.0.1:4200")
  expect(requests).toEqual([
    {
-      url: "http://127.0.0.1:4100/api/info",
+      url: "http://127.0.0.1:4100/api/status",
      authorization: `Basic ${btoa("opencode:first")}`,
    },
    {
-      url: "http://127.0.0.1:4200/api/info",
+      url: "http://127.0.0.1:4200/api/status",
      authorization: `Basic ${btoa("opencode:second")}`,
    },
  ])
@@ -5,7 +5,6 @@ import { createStore } from "solid-js/store"
 import { bootstrapGlobal, loadPathQuery, loadProjectsQuery } from "./bootstrap"
 import { ServerScope } from "@/runtime/server/scope"
 import type { ServerApi } from "@/runtime/server/api"
-import { createServerTransport } from "@/runtime/server/client"
 import type { ServerSync } from "@/runtime/server/sync"
 import { worktreeInventoryKey } from "@/workspaces/inventory"

@@ -65,44 +64,6 @@ test("bootstraps projects through the native store setter and preserves subseque
  }
 })

-// Chromium aborts in-flight loopback requests with ERR_NETWORK_CHANGED when Windows reconfigures an
-// adapter; the client wraps that as ClientError("Transport"), which the bootstrap retry must see through.
-test("recovers project metadata after the connection to the server is dropped", async () => {
-  const body = JSON.stringify([{ id: "project", canonical: "/repo", time: { created: 1, updated: 1 }, sandboxes: [] }])
-  let dropped = 0
-  const requests: string[] = []
-  const server = Bun.listen({
-    hostname: "127.0.0.1",
-    port: 0,
-    socket: {
-      open(socket) {
-        if (dropped >= 2) return
-        dropped += 1
-        socket.terminate()
-      },
-      data(socket, chunk) {
-        requests.push(String(chunk).split(" ")[0] ?? "")
-        socket.end(
-          `HTTP/1.1 200 OK\r\ncontent-type: application/json\r\ncontent-length: ${Buffer.byteLength(body)}\r\naccess-control-allow-origin: *\r\nconnection: close\r\n\r\n${body}`,
-        )
-      },
-    },
-  })
-  const transport = createServerTransport({ http: { url: `http://127.0.0.1:${server.port}` } })
-
-  try {
-    const result = await new QueryClient({ defaultOptions: { queries: { retry: false } } }).fetchQuery(
-      loadProjectsQuery(ServerScope.local, transport.api.project),
-    )
-    expect(dropped).toBe(2)
-    // happy-dom's fetch adds a CORS preflight; only the GET is the retried API call.
-    expect(requests.filter((method) => method === "GET")).toHaveLength(1)
-    expect(result).toMatchObject([{ id: "project", worktree: "/repo" }])
-  } finally {
-    server.stop(true)
-  }
-})
-
 describe("query keys", () => {
  test("partitions identical directories by server scope", () => {
    const location = {} as ServerApi["location"]
@@ -17,12 +17,7 @@ describe("checkServerHealth", () => {
    const headers: Array<string | null> = []
    const fetch = (async (_input: RequestInfo | URL, init?: RequestInit) => {
      headers.push(new Headers(init?.headers).get("authorization"))
-      return Response.json({
-        version: "2.0.0",
-        pid: 1,
-        urls: [server.url],
-        paths: { tmp: "/tmp/opencode" },
-      })
+      return Response.json({ version: "2.0.0", pid: 1, urls: [server.url] })
    }) as typeof globalThis.fetch

    expect(await checkServerHealth({ ...server, password }, fetch)).toEqual({ healthy: true, version: "2.0.0" })
@@ -33,19 +28,16 @@ describe("checkServerHealth", () => {
    let request: URL | undefined
    const fetch = (async (input: RequestInfo | URL) => {
      request = input instanceof URL ? input : new URL(input instanceof Request ? input.url : input)
-      return new Response(
-        JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url], paths: { tmp: "/tmp/opencode" } }),
-        {
-          status: 200,
-          headers: { "content-type": "application/json" },
-        },
-      )
+      return new Response(JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url] }), {
+        status: 200,
+        headers: { "content-type": "application/json" },
+      })
    }) as unknown as typeof globalThis.fetch

    const result = await checkServerHealth(server, fetch)

    expect(result).toEqual({ healthy: true, version: "1.2.3" })
-    expect(request?.pathname).toBe("/api/info")
+    expect(request?.pathname).toBe("/api/status")
  })

  test("allows slow servers thirty seconds by default", async () => {
@@ -60,7 +52,7 @@ describe("checkServerHealth", () => {
    })

    const fetch = (async () =>
-      new Response(JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url], paths: { tmp: "/tmp/opencode" } }), {
+      new Response(JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url] }), {
        status: 200,
        headers: { "content-type": "application/json" },
      })) as unknown as typeof globalThis.fetch
@@ -119,13 +111,10 @@ describe("checkServerHealth", () => {
    let signal: AbortSignal | undefined
    const fetch = (async (input: RequestInfo | URL, init?: RequestInit) => {
      signal = abortFromInput(input, init)
-      return new Response(
-        JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url], paths: { tmp: "/tmp/opencode" } }),
-        {
-          status: 200,
-          headers: { "content-type": "application/json" },
-        },
-      )
+      return new Response(JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url] }), {
+        status: 200,
+        headers: { "content-type": "application/json" },
+      })
    }) as unknown as typeof globalThis.fetch

    const abort = new AbortController()
@@ -141,13 +130,10 @@ describe("checkServerHealth", () => {
    const fetch = (async () => {
      count += 1
      if (count < 3) throw new TypeError("network")
-      return new Response(
-        JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url], paths: { tmp: "/tmp/opencode" } }),
-        {
-          status: 200,
-          headers: { "content-type": "application/json" },
-        },
-      )
+      return new Response(JSON.stringify({ version: "1.2.3", pid: 1, urls: [server.url] }), {
+        status: 200,
+        headers: { "content-type": "application/json" },
+      })
    }) as unknown as typeof globalThis.fetch

    const result = await checkServerHealth(server, fetch, {
@@ -95,7 +95,7 @@ export async function checkServerHealth(
      fetch,
      headers,
    })
-      .server.info({ signal })
+      .server.status({ signal })
      .then((status) => ({ data: { healthy: true as const, version: status.version } }))
      .catch((error) => ({ error }))
    if ("data" in current) return current.data
@@ -8,8 +8,11 @@ import { ServerHttp, ServerHttpBase, ServerKey, serverState } from "./persistenc
 import type { SshItem } from "@/servers/ssh/types"

 type ServerState = ReturnType<typeof serverState>["current"]["Type"]
-// Retain closed paths until reopened so settings can exclude them from the server inventory.
-// The Home page independently limits the visible recently closed entries.
+// The store retains more history than is displayed. Consumers filter recently closed entries
+// against the live project list (dropping deleted projects) and then cap the visible count via
+// RECENTLY_CLOSED_DISPLAY_LIMIT. Retaining extra history ensures entries that are temporarily
+// filtered out do not evict still-visible ones from the persisted store.
+const RECENTLY_CLOSED_HISTORY_LIMIT = 16
 export const RECENTLY_CLOSED_DISPLAY_LIMIT = 5

 export function normalizeServerUrl(input: string) {
@@ -48,7 +51,6 @@ export function createServerProjects(input: {
  }
  return {
    list: current,
-    closed: currentClosed,
    recentlyClosed: currentClosed,
    remove,
    open(directory: string) {
@@ -70,7 +72,10 @@ export function createServerProjects(input: {
    close(directory: string) {
      remove(directory)
      const key = pathKey(directory)
-      const closed = [directory, ...currentClosed().filter((worktree) => pathKey(worktree) !== key)]
+      const closed = [directory, ...currentClosed().filter((worktree) => pathKey(worktree) !== key)].slice(
+        0,
+        RECENTLY_CLOSED_HISTORY_LIMIT,
+      )
      setStore("recentlyClosed", input.scope(), closed)
    },
    expand(directory: string) {
@@ -195,7 +195,7 @@ describe("createRequestQueue", () => {
    input.tick(50)
    input.queue.fetch("http://server/api/worktree?location[directory]=%2Fc").catch(() => undefined)
    input.tick(100)
-    input.queue.fetch("http://server/api/info").catch(() => undefined)
+    input.queue.fetch("http://server/api/status").catch(() => undefined)
    expect(input.logs).toEqual([])
    input.tick(2_000)
    await new Promise((resolve) => setTimeout(resolve, 20))
@@ -210,7 +210,7 @@ describe("createRequestQueue", () => {
          ],
          queued: [
            { method: "GET", url: "http://server/api/worktree?location[directory]=%2Fc", ms: 2_100 },
-            { method: "GET", url: "http://server/api/info", ms: 2_000 },
+            { method: "GET", url: "http://server/api/status", ms: 2_000 },
          ],
        },
      },
@@ -146,11 +146,7 @@ function createServerController(
    // Preserve local icon override from per-workspace localStorage cache (childStore.icon).
    // Without this, different subdirectories of the same git repo would share the same
    // icon from the database instead of using their individual overrides.
-    const base = {
-      ...metadata,
-      ...(!metadata || metadata.id === "global" ? childStore.projectMeta : undefined),
-      ...project,
-    }
+    const base = { ...metadata, ...project }
    if (childStore.icon) {
      return { ...base, icon: { ...base.icon, override: childStore.icon } }
    }
@@ -178,7 +174,6 @@ function createServerController(
    projects: {
      ...projects,
      list: projectsList,
-      resolve: enrich,
      recentlyClosed: recentlyClosedList,
    },
    notification,
@@ -6,19 +6,12 @@ import { useLanguage } from "@/runtime/i18n/language"
 export function SettingsSearchEmpty(props: { query: string }) {
  const language = useLanguage()
  const [state, setState] = createStore({ query: props.query })
-  let container: HTMLDivElement | undefined
+  let quoted: HTMLSpanElement | undefined
  let measure: HTMLSpanElement | undefined
  const text = (query: string) => language.t("settings.search.empty.query", { query })
  const update = () => {
-    if (!container || !measure) return
-    const style = getComputedStyle(container)
-    measure.textContent = language.t("settings.search.empty", { query: "" })
-    // Measure the available query space independently of its current truncated text.
-    const width =
-      container.clientWidth -
-      parseFloat(style.paddingInlineStart) -
-      parseFloat(style.paddingInlineEnd) -
-      measure.getBoundingClientRect().width
+    if (!quoted || !measure) return
+    const width = quoted.getBoundingClientRect().width
    const fits = (query: string) => {
      measure!.textContent = text(query)
      return measure!.getBoundingClientRect().width <= width
@@ -47,22 +40,21 @@ export function SettingsSearchEmpty(props: { query: string }) {

  createEffect(update)
  onMount(() => {
-    if (!container || !measure) return
+    if (!quoted || !measure) return
    // The measuring text also observes font changes that do not resize the available space.
-    createResizeObserver([container, measure], update)
+    createResizeObserver([quoted, measure], update)
  })

  return (
    <>
      <div
-        ref={container}
        class="settings-search-empty"
        role="status"
        aria-label={language.t("settings.search.empty", { query: text(props.query) })}
      >
        {language.rich("settings.search.empty", {
          query: (
-            <span class="settings-search-empty-quoted">
+            <span ref={quoted} class="settings-search-empty-quoted">
              <bdi dir="auto">{text(state.query)}</bdi>
            </span>
          ),
@@ -15,12 +15,11 @@
  visibility: hidden;
 }

-:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
+.settings-search [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
  color: var(--v2-icon-icon-faint);
-  cursor: default;
 }

-:is(.settings-search, .settings-projects-search)
+.settings-search
  [data-slot="text-input-v2-icon-button"][data-variant="clear"]:is(:hover, :active, :focus-visible):not(:disabled) {
  background: transparent;
  color: var(--v2-icon-icon-base);
@@ -38,20 +37,19 @@
  background: var(--v2-overlay-simple-overlay-hover);
 }

-:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-input"][data-overflow-start="true"] {
+.settings-search [data-slot="text-input-v2-input"][data-overflow-start="true"] {
  --mask-start: 16px;
 }

-:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-input"][data-overflow-end="true"] {
+.settings-search [data-slot="text-input-v2-input"][data-overflow-end="true"] {
  --mask-end: 16px;
 }

-:is(.settings-search, .settings-projects-search) [data-slot="text-input-v2-input"]:dir(rtl) {
+.settings-search [data-slot="text-input-v2-input"]:dir(rtl) {
  --mask-direction: to left;
 }

-:is(.settings-search, .settings-projects-search)
-  [data-slot="text-input-v2-input"]:is([data-overflow-start="true"], [data-overflow-end="true"]) {
+.settings-search [data-slot="text-input-v2-input"]:is([data-overflow-start="true"], [data-overflow-end="true"]) {
  mask-image: linear-gradient(
    var(--mask-direction, to right),
    transparent,
@@ -7,18 +7,14 @@ import { sshName, type SshItem } from "@/servers/ssh/types"
 import type { ServerCtx } from "@/runtime/server/runtime"
 import { pathKey } from "@/workspaces/path-key"

-export function settingsProjects(context: {
-  projects: Pick<ServerCtx["projects"], "list" | "closed" | "resolve">
-  sync: { data: Pick<ServerCtx["sync"]["data"], "project"> }
-}) {
+export function settingsProjects(context: ServerCtx) {
  const tracked = context.projects.list()
  const paths = new Set(tracked.map((project) => pathKey(project.worktree)))
-  const closed = new Set(context.projects.closed().map(pathKey))
  return [
    ...tracked,
    ...context.sync.data.project
-      .filter((project) => !paths.has(pathKey(project.worktree)) && !closed.has(pathKey(project.worktree)))
-      .map((project) => context.projects.resolve({ worktree: project.worktree, expanded: false })),
+      .filter((project) => !paths.has(pathKey(project.worktree)))
+      .map((project) => ({ ...project, expanded: false })),
  ]
 }

@@ -803,78 +803,6 @@
  padding-inline-end: 28px;
 }

-.settings-projects-search [data-component="text-input-v2"] {
-  height: 36px;
-  background: color-mix(in oklab, var(--v2-background-bg-layer-02) 60%, transparent);
-  box-shadow: none;
-}
-
-.settings-projects-search [data-component="text-input-v2"]:is(:hover, :focus-within):not([data-disabled]) {
-  background: var(--v2-background-bg-layer-02);
-}
-
-.settings-projects-search [data-slot="text-input-v2-input"] {
-  padding-inline-end: 0;
-}
-
-.settings-projects-search [data-slot="text-input-v2-leading-icon"] {
-  padding-inline-start: 16px;
-}
-
-.settings-projects-search [data-slot="text-input-v2-value"] {
-  gap: 12px;
-}
-
-.settings-projects-search [data-slot="text-input-v2-icon-button"][data-variant="clear"] {
-  margin-inline-end: -4px;
-}
-
-.settings-projects-empty {
-  width: 60%;
-  margin-inline: auto;
-}
-
-.settings-projects-empty .settings-search-empty {
-  justify-content: center;
-  padding-inline: 0;
-}
-
-.settings-projects-empty .settings-search-empty-quoted {
-  flex: 0 1 auto;
-}
-
-.settings-project-row {
-  position: relative;
-  margin-inline: 1px;
-  border-radius: 8px;
-  background: var(--v2-background-bg-layer-01);
-  box-shadow: inset 0 0 0 0.5px var(--v2-border-border-muted);
-  transition: background-color 120ms;
-}
-
-.settings-project-row:hover {
-  background: var(--v2-background-bg-layer-02);
-}
-
-.settings-project-row-content {
-  display: flex;
-  width: 100%;
-  min-height: 73px;
-  align-items: center;
-  justify-content: space-between;
-  gap: 20px;
-  padding: 16px;
-  border-radius: inherit;
-  text-align: start;
-}
-
-.settings-project-row-name {
-  font-size: 13px;
-  font-weight: 530;
-  line-height: var(--line-height-compact);
-  color: var(--v2-text-text-base);
-}
-
 .settings-tab-search-clear {
  position: absolute;
  top: 50%;
@@ -294,6 +294,8 @@ function RootSettings() {
            <Tabs.Content value="projects" class="settings-panel">
              <SettingsProjects
                server={server}
+                active={surface.view().tab === "projects"}
+                autofocus={!surface.search.state.selected}
                onOpenProject={(project) =>
                  surface.openProject({
                    server: ServerConnection.key(server),
@@ -376,6 +378,7 @@ function ServerSettings(props: { entry: SettingsServer }) {
            <Tabs.Content value="projects" class="settings-panel">
              <SettingsProjects
                server={server}
+                active={surface.view().tab === "projects"}
                onOpenProject={(project) =>
                  surface.openProject({
                    server: props.entry.key,
@@ -1,230 +0,0 @@
-import { Show, type JSX } from "solid-js"
-import { createStore } from "solid-js/store"
-import { Icon } from "@opencode/ui/icon"
-import { InlineInput } from "@opencode/ui/inline-input"
-import { Menu } from "@opencode/ui/menu"
-import { getFilename } from "@opencode/util/path"
-import { useLanguage } from "@/runtime/i18n/language"
-import { usePlatform } from "@/runtime/platform/platform"
-import { ServerConnection } from "@/runtime/server/registry"
-import { useGlobal } from "@/runtime/server/runtime"
-import { displayName, errorMessage } from "@/shell/layout/helpers"
-import { fileManagerApp } from "@/home/projects/file-manager"
-import { ProjectIcon } from "@/shell/layout/project-icon"
-import { showToast } from "@/shell/notifications/toast"
-import type { LocalProject } from "@/shell/state/layout"
-
-export function SettingsProjectRow(props: {
-  project: LocalProject
-  server: ServerConnection.Any
-  onOpen: (project: LocalProject) => void
-}) {
-  const language = useLanguage()
-  const platform = usePlatform()
-  const global = useGlobal()
-  const [store, setStore] = createStore({
-    menu: undefined as { x: number; y: number } | undefined,
-    editor: undefined as { draft: string; saving: boolean } | undefined,
-  })
-  let row: HTMLDivElement | undefined
-  let button: HTMLButtonElement | undefined
-  let input: HTMLInputElement | undefined
-  let outside = false
-  const openMenu = (x: number, y: number) => {
-    if (!row) return
-    const bounds = row.getBoundingClientRect()
-    setStore("menu", { x: x - bounds.left, y: y - bounds.top })
-  }
-  const openEditor = () => {
-    setStore("editor", { draft: displayName(props.project), saving: false })
-    requestAnimationFrame(() => {
-      input?.focus()
-      input?.select()
-    })
-  }
-  const closeEditor = () => {
-    if (store.editor?.saving) return
-    setStore("editor", undefined)
-  }
-  const saveEditor = async () => {
-    if (!store.editor || store.editor.saving) return
-    const name = store.editor.draft.trim()
-    if (!name || name === displayName(props.project)) {
-      closeEditor()
-      requestAnimationFrame(() => button?.focus())
-      return
-    }
-    setStore("editor", "saving", true)
-    const context = global.ensureServerCtx(props.server)
-    const value = name === getFilename(props.project.worktree) ? "" : name
-    const saved = await (props.project.id && props.project.id !== "global"
-      ? context.sdk.api.project
-          .update({ projectID: props.project.id, name: value })
-          .then((project) => context.sync.project.update(project))
-      : Promise.resolve(context.sync.project.meta(props.project.worktree, { name: value }))
-    )
-      .then(() => true)
-      .catch((error: unknown) => {
-        showToast({
-          variant: "error",
-          title: language.t("common.requestFailed"),
-          description: error instanceof Error ? error.message : language.t("common.requestFailed"),
-        })
-        return false
-      })
-    const restore = document.activeElement === document.body || document.activeElement === input
-    if (saved) setStore("editor", undefined)
-    if (!saved) setStore("editor", "saving", false)
-    if (!restore) return
-    requestAnimationFrame(() => (saved ? button : input)?.focus())
-  }
-
-  return (
-    <div
-      ref={row}
-      data-component="settings-project-row"
-      class="settings-project-row group"
-      onContextMenu={(event) => {
-        if (store.editor) return
-        event.preventDefault()
-        openMenu(event.clientX, event.clientY)
-      }}
-    >
-      <Show
-        when={!store.editor}
-        fallback={
-          <div class="settings-project-row-content">
-            <ProjectRowContent project={props.project}>
-              <InlineInput
-                ref={input}
-                aria-label={language.t("common.rename")}
-                dir="auto"
-                value={store.editor?.draft ?? ""}
-                disabled={store.editor?.saving}
-                class="settings-project-row-name w-full outline-none"
-                style={{ "--inline-input-shadow": "none", "text-align": "start" }}
-                onInput={(event) => setStore("editor", "draft", event.currentTarget.value)}
-                onKeyDown={(event) => {
-                  event.stopPropagation()
-                  if (event.isComposing || event.keyCode === 229) return
-                  if (event.key === "Enter") {
-                    event.preventDefault()
-                    void saveEditor()
-                    return
-                  }
-                  if (event.key !== "Escape") return
-                  event.preventDefault()
-                  closeEditor()
-                  requestAnimationFrame(() => button?.focus())
-                }}
-                onBlur={closeEditor}
-              />
-            </ProjectRowContent>
-          </div>
-        }
-      >
-        <button
-          ref={button}
-          type="button"
-          aria-label={displayName(props.project)}
-          aria-haspopup="menu"
-          aria-expanded={!!store.menu}
-          class="settings-project-row-content"
-          onClick={() => props.onOpen(props.project)}
-          onKeyDown={(event) => {
-            if (event.key !== "ContextMenu" && (event.key !== "F10" || !event.shiftKey)) return
-            event.preventDefault()
-            const bounds = event.currentTarget.getBoundingClientRect()
-            openMenu(bounds.left + 12, bounds.bottom)
-          }}
-        >
-          <ProjectRowContent project={props.project}>
-            <bdi class="settings-project-row-name truncate">{displayName(props.project)}</bdi>
-          </ProjectRowContent>
-          <Icon
-            name="chevron-right"
-            size="small"
-            class="shrink-0 text-v2-icon-icon-muted opacity-0 transition-opacity group-hover:opacity-100 group-focus-within:opacity-100"
-          />
-        </button>
-      </Show>
-      <Menu
-        modal={false}
-        placement="bottom-start"
-        gutter={2}
-        open={!!store.menu}
-        onOpenChange={(open) => {
-          if (!open) setStore("menu", undefined)
-        }}
-      >
-        <Menu.Trigger
-          as="span"
-          aria-hidden="true"
-          tabIndex={-1}
-          class="pointer-events-none absolute size-px"
-          style={{ left: `${store.menu?.x ?? 0}px`, top: `${store.menu?.y ?? 0}px` }}
-        />
-        <Menu.Portal>
-          <Menu.Content
-            onInteractOutside={() => {
-              outside = true
-            }}
-            onCloseAutoFocus={(event) => {
-              event.preventDefault()
-              const restore = !outside && !store.editor
-              outside = false
-              if (restore) requestAnimationFrame(() => button?.focus())
-            }}
-          >
-            <Menu.Item onSelect={openEditor}>{language.t("common.rename")}</Menu.Item>
-            <Show
-              when={platform.platform === "desktop" && !!platform.openPath && ServerConnection.local(props.server)}
-            >
-              <Menu.Item
-                onSelect={() => {
-                  if (!platform.openPath) return
-                  void platform.openPath(props.project.worktree).catch((cause: unknown) =>
-                    showToast({
-                      title: language.t("common.requestFailed"),
-                      description: errorMessage(cause, language.t("common.requestFailed")),
-                    }),
-                  )
-                }}
-              >
-                {language.t(fileManagerApp(platform.os ?? "unknown").actionLabel)}
-              </Menu.Item>
-            </Show>
-            <Menu.Separator />
-            <Menu.Item
-              onSelect={() => {
-                const next = row?.nextElementSibling ?? row?.previousElementSibling
-                global.ensureServerCtx(props.server).projects.close(props.project.worktree)
-                requestAnimationFrame(() => next?.querySelector("button")?.focus())
-              }}
-            >
-              {language.t("common.close")}
-            </Menu.Item>
-          </Menu.Content>
-        </Menu.Portal>
-      </Menu>
-    </div>
-  )
-}
-
-function ProjectRowContent(props: { project: LocalProject; children: JSX.Element }) {
-  return (
-    <span class="flex items-start gap-2.5 min-w-0 flex-1">
-      <ProjectIcon project={props.project} class="shrink-0" />
-      <span class="flex min-w-0 flex-1 flex-col gap-1.5">
-        {props.children}
-        <bdi
-          dir="ltr"
-          class="text-11-regular leading-[var(--line-height-compact)] text-v2-text-text-muted truncate"
-          title={props.project.worktree}
-        >
-          {props.project.worktree}
-        </bdi>
-      </span>
-    </span>
-  )
-}
@@ -1,43 +1,45 @@
-import { Show, createEffect, createMemo, on, type Component } from "solid-js"
-import { Key } from "@solid-primitives/keyed"
+import { For, Show, createEffect, createMemo, on, onCleanup, type Component } from "solid-js"
 import { createStore } from "solid-js/store"
-import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { Icon } from "@opencode/ui/icon"
 import { TextInput } from "@opencode/ui/text-input"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useGlobal } from "@/runtime/server/runtime"
 import { ServerConnection } from "@/runtime/server/registry"
 import { displayName } from "@/shell/layout/helpers"
+import { ProjectIcon } from "@/shell/layout/project-icon"
 import type { LocalProject } from "@/shell/state/layout"
-import { SettingsSearchEmpty } from "../search-empty"
 import { settingsProjects } from "../servers/inventory"
-import { SettingsProjectRow } from "./project-row"
-import "@/settings/search.css"
 import "@/settings/settings.css"

 export const SettingsProjects: Component<{
  server: ServerConnection.Any
+  active?: boolean
+  autofocus?: boolean
  onOpenProject: (project: LocalProject) => void
 }> = (props) => {
  const language = useLanguage()
  const global = useGlobal()
-  const [store, setStore] = createStore({ filter: "", overflow: { start: false, end: false } })
+  const [store, setStore] = createStore({ filter: "" })
  let search: HTMLInputElement | undefined
-  const updateOverflow = () => {
-    if (!search) return
-    const offset = Math.abs(search.scrollLeft)
-    setStore("overflow", {
-      start: offset > 1,
-      end: search.scrollWidth - search.clientWidth - offset > 1,
-    })
-  }
-  createEffect(on(() => store.filter, updateOverflow))
  const projects = createMemo(() => settingsProjects(global.ensureServerCtx(props.server)))
  const searchable = createMemo(() => projects().length > 7)
  const filtered = createMemo(() => {
    const query = searchable() ? store.filter.trim().toLowerCase() : ""
    return query ? projects().filter((project) => displayName(project).toLowerCase().includes(query)) : projects()
  })
+  createEffect(
+    on(
+      () => (props.active ?? true) && searchable(),
+      (active) => {
+        if (!active) return
+        const frame = requestAnimationFrame(() => {
+          if (props.active !== false && props.autofocus !== false && search?.isConnected)
+            search.focus({ preventScroll: true })
+        })
+        onCleanup(() => cancelAnimationFrame(frame))
+      },
+    ),
+  )
  createEffect(() => {
    if (!searchable()) setStore("filter", "")
  })
@@ -52,24 +54,16 @@ export const SettingsProjects: Component<{
          </div>
        </div>
        <Show when={searchable()}>
-          <div class="settings-tab-search settings-projects-search">
+          <div class="settings-tab-search">
            <TextInput
-              ref={(element) => {
-                search = element
-                createResizeObserver(element, updateOverflow)
-              }}
+              ref={search}
              type="search"
              appearance="base"
-              leadingIcon={<Icon name="magnifying-glass" size="small" />}
              value={store.filter}
-              data-overflow-start={store.overflow.start}
-              data-overflow-end={store.overflow.end}
-              onScroll={updateOverflow}
              onInput={(event) => setStore("filter", event.currentTarget.value)}
              placeholder={language.t("settings.projects.search.placeholder")}
              aria-label={language.t("settings.projects.search.placeholder")}
              showClearButton={!!store.filter}
-              clearIcon="circle-xmark"
              onClearClick={() => {
                setStore("filter", "")
                search?.focus({ preventScroll: true })
@@ -87,26 +81,32 @@ export const SettingsProjects: Component<{
        <Show
          when={filtered().length > 0}
          fallback={
-            <Show
-              when={store.filter.trim()}
-              fallback={
-                <div class="py-12 text-center text-v2-text-text-muted text-13-regular">
-                  {language.t("settings.projects.empty")}
-                </div>
-              }
-            >
-              <div class="settings-projects-empty">
-                <SettingsSearchEmpty query={store.filter} />
-              </div>
-            </Show>
+            <div class="py-12 text-center text-v2-text-text-muted text-13-regular">
+              {language.t("settings.projects.empty")}
+            </div>
          }
        >
          <div class="flex w-full flex-col gap-2">
-            <Key each={filtered()} by="worktree">
+            <For each={filtered()}>
              {(project) => (
-                <SettingsProjectRow project={project()} server={props.server} onOpen={props.onOpenProject} />
+                <button
+                  type="button"
+                  aria-label={displayName(project)}
+                  class="group mx-px flex items-center justify-between gap-5 px-4 py-2.5 rounded-lg bg-v2-background-bg-base shadow-[var(--v2-elevation-raised)] transition-[background-color] hover:bg-v2-background-bg-layer-01 text-start"
+                  onClick={() => props.onOpenProject(project)}
+                >
+                  <span class="flex items-center gap-2.5 min-w-0 flex-1">
+                    <ProjectIcon project={project} class="shrink-0" />
+                    <bdi class="text-13-medium text-v2-text-text-base truncate">{displayName(project)}</bdi>
+                  </span>
+                  <Icon
+                    name="chevron-right"
+                    size="small"
+                    class="shrink-0 text-v2-icon-icon-muted opacity-0 transition-opacity group-hover:opacity-100 group-focus-visible:opacity-100"
+                  />
+                </button>
              )}
-            </Key>
+            </For>
          </div>
        </Show>
      </div>
@@ -218,30 +218,22 @@
  }
 }

-@container (44px < width <= 64px) {
-  [data-titlebar-tab]:not([data-orientation="vertical"]):not([data-editing="true"]):is(:hover, [data-active="true"])
-    [data-slot="tab-link"] {
-    -webkit-mask-image: none;
-    mask-image: none;
-  }
-
-  [data-titlebar-tab]:not([data-orientation="vertical"]):not([data-editing="true"]):is(:hover, [data-active="true"])
-    [data-titlebar-tab-title] {
-    visibility: hidden;
-  }
-}
-
-@container (max-width: 44px) {
+@container (max-width: 64px) {
  [data-titlebar-tab]:not([data-orientation="vertical"]) [data-titlebar-tab-link] {
    justify-content: center;
    gap: 0;
    padding-inline: 0;
  }

-  [data-titlebar-tab]:not([data-orientation="vertical"]):not([data-editing="true"]) [data-slot="tab-link"],
-  [data-titlebar-tab]:not([data-orientation="vertical"]):not([data-editing="true"]):dir(rtl) [data-slot="tab-link"] {
-    -webkit-mask-image: none;
-    mask-image: none;
+  @media (hover: none) {
+    [data-titlebar-tab]:not([data-orientation="vertical"]):not([data-editing="true"]) [data-slot="tab-link"],
+    [data-titlebar-tab][data-title-overflow="true"]:not([data-orientation="vertical"]):not([data-editing="true"]):dir(
+        rtl
+      )
+      [data-slot="tab-link"] {
+      -webkit-mask-image: none;
+      mask-image: none;
+    }
  }

  [data-titlebar-tab]:not([data-orientation="vertical"]) [data-titlebar-tab-title] {
@@ -252,13 +244,6 @@
    display: none;
  }

-  @media (hover: hover) {
-    [data-titlebar-tab]:not([data-orientation="vertical"]):not(:hover):not(:has(:focus-visible))
-      [data-slot="tab-close"] {
-      display: none;
-    }
-  }
-
  [data-titlebar-tab]:not([data-orientation="vertical"]) [data-slot="tab-close"] {
    right: auto;
    left: 50%;
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/cli",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "type": "module",
  "license": "MIT",
  "bin": {
@@ -2,7 +2,7 @@

 import { NodeFileSystem } from "@effect/platform-node"
 import { Service } from "@opencode/client/effect/service"
-import { ServerInfo } from "@opencode/protocol/groups/server"
+import { ServerStatus } from "@opencode/protocol/groups/server"
 import { Effect, Schema } from "effect"
 import fs from "node:fs/promises"
 import os from "node:os"
@@ -42,12 +42,12 @@ try {
  const credential = btoa(`opencode:${info.password}`)
  const headers = { authorization: "Basic " + credential }
  const token = encodeURIComponent(credential)
-  const serverInfo = await waitForReady(info.url, headers)
-  if (serverInfo.pid !== info.pid) throw new Error("Server info does not match registration")
-  const tokenInfo = await fetch(new URL(`/api/info?auth_token=${token}`, info.url), {
+  const status = await waitForReady(info.url, headers)
+  if (status.pid !== info.pid) throw new Error("Status process does not match registration")
+  const tokenStatus = await fetch(new URL(`/api/status?auth_token=${token}`, info.url), {
    signal: AbortSignal.timeout(5_000),
  })
-  if (tokenInfo.status !== 200) throw new Error("Compiled service rejected query authentication")
+  if (tokenStatus.status !== 200) throw new Error("Compiled service rejected query authentication")
  const tokenOpenApi = await fetch(new URL(`/openapi.json?auth_token=${token}`, info.url), {
    signal: AbortSignal.timeout(5_000),
  })
@@ -57,10 +57,10 @@ try {
  await fs.writeFile(plugin, pluginSource())
  await waitForPlugin(info.url, headers)

-  const unauthorizedInfo = await fetch(new URL("/api/info", info.url), {
+  const unauthorizedStatus = await fetch(new URL("/api/status", info.url), {
    signal: AbortSignal.timeout(5_000),
  })
-  if (unauthorizedInfo.status !== 401) throw new Error("Compiled service exposed info without authentication")
+  if (unauthorizedStatus.status !== 401) throw new Error("Compiled service exposed status without authentication")
  const unauthorizedOpenApi = await fetch(new URL("/openapi.json", info.url), {
    signal: AbortSignal.timeout(5_000),
  })
@@ -128,11 +128,11 @@ async function waitForRegistration() {
 async function waitForReady(url: string, headers: HeadersInit) {
  const deadline = Date.now() + 20_000
  while (Date.now() < deadline) {
-    const response = await fetch(new URL("/api/info", url), {
+    const response = await fetch(new URL("/api/status", url), {
      headers,
      signal: AbortSignal.timeout(1_000),
    }).catch(() => undefined)
-    if (response?.ok) return Schema.decodeUnknownPromise(ServerInfo)(await response.json())
+    if (response?.ok) return Schema.decodeUnknownPromise(ServerStatus)(await response.json())
    await Bun.sleep(25)
  }
  throw new Error("Compiled service did not become ready")
@@ -1,4 +1,5 @@
 import type { AgentSideConnection, PromptResponse, SessionUpdate } from "@agentclientprotocol/sdk"
+import type { Command } from "@opencode/schema/command"
 import type {
  EventSubscribeOutput,
  OpenCodeClient,
@@ -37,6 +38,9 @@ export type TurnStart =
  | { readonly type: "skill"; readonly id: string }
  | { readonly type: "compaction"; readonly id: string }

+/** `prompt` submissions admitted work under the start ID; `immediate` submissions have none to follow. */
+export type Admission = Command.Outcome["type"]
+
 export const ChildSessionUpdatesCapability = "opencode/child-session-updates"
 export const ChildSessionUpdateMethod = "opencode/session/child_update"

@@ -76,8 +80,7 @@ export async function streamTurn(input: {
  readonly cwd: string
  readonly start: TurnStart
  readonly writeTextFile: boolean
-  readonly action?: boolean
-  readonly submit: (signal: AbortSignal) => Promise<unknown>
+  readonly submit: (signal: AbortSignal) => Promise<Admission>
  readonly control: TurnControl
  readonly childSessionUpdate?: (update: ChildSessionUpdate) => Promise<void>
  readonly connectionSignal?: AbortSignal
@@ -114,6 +117,14 @@ export async function streamTurn(input: {
      .catch(() => {})
  }

+  // Command-spawned subagents run while the invoking Session is idle, so cancelling the prompt
+  // must interrupt them directly. Sessions that start after cancellation are interrupted on start.
+  const interruptChildren = async () => {
+    await Promise.all(
+      [...openChildren].map((sessionID) => input.client.session.interrupt({ sessionID }).catch(() => {})),
+    )
+  }
+
  const updateSession = async (value: SessionUpdate, child: ChildSession | undefined, mode: "turn" | "background") => {
    const projected = child ? projectChildUpdate(value, child) : value
    if (mode === "turn" && (!child || !input.childSessionUpdate)) {
@@ -178,9 +189,10 @@ export async function streamTurn(input: {
      if (!started) continue

      if (event.type === "session.execution.started") {
-        if (child) {
-          await notifyChild(child, { type: "status", status: "running" })
+        if (mode === "turn" && control.cancelled) {
+          await input.client.session.interrupt({ sessionID: event.data.sessionID }).catch(() => {})
        }
+        if (child) await notifyChild(child, { type: "status", status: "running" })
        continue
      }

@@ -342,11 +354,15 @@ export async function streamTurn(input: {
    input.sessionSignal?.removeEventListener("abort", connectionAbort)
    await stream.return?.(undefined).catch(() => {})
  }
+  const onCancel = () => void interruptChildren()
+  control.admission.signal.addEventListener("abort", onCancel, { once: true })
  try {
-    await input.submit(control.admission.signal).catch((error) => {
+    const admission = await input.submit(control.admission.signal).catch((error): Admission => {
      if (!control.cancelled) throw error
+      // The request may have been admitted before the abort reached the server; keep observing.
+      return "prompt"
    })
-    if (input.action) {
+    if (admission === "immediate") {
      streamController.abort()
      await completed.catch(() => {})
      return response(undefined, undefined, "succeeded", control.cancelled, undefined)
@@ -384,6 +400,7 @@ export async function streamTurn(input: {
    await completed.catch(() => {})
    throw error
  } finally {
+    control.admission.signal.removeEventListener("abort", onCancel)
    if (!handedOff) await closeStream()
  }
 }
@@ -52,6 +52,7 @@ import {
  ChildSessionUpdatesCapability,
  replayMessages,
  streamTurn,
+  type Admission,
  type ChildSessionUpdate,
  type TurnControl,
  type TurnStart,
@@ -327,7 +328,6 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
        cwd: state.cwd,
        start: prepared.start,
        writeTextFile: capabilities.writeTextFile,
-        action: prepared.command !== undefined,
        control,
        connectionSignal: input.connection.signal,
        sessionSignal: state.abort.signal,
@@ -362,7 +362,12 @@ function preparePrompt(catalog: Catalog, prompt: PromptRequest["prompt"], messag
  return { start, text, files, synthetic, slash, command }
 }

-async function submitPrompt(client: OpenCodeClient, session: Attached, prompt: PreparedPrompt, signal: AbortSignal) {
+async function submitPrompt(
+  client: OpenCodeClient,
+  session: Attached,
+  prompt: PreparedPrompt,
+  signal: AbortSignal,
+): Promise<Admission> {
  if (prompt.synthetic.length > 0) {
    await client.session.synthetic({
      sessionID: session.id,
@@ -372,23 +377,30 @@ async function submitPrompt(client: OpenCodeClient, session: Attached, prompt: P
      resume: false,
    })
  }
-  if (prompt.start.type === "compaction") return client.session.compact({ sessionID: session.id, id: prompt.start.id })
+  if (prompt.start.type === "compaction") {
+    await client.session.compact({ sessionID: session.id, id: prompt.start.id })
+    return "prompt"
+  }
  if (prompt.command) {
-    return client.session.command(
+    // The command admits any resulting input under the turn's start ID so the stream can follow it.
+    const outcome = await client.session.command(
      {
        sessionID: session.id,
        name: prompt.command.name,
+        id: prompt.start.id,
        text: prompt.slash?.args ?? "",
        files: prompt.files,
        delivery: "steer",
      },
      { signal },
    )
+    return outcome.type
  }
-  return client.session.prompt(
+  await client.session.prompt(
    { sessionID: session.id, id: prompt.start.id, text: prompt.text, files: prompt.files, delivery: "steer" },
    { signal },
  )
+  return "prompt"
 }

 function turnStart(messageID: string, slash: PreparedPrompt["slash"]): TurnStart {
@@ -15,7 +15,7 @@ export default Runtime.handler(
    const urls = Option.isSome(input.url)
      ? [input.url.value]
      : (yield* Effect.tryPromise(() =>
-          OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) }).server.info(),
+          OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) }).server.status(),
        )).urls
    const info = { urls, username: "opencode", password }
    process.stdout.write(
@@ -20,7 +20,7 @@ export interface Interface {
 export class Service extends Context.Service<Service, Interface>()("@opencode/cli/config/Config") {}

 const decode = Schema.decodeUnknownOption(Info)
-const decodeRecord = Schema.decodeUnknownOption(Schema.Record(Schema.String, Schema.Unknown))
+const decodeRecord = Schema.decodeUnknownOption(Schema.Record(Schema.String, Schema.Any))
 const empty: Info = {}

 export const layer = Layer.effect(
@@ -29,14 +29,14 @@ export const layer = Layer.effect(
    const fs = yield* FileSystem.FileSystem
    const global = yield* Global.Service
    const file = path.join(global.config, "cli.json")
-    const content = process.env.OPENCODE_CLI_CONFIG_CONTENT
-      ? Option.getOrUndefined(decode(parseRecord(process.env.OPENCODE_CLI_CONFIG_CONTENT)))
-      : undefined

    const readJson = Effect.fnUntraced(function* () {
      const text = yield* fs.readFileString(file).pipe(Effect.orElseSucceed(() => undefined))
      if (text === undefined) return undefined
-      return parseRecord(text)
+      const errors: ParseError[] = []
+      const value: any = parse(text, errors, { allowTrailingComma: true })
+      if (errors.length) return undefined
+      return Option.getOrUndefined(decodeRecord(value))
    })

    const write = Effect.fnUntraced(function* (text: string) {
@@ -61,9 +61,6 @@ export const layer = Layer.effect(
          }),
        ),
      )
-    const load = Effect.fnUntraced(function* (migration?: Info) {
-      return merge(migration ?? Option.getOrUndefined(decode(yield* readJson())), content)
-    })

    const get = Effect.fn("cli.config.get")(() =>
      withLock(
@@ -75,7 +72,8 @@ export const layer = Layer.effect(
          )
          if (migration?.cause)
            yield* Effect.logWarning("failed to persist migrated cli config", { cause: migration.cause })
-          return yield* load(migration?.info)
+          if (migration?.info) return migration.info
+          return Option.getOrElse(decode(yield* readJson()), () => empty)
        }),
      ),
    )
@@ -85,7 +83,7 @@ export const layer = Layer.effect(
        Effect.gen(function* () {
          const migration = yield* migrate
          if (migration?.cause) return yield* Effect.failCause(migration.cause)
-          const current = yield* load(migration?.info)
+          const current = migration?.info ?? Option.getOrElse(decode(yield* readJson()), () => empty)
          const next = produce(current, update)
          const edits = changes(current, next)
          if (!edits.length) return current
@@ -104,7 +102,7 @@ export const layer = Layer.effect(
          const config = Option.getOrUndefined(decode(parse(updated, errors, { allowTrailingComma: true })))
          if (errors.length || config === undefined) return yield* Effect.fail(new Error("Invalid CLI config update"))
          yield* write(updated.endsWith("\n") ? updated : updated + "\n")
-          return merge(config, content)
+          return config
        }),
      ).pipe(Effect.mapError((cause) => new Error("Failed to update CLI config", { cause }))),
    )
@@ -115,39 +113,6 @@ export const layer = Layer.effect(

 type Edit = { readonly path: (string | number)[]; readonly value: any }

-function merge(...values: readonly (Info | undefined)[]) {
-  return Option.getOrElse(
-    decode(
-      values.reduce<Record<string, unknown>>(
-        (result, value) => mergeRecords(result, value ?? {}),
-        {},
-      ),
-    ),
-    () => empty,
-  )
-}
-
-function mergeRecords(base: object, overlay: object) {
-  return Object.entries(overlay).reduce<Record<string, unknown>>(
-    (result, [key, value]) => {
-      result[key] = isRecord(result[key]) && isRecord(value) ? mergeRecords(result[key], value) : value
-      return result
-    },
-    { ...base },
-  )
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null && !Array.isArray(value)
-}
-
-function parseRecord(text: string) {
-  const errors: ParseError[] = []
-  const value: unknown = parse(text, errors, { allowTrailingComma: true })
-  if (errors.length) return undefined
-  return Option.getOrUndefined(decodeRecord(value))
-}
-
 function changes(before: any, after: any, path: (string | number)[] = []): Edit[] {
  if (Object.is(before, after)) return []
  if (
@@ -29,7 +29,7 @@ export const resolve = Effect.fn("cli.server-connection.resolve")(function* (arg
    } satisfies Endpoint
    const client = OpenCode.make({ baseUrl: endpoint.url, headers: Service.headers(endpoint) })
    const health = yield* Effect.tryPromise({
-      try: () => client.server.info({ signal: AbortSignal.timeout(5_000) }),
+      try: () => client.server.status({ signal: AbortSignal.timeout(5_000) }),
      catch: (cause) => connectError(endpoint, cause),
    })
    if (health.version !== OPENCODE_VERSION)
@@ -0,0 +1,138 @@
+import type { PromptResponse, SessionNotification } from "@agentclientprotocol/sdk"
+import { describe, expect, test } from "bun:test"
+import { createAcpFixture, expectOk, initialize, lastUserText, newSession, type ChatRequest } from "./subprocess"
+
+describe("acp slash command subprocess", () => {
+  test("template command stays pending until its model work completes and streams the output", async () => {
+    const script = scriptedModel()
+    await using fixture = await createAcpFixture({
+      respond: script.respond,
+      config: { commands: { audit: { description: "Audit the change", template: "Audit $ARGUMENTS" } } },
+    })
+    const acp = fixture.spawn()
+    await initialize(acp)
+    const session = await newSession(acp, fixture.home)
+
+    const gate = script.hold()
+    const pending = acp
+      .request<PromptResponse>("session/prompt", {
+        sessionId: session.sessionId,
+        prompt: [{ type: "text", text: "/audit now" }],
+      })
+      .then(expectOk)
+    await gate.started
+    expect(lastUserText(fixture.llm.requests.at(-1)!)).toBe("Audit now")
+    // The response is held, so the prompt must still be pending.
+    expect(await Promise.race([pending.then(() => "settled"), Bun.sleep(200).then(() => "pending")])).toBe("pending")
+
+    gate.release("COMMAND_RESPONSE")
+    expect((await pending).stopReason).toBe("end_turn")
+    const chunk = await acp.waitForNotification<SessionNotification>("session/update", (params) =>
+      isAgentText(params, "COMMAND_RESPONSE"),
+    )
+    expect(chunk.params.sessionId).toBe(session.sessionId)
+  }, 60_000)
+
+  test("subagent command follows the child and the parent's follow-up before completing", async () => {
+    const script = scriptedModel()
+    await using fixture = await createAcpFixture({
+      respond: script.respond,
+      config: {
+        commands: { audit: { description: "Audit in a subagent", template: "Audit $ARGUMENTS", subagent: true } },
+      },
+    })
+    const acp = fixture.spawn()
+    await initialize(acp)
+    const session = await newSession(acp, fixture.home)
+
+    const child = script.hold()
+    const parent = script.hold()
+    const pending = acp
+      .request<PromptResponse>("session/prompt", {
+        sessionId: session.sessionId,
+        prompt: [{ type: "text", text: "/audit now" }],
+      })
+      .then(expectOk)
+    await child.started
+    expect(lastUserText(fixture.llm.requests.at(-1)!)).toBe("You are a subagent spawned by another session.\nAudit now")
+    child.release("CHILD_DONE")
+    await parent.started
+    expect(lastUserText(fixture.llm.requests.at(-1)!)).toContain("CHILD_DONE")
+    expect(await Promise.race([pending.then(() => "settled"), Bun.sleep(200).then(() => "pending")])).toBe("pending")
+
+    parent.release("PARENT_DONE")
+    expect((await pending).stopReason).toBe("end_turn")
+    const childChunk = await acp.waitForNotification<SessionNotification>("session/update", (params) =>
+      isAgentText(params, "CHILD_DONE"),
+    )
+    expect(childChunk.params.update._meta?.["opencode/child-session"]).toMatchObject({ parentID: session.sessionId })
+    const parentChunk = await acp.waitForNotification<SessionNotification>("session/update", (params) =>
+      isAgentText(params, "PARENT_DONE"),
+    )
+    expect(parentChunk.params.update._meta?.["opencode/child-session"]).toBeUndefined()
+  }, 60_000)
+
+  test("cancelling during subagent command work interrupts the child and the parent's follow-up", async () => {
+    const script = scriptedModel()
+    await using fixture = await createAcpFixture({
+      respond: script.respond,
+      config: {
+        commands: { audit: { description: "Audit in a subagent", template: "Audit $ARGUMENTS", subagent: true } },
+      },
+    })
+    const acp = fixture.spawn()
+    await initialize(acp)
+    const session = await newSession(acp, fixture.home)
+
+    const child = script.hold()
+    const parent = script.hold()
+    const pending = acp
+      .request<PromptResponse>("session/prompt", {
+        sessionId: session.sessionId,
+        prompt: [{ type: "text", text: "/audit now" }],
+      })
+      .then(expectOk)
+    await child.started
+    await acp.notify("session/cancel", { sessionId: session.sessionId })
+
+    // Both model responses stay held, so the prompt can only settle by interrupting the child and
+    // the parent's follow-up run that the cancelled-subagent notice wakes.
+    expect((await pending).stopReason).toBe("cancelled")
+    child.release("LATE")
+    parent.release("LATE")
+    const followUp = expectOk(
+      await acp.request<PromptResponse>("session/prompt", {
+        sessionId: session.sessionId,
+        prompt: [{ type: "text", text: "hello again" }],
+      }),
+    )
+    expect(followUp.stopReason).toBe("end_turn")
+  }, 60_000)
+})
+
+/** Holds agent-loop model responses in FIFO order; auxiliary requests (no tools) answer immediately. */
+function scriptedModel() {
+  const holds: Array<{ started: () => void; released: Promise<string> }> = []
+  return {
+    respond: (request: ChatRequest) => {
+      const next = request.tools ? holds.shift() : undefined
+      if (!next) return "accepted"
+      next.started()
+      return next.released
+    },
+    hold() {
+      const started = Promise.withResolvers<void>()
+      const released = Promise.withResolvers<string>()
+      holds.push({ started: started.resolve, released: released.promise })
+      return { started: started.promise, release: released.resolve }
+    },
+  }
+}
+
+function isAgentText(params: SessionNotification, text: string) {
+  return (
+    params.update.sessionUpdate === "agent_message_chunk" &&
+    params.update.content.type === "text" &&
+    params.update.content.text === text
+  )
+}
@@ -656,6 +656,7 @@ describe("acp event behavior", () => {
          { signal },
        )
        submitted.resolve()
+        return "prompt"
      },
    })

@@ -694,10 +695,9 @@ describe("acp event behavior", () => {
      writeTextFile: false,
      control,
      submit: (signal) =>
-        fixture.client.session.prompt(
-          { sessionID: "ses_cancel_admission", id: "input_cancel_admission", text: "cancel me" },
-          { signal },
-        ),
+        fixture.client.session
+          .prompt({ sessionID: "ses_cancel_admission", id: "input_cancel_admission", text: "cancel me" }, { signal })
+          .then(() => "prompt" as const),
    })

    try {
@@ -784,7 +784,9 @@ function turn(input: {
    control: { cancelled: false, admission: new AbortController() },
    childSessionUpdate: input.childSessionUpdate,
    submit: (signal) =>
-      input.fixture.client.session.prompt({ sessionID: input.sessionID, id: input.inboxID, text: "hello" }, { signal }),
+      input.fixture.client.session
+        .prompt({ sessionID: input.sessionID, id: input.inboxID, text: "hello" }, { signal })
+        .then(() => "prompt" as const),
  })
 }

@@ -98,7 +98,7 @@ test("acp prompt resolves after ordered turn updates", async () => {
      start: { type: "input", id },
      writeTextFile: false,
      control: { cancelled: false, admission: new AbortController() },
-      submit: () => client.session.prompt({ sessionID: "ses_test", id, text: "hi" }),
+      submit: () => client.session.prompt({ sessionID: "ses_test", id, text: "hi" }).then(() => "prompt" as const),
    })

    expect(updates).toEqual([
@@ -122,7 +122,7 @@ test("acp prompt resolves after ordered turn updates", async () => {
  }
 })

-test("acp action resolves without prompt lifecycle events", async () => {
+test("acp immediate admission resolves without prompt lifecycle events", async () => {
  const encoder = new TextEncoder()
  const server = Bun.serve({
    port: 0,
@@ -150,9 +150,8 @@ test("acp action resolves without prompt lifecycle events", async () => {
      cwd: "/workspace",
      start: { type: "input", id: "msg_action" },
      writeTextFile: false,
-      action: true,
      control: { cancelled: false, admission: new AbortController() },
-      submit: async () => {},
+      submit: async () => "immediate",
    })

    expect(response).toMatchObject({ stopReason: "end_turn" })
@@ -547,7 +547,10 @@ function startTurn(fixture: Fixture, connection: Connection, sessionID: string,
    start: { type: "input", id: inboxID },
    writeTextFile: true,
    control: { cancelled: false, admission: new AbortController() },
-    submit: (signal) => fixture.client.session.prompt({ sessionID, id: inboxID, text: "hello" }, { signal }),
+    submit: (signal) =>
+      fixture.client.session
+        .prompt({ sessionID, id: inboxID, text: "hello" }, { signal })
+        .then(() => "prompt" as const),
  })
 }

@@ -12,7 +12,7 @@ describe("acp service prompt routing and usage", () => {
          return Response.json({ data: makeSession("ses_routes") })
        }
        if (request.method === "POST" && request.path === "/api/session/ses_routes/command") {
-          return new Response(null, { status: 204 })
+          return Response.json({ data: { type: "immediate" } })
        }
        if (request.method === "POST" && request.path === "/api/session/ses_routes/compact") {
          const id = requestID(request)
@@ -42,6 +42,7 @@ describe("acp service prompt routing and usage", () => {
    const compact = fixture.requests.find((request) => request.path === "/api/session/ses_routes/compact")
    expect(command?.body).toMatchObject({
      name: "review",
+      id: expect.stringMatching(/^msg_/),
      text: "now",
      files: [],
      delivery: "steer",
@@ -4,6 +4,7 @@ import type {
  SessionConfigOption,
  SessionConfigSelectOption,
 } from "@agentclientprotocol/sdk"
+import { Schema } from "effect"
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
@@ -46,6 +47,7 @@ type Waiter = {

 export type AcpProcess = {
  readonly request: <T>(method: string, params?: unknown) => Promise<JsonRpcResponse<T>>
+  readonly notify: (method: string, params?: unknown) => Promise<void>
  readonly waitForNotification: <T>(
    method: string,
    predicate: (params: T) => boolean,
@@ -64,7 +66,38 @@ description: Verifier compatibility skill.
 # Verifier Skill
 `

-export async function createAcpFixture(options: { readonly skill?: string } = {}) {
+/** The subset of an OpenAI-compatible chat request that tests inspect. */
+const ChatRequest = Schema.Struct({
+  messages: Schema.Array(
+    Schema.Struct({
+      role: Schema.String,
+      content: Schema.Union([
+        Schema.String,
+        Schema.Array(Schema.Struct({ text: Schema.String.pipe(Schema.optional) })),
+      ]).pipe(Schema.optional),
+    }),
+  ),
+  tools: Schema.Array(Schema.Unknown).pipe(Schema.optional),
+})
+export type ChatRequest = typeof ChatRequest.Type
+const decodeChatRequest = Schema.decodeUnknownSync(ChatRequest)
+
+/** Text of the most recent user message. */
+export function lastUserText(request: ChatRequest) {
+  const content = request.messages.findLast((message) => message.role === "user")?.content
+  if (!Array.isArray(content)) return content
+  return content.flatMap((part) => (part.text === undefined ? [] : [part.text])).join("")
+}
+
+export type FixtureOptions = {
+  readonly skill?: string
+  /** Extra opencode.json entries merged over the verifier config. */
+  readonly config?: Record<string, Schema.Json>
+  /** Produce the scripted completion text; awaiting here holds the model response. */
+  readonly respond?: (request: ChatRequest) => string | Promise<string>
+}
+
+export async function createAcpFixture(options: FixtureOptions = {}) {
  const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-cli-acp-"))
  const home = path.join(root, "workspace")
  const config = path.join(root, "config")
@@ -76,7 +109,7 @@ export async function createAcpFixture(options: { readonly skill?: string } = {}
    await Bun.write(path.join(skills, "verifier-skill", "SKILL.md"), options.skill)
  }

-  const requests: unknown[] = []
+  const requests: ChatRequest[] = []
  const llm = Bun.serve({
    hostname: "127.0.0.1",
    port: 0,
@@ -84,15 +117,19 @@ export async function createAcpFixture(options: { readonly skill?: string } = {}
      if (request.method !== "POST" || new URL(request.url).pathname !== "/v1/chat/completions") {
        return new Response("Not found", { status: 404 })
      }
-      requests.push(await request.json().catch(() => undefined))
-      return new Response(completion("accepted"), {
+      const body = decodeChatRequest(await request.json())
+      requests.push(body)
+      return new Response(completion(await (options.respond?.(body) ?? "accepted")), {
        headers: { "content-type": "text/event-stream" },
      })
    },
  })
  await Bun.write(
    path.join(config, "opencode.json"),
-    JSON.stringify(verifierConfig(`http://127.0.0.1:${llm.port}/v1`, options.skill ? skills : undefined)),
+    JSON.stringify({
+      ...verifierConfig(`http://127.0.0.1:${llm.port}/v1`, options.skill ? skills : undefined),
+      ...options.config,
+    }),
  )
  await Bun.write(models, "{}")

@@ -306,6 +343,12 @@ function spawnAcp(input: { readonly env: Record<string, string | undefined> }):
      if (!isResponse<T>(response)) throw new Error(`Invalid ACP response: ${JSON.stringify(response)}`)
      return response
    },
+    async notify(method: string, params?: unknown) {
+      if (inputClosed) throw new Error("ACP stdin is closed")
+      const notification: JsonRpcNotification<unknown> = { jsonrpc: "2.0", method, params }
+      await child.stdin.write(encoder.encode(`${JSON.stringify(notification)}\n`))
+      await child.stdin.flush()
+    },
    async waitForNotification<T>(method: string, predicate: (params: T) => boolean, timeoutMs = 20_000) {
      const notification = await take(
        (message) => isNotification<T>(message) && message.method === method && predicate(message.params),
@@ -272,7 +272,7 @@ function authServer(fetch: (request: Request, url: URL) => Response | Promise<Re
    fetch(request) {
      const url = new URL(request.url)
      requests?.push(url.pathname)
-      if (url.pathname === "/api/info") return status()
+      if (url.pathname === "/api/status") return status()
      if (url.pathname === "/api/model/default") return Response.json(located(null))
      return fetch(request, url)
    },
@@ -280,7 +280,7 @@ function authServer(fetch: (request: Request, url: URL) => Response | Promise<Re
 }

 function status() {
-  return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [], paths: { tmp: "/tmp/opencode" } })
+  return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] })
 }

 function located<T>(data: T) {
@@ -71,51 +71,6 @@ test("preserves the schema in an existing cli.json", async () => {
  expect(await Bun.file(file).json()).toEqual(config)
 })

-test("merges inline CLI config content over the global config", async () => {
-  await using directory = await tmpdir()
-  const file = path.join(directory.path, "cli.json")
-  const previous = process.env.OPENCODE_CLI_CONFIG_CONTENT
-  await Bun.write(
-    file,
-    JSON.stringify({
-      tabs: { enabled: true, scope: "global" },
-      keybinds: { "app.exit": "ctrl+q" },
-      plugins: ["global"],
-      animations: true,
-    }),
-  )
-  process.env.OPENCODE_CLI_CONFIG_CONTENT = JSON.stringify({
-    tabs: { enabled: false },
-    keybinds: { "help.show": false },
-    plugins: ["inline"],
-    animations: false,
-  })
-
-  try {
-    const result = await run(
-      directory.path,
-      Effect.gen(function* () {
-        const service = yield* Config.Service
-        const loaded = yield* service.get()
-        const updated = yield* service.update((draft) => {
-          draft.animations = true
-          draft.mouse = false
-        })
-        return { loaded, updated }
-      }),
-    )
-
-    expect(result.loaded.tabs).toEqual({ enabled: false, scope: "global" })
-    expect(result.loaded.keybinds).toEqual({ "app.exit": "ctrl+q", "help.show": false })
-    expect(result.loaded.plugins).toEqual(["inline"])
-    expect(result.updated).toMatchObject({ animations: false, mouse: false })
-    expect(await Bun.file(file).json()).toMatchObject({ animations: true, mouse: false })
-  } finally {
-    if (previous === undefined) delete process.env.OPENCODE_CLI_CONFIG_CONTENT
-    else process.env.OPENCODE_CLI_CONFIG_CONTENT = previous
-  }
-})
-
 test("migrates tui and kv config into cli.json", async () => {
  await using directory = await tmpdir()
  await Bun.write(
@@ -39,14 +39,9 @@ describe("debug config command", () => {
      port: 0,
      fetch(request) {
        const url = new URL(request.url)
-        if (url.pathname === "/api/info") {
+        if (url.pathname === "/api/status") {
          healthProbes += 1
-          return Response.json({
-            version: OPENCODE_VERSION,
-            pid: process.pid,
-            urls: [],
-            paths: { tmp: "/tmp/opencode" },
-          })
+          return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] })
        }
        requested = url
        authorization.push(request.headers.get("authorization"))
@@ -4,7 +4,6 @@ export function isolatedEnv(root: string, overrides: Record<string, string | und
  return {
    ...process.env,
    HOME: root,
-    OPENCODE_CLI_CONFIG_CONTENT: undefined,
    OPENCODE_CONFIG_CONTENT: "{}",
    OPENCODE_CONFIG_DIR: path.join(root, "config"),
    OPENCODE_DB: path.join(root, "opencode.db"),
@@ -12,7 +12,7 @@ await Effect.runPromise(
        command: [process.execPath, path.join(import.meta.dir, "../../src/index.ts"), "serve"],
      })
      const response = yield* Effect.promise(() =>
-        fetch(new URL("/api/info", endpoint.url), { headers: Service.headers(endpoint) }),
+        fetch(new URL("/api/status", endpoint.url), { headers: Service.headers(endpoint) }),
      )
      console.log(`STANDALONE_READY ${endpoint.pid} ${endpoint.url} ${response.status}`)
      return yield* Effect.never
@@ -42,8 +42,7 @@ const sanitizedTransfer = {
  ],
 }

-const status = () =>
-  Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [], paths: { tmp: "/tmp/opencode" } })
+const status = () => Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] })

 function run(args: string[], stdin?: string) {
  const child = Bun.spawn([process.execPath, "run", "src/index.ts", ...args], {
@@ -61,7 +60,7 @@ test("export is raw by default and supports explicit sanitization", async () =>
    port: 0,
    fetch(request) {
      const url = new URL(request.url)
-      if (url.pathname === "/api/info") return status()
+      if (url.pathname === "/api/status") return status()
      if (url.pathname === `/api/session/${info.id}`) return Response.json({ data: info })
      if (url.pathname === `/api/experimental/session/${info.id}/export`) {
        sanitization.push(url.searchParams.get("sanitize") ?? "")
@@ -99,7 +98,7 @@ test("export requires a session outside an interactive terminal", async () => {
    port: 0,
    fetch(request) {
      const url = new URL(request.url)
-      if (url.pathname === "/api/info") return status()
+      if (url.pathname === "/api/status") return status()
      if (url.pathname === "/api/location") {
        return Response.json({
          directory: "/project",
@@ -128,7 +127,7 @@ test("export reports a missing session without a stack trace", async () => {
    port: 0,
    fetch(request) {
      const url = new URL(request.url)
-      if (url.pathname === "/api/info") return status()
+      if (url.pathname === "/api/status") return status()
      if (url.pathname === `/api/experimental/session/${sessionID}/export`) {
        return Response.json(
          { _tag: "SessionNotFoundError", sessionID, message: `Session not found: ${sessionID}` },
@@ -159,7 +158,7 @@ test("import validates a file and sends it to the resolved location", async () =
    port: 0,
    async fetch(request) {
      const url = new URL(request.url)
-      if (url.pathname === "/api/info") return status()
+      if (url.pathname === "/api/status") return status()
      if (url.pathname === "/api/location") {
        return Response.json({
          directory: root,
@@ -202,7 +201,7 @@ test("import reports an existing session without a stack trace", async () => {
    port: 0,
    fetch(request) {
      const url = new URL(request.url)
-      if (url.pathname === "/api/info") return status()
+      if (url.pathname === "/api/status") return status()
      if (url.pathname === "/api/location") {
        return Response.json({
          directory: root,
@@ -31,24 +31,14 @@ describe("mini command", () => {
    const initial = Bun.serve({
      port: 0,
      fetch() {
-        return Response.json({
-          version: OPENCODE_VERSION,
-          pid: process.pid,
-          urls: [],
-          paths: { tmp: "/tmp/opencode" },
-        })
+        return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] })
      },
    })
    const replacement = Bun.serve({
      port: 0,
      fetch(request) {
        authorization.push(request.headers.get("authorization"))
-        return Response.json({
-          version: OPENCODE_VERSION,
-          pid: process.pid,
-          urls: [],
-          paths: { tmp: "/tmp/opencode" },
-        })
+        return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] })
      },
    })
    const controller = new AbortController()
@@ -67,7 +57,7 @@ describe("mini command", () => {
      })
      const client = await connection.reconnect?.(controller.signal)
      if (!client) throw new Error("Expected a replacement client")
-      await client.server.info()
+      await client.server.status()

      expect(client).not.toBe(connection.sdk)
      expect(signal).toBe(controller.signal)
@@ -157,13 +147,8 @@ describe("mini command", () => {
      async fetch(request) {
        const url = new URL(request.url)
        requests.push(url.pathname)
-        if (url.pathname === "/api/info")
-          return Response.json({
-            version: OPENCODE_VERSION,
-            pid: process.pid,
-            urls: [],
-            paths: { tmp: "/tmp/opencode" },
-          })
+        if (url.pathname === "/api/status")
+          return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] })
        if (url.pathname === "/api/location")
          return Response.json({ directory: process.cwd(), project: { id: "global", directory: process.cwd() } })
        if (url.pathname === "/api/session") {
@@ -205,12 +190,7 @@ describe("mini command", () => {
      port: 0,
      fetch(request) {
        if (new URL(request.url).pathname === "/api/session") return new Response("boom", { status: 500 })
-        return Response.json({
-          version: "incompatible",
-          pid: process.pid,
-          urls: [],
-          paths: { tmp: "/tmp/opencode" },
-        })
+        return Response.json({ version: "incompatible", pid: process.pid, urls: [] })
      },
    })

@@ -256,14 +256,13 @@ test("concurrent service processes elect one server", async () => {
    expect((await Bun.file(config).json()).password).toBe(info.password)
    expect(await Bun.file(registration + ".lock").exists()).toBe(false)
    expect(
-      await fetch(new URL("/api/info", info.url), {
+      await fetch(new URL("/api/status", info.url), {
        headers: { authorization: "Basic " + btoa(`opencode:${info.password}`) },
      }).then((response) => response.json()),
    ).toEqual({
      version: info.version,
      pid: info.pid,
      urls: [info.url],
-      paths: { tmp: path.join(os.tmpdir(), "opencode") },
    })
    const contender = Bun.spawn(command, { env, stderr: "pipe", stdout: "ignore" })
    try {
@@ -338,7 +337,7 @@ test.each([
      const info = await waitForInfo(registration)
      await Promise.all(
        [...new Set([...cors, ...origins, "https://unlisted.example.com"])].map(async (origin) => {
-          const response = await fetch(new URL("/api/info", info.url), {
+          const response = await fetch(new URL("/api/status", info.url), {
            method: "OPTIONS",
            headers: { Origin: origin, "Access-Control-Request-Method": "GET" },
          })
@@ -441,10 +440,7 @@ test("port contender recognizes an incumbent registered during the bind race", a
    fetch() {
      requests.count += 1
      if (requests.count === 2) recognizing.resolve()
-      return Response.json(
-        { version: OPENCODE_VERSION, pid: process.pid, urls: [], paths: { tmp: "/tmp/opencode" } },
-        { status: 503 },
-      )
+      return Response.json({ version: OPENCODE_VERSION, pid: process.pid, urls: [] }, { status: 503 })
    },
  })
  const registration = path.join(root, "state", "opencode", "service-local.json")
@@ -579,7 +575,7 @@ async function waitForInfo(file: string, accept: (info: Info) => boolean = () =>

 async function waitForFailed(info: Info) {
  for (let attempt = 0; attempt < 400; attempt++) {
-    const status = await fetch(new URL("/api/info", info.url), {
+    const status = await fetch(new URL("/api/status", info.url), {
      headers: { authorization: "Basic " + btoa(`opencode:${info.password}`) },
    })
      .then((response) => response.status)
@@ -35,13 +35,8 @@ describe("web UI", () => {
              Effect.gen(function* () {
                const request = yield* HttpServerRequest.HttpServerRequest
                const pathname = new URL(request.url, "http://localhost").pathname
-                if (pathname === "/api/info")
-                  return HttpServerResponse.jsonUnsafe({
-                    version: "test",
-                    pid: 1,
-                    urls: [origin],
-                    paths: { tmp: "/tmp/opencode" },
-                  })
+                if (pathname === "/api/status")
+                  return HttpServerResponse.jsonUnsafe({ version: "test", pid: 1, urls: [origin] })
                return yield* Effect.fail(
                  new HttpServerError.HttpServerError({
                    reason: new HttpServerError.RouteNotFound({ request }),
@@ -52,13 +47,8 @@ describe("web UI", () => {
          )
          const origin = HttpServer.formatAddress(http.address)

-          const status = yield* Effect.promise(() => fetch(`${origin}/api/info`))
-          expect(yield* Effect.promise(() => status.json())).toEqual({
-            version: "test",
-            pid: 1,
-            urls: [origin],
-            paths: { tmp: "/tmp/opencode" },
-          })
+          const status = yield* Effect.promise(() => fetch(`${origin}/api/status`))
+          expect(yield* Effect.promise(() => status.json())).toEqual({ version: "test", pid: 1, urls: [origin] })

          const missing = yield* Effect.promise(() => fetch(`${origin}/api/missing`))
          expect(missing.status).toBe(404)
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/client",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "type": "module",
  "license": "MIT",
  "repository": {
@@ -15,6 +15,7 @@ import type { SessionMessage } from "@opencode/schema/session-message"
 import type { SessionInbox } from "@opencode/schema/session-inbox"
 import type { PromptInput } from "@opencode/schema/prompt-input"
 import type { AgentAttachment } from "@opencode/schema/prompt"
+import type { Command } from "@opencode/schema/command"
 import type { Skill } from "@opencode/schema/skill"
 import type { FileDiff } from "@opencode/schema/file-diff"
 import type { InstructionEntry } from "@opencode/schema/instruction-entry"
@@ -29,7 +30,6 @@ import type { Mcp } from "@opencode/schema/mcp"
 import type { Credential } from "@opencode/schema/credential"
 import type { PermissionSaved } from "@opencode/schema/permission-saved"
 import type { FileSystem } from "@opencode/schema/filesystem"
-import type { Command } from "@opencode/schema/command"
 import type { OpenCodeEvent } from "@opencode/protocol/groups/event"
 import type { Pty } from "@opencode/schema/pty"
 import type { PtyTicket } from "@opencode/schema/pty-ticket"
@@ -39,28 +39,23 @@ import type { Vcs } from "@opencode/schema/vcs"
 import type { WebSearch } from "@opencode/schema/websearch"
 import type { Config } from "@opencode/schema/config"

-export type ServerInfoOutput = {
+export type ServerStatusOutput = {
  readonly version: string
  readonly pid: number
  readonly urls: ReadonlyArray<string>
-  readonly paths: { readonly tmp: string }
 }
-export type ServerInfoOperation<E = never> = () => Effect.Effect<ServerInfoOutput, E>
+export type ServerStatusOperation<E = never> = () => Effect.Effect<ServerStatusOutput, E>

 export interface ServerApi<E = never> {
-  readonly info: ServerInfoOperation<E>
+  readonly status: ServerStatusOperation<E>
 }

 export type LocationGetInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
 export type LocationGetOutput = Location.PublicInfo
 export type LocationGetOperation<E = never> = (input?: LocationGetInput) => Effect.Effect<LocationGetOutput, E>

-export type LocationReloadOutput = void
-export type LocationReloadOperation<E = never> = () => Effect.Effect<LocationReloadOutput, E>
-
 export interface LocationApi<E = never> {
  readonly get: LocationGetOperation<E>
-  readonly reload: LocationReloadOperation<E>
 }

 export type AgentListInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
@@ -271,13 +266,14 @@ export type SessionPromptOperation<E = never> = (input: SessionPromptInput) => E
 export type SessionCommandInput = {
  readonly sessionID: Session.ID
  readonly name: string
+  readonly id?: SessionMessage.ID | undefined
  readonly text: string
  readonly files?: ReadonlyArray<PromptInput.FileAttachment> | undefined
  readonly agents?: ReadonlyArray<AgentAttachment> | undefined
  readonly skills?: ReadonlyArray<PromptInput.SkillAttachment> | undefined
  readonly delivery?: SessionInbox.Delivery | undefined
 }
-export type SessionCommandOutput = void
+export type SessionCommandOutput = Command.Outcome
 export type SessionCommandOperation<E = never> = (input: SessionCommandInput) => Effect.Effect<SessionCommandOutput, E>

 export type SessionSkillInput = {
@@ -5,10 +5,9 @@ import { HttpClientError } from "effect/unstable/http"
 import { HttpApiClient } from "effect/unstable/httpapi"
 import { ClientApi } from "../../contract"
 import type {
-  ServerInfoOutput,
+  ServerStatusOutput,
  LocationGetInput,
  LocationGetOutput,
-  LocationReloadOutput,
  AgentListInput,
  AgentListOutput,
  AgentGetInput,
@@ -278,23 +277,17 @@ const preserveStream =
  <E, R>(stream: Stream.Stream<A, E, R>) =>
    stream

-const EndpointServerInfo = (raw: RawClient["server.server"]) => () =>
-  preserveEffect<ServerInfoOutput>()(raw["server.info"]({}).pipe(Effect.mapError(mapClientError)))
+const EndpointServerStatus = (raw: RawClient["server.server"]) => () =>
+  preserveEffect<ServerStatusOutput>()(raw["server.status"]({}).pipe(Effect.mapError(mapClientError)))

-const adaptGroupServer = (raw: RawClient["server.server"]) => ({ info: EndpointServerInfo(raw) })
+const adaptGroupServer = (raw: RawClient["server.server"]) => ({ status: EndpointServerStatus(raw) })

 const EndpointLocationGet = (raw: RawClient["server.location"]) => (input?: LocationGetInput) =>
  preserveEffect<LocationGetOutput>()(
    raw["location.get"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
  )

-const EndpointLocationReload = (raw: RawClient["server.location"]) => () =>
-  preserveEffect<LocationReloadOutput>()(raw["location.reload"]({}).pipe(Effect.mapError(mapClientError)))
-
-const adaptGroupLocation = (raw: RawClient["server.location"]) => ({
-  get: EndpointLocationGet(raw),
-  reload: EndpointLocationReload(raw),
-})
+const adaptGroupLocation = (raw: RawClient["server.location"]) => ({ get: EndpointLocationGet(raw) })

 const EndpointAgentList = (raw: RawClient["server.agent"]) => (input?: AgentListInput) =>
  preserveEffect<AgentListOutput>()(
@@ -491,13 +484,17 @@ const EndpointSessionCommand = (raw: RawClient["server.session"]) => (input: Ses
      params: { sessionID: input["sessionID"] },
      payload: {
        name: input["name"],
+        id: input["id"],
        text: input["text"],
        files: input["files"],
        agents: input["agents"],
        skills: input["skills"],
        delivery: input["delivery"],
      },
-    }).pipe(Effect.mapError(mapClientError)),
+    }).pipe(
+      Effect.mapError(mapClientError),
+      Effect.map((value) => value.data),
+    ),
  )

 const EndpointSessionSkill = (raw: RawClient["server.session"]) => (input: SessionSkillInput) =>
@@ -172,7 +172,7 @@ export const Info = Schema.Struct({
 })

 const decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Info))
-const decodeInfo = Schema.decodeUnknownOption(
+const decodeStatus = Schema.decodeUnknownOption(
  Schema.Struct({
    version: Schema.String,
    pid: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
@@ -213,7 +213,7 @@ const probeResult = Effect.fnUntraced(function* (
  } satisfies Endpoint
  const signal = AbortSignal.timeout(timeout)
  const result = yield* Effect.promise(() =>
-    fetch(new URL("/api/info", info.url), { headers: headers(endpoint), signal })
+    fetch(new URL("/api/status", info.url), { headers: headers(endpoint), signal })
      .then(async (response) => ({
        response,
        body: response.status === 404 ? undefined : ((await response.json()) as unknown),
@@ -225,7 +225,7 @@ const probeResult = Effect.fnUntraced(function* (
  )
  if ("cause" in result) return { service: undefined, timedOut: signal.aborted }
  const response = result.value.response
-  // The previous V2 service exposes /api/status instead. Its authenticated 404 is enough
+  // The previous V2 service exposes /api/health instead. Its authenticated 404 is enough
  // to recognize the registered daemon as incompatible and route it through replacement.
  if (response.status === 404)
    return {
@@ -239,16 +239,16 @@ const probeResult = Effect.fnUntraced(function* (
      timedOut: false,
    }
  const body = result.value.body
-  const serverInfo = decodeInfo(body)
-  if (Option.isSome(serverInfo)) {
-    if (serverInfo.value.pid !== info.pid) return { service: undefined, timedOut: false }
-    if (info.version !== undefined && serverInfo.value.version !== info.version)
+  const status = decodeStatus(body)
+  if (Option.isSome(status)) {
+    if (status.value.pid !== info.pid) return { service: undefined, timedOut: false }
+    if (info.version !== undefined && status.value.version !== info.version)
      return { service: undefined, timedOut: false }
    return {
      service: {
        info,
        endpoint,
-        version: serverInfo.value.version,
+        version: status.value.version,
        state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
        compatible: true,
      } satisfies LocalService,
@@ -1,8 +1,7 @@
 import type {
-  ServerInfoOutput,
+  ServerStatusOutput,
  LocationGetInput,
  LocationGetOutput,
-  LocationReloadOutput,
  AgentListInput,
  AgentListOutput,
  AgentGetInput,
@@ -398,9 +397,9 @@ export function make(options: ClientOptions) {

  return {
    server: {
-      info: (requestOptions?: RequestOptions) =>
-        request<ServerInfoOutput>(
-          { method: "GET", path: `/api/info`, successStatus: 200, declaredStatuses: [400, 401], empty: false },
+      status: (requestOptions?: RequestOptions) =>
+        request<ServerStatusOutput>(
+          { method: "GET", path: `/api/status`, successStatus: 200, declaredStatuses: [400, 401], empty: false },
          requestOptions,
        ),
    },
@@ -417,17 +416,6 @@ export function make(options: ClientOptions) {
          },
          requestOptions,
        ),
-      reload: (requestOptions?: RequestOptions) =>
-        request<LocationReloadOutput>(
-          {
-            method: "POST",
-            path: `/api/location/reload`,
-            successStatus: 204,
-            declaredStatuses: [400, 401, 503],
-            empty: true,
-          },
-          requestOptions,
-        ),
    },
    agent: {
      list: (input?: AgentListInput, requestOptions?: RequestOptions) =>
@@ -694,24 +682,25 @@ export function make(options: ClientOptions) {
          requestOptions,
        ).then((value) => value.data),
      command: (input: SessionCommandInput, requestOptions?: RequestOptions) =>
-        request<SessionCommandOutput>(
+        request<{ readonly data: SessionCommandOutput }>(
          {
            method: "POST",
            path: `/api/session/${encodeURIComponent(input.sessionID)}/command`,
            body: {
              name: input["name"],
+              id: input["id"],
              text: input["text"],
              files: input["files"],
              agents: input["agents"],
              skills: input["skills"],
              delivery: input["delivery"],
            },
-            successStatus: 204,
+            successStatus: 200,
            declaredStatuses: [400, 401, 404, 500],
-            empty: true,
+            empty: false,
          },
          requestOptions,
-        ),
+        ).then((value) => value.data),
      skill: (input: SessionSkillInput, requestOptions?: RequestOptions) =>
        request<SessionSkillOutput>(
          {
@@ -1,6 +1,6 @@
 export type JsonValue = null | boolean | number | string | Array<JsonValue> | { [key: string]: JsonValue }

-export type ServerInfo = { version: string; pid: number; urls: Array<string>; paths: { tmp: string } }
+export type ServerStatus = { version: string; pid: number; urls: Array<string> }

 export type LocationPublicInfo = { directory: string; project: { id: string; directory: string; canonical: string } }

@@ -161,6 +161,8 @@ export type SessionActive = { type: "running" }

 export type SessionInboxDelivery = "steer" | "queue"

+export type CommandOutcome = { type: "immediate" } | { type: "prompt"; inboxID: string }
+
 export type SessionInboxSyntheticPayload = { text: string; description?: string; metadata?: { [x: string]: JsonValue } }

 export type SessionInboxCompactionPayload = {}
@@ -820,15 +822,6 @@ export type SessionUsageRecorded = {
  data: { sessionID: string; source: "title" | "compaction"; cost: MoneyUSD; tokens: TokenUsageInfo }
 }

-export type LocationShutdown = {
-  id: string
-  created: number
-  metadata?: { [x: string]: any }
-  type: "location.shutdown"
-  location?: LocationRef
-  data: {}
-}
-
 export type ModelsDevRefreshed = {
  id: string
  created: number
@@ -2330,7 +2323,6 @@ export type IntegrationInfo = {
 }

 export type V2Event =
-  | LocationShutdown
  | ModelsDevRefreshed
  | CredentialUpdated
  | CredentialSwitched
@@ -2439,14 +2431,6 @@ export type UnauthorizedError = { readonly _tag: "UnauthorizedError"; readonly m
 export const isUnauthorizedError = (value: unknown): value is UnauthorizedError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "UnauthorizedError"

-export type ServiceUnavailableError = {
-  readonly _tag: "ServiceUnavailableError"
-  readonly message: string
-  readonly service?: string | undefined
-}
-export const isServiceUnavailableError = (value: unknown): value is ServiceUnavailableError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ServiceUnavailableError"
-
 export type AgentNotFoundError = {
  readonly _tag: "AgentNotFoundError"
  readonly agentID: string
@@ -2455,6 +2439,14 @@ export type AgentNotFoundError = {
 export const isAgentNotFoundError = (value: unknown): value is AgentNotFoundError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "AgentNotFoundError"

+export type ServiceUnavailableError = {
+  readonly _tag: "ServiceUnavailableError"
+  readonly message: string
+  readonly service?: string | undefined
+}
+export const isServiceUnavailableError = (value: unknown): value is ServiceUnavailableError =>
+  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "ServiceUnavailableError"
+
 export type InvalidCursorError = { readonly _tag: "InvalidCursorError"; readonly message: string }
 export const isInvalidCursorError = (value: unknown): value is InvalidCursorError =>
  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "InvalidCursorError"
@@ -2655,7 +2647,7 @@ export type WorktreeError = {
 export const isWorktreeError = (value: unknown): value is WorktreeError =>
  typeof value === "object" && value !== null && "name" in value && value["name"] === "WorktreeError"

-export type ServerInfoOutput = ServerInfo
+export type ServerStatusOutput = ServerStatus

 export type LocationGetInput = {
  readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
@@ -2663,8 +2655,6 @@ export type LocationGetInput = {

 export type LocationGetOutput = LocationPublicInfo

-export type LocationReloadOutput = void
-
 export type AgentListInput = {
  readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
 }
@@ -4119,6 +4109,7 @@ export type SessionCommandInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
  readonly name: {
    readonly name: string
+    readonly id?: string | null
    readonly text: string
    readonly files?: ReadonlyArray<{
      readonly uri: string
@@ -4136,8 +4127,29 @@ export type SessionCommandInput = {
    }>
    readonly delivery?: ("steer" | "queue") | null
  }["name"]
+  readonly id?: {
+    readonly name: string
+    readonly id?: string | null
+    readonly text: string
+    readonly files?: ReadonlyArray<{
+      readonly uri: string
+      readonly name?: string
+      readonly description?: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly agents?: ReadonlyArray<{
+      readonly name: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly skills?: ReadonlyArray<{
+      readonly id: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly delivery?: ("steer" | "queue") | null
+  }["id"]
  readonly text: {
    readonly name: string
+    readonly id?: string | null
    readonly text: string
    readonly files?: ReadonlyArray<{
      readonly uri: string
@@ -4157,6 +4169,7 @@ export type SessionCommandInput = {
  }["text"]
  readonly files?: {
    readonly name: string
+    readonly id?: string | null
    readonly text: string
    readonly files?: ReadonlyArray<{
      readonly uri: string
@@ -4176,6 +4189,7 @@ export type SessionCommandInput = {
  }["files"]
  readonly agents?: {
    readonly name: string
+    readonly id?: string | null
    readonly text: string
    readonly files?: ReadonlyArray<{
      readonly uri: string
@@ -4195,6 +4209,7 @@ export type SessionCommandInput = {
  }["agents"]
  readonly skills?: {
    readonly name: string
+    readonly id?: string | null
    readonly text: string
    readonly files?: ReadonlyArray<{
      readonly uri: string
@@ -4214,6 +4229,7 @@ export type SessionCommandInput = {
  }["skills"]
  readonly delivery?: {
    readonly name: string
+    readonly id?: string | null
    readonly text: string
    readonly files?: ReadonlyArray<{
      readonly uri: string
@@ -4233,7 +4249,7 @@ export type SessionCommandInput = {
  }["delivery"]
 }

-export type SessionCommandOutput = void
+export type SessionCommandOutput = { data: CommandOutcome }["data"]

 export type SessionSkillInput = {
  readonly sessionID: { readonly sessionID: string }["sessionID"]
@@ -163,7 +163,7 @@ async function probeResult(info: Info, timeout = defaultEnsureTiming.requestTime
        : { type: "basic" as const, username: "opencode", password: info.password },
  } satisfies Endpoint
  const signal = AbortSignal.timeout(timeout)
-  const result = await fetch(new URL("/api/info", info.url), { headers: headers(endpoint), signal })
+  const result = await fetch(new URL("/api/status", info.url), { headers: headers(endpoint), signal })
    .then(async (response) => ({
      response,
      body: response.status === 404 ? undefined : ((await response.json()) as unknown),
@@ -174,7 +174,7 @@ async function probeResult(info: Info, timeout = defaultEnsureTiming.requestTime
    )
  if ("cause" in result) return { service: undefined, timedOut: signal.aborted }
  const response = result.value.response
-  // The previous V2 service exposes /api/status instead. Its authenticated 404 is enough
+  // The previous V2 service exposes /api/health instead. Its authenticated 404 is enough
  // to recognize the registered daemon as incompatible and route it through replacement.
  if (response.status === 404)
    return {
@@ -187,16 +187,15 @@ async function probeResult(info: Info, timeout = defaultEnsureTiming.requestTime
      } satisfies LocalService,
      timedOut: false,
    }
-  const serverInfo = decodeInfo(result.value.body)
-  if (serverInfo !== undefined) {
-    if (serverInfo.pid !== info.pid) return { service: undefined, timedOut: false }
-    if (info.version !== undefined && serverInfo.version !== info.version)
-      return { service: undefined, timedOut: false }
+  const status = decodeStatus(result.value.body)
+  if (status !== undefined) {
+    if (status.pid !== info.pid) return { service: undefined, timedOut: false }
+    if (info.version !== undefined && status.version !== info.version) return { service: undefined, timedOut: false }
    return {
      service: {
        info,
        endpoint,
-        version: serverInfo.version,
+        version: status.version,
        state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
        compatible: true,
      } satisfies LocalService,
@@ -206,7 +205,7 @@ async function probeResult(info: Info, timeout = defaultEnsureTiming.requestTime
  return { service: undefined, timedOut: false }
 }

-function decodeInfo(input: unknown) {
+function decodeStatus(input: unknown) {
  if (typeof input !== "object" || input === null) return
  if (!("version" in input) || typeof input.version !== "string") return
  if (!("pid" in input) || typeof input.pid !== "number" || !Number.isInteger(input.pid) || input.pid < 0) return
@@ -15,31 +15,21 @@ import {

 const synced = { type: "log.synced" as const, aggregateID: "ses_test", seq: Event.Seq.make(1) }

-test("server.info decodes the readiness response", async () => {
+test("server.status decodes the readiness response", async () => {
  const httpClient = HttpClient.make((request) =>
    Effect.succeed(
      HttpClientResponse.fromWeb(
        request,
-        Response.json({
-          version: "current",
-          pid: 123,
-          urls: ["http://localhost:3000"],
-          paths: { tmp: "/tmp/opencode" },
-        }),
+        Response.json({ version: "current", pid: 123, urls: ["http://localhost:3000"] }),
      ),
    ),
  )
  const result = await Effect.gen(function* () {
    const client = yield* OpenCode.make({ baseUrl: "http://localhost:3000" })
-    return yield* client.server.info()
+    return yield* client.server.status()
  }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)

-  expect(result).toEqual({
-    version: "current",
-    pid: 123,
-    urls: ["http://localhost:3000"],
-    paths: { tmp: "/tmp/opencode" },
-  })
+  expect(result).toEqual({ version: "current", pid: 123, urls: ["http://localhost:3000"] })
 })

 test("vcs.base decodes nullable review-base metadata", async () => {
@@ -52,7 +52,7 @@ const server = Bun.serve({
      await writeFile(registration + ".prepared", JSON.stringify(handoff))
      return Response.json({ handoff })
    }
-    if (pathname !== "/api/info") return new Response(null, { status: 404 })
+    if (pathname !== "/api/status") return new Response(null, { status: 404 })
    requests += 1
    if (mode === "starting") await writeFile(registration + ".status-request", "")
    if (mode === "hanging") {
@@ -65,21 +65,10 @@ const server = Bun.serve({
      return new Response(null, { status: 503 })
    }
    if (mode === "starting" && !(await Bun.file(registration + ".release").exists()))
-      return Response.json(
-        { version, pid: process.pid, urls: [server.url.toString()], paths: { tmp: "/tmp/opencode" } },
-        { status: 503 },
-      )
+      return Response.json({ version, pid: process.pid, urls: [server.url.toString()] }, { status: 503 })
    if (mode === "failed-owner")
-      return Response.json(
-        { version, pid: process.pid, urls: [server.url.toString()], paths: { tmp: "/tmp/opencode" } },
-        { status: 500 },
-      )
-    return Response.json({
-      version,
-      pid: process.pid,
-      urls: [server.url.toString()],
-      paths: { tmp: "/tmp/opencode" },
-    })
+      return Response.json({ version, pid: process.pid, urls: [server.url.toString()] }, { status: 500 })
+    return Response.json({ version, pid: process.pid, urls: [server.url.toString()] })
  },
 })

@@ -192,29 +192,19 @@ test("websearch.query uses the public HTTP contract", async () => {
  expect(await request?.json()).toEqual({ query: "opencode", providerID: "exa" })
 })

-test("server.info uses the public HTTP contract", async () => {
+test("server.status uses the public HTTP contract", async () => {
  let request: Request | undefined
  const client = OpenCode.make({
    baseUrl: "http://localhost:3000",
    fetch: async (input) => {
      request = input instanceof Request ? input : new Request(input)
-      return Response.json({
-        version: "2.0.0",
-        pid: 1,
-        urls: ["http://192.168.1.10:4096"],
-        paths: { tmp: "/tmp/opencode" },
-      })
+      return Response.json({ version: "2.0.0", pid: 1, urls: ["http://192.168.1.10:4096"] })
    },
  })

-  expect(await client.server.info()).toEqual({
-    version: "2.0.0",
-    pid: 1,
-    urls: ["http://192.168.1.10:4096"],
-    paths: { tmp: "/tmp/opencode" },
-  })
+  expect(await client.server.status()).toEqual({ version: "2.0.0", pid: 1, urls: ["http://192.168.1.10:4096"] })
  expect(request?.method).toBe("GET")
-  expect(request?.url).toBe("http://localhost:3000/api/info")
+  expect(request?.url).toBe("http://localhost:3000/api/status")
 })

 test("experimental wellknown integration add uses the public HTTP contract", async () => {
@@ -696,7 +686,7 @@ test("event.subscribe reports heartbeat comments as stream activity", async () =
 })

 // Moved from packages/app/e2e/regression/session-timeline-transport.spec.ts
-test("event transport passes through ordinary info requests", async () => {
+test("event transport passes through ordinary status requests", async () => {
  const requests: string[] = []
  const event = { id: "evt_connected", created: 1, type: "server.connected", data: {} }
  const client = OpenCode.make({
@@ -709,22 +699,16 @@ test("event transport passes through ordinary info requests", async () => {
          headers: { "content-type": "text/event-stream" },
        })
      }
-      return Response.json({
-        version: "2.0.0",
-        pid: 1,
-        urls: ["http://localhost:3000"],
-        paths: { tmp: "/tmp/opencode" },
-      })
+      return Response.json({ version: "2.0.0", pid: 1, urls: ["http://localhost:3000"] })
    },
  })
  await expect(client.event.subscribe()[Symbol.asyncIterator]().next()).resolves.toEqual({ done: false, value: event })
-  await expect(client.server.info()).resolves.toEqual({
+  await expect(client.server.status()).resolves.toEqual({
    version: "2.0.0",
    pid: 1,
    urls: ["http://localhost:3000"],
-    paths: { tmp: "/tmp/opencode" },
  })
-  expect(requests).toEqual(["/api/event", "/api/info"])
+  expect(requests).toEqual(["/api/event", "/api/status"])
 })

 test("event.subscribe terminates on malformed Promise SSE data", async () => {
@@ -300,5 +300,5 @@ function run<A, E>(effect: Effect.Effect<A, E, FileSystem.FileSystem>) {
 }

 async function status(url: string) {
-  return fetch(new URL("/api/info", url), { signal: AbortSignal.timeout(1_000) }).then((response) => response.json())
+  return fetch(new URL("/api/status", url), { signal: AbortSignal.timeout(1_000) }).then((response) => response.json())
 }
@@ -182,8 +182,7 @@ ultimate source of truth. Upstream test262 files run verbatim from `test/test262
 - [x] `new` for Array, Object, Error types, Date, RegExp, Map, Set, URL, URLSearchParams, and Promise. `new` on any
      other value throws a catchable `TypeError` naming the callee: other built-in functions such as `Number` say
      `new` is unsupported and point at the plain call, user-defined functions report the constructor gap below, and
-      non-callable values are not constructors. Error constructors take the ES2022 options object, so
-      `new Error(message, { cause })` installs a non-enumerable `cause` when the option is present.
+      non-callable values are not constructors.
 - [x] Arithmetic operators: `+`, `-`, `*`, `/`, `%`, and `**`.
 - [x] Equality and ordering: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, and `>=`.
 - [x] Bitwise operators: `&`, `|`, `^`, `~`, `<<`, `>>`, and `>>>`.
@@ -473,10 +472,6 @@ Nothing is exposed unless a host provides it; extension calls are not tool calls
 - [x] A host `Promise` becomes a program promise. Whatever host code returns, resolves, throws, or rejects with
      crosses the same way, so `catch (e)` receives a copy of the thrown value (an `Error` of the matching type, or
      plain data).
- [x] An Error crosses, in either direction, as its name, message, `cause`, and own enumerable data, so Node's
-      `code`, `errno`, `syscall`, and `path` reach the program and `err.code === "ENOENT"` works. `stack` stays on its
-      own side, no field may shadow an Error method, and a field that cannot cross (a class instance, a function) is
-      left behind rather than replacing the error.
 - [ ] Program functions as arguments to extension code (callbacks such as `forEach`).
 - [ ] Host classes. Stateful host objects are expressed as closures; a declared method table would be the next
      step if `new X()` in a program is ever needed.
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/codemode",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "description": "Effect-native confined code execution over schema-described tools",
  "type": "module",
  "license": "MIT",
@@ -6,7 +6,7 @@ import { type AstNode, formatLocation, PendingThrow, Throw, sourceLocation, type
 import { containsRuntimeReference } from "./references.js"
 import { createErrorValue, type ErrorType, isErrorType } from "./intrinsics.js"
 import { constructor, methods, prototypeFrom, receiver } from "./native.js"
-import { type Callable, define, get, has, hidden, type Native, Arr, ErrorObj, Obj } from "./objects.js"
+import { type Callable, define, get, hidden, type Native, Arr, ErrorObj, Obj } from "./objects.js"
 import type { Interpreter } from "./interpreter.js"
 import { formatValue } from "../stdlib/console.js"
 import { coerceToString } from "../stdlib/value.js"
@@ -146,17 +146,9 @@ export const errorGlobal = <R>(type: ErrorType, ctx: Interpreter<R>) => {
  const prototype = builtins[type]
  const construct = (args: Array<unknown>, newTarget: Callable) => {
    const proto = prototypeFrom(newTarget, prototype)
-    const created =
-      type === "AggregateError"
-        ? constructAggregateErrorValue(ctx, args, proto)
-        : Effect.sync(() => createErrorValue(proto, args[0] === undefined ? undefined : coerceToString(args[0])))
-    // ES2022 `new Error(message, { cause })`: installed only when the options object has the property at all.
-    const options = args[type === "AggregateError" ? 2 : 1]
-    if (!(options instanceof Obj) || !has(options, "cause")) return created
-    return Effect.map(created, (value) => {
-      define(value, "cause", get(options, "cause"), hidden)
-      return value
-    })
+    return type === "AggregateError"
+      ? constructAggregateErrorValue(ctx, args, proto)
+      : Effect.sync(() => createErrorValue(proto, args[0] === undefined ? undefined : coerceToString(args[0])))
  }
  const ctor: Native<R> = constructor<R>(builtins, prototype, {
    name: type,
@@ -5,16 +5,13 @@ import { type ExtensionInvocation, hooked } from "../tool-runtime.js"
 import type { Interpreter } from "./interpreter.js"
 import { createErrorValue, isErrorType } from "./intrinsics.js"
 import { MAX_VALUE_DEPTH } from "./limits.js"
-import { PendingThrow, Throw, typeError } from "./model.js"
+import { Throw, typeError } from "./model.js"
 import { fn } from "./native.js"
 import {
  Callable,
  define,
  entries,
  get,
-  has,
-  hidden,
-  keys,
  Arr,
  Bytes,
  DateObj,
@@ -63,28 +60,14 @@ export const extensionGlobals = <R>(
    ) {
      throw typeError(`${label} contains ${describeValue(value)}, which cannot be passed to an extension.`)
    }
-    if (seen.has(value)) throw typeError(`${label} contains a circular value.`)
-    seen.add(value)
    if (value instanceof ErrorObj) {
      const name = coerceToString(get(value, "name"))
      const message = get(value, "message")
      const text = message === undefined ? "" : coerceToString(message)
-      const copied =
-        name === "AggregateError" ? new AggregateError([], text) : new (hostErrors.get(name) ?? Error)(text)
-      for (const key of new Set(["cause", ...keys(value)])) {
-        if (uncrossed.has(key) || !has(value, key)) continue
-        const item = crossing(() => next(get(value, key)))
-        if (item === left) continue
-        Object.defineProperty(copied, key, {
-          value: item,
-          writable: true,
-          configurable: true,
-          enumerable: key !== "cause",
-        })
-      }
-      seen.delete(value)
-      return copied
+      return name === "AggregateError" ? new AggregateError([], text) : new (hostErrors.get(name) ?? Error)(text)
    }
+    if (seen.has(value)) throw typeError(`${label} contains a circular value.`)
+    seen.add(value)
    const copied =
      value instanceof Arr
        ? value.items.map(next)
@@ -102,29 +85,18 @@ export const extensionGlobals = <R>(
    if (isPrimitive(value)) return value
    if (typeof value === "function") return wrap(value, label)
    if (value !== null && typeof value === "object") {
-      const next = (item: unknown, path: string) => fromHost(item, path, depth + 1, seen)
      if (value instanceof Date) return new DateObj(builtins.Date, value.getTime())
      if (value instanceof RegExp) return new RegExpObj(builtins.RegExp, value.source, value.flags)
      if (value instanceof Uint8Array) return new Bytes(builtins.Uint8Array, new Uint8Array(value))
      if (value instanceof ArrayBuffer) return new Bytes(builtins.Uint8Array, new Uint8Array(value.slice(0)))
      if (value instanceof Error) {
-        if (seen.has(value)) throw typeError(`${label} produced a circular value.`)
-        seen.add(value)
-        const copied = createErrorValue(builtins[isErrorType(value.name) ? value.name : "Error"], value.message)
-        const fields = value as unknown as Record<string, unknown>
-        for (const key of new Set(["cause", ...Object.keys(value)])) {
-          if (uncrossed.has(key) || !(key in value) || typeof fields[key] === "function") continue
-          const item = crossing(() => next(fields[key], `${label}.${key}`))
-          if (item === left) continue
-          define(copied, key, item, key === "cause" ? hidden : undefined)
-        }
-        seen.delete(value)
-        return copied
+        return createErrorValue(builtins[isErrorType(value.name) ? value.name : "Error"], value.message)
      }
      if (value instanceof URL) return new URLObj(builtins.URL, builtins.URLSearchParams, new URL(value.href))
      if (value instanceof URLSearchParams) {
        return new URLSearchParamsObj(builtins.URLSearchParams, new URLSearchParams(value))
      }
+      const next = (item: unknown, path: string) => fromHost(item, path, depth + 1, seen)
      if (value instanceof Map) {
        const wrapped = new MapObj(builtins.Map)
        for (const [key, item] of value) wrapped.map.set(next(key, label), next(item, label))
@@ -188,22 +160,6 @@ export const extensionGlobals = <R>(
  )
 }

-/**
- * An error crosses as its name, message, `cause`, and own enumerable fields, such as Node's `code`, `errno`,
- * `syscall`, and `path`. `stack` stays on its own side, and no field may shadow an Error method. A field that cannot
- * cross (a socket, a handle, a function) is left behind so the error itself always arrives.
- */
-const uncrossed = new Set(["stack", "constructor", "toString", "__proto__"])
-const left = Symbol("left behind")
-const crossing = (convert: () => unknown): unknown => {
-  try {
-    return convert()
-  } catch (reason) {
-    if (reason instanceof PendingThrow) return left
-    throw reason
-  }
-}
-
 const hostErrors = new Map<string, ErrorConstructor>([
  ["TypeError", TypeError],
  ["RangeError", RangeError],
@@ -163,26 +163,12 @@ describe("values are converted at the boundary, never shared", () => {
    expect(held[0]).toEqual({ a: 1 })
  })

-  test("a program Error crosses as a host Error with its name, message, cause, and own data", async () => {
+  test("a program Error crosses as a host Error with its name and message", async () => {
    held.length = 0
    await value(`keep(new TypeError("bad"))`)
    expect(held[0]).toBeInstanceOf(TypeError)
    expect((held[0] as Error).message).toBe("bad")
    expect(Object.keys(held[0] as object)).toEqual([])
-    held.length = 0
-    await value(`
-      const e = new Error("m", { cause: new RangeError("root") })
-      e.code = "ENOENT"; e.detail = { path: "x" }
-      e.stack = "chosen"; e.toString = 1; e.constructor = 2; e.fn = () => 1
-      keep(e)`)
-    const crossed = held[0] as Error & Record<string, unknown>
-    expect(crossed.cause).toBeInstanceOf(RangeError)
-    expect((crossed.cause as Error).message).toBe("root")
-    expect(Object.keys(crossed)).toEqual(["code", "detail"])
-    expect(crossed.detail).toEqual({ path: "x" })
-    expect(crossed.stack).not.toBe("chosen")
-    expect(String(crossed)).toBe("Error: m")
-    expect(crossed.constructor).toBe(Error)
  })

  test("an Error with an unknown name crosses as a plain Error", async () => {
@@ -245,49 +231,6 @@ describe("host errors", () => {
    ])
  })

-  test("a host Error arrives with its cause and own data; what cannot cross is left behind", async () => {
-    class Handle {}
-    const target = CodeMode.make({
-      extensions: [
-        Extension.make({
-          name: "fs",
-          globals: {
-            open: () => {
-              const error = Object.assign(new Error("ENOENT: no such file or directory, open 'x'"), {
-                code: "ENOENT",
-                errno: -2,
-                path: "x",
-                detail: { retried: true },
-                handle: new Handle(),
-                retry: () => 1,
-              })
-              throw new Error("open failed", { cause: error })
-            },
-          },
-        }),
-      ],
-    })
-    expect(
-      await value(
-        `try { open() } catch (e) {
-          const c = e.cause
-          return [e.message, Object.keys(e), c instanceof Error, c.code, c.errno, c.path, c.detail, Object.keys(c), "stack" in c]
-        }`,
-        target,
-      ),
-    ).toEqual([
-      "open failed",
-      [],
-      true,
-      "ENOENT",
-      -2,
-      "x",
-      { retried: true },
-      ["code", "errno", "path", "detail"],
-      false,
-    ])
-  })
-
  test("a thrown or rejected value crosses like a return, so the program catches what was thrown", async () => {
    const reason = { status: 404, nested: { a: 1 } }
    const target = CodeMode.make({
@@ -235,7 +235,7 @@ describe("OpenAPI.fromSpec", () => {
      path: "/api/fs/read/*",
      reason: "binary responses are not supported",
    })
-    expect(toolAt(result.tools, "server.info")).not.toBeUndefined()
+    expect(toolAt(result.tools, "server.status")).not.toBeUndefined()
    expect(toolAt(result.tools, "session.get")).not.toBeUndefined()
    expect(toolAt(result.tools, "session.create")).not.toBeUndefined()

@@ -978,10 +978,10 @@ describe("OpenAPI.fromSpec", () => {

    expect(spec.security).toStrictEqual([])
    expect(isRecord(components.securitySchemes) ? Object.keys(components.securitySchemes) : []).toStrictEqual([])
-    const info = toolAt(result.tools, "server.info")
-    const infoInput = Tool.isTool(info) && isRecord(info.input) ? info.input : undefined
-    expect(infoInput).toMatchObject({ type: "object", properties: {} })
-    const input = isRecord(infoInput) ? infoInput : {}
+    const status = toolAt(result.tools, "server.status")
+    const statusInput = Tool.isTool(status) && isRecord(status.input) ? status.input : undefined
+    expect(statusInput).toMatchObject({ type: "object", properties: {} })
+    const input = isRecord(statusInput) ? statusInput : {}
    expect(Object.keys(isRecord(input.properties) ? input.properties : {})).toStrictEqual([])
  })

@@ -994,7 +994,7 @@ describe("OpenAPI.fromSpec", () => {
      runtime
        .execute(
          `
-        return search({ query: "server info", namespace: "opencode", limit: 1 })
+        return search({ query: "server status", namespace: "opencode", limit: 1 })
      `,
        )
        .pipe(Effect.provide(layer)),
@@ -1005,8 +1005,8 @@ describe("OpenAPI.fromSpec", () => {
    expect(result.value).toMatchObject({
      items: [
        {
-          path: "tools.opencode.server.info",
-          description: "Return the server identity, connection URLs, paths, and readiness status.",
+          path: "tools.opencode.server.status",
+          description: "Return the server identity, connection URLs, and readiness status.",
        },
      ],
    })
@@ -350,16 +350,6 @@ describe("Error values and instanceof", () => {
    expect(await value(`return new Error("e") instanceof TypeError`)).toBe(false)
  })

-  test("new Error(message, { cause }) installs a non-enumerable cause only when the option is present", async () => {
-    expect(
-      await value(`
-        const inner = new Error("root")
-        const e = new TypeError("m", { cause: inner })
-        const agg = new AggregateError([], "a", { cause: 3 })
-        return [e.cause === inner, Object.keys(e), "cause" in new Error("m"), "cause" in new Error("m", { cause: undefined }), agg.cause]`),
-    ).toEqual([true, [], false, true, 3])
-  })
-
  test("thrown errors keep instanceof through try/catch", async () => {
    expect(await value(`try { throw new Error("x") } catch (e) { return [e instanceof Error, e.message] }`)).toEqual([
      true,
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-app",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode/console-core",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-function",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-mail",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode/console-support",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.0.5",
+  "version": "2.0.4",
  "name": "@opencode/core",
  "type": "module",
  "license": "MIT",
@@ -4,6 +4,7 @@ import { Command } from "@opencode/schema/command"
 import type { PromptInput } from "@opencode/schema/prompt-input"
 import type { Session } from "@opencode/schema/session"
 import type { SessionInbox } from "@opencode/schema/session-inbox"
+import type { SessionMessage } from "@opencode/schema/session-message"
 import { makeLocationNode } from "@opencode/util/effect/app-node"
 import { Context, Effect, Layer, Schema } from "effect"
 import { Bus } from "./bus.js"
@@ -11,10 +12,23 @@ import { State } from "./state.js"

 export const Info = Command.Info
 export type Info = Command.Info
+export const Outcome = Command.Outcome
+export type Outcome = Command.Outcome
 export { Event } from "@opencode/schema/command"

+export const immediate: Outcome = { type: "immediate" }
+
+export function prompted(admitted: { readonly id: SessionMessage.ID }): Outcome {
+  return { type: "prompt", inboxID: admitted.id }
+}
+
 export interface Invocation {
  readonly sessionID: Session.ID
+  /**
+   * Identity for the input this command admits. Commands that prompt a Session must admit
+   * with this ID and report it in their outcome so clients can follow the resulting work.
+   */
+  readonly messageID: SessionMessage.ID
  readonly prompt: PromptInput.Prompt
  readonly delivery: SessionInbox.Delivery
 }
@@ -22,7 +36,8 @@ export interface Invocation {
 export interface Definition {
  readonly name: string
  readonly description?: string
-  readonly execute: (input: Invocation) => Effect.Effect<void, unknown>
+  /** Resolve with an Outcome to report admitted work; `void` means the command finished immediately. */
+  readonly execute: (input: Invocation) => Effect.Effect<Outcome | void, unknown>
 }

 export type Editor = {
@@ -45,7 +60,7 @@ export interface Interface extends State.Transformable<Editor> {
  readonly execute: (input: {
    readonly name: string
    readonly invocation: Invocation
-  }) => Effect.Effect<void, NotFoundError | ExecutionError>
+  }) => Effect.Effect<Outcome, NotFoundError | ExecutionError>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/Command") {}
@@ -82,10 +97,22 @@ export const layer = Layer.effect(
        const definition = state.get().get(input.name)
        if (!definition)
          return yield* new NotFoundError({ command: input.name, message: `Command not found: ${input.name}` })
-        return yield* definition.execute(input.invocation).pipe(
+        const outcome = yield* definition.execute(input.invocation).pipe(
          Effect.tapError((error) => Effect.logError("command execution failed", { command: input.name, error })),
          Effect.mapError((error) => new ExecutionError({ command: input.name, message: errorMessage(error) })),
        )
+        if (outcome === undefined) return immediate
+        // Plugin callbacks cross a JavaScript boundary; only a well-formed outcome is reportable.
+        if (!isOutcome(outcome))
+          return yield* new ExecutionError({ command: input.name, message: "Command returned an invalid outcome" })
+        // Clients follow the invocation ID, so a command that admitted under another ID (typically by
+        // omitting `id: messageID` from its prompt) would leave them waiting forever. Fail loudly instead.
+        if (outcome.type === "prompt" && outcome.inboxID !== input.invocation.messageID)
+          return yield* new ExecutionError({
+            command: input.name,
+            message: `Command admitted ${outcome.inboxID} instead of the invocation message ID ${input.invocation.messageID}`,
+          })
+        return outcome
      }),
    })
  }),
@@ -97,6 +124,8 @@ export const node = makeLocationNode({
  deps: [Bus.node],
 })

+const isOutcome = Schema.is(Outcome)
+
 function errorMessage(error: unknown) {
  if (error instanceof Error) return error.message
  if (typeof error === "string") return error
@@ -11,6 +11,7 @@ import { Effect, Option, PubSub, Schema, Stream } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { Agent } from "../../agent.js"
 import { Config } from "../../config.js"
+import { Command } from "../../command.js"
 import { Location } from "../../location.js"
 import { Session } from "../../session.js"
 import { SubagentJob } from "../../session/subagent-job.js"
@@ -104,9 +105,10 @@ export const Plugin = define({
                    agent: selected.id,
                    model: model ?? selected.info?.model ?? parent.model,
                  })
-                  yield* sessions.prompt({
+                  const admitted = yield* sessions.prompt({
                    ...input.prompt,
                    sessionID: child.id,
+                    id: input.messageID,
                    text: ["You are a subagent spawned by another session.", text].join("\n"),
                    resume: false,
                  })
@@ -119,20 +121,22 @@ export const Plugin = define({
                  }
                  yield* subagents.start(recovery)
                  yield* subagents.background(recovery)
-                  return
+                  return Command.prompted(admitted)
                }
                if (agent !== undefined) {
                  const session = yield* ctx.session.get({ sessionID: input.sessionID })
                  if (session.agent !== agent) yield* ctx.session.switchAgent({ sessionID: input.sessionID, agent })
                }
                if (model !== undefined) yield* ctx.session.switchModel({ sessionID: input.sessionID, model })
-                yield* ctx.session.prompt({
+                const admitted = yield* ctx.session.prompt({
                  ...input.prompt,
                  sessionID: input.sessionID,
+                  id: input.messageID,
                  text,
                  delivery: input.delivery,
                })
-              }).pipe(Effect.asVoid),
+                return Command.prompted(admitted)
+              }),
          })
        }
      }
@@ -79,7 +79,6 @@ export interface ListInput {
 }

 export interface Interface {
-  readonly close: Effect.Effect<void>
  readonly create: (input: CreateInput) => Effect.Effect<Info, AlreadyExistsError | InvalidFormError>
  readonly ask: (input: CreateInput) => Effect.Effect<TerminalState, AlreadyExistsError | InvalidFormError>
  readonly get: (id: ID) => Effect.Effect<Info, NotFoundError>
@@ -101,7 +100,6 @@ export const layer = Layer.effect(
  Service,
  Effect.gen(function* () {
    const bus = yield* Bus.Service
-    let closed = false
    const forms = yield* Cache.makeWith<ID, Entry>(
      () => Effect.die(new Error("Form cache must be used via set/getSuccess, never get")),
      {
@@ -139,7 +137,6 @@ export const layer = Layer.effect(
          }
          yield* Cache.set(forms, id, entry)
          yield* bus.publish(Form.Event.Created, { form }).pipe(Effect.onError(() => Cache.invalidate(forms, id)))
-          if (closed) yield* cancel(id).pipe(Effect.orDie)
          return form
        }),
      ),
@@ -205,21 +202,19 @@ export const layer = Layer.effect(
      ),
    )

-    const close = Effect.sync(() => {
-      closed = true
-    }).pipe(
-      Effect.andThen(Cache.values(forms)),
-      Effect.flatMap((entries) =>
-        Effect.forEach(
-          Array.from(entries).filter((entry) => entry.state.status === "pending"),
-          (entry) => cancel(entry.form.id).pipe(Effect.ignore),
-          { discard: true },
+    yield* Effect.addFinalizer(() =>
+      Cache.values(forms).pipe(
+        Effect.flatMap((entries) =>
+          Effect.forEach(
+            Array.from(entries).filter((entry) => entry.state.status === "pending"),
+            (entry) => cancel(entry.form.id).pipe(Effect.ignore),
+            { discard: true },
+          ),
        ),
      ),
    )
-    yield* Effect.addFinalizer(() => close)

-    return Service.of({ create, ask, get, list, state, reply, cancel, close })
+    return Service.of({ create, ask, get, list, state, reply, cancel })
  }),
 )

@@ -1,4 +1,4 @@
-import { Context, Effect, Layer } from "effect"
+import { Effect, Layer } from "effect"
 import { Agent } from "./agent.js"
 import { AISDK } from "./aisdk.js"
 import { Model } from "./model.js"
@@ -18,7 +18,6 @@ import { Image } from "./image.js"
 import { LocationWatcher } from "./filesystem/location-watcher.js"
 import { Integration } from "./integration.js"
 import { Location } from "./location.js"
-import { LocationLifecycle } from "./location-lifecycle.js"
 import { FileAccess } from "./file-access.js"
 import { ModelResolver } from "./model-resolver.js"
 import { Mcp } from "./mcp/index.js"
@@ -58,7 +57,6 @@ export { Service, node, type Interface } from "./instance/service.js"

 const nodes = [
  Location.node,
-  LocationLifecycle.node,
  Environment.node,
  Config.node,
  Agent.node,
@@ -159,7 +157,6 @@ export function layer(ref: Location.Ref, options: Options = {}): Layer.Layer<Ser
  return LayerNode.compile(graph, { replacements, shared: Node.tags.values.global }).pipe(
    // Instance boot failures are defects; provided operations retain their typed errors.
    Layer.orDie,
-    Layer.tap((context) => Effect.addFinalizer(() => Context.get(context, LocationLifecycle.Service).shutdown)),
    Layer.tap(() =>
      Effect.logInfo("location services booted", {
        directory: ref.directory,
@@ -1,52 +0,0 @@
-export * as LocationLifecycle from "./location-lifecycle.js"
-
-import { Context, Effect, Layer } from "effect"
-import { makeLocationNode } from "@opencode/util/effect/app-node"
-import { LocationEvent } from "@opencode/schema/location-event"
-import { Bus } from "./bus.js"
-import { Form } from "./form.js"
-import { Location } from "./location.js"
-import { Permission } from "./permission.js"
-import { Rpc } from "./rpc.js"
-
-export class Service extends Context.Service<
-  Service,
-  { readonly isClosed: () => boolean; readonly shutdown: Effect.Effect<void> }
->()("@opencode/LocationLifecycle") {}
-
-const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const bus = yield* Bus.Service
-    const location = yield* Location.Service
-    const permission = yield* Permission.Service
-    const forms = yield* Form.Service
-    const rpc = yield* Rpc.Service
-    let closed = false
-    const shutdown = yield* Effect.cached(
-      Effect.gen(function* () {
-        closed = true
-        yield* permission.close
-        yield* forms.close
-        yield* rpc.close
-        yield* bus.publish(
-          LocationEvent.Shutdown,
-          {},
-          {
-            location: Location.Ref.make({ directory: location.directory, workspaceID: location.workspaceID }),
-          },
-        )
-      }).pipe(Effect.uninterruptible),
-    )
-    return Service.of({
-      isClosed: () => closed,
-      shutdown,
-    })
-  }),
-)
-
-export const node = makeLocationNode({
-  service: Service,
-  layer,
-  deps: [Bus.node, Location.node, Permission.node, Form.node, Rpc.node],
-})
@@ -1,4 +1,4 @@
-import { Context, Effect, Exit, Layer, LayerMap, RcMap } from "effect"
+import { Context, Effect, Layer, LayerMap } from "effect"
 import { LayerNode } from "@opencode/util/effect/layer-node"
 import { Node } from "@opencode/util/effect/app-node"
 import { AbsolutePath } from "@opencode/schema/schema"
@@ -17,24 +17,6 @@ export class Service extends Context.Service<

 export const node = LayerNode.unbound(Service, Node.tags.values.global)

-export const reload = Effect.fn("LocationServiceMap.reload")(function* () {
-  const locations = yield* Service
-  const refs = Array.from(yield* RcMap.keys(locations.rcMap))
-  yield* Effect.forEach(refs, (ref) => locations.invalidate(ref), {
-    discard: true,
-    concurrency: "unbounded",
-  })
-  // Boot every replacement now and let all builds settle even if one fails.
-  const results = yield* Effect.forEach(
-    refs,
-    (ref) => Effect.scoped(locations.contextEffect(ref)).pipe(Effect.asVoid, Effect.exit),
-    { concurrency: "unbounded" },
-  )
-  const failure = results.find(Exit.isFailure)
-  if (failure) return yield* Effect.failCause(failure.cause)
-  yield* Effect.logInfo("location services reloaded", { count: refs.length })
-})
-
 /** Normalize equivalent placements before they become resource-cache keys. */
 export function canonical(ref: Location.Ref) {
  return Location.Ref.make({
@@ -2,8 +2,8 @@ import { Context, Duration, Effect, Exit, Layer, LayerMap, MutableHashMap, Optio
 import { LayerNode } from "@opencode/util/effect/layer-node"
 import { Instance } from "./instance.js"
 import { Location } from "./location.js"
-import { LocationLifecycle } from "./location-lifecycle.js"
 import { LocationServiceMap } from "./location-service-map.js"
+import { Rpc } from "./rpc.js"

 export { LocationServiceMap } from "./location-service-map.js"

@@ -28,17 +28,12 @@ export function buildLocationServiceMap(
            ).pipe(
              Effect.onExit((exit) => {
                const finish = Effect.suspend(() => {
-                  if (Exit.isSuccess(exit)) {
-                    return Effect.gen(function* () {
-                      const lifecycle = Context.get(exit.value, LocationLifecycle.Service)
-                      // A boot detached while in flight still needs shutdown and cancellation.
-                      if (Option.getOrUndefined(MutableHashMap.get(builds, ref)) !== build)
-                        return yield* lifecycle.shutdown
-                      build.close = lifecycle.shutdown
-                    })
-                  }
                  // An explicitly invalidated build must not evict its replacement.
                  if (Option.getOrUndefined(MutableHashMap.get(builds, ref)) !== build) return Effect.void
+                  if (Exit.isSuccess(exit)) {
+                    build.close = Context.get(exit.value, Rpc.Service).close
+                    return Effect.void
+                  }
                  MutableHashMap.remove(builds, ref)
                  // Evict once per failed build, before its result reaches borrowers.
                  return Exit.isFailure(exit) ? inner.invalidate(ref) : Effect.void
@@ -66,11 +61,10 @@ export function buildLocationServiceMap(
            const key = LocationServiceMap.canonical(ref)
            const build = Option.getOrUndefined(MutableHashMap.get(builds, key))
            MutableHashMap.remove(builds, key)
-            // Detach routing first, then cancel interactions and notify clients. Running
-            // steps retain their borrowed graph until they can hand off at a boundary.
+            // Detach routing first, then end pending RPCs that still borrow the old graph.
            // Do not await a boot here: failed/in-flight builds have their own cleanup path.
            return inner.invalidate(key).pipe(Effect.andThen(build?.close ?? Effect.void))
-          }).pipe(Effect.uninterruptible),
+          }),
      }
      // Cached instances borrow their owner instead of retaining its Layer scope.
      const bindings: LayerNode.Replacements = [
@@ -81,8 +81,6 @@ type ServerEntry = {
 // persisted session row, so their forms are owned by this opaque sentinel session identifier.
 const GLOBAL_ELICITATION_SESSION_ID = "global"
 const URL_ELICITATION_FIELD_KEY = "elicitation"
-// Connections remain Location-scoped, but shared remote endpoints should not receive concurrent startup bursts.
-const endpointLoads = KeyedMutex.makeUnsafe<string>()

 type Data = {
  servers: Map<ServerName, Types.DeepMutable<Mcp.ServerConfig>>
@@ -389,7 +387,7 @@ export const layer = (options?: Options) =>
          const { McpClient } = yield* Effect.promise(() => import("./client.js"))
          // List tools as part of connect so a failure here marks the server failed rather than
          // leaving it connected with a silently empty tool list and no path to recover.
-          const load = McpClient.connect(
+          const result = yield* McpClient.connect(
            name,
            entry.config,
            location.directory,
@@ -401,10 +399,8 @@ export const layer = (options?: Options) =>
            // A stdio server is spawned on this location's execution plane, not the host's.
            Effect.provideService(Environment.Service, environment),
            Scope.provide(scope),
+            Effect.exit,
          )
-          const result = yield* (
-            entry.config.type === "remote" ? endpointLoads.withLock(entry.config.url)(load) : load
-          ).pipe(Effect.exit)
          if (Exit.isSuccess(result)) {
            entry.client = result.value.connection
            entry.tools = result.value.tools.map((tool) => toTool(name, entry, tool))
@@ -101,7 +101,6 @@ export function merge(...rulesets: Permission.Ruleset[]): Permission.Ruleset {
 }

 export interface Interface {
-  readonly close: Effect.Effect<void>
  readonly ask: (input: AssertInput) => Effect.Effect<AskResult, SessionErrors.NotFoundError>
  readonly assert: (input: AssertInput) => Effect.Effect<void, Error | SessionErrors.NotFoundError>
  readonly reply: (input: ReplyInput) => Effect.Effect<void, NotFoundError>
@@ -128,22 +127,18 @@ const layer = Layer.effect(
    const saved = yield* PermissionSaved.Service
    const hooks = yield* PluginHooks.Service
    const pending = new Map<ID, Pending>()
-    let closed = false

-    const close = Effect.gen(function* () {
-      closed = true
-      yield* Effect.forEach(Array.from(pending.values()), (item) =>
-        bus
-          .publish(Permission.Event.Replied, {
-            sessionID: item.request.sessionID,
-            requestID: item.request.id,
-            reply: "reject",
-          })
-          .pipe(Effect.ensuring(Deferred.fail(item.deferred, new DeclinedError()))),
-      )
-      pending.clear()
-    }).pipe(Effect.uninterruptible)
-    yield* Effect.addFinalizer(() => close)
+    yield* Effect.addFinalizer(() =>
+      Effect.forEach(pending.values(), (item) => Deferred.fail(item.deferred, new DeclinedError()), {
+        discard: true,
+      }).pipe(
+        Effect.ensuring(
+          Effect.sync(() => {
+            pending.clear()
+          }),
+        ),
+      ),
+    )

    const savedRules = Effect.fnUntraced(function* () {
      return (yield* saved.list({ projectID: location.project.id })).map(
@@ -206,10 +201,6 @@ const layer = Layer.effect(
        Effect.gen(function* () {
          const deferred = yield* Deferred.make<void, DeclinedError | CorrectedError>()
          const item = { request, agent, deferred }
-          if (closed) {
-            yield* Deferred.fail(deferred, new DeclinedError())
-            return item
-          }
          if (pending.has(request.id))
            return yield* Effect.die(new Error(`Duplicate pending permission ID: ${request.id}`))
          pending.set(request.id, item)
@@ -221,7 +212,6 @@ const layer = Layer.effect(
      )

    const ask = Effect.fn("Permission.ask")(function* (input: AssertInput) {
-      if (closed) return { id: input.id ?? ID.create(), effect: "deny" as const }
      const result = yield* evaluateInput(input)
      const value = request(input, result.message)
      if (result.effect === "ask") yield* create(value, input.agent)
@@ -230,7 +220,6 @@ const layer = Layer.effect(

    const assert = Effect.fn("Permission.assert")((input: AssertInput) =>
      Effect.gen(function* () {
-        if (closed) return yield* Effect.die(new DeclinedError())
        const result = yield* evaluateInput(input)
        return yield* Effect.uninterruptibleMask((restore) =>
          Effect.gen(function* () {
@@ -332,7 +321,7 @@ const layer = Layer.effect(
      return Array.from(pending.values(), (item) => item.request).filter((request) => request.sessionID === sessionID)
    })

-    return Service.of({ ask, assert, reply, get, forSession, list, close })
+    return Service.of({ ask, assert, reply, get, forSession, list })
  }),
 )

@@ -3,6 +3,7 @@ export * as CommandPlugin from "./command.js"
 import { define } from "@opencode/plugin/effect/plugin"
 import { Effect, Stream } from "effect"
 import { Bus } from "../bus.js"
+import { Command } from "../command.js"
 import { Location } from "../location.js"
 import { Mcp } from "../mcp/index.js"
 import PROMPT_INITIALIZE from "./command/initialize.txt"
@@ -34,10 +35,11 @@ export const Plugin = define({
            .prompt({
              ...input.prompt,
              sessionID: input.sessionID,
+              id: input.messageID,
              text: append(PROMPT_INITIALIZE.replace("${path}", location.project.directory), input.prompt.text),
              delivery: input.delivery,
            })
-            .pipe(Effect.asVoid),
+            .pipe(Effect.map(Command.prompted)),
      })
      editor.add({
        name: "review",
@@ -47,10 +49,11 @@ export const Plugin = define({
            .prompt({
              ...input.prompt,
              sessionID: input.sessionID,
+              id: input.messageID,
              text: append(PROMPT_REVIEW.replace("${path}", location.project.directory), input.prompt.text),
              delivery: input.delivery,
            })
-            .pipe(Effect.asVoid),
+            .pipe(Effect.map(Command.prompted)),
      })
      for (const prompt of loaded.prompts) {
        editor.add({
@@ -67,16 +70,18 @@ export const Plugin = define({
                ),
              })
              if (!result) return yield* Effect.fail(new Error(`MCP prompt not found: ${prompt.server}:${prompt.name}`))
-              yield* ctx.session.prompt({
+              const admitted = yield* ctx.session.prompt({
                ...input.prompt,
                sessionID: input.sessionID,
+                id: input.messageID,
                text: result.messages
                  .map((message) => promptMessageText(message.content))
                  .join("\n")
                  .trim(),
                delivery: input.delivery,
              })
-            }).pipe(Effect.asVoid),
+              return Command.prompted(admitted)
+            }),
        })
      }
    })
@@ -167,8 +167,7 @@ export const AzurePlugin = define({
                draft.settings.baseURL,
                resolveResourceName(draft.settings, resourceName) ?? resourceName,
              )
-            if (responsesWebSocketCapable(item.provider, draft))
-              draft.transport = item.provider.transport ?? "websocket"
+            if (responsesWebSocketCapable(item.provider, draft)) draft.transport = "websocket"
          })
        }
      }
@@ -270,7 +270,7 @@ export const OpenAIPlugin = define({
        // ChatGPT-plan tokens only authorize codex-eligible models, and the
        // subscription covers usage, so hide the rest and zero the cost.
        models.update(model.providerID, model.id, (draft) => {
-          draft.transport = models.provider.get(model.providerID)?.provider.transport ?? "websocket"
+          draft.transport = "websocket"
          if (!chatgpt) return
          if (Schema.is(Schema.Struct({ mode: Schema.Literal("pro") }))(draft.body?.reasoning)) {
            draft.enabled = false
@@ -98,7 +98,7 @@ export const XAIPlugin = define({
    yield* ctx.model.transform((models) => {
      for (const model of models.list(providerID)) {
        models.update(providerID, model.id, (draft) => {
-          draft.transport = models.provider.get(providerID)?.provider.transport ?? "websocket"
+          draft.transport = "websocket"
        })
      }
    })
@@ -42,17 +42,13 @@ that section.
 CLI and TUI preferences are separate from OpenCode's server and project
 configuration. They live in the global `~/.config/opencode/cli.json`, or
 `$XDG_CONFIG_HOME/opencode/cli.json` when `XDG_CONFIG_HOME` is set. There is no
-project-local CLI configuration. Set `OPENCODE_CLI_CONFIG_CONTENT` to merge
-inline JSON over the global settings. Most preferences can also be changed from
-the TUI by pressing `Ctrl+P` and selecting **Open settings**.
+project-local CLI configuration. Most preferences can also be changed from the
+TUI by pressing `Ctrl+P` and selecting **Open settings**.

-### [Settings](https://opencode.ai/v2/docs/cli/config)
-
-Fetch the full [CLI settings reference](https://opencode.ai/v2/docs/cli/config)
-before editing `cli.json`. It documents every terminal-only setting, accepted
-values, and examples, including themes, input, sessions, tabs, diffs, alerts,
-Mini, keybindings, terminal plugins, and debugging. Do not put these settings
-in `opencode.json(c)`.
+Fetch the full [CLI configuration guide](https://opencode.ai/v2/docs/cli/config)
+before editing `cli.json`. It covers terminal-only settings such as themes,
+keybindings, terminal plugins, scrolling, attention alerts, diff presentation,
+and terminal integration. Do not put these settings in `opencode.json(c)`.

 ### [Keybinds](https://opencode.ai/v2/docs/cli/keybinds)

@@ -96,7 +92,7 @@ Common configuration fields include `model`, `default_agent`, `permissions`,
 `references`, `formatter`, and `lsp`.

 This configuration is distinct from `cli.json`. Use the
-[CLI settings reference](https://opencode.ai/v2/docs/cli/config) for terminal
+[CLI configuration guide](https://opencode.ai/v2/docs/cli/config) for terminal
 preferences, especially themes and keybindings.

 Do not guess field names or shapes. Fetch the V2 configuration guide and its
@@ -194,7 +190,7 @@ HTTP method and path or an OpenAPI operation ID.
 Call an endpoint with an HTTP method and path:

 ```sh
-opencode api get /api/info
+opencode api get /api/status
 ```

 Pass a request body with `--data` or `-d`, and additional headers with
@@ -245,7 +241,7 @@ OpenCode runs a client and a background server. Start by determining whether a
 problem belongs to the client, the shared server, or one project.

 - Check the service with `opencode service status` and verify the API with
-  `opencode api get /api/info`.
+  `opencode api get /api/status`.
 - Compare with `opencode --standalone`, which runs the TUI with a private
  server, to isolate shared-service issues.
 - Inspect `~/.local/share/opencode/log/opencode.log`. Filter `role=cli` for
@@ -57,9 +57,6 @@ export const Plugin = define({

    const hook = (event: SessionHooks["context"]) =>
      Effect.gen(function* () {
-        const session = yield* ctx.session.get({ sessionID: event.sessionID }).pipe(Effect.orDie)
-        if (session.parentID) return
-
        const active = sessions.get(event.sessionID)
        const settings = yield* loadSettings()
        if (!settings) {
@@ -186,12 +186,13 @@ export interface Interface {
  readonly command: (input: {
    sessionID: SessionSchema.ID
    command: string
+    id?: SessionMessage.ID
    text: string
    files?: PromptInput.Prompt["files"]
    agents?: PromptInput.Prompt["agents"]
    skills?: PromptInput.Prompt["skills"]
    delivery?: SessionInbox.Delivery
-  }) => Effect.Effect<void, NotFoundError | Command.NotFoundError | Command.ExecutionError>
+  }) => Effect.Effect<Command.Outcome, NotFoundError | Command.NotFoundError | Command.ExecutionError>
  readonly shell: (
    input: Parameters<Session.Handle["shell"]>[0] & { sessionID: SessionSchema.ID },
  ) => ReturnType<Session.Handle["shell"]>
@@ -3,6 +3,7 @@ export * as SessionCommand from "./command.js"
 import type { PromptInput } from "@opencode/schema/prompt-input"
 import type { Session } from "@opencode/schema/session"
 import type { SessionInbox } from "@opencode/schema/session-inbox"
+import { SessionMessage } from "@opencode/schema/session-message"
 import { Effect } from "effect"
 import { Command } from "../command.js"
 import { Instance } from "../instance/service.js"
@@ -11,6 +12,7 @@ import { Plugin } from "../plugin/service.js"
 export const execute = Effect.fn("SessionCommand.execute")(function* (input: {
  session: Session.Info
  command: string
+  id?: SessionMessage.ID
  text: string
  files?: PromptInput.Prompt["files"]
  agents?: PromptInput.Prompt["agents"]
@@ -19,10 +21,11 @@ export const execute = Effect.fn("SessionCommand.execute")(function* (input: {
 }) {
  const instances = yield* Instance.Service
  const commands = yield* Plugin.awaitActivation.pipe(Effect.andThen(Command.Service), instances.provide(input.session))
-  yield* commands.execute({
+  return yield* commands.execute({
    name: input.command,
    invocation: {
      sessionID: input.session.id,
+      messageID: input.id ?? SessionMessage.ID.create(),
      prompt: {
        text: input.text,
        files: input.files,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shoubhit Dash	09a725e20a	test(acp): keep only end-to-end slash command coverage	2026-09-16 16:57:54 +05:30
Shoubhit Dash	5258487a08	test(app): return a command outcome from the workspace e2e mock	2026-09-16 16:30:04 +05:30
Shoubhit Dash	96bc3a52e7	fix(acp): preserve slash command prompt lifecycle	2026-09-16 16:30:04 +05:30