zooid 0.10.0 → 0.11.1

package/dist/bin.js

@@ -16,7 +16,7 @@ import {
   renderRegistration,
   startDaemonSocketServer,
   startWorkforcePublisher
-} from "./chunk-LIMRV7C4.js";
+} from "./chunk-KGYQ5YNP.js";
 
 // src/bin.ts
 import { resolve as resolve6 } from "path";

package/dist/{chunk-LIMRV7C4.js → chunk-KGYQ5YNP.js}

@@ -24326,7 +24326,7 @@ var AcpClient = class {
     this.connection = null;
     this.initialized = false;
   }
-  async ensureSession(threadId, channelId) {
+  async ensureSession(threadId, channelId, contextThreadId) {
     if (!this.connection || !this.initialized) {
       throw new Error("AcpClient.start() must be called before ensureSession()");
     }
@@ -24334,7 +24334,7 @@ var AcpClient = class {
     const key = { threadId, agentId: this.options.agent.id };
     const cached3 = this.sessions.get(key);
     if (cached3) return cached3.sessionId;
-    const mcpServers = this.options.contextSpawn ? [await this.options.contextSpawn(threadId, channelId)] : [];
+    const mcpServers = this.options.contextSpawn ? [await this.options.contextSpawn(contextThreadId ?? threadId, channelId)] : [];
     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 })))}
 `
@@ -24408,7 +24408,11 @@ var AcpClient = class {
     let sessionId = null;
     let turnId = 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 \u2192", { sessionId, content: input.content });
@@ -25410,10 +25414,10 @@ var AcpAgentRegistry = class {
   getApprovalTimeoutMs(name) {
     return this.opts.agents[name]?.approval_timeout_ms ?? 0;
   }
-  async ensureSession(name, threadId, channelId) {
+  async ensureSession(name, threadId, channelId, contextThreadId) {
     if (!this.hasAgent(name)) throw new Error(`unknown agent: ${name}`);
     const client = await this.ensureClient(name);
-    return client.ensureSession(threadId, channelId);
+    return client.ensureSession(threadId, channelId, contextThreadId);
   }
   endSession(name, threadId) {
     if (!this.hasAgent(name)) return;
@@ -26301,6 +26305,16 @@ function buildUserPowerLevels(asUserId, admins, agents, roomAlias) {
 import { Hono } from "hono";
 import { timingSafeEqual } from "crypto";
 
+// ../transport-matrix/src/session-keys.ts
+var HANDOFF_KEY_SEP = "|";
+function composeHandoffKey(threadRoot, callEventId) {
+  return `${threadRoot}${HANDOFF_KEY_SEP}${callEventId}`;
+}
+function sessionKeyFor(agentName, threadRoot, state) {
+  const arc = state?.handoffs[agentName]?.at(-1);
+  return arc ? composeHandoffKey(threadRoot, arc) : threadRoot;
+}
+
 // ../transport-matrix/src/event-encoders.ts
 var RAW_INPUT_STR_MAX = 250;
 function toToolCallBody(evt) {
@@ -26865,8 +26879,22 @@ function createMatrixTransport(opts) {
         return;
       }
       console.log(`[matrix] inbound dev.zooid.session_reset in ${evt.room_id} thread=${threadRoot}`);
+      if (!threadStates.has(threadRoot) && evt.room_id) {
+        try {
+          threadStates.set(
+            threadRoot,
+            await rebuildThreadState(client, evt.room_id, threadRoot, bindings)
+          );
+        } catch (err) {
+          console.warn(`[matrix] failed to rebuild threadState for reset ${threadRoot}:`, err);
+        }
+      }
+      const st = threadStates.get(threadRoot);
       for (const a of bindings) {
         agents.endSession(a.name, threadRoot);
+        for (const arc of st?.handoffs[a.name] ?? []) {
+          agents.endSession(a.name, composeHandoffKey(threadRoot, arc));
+        }
       }
       return;
     }
@@ -26955,7 +26983,7 @@ function createMatrixTransport(opts) {
     if (matches.length > 0 && promotedRoot) {
       let st = threadStates.get(promotedRoot);
       if (!st) {
-        st = { participants: [], rootMentions: [], callers: {} };
+        st = { participants: [], rootMentions: [], callers: {}, handoffs: {} };
         threadStates.set(promotedRoot, st);
       }
       const msgMentions = new Set(extractMentions(evt));
@@ -26963,7 +26991,13 @@ function createMatrixTransport(opts) {
       for (const a of bindings) {
         if (!msgMentions.has(a.userId)) continue;
         if (!st.rootMentions.includes(a.name)) st.rootMentions.push(a.name);
-        if (senderAgent && a.name !== senderAgent.name) st.callers[a.name] = senderAgent.name;
+        if (senderAgent && a.name !== senderAgent.name) {
+          st.callers[a.name] = senderAgent.name;
+          if (evt.event_id) {
+            const arcs = st.handoffs[a.name] ??= [];
+            if (!arcs.includes(evt.event_id)) arcs.push(evt.event_id);
+          }
+        }
       }
     }
     for (const a of matches) {
@@ -26972,7 +27006,7 @@ function createMatrixTransport(opts) {
         if (!promotedRoot) return;
         let st = threadStates.get(promotedRoot);
         if (!st) {
-          st = { participants: [], rootMentions: [], callers: {} };
+          st = { participants: [], rootMentions: [], callers: {}, handoffs: {} };
           threadStates.set(promotedRoot, st);
         }
         if (st.participants.at(-1) !== a.name) st.participants.push(a.name);
@@ -27045,8 +27079,8 @@ function createMatrixTransport(opts) {
     if (!evt.room_id || !evt.event_id) return;
     const inbound = inboundThreadRoot2(evt);
     const threadRoot = inbound ?? evt.event_id;
-    const sessionKey = threadRoot;
-    const sessionId = await agents.ensureSession(agent.name, sessionKey, evt.room_id);
+    const sessionKey = sessionKeyFor(agent.name, threadRoot, threadStates.get(threadRoot));
+    const sessionId = await agents.ensureSession(agent.name, sessionKey, evt.room_id, threadRoot);
     sessions.set(sessionId, { agent, roomId: evt.room_id, threadRoot });
     buffers.set(sessionId, "");
     bufferMessageIds.delete(sessionId);
@@ -27094,6 +27128,7 @@ function createMatrixTransport(opts) {
       await agents.prompt(agent.name, {
         threadId: sessionKey,
         channelId: evt.room_id,
+        contextThreadId: threadRoot,
         content: [...blocks, { type: "text", text: fullPromptText }]
       });
       const drainStart = Date.now();
@@ -27148,7 +27183,7 @@ function createMatrixTransport(opts) {
   };
 }
 async function rebuildThreadState(client, roomId, rootEventId, bindings) {
-  const state = { participants: [], rootMentions: [], callers: {} };
+  const state = { participants: [], rootMentions: [], callers: {}, handoffs: {} };
   const asUser = (bindings.find((b) => b.rooms.some((r) => r.alias === roomId)) ?? bindings[0])?.userId;
   if (!asUser) return state;
   const root = await client.fetchEvent(roomId, rootEventId, asUser);
@@ -27159,7 +27194,11 @@ async function rebuildThreadState(client, roomId, rootEventId, bindings) {
     for (const a of bindings) {
       if (!rootMentions.has(a.userId)) continue;
       if (!state.rootMentions.includes(a.name)) state.rootMentions.push(a.name);
-      if (rootSenderAgent && a.name !== rootSenderAgent.name) state.callers[a.name] = rootSenderAgent.name;
+      if (rootSenderAgent && a.name !== rootSenderAgent.name) {
+        state.callers[a.name] = rootSenderAgent.name;
+        const arcs = state.handoffs[a.name] ??= [];
+        if (!arcs.includes(rootEventId)) arcs.push(rootEventId);
+      }
     }
   }
   const { chunk: thread } = await client.fetchThreadRelations({
@@ -27171,10 +27210,17 @@ async function rebuildThreadState(client, roomId, rootEventId, bindings) {
     const mentions = new Set(extractMentions(ev));
     const evSender = ev.sender;
     const evSenderAgent = evSender ? bindings.find((b) => b.userId === evSender) : void 0;
+    const evId = ev.event_id;
     for (const a of bindings) {
       if (!mentions.has(a.userId)) continue;
       if (!state.rootMentions.includes(a.name)) state.rootMentions.push(a.name);
-      if (evSenderAgent && a.name !== evSenderAgent.name) state.callers[a.name] = evSenderAgent.name;
+      if (evSenderAgent && a.name !== evSenderAgent.name) {
+        state.callers[a.name] = evSenderAgent.name;
+        if (evId) {
+          const arcs = state.handoffs[a.name] ??= [];
+          if (!arcs.includes(evId)) arcs.push(evId);
+        }
+      }
     }
     const type = ev.type;
     if (type === "m.room.message" && evSender) {
@@ -32571,6 +32617,7 @@ var McpZodTypeKind;
 
 // ../context-mcp/src/factory.ts
 import { createRequire } from "module";
+import { dirname } from "path";
 function resolveDefaultBin() {
   const req = createRequire(import.meta.url);
   return req.resolve("@zooid/context-mcp/bin");
@@ -32580,7 +32627,25 @@ function getDefaultBin() {
   if (!cachedDefaultBin) cachedDefaultBin = resolveDefaultBin();
   return cachedDefaultBin;
 }
+var CONTEXT_CONTAINER_BIN_DIR = "/zooid/context-mcp";
+var CONTEXT_CONTAINER_BIN = `${CONTEXT_CONTAINER_BIN_DIR}/bin.js`;
+var CONTEXT_CONTAINER_SOCK = "/zooid/context.sock";
+function contextContainerMounts(opts) {
+  const binFile = opts.binPath ?? getDefaultBin();
+  return [
+    { path: dirname(binFile), target: CONTEXT_CONTAINER_BIN_DIR, mode: "ro" },
+    { path: opts.sockPath, target: CONTEXT_CONTAINER_SOCK, mode: "rw" }
+  ];
+}
 function buildContextServerSpec(opts) {
+  if (opts.containerize) {
+    return {
+      name: "zooid-context",
+      command: "node",
+      args: [CONTEXT_CONTAINER_BIN, "--spawn-id", opts.spawnId],
+      env: [{ name: "ZOOID_DAEMON_SOCK", value: CONTEXT_CONTAINER_SOCK }]
+    };
+  }
   return {
     name: "zooid-context",
     command: process.execPath,
@@ -32730,6 +32795,15 @@ Set agents.<name>.container.image, top-level container.image, or use a preset th
     }
   }
   const contextSpawns = buildContextSpawns(cfg, opts);
+  if (cfg.runtime !== "local" && opts.daemonSockPath && contextSpawns) {
+    for (const name of Object.keys(cfg.agents)) {
+      if (!contextSpawns[name]) continue;
+      mountsByAgent[name] = [
+        ...mountsByAgent[name] ?? [],
+        ...contextContainerMounts({ sockPath: opts.daemonSockPath })
+      ];
+    }
+  }
   return new AcpAgentRegistry({
     runtime,
     agents: cfg.agents,
@@ -32775,7 +32849,11 @@ function buildContextSpawns(cfg, opts) {
           threadRef: { channelId: channelId ?? threadId, threadId },
           provider
         });
-        return buildContextServerSpec({ spawnId, sockPath });
+        return buildContextServerSpec({
+          spawnId,
+          sockPath,
+          containerize: cfg.runtime !== "local"
+        });
       };
     } else {
       result[name] = void 0;
@@ -32812,4 +32890,4 @@ export {
   startDaemonSocketServer,
   buildAcpRegistry
 };
-//# sourceMappingURL=chunk-LIMRV7C4.js.map
+//# sourceMappingURL=chunk-KGYQ5YNP.js.map