@rk0429/agentic-relay 2.0.3 → 2.0.5

package/dist/relay.mjs

@@ -992,11 +992,20 @@ function isRelayEntry(name, config) {
   if (config.command?.includes("relay.mjs") || config.command?.includes("agentic-relay")) return true;
   return false;
 }
-function buildChildMcpServers(parentMcpServers, childHttpUrl) {
+function buildChildMcpServers(parentMcpServers, childHttpUrl, relayContext) {
   const result = {};
   for (const [name, config] of Object.entries(parentMcpServers)) {
     if (isRelayEntry(name, config)) {
-      result[name] = { type: "http", url: childHttpUrl };
+      let url = childHttpUrl;
+      if (relayContext) {
+        const params = new URLSearchParams({
+          relay_depth: String(relayContext.depth),
+          relay_parent_session_id: relayContext.parentSessionId,
+          relay_trace_id: relayContext.traceId
+        });
+        url = `${childHttpUrl}?${params.toString()}`;
+      }
+      result[name] = { type: "http", url };
     } else if (config.type === "http" || config.type === "sse") {
       result[name] = {
         type: config.type,
@@ -1076,7 +1085,7 @@ function buildContextFromEnv() {
   const depth = Number(process.env["RELAY_DEPTH"] ?? "0");
   return { traceId, parentSessionId, depth };
 }
-async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager) {
+async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager, relayContext) {
   onProgress?.({ stage: "initializing", percent: 0 });
   let inlineTaskId;
   if (input.title && taskLifecycleManager) {
@@ -1119,7 +1128,7 @@ async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooks
     effectiveBackend = "claude";
     selectionReason = "default(no-selector)";
   }
-  const envContext = buildContextFromEnv();
+  const envContext = relayContext ?? buildContextFromEnv();
   const promptHash = RecursionGuard.hashPrompt(input.prompt);
   const context = {
     traceId: envContext.traceId,
@@ -1378,7 +1387,11 @@ ${input.prompt}`;
         if (childHttpUrl) {
           const parentMcpServers = readProjectMcpJson();
           if (Object.keys(parentMcpServers).length > 0) {
-            mcpServers = buildChildMcpServers(parentMcpServers, childHttpUrl);
+            mcpServers = buildChildMcpServers(parentMcpServers, childHttpUrl, {
+              depth: envContext.depth + 1,
+              parentSessionId: session.relaySessionId,
+              traceId: envContext.traceId
+            });
           }
         }
         return adapter.execute({
@@ -1840,7 +1853,7 @@ var init_conflict_detector = __esm({
 });
 
 // src/mcp-server/tools/spawn-agents-parallel.ts
-async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager) {
+async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress, agentEventStore, hookMemoryDir = "./memory", taskCompleter, taskLifecycleManager, relayContext) {
   for (let index = 0; index < agents.length; index += 1) {
     try {
       resolveValidatedSessionMetadata(agents[index]);
@@ -1865,7 +1878,7 @@ async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, gu
       };
     }
   }
-  const envContext = buildContextFromEnv();
+  const envContext = relayContext ?? buildContextFromEnv();
   if (envContext.depth >= guard.getConfig().maxDepth) {
     const reason = `Max depth exceeded: ${envContext.depth} >= ${guard.getConfig().maxDepth}`;
     logger.warn(`Batch spawn blocked by RecursionGuard: ${reason}`);
@@ -1925,7 +1938,8 @@ async function executeSpawnAgentsParallel(agents, registry2, sessionManager2, gu
         agentEventStore,
         hookMemoryDir,
         taskCompleter,
-        taskLifecycleManager
+        taskLifecycleManager,
+        relayContext
       ).then((result) => {
         completedCount++;
         onProgress?.({
@@ -8259,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";
@@ -8270,6 +8285,27 @@ import { mkdirSync as mkdirSync3 } from "fs";
 import path2 from "path";
 import { randomUUID } from "crypto";
 import { z as z8 } from "zod";
+function extractRelayContextFromUrl(url) {
+  try {
+    const parsed = new URL(url, "http://localhost");
+    const depth = parsed.searchParams.get("relay_depth");
+    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: parsedDepth,
+        parentSessionId,
+        traceId: traceId ?? `trace-${randomUUID()}`
+      };
+    }
+  } catch {
+  }
+  return void 0;
+}
 function createMcpServerOptions() {
   const taskStore = new DeferredCleanupTaskStore();
   return {
@@ -8406,7 +8442,7 @@ var init_server = __esm({
           this.agentEventStore
         );
         this.server = new McpServer(
-          { name: "agentic-relay", version: "2.0.3" },
+          { name: "agentic-relay", version: "2.0.5" },
           createMcpServerOptions()
         );
         this.registerTools(this.server);
@@ -8436,7 +8472,7 @@ var init_server = __esm({
        * 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) {
+      runSpawnAgentInBackground(taskId, params, extra, relayContext) {
         const run = async () => {
           try {
             const result = await executeSpawnAgent(
@@ -8452,7 +8488,8 @@ var init_server = __esm({
               this.agentEventStore,
               this.hookMemoryDir,
               void 0,
-              this.taskLifecycleManager
+              this.taskLifecycleManager,
+              relayContext
             );
             const controlOptions = {
               inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8493,7 +8530,7 @@ var init_server = __esm({
        * 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) {
+      runSpawnAgentsParallelInBackground(taskId, agents, extra, relayContext) {
         const run = async () => {
           try {
             const result = await executeSpawnAgentsParallel(
@@ -8509,7 +8546,8 @@ var init_server = __esm({
               this.agentEventStore,
               this.hookMemoryDir,
               void 0,
-              this.taskLifecycleManager
+              this.taskLifecycleManager,
+              relayContext
             );
             const controlOptions = {
               inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8545,7 +8583,7 @@ var init_server = __esm({
         };
         void run();
       }
-      registerTools(server) {
+      registerTools(server, relayContext) {
         server.experimental.tasks.registerToolTask(
           "spawn_agent",
           {
@@ -8559,7 +8597,7 @@ var init_server = __esm({
                 ttl: DEFAULT_TASK_TTL,
                 pollInterval: DEFAULT_POLL_INTERVAL
               });
-              this.runSpawnAgentInBackground(task.taskId, params, extra);
+              this.runSpawnAgentInBackground(task.taskId, params, extra, relayContext);
               return { task };
             },
             getTask: async (_params, extra) => {
@@ -8585,7 +8623,7 @@ var init_server = __esm({
                 ttl: DEFAULT_TASK_TTL,
                 pollInterval: DEFAULT_POLL_INTERVAL
               });
-              this.runSpawnAgentsParallelInBackground(task.taskId, params.agents, extra);
+              this.runSpawnAgentsParallelInBackground(task.taskId, params.agents, extra, relayContext);
               return { task };
             },
             getTask: async (_params, extra) => {
@@ -8623,7 +8661,8 @@ var init_server = __esm({
                 this.agentEventStore,
                 this.hookMemoryDir,
                 void 0,
-                this.taskLifecycleManager
+                this.taskLifecycleManager,
+                relayContext
               );
               const controlOptions = {
                 inlineSummaryLength: this.inlineSummaryLength ?? DEFAULT_INLINE_SUMMARY_LENGTH,
@@ -8888,14 +8927,15 @@ var init_server = __esm({
               return;
             }
           }
+          const childRelayContext = extractRelayContextFromUrl(url);
           const transport = new StreamableHTTPServerTransport({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "2.0.3" },
+            { name: "agentic-relay", version: "2.0.5" },
             createMcpServerOptions()
           );
-          this.registerTools(server);
+          this.registerTools(server, childRelayContext);
           transport.onclose = () => {
             const sid2 = transport.sessionId;
             if (sid2) {
@@ -13332,7 +13372,7 @@ function createMCPCommand(configManager2, registry2, sessionManager2, hooksEngin
             responseOutputDir,
             relayConfig
           );
-          await server.start({ transport, port, currentVersion: "2.0.3" });
+          await server.start({ transport, port, currentVersion: "2.0.5" });
         }
       })
     },
@@ -13492,7 +13532,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "2.0.3";
+      const relayVersion = "2.0.5";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -13889,7 +13929,7 @@ var subCommandNames = /* @__PURE__ */ new Set(["claude", "codex", "gemini", "upd
 var main = defineCommand11({
   meta: {
     name: "relay",
-    version: "2.0.3",
+    version: "2.0.5",
     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.3",
+  "version": "2.0.5",
   "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",