@zooid/acp-client 0.11.0 → 0.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zooid/acp-client",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "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

@@ -90,4 +90,44 @@ describe('AcpClient — context MCP wiring', () => {
     }
     expect(params.mcpServers.map((s) => s.name)).toEqual(['zooid-context'])
   })
+
+  it('passes contextThreadId — not the composed session key — to contextSpawn', async () => {
+    const calls: Array<{ method: string; params: unknown }> = []
+    const contextSpawn = vi.fn(async (threadId: string) => ({
+      name: 'zooid-context' as const,
+      command: 'node',
+      args: ['/bin/zooid-context-mcp.js', '--spawn-id', `spawn-${threadId}`],
+      env: [{ name: 'ZOOID_DAEMON_SOCK', value: '/run/zooid/test.sock' }],
+    }))
+    const client = new AcpClient({
+      agent: { id: 'bebop', command: 'x', args: [] },
+      onEvent: () => {},
+      onApprovalRequest: async () => ({ decision: 'allow', optionId: 'allow' }),
+      contextSpawn,
+    })
+    injectConnection(client, calls)
+    // 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')
+  })
+
+  it('defaults the context ref to the session key when contextThreadId is omitted (back-compat)', async () => {
+    const calls: Array<{ method: string; params: unknown }> = []
+    const contextSpawn = vi.fn(async (threadId: string) => ({
+      name: 'zooid-context' as const,
+      command: 'node',
+      args: ['/bin/zooid-context-mcp.js', '--spawn-id', `spawn-${threadId}`],
+      env: [{ name: 'ZOOID_DAEMON_SOCK', value: '/run/zooid/test.sock' }],
+    }))
+    const client = new AcpClient({
+      agent: { id: 'bebop', command: 'x', args: [] },
+      onEvent: () => {},
+      onApprovalRequest: async () => ({ decision: 'allow', optionId: 'allow' }),
+      contextSpawn,
+    })
+    injectConnection(client, calls)
+    await client.ensureSession('$root', '!r:example.com')
+    expect(contextSpawn).toHaveBeenCalledWith('$root', '!r:example.com')
+  })
 })

package/src/acp-client.ts

@@ -162,7 +162,11 @@ export class AcpClient {
     this.initialized = false
   }
 
-  async ensureSession(threadId: string, channelId?: string): Promise<string> {
+  async ensureSession(
+    threadId: string,
+    channelId?: string,
+    contextThreadId?: string,
+  ): Promise<string> {
     if (!this.connection || !this.initialized) {
       throw new Error('AcpClient.start() must be called before ensureSession()')
     }
@@ -173,7 +177,7 @@ export class AcpClient {
     if (cached) return cached.sessionId
 
     const mcpServers = this.options.contextSpawn
-      ? [await this.options.contextSpawn(threadId, channelId)]
+      ? [await this.options.contextSpawn(contextThreadId ?? threadId, channelId)]
       : []
     process.stderr.write(
       `[acp-client:${this.options.agent.id}] ensureSession(${threadId}) mcpServers=${
@@ -260,7 +264,11 @@ export class AcpClient {
     let sessionId: string | null = null
     let turnId: string | null = null
     try {
-      sessionId = await this.ensureSession(input.threadId, input.channelId)
+      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 })

package/src/types.ts

@@ -48,6 +48,12 @@ export interface PromptInput {
    * transport-context provider sees the real room.
    */
   channelId?: string
+  /**
+   * The real thread root when `threadId` is a composed handoff-arc session
+   * key ([[ZOD071]]). Feeds the transport-context spawn so history reads
+   * target the real thread. Defaults to `threadId`.
+   */
+  contextThreadId?: string
   content: ContentBlock[]
 }