@rk0429/agentic-relay 2.0.5 → 2.0.7

package/dist/relay.mjs

@@ -332,7 +332,7 @@ import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } fr
 import { join as join6 } from "path";
 import { homedir as homedir5 } from "os";
 import { nanoid as nanoid2 } from "nanoid";
-function getRelayHome2() {
+function getRelayHome3() {
   return process.env["RELAY_HOME"] ?? join6(homedir5(), ".relay");
 }
 function isValidEventType(type) {
@@ -347,7 +347,7 @@ var init_agent_event_store = __esm({
       maxEvents: 1e3,
       ttlMs: 36e5,
       backend: "jsonl",
-      sessionDir: join6(getRelayHome2(), "sessions"),
+      sessionDir: join6(getRelayHome3(), "sessions"),
       eventsFileName: "events.jsonl"
     };
     AgentEventStore = class {
@@ -8442,7 +8442,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.5" },
+          { name: "agentic-relay", version: "2.0.7" },
           createMcpServerOptions()
         );
         this.registerTools(this.server);
@@ -8460,6 +8460,8 @@ var init_server = __esm({
       purgeTimer;
       _childHttpServer;
       _childHttpUrl;
+      _closePromise;
+      _isClosed = false;
       /** URL for child agents to connect via HTTP. Available after start() in stdio mode. */
       get childHttpUrl() {
         return this._childHttpUrl;
@@ -8870,7 +8872,29 @@ var init_server = __esm({
           redirectToStderr();
           logger.info("Starting agentic-relay MCP server (stdio transport)...");
           const transport = new StdioServerTransport();
-          await this.server.connect(transport);
+          const handleStdioDisconnect = () => {
+            void transport.close().catch((error) => {
+              const message = error instanceof Error ? error.message : String(error);
+              logger.debug(`Failed to close stdio transport: ${message}`);
+              void this.close();
+            });
+          };
+          const cleanupStdioListeners = () => {
+            process.stdin.off("end", handleStdioDisconnect);
+            process.stdin.off("close", handleStdioDisconnect);
+          };
+          transport.onclose = () => {
+            cleanupStdioListeners();
+            void this.close();
+          };
+          process.stdin.once("end", handleStdioDisconnect);
+          process.stdin.once("close", handleStdioDisconnect);
+          try {
+            await this.server.connect(transport);
+          } catch (error) {
+            cleanupStdioListeners();
+            throw error;
+          }
           await this.startChildHttpServer();
           return;
         }
@@ -8932,7 +8956,7 @@ var init_server = __esm({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "2.0.5" },
+            { name: "agentic-relay", version: "2.0.7" },
             createMcpServerOptions()
           );
           this.registerTools(server, childRelayContext);
@@ -8978,16 +9002,27 @@ var init_server = __esm({
         });
       }
       async close() {
-        this.sessionHealthMonitor.stop();
-        this.agentEventStore.cleanup();
-        clearInterval(this.purgeTimer);
-        if (this._childHttpServer) {
-          await new Promise((resolve3) => {
-            this._childHttpServer.close(() => resolve3());
-          });
-          this._childHttpServer = void 0;
-          this._childHttpUrl = void 0;
+        if (this._isClosed) {
+          return;
         }
+        if (this._closePromise) {
+          await this._closePromise;
+          return;
+        }
+        this._closePromise = (async () => {
+          this.sessionHealthMonitor.stop();
+          this.agentEventStore.cleanup();
+          clearInterval(this.purgeTimer);
+          if (this._childHttpServer) {
+            await new Promise((resolve3) => {
+              this._childHttpServer.close(() => resolve3());
+            });
+            this._childHttpServer = void 0;
+            this._childHttpUrl = void 0;
+          }
+          this._isClosed = true;
+        })();
+        await this._closePromise;
       }
       /** Exposed for testing and graceful shutdown */
       get httpServer() {
@@ -10934,7 +10969,7 @@ var ClaudeAdapter = class extends BaseAdapter {
 
 // src/adapters/codex-adapter.ts
 init_logger();
-import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
+import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2, mkdtemp, copyFile } from "fs/promises";
 import { homedir as homedir2 } from "os";
 import { join as join2, dirname as dirname2 } from "path";
 async function loadCodexSDK() {
@@ -11031,6 +11066,12 @@ function toTOMLString(value) {
 function toTOMLStringArray(values) {
   return `[${values.map(toTOMLString).join(", ")}]`;
 }
+function toTOMLInlineTable(values) {
+  return `{ ${Object.entries(values).map(([key, value]) => `${toTOMLString(key)} = ${toTOMLString(value)}`).join(", ")} }`;
+}
+function toTOMLTableKey(key) {
+  return /^[A-Za-z0-9_-]+$/.test(key) ? key : toTOMLString(key);
+}
 function generateMcpServersTOML(servers) {
   const parts = [];
   for (const server of servers) {
@@ -11044,11 +11085,88 @@ function generateMcpServersTOML(servers) {
   }
   return parts.join("\n");
 }
+function generateChildMcpServersTOML(servers) {
+  const parts = [];
+  for (const [name, server] of Object.entries(servers)) {
+    parts.push(`[mcp_servers.${toTOMLTableKey(name)}]`);
+    if ("url" in server) {
+      parts.push(`url = ${toTOMLString(server.url)}`);
+      if (server.headers && Object.keys(server.headers).length > 0) {
+        parts.push(`headers = ${toTOMLInlineTable(server.headers)}`);
+      }
+    } else {
+      parts.push(`command = ${toTOMLString(server.command)}`);
+      if (server.args && server.args.length > 0) {
+        parts.push(`args = ${toTOMLStringArray(server.args)}`);
+      }
+      if (server.env && Object.keys(server.env).length > 0) {
+        parts.push(`env = ${toTOMLInlineTable(server.env)}`);
+      }
+    }
+    parts.push("");
+  }
+  return parts.join("\n");
+}
+function rewriteCodexConfigWithMcpServers(existingContent, mcpServers) {
+  const parsed = parseTOMLMcpServers(existingContent);
+  const preamble = parsed.preambleLines.join("\n").replace(/\n+$/, "");
+  const mcpSection = generateChildMcpServersTOML(mcpServers);
+  const postamble = parsed.postambleLines.join("\n").replace(/^\n+/, "");
+  const parts = [];
+  if (preamble) parts.push(preamble);
+  if (mcpSection) parts.push(mcpSection);
+  if (postamble) parts.push(postamble);
+  let output = parts.join("\n\n");
+  if (!output.endsWith("\n")) output += "\n";
+  return output;
+}
+function getRelayHome() {
+  return process.env["RELAY_HOME"] ?? join2(homedir2(), ".relay");
+}
+function encodeNativeSessionId(threadId, codexHome) {
+  if (!codexHome) {
+    return threadId;
+  }
+  return `${threadId}@@${Buffer.from(codexHome, "utf8").toString("base64url")}`;
+}
+function decodeNativeSessionId(nativeSessionId) {
+  const separatorIndex = nativeSessionId.lastIndexOf("@@");
+  if (separatorIndex === -1) {
+    return { threadId: nativeSessionId };
+  }
+  const threadId = nativeSessionId.slice(0, separatorIndex);
+  const encodedHome = nativeSessionId.slice(separatorIndex + 2);
+  try {
+    const codexHome = Buffer.from(encodedHome, "base64url").toString("utf8");
+    return { threadId, codexHome };
+  } catch {
+    return { threadId: nativeSessionId };
+  }
+}
+function isFileNotFoundError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";
+}
+async function copyIfExists(from, to) {
+  try {
+    await copyFile(from, to);
+  } catch (error) {
+    if (isFileNotFoundError(error)) {
+      return;
+    }
+    throw error;
+  }
+}
 var CodexAdapter = class extends BaseAdapter {
   id = "codex";
   command = "codex";
+  getCodexHomePath() {
+    return join2(homedir2(), ".codex");
+  }
+  getIsolatedCodexHomesPath() {
+    return join2(getRelayHome(), "codex-homes");
+  }
   getConfigPath() {
-    return join2(homedir2(), ".codex", "config.toml");
+    return join2(this.getCodexHomePath(), "config.toml");
   }
   async checkAuthStatus() {
     const result = await this.processManager.execute(this.command, [
@@ -11061,20 +11179,74 @@ var CodexAdapter = class extends BaseAdapter {
       ...!authenticated ? { message: "codex authentication not configured" } : {}
     };
   }
-  buildCodexOptions(flags) {
-    if (!flags.mcpContext) {
-      return {};
+  async prepareIsolatedCodexHome(mcpServers) {
+    const codexHomesDir = this.getIsolatedCodexHomesPath();
+    await mkdir2(codexHomesDir, { recursive: true });
+    const isolatedCodexHome = await mkdtemp(join2(codexHomesDir, "codex-"));
+    const realCodexHome = this.getCodexHomePath();
+    await copyIfExists(
+      join2(realCodexHome, "auth.json"),
+      join2(isolatedCodexHome, "auth.json")
+    );
+    await copyIfExists(
+      join2(realCodexHome, "version.json"),
+      join2(isolatedCodexHome, "version.json")
+    );
+    await copyIfExists(
+      join2(realCodexHome, "internal_storage.json"),
+      join2(isolatedCodexHome, "internal_storage.json")
+    );
+    await copyIfExists(
+      join2(realCodexHome, ".codex-global-state.json"),
+      join2(isolatedCodexHome, ".codex-global-state.json")
+    );
+    let existingConfig = "";
+    try {
+      existingConfig = await readFile2(this.getConfigPath(), "utf-8");
+    } catch (error) {
+      if (!isFileNotFoundError(error)) {
+        throw error;
+      }
     }
-    const env = {};
-    for (const [key, value] of Object.entries(process.env)) {
-      if (value !== void 0) {
-        env[key] = value;
+    const isolatedConfig = rewriteCodexConfigWithMcpServers(
+      existingConfig,
+      mcpServers
+    );
+    await writeFile2(join2(isolatedCodexHome, "config.toml"), isolatedConfig, {
+      mode: 384
+    });
+    return isolatedCodexHome;
+  }
+  async buildCodexOptions(flags) {
+    const options = {};
+    let env;
+    let isolatedCodexHome;
+    const ensureEnv = () => {
+      if (!env) {
+        env = {};
+        for (const [key, value] of Object.entries(process.env)) {
+          if (value !== void 0) {
+            env[key] = value;
+          }
+        }
       }
+      return env;
+    };
+    if (flags.mcpContext) {
+      const resolvedEnv = ensureEnv();
+      resolvedEnv.RELAY_TRACE_ID = flags.mcpContext.traceId;
+      resolvedEnv.RELAY_PARENT_SESSION_ID = flags.mcpContext.parentSessionId;
+      resolvedEnv.RELAY_DEPTH = String(flags.mcpContext.depth);
+    }
+    if (flags.mcpServers && Object.keys(flags.mcpServers).length > 0) {
+      const resolvedEnv = ensureEnv();
+      isolatedCodexHome = await this.prepareIsolatedCodexHome(flags.mcpServers);
+      resolvedEnv.CODEX_HOME = isolatedCodexHome;
     }
-    env.RELAY_TRACE_ID = flags.mcpContext.traceId;
-    env.RELAY_PARENT_SESSION_ID = flags.mcpContext.parentSessionId;
-    env.RELAY_DEPTH = String(flags.mcpContext.depth);
-    return { env };
+    if (env) {
+      options.env = env;
+    }
+    return { options, isolatedCodexHome };
   }
   mapFlags(flags) {
     const args = mapCommonToNative("codex", flags);
@@ -11128,7 +11300,8 @@ ${prompt}`;
     );
     try {
       const { Codex } = await loadCodexSDK();
-      const codex = new Codex(this.buildCodexOptions(flags));
+      const { options, isolatedCodexHome } = await this.buildCodexOptions(flags);
+      const codex = new Codex(options);
       const thread = codex.startThread({
         ...flags.model ? { model: flags.model } : {},
         workingDirectory: process.cwd(),
@@ -11139,7 +11312,12 @@ ${prompt}`;
         exitCode: 0,
         stdout: result.finalResponse,
         stderr: "",
-        ...thread.id ? { nativeSessionId: thread.id } : {}
+        ...thread.id ? {
+          nativeSessionId: encodeNativeSessionId(
+            thread.id,
+            isolatedCodexHome
+          )
+        } : {}
       };
     } catch (error) {
       return {
@@ -11160,7 +11338,8 @@ ${prompt}`;
     );
     try {
       const { Codex } = await loadCodexSDK();
-      const codex = new Codex(this.buildCodexOptions(flags));
+      const { options, isolatedCodexHome } = await this.buildCodexOptions(flags);
+      const codex = new Codex(options);
       const thread = codex.startThread({
         ...flags.model ? { model: flags.model } : {},
         workingDirectory: process.cwd(),
@@ -11221,14 +11400,20 @@ ${prompt}`;
           yield {
             type: "done",
             result: { exitCode: 0, stdout: finalResponse, stderr: "" },
-            nativeSessionId: threadId ?? thread.id ?? void 0
+            nativeSessionId: threadId || thread.id ? encodeNativeSessionId(
+              threadId ?? thread.id ?? "",
+              isolatedCodexHome
+            ) : void 0
           };
         } else if (event.type === "turn.failed") {
           const errorMessage = event.error.message ?? "Turn failed";
           yield {
             type: "done",
             result: { exitCode: 1, stdout: "", stderr: errorMessage },
-            nativeSessionId: threadId ?? thread.id ?? void 0
+            nativeSessionId: threadId || thread.id ? encodeNativeSessionId(
+              threadId ?? thread.id ?? "",
+              isolatedCodexHome
+            ) : void 0
           };
         } else if (event.type === "error") {
           yield {
@@ -11249,8 +11434,20 @@ ${prompt}`;
   async continueSession(nativeSessionId, prompt) {
     try {
       const { Codex } = await loadCodexSDK();
-      const codex = new Codex();
-      const thread = codex.resumeThread(nativeSessionId, {
+      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"
       });
@@ -11589,7 +11786,7 @@ import { readFile as readFile4, writeFile as writeFile4, readdir, mkdir as mkdir
 import { join as join4 } from "path";
 import { homedir as homedir4 } from "os";
 import { nanoid } from "nanoid";
-function getRelayHome() {
+function getRelayHome2() {
   return process.env["RELAY_HOME"] ?? join4(homedir4(), ".relay");
 }
 function getSessionsDir(relayHome2) {
@@ -11629,7 +11826,7 @@ var SessionManager = class _SessionManager {
   ]);
   sessionsDir;
   constructor(sessionsDir) {
-    this.sessionsDir = sessionsDir ?? getSessionsDir(getRelayHome());
+    this.sessionsDir = sessionsDir ?? getSessionsDir(getRelayHome2());
   }
   getSessionsDir() {
     return this.sessionsDir;
@@ -13372,7 +13569,7 @@ function createMCPCommand(configManager2, registry2, sessionManager2, hooksEngin
             responseOutputDir,
             relayConfig
           );
-          await server.start({ transport, port, currentVersion: "2.0.5" });
+          await server.start({ transport, port, currentVersion: "2.0.7" });
         }
       })
     },
@@ -13532,7 +13729,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.5";
+      const relayVersion = "2.0.7";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -13929,7 +14126,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.5",
+    version: "2.0.7",
     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.5",
+  "version": "2.0.7",
   "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",