@rk0429/agentic-relay 2.0.7 → 2.0.8

package/dist/relay.mjs

@@ -1085,7 +1085,16 @@ function buildContextFromEnv() {
   const depth = Number(process.env["RELAY_DEPTH"] ?? "0");
   return { traceId, parentSessionId, depth };
 }
-async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager, relayContext) {
+async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager, relayContext, signal) {
+  if (signal?.aborted) {
+    return {
+      sessionId: "",
+      exitCode: 1,
+      stdout: "",
+      stderr: "Spawn cancelled: parent session disconnected",
+      failureReason: "unknown"
+    };
+  }
   onProgress?.({ stage: "initializing", percent: 0 });
   let inlineTaskId;
   if (input.title && taskLifecycleManager) {
@@ -1405,7 +1414,8 @@ ${input.prompt}`;
             maxDepth: guard.getConfig().maxDepth,
             traceId: envContext.traceId
           },
-          ...mcpServers ? { mcpServers } : {}
+          ...mcpServers ? { mcpServers } : {},
+          ...signal ? { signal } : {}
         });
       }
     })();
@@ -1853,7 +1863,7 @@ var init_conflict_detector = __esm({
 });
 
 // src/mcp-server/tools/spawn-agents-parallel.ts
-async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager, relayContext) {
+async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager, relayContext, signal) {
   for (let index = 0; index < agents.length; index += 1) {
     try {
       resolveValidatedSessionMetadata(agents[index]);
@@ -1939,7 +1949,8 @@ async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, gu
         hookMemoryDir,
         taskCompleter,
         taskLifecycleManager,
-        relayContext
+        relayContext,
+        signal
       ).then((result) => {
         completedCount++;
         onProgress?.({
@@ -8442,7 +8453,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.7" },
+          { name: "agentic-relay", version: "2.0.8" },
           createMcpServerOptions()
         );
         this.registerTools(this.server);
@@ -8474,7 +8485,7 @@ var init_server = __esm({
        * Run spawn_agent in the background and store the result in taskStore.
        * Fire-and-forget: errors are caught and stored as failed task results.
        */
-      runSpawnAgentInBackground(taskId, params, extra, relayContext) {
+      runSpawnAgentInBackground(taskId, params, extra, relayContext, signal) {
         const run = async () => {
           try {
             const result = await executeSpawnAgent(
@@ -8491,7 +8502,8 @@ var init_server = __esm({
               this.hookMemoryDir,
               void 0,
               this.taskLifecycleManager,
-              relayContext
+              relayContext,
+              signal
             );
             const controlOptions = {
               inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8532,7 +8544,7 @@ var init_server = __esm({
        * Run spawn_agents_parallel in the background and store the result in taskStore.
        * Fire-and-forget: errors are caught and stored as failed task results.
        */
-      runSpawnAgentsParallelInBackground(taskId, agents, extra, relayContext) {
+      runSpawnAgentsParallelInBackground(taskId, agents, extra, relayContext, signal) {
         const run = async () => {
           try {
             const result = await executeSpawnAgentsParallel(
@@ -8549,7 +8561,8 @@ var init_server = __esm({
               this.hookMemoryDir,
               void 0,
               this.taskLifecycleManager,
-              relayContext
+              relayContext,
+              signal
             );
             const controlOptions = {
               inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8585,7 +8598,7 @@ var init_server = __esm({
         };
         void run();
       }
-      registerTools(server, relayContext) {
+      registerTools(server, relayContext, signal) {
         server.experimental.tasks.registerToolTask(
           "spawn_agent",
           {
@@ -8599,7 +8612,7 @@ var init_server = __esm({
                 ttl: DEFAULT_TASK_TTL,
                 pollInterval: DEFAULT_POLL_INTERVAL
               });
-              this.runSpawnAgentInBackground(task.taskId, params, extra, relayContext);
+              this.runSpawnAgentInBackground(task.taskId, params, extra, relayContext, signal);
               return { task };
             },
             getTask: async (_params, extra) => {
@@ -8625,7 +8638,7 @@ var init_server = __esm({
                 ttl: DEFAULT_TASK_TTL,
                 pollInterval: DEFAULT_POLL_INTERVAL
               });
-              this.runSpawnAgentsParallelInBackground(task.taskId, params.agents, extra, relayContext);
+              this.runSpawnAgentsParallelInBackground(task.taskId, params.agents, extra, relayContext, signal);
               return { task };
             },
             getTask: async (_params, extra) => {
@@ -8664,7 +8677,8 @@ var init_server = __esm({
                 this.hookMemoryDir,
                 void 0,
                 this.taskLifecycleManager,
-                relayContext
+                relayContext,
+                signal
               );
               const controlOptions = {
                 inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8936,6 +8950,7 @@ var init_server = __esm({
        */
       async startChildHttpServer() {
         const sessions = /* @__PURE__ */ new Map();
+        const sessionAbortControllers = /* @__PURE__ */ new Map();
         const httpServer = createServer(async (req, res) => {
           const url = req.url ?? "";
           if (url !== "/mcp" && !url.startsWith("/mcp?")) {
@@ -8952,19 +8967,27 @@ var init_server = __esm({
             }
           }
           const childRelayContext = extractRelayContextFromUrl(url);
+          const abortController = new AbortController();
           const transport = new StreamableHTTPServerTransport({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "2.0.7" },
+            { name: "agentic-relay", version: "2.0.8" },
             createMcpServerOptions()
           );
-          this.registerTools(server, childRelayContext);
+          this.registerTools(server, childRelayContext, abortController.signal);
           transport.onclose = () => {
             const sid2 = transport.sessionId;
             if (sid2) {
               sessions.delete(sid2);
-              logger.debug(`Child MCP session closed: ${sid2}`);
+              const ctrl = sessionAbortControllers.get(sid2);
+              if (ctrl) {
+                ctrl.abort();
+                sessionAbortControllers.delete(sid2);
+                logger.debug(`Child MCP session closed, background tasks aborted: ${sid2}`);
+              } else {
+                logger.debug(`Child MCP session closed: ${sid2}`);
+              }
             }
           };
           await server.connect(transport);
@@ -8972,12 +8995,18 @@ var init_server = __esm({
           const sid = transport.sessionId;
           if (sid) {
             sessions.set(sid, { transport, server });
+            sessionAbortControllers.set(sid, abortController);
             logger.debug(`Child MCP session created: ${sid}`);
             if (sessions.size > MAX_CHILD_HTTP_SESSIONS) {
               const oldestEntry = sessions.entries().next().value;
               if (oldestEntry) {
                 const [oldestSessionId, oldestSession] = oldestEntry;
                 sessions.delete(oldestSessionId);
+                const evictedCtrl = sessionAbortControllers.get(oldestSessionId);
+                if (evictedCtrl) {
+                  evictedCtrl.abort();
+                  sessionAbortControllers.delete(oldestSessionId);
+                }
                 logger.warn(
                   `Child MCP session evicted due to limit (${MAX_CHILD_HTTP_SESSIONS}): ${oldestSessionId}`
                 );
@@ -10635,6 +10664,14 @@ var ClaudeAdapter = class extends BaseAdapter {
     const timeoutMs = resolveClaudeSdkTimeoutMs();
     const abortController = new AbortController();
     const timer = timeoutMs !== void 0 ? setTimeout(() => abortController.abort(), timeoutMs) : void 0;
+    const onExternalAbort = () => abortController.abort();
+    if (flags.signal) {
+      if (flags.signal.aborted) {
+        abortController.abort();
+      } else {
+        flags.signal.addEventListener("abort", onExternalAbort, { once: true });
+      }
+    }
     try {
       const { query } = await loadClaudeSDK();
       const options = {
@@ -10705,10 +10742,11 @@ var ClaudeAdapter = class extends BaseAdapter {
       };
     } catch (error) {
       if (abortController.signal.aborted) {
+        const reason = flags.signal?.aborted ? "Claude execution cancelled: parent session disconnected" : `Claude SDK query timed out after ${timeoutMs}ms`;
         return {
           exitCode: 1,
           stdout: "",
-          stderr: `Claude SDK query timed out after ${timeoutMs}ms`
+          stderr: reason
         };
       }
       return {
@@ -10718,6 +10756,7 @@ var ClaudeAdapter = class extends BaseAdapter {
       };
     } finally {
       if (timer !== void 0) clearTimeout(timer);
+      flags.signal?.removeEventListener("abort", onExternalAbort);
     }
   }
   async *executeStreaming(flags) {
@@ -11307,7 +11346,9 @@ ${prompt}`;
         workingDirectory: process.cwd(),
         approvalPolicy: "never"
       });
-      const result = await thread.run(effectivePrompt);
+      const result = await thread.run(effectivePrompt, {
+        ...flags.signal ? { signal: flags.signal } : {}
+      });
       return {
         exitCode: 0,
         stdout: result.finalResponse,
@@ -11320,6 +11361,13 @@ ${prompt}`;
         } : {}
       };
     } catch (error) {
+      if (flags.signal?.aborted) {
+        return {
+          exitCode: 1,
+          stdout: "",
+          stderr: "Codex execution cancelled: parent session disconnected"
+        };
+      }
       return {
         exitCode: 1,
         stdout: "",
@@ -13569,7 +13617,7 @@ function createMCPCommand(configManager2, registry2, sessionManager2, hooksEngin
             responseOutputDir,
             relayConfig
           );
-          await server.start({ transport, port, currentVersion: "2.0.7" });
+          await server.start({ transport, port, currentVersion: "2.0.8" });
         }
       })
     },
@@ -13729,7 +13777,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.7";
+      const relayVersion = "2.0.8";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -14126,7 +14174,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.7",
+    version: "2.0.8",
     description: "Unified CLI proxy for Claude Code, Codex CLI, and Gemini CLI"
   },
   args: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rk0429/agentic-relay",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Unified CLI proxy for Claude Code, Codex CLI, and Gemini CLI with MCP-based multi-layer sub-agent orchestration",
   "type": "module",
   "license": "Apache-2.0",