chore(plugins): integrate current v2 and SDK readiness fixture

.changeset/directory-page-heading.md

@@ -1,5 +0,0 @@
----
-"@opencode-ai/core": patch
----
-
-Correct directory page headings when the read offset is zero.

bun.lock

@@ -966,6 +966,7 @@
         "mime-types": "3.0.2",
         "minimatch": "10.2.5",
         "npm-package-arg": "13.0.2",
+        "pacote": "21.5.1",
         "resolve.exports": "catalog:",
       },
       "devDependencies": {
@@ -975,6 +976,7 @@
         "@types/node": "catalog:",
         "@types/npm-package-arg": "6.1.4",
         "@types/npmcli__arborist": "6.3.3",
+        "@types/pacote": "11.1.8",
         "@typescript/native-preview": "catalog:",
       },
     },
@@ -5812,7 +5814,7 @@
 
     "y18n": ["y18n@5.0.8", "", {}, "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="],
 
-    "yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
+    "yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="],
 
     "yaml": ["yaml@2.9.0", "", { "bin": { "yaml": "bin.mjs" } }, "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA=="],
 
@@ -6642,8 +6644,6 @@
 
     "svgo/commander": ["commander@11.1.0", "", {}, "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ=="],
 
-    "tar/yallist": ["yallist@5.0.0", "", {}, "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw=="],
-
     "temp/rimraf": ["rimraf@2.6.3", "", { "dependencies": { "glob": "^7.1.3" }, "bin": { "rimraf": "./bin.js" } }, "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="],
 
     "tempy/type-fest": ["type-fest@0.16.0", "", {}, "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="],
@@ -7450,6 +7450,12 @@
 
     "miniflare/sharp/@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.33.5", "", { "os": "win32", "cpu": "x64" }, "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg=="],
 
+    "minipass-flush/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
+
+    "minipass-pipeline/minipass/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
+
+    "openid-client/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
+
     "p-locate/p-limit/yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
 
     "pkg-dir/find-up/locate-path": ["locate-path@5.0.0", "", { "dependencies": { "p-locate": "^4.1.0" } }, "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="],
@@ -8156,6 +8162,8 @@
 
     "app-builder-lib/@electron/get/fs-extra/universalify": ["universalify@0.1.2", "", {}, "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="],
 
+    "app-builder-lib/hosted-git-info/lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="],
+
     "archiver-utils/glob/jackspeak/@isaacs/cliui": ["@isaacs/cliui@8.0.2", "", { "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", "strip-ansi": "^7.0.1", "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", "wrap-ansi": "^8.1.0", "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" } }, "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="],
 
     "archiver-utils/glob/minimatch/brace-expansion": ["brace-expansion@2.1.4", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg=="],

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-EtUp4pHl9TyPtRrLGvk/X7kd2LuIxNxCpUwF5aLtzN4=",
-    "aarch64-linux": "sha256-m0j/pMZCguclR3/T9JmzCfi11YzmIvBFyR2bVhIO37Y=",
-    "aarch64-darwin": "sha256-nqefk68ZTUfNU15q1WkXaGsFzPNwOjCtMHpp6WrpNqM=",
-    "x86_64-darwin": "sha256-syD7hX62E4yCDV/wux1QKw4q/zZr24f99Y2mmzMJo6o="
+    "x86_64-linux": "sha256-Fmwqp/fjTMX7gQW01Zgta51reLHp1S53GSQgBcJePrY=",
+    "aarch64-linux": "sha256-KLI6OIbvycMePKxt66nNKeILYJSEkufOIaSawZ/gotc=",
+    "aarch64-darwin": "sha256-go1wmrsHfYfJ3ukUIR/fveobyVba4E9G/rdsB/J2cQQ=",
+    "x86_64-darwin": "sha256-UnVYMijlG12k4RLFkTwf4Or0yXqFSwe1Ji6QCGufjzg="
   }
 }

packages/ai/README.md

@@ -214,40 +214,22 @@ the requests sent by code under test:
 import { Effect } from "effect"
 import { TestLLM } from "@opencode-ai/ai/testing"
 
+const testLLM = TestLLM.layer({
+  fallback: TestLLM.text("Hello from the test model", "text-1"),
+})
+
+// TestLLM.clientLayer provides LLMClient.Service and consumes TestLLM.Service.
 const programWithTestClient = Effect.gen(function* () {
-  const test = yield* TestLLM.Test
-  yield* test.push(TestLLM.text("Hello from the test model", "text-1"))
   const result = yield* program
-  console.log(yield* test.requests())
+  const test = yield* TestLLM.Service
+  console.log(test.requests)
   return result
-}).pipe(Effect.provide(TestLLM.testLayer()))
+}).pipe(Effect.provide(TestLLM.clientLayer), Effect.provide(testLLM))
 ```
 
-`testLayer()` provides the same object under `LLMClient.Service` and `TestLLM.Test`. Production consumes the
-normal client; tests use the additional controls. Each layer build has fresh state.
-
-- `test.push(...)` queues one-shot responses in execution order. Each argument is one response.
-- `test.always(response)` installs a repeatable fallback. The layer's `fallback` option sets its initial value.
-- `test.serve(request => response)` installs a request-dependent fallback. `always` and `serve` replace each
-  other without changing queued replies; queued replies take precedence.
-- `test.requests()` returns an array snapshot. `transformRequest` changes only the recorded observation;
-  `serve` receives the original canonical request.
-- `test.wait(count)` waits for request arrivals, not output or completion, and supports concurrent waiters.
-- `test.gate()` returns a scoped gate with countable `started` notifications and a `release` Effect. Release
-  unblocks all requests captured by that gate; closing its scope also releases it. Effect-aware test runners
-  already provide Scope.
-
-Constructing `stream()` or `generate()` does not record a request, invoke a responder, or consume a script.
-Each execution does. An exhausted queue without a fallback defects immediately rather than waiting for a
-future reply.
-
-Responses remain canonical event arrays or arbitrary `Stream<LLMEvent, AIError>` values. The client consumes
-supplied streams directly, preserving failure identity, finalizers, incomplete output, and post-finish tails;
-it does not repair or truncate them.
-
-The published legacy `Service`, `layer`, `clientLayer`, and module-level controls remain available as adapters
-over the same implementation, including the legacy live `requests` array. New tests should use `Test` and
-`testLayer`.
+`TestLLM.push(...)` scripts one-shot responses, `TestLLM.always(...)` changes the fallback, and
+`TestLLM.wait(...)` lets concurrent tests wait until a request has arrived. Every received canonical request is
+available on the yielded `TestLLM.Service`.
 
 ## Caching
 

packages/ai/src/protocols/bedrock-converse.ts

@@ -496,7 +496,6 @@ const mapUsage = (usage: BedrockUsageSchema | undefined, providerMetadataKey: st
 interface ParserState {
   readonly providerMetadataKey: string
   readonly tools: ToolStream.State<number>
-  readonly finishedTools: ReadonlySet<number>
   // Bedrock splits the finish into `messageStop` (carries `stopReason`) and
   // `metadata` (carries usage). Hold the terminal event in state so `onHalt`
   // can emit exactly one finish after both chunks have had a chance to arrive.
@@ -575,7 +574,6 @@ const step = (state: ParserState, event: BedrockEvent) =>
 
     if (event.contentBlockDelta?.delta?.toolUse) {
       const index = event.contentBlockDelta.contentBlockIndex
-      if (state.finishedTools.has(index)) return [state, []] as const
       const result = ToolStream.appendExisting(
         ADAPTER,
         state.tools,
@@ -614,7 +612,6 @@ const step = (state: ParserState, event: BedrockEvent) =>
             state.hasToolCalls,
           lifecycle,
           tools: result.tools,
-          finishedTools: resultEvents.length > 0 ? new Set([...state.finishedTools, index]) : state.finishedTools,
           reasoningSignatures: Object.fromEntries(
             Object.entries(state.reasoningSignatures).filter(([key]) => key !== String(index)),
           ),
@@ -706,7 +703,6 @@ export const protocol = Protocol.make({
     initial: (request) => ({
       providerMetadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider),
       tools: ToolStream.empty<number>(),
-      finishedTools: new Set<number>(),
       pendingFinish: undefined,
       hasToolCalls: false,
       lifecycle: Lifecycle.initial(),

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

@@ -391,19 +391,17 @@ export interface ParserState {
   readonly name: string
   readonly providerMetadataKey: string
   readonly tools: ToolStream.State<string>
-  // Call ids stay independent of item ids, which may be omitted or reused.
-  readonly completedTools: ReadonlySet<string>
   readonly hasFunctionCall: boolean
   readonly lifecycle: Lifecycle.State
   readonly outputItems: Readonly<Record<number, string>>
-  readonly message: { readonly id: string; readonly phase: MessagePhase | null | undefined } | undefined
+  readonly messageItems: ReadonlySet<string>
+  readonly messagePhases: Readonly<Record<string, MessagePhase | null>>
   readonly reasoningItems: Readonly<Record<string, ReasoningStreamItem>>
 }
 
 type ReasoningSummaryStatus = "active" | "can-conclude" | "concluded"
 
 interface ReasoningStreamItem {
-  readonly open: boolean
   readonly encryptedContent: string | null | undefined
   // Keyed by the wire protocol's numeric `summary_index`. JS object keys coerce to
   // strings, but typing the map as `Record<number, ...>` documents intent
@@ -828,16 +826,16 @@ const TERMINAL_TYPES = new Set(["error", "response.completed", "response.incompl
 export const terminal = (event: Event) => TERMINAL_TYPES.has(event.type)
 
 const onOutputTextDelta = (state: ParserState, event: Event, id: string): StepResult => {
-  if (!event.delta || state.message?.id !== id) return [state, NO_EVENTS]
+  if (!event.delta || !state.messageItems.has(id)) return [state, NO_EVENTS]
   const events: LLMEvent[] = []
-  const phase = state.message.phase
+  const phase = state.messagePhases[id]
   const metadata = providerMetadata(state, { itemId: id, ...(phase === undefined ? {} : { phase }) })
   const lifecycle = Lifecycle.textStart(state.lifecycle, events, id, metadata)
   return [{ ...state, lifecycle: Lifecycle.textDelta(lifecycle, events, id, event.delta) }, events]
 }
 
 const onOutputTextDone = (state: ParserState, event: Event, id: string): StepResult => {
-  if (state.message?.id === id) {
+  if (state.messageItems.has(id)) {
     if (state.lifecycle.text.has(id) || event.text === undefined) return [state, NO_EVENTS]
     return onOutputTextDelta(state, { ...event, delta: event.text }, id)
   }
@@ -848,62 +846,18 @@ const onOutputTextDone = (state: ParserState, event: Event, id: string): StepRes
 export const outputItemID = (state: ParserState, event: Event) =>
   event.output_index === undefined ? event.item_id : (state.outputItems[event.output_index] ?? event.item_id)
 
-const startReasoningSummaryPart = (state: ParserState, itemID: string, index: number): StepResult => {
+export const onReasoningDelta = (state: ParserState, event: Event, itemID: string): StepResult => {
   const item = state.reasoningItems[itemID]
-  if (!item?.open || index === 0 || item.summaryParts[index] !== undefined) return [state, NO_EVENTS]
-
+  if (!event.delta || !item) return [state, NO_EVENTS]
+  const index = event.summary_index ?? 0
   const events: LLMEvent[] = []
-  const lifecycle = Object.entries(item.summaryParts)
-    .filter((entry) => entry[1] !== "concluded")
-    .reduce(
-      (lifecycle, entry) =>
-        Lifecycle.reasoningEnd(lifecycle, events, `${itemID}:${entry[0]}`, providerMetadata(state, { itemId: itemID })),
-      state.lifecycle,
-    )
   return [
     {
       ...state,
-      lifecycle: Lifecycle.reasoningStart(
-        lifecycle,
-        events,
-        `${itemID}:${index}`,
-        providerMetadata(state, { itemId: itemID, reasoningEncryptedContent: item.encryptedContent ?? null }),
-      ),
+      lifecycle: Lifecycle.reasoningDelta(state.lifecycle, events, `${itemID}:${index}`, event.delta),
       reasoningItems: {
         ...state.reasoningItems,
-        [itemID]: {
-          ...item,
-          summaryParts: {
-            ...Object.fromEntries(
-              Object.entries(item.summaryParts).map((entry) =>
-                entry[1] === "concluded" ? entry : [entry[0], "concluded" as const],
-              ),
-            ),
-            [index]: "active",
-          },
-        },
-      },
-    },
-    events,
-  ]
-}
-
-export const onReasoningDelta = (state: ParserState, event: Event, itemID: string): StepResult => {
-  const item = state.reasoningItems[itemID]
-  if (!event.delta || !item?.open) return [state, NO_EVENTS]
-  const index = event.summary_index ?? 0
-  if (item.summaryParts[index] === "concluded") return [state, NO_EVENTS]
-  const [started, emitted] = startReasoningSummaryPart(state, itemID, index)
-  const current = started.reasoningItems[itemID]
-  if (!current) return [started, emitted]
-  const events: LLMEvent[] = [...emitted]
-  return [
-    {
-      ...started,
-      lifecycle: Lifecycle.reasoningDelta(started.lifecycle, events, `${itemID}:${index}`, event.delta),
-      reasoningItems: {
-        ...started.reasoningItems,
-        [itemID]: { ...current, deltaIndexes: new Set([...current.deltaIndexes, index]) },
+        [itemID]: { ...item, deltaIndexes: new Set([...item.deltaIndexes, index]) },
       },
     },
     events,
@@ -915,7 +869,7 @@ export const onReasoningDelta = (state: ParserState, event: Event, itemID: strin
 // as a single delta unless that summary index already streamed one.
 export const onReasoningDone = (state: ParserState, event: Event, itemID: string): StepResult => {
   const item = state.reasoningItems[itemID]
-  if (!item?.open || typeof event.text !== "string") return [state, NO_EVENTS]
+  if (!item || typeof event.text !== "string") return [state, NO_EVENTS]
   const index = event.summary_index ?? 0
   if (item.deltaIndexes.has(index)) return [state, NO_EVENTS]
   return onReasoningDelta(state, { ...event, delta: event.text }, itemID)
@@ -924,48 +878,32 @@ export const onReasoningDone = (state: ParserState, event: Event, itemID: string
 const reasoningMetadata = (state: ParserState, item: StreamItem & { id: string }) =>
   providerMetadata(state, { itemId: item.id, reasoningEncryptedContent: item.encrypted_content ?? null })
 
-// Responses APIs normally stream reasoning items in this order:
+// Responses APIs stream reasoning items in a stable order:
 //   `output_item.added` (reasoning) →
 //     `reasoning_summary_part.added` (index=0) →
 //     `reasoning_summary_text.delta` →
 //     `reasoning_summary_part.done` (index=0) →
 //     (repeat for index>0) →
 //   `output_item.done` (reasoning).
-// `onOutputItemAdded` seeds the per-item entry, while each later part start is
-// also an implicit boundary for the previous part. This keeps the common event
-// lifecycle ordered when a compatible provider omits or delays a part-done event.
+// The handlers below rely on this ordering: `onOutputItemAdded` seeds the
+// per-item entry, `onReasoningSummaryPartAdded` for `summary_index === 0`
+// short-circuits when the entry already exists, and higher-index handlers
+// fold against the same entry. Behaviour for out-of-order events is
+// best-effort, not guaranteed.
 const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
   const item = event.item
   if (item?.type === "message" && item.id !== undefined) {
-    const itemID = item.id
     const phase = messagePhase(item.phase)
-    // A new message closes earlier messages, including ones that never streamed.
-    const events: LLMEvent[] = []
-    const lifecycle = [...state.lifecycle.text]
-      .filter((id) => id !== itemID)
-      .reduce((lifecycle, id) => {
-        const openPhase = state.message?.id === id ? state.message.phase : undefined
-        return Lifecycle.textEnd(
-          lifecycle,
-          events,
-          id,
-          providerMetadata(state, { itemId: id, ...(openPhase === undefined ? {} : { phase: openPhase }) }),
-        )
-      }, state.lifecycle)
     return [
       {
         ...state,
-        lifecycle,
-        message: {
-          id: itemID,
-          phase: phase === undefined && state.message?.id === itemID ? state.message.phase : phase,
-        },
+        messageItems: new Set([...state.messageItems, item.id]),
+        messagePhases: phase === undefined ? state.messagePhases : { ...state.messagePhases, [item.id]: phase },
       },
-      events,
+      NO_EVENTS,
     ]
   }
   if (item && isReasoningItem(item)) {
-    if (state.reasoningItems[item.id] !== undefined) return [state, NO_EVENTS]
     const events: LLMEvent[] = []
     return [
       {
@@ -974,7 +912,6 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
         reasoningItems: {
           ...state.reasoningItems,
           [item.id]: {
-            open: true,
             encryptedContent: item.encrypted_content,
             summaryParts: { 0: "active" },
             deltaIndexes: new Set(),
@@ -986,8 +923,6 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
   }
   if (item?.type !== "function_call" || !item.call_id) return [state, NO_EVENTS]
   const id = item.id ?? item.call_id
-  if (Object.values(state.tools).some((tool) => tool?.id === item.call_id) || state.completedTools.has(item.call_id))
-    return [state, NO_EVENTS]
   const metadata = item.id !== undefined ? providerMetadata(state, { itemId: item.id }) : undefined
   const events: LLMEvent[] = []
   const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
@@ -1008,14 +943,55 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
 
 const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResult => {
   if (event.item_id === undefined || event.summary_index === undefined) return [state, NO_EVENTS]
-  return startReasoningSummaryPart(state, event.item_id, event.summary_index)
+  const item = state.reasoningItems[event.item_id]
+  if (!item) return [state, NO_EVENTS]
+  if (event.summary_index === 0) return [state, NO_EVENTS]
+
+  const events: LLMEvent[] = []
+  const closed = Object.entries(item.summaryParts)
+    .filter((entry) => entry[1] === "can-conclude")
+    .reduce(
+      (lifecycle, entry) =>
+        Lifecycle.reasoningEnd(
+          lifecycle,
+          events,
+          `${event.item_id}:${entry[0]}`,
+          providerMetadata(state, { itemId: event.item_id }),
+        ),
+      state.lifecycle,
+    )
+  return [
+    {
+      ...state,
+      lifecycle: Lifecycle.reasoningStart(
+        closed,
+        events,
+        `${event.item_id}:${event.summary_index}`,
+        providerMetadata(state, { itemId: event.item_id, reasoningEncryptedContent: item.encryptedContent ?? null }),
+      ),
+      reasoningItems: {
+        ...state.reasoningItems,
+        [event.item_id]: {
+          ...item,
+          summaryParts: {
+            ...Object.fromEntries(
+              Object.entries(item.summaryParts).map((entry) =>
+                entry[1] === "can-conclude" ? [entry[0], "concluded" as const] : entry,
+              ),
+            ),
+            [event.summary_index]: "active",
+          },
+        },
+      },
+    },
+    events,
+  ]
 }
 
 const onReasoningSummaryPartDone = (state: ParserState, event: Event): StepResult => {
   if (event.item_id === undefined || event.summary_index === undefined) return [state, NO_EVENTS]
   const item = state.reasoningItems[event.item_id]
-  if (!item?.open) return [state, NO_EVENTS]
-  if (item.summaryParts[event.summary_index] !== "active") return [state, NO_EVENTS]
+  if (!item) return [state, NO_EVENTS]
   return [
     {
       ...state,
@@ -1071,8 +1047,11 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
 
   if (item.type === "message" && item.id !== undefined) {
     const itemPhase = messagePhase(item.phase)
-    const phase = itemPhase === undefined && state.message?.id === item.id ? state.message.phase : itemPhase
+    const phase = itemPhase === undefined ? state.messagePhases[item.id] : itemPhase
     const events: LLMEvent[] = []
+    const messageItems = new Set(state.messageItems)
+    messageItems.delete(item.id)
+    const { [item.id]: _phase, ...messagePhases } = state.messagePhases
     return [
       {
         ...state,
@@ -1082,7 +1061,8 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
           item.id,
           providerMetadata(state, { itemId: item.id, ...(phase === undefined ? {} : { phase }) }),
         ),
-        message: state.message?.id === item.id ? undefined : state.message,
+        messageItems,
+        messagePhases,
       },
       events,
     ] satisfies StepResult
@@ -1090,36 +1070,20 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
 
   if (item.type === "function_call") {
     if (!item.call_id || !item.name) return [state, NO_EVENTS] satisfies StepResult
-    const callID = item.call_id
-    if (state.completedTools.has(callID)) return [state, NO_EVENTS] satisfies StepResult
-    const metadata = item.id !== undefined ? providerMetadata(state, { itemId: item.id }) : undefined
-    const fallback = item.id ?? callID
-    // Match the pending tool by call id so item events that disagree on
-    // whether `item.id` is present still resolve the same call.
-    const registered =
-      state.tools[fallback] !== undefined
-        ? fallback
-        : Object.keys(state.tools).find((key) => state.tools[key]?.id === callID)
-    const id = registered ?? fallback
-    const tools =
-      registered !== undefined
-        ? state.tools
-        : ToolStream.start(state.tools, id, {
-            id: callID,
-            name: item.name,
-            providerMetadata: metadata,
-          })
+    const id = item.id ?? item.call_id
+    const tools = state.tools[id]
+      ? state.tools
+      : ToolStream.start(state.tools, id, {
+          id: item.call_id,
+          name: item.name,
+          providerMetadata: item.id !== undefined ? providerMetadata(state, { itemId: item.id }) : undefined,
+        })
     const result =
       item.arguments === undefined
         ? yield* ToolStream.finish(state.id, tools, id)
         : yield* ToolStream.finishWithInput(state.id, tools, id, item.arguments)
     const events: LLMEvent[] = []
-    const finished = result.events ?? []
-    // A done-only call never streamed a start event, so open its lifecycle here.
-    const resultEvents =
-      registered !== undefined || finished.length === 0
-        ? finished
-        : [LLMEvent.toolInputStart({ id: callID, name: item.name, providerMetadata: metadata }), ...finished]
+    const resultEvents = result.events ?? []
     const lifecycle = resultEvents.length ? Lifecycle.stepStart(state.lifecycle, events) : state.lifecycle
     events.push(...resultEvents)
     return [
@@ -1130,7 +1094,6 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
           resultEvents.some((event) => LLMEvent.is.toolCall(event) || LLMEvent.is.toolInputError(event)) ||
           state.hasFunctionCall,
         tools: result.tools,
-        completedTools: new Set([...state.completedTools, callID]),
       },
       events,
     ] satisfies StepResult
@@ -1141,49 +1104,20 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
     const metadata = reasoningMetadata(state, item)
     const reasoningItem = state.reasoningItems[item.id]
     if (reasoningItem) {
-      if (!reasoningItem.open) return [state, NO_EVENTS] satisfies StepResult
       const lifecycle = Object.entries(reasoningItem.summaryParts)
         .filter((entry) => entry[1] === "active" || entry[1] === "can-conclude")
         .reduce(
           (lifecycle, entry) => Lifecycle.reasoningEnd(lifecycle, events, `${item.id}:${entry[0]}`, metadata),
           state.lifecycle,
         )
-      return [
-        {
-          ...state,
-          lifecycle,
-          reasoningItems: {
-            ...state.reasoningItems,
-            [item.id]: {
-              ...reasoningItem,
-              open: false,
-              encryptedContent: item.encrypted_content ?? reasoningItem.encryptedContent,
-            },
-          },
-        },
-        events,
-      ] satisfies StepResult
+      const { [item.id]: _removed, ...reasoningItems } = state.reasoningItems
+      return [{ ...state, lifecycle, reasoningItems }, events] satisfies StepResult
     }
     if (!state.lifecycle.reasoning.has(item.id)) {
       const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
       events.push(LLMEvent.reasoningStart({ id: item.id, providerMetadata: metadata }))
       events.push(LLMEvent.reasoningEnd({ id: item.id, providerMetadata: metadata }))
-      return [
-        {
-          ...state,
-          lifecycle,
-          reasoningItems: {
-            ...state.reasoningItems,
-            [item.id]: {
-              open: false,
-              encryptedContent: item.encrypted_content,
-              summaryParts: { 0: "concluded" },
-              deltaIndexes: new Set(),
-            },
-          },
-        },
-        events,
-      ] satisfies StepResult
+      return [{ ...state, lifecycle }, events] satisfies StepResult
     }
     return [
       { ...state, lifecycle: Lifecycle.reasoningEnd(state.lifecycle, events, item.id, metadata) },
@@ -1205,7 +1139,7 @@ const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (
             if (
               id === undefined ||
               ((item.type !== "function_call" || !current.tools[id]) &&
-                (item.type !== "reasoning" || !current.reasoningItems[id]?.open))
+                (item.type !== "reasoning" || !current.reasoningItems[id]))
             )
               return Effect.succeed([current, events] satisfies StepResult)
             return onOutputItemDone(current, { type: "response.output_item.done", item }).pipe(
@@ -1322,13 +1256,6 @@ export const step = (state: ParserState, input: Event) => {
   if (event.type === "response.output_item.added") {
     if (event.item?.type === "message" && event.item.id === undefined)
       return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
-    if (
-      event.item &&
-      isReasoningItem(event.item) &&
-      state.reasoningItems[event.item.id] === undefined &&
-      state.lifecycle.reasoning.size > 0
-    )
-      return ProviderShared.eventError(state.id, `${event.type} started reasoning before the previous item ended`)
     const id = event.item?.id ?? (event.item?.type === "function_call" ? event.item.call_id : undefined)
     return Effect.succeed(
       onOutputItemAdded(
@@ -1378,10 +1305,10 @@ export const initial = (request: LLMRequest, extension: Extension = BASE): Parse
   providerMetadataKey: request.model.route.providerMetadataKey ?? "openresponses",
   hasFunctionCall: false,
   tools: ToolStream.empty<string>(),
-  completedTools: new Set<string>(),
   lifecycle: Lifecycle.initial(),
   outputItems: {},
-  message: undefined,
+  messageItems: new Set<string>(),
+  messagePhases: {},
   reasoningItems: {},
 })
 

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

@@ -3,7 +3,6 @@ import { Tool } from "@opencode-ai/schema/tool"
 import { Route } from "../route/client.js"
 import { Auth } from "../route/auth.js"
 import { Endpoint } from "../route/endpoint.js"
-import { Framing } from "../route/framing.js"
 import { HttpTransport } from "../route/transport/index.js"
 import { Protocol } from "../route/protocol.js"
 import {
@@ -246,8 +245,6 @@ export const OpenAIChatEvent = Schema.StructWithRest(
   [Schema.Record(Schema.String, Schema.Unknown)],
 )
 export type OpenAIChatEvent = Schema.Schema.Type<typeof OpenAIChatEvent>
-const DONE = "[DONE]" as const
-const OpenAIChatStreamEvent = Schema.Union([Schema.Literal(DONE), Protocol.jsonEvent(OpenAIChatEvent)])
 type OpenAIChatRequestMessage = LLMRequest["messages"][number]
 
 interface PendingToolDelta {
@@ -1000,12 +997,33 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
       lifecycle = Lifecycle.reasoningStart(lifecycle, events, "reasoning-0", deltaMetadata)
     const reasoningEmitted = state.reasoningEmitted || lifecycle.reasoning.has("reasoning-0")
 
-    // Reasoning is one response-wide channel: it stays open alongside text and
-    // refusal output so late reasoning deltas and details join the same block,
-    // and `finishEvents` closes it once with the complete metadata.
-    if (delta?.content) lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", delta.content)
+    if (delta?.content) {
+      lifecycle = Lifecycle.reasoningEnd(
+        lifecycle,
+        events,
+        "reasoning-0",
+        reasoningMetadata(
+          state.providerMetadataKey,
+          reasoningField,
+          reasoningDetailsObserved ? state.reasoningDetails : undefined,
+        ),
+      )
+      lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", delta.content)
+    }
 
-    if (delta?.refusal) lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", delta.refusal)
+    if (delta?.refusal) {
+      lifecycle = Lifecycle.reasoningEnd(
+        lifecycle,
+        events,
+        "reasoning-0",
+        reasoningMetadata(
+          state.providerMetadataKey,
+          reasoningField,
+          reasoningDetailsObserved ? state.reasoningDetails : undefined,
+        ),
+      )
+      lifecycle = Lifecycle.textDelta(lifecycle, events, "text-0", delta.refusal)
+    }
 
     // Compatible providers may omit indexes. Prefer durable identity, then use
     // batch position for parallel deltas or the latest call for sparse chunks.
@@ -1111,12 +1129,10 @@ const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: Pars
           state.finishReason.normalized === "stop" && hasToolCalls ? "tool-calls" : state.finishReason.normalized,
       }
     : { normalized: hasToolCalls ? ("tool-calls" as const) : ("stop" as const) }
-  // Snapshot details at publish time so the emitted event never observes later
-  // mutation of the accumulated `reasoningDetails` array.
   const metadata = reasoningMetadata(
     state.providerMetadataKey,
     state.reasoningField,
-    state.reasoningDetailsObserved ? [...state.reasoningDetails] : undefined,
+    state.reasoningDetailsObserved ? state.reasoningDetails : undefined,
   )
   const started =
     state.reasoningDetailsObserved && !state.reasoningEmitted
@@ -1150,7 +1166,7 @@ export const protocol = Protocol.make({
     from: fromRequest,
   },
   stream: {
-    event: OpenAIChatStreamEvent,
+    event: Protocol.jsonEvent(OpenAIChatEvent),
     initial: (request) => ({
       providerMetadataKey: request.model.route.providerMetadataKey ?? String(request.model.provider),
       tools: ToolStream.empty<number>(),
@@ -1164,14 +1180,12 @@ export const protocol = Protocol.make({
       nextToolIndex: 0,
       requireFinishReason: request.model.compatibility?.requireFinishReason ?? true,
     }),
-    step: (state: ParserState, event) => (event === DONE ? Effect.succeed([state, []] as const) : step(state, event)),
-    terminal: (event) => event === DONE,
+    step,
     onHalt: finishEvents,
   },
 })
 
-export const framing = Framing.sseWithDone
-export const httpTransport = HttpTransport.sseJson.with<OpenAIChatBody>().with({ framing })
+export const httpTransport = HttpTransport.sseJson.with<OpenAIChatBody>()
 
 export const route = Route.make({
   id: ADAPTER,

packages/ai/src/protocols/openai-compatible-chat.ts

@@ -1,5 +1,6 @@
 import { Route, type RouteRoutedLanguageModelInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
+import { Framing } from "../route/framing.js"
 import * as OpenAIChat from "./openai-chat.js"
 
 const ADAPTER = "openai-compatible-chat"
@@ -18,7 +19,7 @@ export const route = Route.make({
   providerMetadataKey: "openai",
   protocol: OpenAIChat.protocol,
   endpoint: Endpoint.path("/chat/completions"),
-  framing: OpenAIChat.framing,
+  framing: Framing.sse,
 })
 
 export * as OpenAICompatibleChat from "./openai-compatible-chat.js"

packages/ai/src/protocols/shared.ts

@@ -207,16 +207,15 @@ export const errorText = (error: unknown) => {
 
 /**
  * `framing` step for Server-Sent Events. Decodes UTF-8, runs the SSE channel
- * decoder, optionally filters named events, and drops empty events. `[DONE]`
- * is dropped by default or retained for protocols that use it as their stream
- * boundary. Retry control events are ignored without interrupting the stream.
+ * decoder, optionally filters named events, and drops empty / `[DONE]`
+ * keep-alive events so the protocol event schema sees one JSON string per
+ * element. Retry control events are ignored without interrupting the stream.
  * Decoder failures become provider output errors so the public error channel
  * stays `AIError`.
  */
 export const sseFraming = (
   bytes: Stream.Stream<Uint8Array, AIError>,
   events?: ReadonlySet<string>,
-  includeDone = false,
 ): Stream.Stream<string, AIError> =>
   bytes.pipe(
     Stream.decodeText(),
@@ -241,7 +240,7 @@ export const sseFraming = (
       (event) =>
         (events === undefined || events.has(event.event)) &&
         event.data.length > 0 &&
-        (event.data !== "[DONE]" || includeDone || (events !== undefined && event.event !== "message")),
+        (event.data !== "[DONE]" || (events !== undefined && event.event !== "message")),
     ),
     Stream.map((event) => event.data),
   )

packages/ai/src/protocols/utils/lifecycle.ts

@@ -62,31 +62,22 @@ export const reasoningEnd = (
   events: LLMEvent[],
   id: string,
   providerMetadata?: ProviderMetadata,
-  /** Authoritative complete value; replaces accumulated deltas when present. */
-  text?: string,
 ): State => {
   if (!state.reasoning.has(id)) return state
   const stepped = stepStart(state, events)
-  events.push(LLMEvent.reasoningEnd({ id, text, providerMetadata }))
+  events.push(LLMEvent.reasoningEnd({ id, providerMetadata }))
   const reasoning = new Set(stepped.reasoning)
   reasoning.delete(id)
   return { ...stepped, reasoning }
 }
 
-export const textEnd = (
-  state: State,
-  events: LLMEvent[],
-  id: string,
-  providerMetadata?: ProviderMetadata,
-  /** Authoritative complete value; replaces accumulated deltas when present. */
-  text?: string,
-): State => {
+export const textEnd = (state: State, events: LLMEvent[], id: string, providerMetadata?: ProviderMetadata): State => {
   if (!state.text.has(id)) return state
   const stepped = stepStart(state, events)
-  events.push(LLMEvent.textEnd({ id, text, providerMetadata }))
-  const open = new Set(stepped.text)
-  open.delete(id)
-  return { ...stepped, text: open }
+  events.push(LLMEvent.textEnd({ id, providerMetadata }))
+  const text = new Set(stepped.text)
+  text.delete(id)
+  return { ...stepped, text }
 }
 
 const closeOpenBlocks = (state: State, events: LLMEvent[]): State => {

packages/ai/src/provider-error.ts

@@ -37,7 +37,6 @@ const patterns = [
   /too large for model with \d+ maximum context length/i,
   /prompt has [\d,]+ tokens?, but the configured context size is [\d,]+ tokens?/i,
   /model_context_window_exceeded/i,
-  /range of input length should be/i,
   /too many tokens/i,
   /token limit exceeded/i,
   /request_too_large/i,
@@ -60,7 +59,6 @@ export const isContextOverflowFailure = (failure: unknown) =>
 
 const decodeJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown))
 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",
   "internal_error",
@@ -76,6 +74,7 @@ const INVALID_REQUEST_CODES = new Set(["invalid_prompt", "invalid_request_error"
 const RATE_LIMIT_TEXT = /rate increased too quickly|rate[-_\s]?limit|too[_\s]?many[_\s]?requests/i
 const QUOTA_TEXT = /insufficient[-_\s]?quota|quota[-_\s]?exceeded/i
 const CONTENT_POLICY_TEXT = /content[-_\s]?policy|content_filter|safety/i
+const NETWORK_ERROR_TEXT = /network[-_\s]error/i
 
 export interface ProviderFailure {
   readonly message: string
@@ -91,12 +90,8 @@ export interface ProviderFailure {
   readonly rateLimit?: HttpRateLimitDetails | undefined
 }
 
-// Classification records affirmative evidence about a failure. Deterministic
-// failures need positive identification (a 4xx status, quota/auth/policy
-// signals); anything unrecognized stays UnknownProvider, which the session
-// retry policy treats as retry-eligible because transient failures arrive in
-// unpredictable shapes while deterministic rejections almost always carry a
-// status or known code.
+// Keep HTTP failures and provider-reported stream failures on one typed path so
+// session retry policy never needs provider-specific string matching.
 export function classifyProviderFailure(input: ProviderFailure): AIError["reason"] {
   const details = { message: input.message, body: input.rawBody, http: input.http, cause: input.cause }
   const body = input.rawBody ?? ""
@@ -121,33 +116,46 @@ export function classifyProviderFailure(input: ProviderFailure): AIError["reason
   if (CONTENT_POLICY_TEXT.test(text)) return new ContentPolicyError(details)
   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)
+  if (input.status === 401) return new AuthenticationError({ ...details, kind: "invalid" })
+  if (input.status === 403) return new AuthenticationError({ ...details, kind: "insufficient-permissions" })
+  if (codes.includes("authentication_error")) return new AuthenticationError({ ...details, kind: "invalid" })
+  if (codes.includes("permission_error"))
+    return new AuthenticationError({ ...details, kind: "insufficient-permissions" })
   if (
-    input.status === 429 ||
-    codes.some(
-      (code) => code.includes("rate_limit") || code === "too_many_requests" || code === "throttlingexception",
-    ) ||
-    RATE_LIMIT_TEXT.test(text)
+    codes.some((code) => code.includes("rate_limit") || code === "too_many_requests" || code === "throttlingexception")
   )
     return new RateLimitError({
       ...details,
       retryAfterMs: input.retryAfterMs,
       rateLimit: input.rateLimit,
     })
-  if (
-    input.status === 408 ||
-    input.status === 409 ||
-    (input.status !== undefined && input.status >= 500) ||
-    codes.some((code) => SERVER_CODES.has(code) || code.includes("exhausted") || code.includes("unavailable"))
-  )
+  if (RATE_LIMIT_TEXT.test(text))
+    return new RateLimitError({
+      ...details,
+      retryAfterMs: input.retryAfterMs,
+      rateLimit: input.rateLimit,
+    })
+  if (NETWORK_ERROR_TEXT.test(text)) return new ProviderInternalError(details)
+  if (codes.some((code) => SERVER_CODES.has(code) || code.includes("exhausted") || code.includes("unavailable")))
+    return new ProviderInternalError({
+      ...details,
+      retryAfterMs: input.retryAfterMs,
+    })
+  if (input.status === 429) {
+    return new RateLimitError({
+      ...details,
+      retryAfterMs: input.retryAfterMs,
+      rateLimit: input.rateLimit,
+    })
+  }
+  if (input.status === 408 || input.status === 409 || (input.status !== undefined && input.status >= 500))
     return new ProviderInternalError({
       ...details,
       retryAfterMs: input.retryAfterMs,
     })
   if (codes.some((code) => INVALID_REQUEST_CODES.has(code))) return new InvalidRequestError(details)
-  // Any remaining 4xx is a deterministic rejection of this request.
-  if (input.status !== undefined && input.status >= 400 && input.status < 500) return new InvalidRequestError(details)
+  if (input.status === 400 || input.status === 404 || input.status === 413 || input.status === 422)
+    return new InvalidRequestError(details)
   return new UnknownProviderError(details)
 }
 

packages/ai/src/providers/groq.ts

@@ -5,6 +5,7 @@ import { ProviderShared } from "../protocols/shared.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
+import { Framing } from "../route/framing.js"
 import { Protocol } from "../route/protocol.js"
 import { ProviderID, type ModelID, type LLMRequest } from "../schema/index.js"
 import { profiles } from "./openai-compatible-profile.js"
@@ -74,7 +75,7 @@ export const route = Route.make({
   providerMetadataKey: "openai",
   protocol,
   endpoint: Endpoint.path("/chat/completions", { baseURL: profiles.groq.baseURL }),
-  framing: OpenAIChat.framing,
+  framing: Framing.sse,
 })
 
 export const configure = (input: LanguageModelOptions = {}) => {

packages/ai/src/providers/openrouter.ts

@@ -1,6 +1,7 @@
 import { Effect, Schema } from "effect"
 import { Route, type RouteDefaultsInput } from "../route/client.js"
 import { Endpoint } from "../route/endpoint.js"
+import { Framing } from "../route/framing.js"
 import { Protocol } from "../route/protocol.js"
 import { AuthOptions, type ProviderAuthOption } from "../route/auth-options.js"
 import { ProviderID, type CacheHint, type ModelID } from "../schema/index.js"
@@ -166,7 +167,7 @@ export const route = Route.make({
   providerMetadataKey: "openrouter",
   protocol,
   endpoint: Endpoint.path("/chat/completions", { baseURL: profile.baseURL }),
-  framing: OpenAIChat.framing,
+  framing: Framing.sse,
 })
 
 export const routes = [route]

packages/ai/src/route/auth.ts

@@ -139,7 +139,7 @@ const toAIError = (error: AuthError): AIError => {
     return new AIError({
       reason:
         error instanceof MissingCredentialError
-          ? new AuthenticationError({ message: error.message, cause: error })
+          ? new AuthenticationError({ message: error.message, cause: error, kind: "missing" })
           : new InvalidRequestError({ message: `Failed to resolve auth config: ${error.message}`, cause: error }),
     })
   }

packages/ai/src/route/framing.ts

@@ -8,8 +8,8 @@ import type { AIError } from "../schema/index.js"
  * `Framing` is the byte-stream-shaped seam between transport and protocol:
  *
  * - SSE (`Framing.sse`) — UTF-8 decode the body, run the SSE channel decoder,
- *   and emit the `data:` payload of each non-empty event. The default drops
- *   `[DONE]`; protocols that use it as a terminal select `sseWithDone`.
+ *   drop empty / `[DONE]` keep-alives. Each emitted frame is the JSON `data:`
+ *   payload of one event.
  * - AWS event stream — length-prefixed binary frames with CRC checksums.
  *   Each emitted frame is one parsed binary event record.
  *
@@ -26,12 +26,6 @@ export interface Definition<Frame> {
 /** Server-Sent Events framing. Used by every JSON-streaming HTTP provider. */
 export const sse: Definition<string> = { id: "sse", frame: ProviderShared.sseFraming }
 
-/** Server-Sent Events framing that retains the conventional `[DONE]` sentinel. */
-export const sseWithDone: Definition<string> = {
-  id: "sse",
-  frame: (bytes) => ProviderShared.sseFraming(bytes, undefined, true),
-}
-
 /** SSE framing restricted to protocol-recognized event names. */
 export const sseEvents = (events: ReadonlySet<string>): Definition<string> => ({
   id: "sse",

packages/ai/src/schema/errors.ts

@@ -44,7 +44,10 @@ export class NoRouteError extends Schema.TaggedError<NoRouteError>("AI.Error.NoR
 
 export class AuthenticationError extends Schema.TaggedError<AuthenticationError>("AI.Error.Authentication")(
   "Authentication",
-  ReasonFields,
+  {
+    ...ReasonFields,
+    kind: Schema.Literals(["missing", "invalid", "expired", "insufficient-permissions", "unknown"]),
+  },
 ) {}
 
 export class RateLimitError extends Schema.TaggedError<RateLimitError>("AI.Error.RateLimit")("RateLimit", {

packages/ai/src/schema/events.ts

@@ -112,8 +112,6 @@ export type TextDelta = Schema.Schema.Type<typeof TextDelta>
 export const TextEnd = Schema.Struct({
   type: Schema.tag("text-end"),
   id: ContentBlockID,
-  /** Authoritative complete value; replaces accumulated deltas when present. */
-  text: Schema.optional(Schema.String),
   providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.TextEnd" })
 export type TextEnd = Schema.Schema.Type<typeof TextEnd>
@@ -136,8 +134,6 @@ export type ReasoningDelta = Schema.Schema.Type<typeof ReasoningDelta>
 export const ReasoningEnd = Schema.Struct({
   type: Schema.tag("reasoning-end"),
   id: ContentBlockID,
-  /** Authoritative complete value; replaces accumulated deltas when present. */
-  text: Schema.optional(Schema.String),
   providerMetadata: Schema.optional(ProviderMetadata),
 }).annotate({ identifier: "LLM.Event.ReasoningEnd" })
 export type ReasoningEnd = Schema.Schema.Type<typeof ReasoningEnd>
@@ -332,32 +328,17 @@ export const LLMEvent = Object.assign(llmEventTagged, {
 })
 export type LLMEvent = Schema.Schema.Type<typeof llmEventTagged>
 
-/** Joins deltas per fragment, letting an authoritative end value replace that fragment's accumulated deltas. */
-const joinFragments = <Delta extends { id: string; text: string }, End extends { id: string; text?: string }>(
-  events: ReadonlyArray<LLMEvent>,
-  isDelta: (event: LLMEvent) => event is Extract<LLMEvent, Delta>,
-  isEnd: (event: LLMEvent) => event is Extract<LLMEvent, End>,
-) => {
-  const order: string[] = []
-  const parts = new Map<string, string>()
-  for (const event of events) {
-    if (isDelta(event)) {
-      if (!parts.has(event.id)) order.push(event.id)
-      parts.set(event.id, (parts.get(event.id) ?? "") + event.text)
-    }
-    if (isEnd(event) && event.text !== undefined) {
-      if (!parts.has(event.id)) order.push(event.id)
-      parts.set(event.id, event.text)
-    }
-  }
-  return order.map((id) => parts.get(id)).join("")
-}
-
 const responseText = (events: ReadonlyArray<LLMEvent>) =>
-  joinFragments(events, LLMEvent.is.textDelta, LLMEvent.is.textEnd)
+  events
+    .filter(LLMEvent.is.textDelta)
+    .map((event) => event.text)
+    .join("")
 
 const responseReasoning = (events: ReadonlyArray<LLMEvent>) =>
-  joinFragments(events, LLMEvent.is.reasoningDelta, LLMEvent.is.reasoningEnd)
+  events
+    .filter(LLMEvent.is.reasoningDelta)
+    .map((event) => event.text)
+    .join("")
 
 const responseUsage = (events: ReadonlyArray<LLMEvent>) =>
   events.reduce<Usage | undefined>(
@@ -464,11 +445,10 @@ const reduceTextDelta = (state: ResponseState, event: TextDelta): ResponseState
 const reduceTextEnd = (state: ResponseState, event: TextEnd): ResponseState => {
   const current = state.textParts[event.id]
   if (!current) return state
-  const text = event.text ?? current.text
   const providerMetadata = event.providerMetadata ?? current.providerMetadata
   return {
-    ...replaceContent(state, current.contentIndex, textContent(text, providerMetadata)),
-    textParts: { ...state.textParts, [event.id]: { ...current, text, providerMetadata } },
+    ...replaceContent(state, current.contentIndex, textContent(current.text, providerMetadata)),
+    textParts: { ...state.textParts, [event.id]: { ...current, providerMetadata } },
   }
 }
 
@@ -498,11 +478,10 @@ const reduceReasoningDelta = (state: ResponseState, event: ReasoningDelta): Resp
 const reduceReasoningEnd = (state: ResponseState, event: ReasoningEnd): ResponseState => {
   const current = state.reasoningParts[event.id]
   if (!current) return state
-  const text = event.text ?? current.text
   const providerMetadata = event.providerMetadata ?? current.providerMetadata
   return {
-    ...replaceContent(state, current.contentIndex, reasoningContent(text, providerMetadata)),
-    reasoningParts: { ...state.reasoningParts, [event.id]: { ...current, text, providerMetadata } },
+    ...replaceContent(state, current.contentIndex, reasoningContent(current.text, providerMetadata)),
+    reasoningParts: { ...state.reasoningParts, [event.id]: { ...current, providerMetadata } },
   }
 }
 
@@ -600,12 +579,12 @@ export class LLMResponse extends Schema.Class<LLMResponse>("LLM.Response")({
   usage: Schema.optional(Usage),
   finishReason: FinishReasonDetails,
 }) {
-  /** Concatenated assistant text; each fragment's `text-end` value replaces its accumulated deltas when present. */
+  /** Concatenated assistant text assembled from streamed `text-delta` events. */
   get text() {
     return responseText(this.events)
   }
 
-  /** Concatenated reasoning text; each fragment's `reasoning-end` value replaces its accumulated deltas when present. */
+  /** Concatenated reasoning text assembled from streamed `reasoning-delta` events. */
   get reasoning() {
     return responseReasoning(this.events)
   }

packages/ai/src/testing.ts

@@ -1,6 +1,6 @@
 export * as TestLLM from "./testing.js"
 
-import { LLMClient } from "./route/client.js"
+import { LLMClient, type Interface as LLMClientShape } from "./route/client.js"
 import {
   LLMEvent,
   LLMResponse,
@@ -16,33 +16,13 @@ export type Response = readonly LLMEvent[] | Stream.Stream<LLMEvent, AIError>
 
 export type Gate = Readonly<{ started: Effect.Effect<void>; release: Effect.Effect<void> }>
 
-type ClientInterface = Context.Service.Shape<typeof LLMClient.Service>
-
-export type Responder = (request: LLMRequest) => Response
-
-export interface TestInterface extends ClientInterface {
-  /** Returns a snapshot of requests observed at execution time. */
-  readonly requests: () => Effect.Effect<readonly LLMRequest[]>
-  readonly push: (...responses: readonly Response[]) => Effect.Effect<void>
-  /** Replaces the fallback without changing queued responses. */
-  readonly always: (response: Response) => Effect.Effect<void>
-  /** Answers requests after the one-shot queue is exhausted; receives the original request. */
-  readonly serve: (responder: Responder) => Effect.Effect<void>
-  /** Waits for request arrivals, not output or completion. */
-  readonly wait: (count: number) => Effect.Effect<void>
-  readonly gate: () => Effect.Effect<Gate, never, Scope.Scope>
-}
-
-export class Test extends Context.Service<Test, TestInterface>()("@opencode/ai/TestLLM/Test") {}
-
-/** @deprecated Use TestInterface through Test and testLayer. */
 export interface Interface {
   readonly requests: LLMRequest[]
   readonly push: (...responses: readonly Response[]) => Effect.Effect<void>
   readonly always: (response: Response) => Effect.Effect<void>
   readonly wait: (count: number) => Effect.Effect<void>
   readonly gate: Effect.Effect<Gate, never, Scope.Scope>
-  readonly client: ClientInterface
+  readonly client: LLMClientShape
 }
 
 export interface LayerOptions {
@@ -51,7 +31,6 @@ export interface LayerOptions {
   readonly fallback?: Response
 }
 
-/** @deprecated Use Test and testLayer for normal client methods and test controls. */
 export class Service extends Context.Service<Service, Interface>()("@opencode/ai/TestLLM") {}
 
 export const complete = (
@@ -101,64 +80,59 @@ export const hangAfter = (...events: readonly LLMEvent[]) => Stream.concat(Strea
 
 const toStream = (response: Response) => (Stream.isStream(response) ? response : Stream.fromIterable(response))
 
-const make = (options: LayerOptions) =>
-  Effect.sync(() => {
-    const requests: LLMRequest[] = []
-    const responses: Response[] = []
-    let started = Deferred.makeUnsafe<void>()
-    let fallback: Response | Responder | undefined = options.fallback
-    let activeGate: { readonly started: Queue.Queue<void>; readonly release: Latch.Latch } | undefined
-    const wait = (count: number): Effect.Effect<void> =>
-      Effect.suspend(() =>
-        requests.length >= count ? Effect.void : Deferred.await(started).pipe(Effect.andThen(wait(count))),
-      )
+export const layer = (options: LayerOptions = {}) =>
+  Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const requests: LLMRequest[] = []
+      const responses: Response[] = []
+      let started = Deferred.makeUnsafe<void>()
+      let fallback = options.fallback
+      let activeGate: { readonly started: Queue.Queue<void>; readonly release: Latch.Latch } | undefined
+      const wait = (count: number): Effect.Effect<void> =>
+        Effect.suspend(() =>
+          requests.length >= count ? Effect.void : Deferred.await(started).pipe(Effect.andThen(wait(count))),
+        )
 
-    const stream: ClientInterface["stream"] = (request) =>
-      Stream.suspend(() => {
-        const count = requests.push(options.transformRequest?.(request) ?? request)
+      const stream = ((request: LLMRequest) => {
+        requests.push(options.transformRequest?.(request) ?? request)
         const waiting = started
         started = Deferred.makeUnsafe()
+        Deferred.doneUnsafe(waiting, Effect.void)
+        const response = responses.shift() ?? fallback
+        if (!response) return Stream.die(new Error(`TestLLM has no response for request ${requests.length}`))
+        const streamed = toStream(response)
         const gate = activeGate
-        try {
-          const response = responses.shift() ?? (typeof fallback === "function" ? fallback(request) : fallback)
-          if (!response) return Stream.die(new Error(`TestLLM has no response for request ${count}`))
-          const streamed = toStream(response)
-          if (!gate) return streamed
-          return Stream.unwrap(
-            Queue.offer(gate.started, undefined).pipe(Effect.andThen(gate.release.await), Effect.as(streamed)),
-          )
-        } finally {
-          // Waiters can resume synchronously; assign the reply and gate before notifying them.
-          Deferred.doneUnsafe(waiting, Effect.void)
-        }
+        if (!gate) return streamed
+        return Stream.unwrap(
+          Queue.offer(gate.started, undefined).pipe(Effect.andThen(gate.release.await), Effect.as(streamed)),
+        )
+      }) as LLMClientShape["stream"]
+      const client = LLMClient.Service.of({
+        stream,
+        generate: (request) =>
+          stream(request).pipe(
+            Stream.runFold(LLMResponse.empty, LLMResponse.reduce),
+            Effect.flatMap((state) => {
+              const response = LLMResponse.complete(state)
+              if (response) return Effect.succeed(response)
+              return Effect.die("TestLLM response ended without a terminal finish event")
+            }),
+          ),
       })
-    const test = Test.of({
-      stream,
-      generate: (request) =>
-        stream(request).pipe(
-          Stream.runFold(LLMResponse.empty, LLMResponse.reduce),
-          Effect.flatMap((state) => {
-            const response = LLMResponse.complete(state)
-            if (response) return Effect.succeed(response)
-            return Effect.die("TestLLM response ended without a terminal finish event")
+
+      return Service.of({
+        requests,
+        push: (...input) =>
+          Effect.sync(() => {
+            responses.push(...input)
           }),
-        ),
-      requests: () => Effect.sync(() => [...requests]),
-      push: (...input) =>
-        Effect.sync(() => {
-          responses.push(...input)
-        }),
-      always: (response) =>
-        Effect.sync(() => {
-          fallback = response
-        }),
-      serve: (responder) =>
-        Effect.sync(() => {
-          fallback = responder
-        }),
-      wait,
-      gate: () =>
-        Effect.gen(function* () {
+        always: (response) =>
+          Effect.sync(() => {
+            fallback = response
+          }),
+        wait,
+        gate: Effect.gen(function* () {
           const gate = {
             started: yield* Effect.acquireRelease(Queue.unbounded<void>(), Queue.shutdown),
             release: yield* Latch.make(),
@@ -173,36 +147,11 @@ const make = (options: LayerOptions) =>
             release,
           }
         }),
-    })
-
-    return { test, requests }
-  })
-
-/** Provides one shared implementation under the normal client and test-control tags. */
-export const testLayer = (options: LayerOptions = {}) =>
-  Layer.effectContext(
-    Effect.map(make(options), (implementation) =>
-      Context.make(LLMClient.Service, implementation.test).pipe(Context.add(Test, implementation.test)),
-    ),
+        client,
+      })
+    }),
   )
 
-/** @deprecated Use testLayer; retained for published callers of the legacy control interface. */
-export const layer = (options: LayerOptions = {}) =>
-  Layer.effect(
-    Service,
-    Effect.map(make(options), (implementation) =>
-      Service.of({
-        requests: implementation.requests,
-        push: implementation.test.push,
-        always: implementation.test.always,
-        wait: implementation.test.wait,
-        gate: implementation.test.gate(),
-        client: implementation.test,
-      }),
-    ),
-  )
-
-/** @deprecated testLayer provides LLMClient.Service directly. */
 export const clientLayer = Layer.effect(
   LLMClient.Service,
   Effect.map(Service, (service) => service.client),

packages/ai/test/executor.test.ts

@@ -574,7 +574,6 @@ describe("WebSocket channel execution", () => {
   const model = configure({ baseURL: "https://api.openai.test/v1/", apiKey: "test" }).responses("gpt-4.1-mini")
   const request = LLM.request({ model, prompt: "Say hello." })
   const frames = [
-    JSON.stringify({ type: "response.output_item.added", item: { type: "message", id: "msg_1" } }),
     JSON.stringify({ type: "response.output_text.delta", item_id: "msg_1", delta: "Hi" }),
     JSON.stringify({ type: "response.completed", response: { id: "resp_1" } }),
   ]

packages/ai/test/exports.test.ts

@@ -32,8 +32,6 @@ describe("public exports", () => {
     expect(Provider.make).toBeFunction()
     expect(ProviderSubpath.make).toBe(Provider.make)
     expect(TestLLM.layer).toBeFunction()
-    expect(TestLLM.testLayer).toBeFunction()
-    expect(TestLLM.Test.of).toBeFunction()
   })
 
   test("route barrel exposes route-authoring APIs", () => {

packages/ai/test/fixtures/recordings/anthropic-messages-cache/keeps-a-long-tool-turn-inside-the-cache-lookback.json

@@ -10,7 +10,7 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "anthropic-version": "2023-06-01",
           "content-type": "application/json"
@@ -29,7 +29,7 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "anthropic-version": "2023-06-01",
           "content-type": "application/json"

packages/ai/test/fixtures/recordings/anthropic-messages-cache/writes-then-reads-cache-control-on-identical-second-call.json

@@ -10,7 +10,7 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "anthropic-version": "2023-06-01",
           "content-type": "application/json"
@@ -29,7 +29,7 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "anthropic-version": "2023-06-01",
           "content-type": "application/json"

packages/ai/test/fixtures/recordings/anthropic-messages/anthropic-opus-4-7-image-tool-result.json

@@ -24,7 +24,7 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "anthropic-version": "2023-06-01",
           "content-type": "application/json"

packages/ai/test/fixtures/recordings/openrouter-reasoning-tool-loop.json

@@ -23,7 +23,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"anthropic/claude-sonnet-4.6\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"reasoning\":{\"max_tokens\":1024},\"max_completion_tokens\":1536,\"store\":false,\"usage\":{\"include\":true}}"
+        "body": "{\"model\":\"anthropic/claude-sonnet-4.6\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":1536,\"reasoning\":{\"max_tokens\":1024}}"
       },
       "response": {
         "status": 200,
@@ -41,7 +41,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"anthropic/claude-sonnet-4.6\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"},{\"role\":\"assistant\",\"content\":\"Sure! Let me check the weather in Paris for you right now!\",\"tool_calls\":[{\"id\":\"toolu_01PaChhcyw3yu2P2bDS2bgAA\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}}],\"reasoning\":\"The user wants to know the weather in Paris. I'll use the get_weather tool.\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"The user wants to know the weather in Paris. I'll use the get_weather tool.\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"signature\":\"ErkCCosBCA8YAipAjKnRKpxkZ4eHrMPJ63IWEOYPSzb+XSHyG+vLK+2ks2O9T4N9M37Xn2kausQSH1rfsrdmKxgUlBg6yUFRgMVR7DIRY2xhdWRlLXNvbm5ldC00LTY4AEIIdGhpbmtpbmdaJDRjMGYwNDZmLTI1ZmQtNDVmYi1iZmIzLWEwOGE4ZTI0OWNhNxIMNFb5O6pb4nX0HojdGgyL5h+CAIpsxpdM1QgiMGm/i3ST6F5mAhxB+Uez0Cm95ra9yvQkrzHaA/AmWoXpdmPlczSn1S1RDk2IqeA57Spbf7JT44jygtLQt6yZmGzoTBHn3VkwaNZsuuAtbdo4B5QJXooa/AoKKs54QZ2kfS640vsv5flQVCg7CoQCFuLKjIeLMO7MnxVyuskXJr1DgesTa7I0ScF53U9JGhgB\"}]},{\"role\":\"tool\",\"tool_call_id\":\"toolu_01PaChhcyw3yu2P2bDS2bgAA\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false},\"strict\":false}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"reasoning\":{\"max_tokens\":1024},\"max_completion_tokens\":1536,\"store\":false,\"usage\":{\"include\":true}}"
+        "body": "{\"model\":\"anthropic/claude-sonnet-4.6\",\"messages\":[{\"role\":\"system\",\"content\":\"Use the get_weather tool exactly once. After the tool result, reply exactly: Paris is sunny.\"},{\"role\":\"user\",\"content\":\"What is the weather in Paris?\"},{\"role\":\"assistant\",\"content\":\"Sure! Let me check the weather in Paris for you right now!\",\"tool_calls\":[{\"id\":\"toolu_01PaChhcyw3yu2P2bDS2bgAA\",\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"arguments\":\"{\\\"city\\\":\\\"Paris\\\"}\"}}],\"reasoning\":\"The user wants to know the weather in Paris. I'll use the get_weather tool.\",\"reasoning_details\":[{\"type\":\"reasoning.text\",\"text\":\"The user wants to know the weather in Paris. I'll use the get_weather tool.\",\"format\":\"anthropic-claude-v1\",\"index\":0,\"signature\":\"ErkCCosBCA8YAipAjKnRKpxkZ4eHrMPJ63IWEOYPSzb+XSHyG+vLK+2ks2O9T4N9M37Xn2kausQSH1rfsrdmKxgUlBg6yUFRgMVR7DIRY2xhdWRlLXNvbm5ldC00LTY4AEIIdGhpbmtpbmdaJDRjMGYwNDZmLTI1ZmQtNDVmYi1iZmIzLWEwOGE4ZTI0OWNhNxIMNFb5O6pb4nX0HojdGgyL5h+CAIpsxpdM1QgiMGm/i3ST6F5mAhxB+Uez0Cm95ra9yvQkrzHaA/AmWoXpdmPlczSn1S1RDk2IqeA57Spbf7JT44jygtLQt6yZmGzoTBHn3VkwaNZsuuAtbdo4B5QJXooa/AoKKs54QZ2kfS640vsv5flQVCg7CoQCFuLKjIeLMO7MnxVyuskXJr1DgesTa7I0ScF53U9JGhgB\"}]},{\"role\":\"tool\",\"tool_call_id\":\"toolu_01PaChhcyw3yu2P2bDS2bgAA\",\"content\":\"{\\\"temperature\\\":22,\\\"condition\\\":\\\"sunny\\\"}\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":1536,\"reasoning\":{\"max_tokens\":1024}}"
       },
       "response": {
         "status": 200,

packages/ai/test/fixtures/recordings/openrouter-reasoning.json

@@ -15,7 +15,7 @@
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"anthropic/claude-sonnet-4.6\",\"messages\":[{\"role\":\"system\",\"content\":\"Think through the arithmetic, then reply with only the final integer.\"},{\"role\":\"user\",\"content\":\"What is 173 multiplied by 219?\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"temperature\":0,\"reasoning\":{\"max_tokens\":1024},\"max_completion_tokens\":1536,\"store\":false,\"usage\":{\"include\":true}}"
+        "body": "{\"model\":\"anthropic/claude-sonnet-4.6\",\"messages\":[{\"role\":\"system\",\"content\":\"Think through the arithmetic, then reply with only the final integer.\"},{\"role\":\"user\",\"content\":\"What is 173 multiplied by 219?\"}],\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":1536,\"temperature\":0,\"reasoning\":{\"max_tokens\":1024}}"
       },
       "response": {
         "status": 200,

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

@@ -10,11 +10,11 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"claude-haiku-4-5-20251001\",\"system\":[{\"type\":\"text\",\"text\":\"Read the PDF returned by the tool and follow the user's response format exactly.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Return only the verification code from the PDF.\"}]},{\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"call_pdf_1\",\"name\":\"read_pdf\",\"input\":{}}]},{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"call_pdf_1\",\"content\":[{\"type\":\"text\",\"text\":\"PDF read successfully\"},{\"type\":\"document\",\"source\":{\"type\":\"base64\",\"media_type\":\"application/pdf\",\"data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"},\"title\":\"verification.pdf\"}]}]}],\"tools\":[{\"name\":\"read_pdf\",\"description\":\"Read the attached PDF.\",\"input_schema\":{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false}}],\"stream\":true,\"max_tokens\":40,\"temperature\":0}"
+        "body": "{\"model\":\"claude-haiku-4-5-20251001\",\"system\":[{\"type\":\"text\",\"text\":\"Read the PDF returned by the tool and follow the user's response format exactly.\"}],\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"text\",\"text\":\"Return only the verification code from the PDF.\"}]},{\"role\":\"assistant\",\"content\":[{\"type\":\"tool_use\",\"id\":\"call_pdf_1\",\"name\":\"read_pdf\",\"input\":{}}]},{\"role\":\"user\",\"content\":[{\"type\":\"tool_result\",\"tool_use_id\":\"call_pdf_1\",\"content\":[{\"type\":\"text\",\"text\":\"PDF read successfully\"},{\"type\":\"document\",\"source\":{\"type\":\"base64\",\"media_type\":\"application/pdf\",\"data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"}}]}]}],\"tools\":[{\"name\":\"read_pdf\",\"description\":\"Read the attached PDF.\",\"input_schema\":{\"type\":\"object\",\"properties\":{},\"additionalProperties\":false}}],\"stream\":true,\"max_tokens\":40,\"temperature\":0}"
       },
       "response": {
         "status": 200,

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

@@ -10,11 +10,11 @@
       "transport": "http",
       "request": {
         "method": "POST",
-        "url": "https://api.anthropic.com/v1/messages?beta=true",
+        "url": "https://api.anthropic.com/v1/messages",
         "headers": {
           "content-type": "application/json"
         },
-        "body": "{\"model\":\"claude-haiku-4-5-20251001\",\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"document\",\"source\":{\"type\":\"base64\",\"media_type\":\"application/pdf\",\"data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"},\"title\":\"verification.pdf\"},{\"type\":\"text\",\"text\":\"Return only the verification code from the PDF.\"}]}],\"stream\":true,\"max_tokens\":40,\"temperature\":0}"
+        "body": "{\"model\":\"claude-haiku-4-5-20251001\",\"messages\":[{\"role\":\"user\",\"content\":[{\"type\":\"document\",\"source\":{\"type\":\"base64\",\"media_type\":\"application/pdf\",\"data\":\"JVBERi0xLjQKMSAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvUGFnZXMgMiAwIFIgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9LaWRzIFszIDAgUl0gL0NvdW50IDEgPj4KZW5kb2JqCjMgMCBvYmoKPDwgL1R5cGUgL1BhZ2UgL1BhcmVudCAyIDAgUiAvTWVkaWFCb3ggWzAgMCA2MTIgNzkyXSAvUmVzb3VyY2VzIDw8IC9Gb250IDw8IC9GMSA1IDAgUiA+PiA+PiAvQ29udGVudHMgNCAwIFIgPj4KZW5kb2JqCjQgMCBvYmoKPDwgL0xlbmd0aCA3NSA+PgpzdHJlYW0KQlQKL0YxIDE4IFRmCjcyIDcyMCBUZAooUERGIGNhc3NldHRlIHZlcmlmaWNhdGlvbiBjb2RlOiBPUkNISUQtNzM5MSkgVGoKRVQKZW5kc3RyZWFtCmVuZG9iago1IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UeXBlMSAvQmFzZUZvbnQgL0hlbHZldGljYSA+PgplbmRvYmoKeHJlZgowIDYKMDAwMDAwMDAwMCA2NTUzNSBmIAowMDAwMDAwMDA5IDAwMDAwIG4gCjAwMDAwMDAwNTggMDAwMDAgbiAKMDAwMDAwMDExNSAwMDAwMCBuIAowMDAwMDAwMjQxIDAwMDAwIG4gCjAwMDAwMDAzNjUgMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSA2IC9Sb290IDEgMCBSID4+CnN0YXJ0eHJlZgo0MzUKJSVFT0YK\"}},{\"type\":\"text\",\"text\":\"Return only the verification code from the PDF.\"}]}],\"stream\":true,\"max_tokens\":40,\"temperature\":0}"
       },
       "response": {
         "status": 200,

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

@@ -11,7 +11,6 @@ describe("provider error classification", () => {
       "Input length 131393 exceeds the maximum allowed input length of 131040 tokens.",
       "The input (516368 tokens) is longer than the model's context length (262144 tokens).",
       "Prompt has 5,958,968 tokens, but the configured context size is 256,000 tokens",
-      "Range of input length should be [1, 129024]",
       "Too many tokens",
       "Token limit exceeded",
     ]
@@ -88,12 +87,10 @@ describe("provider error classification", () => {
     ])
   })
 
-  test("classifies any remaining 4xx status as an invalid request", () => {
+  test("classifies network error text as provider internal", () => {
     expect(
-      [400, 402, 404, 418, 422, 451].map(
-        (status) => classifyProviderFailure({ message: `HTTP ${status}`, status })._tag,
-      ),
-    ).toEqual(Array(6).fill("InvalidRequest"))
+      ["network error", "network-error", "network_error"].map((message) => classifyProviderFailure({ message })._tag),
+    ).toEqual(["ProviderInternal", "ProviderInternal", "ProviderInternal"])
   })
 
   test("classifies nested provider codes when a top-level code is also present", () => {
@@ -106,12 +103,10 @@ describe("provider error classification", () => {
     ).toEqual(["QuotaExceeded", "ProviderInternal", "InvalidRequest"])
   })
 
-  test("leaves unrecognized failures unclassified for the retry default", () => {
+  test("keeps unknown and malformed provider payloads non-retryable", () => {
     expect(classifyProviderFailure({ message: '{"error":{"message":"no_kv_space"}}' })._tag).toBe("UnknownProvider")
     expect(classifyProviderFailure({ message: '{"type":"error","error":{"code":123}}' })._tag).toBe("UnknownProvider")
     expect(classifyProviderFailure({ message: "not-json" })._tag).toBe("UnknownProvider")
-    expect(classifyProviderFailure({ message: "network error" })._tag).toBe("UnknownProvider")
-    expect(classifyProviderFailure({ message: "Provider returned error" })._tag).toBe("UnknownProvider")
   })
 })
 

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

@@ -1,7 +1,5 @@
 import { describe, expect, test } from "bun:test"
 import { model } from "@opencode-ai/ai/providers/openai"
-import { LLM } from "../src/index.js"
-import { Endpoint } from "../src/route/endpoint.js"
 
 describe("provider package entrypoints", () => {
   test("semantic API aliases expose the same contract", async () => {
@@ -38,8 +36,7 @@ describe("provider package entrypoints", () => {
     expect(modules[0].model).toBe(modules[1].model)
     expect(modules[8].model).toBe(modules[9].model)
     expect(modules[12].model).toBe(modules[13].model)
-    expect(modules[19].model).toBe(modules[21].model)
-    expect(modules[19].model).not.toBe(modules[20].model)
+    expect(modules[19].model).toBe(modules[20].model)
   })
 
   test("maps DeepInfra package settings onto its native executable model", async () => {
@@ -142,10 +139,8 @@ describe("provider package entrypoints", () => {
     expect(selected.route.id).toBe("anthropic-messages")
     expect(selected.route.endpoint).toMatchObject({
       baseURL: "https://messages.example.test/v1",
+      path: "/messages",
     })
-    expect(
-      Endpoint.render(selected.route.endpoint, { request: LLM.request({ model: selected }), body: {} }).toString(),
-    ).toBe("https://messages.example.test/v1/messages")
     expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
     expect(selected.route.defaults.http?.body).toEqual({ metadata: { user_id: "user_1" } })
     expect(selected.route.defaults.providerOptions).toEqual({ effort: "low" })

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

@@ -491,59 +491,6 @@ describe("Bedrock Converse route", () => {
     }),
   )
 
-  it.effect("ignores late tool deltas after contentBlockStop", () =>
-    Effect.gen(function* () {
-      const body = eventStreamBody(
-        [
-          "contentBlockStart",
-          {
-            contentBlockIndex: 0,
-            start: { toolUse: { toolUseId: "tool_1", name: "lookup" } },
-          },
-        ],
-        ["contentBlockDelta", { contentBlockIndex: 0, delta: { toolUse: { input: '{"query":"weather"}' } } }],
-        ["contentBlockStop", { contentBlockIndex: 0 }],
-        ["contentBlockDelta", { contentBlockIndex: 0, delta: { toolUse: { input: '{"late":true}' } } }],
-        ["messageStop", { stopReason: "tool_use" }],
-      )
-      const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)))
-
-      expect(response.toolCalls).toEqual([
-        { type: "tool-call", id: "tool_1", name: "lookup", input: { query: "weather" } },
-      ])
-      expect(response.events.filter((event) => event.type === "tool-input-delta")).toEqual([
-        {
-          type: "tool-input-delta",
-          id: "tool_1",
-          name: "lookup",
-          text: '{"query":"weather"}',
-          input: { query: "weather" },
-        },
-      ])
-    }),
-  )
-
-  it.effect("rejects tool deltas without contentBlockStart", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(baseRequest).pipe(
-        Effect.provide(
-          fixedBytes(
-            eventStreamBody(
-              ["contentBlockDelta", { contentBlockIndex: 0, delta: { toolUse: { input: "{}" } } }],
-              ["messageStop", { stopReason: "tool_use" }],
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error).toMatchObject({
-        reason: { _tag: "InvalidProviderOutput" },
-        message: "Bedrock Converse tool delta is missing its tool call",
-      })
-    }),
-  )
-
   it.effect("recovers incomplete tool input at finalization", () =>
     Effect.gen(function* () {
       const body = eventStreamBody(

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

@@ -52,7 +52,7 @@ describe("provider error retention", () => {
           Effect.flip,
         )
         expect(error.message).toContain("Slow down")
-        expect(error.reason._tag).toBe("RateLimit")
+        expect(error.reason._tag).toBe(entry.name === "Gemini" ? "ProviderInternal" : "RateLimit")
         expect(error.reason.body).toBe(body)
         expect(error.reason.http).toMatchObject({ status: 200, headers: { "x-provider-trace": "trace-1" } })
         expect(error.reason.http?.url).toStartWith("https://provider.test/")

packages/ai/test/provider/open-responses-lifecycle.test.ts

@@ -1,467 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Effect, Stream } from "effect"
-import { LLM, LLMEvent } from "../../src/index.js"
-import { OpenResponses } from "../../src/protocols/open-responses.js"
-import { configure } from "../../src/providers/openai-compatible-responses.js"
-import { LLMClient } from "../../src/route.js"
-import { it } from "../lib/effect.js"
-import { fixedResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
-
-const request = LLM.request({
-  model: configure({ apiKey: "test-key", baseURL: "https://responses.example.test/v1" }).model("example-model"),
-  prompt: "Respond.",
-})
-const completed = { type: "response.completed", response: { id: "resp_1" } }
-
-const collect = (...input: OpenResponses.Event[]) =>
-  Effect.gen(function* () {
-    const events = yield* LLMClient.stream(request).pipe(
-      Stream.runCollect,
-      Effect.provide(fixedResponse(sseEvents(...input))),
-    )
-    expectLifecycle(
-      events,
-      input.some((event) => event.type === "response.completed"),
-    )
-    return events
-  })
-
-// Deliberately local to these basic-item fixtures, not a general stream validator.
-function expectLifecycle(events: ReadonlyArray<LLMEvent>, completed: boolean) {
-  const active = { text: new Set<string>(), reasoning: new Set<string>() }
-  const tools = new Map<string, "started" | "ended" | "called">()
-  events.forEach((event) => {
-    if (event.type === "text-start" || event.type === "reasoning-start") {
-      const blocks = event.type === "text-start" ? active.text : active.reasoning
-      expect(blocks.size).toBe(0)
-      blocks.add(event.id)
-    }
-    if (event.type === "text-delta" || event.type === "reasoning-delta") {
-      expect((event.type === "text-delta" ? active.text : active.reasoning).has(event.id)).toBe(true)
-    }
-    if (event.type === "text-end" || event.type === "reasoning-end") {
-      expect((event.type === "text-end" ? active.text : active.reasoning).delete(event.id)).toBe(true)
-    }
-    if (event.type === "tool-input-start") {
-      expect(tools.has(event.id)).toBe(false)
-      tools.set(event.id, "started")
-    }
-    if (event.type === "tool-input-delta") expect(tools.get(event.id)).toBe("started")
-    if (event.type === "tool-input-end") {
-      expect(tools.get(event.id)).toBe("started")
-      tools.set(event.id, "ended")
-    }
-    if (event.type === "tool-call") {
-      expect(tools.get(event.id)).toBe("ended")
-      tools.set(event.id, "called")
-    }
-    // Incomplete responses may leave pending tool inputs without a call.
-    if (event.type === "finish" && completed) {
-      expect(active.text.size).toBe(0)
-      expect(active.reasoning.size).toBe(0)
-      expect([...tools.values()].every((status) => status === "called")).toBe(true)
-    }
-  })
-  expect(events.filter(LLMEvent.is.stepStart)).toHaveLength(1)
-  expect(events[0]?.type).toBe("step-start")
-  expect(events.filter(LLMEvent.is.stepFinish)).toHaveLength(1)
-  expect(events.filter(LLMEvent.is.finish)).toHaveLength(1)
-  expect(events.slice(-2).map((event) => event.type)).toEqual(["step-finish", "finish"])
-}
-
-describe("Open Responses basic-item lifecycles", () => {
-  it.effect("closes implicit summary boundaries and ignores late events for completed reasoning", () =>
-    Effect.gen(function* () {
-      const item = { type: "reasoning", id: "rs_1", encrypted_content: "encrypted-state" }
-      const events = yield* collect(
-        { type: "response.output_item.added", output_index: 0, item: { ...item, encrypted_content: null } },
-        { type: "response.output_item.added", item: { ...item, encrypted_content: null } },
-        { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 0, delta: "First" },
-        { type: "response.reasoning_summary_part.added", item_id: "rs_1", summary_index: 1 },
-        { type: "response.reasoning_summary_part.done", item_id: "rs_1", summary_index: 0 },
-        { type: "response.reasoning_summary_text.done", item_id: "rs_1", summary_index: 1, text: "Second" },
-        // The third part omits both explicit summary boundaries.
-        {
-          type: "response.reasoning_summary_text.delta",
-          output_index: 0,
-          item_id: "wrong",
-          summary_index: 2,
-          delta: "Third",
-        },
-        { type: "response.output_item.done", item },
-        { type: "response.output_item.done", item },
-        { type: "response.output_item.added", item },
-        { type: "response.reasoning_summary_part.added", item_id: "rs_1", summary_index: 3 },
-        { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 3, delta: "late" },
-        { type: "response.reasoning_summary_text.done", item_id: "rs_1", summary_index: 2, text: "late final" },
-        { type: "response.reasoning_summary_part.done", item_id: "rs_1", summary_index: 3 },
-        completed,
-      )
-
-      expect(events.filter((event) => event.type.startsWith("reasoning-"))).toEqual([
-        {
-          type: "reasoning-start",
-          id: "rs_1:0",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: null } },
-        },
-        { type: "reasoning-delta", id: "rs_1:0", text: "First" },
-        { type: "reasoning-end", id: "rs_1:0", providerMetadata: { "openai-compatible": { itemId: "rs_1" } } },
-        {
-          type: "reasoning-start",
-          id: "rs_1:1",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: null } },
-        },
-        { type: "reasoning-delta", id: "rs_1:1", text: "Second" },
-        { type: "reasoning-end", id: "rs_1:1", providerMetadata: { "openai-compatible": { itemId: "rs_1" } } },
-        {
-          type: "reasoning-start",
-          id: "rs_1:2",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: null } },
-        },
-        { type: "reasoning-delta", id: "rs_1:2", text: "Third" },
-        {
-          type: "reasoning-end",
-          id: "rs_1:2",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: "encrypted-state" } },
-        },
-      ])
-    }),
-  )
-
-  it.effect("preserves done-only encrypted reasoning without replaying its summary or late events", () =>
-    Effect.gen(function* () {
-      const item = {
-        type: "reasoning",
-        id: "rs_1",
-        encrypted_content: "encrypted-state",
-        summary: [{ type: "summary_text", text: "Not streamed" }],
-      }
-      const events = yield* collect(
-        { type: "response.output_item.done", item },
-        { type: "response.output_item.done", item },
-        { type: "response.output_item.added", item },
-        { type: "response.reasoning_summary_text.delta", item_id: "rs_1", delta: "late" },
-        { type: "response.reasoning_summary_part.added", item_id: "rs_1", summary_index: 1 },
-        { type: "response.reasoning_summary_text.done", item_id: "rs_1", summary_index: 1, text: "late final" },
-        completed,
-        // Route termination must also prevent events after response completion.
-        { type: "response.output_item.added", item: { type: "reasoning", id: "rs_after" } },
-      )
-      expect(events.filter((event) => event.type.startsWith("reasoning-"))).toEqual([
-        {
-          type: "reasoning-start",
-          id: "rs_1",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: "encrypted-state" } },
-        },
-        {
-          type: "reasoning-end",
-          id: "rs_1",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: "encrypted-state" } },
-        },
-      ])
-    }),
-  )
-
-  it.effect("forgets never-streamed messages at implicit boundaries and preserves refusal phases", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        { type: "response.output_item.added", item: { type: "message", id: "msg_empty" } },
-        { type: "response.output_item.added", item: { type: "message", id: "msg_1", phase: "commentary" } },
-        { type: "response.output_text.done", item_id: "msg_1", text: "Checking" },
-        { type: "response.output_text.done", item_id: "msg_1", text: "Duplicate" },
-        { type: "response.output_item.added", item: { type: "message", id: "msg_2", phase: null } },
-        { type: "response.output_text.delta", item_id: "msg_empty", delta: "stale" },
-        { type: "response.output_text.done", item_id: "msg_empty", text: "stale final" },
-        { type: "response.output_text.delta", item_id: "msg_1", delta: "late" },
-        { type: "response.refusal.delta", item_id: "msg_2", delta: "Cannot help." },
-        { type: "response.refusal.done", item_id: "msg_2", refusal: "Cannot help." },
-        { type: "response.output_item.done", item: { type: "message", id: "msg_2", phase: "final_answer" } },
-        { type: "response.output_item.added", item: { type: "message", id: "msg_3", phase: null } },
-        { type: "response.refusal.done", item_id: "msg_3", refusal: "Done-only refusal." },
-        { type: "response.output_item.done", item: { type: "message", id: "msg_3" } },
-        completed,
-      )
-      expect(events.filter((event) => event.type.startsWith("text-"))).toEqual([
-        {
-          type: "text-start",
-          id: "msg_1",
-          providerMetadata: { "openai-compatible": { itemId: "msg_1", phase: "commentary" } },
-        },
-        { type: "text-delta", id: "msg_1", text: "Checking" },
-        {
-          type: "text-end",
-          id: "msg_1",
-          providerMetadata: { "openai-compatible": { itemId: "msg_1", phase: "commentary" } },
-        },
-        {
-          type: "text-start",
-          id: "msg_2",
-          providerMetadata: { "openai-compatible": { itemId: "msg_2", phase: null } },
-        },
-        { type: "text-delta", id: "msg_2", text: "Cannot help." },
-        {
-          type: "text-end",
-          id: "msg_2",
-          providerMetadata: { "openai-compatible": { itemId: "msg_2", phase: "final_answer" } },
-        },
-        {
-          type: "text-start",
-          id: "msg_3",
-          providerMetadata: { "openai-compatible": { itemId: "msg_3", phase: null } },
-        },
-        { type: "text-delta", id: "msg_3", text: "Done-only refusal." },
-        { type: "text-end", id: "msg_3", providerMetadata: { "openai-compatible": { itemId: "msg_3", phase: null } } },
-      ])
-    }),
-  )
-  it.effect("allows a message to be registered again without inheriting its previous phase", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        { type: "response.output_item.added", item: { type: "message", id: "msg_1", phase: "commentary" } },
-        { type: "response.output_text.delta", item_id: "msg_1", delta: "First" },
-        { type: "response.output_item.done", item: { type: "message", id: "msg_1" } },
-        { type: "response.output_item.added", item: { type: "message", id: "msg_1" } },
-        { type: "response.output_text.delta", item_id: "msg_1", delta: "Second" },
-        { type: "response.output_item.done", item: { type: "message", id: "msg_1" } },
-        completed,
-      )
-      expect(events.filter(LLMEvent.is.textEnd)).toEqual([
-        {
-          type: "text-end",
-          id: "msg_1",
-          providerMetadata: { "openai-compatible": { itemId: "msg_1", phase: "commentary" } },
-        },
-        { type: "text-end", id: "msg_1", providerMetadata: { "openai-compatible": { itemId: "msg_1" } } },
-      ])
-      expect(events.filter(LLMEvent.is.textDelta).map((event) => event.text)).toEqual(["First", "Second"])
-    }),
-  )
-  ;[undefined, "fc_1"].forEach((id) => {
-    it.effect(`opens and closes a done-only tool ${id === undefined ? "without" : "with"} an item id`, () =>
-      Effect.gen(function* () {
-        const item = {
-          type: "function_call",
-          ...(id === undefined ? {} : { id }),
-          call_id: "call_1",
-          name: "lookup",
-          arguments: '{"query":"weather"}',
-        }
-        const events = yield* collect(
-          { type: "response.output_item.done", item },
-          { type: "response.output_item.done", item: { ...item, id: "fc_1" } },
-          { type: "response.output_item.added", item },
-          completed,
-        )
-        const providerMetadata = id === undefined ? undefined : { "openai-compatible": { itemId: id } }
-        expect(events.filter((event) => event.type.startsWith("tool-"))).toEqual([
-          { type: "tool-input-start", id: "call_1", name: "lookup", providerMetadata },
-          { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata },
-          { type: "tool-call", id: "call_1", name: "lookup", input: { query: "weather" }, providerMetadata },
-        ])
-        expect(events.filter(LLMEvent.is.finish)).toEqual([
-          {
-            type: "finish",
-            reason: { normalized: "tool-calls", raw: undefined },
-            providerMetadata: { "openai-compatible": { responseId: "resp_1", serviceTier: undefined } },
-          },
-        ])
-      }),
-    )
-
-    it.effect(`deduplicates a pending call whose item id is ${id === undefined ? "introduced" : "omitted"} later`, () =>
-      Effect.gen(function* () {
-        const item = { type: "function_call", call_id: "call_1", name: "lookup" }
-        const first = { ...item, ...(id === undefined ? {} : { id }) }
-        const duplicate = { ...item, ...(id === undefined ? { id: "fc_1" } : {}) }
-        const events = yield* collect(
-          { type: "response.output_item.added", item: first },
-          { type: "response.function_call_arguments.delta", item_id: id ?? "call_1", delta: '{"query":"weather"}' },
-          { type: "response.output_item.added", item: duplicate },
-          { type: "response.output_item.done", item: duplicate },
-          { type: "response.output_item.done", item: first },
-          { type: "response.output_item.added", item: duplicate },
-          completed,
-        )
-        // Identity metadata comes from the first admission, not the duplicate.
-        const providerMetadata = id === undefined ? undefined : { "openai-compatible": { itemId: id } }
-        expect(events.filter((event) => event.type.startsWith("tool-"))).toEqual([
-          { type: "tool-input-start", id: "call_1", name: "lookup", providerMetadata },
-          {
-            type: "tool-input-delta",
-            id: "call_1",
-            name: "lookup",
-            text: '{"query":"weather"}',
-            input: { query: "weather" },
-          },
-          { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata },
-          { type: "tool-call", id: "call_1", name: "lookup", input: { query: "weather" }, providerMetadata },
-        ])
-      }),
-    )
-  })
-
-  it.effect("recovers pending items in completed output order with terminal encrypted metadata", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_1", call_id: "call_1", name: "lookup" },
-        },
-        { type: "response.function_call_arguments.delta", item_id: "fc_1", delta: '{"query":"draft"}' },
-        { type: "response.output_item.added", item: { type: "reasoning", id: "rs_1", encrypted_content: null } },
-        { type: "response.reasoning_summary_text.delta", item_id: "rs_1", delta: "Thinking" },
-        { type: "response.reasoning_summary_part.done", item_id: "rs_1", summary_index: 0 },
-        {
-          type: "response.completed",
-          response: {
-            id: "resp_1",
-            output: [
-              { type: "reasoning", id: "rs_1", encrypted_content: "terminal-state" },
-              { type: "function_call", id: "fc_1", call_id: "call_1", name: "lookup", arguments: '{"query":"final"}' },
-              { type: "function_call", id: "fc_unseen", call_id: "call_unseen", name: "lookup", arguments: "{}" },
-            ],
-          },
-        },
-      )
-      expect(events.slice(5, -2)).toEqual([
-        {
-          type: "reasoning-end",
-          id: "rs_1:0",
-          providerMetadata: { "openai-compatible": { itemId: "rs_1", reasoningEncryptedContent: "terminal-state" } },
-        },
-        {
-          type: "tool-input-end",
-          id: "call_1",
-          name: "lookup",
-          providerMetadata: { "openai-compatible": { itemId: "fc_1" } },
-        },
-        {
-          type: "tool-call",
-          id: "call_1",
-          name: "lookup",
-          input: { query: "final" },
-          providerMetadata: { "openai-compatible": { itemId: "fc_1" } },
-        },
-      ])
-    }),
-  )
-
-  it.effect("preserves call identity and pending order when an item id is reused", () =>
-    Effect.gen(function* () {
-      const first = { type: "function_call", id: "fc_1", call_id: "call_1", name: "lookup", arguments: "{}" }
-      const events = yield* collect(
-        { type: "response.output_item.added", item: first },
-        { type: "response.output_item.added", item: { ...first, id: "fc_2", call_id: "call_2" } },
-        { type: "response.output_item.done", item: first },
-        { type: "response.output_item.added", item: { ...first, call_id: "call_3" } },
-        { type: "response.output_item.done", item: first },
-        completed,
-      )
-      expect(events.filter(LLMEvent.is.toolCall).map((event) => event.id)).toEqual(["call_1", "call_2", "call_3"])
-    }),
-  )
-
-  it.effect("keeps text and reasoning identities separate even with empty item ids", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        { type: "response.output_item.added", item: { type: "reasoning", id: "" } },
-        { type: "response.output_item.added", item: { type: "message", id: "" } },
-        { type: "response.output_item.added", item: { type: "reasoning", id: "" } },
-        { type: "response.reasoning_summary_text.delta", item_id: "", delta: "Thinking" },
-        { type: "response.output_text.delta", item_id: "", delta: "Answer" },
-        { type: "response.output_item.done", item: { type: "reasoning", id: "", encrypted_content: "state" } },
-        { type: "response.output_item.done", item: { type: "message", id: "" } },
-        completed,
-      )
-      expect(events.filter(LLMEvent.is.reasoningDelta).map((event) => event.text)).toEqual(["Thinking"])
-      expect(events.filter(LLMEvent.is.textDelta).map((event) => event.text)).toEqual(["Answer"])
-      expect(events.filter(LLMEvent.is.reasoningEnd)).toEqual([
-        {
-          type: "reasoning-end",
-          id: ":0",
-          providerMetadata: { "openai-compatible": { itemId: "", reasoningEncryptedContent: "state" } },
-        },
-      ])
-    }),
-  )
-
-  it.effect("does not recover a completed tool from a tracked message with the same id", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        { type: "response.output_item.added", item: { type: "message", id: "item_1" } },
-        { type: "response.output_text.delta", item_id: "item_1", delta: "Answer" },
-        {
-          type: "response.completed",
-          response: {
-            id: "resp_1",
-            output: [{ type: "function_call", id: "item_1", call_id: "call_1", name: "lookup", arguments: "{}" }],
-          },
-        },
-      )
-      expect(events.filter(LLMEvent.is.toolCall)).toEqual([])
-      expect(events.filter(LLMEvent.is.finish).map((event) => event.reason.normalized)).toEqual(["stop"])
-    }),
-  )
-
-  it.effect("flushes pending calls and open text when completed output is absent", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        { type: "response.output_item.added", item: { type: "message", id: "msg_1", phase: "final_answer" } },
-        { type: "response.output_text.delta", item_id: "msg_1", delta: "Answer" },
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", call_id: "call_1", name: "lookup", arguments: "{}" },
-        },
-        completed,
-      )
-      // Generic terminal closure does not repeat the message's phase metadata.
-      expect(events.slice(4, -2)).toEqual([
-        { type: "tool-input-end", id: "call_1", name: "lookup" },
-        { type: "tool-call", id: "call_1", name: "lookup", input: {} },
-        { type: "text-end", id: "msg_1" },
-      ])
-    }),
-  )
-
-  it.effect("does not reconcile pending calls or terminal reasoning metadata on incomplete responses", () =>
-    Effect.gen(function* () {
-      const events = yield* collect(
-        { type: "response.output_item.added", item: { type: "reasoning", id: "rs_1", encrypted_content: null } },
-        { type: "response.reasoning_summary_text.delta", item_id: "rs_1", delta: "Partial" },
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_1", call_id: "call_1", name: "lookup" },
-        },
-        { type: "response.function_call_arguments.delta", item_id: "fc_1", delta: '{"query":' },
-        {
-          type: "response.incomplete",
-          response: {
-            id: "resp_1",
-            incomplete_details: { reason: "max_output_tokens" },
-            output: [
-              { type: "reasoning", id: "rs_1", encrypted_content: "not-reconciled" },
-              {
-                type: "function_call",
-                id: "fc_1",
-                call_id: "call_1",
-                name: "lookup",
-                arguments: '{"query":"not-reconciled"}',
-              },
-            ],
-          },
-        },
-      )
-      expect(events.filter(LLMEvent.is.toolInputEnd)).toEqual([])
-      expect(events.filter(LLMEvent.is.toolCall)).toEqual([])
-      expect(events.filter(LLMEvent.is.reasoningEnd)).toEqual([{ type: "reasoning-end", id: "rs_1:0" }])
-      expect(events.filter(LLMEvent.is.finish)).toEqual([
-        {
-          type: "finish",
-          reason: { normalized: "length", raw: "max_output_tokens" },
-          providerMetadata: { "openai-compatible": { responseId: "resp_1", serviceTier: undefined } },
-        },
-      ])
-    }),
-  )
-})

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

@@ -7,7 +7,6 @@ import {
   AIError,
   LLMEvent,
   LLMRequest,
-  LLMResponse,
   Message,
   LanguageModel,
   ToolCallPart,
@@ -808,28 +807,6 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  it.effect("finishes at the done sentinel without waiting for response EOF", () =>
-    Effect.gen(function* () {
-      const stream = new ReadableStream<Uint8Array>({
-        start(controller) {
-          controller.enqueue(
-            new TextEncoder().encode(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "stop"))),
-          )
-        },
-      })
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(stream, {
-            headers: { "content-type": "text/event-stream" },
-          }),
-        ),
-      )
-
-      expect(response.text).toBe("Hello")
-      expect(response.events.at(-1)?.type).toBe("finish")
-    }),
-  )
-
   it.effect("preserves streamed refusals as ordinary assistant text", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(
@@ -1150,7 +1127,7 @@ describe("OpenAI Chat route", () => {
     }),
   )
 
-  it.effect("preserves scalar reasoning after content starts in one lifecycle", () =>
+  it.effect("preserves scalar reasoning after content starts", () =>
     Effect.gen(function* () {
       const details = [{ type: "reasoning.text", text: "detail", format: "unknown", index: 0 }]
       const response = yield* LLMClient.generate(request).pipe(
@@ -1167,35 +1144,8 @@ describe("OpenAI Chat route", () => {
       )
 
       expect(response.reasoning).toBe("detailscalar")
-      expect(response.events.filter(LLMEvent.is.reasoningStart)).toHaveLength(1)
-      expect(response.events.filter(LLMEvent.is.reasoningEnd)).toHaveLength(1)
-      expect(response.message.content.filter((part) => part.type === "reasoning")).toHaveLength(1)
-      expect(response.message.content.find((part) => part.type === "reasoning")?.providerMetadata).toEqual({
-        openai: { reasoningField: "reasoning", reasoningDetails: details },
-      })
-    }),
-  )
-
-  it.effect("keeps one reasoning lifecycle across many content chunks", () =>
-    Effect.gen(function* () {
-      const details = [{ type: "reasoning.text", text: "thinking", format: "anthropic-claude-v1", index: 0 }]
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { choices: [{ delta: { reasoning: "thinking", reasoning_details: details } }] },
-              ...Array.from({ length: 25 }, (_, index) => deltaChunk({ content: `chunk-${index} ` })),
-              deltaChunk({}, "stop"),
-            ),
-          ),
-        ),
-      )
-
-      expect(response.reasoning).toBe("thinking")
-      expect(response.text).toBe(Array.from({ length: 25 }, (_, index) => `chunk-${index} `).join(""))
-      expect(response.events.filter(LLMEvent.is.reasoningStart)).toHaveLength(1)
-      expect(response.events.filter(LLMEvent.is.reasoningEnd)).toHaveLength(1)
-      expect(response.message.content.filter((part) => part.type === "reasoning")).toHaveLength(1)
+      expect(response.events.filter(LLMEvent.is.reasoningStart)).toHaveLength(2)
+      expect(response.events.filter(LLMEvent.is.reasoningEnd)).toHaveLength(2)
       expect(response.message.content.find((part) => part.type === "reasoning")?.providerMetadata).toEqual({
         openai: { reasoningField: "reasoning", reasoningDetails: details },
       })
@@ -1241,18 +1191,7 @@ describe("OpenAI Chat route", () => {
           index: 0,
         },
       ]
-      // Snapshot reasoning-end metadata as each event is published so the
-      // assertion cannot pass through later mutation of a shared array.
-      const publishedEndMetadata: unknown[] = []
-      const response = yield* LLMClient.stream(request).pipe(
-        Stream.tap((event) =>
-          Effect.sync(() => {
-            if (LLMEvent.is.reasoningEnd(event))
-              publishedEndMetadata.push(decodeJson(encodeJson(event.providerMetadata)))
-          }),
-        ),
-        Stream.runFold(LLMResponse.empty, LLMResponse.reduce),
-        Effect.map((state) => LLMResponse.complete(state)!),
+      const response = yield* LLMClient.generate(request).pipe(
         Effect.provide(
           fixedResponse(
             sseEvents(
@@ -1273,12 +1212,10 @@ describe("OpenAI Chat route", () => {
       expect(response.events.filter(LLMEvent.is.reasoningStart)).toHaveLength(1)
       expect(response.events.filter(LLMEvent.is.reasoningDelta)).toHaveLength(1)
       expect(response.events.filter(LLMEvent.is.reasoningEnd)).toHaveLength(1)
-      expect(publishedEndMetadata).toEqual([{ openai: { reasoningField: "reasoning", reasoningDetails: merged } }])
-      expect(response.events.findIndex(LLMEvent.is.reasoningStart)).toBeLessThan(
-        response.events.findIndex(LLMEvent.is.textStart),
-      )
-      // Reasoning stays open alongside text and closes once during finalization.
-      expect(response.events.findIndex(LLMEvent.is.reasoningEnd)).toBeGreaterThan(
+      expect(response.events.filter(LLMEvent.is.reasoningEnd).at(-1)?.providerMetadata).toEqual({
+        openai: { reasoningField: "reasoning", reasoningDetails: merged },
+      })
+      expect(response.events.findIndex(LLMEvent.is.reasoningEnd)).toBeLessThan(
         response.events.findIndex(LLMEvent.is.textStart),
       )
 

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

@@ -405,19 +405,6 @@ describe("OpenAI-compatible Chat route", () => {
     }),
   )
 
-  it.effect("ignores events after the done sentinel", () =>
-    Effect.gen(function* () {
-      const body = `${sseEvents(
-        deltaChunk({ content: "Hello" }),
-        deltaChunk({}, "stop"),
-      )}data: ${JSON.stringify(deltaChunk({ content: " late" }))}\n\n`
-      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.text).toBe("Hello")
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "stop" })
-    }),
-  )
-
   it.effect("accepts nullable usage and preserves provider fields", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(request).pipe(

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

@@ -2750,227 +2750,6 @@ describe("OpenAI Responses route", () => {
     }),
   )
 
-  it.effect("concludes reasoning at implicit summary boundaries", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(
-        LLMRequest.update(request, { providerOptions: { store: false } }),
-      ).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "reasoning", id: "rs_1", encrypted_content: null },
-              },
-              { type: "response.reasoning_summary_part.added", item_id: "rs_1", summary_index: 0 },
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 0, delta: "First" },
-              // The next part is enough to conclude the previous one even when
-              // its done event is delayed.
-              { type: "response.reasoning_summary_part.added", item_id: "rs_1", summary_index: 1 },
-              { type: "response.reasoning_summary_part.done", item_id: "rs_1", summary_index: 0 },
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 1, delta: "Second" },
-              { type: "response.reasoning_summary_part.done", item_id: "rs_1", summary_index: 1 },
-              // Some compatible providers begin the next part with its first delta.
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 2, delta: "Third" },
-              {
-                type: "response.output_item.done",
-                item: { type: "reasoning", id: "rs_1", encrypted_content: "encrypted-state" },
-              },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.reasoning).toBe("FirstSecondThird")
-      expect(response.events.filter((event) => event.type.startsWith("reasoning-"))).toEqual([
-        {
-          type: "reasoning-start",
-          id: "rs_1:0",
-          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: null } },
-        },
-        { type: "reasoning-delta", id: "rs_1:0", text: "First", providerMetadata: undefined },
-        { type: "reasoning-end", id: "rs_1:0", providerMetadata: { openai: { itemId: "rs_1" } } },
-        {
-          type: "reasoning-start",
-          id: "rs_1:1",
-          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: null } },
-        },
-        { type: "reasoning-delta", id: "rs_1:1", text: "Second", providerMetadata: undefined },
-        {
-          type: "reasoning-end",
-          id: "rs_1:1",
-          providerMetadata: { openai: { itemId: "rs_1" } },
-        },
-        {
-          type: "reasoning-start",
-          id: "rs_1:2",
-          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: null } },
-        },
-        { type: "reasoning-delta", id: "rs_1:2", text: "Third", providerMetadata: undefined },
-        {
-          type: "reasoning-end",
-          id: "rs_1:2",
-          providerMetadata: { openai: { itemId: "rs_1", reasoningEncryptedContent: "encrypted-state" } },
-        },
-      ])
-    }),
-  )
-
-  it.effect("rejects a reasoning item that starts before the previous item ends", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "response.output_item.added", item: { type: "reasoning", id: "rs_1" } },
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 0, delta: "First" },
-              { type: "response.output_item.added", item: { type: "reasoning", id: "rs_2" } },
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason._tag).toBe("InvalidProviderOutput")
-      expect(error.message).toContain("started reasoning before the previous item ended")
-    }),
-  )
-
-  it.effect("concludes text at implicit message boundaries", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              // An item that never streams text is untracked at the boundary too.
-              { type: "response.output_item.added", item: { type: "message", id: "msg_0" } },
-              { type: "response.output_item.added", item: { type: "message", id: "msg_1" } },
-              { type: "response.output_text.delta", item_id: "msg_1", delta: "First" },
-              // The previous message's done event is missing; the next message
-              // item is the boundary for its open text.
-              { type: "response.output_item.added", item: { type: "message", id: "msg_2" } },
-              // Late deltas for concluded or untracked messages must stay no-ops.
-              { type: "response.output_text.delta", item_id: "msg_1", delta: " late" },
-              { type: "response.output_text.delta", item_id: "msg_0", delta: " stale" },
-              { type: "response.output_text.delta", item_id: "msg_2", delta: "Second" },
-              { type: "response.output_item.done", item: { type: "message", id: "msg_2" } },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.text).toBe("FirstSecond")
-      expect(response.events.filter((event) => event.type.startsWith("text-"))).toMatchObject([
-        { type: "text-start", id: "msg_1" },
-        { type: "text-delta", id: "msg_1", text: "First" },
-        { type: "text-end", id: "msg_1" },
-        { type: "text-start", id: "msg_2" },
-        { type: "text-delta", id: "msg_2", text: "Second" },
-        { type: "text-end", id: "msg_2" },
-      ])
-    }),
-  )
-
-  it.effect("opens the tool lifecycle for a done-only function call", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              // No output_item.added: the call arrives only as a completed item.
-              {
-                type: "response.output_item.done",
-                item: {
-                  type: "function_call",
-                  id: "fc_1",
-                  call_id: "call_1",
-                  name: "lookup",
-                  arguments: '{"query":"weather"}',
-                },
-              },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.events.filter((event) => event.type.startsWith("tool-"))).toMatchObject([
-        { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-end", id: "call_1", name: "lookup" },
-        { type: "tool-call", id: "call_1", name: "lookup", input: { query: "weather" } },
-      ])
-      expect(response.finishReason.normalized).toBe("tool-calls")
-    }),
-  )
-
-  it.effect("ignores duplicate item boundary events", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "response.output_item.added", item: { type: "reasoning", id: "rs_1" } },
-              // Duplicate added for a known item is not overlap and must no-op.
-              { type: "response.output_item.added", item: { type: "reasoning", id: "rs_1" } },
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_1", summary_index: 0, delta: "Think" },
-              { type: "response.output_item.done", item: { type: "reasoning", id: "rs_1" } },
-              { type: "response.output_item.done", item: { type: "reasoning", id: "rs_1" } },
-              {
-                type: "response.output_item.added",
-                item: { type: "function_call", id: "fc_1", call_id: "call_1", name: "lookup", arguments: "" },
-              },
-              {
-                type: "response.output_item.added",
-                item: { type: "function_call", id: "fc_1", call_id: "call_1", name: "lookup", arguments: "" },
-              },
-              { type: "response.function_call_arguments.delta", item_id: "fc_1", delta: '{"query":"weather"}' },
-              {
-                type: "response.output_item.done",
-                item: {
-                  type: "function_call",
-                  id: "fc_1",
-                  call_id: "call_1",
-                  name: "lookup",
-                  arguments: '{"query":"weather"}',
-                },
-              },
-              {
-                type: "response.output_item.done",
-                item: {
-                  type: "function_call",
-                  id: "fc_1",
-                  call_id: "call_1",
-                  name: "lookup",
-                  arguments: '{"query":"weather"}',
-                },
-              },
-              // Duplicates that drop the item id still resolve the same call.
-              {
-                type: "response.output_item.done",
-                item: { type: "function_call", call_id: "call_1", name: "lookup", arguments: '{"query":"weather"}' },
-              },
-              {
-                type: "response.output_item.added",
-                item: { type: "function_call", call_id: "call_1", name: "lookup", arguments: "" },
-              },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.reasoning).toBe("Think")
-      expect(response.events.filter((event) => event.type === "reasoning-start")).toHaveLength(1)
-      expect(response.events.filter((event) => event.type === "reasoning-end")).toHaveLength(1)
-      expect(response.events.filter((event) => event.type === "tool-input-start")).toHaveLength(1)
-      expect(response.events.filter(LLMEvent.is.toolCall)).toEqual([
-        expect.objectContaining({ id: "call_1", input: { query: "weather" } }),
-      ])
-    }),
-  )
-
   it.effect("reconciles reasoning summaries that arrive only as finals", () =>
     Effect.gen(function* () {
       const response = yield* LLMClient.generate(

packages/ai/test/provider/openrouter.test.ts

@@ -305,11 +305,9 @@ describe("OpenRouter", () => {
       expect(prepared.body.messages).toEqual([
         {
           role: "assistant",
-          content: "",
+          content: null,
           reasoning: "Thinking",
-          reasoning_content: undefined,
           reasoning_details: details,
-          reasoning_text: undefined,
         },
       ])
     }),
@@ -337,14 +335,7 @@ describe("OpenRouter", () => {
       )
 
       expect(prepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: "",
-          reasoning: "Thinking",
-          reasoning_content: undefined,
-          reasoning_details: details,
-          reasoning_text: undefined,
-        },
+        { role: "assistant", content: null, reasoning: "Thinking", reasoning_details: details },
       ])
     }),
   )
@@ -370,14 +361,7 @@ describe("OpenRouter", () => {
       )
 
       expect(prepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: "",
-          reasoning: "AB",
-          reasoning_content: undefined,
-          reasoning_details: details,
-          reasoning_text: undefined,
-        },
+        { role: "assistant", content: null, reasoning: "AB", reasoning_details: details },
       ])
     }),
   )
@@ -392,16 +376,7 @@ describe("OpenRouter", () => {
         }),
       )
 
-      expect(prepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: "",
-          reasoning: undefined,
-          reasoning_content: undefined,
-          reasoning_details: undefined,
-          reasoning_text: undefined,
-        },
-      ])
+      expect(prepared.body.messages).toEqual([{ role: "assistant", content: null }])
     }),
   )
 })

packages/ai/test/response.test.ts

@@ -104,60 +104,6 @@ describe("LLMResponse reducer", () => {
     ])
   })
 
-  test("authoritative text-end value replaces accumulated deltas", () => {
-    const response = LLMResponse.fromEvents([
-      LLMEvent.textStart({ id: "t1" }),
-      LLMEvent.textDelta({ id: "t1", text: "Hel" }),
-      LLMEvent.textEnd({ id: "t1", text: "Hello!" }),
-      LLMEvent.finish({ reason: { normalized: "stop" } }),
-    ])
-
-    expect(response?.message.content).toEqual([{ type: "text", text: "Hello!" }])
-    expect(response?.text).toBe("Hello!")
-  })
-
-  test("text-end without value keeps joined deltas", () => {
-    const response = LLMResponse.fromEvents([
-      LLMEvent.textStart({ id: "t1" }),
-      LLMEvent.textDelta({ id: "t1", text: "Hel" }),
-      LLMEvent.textDelta({ id: "t1", text: "lo" }),
-      LLMEvent.textEnd({ id: "t1" }),
-      LLMEvent.finish({ reason: { normalized: "stop" } }),
-    ])
-
-    expect(response?.message.content).toEqual([{ type: "text", text: "Hello" }])
-    expect(response?.text).toBe("Hello")
-  })
-
-  test("authoritative reasoning-end value replaces only its own fragment", () => {
-    const response = LLMResponse.fromEvents([
-      LLMEvent.reasoningStart({ id: "r1:0" }),
-      LLMEvent.reasoningDelta({ id: "r1:0", text: "First summ" }),
-      LLMEvent.reasoningEnd({ id: "r1:0", text: "First summary." }),
-      LLMEvent.reasoningStart({ id: "r1:1" }),
-      LLMEvent.reasoningDelta({ id: "r1:1", text: "Second summary." }),
-      LLMEvent.reasoningEnd({ id: "r1:1" }),
-      LLMEvent.finish({ reason: { normalized: "stop" } }),
-    ])
-
-    expect(response?.message.content).toEqual([
-      { type: "reasoning", text: "First summary." },
-      { type: "reasoning", text: "Second summary." },
-    ])
-    expect(response?.reasoning).toBe("First summary.Second summary.")
-  })
-
-  test("end value recovers a fragment that streamed no deltas", () => {
-    const response = LLMResponse.fromEvents([
-      LLMEvent.textStart({ id: "t1" }),
-      LLMEvent.textEnd({ id: "t1", text: "Hello!" }),
-      LLMEvent.finish({ reason: { normalized: "stop" } }),
-    ])
-
-    expect(response?.message.content).toEqual([{ type: "text", text: "Hello!" }])
-    expect(response?.text).toBe("Hello!")
-  })
-
   test("clears malformed tool input without appending an executable call", () => {
     const state = reduce([
       LLMEvent.toolInputStart({ id: "call_1", name: "lookup" }),

packages/ai/test/schema.test.ts

@@ -250,7 +250,7 @@ test("AI error reasons are tagged Errors with required messages", () => {
       provider: model.provider,
       model: model.id,
     }),
-    new AuthenticationError({ message: "Missing credentials" }),
+    new AuthenticationError({ message: "Missing credentials", kind: "missing" }),
     new RateLimitError({ message: "Rate limited" }),
     new QuotaExceededError({ message: "Quota exceeded" }),
     new ContentPolicyError({ message: "Content blocked" }),

packages/ai/test/testing.test.ts

@@ -1,331 +0,0 @@
-import { describe, expect } from "bun:test"
-import { AIError, LanguageModel, LLM, LLMClient, LLMEvent, LLMRequest, RateLimitError } from "../src/index.js"
-import { OpenAIChat } from "../src/protocols/openai-chat.js"
-import { TestLLM } from "../src/testing.js"
-import { Effect, Fiber, Latch, Stream } from "effect"
-import { testEffect } from "./lib/effect.js"
-
-const request = LLM.request({
-  model: LanguageModel.make({ id: "fictional-model", provider: "fixture", route: OpenAIChat.route }),
-  prompt: "Say hello",
-})
-const legacy = testEffect(TestLLM.layer())
-const it = testEffect(TestLLM.testLayer())
-
-describe("TestLLM legacy client", () => {
-  legacy.effect("does not observe requests or consume responses until execution", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Service
-      yield* llm.push(TestLLM.text("first", "first"), TestLLM.text("second", "second"))
-
-      llm.client.stream(request)
-      llm.client.generate(request)
-      expect(llm.requests).toEqual([])
-
-      expect((yield* llm.client.generate(request)).text).toBe("first")
-      expect((yield* llm.client.generate(request)).text).toBe("second")
-      expect(llm.requests).toEqual([request, request])
-    }),
-  )
-
-  legacy.effect("assigns and records a fresh response for each execution", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Service
-      yield* llm.push(
-        TestLLM.text("first", "first"),
-        TestLLM.text("second", "second"),
-        TestLLM.text("third", "third"),
-        TestLLM.text("fourth", "fourth"),
-      )
-      const stream = llm.client.stream(request)
-      const generate = llm.client.generate(request)
-
-      expect(yield* Stream.runCollect(stream)).toEqual(TestLLM.text("first", "first"))
-      expect(yield* Stream.runCollect(stream)).toEqual(TestLLM.text("second", "second"))
-      expect((yield* generate).text).toBe("third")
-      expect((yield* generate).text).toBe("fourth")
-      expect(llm.requests).toEqual([request, request, request, request])
-    }),
-  )
-
-  legacy.effect("keeps module-level controls and clientLayer on the same backing state", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Service
-      const requests = llm.requests
-      yield* TestLLM.push(TestLLM.text("queued", "queued"))
-      yield* TestLLM.always(TestLLM.text("fallback", "fallback"))
-      expect((yield* LLMClient.generate(request).pipe(Effect.provide(TestLLM.clientLayer))).text).toBe("queued")
-      yield* TestLLM.wait(1)
-      expect(requests).toEqual([request])
-      requests.length = 0
-      expect((yield* llm.client.generate(request)).text).toBe("fallback")
-      expect(llm.requests).toBe(requests)
-      expect(requests).toEqual([request])
-    }),
-  )
-})
-
-describe("TestLLM first-class client", () => {
-  it.effect("provides the same object under normal and test tags with snapshot observations", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      const client = yield* LLMClient.Service
-      expect(client).toBe(llm)
-      const before = yield* llm.requests()
-      yield* llm.push(TestLLM.text("hello", "answer"))
-      const generate = client.generate(request)
-      client.stream(request)
-      expect(yield* llm.requests()).toEqual([])
-
-      expect((yield* generate).text).toBe("hello")
-      expect(before).toEqual([])
-      expect(yield* llm.requests()).toEqual([request])
-      expect(yield* llm.requests()).not.toBe(yield* llm.requests())
-    }),
-  )
-
-  it.effect("prioritizes queued replies over request-dependent and constant fallbacks", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      const served: LLMRequest[] = []
-      yield* llm.always(TestLLM.text("old fallback", "old"))
-      yield* llm.push(TestLLM.text("first", "first"), TestLLM.text("second", "second"))
-      yield* llm.serve((request) => {
-        served.push(request)
-        return TestLLM.text(request.promptCacheKey ?? "default", "served")
-      })
-
-      expect((yield* LLMClient.generate(request)).text).toBe("first")
-      expect((yield* LLMClient.generate(request)).text).toBe("second")
-      expect(served).toEqual([])
-      const selected = LLMRequest.update(request, { promptCacheKey: "selected" })
-      expect((yield* LLMClient.generate(selected)).text).toBe("selected")
-      expect((yield* LLMClient.generate(request)).text).toBe("default")
-      expect(served).toEqual([selected, request])
-
-      yield* llm.push(TestLLM.text("queued again", "queued"))
-      yield* llm.always(TestLLM.text("constant", "constant"))
-      expect((yield* LLMClient.generate(request)).text).toBe("queued again")
-      expect((yield* LLMClient.generate(request)).text).toBe("constant")
-      expect((yield* LLMClient.generate(request)).text).toBe("constant")
-      expect(served).toEqual([selected, request])
-    }),
-  )
-
-  testEffect(
-    TestLLM.testLayer({
-      transformRequest: (request) => LLMRequest.update(request, { promptCacheKey: "observation" }),
-    }),
-  ).effect("transforms observations without changing the request passed to the responder", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      yield* llm.serve((input) => {
-        expect(input).toBe(request)
-        return TestLLM.text("original", "answer")
-      })
-      const generate = llm.generate(request)
-      expect(yield* llm.requests()).toEqual([])
-      expect((yield* generate).text).toBe("original")
-      expect(yield* llm.requests()).toEqual([LLMRequest.update(request, { promptCacheKey: "observation" })])
-    }),
-  )
-
-  it.effect("broadcasts request-arrival waits and satisfies waits registered afterward", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      yield* llm.always(TestLLM.stop())
-      const first = yield* llm.wait(2).pipe(Effect.forkChild({ startImmediately: true }))
-      const second = yield* llm.wait(2).pipe(Effect.forkChild({ startImmediately: true }))
-      yield* llm.generate(request)
-      expect(first.pollUnsafe()).toBeUndefined()
-      expect(second.pollUnsafe()).toBeUndefined()
-      yield* llm.generate(request)
-      yield* Fiber.join(first)
-      yield* Fiber.join(second)
-      yield* llm.wait(2)
-      expect(yield* llm.requests()).toHaveLength(2)
-    }),
-  )
-  ;(["queued", "served"] as const).forEach((mode) => {
-    it.effect(`assigns ${mode} replies before resuming request-arrival continuations`, () =>
-      Effect.gen(function* () {
-        const llm = yield* TestLLM.Test
-        const responses = [TestLLM.text("first", "first"), TestLLM.text("second", "second")]
-        yield* mode === "queued" ? llm.push(...responses) : llm.serve(() => responses.shift() ?? [])
-        const later = yield* llm
-          .wait(1)
-          .pipe(Effect.andThen(llm.generate(request)), Effect.forkChild({ startImmediately: true }))
-
-        expect((yield* llm.generate(request)).text).toBe("first")
-        expect((yield* Fiber.join(later)).text).toBe("second")
-        expect(yield* llm.requests()).toEqual([request, request])
-      }),
-    )
-  })
-
-  it.effect("notifies arrival waiters even when the responder defects", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      const defect = new Error("Broken fixture responder")
-      yield* llm.serve(() => {
-        throw defect
-      })
-      const waiter = yield* llm.wait(1).pipe(Effect.forkChild({ startImmediately: true }))
-      expect(yield* llm.generate(request).pipe(Effect.catchDefect(Effect.succeed))).toBe(defect)
-      yield* Fiber.join(waiter)
-    }),
-  )
-
-  it.effect("builds independent state even when the same layer is provided concurrently", () => {
-    const layer = TestLLM.testLayer()
-    const run = Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      expect(yield* llm.requests()).toEqual([])
-      yield* llm.push(TestLLM.text("one", "answer"))
-      expect((yield* LLMClient.generate(request)).text).toBe("one")
-      return yield* llm.requests()
-    }).pipe(Effect.provide(layer))
-    return Effect.gen(function* () {
-      expect(yield* Effect.all([run, run], { concurrency: "unbounded" })).toEqual([[request], [request]])
-    })
-  })
-
-  it.effect("counts concurrent starts on one gate without serializing their response assignment", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      yield* llm.push(TestLLM.text("first", "first"), TestLLM.text("second", "second"))
-      const generate = llm.generate(request)
-      const gate = yield* llm.gate()
-      const first = yield* generate.pipe(Effect.forkChild({ startImmediately: true }))
-      yield* gate.started
-      const second = yield* generate.pipe(Effect.forkChild({ startImmediately: true }))
-      yield* gate.started
-      yield* llm.wait(2)
-      expect(first.pollUnsafe()).toBeUndefined()
-      expect(second.pollUnsafe()).toBeUndefined()
-      yield* gate.release
-      expect((yield* Fiber.join(first)).text).toBe("first")
-      expect((yield* Fiber.join(second)).text).toBe("second")
-    }),
-  )
-
-  it.effect("does not clear a replacement gate when the previous gate is released", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      yield* llm.always(TestLLM.stop())
-      const previous = yield* llm.gate()
-      const first = yield* llm.generate(request).pipe(Effect.forkChild({ startImmediately: true }))
-      yield* previous.started
-      const next = yield* llm.gate()
-      yield* previous.release
-      yield* Fiber.join(first)
-
-      const second = yield* llm.generate(request).pipe(Effect.forkChild({ startImmediately: true }))
-      yield* next.started
-      expect(second.pollUnsafe()).toBeUndefined()
-      yield* next.release
-      yield* Fiber.join(second)
-    }),
-  )
-
-  it.effect("releases a gate when its deliberately narrower scope closes", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      yield* llm.always(TestLLM.stop())
-      // Only the gate is scoped here; its release must happen before the test ends.
-      const run = yield* Effect.scoped(
-        Effect.gen(function* () {
-          const gate = yield* llm.gate()
-          const run = yield* llm.generate(request).pipe(Effect.forkChild({ startImmediately: true }))
-          yield* gate.started
-          return run
-        }),
-      )
-      yield* Fiber.join(run)
-      yield* llm.generate(request)
-      expect(yield* llm.requests()).toHaveLength(2)
-    }),
-  )
-
-  it.effect("keeps an executed response consumed after interruption and permits later requests", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      yield* llm.push(TestLLM.text("interrupted", "first"), TestLLM.text("next", "second"))
-      const gate = yield* llm.gate()
-      const run = yield* llm.generate(request).pipe(Effect.forkChild({ startImmediately: true }))
-      yield* gate.started
-      yield* Fiber.interrupt(run)
-      yield* gate.release
-      expect((yield* llm.generate(request)).text).toBe("next")
-      expect(yield* llm.requests()).toHaveLength(2)
-    }),
-  )
-
-  it.effect("consumes a supplied stream's post-finish tail and runs its finalizer", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      const tail = yield* Latch.make()
-      const release = yield* Latch.make()
-      const finalized = yield* Latch.make()
-      yield* llm.push(
-        Stream.unwrap(
-          Effect.gen(function* () {
-            yield* Effect.addFinalizer(() => finalized.open)
-            return Stream.fromIterable(TestLLM.text("complete", "answer")).pipe(
-              Stream.concat(Stream.fromEffect(tail.open.pipe(Effect.andThen(release.await))).pipe(Stream.drain)),
-            )
-          }),
-        ),
-      )
-      const run = yield* llm.generate(request).pipe(Effect.forkChild({ startImmediately: true }))
-      yield* tail.await
-      expect(run.pollUnsafe()).toBeUndefined()
-      yield* release.open
-      expect((yield* Fiber.join(run)).text).toBe("complete")
-      yield* finalized.await
-    }),
-  )
-
-  it.effect("preserves irregular events, ordinary EOF, typed failures, and responder defects", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      const events = [LLMEvent.textDelta({ id: "without-start", text: "partial" })]
-      yield* llm.push(events, [])
-      expect(yield* Stream.runCollect(llm.stream(request))).toEqual(events)
-      expect(yield* Stream.runCollect(llm.stream(request))).toEqual([])
-
-      const failure = new AIError({ reason: new RateLimitError({ message: "Try later" }) })
-      const observed: LLMEvent[] = []
-      yield* llm.serve(() => TestLLM.failAfter(failure, ...events))
-      expect(
-        yield* llm.stream(request).pipe(
-          Stream.runForEach((event) => Effect.sync(() => observed.push(event))),
-          Effect.flip,
-        ),
-      ).toBe(failure)
-      expect(observed).toEqual(events)
-      expect(yield* llm.generate(request).pipe(Effect.flip)).toBe(failure)
-
-      const defect = new Error("Broken fixture responder")
-      yield* llm.serve(() => {
-        throw defect
-      })
-      expect(yield* llm.generate(request).pipe(Effect.catchDefect(Effect.succeed))).toBe(defect)
-      yield* llm.push(TestLLM.text("recovered", "answer"))
-      expect((yield* llm.generate(request)).text).toBe("recovered")
-    }),
-  )
-
-  it.effect("defects on unexpected requests instead of waiting for a late script", () =>
-    Effect.gen(function* () {
-      const llm = yield* TestLLM.Test
-      const defect = yield* llm.generate(request).pipe(Effect.catchDefect(Effect.succeed))
-      expect(defect).toBeInstanceOf(Error)
-      if (!(defect instanceof Error)) return
-      expect(defect.message).toBe("TestLLM has no response for request 1")
-      expect(yield* llm.requests()).toEqual([request])
-      yield* llm.push(TestLLM.stop())
-      yield* llm.generate(request)
-    }),
-  )
-})

packages/ai/tsconfig.types.json

@@ -5,5 +5,5 @@
     "noEmit": true,
     "rootDir": "."
   },
-  "include": ["test/**/*.types.ts", "test/testing.test.ts"]
+  "include": ["test/**/*.types.ts"]
 }

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

@@ -80,8 +80,8 @@ export function createSessionRequestModel() {
         if (message.type !== "synthetic") return []
         if (message.metadata?.source === "subagent" && typeof message.metadata.childID === "string")
           return [message.metadata.childID]
-        if (message.metadata?.source === "shell")
-          return [message.metadata.shellID, message.metadata.jobID].filter((id): id is string => typeof id === "string")
+        if (message.metadata?.source === "shell" && typeof message.metadata.jobID === "string")
+          return [message.metadata.jobID]
         return []
       }),
     )
@@ -121,7 +121,6 @@ export function createSessionRequestModel() {
         if (part.type !== "tool" || part.name !== "shell" || completed.has(part.id)) return []
         if (part.state.status !== "completed" || part.state.metadata?.status !== "running") return []
         const shellID = part.state.metadata.shellID
-        if (typeof shellID === "string" && completed.has(shellID)) return []
         const command = part.state.input.command
         return [
           {

packages/cli/src/commands/handlers/default.ts

@@ -84,12 +84,15 @@ export default Runtime.handler(Commands, (input) =>
         update: (update) => runPromise(config.update(update)),
       },
       packages: {
-        resolve: (spec, install = true) =>
+        resolve: (spec, install = true, revision) =>
           runPromise(
-            (install ? npm.add(spec, { subpaths: ["tui"] }) : npm.resolve(spec, { subpaths: ["tui"] })).pipe(
-              Effect.map((result) => result.entrypoint),
-            ),
+            install
+              ? npm.add(spec, { subpaths: ["tui"], revision })
+              : npm.resolve(spec, { subpaths: ["tui"], revision }),
           ),
+        check: (spec) => runPromise(npm.check(spec)),
+        update: (spec) => runPromise(npm.update(spec, { subpaths: ["tui"] })),
+        reload: (spec, options) => runPromise(npm.reload(spec, { subpaths: ["tui"], ...options })),
       },
       environment: requestedServer === undefined ? Env.session() : undefined,
       terminalHandoff: () => preflight.finish(),

packages/cli/src/services/fixtures/updater.ts

@@ -0,0 +1,58 @@
+import { NodeFileSystem } from "@effect/platform-node"
+import { Global } from "@opencode-ai/util/global"
+import { AppProcess } from "@opencode-ai/util/process"
+import { Effect, FileSystem, Layer, Stream } from "effect"
+import { ChildProcessSpawner } from "effect/unstable/process"
+import assert from "node:assert/strict"
+import path from "node:path"
+import { Updater } from "../updater"
+
+const latest = { version: "0.0.0-beta-17498" }
+const installs: string[] = []
+
+// This fixture runs in its own process; no real update requests or installs occur.
+globalThis.fetch = Object.assign(async () => Response.json(latest), { preconnect() {} })
+
+await Effect.runPromise(
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem
+    const directory = yield* fs.makeTempDirectoryScoped({ prefix: "opencode-updater-" })
+    const dependencies = Layer.mergeAll(
+      Layer.succeed(FileSystem.FileSystem, fs),
+      Layer.succeed(
+        Global.Service,
+        Global.make({ home: directory, config: directory, cache: path.join(directory, "cache") }),
+      ),
+      Layer.succeed(AppProcess.Service, {
+        ...ChildProcessSpawner.make(() => Effect.die("Unexpected process spawn")),
+        runStream: () => Stream.die("Unexpected streaming process"),
+        run: (command) => {
+          assert.equal(command._tag, "StandardCommand")
+          if (command.command === "npm" && command.args[0] === "install") {
+            assert.ok(command.args.includes("--global"))
+            installs.push(command.args.at(-1)!)
+          }
+          return Effect.succeed({
+            command: command.command,
+            exitCode: 0,
+            stdout: Buffer.from(command.command === "npm" ? "@opencode-ai/cli" : ""),
+            stderr: Buffer.alloc(0),
+            stdoutTruncated: false,
+            stderrTruncated: false,
+          })
+        },
+      }),
+    )
+    yield* Effect.gen(function* () {
+      const updater = yield* Updater.Service
+      yield* updater.check()
+      assert.deepEqual(installs, ["@opencode-ai/cli@0.0.0-beta-17498"])
+      yield* updater.check()
+      yield* updater.check()
+      assert.deepEqual(installs, ["@opencode-ai/cli@0.0.0-beta-17498"])
+      latest.version = "0.0.0-beta-17499"
+      yield* updater.check()
+      assert.deepEqual(installs, ["@opencode-ai/cli@0.0.0-beta-17498", "@opencode-ai/cli@0.0.0-beta-17499"])
+    }).pipe(Effect.provide(Updater.layer.pipe(Layer.provide(dependencies))))
+  }).pipe(Effect.scoped, Effect.provide(NodeFileSystem.layer)),
+)

packages/cli/src/services/updater-action.ts

@@ -5,9 +5,9 @@ const maximumComponent = "9007199254740991"
 const versionPattern =
   /^v?([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/
 
-export function action(current: string, latest: string, policy: Policy): Action {
+export function action(current: string, latest: string, policy: Policy, installed = current): Action {
   if (policy === false) return "none"
-  const currentVersion = parseReleaseVersion(current)
+  const currentVersion = parseReleaseVersion(installed)
   const latestVersion = parseReleaseVersion(latest)
   if (!currentVersion || !latestVersion || sameRelease(currentVersion, latestVersion)) return "none"
   // Major upgrades are never installed automatically.

packages/cli/src/services/updater.test.ts

@@ -1,8 +1,30 @@
 import { describe, expect, test } from "bun:test"
+import path from "node:path"
 import { action } from "./updater-action"
 import { decodePolicy } from "./updater"
 
 describe("updater", () => {
+  test("remembers successful installs across checks and accepts the next release", async () => {
+    // Isolate compiled version constants and the update endpoint from other tests.
+    const child = Bun.spawn(
+      [
+        process.execPath,
+        "--define",
+        'OPENCODE_VERSION="0.0.0-next-16473"',
+        "--define",
+        'OPENCODE_CHANNEL="beta"',
+        path.join(import.meta.dir, "fixtures/updater.ts"),
+      ],
+      { env: { ...process.env, OPENCODE_DISABLE_AUTOUPDATE: "" }, stdout: "pipe", stderr: "pipe" },
+    )
+    const [code, stdout, stderr] = await Promise.all([
+      child.exited,
+      new Response(child.stdout).text(),
+      new Response(child.stderr).text(),
+    ])
+    expect(code, stdout + stderr).toBe(0)
+  })
+
   test("reads autoupdate from JSONC", () => {
     expect(decodePolicy('{ // preference\n "autoupdate": "notify",\n}')).toBe("notify")
     expect(decodePolicy('{ "autoupdate": false }')).toBe(false)
@@ -32,6 +54,14 @@ describe("updater", () => {
     expect(action("1.2.3", "1.2.3", true)).toBe("none")
   })
 
+  test("skips an installed update but still accepts the next release", () => {
+    const current = "0.0.0-next-16473"
+    const installed = "0.0.0-beta-17498"
+    expect(action(current, installed, true)).toBe("upgrade")
+    expect(action(current, installed, true, installed)).toBe("none")
+    expect(action(current, "0.0.0-beta-17499", true, installed)).toBe("upgrade")
+  })
+
   test("upgrades when latest is lower (rollback)", () => {
     expect(action("1.2.4", "1.2.3", true)).toBe("upgrade")
   })

packages/cli/src/services/updater.ts

@@ -1,7 +1,7 @@
 import { Global } from "@opencode-ai/util/global"
 import { AppProcess } from "@opencode-ai/util/process"
 import { OPENCODE_CHANNEL, OPENCODE_LOCAL, OPENCODE_VERSION } from "../version"
-import { Context, Duration, Effect, FileSystem, Layer } from "effect"
+import { Context, Duration, Effect, FileSystem, Layer, Ref } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { parse, type ParseError } from "jsonc-parser"
 import path from "node:path"
@@ -38,6 +38,7 @@ export const layer = Layer.effect(
     const fs = yield* FileSystem.FileSystem
     const global = yield* Global.Service
     const appProcess = yield* AppProcess.Service
+    const installed = yield* Ref.make(OPENCODE_VERSION)
     const channel = OPENCODE_CHANNEL.replace(/[^a-zA-Z0-9._-]/g, "-")
 
     const readPolicy = Effect.fnUntraced(function* () {
@@ -112,18 +113,20 @@ export const layer = Layer.effect(
 
     const upgrade = Effect.fnUntraced(function* (method: Method, version: string) {
       const target = `${packageName}@${version}`
-      const commands: Record<Exclude<Method, "bun" | "curl">, string[]> = {
-        npm: ["npm", "install", "--global", target],
+      const commands: Record<Exclude<Method, "bun" | "curl" | "npm">, string[]> = {
         pnpm: ["pnpm", "add", "--global", `--allow-build=${packageName}`, target],
         yarn: ["yarn", "global", "add", target],
       }
       const result = yield* Effect.scoped(
         Effect.gen(function* () {
-          if (method === "bun") {
-            // Bun does not prune old versions from its shared package cache.
+          if (method === "bun" || method === "npm") {
             yield* fs.makeDirectory(global.cache, { recursive: true })
             const cache = yield* fs.makeTempDirectoryScoped({ directory: global.cache, prefix: "update-" })
-            return yield* run(["bun", "install", "--global", "--trust", "--cache-dir", cache, target], "5 minutes")
+            const command =
+              method === "bun"
+                ? ["bun", "install", "--global", "--trust", "--cache-dir", cache, target]
+                : ["npm", "install", "--global", "--cache", cache, target]
+            return yield* run(command, "5 minutes")
           }
           if (method === "curl") {
             yield* fs.makeDirectory(global.cache, { recursive: true })
@@ -156,18 +159,19 @@ export const layer = Layer.effect(
 
         return yield* Effect.gen(function* () {
           const version = yield* latest()
+          const current = yield* Ref.get(installed)
           yield* Effect.logInfo("update check", {
-            current: OPENCODE_VERSION,
+            current,
             latest: version,
           })
-          const next = action(OPENCODE_VERSION, version, policy)
+          const next = action(OPENCODE_VERSION, version, policy, current)
           if (next === "none") return yield* Effect.logInfo("update check done", { action: "up-to-date" })
-          if (next === "notify")
-            return yield* Effect.logInfo("OpenCode update available", { current: OPENCODE_VERSION, latest: version })
+          if (next === "notify") return yield* Effect.logInfo("OpenCode update available", { current, latest: version })
           const detected = yield* method()
           if (!detected) return yield* Effect.logWarning("automatic update skipped: installation method not found")
           yield* upgrade(detected, version)
-          yield* Effect.logInfo("updated OpenCode", { from: OPENCODE_VERSION, to: version, method: detected })
+          yield* Ref.set(installed, version)
+          yield* Effect.logInfo("updated OpenCode", { from: current, to: version, method: detected })
         })
       },
       Effect.catchCause((cause) => Effect.logWarning("automatic update failed", { cause })),

packages/client/src/effect/api/api.ts

@@ -88,8 +88,32 @@ export type PluginListInput = {
 export type PluginListOutput = { readonly location: Location.Info; readonly data: ReadonlyArray<Plugin.Info> }
 export type PluginListOperation<E = never> = (input?: PluginListInput) => Effect.Effect<PluginListOutput, E>
 
+export type PluginCheckInput = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly target: string
+}
+export type PluginCheckOutput = { readonly location: Location.Info; readonly data: Plugin.PackageStatus }
+export type PluginCheckOperation<E = never> = (input: PluginCheckInput) => Effect.Effect<PluginCheckOutput, E>
+
+export type PluginUpdateInput = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly target: string
+}
+export type PluginUpdateOutput = { readonly location: Location.Info; readonly data: ReadonlyArray<Plugin.Info> }
+export type PluginUpdateOperation<E = never> = (input: PluginUpdateInput) => Effect.Effect<PluginUpdateOutput, E>
+
+export type PluginReloadInput = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly target: string
+}
+export type PluginReloadOutput = { readonly location: Location.Info; readonly data: ReadonlyArray<Plugin.Info> }
+export type PluginReloadOperation<E = never> = (input: PluginReloadInput) => Effect.Effect<PluginReloadOutput, E>
+
 export interface PluginApi<E = never> {
   readonly list: PluginListOperation<E>
+  readonly check: PluginCheckOperation<E>
+  readonly update: PluginUpdateOperation<E>
+  readonly reload: PluginReloadOperation<E>
 }
 
 export type SessionListInput = {
@@ -1639,23 +1663,6 @@ export interface PtyApi<E = never> {
   readonly connect: { readonly token: PtyConnectTokenOperation<E> }
 }
 
-export type ExperimentalPersistentPtyReadInput = { readonly sessionID: Session.ID; readonly lines?: number | undefined }
-export type ExperimentalPersistentPtyReadOutput = {
-  readonly ptyID: Pty.ID
-  readonly title: string
-  readonly cwd: string
-  readonly foregroundProcess: string | null
-  readonly screen: {
-    readonly text: string
-    readonly cols: number
-    readonly rows: number
-    readonly cursor: { readonly x: number; readonly y: number }
-  }
-} | null
-export type ExperimentalPersistentPtyReadOperation<E = never> = (
-  input: ExperimentalPersistentPtyReadInput,
-) => Effect.Effect<ExperimentalPersistentPtyReadOutput, E>
-
 export type ExperimentalPersistentPtyListInput = { readonly sessionID: Session.ID }
 export type ExperimentalPersistentPtyListOutput = ReadonlyArray<{
   readonly id: Pty.ID
@@ -1804,7 +1811,6 @@ export type ExperimentalPersistentPtyConnectTokenOperation<E = never> = (
 
 export interface ExperimentalApi<E = never> {
   readonly persistentPty: {
-    readonly read: ExperimentalPersistentPtyReadOperation<E>
     readonly list: ExperimentalPersistentPtyListOperation<E>
     readonly create: ExperimentalPersistentPtyCreateOperation<E>
     readonly shutdown: ExperimentalPersistentPtyShutdownOperation<E>

packages/client/src/effect/generated/client.ts

@@ -15,6 +15,12 @@ import type {
   AgentGetOutput,
   PluginListInput,
   PluginListOutput,
+  PluginCheckInput,
+  PluginCheckOutput,
+  PluginUpdateInput,
+  PluginUpdateOutput,
+  PluginReloadInput,
+  PluginReloadOutput,
   SessionListInput,
   SessionListOutput,
   SessionStatsInput,
@@ -198,8 +204,6 @@ import type {
   PtyRemoveOutput,
   PtyConnectTokenInput,
   PtyConnectTokenOutput,
-  ExperimentalPersistentPtyReadInput,
-  ExperimentalPersistentPtyReadOutput,
   ExperimentalPersistentPtyListInput,
   ExperimentalPersistentPtyListOutput,
   ExperimentalPersistentPtyCreateInput,
@@ -318,7 +322,33 @@ const EndpointPluginList = (raw: RawClient["server.plugin"]) => (input?: PluginL
     raw["plugin.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
   )
 
-const adaptGroupPlugin = (raw: RawClient["server.plugin"]) => ({ list: EndpointPluginList(raw) })
+const EndpointPluginCheck = (raw: RawClient["server.plugin"]) => (input: PluginCheckInput) =>
+  preserveEffect<PluginCheckOutput>()(
+    raw["plugin.check"]({ query: { location: input["location"] }, payload: { target: input["target"] } }).pipe(
+      Effect.mapError(mapClientError),
+    ),
+  )
+
+const EndpointPluginUpdate = (raw: RawClient["server.plugin"]) => (input: PluginUpdateInput) =>
+  preserveEffect<PluginUpdateOutput>()(
+    raw["plugin.update"]({ query: { location: input["location"] }, payload: { target: input["target"] } }).pipe(
+      Effect.mapError(mapClientError),
+    ),
+  )
+
+const EndpointPluginReload = (raw: RawClient["server.plugin"]) => (input: PluginReloadInput) =>
+  preserveEffect<PluginReloadOutput>()(
+    raw["plugin.reload"]({ query: { location: input["location"] }, payload: { target: input["target"] } }).pipe(
+      Effect.mapError(mapClientError),
+    ),
+  )
+
+const adaptGroupPlugin = (raw: RawClient["server.plugin"]) => ({
+  list: EndpointPluginList(raw),
+  check: EndpointPluginCheck(raw),
+  update: EndpointPluginUpdate(raw),
+  reload: EndpointPluginReload(raw),
+})
 
 const EndpointSessionList = (raw: RawClient["server.session"]) => (input?: SessionListInput) =>
   preserveEffect<SessionListOutput>()(
@@ -1236,15 +1266,6 @@ const adaptGroupPty = (raw: RawClient["server.pty"]) => ({
   connect: { token: EndpointPtyConnectToken(raw) },
 })
 
-const EndpointExperimentalPersistentPtyRead =
-  (raw: RawClient["server.experimental"]) => (input: ExperimentalPersistentPtyReadInput) =>
-    preserveEffect<ExperimentalPersistentPtyReadOutput>()(
-      raw["persistentPty.read"]({ params: { sessionID: input["sessionID"] }, query: { lines: input["lines"] } }).pipe(
-        Effect.mapError(mapClientError),
-        Effect.map((value) => value.data),
-      ),
-    )
-
 const EndpointExperimentalPersistentPtyList =
   (raw: RawClient["server.experimental"]) => (input: ExperimentalPersistentPtyListInput) =>
     preserveEffect<ExperimentalPersistentPtyListOutput>()(
@@ -1333,7 +1354,6 @@ const EndpointExperimentalPersistentPtyConnectToken =
 
 const adaptGroupExperimental = (raw: RawClient["server.experimental"]) => ({
   persistentPty: {
-    read: EndpointExperimentalPersistentPtyRead(raw),
     list: EndpointExperimentalPersistentPtyList(raw),
     create: EndpointExperimentalPersistentPtyCreate(raw),
     shutdown: EndpointExperimentalPersistentPtyShutdown(raw),

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

@@ -9,6 +9,12 @@ import type {
   AgentGetOutput,
   PluginListInput,
   PluginListOutput,
+  PluginCheckInput,
+  PluginCheckOutput,
+  PluginUpdateInput,
+  PluginUpdateOutput,
+  PluginReloadInput,
+  PluginReloadOutput,
   SessionListInput,
   SessionListOutput,
   SessionStatsInput,
@@ -194,8 +200,6 @@ import type {
   PtyRemoveOutput,
   PtyConnectTokenInput,
   PtyConnectTokenOutput,
-  ExperimentalPersistentPtyReadInput,
-  ExperimentalPersistentPtyReadOutput,
   ExperimentalPersistentPtyListInput,
   ExperimentalPersistentPtyListOutput,
   ExperimentalPersistentPtyCreateInput,
@@ -462,6 +466,45 @@ export function make(options: ClientOptions) {
           },
           requestOptions,
         ),
+      check: (input: PluginCheckInput, requestOptions?: RequestOptions) =>
+        request<PluginCheckOutput>(
+          {
+            method: "POST",
+            path: `/api/plugin/check`,
+            query: { location: input["location"] },
+            body: { target: input["target"] },
+            successStatus: 200,
+            declaredStatuses: [400, 401],
+            empty: false,
+          },
+          requestOptions,
+        ),
+      update: (input: PluginUpdateInput, requestOptions?: RequestOptions) =>
+        request<PluginUpdateOutput>(
+          {
+            method: "POST",
+            path: `/api/plugin/update`,
+            query: { location: input["location"] },
+            body: { target: input["target"] },
+            successStatus: 200,
+            declaredStatuses: [400, 401],
+            empty: false,
+          },
+          requestOptions,
+        ),
+      reload: (input: PluginReloadInput, requestOptions?: RequestOptions) =>
+        request<PluginReloadOutput>(
+          {
+            method: "POST",
+            path: `/api/plugin/reload`,
+            query: { location: input["location"] },
+            body: { target: input["target"] },
+            successStatus: 200,
+            declaredStatuses: [400, 401],
+            empty: false,
+          },
+          requestOptions,
+        ),
     },
     session: {
       list: (input?: SessionListInput, requestOptions?: RequestOptions) =>
@@ -1686,18 +1729,6 @@ export function make(options: ClientOptions) {
     },
     experimental: {
       persistentPty: {
-        read: (input: ExperimentalPersistentPtyReadInput, requestOptions?: RequestOptions) =>
-          request<{ readonly data: ExperimentalPersistentPtyReadOutput }>(
-            {
-              method: "GET",
-              path: `/api/experimental/session/${encodeURIComponent(input.sessionID)}/terminal/read`,
-              query: { lines: input["lines"] },
-              successStatus: 200,
-              declaredStatuses: [503, 401, 400],
-              empty: false,
-            },
-            requestOptions,
-          ).then((value) => value.data),
         list: (input: ExperimentalPersistentPtyListInput, requestOptions?: RequestOptions) =>
           request<{ readonly data: ExperimentalPersistentPtyListOutput }>(
             {

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

@@ -16,6 +16,8 @@ export type PluginSource =
   | { type: "local"; path: string }
   | { type: "sdk" }
 
+export type PluginPackageStatus = { installed?: string; available?: string; mutable: boolean }
+
 export type SessionForkBoundary = { type: "before"; messageID: string } | { type: "through"; messageID: string }
 
 export type MoneyUSD = number
@@ -378,14 +380,6 @@ export type SessionStatus =
 
 export type PtyTicketConnectToken = { ticket: string; expires_in: number }
 
-export type PersistentPtyReadResult = {
-  ptyID: string
-  title: string
-  cwd: string
-  foregroundProcess: string | null
-  screen: { text: string; cols: number; rows: number; cursor: { x: number; y: number } }
-}
-
 export type PersistentPtyHandoff = { directory: string; instanceID: string; ticket: string; expiresAt: number }
 
 export type ShellInfo1 = {
@@ -441,8 +435,24 @@ export type ProviderRequest = {
 export type PermissionRule = { action: string; resource: string; effect: PermissionEffect }
 
 export type PluginInfo =
-  | { id: string; source: PluginSource; status: "active"; tui: boolean }
-  | { id?: string; source: PluginSource; status: "failed"; error: string; tui: boolean }
+  | {
+      id: string
+      source: PluginSource
+      status: "active"
+      tui: boolean
+      revision?: string
+      generation?: string
+      error?: string
+    }
+  | {
+      id?: string
+      source: PluginSource
+      status: "failed"
+      error: string
+      tui: boolean
+      revision?: string
+      generation?: string
+    }
 
 export type SessionMessageLocationSwitched = {
   id: string
@@ -2338,6 +2348,10 @@ export type AgentNotFoundError = {
 export const isAgentNotFoundError = (value: unknown): value is AgentNotFoundError =>
   typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "AgentNotFoundError"
 
+export type PluginOperationError = { readonly _tag: "PluginOperationError"; readonly message: string }
+export const isPluginOperationError = (value: unknown): value is PluginOperationError =>
+  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "PluginOperationError"
+
 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"
@@ -2548,6 +2562,42 @@ export type PluginListOutput = {
   data: Array<PluginInfo>
 }
 
+export type PluginCheckInput = {
+  readonly location?: {
+    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  }["location"]
+  readonly target: { readonly target: string }["target"]
+}
+
+export type PluginCheckOutput = {
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
+  data: PluginPackageStatus
+}
+
+export type PluginUpdateInput = {
+  readonly location?: {
+    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  }["location"]
+  readonly target: { readonly target: string }["target"]
+}
+
+export type PluginUpdateOutput = {
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
+  data: Array<PluginInfo>
+}
+
+export type PluginReloadInput = {
+  readonly location?: {
+    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  }["location"]
+  readonly target: { readonly target: string }["target"]
+}
+
+export type PluginReloadOutput = {
+  location: { directory: string; workspaceID?: string; project: { id: string; directory: string; canonical: string } }
+  data: Array<PluginInfo>
+}
+
 export type SessionListInput = {
   readonly workspace?: {
     readonly workspace?: string | undefined
@@ -5777,13 +5827,6 @@ export type PtyConnectTokenOutput = {
   data: PtyTicketConnectToken
 }
 
-export type ExperimentalPersistentPtyReadInput = {
-  readonly sessionID: { readonly sessionID: string }["sessionID"]
-  readonly lines?: { readonly lines?: number | undefined }["lines"]
-}
-
-export type ExperimentalPersistentPtyReadOutput = { data: PersistentPtyReadResult | null }["data"]
-
 export type ExperimentalPersistentPtyListInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
 
 export type ExperimentalPersistentPtyListOutput = { data: Array<PersistentPtyInfo> }["data"]

packages/client/src/solid/data.ts

@@ -29,7 +29,6 @@ import type {
   SessionMessageAssistantTool,
   SessionInfo,
   SessionInboxInfo,
-  SessionInboxCompaction,
   ShellInfo,
   SkillInfo,
   VcsInfo,
@@ -216,10 +215,8 @@ export function createData(config: CreateDataInput) {
   )
   const messageIndex = new Map<string, Map<string, number>>()
   const sync = createSync()
-  let activeUpdates: Map<string, DataSessionStatus | undefined> | undefined
 
   function setSessionActive(sessionID: string, status: DataSessionStatus) {
-    activeUpdates?.set(sessionID, status)
     setStore("session", "active", sessionID, status)
   }
 
@@ -285,11 +282,12 @@ export function createData(config: CreateDataInput) {
     setStore("session", "pending", sessionID, index, { ...item, delivery })
   }
 
-  // Inbox IDs of optimistic admissions awaiting acknowledgement, so rejection
-  // only rolls back unacknowledged rows and a pending re-fetch cannot wipe a
-  // row the server does not know about yet. Prompts clear on their durable
-  // echo, positive pending read, or rollback; compactions also reconcile the
-  // POST's canonical ID.
+  // Inbox IDs of optimistic prompt admissions still awaiting their durable
+  // echo. This is the one deliberate piece of in-flight bookkeeping in this
+  // layer: it exists so a rejection only rolls back rows the server never
+  // acknowledged, and so a concurrent pending re-fetch cannot wipe a row the
+  // server does not know about yet. Entries clear on the enqueued echo or on
+  // rollback — not on POST success, which typically precedes the echo.
   const outbox = new Set<string>()
 
   // Session IDs of optimistic create admissions still awaiting acknowledgement
@@ -303,12 +301,11 @@ export function createData(config: CreateDataInput) {
   // to exist server-side instead of failing with "not found".
   const creating = new Map<string, Promise<unknown>>()
 
-  // Per-session send chain: prompts and compactions must be admitted in
-  // submission order. Each waits for the previous POST to settle, so one
-  // failure does not block the next.
+  // Per-session send chain: prompts must be admitted in submission order,
+  // and HTTP gives no ordering across concurrent POSTs. Each prompt waits
+  // for the previous prompt's POST (settled, so one failure does not block
+  // the next) before sending its own.
   const sending = new Map<string, Promise<unknown>>()
-  const compacting = new Map<string, { id: string; observed: Set<string>; request: Promise<SessionInboxCompaction> }>()
-  onCleanup(() => compacting.clear())
 
   // Register `promise` under `key` until it settles. A later registration
   // replaces an earlier one; settlement only clears its own entry.
@@ -320,24 +317,9 @@ export function createData(config: CreateDataInput) {
     void promise.then(settle, settle)
   }
 
-  // Capture creation before settlement clears its entry, so dependent RPCs still see a failed create.
-  function sendAdmission<Value>(sessionID: string, send: () => Promise<Value>, gate?: Promise<unknown>) {
-    const created = creating.get(sessionID)
-    const previous = sending.get(sessionID)
-    const request = Promise.resolve()
-      .then(() => Promise.all([gate, created, previous]))
-      .then(send)
-    track(
-      sending,
-      sessionID,
-      request.catch(() => undefined),
-    )
-    return request
-  }
-
   // Upsert an admitted inbox item into pending, input, and (for user and
   // synthetic items) the visible transcript. Used by the inbox.enqueued
-  // handler and by optimistic admission; the upsert is what reconciles
+  // handler and by optimistic prompt admission; the upsert is what reconciles
   // the durable echo with an optimistic placeholder — the durable payload and
   // times replace the client's guess.
   function admitLocal(item: SessionInboxInfo) {
@@ -350,7 +332,6 @@ export function createData(config: CreateDataInput) {
         item.sessionID,
         at < 0 ? [...pending, item] : pending.map((entry, index) => (index === at ? item : entry)),
       )
-      if (item.type === "compaction") return
       const input = store.session.input[item.sessionID] ?? []
       if (!input.includes(item.id)) setStore("session", "input", item.sessionID, [...input, item.id])
       materializeInboxMessage(item)
@@ -492,7 +473,6 @@ export function createData(config: CreateDataInput) {
   }
 
   function removeSession(sessionID: string) {
-    activeUpdates?.set(sessionID, undefined)
     store.session.pending[sessionID]?.forEach((item) => outbox.delete(item.id))
     messageIndex.delete(sessionID)
     sync.invalidate(`session:${sessionID}`)
@@ -524,25 +504,17 @@ export function createData(config: CreateDataInput) {
 
   function handleEvent(event: OpenCodeEvent) {
     switch (event.type) {
-      case "server.connected": {
-        const updates = new Map<string, DataSessionStatus | undefined>()
-        activeUpdates = updates
+      case "server.connected":
         void api()
           .session.active()
           .then((active) => {
-            if (activeUpdates !== updates) return
-            // Lifecycle events received during hydration supersede the snapshot.
-            const snapshot = new Map<string, DataSessionStatus>(Object.keys(active).map((id) => [id, "running"]))
-            updates.forEach((status, id) => {
-              if (status === undefined) return snapshot.delete(id)
-              snapshot.set(id, status)
-            })
-            activeUpdates = undefined
-            setStore("session", "active", reconcile(Object.fromEntries(snapshot)))
-          })
-          .catch(() => {
-            if (activeUpdates === updates) activeUpdates = undefined
+            setStore(
+              "session",
+              "active",
+              reconcile(Object.fromEntries(Object.keys(active).map((sessionID) => [sessionID, "running" as const]))),
+            )
           })
+          .catch(() => undefined)
         void api()
           .location.get({ location: locationQuery(defaultLocation()) })
           .then((location) => {
@@ -553,7 +525,6 @@ export function createData(config: CreateDataInput) {
         void result.location.vcs.sync().catch((error) => console.error("Failed to preload VCS info", error))
         void result.project.sync().catch((error) => console.error("Failed to preload projects", error))
         return
-      }
       case "project.updated":
         setStore("project", "info", event.data.id, reconcile(event.data))
         return
@@ -685,7 +656,6 @@ export function createData(config: CreateDataInput) {
           draft.push(existing)
           message.reindex(draft, index, position)
         })
-        compacting.get(event.data.sessionID)?.observed.add(event.data.inboxID)
         return
       }
       case "session.inbox.delivery.changed":
@@ -693,7 +663,6 @@ export function createData(config: CreateDataInput) {
         return
       case "session.inbox.cancelled": {
         retractLocal(event.data.sessionID, event.data.inboxID)
-        compacting.get(event.data.sessionID)?.observed.add(event.data.inboxID)
         return
       }
       case "session.inbox.enqueued": {
@@ -704,12 +673,6 @@ export function createData(config: CreateDataInput) {
           timeCreated: event.created,
           ...event.data.item,
         })
-        if (event.data.item.type === "compaction") {
-          const active = compacting.get(event.data.sessionID)
-          active?.observed.add(event.data.inboxID)
-          if (active && active.id !== event.data.inboxID && outbox.delete(active.id))
-            removePending(event.data.sessionID, active.id)
-        }
         return
       }
       case "session.instructions.updated":
@@ -1008,7 +971,6 @@ export function createData(config: CreateDataInput) {
             time: { created: event.created },
           })
         })
-        if (event.data.inputID) compacting.get(event.data.sessionID)?.observed.add(event.data.inputID)
         return
       case "session.execution.succeeded":
       case "session.execution.failed":
@@ -1106,7 +1068,6 @@ export function createData(config: CreateDataInput) {
           }
           message.append(draft, index, failed)
         })
-        if (event.data.inputID) compacting.get(event.data.sessionID)?.observed.add(event.data.inputID)
         return
       case "permission.asked":
         if (store.session.permission[event.data.sessionID]?.some((request) => request.id === event.data.id)) return
@@ -1293,17 +1254,12 @@ export function createData(config: CreateDataInput) {
         sync(sessionID: string) {
           return sync.run(`session.pending:${sessionID}`, async () => {
             const pending = await api().session.inbox.list({ sessionID })
-            // A positive read acknowledges admission even when its SSE echo is delayed.
-            pending.forEach((item) => outbox.delete(item.id))
-            // Compactions also coalesce by Session, not just by the proposed ID.
-            if (pending.some((item) => item.type === "compaction"))
-              store.session.pending[sessionID]
-                ?.filter((item) => item.type === "compaction")
-                .forEach((item) => outbox.delete(item.id))
             // Keep optimistic rows still awaiting their echo: this fetch may
             // have raced ahead of an in-flight admission the server does not
             // know about yet.
-            const inflight = (store.session.pending[sessionID] ?? []).filter((item) => outbox.has(item.id))
+            const inflight = (store.session.pending[sessionID] ?? []).filter(
+              (item) => outbox.has(item.id) && !pending.some((row) => row.id === item.id),
+            )
             const merged = inflight.length === 0 ? pending : [...pending, ...inflight]
             batch(() => {
               setStore("session", "pending", sessionID, reconcile(merged))
@@ -1377,56 +1333,13 @@ export function createData(config: CreateDataInput) {
         if (fresh) track(creating, id, request)
         return { id, request }
       },
-      compact(input: { sessionID: string; model?: ModelRef }) {
-        const active = compacting.get(input.sessionID)
-        if (active) return active.request
-        // A known pending control ID may be consumed while setup waits. Propose
-        // a fresh ID and let the server coalesce, without duplicating its row.
-        const id = SessionMessage.ID.create()
-        if (!store.session.pending[input.sessionID]?.some((item) => item.type === "compaction")) {
-          outbox.add(id)
-          admitLocal({
-            id,
-            sessionID: input.sessionID,
-            timeCreated: Date.now(),
-            type: "compaction",
-            delivery: "steer",
-            payload: {},
-          })
-        }
-        // Compaction admission can coalesce onto a different ID. Retire the
-        // speculative row on an echo, and remember consumed IDs until the POST
-        // settles so its older response cannot resurrect a queued row.
-        const observed = new Set<string>()
-        const request = sendAdmission(input.sessionID, async () => {
-          if (input.model) await api().session.switchModel({ sessionID: input.sessionID, model: input.model })
-          return api().session.compact({ sessionID: input.sessionID, id })
-        })
-          .then((item) => {
-            batch(() => {
-              outbox.delete(id)
-              if (item.id !== id) removePending(input.sessionID, id)
-              if (!observed.has(item.id) && !messageIndex.get(input.sessionID)?.has(item.id)) admitLocal(item)
-            })
-            return item
-          })
-          .catch((error) => {
-            if (outbox.delete(id)) removePending(input.sessionID, id)
-            throw error
-          })
-          .finally(() => {
-            if (compacting.get(input.sessionID)?.request === request) compacting.delete(input.sessionID)
-          })
-        compacting.set(input.sessionID, { id, observed, request })
-        return request
-      },
       // Optimistic prompt admission: render the prompt immediately under a
       // client-minted ID, send it, and let the durable inbox.enqueued echo
       // upsert that same ID with the server's payload. Server admission is
       // idempotent per ID, so retrying with the identical payload cannot
       // double-admit.
-      prompt(input: SessionPromptInput & { gate?: Promise<unknown>; prepare?: () => Promise<unknown> }) {
-        const { gate, prepare, ...request } = input
+      prompt(input: SessionPromptInput & { gate?: Promise<unknown> }) {
+        const { gate, ...request } = input
         const id = request.id ?? SessionMessage.ID.create()
         // A retry may reuse an ID that is already rendered — and possibly
         // already durable. Admit optimistically only for new IDs so a failed
@@ -1452,15 +1365,25 @@ export function createData(config: CreateDataInput) {
             },
           })
         }
-        return sendAdmission(
+        // Wrapped so even a synchronous client failure reaches the rollback.
+        // The POST additionally waits for the caller's gate, for any
+        // in-flight optimistic create of this session, and for the previous
+        // prompt's POST: the row renders now, the send happens once the
+        // session exists server-side and earlier prompts are admitted.
+        const previous = sending.get(request.sessionID)
+        const send = Promise.resolve()
+          .then(() => Promise.all([gate, creating.get(request.sessionID), previous]))
+          .then(() => api().session.prompt({ ...request, id }))
+        track(
+          sending,
           request.sessionID,
-          async () => {
-            await prepare?.()
-            return api().session.prompt({ ...request, id })
-          },
-          gate,
-        ).catch((error) => {
-          // Roll back only rows this call admitted and the server has not
+          send.then(
+            () => undefined,
+            () => undefined,
+          ),
+        )
+        return send.catch((error) => {
+          // Roll back only rows this call admitted and the echo has not
           // acknowledged: anything else is server state.
           if (fresh && outbox.delete(id)) retractLocal(request.sessionID, id)
           throw error

packages/client/test/promise.test.ts

@@ -50,8 +50,6 @@ test("exposes every standard HTTP API group", () => {
   expect(Object.keys(client.vcs)).toEqual(["get", "status", "branches", "diff"])
   expect(Object.keys(client.pty)).toEqual(["list", "create", "get", "update", "remove", "connect"])
   expect(Object.keys(client.pty.connect)).toEqual(["token"])
-  expect(Object.keys(client.experimental)).toEqual(["persistentPty"])
-  expect(client.experimental.persistentPty.read).toBeFunction()
   expect(Object.keys(client.shell)).toEqual(["list", "create", "get", "timeout", "output", "remove"])
   expect(Object.keys(client.project)).toEqual(["list", "update", "current"])
   expect(Object.keys(client.worktree)).toEqual(["list", "create", "remove", "refresh"])

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

@@ -1,400 +0,0 @@
-import { expect, test } from "bun:test"
-import { createRoot } from "solid-js"
-import { createData, type CreateDataInput } from "../src/solid"
-import { OpenCode, type OpenCodeEvent, type SessionInboxCompaction, type SessionInboxInfo } from "../src/promise"
-
-test("admits compaction before model setup and serializes the following prompt", async () => {
-  using fixture = setup()
-  const compact = fixture.data.session.compact({ sessionID, model: { providerID: "demo", id: "model" } })
-  const proposed = fixture.data.session.pending.list(sessionID)[0]
-  expect(proposed).toMatchObject({ type: "compaction", sessionID })
-  expect(fixture.calls).toEqual([])
-  expect(fixture.data.session.message.list(sessionID)).toEqual([])
-  expect(fixture.data.session.status(sessionID)).toBe("idle")
-
-  const prompt = fixture.data.session.prompt({ sessionID, text: "Follow up" })
-  expect(fixture.data.session.message.list(sessionID)).toMatchObject([{ type: "user", text: "Follow up" }])
-  await wait(() => fixture.calls.length === 1)
-  expect(fixture.calls).toEqual(["model"])
-  fixture.model.resolve()
-  await wait(() => fixture.calls.length === 2)
-  expect(fixture.calls).toEqual(["model", "compact"])
-  fixture.response.resolve(Response.json({ data: item(proposed.id) }))
-  await Promise.all([compact, prompt])
-  expect(fixture.calls).toEqual(["model", "compact", "prompt"])
-  expect(fixture.proposals).toEqual([proposed.id])
-})
-
-test("coalesces duplicate gestures until the admission request settles", async () => {
-  using fixture = setup()
-  const first = fixture.data.session.compact({ sessionID })
-  expect(fixture.data.session.compact({ sessionID })).toBe(first)
-  expect(fixture.data.session.pending.list(sessionID)).toHaveLength(1)
-  await wait(() => fixture.calls.length === 1)
-  fixture.response.resolve(Response.json({ data: item("msg_canonical") }))
-  await first
-  expect(fixture.calls).toEqual(["compact"])
-  const next = fixture.data.session.compact({ sessionID })
-  expect(next).not.toBe(first)
-  await next
-  expect(fixture.calls).toEqual(["compact", "compact"])
-  expect(new Set(fixture.proposals).size).toBe(2)
-  expect(fixture.proposals).not.toContain("msg_canonical")
-})
-
-test("substitutes the canonical response ID and reconciles its later echo", async () => {
-  using fixture = setup()
-  const request = fixture.data.session.compact({ sessionID })
-  const proposed = fixture.data.session.pending.list(sessionID)[0].id
-  await fixture.data.session.pending.sync(sessionID)
-  expect(fixture.data.session.pending.list(sessionID).map((row) => row.id)).toEqual([proposed])
-  fixture.response.resolve(Response.json({ data: item("msg_canonical") }))
-  await request
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([item("msg_canonical")])
-  fixture.enqueue("msg_canonical", 20)
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([item("msg_canonical", 20)])
-  expect(fixture.data.session.input.list(sessionID)).toEqual([])
-})
-
-test.each(["proposed", "canonical"])("adopts the %s echo before the response without duplicating it", async (kind) => {
-  using fixture = setup()
-  const request = fixture.data.session.compact({ sessionID })
-  const id = kind === "proposed" ? fixture.data.session.pending.list(sessionID)[0].id : "msg_canonical"
-  fixture.enqueue(id, 20)
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([item(id, 20)])
-  fixture.response.resolve(Response.json({ data: item(id) }))
-  await request
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([item(id, 20)])
-})
-
-test.each(["started", "cancelled", "failed"])(
-  "does not resurrect a canonical item already %s before the response",
-  async (kind) => {
-    using fixture = setup()
-    const request = fixture.data.session.compact({ sessionID })
-    fixture.enqueue("msg_canonical")
-    if (kind === "started")
-      fixture.emit({
-        ...event,
-        type: "session.compaction.started",
-        data: { sessionID, inputID: "msg_canonical", reason: "manual" },
-      })
-    if (kind === "cancelled")
-      fixture.emit({ ...event, type: "session.inbox.cancelled", data: { sessionID, inboxID: "msg_canonical" } })
-    if (kind === "failed")
-      fixture.emit({
-        ...event,
-        type: "session.compaction.failed",
-        data: {
-          sessionID,
-          inputID: "msg_canonical",
-          reason: "manual",
-          error: { type: "aborted", message: "Cancelled" },
-        },
-      })
-    expect(fixture.data.session.pending.list(sessionID)).toEqual([])
-    fixture.response.resolve(Response.json({ data: item("msg_canonical") }))
-    await request
-    expect(fixture.data.session.pending.list(sessionID)).toEqual([])
-    if (kind === "started") {
-      expect(fixture.data.session.message.list(sessionID)).toMatchObject([{ type: "compaction", status: "running" }])
-      fixture.emit({
-        ...event,
-        type: "session.compaction.ended",
-        data: { sessionID, reason: "manual", text: "Summary", recent: "Recent" },
-      })
-      expect(fixture.data.session.message.list(sessionID)).toMatchObject([
-        { type: "compaction", status: "completed", summary: "Summary" },
-      ])
-    }
-  },
-)
-
-test.each(["model", "compact"])("rolls back a rejected %s RPC and releases the following prompt", async (rpc) => {
-  using fixture = setup()
-  const request = fixture.data.session.compact({ sessionID, model: { providerID: "demo", id: "model" } })
-  const failed = request.catch((error: unknown) => error)
-  const prompt = fixture.data.session.prompt({ sessionID, text: "Follow up" })
-  if (rpc === "model") fixture.model.reject(new Error("Model setup failed"))
-  if (rpc === "compact") {
-    fixture.model.resolve()
-    fixture.response.resolve(new Response("Admission failed", { status: 500 }))
-  }
-  expect(await failed).toBeInstanceOf(Error)
-  await prompt
-  expect(fixture.data.session.pending.list(sessionID).map((row) => row.type)).toEqual(["user"])
-  expect(fixture.data.session.message.list(sessionID)).toMatchObject([{ type: "user", text: "Follow up" }])
-})
-
-test.each(["proposed", "canonical", "existing"])(
-  "preserves acknowledged %s compaction after an HTTP error",
-  async (kind) => {
-    using fixture = setup()
-    if (kind === "existing") fixture.enqueue("msg_canonical")
-    const request = fixture.data.session.compact({ sessionID })
-    const failed = request.catch((error: unknown) => error)
-    const id = kind === "proposed" ? fixture.data.session.pending.list(sessionID)[0].id : "msg_canonical"
-    if (kind !== "existing") fixture.enqueue(id)
-    expect(fixture.data.session.pending.list(sessionID)).toEqual([item(id)])
-    fixture.response.resolve(new Response("Lost response", { status: 500 }))
-    expect(await failed).toBeInstanceOf(Error)
-    expect(fixture.data.session.pending.list(sessionID)).toEqual([item(id)])
-    expect(fixture.listeners.size).toBe(1)
-  },
-)
-
-test("uses a fresh control ID when the known pending compaction starts during model setup", async () => {
-  const proposed = Promise.withResolvers<string>()
-  using fixture = setup(async (request) => {
-    if (!request.url.endsWith("/compact")) return undefined
-    const body = await request.json()
-    proposed.resolve(body.id)
-    if (body.id === "msg_existing") return Response.json({ message: "Control ID already consumed" }, { status: 409 })
-    return Response.json({ data: item(body.id) })
-  })
-  fixture.enqueue("msg_existing")
-  const request = fixture.data.session.compact({ sessionID, model: { providerID: "demo", id: "model" } })
-  const result = request.catch((error: unknown) => error)
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([item("msg_existing")])
-  await wait(() => fixture.calls.includes("model"))
-  fixture.emit({
-    ...event,
-    type: "session.compaction.started",
-    data: { sessionID, inputID: "msg_existing", reason: "manual" },
-  })
-  fixture.model.resolve()
-  expect(await proposed.promise).not.toBe("msg_existing")
-  expect(await result).toEqual(item(await proposed.promise))
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([item(await proposed.promise)])
-  expect(fixture.data.session.message.list(sessionID)).toMatchObject([
-    { id: "msg_existing", type: "compaction", status: "running" },
-  ])
-})
-
-test.each(["compaction", "canonical compaction", "user"])(
-  "preserves a fetched durable %s when SSE is delayed and HTTP fails",
-  async (type) => {
-    using fixture = setup(async (request) => {
-      if (request.url.endsWith("/prompt")) return fixture.response.promise
-      return undefined
-    })
-    const request =
-      type === "user"
-        ? fixture.data.session.prompt({ sessionID, text: "Follow up" })
-        : fixture.data.session.compact({ sessionID })
-    const result = request.catch((error: unknown) => error)
-    const id = type === "canonical compaction" ? "msg_canonical" : fixture.data.session.pending.list(sessionID)[0].id
-    const durable: SessionInboxInfo =
-      type === "user" ? { ...item(id, 20), type: "user", payload: { text: "Follow up" } } : item(id, 20)
-    fixture.pending.push(durable)
-    await fixture.data.session.pending.sync(sessionID)
-    expect(fixture.data.session.pending.list(sessionID)).toEqual([durable])
-    fixture.response.resolve(new Response("Lost response", { status: 500 }))
-    expect(await result).toBeInstanceOf(Error)
-    expect(fixture.data.session.pending.list(sessionID)).toEqual([durable])
-    if (type === "user")
-      expect(fixture.data.session.message.list(sessionID)).toMatchObject([{ id, type: "user", text: "Follow up" }])
-  },
-)
-
-test("keeps one event listener and removes it when the data owner is disposed during a gate", async () => {
-  using fixture = setup()
-  const gate = Promise.withResolvers<void>()
-  const first = fixture.data.session.prompt({ sessionID, text: "First", gate: gate.promise })
-  const compact = fixture.data.session.compact({ sessionID })
-  expect(fixture.listeners.size).toBe(1)
-  fixture.dispose()
-  expect(fixture.listeners.size).toBe(0)
-  gate.resolve()
-  fixture.response.resolve(Response.json({ data: item("msg_canonical") }))
-  await Promise.all([first, compact])
-  expect(fixture.listeners.size).toBe(0)
-})
-
-test("routes concurrent compaction observations by session through one listener", async () => {
-  const firstResponse = Promise.withResolvers<Response>()
-  const secondResponse = Promise.withResolvers<Response>()
-  using fixture = setup(async (request) => {
-    if (!request.url.endsWith("/compact")) return undefined
-    return request.url.includes(`/session/${sessionID}/`) ? firstResponse.promise : secondResponse.promise
-  })
-  const first = fixture.data.session.compact({ sessionID })
-  const second = fixture.data.session.compact({ sessionID: "ses_other" })
-  const firstID = fixture.data.session.pending.list(sessionID)[0].id
-  const secondID = fixture.data.session.pending.list("ses_other")[0].id
-  expect(fixture.listeners.size).toBe(1)
-  fixture.emit({ ...event, type: "session.inbox.cancelled", data: { sessionID, inboxID: firstID } })
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([])
-  expect(fixture.data.session.pending.list("ses_other").map((row) => row.id)).toEqual([secondID])
-
-  firstResponse.resolve(Response.json({ data: item(firstID) }))
-  secondResponse.resolve(Response.json({ data: { ...item(secondID), sessionID: "ses_other" } }))
-  await Promise.all([first, second])
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([])
-  expect(fixture.data.session.pending.list("ses_other")).toEqual([{ ...item(secondID), sessionID: "ses_other" }])
-  expect(fixture.listeners.size).toBe(1)
-})
-
-test.each(["gate", "prepare"])(
-  "a preceding prompt's failed %s does not block compaction or following model preparation",
-  async (kind) => {
-    using fixture = setup()
-    const gate = Promise.withResolvers<void>()
-    const prepared: string[] = []
-    const first = fixture.data.session
-      .prompt({
-        sessionID,
-        id: "msg_first",
-        text: "First",
-        gate: kind === "gate" ? gate.promise : undefined,
-        prepare: () => {
-          prepared.push("first")
-          return gate.promise
-        },
-      })
-      .catch((error: unknown) => error)
-    const compact = fixture.data.session.compact({ sessionID, model: { providerID: "demo", id: "first" } })
-    const following = fixture.data.session.prompt({
-      sessionID,
-      text: "Follow up",
-      prepare: () => {
-        prepared.push("following")
-        return fixture.api.session.switchModel({ sessionID, model: { providerID: "demo", id: "second" } })
-      },
-    })
-    if (kind === "prepare") await wait(() => prepared.includes("first"))
-    gate.reject(new Error("Preparation failed"))
-    expect(await first).toBeInstanceOf(Error)
-    await wait(() => fixture.calls.includes("model"))
-    expect(prepared).toEqual(kind === "prepare" ? ["first"] : [])
-    fixture.model.resolve()
-    fixture.response.resolve(Response.json({ data: item("msg_canonical") }))
-    await Promise.all([compact, following])
-    expect(fixture.calls).toEqual(["model", "compact", "model", "prompt"])
-    expect(prepared.at(-1)).toBe("following")
-    expect(fixture.data.session.message.list(sessionID)).toMatchObject([{ type: "user", text: "Follow up" }])
-  },
-)
-
-test("creation failure rejects gated prompt, compaction, and following preparation without sending their RPCs", async () => {
-  const creation = Promise.withResolvers<Response>()
-  const requested = Promise.withResolvers<void>()
-  using fixture = setup(async (request) => {
-    if (!request.url.endsWith("/api/session")) return undefined
-    requested.resolve()
-    return creation.promise
-  })
-  const gate = Promise.withResolvers<void>()
-  const prepared: string[] = []
-  const created = fixture.data.session.create({ id: sessionID })
-  const first = fixture.data.session.prompt({ sessionID, text: "First", gate: gate.promise })
-  const compact = fixture.data.session.compact({ sessionID, model: { providerID: "demo", id: "model" } })
-  const following = fixture.data.session.prompt({
-    sessionID,
-    text: "Follow up",
-    prepare: async () => {
-      prepared.push("following")
-    },
-  })
-  const results = Promise.allSettled([created.request, first, compact, following])
-  await requested.promise
-  creation.resolve(new Response("Creation failed", { status: 500 }))
-  expect((await results).map((result) => result.status)).toEqual(["rejected", "rejected", "rejected", "rejected"])
-  expect(fixture.calls).toEqual([])
-  expect(prepared).toEqual([])
-  expect(fixture.data.session.get(sessionID)).toBeUndefined()
-  expect(fixture.data.session.pending.list(sessionID)).toEqual([])
-  expect(fixture.listeners.size).toBe(1)
-  gate.resolve()
-})
-
-const sessionID = "ses_compact"
-const event = { id: "evt_compact", created: 10, durable: { aggregateID: sessionID, seq: 1, version: 1 } }
-const item = (id: string, timeCreated = 10): SessionInboxCompaction => ({
-  id,
-  sessionID,
-  timeCreated,
-  type: "compaction",
-  delivery: "steer",
-  payload: {},
-})
-
-function setup(override?: (request: Request) => Promise<Response | undefined>) {
-  const model = Promise.withResolvers<void>()
-  const response = Promise.withResolvers<Response>()
-  const calls: string[] = []
-  const proposals: string[] = []
-  const pending: SessionInboxInfo[] = []
-  const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
-  const api = OpenCode.make({
-    baseUrl: "http://opencode.local",
-    fetch: async (input, init) => {
-      const request = input instanceof Request ? input : new Request(input, init)
-      const overridden = await override?.(request)
-      if (overridden) return overridden
-      const rpc = new URL(request.url).pathname.split("/").at(-1)
-      if (rpc === "inbox") return Response.json({ data: pending })
-      if (rpc === "model") {
-        calls.push(rpc)
-        await model.promise
-        return new Response(null, { status: 204 })
-      }
-      if (rpc === "compact") {
-        calls.push(rpc)
-        proposals.push((await request.json()).id)
-        return (await response.promise).clone()
-      }
-      if (rpc === "prompt") {
-        calls.push(rpc)
-        return Response.json({
-          data: { ...item((await request.json()).id), type: "user", payload: { text: "Follow up" } },
-        })
-      }
-      throw new Error(`Unexpected request: ${request.url}`)
-    },
-  })
-  const root = createRoot((dispose) => ({
-    data: createData({
-      api: () => api,
-      directory: "/project",
-      event: {
-        on: () => () => {},
-        listen(handler) {
-          listeners.add(handler)
-          return () => listeners.delete(handler)
-        },
-      },
-    }),
-    dispose,
-  }))
-  const emit = (details: OpenCodeEvent) => listeners.forEach((listener) => listener({ name: details.type, details }))
-  return {
-    data: root.data,
-    api,
-    dispose: root.dispose,
-    [Symbol.dispose]: root.dispose,
-    model,
-    response,
-    calls,
-    proposals,
-    pending,
-    listeners,
-    emit,
-    enqueue(id: string, created = 10) {
-      emit({
-        ...event,
-        created,
-        type: "session.inbox.enqueued",
-        data: { sessionID, inboxID: id, item: { type: "compaction", delivery: "steer", payload: {} } },
-      })
-    },
-  }
-}
-
-async function wait(predicate: () => boolean) {
-  for (let attempt = 0; attempt < 100; attempt++) {
-    if (predicate()) return
-    await Bun.sleep(5)
-  }
-  throw new Error("Timed out waiting for request")
-}

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

@@ -485,102 +485,6 @@ test("preserves assistant content replacement events across an active message re
   }
 })
 
-test.each([
-  "session.execution.succeeded",
-  "session.execution.failed",
-  "session.execution.interrupted",
-  "session.execution.started",
-  "session.deleted",
-] as const)("preserves %s activity when an older snapshot arrives", async (type) => {
-  const release = Promise.withResolvers<void>()
-  const requested = Promise.withResolvers<void>()
-  const setup = activityFixture(async () => {
-    requested.resolve()
-    await release.promise
-    return Response.json({
-      data: {
-        ...(type === "session.execution.started" ? {} : { ses_refresh: { type: "running" } }),
-        ses_hydrated: { type: "running" },
-      },
-    })
-  })
-
-  try {
-    if (type !== "session.execution.started") setup.data.session.setStatus("ses_refresh", "running")
-    setup.emit({ type: "server.connected", data: {} })
-    await requested.promise
-    setup.emit({
-      id: "evt_activity",
-      created: 2,
-      type,
-      durable: { aggregateID: "ses_refresh", seq: 2, version: 1 },
-      data: { sessionID: "ses_refresh", reason: "user" },
-    })
-    expect(setup.data.session.status("ses_refresh")).toBe(type === "session.execution.started" ? "running" : "idle")
-    release.resolve()
-    await wait(() => setup.data.session.status("ses_hydrated") === "running")
-    expect(setup.data.session.status("ses_refresh")).toBe(type === "session.execution.started" ? "running" : "idle")
-  } finally {
-    release.resolve()
-    setup.dispose()
-  }
-})
-
-test("ignores activity snapshots from an older connection", async () => {
-  const reads: ReturnType<typeof Promise.withResolvers<Response>>[] = []
-  const setup = activityFixture(() => {
-    const read = Promise.withResolvers<Response>()
-    reads.push(read)
-    return read.promise
-  })
-
-  try {
-    setup.emit({ type: "server.connected", data: {} })
-    await wait(() => reads.length === 1)
-    setup.emit({ type: "server.connected", data: {} })
-    await wait(() => reads.length === 2)
-    reads[1]?.resolve(Response.json({ data: { ses_new: { type: "running" } } }))
-    await wait(() => setup.data.session.status("ses_new") === "running")
-    reads[0]?.resolve(Response.json({ data: { ses_old: { type: "running" } } }))
-    await Bun.sleep(20)
-    expect(setup.data.session.status("ses_new")).toBe("running")
-    expect(setup.data.session.status("ses_old")).toBe("idle")
-  } finally {
-    reads.forEach((read) => read.resolve(Response.json({ data: {} })))
-    setup.dispose()
-  }
-})
-
-function activityFixture(read: () => Response | Promise<Response>) {
-  const listeners = new Set<Parameters<CreateDataInput["event"]["listen"]>[0]>()
-  const api = OpenCode.make({
-    baseUrl: "http://opencode.local",
-    fetch: async (input, init) => {
-      const request = input instanceof Request ? input : new Request(input, init)
-      const path = new URL(request.url).pathname
-      if (path === "/api/session/active") return read()
-      if (path === "/api/project") return Response.json([])
-      if (path === "/api/location") return Response.json({ directory: "/project" })
-      return Response.json({ location: { directory: "/project" }, data: { branch: "main" } })
-    },
-  })
-  return createRoot((dispose) => ({
-    data: createData({
-      api: () => api,
-      directory: "/project",
-      event: {
-        on: () => () => {},
-        listen(handler) {
-          listeners.add(handler)
-          return () => listeners.delete(handler)
-        },
-      },
-    }),
-    emit: (details: OpenCodeEvent) => listeners.forEach((listener) => listener({ name: details.type, details })),
-    dispose,
-  }))
-}
-
 async function wait(check: () => boolean) {
   const started = Date.now()
   while (!check()) {

packages/core/src/aisdk-native.ts

@@ -84,7 +84,10 @@ export function map(input: MapInput): Mapping | undefined {
           ...mapAPIKey(input.settings),
           ...(typeof input.settings.location === "string" ? { location: input.settings.location } : {}),
           ...(typeof input.settings.project === "string" ? { project: input.settings.project } : {}),
-          ...mapGoogleOptions(input.settings),
+          ...mapGoogleOptions(
+            input.settings,
+            isStringRecord(input.settings.labels) ? { labels: input.settings.labels } : {},
+          ),
         },
         ...(isStringRecord(input.settings.headers) ? { headers: input.settings.headers } : {}),
       }
@@ -293,7 +296,7 @@ function mapAPIKey(settings: Readonly<Record<string, unknown>>) {
   return typeof settings.apiKey === "string" ? { apiKey: settings.apiKey } : {}
 }
 
-function mapGoogleOptions(settings: Readonly<Record<string, unknown>>) {
+function mapGoogleOptions(settings: Readonly<Record<string, unknown>>, extra: Readonly<Record<string, unknown>> = {}) {
   const input = settings.thinkingConfig
   const thinkingConfig = {
     ...(isRecord(input) && typeof input.thinkingBudget === "number" ? { thinkingBudget: input.thinkingBudget } : {}),
@@ -308,6 +311,7 @@ function mapGoogleOptions(settings: Readonly<Record<string, unknown>>) {
     ...(Array.isArray(settings.safetySettings) ? { safetySettings: settings.safetySettings } : {}),
     ...(typeof settings.serviceTier === "string" ? { serviceTier: settings.serviceTier } : {}),
     ...(Object.keys(thinkingConfig).length > 0 ? { thinkingConfig } : {}),
+    ...extra,
   }
   if (Object.keys(options).length === 0) return {}
   return { providerOptions: options }
@@ -341,21 +345,28 @@ function mapOpenRouter(
 }
 
 function mapOpenRouterOptions(settings: Readonly<Record<string, unknown>>) {
-  return mapProviderOptions(settings, [
-    "apiKey",
-    "api_keys",
-    "appName",
-    "appUrl",
-    "authToken",
-    "baseURL",
-    "chunkTimeout",
-    "compatibility",
-    "extraBody",
-    "fetch",
-    "headers",
-    "promptCacheKey",
-    "timeout",
-  ])
+  const options = Object.fromEntries(
+    Object.entries(settings).filter(
+      ([key]) =>
+        ![
+          "apiKey",
+          "api_keys",
+          "appName",
+          "appUrl",
+          "authToken",
+          "baseURL",
+          "chunkTimeout",
+          "compatibility",
+          "extraBody",
+          "fetch",
+          "headers",
+          "promptCacheKey",
+          "timeout",
+        ].includes(key),
+    ),
+  )
+  if (Object.keys(options).length === 0) return {}
+  return { providerOptions: options }
 }
 
 function isStringRecord(value: unknown): value is Readonly<Record<string, string>> {

packages/core/src/aisdk.ts

@@ -612,12 +612,12 @@ function streamLanguage(language: LanguageModelV3, options: LanguageModelV3CallO
     Stream.unwrap(
       Effect.tryPromise({
         try: () => language.doStream(options),
-        catch: (error) => llmError(error, "request"),
+        catch: llmError,
       }).pipe(
         Effect.map((result) =>
           Stream.fromReadableStream({
             evaluate: () => result.stream,
-            onError: (error) => llmError(error, "read"),
+            onError: llmError,
           }).pipe(
             Stream.mapEffect((event) => streamPartEvents(state, event)),
             Stream.flatMap((events) => Stream.fromIterable(events)),
@@ -744,7 +744,7 @@ function streamPartEvents(
         }),
       ])
     case "error":
-      return Effect.fail(llmError(event.error, "read"))
+      return Effect.fail(llmError(event.error))
   }
 }
 
@@ -794,20 +794,9 @@ function messageValue(input: unknown) {
   }
 }
 
-function llmError(error: unknown, operation: "request" | "read") {
+function llmError(error: unknown) {
   if (error instanceof AIError) return error
   if (APICallError.isInstance(error)) return apiCallError(error)
-  const network = networkFailure(error)
-  if (network)
-    return new AIError({
-      reason: new TransportError({
-        message: network.message.trim() === "" ? unknownErrorMessage(error) : network.message,
-        cause: error,
-        transport: "http",
-        operation,
-        code: network.code,
-      }),
-    })
   return new AIError({
     reason: new UnknownProviderError({
       message: unknownErrorMessage(error),
@@ -817,50 +806,6 @@ function llmError(error: unknown, operation: "request" | "read") {
   })
 }
 
-// Runtime-generated network failure shapes. The codes mirror the AI SDK's own
-// Bun network error list in handleFetchError; the messages are undici's fetch
-// TypeError and stream termination strings plus our SSE chunk timeout error.
-// Unrecognized shapes still retry via the UnknownProvider default; this match
-// only adds transport semantics (continuation eligibility, display).
-const NETWORK_ERROR_CODES = new Set([
-  "ECONNRESET",
-  "ECONNREFUSED",
-  "ETIMEDOUT",
-  "EPIPE",
-  "ConnectionRefused",
-  "ConnectionClosed",
-  "FailedToOpenSocket",
-])
-const NETWORK_ERROR_MESSAGES = new Set([
-  "fetch failed",
-  "failed to fetch",
-  "terminated",
-  "other side closed",
-  "sse read timed out",
-])
-
-const NativeErrorShape = Schema.Struct({
-  message: Schema.String,
-  code: Schema.optionalKey(Schema.String),
-  cause: Schema.optionalKey(Schema.Unknown),
-})
-const decodeNativeErrorShape = Schema.decodeUnknownOption(NativeErrorShape)
-
-function networkFailure(error: unknown, depth = 0): { message: string; code?: string } | undefined {
-  if (depth > 4) return undefined
-  const shape = Option.getOrUndefined(decodeNativeErrorShape(error))
-  if (!shape) return undefined
-  // Prefer the deepest match: wrappers like undici's "fetch failed" TypeError
-  // carry the specific network code on their cause.
-  const cause = networkFailure(shape.cause, depth + 1)
-  if (cause) return cause
-  if (shape.code !== undefined && (NETWORK_ERROR_CODES.has(shape.code) || shape.code.startsWith("UND_ERR")))
-    return { message: shape.message, code: shape.code }
-  if (NETWORK_ERROR_MESSAGES.has(shape.message.trim().toLowerCase()))
-    return { message: shape.message, code: shape.code }
-  return undefined
-}
-
 function apiCallError(error: APICallError) {
   const failure = RequestExecutor.httpFailure({
     message: providerErrorMessage(error),

packages/core/src/config.ts

@@ -4,7 +4,9 @@ import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import path from "path"
 import { isDeepStrictEqual } from "node:util"
 import { type ParseError, parse } from "jsonc-parser"
+import { applyEdits, modify } from "jsonc-parser"
 import { Context, Effect, Layer, Option, PubSub, Ref, Schema, Semaphore, Stream } from "effect"
+import { produce, type Draft } from "immer"
 import {
   AgentsDirectory,
   ClaudeDirectory,
@@ -14,6 +16,7 @@ import {
   type Entry,
   Event,
 } from "@opencode-ai/schema/config"
+import { isRecord } from "@opencode-ai/ai/utils/record"
 import { Credential } from "./credential.js"
 import { Bus } from "./bus.js"
 import { Watcher } from "./filesystem/watcher.js"
@@ -33,6 +36,8 @@ export function latest<K extends keyof Info>(entries: readonly Entry[], key: K):
 export interface Interface {
   /** Returns location config documents and discovery sources from lowest to highest priority. */
   readonly entries: () => Effect.Effect<Entry[]>
+  /** Updates the first file-backed configuration document. */
+  readonly update: (update: (draft: Draft<Info>) => void) => Effect.Effect<Info, UpdateError>
   /**
    * Streams raw filesystem updates under config roots. Config owns root
    * topology and watch reconciliation; domain owners filter this feed for the
@@ -41,6 +46,11 @@ export interface Interface {
   readonly changes: () => Stream.Stream<Watcher.Update>
 }
 
+export class UpdateError extends Schema.TaggedError<UpdateError>()("Config.UpdateError", {
+  message: Schema.String,
+  cause: Schema.optional(Schema.Defect()),
+}) {}
+
 export const Options = Schema.Struct({
   project: Schema.optional(Schema.Boolean),
   // false skips the global config dir, ~/.claude, and ~/.agents; wellknown,
@@ -70,6 +80,20 @@ export const testLayer = (initial: Entry[] = []) =>
       const updates = yield* PubSub.unbounded<Watcher.Update>()
       const service = Test.of({
         entries: () => Ref.get(entries),
+        update: (update) =>
+          Effect.gen(function* () {
+            const current = yield* Ref.get(entries)
+            const index = current.findIndex((entry) => entry.type === "document" && entry.path !== undefined)
+            const entry = current[index]
+            if (!entry || entry.type !== "document")
+              return yield* Effect.fail(new UpdateError({ message: "No editable config document found" }))
+            const info = yield* Effect.try({
+              try: () => produce(entry.info, update),
+              catch: (cause) => new UpdateError({ message: "Config update failed", cause }),
+            })
+            yield* Ref.set(entries, current.with(index, new Document({ type: "document", path: entry.path, info })))
+            return info
+          }),
         changes: () => Stream.fromPubSub(updates),
         setEntries: (next) => Ref.set(entries, next),
         emitChange: (update) => PubSub.publish(updates, update).pipe(Effect.asVoid),
@@ -376,10 +400,54 @@ export const layer = (options?: Options) =>
       )
       yield* reconcile(initial)
 
+      const update = Effect.fn("Config.update")((mutate: (draft: Draft<Info>) => void) =>
+        reloadLock.withPermit(
+          Effect.gen(function* () {
+            // TODO: Replace entry-order selection with an explicit config scope/target model.
+            const document = configs.find((entry) => entry.type === "document" && entry.path !== undefined)
+            if (!document || document.type !== "document" || !document.path)
+              return yield* Effect.fail(new UpdateError({ message: "No editable config document found" }))
+            const next = yield* Effect.try({
+              try: () => produce(document.info, mutate),
+              catch: (cause) => new UpdateError({ message: "Config update failed", cause }),
+            })
+            const edits = changes(document.info, next)
+            if (!edits.length) return document.info
+            const text = yield* fs
+              .readFileString(document.path)
+              .pipe(
+                Effect.mapError(
+                  (cause) => new UpdateError({ message: `Failed to read config: ${document.path}`, cause }),
+                ),
+              )
+            const updated = edits.reduce(
+              (text, edit) =>
+                applyEdits(
+                  text,
+                  modify(text, edit.path, edit.value, { formattingOptions: { tabSize: 2, insertSpaces: true } }),
+                ),
+              text,
+            )
+            const info = yield* parseInfo(updated, document.path)
+            if (!info)
+              return yield* Effect.fail(new UpdateError({ message: `Invalid config update: ${document.path}` }))
+            const temporary = document.path + ".tmp"
+            yield* fs.writeFileString(temporary, updated.endsWith("\n") ? updated : updated + "\n").pipe(
+              Effect.andThen(fs.rename(temporary, document.path)),
+              Effect.mapError(
+                (cause) => new UpdateError({ message: `Failed to write config: ${document.path}`, cause }),
+              ),
+            )
+            return info
+          }),
+        ),
+      )
+
       return Service.of({
         entries: Effect.fnUntraced(function* () {
           return configs
         }),
+        update,
         changes: () => Stream.fromPubSub(updates),
       })
     }),
@@ -394,3 +462,17 @@ export function configured(options?: Options) {
 }
 
 export const node = configured()
+
+type Edit = { readonly path: (string | number)[]; readonly value: unknown }
+
+function changes(before: unknown, after: unknown, path: (string | number)[] = []): Edit[] {
+  if (Object.is(before, after)) return []
+  if (isRecord(before) && isRecord(after)) {
+    return [...new Set([...Object.keys(before), ...Object.keys(after)])].flatMap((key) => {
+      if (!(key in after)) return [{ path: [...path, key], value: undefined }]
+      if (!(key in before)) return [{ path: [...path, key], value: after[key] }]
+      return changes(before[key], after[key], [...path, key])
+    })
+  }
+  return [{ path, value: after }]
+}

packages/core/src/config/file.ts

@@ -1,150 +0,0 @@
-export * as ConfigFile from "./file.js"
-
-import { isDeepStrictEqual } from "node:util"
-import { isRecord } from "@opencode-ai/ai/utils/record"
-import { FSUtil } from "@opencode-ai/util/fs-util"
-import { Effect, Schema, Semaphore } from "effect"
-import {
-  applyEdits,
-  createScanner,
-  findNodeAtLocation,
-  modify,
-  parseTree,
-  type Node,
-  type ParseError,
-} from "jsonc-parser"
-
-export class UpdateError extends Schema.TaggedError<UpdateError>()("ConfigFile.UpdateError", {
-  message: Schema.String,
-  cause: Schema.optional(Schema.Defect()),
-}) {}
-
-const isJson = Schema.is(Schema.MutableJson)
-const isDocument = (value: unknown): value is Schema.MutableJsonObject => isRecord(value) && isJson(value)
-const lock = Semaphore.makeUnsafe(1)
-
-/**
- * Edits an existing JSON(C) file using raw source values, not resolved Config.Info.
- * The synchronous callback mutates a source clone; its return value is ignored.
- * Validates JSON only; normalization and substitution remain the reader's job.
- * Does not discover files, start watchers, or refresh Config state.
- * Read-modify-write calls are serialized within this process.
- */
-export const update = Effect.fn("ConfigFile.update")(
-  function* (
-    filepath: string,
-    mutate: (draft: Schema.MutableJsonObject) => void,
-  ): Effect.fn.Return<Schema.JsonObject, UpdateError, FSUtil.Service> {
-    const fs = yield* FSUtil.Service
-    const text = yield* fs
-      .readFileString(filepath)
-      .pipe(Effect.mapError((cause) => new UpdateError({ message: `Failed to read config: ${filepath}`, cause })))
-    const errors: ParseError[] = []
-    const current = parseSource(text, errors)
-    if (errors.length || !isDocument(current))
-      return yield* Effect.fail(new UpdateError({ message: `Invalid config file: ${filepath}` }))
-
-    const next = yield* Effect.try({
-      try: () => {
-        const draft = structuredClone(current)
-        mutate(draft)
-        return draft
-      },
-      catch: (cause) => new UpdateError({ message: "Config update failed", cause }),
-    })
-    if (!isDocument(next))
-      return yield* Effect.fail(new UpdateError({ message: `Config update must produce a JSON object: ${filepath}` }))
-
-    const edits = changes(current, next)
-    if (!edits.length) return next
-    const updated = yield* Effect.try({
-      try: () => edits.reduce(patch, text),
-      catch: (cause) => new UpdateError({ message: `Failed to patch config: ${filepath}`, cause }),
-    })
-    // Duplicate keys can make parse choose the last value while modify edits the first.
-    const written = parseSource(updated, errors)
-    if (errors.length || !isDeepStrictEqual(written, next))
-      return yield* Effect.fail(
-        new UpdateError({ message: `Config patch does not match the requested update: ${filepath}` }),
-      )
-    const temporary = filepath + ".tmp"
-    yield* fs.writeFileString(temporary, updated.endsWith("\n") ? updated : updated + "\n").pipe(
-      Effect.andThen(fs.rename(temporary, filepath)),
-      Effect.mapError((cause) => new UpdateError({ message: `Failed to write config: ${filepath}`, cause })),
-    )
-    return next
-  },
-  (effect) => lock.withPermit(effect),
-)
-
-type Edit = { readonly path: (string | number)[]; readonly value: unknown }
-
-function parseSource(text: string, errors: ParseError[]) {
-  const root = parseTree(text, errors, { allowTrailingComma: true })
-  if (!root || errors.length) return undefined
-  // parse() assigns onto {}, invoking the __proto__ setter instead of retaining
-  // an own JSON key. Construct object entries from the AST without those setters.
-  const value = (node: Node): unknown => {
-    if (node.type === "array") return (node.children ?? []).map(value)
-    if (node.type === "object")
-      return Object.fromEntries(
-        (node.children ?? []).map((property) => {
-          const child = property.children?.[1]
-          return [property.children?.[0]?.value, child && value(child)]
-        }),
-      )
-    return node.value
-  }
-  return value(root)
-}
-
-function patch(text: string, edit: Edit) {
-  if (edit.value !== undefined)
-    return applyEdits(
-      text,
-      modify(text, edit.path, edit.value, { formattingOptions: { tabSize: 2, insertSpaces: true } }),
-    )
-
-  const tree = parseTree(text)
-  const node = tree && findNodeAtLocation(tree, edit.path)
-  if (!node) return text
-  // jsonc-parser removes adjacent comments along with the separator. Remove only
-  // the property/element itself and one comma, leaving surrounding comments intact.
-  const target = node.parent?.type === "property" ? node.parent : node
-  const siblings = target.parent?.children ?? []
-  const previous = siblings[siblings.indexOf(target) - 1]
-  const scanner = createScanner(text, true)
-  scanner.setPosition(target.offset + target.length)
-  scanner.scan()
-  const following = text[scanner.getTokenOffset()] === ","
-  if (!following && previous) {
-    scanner.setPosition(previous.offset + previous.length)
-    scanner.scan()
-  }
-  return applyEdits(text, [
-    { offset: target.offset, length: target.length, content: "" },
-    ...(following || previous ? [{ offset: scanner.getTokenOffset(), length: 1, content: "" }] : []),
-  ])
-}
-
-function changes(before: unknown, after: unknown, path: (string | number)[] = []): Edit[] {
-  if (isDeepStrictEqual(before, after)) return []
-  if (Array.isArray(before) && Array.isArray(after)) {
-    return [
-      ...after.flatMap((value, index) => changes(before[index], value, [...path, index])),
-      // Remove from the end so earlier deletions cannot shift later paths.
-      ...before
-        .slice(after.length)
-        .map((_, index) => ({ path: [...path, after.length + index], value: undefined }))
-        .toReversed(),
-    ]
-  }
-  if (isRecord(before) && isRecord(after)) {
-    return [...new Set([...Object.keys(before), ...Object.keys(after)])].flatMap((key) => {
-      if (!Object.hasOwn(after, key)) return [{ path: [...path, key], value: undefined }]
-      if (!Object.hasOwn(before, key)) return [{ path: [...path, key], value: after[key] }]
-      return changes(before[key], after[key], [...path, key])
-    })
-  }
-  return [{ path, value: after }]
-}

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

@@ -87,6 +87,7 @@ export const Plugin = define({
                   ...input.prompt,
                   sessionID: input.sessionID,
                   text: yield* evaluateTemplate(command.template, input.prompt.text, {
+                    config,
                     location,
                     processes,
                     shell,
@@ -151,6 +152,7 @@ function evaluateTemplate(
   template: string,
   input: string,
   services: {
+    readonly config: Config.Interface
     readonly location: Location.Info
     readonly processes: AppProcess.Interface
     readonly shell: ShellSelect.Interface

packages/core/src/filesystem/search.ts

@@ -135,7 +135,7 @@ export const fffLayer = Layer.effect(
         find: () => Effect.succeed([]),
       })
     }
-    yield* Effect.addFinalizer(() => Effect.sync(() => result.value.destroy()))
+    yield* Effect.addFinalizer(() => Effect.sync(() => result.value.destroy()).pipe(Effect.ignore))
     return Service.of({
       find: (input) =>
         Effect.sync(() => {

packages/core/src/instance.ts

@@ -23,6 +23,7 @@ import { Mcp } from "./mcp/index.js"
 import { Permission } from "./permission.js"
 import { Plugin } from "./plugin.js"
 import { PluginHooks } from "./plugin/hooks.js"
+import { PluginExecution } from "./plugin/execution.js"
 import { InstancePlugins } from "./plugin/instance.js"
 import { PluginSupervisor } from "./plugin/supervisor.js"
 import { Worktree } from "./worktree.js"
@@ -67,6 +68,7 @@ const nodes = [
   AISDK.node,
   Plugin.node,
   PluginHooks.node,
+  PluginExecution.node,
   InstancePlugins.node,
   PluginSupervisor.node,
   Worktree.refreshNode,

packages/core/src/job.ts

@@ -213,7 +213,7 @@ export const make = Effect.gen(function* () {
         return [{ info: snapshot(next), done: job.done, scope: job.scope }, new Map(jobs).set(id, next)]
       }),
     )
-    if (result.info && result.done) yield* Deferred.succeed(result.done, result.info)
+    if (result.info && result.done) yield* Deferred.succeed(result.done, result.info).pipe(Effect.ignore)
     if (result.scope) {
       yield* Scope.close(result.scope, Exit.void).pipe(Effect.forkIn(state.scope, { startImmediately: true }))
     }
@@ -346,7 +346,8 @@ export const make = Effect.gen(function* () {
         return [{ info: snapshot(next), backgrounded: job.backgrounded }, new Map(jobs).set(id, next)]
       }),
     )
-    if (result.info && result.backgrounded) yield* Deferred.succeed(result.backgrounded, result.info)
+    if (result.info && result.backgrounded)
+      yield* Deferred.succeed(result.backgrounded, result.info).pipe(Effect.ignore)
     return result.info
   })
 
@@ -395,7 +396,7 @@ export const make = Effect.gen(function* () {
         return [{ info: snapshot(next), done: job.done, scope: job.scope }, new Map(jobs).set(id, next)]
       }),
     )
-    if (result.info && result.done) yield* Deferred.succeed(result.done, result.info)
+    if (result.info && result.done) yield* Deferred.succeed(result.done, result.info).pipe(Effect.ignore)
     if (result.scope) yield* Scope.close(result.scope, Exit.void)
     return result.info
   })

packages/core/src/mcp/client.ts

@@ -10,14 +10,17 @@ import {
   CallToolResultSchema,
   ElicitationCompleteNotificationSchema,
   ElicitRequestSchema,
+  GetPromptResultSchema,
   type Implementation,
   type ElicitRequestFormParams,
   type ElicitRequestParams,
   type ElicitRequestURLParams,
   type ElicitResult,
+  ListPromptsResultSchema,
   ListRootsRequestSchema,
   ListToolsResultSchema,
   PromptListChangedNotificationSchema,
+  PromptSchema,
   ResourceListChangedNotificationSchema,
   type LoggingMessageNotification,
   LoggingMessageNotificationSchema,
@@ -38,6 +41,10 @@ const toError = (error: unknown) => (error instanceof Error ? error : new Error(
 const TolerantListToolsResult = ListToolsResultSchema.extend({
   tools: ToolSchema.omit({ outputSchema: true }).array(),
 })
+const TolerantListPromptsResult = ListPromptsResultSchema.extend({
+  prompts: PromptSchema.array(),
+})
+
 export class NeedsAuthError extends Schema.TaggedError<NeedsAuthError>()("MCP.NeedsAuthError", {
   server: Schema.String,
 }) {
@@ -294,8 +301,12 @@ export const connect = Effect.fnUntraced(function* (
           const prompts = yield* Effect.tryPromise({
             try: () =>
               paginate(
-                (cursor) =>
-                  client.listPrompts(cursor === undefined ? undefined : { cursor }, { timeout: catalogTimeout }),
+                async (cursor) => {
+                  const params = cursor === undefined ? undefined : { cursor }
+                  return client.request({ method: "prompts/list", params }, TolerantListPromptsResult, {
+                    timeout: catalogTimeout,
+                  })
+                },
                 (result) => result.prompts,
               ),
             catch: toError,
@@ -385,7 +396,11 @@ export const connect = Effect.fnUntraced(function* (
       prompt: (input) =>
         Effect.tryPromise({
           try: (signal) =>
-            client.getPrompt({ name: input.name, arguments: input.args ?? {} }, { signal, timeout: executionTimeout }),
+            client.request(
+              { method: "prompts/get", params: { name: input.name, arguments: input.args ?? {} } },
+              GetPromptResultSchema,
+              { signal, timeout: executionTimeout },
+            ),
           catch: toError,
         }).pipe(
           Effect.map((result) => ({

packages/core/src/mcp/index.ts

@@ -473,11 +473,11 @@ export const layer = (options?: Options) =>
             Effect.gen(function* () {
               entry.status = { status: "failed", error: "Connection closed" }
               yield* stopServer(name, entry)
-              yield* bus.publish(McpEvent.StatusChanged, { server: name })
+              yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
             }),
           ),
         )
-        connection.onLog((message) => fork(serverLog(name, message)))
+        connection.onLog((message) => fork(serverLog(name, message).pipe(Effect.ignore)))
         connection.onToolsChanged(() =>
           live(
             refreshTools(name, entry, connection).pipe(
@@ -512,7 +512,7 @@ export const layer = (options?: Options) =>
           // Announce the handshake so connect() and credential reconnects don't show a stale
           // disabled/failed status for the duration of the connection attempt.
           entry.status = { status: "pending" }
-          yield* bus.publish(McpEvent.StatusChanged, { server: name })
+          yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
           const scope = yield* Scope.fork(root)
           entry.scope = scope
           const authProvider = yield* connectProvider(entry)
@@ -543,9 +543,9 @@ export const layer = (options?: Options) =>
             // Announce the new tool set so the tool registry registers it. A server that finishes connecting
             // after the initial registration sweep and emits no list-changed notification would otherwise
             // stay invisible to the model.
-            yield* bus.publish(McpEvent.ToolsChanged, { server: name })
-            yield* bus.publish(McpEvent.ResourcesChanged, { server: name })
-            yield* bus.publish(McpEvent.StatusChanged, { server: name })
+            yield* bus.publish(McpEvent.ToolsChanged, { server: name }).pipe(Effect.ignore)
+            yield* bus.publish(McpEvent.ResourcesChanged, { server: name }).pipe(Effect.ignore)
+            yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
             whenLive(name, entry, result.value.connection)(refreshPrompts(name, entry, result.value.connection))
             return
           }
@@ -557,7 +557,7 @@ export const layer = (options?: Options) =>
               ? { status: "needs_auth" }
               : { status: "failed", error: error instanceof Error ? error.message : String(error) }
           yield* Effect.logWarning("mcp connect failed", { server: name, status: entry.status })
-          yield* bus.publish(McpEvent.StatusChanged, { server: name })
+          yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
         }).pipe(Effect.ensuring(entry.startup.open))
 
       const stopServer = Effect.fnUntraced(function* (name: ServerName, entry: ServerEntry) {
@@ -568,9 +568,9 @@ export const layer = (options?: Options) =>
         entry.tools = undefined
         entry.prompts = undefined
         yield* Scope.close(scope, Exit.void)
-        yield* bus.publish(McpEvent.ToolsChanged, { server: name })
-        yield* bus.publish(McpEvent.ResourcesChanged, { server: name })
-        yield* bus.publish(PromptsChanged, { server: name })
+        yield* bus.publish(McpEvent.ToolsChanged, { server: name }).pipe(Effect.ignore)
+        yield* bus.publish(McpEvent.ResourcesChanged, { server: name }).pipe(Effect.ignore)
+        yield* bus.publish(PromptsChanged, { server: name }).pipe(Effect.ignore)
       })
 
       const disposeServer = Effect.fnUntraced(function* (name: ServerName, entry: ServerEntry) {
@@ -592,7 +592,7 @@ export const layer = (options?: Options) =>
           yield* register(name, entry)
           if (serverConfig.disabled) {
             entry.status = { status: "disabled" }
-            yield* bus.publish(McpEvent.StatusChanged, { server: name })
+            yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
             return
           }
           yield* startServer(name, entry)
@@ -608,7 +608,7 @@ export const layer = (options?: Options) =>
         yield* disposeServer(name, entry)
         // Credentials are keyed by name + URL and intentionally survive removal for a later re-add.
         entries.delete(name)
-        yield* bus.publish(McpEvent.StatusChanged, { server: name })
+        yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
       })
 
       let applied: Map<ServerName, Mcp.ServerConfig> | undefined
@@ -631,7 +631,7 @@ export const layer = (options?: Options) =>
             if (entry.config.disabled) {
               entry.status = { status: "disabled" }
               entry.startup.openUnsafe()
-              yield* bus.publish(McpEvent.StatusChanged, { server: name })
+              yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
               continue
             }
             fork(startServer(name, entry).pipe(locks.withLock(name)))
@@ -673,6 +673,7 @@ export const layer = (options?: Options) =>
         bus.subscribe(Credential.Event.Switched).pipe(
           Stream.filter((event) => owned.has(event.data.integrationID)),
           Stream.runForEach((event) => Effect.sync(() => fork(reconnect(event.data.integrationID)))),
+          Effect.ignore,
         ),
       )
       const state = State.create<Data, Draft>({
@@ -737,7 +738,7 @@ export const layer = (options?: Options) =>
             const target = yield* requireServer(name)
             yield* stopServer(name, target.entry)
             target.entry.status = { status: "disabled" }
-            yield* bus.publish(McpEvent.StatusChanged, { server: name })
+            yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore)
           }).pipe(locks.withLock(name))
         }),
         remove: Effect.fn("MCP.remove")(function* (server) {

packages/core/src/mcp/oauth.ts

@@ -213,11 +213,20 @@ export const authorize = (input: {
       return toCredential({ methodID: input.methodID, serverUrl: input.config.url, tokens, client })
     })
 
-    yield* Effect.tryPromise({
+    const result = yield* Effect.tryPromise({
       try: () => auth(oauthProvider, { serverUrl: input.config.url, scope: oauth?.scope }),
       catch: (error) => (error instanceof Error ? error : new Error(String(error))),
     })
 
+    // The provider may already hold valid tokens (e.g. a re-auth), in which case there is no browser step.
+    if (result === "AUTHORIZED") {
+      return {
+        url: input.config.url,
+        instructions: `Connected to ${input.name}.`,
+        mode: "auto" as const,
+        callback: finalize,
+      }
+    }
     if (!authorizationUrl)
       return yield* Effect.fail(new Error(`MCP server "${input.name}" did not provide an authorization URL`))
 

packages/core/src/persistent-pty/daemon.ts

@@ -59,13 +59,6 @@ export const WireResponse = Schema.Union([
     cursor_x: Schema.Number,
     cursor_y: Schema.Number,
   }),
-  Schema.Struct({
-    type: Schema.Literal("rows"),
-    terminal: WireTerminal,
-    lines: Schema.Array(Schema.String),
-    cursor_x: Schema.Number,
-    cursor_y: Schema.Number,
-  }),
   Schema.Struct({
     type: Schema.Literal("attached"),
     terminal: WireTerminal,

packages/core/src/persistent-pty/index.ts

@@ -4,7 +4,7 @@ import os from "node:os"
 import path from "node:path"
 import { Context, Effect, Layer, Schema } from "effect"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { Added, Handoff, ReadLines, Removed, type ReadResult } from "@opencode-ai/schema/persistent-pty"
+import { Added, Handoff, Removed } from "@opencode-ai/schema/persistent-pty"
 import { Session } from "@opencode-ai/schema/session"
 import { Bus } from "../bus.js"
 import { Pty } from "@opencode-ai/schema/pty"
@@ -103,7 +103,6 @@ export interface Interface {
     data: Uint8Array,
   ) => Effect.Effect<void, NotFoundError | UnavailableError>
   readonly snapshot: (id: Pty.ID) => Effect.Effect<Snapshot, NotFoundError | UnavailableError>
-  readonly read: (sessionID: Session.ID, lines?: number) => Effect.Effect<ReadResult | null, UnavailableError>
   readonly remove: (id: Pty.ID) => Effect.Effect<void, NotFoundError | UnavailableError>
   readonly shutdown: () => Effect.Effect<void, UnavailableError>
   readonly handoff: () => Effect.Effect<Handoff | null, UnavailableError>
@@ -141,8 +140,6 @@ export const configured = (options: Options = {}) =>
         options.handoff,
       ).pipe(Effect.mapError(unavailable))
       const removing = new Set<Pty.ID>()
-      // Controller activity selects a terminal; observer reads and pane visibility do not.
-      const current = new Map<Session.ID, Pty.ID>()
 
       const list = Effect.fn("PersistentPty.list")(function* (sessionID?: Session.ID) {
         const response = yield* optionalRequest(daemon, { op: "list" })
@@ -210,7 +207,7 @@ export const configured = (options: Options = {}) =>
         rows: number,
         attachmentID?: string,
       ) {
-        const terminal = yield* get(id)
+        yield* get(id)
         const response = yield* request(daemon, {
           op: "resize",
           id: fromID(id),
@@ -219,7 +216,6 @@ export const configured = (options: Options = {}) =>
           rows,
         })
         if (response.type !== "ok") return yield* unexpected(response)
-        current.set(terminal.sessionID, id)
         return undefined
       })
 
@@ -229,7 +225,7 @@ export const configured = (options: Options = {}) =>
         cols: number,
         rows: number,
       ) {
-        const terminal = yield* get(id)
+        yield* get(id)
         const response = yield* request(daemon, {
           op: "control",
           id: fromID(id),
@@ -238,7 +234,6 @@ export const configured = (options: Options = {}) =>
           rows,
         })
         if (response.type !== "ok") return yield* unexpected(response)
-        current.set(terminal.sessionID, id)
         return undefined
       })
 
@@ -249,7 +244,7 @@ export const configured = (options: Options = {}) =>
         rows: number,
         data: Uint8Array,
       ) {
-        const terminal = yield* get(id)
+        yield* get(id)
         const response = yield* request(daemon, {
           op: "input",
           id: fromID(id),
@@ -259,7 +254,6 @@ export const configured = (options: Options = {}) =>
           data_base64: Buffer.from(data).toString("base64"),
         })
         if (response.type !== "ok") return yield* unexpected(response)
-        current.set(terminal.sessionID, id)
         return undefined
       })
 
@@ -275,46 +269,16 @@ export const configured = (options: Options = {}) =>
         }
       })
 
-      const read = Effect.fn("PersistentPty.read")(function* (sessionID: Session.ID, lines?: number) {
-        if (lines !== undefined && !Schema.is(ReadLines)(lines))
-          return yield* new UnavailableError({ message: "lines must be an integer between 1 and 65535" })
-        const id = current.get(sessionID)
-        if (!id) return null
-        const terminal = yield* get(id).pipe(Effect.catchTag("PersistentPty.NotFoundError", () => Effect.succeed(null)))
-        if (!terminal || terminal.sessionID !== sessionID) {
-          if (current.get(sessionID) === id) current.delete(sessionID)
-          return null
-        }
-        // Let the daemon choose the live height in the same snapshot when lines is omitted.
-        const response = yield* request(daemon, { op: "read_rows", id: fromID(id), rows: lines })
-        if (response.type !== "rows") return yield* unexpected(response)
-        const info = toInfo(response.terminal)
-        return {
-          ptyID: info.id,
-          title: info.title,
-          cwd: info.cwd,
-          foregroundProcess: info.foregroundProcess,
-          screen: {
-            text: response.lines.join("\n"),
-            cols: info.size.cols,
-            rows: info.size.rows,
-            cursor: { x: response.cursor_x, y: response.cursor_y },
-          },
-        }
-      })
-
       const remove = Effect.fn("PersistentPty.remove")(function* (id: Pty.ID) {
         const terminal = yield* get(id)
         const response = yield* request(daemon, { op: "terminate", id: fromID(id) })
         if (response.type !== "ok") return yield* unexpected(response)
-        if (current.get(terminal.sessionID) === id) current.delete(terminal.sessionID)
         yield* bus.publish(Removed, { sessionID: terminal.sessionID, ptyID: id })
         return undefined
       })
 
       const shutdown = Effect.fn("PersistentPty.shutdown")(function* () {
         const response = yield* daemon.shutdown.pipe(Effect.mapError(unavailable))
-        current.clear()
         if (!response) return
         if (response.type !== "ok") return yield* unexpected(response)
       })
@@ -357,7 +321,6 @@ export const configured = (options: Options = {}) =>
             },
           })
           .pipe(Effect.mapError(unavailable))
-        if (attachment.role === "controller") current.set(Session.ID.make(attachment.terminal.group_id), id)
         return {
           info: toInfo(attachment.terminal),
           role: attachment.role,
@@ -377,7 +340,6 @@ export const configured = (options: Options = {}) =>
         control,
         input,
         snapshot,
-        read,
         remove,
         shutdown,
         handoff,

packages/core/src/plugin.ts

@@ -1,5 +1,5 @@
 export * as Plugin from "./plugin.js"
-export { Event, ID, Info, Source } from "@opencode-ai/schema/plugin"
+export { Event, ID, Info, Source, PackageStatus, OperationError } from "@opencode-ai/schema/plugin"
 
 import { Plugin } from "@opencode-ai/schema/plugin"
 import type { Plugin as PluginDefinition } from "@opencode-ai/plugin/effect/plugin"
@@ -26,6 +26,7 @@ import { Vcs } from "./vcs.js"
 import { PluginHooks } from "./plugin/hooks.js"
 import { Generate } from "./generate.js"
 import { Permission } from "./permission.js"
+import { PluginExecution } from "./plugin/execution.js"
 
 export interface Interface {
   readonly activate: (
@@ -38,6 +39,8 @@ export interface Interface {
 export type Versioned = PluginDefinition & {
   readonly version: string
   readonly source?: Plugin.Source
+  readonly revision?: string
+  readonly generation?: string
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/Plugin") {}
@@ -47,8 +50,12 @@ const layer = Layer.effect(
   Effect.gen(function* () {
     const bus = yield* Bus.Service
     const kv = yield* KV.Service
+    const execution = yield* PluginExecution.Service
     const scope = yield* Scope.make()
-    const active = new Map<Plugin.ID, { readonly plugin: Versioned; readonly scope: Scope.Closeable }>()
+    const active = new Map<
+      Plugin.ID,
+      { readonly plugin: Versioned; readonly scope: Scope.Closeable; readonly error?: string }
+    >()
     const lock = Semaphore.makeUnsafe(1)
     let inventory: Plugin.Info[] = []
     let host: Parameters<PluginDefinition["effect"]>[0]
@@ -75,7 +82,7 @@ const layer = Layer.effect(
         "plugin.id": plugin.id,
         cause: loaded.cause,
       })
-      return { error: Cause.pretty(loaded.cause) } as const
+      return { error: errorMessage(loaded.cause) } as const
     })
 
     const activate = Effect.fn("Plugin.activate")(function* (
@@ -98,55 +105,84 @@ const layer = Layer.effect(
               return entry.plugin.id === definition?.id && entry.plugin.version === definition.version
             })
           ) {
-            const nextInventory = [...Array.from(active.values(), (entry) => activeInfo(entry.plugin)), ...failures]
+            const nextInventory = withFailures(
+              Array.from(active.values(), (entry) => activeInfo(entry.plugin, entry.error)),
+              failures,
+            )
             if (JSON.stringify(inventory) === JSON.stringify(nextInventory)) return
             inventory = nextInventory
             yield* bus.publish(Plugin.Event.Updated, {})
             return
           }
 
-          yield* State.batch(
-            Effect.gen(function* () {
-              const nextInventory: Plugin.Info[] = []
-              for (const definition of definitions) {
-                const previous = active.get(definition.id)
-                active.delete(definition.id)
-                if (previous) yield* Scope.close(previous.scope, Exit.void)
+          yield* execution.exclusive(
+            State.batch(
+              Effect.gen(function* () {
+                const nextInventory: Plugin.Info[] = []
+                // Registrations are append-ordered. Preserve the unchanged prefix, then rebuild the suffix.
+                const current = Array.from(active.values(), (entry) => entry.plugin)
+                const prefix = definitions.findIndex(
+                  (definition, index) =>
+                    definition.id !== current[index]?.id || definition.version !== current[index]?.version,
+                )
+                const keep = prefix === -1 ? definitions.length : prefix
+                const previousEntries = new Map(active)
+                const closing = Array.from(active.entries()).slice(keep).toReversed()
+                yield* Effect.forEach(
+                  closing,
+                  ([id, entry]) =>
+                    Effect.gen(function* () {
+                      yield* Scope.close(entry.scope, Exit.void).pipe(
+                        Effect.catchCause((cause) =>
+                          Effect.logWarning("failed to clean up plugin", { "plugin.id": id, cause }),
+                        ),
+                      )
+                      active.delete(id)
+                    }),
+                  { discard: true },
+                )
+                for (const [index, definition] of definitions.entries()) {
+                  if (index < keep) {
+                    nextInventory.push(activeInfo(definition, active.get(definition.id)?.error))
+                    continue
+                  }
+                  const previous = previousEntries.get(definition.id)
 
-                const loaded = yield* load(definition)
-                if (loaded.scope !== undefined) {
-                  active.set(definition.id, { plugin: definition, scope: loaded.scope })
-                  nextInventory.push(activeInfo(definition))
-                  continue
+                  const loaded = yield* load(definition)
+                  if (loaded.scope !== undefined) {
+                    active.set(definition.id, { plugin: definition, scope: loaded.scope })
+                    nextInventory.push(activeInfo(definition))
+                    continue
+                  }
+                  const failed: Plugin.Info = {
+                    id: definition.id,
+                    source: definition.source ?? { type: "builtin" },
+                    status: "failed",
+                    error: loaded.error,
+                    tui: definition.tui ?? false,
+                    ...(definition.revision === undefined ? {} : { revision: definition.revision }),
+                    ...(definition.generation === undefined ? {} : { generation: definition.generation }),
+                  }
+
+                  if (!previous) {
+                    nextInventory.push(failed)
+                    continue
+                  }
+                  const restored = yield* load(previous.plugin)
+                  if (restored.scope !== undefined) {
+                    active.set(definition.id, { plugin: previous.plugin, scope: restored.scope, error: loaded.error })
+                    nextInventory.push({ ...activeInfo(previous.plugin), error: loaded.error })
+                    continue
+                  }
+                  yield* Effect.logError("failed to restore plugin; deactivating", {
+                    "plugin.id": definition.id,
+                  })
+                  nextInventory.push(failed)
                 }
-                nextInventory.push({
-                  id: definition.id,
-                  source: definition.source ?? { type: "builtin" },
-                  status: "failed",
-                  error: loaded.error,
-                  tui: definition.tui ?? false,
-                })
 
-                if (!previous) continue
-                const restored = yield* load(previous.plugin)
-                if (restored.scope !== undefined) {
-                  active.set(definition.id, { plugin: previous.plugin, scope: restored.scope })
-                  continue
-                }
-                yield* Effect.logError("failed to restore plugin; deactivating", {
-                  "plugin.id": definition.id,
-                })
-              }
-
-              const removed = Array.from(active.entries())
-                .filter(([id]) => !ids.has(id))
-                .toReversed()
-              removed.forEach(([id]) => active.delete(id))
-              yield* Effect.forEach(removed, ([, entry]) => Scope.close(entry.scope, Exit.void), {
-                discard: true,
-              })
-              inventory = [...nextInventory, ...failures]
-            }),
+                inventory = withFailures(nextInventory, failures)
+              }),
+            ).pipe(Effect.uninterruptible),
           )
           yield* bus.publish(Plugin.Event.Updated, {})
         }),
@@ -171,15 +207,41 @@ const layer = Layer.effect(
   }),
 )
 
-function activeInfo(plugin: Versioned): Plugin.Info {
+function activeInfo(plugin: Versioned, error?: string): Plugin.Info {
   return {
     id: Plugin.ID.make(plugin.id),
     source: plugin.source ?? { type: "builtin" },
     status: "active",
     tui: plugin.tui ?? false,
+    ...(plugin.revision === undefined ? {} : { revision: plugin.revision }),
+    ...(plugin.generation === undefined ? {} : { generation: plugin.generation }),
+    ...(error === undefined ? {} : { error }),
   }
 }
 
+/** Inventory errors must not expose credentials or unbounded import/setup traces. */
+export function errorMessage(cause: Cause.Cause<unknown>) {
+  return Cause.pretty(cause)
+    .replace(/https?:\/\/[^\s"'<>]+/g, (value) => {
+      if (!URL.canParse(value)) return "[URL]"
+      const url = new URL(value)
+      url.username = ""
+      url.password = ""
+      url.search = ""
+      url.hash = ""
+      return url.href
+    })
+    .slice(0, 2000)
+}
+
+function withFailures(active: Plugin.Info[], failures: readonly Extract<Plugin.Info, { readonly status: "failed" }>[]) {
+  return failures.reduce((inventory, failure) => {
+    const index = inventory.findIndex((entry) => JSON.stringify(entry.source) === JSON.stringify(failure.source))
+    if (index === -1) return [...inventory, failure]
+    return inventory.map((entry, current) => (current === index ? { ...entry, error: failure.error } : entry))
+  }, active)
+}
+
 export const node = makeLocationNode({
   service: Service,
   layer,
@@ -203,5 +265,6 @@ export const node = makeLocationNode({
     WebSearch.node,
     Generate.node,
     Permission.node,
+    PluginExecution.node,
   ],
 })

packages/core/src/plugin/execution.ts

@@ -0,0 +1,74 @@
+export * as PluginExecution from "./execution.js"
+
+import { Context, Effect, Latch, Layer, Semaphore } from "effect"
+import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
+
+export interface Interface {
+  readonly lease: <A, E, R>(
+    session: { readonly id: string; readonly parentID?: string; readonly admission?: boolean },
+    effect: Effect.Effect<A, E, R>,
+  ) => Effect.Effect<A, E, R>
+  readonly exclusive: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+}
+
+export class Service extends Context.Service<Service, Interface>()("@opencode/PluginExecution") {}
+
+export const layer = Layer.effect(
+  Service,
+  Effect.gen(function* () {
+    const admission = yield* Latch.make(true)
+    const idle = yield* Latch.make(true)
+    const mutations = yield* Semaphore.make(1)
+    const readers = new Map<string, number>()
+    let leases = 0
+
+    const acquire = (session: {
+      readonly id: string
+      readonly parentID?: string
+      readonly admission?: boolean
+    }): Effect.Effect<void> =>
+      Effect.suspend(() => {
+        // Child execution must finish the parent's tool call even while activation waits.
+        if (
+          !admission.isOpen() &&
+          !readers.has(session.id) &&
+          !(session.parentID && readers.has(session.parentID)) &&
+          !(session.admission && leases > 0)
+        )
+          return Effect.interruptible(admission.await).pipe(Effect.andThen(acquire(session)))
+        // Admission protects callbacks but does not establish Session execution ownership.
+        if (!session.admission) readers.set(session.id, (readers.get(session.id) ?? 0) + 1)
+        leases++
+        return idle.close
+      })
+
+    return Service.of({
+      lease: (session, effect) =>
+        Effect.acquireUseRelease(
+          acquire(session),
+          () => effect,
+          () =>
+            Effect.suspend(() => {
+              leases--
+              if (!session.admission) {
+                const count = (readers.get(session.id) ?? 1) - 1
+                if (count === 0) readers.delete(session.id)
+                else readers.set(session.id, count)
+              }
+              return leases === 0 ? idle.open : Effect.void
+            }),
+        ),
+      exclusive: (effect) =>
+        mutations.withPermit(
+          Effect.uninterruptibleMask((restore) =>
+            admission.close.pipe(
+              Effect.andThen(restore(idle.await).pipe(Effect.andThen(restore(effect)))),
+              Effect.ensuring(admission.open),
+            ),
+          ),
+        ),
+    })
+  }),
+)
+
+export const node = makeLocationNode({ service: Service, layer, deps: [] })

packages/core/src/plugin/host.ts

@@ -4,6 +4,7 @@ import { Plugin } from "@opencode-ai/plugin/effect"
 import type { IntegrationMethodRegistration } from "@opencode-ai/plugin/effect/integration"
 import { EventManifest } from "@opencode-ai/schema/event-manifest"
 import { ServerConfig } from "@opencode-ai/schema/mcp"
+import { OperationError } from "@opencode-ai/schema/plugin"
 import { App } from "../app.js"
 import { Effect, Schema, Stream } from "effect"
 import { Agent } from "../agent.js"
@@ -98,7 +99,7 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p
       list: (input) => {
         const ref = locationRef(input)
         if (ref && !isCurrentLocation(ref)) return runtime.location.agent.list(ref)
-        return response(agents.list())
+        return agents.list().pipe(Effect.map((data) => ({ location: locationInfo(), data })))
       },
       reload: agents.reload,
       transform: (callback) =>
@@ -193,11 +194,6 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p
     event: {
       subscribe: () => bus.subscribe().pipe(Stream.filter(EventManifest.isServer)),
     },
-    experimental: {
-      terminal: {
-        read: (input) => runtime.persistentPty.read(input.sessionID, input.lines),
-      },
-    },
     generate: {
       text: (input) => generate.text(input).pipe(Effect.map((text) => ({ text }))),
     },
@@ -332,6 +328,10 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p
     },
     plugin: {
       list: () => response(plugin.list()),
+      // In-process management can wait on its own setup/tool lease. Use an external client instead.
+      check: () => Effect.fail(new OperationError({ message: "Check plugin updates through an external client." })),
+      update: () => Effect.fail(new OperationError({ message: "Update plugins through an external client." })),
+      reload: () => Effect.fail(new OperationError({ message: "Reload plugins through an external client." })),
     },
     reference: {
       list: () => response(reference.list()),

packages/core/src/plugin/module.ts

@@ -36,15 +36,22 @@ const Definition = Schema.Struct({
 
 export const load = Effect.fn("PluginModule.load")(function* (
   operation: Extract<ConfigPluginSource.Operation, { type: "add" }>,
+  fresh?: Npm.EntryPoint,
 ) {
   const npm = yield* Npm.Service
-  const entrypoint = path.isAbsolute(operation.target)
-    ? pathToFileURL(operation.target).href
-    : (yield* npm.add(operation.target, { subpaths: ["server", ""], refresh: true })).entrypoint
+  const resolved =
+    fresh ??
+    (path.isAbsolute(operation.target)
+      ? { entrypoint: pathToFileURL(operation.target).href, revision: undefined, generation: undefined }
+      : yield* npm.add(operation.target, { subpaths: ["server", ""], refresh: true }))
+  const entrypoint = resolved.entrypoint
   if (!entrypoint) return yield* Effect.fail(new Error(`Plugin entrypoint not found: ${operation.target}`))
   // Bun currently ignores query parameters when caching file:// imports.
-  const target = typeof Bun !== "undefined" ? operation.target.replaceAll("\\", "/") : entrypoint
-  const source = operation.mtime === undefined ? entrypoint : `${target}?mtime=${operation.mtime}`
+  const target =
+    typeof Bun !== "undefined" && path.isAbsolute(operation.target)
+      ? operation.target.replaceAll("\\", "/")
+      : entrypoint
+  const source = fresh || operation.mtime === undefined ? entrypoint : `${target}?mtime=${operation.mtime}`
   yield* Effect.log({ msg: "loading plugin", id: operation.target, entrypoint: source })
   const mod = yield* Effect.promise(() => importModule(source))
   const value = (yield* Schema.decodeUnknownEffect(Definition)(mod)).default
@@ -53,7 +60,9 @@ export const load = Effect.fn("PluginModule.load")(function* (
     id: plugin.id,
     tui: plugin.tui,
     vcs: plugin.vcs,
-    version: JSON.stringify(operation),
+    version: JSON.stringify([operation, resolved.generation]),
+    revision: resolved.revision,
+    generation: resolved.generation,
     source: path.isAbsolute(operation.target)
       ? { type: "local" as const, path: operation.target }
       : { type: "package" as const, package: operation.target },

packages/core/src/plugin/provider/amazon-bedrock.ts

@@ -4,6 +4,7 @@ import { define } from "@opencode-ai/plugin/effect/plugin"
 import { Provider } from "../../provider.js"
 
 type MantleSDK = {
+  languageModel: (modelID: string) => LanguageModelV3
   chat: (modelID: string) => LanguageModelV3
   responses: (modelID: string) => LanguageModelV3
 }

packages/core/src/plugin/provider/cloudflare-ai-gateway.ts

@@ -58,8 +58,10 @@ export const CloudflareAIGatewayPlugin = define({
         const config = gatewayConfig(evt.options)
         if (!config) return
         const metadata = gatewayMetadata(evt.options)
-        const { createAiGateway } = yield* Effect.promise(() => import("ai-gateway-provider"))
-        const { createUnified } = yield* Effect.promise(() => import("ai-gateway-provider/providers/unified"))
+        const { createAiGateway } = yield* Effect.promise(() => import("ai-gateway-provider")).pipe(Effect.orDie)
+        const { createUnified } = yield* Effect.promise(() => import("ai-gateway-provider/providers/unified")).pipe(
+          Effect.orDie,
+        )
         const gateway = createAiGateway({
           accountId: config.accountId,
           gateway: config.gatewayId,

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

@@ -1,7 +1,8 @@
 import { Effect } from "effect"
+import { pathToFileURL } from "url"
 import { define } from "@opencode-ai/plugin/effect/plugin"
 import { Npm } from "@opencode-ai/util/npm"
-import { loadSDKFactory } from "./sdk-factory.js"
+import { importModule } from "@opencode-ai/util/runtime-import"
 
 export const DynamicProviderPlugin = define({
   id: "opencode.provider.dynamic",
@@ -12,7 +13,18 @@ export const DynamicProviderPlugin = define({
       Effect.fn(function* (evt) {
         if (evt.sdk) return
 
-        evt.sdk = ((yield* loadSDKFactory(npm, evt.package)) as (options: any) => any)(evt.options)
+        const installedPath = evt.package.startsWith("file://")
+          ? evt.package
+          : (yield* npm.add(evt.package).pipe(Effect.orDie)).entrypoint
+        if (!installedPath) throw new Error(`Package ${evt.package} has no import entrypoint`)
+
+        const mod = (yield* Effect.promise(() =>
+          importModule(installedPath.startsWith("file://") ? installedPath : pathToFileURL(installedPath).href),
+        ).pipe(Effect.orDie)) as Record<string, (options: any) => any>
+        const match = Object.keys(mod).find((name) => name.startsWith("create"))
+        if (!match) throw new Error(`Package ${evt.package} has no provider factory export`)
+
+        evt.sdk = mod[match](evt.options)
       }),
     )
   }),

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

@@ -40,7 +40,7 @@ export const GitLabPlugin = define({
           typeof evt.options.featureFlags === "object" && evt.options.featureFlags ? evt.options.featureFlags : {}
         const id = evt.model.modelID ?? evt.model.id
         if (id.startsWith("duo-workflow-")) {
-          const gitlab = yield* Effect.promise(() => import("gitlab-ai-provider"))
+          const gitlab = yield* Effect.promise(() => import("gitlab-ai-provider")).pipe(Effect.orDie)
           const workflowRef =
             typeof evt.model.settings?.workflowRef === "string" ? evt.model.settings.workflowRef : undefined
           const workflowDefinition =

packages/core/src/plugin/provider/sap-ai-core.ts

@@ -1,8 +1,9 @@
 import { Effect } from "effect"
+import { pathToFileURL } from "url"
 import { define } from "@opencode-ai/plugin/effect/plugin"
 import { Npm } from "@opencode-ai/util/npm"
 import { Provider } from "../../provider.js"
-import { loadSDKFactory } from "./sdk-factory.js"
+import { importModule } from "@opencode-ai/util/runtime-import"
 
 export const SapAICorePlugin = define({
   id: "opencode.provider.sap.ai.core",
@@ -17,7 +18,17 @@ export const SapAICorePlugin = define({
           (typeof evt.options.serviceKey === "string" ? evt.options.serviceKey : undefined)
         if (serviceKey && !process.env.AICORE_SERVICE_KEY) process.env.AICORE_SERVICE_KEY = serviceKey
 
-        const factory = yield* loadSDKFactory(npm, evt.package)
+        const installedPath = evt.package.startsWith("file://")
+          ? evt.package
+          : (yield* npm.add(evt.package).pipe(Effect.orDie)).entrypoint
+        if (!installedPath) return yield* Effect.die(new Error(`Package ${evt.package} has no import entrypoint`))
+
+        const mod = (yield* Effect.promise(() =>
+          importModule(installedPath.startsWith("file://") ? installedPath : pathToFileURL(installedPath).href),
+        )) as Record<string, unknown>
+        const match = Object.keys(mod).find((name) => name.startsWith("create"))
+        if (!match) return yield* Effect.die(new Error(`Package ${evt.package} has no provider factory export`))
+        const factory = mod[match]
         if (typeof factory !== "function")
           return yield* Effect.die(new Error(`Package ${evt.package} provider factory export is not callable`))
 

packages/core/src/plugin/provider/sdk-factory.ts

@@ -1,18 +0,0 @@
-import { Effect } from "effect"
-import { pathToFileURL } from "url"
-import { Npm } from "@opencode-ai/util/npm"
-import { importModule } from "@opencode-ai/util/runtime-import"
-
-export const loadSDKFactory = Effect.fnUntraced(function* (npm: Npm.Interface, packageName: string) {
-  const installedPath = packageName.startsWith("file://")
-    ? packageName
-    : (yield* npm.add(packageName).pipe(Effect.orDie)).entrypoint
-  if (!installedPath) return yield* Effect.die(new Error(`Package ${packageName} has no import entrypoint`))
-
-  const mod = (yield* Effect.promise(() =>
-    importModule(installedPath.startsWith("file://") ? installedPath : pathToFileURL(installedPath).href),
-  )) as Record<string, unknown>
-  const match = Object.keys(mod).find((name) => name.startsWith("create"))
-  if (!match) return yield* Effect.die(new Error(`Package ${packageName} has no provider factory export`))
-  return mod[match]
-})

packages/core/src/plugin/runtime.ts

@@ -7,7 +7,6 @@ import { Job } from "../job.js"
 import { Location } from "../location.js"
 import { LocationServiceMap } from "../location-service-map.js"
 import { Mcp } from "../mcp/index.js"
-import { PersistentPty } from "../persistent-pty.js"
 import { Session } from "../session.js"
 
 export interface Interface {
@@ -30,7 +29,6 @@ export interface Interface {
     | "context"
   >
   readonly job: Pick<Job.Interface, "start" | "wait" | "block" | "background" | "cancel" | "completeBackground">
-  readonly persistentPty: Pick<PersistentPty.Interface, "read">
   readonly location: {
     readonly agent: {
       readonly list: (
@@ -92,9 +90,6 @@ export const layerWithCell = (cell: Cell) =>
         completeBackground: (notificationID) =>
           require(cell, (runtime) => runtime.job.completeBackground(notificationID)),
       },
-      persistentPty: {
-        read: (sessionID, lines) => require(cell, (runtime) => runtime.persistentPty.read(sessionID, lines)),
-      },
       location: {
         agent: {
           list: (ref) => require(cell, (runtime) => runtime.location.agent.list(ref)),
@@ -112,11 +107,9 @@ export const providerLayerWithCell = (cell: Cell) =>
       const sessions = yield* Session.Service
       const jobs = yield* Job.Service
       const locations = yield* LocationServiceMap.Service
-      const persistentPty = yield* PersistentPty.Service
       const runtime: Interface = {
         session: sessions,
         job: jobs,
-        persistentPty,
         location: {
           agent: {
             list: (ref) =>
@@ -169,7 +162,7 @@ export const providerNodeWithCell = (cell: Cell) =>
   makeGlobalNode({
     name: "plugin-runtime-provider",
     layer: providerLayerWithCell(cell),
-    deps: [node, Session.node, Job.node, LocationServiceMap.node, PersistentPty.node],
+    deps: [node, Session.node, Job.node, LocationServiceMap.node],
   })
 
 export const providerNode = providerNodeWithCell(defaultCell)

packages/core/src/plugin/skill.ts

@@ -50,7 +50,7 @@ export const Plugin = define({
 const reportContentWithDiagnostics = Effect.fn("SkillPlugin.reportContentWithDiagnostics")(function* (
   app: Context["app"],
 ) {
-  const plugins = yield* configuredPlugins()
+  const plugins = yield* configuredPlugins().pipe(Effect.orElseSucceed(() => ["Unavailable: failed to inspect config"]))
   return [
     ReportContent,
     "",

packages/core/src/plugin/supervisor-service.ts

@@ -1,6 +1,7 @@
 export * as PluginSupervisor from "./supervisor-service.js"
 
 import { Context, Effect } from "effect"
+import type { Plugin } from "@opencode-ai/schema/plugin"
 
 /**
  * Dependency-only supervisor seam. Keep this module free of implementation
@@ -9,6 +10,11 @@ import { Context, Effect } from "effect"
 export interface Interface {
   /** Wait for the initial plugin generation and startup updates to settle. */
   readonly flush: Effect.Effect<void>
+  /** Initial reconciliation barrier; it never closes again after startup settles. */
+  readonly initialized: Effect.Effect<void>
+  readonly check: (target: string) => Effect.Effect<Plugin.PackageStatus, Plugin.OperationError>
+  readonly update: (target: string) => Effect.Effect<Plugin.Info[], Plugin.OperationError>
+  readonly reload: (target: string) => Effect.Effect<Plugin.Info[], Plugin.OperationError>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/PluginSupervisor") {}

packages/core/src/plugin/supervisor.ts

@@ -2,8 +2,10 @@ export * as PluginSupervisor from "./supervisor.js"
 export { Service, type Interface } from "./supervisor-service.js"
 
 import { Event } from "@opencode-ai/schema/config"
-import { Cause, Effect, Latch, Layer, Stream } from "effect"
+import { Cause, Effect, Latch, Layer, Option, Scope, Semaphore, Stream } from "effect"
 import path from "path"
+import { randomUUID } from "node:crypto"
+import { pathToFileURL } from "node:url"
 import { ConfigPluginSource } from "../config/plugin/source.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { Bus } from "../bus.js"
@@ -15,10 +17,13 @@ import { PluginModule } from "./module.js"
 import { SdkPlugins } from "./sdk.js"
 import { Service } from "./supervisor-service.js"
 
+type Cached = { readonly operation: string; readonly plugin: Plugin.Versioned; readonly error?: string }
+
 const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
   pre: readonly Plugin.Versioned[],
   post: readonly Plugin.Versioned[],
   operations: readonly ConfigPluginSource.Operation[],
+  cache: Map<string, Cached>,
 ) {
   const matches = (selector: string, target: string) =>
     selector === "*" || (selector.endsWith(".*") ? target.startsWith(selector.slice(0, -1)) : selector === target)
@@ -26,6 +31,7 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
   const enabled = new Set(definitions.map((plugin) => plugin.id))
   const packages = new Map<string, Plugin.Versioned>()
   const failures = new Map<string, Extract<Plugin.Info, { readonly status: "failed" }>>()
+  const previousSources = new Map(cache)
   const plugins = () => [...definitions, ...packages.values()]
 
   for (const operation of operations) {
@@ -48,13 +54,23 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
       continue
     }
 
-    const plugin = yield* PluginModule.load(operation).pipe(
-      Effect.catchCause((cause) =>
-        Effect.logWarning("failed to load plugin", { target: operation.target, cause }).pipe(
-          Effect.as({ error: Cause.pretty(cause) }),
-        ),
-      ),
-    )
+    const cached = previousSources.get(operation.target)
+    const key = JSON.stringify(operation)
+    const plugin =
+      cached?.operation === key
+        ? cached.plugin
+        : yield* PluginModule.load(operation).pipe(
+            Effect.flatMap((plugin) =>
+              cached && plugin.id !== cached.plugin.id
+                ? Effect.fail(new Error(`Plugin ID changed from ${cached.plugin.id} to ${plugin.id}`))
+                : Effect.succeed(plugin),
+            ),
+            Effect.catchCause((cause) =>
+              Effect.logWarning("failed to load plugin", { target: operation.target, cause }).pipe(
+                Effect.as({ error: Plugin.errorMessage(cause) }),
+              ),
+            ),
+          )
     if ("error" in plugin) {
       failures.set(operation.target, {
         source: pluginSource(operation.target),
@@ -62,9 +78,24 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
         error: plugin.error,
         tui: false,
       })
+      if (cached) {
+        cache.set(operation.target, { ...cached, operation: key, error: plugin.error })
+        packages.set(operation.target, cached.plugin)
+        enabled.add(cached.plugin.id)
+      }
       continue
     }
-    failures.delete(operation.target)
+    if (cached?.operation === key && cached.error) {
+      failures.set(operation.target, {
+        source: pluginSource(operation.target),
+        status: "failed",
+        error: cached.error,
+        tui: plugin.tui ?? false,
+      })
+    } else {
+      failures.delete(operation.target)
+      cache.set(operation.target, { operation: key, plugin })
+    }
     const previous = packages.get(operation.target)
     if (previous) enabled.delete(previous.id)
     packages.set(operation.target, plugin)
@@ -77,7 +108,12 @@ const resolve = Effect.fn("PluginSupervisor.resolve")(function* (
       ...[...packages.values()].filter((plugin) => enabled.has(plugin.id)),
       ...post.filter((plugin) => enabled.has(plugin.id)),
     ],
-    failures: [...failures.values()],
+    failures: [...failures.entries()]
+      .filter(([target]) => {
+        const plugin = packages.get(target)
+        return !plugin || enabled.has(plugin.id)
+      })
+      .map(([, failure]) => failure),
   }
 })
 
@@ -89,12 +125,20 @@ export const layer = Layer.effect(
     const instance = yield* InstancePlugins.Service
     const sources = yield* ConfigPluginSource.Service
     const bus = yield* Bus.Service
+    const npm = yield* Npm.Service
+    const scope = yield* Scope.Scope
     const ready = yield* Latch.make()
+    const initialized = yield* Latch.make()
+    const mutations = yield* Semaphore.make(1)
+    const cache = new Map<string, Cached>()
+    // Internal definitions capture stable Location services; SDK contributions remain dynamic.
+    const internal = yield* PluginInternal.list()
     let observed = 0
 
-    const activate = Effect.fn("PluginSupervisor.activate")(function* () {
-      // Resolve OpenCode's internal plugins with their privileged Location services.
-      const internal = yield* PluginInternal.list()
+    const activate = Effect.fn("PluginSupervisor.activate")(function* (
+      operations: readonly ConfigPluginSource.Operation[],
+      previous: ReadonlyMap<string, Cached> = new Map(cache),
+    ) {
       // Combine internal plugins with host-contributed plugins in boot order.
       // Instance-bound plugins come last: later activation can override earlier
       // container writes, so the instance's explicit choices win over globals.
@@ -108,12 +152,117 @@ export const layer = Layer.effect(
         version: "internal",
         source: { type: "builtin" as const },
       }))
-      const operations = yield* sources.operations()
       // Apply config operations and load enabled package plugins into one ordered generation.
-      const resolved = yield* resolve(pre, post, operations)
+      const resolved = yield* resolve(pre, post, operations, cache).pipe(Effect.provideService(Npm.Service, npm))
       // Replace the active generation in one scoped, batched activation.
-      yield* registry.activate(resolved.plugins, resolved.failures)
+      const activated = yield* registry.activate(resolved.plugins, resolved.failures).pipe(Effect.exit)
+      if (activated._tag === "Failure") {
+        cache.clear()
+        previous.forEach((entry, target) => cache.set(target, entry))
+        return yield* Effect.failCause(activated.cause)
+      }
+      const inventory = yield* registry.list()
+      for (const [target, entry] of cache) {
+        if (!operations.some((operation) => operation.type === "add" && operation.target === target)) {
+          cache.delete(target)
+          continue
+        }
+        const active = inventory.find((item) =>
+          item.source.type === "local"
+            ? item.source.path === target
+            : item.source.type === "package" && item.source.package === target,
+        )
+        if (active?.status !== "active" || !active.error) continue
+        const old = previous.get(target)
+        if (old) cache.set(target, { ...old, operation: entry.operation, error: active.error })
+      }
+      return inventory
     })
+
+    const operation = Effect.fnUntraced(function* (target: string) {
+      const operations = yield* sources.operations().pipe(Effect.provideService(Scope.Scope, scope))
+      const entry = operations.findLast((entry) => entry.type === "add" && entry.target === target)
+      const inventory = yield* registry.list()
+      if (
+        !entry ||
+        entry.type !== "add" ||
+        target === "*" ||
+        target.endsWith(".*") ||
+        target.startsWith("opencode.") ||
+        (!cache.has(target) &&
+          !inventory.some((item) =>
+            item.source.type === "local"
+              ? item.source.path === target
+              : item.source.type === "package" && item.source.package === target,
+          ))
+      )
+        return yield* new Plugin.OperationError({ message: `Not a configured plugin source: ${target}` })
+      return { entry, operations }
+    })
+
+    const mutate = (target: string, action: "update" | "reload") =>
+      initialized.await.pipe(
+        Effect.andThen(
+          mutations.withPermit(
+            Effect.gen(function* () {
+              const selected = yield* operation(target)
+              if (action === "update") {
+                if (path.isAbsolute(target) || !(yield* npm.inspect(target)).mutable)
+                  return yield* new Plugin.OperationError({ message: `Plugin source cannot be updated: ${target}` })
+              }
+              const previous = new Map(cache)
+              const generation = randomUUID()
+              const staged = path.isAbsolute(target)
+                ? {
+                    directory: path.dirname(target),
+                    generation,
+                    entrypoint: `${typeof Bun !== "undefined" ? target.replaceAll("\\", "/") : pathToFileURL(target).href}?reload=${generation}`,
+                  }
+                : yield* action === "update"
+                    ? npm.update(target, { subpaths: ["server", ""] })
+                    : npm.reload(target, {
+                        subpaths: ["server", ""],
+                        revision: cache.get(target)?.plugin.revision,
+                        generation: cache.get(target)?.plugin.generation,
+                      })
+              const loaded = yield* PluginModule.load(selected.entry, staged).pipe(
+                Effect.provideService(Npm.Service, npm),
+                Effect.exit,
+              )
+              if (loaded._tag === "Failure") {
+                const old = cache.get(target)
+                if (!old) return yield* Effect.failCause(loaded.cause)
+                cache.set(target, {
+                  ...old,
+                  operation: JSON.stringify(selected.entry),
+                  error: Plugin.errorMessage(loaded.cause),
+                })
+                return yield* activate(selected.operations, previous)
+              }
+              const old = cache.get(target)
+              if (old && loaded.value.id !== old.plugin.id) {
+                cache.set(target, {
+                  ...old,
+                  operation: JSON.stringify(selected.entry),
+                  error: `Plugin ID changed from ${old.plugin.id} to ${loaded.value.id}`,
+                })
+                return yield* activate(selected.operations, previous)
+              }
+              cache.set(target, { operation: JSON.stringify(selected.entry), plugin: loaded.value })
+              return yield* activate(selected.operations, previous)
+            }),
+          ),
+        ),
+        Effect.catchCause((cause) => {
+          if (Cause.hasInterruptsOnly(cause)) return Effect.interrupt
+          const error = Option.getOrUndefined(Cause.findErrorOption(cause))
+          return Effect.fail(
+            error instanceof Plugin.OperationError
+              ? error
+              : new Plugin.OperationError({ message: `Unable to ${action} plugin source.` }),
+          )
+        }),
+      )
     const updates = Stream.merge(sources.changes(), bus.subscribe([Event.Updated, SdkPlugins.Updated])).pipe(
       // Make accepted work visible to flush before coalescing the burst.
       Stream.mapEffect(() =>
@@ -130,13 +279,48 @@ export const layer = Layer.effect(
       Stream.debounce("100 millis"),
       Stream.runForEach((target) =>
         Effect.gen(function* () {
-          yield* activate().pipe(Effect.catchCause((cause) => Effect.logError("failed to reload plugins", { cause })))
-          if (observed === target) yield* ready.open
+          yield* mutations
+            .withPermit(
+              Effect.gen(function* () {
+                return yield* activate(yield* sources.operations().pipe(Effect.provideService(Scope.Scope, scope)))
+              }),
+            )
+            .pipe(Effect.catchCause((cause) => Effect.logError("failed to reload plugins", { cause })))
+          if (observed === target) {
+            yield* initialized.open
+            yield* ready.open
+          }
         }),
       ),
       Effect.forkScoped({ startImmediately: true }),
     )
-    return Service.of({ flush: ready.await })
+    return Service.of({
+      flush: ready.await,
+      initialized: initialized.await,
+      check: (target) =>
+        initialized.await.pipe(
+          Effect.andThen(
+            mutations.withPermit(
+              Effect.gen(function* () {
+                yield* operation(target)
+                if (path.isAbsolute(target)) return { mutable: false }
+                return yield* npm.check(target)
+              }),
+            ),
+          ),
+          Effect.catchCause((cause) => {
+            if (Cause.hasInterruptsOnly(cause)) return Effect.interrupt
+            const error = Option.getOrUndefined(Cause.findErrorOption(cause))
+            return Effect.fail(
+              error instanceof Plugin.OperationError
+                ? error
+                : new Plugin.OperationError({ message: "Unable to check plugin source." }),
+            )
+          }),
+        ),
+      update: (target) => mutate(target, "update"),
+      reload: (target) => mutate(target, "reload"),
+    })
   }),
 )
 

packages/core/src/session.ts

@@ -5,8 +5,8 @@ import { Cause, Effect, Layer, Schema, Context, RcMap, Stream, Scope } from "eff
 import { ListAnchor } from "@opencode-ai/schema/session"
 import { and, asc, desc, eq, gt, isNull, like, lt, or, type SQL } from "drizzle-orm"
 import { Project } from "./project.js"
-import { Workspace } from "@opencode-ai/schema/workspace"
-import { Model } from "@opencode-ai/schema/model"
+import { Workspace } from "./workspace.js"
+import { Model } from "./model.js"
 import { Location } from "./location.js"
 import { SessionMessage } from "./session/message.js"
 import { Base64, FileAttachment, Prompt } from "@opencode-ai/schema/prompt"
@@ -17,7 +17,7 @@ import { SessionProjector } from "./session/projector.js"
 import { SessionMessageTable, SessionTable } from "./session/sql.js"
 import { SessionSchema } from "./session/schema.js"
 import { AbsolutePath, PositiveInt, RelativePath } from "./schema.js"
-import { Agent } from "@opencode-ai/schema/agent"
+import { Agent } from "./agent.js"
 import { Money } from "@opencode-ai/schema/money"
 import { App } from "./app.js"
 import { Slug } from "./util/slug.js"
@@ -41,6 +41,7 @@ import { Session } from "@opencode-ai/schema/session"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { Image } from "./image.js"
 import { PluginSupervisor } from "./plugin/supervisor-service.js"
+import { PluginExecution } from "./plugin/execution.js"
 import { PluginHooks } from "./plugin/hooks.js"
 import { Mime } from "./mime.js"
 import type { EventLog } from "@opencode-ai/schema/event-log"
@@ -690,30 +691,39 @@ const layer = Layer.effect(
       ),
       generate: Effect.fn("Session.generate")(function* (input) {
         const session = yield* result.get(input.sessionID)
-        const generate = yield* SessionGenerate.Service.pipe(Effect.provide(locations.get(session.location)))
-        return yield* generate.generate(input)
+        return yield* Effect.gen(function* () {
+          const plugins = yield* PluginSupervisor.Service
+          yield* plugins.initialized
+          const gate = yield* PluginExecution.Service
+          const generate = yield* SessionGenerate.Service
+          return yield* gate.lease({ id: session.id, admission: true }, generate.generate(input))
+        }).pipe(Effect.provide(locations.get(session.location)))
       }),
       command: Effect.fn("Session.command")(function* (input) {
         const session = yield* result.get(input.sessionID)
-        const commands = yield* Effect.gen(function* () {
+        yield* Effect.gen(function* () {
           const plugins = yield* PluginSupervisor.Service
-          yield* plugins.flush
-          return yield* Command.Service
+          yield* plugins.initialized
+          const gate = yield* PluginExecution.Service
+          const commands = yield* Command.Service
+          // Commands may await child Sessions, so they retain ownership that lets those children drain.
+          return yield* gate.lease(
+            session,
+            commands.execute({
+              name: input.command,
+              invocation: {
+                sessionID: input.sessionID,
+                prompt: {
+                  text: input.text,
+                  files: input.files,
+                  agents: input.agents,
+                  skills: input.skills,
+                },
+                delivery: input.delivery ?? "steer",
+              },
+            }),
+          )
         }).pipe(Effect.provide(locations.get(session.location)))
-        const delivery = input.delivery ?? "steer"
-        yield* commands.execute({
-          name: input.command,
-          invocation: {
-            sessionID: input.sessionID,
-            prompt: {
-              text: input.text,
-              files: input.files,
-              agents: input.agents,
-              skills: input.skills,
-            },
-            delivery,
-          },
-        })
       }),
       shell: Effect.fn("Session.shell")(function* (input) {
         const session = yield* result.get(input.sessionID)
@@ -723,16 +733,20 @@ const layer = Layer.effect(
             yield* execution.awaitIdle(input.sessionID)
             const started = yield* Effect.gen(function* () {
               const plugins = yield* PluginSupervisor.Service
-              yield* plugins.flush
+              yield* plugins.initialized
+              const gate = yield* PluginExecution.Service
               const shell = yield* Shell.Service
-              return yield* shell
-                .create({
-                  command: input.command,
-                  cwd: session.location.directory,
-                  timeout: 0,
-                  metadata: { sessionID: input.sessionID },
-                })
-                .pipe(Effect.orDie)
+              return yield* gate.lease(
+                { id: input.sessionID, admission: true },
+                shell
+                  .create({
+                    command: input.command,
+                    cwd: session.location.directory,
+                    timeout: 0,
+                    metadata: { sessionID: input.sessionID },
+                  })
+                  .pipe(Effect.orDie),
+              )
             }).pipe(Effect.provide(locations.get(session.location)))
             yield* bus.publish(
               SessionEvent.Shell.Started,
@@ -964,10 +978,14 @@ const layer = Layer.effect(
             return yield* new BusyError({ sessionID: input.sessionID })
           return yield* Effect.gen(function* () {
             const plugins = yield* PluginSupervisor.Service
-            yield* plugins.flush
-            return yield* SessionRevert.stage({ session, messageID: input.messageID, files: input.files }).pipe(
-              Effect.provideService(Database.Service, database),
-              Effect.provideService(Bus.Service, bus),
+            yield* plugins.initialized
+            const gate = yield* PluginExecution.Service
+            return yield* gate.lease(
+              { id: session.id, admission: true },
+              SessionRevert.stage({ session, messageID: input.messageID, files: input.files }).pipe(
+                Effect.provideService(Database.Service, database),
+                Effect.provideService(Bus.Service, bus),
+              ),
             )
           }).pipe(Effect.provide(locations.get(session.location)))
         }),
@@ -976,8 +994,12 @@ const layer = Layer.effect(
           if ((yield* execution.active).has(sessionID)) return yield* new BusyError({ sessionID })
           const revert = yield* Effect.gen(function* () {
             const plugins = yield* PluginSupervisor.Service
-            yield* plugins.flush
-            return yield* SessionRevert.clear(session).pipe(Effect.provideService(Bus.Service, bus))
+            yield* plugins.initialized
+            const gate = yield* PluginExecution.Service
+            return yield* gate.lease(
+              { id: session.id, admission: true },
+              SessionRevert.clear(session).pipe(Effect.provideService(Bus.Service, bus)),
+            )
           }).pipe(Effect.provide(locations.get(session.location)))
           yield* execution.wake(sessionID)
           return revert
@@ -1019,59 +1041,65 @@ const preparePrompt = Effect.fn("Session.preparePrompt")(function* (
   messageID: SessionMessage.ID,
 ) {
   const plugins = yield* PluginSupervisor.Service
-  yield* plugins.flush
-  const hooks = yield* PluginHooks.Service
-  const event = yield* hooks.trigger("session", "prompt", {
-    sessionID: request.sessionID,
-    messageID,
-    prompt: structuredClone({
-      text: request.text,
-      files: request.files?.slice(),
-      agents: request.agents?.slice(),
-      skills: request.skills?.slice(),
+  yield* plugins.initialized
+  const gate = yield* PluginExecution.Service
+  return yield* gate.lease(
+    { id: request.sessionID, admission: true },
+    Effect.gen(function* () {
+      const hooks = yield* PluginHooks.Service
+      const event = yield* hooks.trigger("session", "prompt", {
+        sessionID: request.sessionID,
+        messageID,
+        prompt: structuredClone({
+          text: request.text,
+          files: request.files?.slice(),
+          agents: request.agents?.slice(),
+          skills: request.skills?.slice(),
+        }),
+        metadata: structuredClone(request.metadata),
+        delivery: request.delivery ?? "steer",
+      })
+      const input = event.prompt
+      const fs = yield* FSUtil.Service
+      const files = input.files
+        ? yield* Effect.forEach(input.files, (file) => materializeAttachment(fs, file), { concurrency: 8 })
+        : undefined
+      const requested = input.skills
+      const selected = yield* Effect.gen(function* () {
+        if (!requested?.length) return undefined
+        const skillService = yield* Skill.Service
+        const prepared = new Map<Skill.ID, Skill.Name>()
+        return yield* Effect.forEach(requested, (attachment) =>
+          Effect.gen(function* () {
+            const name = prepared.get(attachment.id)
+            if (name !== undefined) return { id: attachment.id, name, mention: attachment.mention }
+            const skill = yield* skillService.get(attachment.id)
+            if (!skill) return yield* new SkillNotFoundError({ skill: attachment.id })
+            prepared.set(skill.id, skill.name)
+            return {
+              id: skill.id,
+              name: skill.name,
+              text: (yield* Skill.prepare(fs, skill).pipe(Effect.orDie)).output,
+              mention: attachment.mention,
+            }
+          }),
+        )
+      })
+      return SessionInbox.Item.make({
+        type: "user",
+        payload: {
+          ...Prompt.make({
+            text: input.text,
+            agents: input.agents,
+            files,
+            skills: selected?.length ? selected : undefined,
+          }),
+          metadata: event.metadata,
+        },
+        delivery: event.delivery,
+      })
     }),
-    metadata: structuredClone(request.metadata),
-    delivery: request.delivery ?? "steer",
-  })
-  const input = event.prompt
-  const fs = yield* FSUtil.Service
-  const files = input.files
-    ? yield* Effect.forEach(input.files, (file) => materializeAttachment(fs, file), { concurrency: 8 })
-    : undefined
-  const requested = input.skills
-  const selected = yield* Effect.gen(function* () {
-    if (!requested?.length) return undefined
-    const skillService = yield* Skill.Service
-    const prepared = new Map<Skill.ID, Skill.Name>()
-    return yield* Effect.forEach(requested, (attachment) =>
-      Effect.gen(function* () {
-        const name = prepared.get(attachment.id)
-        if (name !== undefined) return { id: attachment.id, name, mention: attachment.mention }
-        const skill = yield* skillService.get(attachment.id)
-        if (!skill) return yield* new SkillNotFoundError({ skill: attachment.id })
-        prepared.set(skill.id, skill.name)
-        return {
-          id: skill.id,
-          name: skill.name,
-          text: (yield* Skill.prepare(fs, skill).pipe(Effect.orDie)).output,
-          mention: attachment.mention,
-        }
-      }),
-    )
-  })
-  return SessionInbox.Item.make({
-    type: "user",
-    payload: {
-      ...Prompt.make({
-        text: input.text,
-        agents: input.agents,
-        files,
-        skills: selected?.length ? selected : undefined,
-      }),
-      metadata: event.metadata,
-    },
-    delivery: event.delivery,
-  })
+  )
 })
 
 const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024

packages/core/src/session/compaction.ts

@@ -1,6 +1,7 @@
 export * as SessionCompaction from "./compaction.js"
 
-import { LLMClient, LLMEvent, Message } from "@opencode-ai/ai"
+import { LLMClient, AIError, LLMEvent, Message, type LLMRequest } from "@opencode-ai/ai"
+import type { StreamOptions } from "@opencode-ai/ai/route"
 import { SessionError } from "@opencode-ai/schema/session-error"
 import { Context, Effect, Layer, Stream } from "effect"
 import { Bus } from "../bus.js"
@@ -64,6 +65,13 @@ export type Draft = {
   configure: (settings: Partial<Settings>) => void
 }
 
+type Dependencies = {
+  readonly bus: Bus.Interface
+  readonly llm: {
+    readonly stream: (request: LLMRequest, options?: StreamOptions) => Stream.Stream<LLMEvent, AIError>
+  }
+}
+
 export type AutoInput = {
   readonly session: SessionSchema.Info
   readonly messages: readonly SessionMessage.Info[]
@@ -232,196 +240,195 @@ const planContent = (messages: readonly SessionMessage.Info[], tokens: number) =
   }
 }
 
+const make = (dependencies: Dependencies) => {
+  const state = State.create<Settings, Draft>({
+    name: "session-compaction",
+    initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS }),
+    draft: (draft) => ({
+      configure: (settings) => {
+        if (settings.auto !== undefined) draft.auto = settings.auto
+        if (settings.buffer !== undefined) draft.buffer = settings.buffer
+        if (settings.tokens !== undefined) draft.tokens = settings.tokens
+      },
+    }),
+  })
+  const failed = Effect.fnUntraced(function* (input: {
+    readonly sessionID: SessionSchema.ID
+    readonly reason: SessionMessage.Compaction["reason"]
+    readonly error: SessionError.Error
+    readonly inputID?: SessionMessage.ID
+  }) {
+    yield* dependencies.bus.publish(SessionEvent.Compaction.Failed, input)
+    return { status: "failed" as const, error: input.error }
+  })
+  const execute = Effect.fn("SessionCompaction.execute")(function* (plan: Plan) {
+    if (!plan.started)
+      yield* dependencies.bus.publish(SessionEvent.Compaction.Started, {
+        sessionID: plan.session.id,
+        reason: plan.reason,
+        recent: plan.recent,
+        inputID: plan.inputID,
+      })
+
+    const chunks: string[] = []
+    let failure: SessionError.Error | undefined
+    let usage: SessionUsage.Recorded | undefined
+    const recordUsage = Effect.suspend(() =>
+      usage
+        ? dependencies.bus.publish(SessionEvent.UsageRecorded, {
+            sessionID: plan.session.id,
+            source: "compaction",
+            ...usage,
+          })
+        : Effect.void,
+    )
+    const prepared = yield* plan.prepare({
+      scope: { session: plan.session, agentID: Agent.ID.make("compaction"), model: plan.resolved },
+      transcript: { system: [], messages: [Message.user(plan.prompt)] },
+      contextHooks: false,
+    })
+    yield* dependencies.llm.stream(prepared.request, prepared.options).pipe(
+      Stream.runForEach((event) => {
+        if (LLMEvent.is.providerError(event))
+          failure = {
+            type: event.classification === "context-overflow" ? "provider.invalid-request" : "provider.error",
+            message: event.message,
+          }
+        if (LLMEvent.is.textDelta(event)) {
+          chunks.push(event.text)
+          return dependencies.bus.publish(SessionEvent.Compaction.Delta, {
+            sessionID: plan.session.id,
+            text: event.text,
+          })
+        }
+        if (LLMEvent.is.stepFinish(event)) {
+          const step = SessionUsage.record(event.usage, plan.resolved.cost)
+          usage = usage ? SessionUsage.add(usage, step) : step
+        }
+        return Effect.void
+      }),
+      Effect.catchTag("AI.Error", (error) =>
+        Effect.sync(() => {
+          failure = toSessionError(error)
+        }),
+      ),
+      Effect.onInterrupt(() =>
+        recordUsage.pipe(
+          Effect.andThen(
+            plan.reason === "auto"
+              ? failed({
+                  sessionID: plan.session.id,
+                  reason: plan.reason,
+                  error: { type: "compaction.interrupted", message: "Compaction was interrupted" },
+                  inputID: plan.inputID,
+                }).pipe(Effect.asVoid)
+              : Effect.void,
+          ),
+        ),
+      ),
+    )
+    yield* recordUsage
+    const summary = chunks.join("")
+    if (failure || !summary.trim()) {
+      const error = failure ?? { type: "compaction.failed" as const, message: "Compaction produced no summary" }
+      return yield* failed({
+        sessionID: plan.session.id,
+        reason: plan.reason,
+        error,
+        inputID: plan.inputID,
+      })
+    }
+    yield* dependencies.bus.publish(SessionEvent.Compaction.Ended, {
+      sessionID: plan.session.id,
+      reason: plan.reason,
+      text: summary,
+      recent: plan.recent,
+    })
+    return { status: "completed" as const }
+  })
+  const compact = Effect.fn("SessionCompaction.compact")(function* (input: AutoInput) {
+    const content = planContent(input.messages, state.get().tokens)
+    if (content)
+      return yield* execute({
+        session: input.session,
+        resolved: input.resolved,
+        prepare: input.prepare,
+        reason: "auto",
+        ...content,
+      })
+    return yield* failed({
+      sessionID: input.session.id,
+      reason: "auto",
+      error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
+    })
+  })
+  const required = (input: RequiredInput) => {
+    const config = state.get()
+    if (!config.auto) return false
+    const limit = input.resolved.limit
+    const context = limit.context
+    if (context <= 0) return false
+    const last = input.messages.findLast(
+      (message): message is SessionMessage.Assistant & { tokens: NonNullable<SessionMessage.Assistant["tokens"]> } =>
+        message.type === "assistant" && message.tokens !== undefined,
+    )
+    if (!last) return false
+    const output = Math.min(limit.output, OUTPUT_TOKEN_MAX)
+    const promptCeiling = Math.min(
+      limit.input === undefined ? Number.POSITIVE_INFINITY : limit.input - config.buffer,
+      context - Math.max(output, config.buffer),
+    )
+    const used =
+      last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write
+    if (used <= 0) return false
+    return used >= promptCeiling
+  }
+  const compactManual = Effect.fn("SessionCompaction.compactManual")(function* (input: ManualInput) {
+    const content = planContent(input.messages, state.get().tokens)
+    if (!content)
+      return yield* failed({
+        sessionID: input.session.id,
+        reason: "manual",
+        error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
+        inputID: input.inputID,
+      })
+    const resolved = yield* input.resolveModel(input.session).pipe(
+      Effect.catch((cause) =>
+        failed({
+          sessionID: input.session.id,
+          reason: "manual",
+          error: toSessionError(cause),
+          inputID: input.inputID,
+        }),
+      ),
+    )
+    if ("status" in resolved) return resolved
+    return yield* execute({
+      session: input.session,
+      resolved,
+      prepare: input.prepare,
+      reason: "manual",
+      inputID: input.inputID,
+      started: input.started,
+      ...content,
+    })
+  })
+  return Service.of({
+    transform: state.transform,
+    reload: state.reload,
+    enabled: () => state.get().auto,
+    required,
+    compact,
+    compactManual,
+  })
+}
+
 export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
     const bus = yield* Bus.Service
     const llm = yield* LLMClient.Service
-
-    const state = State.create<Settings, Draft>({
-      name: "session-compaction",
-      initial: () => ({ auto: true, buffer: DEFAULT_BUFFER, tokens: DEFAULT_KEEP_TOKENS }),
-      draft: (draft) => ({
-        configure: (settings) => {
-          if (settings.auto !== undefined) draft.auto = settings.auto
-          if (settings.buffer !== undefined) draft.buffer = settings.buffer
-          if (settings.tokens !== undefined) draft.tokens = settings.tokens
-        },
-      }),
-    })
-    const failed = Effect.fnUntraced(function* (input: {
-      readonly sessionID: SessionSchema.ID
-      readonly reason: SessionMessage.Compaction["reason"]
-      readonly error: SessionError.Error
-      readonly inputID?: SessionMessage.ID
-    }) {
-      yield* bus.publish(SessionEvent.Compaction.Failed, input)
-      return { status: "failed" as const, error: input.error }
-    })
-    const execute = Effect.fn("SessionCompaction.execute")(function* (plan: Plan) {
-      if (!plan.started)
-        yield* bus.publish(SessionEvent.Compaction.Started, {
-          sessionID: plan.session.id,
-          reason: plan.reason,
-          recent: plan.recent,
-          inputID: plan.inputID,
-        })
-
-      const chunks: string[] = []
-      let failure: SessionError.Error | undefined
-      let usage: SessionUsage.Recorded | undefined
-      const recordUsage = Effect.suspend(() =>
-        usage
-          ? bus.publish(SessionEvent.UsageRecorded, {
-              sessionID: plan.session.id,
-              source: "compaction",
-              ...usage,
-            })
-          : Effect.void,
-      )
-      const prepared = yield* plan.prepare({
-        scope: { session: plan.session, agentID: Agent.ID.make("compaction"), model: plan.resolved },
-        transcript: { system: [], messages: [Message.user(plan.prompt)] },
-        contextHooks: false,
-      })
-      yield* llm.stream(prepared.request, prepared.options).pipe(
-        Stream.runForEach((event) => {
-          if (LLMEvent.is.providerError(event))
-            failure = {
-              type: event.classification === "context-overflow" ? "provider.invalid-request" : "provider.error",
-              message: event.message,
-            }
-          if (LLMEvent.is.textDelta(event)) {
-            chunks.push(event.text)
-            return bus.publish(SessionEvent.Compaction.Delta, {
-              sessionID: plan.session.id,
-              text: event.text,
-            })
-          }
-          if (LLMEvent.is.stepFinish(event)) {
-            const step = SessionUsage.record(event.usage, plan.resolved.cost)
-            usage = usage ? SessionUsage.add(usage, step) : step
-          }
-          return Effect.void
-        }),
-        Effect.catchTag("AI.Error", (error) =>
-          Effect.sync(() => {
-            failure = toSessionError(error)
-          }),
-        ),
-        Effect.onInterrupt(() =>
-          recordUsage.pipe(
-            Effect.andThen(
-              plan.reason === "auto"
-                ? failed({
-                    sessionID: plan.session.id,
-                    reason: plan.reason,
-                    error: { type: "compaction.interrupted", message: "Compaction was interrupted" },
-                    inputID: plan.inputID,
-                  }).pipe(Effect.asVoid)
-                : Effect.void,
-            ),
-          ),
-        ),
-      )
-      yield* recordUsage
-      const summary = chunks.join("")
-      if (failure || !summary.trim()) {
-        const error = failure ?? { type: "compaction.failed" as const, message: "Compaction produced no summary" }
-        return yield* failed({
-          sessionID: plan.session.id,
-          reason: plan.reason,
-          error,
-          inputID: plan.inputID,
-        })
-      }
-      yield* bus.publish(SessionEvent.Compaction.Ended, {
-        sessionID: plan.session.id,
-        reason: plan.reason,
-        text: summary,
-        recent: plan.recent,
-      })
-      return { status: "completed" as const }
-    })
-    const compact = Effect.fn("SessionCompaction.compact")(function* (input: AutoInput) {
-      const content = planContent(input.messages, state.get().tokens)
-      if (content)
-        return yield* execute({
-          session: input.session,
-          resolved: input.resolved,
-          prepare: input.prepare,
-          reason: "auto",
-          ...content,
-        })
-      return yield* failed({
-        sessionID: input.session.id,
-        reason: "auto",
-        error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
-      })
-    })
-    const required = (input: RequiredInput) => {
-      const config = state.get()
-      if (!config.auto) return false
-      const limit = input.resolved.limit
-      const context = limit.context
-      if (context <= 0) return false
-      const last = input.messages.findLast(
-        (message): message is SessionMessage.Assistant & { tokens: NonNullable<SessionMessage.Assistant["tokens"]> } =>
-          message.type === "assistant" && message.tokens !== undefined,
-      )
-      if (!last) return false
-      const output = Math.min(limit.output, OUTPUT_TOKEN_MAX)
-      const promptCeiling = Math.min(
-        limit.input === undefined ? Number.POSITIVE_INFINITY : limit.input - config.buffer,
-        context - Math.max(output, config.buffer),
-      )
-      const used =
-        last.tokens.input +
-        last.tokens.output +
-        last.tokens.reasoning +
-        last.tokens.cache.read +
-        last.tokens.cache.write
-      if (used <= 0) return false
-      return used >= promptCeiling
-    }
-    const compactManual = Effect.fn("SessionCompaction.compactManual")(function* (input: ManualInput) {
-      const content = planContent(input.messages, state.get().tokens)
-      if (!content)
-        return yield* failed({
-          sessionID: input.session.id,
-          reason: "manual",
-          error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
-          inputID: input.inputID,
-        })
-      const resolved = yield* input.resolveModel(input.session).pipe(
-        Effect.catch((cause) =>
-          failed({
-            sessionID: input.session.id,
-            reason: "manual",
-            error: toSessionError(cause),
-            inputID: input.inputID,
-          }),
-        ),
-      )
-      if ("status" in resolved) return resolved
-      return yield* execute({
-        session: input.session,
-        resolved,
-        prepare: input.prepare,
-        reason: "manual",
-        inputID: input.inputID,
-        started: input.started,
-        ...content,
-      })
-    })
-    return Service.of({
-      transform: state.transform,
-      reload: state.reload,
-      enabled: () => state.get().auto,
-      required,
-      compact,
-      compactManual,
-    })
+    return make({ bus, llm })
   }),
 )
 

packages/core/src/session/context.ts

@@ -125,7 +125,7 @@ const layer = Layer.effect(
       if (session.location.directory !== location.directory || session.location.workspaceID !== location.workspaceID)
         return yield* Effect.interrupt
 
-      yield* plugins.flush
+      yield* plugins.initialized
       yield* mcpTools.flush
       const agent = yield* agents.select(session.agent)
       if (!agent.info) return yield* new AgentNotFoundError({ sessionID: session.id, agent: session.agent ?? agent.id })

packages/core/src/session/execution/restart.ts

@@ -204,6 +204,7 @@ export const layer = (options?: Options) =>
         yield* jobs.background(background.id)
         yield* jobs.wait({ id: background.id }).pipe(
           Effect.flatMap((result) => (result.info ? notify(result.info) : Effect.void)),
+          Effect.ignore,
           Effect.forkIn(scope),
         )
       })

packages/core/src/session/info.ts

@@ -1,13 +1,13 @@
 import { DateTime, Schema } from "effect"
-import { Agent } from "@opencode-ai/schema/agent"
-import { Location } from "@opencode-ai/schema/location"
-import { Model } from "@opencode-ai/schema/model"
-import { Project } from "@opencode-ai/schema/project"
-import { Provider } from "@opencode-ai/schema/provider"
+import { Agent } from "../agent.js"
+import { Location } from "../location.js"
+import { Model } from "../model.js"
+import { Project } from "../project.js"
+import { Provider } from "../provider.js"
 import { AbsolutePath, RelativePath } from "../schema.js"
-import { Workspace } from "@opencode-ai/schema/workspace"
+import { Workspace } from "../workspace.js"
 import { SessionSchema } from "./schema.js"
-import type { SessionTable } from "./sql.js"
+import { SessionTable } from "./sql.js"
 import { PersistedRevert } from "@opencode-ai/schema/session-revert"
 import { Money } from "@opencode-ai/schema/money"
 

packages/core/src/session/message-updater.ts

@@ -4,17 +4,21 @@ import { SessionEvent } from "./event.js"
 import { SessionMessage } from "./message.js"
 
 export interface Adapter {
-  readonly getAgent: () => Effect.Effect<SessionMessage.AgentSelected["agent"] | undefined>
-  readonly getModel: () => Effect.Effect<SessionMessage.ModelSelected["model"] | undefined>
-  readonly getLocation: () => Effect.Effect<SessionMessage.LocationSwitched["previous"]>
-  readonly getCurrentAssistant: () => Effect.Effect<SessionMessage.Assistant | undefined>
-  readonly getAssistant: (messageID: SessionMessage.ID) => Effect.Effect<SessionMessage.Assistant | undefined>
-  readonly getShell: (shellID: SessionMessage.Shell["shellID"]) => Effect.Effect<SessionMessage.Shell | undefined>
-  readonly getCompaction: () => Effect.Effect<SessionMessage.Compaction | undefined>
-  readonly updateAssistant: (assistant: SessionMessage.Assistant) => Effect.Effect<void>
-  readonly updateShell: (shell: SessionMessage.Shell) => Effect.Effect<void>
-  readonly updateCompaction: (compaction: SessionMessage.Compaction) => Effect.Effect<void>
-  readonly appendMessage: (message: SessionMessage.Info) => Effect.Effect<void>
+  readonly getAgent: () => Effect.Effect<SessionMessage.AgentSelected["agent"] | undefined, never, never>
+  readonly getModel: () => Effect.Effect<SessionMessage.ModelSelected["model"] | undefined, never, never>
+  readonly getLocation: () => Effect.Effect<SessionMessage.LocationSwitched["previous"], never, never>
+  readonly getCurrentAssistant: () => Effect.Effect<SessionMessage.Assistant | undefined, never, never>
+  readonly getAssistant: (
+    messageID: SessionMessage.ID,
+  ) => Effect.Effect<SessionMessage.Assistant | undefined, never, never>
+  readonly getShell: (
+    shellID: SessionMessage.Shell["shellID"],
+  ) => Effect.Effect<SessionMessage.Shell | undefined, never, never>
+  readonly getCompaction: () => Effect.Effect<SessionMessage.Compaction | undefined, never, never>
+  readonly updateAssistant: (assistant: SessionMessage.Assistant) => Effect.Effect<void, never, never>
+  readonly updateShell: (shell: SessionMessage.Shell) => Effect.Effect<void, never, never>
+  readonly updateCompaction: (compaction: SessionMessage.Compaction) => Effect.Effect<void, never, never>
+  readonly appendMessage: (message: SessionMessage.Info) => Effect.Effect<void, never, never>
 }
 
 type DraftAssistant = WritableDraft<SessionMessage.Assistant>
@@ -34,14 +38,16 @@ export function update(adapter: Adapter, event: SessionEvent.DurableEvent) {
   type DraftReasoning = WritableDraft<SessionMessage.AssistantReasoning>
   const created = DateTime.makeUnsafe(event.created)
 
-  const latestTool = (assistant: DraftAssistant, id: string) =>
-    assistant.content.findLast((item): item is DraftTool => item.type === "tool" && item.id === id)
+  const latestTool = (assistant: DraftAssistant | undefined, id?: string) =>
+    assistant?.content.findLast(
+      (item): item is DraftTool => item.type === "tool" && (id === undefined || item.id === id),
+    )
 
-  const latestText = (assistant: DraftAssistant) =>
-    assistant.content.findLast((item): item is DraftText => item.type === "text")
+  const latestText = (assistant: DraftAssistant | undefined) =>
+    assistant?.content.findLast((item): item is DraftText => item.type === "text")
 
-  const latestReasoning = (assistant: DraftAssistant) =>
-    assistant.content.findLast((item): item is DraftReasoning => item.type === "reasoning" && !item.time?.completed)
+  const latestReasoning = (assistant: DraftAssistant | undefined) =>
+    assistant?.content.findLast((item): item is DraftReasoning => item.type === "reasoning" && !item.time?.completed)
 
   const updateOwnedAssistant = (messageID: SessionMessage.ID, recipe: (draft: DraftAssistant) => void) =>
     Effect.gen(function* () {

packages/core/src/session/projector.ts

@@ -6,13 +6,13 @@ import path from "path"
 import { Database } from "../database/database.js"
 import { Bus } from "../bus.js"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { Agent } from "@opencode-ai/schema/agent"
-import { Model } from "@opencode-ai/schema/model"
+import { Agent } from "../agent.js"
+import { Model } from "../model.js"
 import { SessionEvent } from "./event.js"
 import { SessionMessage } from "./message.js"
 import { SessionMessageUpdater } from "./message-updater.js"
 import { SessionInbox } from "./inbox.js"
-import { Workspace } from "@opencode-ai/schema/workspace"
+import { Workspace } from "../workspace.js"
 import { InstructionState } from "./instruction-state.js"
 import { SessionInboxTable, SessionMessageTable, SessionTable } from "./sql.js"
 import { InstructionEntry } from "./instruction-entry.js"
@@ -26,10 +26,8 @@ import type { SessionSchema } from "./schema.js"
 import { ProjectTable } from "../project/sql.js"
 
 type DatabaseService = Database.Interface["db"]
-type MessageEvent = Exclude<
-  SessionEvent.DurableEvent,
-  typeof SessionEvent.Forked.Type | typeof SessionEvent.Deleted.Type
->
+type CurrentDurableEvent = Extract<SessionEvent.Event, { readonly durable: object }>
+type MessageEvent = Exclude<CurrentDurableEvent, typeof SessionEvent.Forked.Type | typeof SessionEvent.Deleted.Type>
 
 const decodeMessage = Schema.decodeUnknownSync(SessionMessage.Info)
 const encodeMessage = Schema.encodeSync(SessionMessage.Info)
@@ -55,16 +53,16 @@ const forkTitle = (value?: string) => {
   return `${value} (fork #1)`
 }
 
-function applyUsage(db: DatabaseService, sessionID: SessionSchema.ID, value: Usage) {
+function applyUsage(db: DatabaseService, sessionID: SessionSchema.ID, value: Usage, sign = 1) {
   return db
     .update(SessionTable)
     .set({
-      cost: sql`${SessionTable.cost} + ${value.cost}`,
-      tokens_input: sql`${SessionTable.tokens_input} + ${value.tokens.input}`,
-      tokens_output: sql`${SessionTable.tokens_output} + ${value.tokens.output}`,
-      tokens_reasoning: sql`${SessionTable.tokens_reasoning} + ${value.tokens.reasoning}`,
-      tokens_cache_read: sql`${SessionTable.tokens_cache_read} + ${value.tokens.cache.read}`,
-      tokens_cache_write: sql`${SessionTable.tokens_cache_write} + ${value.tokens.cache.write}`,
+      cost: sql`${SessionTable.cost} + ${value.cost * sign}`,
+      tokens_input: sql`${SessionTable.tokens_input} + ${value.tokens.input * sign}`,
+      tokens_output: sql`${SessionTable.tokens_output} + ${value.tokens.output * sign}`,
+      tokens_reasoning: sql`${SessionTable.tokens_reasoning} + ${value.tokens.reasoning * sign}`,
+      tokens_cache_read: sql`${SessionTable.tokens_cache_read} + ${value.tokens.cache.read * sign}`,
+      tokens_cache_write: sql`${SessionTable.tokens_cache_write} + ${value.tokens.cache.write * sign}`,
       time_updated: sql`${SessionTable.time_updated}`,
     })
     .where(eq(SessionTable.id, sessionID))
@@ -75,7 +73,7 @@ function applyUsage(db: DatabaseService, sessionID: SessionSchema.ID, value: Usa
 const publishSessionUsage = Effect.fn("SessionProjector.publishUsage")(function* (
   db: DatabaseService,
   bus: Bus.Interface,
-  sessionID: SessionSchema.ID,
+  sessionID: (typeof SessionEvent.Step.Ended.Type)["data"]["sessionID"],
 ) {
   const row = yield* db
     .select({

packages/core/src/session/prompt-cache-diagnostics.ts

@@ -0,0 +1,95 @@
+export * as PromptCacheDiagnostics from "./prompt-cache-diagnostics.js"
+
+import type { LLMRequest } from "@opencode-ai/ai"
+import { Hash } from "@opencode-ai/util/hash"
+
+interface Entry {
+  readonly label: string
+  readonly hash: string
+}
+
+export interface Snapshot {
+  readonly settings: string
+  readonly tools: ReadonlyArray<Entry>
+  readonly system: ReadonlyArray<Entry>
+  readonly messages: ReadonlyArray<Entry>
+}
+
+export type Comparison =
+  | { readonly status: "initial" }
+  | { readonly status: "stable"; readonly messages: number }
+  | { readonly status: "append-only"; readonly previousMessages: number; readonly currentMessages: number }
+  | {
+      readonly status: "changed"
+      readonly component: "settings" | "tools" | "system" | "messages"
+      readonly index: number
+      readonly label: string
+    }
+
+const hash = (value: unknown) => Hash.sha256(JSON.stringify(value)).slice(0, 16)
+
+export function snapshot(request: LLMRequest): Snapshot {
+  return {
+    settings: hash({
+      route: request.model.route.id,
+      provider: request.model.provider,
+      model: request.model.id,
+      modelDefaults: request.model.defaults,
+      compatibility: request.model.compatibility,
+      routeDefaults: {
+        generation: request.model.route.defaults.generation,
+        providerOptions: request.model.route.defaults.providerOptions,
+        http: request.model.route.defaults.http,
+      },
+      generation: request.generation,
+      providerOptions: request.providerOptions,
+      http: request.http,
+      toolChoice: request.toolChoice,
+      cache: request.cache,
+    }),
+    tools: request.tools.map((tool) => ({ label: tool.name, hash: hash(tool) })),
+    system: request.system.map((part, index) => ({ label: `system[${index}]`, hash: hash(part) })),
+    messages: request.messages.map((message, index) => ({
+      label: message.id ?? `${message.role}[${index}]`,
+      hash: hash(message),
+    })),
+  }
+}
+
+export function compare(previous: Snapshot | undefined, current: Snapshot): Comparison {
+  if (!previous) return { status: "initial" }
+  if (previous.settings !== current.settings)
+    return {
+      status: "changed",
+      component: "settings",
+      index: 0,
+      label: "model settings",
+    }
+  const tools = firstChange(previous.tools, current.tools, false)
+  if (tools) return { status: "changed", component: "tools", ...tools }
+  const system = firstChange(previous.system, current.system, false)
+  if (system) return { status: "changed", component: "system", ...system }
+  const messages = firstChange(previous.messages, current.messages, true)
+  if (messages) return { status: "changed", component: "messages", ...messages }
+  if (previous.messages.length === current.messages.length)
+    return { status: "stable", messages: current.messages.length }
+  return {
+    status: "append-only",
+    previousMessages: previous.messages.length,
+    currentMessages: current.messages.length,
+  }
+}
+
+function firstChange(previous: ReadonlyArray<Entry>, current: ReadonlyArray<Entry>, allowAppend: boolean) {
+  const index = previous.findIndex((entry, index) => entry.hash !== current[index]?.hash)
+  if (index >= 0)
+    return {
+      index,
+      label: current[index]?.label ?? previous[index]?.label ?? `entry[${index}]`,
+    }
+  if (current.length === previous.length || (allowAppend && current.length > previous.length)) return
+  return {
+    index: previous.length,
+    label: current[previous.length]?.label ?? `entry[${previous.length}]`,
+  }
+}

packages/core/src/session/runner/llm.ts

@@ -1,7 +1,7 @@
 export * as SessionRunnerLLM from "./llm.js"
 
 import { Message } from "@opencode-ai/ai"
-import { Cause, Effect, Exit, FiberMap, Layer, Pull, Schedule } from "effect"
+import { Cause, Config, Effect, Exit, FiberMap, Layer, Pull, Schedule } from "effect"
 import { Database } from "../../database/database.js"
 import { Bus } from "../../bus.js"
 import { InstructionState } from "../instruction-state.js"
@@ -24,7 +24,9 @@ import { SessionRunnerRetry } from "./retry.js"
 import { SessionStep } from "./step.js"
 import { ToolOutput } from "../../tool-output.js"
 import { PluginSupervisor } from "../../plugin/supervisor.js"
+import { PromptCacheDiagnostics } from "../prompt-cache-diagnostics.js"
 import { MAX_STEPS_PROMPT } from "./max-steps.js"
+import { PluginExecution } from "../../plugin/execution.js"
 
 const CONTINUE_AFTER_INCOMPLETE_STREAM =
   "The previous response was interrupted. Continue from where you left off without repeating completed content."
@@ -39,8 +41,35 @@ const layer = Layer.effect(
     const db = (yield* Database.Service).db
     const compaction = yield* SessionCompaction.Service
     const plugins = yield* PluginSupervisor.Service
+    const pluginExecution = yield* PluginExecution.Service
     const title = yield* SessionTitle.Service
     const steps = yield* SessionStep.make
+    const diagnostics = yield* Config.boolean("OPENCODE_PROMPT_CACHE_DIAGNOSTICS").pipe(
+      Config.withDefault(false),
+      Effect.orDie,
+    )
+    const promptCacheSnapshots = diagnostics ? new Map<string, PromptCacheDiagnostics.Snapshot>() : undefined
+    const diagnosePromptCache = Effect.fn("SessionRunner.diagnosePromptCache")(function* (
+      sessionID: SessionSchema.ID,
+      request: Parameters<typeof PromptCacheDiagnostics.snapshot>[0],
+    ) {
+      if (!promptCacheSnapshots) return
+      const current = PromptCacheDiagnostics.snapshot(request)
+      const comparison = PromptCacheDiagnostics.compare(promptCacheSnapshots.get(sessionID), current)
+      promptCacheSnapshots.delete(sessionID)
+      promptCacheSnapshots.set(sessionID, current)
+      const oldest = promptCacheSnapshots.keys().next().value
+      if (promptCacheSnapshots.size > 100 && oldest !== undefined) promptCacheSnapshots.delete(oldest)
+      yield* Effect.logInfo("prompt cache prefix").pipe(
+        Effect.annotateLogs({
+          sessionID,
+          toolCount: current.tools.length,
+          systemParts: current.system.length,
+          messageCount: current.messages.length,
+          ...comparison,
+        }),
+      )
+    })
     // Title generation starts once input is visible and must not delay model execution.
     const titles = yield* FiberMap.make<SessionSchema.ID, void, never>()
 
@@ -62,7 +91,6 @@ const layer = Layer.effect(
         const control = pending.type === "compaction" || pending.type === "move"
         if (promotable === "steer" && pending.delivery === "queue" && !control) return DrainResult.Complete()
       }
-      yield* plugins.flush
       yield* settleStaleToolCalls(sessionID)
 
       const advanceToStep = Effect.fn("SessionRunner.advanceToStep")(() =>
@@ -143,7 +171,7 @@ const layer = Layer.effect(
                     entering && !continuing ? promotable : "steer",
                   )
                   if (promoted > 0 && !selected.session.parentID && SessionTitle.isUntitled(selected.session))
-                    yield* FiberMap.run(titles, sessionID, title.generate(sessionID), {
+                    yield* FiberMap.run(titles, sessionID, title.generate(sessionID).pipe(Effect.ignore), {
                       onlyIfMissing: true,
                     })
                   if (promoted > 0) step = 1
@@ -216,12 +244,14 @@ const layer = Layer.effect(
           toolChoice: stepLimitReached ? "none" : undefined,
           webSocket: "session",
         })
+        yield* diagnosePromptCache(sessionID, prepared.request)
         const outcome = yield* steps.attempt({
           sessionID,
           assistantMessageID,
           agent: loaded.agent.id,
           model: loaded.model,
           prepared,
+          toolsDisabled: stepLimitReached,
           recoverContinuation,
           recoverOverflow: Effect.suspend(() =>
             recoverOverflow && compaction.enabled()
@@ -284,7 +314,14 @@ const layer = Layer.effect(
       }
     })
 
-    return Service.of({ drain })
+    return Service.of({
+      drain: Effect.fnUntraced(function* (input) {
+        yield* plugins.initialized
+        const session = yield* store.get(input.sessionID)
+        if (!session) return yield* Effect.die(new Error(`Session not found: ${input.sessionID}`))
+        return yield* pluginExecution.lease(session, drain(input))
+      }),
+    })
   }),
 )
 
@@ -303,5 +340,6 @@ export const node = makeLocationNode({
     Snapshot.node,
     ToolOutput.node,
     Database.node,
+    PluginExecution.node,
   ],
 })

packages/core/src/session/runner/publish-llm-event.ts

@@ -396,7 +396,7 @@ export const createLLMEventPublisher = (bus: Pick<Bus.Interface, "publish">, inp
         yield* text.append(event.id, event.text, providerState(event.providerMetadata))
         return
       case "text-end":
-        yield* text.end(event.id, providerState(event.providerMetadata), event.text)
+        yield* text.end(event.id, providerState(event.providerMetadata))
         return
       case "reasoning-start":
         outputStarted = true
@@ -412,7 +412,7 @@ export const createLLMEventPublisher = (bus: Pick<Bus.Interface, "publish">, inp
         yield* reasoning.append(event.id, event.text, providerState(event.providerMetadata))
         return
       case "reasoning-end":
-        yield* reasoning.end(event.id, providerState(event.providerMetadata), event.text)
+        yield* reasoning.end(event.id, providerState(event.providerMetadata))
         return
       case "tool-input-start":
         outputStarted = true

packages/core/src/session/runner/retry.ts

@@ -26,16 +26,12 @@ export function isRetryable(error: AIError) {
       return error.reason.delivery === undefined || error.reason.delivery === "not-sent"
     case "InvalidProviderOutput":
       return error.reason.classification === "incomplete-stream"
-    // Unrecognized failures retry: classification records affirmative
-    // deterministic evidence, and transient failures are exactly the ones
-    // that arrive in shapes no classifier anticipates.
-    case "UnknownProvider":
-      return true
     case "Authentication":
     case "QuotaExceeded":
     case "ContentPolicy":
     case "InvalidRequest":
     case "NoRoute":
+    case "UnknownProvider":
       return false
     default: {
       const exhaustive: never = error.reason

packages/core/src/session/runner/step.ts

@@ -44,6 +44,7 @@ interface Input {
   readonly agent: Agent.ID
   readonly model: SessionRunnerModel.Resolved
   readonly prepared: SessionModelRequest.Prepared
+  readonly toolsDisabled: boolean
   readonly recoverContinuation: boolean
   /** The runner owns compaction policy; the attempt invokes it only before durable output. */
   readonly recoverOverflow: Effect.Effect<boolean>
@@ -72,12 +73,11 @@ export const make = Effect.gen(function* () {
     })
     const toolRuns: Array<{
       readonly call: ToolCall
-      readonly fiber: Fiber.Fiber<void, Permission.DeclinedError | QuestionTool.CancelledError>
+      readonly fiber: Fiber.Fiber<void, SessionModelRequest.ExecuteError>
     }> = []
     const interruptTools = Effect.suspend(() => Fiber.interruptAll(toolRuns.map((run) => run.fiber)))
     const executeTool = (call: ToolCall) => {
-      if (input.prepared.request.toolChoice?.type === "none")
-        return new Tool.Error({ message: "Tools are disabled after the maximum agent steps" })
+      if (input.toolsDisabled) return new Tool.Error({ message: "Tools are disabled after the maximum agent steps" })
       return input.prepared.executeTool({
         sessionID: input.sessionID,
         agent: input.agent,
@@ -132,7 +132,10 @@ export const make = Effect.gen(function* () {
         if (streamInterrupted) yield* interruptTools
         const joined = yield* restore(Fiber.awaitAll(toolRuns.map((run) => run.fiber))).pipe(Effect.exit)
         if (Exit.isFailure(joined)) yield* interruptTools
-        const tools = classifyToolExits(joined, toolRuns)
+        const tools = classifyToolExits(
+          joined,
+          toolRuns.map((run) => run.call),
+        )
 
         if (
           !publisher.record().outputStarted &&
@@ -221,15 +224,10 @@ export const make = Effect.gen(function* () {
             })
         }
 
-        // After durable output, recovery continues instead of replaying: the
-        // partial assistant message is already persisted history. Any failure
-        // the pre-output gate would retry is continued here, plus interrupted
-        // streams, whose read failures may carry delivery states the retry
-        // policy rejects for full resends.
         if (
           llmFailure &&
           llmError &&
-          (isInterruptedStream(llmFailure) || SessionRunnerRetry.isRetryable(llmFailure)) &&
+          isInterruptedStream(llmFailure) &&
           record.outputStarted &&
           tools.declines.length === 0 &&
           !tools.interrupted
@@ -242,7 +240,7 @@ export const make = Effect.gen(function* () {
         if (tools.interrupted && Exit.isFailure(joined)) return yield* Effect.failCause(joined.cause)
         if (record.failure) return yield* new StepFailedError({ error: record.failure })
         return Outcome.Completed({
-          needsContinuation: input.prepared.request.toolChoice?.type !== "none" && record.needsContinuation,
+          needsContinuation: !input.toolsDisabled && record.needsContinuation,
         })
       }),
     )
@@ -251,22 +249,27 @@ export const make = Effect.gen(function* () {
   return { attempt }
 })
 
+const isDecline = (
+  error: SessionModelRequest.ExecuteError,
+): error is Permission.DeclinedError | QuestionTool.CancelledError =>
+  error._tag === "Permission.DeclinedError" || error._tag === "QuestionTool.CancelledError"
+
 const isInterruptedStream = (failure: AIError) => {
   if (failure.reason._tag === "InvalidProviderOutput") return failure.reason.classification === "incomplete-stream"
   if (failure.reason._tag === "Transport") return failure.reason.operation === "read"
   return false
 }
 
-/** Tool.Error settles in each fiber; only user declines remain in the typed error channel. */
+/** Keep every joined exit associated with its call; a decline is not an infrastructure failure. */
 const classifyToolExits = (
-  settled: Exit.Exit<Array<Exit.Exit<void, Permission.DeclinedError | QuestionTool.CancelledError>>>,
-  runs: ReadonlyArray<{ readonly call: ToolCall }>,
+  settled: Exit.Exit<Array<Exit.Exit<void, SessionModelRequest.ExecuteError>>>,
+  calls: ReadonlyArray<ToolCall>,
 ) => {
   const exits = Exit.isSuccess(settled) ? settled.value : []
   const declines = exits.flatMap((exit, index) =>
     Exit.isFailure(exit)
       ? exit.cause.reasons.flatMap((reason) =>
-          Cause.isFailReason(reason) ? [{ call: runs[index].call, reason: reason.error }] : [],
+          Cause.isFailReason(reason) && isDecline(reason.error) ? [{ call: calls[index], reason: reason.error }] : [],
         )
       : [],
   )
@@ -276,8 +279,11 @@ const classifyToolExits = (
   const failure = causes
     .flatMap((cause) => {
       if (Cause.hasInterrupts(cause)) return []
-      const reasons = cause.reasons.filter(Cause.isDieReason)
-      return reasons.length > 0 ? [Cause.fromReasons<never>(reasons)] : []
+      const reasons = cause.reasons.flatMap(
+        (reason): Array<Cause.Reason<never>> =>
+          Cause.isFailReason(reason) ? (isDecline(reason.error) ? [] : [Cause.makeDieReason(reason.error)]) : [reason],
+      )
+      return reasons.length > 0 ? [Cause.fromReasons(reasons)] : []
     })
     .at(0)
   return { interrupted: causes.some(Cause.hasInterrupts), declines, failure }

packages/core/src/session/sql.ts

@@ -5,10 +5,10 @@ import { ProjectTable } from "../project/sql.js"
 import type { SessionMessage } from "./message.js"
 import type { SessionInbox } from "./inbox.js"
 import type { FileDiff } from "@opencode-ai/schema/file-diff"
-import type { PermissionV1 } from "@opencode-ai/schema/permission-v1"
-import type { Project } from "@opencode-ai/schema/project"
+import { PermissionV1 } from "../v1/permission.js"
+import { Project } from "../project.js"
 import type { SessionSchema } from "./schema.js"
-import type { Workspace } from "@opencode-ai/schema/workspace"
+import { Workspace } from "../workspace.js"
 import { Timestamps } from "../database/schema.sql.js"
 import type { Instruction } from "@opencode-ai/schema/instruction"
 import type { Session } from "@opencode-ai/schema/session"

packages/core/src/session/stats.ts

@@ -255,7 +255,7 @@ export const get = Effect.fn("SessionStats.get")(function* (input: Input = {}) {
             Effect.tap((rows) =>
               Effect.sync(() => {
                 rows.forEach((row) => {
-                  addToolStatus(toolTotals, row.status)
+                  addToolStatus(toolTotals, row.status, 1)
                   if (!row.name) return
                   const tool = tools.get(row.name) ?? {
                     name: row.name,
@@ -266,7 +266,7 @@ export const get = Effect.fn("SessionStats.get")(function* (input: Input = {}) {
                     durations: [],
                   }
                   tools.set(row.name, tool)
-                  addToolStatus(tool, row.status)
+                  addToolStatus(tool, row.status, 1)
                   if (row.duration !== null) tool.durations.push(row.duration)
                 })
               }),
@@ -385,17 +385,18 @@ function tokenTotal(tokens: Tokens) {
 function addToolStatus(
   target: { calls: number; succeeded: number; failed: number; unfinished: number },
   status: string | null,
+  count: number,
 ) {
-  target.calls++
+  target.calls += count
   if (status === "completed") {
-    target.succeeded++
+    target.succeeded += count
     return
   }
   if (status === "error") {
-    target.failed++
+    target.failed += count
     return
   }
-  target.unfinished++
+  target.unfinished += count
 }
 
 function makeDateKey(timezone = "UTC") {

packages/core/src/session/title.ts

@@ -1,7 +1,8 @@
 export * as SessionTitle from "./title.js"
 
 import { isDeepStrictEqual } from "node:util"
-import { LLMClient, LLMEvent, Message, SystemPart } from "@opencode-ai/ai"
+import { LLMClient, AIError, LLMEvent, Message, SystemPart, type LLMRequest } from "@opencode-ai/ai"
+import type { StreamOptions } from "@opencode-ai/ai/route"
 import { Context, DateTime, Effect, Layer, Stream } from "effect"
 import type { Agent } from "../agent.js"
 import { Database } from "../database/database.js"
@@ -16,12 +17,22 @@ import type { SessionRunnerModel } from "./runner/model.js"
 import { SessionSchema } from "./schema.js"
 import { SessionUsage } from "./usage.js"
 import { SessionStore } from "./store.js"
+import { PluginExecution } from "../plugin/execution.js"
 
 const MAX_LENGTH = 100
 const MAX_CONTEXT_LENGTH = 8_000
 const MAX_FIRST_MESSAGE_LENGTH = 2_000
 const titleChanged = Symbol("Session title changed")
 
+type Dependencies = {
+  readonly bus: Bus.Interface
+  readonly llm: {
+    readonly stream: (request: LLMRequest, options?: StreamOptions) => Stream.Stream<LLMEvent, AIError>
+  }
+  readonly context: SessionContext.Interface
+  readonly store: SessionStore.Interface
+}
+
 export interface Interface {
   /** Generates an initial title or regenerates one from bounded conversation history. */
   readonly generate: (sessionID: SessionSchema.ID) => Effect.Effect<void>
@@ -36,6 +47,117 @@ export const isUntitled = (session: SessionSchema.Info) =>
     time: { created: DateTime.toEpochMillis(session.time.created) },
   })
 
+const attempt = Effect.fn("SessionTitle.attempt")(function* (
+  dependencies: Dependencies,
+  input: {
+    readonly session: SessionSchema.Info
+    readonly agent: Agent.Info
+    readonly text: string
+    readonly model: SessionRunnerModel.Resolved
+  },
+) {
+  const chunks: string[] = []
+  let failed = false
+  let usage: SessionUsage.Recorded | undefined
+  const recordUsage = Effect.suspend(() =>
+    usage
+      ? dependencies.bus.publish(SessionEvent.UsageRecorded, {
+          sessionID: input.session.id,
+          source: "title",
+          ...usage,
+        })
+      : Effect.void,
+  )
+  const prepared = yield* dependencies.context.prepare({
+    scope: { session: input.session, agentID: input.agent.id, model: input.model },
+    transcript: {
+      system: input.agent.system ? [SystemPart.make(input.agent.system)] : [],
+      messages: [Message.user(input.text)],
+    },
+    contextHooks: false,
+  })
+  yield* dependencies.llm.stream(prepared.request, prepared.options).pipe(
+    Stream.runForEach((event) => {
+      if (LLMEvent.is.providerError(event)) failed = true
+      if (LLMEvent.is.textDelta(event)) chunks.push(event.text)
+      if (LLMEvent.is.stepFinish(event)) {
+        const step = SessionUsage.record(event.usage, input.model.cost)
+        usage = usage ? SessionUsage.add(usage, step) : step
+      }
+      return Effect.void
+    }),
+    Effect.catchTag("AI.Error", () =>
+      Effect.sync(() => {
+        failed = true
+      }),
+    ),
+    Effect.onInterrupt(() => recordUsage.pipe(Effect.asVoid)),
+  )
+  yield* recordUsage
+  if (failed) return
+  return chunks
+    .join("")
+    .split("\n")
+    .map((line) => line.trim())
+    .find((line) => line.length > 0)
+})
+
+const make = (dependencies: Dependencies) => {
+  const generate = Effect.fn("SessionTitle.generate")(function* (
+    db: Database.Interface["db"],
+    sessionID: SessionSchema.ID,
+  ) {
+    const session = yield* dependencies.store.get(sessionID)
+    if (!session) return
+    const firstUser = yield* SessionHistory.firstUserMessage(db, session.id)
+    if (!firstUser) return
+    const text = !isUntitled(session)
+      ? yield* dependencies.store.context(session.id).pipe(
+          Effect.map((messages) => {
+            const original = `Original request:\n${firstUser.text.slice(0, MAX_FIRST_MESSAGE_LENGTH)}`
+            const recent = messages
+              .flatMap((message) => {
+                if (message.type === "user" && message.id !== firstUser.id) return [`User: ${message.text.trim()}`]
+                if (message.type !== "assistant") return []
+                const text = message.content
+                  .flatMap((part) => (part.type === "text" ? [part.text.trim()] : []))
+                  .filter(Boolean)
+                  .join("\n")
+                return text ? [`Assistant: ${text}`] : []
+              })
+              .join("\n\n")
+            if (!recent) return original
+            const prefix = `${original}\n\nRecent conversation:\n`
+            return `${prefix}${recent.slice(-(MAX_CONTEXT_LENGTH - prefix.length))}`
+          }),
+          Effect.orElseSucceed(() => firstUser.text),
+        )
+      : firstUser.text
+    const selection = yield* dependencies.context.selectTitle(session)
+    if (!selection) return
+    const title =
+      (yield* attempt(dependencies, { session, agent: selection.agent, text, model: selection.selected })) ??
+      (selection.primary && !isDeepStrictEqual(selection.selected.ref, selection.primary.ref)
+        ? yield* attempt(dependencies, { session, agent: selection.agent, text, model: selection.primary })
+        : undefined)
+    if (!title) return
+    const expectedSequence = (yield* Bus.latestSequence(db, sessionID)) + 1
+    const current = yield* dependencies.store.get(sessionID)
+    if (!current || current.title !== session.title || current.title === truncate(title)) return
+    yield* dependencies.bus
+      .publish(
+        SessionEvent.Renamed,
+        {
+          sessionID: session.id,
+          title: truncate(title),
+        },
+        { commit: (sequence) => (sequence === expectedSequence ? Effect.void : Effect.die(titleChanged)) },
+      )
+      .pipe(Effect.catchDefect((defect) => (defect === titleChanged ? Effect.void : Effect.die(defect))))
+  })
+  return { generate }
+}
+
 export const layer = Layer.effect(
   Service,
   Effect.gen(function* () {
@@ -43,115 +165,21 @@ export const layer = Layer.effect(
     const llm = yield* LLMClient.Service
     const context = yield* SessionContext.Service
     const store = yield* SessionStore.Service
-    const db = (yield* Database.Service).db
-
-    const attempt = Effect.fn("SessionTitle.attempt")(function* (input: {
-      readonly session: SessionSchema.Info
-      readonly agent: Agent.Info
-      readonly text: string
-      readonly model: SessionRunnerModel.Resolved
-    }) {
-      const chunks: string[] = []
-      let failed = false
-      let usage: SessionUsage.Recorded | undefined
-      const recordUsage = Effect.suspend(() =>
-        usage
-          ? bus.publish(SessionEvent.UsageRecorded, {
-              sessionID: input.session.id,
-              source: "title",
-              ...usage,
-            })
-          : Effect.void,
-      )
-      const prepared = yield* context.prepare({
-        scope: { session: input.session, agentID: input.agent.id, model: input.model },
-        transcript: {
-          system: input.agent.system ? [SystemPart.make(input.agent.system)] : [],
-          messages: [Message.user(input.text)],
-        },
-        contextHooks: false,
-      })
-      yield* llm.stream(prepared.request, prepared.options).pipe(
-        Stream.runForEach((event) => {
-          if (LLMEvent.is.providerError(event)) failed = true
-          if (LLMEvent.is.textDelta(event)) chunks.push(event.text)
-          if (LLMEvent.is.stepFinish(event)) {
-            const step = SessionUsage.record(event.usage, input.model.cost)
-            usage = usage ? SessionUsage.add(usage, step) : step
-          }
-          return Effect.void
-        }),
-        Effect.catchTag("AI.Error", () =>
-          Effect.sync(() => {
-            failed = true
-          }),
-        ),
-        Effect.onInterrupt(() => recordUsage.pipe(Effect.asVoid)),
-      )
-      yield* recordUsage
-      if (failed) return
-      return chunks
-        .join("")
-        .split("\n")
-        .map((line) => line.trim())
-        .find((line) => line.length > 0)
+    const database = yield* Database.Service
+    const gate = yield* PluginExecution.Service
+    const title = make({ bus, llm, context, store })
+    return Service.of({
+      generate: Effect.fnUntraced(function* (sessionID) {
+        const session = yield* store.get(sessionID)
+        if (!session) return
+        return yield* gate.lease({ id: session.id, admission: true }, title.generate(database.db, sessionID))
+      }),
     })
-
-    const generate = Effect.fn("SessionTitle.generate")(function* (sessionID: SessionSchema.ID) {
-      const session = yield* store.get(sessionID)
-      if (!session) return
-      const firstUser = yield* SessionHistory.firstUserMessage(db, session.id)
-      if (!firstUser) return
-      const text = !isUntitled(session)
-        ? yield* store.context(session.id).pipe(
-            Effect.map((messages) => {
-              const original = `Original request:\n${firstUser.text.slice(0, MAX_FIRST_MESSAGE_LENGTH)}`
-              const recent = messages
-                .flatMap((message) => {
-                  if (message.type === "user" && message.id !== firstUser.id) return [`User: ${message.text.trim()}`]
-                  if (message.type !== "assistant") return []
-                  const text = message.content
-                    .flatMap((part) => (part.type === "text" ? [part.text.trim()] : []))
-                    .filter(Boolean)
-                    .join("\n")
-                  return text ? [`Assistant: ${text}`] : []
-                })
-                .join("\n\n")
-              if (!recent) return original
-              const prefix = `${original}\n\nRecent conversation:\n`
-              return `${prefix}${recent.slice(-(MAX_CONTEXT_LENGTH - prefix.length))}`
-            }),
-            Effect.orElseSucceed(() => firstUser.text),
-          )
-        : firstUser.text
-      const selection = yield* context.selectTitle(session)
-      if (!selection) return
-      const title =
-        (yield* attempt({ session, agent: selection.agent, text, model: selection.selected })) ??
-        (selection.primary && !isDeepStrictEqual(selection.selected.ref, selection.primary.ref)
-          ? yield* attempt({ session, agent: selection.agent, text, model: selection.primary })
-          : undefined)
-      if (!title) return
-      const expectedSequence = (yield* Bus.latestSequence(db, sessionID)) + 1
-      const current = yield* store.get(sessionID)
-      if (!current || current.title !== session.title || current.title === truncate(title)) return
-      yield* bus
-        .publish(
-          SessionEvent.Renamed,
-          {
-            sessionID: session.id,
-            title: truncate(title),
-          },
-          { commit: (sequence) => (sequence === expectedSequence ? Effect.void : Effect.die(titleChanged)) },
-        )
-        .pipe(Effect.catchDefect((defect) => (defect === titleChanged ? Effect.void : Effect.die(defect))))
-    })
-    return Service.of({ generate })
   }),
 )
 
 export const node = makeLocationNode({
   service: Service,
   layer,
-  deps: [Bus.node, llmClient, SessionContext.node, SessionStore.node, Database.node],
+  deps: [Bus.node, llmClient, SessionContext.node, SessionStore.node, Database.node, PluginExecution.node],
 })

packages/core/src/session/usage.ts

@@ -3,7 +3,7 @@ export * as SessionUsage from "./usage.js"
 import type { Usage } from "@opencode-ai/ai"
 import { Money } from "@opencode-ai/schema/money"
 import type { TokenUsage } from "@opencode-ai/schema/token-usage"
-import type { Model } from "@opencode-ai/schema/model"
+import type { Model } from "../model.js"
 
 const finite = (value: number) => (Number.isFinite(value) ? value : 0)
 const safe = (value: number | undefined) => Math.max(0, finite(value ?? 0))

packages/core/src/shell.ts

@@ -305,7 +305,7 @@ const layer = () =>
                       }),
                   )
                   yield* outputDone.open
-                }),
+                }).pipe(Effect.catch(() => outputDone.open)),
               )
               yield* Effect.promise(
                 () =>
@@ -356,6 +356,7 @@ const layer = () =>
                       Effect.flatMap(() =>
                         finish("timeout", undefined, handle.kill().pipe(Effect.catch(() => Effect.void))),
                       ),
+                      Effect.catch(() => Effect.void),
                     ),
                   )
                 })

packages/core/src/shell/parse.ts

@@ -7,7 +7,6 @@ import path from "path"
 import type { Node } from "web-tree-sitter"
 import { shellParserWasm } from "#shell-parser-wasm"
 import { ShellSelect } from "./select.js"
-import { lazy } from "../util/lazy.js"
 import { Wildcard } from "../util/wildcard.js"
 
 type Part = { type: string; text: string }
@@ -356,7 +355,10 @@ function resolve(asset: string) {
   return fileURLToPath(new URL(asset, import.meta.url))
 }
 
-const load = lazy(initialize)
+const load = (() => {
+  let loading: ReturnType<typeof initialize> | undefined
+  return () => (loading ??= initialize())
+})()
 
 async function initialize() {
   const { Parser, Language } = await import("web-tree-sitter")

packages/core/src/snapshot.ts

@@ -133,34 +133,36 @@ const layer = Layer.effect(
 
     const compare = Effect.fnUntraced(function* (operation: "files" | "diff", input: CompareInput) {
       const repo = yield* repository.pipe(Effect.mapError((cause) => failure(operation, cause)))
-      const comparison = {
-        repository: repo.snapshotRepository,
-        from: Git.TreeID.make(input.from),
-        to: Git.TreeID.make(input.to),
-      }
-      const files = yield* git.tree.files(comparison).pipe(Effect.mapError((cause) => failure(operation, cause)))
-      const ignored = yield* git.index
-        .ignored({ repository: repo.source, paths: files })
-        .pipe(Effect.mapError((cause) => failure(operation, cause)))
       return {
-        input: comparison,
-        files,
-        ignored,
+        source: repo.source,
+        input: {
+          repository: repo.snapshotRepository,
+          from: Git.TreeID.make(input.from),
+          to: Git.TreeID.make(input.to),
+        },
       }
     })
 
     const files = Effect.fn("Snapshot.files")(function* (input: CompareInput) {
       const comparison = yield* compare("files", input)
-      return comparison.files.filter((file) => !comparison.ignored.has(file))
+      const files = yield* git.tree.files(comparison.input).pipe(Effect.mapError((cause) => failure("files", cause)))
+      const ignored = yield* git.index
+        .ignored({ repository: comparison.source, paths: files })
+        .pipe(Effect.mapError((cause) => failure("files", cause)))
+      return files.filter((file) => !ignored.has(file))
     })
 
     const diff = Effect.fn("Snapshot.diff")(function* (input: DiffInput) {
       const comparison = yield* compare("diff", input)
+      const files = yield* git.tree.files(comparison.input).pipe(Effect.mapError((cause) => failure("diff", cause)))
+      const ignored = yield* git.index
+        .ignored({ repository: comparison.source, paths: files })
+        .pipe(Effect.mapError((cause) => failure("diff", cause)))
       return yield* git.tree
         .diff({
           ...comparison.input,
           context: input.context,
-          paths: (input.paths ?? comparison.files).filter((file) => !comparison.ignored.has(file)),
+          paths: (input.paths ?? files).filter((file) => !ignored.has(file)),
         })
         .pipe(Effect.mapError((cause) => failure("diff", cause)))
     })