@rk0429/agentic-relay 2.0.7 → 2.0.9

package/dist/relay.mjs

@@ -204,129 +204,6 @@ var init_version_check = __esm({
   }
 });
 
-// src/mcp-server/deferred-cleanup-task-store.ts
-import { isTerminal } from "@modelcontextprotocol/sdk/experimental/tasks/interfaces.js";
-import { randomBytes } from "crypto";
-var DeferredCleanupTaskStore;
-var init_deferred_cleanup_task_store = __esm({
-  "src/mcp-server/deferred-cleanup-task-store.ts"() {
-    "use strict";
-    DeferredCleanupTaskStore = class {
-      tasks = /* @__PURE__ */ new Map();
-      cleanupTimers = /* @__PURE__ */ new Map();
-      generateTaskId() {
-        return randomBytes(16).toString("hex");
-      }
-      async createTask(taskParams, requestId, request, _sessionId) {
-        const taskId = this.generateTaskId();
-        if (this.tasks.has(taskId)) {
-          throw new Error(`Task with ID ${taskId} already exists`);
-        }
-        const actualTtl = taskParams.ttl ?? null;
-        const createdAt = (/* @__PURE__ */ new Date()).toISOString();
-        const task = {
-          taskId,
-          status: "working",
-          ttl: actualTtl,
-          createdAt,
-          lastUpdatedAt: createdAt,
-          pollInterval: taskParams.pollInterval ?? 1e3
-        };
-        this.tasks.set(taskId, { task, request, requestId });
-        return { ...task };
-      }
-      async getTask(taskId, _sessionId) {
-        const stored = this.tasks.get(taskId);
-        return stored ? { ...stored.task } : null;
-      }
-      async storeTaskResult(taskId, status, result, _sessionId) {
-        const stored = this.tasks.get(taskId);
-        if (!stored) {
-          throw new Error(`Task with ID ${taskId} not found`);
-        }
-        if (isTerminal(stored.task.status)) {
-          throw new Error(
-            `Cannot store result for task ${taskId} in terminal status '${stored.task.status}'. Task results can only be stored once.`
-          );
-        }
-        stored.result = result;
-        stored.task.status = status;
-        stored.task.lastUpdatedAt = (/* @__PURE__ */ new Date()).toISOString();
-        this.scheduleCleanup(taskId, stored.task.ttl);
-      }
-      async getTaskResult(taskId, _sessionId) {
-        const stored = this.tasks.get(taskId);
-        if (!stored) {
-          throw new Error(`Task with ID ${taskId} not found`);
-        }
-        if (!stored.result) {
-          throw new Error(`Task ${taskId} has no result stored`);
-        }
-        return stored.result;
-      }
-      async updateTaskStatus(taskId, status, statusMessage, _sessionId) {
-        const stored = this.tasks.get(taskId);
-        if (!stored) {
-          throw new Error(`Task with ID ${taskId} not found`);
-        }
-        if (isTerminal(stored.task.status)) {
-          throw new Error(
-            `Cannot update task ${taskId} from terminal status '${stored.task.status}'.`
-          );
-        }
-        stored.task.status = status;
-        if (statusMessage) {
-          stored.task.statusMessage = statusMessage;
-        }
-        stored.task.lastUpdatedAt = (/* @__PURE__ */ new Date()).toISOString();
-        if (isTerminal(status)) {
-          this.scheduleCleanup(taskId, stored.task.ttl);
-        }
-      }
-      async listTasks(cursor, _sessionId) {
-        const PAGE_SIZE = 10;
-        const allTaskIds = Array.from(this.tasks.keys());
-        let startIndex = 0;
-        if (cursor) {
-          const cursorIndex = allTaskIds.indexOf(cursor);
-          if (cursorIndex >= 0) {
-            startIndex = cursorIndex + 1;
-          } else {
-            throw new Error(`Invalid cursor: ${cursor}`);
-          }
-        }
-        const pageTaskIds = allTaskIds.slice(startIndex, startIndex + PAGE_SIZE);
-        const tasks = pageTaskIds.map((id) => {
-          const stored = this.tasks.get(id);
-          return { ...stored.task };
-        });
-        const nextCursor = startIndex + PAGE_SIZE < allTaskIds.length ? pageTaskIds[pageTaskIds.length - 1] : void 0;
-        return { tasks, nextCursor };
-      }
-      /** Cleanup all timers (for testing or graceful shutdown) */
-      cleanup() {
-        for (const timer of this.cleanupTimers.values()) {
-          clearTimeout(timer);
-        }
-        this.cleanupTimers.clear();
-        this.tasks.clear();
-      }
-      scheduleCleanup(taskId, ttl) {
-        if (!ttl) return;
-        const existingTimer = this.cleanupTimers.get(taskId);
-        if (existingTimer) {
-          clearTimeout(existingTimer);
-        }
-        const timer = setTimeout(() => {
-          this.tasks.delete(taskId);
-          this.cleanupTimers.delete(taskId);
-        }, ttl);
-        this.cleanupTimers.set(taskId, timer);
-      }
-    };
-  }
-});
-
 // src/core/agent-event-store.ts
 import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { join as join6 } from "path";
@@ -1085,7 +962,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 +1291,8 @@ ${input.prompt}`;
             maxDepth: guard.getConfig().maxDepth,
             traceId: envContext.traceId
           },
-          ...mcpServers ? { mcpServers } : {}
+          ...mcpServers ? { mcpServers } : {},
+          ...signal ? { signal } : {}
         });
       }
     })();
@@ -1853,7 +1740,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 +1826,8 @@ async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, gu
         hookMemoryDir,
         taskCompleter,
         taskLifecycleManager,
-        relayContext
+        relayContext,
+        signal
       ).then((result) => {
         completedCount++;
         onProgress?.({
@@ -8098,24 +7986,6 @@ var init_backend_selector = __esm({
   }
 });
 
-// src/types/mcp.ts
-var DEFAULT_TASK_TTL, DEFAULT_POLL_INTERVAL;
-var init_mcp = __esm({
-  "src/types/mcp.ts"() {
-    "use strict";
-    DEFAULT_TASK_TTL = 5 * 60 * 1e3;
-    DEFAULT_POLL_INTERVAL = 3e3;
-  }
-});
-
-// src/types/index.ts
-var init_types2 = __esm({
-  "src/types/index.ts"() {
-    "use strict";
-    init_mcp();
-  }
-});
-
 // src/mcp-server/response-formatter.ts
 import * as fs from "fs";
 import * as path from "path";
@@ -8279,7 +8149,6 @@ __export(server_exports, {
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import { InMemoryTaskMessageQueue } from "@modelcontextprotocol/sdk/experimental/tasks/stores/in-memory.js";
 import { createServer } from "http";
 import { mkdirSync as mkdirSync3 } from "fs";
 import path2 from "path";
@@ -8306,20 +8175,20 @@ function extractRelayContextFromUrl(url) {
   }
   return void 0;
 }
-function createMcpServerOptions() {
-  const taskStore = new DeferredCleanupTaskStore();
-  return {
-    capabilities: { tasks: { requests: { tools: { call: {} } } } },
-    taskStore,
-    taskMessageQueue: new InMemoryTaskMessageQueue(),
-    defaultTaskPollInterval: DEFAULT_POLL_INTERVAL
-  };
+function combineAbortSignals(...signals) {
+  const activeSignals = signals.filter((signal) => signal !== void 0);
+  if (activeSignals.length === 0) {
+    return void 0;
+  }
+  if (activeSignals.length === 1) {
+    return activeSignals[0];
+  }
+  return AbortSignal.any(activeSignals);
 }
 var spawnAgentsParallelInputShape, MAX_CHILD_HTTP_SESSIONS, DEFAULT_TASKS_DB_PATH, RelayMCPServer;
 var init_server = __esm({
   "src/mcp-server/server.ts"() {
     "use strict";
-    init_deferred_cleanup_task_store();
     init_agent_event_store();
     init_session_health_monitor();
     init_recursion_guard();
@@ -8335,7 +8204,6 @@ var init_server = __esm({
     init_metadata_validation();
     init_logger();
     init_version_check();
-    init_types2();
     init_response_formatter();
     init_tasks();
     spawnAgentsParallelInputShape = {
@@ -8442,8 +8310,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.7" },
-          createMcpServerOptions()
+          { name: "agentic-relay", version: "2.0.9" }
         );
         this.registerTools(this.server);
         this.sessionHealthMonitor.start();
@@ -8470,171 +8337,87 @@ var init_server = __esm({
       get childHttpServer() {
         return this._childHttpServer;
       }
-      /**
-       * 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) {
-        const run = async () => {
-          try {
-            const result = await executeSpawnAgent(
-              params,
-              this.registry,
-              this.sessionManager,
-              this.guard,
-              this.hooksEngine,
-              this.contextMonitor,
-              this.backendSelector,
-              this._childHttpUrl,
-              void 0,
-              this.agentEventStore,
-              this.hookMemoryDir,
-              void 0,
-              this.taskLifecycleManager,
-              relayContext
-            );
-            const controlOptions = {
-              inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
-              sessionId: result.sessionId,
-              responseOutputDir: this.responseOutputDir
-            };
-            const { text, isError } = await formatSpawnAgentResponse(result, controlOptions);
-            const callToolResult = {
-              content: [{ type: "text", text }],
-              isError
-            };
-            await extra.taskStore.storeTaskResult(
-              taskId,
-              "completed",
-              callToolResult
-            );
-          } catch (outerError) {
-            try {
-              const message = outerError instanceof Error ? outerError.message : String(outerError);
-              await extra.taskStore.storeTaskResult(
-                taskId,
-                "failed",
-                {
-                  content: [{ type: "text", text: `Error: ${message}` }],
-                  isError: true
-                }
-              );
-            } catch (storeError) {
-              logger.error(
-                `Failed to store task result for ${taskId}: ${storeError instanceof Error ? storeError.message : String(storeError)}`
-              );
-            }
-          }
-        };
-        void run();
-      }
-      /**
-       * 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) {
-        const run = async () => {
-          try {
-            const result = await executeSpawnAgentsParallel(
-              agents,
-              this.registry,
-              this.sessionManager,
-              this.guard,
-              this.hooksEngine,
-              this.contextMonitor,
-              this.backendSelector,
-              this._childHttpUrl,
-              void 0,
-              this.agentEventStore,
-              this.hookMemoryDir,
-              void 0,
-              this.taskLifecycleManager,
-              relayContext
-            );
-            const controlOptions = {
-              inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
-              responseOutputDir: this.responseOutputDir
-            };
-            const { text, isError } = await formatParallelResponse(result, controlOptions);
-            const callToolResult = {
-              content: [{ type: "text", text }],
-              isError
-            };
-            await extra.taskStore.storeTaskResult(
-              taskId,
-              "completed",
-              callToolResult
-            );
-          } catch (outerError) {
-            try {
-              const message = outerError instanceof Error ? outerError.message : String(outerError);
-              await extra.taskStore.storeTaskResult(
-                taskId,
-                "failed",
-                {
-                  content: [{ type: "text", text: `Error: ${message}` }],
-                  isError: true
-                }
-              );
-            } catch (storeError) {
-              logger.error(
-                `Failed to store parallel task result for ${taskId}: ${storeError instanceof Error ? storeError.message : String(storeError)}`
-              );
-            }
-          }
-        };
-        void run();
-      }
-      registerTools(server, relayContext) {
-        server.experimental.tasks.registerToolTask(
+      registerTools(server, relayContext, sessionSignal) {
+        server.tool(
           "spawn_agent",
-          {
-            description: "Spawn a sub-agent on a backend CLI (Claude Code, Codex CLI, or Gemini CLI). The agent executes the given prompt in non-interactive mode and returns the result. Backend is auto-selected by priority: agentType mapping (coder/researcher\u2192codex, documenter\u2192claude) > taskType mapping > default (claude). metadata with metadata.taskId is required for task-first delegation. Use 'agentDefinition' to inject an agent .md file, 'skillContext' for a SKILL.md, or 'systemPrompt' for custom instructions.",
-            inputSchema: spawnAgentInputSchema.shape,
-            execution: { taskSupport: "optional" }
-          },
-          {
-            createTask: async (params, extra) => {
-              const task = await extra.taskStore.createTask({
-                ttl: DEFAULT_TASK_TTL,
-                pollInterval: DEFAULT_POLL_INTERVAL
-              });
-              this.runSpawnAgentInBackground(task.taskId, params, extra, relayContext);
-              return { task };
-            },
-            getTask: async (_params, extra) => {
-              return await extra.taskStore.getTask(extra.taskId);
-            },
-            getTaskResult: async (_params, extra) => {
-              return await extra.taskStore.getTaskResult(
-                extra.taskId
+          "Spawn a sub-agent on a backend CLI (Claude Code, Codex CLI, or Gemini CLI). The agent executes the given prompt in non-interactive mode and returns the result. Backend is auto-selected by priority: agentType mapping (coder/researcher\u2192codex, documenter\u2192claude) > taskType mapping > default (claude). metadata with metadata.taskId is required for task-first delegation. Use 'agentDefinition' to inject an agent .md file, 'skillContext' for a SKILL.md, or 'systemPrompt' for custom instructions.",
+          spawnAgentInputSchema.shape,
+          async (params, extra) => {
+            try {
+              const result = await executeSpawnAgent(
+                params,
+                this.registry,
+                this.sessionManager,
+                this.guard,
+                this.hooksEngine,
+                this.contextMonitor,
+                this.backendSelector,
+                this._childHttpUrl,
+                void 0,
+                this.agentEventStore,
+                this.hookMemoryDir,
+                void 0,
+                this.taskLifecycleManager,
+                relayContext,
+                combineAbortSignals(extra.signal, sessionSignal)
               );
+              const controlOptions = {
+                inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
+                sessionId: result.sessionId,
+                responseOutputDir: this.responseOutputDir
+              };
+              const { text, isError } = await formatSpawnAgentResponse(result, controlOptions);
+              return {
+                content: [{ type: "text", text }],
+                isError
+              };
+            } catch (error) {
+              const message = error instanceof Error ? error.message : String(error);
+              return {
+                content: [{ type: "text", text: `Error: ${message}` }],
+                isError: true
+              };
             }
           }
         );
-        server.experimental.tasks.registerToolTask(
+        server.tool(
           "spawn_agents_parallel",
-          {
-            description: "Spawn multiple sub-agents in parallel across available backends. Use this when you have 2+ independent tasks that can execute concurrently. Each agent entry accepts the same parameters as spawn_agent. Results are returned as an array with per-agent status (success/failure). RecursionGuard batch pre-validation ensures the batch fits within call limits. Failed results include 'originalInput' for retry via retry_failed_agents.",
-            inputSchema: spawnAgentsParallelInputShape,
-            execution: { taskSupport: "optional" }
-          },
-          {
-            createTask: async (params, extra) => {
-              const task = await extra.taskStore.createTask({
-                ttl: DEFAULT_TASK_TTL,
-                pollInterval: DEFAULT_POLL_INTERVAL
-              });
-              this.runSpawnAgentsParallelInBackground(task.taskId, params.agents, extra, relayContext);
-              return { task };
-            },
-            getTask: async (_params, extra) => {
-              return await extra.taskStore.getTask(extra.taskId);
-            },
-            getTaskResult: async (_params, extra) => {
-              return await extra.taskStore.getTaskResult(
-                extra.taskId
+          "Spawn multiple sub-agents in parallel across available backends. Use this when you have 2+ independent tasks that can execute concurrently. Each agent entry accepts the same parameters as spawn_agent. Results are returned as an array with per-agent status (success/failure). RecursionGuard batch pre-validation ensures the batch fits within call limits. Failed results include 'originalInput' for retry via retry_failed_agents.",
+          spawnAgentsParallelInputShape,
+          async (params, extra) => {
+            try {
+              const result = await executeSpawnAgentsParallel(
+                params.agents,
+                this.registry,
+                this.sessionManager,
+                this.guard,
+                this.hooksEngine,
+                this.contextMonitor,
+                this.backendSelector,
+                this._childHttpUrl,
+                void 0,
+                this.agentEventStore,
+                this.hookMemoryDir,
+                void 0,
+                this.taskLifecycleManager,
+                relayContext,
+                combineAbortSignals(extra.signal, sessionSignal)
               );
+              const controlOptions = {
+                inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
+                responseOutputDir: this.responseOutputDir
+              };
+              const { text, isError } = await formatParallelResponse(result, controlOptions);
+              return {
+                content: [{ type: "text", text }],
+                isError
+              };
+            } catch (error) {
+              const message = error instanceof Error ? error.message : String(error);
+              return {
+                content: [{ type: "text", text: `Error: ${message}` }],
+                isError: true
+              };
             }
           }
         );
@@ -8647,7 +8430,7 @@ var init_server = __esm({
               originalInput: spawnAgentInputSchema
             })).min(1).describe("Array of failed results with their original input configurations")
           },
-          async (params) => {
+          async (params, extra) => {
             try {
               const agents = params.failedResults.map((r) => ({ ...r.originalInput }));
               const result = await executeSpawnAgentsParallel(
@@ -8664,7 +8447,8 @@ var init_server = __esm({
                 this.hookMemoryDir,
                 void 0,
                 this.taskLifecycleManager,
-                relayContext
+                relayContext,
+                combineAbortSignals(extra.signal, sessionSignal)
               );
               const controlOptions = {
                 inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8936,6 +8720,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 +8737,26 @@ 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" },
-            createMcpServerOptions()
+            { name: "agentic-relay", version: "2.0.9" }
           );
-          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, in-flight requests aborted: ${sid2}`);
+              } else {
+                logger.debug(`Child MCP session closed: ${sid2}`);
+              }
             }
           };
           await server.connect(transport);
@@ -8972,12 +8764,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}`
                 );
@@ -9719,7 +9517,7 @@ __export(types_exports, {
   DEFAULT_TUI_CONFIG: () => DEFAULT_TUI_CONFIG
 });
 var DEFAULT_TUI_CONFIG;
-var init_types3 = __esm({
+var init_types2 = __esm({
   "src/tui/types.ts"() {
     "use strict";
     DEFAULT_TUI_CONFIG = {
@@ -9743,7 +9541,7 @@ var TUIConfigManager;
 var init_tui_config_manager = __esm({
   "src/tui/services/tui-config-manager.ts"() {
     "use strict";
-    init_types3();
+    init_types2();
     TUIConfigManager = class {
       constructor(configManager2) {
         this.configManager = configManager2;
@@ -10070,7 +9868,7 @@ function App({ registry: registry2, sessionManager: sessionManager2, hooksEngine
           setTuiConfig(updated);
           setStatusMessage(`Config updated: ${key} = ${JSON.stringify(value)}`);
         } else if (subCmd === "reset") {
-          const { DEFAULT_TUI_CONFIG: DEFAULT_TUI_CONFIG2 } = await Promise.resolve().then(() => (init_types3(), types_exports));
+          const { DEFAULT_TUI_CONFIG: DEFAULT_TUI_CONFIG2 } = await Promise.resolve().then(() => (init_types2(), types_exports));
           for (const [section, sectionValue] of Object.entries(DEFAULT_TUI_CONFIG2)) {
             for (const [k, v] of Object.entries(sectionValue)) {
               await tuiConfigManager.set(`${section}.${k}`, v);
@@ -10635,6 +10433,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 +10511,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 +10525,7 @@ var ClaudeAdapter = class extends BaseAdapter {
       };
     } finally {
       if (timer !== void 0) clearTimeout(timer);
+      flags.signal?.removeEventListener("abort", onExternalAbort);
     }
   }
   async *executeStreaming(flags) {
@@ -11307,7 +11115,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 +11130,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 +13386,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.9" });
         }
       })
     },
@@ -13729,7 +13546,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.7";
+      const relayVersion = "2.0.9";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -14126,7 +13943,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.7",
+    version: "2.0.9",
     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.9",
   "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",