@rk0429/agentic-relay 2.0.9 → 2.0.10

package/dist/relay.mjs

@@ -1267,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) {
@@ -8310,7 +8313,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.9" }
+          { name: "agentic-relay", version: "2.0.10" }
         );
         this.registerTools(this.server);
         this.sessionHealthMonitor.start();
@@ -8742,7 +8745,7 @@ var init_server = __esm({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "2.0.9" }
+            { name: "agentic-relay", version: "2.0.10" }
           );
           this.registerTools(server, childRelayContext, abortController.signal);
           transport.onclose = () => {
@@ -10080,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() {
@@ -10093,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);
@@ -10113,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);
@@ -10122,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);
     }
@@ -10135,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);
@@ -10145,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);
     }
@@ -10235,7 +10258,7 @@ var BaseAdapter = class _BaseAdapter {
     }
     return result.stdout.trim();
   }
-  async continueSession(_nativeSessionId, _prompt) {
+  async continueSession(_nativeSessionId, _prompt, _options) {
     return {
       exitCode: 1,
       stdout: "",
@@ -10624,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();
@@ -10675,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);
     }
   }
@@ -10777,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");
@@ -10964,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";
@@ -11097,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)");
@@ -11107,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 {
@@ -11248,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: "",
@@ -13386,7 +13528,7 @@ function createMCPCommand(configManager2, registry2, sessionManager2, hooksEngin
             responseOutputDir,
             relayConfig
           );
-          await server.start({ transport, port, currentVersion: "2.0.9" });
+          await server.start({ transport, port, currentVersion: "2.0.10" });
         }
       })
     },
@@ -13546,7 +13688,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.9";
+      const relayVersion = "2.0.10";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -13943,7 +14085,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.9",
+    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.9",
+  "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",