@rk0429/agentic-relay 2.0.8 → 2.0.10

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";
@@ -1390,7 +1267,10 @@ ${input.prompt}`;
         } else {
           effectiveNativeSessionId = input.resumeSessionId;
         }
-        return adapter.continueSession(effectiveNativeSessionId, effectivePrompt);
+        return adapter.continueSession(effectiveNativeSessionId, effectivePrompt, {
+          ...input.model ? { model: input.model } : {},
+          ...signal ? { signal } : {}
+        });
       } else {
         let mcpServers;
         if (childHttpUrl) {
@@ -8109,24 +7989,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";
@@ -8290,7 +8152,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";
@@ -8317,20 +8178,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();
@@ -8346,7 +8207,6 @@ var init_server = __esm({
     init_metadata_validation();
     init_logger();
     init_version_check();
-    init_types2();
     init_response_formatter();
     init_tasks();
     spawnAgentsParallelInputShape = {
@@ -8453,8 +8313,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.8" },
-          createMcpServerOptions()
+          { name: "agentic-relay", version: "2.0.10" }
         );
         this.registerTools(this.server);
         this.sessionHealthMonitor.start();
@@ -8481,173 +8340,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, signal) {
-        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,
-              signal
-            );
-            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, signal) {
-        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,
-              signal
-            );
-            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, signal) {
-        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, signal);
-              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, signal);
-              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
+              };
             }
           }
         );
@@ -8660,7 +8433,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(
@@ -8678,7 +8451,7 @@ var init_server = __esm({
                 void 0,
                 this.taskLifecycleManager,
                 relayContext,
-                signal
+                combineAbortSignals(extra.signal, sessionSignal)
               );
               const controlOptions = {
                 inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8972,8 +8745,7 @@ var init_server = __esm({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "2.0.8" },
-            createMcpServerOptions()
+            { name: "agentic-relay", version: "2.0.10" }
           );
           this.registerTools(server, childRelayContext, abortController.signal);
           transport.onclose = () => {
@@ -8984,7 +8756,7 @@ var init_server = __esm({
               if (ctrl) {
                 ctrl.abort();
                 sessionAbortControllers.delete(sid2);
-                logger.debug(`Child MCP session closed, background tasks aborted: ${sid2}`);
+                logger.debug(`Child MCP session closed, in-flight requests aborted: ${sid2}`);
               } else {
                 logger.debug(`Child MCP session closed: ${sid2}`);
               }
@@ -9748,7 +9520,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 = {
@@ -9772,7 +9544,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;
@@ -10099,7 +9871,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);
@@ -10311,6 +10083,18 @@ import { homedir as homedir7 } from "os";
 // src/infrastructure/process-manager.ts
 init_logger();
 import { execa } from "execa";
+function toProcessResultFromError(error) {
+  const exitCode = typeof error === "object" && error !== null && "exitCode" in error && typeof error.exitCode === "number" ? error.exitCode : 1;
+  const stdout = typeof error === "object" && error !== null && "stdout" in error && typeof error.stdout === "string" ? error.stdout : "";
+  const stderr = typeof error === "object" && error !== null && "stderr" in error && typeof error.stderr === "string" && error.stderr.length > 0 ? error.stderr : error instanceof Error ? error.message : String(error);
+  return { exitCode, stdout, stderr };
+}
+function getCanceledMessage(signal) {
+  if (!signal?.aborted) {
+    return "";
+  }
+  return signal.reason instanceof Error ? signal.reason.message : typeof signal.reason === "string" ? signal.reason : "";
+}
 var ProcessManager = class {
   activeProcesses = /* @__PURE__ */ new Set();
   constructor() {
@@ -10324,6 +10108,7 @@ var ProcessManager = class {
       env: options?.env,
       extendEnv: options?.env ? false : true,
       timeout: options?.timeout,
+      cancelSignal: options?.signal,
       reject: false
     };
     const proc = execa(command, args, execaOptions);
@@ -10344,6 +10129,7 @@ var ProcessManager = class {
       env: options?.env,
       extendEnv: options?.env ? false : true,
       timeout: options?.timeout,
+      cancelSignal: options?.signal,
       reject: false
     };
     const proc = execa(command, args, execaOptions);
@@ -10353,8 +10139,10 @@ var ProcessManager = class {
       return {
         exitCode: result.exitCode ?? 1,
         stdout: result.stdout?.toString() ?? "",
-        stderr: result.stderr?.toString() ?? ""
+        stderr: result.stderr?.toString() || getCanceledMessage(options?.signal)
       };
+    } catch (error) {
+      return toProcessResultFromError(error);
     } finally {
       this.activeProcesses.delete(proc);
     }
@@ -10366,7 +10154,9 @@ var ProcessManager = class {
       input: stdinData,
       cwd: options?.cwd,
       env: options?.env,
+      extendEnv: options?.env ? false : true,
       timeout: options?.timeout,
+      cancelSignal: options?.signal,
       reject: false
     };
     const proc = execa(command, args, execaOptions);
@@ -10376,8 +10166,10 @@ var ProcessManager = class {
       return {
         exitCode: result.exitCode ?? 1,
         stdout: result.stdout?.toString() ?? "",
-        stderr: result.stderr?.toString() ?? ""
+        stderr: result.stderr?.toString() || getCanceledMessage(options?.signal)
       };
+    } catch (error) {
+      return toProcessResultFromError(error);
     } finally {
       this.activeProcesses.delete(proc);
     }
@@ -10466,7 +10258,7 @@ var BaseAdapter = class _BaseAdapter {
     }
     return result.stdout.trim();
   }
-  async continueSession(_nativeSessionId, _prompt) {
+  async continueSession(_nativeSessionId, _prompt, _options) {
     return {
       exitCode: 1,
       stdout: "",
@@ -10855,9 +10647,11 @@ var ClaudeAdapter = class extends BaseAdapter {
       if (timer !== void 0) clearTimeout(timer);
     }
   }
-  async continueSession(nativeSessionId, prompt) {
+  async continueSession(nativeSessionId, prompt, options) {
     const timeoutMs = resolveClaudeSdkTimeoutMs();
     const abortController = new AbortController();
+    const onAbort = () => abortController.abort();
+    options?.signal?.addEventListener("abort", onAbort, { once: true });
     const timer = timeoutMs !== void 0 ? setTimeout(() => abortController.abort(), timeoutMs) : void 0;
     try {
       const { query } = await loadClaudeSDK();
@@ -10906,6 +10700,7 @@ var ClaudeAdapter = class extends BaseAdapter {
         stderr: error instanceof Error ? error.message : String(error)
       };
     } finally {
+      options?.signal?.removeEventListener("abort", onAbort);
       if (timer !== void 0) clearTimeout(timer);
     }
   }
@@ -11008,8 +10803,8 @@ var ClaudeAdapter = class extends BaseAdapter {
 
 // src/adapters/codex-adapter.ts
 init_logger();
-import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, mkdtemp, copyFile } from "fs/promises";
-import { homedir as homedir2 } from "os";
+import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, mkdtemp, copyFile, rm } from "fs/promises";
+import { homedir as homedir2, tmpdir } from "os";
 import { join as join2, dirname as dirname2 } from "path";
 async function loadCodexSDK() {
   return await import("@openai/codex-sdk");
@@ -11195,6 +10990,70 @@ async function copyIfExists(from, to) {
     throw error;
   }
 }
+async function readFileIfExists(path3) {
+  try {
+    return await readFile2(path3, "utf-8");
+  } catch (error) {
+    if (isFileNotFoundError(error)) {
+      return void 0;
+    }
+    throw error;
+  }
+}
+function parseCodexExecJson(stdout) {
+  const parsed = {
+    completedMessages: [],
+    errorMessages: []
+  };
+  for (const rawLine of stdout.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line) continue;
+    let event;
+    try {
+      event = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (typeof event !== "object" || event === null || !("type" in event) || typeof event.type !== "string") {
+      continue;
+    }
+    switch (event.type) {
+      case "thread.started":
+        if ("thread_id" in event && typeof event.thread_id === "string") {
+          parsed.threadId = event.thread_id;
+        }
+        break;
+      case "item.completed":
+        if ("item" in event && typeof event.item === "object" && event.item !== null && "type" in event.item && event.item.type === "agent_message" && "text" in event.item && typeof event.item.text === "string") {
+          parsed.completedMessages.push(event.item.text);
+        }
+        break;
+      case "turn.completed":
+        if ("usage" in event && typeof event.usage === "object" && event.usage !== null) {
+          const cachedInputTokens = "cached_input_tokens" in event.usage && typeof event.usage.cached_input_tokens === "number" ? event.usage.cached_input_tokens : 0;
+          parsed.tokenUsage = {
+            inputTokens: ("input_tokens" in event.usage && typeof event.usage.input_tokens === "number" ? event.usage.input_tokens : 0) + cachedInputTokens,
+            outputTokens: "output_tokens" in event.usage && typeof event.usage.output_tokens === "number" ? event.usage.output_tokens : 0,
+            ...cachedInputTokens > 0 ? { cachedInputTokens } : {}
+          };
+        }
+        break;
+      case "turn.failed":
+        if ("error" in event && typeof event.error === "object" && event.error !== null && "message" in event.error && typeof event.error.message === "string") {
+          parsed.failureMessage = event.error.message;
+        }
+        break;
+      case "error":
+        if ("message" in event && typeof event.message === "string") {
+          parsed.errorMessages.push(event.message);
+        }
+        break;
+      default:
+        break;
+    }
+  }
+  return parsed;
+}
 var CodexAdapter = class extends BaseAdapter {
   id = "codex";
   command = "codex";
@@ -11328,6 +11187,62 @@ ${systemPrompt}
 [User Request]
 ${prompt}`;
   }
+  shouldHardenRelayChild(flags) {
+    return Boolean(
+      flags.mcpContext || flags.mcpServers && Object.keys(flags.mcpServers).length > 0
+    );
+  }
+  buildCodexExecBaseArgs(model, hardenRelayChild) {
+    const args = [
+      "-a",
+      "never",
+      "-C",
+      process.cwd()
+    ];
+    if (model) {
+      args.unshift(model);
+      args.unshift("--model");
+    }
+    if (hardenRelayChild) {
+      args.push("-c", "project_root_markers=[]");
+    }
+    return args;
+  }
+  async runCodexExecCommand(args, prompt, env, signal, isolatedCodexHome, fallbackNativeSessionId) {
+    const execTempDir = await mkdtemp(join2(tmpdir(), "relay-codex-exec-"));
+    const outputPath = join2(execTempDir, "last-message.txt");
+    try {
+      const result = await this.processManager.executeWithInput(
+        this.command,
+        [...args, "--json", "-o", outputPath, "-"],
+        prompt,
+        { env, signal }
+      );
+      const parsed = parseCodexExecJson(result.stdout);
+      const outputFileContent = await readFileIfExists(outputPath);
+      const finalResponse = outputFileContent ?? parsed.completedMessages.join("\n");
+      const nativeSessionId = parsed.threadId ? encodeNativeSessionId(parsed.threadId, isolatedCodexHome) : fallbackNativeSessionId;
+      if (result.exitCode === 0) {
+        return {
+          exitCode: 0,
+          stdout: finalResponse,
+          stderr: "",
+          ...nativeSessionId ? { nativeSessionId } : {},
+          ...parsed.tokenUsage ? { tokenUsage: parsed.tokenUsage } : {}
+        };
+      }
+      const stderr = signal?.aborted ? "Codex execution cancelled: parent session disconnected" : parsed.failureMessage ?? parsed.errorMessages.at(-1) ?? (result.stderr || "Codex execution failed");
+      return {
+        exitCode: result.exitCode || 1,
+        stdout: finalResponse,
+        stderr,
+        ...nativeSessionId ? { nativeSessionId } : {},
+        ...parsed.tokenUsage ? { tokenUsage: parsed.tokenUsage } : {}
+      };
+    } finally {
+      await rm(execTempDir, { recursive: true, force: true }).catch(() => void 0);
+    }
+  }
   async execute(flags) {
     if (!flags.prompt) {
       throw new Error("execute requires a prompt (-p flag)");
@@ -11338,28 +11253,22 @@ ${prompt}`;
       systemPrompt
     );
     try {
-      const { Codex } = await loadCodexSDK();
       const { options, isolatedCodexHome } = await this.buildCodexOptions(flags);
-      const codex = new Codex(options);
-      const thread = codex.startThread({
-        ...flags.model ? { model: flags.model } : {},
-        workingDirectory: process.cwd(),
-        approvalPolicy: "never"
-      });
-      const result = await thread.run(effectivePrompt, {
-        ...flags.signal ? { signal: flags.signal } : {}
-      });
-      return {
-        exitCode: 0,
-        stdout: result.finalResponse,
-        stderr: "",
-        ...thread.id ? {
-          nativeSessionId: encodeNativeSessionId(
-            thread.id,
-            isolatedCodexHome
-          )
-        } : {}
-      };
+      const args = this.buildCodexExecBaseArgs(
+        flags.model,
+        this.shouldHardenRelayChild(flags)
+      );
+      args.push("exec");
+      if (this.shouldHardenRelayChild(flags)) {
+        args.push("--disable", "multi_agent");
+      }
+      return await this.runCodexExecCommand(
+        args,
+        effectivePrompt,
+        options.env,
+        flags.signal,
+        isolatedCodexHome
+      );
     } catch (error) {
       if (flags.signal?.aborted) {
         return {
@@ -11479,34 +11388,36 @@ ${prompt}`;
       };
     }
   }
-  async continueSession(nativeSessionId, prompt) {
+  async continueSession(nativeSessionId, prompt, options) {
     try {
-      const { Codex } = await loadCodexSDK();
       const { threadId, codexHome } = decodeNativeSessionId(nativeSessionId);
-      const codex = new Codex(
-        codexHome ? {
-          env: {
-            ...Object.fromEntries(
-              Object.entries(process.env).filter(
-                ([, value]) => value !== void 0
-              )
-            ),
-            CODEX_HOME: codexHome
-          }
-        } : {}
-      );
-      const thread = codex.resumeThread(threadId, {
-        workingDirectory: process.cwd(),
-        approvalPolicy: "never"
-      });
-      const result = await thread.run(prompt);
-      return {
-        exitCode: 0,
-        stdout: result.finalResponse,
-        stderr: "",
+      const env = codexHome ? {
+        ...Object.fromEntries(
+          Object.entries(process.env).filter(
+            ([, value]) => value !== void 0
+          )
+        ),
+        CODEX_HOME: codexHome
+      } : void 0;
+      const args = this.buildCodexExecBaseArgs(options?.model, true);
+      args.push("exec", "resume", "--disable", "multi_agent", threadId);
+      return await this.runCodexExecCommand(
+        args,
+        prompt,
+        env,
+        options?.signal,
+        codexHome,
         nativeSessionId
-      };
+      );
     } catch (error) {
+      if (options?.signal?.aborted) {
+        return {
+          exitCode: 1,
+          stdout: "",
+          stderr: "Codex execution cancelled: parent session disconnected",
+          nativeSessionId
+        };
+      }
       return {
         exitCode: 1,
         stdout: "",
@@ -13617,7 +13528,7 @@ function createMCPCommand(configManager2, registry2, sessionManager2, hooksEngin
             responseOutputDir,
             relayConfig
           );
-          await server.start({ transport, port, currentVersion: "2.0.8" });
+          await server.start({ transport, port, currentVersion: "2.0.10" });
         }
       })
     },
@@ -13777,7 +13688,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.8";
+      const relayVersion = "2.0.10";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -14174,7 +14085,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.8",
+    version: "2.0.10",
     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.8",
+  "version": "2.0.10",
   "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",