@rk0429/agentic-relay 2.0.4 → 2.0.6

package/dist/relay.mjs

@@ -8273,7 +8273,8 @@ var init_response_formatter = __esm({
 // src/mcp-server/server.ts
 var server_exports = {};
 __export(server_exports, {
-  RelayMCPServer: () => RelayMCPServer
+  RelayMCPServer: () => RelayMCPServer,
+  extractRelayContextFromUrl: () => extractRelayContextFromUrl
 });
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
@@ -8291,8 +8292,12 @@ function extractRelayContextFromUrl(url) {
     const parentSessionId = parsed.searchParams.get("relay_parent_session_id");
     const traceId = parsed.searchParams.get("relay_trace_id");
     if (depth !== null && parentSessionId !== null) {
+      const parsedDepth = Number(depth);
+      if (!Number.isFinite(parsedDepth) || parsedDepth < 0) {
+        return void 0;
+      }
       return {
-        depth: Number(depth),
+        depth: parsedDepth,
         parentSessionId,
         traceId: traceId ?? `trace-${randomUUID()}`
       };
@@ -8437,7 +8442,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.4" },
+          { name: "agentic-relay", version: "2.0.6" },
           createMcpServerOptions()
         );
         this.registerTools(this.server);
@@ -8455,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;
@@ -8865,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;
         }
@@ -8927,7 +8956,7 @@ var init_server = __esm({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "2.0.4" },
+            { name: "agentic-relay", version: "2.0.6" },
             createMcpServerOptions()
           );
           this.registerTools(server, childRelayContext);
@@ -8973,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() {
@@ -11056,20 +11096,46 @@ var CodexAdapter = class extends BaseAdapter {
       ...!authenticated ? { message: "codex authentication not configured" } : {}
     };
   }
-  buildCodexOptions(flags) {
-    if (!flags.mcpContext) {
-      return {};
+  buildCodexMcpConfig(mcpServers) {
+    if (!mcpServers || Object.keys(mcpServers).length === 0) {
+      return void 0;
     }
-    const env = {};
-    for (const [key, value] of Object.entries(process.env)) {
-      if (value !== void 0) {
-        env[key] = value;
+    const configServers = {};
+    for (const [name, server] of Object.entries(mcpServers)) {
+      if ("url" in server) {
+        configServers[name] = {
+          url: server.url,
+          ...server.headers ? { headers: server.headers } : {}
+        };
+      } else {
+        configServers[name] = {
+          command: server.command,
+          ...server.args ? { args: server.args } : {},
+          ...server.env ? { env: server.env } : {}
+        };
+      }
+    }
+    return { mcp_servers: configServers };
+  }
+  buildCodexOptions(flags) {
+    const options = {};
+    if (flags.mcpContext) {
+      const env = {};
+      for (const [key, value] of Object.entries(process.env)) {
+        if (value !== void 0) {
+          env[key] = value;
+        }
       }
+      env.RELAY_TRACE_ID = flags.mcpContext.traceId;
+      env.RELAY_PARENT_SESSION_ID = flags.mcpContext.parentSessionId;
+      env.RELAY_DEPTH = String(flags.mcpContext.depth);
+      options.env = env;
+    }
+    const config = this.buildCodexMcpConfig(flags.mcpServers);
+    if (config) {
+      options.config = config;
     }
-    env.RELAY_TRACE_ID = flags.mcpContext.traceId;
-    env.RELAY_PARENT_SESSION_ID = flags.mcpContext.parentSessionId;
-    env.RELAY_DEPTH = String(flags.mcpContext.depth);
-    return { env };
+    return options;
   }
   mapFlags(flags) {
     const args = mapCommonToNative("codex", flags);
@@ -13367,7 +13433,7 @@ function createMCPCommand(configManager2, registry2, sessionManager2, hooksEngin
             responseOutputDir,
             relayConfig
           );
-          await server.start({ transport, port, currentVersion: "2.0.4" });
+          await server.start({ transport, port, currentVersion: "2.0.6" });
         }
       })
     },
@@ -13527,7 +13593,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.4";
+      const relayVersion = "2.0.6";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -13924,7 +13990,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.4",
+    version: "2.0.6",
     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.4",
+  "version": "2.0.6",
   "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",