@rk0429/agentic-relay 0.12.3 → 0.14.0

package/dist/relay.mjs

@@ -438,7 +438,11 @@ function buildChildMcpServers(parentMcpServers, childHttpUrl) {
   }
   return result;
 }
-function inferFailureReason(stderr, stdout) {
+function inferFailureReason(stderr, stdout, sdkErrorMetadata) {
+  if (sdkErrorMetadata) {
+    if (sdkErrorMetadata.subtype === "error_max_turns") return "max_turns_exhausted";
+    return "adapter_error";
+  }
   const combined = `${stderr} ${stdout}`.toLowerCase();
   if (combined.includes("timed out") || combined.includes("timeout")) return "timeout";
   if (combined.includes("max turns") || combined.includes("max_turns") || combined.includes("turn limit")) return "max_turns_exhausted";
@@ -452,8 +456,8 @@ function buildContextFromEnv() {
 }
 async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooksEngine2, contextMonitor2, backendSelector, childHttpUrl, onProgress) {
   onProgress?.({ stage: "initializing", percent: 0 });
-  let effectiveBackend = input.backend;
-  let selectionReason = "direct";
+  let effectiveBackend;
+  let selectionReason;
   if (backendSelector) {
     const availableBackends = registry2.listIds();
     const selectionContext = {
@@ -465,6 +469,12 @@ async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooks
     const selectionResult = backendSelector.selectBackendWithReason(selectionContext);
     effectiveBackend = selectionResult.backend;
     selectionReason = selectionResult.reason;
+  } else if (input.fallbackBackend) {
+    effectiveBackend = input.fallbackBackend;
+    selectionReason = "fallbackBackend";
+  } else {
+    effectiveBackend = "claude";
+    selectionReason = "default(no-selector)";
   }
   const envContext = buildContextFromEnv();
   const promptHash = RecursionGuard.hashPrompt(input.prompt);
@@ -667,22 +677,11 @@ ${input.prompt}`;
             maxDepth: guard.getConfig().maxDepth,
             traceId: envContext.traceId
           },
-          ...mcpServers ? { mcpServers } : {},
-          ...input.timeoutMs ? { timeoutMs: input.timeoutMs } : {}
+          ...mcpServers ? { mcpServers } : {}
         });
       }
     })();
-    if (input.timeoutMs) {
-      const timeoutPromise = new Promise(
-        (_, reject) => setTimeout(
-          () => reject(new Error(`Agent execution timed out after ${input.timeoutMs}ms`)),
-          input.timeoutMs
-        )
-      );
-      result = await Promise.race([executePromise, timeoutPromise]);
-    } else {
-      result = await executePromise;
-    }
+    result = await executePromise;
     if (result && "_noSession" in result) {
       return {
         sessionId: session.relaySessionId,
@@ -705,7 +704,7 @@ ${input.prompt}`;
     }
     guard.recordSpawn(context);
     const status = result.exitCode === 0 ? "completed" : "error";
-    const failureReason = result.exitCode !== 0 ? inferFailureReason(result.stderr, result.stdout) : void 0;
+    const failureReason = result.exitCode !== 0 ? inferFailureReason(result.stderr, result.stdout, result.sdkErrorMetadata) : void 0;
     await sessionManager2.update(session.relaySessionId, {
       status,
       ...result.nativeSessionId ? { nativeSessionId: result.nativeSessionId } : {}
@@ -781,8 +780,8 @@ var init_spawn_agent = __esm({
     init_recursion_guard();
     init_logger();
     spawnAgentInputSchema = z2.object({
-      backend: z2.enum(["claude", "codex", "gemini"]).describe(
-        "Required fallback backend. Overridden by automatic selection when BackendSelector is active (priority: preferredBackend > agentType mapping > taskType mapping > default)."
+      fallbackBackend: z2.enum(["claude", "codex", "gemini"]).optional().describe(
+        "Optional fallback backend. Used only when BackendSelector is not active or cannot determine a backend. When BackendSelector is active, backend is auto-selected by priority: preferredBackend > agentType mapping > taskType mapping > default (claude)."
       ),
       prompt: z2.string().describe(
         "The task instruction for the sub-agent. Be specific and include all necessary context for autonomous execution."
@@ -815,7 +814,6 @@ var init_spawn_agent = __esm({
       taskType: z2.enum(["code-writing", "code-review", "document-writing", "document-review", "research", "mixed"]).optional().describe(
         "Task type hint for automatic backend selection (priority 3, after preferredBackend and agentType). Mapping: code-writing\u2192codex, code-review\u2192claude, document-writing\u2192claude, document-review\u2192codex, research\u2192codex, mixed\u2192claude."
       ),
-      timeoutMs: z2.number().optional().describe("Timeout in milliseconds for agent execution. Default: no timeout."),
       taskInstructionPath: z2.string().optional().describe(
         "Path to a file containing task instructions. Content is prepended to the prompt. Path is resolved relative to the project root and validated against path traversal."
       ),
@@ -1324,7 +1322,7 @@ var init_server = __esm({
         this.guard = new RecursionGuard(guardConfig);
         this.backendSelector = new BackendSelector();
         this.server = new McpServer(
-          { name: "agentic-relay", version: "0.12.3" },
+          { name: "agentic-relay", version: "0.14.0" },
           createMcpServerOptions()
         );
         this.registerTools(this.server);
@@ -1499,7 +1497,6 @@ var init_server = __esm({
             })).min(1).describe("Array of failed results with their original input configurations"),
             overrides: z5.object({
               maxTurns: z5.number().optional(),
-              timeoutMs: z5.number().optional(),
               preferredBackend: z5.enum(["claude", "codex", "gemini"]).optional()
             }).optional().describe("Parameter overrides applied to all retried agents")
           },
@@ -1509,7 +1506,6 @@ var init_server = __esm({
                 const input = { ...r.originalInput };
                 if (params.overrides) {
                   if (params.overrides.maxTurns !== void 0) input.maxTurns = params.overrides.maxTurns;
-                  if (params.overrides.timeoutMs !== void 0) input.timeoutMs = params.overrides.timeoutMs;
                   if (params.overrides.preferredBackend !== void 0) input.preferredBackend = params.overrides.preferredBackend;
                 }
                 return input;
@@ -1688,7 +1684,7 @@ var init_server = __esm({
             sessionIdGenerator: () => randomUUID()
           });
           const server = new McpServer(
-            { name: "agentic-relay", version: "0.12.3" },
+            { name: "agentic-relay", version: "0.14.0" },
             createMcpServerOptions()
           );
           this.registerTools(server);
@@ -2053,10 +2049,7 @@ var CLAUDE_NESTING_ENV_VARS = [
   "CLAUDE_CODE_SSE_PORT",
   "CLAUDE_CODE_ENTRYPOINT"
 ];
-function resolveClaudeSdkTimeoutMs(flagsTimeoutMs) {
-  if (flagsTimeoutMs !== void 0 && flagsTimeoutMs > 0) {
-    return flagsTimeoutMs;
-  }
+function resolveClaudeSdkTimeoutMs() {
   const envVal = process.env["RELAY_CLAUDE_TIMEOUT_MS"];
   if (envVal) {
     const parsed = Number(envVal);
@@ -2103,7 +2096,7 @@ var ClaudeAdapter = class extends BaseAdapter {
     }
     const env = this.buildCleanEnv(flags);
     const permissionMode = this.getPermissionMode();
-    const timeoutMs = resolveClaudeSdkTimeoutMs(flags.timeoutMs);
+    const timeoutMs = resolveClaudeSdkTimeoutMs();
     const abortController = new AbortController();
     const timer = timeoutMs !== void 0 ? setTimeout(() => abortController.abort(), timeoutMs) : void 0;
     try {
@@ -2132,6 +2125,7 @@ var ClaudeAdapter = class extends BaseAdapter {
       let errorMessages = [];
       let totalInputTokens = 0;
       let totalOutputTokens = 0;
+      let sdkError = null;
       for await (const message of q) {
         if (message.type === "assistant") {
           const betaMessage = message.message;
@@ -2146,18 +2140,32 @@ var ClaudeAdapter = class extends BaseAdapter {
             resultText = message.result;
           } else {
             isError = true;
-            errorMessages = message.errors;
+            sdkError = message;
+            errorMessages = sdkError.errors;
           }
         }
       }
       logger.debug(`Claude SDK session: ${sessionId}`);
+      if (sdkError) {
+        logger.warn(
+          `Claude SDK error: subtype=${sdkError.subtype} stop_reason=${sdkError.stop_reason} num_turns=${sdkError.num_turns} errors=[${sdkError.errors.join("; ")}]`
+        );
+      }
       const hasTokenUsage = totalInputTokens > 0 || totalOutputTokens > 0;
       return {
         exitCode: isError ? 1 : 0,
         stdout: resultText,
         stderr: errorMessages.join("\n"),
         ...sessionId ? { nativeSessionId: sessionId } : {},
-        ...hasTokenUsage ? { tokenUsage: { inputTokens: totalInputTokens, outputTokens: totalOutputTokens } } : {}
+        ...hasTokenUsage ? { tokenUsage: { inputTokens: totalInputTokens, outputTokens: totalOutputTokens } } : {},
+        ...sdkError ? {
+          sdkErrorMetadata: {
+            subtype: sdkError.subtype,
+            numTurns: sdkError.num_turns,
+            stopReason: sdkError.stop_reason,
+            totalCostUsd: sdkError.total_cost_usd
+          }
+        } : {}
       };
     } catch (error) {
       if (abortController.signal.aborted) {
@@ -2182,7 +2190,7 @@ var ClaudeAdapter = class extends BaseAdapter {
     }
     const env = this.buildCleanEnv(flags);
     const permissionMode = this.getPermissionMode();
-    const timeoutMs = resolveClaudeSdkTimeoutMs(flags.timeoutMs);
+    const timeoutMs = resolveClaudeSdkTimeoutMs();
     const abortController = new AbortController();
     const timer = timeoutMs !== void 0 ? setTimeout(() => abortController.abort(), timeoutMs) : void 0;
     try {
@@ -2238,13 +2246,23 @@ var ClaudeAdapter = class extends BaseAdapter {
               nativeSessionId
             };
           } else {
-            const errors = message.errors;
+            const sdkError = message;
+            const errors = sdkError.errors;
+            logger.warn(
+              `Claude SDK error: subtype=${sdkError.subtype} stop_reason=${sdkError.stop_reason} num_turns=${sdkError.num_turns} errors=[${sdkError.errors.join("; ")}]`
+            );
             yield {
               type: "done",
               result: {
                 exitCode: 1,
                 stdout: "",
-                stderr: errors.join("\n")
+                stderr: errors.join("\n"),
+                sdkErrorMetadata: {
+                  subtype: sdkError.subtype,
+                  numTurns: sdkError.num_turns,
+                  stopReason: sdkError.stop_reason,
+                  totalCostUsd: sdkError.total_cost_usd
+                }
               },
               nativeSessionId
             };
@@ -4640,7 +4658,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "0.12.3";
+      const relayVersion = "0.14.0";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -4990,7 +5008,7 @@ void configManager.getConfig().then((config) => {
 var main = defineCommand10({
   meta: {
     name: "relay",
-    version: "0.12.3",
+    version: "0.14.0",
     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.12.3",
+  "version": "0.14.0",
   "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",