@buildautomaton/cli 0.1.44 → 0.1.45

package/dist/cli.js

@@ -25174,7 +25174,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.44".length > 0 ? "0.1.44" : "0.0.0-dev";
+var CLI_VERSION = "0.1.45".length > 0 ? "0.1.45" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -27438,38 +27438,38 @@ async function closeBridgeConnection(state, acpManager, devServerManager, log2)
 // src/agents/acp/acp-prompt-routing-registry.ts
 var AcpPromptRoutingRegistry = class {
   runs = /* @__PURE__ */ new Map();
-  streamingRunIdByAcpAgent = /* @__PURE__ */ new Map();
+  streamingRunIdBySessionAgent = /* @__PURE__ */ new Map();
   registerRun(route) {
     this.runs.set(route.runId, route);
   }
   unregisterRun(runId) {
     this.runs.delete(runId);
-    for (const [acpAgentKey, streamingRunId] of this.streamingRunIdByAcpAgent.entries()) {
+    for (const [sessionAgentKey, streamingRunId] of this.streamingRunIdBySessionAgent.entries()) {
       if (streamingRunId === runId) {
-        this.streamingRunIdByAcpAgent.delete(acpAgentKey);
+        this.streamingRunIdBySessionAgent.delete(sessionAgentKey);
       }
     }
   }
   isRegisteredRun(runId) {
     return this.runs.has(runId);
   }
-  setStreamingRunId(acpAgentKey, runId) {
+  setStreamingRunId(sessionAgentKey, runId) {
     if (runId) {
-      this.streamingRunIdByAcpAgent.set(acpAgentKey, runId);
+      this.streamingRunIdBySessionAgent.set(sessionAgentKey, runId);
     } else {
-      this.streamingRunIdByAcpAgent.delete(acpAgentKey);
+      this.streamingRunIdBySessionAgent.delete(sessionAgentKey);
     }
   }
-  clearStreamingRunId(acpAgentKey, runId) {
-    if (this.streamingRunIdByAcpAgent.get(acpAgentKey) === runId) {
-      this.streamingRunIdByAcpAgent.delete(acpAgentKey);
+  clearStreamingRunId(sessionAgentKey, runId) {
+    if (this.streamingRunIdBySessionAgent.get(sessionAgentKey) === runId) {
+      this.streamingRunIdBySessionAgent.delete(sessionAgentKey);
     }
   }
-  getStreamingRunId(acpAgentKey) {
-    return this.streamingRunIdByAcpAgent.get(acpAgentKey);
+  getStreamingRunId(sessionAgentKey) {
+    return this.streamingRunIdBySessionAgent.get(sessionAgentKey);
   }
-  resolveRouting(acpAgentKey) {
-    const runId = this.streamingRunIdByAcpAgent.get(acpAgentKey);
+  resolveRouting(sessionAgentKey) {
+    const runId = this.streamingRunIdBySessionAgent.get(sessionAgentKey);
     if (!runId) return void 0;
     return this.runs.get(runId);
   }
@@ -27492,9 +27492,9 @@ function createAcpManagerContext(options) {
 async function cancelRun(ctx, runId) {
   const meta = ctx.runDispatch.get(runId);
   if (!meta) return false;
-  const streamingRunId = ctx.promptRouting.getStreamingRunId(meta.acpAgentKey);
+  const streamingRunId = ctx.promptRouting.getStreamingRunId(meta.acpSessionAgentKey);
   if (streamingRunId && streamingRunId !== runId) return false;
-  const handle = ctx.acpAgents.get(meta.acpAgentKey)?.acpHandle;
+  const handle = ctx.acpAgents.get(meta.acpSessionAgentKey)?.acpHandle;
   if (handle?.cancel) {
     ctx.log("[Agent] Stop requested");
     try {
@@ -30696,6 +30696,11 @@ function writeLocalAgentSessionFile(cloudSessionId, patch) {
 }
 
 // src/agents/acp/acp-agent.ts
+function computeAcpSessionAgentKey(cloudSessionId, acpAgentKey) {
+  const sid = cloudSessionId?.trim();
+  if (!sid) return `::${acpAgentKey}`;
+  return `${sid}::${acpAgentKey}`;
+}
 function computeAcpAgentKey(preferredAgentType, mode, agentConfig) {
   const resolved = resolveAgentCommand(preferredAgentType);
   if (!resolved) return null;
@@ -36144,11 +36149,11 @@ async function sendPromptToAgent(options) {
 }
 
 // src/agents/acp/manager/get-acp-agent-state.ts
-function getAcpAgentState(ctx, acpAgentKey) {
-  let state = ctx.acpAgents.get(acpAgentKey);
+function getAcpSessionAgentState(ctx, acpSessionAgentKey) {
+  let state = ctx.acpAgents.get(acpSessionAgentKey);
   if (!state) {
     state = createEmptyAcpClientState();
-    ctx.acpAgents.set(acpAgentKey, state);
+    ctx.acpAgents.set(acpSessionAgentKey, state);
   }
   return state;
 }
@@ -36192,11 +36197,12 @@ function handlePrompt(ctx, opts) {
     return;
   }
   const activeAcpAgentKey = acpAgentKey;
+  const activeAcpSessionAgentKey = computeAcpSessionAgentKey(sessionId, activeAcpAgentKey);
   ctx.pendingCancelRunIds.delete(activeRunId);
   ctx.promptRouting.registerRun({ sessionId, runId: activeRunId });
-  ctx.runDispatch.set(activeRunId, { acpAgentKey: activeAcpAgentKey });
+  ctx.runDispatch.set(activeRunId, { acpSessionAgentKey: activeAcpSessionAgentKey });
   async function run() {
-    const acpAgentState = getAcpAgentState(ctx, activeAcpAgentKey);
+    const acpAgentState = getAcpSessionAgentState(ctx, activeAcpSessionAgentKey);
     const handle = await ensureAcpClient({
       state: acpAgentState,
       acpAgentKey: activeAcpAgentKey,
@@ -36204,7 +36210,7 @@ function handlePrompt(ctx, opts) {
       mode,
       agentConfig: agentConfig ?? null,
       sessionParentPath,
-      resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpAgentKey),
+      resolveRouting: () => ctx.promptRouting.resolveRouting(activeAcpSessionAgentKey),
       cloudSessionId: sessionId,
       sendSessionUpdate,
       sendRequest: sendSessionUpdate,
@@ -36247,7 +36253,7 @@ function handlePrompt(ctx, opts) {
       });
       return;
     }
-    ctx.promptRouting.setStreamingRunId(activeAcpAgentKey, activeRunId);
+    ctx.promptRouting.setStreamingRunId(activeAcpSessionAgentKey, activeRunId);
     try {
       await sendPromptToAgent({
         handle,
@@ -36268,7 +36274,7 @@ function handlePrompt(ctx, opts) {
         attachments
       });
     } finally {
-      ctx.promptRouting.clearStreamingRunId(activeAcpAgentKey, activeRunId);
+      ctx.promptRouting.clearStreamingRunId(activeAcpSessionAgentKey, activeRunId);
     }
   }
   void run().finally(() => {