@rk0429/agentic-relay 0.10.0 → 0.11.0

package/dist/relay.mjs

@@ -55,8 +55,8 @@ var init_recursion_guard = __esm({
     RecursionGuard = class _RecursionGuard {
       constructor(config = {
         maxDepth: 5,
-        maxCallsPerSession: 20,
-        timeoutSec: 300
+        maxCallsPerSession: 50,
+        timeoutSec: 1800
       }) {
         this.config = config;
       }
@@ -110,10 +110,15 @@ var init_recursion_guard = __esm({
             reason: `Max calls per session exceeded: ${currentCount} >= ${this.config.maxCallsPerSession}`
           };
         }
-        if (this.detectLoop(context.traceId, context.backend, context.promptHash)) {
+        if (this.detectLoop(
+          context.traceId,
+          context.backend,
+          context.promptHash,
+          context.taskType
+        )) {
           return {
             allowed: false,
-            reason: `Loop detected: same (backend=${context.backend}, promptHash=${context.promptHash}) appeared 3+ times in trace ${context.traceId}`
+            reason: `Loop detected: same (backend=${context.backend}, taskType=${context.taskType ?? ""}, promptHash=${context.promptHash}) appeared 5+ times in trace ${context.traceId}`
           };
         }
         return { allowed: true };
@@ -127,7 +132,7 @@ var init_recursion_guard = __esm({
         } else {
           this.callCounts.set(context.traceId, { count: 1, createdAt: Date.now() });
         }
-        const key = `${context.backend}:${context.promptHash}`;
+        const key = `${context.backend}:${context.taskType ?? ""}:${context.promptHash}`;
         const hashEntry = this.promptHashes.get(context.traceId);
         if (hashEntry) {
           hashEntry.hashes.push(key);
@@ -135,12 +140,12 @@ var init_recursion_guard = __esm({
           this.promptHashes.set(context.traceId, { hashes: [key], createdAt: Date.now() });
         }
       }
-      /** Detect if the same (backend + promptHash) combination has appeared 3+ times */
-      detectLoop(traceId, backend, promptHash) {
-        const key = `${backend}:${promptHash}`;
+      /** Detect if the same (backend + taskType + promptHash) combination has appeared 5+ times */
+      detectLoop(traceId, backend, promptHash, taskType) {
+        const key = `${backend}:${taskType ?? ""}:${promptHash}`;
         const hashes = this.promptHashes.get(traceId)?.hashes ?? [];
         const count = hashes.filter((h) => h === key).length;
-        return count >= 3;
+        return count >= 5;
       }
       /** Get current config (for testing/inspection) */
       getConfig() {
@@ -344,7 +349,8 @@ async function executeSpawnAgent(input, registry2, sessionManager2, guard, hooks
     traceId: envContext.traceId,
     depth: envContext.depth,
     backend: effectiveBackend,
-    promptHash
+    promptHash,
+    taskType: input.taskType
   };
   const guardResult = guard.canSpawn(context);
   if (!guardResult.allowed) {
@@ -490,7 +496,34 @@ ${input.prompt}`;
             _failureReason: "session_continuation_unsupported"
           };
         }
-        return adapter.continueSession(input.resumeSessionId, effectivePrompt);
+        let effectiveNativeSessionId;
+        if (input.resumeSessionId.startsWith("relay-")) {
+          const existingSession = await sessionManager2.get(input.resumeSessionId);
+          if (!existingSession) {
+            return {
+              exitCode: 1,
+              stdout: "",
+              stderr: `Session not found: ${input.resumeSessionId}`,
+              _noSession: true,
+              _failureReason: "session_not_found"
+            };
+          }
+          if (!existingSession.nativeSessionId) {
+            return {
+              exitCode: 1,
+              stdout: "",
+              stderr: `Session ${input.resumeSessionId} has no native session ID (session may have failed before completing)`,
+              _noSession: true,
+              _failureReason: "session_not_found"
+            };
+          }
+          effectiveNativeSessionId = existingSession.nativeSessionId;
+        } else {
+          effectiveNativeSessionId = input.resumeSessionId;
+        }
+        return adapter.continueSession(effectiveNativeSessionId, effectivePrompt, {
+          ...input.maxTurns !== void 0 ? { maxTurns: input.maxTurns } : {}
+        });
       } else {
         let mcpServers;
         if (childHttpUrl) {
@@ -550,7 +583,10 @@ ${input.prompt}`;
     guard.recordSpawn(context);
     const status = result.exitCode === 0 ? "completed" : "error";
     const failureReason = result.exitCode !== 0 ? inferFailureReason(result.stderr, result.stdout) : void 0;
-    await sessionManager2.update(session.relaySessionId, { status });
+    await sessionManager2.update(session.relaySessionId, {
+      status,
+      ...result.nativeSessionId ? { nativeSessionId: result.nativeSessionId } : {}
+    });
     const completedAt = (/* @__PURE__ */ new Date()).toISOString();
     const metadata = {
       durationMs: new Date(completedAt).getTime() - new Date(spawnStartedAt).getTime(),
@@ -1115,7 +1151,7 @@ var init_server = __esm({
         this.backendSelector = new BackendSelector();
         this.server = new McpServer({
           name: "agentic-relay",
-          version: "0.10.0"
+          version: "0.11.0"
         });
         this.registerTools(this.server);
       }
@@ -1423,7 +1459,7 @@ var init_server = __esm({
           });
           const server = new McpServer({
             name: "agentic-relay",
-            version: "0.10.0"
+            version: "0.11.0"
           });
           this.registerTools(server);
           transport.onclose = () => {
@@ -1639,7 +1675,7 @@ var BaseAdapter = class _BaseAdapter {
     }
     return result.stdout.trim();
   }
-  async continueSession(_nativeSessionId, _prompt) {
+  async continueSession(_nativeSessionId, _prompt, _options) {
     return {
       exitCode: 1,
       stdout: "",
@@ -1996,31 +2032,33 @@ var ClaudeAdapter = class extends BaseAdapter {
       if (timer !== void 0) clearTimeout(timer);
     }
   }
-  async continueSession(nativeSessionId, prompt) {
+  async continueSession(nativeSessionId, prompt, options) {
     const timeoutMs = resolveClaudeSdkTimeoutMs();
     const abortController = new AbortController();
     const timer = timeoutMs !== void 0 ? setTimeout(() => abortController.abort(), timeoutMs) : void 0;
     try {
       const { query } = await loadClaudeSDK();
       const permissionMode = this.getPermissionMode();
-      const options = {
+      const queryOptions = {
         abortController,
         resume: nativeSessionId,
-        maxTurns: 1,
+        maxTurns: options?.maxTurns ?? 1,
         cwd: process.cwd(),
         strictMcpConfig: true
       };
       if (permissionMode === "bypassPermissions") {
-        options.permissionMode = "bypassPermissions";
-        options.allowDangerouslySkipPermissions = true;
+        queryOptions.permissionMode = "bypassPermissions";
+        queryOptions.allowDangerouslySkipPermissions = true;
       }
       const q = query({
         prompt,
-        options
+        options: queryOptions
       });
       let resultText = "";
+      let sessionId = "";
       for await (const message of q) {
         if (message.type === "result") {
+          sessionId = message.session_id;
           if (message.subtype === "success") {
             resultText = message.result;
           }
@@ -2029,7 +2067,8 @@ var ClaudeAdapter = class extends BaseAdapter {
       return {
         exitCode: 0,
         stdout: resultText,
-        stderr: ""
+        stderr: "",
+        ...sessionId ? { nativeSessionId: sessionId } : {}
       };
     } catch (error) {
       if (abortController.signal.aborted) {
@@ -2459,7 +2498,7 @@ ${prompt}`;
       };
     }
   }
-  async continueSession(nativeSessionId, prompt) {
+  async continueSession(nativeSessionId, prompt, _options) {
     try {
       const { Codex } = await loadCodexSDK();
       const codex = new Codex();
@@ -2471,7 +2510,8 @@ ${prompt}`;
       return {
         exitCode: 0,
         stdout: result.finalResponse,
-        stderr: ""
+        stderr: "",
+        nativeSessionId
       };
     } catch (error) {
       return {
@@ -4371,7 +4411,7 @@ function createVersionCommand(registry2) {
       description: "Show relay and backend versions"
     },
     async run() {
-      const relayVersion = "0.10.0";
+      const relayVersion = "0.11.0";
       console.log(`agentic-relay v${relayVersion}`);
       console.log("");
       console.log("Backends:");
@@ -4721,7 +4761,7 @@ void configManager.getConfig().then((config) => {
 var main = defineCommand10({
   meta: {
     name: "relay",
-    version: "0.10.0",
+    version: "0.11.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.10.0",
+  "version": "0.11.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",