@rk0429/agentic-relay 0.6.2 → 0.6.4

package/dist/relay.mjs

@@ -245,13 +245,61 @@ function readSkillContext(skillContext) {
     return null;
   }
 }
+function readProjectMcpJson(cwd) {
+  try {
+    const dir = cwd ?? process.cwd();
+    const mcpJsonPath = join6(dir, ".mcp.json");
+    if (!existsSync(mcpJsonPath)) {
+      return {};
+    }
+    const raw = readFileSync(mcpJsonPath, "utf-8");
+    const parsed = JSON.parse(raw);
+    const servers = parsed.mcpServers;
+    if (!servers || typeof servers !== "object") {
+      return {};
+    }
+    return servers;
+  } catch {
+    return {};
+  }
+}
+function isRelayEntry(name, config) {
+  if (name === "agentic-relay") return true;
+  const argsStr = (config.args ?? []).join(" ");
+  if (config.command === "npx" && argsStr.includes("@rk0429/agentic-relay")) return true;
+  if (argsStr.includes("relay.mjs") && argsStr.includes("mcp")) return true;
+  if (config.command?.includes("relay.mjs") || config.command?.includes("agentic-relay")) return true;
+  return false;
+}
+function buildChildMcpServers(parentMcpServers, childHttpUrl) {
+  const result = {};
+  for (const [name, config] of Object.entries(parentMcpServers)) {
+    if (isRelayEntry(name, config)) {
+      result[name] = { type: "http", url: childHttpUrl };
+    } else if (config.type === "http" || config.type === "sse") {
+      result[name] = {
+        type: config.type,
+        url: config.url ?? "",
+        ...config.headers ? { headers: config.headers } : {}
+      };
+    } else {
+      result[name] = {
+        type: "stdio",
+        command: config.command ?? "",
+        ...config.args ? { args: config.args } : {},
+        ...config.env ? { env: config.env } : {}
+      };
+    }
+  }
+  return result;
+}
 function buildContextFromEnv() {
   const traceId = process.env["RELAY_TRACE_ID"] ?? `trace-${nanoid2()}`;
   const parentSessionId = process.env["RELAY_PARENT_SESSION_ID"] ?? null;
   const depth = Number(process.env["RELAY_DEPTH"] ?? "0");
   return { traceId, parentSessionId, depth };
 }
-async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector) {
+async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl) {
   let effectiveBackend = input.backend;
   if (backendSelector) {
     const availableBackends = registry2.listIds();
@@ -383,6 +431,13 @@ ${wrapped}` : wrapped;
       }
       result = await adapter.continueSession(input.resumeSessionId, input.prompt);
     } else {
+      let mcpServers;
+      if (childHttpUrl) {
+        const parentMcpServers = readProjectMcpJson();
+        if (Object.keys(parentMcpServers).length > 0) {
+          mcpServers = buildChildMcpServers(parentMcpServers, childHttpUrl);
+        }
+      }
       result = await adapter.execute({
         prompt: input.prompt,
         agent: input.agent,
@@ -394,7 +449,8 @@ ${wrapped}` : wrapped;
           depth: envContext.depth + 1,
           maxDepth: guard.getConfig().maxDepth,
           traceId: envContext.traceId
-        }
+        },
+        ...mcpServers ? { mcpServers } : {}
       });
     }
     if (contextMonitor2) {
@@ -661,15 +717,25 @@ var init_server = __esm({
         this.backendSelector = new BackendSelector();
         this.server = new McpServer({
           name: "agentic-relay",
-          version: "0.4.0"
+          version: "0.6.4"
         });
-        this.registerTools();
+        this.registerTools(this.server);
       }
       server;
       guard;
       backendSelector;
-      registerTools() {
-        this.server.tool(
+      _childHttpServer;
+      _childHttpUrl;
+      /** URL for child agents to connect via HTTP. Available after start() in stdio mode. */
+      get childHttpUrl() {
+        return this._childHttpUrl;
+      }
+      /** Exposed for testing: the HTTP server serving child agents */
+      get childHttpServer() {
+        return this._childHttpServer;
+      }
+      registerTools(server) {
+        server.tool(
           "spawn_agent",
           "Spawn a sub-agent on the specified backend CLI (Claude Code, Codex CLI, or Gemini CLI). The agent executes the given prompt in non-interactive mode and returns the result. Use 'agent' for named agent configurations (Claude only), 'systemPrompt' for custom role instructions (all backends), 'skillContext' to inject a skill definition (SKILL.md/SUBSKILL.md), 'agentDefinition' to inject an agent definition file into the sub-agent's system prompt, 'preferredBackend' to override automatic backend selection, or 'taskType' to hint at the task nature for backend selection.",
           {
@@ -701,7 +767,8 @@ var init_server = __esm({
                 this.guard,
                 this.hooksEngine,
                 this.contextMonitor,
-                this.backendSelector
+                this.backendSelector,
+                this._childHttpUrl
               );
               const isError = result.exitCode !== 0;
               const text = isError ? `Error (exit ${result.exitCode}): ${result.stderr || result.stdout}` : `Session: ${result.sessionId}
@@ -720,7 +787,7 @@ ${result.stdout}`;
             }
           }
         );
-        this.server.tool(
+        server.tool(
           "list_sessions",
           "List relay sessions, optionally filtered by backend.",
           {
@@ -750,7 +817,7 @@ ${result.stdout}`;
             }
           }
         );
-        this.server.tool(
+        server.tool(
           "get_context_status",
           "Get the context usage status of a relay session. Returns usage data from ContextMonitor when available, otherwise estimated values.",
           {
@@ -780,7 +847,7 @@ ${result.stdout}`;
             }
           }
         );
-        this.server.tool(
+        server.tool(
           "list_available_backends",
           "List all registered backends with their health status. Use this before spawn_agent to check which backends are available.",
           {},
@@ -811,6 +878,7 @@ ${result.stdout}`;
           logger.info("Starting agentic-relay MCP server (stdio transport)...");
           const transport = new StdioServerTransport();
           await this.server.connect(transport);
+          await this.startChildHttpServer();
           return;
         }
         const port = options?.port ?? 3100;
@@ -841,6 +909,62 @@ ${result.stdout}`;
           httpServer.on("close", resolve);
         });
       }
+      /**
+       * Start an HTTP server for child agents.
+       * Each client connection gets its own McpServer + StreamableHTTPServerTransport pair
+       * because StreamableHTTPServerTransport only supports a single session per instance.
+       * Routes requests to the correct session based on the Mcp-Session-Id header.
+       */
+      async startChildHttpServer() {
+        const sessions = /* @__PURE__ */ new Map();
+        const httpServer = createServer(async (req, res) => {
+          const url = req.url ?? "";
+          if (url !== "/mcp" && !url.startsWith("/mcp?")) {
+            res.writeHead(404, { "Content-Type": "text/plain" });
+            res.end("Not found");
+            return;
+          }
+          const sessionId = req.headers["mcp-session-id"];
+          if (sessionId) {
+            const session = sessions.get(sessionId);
+            if (session) {
+              await session.transport.handleRequest(req, res);
+              return;
+            }
+          }
+          const transport = new StreamableHTTPServerTransport({
+            sessionIdGenerator: () => randomUUID()
+          });
+          const server = new McpServer({
+            name: "agentic-relay",
+            version: "0.6.4"
+          });
+          this.registerTools(server);
+          transport.onclose = () => {
+            const sid2 = transport.sessionId;
+            if (sid2) {
+              sessions.delete(sid2);
+              logger.debug(`Child MCP session closed: ${sid2}`);
+            }
+          };
+          await server.connect(transport);
+          await transport.handleRequest(req, res);
+          const sid = transport.sessionId;
+          if (sid) {
+            sessions.set(sid, { transport, server });
+            logger.debug(`Child MCP session created: ${sid}`);
+          }
+        });
+        this._childHttpServer = httpServer;
+        await new Promise((resolve) => {
+          httpServer.listen(0, "127.0.0.1", () => {
+            const addr = httpServer.address();
+            this._childHttpUrl = `http://127.0.0.1:${addr.port}/mcp`;
+            logger.info(`Child MCP server listening on ${this._childHttpUrl}`);
+            resolve();
+          });
+        });
+      }
       /** Exposed for testing and graceful shutdown */
       get httpServer() {
         return this._httpServer;
@@ -1231,10 +1355,11 @@ var ClaudeAdapter = class extends BaseAdapter {
         abortController,
         env,
         cwd: process.cwd(),
-        settingSources: [],
+        strictMcpConfig: true,
         ...flags.model ? { model: flags.model } : {},
         ...flags.maxTurns ? { maxTurns: flags.maxTurns } : {},
-        ...flags.systemPrompt ? { systemPrompt: flags.systemPrompt } : {}
+        ...flags.systemPrompt ? { systemPrompt: flags.systemPrompt } : {},
+        ...flags.mcpServers ? { mcpServers: flags.mcpServers } : {}
       };
       if (permissionMode === "bypassPermissions") {
         options.permissionMode = "bypassPermissions";
@@ -1298,10 +1423,11 @@ var ClaudeAdapter = class extends BaseAdapter {
         abortController,
         env,
         cwd: process.cwd(),
-        settingSources: [],
+        strictMcpConfig: true,
         ...flags.model ? { model: flags.model } : {},
         ...flags.maxTurns ? { maxTurns: flags.maxTurns } : {},
-        ...flags.systemPrompt ? { systemPrompt: flags.systemPrompt } : {}
+        ...flags.systemPrompt ? { systemPrompt: flags.systemPrompt } : {},
+        ...flags.mcpServers ? { mcpServers: flags.mcpServers } : {}
       };
       if (permissionMode === "bypassPermissions") {
         options.permissionMode = "bypassPermissions";
@@ -1380,7 +1506,7 @@ var ClaudeAdapter = class extends BaseAdapter {
         resume: nativeSessionId,
         maxTurns: 1,
         cwd: process.cwd(),
-        settingSources: []
+        strictMcpConfig: true
       };
       if (permissionMode === "bypassPermissions") {
         options.permissionMode = "bypassPermissions";
@@ -3793,7 +3919,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "0.6.2";
+      const relayVersion = "0.6.4";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -4143,7 +4269,7 @@ void configManager.getConfig().then((config) => {
 var main = defineCommand10({
   meta: {
     name: "relay",
-    version: "0.6.2",
+    version: "0.6.4",
     description: "Unified CLI proxy for Claude Code, Codex CLI, and Gemini CLI"
   },
   subCommands: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rk0429/agentic-relay",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "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",