@zooid/acp-client 0.12.0 → 0.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zooid/acp-client",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "description": "Zooid's ACP client: spawn agent subprocesses, drive them via Agent Client Protocol, route events and permission requests through callbacks.",
   "type": "module",
   "license": "MIT",

package/src/acp-client.context.test.ts

@@ -53,7 +53,7 @@ describe('AcpClient — context MCP wiring', () => {
     })
     injectConnection(client, calls)
     await client.ensureSession('!room:hs')
-    expect(contextSpawn).toHaveBeenCalledWith('!room:hs', undefined)
+    expect(contextSpawn).toHaveBeenCalledWith('!room:hs', undefined, '!room:hs')
     const params = calls.find((c) => c.method === 'newSession')!.params as {
       mcpServers: Array<{ name: string; args: string[] }>
     }
@@ -80,7 +80,12 @@ describe('AcpClient — context MCP wiring', () => {
     })
     const conn = injectConnection(client, calls)
     // @ts-expect-error
-    client.store = { load: async () => {}, get: () => 'sess-old', set: async () => {}, delete: async () => {} }
+    client.store = {
+      load: async () => {},
+      get: () => 'sess-old',
+      set: async () => {},
+      delete: async () => {},
+    }
     // @ts-expect-error
     client.storeLoaded = Promise.resolve()
     await client.ensureSession('!room:hs')
@@ -109,7 +114,7 @@ describe('AcpClient — context MCP wiring', () => {
     // Handoff-arc session: key is composed, context ref is the real root —
     // zooid_get_history must read the real Matrix thread.
     await client.ensureSession('$root|$p1', '!r:example.com', '$root')
-    expect(contextSpawn).toHaveBeenCalledWith('$root', '!r:example.com')
+    expect(contextSpawn).toHaveBeenCalledWith('$root', '!r:example.com', '$root|$p1')
   })
 
   it('defaults the context ref to the session key when contextThreadId is omitted (back-compat)', async () => {
@@ -128,6 +133,6 @@ describe('AcpClient — context MCP wiring', () => {
     })
     injectConnection(client, calls)
     await client.ensureSession('$root', '!r:example.com')
-    expect(contextSpawn).toHaveBeenCalledWith('$root', '!r:example.com')
+    expect(contextSpawn).toHaveBeenCalledWith('$root', '!r:example.com', '$root')
   })
 })

package/src/acp-client.ts

@@ -11,10 +11,7 @@ import { AgentProcess } from './agent-process.js'
 import { SessionMap } from './session-map.js'
 import { JsonFileSessionStore } from './session-store.js'
 import { resolvePreset } from './presets.js'
-import {
-  acpUpdateToAgentEvent,
-  approvalDecisionToPermissionResponse,
-} from './event-mapping.js'
+import { acpUpdateToAgentEvent, approvalDecisionToPermissionResponse } from './event-mapping.js'
 import { TurnTracker, type TapEvent } from './turn-tracker.js'
 import { classify } from './errors.js'
 import type {
@@ -73,7 +70,11 @@ export interface AcpClientOptions {
    * connects to the daemon-side zooid-context MCP server for the session
    * lifetime. Called once per `ensureSession(threadId)`.
    */
-  contextSpawn?: (threadId: string, channelId?: string) => Promise<{
+  contextSpawn?: (
+    threadId: string,
+    channelId?: string,
+    sessionKey?: string,
+  ) => Promise<{
     name: 'zooid-context'
     command: string
     args: string[]
@@ -177,13 +178,19 @@ export class AcpClient {
     if (cached) return cached.sessionId
 
     const mcpServers = this.options.contextSpawn
-      ? [await this.options.contextSpawn(contextThreadId ?? threadId, channelId)]
+      ? [await this.options.contextSpawn(contextThreadId ?? threadId, channelId, threadId)]
       : []
     process.stderr.write(
       `[acp-client:${this.options.agent.id}] ensureSession(${threadId}) mcpServers=${
         mcpServers.length === 0
           ? '[]'
-          : JSON.stringify(mcpServers.map((s) => ({ name: s.name, command: s.command, args: s.args })))
+          : JSON.stringify(
+              mcpServers.map((s) => ({
+                name: s.name,
+                command: s.command,
+                args: s.args,
+              })),
+            )
       }\n`,
     )
 
@@ -264,20 +271,22 @@ export class AcpClient {
     let sessionId: string | null = null
     let turnId: string | null = null
     try {
-      sessionId = await this.ensureSession(
-        input.threadId,
-        input.channelId,
-        input.contextThreadId,
-      )
+      sessionId = await this.ensureSession(input.threadId, input.channelId, input.contextThreadId)
       const promptText = stringifyPromptForLog(input.content)
       turnId = this.turns?.startTurn({ sessionId, promptText }) ?? null
-      debugLog(this.options.agent.id, 'prompt →', { sessionId, content: input.content })
+      debugLog(this.options.agent.id, 'prompt →', {
+        sessionId,
+        content: input.content,
+      })
       const result = await this.connection!.prompt({
         sessionId,
         prompt: input.content,
       })
       this.turns?.endTurn({ sessionId, stopReason: result.stopReason })
-      debugLog(this.options.agent.id, 'prompt ←', { sessionId, stopReason: result.stopReason })
+      debugLog(this.options.agent.id, 'prompt ←', {
+        sessionId,
+        stopReason: result.stopReason,
+      })
       return { stopReason: result.stopReason }
     } catch (err) {
       const c = classify(err)