opencara 0.23.6 → 0.23.8

package/dist/index.js

@@ -714,6 +714,20 @@ function parseAgents(data) {
         agent.maxTasksPerDay = v;
       }
     }
+    if (typeof obj.liveness_timeout === "number") {
+      if (obj.liveness_timeout === 0) {
+        agent.livenessTimeout = 0;
+      } else {
+        const v = parsePositiveInt(obj.liveness_timeout);
+        if (v === null) {
+          console.warn(
+            `\u26A0 Config warning: agents[${i}].liveness_timeout must be a non-negative integer (seconds), got ${obj.liveness_timeout}. Value ignored.`
+          );
+        } else {
+          agent.livenessTimeout = v;
+        }
+      }
+    }
     const repoConfig = parseRepoConfig(obj, i);
     if (repoConfig) agent.repos = repoConfig;
     const synthesizeRepoConfig = parseRepoConfig(obj, i, "synthesize_repos");
@@ -1750,6 +1764,7 @@ var ToolTimeoutError = class extends Error {
 };
 var SIGKILL_GRACE_MS = 5e3;
 var MIN_PARTIAL_RESULT_LENGTH = 50;
+var STDOUT_LIVENESS_TIMEOUT_MS = 3e5;
 var MAX_STDERR_LENGTH = 1e3;
 function validateCommandBinary(commandTemplate) {
   const { command } = parseCommandTemplate(commandTemplate);
@@ -1846,7 +1861,7 @@ function parseTokenUsage(stdout, stderr) {
   const estimated = estimateTokens(stdout);
   return { tokens: estimated, parsed: false, input: 0, output: estimated };
 }
-function executeTool(commandTemplate, prompt2, timeoutMs, signal, vars, cwd) {
+function executeTool(commandTemplate, prompt2, timeoutMs, signal, vars, cwd, livenessTimeoutMs) {
   const promptViaArg = commandTemplate.includes("${PROMPT}");
   const allVars = { ...vars, PROMPT: prompt2 };
   if (cwd && !allVars["CODEBASE_DIR"]) {
@@ -1866,7 +1881,12 @@ function executeTool(commandTemplate, prompt2, timeoutMs, signal, vars, cwd) {
     let stderr = "";
     let settled = false;
     let sigkillTimer;
+    let killedByLiveness = false;
+    const effectiveLivenessMs = livenessTimeoutMs === void 0 ? STDOUT_LIVENESS_TIMEOUT_MS : livenessTimeoutMs;
+    let killScheduled = false;
     function scheduleKillEscalation() {
+      if (killScheduled) return;
+      killScheduled = true;
       child.kill("SIGTERM");
       if (sigkillTimer) clearTimeout(sigkillTimer);
       sigkillTimer = setTimeout(() => {
@@ -1876,8 +1896,26 @@ function executeTool(commandTemplate, prompt2, timeoutMs, signal, vars, cwd) {
       }, SIGKILL_GRACE_MS);
     }
     const timer = setTimeout(scheduleKillEscalation, timeoutMs);
+    let livenessTimer;
+    if (effectiveLivenessMs > 0) {
+      livenessTimer = setTimeout(() => {
+        if (!settled) {
+          killedByLiveness = true;
+          scheduleKillEscalation();
+        }
+      }, effectiveLivenessMs);
+    }
     child.stdout?.on("data", (chunk) => {
       stdout += chunk.toString();
+      if (livenessTimer) {
+        clearTimeout(livenessTimer);
+        livenessTimer = setTimeout(() => {
+          if (!settled) {
+            killedByLiveness = true;
+            scheduleKillEscalation();
+          }
+        }, effectiveLivenessMs);
+      }
     });
     child.stderr?.on("data", (chunk) => {
       stderr += chunk.toString();
@@ -1893,6 +1931,7 @@ function executeTool(commandTemplate, prompt2, timeoutMs, signal, vars, cwd) {
     }
     function cleanup() {
       clearTimeout(timer);
+      if (livenessTimer) clearTimeout(livenessTimer);
       if (sigkillTimer) clearTimeout(sigkillTimer);
       if (onAbort && signal) {
         signal.removeEventListener("abort", onAbort);
@@ -1917,11 +1956,19 @@ function executeTool(commandTemplate, prompt2, timeoutMs, signal, vars, cwd) {
         return;
       }
       if (sig === "SIGTERM" || sig === "SIGKILL") {
-        reject(
-          new ToolTimeoutError(
-            `Tool "${command}" timed out after ${Math.round(timeoutMs / 1e3)}s`
-          )
-        );
+        if (killedByLiveness) {
+          reject(
+            new ToolTimeoutError(
+              `Tool "${command}" killed: no stdout for ${Math.round(effectiveLivenessMs / 1e3)}s (process may be stuck)`
+            )
+          );
+        } else {
+          reject(
+            new ToolTimeoutError(
+              `Tool "${command}" timed out after ${Math.round(timeoutMs / 1e3)}s`
+            )
+          );
+        }
         return;
       }
       if (code !== 0) {
@@ -2500,7 +2547,8 @@ ${userMessage}`;
       effectiveTimeout,
       abortController.signal,
       void 0,
-      deps.codebaseDir ?? void 0
+      deps.codebaseDir ?? void 0,
+      deps.livenessTimeoutMs
     );
     const { verdict, review } = extractVerdict(result.stdout);
     const inputTokens = result.tokensParsed ? 0 : estimateTokens(fullPrompt);
@@ -2615,7 +2663,8 @@ ${userMessage}`;
       effectiveTimeout,
       abortController.signal,
       void 0,
-      deps.codebaseDir ?? void 0
+      deps.codebaseDir ?? void 0,
+      deps.livenessTimeoutMs
     );
     const { verdict, review } = extractVerdict(result.stdout);
     const flaggedReviews = extractFlaggedReviews(result.stdout);
@@ -5663,7 +5712,7 @@ function sleep2(ms, signal) {
 async function startAgent(agentId, platformUrl, agentInfo, reviewDeps, consumptionDeps, options) {
   const client = new ApiClient(platformUrl, {
     authToken: options?.authToken,
-    cliVersion: "0.23.6",
+    cliVersion: "0.23.8",
     versionOverride: options?.versionOverride,
     onTokenRefresh: options?.onTokenRefresh
   });
@@ -5770,6 +5819,8 @@ async function batchPollLoop(client, agentStates, options) {
   let consecutiveAuthErrors = 0;
   let consecutiveErrors = 0;
   let pollCycleCount = 0;
+  const busyAgents = /* @__PURE__ */ new Set();
+  const inflightPromises = /* @__PURE__ */ new Set();
   while (!signal?.aborted) {
     if (accessibleRepos && githubToken && recheckInterval > 0 && pollCycleCount > 0 && pollCycleCount % recheckInterval === 0) {
       const allRepos = extractRepoUrls(
@@ -5826,13 +5877,17 @@ async function batchPollLoop(client, agentStates, options) {
       break;
     }
     try {
-      const descriptors = agentStates.map((s) => s.descriptor);
+      const availableStates = agentStates.filter((s) => !busyAgents.has(s));
+      if (availableStates.length === 0) {
+        await sleep2(pollIntervalMs, signal);
+        continue;
+      }
+      const descriptors = availableStates.map((s) => s.descriptor);
       const request = buildBatchPollRequest(descriptors);
       const response = await client.post("/api/tasks/poll/batch", request);
       consecutiveAuthErrors = 0;
       consecutiveErrors = 0;
-      const handlePromises = [];
-      for (const state of agentStates) {
+      for (const state of availableStates) {
         const agentName = state.descriptor.name;
         const pollResponse = response.assignments[agentName];
         if (!pollResponse || pollResponse.tasks.length === 0) continue;
@@ -5846,8 +5901,9 @@ async function batchPollLoop(client, agentStates, options) {
         );
         const task = eligible[0];
         if (!task) continue;
-        handlePromises.push(
-          (async () => {
+        busyAgents.add(state);
+        const p = (async () => {
+          try {
             const result = await handleTask(
               client,
               state.descriptor.agentId,
@@ -5876,28 +5932,27 @@ async function batchPollLoop(client, agentStates, options) {
                 );
               }
             }
-          })()
-        );
-      }
-      if (handlePromises.length > 0) {
-        const results = await Promise.allSettled(handlePromises);
-        for (const r of results) {
-          if (r.status === "rejected") {
-            logError(`${icons.error} Task handler failed: ${r.reason}`);
+          } catch (err) {
+            logError(`${icons.error} Task handler failed: ${err.message}`);
             consecutiveErrors++;
+          } finally {
+            busyAgents.delete(state);
+            if (state.cleanupTracker) {
+              try {
+                const swept = await state.cleanupTracker.sweep(cleanupWorktree);
+                if (swept > 0) {
+                  state.logger.log(
+                    `${icons.info} Cleaned up ${swept} stale codebase director${swept === 1 ? "y" : "ies"}`
+                  );
+                }
+              } catch {
+              }
+            }
           }
-        }
+        })();
+        inflightPromises.add(p);
+        void p.finally(() => inflightPromises.delete(p));
       }
-      await Promise.allSettled(
-        agentStates.filter((state) => state.cleanupTracker).map(async (state) => {
-          const swept = await state.cleanupTracker.sweep(cleanupWorktree);
-          if (swept > 0) {
-            state.logger.log(
-              `${icons.info} Cleaned up ${swept} stale codebase director${swept === 1 ? "y" : "ies"}`
-            );
-          }
-        })
-      );
     } catch (err) {
       if (signal?.aborted) break;
       if (err instanceof UpgradeRequiredError) {
@@ -5944,12 +5999,16 @@ async function batchPollLoop(client, agentStates, options) {
     }
     await sleep2(pollIntervalMs, signal);
   }
+  if (inflightPromises.size > 0) {
+    log(`${icons.info} Waiting for ${inflightPromises.size} in-flight task(s) to complete...`);
+    await Promise.allSettled([...inflightPromises]);
+  }
 }
 async function startBatchAgents(config, agents, pollIntervalMs, oauthToken, options) {
   const { versionOverride, verbose, instancesOverride, agentOwner, userOrgs } = options;
   const client = new ApiClient(config.platformUrl, {
     authToken: oauthToken,
-    cliVersion: "0.23.6",
+    cliVersion: "0.23.8",
     versionOverride,
     onTokenRefresh: () => getValidToken(config.platformUrl, { configPath: config.authFile })
   });
@@ -5995,7 +6054,8 @@ async function startBatchAgents(config, agents, pollIntervalMs, oauthToken, opti
       commandTemplate,
       maxDiffSizeKb: config.maxDiffSizeKb,
       maxRepoSizeMb: config.maxRepoSizeMb,
-      codebaseDir
+      codebaseDir,
+      livenessTimeoutMs: agentConfig.livenessTimeout != null ? agentConfig.livenessTimeout * 1e3 : void 0
     };
     const session = createSessionTracker();
     const usageTracker = new UsageTracker();
@@ -6151,7 +6211,8 @@ async function startAgentRouter() {
     commandTemplate: commandTemplate ?? "",
     maxDiffSizeKb: config.maxDiffSizeKb,
     maxRepoSizeMb: config.maxRepoSizeMb,
-    codebaseDir
+    codebaseDir,
+    livenessTimeoutMs: agentConfig?.livenessTimeout != null ? agentConfig.livenessTimeout * 1e3 : void 0
   };
   const session = createSessionTracker();
   const usageTracker = new UsageTracker();
@@ -6218,7 +6279,8 @@ function startAgentByIndex(config, agentIndex, pollIntervalMs, oauthToken, versi
     commandTemplate,
     maxDiffSizeKb: config.maxDiffSizeKb,
     maxRepoSizeMb: config.maxRepoSizeMb,
-    codebaseDir
+    codebaseDir,
+    livenessTimeoutMs: agentConfig?.livenessTimeout != null ? agentConfig.livenessTimeout * 1e3 : void 0
   };
   const model = agentConfig?.model ?? "unknown";
   const tool = agentConfig?.tool ?? "unknown";
@@ -6292,7 +6354,7 @@ agentCommand.command("start").description("Start agents in polling mode").option
       }
       config = loadConfig();
     }
-    console.log(formatVersionBanner("0.23.6", "9696efa"));
+    console.log(formatVersionBanner("0.23.8", "4d448ed"));
     if (config.agents && config.agents.length > 0) {
       const toolEntries = config.agents.map((a) => ({
         tool: a.tool,
@@ -7115,7 +7177,7 @@ var statusCommand = new Command4("status").description("Show agent config, conne
 });
 
 // src/index.ts
-var program = new Command5().name("opencara").description("OpenCara \u2014 distributed AI code review agent").version(`${"0.23.6"} (${"9696efa"})`);
+var program = new Command5().name("opencara").description("OpenCara \u2014 distributed AI code review agent").version(`${"0.23.8"} (${"4d448ed"})`);
 program.addCommand(agentCommand);
 program.addCommand(authCommand());
 program.addCommand(dedupCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencara",
-  "version": "0.23.6",
+  "version": "0.23.8",
   "description": "Distributed AI code review agent — poll, review, and submit PR reviews using your own AI tools",
   "type": "module",
   "license": "MIT",