feat(acp): tool-owned tool-call UI presentation (title/command/output)

In Zed the tool-call card showed only "bash" — the bare tool name — instead
of what the command does. Fix it by letting each TOOL own how its calls render,
rather than the bridge special-casing names.

dsh-tools: add an optional two-state presentation seam to ToolDefinition /
defineTool — `presentCall(args)` (pending: title, kind, rawInput) and
`presentResult(args, result)` (completed: title?, content?). Provider-neutral
`ToolCallKind`/`ToolCallPresentation`/`ToolResultPresentation` vocabulary so
tools never depend on ACP. defineTool soft-validates args (display runs on log
replay, so a malformed/old shape returns undefined instead of throwing).

dsh-tool-bash: bash declares presentCall (model `description` → title, exact
`command` → rawInput, kind execute) and presentResult (wrap output in a fenced
```console block — a UI-only affordance kept out of the model-facing result);
bash_output/bash_kill present task-scoped titles.

dsh-acp: inject `tools`; a per-session `ToolPresenter` looks the tool up by name
and maps its neutral presentation to the ACP tool_call/tool_call_update wire
shape, with a generic fallback (title = name) for tools that declare nothing.
Because the `tool/result` event carries only {callId, content, isError}, the
presenter keeps a small bridge-local map of ONLY in-flight calls' (name, args),
keyed by callId and removed as each result is presented — no event-schema or
core change. Replay uses a throwaway presenter so loaded sessions render
identically to live ones.

Tests: dsh-tools defineTool presenters (typed args, soft-validate), tool-bash
bash/bash_output/bash_kill presenters, acp ToolPresenter (tool-owned mapping,
unknown-callId fallback, in-flight-only map), and an end-to-end turn through the
bridge. The key-gated e2e now asserts a real bash call's title is the model
description (not "bash") and rawInput is the command — verified against the real
DeepSeek model. The test harness derives its inject from the bridge's exported
`inject` so it can't drift again.

packages/acp/README.md

@@ -28,7 +28,7 @@ It is a **client-driver / UI plugin**, the structured analogue of the readline `
 | `session/load` | `ctx.agents.resume(...)` | replays the persisted event log to the client as `session/update` — the USER side (`user/message` → `user_message_chunk`), assistant text/reasoning (`assistant/chunk`), and tool calls/results (`tool/call` + `tool/result`). Re-loading an already-live id is rejected; the id's load slot is reserved (`loadingIds`) BEFORE the async resume so a pipelined load of the SAME id can't leak a second agent (distinct ids load concurrently). The resumed session keeps its PERSISTED header `cwd`, so its bash tools run in the original workspace; the requested `cwd` only needs to be absolute. After the async resume a `closed` re-check refuses to install a record if the bridge tore down mid-load |
 | `session/prompt` | `agent.send()` | text-only; rejects image/audio and empty prompts; one in-flight prompt PER session (independent); settles on the OWNING turn's end (a turn that ends in `error` rejects the RPC) |
 | `session/cancel` | `agent.abort()` | aborts a running step + settles the prompt `cancelled` for ONLY that session — a cancel never touches another session's stream or prompt (see limitation below) |
-| `session/update` | `session/event` | `agent_message_chunk` (text-delta), `agent_thought_chunk` (reasoning-delta), `user_message_chunk` (load replay), `tool_call`/`tool_call_update` |
+| `session/update` | `session/event` | `agent_message_chunk` (text-delta), `agent_thought_chunk` (reasoning-delta), `user_message_chunk` (load replay), `tool_call`/`tool_call_update` (title/kind/rawInput/content owned by the TOOL via `presentCall`/`presentResult` — see Tool-call presentation) |
 
 ## Multi-session (RFC 011)
 
@@ -40,6 +40,12 @@ Background-task isolation rides on `dsh-tool-bash`: bash task ids are global and
 
 Each session runs in its own workspace, recorded as the session's `SessionHeader.cwd`. On `session/new` the (absolute) request `cwd` becomes that header cwd; on `session/load` the resumed session keeps its PERSISTED header cwd (the request `cwd` is only shape-checked — it does not override the stored one), and a load whose persisted session has no absolute cwd is REJECTED up front via a metadata-only `list()` check, BEFORE resume constructs an agent (else bash would silently fall back to the server's launch dir, and a post-resume reject would leak the registered agent). `dsh-tool-bash` then defaults the bash workdir to the calling agent's `session.header.cwd` (an explicit model `workdir` still wins; a relative one resolves against the session cwd; with no session cwd the executor falls back to its own config / `process.cwd()`). So the server no longer has to be launched in the workspace — an editor can open any project folder, and N sessions over one connection can each target a different directory. (`additionalDirectories` is still rejected: widening the tool/filesystem scope beyond the single cwd is a separate sandbox concern.)
 
+## Tool-call presentation
+
+How a tool call renders in the editor is owned by the TOOL, not the bridge — the bridge never special-cases tool names. Each tool may declare `presentCall(args)` (pending state: a human-readable `title`, a `kind` for the icon, and the salient `rawInput` to show in a detail view) and `presentResult(args, result)` (completed state: an optional replacement `title` and reformatted `content`) on its `dsh-tools` definition. The bridge looks the definition up by name in `ctx.tools` and maps the neutral `ToolCallPresentation`/`ToolResultPresentation` to the ACP `tool_call`/`tool_call_update` wire shapes. A tool that declares neither gets a generic fallback (title = tool name, raw parsed args as `rawInput`, kind inferred from the name). For example `dsh-tool-bash` makes the model-written one-line `description` the title ("List files in the current directory"), the exact `command` the `rawInput`, `kind: 'execute'`, and wraps the completed output in a fenced ` ```console ` block.
+
+The `tool/result` session event carries only `{ callId, content, isError }` — not the tool name or args — so to call a tool's `presentResult` the bridge keeps a small per-session map from `callId` to the in-flight call's `(name, args)`, populated on `tool/call` and removed as each result is presented (it holds only currently-in-flight calls, never finished ones). This is bridge-local state — NOT a change to the event schema or a core service. The map lives on the `SessionRecord`, so two concurrent sessions never cross their in-flight tool state; a `session/load` replay uses a throwaway presenter that pairs each `tool/call` with its `tool/result` as the log replays in order, so replayed tool cards render identically to live ones.
+
 ## Settle-exactly-once
 
 A `session/prompt` resolves (or rejects) exactly once, keyed off the canonical session log (the `session/event` stream), NOT the `agent/turn-start`/`agent/turn-end` events. One listener captures the prompt's owning turn from the log's `turn/start` and settles on the matching `turn/end` — the one signal that always fires (`closeTurn` appends it unconditionally, even when a boundary emit throws and the `agent/turn-end` EVENT is skipped). A prompt settles only on ITS OWN turn (`inflight.turn === turn/end.turn`), so a stale `turn/end` for a previously-cancelled turn whose end arrives late can never settle the wrong prompt. A turn that ends `error` REJECTS the RPC with an internal error carrying the failure message (ACP has no error stop reason); every other reason resolves via the codec. As a fallback, when the agent settles to `idle`/`disposed` with a prompt still pending — e.g. a `session/event` listener registered before the bridge threw and starved the bridge's listener — an `agent/status` handler reconciles the prompt from the log (the owning turn's `turn/end`, or `cancelled` if the turn was torn down without one). An empty/whitespace prompt is rejected up front — it would queue no work, so no turn would start and the RPC would hang.

packages/acp/package.json

@@ -29,6 +29,7 @@
     "@deepseek-ai/dsh-llm": "^0.0.1",
     "@deepseek-ai/dsh-session": "^0.0.1",
     "@deepseek-ai/dsh-session-persistence": "^0.0.1",
+    "@deepseek-ai/dsh-tools": "^0.0.1",
     "cordis": "^4.0.0-rc.6"
   },
   "devDependencies": {

packages/acp/src/index.ts

@@ -60,6 +60,7 @@ import {
 import type { ContentBlock } from '@deepseek-ai/dsh-llm'
 import type { Agent, AgentStatus } from '@deepseek-ai/dsh-agent'
 import type { SessionEvent } from '@deepseek-ai/dsh-session'
+import type { ToolCallKind, ToolRegistry } from '@deepseek-ai/dsh-tools'
 // Side-effect type import: declaration-merges `ctx.sessionPersistence` onto
 // Context (the bridge injects it and reads `list()` for load cwd validation).
 import type {} from '@deepseek-ai/dsh-session-persistence'
@@ -73,8 +74,10 @@ import {
 export const name = 'acp'
 // The bridge programs against the interface packages only (architecture rule:
 // plugins never depend on dsh-agent-loop). `sessionPersistence` is required
-// because `initialize` advertises `loadSession: true`.
-export const inject = ['agents', 'sessions', 'sessionPersistence']
+// because `initialize` advertises `loadSession: true`. `tools` lets a tool own
+// how its calls render (`presentCall`/`presentResult`); the bridge looks up the
+// definition by name and falls back to a generic presentation when absent.
+export const inject = ['agents', 'sessions', 'sessionPersistence', 'tools']
 
 /**
  * Build an ACP "invalid params" error whose human detail rides in the message.
@@ -131,6 +134,13 @@ export const Config: Schema<AcpConfig> = Schema.object({
 interface SessionRecord {
   sessionId: string
   agent: Agent
+  /**
+   * Resolves tool-owned presentation for THIS session's tool calls and remembers
+   * each in-flight call's `(name, args)` so the matching `tool/result` can find
+   * its tool. Per-session so two concurrent sessions never cross their in-flight
+   * tool state.
+   */
+  presenter: ToolPresenter
   /**
    * The in-flight `session/prompt`, or `undefined` when none is pending. A
    * prompt resolves with a {@link StopReason} or rejects with an Error (a
@@ -182,6 +192,7 @@ export function apply(ctx: Context, config: AcpConfig): void {
   const agents = ctx.agents
   const sessionPersistence = ctx.sessionPersistence
   const logger = ctx.logger
+  const tools = ctx.tools
 
   // Live sessions keyed by id (RFC 011 multi-session), plus an agent→sessionId
   // reverse map so `agent/*` events (which carry only the Agent) demux in O(1).
@@ -270,7 +281,7 @@ export function apply(ctx: Context, config: AcpConfig): void {
   ctx.on('session/event', (session, event: SessionEvent) => {
     const rec = sessions.get(session.header.id)
     if (rec === undefined) return
-    streamSessionEventUpdate(rec.sessionId, event, notify)
+    streamSessionEventUpdate(rec.sessionId, event, notify, rec.presenter)
     const inflight = rec.inflight
     if (inflight === undefined) return
     if (event.type === 'turn/start') {
@@ -395,7 +406,7 @@ export function apply(ctx: Context, config: AcpConfig): void {
           agentOptions: agentOptions(config),
         })
         bySession.set(agent, sessionId)
-        sessions.set(sessionId, { sessionId, agent, inflight: undefined })
+        sessions.set(sessionId, { sessionId, agent, presenter: new ToolPresenter(tools), inflight: undefined })
         return Promise.resolve({ sessionId })
       },
 
@@ -448,14 +459,18 @@ export function apply(ctx: Context, config: AcpConfig): void {
             throw invalidParams('connection closed during session/load')
           }
           bySession.set(agent, params.sessionId)
-          sessions.set(params.sessionId, { sessionId: params.sessionId, agent, inflight: undefined })
+          const record: SessionRecord = { sessionId: params.sessionId, agent, presenter: new ToolPresenter(tools), inflight: undefined }
+          sessions.set(params.sessionId, record)
           // Replay the persisted event log to the client as session/update. Use
           // the raw event log (NOT deriveMessages, which drops assistant/chunk
           // and trace events): RFC 010's load contract reconstructs the streamed
           // turns — user prompts (user/message → user_message_chunk), assistant
-          // text and reasoning (assistant/chunk), and tool calls/results.
+          // text and reasoning (assistant/chunk), and tool calls/results. The
+          // record's presenter pairs each tool/call with its tool/result as the
+          // log replays in order, so the replayed tool cards render identically
+          // to the live ones.
           for (const event of agent.session.events) {
-            streamSessionEventUpdate(params.sessionId, event, notify)
+            streamSessionEventUpdate(params.sessionId, event, notify, record.presenter)
           }
           return {}
         } finally {
@@ -659,6 +674,14 @@ function validateWorkspaceParams(params: { cwd: string; additionalDirectories?:
  * - `tool/call`   → `tool_call` (pending)
  * - `tool/result` → `tool_call_update` (completed/failed)
  *
+ * Tool-call presentation (title/kind/rawInput, and the completed-state content)
+ * is owned by each TOOL via `presentCall`/`presentResult` — the bridge never
+ * special-cases tool names. `presenter` resolves those from the tool registry
+ * and remembers each call's `(name, args)` so the completed `tool/result` (which
+ * carries neither) can find its tool. A {@link nullToolPresenter} gives the
+ * generic fallback (title = tool name, raw args as input) when no registry is
+ * available (e.g. pure translator tests).
+ *
  * Other event types (turn/step boundaries, context/message, usage, …) produce
  * no client update.
  */
@@ -666,6 +689,7 @@ export function streamSessionEventUpdate(
   sessionId: string,
   event: SessionEvent,
   notify: (notification: SessionNotification) => void,
+  presenter: Pick<ToolPresenter, 'call' | 'result'> = nullToolPresenter,
 ): void {
   switch (event.type) {
     case 'assistant/chunk': {
@@ -690,27 +714,30 @@ export function streamSessionEventUpdate(
       return
     }
     case 'tool/call': {
+      const present = presenter.call(event.data.callId, event.data.name, event.data.arguments)
       notify({
         sessionId,
         update: {
           sessionUpdate: 'tool_call',
           toolCallId: event.data.callId,
-          title: event.data.name,
-          kind: toolKindFor(event.data.name),
+          title: present.title,
+          kind: present.kind,
           status: 'in_progress',
-          rawInput: parseToolArguments(event.data.arguments),
+          ...present.rawInput !== undefined ? { rawInput: present.rawInput } : {},
         },
       })
       return
     }
     case 'tool/result': {
+      const present = presenter.result(event.data.callId, event.data.content, event.data.isError)
       notify({
         sessionId,
         update: {
           sessionUpdate: 'tool_call_update',
           toolCallId: event.data.callId,
           status: event.data.isError ? 'failed' : 'completed',
-          content: toolResultContent(event.data.content),
+          content: toolResultContent(present.content),
+          ...present.title !== undefined ? { title: present.title } : {},
         },
       })
       return
@@ -722,8 +749,84 @@ export function streamSessionEventUpdate(
   }
 }
 
+/**
+ * Resolved pending-state presentation the bridge feeds into a `tool_call`
+ * update: a title is always present (tool name when the tool gives none), `kind`
+ * and `rawInput` are optional.
+ */
+interface ResolvedCallPresentation {
+  title: string
+  kind: ToolCallKind
+  rawInput?: unknown
+}
+
+/** Resolved completed-state presentation fed into a `tool_call_update`. */
+interface ResolvedResultPresentation {
+  /** UI content for the result (harness blocks; the tool may reformat, else the raw result). */
+  content: ContentBlock[]
+  /** Optional replacement title for the completed call. */
+  title?: string
+}
+
+/**
+ * Resolves tool-owned presentation for a session's tool-call events. A tool
+ * declares `presentCall`/`presentResult` (see `dsh-tools`); this looks them up
+ * by name in the registry and applies the generic fallback when a tool defines
+ * neither.
+ *
+ * The `tool/result` session event carries only `{ callId, content, isError }` —
+ * NOT the tool name or args — so to call a tool's `presentResult` (which needs
+ * both), the presenter remembers each `tool/call`'s `{ name, args }` keyed by
+ * callId and looks it up on the matching result. The map is bridge-LOCAL (not a
+ * change to the event schema or a core service): one presenter per live session
+ * (and a throwaway per `session/load` replay), entries removed as each result
+ * arrives, so it holds only the currently-in-flight calls.
+ */
+export class ToolPresenter {
+  private readonly pending = new Map<string, { name: string; args: unknown }>()
+
+  constructor(private readonly tools: Pick<ToolRegistry, 'get'>) {}
+
+  /** Pending-state presentation for a `tool/call`; remembers `(name, args)` for the matching result. */
+  call(callId: string, name: string, argsJson: string): ResolvedCallPresentation {
+    const args = parseToolArguments(argsJson)
+    this.pending.set(callId, { name, args })
+    const present = this.tools.get(name)?.presentCall?.(args)
+    if (present === undefined) {
+      // No tool-owned presentation: fall back to the tool name as the title and
+      // the full parsed args as the raw input (the pre-seam behavior).
+      return { title: name, kind: toolKindFor(name), rawInput: args }
+    }
+    return { title: present.title, kind: present.kind ?? 'other', rawInput: present.rawInput }
+  }
+
+  /** Completed-state presentation for a `tool/result`; consumes the remembered `(name, args)`. */
+  result(callId: string, content: ContentBlock[], isError: boolean): ResolvedResultPresentation {
+    const call = this.pending.get(callId)
+    this.pending.delete(callId)
+    const present = call !== undefined
+      ? this.tools.get(call.name)?.presentResult?.(call.args, { content, isError })
+      : undefined
+    if (present === undefined) return { content }
+    return {
+      content: present.content ?? content,
+      ...present.title !== undefined ? { title: present.title } : {},
+    }
+  }
+}
+
+/**
+ * The no-op presenter used when no tool registry is available (e.g. the pure
+ * translator tests): every tool gets the generic fallback presentation, and
+ * results pass their raw content through unchanged.
+ */
+export const nullToolPresenter: Pick<ToolPresenter, 'call' | 'result'> = {
+  call: (_callId, name, argsJson) => ({ title: name, kind: toolKindFor(name), rawInput: parseToolArguments(argsJson) }),
+  result: (_callId, content) => ({ content }),
+}
+
 /** Map a harness tool name to an ACP ToolKind (best-effort; default `other`). */
-function toolKindFor(name: string): 'read' | 'edit' | 'delete' | 'move' | 'search' | 'execute' | 'fetch' | 'other' {
+function toolKindFor(name: string): ToolCallKind {
   if (name === 'bash' || name === 'bash_output' || name === 'bash_kill') return 'execute'
   if (name === 'read' || name.startsWith('read')) return 'read'
   if (name === 'write' || name === 'edit' || name.startsWith('edit')) return 'edit'

packages/acp/tests/harness.ts

@@ -234,7 +234,11 @@ export async function makeBridgeHarness(options: {
   // tears down JUST the bridge (its listeners + effect) for the HMR test.
   harness.acpFiber = await ctx.plugin({
     name: 'acp-test',
-    inject: ['agents', 'sessions', 'sessionPersistence'],
+    // Use the bridge's REAL exported `inject` so this never drifts from the
+    // plugin's actual dependency list (adding a service to the bridge must not
+    // require editing the harness — a hardcoded list silently broke when `tools`
+    // was added). The bridge programs against the interface packages only.
+    inject: [...AcpPlugin.inject],
     apply: (inner: Context) => { AcpPlugin.apply(inner, cfg) },
   })
   harness.client = new ClientSideConnection(makeClient, clientStream)

packages/acp/tests/stream-update.spec.ts

@@ -2,15 +2,22 @@ import { describe, expect, it } from 'vitest'
 import { CallId } from '@deepseek-ai/dsh-llm'
 import type { SessionEvent } from '@deepseek-ai/dsh-session'
 import type { SessionNotification } from '@agentclientprotocol/sdk'
-import { streamSessionEventUpdate, agentOptions } from '../src/index.ts'
+import type { ToolDefinition, ToolRegistry } from '@deepseek-ai/dsh-tools'
+import { streamSessionEventUpdate, agentOptions, ToolPresenter } from '../src/index.ts'
 
-/** Collect the updates a single event produces. */
+/** Collect the updates a single event produces (no presenter → generic fallback). */
 function updatesFor(event: SessionEvent): SessionNotification['update'][] {
   const out: SessionNotification['update'][] = []
   streamSessionEventUpdate('s1', event, n => out.push(n.update))
   return out
 }
 
+/** A tiny tool registry stub exposing just `get` for {@link ToolPresenter}. */
+function registryOf(...tools: ToolDefinition[]): Pick<ToolRegistry, 'get'> {
+  const map = new Map(tools.map(t => [t.name, t]))
+  return { get: name => map.get(name) }
+}
+
 function evt<T extends SessionEvent['type']>(type: T, data: Extract<SessionEvent, { type: T }>['data']): SessionEvent {
   return { type, seq: 0, time: 0, data } as SessionEvent
 }
@@ -31,7 +38,7 @@ describe('streamSessionEventUpdate', () => {
       .toEqual([])
   })
 
-  it('maps tool/call to an in_progress tool_call with inferred kind and parsed rawInput', () => {
+  it('maps tool/call to an in_progress tool_call with inferred kind and parsed rawInput (generic fallback, no presenter)', () => {
     const updates = updatesFor(evt('tool/call', { turn: 1, step: 1, callId: CallId('c1'), name: 'bash', arguments: '{"command":"ls"}' }))
     expect(updates).toEqual([{
       sessionUpdate: 'tool_call',
@@ -99,6 +106,129 @@ describe('streamSessionEventUpdate', () => {
   })
 })
 
+describe('ToolPresenter (tool-owned presentation via the tool registry)', () => {
+  /** A tool whose presentCall/presentResult mirror what tool-bash declares. */
+  const bashLike: ToolDefinition = {
+    name: 'bash',
+    description: 'run a command',
+    parameters: {},
+    execute: async () => [],
+    presentCall: (args: unknown) => {
+      const a = args as { command: string; description: string }
+      return { title: a.description, kind: 'execute', rawInput: a.command }
+    },
+    presentResult: (_args: unknown, result: { content: { type: string }[] }) => ({
+      content: [{ type: 'text', text: `wrapped:${result.content.length}` }],
+    }),
+  }
+
+  function updatesWith(presenter: ToolPresenter, ...events: SessionEvent[]): SessionNotification['update'][] {
+    const out: SessionNotification['update'][] = []
+    for (const event of events) streamSessionEventUpdate('s1', event, n => out.push(n.update), presenter)
+    return out
+  }
+
+  it('tool/call uses the tool: description→title, command→rawInput, tool kind', () => {
+    const presenter = new ToolPresenter(registryOf(bashLike))
+    const [update] = updatesWith(presenter, evt('tool/call', {
+      turn: 1, step: 1, callId: CallId('c1'), name: 'bash',
+      arguments: JSON.stringify({ command: 'ls -la', description: 'List files' }),
+    }))
+    expect(update).toEqual({
+      sessionUpdate: 'tool_call',
+      toolCallId: 'c1',
+      title: 'List files',
+      kind: 'execute',
+      status: 'in_progress',
+      rawInput: 'ls -la',
+    })
+  })
+
+  it('tool/result uses the tool to reformat content (resolved by the remembered tool/call)', () => {
+    const presenter = new ToolPresenter(registryOf(bashLike))
+    const updates = updatesWith(
+      presenter,
+      evt('tool/call', { turn: 1, step: 1, callId: CallId('c1'), name: 'bash', arguments: JSON.stringify({ command: 'x', description: 'd' }) }),
+      evt('tool/result', { turn: 1, step: 1, callId: CallId('c1'), content: [{ type: 'text', text: 'out' }], isError: false }),
+    )
+    expect(updates[1]).toEqual({
+      sessionUpdate: 'tool_call_update',
+      toolCallId: 'c1',
+      status: 'completed',
+      content: [{ type: 'content', content: { type: 'text', text: 'wrapped:1' } }],
+    })
+  })
+
+  it('a result with NO preceding call (unknown callId) falls back to the raw content', () => {
+    const presenter = new ToolPresenter(registryOf(bashLike))
+    // No tool/call for c9 → presenter has nothing remembered → generic fallback.
+    const [update] = updatesWith(presenter, evt('tool/result', {
+      turn: 1, step: 1, callId: CallId('c9'), content: [{ type: 'text', text: 'raw' }], isError: false,
+    }))
+    expect(update).toEqual({
+      sessionUpdate: 'tool_call_update',
+      toolCallId: 'c9',
+      status: 'completed',
+      content: [{ type: 'content', content: { type: 'text', text: 'raw' } }],
+    })
+  })
+
+  it('a tool with no presentCall/presentResult gets the generic fallback (title = name)', () => {
+    const plain: ToolDefinition = { name: 'plain', description: 'p', parameters: {}, execute: async () => [] }
+    const presenter = new ToolPresenter(registryOf(plain))
+    const [update] = updatesWith(presenter, evt('tool/call', {
+      turn: 1, step: 1, callId: CallId('c1'), name: 'plain', arguments: '{"a":1}',
+    }))
+    expect(update).toMatchObject({ title: 'plain', kind: 'other', rawInput: { a: 1 } })
+  })
+
+  it('a presentation that omits kind/content/rawInput uses the defaults (kind other, raw result content kept)', () => {
+    // A minimal tool-owned presentation: presentCall returns only a title (no
+    // kind → defaults to `other`, no rawInput → omitted); presentResult returns
+    // only a title (no content → the raw result content is kept).
+    const minimal: ToolDefinition = {
+      name: 'mini',
+      description: 'm',
+      parameters: {},
+      execute: async () => [],
+      presentCall: () => ({ title: 'Doing a thing' }),
+      presentResult: () => ({ title: 'Did the thing' }),
+    }
+    const presenter = new ToolPresenter(registryOf(minimal))
+    const updates = updatesWith(
+      presenter,
+      evt('tool/call', { turn: 1, step: 1, callId: CallId('c1'), name: 'mini', arguments: '{}' }),
+      evt('tool/result', { turn: 1, step: 1, callId: CallId('c1'), content: [{ type: 'text', text: 'kept' }], isError: false }),
+    )
+    // No kind → 'other'; no rawInput key at all.
+    expect(updates[0]).toEqual({ sessionUpdate: 'tool_call', toolCallId: 'c1', title: 'Doing a thing', kind: 'other', status: 'in_progress' })
+    // Title replaced; content falls back to the raw result content.
+    expect(updates[1]).toEqual({
+      sessionUpdate: 'tool_call_update',
+      toolCallId: 'c1',
+      status: 'completed',
+      content: [{ type: 'content', content: { type: 'text', text: 'kept' } }],
+      title: 'Did the thing',
+    })
+  })
+
+  it('holds ONLY in-flight calls: the callId entry is removed once its result is presented', () => {
+    const presenter = new ToolPresenter(registryOf(bashLike))
+    updatesWith(
+      presenter,
+      evt('tool/call', { turn: 1, step: 1, callId: CallId('c1'), name: 'bash', arguments: JSON.stringify({ command: 'x', description: 'd' }) }),
+      evt('tool/result', { turn: 1, step: 1, callId: CallId('c1'), content: [{ type: 'text', text: 'o' }], isError: false }),
+    )
+    // A SECOND result for the same callId now finds nothing remembered, so it
+    // falls back to raw content (proving the first result consumed the entry —
+    // the map does not retain finished calls).
+    const [late] = updatesWith(presenter, evt('tool/result', {
+      turn: 1, step: 1, callId: CallId('c1'), content: [{ type: 'text', text: 'late' }], isError: false,
+    }))
+    expect(late).toMatchObject({ content: [{ type: 'content', content: { type: 'text', text: 'late' } }] })
+  })
+})
+
 describe('agentOptions', () => {
   it('includes only the fields present in config', () => {
     expect(agentOptions({})).toEqual({})

packages/acp/tests/turns.spec.ts

@@ -75,6 +75,42 @@ describe('acp bridge — turn outcomes', () => {
     expect(callIdx).toBeLessThan(updIdx)
   })
 
+  it('a tool-owned presentation flows end-to-end: presentCall sets title/rawInput, presentResult reformats output', async () => {
+    harness = await makeBridgeHarness({
+      storageDir,
+      script: [toolCallResponse('c1', 'bash', { command: 'ls -la', description: 'List files' }), textResponse('done')],
+    })
+    // A tool that declares its OWN presentation (like the real tool-bash). The
+    // bridge must use it — NOT the generic title=name fallback — proving the
+    // tool-owns-its-rendering seam works through the real session-event path.
+    harness.ctx.tools.register(defineTool({
+      name: 'bash',
+      description: 'run a command',
+      parameters: {
+        command: { type: 'string', required: true },
+        description: { type: 'string', required: true },
+      },
+      async execute() { return [{ type: 'text', text: 'a.txt\nb.txt\n' }] },
+      presentCall: args => ({ title: args.description, kind: 'execute', rawInput: args.command }),
+      presentResult: (_args, result) => {
+        const block = result.content.length === 1 ? result.content[0] : undefined
+        if (block === undefined || block.type !== 'text') return undefined
+        return { content: [{ type: 'text', text: `\`\`\`console\n${block.text.trimEnd()}\n\`\`\`` }] }
+      },
+    }))
+    const sessionId = await newSession(harness)
+    await harness.client.prompt({ sessionId, prompt: [{ type: 'text', text: 'list' }] })
+
+    const call = harness.updates.find(u => u.sessionUpdate === 'tool_call')
+    expect(call).toMatchObject({ toolCallId: 'c1', title: 'List files', kind: 'execute', rawInput: 'ls -la', status: 'in_progress' })
+    const update = harness.updates.find(u => u.sessionUpdate === 'tool_call_update')
+    expect(update).toMatchObject({
+      toolCallId: 'c1',
+      status: 'completed',
+      content: [{ type: 'content', content: { type: 'text', text: '```console\na.txt\nb.txt\n```' } }],
+    })
+  })
+
   it('a failing tool yields a failed tool_call_update', async () => {
     harness = await makeBridgeHarness({
       storageDir,

packages/acp/tsconfig.json

@@ -12,6 +12,7 @@
     { "path": "../llm" },
     { "path": "../session" },
     { "path": "../agent" },
+    { "path": "../tools" },
     { "path": "../session-persistence" }
   ]
 }