@groupchatai/claude-runner 0.4.5 → 0.4.6

package/dist/index.js

@@ -203,6 +203,16 @@ function formatStreamEvent(event, pid) {
     }
     case "tool_result":
       return null;
+    case "rate_limit_event": {
+      const info = event.rate_limit_info;
+      if (info && typeof info === "object" && !Array.isArray(info)) {
+        const payload = safeFormatRateLimitPayload(info);
+        const blocking = isRateLimitEventBlocking(event);
+        const icon = blocking ? "\u{1F6AB}" : "\u2139\uFE0F ";
+        return `${tag} ${C.dim}${icon} ${payload}${blocking ? "" : " (non-blocking)"}${C.reset}`;
+      }
+      return `${tag} ${C.dim}rate_limit_event (no info payload)${C.reset}`;
+    }
     case "result": {
       const lines = [];
       if (event.cost_usd !== void 0 || event.total_cost_usd !== void 0) {
@@ -267,15 +277,6 @@ function clampUserFacingDetail(text, maxChars) {
 function stripAnsi(text) {
   return text.replace(/\x1b\[[0-9;]*m/g, "");
 }
-function errorMessageFromUnknown(err) {
-  if (typeof err === "string" && err.trim()) return err.trim();
-  if (err && typeof err === "object") {
-    const o = err;
-    if (typeof o.message === "string" && o.message.trim()) return o.message.trim();
-    if (typeof o.error === "string" && o.error.trim()) return o.error.trim();
-  }
-  return null;
-}
 function formatAnthropicRateLimitPayload(o) {
   const rateLimitTypeRaw = typeof o.rateLimitType === "string" ? o.rateLimitType.replace(/_/g, " ") : "unknown";
   const rawReset = o.resetsAt;
@@ -326,26 +327,16 @@ function parseClaudeNdjsonEvents(rawOutput) {
   }
   return events;
 }
-function extractAssistantUserVisibleText(event) {
-  const msg = event.message;
-  if (!msg || typeof msg !== "object" || Array.isArray(msg)) return null;
-  const content = msg.content;
-  if (!Array.isArray(content)) return null;
-  const parts = [];
-  for (const block of content) {
-    if (!block || typeof block !== "object") continue;
-    const b = block;
-    if (b.type === "text" && typeof b.text === "string" && b.text.trim()) {
-      parts.push(b.text.trim());
-    }
-  }
-  if (parts.length === 0) return null;
-  return parts.join("\n");
+function isRateLimitEventBlocking(ev) {
+  const info = ev.rate_limit_info;
+  if (!info || typeof info !== "object" || Array.isArray(info)) return true;
+  const status = info.status;
+  return !(typeof status === "string" && status === "allowed");
 }
-var USAGE_LIMIT_RE = /you['\u2019]?ve hit your limit/i;
 function extractRateLimitRetryInfo(events) {
   for (const ev of events) {
     if (ev.type !== "rate_limit_event") continue;
+    if (!isRateLimitEventBlocking(ev)) continue;
     const info = ev.rate_limit_info;
     if (!info || typeof info !== "object" || Array.isArray(info)) continue;
     const raw = info.resetsAt;
@@ -355,59 +346,23 @@ function extractRateLimitRetryInfo(events) {
   }
   return null;
 }
-function isClaudeUsageLimitText(text) {
-  return USAGE_LIMIT_RE.test(text);
-}
-function extractPlainTextCliErrorFromOutput(rawOutput) {
-  const limitMatch = rawOutput.match(new RegExp(USAGE_LIMIT_RE.source + "[^\\n\\r]*", "gi"));
-  if (limitMatch?.[0]) return limitMatch[0].trim();
-  for (const line of rawOutput.split("\n")) {
-    const t = line.trim();
-    if (!t || t.startsWith("{")) continue;
-    if (/^API error:/i.test(t) || /^Error:/i.test(t) || /^Anthropic/i.test(t)) {
-      return t.length <= 2e3 ? t : `${t.slice(0, 1999)}\u2026`;
-    }
-  }
-  return null;
-}
-function deriveClaudeFailureSummary(exitCode, rawOutput, stderr, events) {
-  const stderrText = stripAnsi(stderr).trim();
-  if (stderrText.length > 0) {
-    return clampUserFacingDetail(stderrText, 2e3);
-  }
+function deriveClaudeFailureSummary(exitCode, stderr, events) {
   for (let i = events.length - 1; i >= 0; i--) {
     const ev = events[i];
     if (ev.type !== "result") continue;
-    if (typeof ev.error === "string" && ev.error.trim()) {
-      return clampUserFacingDetail(ev.error.trim(), 2e3);
-    }
-    const nested = errorMessageFromUnknown(ev.error);
-    if (nested) return clampUserFacingDetail(nested, 2e3);
     if (ev.is_error === true && typeof ev.result === "string" && ev.result.trim()) {
       return clampUserFacingDetail(ev.result.trim(), 2e3);
     }
-  }
-  for (let i = events.length - 1; i >= 0; i--) {
-    const ev = events[i];
-    if (ev.type !== "error") continue;
-    if (typeof ev.message === "string" && ev.message.trim()) {
-      return clampUserFacingDetail(ev.message.trim(), 2e3);
-    }
     if (typeof ev.error === "string" && ev.error.trim()) {
       return clampUserFacingDetail(ev.error.trim(), 2e3);
     }
-    const nested = errorMessageFromUnknown(ev.error);
-    if (nested) return clampUserFacingDetail(nested, 2e3);
   }
-  for (let i = events.length - 1; i >= 0; i--) {
-    const ev = events[i];
-    if (ev.type !== "assistant") continue;
-    if (ev.error === void 0 || ev.error === null || ev.error === "") continue;
-    const assistantText = extractAssistantUserVisibleText(ev);
-    if (assistantText) return clampUserFacingDetail(assistantText, 2e3);
+  const stderrText = stripAnsi(stderr).trim();
+  if (stderrText.length > 0) {
+    return clampUserFacingDetail(stderrText, 2e3);
   }
   for (const ev of events) {
-    if (ev.type === "rate_limit_event") {
+    if (ev.type === "rate_limit_event" && isRateLimitEventBlocking(ev)) {
       const info = ev.rate_limit_info;
       if (info && typeof info === "object" && !Array.isArray(info)) {
         return clampUserFacingDetail(
@@ -417,23 +372,13 @@ function deriveClaudeFailureSummary(exitCode, rawOutput, stderr, events) {
       }
     }
   }
-  const combined = stripAnsi(`${stderr}
-${rawOutput}`);
-  const plain = extractPlainTextCliErrorFromOutput(combined);
-  if (plain) return clampUserFacingDetail(plain, 2e3);
-  return `Claude Code ended with exit code ${exitCode}. No detailed error was returned; if this persists, run the runner with verbose logging or try again later.`;
+  return `Claude Code ended with exit code ${exitCode}`;
 }
-function claudeRunShouldReportAsError(options) {
-  if (options.exitCode !== 0) return true;
-  for (const ev of options.events) {
-    if (ev.type === "rate_limit_event") return true;
-    if (ev.type === "assistant" && ev.error !== void 0 && ev.error !== null && ev.error !== "") {
-      return true;
-    }
-    if (ev.type === "result" && ev.is_error === true) return true;
+function claudeRunShouldReportAsError(exitCode, events) {
+  if (exitCode !== 0) return true;
+  for (let i = events.length - 1; i >= 0; i--) {
+    if (events[i].type === "result" && events[i].is_error === true) return true;
   }
-  if (isClaudeUsageLimitText(options.resultSummaryText)) return true;
-  if (isClaudeUsageLimitText(options.combinedText)) return true;
   return false;
 }
 function compactTaskErrorForApi(detail) {
@@ -892,23 +837,51 @@ Removing ${safe.length} safe worktree(s)\u2026`);
   }
   console.log();
 }
-function logClaudeRunFailureDiagnostics(log, stderr, rawOutput) {
-  const se = stripAnsi(stderr).trimEnd();
-  const so = stripAnsi(rawOutput);
+function logClaudeRunFailureDiagnostics(log, opts) {
+  const se = stripAnsi(opts.stderr).trimEnd();
+  const so = stripAnsi(opts.rawOutput);
   log(`${C.dim}\u2500\u2500 Claude failure diagnostics (--verbose) \u2500\u2500${C.reset}`);
+  log(`${C.dim}  exit code:    ${opts.exitCode}${C.reset}`);
+  log(`${C.dim}  session:      ${opts.sessionId ?? "(none)"}${C.reset}`);
+  log(`${C.dim}  derived error: ${opts.derivedError}${C.reset}`);
+  log(`${C.dim}  api error:    ${opts.apiError}${C.reset}`);
+  const rateLimitEvents = opts.streamEvents.filter((e) => e.type === "rate_limit_event");
+  if (rateLimitEvents.length > 0) {
+    log(`${C.dim}  rate_limit_event(s): ${rateLimitEvents.length}${C.reset}`);
+    for (const rl of rateLimitEvents) {
+      const info = rl.rate_limit_info;
+      const blocking = isRateLimitEventBlocking(rl);
+      if (info && typeof info === "object" && !Array.isArray(info)) {
+        log(`${C.dim}    blocking=${blocking} payload=${JSON.stringify(info)}${C.reset}`);
+      } else {
+        log(`${C.dim}    blocking=${blocking} (no rate_limit_info)${C.reset}`);
+      }
+    }
+  }
+  const typeCounts = /* @__PURE__ */ new Map();
+  for (const ev of opts.streamEvents) {
+    const t = typeof ev.type === "string" ? ev.type : "?";
+    typeCounts.set(t, (typeCounts.get(t) ?? 0) + 1);
+  }
+  if (typeCounts.size > 0) {
+    const timeline = Array.from(typeCounts.entries()).map(([t, c]) => c > 1 ? `${t}\xD7${c}` : t).join(", ");
+    log(`${C.dim}  events:       ${opts.streamEvents.length} total (${timeline})${C.reset}`);
+  } else {
+    log(`${C.dim}  events:       0 parsed${C.reset}`);
+  }
   if (se.length > 0) {
-    log(`${C.dim}stderr:${C.reset}`);
+    log(`${C.dim}  stderr:${C.reset}`);
     for (const ln of se.split("\n")) {
-      log(`${C.dim}  ${ln}${C.reset}`);
+      log(`${C.dim}    ${ln}${C.reset}`);
     }
   } else {
-    log(`${C.dim}(stderr empty)${C.reset}`);
+    log(`${C.dim}  stderr:       (empty)${C.reset}`);
   }
   const lines = so.length > 0 ? so.split("\n") : [];
   const tailLines = lines.length > 200 ? lines.slice(-200) : lines;
-  log(`${C.dim}stdout: ${lines.length} line(s), showing last ${tailLines.length}${C.reset}`);
+  log(`${C.dim}  stdout: ${lines.length} line(s), showing last ${tailLines.length}${C.reset}`);
   for (const ln of tailLines) {
-    log(`${C.dim}  ${ln}${C.reset}`);
+    log(`${C.dim}    ${ln}${C.reset}`);
   }
   log(`${C.dim}\u2500\u2500 end diagnostics \u2500\u2500${C.reset}`);
 }
@@ -1029,17 +1002,9 @@ async function processRun(client, run, config, worktreeDir, detail) {
     }
     const pullRequestUrl = streamPrUrl ?? await detectPullRequestUrl(effectiveCwd) ?? extractPullRequestUrlFromOutput(stdout) ?? extractPullRequestUrlFromOutput(rawOutput);
     const streamEvents = parseClaudeNdjsonEvents(rawOutput);
-    const combinedForLimit = stripAnsi(`${stderr}
-${rawOutput}`);
-    const resultSummaryText = extractResultText(stdout);
-    const usageCap = claudeRunShouldReportAsError({
-      exitCode,
-      events: streamEvents,
-      combinedText: combinedForLimit,
-      resultSummaryText
-    });
-    if (exitCode !== 0 || usageCap) {
-      const detail2 = deriveClaudeFailureSummary(exitCode, rawOutput, stderr, streamEvents);
+    const isError = claudeRunShouldReportAsError(exitCode, streamEvents);
+    if (isError) {
+      const detail2 = deriveClaudeFailureSummary(exitCode, stderr, streamEvents);
       const errorMsg = compactTaskErrorForApi(detail2);
       if (process.env.GCA_DEBUG_CLAUDE_RAW === "1") {
         const stderrDbg = truncateClaudeDebugString(stripAnsi(stderr));
@@ -1050,7 +1015,6 @@ ${rawOutput}`);
           taskId: run.taskId,
           taskTitle: run.taskTitle,
           exitCode,
-          usageCap,
           sessionId: sessionId ?? null,
           streamPrUrl: streamPrUrl ?? null,
           pullRequestUrl: pullRequestUrl ?? null,
@@ -1062,8 +1026,7 @@ ${rawOutput}`);
           stdout: stdoutDbg.text,
           stdoutMeta: { fullLength: stdoutDbg.fullLength, truncated: stdoutDbg.truncated },
           rawOutput: rawDbg.text,
-          rawOutputMeta: { fullLength: rawDbg.fullLength, truncated: rawDbg.truncated },
-          resultTextFromExtract: resultSummaryText || null
+          rawOutputMeta: { fullLength: rawDbg.fullLength, truncated: rawDbg.truncated }
         });
       }
       const retryInfo = extractRateLimitRetryInfo(streamEvents);
@@ -1087,7 +1050,15 @@ ${rawOutput}`);
         log(`${C.red}   ${line}${C.reset}`);
       }
       if (config.verbose) {
-        logClaudeRunFailureDiagnostics(log, stderr, rawOutput);
+        logClaudeRunFailureDiagnostics(log, {
+          exitCode,
+          sessionId,
+          stderr,
+          rawOutput,
+          streamEvents,
+          derivedError: detail2,
+          apiError: errorMsg
+        });
       }
       return;
     }
@@ -1540,10 +1511,20 @@ async function main() {
     await runWithWebSocket(client, config, scheduler);
   }
   if (!scheduler.isEmpty()) {
-    console.log(`\u23F3 Waiting for ${scheduler.activeTaskCount} in-flight task(s)\u2026`);
-    while (!scheduler.isEmpty()) {
+    console.log(
+      `\u23F3 Waiting for ${scheduler.activeTaskCount} in-flight task(s)\u2026 (Ctrl+C to force quit)`
+    );
+    let forceQuit = false;
+    const forceHandler = () => {
+      forceQuit = true;
+    };
+    process.once("SIGINT", forceHandler);
+    process.once("SIGTERM", forceHandler);
+    while (!scheduler.isEmpty() && !forceQuit) {
       await sleep(1e3);
     }
+    process.removeListener("SIGINT", forceHandler);
+    process.removeListener("SIGTERM", forceHandler);
   }
   console.log("\u{1F44B} Goodbye.");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@groupchatai/claude-runner",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Run GroupChat AI agent tasks locally with Claude Code",
   "type": "module",
   "bin": {