chore(app): resolve last turn review conflicts

Co-authored-by: nexxeln <95541290+nexxeln@users.noreply.github.com>

packages/app/e2e/regression/review.spec.ts

@@ -532,6 +532,29 @@ test("restores review state and the side-panel tab per session", async ({ page }
   await expect(review).toHaveAttribute("aria-selected", "true")
 })
 
+test("shows and restores last turn changes from the session diff", async ({ page }) => {
+  const sessionID = "ses_reviewturn"
+  await openSession(page, { name: "ReviewTurn", vcsDiff: [fileDiff("src/alpha.ts")] })
+  await page.route(`**/api/session/${sessionID}/diff**`, (route) =>
+    route.fulfill({
+      status: 200,
+      contentType: "application/json",
+      body: JSON.stringify({ data: [fileDiff("src/delta.ts")] }),
+    }),
+  )
+  const panel = page.locator("#review-panel")
+  await page.getByRole("button", { name: "Toggle review" }).click()
+  await page.getByRole("button", { name: "Git changes" }).click()
+  await page.getByRole("option", { name: "Last turn changes" }).click()
+  await expect(page.getByRole("button", { name: "Last turn changes" })).toBeVisible()
+  await expect(panel.locator('[data-slot="session-review-v2-file-name"]')).toHaveText("delta.ts")
+
+  await page.reload()
+  await expectSessionTitle(page, "ReviewTurn")
+  await expect(page.getByRole("button", { name: "Last turn changes" })).toBeVisible()
+  await expect(panel.locator('[data-slot="session-review-v2-file-name"]')).toHaveText("delta.ts")
+})
+
 test("keeps the review state a session stored before extensions", async ({ page }) => {
   const directory = "C:/OpenCode/ReviewLegacy"
   await openSession(page, {

packages/cli/src/acp/agent.ts

@@ -9,14 +9,16 @@ import {
   type Stream,
 } from "@agentclientprotocol/sdk"
 import { ClientError, type OpenCodeClient } from "@opencode/client/promise"
-import { Cause, Effect } from "effect"
+import { Cause, Effect, type Scope } from "effect"
+import { ACPCatalog } from "./catalog"
 import { ACPConnection } from "./connection"
 import { ACPError } from "./error"
 import { ACPService } from "./service"
 
 // Untraced so request spans parent to the caller's span instead of a setup span that has already ended.
 export const connect = Effect.fnUntraced(function* (client: OpenCodeClient, stream: Stream) {
-  const run = Effect.runPromiseWith(yield* Effect.context<never>())
+  const run = Effect.runPromiseWith(yield* Effect.context<Scope.Scope>())
+  const catalog = yield* ACPCatalog.make(client)
   const handle =
     <Params, A>(call: (ctx: AgentHandlerContext<Params>) => Effect.Effect<A, ACPError.Error | RequestError>) =>
     (name: string) => {
@@ -94,14 +96,18 @@ export const connect = Effect.fnUntraced(function* (client: OpenCodeClient, stre
   )
   const connection = app.connect(stream)
   // Inbound dispatch starts after the stream's async read loop yields, so handlers never observe this before assignment.
-  const service = ACPService.make({ client, connection: ACPConnection.make(connection) })
+  const service = ACPService.make({ client, connection: ACPConnection.make(connection), catalog, run })
   return connection
 })
 
 const spanName = (method: string) => `cli.acp.${method.replaceAll("/", ".")}`
 
 const promise = <A>(evaluate: () => Promise<A>) =>
-  Effect.tryPromise({ try: evaluate, catch: (cause) => cause }).pipe(
+  Effect.tryPromise({
+    try: evaluate,
+    // A catalog load failure is classified by the client error that caused it.
+    catch: (cause) => (cause instanceof ACPCatalog.LoadError ? cause.cause : cause),
+  }).pipe(
     Effect.catch((cause) => {
       if (cause instanceof RequestError || ACPError.is(cause)) return Effect.fail(cause)
       if (cause instanceof ClientError && cause.reason === "Transport")

packages/cli/src/acp/catalog.ts

@@ -1,5 +1,6 @@
 import type { CommandInfo, ModelInfo, ModelRef, OpenCodeClient, OpenCodeEvent } from "@opencode/client/promise"
 import { FSUtil } from "@opencode/util/fs-util"
+import { Context, Deferred, Effect, Exit, Schedule, Schema, Scope, Semaphore, Stream, SubscriptionRef } from "effect"
 import type { ConfigOptionProvider } from "./config-option"
 
 export type Catalog = {
@@ -11,118 +12,219 @@ export type Catalog = {
   readonly commands: CommandInfo[]
 }
 
-export type Live = {
+export class NotReadyError extends Schema.TaggedError<NotReadyError>()("ACPCatalogNotReadyError", {
+  reason: Schema.Literals(["models", "agents"]),
+}) {
+  override get message() {
+    return this.reason === "models" ? "No models are available" : "No primary agents are available"
+  }
+}
+
+export class LoadError extends Schema.TaggedError<LoadError>()("ACPCatalogLoadError", {
+  cause: Schema.Defect(),
+}) {}
+
+export type Error = NotReadyError | LoadError
+
+export interface Interface {
+  /** Loads a directory's catalog once. Concurrent callers share the load, and a failed load is not cached. */
+  readonly get: (cwd: string) => Effect.Effect<Catalog, Error>
+  /** Resolves after a reload that started after the call. A failed reload keeps the previous catalog. */
+  readonly reload: (cwd: string) => Effect.Effect<void, Error>
+  /** Emits the current catalog, then each reloaded one. */
+  readonly changes: (cwd: string) => Stream.Stream<Catalog, Error>
+}
+
+export class Service extends Context.Service<Service, Interface>()("@opencode/cli/acp/Catalog") {}
+
+type Entry = {
   readonly cwd: string
-  current: Catalog
+  readonly catalog: SubscriptionRef.SubscriptionRef<Catalog>
+  readonly lock: Semaphore.Semaphore
+  requested: number
+  loaded: number
 }
 
 // Provider, integration, and credential changes reach the catalog through model.updated.
 const reloadOn = new Set<OpenCodeEvent["type"]>(["model.updated", "agent.updated", "command.updated"])
 
-export function make(input: {
-  readonly client: OpenCodeClient
-  readonly signal?: AbortSignal
+export const make = Effect.fnUntraced(function* (client: OpenCodeClient) {
+  const scope = yield* Effect.scope
+  const entries = new Map<string, Deferred.Deferred<Entry, Error>>()
+  const connected = yield* Deferred.make<void>()
+
+  // A reload covers every request made before it starts, so requests queued behind a running reload share
+  // one more load. Typed load failures keep the previous catalog and still settle the requests they covered.
+  const reload = (entry: Entry) =>
+    Effect.suspend(() => {
+      const target = ++entry.requested
+      return entry.lock.withPermit(
+        Effect.suspend(() => {
+          if (entry.loaded >= target) return Effect.void
+          const generation = entry.requested
+          return load(client, entry.cwd).pipe(
+            Effect.flatMap((next) => SubscriptionRef.set(entry.catalog, next)),
+            Effect.ignore,
+            Effect.andThen(
+              Effect.sync(() => {
+                entry.loaded = generation
+              }),
+            ),
+          )
+        }),
+      )
+    })
+
+  // Subscribe before the first read so an update between the read and the subscription is not lost.
+  yield* Stream.fromAsyncIterable(client.event.subscribe(), (cause) => cause).pipe(
+    Stream.runForEach((event) => {
+      if (event.type === "server.connected") return Deferred.succeed(connected, undefined)
+      if (!reloadOn.has(event.type)) return Effect.void
+      const directory = event.location?.directory
+      const targets = directory === undefined ? [...entries.values()] : [entries.get(FSUtil.resolve(directory))]
+      return Effect.forEach(
+        targets.filter((entry) => entry !== undefined),
+        (entry) => Deferred.await(entry).pipe(Effect.flatMap(reload), Effect.ignore, Effect.forkIn(scope)),
+        { discard: true },
+      )
+    }),
+    Effect.ignore,
+    Effect.ensuring(Deferred.succeed(connected, undefined)),
+    Effect.forkScoped,
+  )
+
+  const create = Effect.fnUntraced(function* (cwd: string) {
+    yield* Deferred.await(connected)
+    return {
+      cwd,
+      catalog: yield* SubscriptionRef.make<Catalog>(yield* load(client, cwd)),
+      lock: Semaphore.makeUnsafe(1),
+      requested: 0,
+      loaded: 0,
+    } satisfies Entry
+  })
+
+  const entry = (cwd: string) =>
+    Effect.suspend(() => {
+      const key = FSUtil.resolve(cwd)
+      const cached = entries.get(key)
+      if (cached) return Deferred.await(cached)
+      const loading = Deferred.makeUnsafe<Entry, Error>()
+      entries.set(key, loading)
+      return create(cwd).pipe(
+        Effect.onExit((exit) => {
+          if (Exit.isFailure(exit)) entries.delete(key)
+          return Deferred.done(loading, exit)
+        }),
+        Effect.forkIn(scope),
+        Effect.andThen(Deferred.await(loading)),
+      )
+    })
+
+  return Service.of({
+    get: Effect.fn("cli.acp.catalog.get")(function* (cwd) {
+      const loaded = yield* entry(cwd)
+      return yield* SubscriptionRef.get(loaded.catalog)
+    }),
+    reload: Effect.fn("cli.acp.catalog.reload")(function* (cwd) {
+      yield* reload(yield* entry(cwd))
+    }),
+    changes: (cwd) => Stream.unwrap(entry(cwd).pipe(Effect.map((loaded) => SubscriptionRef.changes(loaded.catalog)))),
+  })
+})
+
+export type Live = {
+  readonly cwd: string
+  readonly current: Catalog
+}
+
+/** Temporary adapter for the promise-based `ACPService` until sessions consume the service directly. */
+export function promise(input: {
+  readonly catalog: Interface
+  readonly run: <A, E>(effect: Effect.Effect<A, E, Scope.Scope>) => Promise<A>
   readonly changed: (live: Live, previous: Catalog) => Promise<unknown>
 }) {
-  const entries = new Map<string, Promise<Live>>()
-  const running = new Map<Live, Promise<void>>()
-  const queued = new Set<Live>()
-  let subscribed: Promise<void> | undefined
-
-  const get = (cwd: string) => {
-    const key = FSUtil.resolve(cwd)
-    const cached = entries.get(key)
-    if (cached) return cached
-    // Subscribe before the first read so an update between the read and the subscription is not lost.
-    const loaded = subscribe()
-      .then(() => load(input.client, cwd))
-      .then((current): Live => ({ cwd, current }))
-      .catch((error) => {
-        entries.delete(key)
-        throw error
-      })
-    entries.set(key, loaded)
-    return loaded
+  const lives = new Map<string, Live>()
+  return {
+    get: (cwd: string) =>
+      input.run(
+        Effect.gen(function* () {
+          const current = yield* input.catalog.get(cwd)
+          const key = FSUtil.resolve(cwd)
+          const existing = lives.get(key)
+          if (existing) return existing
+          const live: Live = {
+            cwd,
+            // A loaded entry's read never suspends.
+            get current() {
+              return Effect.runSync(input.catalog.get(cwd))
+            },
+          }
+          lives.set(key, live)
+          yield* input.catalog.changes(cwd).pipe(
+            Stream.runFoldEffect(
+              () => current,
+              (previous, next) =>
+                next === previous
+                  ? Effect.succeed(previous)
+                  : Effect.promise(() => input.changed(live, previous).catch(() => {})).pipe(Effect.as(next)),
+            ),
+            Effect.ignore,
+            Effect.forkScoped({ startImmediately: true }),
+          )
+          return live
+        }),
+      ),
+    reload: (live: Live) => input.run(input.catalog.reload(live.cwd)),
   }
-
-  const reload = (live: Live) => {
-    const current = running.get(live)
-    if (current) {
-      queued.add(live)
-      return current
-    }
-    const run = (async () => {
-      do {
-        queued.delete(live)
-        const next = await load(input.client, live.cwd).catch(() => undefined)
-        if (!next) break
-        const previous = live.current
-        live.current = next
-        await input.changed(live, previous).catch(() => {})
-      } while (queued.has(live))
-      running.delete(live)
-    })()
-    running.set(live, run)
-    return run
-  }
-
-  const subscribe = () =>
-    (subscribed ??= new Promise<void>((ready) => {
-      void (async () => {
-        for await (const event of input.client.event.subscribe({ signal: input.signal })) {
-          if (event.type === "server.connected") ready()
-          if (!reloadOn.has(event.type)) continue
-          const directory = event.location?.directory
-          const targets = directory === undefined ? [...entries.values()] : [entries.get(FSUtil.resolve(directory))]
-          targets.forEach((entry) => void entry?.then(reload, () => {}))
-        }
-      })()
-        .catch(() => {})
-        .finally(ready)
-    }))
-
-  return { get, reload }
 }
 
-async function load(client: OpenCodeClient, cwd: string): Promise<Catalog> {
+const load = (client: OpenCodeClient, cwd: string) =>
+  read(client, cwd).pipe(
+    // Some providers discover models in the background after plugin startup begins.
+    Effect.retry({
+      while: (error) => error._tag === "ACPCatalogNotReadyError",
+      schedule: Schedule.spaced("25 millis").pipe(Schedule.upTo({ duration: "5 seconds" })),
+    }),
+    Effect.withSpan("cli.acp.catalog.load"),
+  )
+
+const read = Effect.fnUntraced(function* (client: OpenCodeClient, cwd: string) {
   const location = { directory: cwd }
-  // Some providers discover models in the background after plugin startup begins.
-  const deadline = Date.now() + 5_000
-  let missing = "No models are available"
-  while (Date.now() < deadline) {
-    const [modelResult, defaultResult, agentResult, commandResult] = await Promise.all([
-      client.model.list({ location }),
-      client.model.default({ location }),
-      client.agent.list({ location }),
-      client.command.list({ location }),
-    ])
-    const models = modelResult.data.filter((model) => model.enabled)
-    const preferred = defaultResult.data
-    // Parallel reads can straddle initialization; select only from this model list.
-    const defaultModel = preferred
-      ? models.find((model) => model.providerID === preferred.providerID && model.id === preferred.id)
-      : models[0]
-    const agents = agentResult.data.filter((agent) => agent.mode !== "subagent" && !agent.hidden)
-    const defaultAgent = agents.find((agent) => agent.mode === "primary") ?? agents[0]
-    if (defaultModel && defaultAgent) {
-      return {
-        providers: providers(models),
-        models,
-        defaultModel: {
-          providerID: defaultModel.providerID,
-          id: defaultModel.id,
-          variant: defaultModel.variants.find((variant) => variant.id === "default")?.id,
-        },
-        modes: agents.map((agent) => ({ id: agent.id, name: agent.name, description: agent.description })),
-        defaultModeID: defaultAgent.id,
-        commands: commandResult.data,
-      }
-    }
-    missing = defaultModel ? "No primary agents are available" : "No models are available"
-    await Bun.sleep(25)
-  }
-  throw new Error(missing)
-}
+  const [modelResult, defaultResult, agentResult, commandResult] = yield* Effect.tryPromise({
+    try: (signal) =>
+      Promise.all([
+        client.model.list({ location }, { signal }),
+        client.model.default({ location }, { signal }),
+        client.agent.list({ location }, { signal }),
+        client.command.list({ location }, { signal }),
+      ]),
+    catch: (cause) => new LoadError({ cause }),
+  })
+  const models = modelResult.data.filter((model) => model.enabled)
+  const preferred = defaultResult.data
+  // Parallel reads can straddle initialization; select only from this model list.
+  const defaultModel = preferred
+    ? models.find((model) => model.providerID === preferred.providerID && model.id === preferred.id)
+    : models[0]
+  if (!defaultModel) return yield* new NotReadyError({ reason: "models" })
+  const agents = agentResult.data.filter((agent) => agent.mode !== "subagent" && !agent.hidden)
+  // Core lists its resolved default agent first, the same one a new session runs.
+  const defaultAgent = agents[0]
+  if (!defaultAgent) return yield* new NotReadyError({ reason: "agents" })
+  return {
+    providers: providers(models),
+    models,
+    defaultModel: {
+      providerID: defaultModel.providerID,
+      id: defaultModel.id,
+      variant: defaultModel.variants.find((variant) => variant.id === "default")?.id,
+    },
+    modes: agents.map((agent) => ({ id: agent.id, name: agent.name, description: agent.description })),
+    defaultModeID: defaultAgent.id,
+    commands: commandResult.data,
+  } satisfies Catalog
+})
 
 function providers(models: readonly ModelInfo[]): ConfigOptionProvider[] {
   return Array.from(new Set(models.map((model) => model.providerID)))

packages/cli/src/acp/connection.ts

@@ -5,15 +5,12 @@ import {
   type RequestPermissionResponse,
   type SendRequestOptions,
   type SessionNotification,
-  type WriteTextFileRequest,
-  type WriteTextFileResponse,
 } from "@agentclientprotocol/sdk"
 
 export type Connection = {
   readonly signal?: AbortSignal
   sessionUpdate(params: SessionNotification): Promise<void>
   requestPermission(params: RequestPermissionRequest, options?: SendRequestOptions): Promise<RequestPermissionResponse>
-  writeTextFile?(params: WriteTextFileRequest, options?: SendRequestOptions): Promise<WriteTextFileResponse>
   extNotification?(method: string, params: Record<string, unknown>): Promise<void>
 }
 
@@ -23,7 +20,6 @@ export function make(connection: AgentConnection): Connection {
     sessionUpdate: (params) => connection.client.notify(methods.client.session.update, params),
     requestPermission: (params, options) =>
       connection.client.request(methods.client.session.requestPermission, params, options),
-    writeTextFile: (params, options) => connection.client.request(methods.client.fs.writeTextFile, params, options),
     extNotification: (method, params) => connection.client.notify(method, params),
   }
 }

packages/cli/src/acp/event.ts

@@ -5,11 +5,13 @@ import type {
   SessionMessageAssistant,
   SessionMessageInfo,
   SessionStructuredError,
+  TokenUsageInfo,
 } from "@opencode/client/promise"
+import { TokenUsage } from "@opencode/schema/token-usage"
 import type { ACPConnection } from "./connection"
 import { partsToContentChunks, type ReplayPart } from "./content"
 import { ACPError } from "./error"
-import { replyPermission, syncEditedFiles } from "./permission"
+import { replyPermission } from "./permission"
 import {
   completedToolUpdate,
   errorToolUpdate,
@@ -19,7 +21,7 @@ import {
   type ToolInput,
 } from "./tool"
 
-type Connection = Pick<ACPConnection.Connection, "sessionUpdate" | "requestPermission" | "writeTextFile">
+type Connection = Pick<ACPConnection.Connection, "sessionUpdate" | "requestPermission">
 
 export type TurnControl = {
   cancelled: boolean
@@ -84,14 +86,13 @@ export async function streamTurn(input: {
   readonly sessionID: string
   readonly cwd: string
   readonly start: TurnStart
-  readonly writeTextFile: boolean
   readonly action?: boolean
   readonly submit: (signal: AbortSignal) => Promise<unknown>
   readonly control: TurnControl
   readonly childSessionUpdate?: (update: ChildSessionUpdate) => Promise<void>
   readonly connectionSignal?: AbortSignal
   readonly sessionSignal?: AbortSignal
-}): Promise<PromptResponse> {
+}): Promise<{ readonly response: PromptResponse; readonly contextTokens: number | undefined }> {
   const streamController = new AbortController()
   const connectionAbort = () => streamController.abort()
   input.connectionSignal?.addEventListener("abort", connectionAbort, { once: true })
@@ -101,15 +102,31 @@ export async function streamTurn(input: {
 
   const control = input.control
   let started = false
-  let assistantMessageID: string | undefined
   let finish: SessionMessageAssistant["finish"]
   let executionError: { readonly type: string; readonly message: string } | undefined
+  let stepError: SessionStructuredError | undefined
+  let usage: { readonly turn: TokenUsageInfo; readonly last: TokenUsageInfo } | undefined
   const tools = new Map<string, ToolState>()
   const retries = new Map<string, RetryStatus>()
   const children = new Map<string, ChildSession>()
   const openChildren = new Set<string>()
   let handedOff = false
 
+  const recordStep = (tokens: TokenUsageInfo) => {
+    const turn = usage?.turn
+    usage = {
+      turn: turn
+        ? {
+            input: turn.input + tokens.input,
+            output: turn.output + tokens.output,
+            reasoning: turn.reasoning + tokens.reasoning,
+            cache: { read: turn.cache.read + tokens.cache.read, write: turn.cache.write + tokens.cache.write },
+          }
+        : tokens,
+      last: tokens,
+    }
+  }
+
   const notifyChild = async (child: ChildSession, value: ChildSessionEvent) => {
     if (!input.childSessionUpdate) return
     await input
@@ -196,7 +213,7 @@ export async function streamTurn(input: {
       }
 
       if (event.type === "session.step.started") {
-        if (!child) assistantMessageID = event.data.assistantMessageID
+        if (!child) stepError = undefined
         if (retries.delete(eventSessionID))
           await send({ sessionUpdate: "session_info_update", _meta: { [RetryMeta]: null } })
         continue
@@ -212,7 +229,6 @@ export async function streamTurn(input: {
         continue
       }
       if (event.type === "session.text.delta") {
-        if (!child) assistantMessageID = event.data.assistantMessageID
         await send({
           sessionUpdate: "agent_message_chunk",
           messageId: event.data.assistantMessageID,
@@ -221,7 +237,6 @@ export async function streamTurn(input: {
         continue
       }
       if (event.type === "session.reasoning.delta") {
-        if (!child) assistantMessageID = event.data.assistantMessageID
         await send({
           sessionUpdate: "agent_thought_chunk",
           messageId: `${event.data.assistantMessageID}:reasoning:${event.data.ordinal}`,
@@ -230,7 +245,6 @@ export async function streamTurn(input: {
         continue
       }
       if (event.type === "session.tool.input.started") {
-        if (!child) assistantMessageID = event.data.assistantMessageID
         tools.set(toolKey(event.data.sessionID, event.data.id), {
           name: event.data.name,
           input: {},
@@ -249,7 +263,6 @@ export async function streamTurn(input: {
         continue
       }
       if (event.type === "session.tool.called") {
-        if (!child) assistantMessageID = event.data.assistantMessageID
         const key = toolKey(event.data.sessionID, event.data.id)
         const current = tools.get(key) ?? emptyToolState()
         current.input = event.data.input
@@ -284,16 +297,6 @@ export async function streamTurn(input: {
         const key = toolKey(event.data.sessionID, event.data.id)
         const current = tools.get(key) ?? emptyToolState()
         tools.delete(key)
-        await syncEditedFiles({
-          connection: input.connection,
-          writeTextFile: input.writeTextFile,
-          sessionID: input.sessionID,
-          cwd: input.cwd,
-          toolName: current.name,
-          toolInput: current.input,
-          metadata: event.data.metadata ?? {},
-          signal: control.admission.signal,
-        }).catch(() => {})
         await send({
           sessionUpdate: "tool_call_update",
           ...completedToolUpdate({
@@ -302,6 +305,7 @@ export async function streamTurn(input: {
             input: current.input,
             metadata: event.data.metadata,
             content: event.data.content,
+            cwd: input.cwd,
           }),
         })
         continue
@@ -326,8 +330,15 @@ export async function streamTurn(input: {
       }
       if (event.type === "session.step.ended") {
         if (!child) {
-          assistantMessageID = event.data.assistantMessageID
           finish = event.data.finish
+          recordStep(event.data.tokens)
+        }
+        continue
+      }
+      if (event.type === "session.step.failed") {
+        if (!child) {
+          stepError = event.data.error
+          if (event.data.tokens) recordStep(event.data.tokens)
         }
         continue
       }
@@ -373,14 +384,17 @@ export async function streamTurn(input: {
     if (input.action) {
       streamController.abort()
       await completed.catch(() => {})
-      return response(undefined, undefined, "succeeded", control.cancelled, undefined)
+      return {
+        response: response(undefined, undefined, "succeeded", control.cancelled, undefined),
+        contextTokens: undefined,
+      }
     }
     if (control.cancelled) {
       await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
       if (!started) {
         streamController.abort()
         await completed.catch(() => {})
-        return response(undefined, undefined, "interrupted", true, undefined)
+        return { response: response(undefined, undefined, "interrupted", true, undefined), contextTokens: undefined }
       }
     }
     const terminal = await completed
@@ -391,19 +405,17 @@ export async function streamTurn(input: {
         .catch(() => {})
         .finally(closeStream)
     }
-    const assistant = assistantMessageID
-      ? await input.client.session
-          .message.get({ sessionID: input.sessionID, messageID: assistantMessageID })
-          .catch(() => undefined)
-      : undefined
-    return response(
-      assistant?.type === "assistant" ? assistant : undefined,
-      executionError,
-      terminal,
-      control.cancelled,
-      finish,
-      retries.get(input.sessionID),
-    )
+    return {
+      response: response(
+        usage?.turn,
+        stepError ?? executionError,
+        terminal,
+        control.cancelled,
+        finish,
+        retries.get(input.sessionID),
+      ),
+      contextTokens: usage ? TokenUsage.total(usage.last) : undefined,
+    }
   } catch (error) {
     streamController.abort()
     await completed.catch(() => {})
@@ -529,6 +541,7 @@ async function replayMessage(
               input: part.state.input,
               metadata: part.state.metadata,
               content: part.state.content,
+              cwd,
             }),
           },
         })
@@ -577,14 +590,13 @@ function matchesStart(event: EventSubscribeOutput, start: TurnStart) {
 }
 
 function response(
-  assistant: SessionMessageAssistant | undefined,
-  executionError: { readonly type: string; readonly message: string } | undefined,
+  tokens: TokenUsageInfo | undefined,
+  error: { readonly type: string; readonly message: string } | undefined,
   terminal: "succeeded" | "failed" | "interrupted",
   cancelled: boolean,
   finish: SessionMessageAssistant["finish"],
   retry?: RetryStatus,
 ): PromptResponse {
-  const error = assistant?.error ?? executionError
   if (error?.type === "provider.auth") throw new ACPError.AuthRequiredError()
   if (error && error.type !== "aborted" && error.type !== "provider.content-filter") {
     throw new ACPError.ServiceFailureError({
@@ -593,12 +605,11 @@ function response(
       errorName: error.type,
     })
   }
-  const tokens = assistant?.tokens
   const usage = tokens
     ? {
         inputTokens: tokens.input,
         outputTokens: tokens.output,
-        totalTokens: tokens.input + tokens.output + tokens.reasoning + tokens.cache.read + tokens.cache.write,
+        totalTokens: TokenUsage.total(tokens),
         ...(tokens.reasoning > 0 ? { thoughtTokens: tokens.reasoning } : {}),
         ...(tokens.cache.read > 0 ? { cachedReadTokens: tokens.cache.read } : {}),
         ...(tokens.cache.write > 0 ? { cachedWriteTokens: tokens.cache.write } : {}),

packages/cli/src/acp/permission.ts

@@ -1,13 +1,19 @@
 import type { PermissionOption, ToolCallContent, ToolCallLocation } from "@agentclientprotocol/sdk"
 import type { EventSubscribeOutput, OpenCodeClient } from "@opencode/client/promise"
 import { Patch } from "@opencode/util/patch"
-import { Result } from "effect"
-import { isAbsolute, resolve } from "node:path"
 import type { ACPConnection } from "./connection"
-import { pendingToolCall, stringValue, toLocations, toToolKind, type ToolInput } from "./tool"
+import {
+  absolutePath,
+  filePath,
+  patchHunks,
+  pendingToolCall,
+  stringValue,
+  toLocations,
+  type ToolInput,
+} from "./tool"
 
 type PermissionEvent = Extract<EventSubscribeOutput, { type: "permission.asked" }>
-type Connection = Pick<ACPConnection.Connection, "requestPermission" | "writeTextFile">
+type Connection = Pick<ACPConnection.Connection, "requestPermission">
 type Tool = { readonly name: string; readonly input: ToolInput }
 
 const options: PermissionOption[] = [
@@ -45,7 +51,7 @@ export async function replyPermission(input: {
         },
         cwd: input.cwd,
       }),
-      locations: permissionLocations(toolName, toolInput, input.event.data.resources, input.cwd, previews),
+      locations: permissionLocations(toolName, toolInput, input.event.data.resources, input.cwd),
       ...(previews.length > 0 ? { content: previews } : {}),
     },
     options,
@@ -69,45 +75,13 @@ function prefixedTitle(prefix: string | undefined, title: string | undefined) {
   return `${prefix}: ${title}`
 }
 
-export async function syncEditedFiles(input: {
-  readonly connection: Pick<ACPConnection.Connection, "writeTextFile">
-  readonly writeTextFile: boolean
-  readonly sessionID: string
-  readonly cwd: string
-  readonly toolName: string
-  readonly toolInput: ToolInput
-  readonly metadata: Readonly<Record<string, unknown>>
-  readonly signal?: AbortSignal
-}) {
-  if (!input.writeTextFile || !input.connection.writeTextFile || toToolKind(input.toolName) !== "edit") return
-  const files = Array.isArray(input.metadata.files)
-    ? input.metadata.files.flatMap((file): string[] => {
-        if (!file || typeof file !== "object") return []
-        const path = "file" in file ? file.file : undefined
-        return typeof path === "string" ? [path] : []
-      })
-    : []
-  const path = filePath(input.toolInput)
-  const paths = [...new Set([...files, ...(path ? [path] : [])])]
-  await Promise.all(
-    paths.map(async (path) => {
-      const target = resolvePath(path, input.cwd)
-      const file = Bun.file(target)
-      if (!(await file.exists())) return
-      await input.connection.writeTextFile?.(
-        { sessionId: input.sessionID, path: target, content: await file.text() },
-        { cancellationSignal: input.signal },
-      )
-    }),
-  )
-}
-
 async function permissionPreviews(toolName: string, input: ToolInput, cwd: string): Promise<ToolCallContent[]> {
   const tool = toolName.toLocaleLowerCase()
   if (tool === "patch" || tool === "apply_patch") return patchPreviews(input, cwd)
-  const path = filePath(input)
-  if (!path) return []
-  const oldText = await readText(path, cwd)
+  const file = filePath(input)
+  if (!file) return []
+  const path = absolutePath(file, cwd)
+  const oldText = await readText(path)
   if (tool === "write") {
     const content = stringValue(input.content)
     return content === undefined ? [] : [{ type: "diff", path, oldText, newText: content }]
@@ -121,31 +95,25 @@ async function permissionPreviews(toolName: string, input: ToolInput, cwd: strin
   return [{ type: "diff", path, oldText, newText }]
 }
 
-async function patchPreviews(input: ToolInput, cwd: string): Promise<ToolCallContent[]> {
-  const patchText = stringValue(input.patchText)
-  if (!patchText) return []
-  try {
-    const parsed = Patch.parse(patchText)
-    if (Result.isFailure(parsed)) return []
-    return await Promise.all(
-      parsed.success.map(async (hunk): Promise<ToolCallContent> => {
-        const oldText = hunk.type === "add" ? "" : await readText(hunk.path, cwd)
-        if (hunk.type === "add") {
-          const newText = hunk.contents.endsWith("\n") || hunk.contents === "" ? hunk.contents : `${hunk.contents}\n`
-          return { type: "diff", path: hunk.path, oldText, newText }
-        }
-        if (hunk.type === "delete") return { type: "diff", path: hunk.path, oldText, newText: "" }
-        return {
-          type: "diff",
-          path: hunk.movePath ?? hunk.path,
-          oldText,
-          newText: Patch.derive(hunk.path, hunk.chunks, oldText).content,
-        }
-      }),
-    )
-  } catch {
-    return []
-  }
+function patchPreviews(input: ToolInput, cwd: string): Promise<ToolCallContent[]> {
+  // Patch.derive throws when a hunk does not match the current file.
+  return Promise.all(
+    patchHunks(input).map(async (hunk): Promise<ToolCallContent> => {
+      const path = absolutePath(hunk.path, cwd)
+      if (hunk.type === "add") {
+        const newText = hunk.contents.endsWith("\n") || hunk.contents === "" ? hunk.contents : `${hunk.contents}\n`
+        return { type: "diff", path, oldText: "", newText }
+      }
+      const oldText = await readText(path)
+      if (hunk.type === "delete") return { type: "diff", path, oldText, newText: "" }
+      return {
+        type: "diff",
+        path: hunk.movePath ? absolutePath(hunk.movePath, cwd) : path,
+        oldText,
+        newText: Patch.derive(hunk.path, hunk.chunks, oldText).content,
+      }
+    }),
+  ).catch(() => [])
 }
 
 function permissionTitle(toolName: string, input: ToolInput, previews: ReadonlyArray<ToolCallContent>) {
@@ -176,27 +144,16 @@ function permissionLocations(
   input: ToolInput,
   resources: ReadonlyArray<string>,
   cwd: string,
-  previews: ReadonlyArray<ToolCallContent>,
 ): ToolCallLocation[] {
-  const paths = previews.flatMap((preview) => (preview.type === "diff" ? [preview.path] : []))
-  if (paths.length > 0) return [...new Set(paths)].map((path) => ({ path }))
   const locations = toLocations(toolName, input, cwd)
   if (locations.length > 0) return locations
-  return resources.filter((resource) => resource !== "*").map((path) => ({ path }))
+  return resources.filter((resource) => resource !== "*").map((path) => ({ path: absolutePath(path, cwd) }))
 }
 
-function readText(path: string, cwd: string) {
-  return Bun.file(resolvePath(path, cwd))
+function readText(path: string) {
+  return Bun.file(path)
     .text()
     .catch(() => "")
 }
 
-function filePath(input: ToolInput) {
-  return stringValue(input.path) ?? stringValue(input.filePath) ?? stringValue(input.filepath)
-}
-
-function resolvePath(path: string, cwd: string) {
-  return isAbsolute(path) ? path : resolve(cwd, path)
-}
-
 export * as ACPPermission from "./permission"

packages/cli/src/acp/service.ts

@@ -8,6 +8,7 @@ import {
   type SessionMessageInfo,
 } from "@opencode/client/promise"
 import { FSUtil } from "@opencode/util/fs-util"
+import type { Effect, Scope } from "effect"
 import { withTimestampedFallback } from "@opencode/util/session-title-fallback"
 import type {
   AuthenticateRequest,
@@ -57,6 +58,9 @@ import { ACPError } from "./error"
 
 export const AuthMethodID = "opencode-login"
 
+// ACP runs these itself; they take precedence over server commands with the same name.
+const builtinCommands = new Map([["compact", { description: "Compact the session", start: "compaction" as const }]])
+
 // Model and mode are unset while the session follows the server defaults.
 type Attached = {
   readonly id: string
@@ -95,15 +99,17 @@ export interface Interface {
 export function make(input: {
   readonly client: OpenCodeClient
   readonly connection: ACPConnection.Connection
+  readonly catalog: ACPCatalog.Interface
+  readonly run: <A, E>(effect: Effect.Effect<A, E, Scope.Scope>) => Promise<A>
 }): Interface {
   const sessions = new Map<string, Attached>()
   const registeredMcp = new Map<string, Set<string>>()
   const active = new Map<string, { readonly control: TurnControl; readonly turn: Promise<PromptResponse> }>()
-  const capabilities = { writeTextFile: false, childSessionUpdates: false }
+  const capabilities = { childSessionUpdates: false }
 
-  const catalogs = ACPCatalog.make({
-    client: input.client,
-    signal: input.connection.signal,
+  const catalogs = ACPCatalog.promise({
+    catalog: input.catalog,
+    run: input.run,
     changed: (live, previous) =>
       Promise.all(
         Array.from(sessions.values())
@@ -126,10 +132,12 @@ export function make(input: {
       sessionId: state.id,
       update: {
         sessionUpdate: "available_commands_update",
-        availableCommands: state.catalog.current.commands.map((command) => ({
-          name: command.name,
-          description: command.description ?? "",
-        })),
+        availableCommands: [
+          ...state.catalog.current.commands
+            .filter((command) => !builtinCommands.has(command.name))
+            .map((command) => ({ name: command.name, description: command.description ?? "" })),
+          ...Array.from(builtinCommands, ([name, command]) => ({ name, description: command.description })),
+        ],
       },
     })
 
@@ -202,7 +210,6 @@ export function make(input: {
 
   return {
     initialize: async (params) => {
-      capabilities.writeTextFile = params.clientCapabilities?.fs?.writeTextFile === true
       capabilities.childSessionUpdates = params.clientCapabilities?._meta?.[ChildSessionUpdatesCapability] === true
       const authMethod: AuthMethod = {
         description: "Run `opencode auth login` in the terminal",
@@ -351,7 +358,6 @@ export function make(input: {
         sessionID: state.id,
         cwd: state.cwd,
         start: prepared.start,
-        writeTextFile: capabilities.writeTextFile,
         action: prepared.command !== undefined,
         control,
         connectionSignal: input.connection.signal,
@@ -359,9 +365,9 @@ export function make(input: {
         submit: (signal) => submitPrompt(input.client, state, prepared, signal),
         ...(childSessionUpdate ? { childSessionUpdate } : {}),
       })
-        .then(async (response) => {
-          await sendUsageUpdate(input.client, input.connection, state, response.usage?.totalTokens).catch(() => {})
-          return response
+        .then(async (result) => {
+          await sendUsageUpdate(input.client, input.connection, state, result.contextTokens).catch(() => {})
+          return result.response
         })
         .finally(() => {
           signal?.removeEventListener("abort", cancel)
@@ -386,7 +392,8 @@ function preparePrompt(catalog: Catalog, prompt: PromptRequest["prompt"], messag
   const text = visible.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
   const files = visible.flatMap((part) => (part.type === "file" ? [{ uri: part.url, name: part.filename }] : []))
   const slash = detectSlashCommand(text)
-  const command = slash ? catalog.commands.find((item) => item.name === slash.name) : undefined
+  const command =
+    slash && !builtinCommands.has(slash.name) ? catalog.commands.find((item) => item.name === slash.name) : undefined
   const start = turnStart(messageID, slash)
   return { start, text, files, synthetic, slash, command }
 }
@@ -421,7 +428,7 @@ async function submitPrompt(client: OpenCodeClient, session: Attached, prompt: P
 }
 
 function turnStart(messageID: string, slash: PreparedPrompt["slash"]): TurnStart {
-  if (slash?.name === "compact") return { type: "compaction", id: messageID }
+  if (slash && builtinCommands.get(slash.name)?.start === "compaction") return { type: "compaction", id: messageID }
   return { type: "input", id: messageID }
 }
 

packages/cli/src/acp/tool.ts

@@ -1,6 +1,8 @@
 import { isAbsolute, resolve } from "node:path"
 import type { ToolCall, ToolCallContent, ToolCallLocation, ToolCallUpdate, ToolKind } from "@agentclientprotocol/sdk"
 import { readDisplayText } from "@opencode/tui/mini/tool"
+import { Patch } from "@opencode/util/patch"
+import { Result } from "effect"
 
 export type ToolInput = Record<string, unknown>
 export type ToolContent = ReadonlyArray<
@@ -36,28 +38,29 @@ export function toToolKind(toolName: string): ToolKind {
   }
 }
 
-export function toLocations(toolName: string, input: ToolInput, cwd?: string): ToolCallLocation[] {
+export function toLocations(toolName: string, input: ToolInput, cwd: string): ToolCallLocation[] {
   switch (toolName.toLocaleLowerCase()) {
     case "bash":
-    case "shell": {
-      const workdir = shellWorkdir(input, cwd)
-      return workdir ? [{ path: workdir }] : []
-    }
+    case "shell":
+      return locationFrom(cwd, stringValue(input.workdir) ?? stringValue(input.cwd) ?? cwd)
     case "read":
-      return locationFrom(input.path)
     case "edit":
     case "write":
+      return locationFrom(cwd, filePath(input))
     case "patch":
     case "apply_patch":
-      return locationFrom(input.filePath ?? input.filepath)
+      return locationFrom(
+        cwd,
+        ...patchHunks(input).flatMap((hunk) => [hunk.path, hunk.type === "update" ? hunk.movePath : undefined]),
+      )
     case "external_directory":
-      return locationFrom(input.filePath ?? input.filepath, input.parentDir, input.directories)
+      return locationFrom(cwd, input.filepath)
     case "grep":
     case "glob":
     case "context":
     case "context7_resolve_library_id":
     case "context7_get_library_docs":
-      return locationFrom(input.path)
+      return locationFrom(cwd, input.path)
     default:
       return []
   }
@@ -67,7 +70,7 @@ export function pendingToolCall(input: {
   readonly toolCallId: string
   readonly toolName: string
   readonly state: { readonly input: ToolInput; readonly title?: string }
-  readonly cwd?: string
+  readonly cwd: string
 }): ToolCall {
   return {
     toolCallId: input.toolCallId,
@@ -84,7 +87,7 @@ export function runningToolUpdate(input: {
   readonly toolName: string
   readonly state: { readonly input: ToolInput; readonly title?: string }
   readonly content?: ToolContent
-  readonly cwd?: string
+  readonly cwd: string
 }): ToolCallUpdate {
   return {
     toolCallId: input.toolCallId,
@@ -103,6 +106,7 @@ export function completedToolUpdate(input: {
   readonly input: ToolInput
   readonly content: ToolContent
   readonly metadata?: Readonly<Record<string, unknown>>
+  readonly cwd: string
 }): ToolCallUpdate {
   const normalized = toolContent(input.content)
   // Read's model content is a JSON page envelope; show the clean text instead.
@@ -115,20 +119,15 @@ export function completedToolUpdate(input: {
       : [{ type: "content" as const, content: { type: "text" as const, text: read } }]
   const oldText = stringValue(input.input.oldString)
   const newText = stringValue(input.input.newString)
+  const path = filePath(input.input)
   const diff: ToolCallContent[] =
-    oldText === undefined || newText === undefined
+    oldText === undefined || newText === undefined || path === undefined
       ? []
-      : [
-          {
-            type: "diff",
-            path: stringValue(input.input.path) ?? stringValue(input.input.filePath) ?? "",
-            oldText,
-            newText,
-          },
-        ]
+      : [{ type: "diff", path: absolutePath(path, input.cwd), oldText, newText }]
   return {
     toolCallId: input.toolCallId,
     status: "completed",
+    locations: toLocations(input.toolName, input.input, input.cwd),
     content: [...primary, ...diff, ...images],
     rawOutput: {
       ...(input.metadata === undefined ? {} : { metadata: input.metadata }),
@@ -143,7 +142,7 @@ export function errorToolUpdate(input: {
   readonly content?: ToolContent
   readonly metadata?: Readonly<Record<string, unknown>>
   readonly error: string
-  readonly cwd?: string
+  readonly cwd: string
 }): ToolCallUpdate {
   return {
     toolCallId: input.toolCallId,
@@ -174,16 +173,9 @@ function toolTitle(toolName: string, input: ToolInput, fallback: string | undefi
   return fallback || toolName
 }
 
-function rawInput(toolName: string, input: ToolInput, cwd?: string): ToolInput {
+function rawInput(toolName: string, input: ToolInput, cwd: string): ToolInput {
   if (!isShell(toolName) || input.cwd || input.workdir) return input
-  const workdir = shellWorkdir(input, cwd)
-  return workdir ? { ...input, cwd: workdir } : input
-}
-
-function shellWorkdir(input: ToolInput, cwd?: string) {
-  const explicit = stringValue(input.workdir) ?? stringValue(input.cwd)
-  if (!explicit) return cwd
-  return isAbsolute(explicit) ? explicit : resolve(cwd ?? process.cwd(), explicit)
+  return { ...input, cwd }
 }
 
 function isShell(toolName: string) {
@@ -191,20 +183,29 @@ function isShell(toolName: string) {
   return tool === "bash" || tool === "shell"
 }
 
-function locationFrom(...values: unknown[]): ToolCallLocation[] {
+function locationFrom(cwd: string, ...values: unknown[]): ToolCallLocation[] {
   return Array.from(
-    new Set(
-      values.flatMap((value): string[] => {
-        if (Array.isArray(value))
-          return value.filter((item): item is string => typeof item === "string" && item.length > 0)
-        const path = stringValue(value)
-        return path ? [path] : []
-      }),
-    ),
+    new Set(values.flatMap((value) => (typeof value === "string" && value ? [absolutePath(value, cwd)] : []))),
     (path) => ({ path }),
   )
 }
 
+// Sessions migrated from V1 keep their original `filePath` tool inputs.
+export function filePath(input: ToolInput) {
+  return stringValue(input.path) ?? stringValue(input.filePath)
+}
+
+export function patchHunks(input: ToolInput) {
+  const patchText = stringValue(input.patchText)
+  if (!patchText) return []
+  const parsed = Patch.parse(patchText)
+  return Result.isSuccess(parsed) ? parsed.success : []
+}
+
+export function absolutePath(path: string, cwd: string) {
+  return isAbsolute(path) ? path : resolve(cwd, path)
+}
+
 export function stringValue(value: unknown) {
   return typeof value === "string" ? value : undefined
 }

packages/cli/test/acp/catalog-service.test.ts

@@ -0,0 +1,128 @@
+import { describe, expect } from "bun:test"
+import { OpenCode } from "@opencode/client/promise"
+import { Clock, Duration, Effect, Fiber } from "effect"
+import { TestClock } from "effect/testing"
+import { it } from "../../../core/test/lib/effect"
+import { ACPCatalog } from "../../src/acp/catalog"
+import { buildAgent, planAgent, startWire, testModel, type Wire, type WireOptions } from "./wire-fixture"
+
+describe("acp catalog service", () => {
+  it.effect("coalesces reloads requested during a reload into one more load", () => {
+    const gate = { held: false, release: Promise.withResolvers<void>() }
+    return withCatalog(
+      {
+        fetch: (request) =>
+          request.path === "/api/agent" && gate.held ? gate.release.promise.then(() => undefined) : undefined,
+      },
+      (acp) =>
+        Effect.gen(function* () {
+          const catalog = yield* ACPCatalog.Service
+          yield* catalog.get("/workspace")
+          gate.held = true
+
+          const running = yield* catalog.reload("/workspace").pipe(Effect.forkChild({ startImmediately: true }))
+          yield* Effect.promise(() => acp.until(() => requests(acp, "/api/agent") === 2, "the held reload"))
+          const queued = yield* Effect.all(
+            [0, 1].map(() => catalog.reload("/workspace").pipe(Effect.forkChild({ startImmediately: true }))),
+          )
+          acp.server.catalog.agents = [planAgent, buildAgent]
+          gate.held = false
+          gate.release.resolve()
+          yield* Fiber.join(running)
+          yield* Fiber.joinAll(queued)
+
+          expect(reads(acp, "agent")).toBe(3)
+          expect((yield* catalog.get("/workspace")).defaultModeID).toBe("plan")
+        }),
+    )
+  })
+
+  it.effect("keeps the previous catalog when a reload fails", () => {
+    const failing = { model: false }
+    return withCatalog(
+      {
+        fetch: (request) =>
+          failing.model && request.path === "/api/model"
+            ? Response.json({ name: "ModelsNotReadyError", data: { message: "catalog is warming" } }, { status: 503 })
+            : undefined,
+      },
+      () =>
+        Effect.gen(function* () {
+          const catalog = yield* ACPCatalog.Service
+          const before = yield* catalog.get("/workspace")
+          failing.model = true
+
+          yield* catalog.reload("/workspace")
+
+          expect(yield* catalog.get("/workspace")).toBe(before)
+        }),
+    )
+  })
+
+  it.effect("waits 25ms between readiness reads", () =>
+    withCatalog({}, (acp) =>
+      Effect.gen(function* () {
+        const catalog = yield* ACPCatalog.Service
+        acp.server.catalog.models = []
+
+        const loading = yield* catalog.get("/workspace").pipe(Effect.forkChild)
+        yield* Effect.promise(() => acp.until(() => reads(acp, "model") === 1, "the first model read"))
+        acp.server.catalog.models = [testModel]
+        yield* advance("5 millis", () => reads(acp, "model") === 2)
+        const retriedAt = yield* Clock.currentTimeMillis
+        const loaded = yield* Fiber.join(loading)
+
+        expect(retriedAt).toBeGreaterThanOrEqual(25)
+        expect(loaded.defaultModel).toEqual({ providerID: "test", id: "test-model", variant: "default" })
+      }),
+    ),
+  )
+
+  it.effect("gives up with the last readiness failure after 5 seconds", () =>
+    withCatalog({}, (acp) =>
+      Effect.gen(function* () {
+        const catalog = yield* ACPCatalog.Service
+        acp.server.catalog.agents = []
+
+        const loading = yield* catalog.get("/workspace").pipe(Effect.flip, Effect.timed, Effect.forkChild)
+        yield* advance("25 millis", () => loading.pollUnsafe() !== undefined)
+        const [elapsed, error] = yield* Fiber.join(loading)
+
+        expect(error).toEqual(new ACPCatalog.NotReadyError({ reason: "agents" }))
+        expect(error.message).toBe("No primary agents are available")
+        // Reads in flight while the clock steps push the last attempt slightly past the deadline.
+        expect(Duration.toMillis(elapsed)).toBeGreaterThanOrEqual(5_000)
+        expect(Duration.toMillis(elapsed)).toBeLessThan(6_000)
+      }),
+    ),
+  )
+})
+
+function withCatalog<A, E>(options: WireOptions, body: (acp: Wire) => Effect.Effect<A, E, ACPCatalog.Service>) {
+  return Effect.acquireRelease(
+    Effect.promise(() => startWire(options)),
+    (acp) => Effect.promise(() => acp[Symbol.asyncDispose]()),
+  ).pipe(
+    Effect.flatMap((acp) =>
+      body(acp).pipe(
+        Effect.provideServiceEffect(ACPCatalog.Service, ACPCatalog.make(OpenCode.make({ baseUrl: acp.server.url }))),
+      ),
+    ),
+  )
+}
+
+// Catalog reads are real HTTP that settles between sleeps, so the clock moves in steps until the reads catch up.
+function advance(step: Duration.Input, done: () => boolean) {
+  return TestClock.adjust(step).pipe(
+    Effect.andThen(TestClock.withLive(Effect.sleep("1 millis"))),
+    Effect.repeat({ until: done }),
+  )
+}
+
+function reads(acp: Wire, kind: "model" | "agent") {
+  return acp.server.catalogReads.filter((read) => read.kind === kind).length
+}
+
+function requests(acp: Wire, path: string) {
+  return acp.server.requests.filter((request) => request.path === path).length
+}

packages/cli/test/acp/catalog.test.ts

@@ -37,7 +37,7 @@ describe("acp catalog and config options over the wire", () => {
       [other.sessionId]: "/other",
     })
     await acp.until(() => acp.updates.filter((item) => commandNames(item)).length === 3, "commands for each session")
-    expect(acp.updates.map(commandNames)).toEqual([["review"], ["review"], ["review"]])
+    expect(acp.updates.map(commandNames)).toEqual(Array.from({ length: 3 }, () => ["review", "compact"]))
   })
 
   test("follows server defaults and refreshes the catalog when location plugins finish activating", async () => {
@@ -57,14 +57,28 @@ describe("acp catalog and config options over the wire", () => {
       currentValue: "copilot-build",
       options: ["copilot-build", "build", "plan"],
     })
-    const commands = await acp.waitForUpdate((item) => commandNames(item)?.length === 2)
-    expect(commandNames(commands)).toEqual(["review", "ship"])
+    const commands = await acp.waitForUpdate((item) => commandNames(item)?.length === 3)
+    expect(commandNames(commands)).toEqual(["review", "ship", "compact"])
     expect(agentReads(acp)).toBe(reads + 1)
 
     const second = await acp.newSession()
     expect(currentValue(second, "mode")).toBe("copilot-build")
   })
 
+  test("defaults the mode to the first selectable agent the server lists", async () => {
+    const configured = { ...buildAgent, id: "review", name: "Review", mode: "all" as const }
+    await using acp = await startWire()
+    acp.server.catalog.agents = [configured, buildAgent, planAgent]
+    await acp.initialize()
+
+    const session = await acp.newSession()
+
+    expect(modeOption(session.configOptions ?? [])).toEqual({
+      currentValue: "review",
+      options: ["review", "build", "plan"],
+    })
+  })
+
   test("pushes config options on model.updated and commands on command.updated", async () => {
     await using acp = await startWire()
     acp.server.catalog.models = [testModel]
@@ -81,7 +95,7 @@ describe("acp catalog and config options over the wire", () => {
 
     acp.server.catalog.commands = [reviewCommand, { name: "ship", description: "Ship it" }]
     acp.server.send(ephemeralEvent("command.updated", {}, { directory: "/workspace" }))
-    const commands = await acp.waitForUpdate((item) => commandNames(item)?.length === 2)
+    const commands = await acp.waitForUpdate((item) => commandNames(item)?.length === 3)
     expect(commands).toEqual({
       sessionId: session.sessionId,
       update: {
@@ -89,6 +103,7 @@ describe("acp catalog and config options over the wire", () => {
         availableCommands: [
           { name: "review", description: "Review changes" },
           { name: "ship", description: "Ship it" },
+          { name: "compact", description: "Compact the session" },
         ],
       },
     })
@@ -193,15 +208,27 @@ describe("acp catalog and config options over the wire", () => {
     })
   })
 
-  test.todo(
-    "advertises the built-in compact command (https://github.com/anomalyco/opencode/issues/37229)",
-    async () => {
-      await using acp = await startSession()
+  test("advertises and runs the built-in compact over a server command (https://github.com/anomalyco/opencode/issues/37229)", async () => {
+    await using acp = await startSession()
+    const advertised = await acp.waitForUpdate((item) => commandNames(item) !== undefined)
 
-      const commands = await acp.waitForUpdate((item) => commandNames(item) !== undefined)
-      expect(commandNames(commands)).toContain("compact")
-    },
-  )
+    acp.server.catalog.commands = [reviewCommand, { name: "compact", description: "Server compact" }]
+    acp.server.send(ephemeralEvent("command.updated", {}, { directory: "/workspace" }))
+    const replaced = await acp.waitForUpdate((item) => item !== advertised && commandNames(item) !== undefined)
+    const compacted = await acp.prompt(acp.sessionId, "/compact")
+
+    expect([advertised, replaced].map((item) => item.update)).toEqual(
+      Array.from({ length: 2 }, () => ({
+        sessionUpdate: "available_commands_update",
+        availableCommands: [
+          { name: "review", description: "Review changes" },
+          { name: "compact", description: "Compact the session" },
+        ],
+      })),
+    )
+    expect(compacted.stopReason).toBe("end_turn")
+    expect(acp.server.submissions.map((item) => item.kind)).toEqual(["compact"])
+  })
 })
 
 function commandNames(item: SessionNotification) {

packages/cli/test/acp/permission.test.ts

@@ -89,12 +89,7 @@ describe("acp permissions over the wire", () => {
           id,
           permissionAsked(sessionID, "perm_external", {
             action: "external_directory",
-            metadata: {
-              command: "mkdir -p /tmp/outside",
-              description: "Create external directory",
-              directories: ["/tmp/outside"],
-              patterns: ["/tmp/outside/*"],
-            },
+            metadata: { filepath: "/tmp/outside/a.ts", parentDir: "/tmp/outside" },
           }),
         ),
       permission: allowOnce,
@@ -103,14 +98,9 @@ describe("acp permissions over the wire", () => {
     await acp.prompt(acp.sessionId, "hello")
 
     expect(acp.permissions[0]?.toolCall).toMatchObject({
-      title: "Create external directory",
-      locations: [{ path: "/tmp/outside" }],
-      rawInput: {
-        command: "mkdir -p /tmp/outside",
-        description: "Create external directory",
-        directories: ["/tmp/outside"],
-        patterns: ["/tmp/outside/*"],
-      },
+      title: "/tmp/outside",
+      locations: [{ path: "/tmp/outside/a.ts" }],
+      rawInput: { filepath: "/tmp/outside/a.ts", parentDir: "/tmp/outside" },
     })
   })
 
@@ -263,8 +253,8 @@ describe("acp permissions over the wire", () => {
   })
 })
 
-describe("acp edit previews and client file sync over the wire", () => {
-  test("previews edits during approval and syncs the completed file", async () => {
+describe("acp edit previews over the wire", () => {
+  test("previews edits during approval", async () => {
     await using dir = await tmpdir()
     const file = path.join(dir.path, "file.ts")
     await fs.writeFile(file, "before")
@@ -287,7 +277,7 @@ describe("acp edit previews and client file sync over the wire", () => {
       },
       permission: allowOnce,
     })
-    await acp.initialize({ writeTextFile: true })
+    await acp.initialize()
     const session = await acp.newSession(dir.path)
 
     await acp.prompt(session.sessionId, "hello")
@@ -295,13 +285,12 @@ describe("acp edit previews and client file sync over the wire", () => {
     expect(acp.permissions[0]?.toolCall).toMatchObject({
       title: "file.ts",
       kind: "edit",
-      locations: [{ path: "file.ts" }],
-      content: [{ type: "diff", path: "file.ts", oldText: "before", newText: "after" }],
+      locations: [{ path: file }],
+      content: [{ type: "diff", path: file, oldText: "before", newText: "after" }],
     })
-    expect(acp.writes).toEqual([{ sessionId: session.sessionId, path: file, content: "after" }])
   })
 
-  test("previews and syncs each file in a patch", async () => {
+  test("previews each file in a patch", async () => {
     await using dir = await tmpdir()
     await Promise.all([
       fs.writeFile(path.join(dir.path, "first.ts"), "one\n"),
@@ -341,7 +330,7 @@ describe("acp edit previews and client file sync over the wire", () => {
       },
       permission: allowOnce,
     })
-    await acp.initialize({ writeTextFile: true })
+    await acp.initialize()
     const session = await acp.newSession(dir.path)
 
     await acp.prompt(session.sessionId, "hello")
@@ -349,36 +338,96 @@ describe("acp edit previews and client file sync over the wire", () => {
     expect(acp.permissions[0]?.toolCall).toMatchObject({
       title: "2 files",
       kind: "edit",
-      locations: [{ path: "first.ts" }, { path: "second.ts" }],
+      locations: [{ path: path.join(dir.path, "first.ts") }, { path: path.join(dir.path, "second.ts") }],
       content: [
-        { type: "diff", path: "first.ts", oldText: "one\n", newText: "two\n" },
-        { type: "diff", path: "second.ts", oldText: "alpha\n", newText: "beta\n" },
+        { type: "diff", path: path.join(dir.path, "first.ts"), oldText: "one\n", newText: "two\n" },
+        { type: "diff", path: path.join(dir.path, "second.ts"), oldText: "alpha\n", newText: "beta\n" },
       ],
     })
-    expect(acp.writes.toSorted((a, b) => a.path.localeCompare(b.path))).toEqual([
-      { sessionId: session.sessionId, path: path.join(dir.path, "first.ts"), content: "two\n" },
-      { sessionId: session.sessionId, path: path.join(dir.path, "second.ts"), content: "beta\n" },
+  })
+
+  test("reports the same absolute locations for a moved file in the permission and tool updates", async () => {
+    await using dir = await tmpdir()
+    await fs.writeFile(path.join(dir.path, "old.ts"), "one\n")
+    const patchText = [
+      "*** Begin Patch",
+      "*** Update File: old.ts",
+      "*** Move to: new.ts",
+      "@@",
+      "-one",
+      "+two",
+      "*** End Patch",
+    ].join("\n")
+    await using acp = await startWire({
+      onPrompt: ({ sessionID, id }) => [
+        delivered(sessionID, id),
+        toolStarted(sessionID, "call_move", "patch"),
+        toolCalled(sessionID, "call_move", { patchText }),
+        permissionAsked(sessionID, "perm_move", {
+          action: "edit",
+          source: { type: "tool", messageID: "msg_move", id: "call_move" },
+        }),
+      ],
+      onPermissionReply: ({ sessionID }) => [
+        toolSucceeded(sessionID, "call_move", {}, "patched"),
+        succeeded(sessionID),
+      ],
+      permission: allowOnce,
+    })
+    await acp.initialize()
+    const session = await acp.newSession(dir.path)
+
+    await acp.prompt(session.sessionId, "hello")
+
+    const locations = [{ path: path.join(dir.path, "old.ts") }, { path: path.join(dir.path, "new.ts") }]
+    expect(acp.permissions[0]?.toolCall).toMatchObject({
+      locations,
+      content: [{ type: "diff", path: path.join(dir.path, "new.ts"), oldText: "one\n", newText: "two\n" }],
+    })
+    expect(
+      acp.updates.flatMap((item) =>
+        item.update.sessionUpdate === "tool_call_update" && item.update.toolCallId === "call_move"
+          ? [[item.update.status, item.update.locations]]
+          : [],
+      ),
+    ).toEqual([
+      ["in_progress", locations],
+      ["completed", locations],
     ])
   })
 
-  test("does not sync edits when the client did not advertise writeTextFile", async () => {
+  test("does not echo completed edits to a client that advertises writeTextFile", async () => {
     await using dir = await tmpdir()
-    await fs.writeFile(path.join(dir.path, "file.ts"), "after")
+    const file = path.join(dir.path, "file.ts")
+    await fs.writeFile(file, "after")
     await using acp = await startWire({
       onPrompt: ({ sessionID, id }) =>
         turn(
           sessionID,
           id,
           toolStarted(sessionID, "call_edit", "edit"),
-          toolCalled(sessionID, "call_edit", { filePath: path.join(dir.path, "file.ts") }),
-          toolSucceeded(sessionID, "call_edit", {}, "edited"),
+          toolCalled(sessionID, "call_edit", { filePath: file, oldString: "before", newString: "after" }),
+          toolSucceeded(sessionID, "call_edit", { files: [{ file }] }, "edited"),
         ),
     })
-    await acp.initialize()
+    await acp.initialize({ writeTextFile: true })
     const session = await acp.newSession(dir.path)
 
     expect(await acp.prompt(session.sessionId, "hello")).toMatchObject({ stopReason: "end_turn" })
     expect(acp.writes).toEqual([])
+    expect(
+      acp.updates.flatMap((item) =>
+        item.update.sessionUpdate === "tool_call_update" && item.update.status === "completed" ? [item.update] : [],
+      ),
+    ).toMatchObject([
+      {
+        toolCallId: "call_edit",
+        content: [
+          { type: "content", content: { type: "text", text: "edited" } },
+          { type: "diff", path: file, oldText: "before", newText: "after" },
+        ],
+      },
+    ])
   })
 })
 

packages/cli/test/acp/prompt.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test"
 import type { StopReason } from "@agentclientprotocol/sdk"
 import type { OpenCodeEvent } from "@opencode/client/promise"
 import {
-  assistantMessage,
+  childCreated,
   delivered,
   durableEvent,
   failed,
@@ -32,7 +32,6 @@ describe("acp prompt turns over the wire", () => {
       onPrompt: ({ sessionID, id }) =>
         turn(sessionID, id, textDelta(sessionID, "msg_assistant", "hello"), stepEnded(sessionID, "msg_assistant")),
     })
-    acp.server.messages.set(acp.sessionId, [assistantMessage("msg_assistant")])
 
     const response = await acp.prompt(acp.sessionId, "hi")
 
@@ -114,7 +113,6 @@ describe("acp prompt turns over the wire", () => {
       value: "test/second-model",
     })
     acp.server.sessions.set(acp.sessionId, makeSession(acp.sessionId, { cost: 3.5 }))
-    acp.server.messages.set(acp.sessionId, [assistantMessage("msg_assistant", { tokens: assistantTokens })])
 
     const response = await acp.prompt(acp.sessionId, "hello")
 
@@ -145,7 +143,6 @@ describe("acp prompt turns over the wire", () => {
         return turn(sessionID, id, stepEnded(sessionID, "msg_assistant"))
       },
     })
-    acp.server.messages.set(acp.sessionId, [assistantMessage("msg_assistant")])
 
     expect((await acp.prompt(acp.sessionId, "hello")).stopReason).toBe("end_turn")
   })
@@ -191,14 +188,20 @@ describe("acp prompt turns over the wire", () => {
     expect(await rpcError(acp.prompt(acp.sessionId, "hello"))).toMatchObject({ code: -32000 })
   })
 
-  test("maps an assistant message auth error to auth required", async () => {
+  test("maps an assistant step auth error to auth required", async () => {
     await using acp = await startSession({
       onPrompt: ({ sessionID, id }) =>
-        turn(sessionID, id, textDelta(sessionID, "msg_auth", "partial"), stepEnded(sessionID, "msg_auth")),
+        turn(
+          sessionID,
+          id,
+          textDelta(sessionID, "msg_auth", "partial"),
+          durableEvent("session.step.failed", {
+            sessionID,
+            assistantMessageID: "msg_auth",
+            error: { type: "provider.auth", message: "expired" },
+          }),
+        ),
     })
-    acp.server.messages.set(acp.sessionId, [
-      assistantMessage("msg_auth", { error: { type: "provider.auth", message: "expired" } }),
-    ])
 
     expect(await rpcError(acp.prompt(acp.sessionId, "hello"))).toMatchObject({ code: -32000 })
   })
@@ -353,27 +356,110 @@ describe("acp prompt turns over the wire", () => {
     expect((await first).stopReason).toBe("cancelled")
   })
 
-  test.todo(
-    "reports usage summed across every step of the turn (https://github.com/anomalyco/opencode/issues/41660)",
-    async () => {
-      await using acp = await startSession({
-        onPrompt: ({ sessionID, id }) =>
-          turn(
+  test("reports usage summed across every step of the turn", async () => {
+    await using acp = await startSession({
+      onPrompt: ({ sessionID, id }) =>
+        turn(
+          sessionID,
+          id,
+          stepEnded(sessionID, "msg_step_1", { finish: "tool-calls", tokens: { ...tokens(), input: 10, output: 5 } }),
+          stepEnded(sessionID, "msg_step_2", { tokens: { ...tokens(), input: 20, output: 7 } }),
+        ),
+    })
+
+    const response = await acp.prompt(acp.sessionId, "hello")
+
+    expect(response.usage).toEqual({ inputTokens: 30, outputTokens: 12, totalTokens: 42 })
+  })
+
+  test("publishes the last step's context usage rather than the turn sum", async () => {
+    await using acp = await startSession({
+      onPrompt: ({ sessionID, id }) =>
+        turn(
+          sessionID,
+          id,
+          stepEnded(sessionID, "msg_step_1", {
+            finish: "tool-calls",
+            tokens: { input: 100, output: 10, reasoning: 0, cache: { read: 0, write: 50 } },
+          }),
+          stepEnded(sessionID, "msg_step_2", {
+            tokens: { input: 20, output: 5, reasoning: 3, cache: { read: 150, write: 0 } },
+          }),
+        ),
+    })
+
+    const response = await acp.prompt(acp.sessionId, "hello")
+
+    expect(response.usage).toEqual({
+      inputTokens: 120,
+      outputTokens: 15,
+      thoughtTokens: 3,
+      cachedReadTokens: 150,
+      cachedWriteTokens: 50,
+      totalTokens: 338,
+    })
+    expect(await acp.waitForUpdate((item) => item.update.sessionUpdate === "usage_update")).toEqual({
+      sessionId: acp.sessionId,
+      update: { sessionUpdate: "usage_update", used: 178, size: 100_000, cost: { amount: 0, currency: "USD" } },
+    })
+  })
+
+  test("counts a failed step's tokens and clears its error when the next step starts", async () => {
+    await using acp = await startSession({
+      onPrompt: ({ sessionID, id }) =>
+        turn(
+          sessionID,
+          id,
+          durableEvent("session.step.failed", {
             sessionID,
-            id,
-            stepEnded(sessionID, "msg_step_1", { finish: "tool-calls", tokens: { ...tokens(), input: 10, output: 5 } }),
-            stepEnded(sessionID, "msg_step_2", { tokens: { ...tokens(), input: 20, output: 7 } }),
-          ),
-      })
-      acp.server.messages.set(acp.sessionId, [
-        assistantMessage("msg_step_2", { tokens: { ...tokens(), input: 20, output: 7 } }),
-      ])
+            assistantMessageID: "msg_1",
+            error: { type: "provider.stream", message: "stream interrupted" },
+            cost: 0,
+            tokens: { ...tokens(), input: 40, output: 4 },
+          }),
+          durableEvent("session.step.started", {
+            sessionID,
+            assistantMessageID: "msg_2",
+            agent: "build",
+            model: { providerID: "test", id: "test-model" },
+            started: 0,
+          }),
+          stepEnded(sessionID, "msg_2", { tokens: { ...tokens(), input: 20, output: 7 } }),
+        ),
+    })
 
-      const response = await acp.prompt(acp.sessionId, "hello")
+    const response = await acp.prompt(acp.sessionId, "hello")
 
-      expect(response.usage).toEqual({ inputTokens: 30, outputTokens: 12, totalTokens: 42 })
-    },
-  )
+    expect(response).toEqual({
+      stopReason: "end_turn",
+      usage: { inputTokens: 60, outputTokens: 11, totalTokens: 71 },
+      _meta: {},
+    })
+    expect(await acp.waitForUpdate((item) => item.update.sessionUpdate === "usage_update")).toMatchObject({
+      update: { used: 27 },
+    })
+  })
+
+  test("excludes child session steps from the turn usage", async () => {
+    await using acp = await startSession({
+      onPrompt: ({ sessionID, id }) =>
+        turn(
+          sessionID,
+          id,
+          childCreated("ses_child", sessionID, "Explore"),
+          stepEnded("ses_child", "msg_child", { tokens: { ...tokens(), input: 500, output: 50 } }),
+          succeeded("ses_child"),
+          stepEnded(sessionID, "msg_root", { tokens: { ...tokens(), input: 20, output: 7 } }),
+        ),
+    })
+
+    const response = await acp.prompt(acp.sessionId, "hello")
+
+    expect(response.usage).toEqual({ inputTokens: 20, outputTokens: 7, totalTokens: 27 })
+    expect(await acp.waitForUpdate((item) => item.update.sessionUpdate === "usage_update")).toMatchObject({
+      update: { used: 27 },
+    })
+  })
 })
 
 // The server answered admission before streaming the chunk, and this request round-trips through the server after it,

packages/cli/test/acp/session.test.ts

@@ -54,7 +54,13 @@ describe("acp session lifecycle over the wire", () => {
     ])
     expect(await acp.waitForUpdate((item) => item.update.sessionUpdate === "available_commands_update")).toEqual({
       sessionId: result.sessionId,
-      update: { sessionUpdate: "available_commands_update", availableCommands: [{ name: "review", description: "" }] },
+      update: {
+        sessionUpdate: "available_commands_update",
+        availableCommands: [
+          { name: "review", description: "" },
+          { name: "compact", description: "Compact the session" },
+        ],
+      },
     })
   })
 

packages/cli/test/acp/tool.test.ts

@@ -28,22 +28,105 @@ describe("acp tools", () => {
   })
 
   test("extracts file locations from tool input", () => {
-    expect(toLocations("read", { path: "/tmp/a.ts" })).toEqual([{ path: "/tmp/a.ts" }])
-    expect(toLocations("edit", { filePath: "/tmp/b.ts" })).toEqual([{ path: "/tmp/b.ts" }])
-    expect(toLocations("write", { filePath: "/tmp/c.ts" })).toEqual([{ path: "/tmp/c.ts" }])
-    expect(toLocations("grep", { path: "/repo/src" })).toEqual([{ path: "/repo/src" }])
-    expect(toLocations("glob", { path: "/repo/test" })).toEqual([{ path: "/repo/test" }])
-    expect(toLocations("context7_get_library_docs", { path: "/docs" })).toEqual([{ path: "/docs" }])
-    expect(toLocations("external_directory", { directories: ["/tmp/outside"], patterns: ["/tmp/outside/*"] })).toEqual([
-      { path: "/tmp/outside" },
+    expect(toLocations("read", { path: "/tmp/a.ts" }, "/workspace")).toEqual([{ path: "/tmp/a.ts" }])
+    expect(toLocations("edit", { path: "/tmp/b.ts", oldString: "a", newString: "b" }, "/workspace")).toEqual([
+      { path: "/tmp/b.ts" },
     ])
+    expect(toLocations("write", { path: "/tmp/c.ts", content: "c" }, "/workspace")).toEqual([{ path: "/tmp/c.ts" }])
+    expect(toLocations("read", { filePath: "/tmp/v1.ts" }, "/workspace")).toEqual([{ path: "/tmp/v1.ts" }])
+    expect(toLocations("edit", { path: "src/b.ts" }, "/workspace")).toEqual([
+      { path: resolve("/workspace", "src/b.ts") },
+    ])
+    expect(toLocations("grep", { path: "/repo/src" }, "/workspace")).toEqual([{ path: "/repo/src" }])
+    expect(toLocations("glob", { path: "/repo/test" }, "/workspace")).toEqual([{ path: "/repo/test" }])
+    expect(toLocations("grep", { pattern: "x", path: "src" }, "/workspace")).toEqual([
+      { path: resolve("/workspace", "src") },
+    ])
+    expect(toLocations("glob", { pattern: "*.ts" }, "/workspace")).toEqual([])
+    expect(toLocations("context7_get_library_docs", { path: "/docs" }, "/workspace")).toEqual([{ path: "/docs" }])
+    expect(
+      toLocations("external_directory", { filepath: "/tmp/outside/a.ts", parentDir: "/tmp/outside" }, "/workspace"),
+    ).toEqual([{ path: "/tmp/outside/a.ts" }])
     expect(toLocations("bash", { cmd: "pwd" }, "/workspace")).toEqual([{ path: "/workspace" }])
     expect(toLocations("bash", { command: "pwd", workdir: "subdir" }, "/workspace")).toEqual([
       { path: resolve("/workspace", "subdir") },
     ])
     expect(toLocations("bash", { command: "pwd", workdir: "/abs/dir" }, "/workspace")).toEqual([{ path: "/abs/dir" }])
-    expect(toLocations("bash", { command: "printf hello" })).toEqual([])
-    expect(toLocations("read", { path: "/tmp/missing-file-path.ts" })).toEqual([{ path: "/tmp/missing-file-path.ts" }])
+    expect(toLocations("read", { path: "/tmp/missing-file-path.ts" }, "/workspace")).toEqual([
+      { path: "/tmp/missing-file-path.ts" },
+    ])
+  })
+
+  test("extracts patch locations from every hunk in the patch body", () => {
+    const patchText = [
+      "*** Begin Patch",
+      "*** Add File: src/new.ts",
+      "+created",
+      "*** Update File: /abs/old.ts",
+      "*** Move to: src/moved.ts",
+      "@@",
+      "-one",
+      "+two",
+      "*** Update File: src/same.ts",
+      "@@",
+      "-a",
+      "+b",
+      "*** Delete File: src/gone.ts",
+      "*** Update File: src/new.ts",
+      "@@",
+      "-created",
+      "+changed",
+      "*** End Patch",
+    ].join("\n")
+
+    expect(toLocations("patch", { patchText }, "/workspace")).toEqual([
+      { path: resolve("/workspace", "src/new.ts") },
+      { path: "/abs/old.ts" },
+      { path: resolve("/workspace", "src/moved.ts") },
+      { path: resolve("/workspace", "src/same.ts") },
+      { path: resolve("/workspace", "src/gone.ts") },
+    ])
+    expect(toLocations("apply_patch", { patchText }, "/workspace")).toHaveLength(5)
+  })
+
+  test("returns no patch locations when the patch body cannot be parsed", () => {
+    expect(toLocations("patch", { patchText: "*** Update File: src/a.ts\n-a\n+b" }, "/workspace")).toEqual([])
+    expect(toLocations("patch", { patchText: "*** Begin Patch\nnot a hunk\n*** End Patch" }, "/workspace")).toEqual([])
+    expect(toLocations("patch", {}, "/workspace")).toEqual([])
+  })
+
+  test("reports resolved locations on completed and failed updates", () => {
+    const patchText = ["*** Begin Patch", "*** Add File: src/a.ts", "+a", "*** End Patch"].join("\n")
+    expect(
+      completedToolUpdate({
+        toolCallId: "call",
+        toolName: "patch",
+        input: { patchText },
+        content: [{ type: "text", text: "patched" }],
+        cwd: "/workspace",
+      }).locations,
+    ).toEqual([{ path: resolve("/workspace", "src/a.ts") }])
+    expect(
+      completedToolUpdate({
+        toolCallId: "call",
+        toolName: "edit",
+        input: { path: "src/b.ts", oldString: "before", newString: "after" },
+        content: [],
+        cwd: "/workspace",
+      }),
+    ).toMatchObject({
+      locations: [{ path: resolve("/workspace", "src/b.ts") }],
+      content: [{ type: "diff", path: resolve("/workspace", "src/b.ts"), oldText: "before", newText: "after" }],
+    })
+    expect(
+      errorToolUpdate({
+        toolCallId: "call",
+        toolName: "write",
+        input: { path: "src/c.ts", content: "c" },
+        error: "denied",
+        cwd: "/workspace",
+      }).locations,
+    ).toEqual([{ path: resolve("/workspace", "src/c.ts") }])
   })
 
   test("builds completed content with text and image attachments", () => {
@@ -52,9 +135,10 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "tool-1",
+        cwd: "/workspace",
         toolName: "edit",
         input: {
-          filePath: "/tmp/file.ts",
+          path: "/tmp/file.ts",
           oldString: "before",
           newString: "after",
         },
@@ -87,9 +171,10 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "tool-1",
+        cwd: "/workspace",
         toolName: "write",
         input: {
-          filePath: "/tmp/file.ts",
+          path: "/tmp/file.ts",
           content: "created",
         },
         content: [{ type: "text", text: "wrote /tmp/file.ts" }],
@@ -107,6 +192,7 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "tool-read",
+        cwd: "/workspace",
         toolName: "read",
         input: { path: "/tmp/file.ts" },
         content: [
@@ -125,6 +211,7 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "tool-list",
+        cwd: "/workspace",
         toolName: "read",
         input: { path: "/tmp" },
         content: [
@@ -146,10 +233,11 @@ describe("acp tools", () => {
     expect(
       pendingToolCall({
         toolCallId: "tool-1",
+        cwd: "/workspace",
         toolName: "edit",
         state: {
           input: {
-            filePath: "/tmp/file.ts",
+            path: "/tmp/file.ts",
             oldString: "before",
             newString: "after",
           },
@@ -161,7 +249,7 @@ describe("acp tools", () => {
       kind: "edit",
       locations: [{ path: "/tmp/file.ts" }],
       rawInput: {
-        filePath: "/tmp/file.ts",
+        path: "/tmp/file.ts",
         oldString: "before",
         newString: "after",
       },
@@ -170,9 +258,10 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "tool-1",
+        cwd: "/workspace",
         toolName: "edit",
         input: {
-          filePath: "/tmp/file.ts",
+          path: "/tmp/file.ts",
           oldString: "before",
           newString: "after",
         },
@@ -182,6 +271,7 @@ describe("acp tools", () => {
     ).toEqual({
       toolCallId: "tool-1",
       status: "completed",
+      locations: [{ path: "/tmp/file.ts" }],
       content: [
         {
           type: "content",
@@ -204,6 +294,7 @@ describe("acp tools", () => {
     expect(
       runningToolUpdate({
         toolCallId: "call",
+        cwd: "/workspace",
         toolName: "read",
         state: { input: { path: "/tmp/a" } },
         content: [{ type: "text", text: "done" }],
@@ -229,6 +320,7 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "call",
+        cwd: "/workspace",
         toolName: "read",
         input: {},
         content: [],
@@ -241,6 +333,7 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "call",
+        cwd: "/workspace",
         toolName: "read",
         input: {},
         content: [],
@@ -252,6 +345,7 @@ describe("acp tools", () => {
     expect(
       completedToolUpdate({
         toolCallId: "call",
+        cwd: "/workspace",
         toolName: "read",
         input: {},
         content: [
@@ -273,6 +367,7 @@ describe("acp tools", () => {
     expect(
       errorToolUpdate({
         toolCallId: "call",
+        cwd: "/workspace",
         toolName: "read",
         input: { path: "/tmp/a" },
         content: [{ type: "text", text: "partial output" }],

packages/cli/test/acp/turn.test.ts

@@ -317,53 +317,50 @@ describe("acp turn events over the wire", () => {
     expect(acp.server.cancelledForms).toEqual([{ sessionID: acp.sessionId, formID: "frm_question" }])
   })
 
-  test.todo(
-    "reports locations for native edit, write, and patch tools (https://github.com/anomalyco/opencode/issues/49591)",
-    async () => {
-      const patchText = [
-        "*** Begin Patch",
-        "*** Update File: /workspace/src/c.ts",
-        "@@",
-        "-one",
-        "+two",
-        "*** End Patch",
-      ].join("\n")
-      await using acp = await startSession({
-        onPrompt: ({ sessionID, id }) =>
-          turn(
-            sessionID,
-            id,
-            toolStarted(sessionID, "call_edit", "edit"),
-            toolCalled(sessionID, "call_edit", { path: "/workspace/src/a.ts", oldString: "a", newString: "b" }),
-            toolSucceeded(sessionID, "call_edit", {}, "edited"),
-            toolStarted(sessionID, "call_write", "write"),
-            toolCalled(sessionID, "call_write", { path: "/workspace/src/b.ts", content: "b" }),
-            toolSucceeded(sessionID, "call_write", {}, "written"),
-            toolStarted(sessionID, "call_patch", "patch"),
-            toolCalled(sessionID, "call_patch", { patchText }),
-            toolSucceeded(sessionID, "call_patch", {}, "patched"),
-          ),
-      })
+  test("reports locations for native edit, write, and patch tools (https://github.com/anomalyco/opencode/issues/49591)", async () => {
+    const patchText = [
+      "*** Begin Patch",
+      "*** Update File: /workspace/src/c.ts",
+      "@@",
+      "-one",
+      "+two",
+      "*** End Patch",
+    ].join("\n")
+    await using acp = await startSession({
+      onPrompt: ({ sessionID, id }) =>
+        turn(
+          sessionID,
+          id,
+          toolStarted(sessionID, "call_edit", "edit"),
+          toolCalled(sessionID, "call_edit", { path: "/workspace/src/a.ts", oldString: "a", newString: "b" }),
+          toolSucceeded(sessionID, "call_edit", {}, "edited"),
+          toolStarted(sessionID, "call_write", "write"),
+          toolCalled(sessionID, "call_write", { path: "/workspace/src/b.ts", content: "b" }),
+          toolSucceeded(sessionID, "call_write", {}, "written"),
+          toolStarted(sessionID, "call_patch", "patch"),
+          toolCalled(sessionID, "call_patch", { patchText }),
+          toolSucceeded(sessionID, "call_patch", {}, "patched"),
+        ),
+    })
 
-      await acp.prompt(acp.sessionId, "hello")
+    await acp.prompt(acp.sessionId, "hello")
 
-      const locations = turnUpdates(acp.updates)
-        .filter((item) => item.update.sessionUpdate === "tool_call_update")
-        .map((item) => [
-          toolCallID(item),
-          toolStatus(item),
-          "locations" in item.update ? item.update.locations : undefined,
-        ])
-      expect(locations).toEqual([
-        ["call_edit", "in_progress", [{ path: "/workspace/src/a.ts" }]],
-        ["call_edit", "completed", [{ path: "/workspace/src/a.ts" }]],
-        ["call_write", "in_progress", [{ path: "/workspace/src/b.ts" }]],
-        ["call_write", "completed", [{ path: "/workspace/src/b.ts" }]],
-        ["call_patch", "in_progress", [{ path: "/workspace/src/c.ts" }]],
-        ["call_patch", "completed", [{ path: "/workspace/src/c.ts" }]],
+    const locations = turnUpdates(acp.updates)
+      .filter((item) => item.update.sessionUpdate === "tool_call_update")
+      .map((item) => [
+        toolCallID(item),
+        toolStatus(item),
+        "locations" in item.update ? item.update.locations : undefined,
       ])
-    },
-  )
+    expect(locations).toEqual([
+      ["call_edit", "in_progress", [{ path: "/workspace/src/a.ts" }]],
+      ["call_edit", "completed", [{ path: "/workspace/src/a.ts" }]],
+      ["call_write", "in_progress", [{ path: "/workspace/src/b.ts" }]],
+      ["call_write", "completed", [{ path: "/workspace/src/b.ts" }]],
+      ["call_patch", "in_progress", [{ path: "/workspace/src/c.ts" }]],
+      ["call_patch", "completed", [{ path: "/workspace/src/c.ts" }]],
+    ])
+  })
 })
 
 function turnUpdates(updates: readonly SessionNotification[]) {

packages/cli/test/acp/wire-fixture.ts

@@ -28,7 +28,7 @@ import {
   type TokenUsageInfo,
 } from "@opencode/client/promise"
 import type { BunRequest } from "bun"
-import { Effect, Logger, Option, Schema } from "effect"
+import { Effect, Exit, Logger, Option, Schema, Scope } from "effect"
 import { ACP } from "../../src/acp/agent"
 
 type DurableEvent = Extract<OpenCodeEvent, { durable: unknown }>
@@ -378,11 +378,15 @@ export async function startWire(options: WireOptions = {}) {
   const clientToAgent = new TransformStream<Uint8Array, Uint8Array>()
   const agentToClient = new TransformStream<Uint8Array, Uint8Array>()
   const logs: Array<Pick<Logger.Options<unknown>, "message" | "cause">> = []
+  const agentScope = Scope.makeUnsafe()
   const agentConnection = await Effect.runPromise(
     ACP.connect(
       OpenCode.make({ baseUrl: server.url }),
       ndJsonStream(agentToClient.writable, clientToAgent.readable),
-    ).pipe(Effect.provide(Logger.layer([Logger.make((log) => logs.push({ message: log.message, cause: log.cause }))]))),
+    ).pipe(
+      Scope.provide(agentScope),
+      Effect.provide(Logger.layer([Logger.make((log) => logs.push({ message: log.message, cause: log.cause }))])),
+    ),
   )
   const clientStream = ndJsonStream(clientToAgent.writable, agentToClient.readable)
   const connection = client({ name: "test" })
@@ -482,6 +486,7 @@ export async function startWire(options: WireOptions = {}) {
     async [Symbol.asyncDispose]() {
       connection.close()
       agentConnection.close()
+      await Effect.runPromise(Scope.close(agentScope, Exit.void))
       await server.stop()
     },
   }

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

@@ -76,10 +76,6 @@ export type AgentListInput = { readonly location?: { readonly directory?: string
 export type AgentListOutput = { readonly location: Location.PublicRef; readonly data: ReadonlyArray<Agent.Info> }
 export type AgentListOperation<E = never> = (input?: AgentListInput) => Effect.Effect<AgentListOutput, E>
 
-export type AgentDefaultInput = { readonly location?: { readonly directory?: string | undefined } | undefined }
-export type AgentDefaultOutput = { readonly location: Location.PublicRef; readonly data: Agent.Info | undefined }
-export type AgentDefaultOperation<E = never> = (input?: AgentDefaultInput) => Effect.Effect<AgentDefaultOutput, E>
-
 export type AgentGetInput = {
   readonly agentID: Agent.ID
   readonly location?: { readonly directory?: string | undefined } | undefined
@@ -89,7 +85,6 @@ export type AgentGetOperation<E = never> = (input: AgentGetInput) => Effect.Effe
 
 export interface AgentApi<E = never> {
   readonly list: AgentListOperation<E>
-  readonly default: AgentDefaultOperation<E>
   readonly get: AgentGetOperation<E>
 }
 

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

@@ -14,8 +14,6 @@ import type {
   LocationReloadOutput,
   AgentListInput,
   AgentListOutput,
-  AgentDefaultInput,
-  AgentDefaultOutput,
   AgentGetInput,
   AgentGetOutput,
   PluginListInput,
@@ -321,11 +319,6 @@ const EndpointAgentList = (raw: RawClient["server.agent"]) => (input?: AgentList
     raw["agent.list"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
   )
 
-const EndpointAgentDefault = (raw: RawClient["server.agent"]) => (input?: AgentDefaultInput) =>
-  preserveEffect<AgentDefaultOutput>()(
-    raw["agent.default"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
-  )
-
 const EndpointAgentGet = (raw: RawClient["server.agent"]) => (input: AgentGetInput) =>
   preserveEffect<AgentGetOutput>()(
     raw["agent.get"]({ params: { agentID: input["agentID"] }, query: { location: input["location"] } }).pipe(
@@ -335,7 +328,6 @@ const EndpointAgentGet = (raw: RawClient["server.agent"]) => (input: AgentGetInp
 
 const adaptGroupAgent = (raw: RawClient["server.agent"]) => ({
   list: EndpointAgentList(raw),
-  default: EndpointAgentDefault(raw),
   get: EndpointAgentGet(raw),
 })
 

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

@@ -8,8 +8,6 @@ import type {
   LocationReloadOutput,
   AgentListInput,
   AgentListOutput,
-  AgentDefaultInput,
-  AgentDefaultOutput,
   AgentGetInput,
   AgentGetOutput,
   PluginListInput,
@@ -479,18 +477,6 @@ export function make(options: ClientOptions) {
           },
           requestOptions,
         ),
-      default: (input?: AgentDefaultInput, requestOptions?: RequestOptions) =>
-        request<AgentDefaultOutput>(
-          {
-            method: "GET",
-            path: `/api/agent/default`,
-            query: { location: input?.["location"] },
-            successStatus: 200,
-            declaredStatuses: [400, 401],
-            empty: false,
-          },
-          requestOptions,
-        ),
       get: (input: AgentGetInput, requestOptions?: RequestOptions) =>
         request<AgentGetOutput>(
           {

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

@@ -2759,12 +2759,6 @@ export type AgentListInput = {
 
 export type AgentListOutput = { location: LocationPublicRef; data: Array<AgentInfo> }
 
-export type AgentDefaultInput = {
-  readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]
-}
-
-export type AgentDefaultOutput = { location: LocationPublicRef; data: AgentInfo | null }
-
 export type AgentGetInput = {
   readonly agentID: { readonly agentID: string }["agentID"]
   readonly location?: { readonly location?: { readonly directory?: string | undefined } | undefined }["location"]

packages/core/src/agent.ts

@@ -46,7 +46,6 @@ export interface Interface extends State.Transformable<Editor> {
   readonly get: (id: ID) => Effect.Effect<Info | undefined>
   readonly resolve: (id?: ID | string) => Effect.Effect<Info | undefined>
   readonly select: (id?: ID | string) => Effect.Effect<Selection>
-  readonly default: () => Effect.Effect<Info | undefined>
   readonly list: () => Effect.Effect<Info[]>
 }
 
@@ -122,9 +121,6 @@ const layer = Layer.effect(
         const info = selectedDefault()
         return { id: info?.id ?? defaultID, info }
       }),
-      default: Effect.fn("Agent.default")(function* () {
-        return selectedDefault()
-      }),
       list: Effect.fn("Agent.list")(function* () {
         const agents = Array.fromIterable(state.get().agents.values())
         const selected = selectedDefault()

packages/core/src/plugin/host.ts

@@ -96,25 +96,20 @@ export const make = Effect.fn("PluginHost.make")(function* (
   const decodeWorktree = Schema.decodeUnknownEffect(Worktree.Info)
   const decodeWorktrees = Schema.decodeUnknownEffect(Schema.Array(Worktree.ListEntry))
 
-  const atAgentLocation = <A>(
-    input: Parameters<typeof locationRef>[0],
-    use: (agents: Agent.Interface) => Effect.Effect<A>,
-  ) => {
-    const ref = locationRef(input)
-    if (!ref || isCurrentLocation(ref)) return response(use(agents))
-    return Effect.gen(function* () {
+  const listAgents = Effect.fn("PluginHost.listAgents")((ref: Location.Ref) =>
+    Effect.gen(function* () {
       const location = yield* Location.Service
-      const remote = yield* Agent.Service
+      const agents = yield* Agent.Service
       return {
         location: new Location.Info({
           directory: location.directory,
           workspaceID: location.workspaceID,
           project: location.project,
         }),
-        data: yield* use(remote),
+        data: yield* agents.list(),
       }
-    }).pipe(Effect.provide(locations.get(ref)), Effect.orDie, Effect.withSpan("PluginHost.atAgentLocation"))
-  }
+    }).pipe(Effect.provide(locations.get(ref)), Effect.orDie),
+  )
 
   // Keep the instance graph's inferred types independent of Session handles.
   const context: Plugin.Context = {
@@ -123,16 +118,30 @@ export const make = Effect.fn("PluginHost.make")(function* (
     options: {},
     rpc: Object.assign(rpc.client, { register: rpc.register }),
     agent: {
-      get: (input) =>
-        atAgentLocation(input, (agents) => agents.get(input.agentID)).pipe(
+      get: (input) => {
+        const ref = locationRef(input)
+        const output =
+          ref && !isCurrentLocation(ref)
+            ? listAgents(ref).pipe(
+                Effect.map((result) => ({
+                  ...result,
+                  data: result.data.find((agent) => agent.id === input.agentID),
+                })),
+              )
+            : response(agents.get(input.agentID))
+        return output.pipe(
           Effect.flatMap((result) =>
             result.data
               ? Effect.succeed({ ...result, data: result.data })
               : Effect.fail(new Error(`Agent not found: ${input.agentID}`)),
           ),
-        ),
-      list: (input) => atAgentLocation(input, (agents) => agents.list()),
-      default: (input) => atAgentLocation(input, (agents) => agents.default()),
+        )
+      },
+      list: (input) => {
+        const ref = locationRef(input)
+        if (ref && !isCurrentLocation(ref)) return listAgents(ref)
+        return response(agents.list())
+      },
       reload: agents.reload,
       transform: (callback) =>
         agents.transform((editor) => {

packages/core/test/agent.test.ts

@@ -87,73 +87,6 @@ describe("Agent", () => {
     }),
   )
 
-  it.effect("resolves the default agent the same way sessions select one", () =>
-    Effect.gen(function* () {
-      const agent = yield* Agent.Service
-      yield* agent.transform((editor) => {
-        editor.update(Agent.ID.make("plan"), (info) => {
-          info.mode = "primary"
-        })
-        editor.update(Agent.ID.make("build"), (info) => {
-          info.mode = "primary"
-        })
-        editor.update(Agent.ID.make("reviewer"), (info) => {
-          info.mode = "primary"
-        })
-        editor.update(Agent.ID.make("secret"), (info) => {
-          info.hidden = true
-        })
-        editor.update(Agent.ID.make("explore"), (info) => {
-          info.mode = "subagent"
-        })
-      })
-      const resolved = Effect.gen(function* () {
-        const info = yield* agent.default()
-        expect((yield* agent.select()).info).toEqual(info)
-        return info?.id
-      })
-
-      expect(yield* resolved).toBe(Agent.ID.make("build"))
-      yield* Effect.forEach(
-        [
-          ["reviewer", "reviewer"],
-          ["missing", "build"],
-          ["secret", "build"],
-          ["explore", "build"],
-        ] as const,
-        ([id, expected]) =>
-          Effect.gen(function* () {
-            yield* agent.transform((editor) => editor.default(Agent.ID.make(id)))
-            expect(yield* resolved).toBe(Agent.ID.make(expected))
-          }),
-      )
-    }),
-  )
-
-  it.effect("falls back to the first selectable agent without build", () =>
-    Effect.gen(function* () {
-      const agent = yield* Agent.Service
-      yield* agent.transform((editor) => {
-        editor.update(Agent.ID.make("explore"), (info) => {
-          info.mode = "subagent"
-        })
-        editor.update(Agent.ID.make("plan"), (info) => {
-          info.mode = "primary"
-        })
-      })
-
-      expect((yield* agent.default())?.id).toBe(Agent.ID.make("plan"))
-
-      yield* agent.transform((editor) =>
-        editor.update(Agent.ID.make("plan"), (info) => {
-          info.mode = "subagent"
-        }),
-      )
-      expect(yield* agent.default()).toBeUndefined()
-      expect(yield* agent.select()).toEqual({ id: Agent.defaultID, info: undefined })
-    }),
-  )
-
   it.effect("rebuilds state when a transform is replaced", () =>
     Effect.gen(function* () {
       const agent = yield* Agent.Service

packages/core/test/plugin/host.ts

@@ -39,7 +39,6 @@ export function host(overrides: Overrides = {}): Plugin.Context {
     agent: overrides.agent ?? {
       get: () => Effect.die("unused agent.get"),
       list: () => Effect.die("unused agent.list"),
-      default: () => Effect.die("unused agent.default"),
       transform: () => Effect.die("unused agent.transform"),
       reload: () => Effect.die("unused agent.reload"),
     },
@@ -205,7 +204,6 @@ export function agentHost(agent: Agent.Interface): Plugin.Context["agent"] {
         ),
       ),
     list: () => Effect.die("unused agent.list"),
-    default: () => Effect.die("unused agent.default"),
     reload: agent.reload,
     transform: (callback) =>
       agent.transform((editor) =>

packages/core/test/plugin/plan.test.ts

@@ -56,7 +56,6 @@ const run = Effect.fnUntraced(function* (events: ReadonlyArray<SessionEvent.Agen
       agent: {
         get: () => Effect.die("unused agent.get"),
         list: () => Effect.die("unused agent.list"),
-        default: () => Effect.die("unused agent.default"),
         reload: () => Effect.die("unused agent.reload"),
         transform: (callback) => {
           callback({

packages/gui-extensions/src/review/model.ts

@@ -2,7 +2,7 @@ import type { FileDiffInfo } from "@opencode/client/promise"
 import type { SessionReviewLineComment } from "@opencode/session-ui/session-review"
 import { previewSelectedLines } from "@opencode/session-ui/pierre/selection-bridge"
 import { checksum } from "@opencode/util/encode"
-import { createQuery, skipToken, useQueryClient } from "@tanstack/solid-query"
+import { createQuery, useQueryClient } from "@tanstack/solid-query"
 import { debounce } from "@solid-primitives/scheduled"
 import { createComputed, createEffect, createMemo, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
@@ -17,7 +17,6 @@ import {
 } from "./kinds"
 
 export type ChangeMode = "git" | "branch" | "turn"
-type VcsMode = "git" | "branch"
 type FileSelection = { startLine: number; endLine: number; startChar: number; endChar: number }
 
 export type Demand = { tree: number; files: number; panel: number; details: number }
@@ -109,12 +108,10 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
     ) {
       list.push("branch")
     }
+    // Turn snapshots are captured only for Git sessions.
+    if (project?.vcs === "git" && view.id) list.push("turn")
     return list
   })
-  const vcsMode = createMemo<VcsMode | undefined>(() => {
-    const value = mode()
-    return value === "git" || value === "branch" ? value : undefined
-  })
   const vcsKey = createMemo(
     () =>
       [
@@ -130,22 +127,25 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
     const demand = input.demand
     return demand.tree + demand.files + demand.panel > 0
   })
-  const vcsQuery = createQuery(() => {
-    const value = vcsMode()
+  const turnKey = () => [ctx.id, view.server.id, "session-turn", view.id] as const
+  const diffQuery = createQuery(() => {
+    const value = mode()
+    const turn = value === "turn"
     return {
-      queryKey: [...vcsKey(), value] as const,
+      queryKey: turn ? turnKey() : ([...vcsKey(), value] as const),
       enabled: view.server.connected && wantsReview() && !!view.project?.vcs,
       refetchOnMount: "always" as const,
-      refetchOnWindowFocus: true,
-      queryFn: value
-        ? () =>
+      // A finished turn does not change on focus or filesystem events; refresh it when the session goes idle.
+      refetchOnWindowFocus: !turn,
+      queryFn: turn
+        ? () => view.server.client.session.diff({ sessionID: view.id })
+        : () =>
             view.server.client.vcs
               .diff({
                 location: { directory: directory() },
                 mode: value === "git" ? "working" : value,
               })
-              .then((result) => result.data)
-        : skipToken,
+              .then((result) => result.data),
     }
   })
   // The summary's changes row: the session directory's working tree, loaded only while the summary shows.
@@ -180,20 +180,17 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
     on(
       () => !layout.narrow() && layout.side.opened(view),
       (open, previous) => {
-        if (!open || previous || vcsQuery.isFetching) return
+        if (!open || previous || diffQuery.isFetching) return
         if (input.demand.tree > 0) {
           refresh()
           return
         }
-        if (vcsMode() && view.server.connected && view.project?.vcs) void vcsQuery.refetch()
+        if (view.server.connected && view.project?.vcs) void diffQuery.refetch()
       },
       { defer: true },
     ),
   )
-  const diffs = (): FileDiffInfo[] => {
-    if (mode() === "git" || mode() === "branch") return vcsQuery.isFetched ? (vcsQuery.data ?? []) : []
-    return []
-  }
+  const diffs = (): FileDiffInfo[] => (diffQuery.isFetched ? (diffQuery.data ?? []) : [])
   const renderable = createMemo(() => diffs().filter(filterRenderableDiff))
   const kinds = createMemo(() => reviewDiffKinds(renderable()))
   const activeFile = () => {
@@ -205,17 +202,12 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
   const count = () => diffs().length
   const hasChanges = () => count() > 0
   const ready = () => {
-    // A project without VCS never enables vcsQuery, so its status stays "pending" forever.
+    // A project without VCS never enables diffQuery, so its status stays "pending" forever.
     const project = view.project
     if (project && !project.vcs) return true
-    if (mode() === "git" || mode() === "branch") return !vcsQuery.isPending
-    return true
+    return !diffQuery.isPending
   }
   const loadDiff = async (path: string, version?: number): Promise<FileDiffInfo | undefined> => {
-    const value = vcsMode()
-    if (!value) return undefined
-    const root = reviewRootDirectory(view.project?.worktree ?? directory())
-    const scoped = reviewDiffDirectory(root, path)
     const source = diffs().find((diff) => diff.file === path)
     const valid = (diff: FileDiffInfo | undefined): FileDiffInfo | undefined => {
       if (!diff || !source) return undefined
@@ -223,6 +215,24 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
       if (reviewDiffNeedsLoad(diff)) return undefined
       return diff
     }
+    const value = mode()
+    // Oversized full-file patches come back empty; bounded context usually fits.
+    if (value === "turn") {
+      return queryClient
+        .fetchQuery({
+          queryKey: [...turnKey(), "bounded", version] as const,
+          staleTime: Number.POSITIVE_INFINITY,
+          retry: 2,
+          queryFn: () => view.server.client.session.diff({ sessionID: view.id, context: 3 }),
+        })
+        .then((result) => valid(result.find((diff) => diff.file === path)))
+        .catch((error: unknown) => {
+          console.debug("[session-review] failed to load bounded turn diff", { path, error })
+          return undefined
+        })
+    }
+    const root = reviewRootDirectory(view.project?.worktree ?? directory())
+    const scoped = reviewDiffDirectory(root, path)
     const request = (scope: string, context?: number) =>
       queryClient
         .fetchQuery({
@@ -376,6 +386,7 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
       (next, previous) => {
         if (next !== "idle" || previous === undefined || previous === "idle") return
         refresh()
+        void queryClient.invalidateQueries({ queryKey: turnKey() })
       },
       { defer: true },
     ),
@@ -416,7 +427,7 @@ export function createReviewModel(input: { ctx: Context; view: SessionView; dema
     count,
     deferRender: () => state.deferRender,
     details: (): FileDiffInfo[] | undefined => (detailsQuery.isFetched ? (detailsQuery.data ?? []) : undefined),
-    diffVersion: () => vcsQuery.dataUpdatedAt,
+    diffVersion: () => diffQuery.dataUpdatedAt,
     diffs,
     renderable,
     kinds,

packages/gui-extensions/src/review/parts.tsx

@@ -27,7 +27,7 @@ export function ReviewTitle(props: { review: ReviewModel }) {
 
 export function ReviewEmpty(props: { review: ReviewModel; loadingClass: string }) {
   const ctx = useExtension()
-  const loading = () => (props.review.mode() === "git" || props.review.mode() === "branch") && !props.review.ready()
+  const loading = () => !props.review.ready()
   const noGit = () => props.review.noGit()
   const text = () => {
     if (props.review.mode() === "git") return ctx.t("empty.git")
@@ -60,7 +60,7 @@ export function ReviewEmpty(props: { review: ReviewModel; loadingClass: string }
 
 export function ReviewPanelEmpty(props: { review: ReviewModel }) {
   const ctx = useExtension()
-  const loading = () => (props.review.mode() === "git" || props.review.mode() === "branch") && !props.review.ready()
+  const loading = () => !props.review.ready()
   const noGit = () => props.review.noGit()
   return (
     <Switch>

packages/plugin/src/promise/adapter.ts

@@ -295,7 +295,6 @@ export function fromPromise(plugin: Plugin) {
           agent: {
             get: adaptApiMethod(AgentEndpoints["agent.get"], host.agent.get),
             list: adaptApiMethod(AgentEndpoints["agent.list"], host.agent.list),
-            default: adaptApiMethod(AgentEndpoints["agent.default"], host.agent.default),
             transform: transform(host.agent),
             reload: () => run(host.agent.reload()),
           },

packages/protocol/src/groups/agent.ts

@@ -20,21 +20,6 @@ export const AgentGroup = HttpApiGroup.make("server.agent")
         }),
       ),
   )
-  .add(
-    HttpApiEndpoint.get("agent.default", "/api/agent/default", {
-      query: LocationQuery,
-      success: Location.response(Schema.UndefinedOr(Agent.Info)),
-    })
-      .annotateMerge(locationQueryOpenApi)
-      .annotateMerge(
-        OpenApi.annotations({
-          identifier: "agent.default",
-          summary: "Get default agent",
-          description:
-            "Retrieve the agent used when a session has no explicit agent selection. The result may precede initial plugin and config settlement.",
-        }),
-      ),
-  )
   .add(
     HttpApiEndpoint.get("agent.get", "/api/agent/:agentID", {
       params: { agentID: Agent.ID },

packages/server/src/handlers/agent.ts

@@ -12,13 +12,6 @@ export const AgentHandler = HttpApiBuilder.group(Api, "server.agent", (handlers)
         return yield* response(Agent.Service.use((agent) => agent.list()))
       }),
     )
-    .handle(
-      "agent.default",
-      Effect.fn(function* () {
-        const agents = yield* Agent.Service
-        return yield* response(agents.default())
-      }),
-    )
     .handle(
       "agent.get",
       Effect.fn(function* (ctx) {

packages/server/test/agent.test.ts

@@ -1,50 +0,0 @@
-import fs from "node:fs/promises"
-import path from "node:path"
-import { expect } from "bun:test"
-import { Agent } from "@opencode/schema/agent"
-import { Effect, Schedule, Schema } from "effect"
-import { tmpdir } from "../../core/test/fixture/tmpdir"
-import { it } from "../../core/test/lib/effect"
-import { startServer } from "./fixture/server"
-
-const DefaultResponse = Schema.Struct({
-  location: Schema.Struct({ directory: Schema.String }),
-  data: Schema.NullOr(Agent.Info),
-})
-
-it.live("returns the default agent for each location", () =>
-  Effect.gen(function* () {
-    const global = yield* Effect.acquireDisposable(Effect.promise(() => tmpdir("opencode-agent-default-global-")))
-    const configured = yield* Effect.acquireDisposable(Effect.promise(() => tmpdir("opencode-agent-default-")))
-    const unconfigured = yield* Effect.acquireDisposable(Effect.promise(() => tmpdir("opencode-agent-default-")))
-    yield* Effect.promise(() =>
-      fs.writeFile(
-        path.join(configured.path, "opencode.json"),
-        JSON.stringify({ default_agent: "reviewer", agents: { reviewer: { mode: "primary" } } }),
-      ),
-    )
-    const server = yield* startServer(global.path)
-
-    yield* Effect.forEach(
-      [
-        { directory: configured.path, expected: "reviewer" },
-        { directory: unconfigured.path, expected: "build" },
-      ],
-      (project) =>
-        Effect.gen(function* () {
-          const url = new URL("/api/agent/default", server.base)
-          url.searchParams.set("location[directory]", project.directory)
-          const response = yield* Effect.promise(() => fetch(url, { headers: server.headers }))
-          expect(response.status).toBe(200)
-          const body = Schema.decodeUnknownSync(DefaultResponse)(yield* Effect.promise(() => response.json()))
-          expect(body.location.directory).toBe(project.directory)
-          return body.data?.id
-        }).pipe(
-          // Agents register during plugin activation, after the location is served.
-          Effect.filterOrFail((id) => id === project.expected),
-          Effect.retry(Schedule.spaced("10 millis")),
-          Effect.timeout("2 seconds"),
-        ),
-    )
-  }),
-)

services/www/src/docs/content/build/plugins/effect.mdx

@@ -890,7 +890,7 @@ effect: (ctx) =>
         id: Skill.ID.make("review"),
         name: Skill.Name.make("Review"),
         description: "Review the current changes",
-        location: "/workspace/.opencode/skills/review.md",
+        path: "/workspace/.opencode/skills/review/SKILL.md",
         content: "Review the current changes for correctness and missing tests.",
       }))
       const review = editor.get("review")

services/www/src/docs/content/build/plugins/index.mdx

@@ -829,7 +829,7 @@ await ctx.skill.transform((editor) => {
     id: "review",
     name: "Review",
     description: "Review the current changes",
-    location: "/workspace/.opencode/skills/review.md",
+    path: "/workspace/.opencode/skills/review/SKILL.md",
     content: "Review the current changes for correctness and missing tests.",
   })
   const review = editor.get("review")