@groupchatai/claude-runner 0.4.5 → 0.4.7

package/dist/index.js

@@ -154,8 +154,7 @@ function pidTag(pid) {
   return `  ${C.pid}[pid ${pid}]${C.reset}`;
 }
 function padForTag(pid) {
-  const tagLen = `  [pid ${pid}] `.length;
-  return " ".repeat(tagLen);
+  return " ".repeat(8 + String(pid).length);
 }
 function wrapLines(tag, pad, text, color) {
   const lines = text.split("\n").filter((l) => l.trim());
@@ -203,6 +202,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,22 +276,16 @@ 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 errMsg(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function normalizeEpochMs(raw) {
+  if (typeof raw !== "number" || !Number.isFinite(raw)) return null;
+  return raw > 1e10 ? raw : raw * 1e3;
 }
 function formatAnthropicRateLimitPayload(o) {
   const rateLimitTypeRaw = typeof o.rateLimitType === "string" ? o.rateLimitType.replace(/_/g, " ") : "unknown";
-  const rawReset = o.resetsAt;
-  let resetMs = null;
-  if (typeof rawReset === "number" && Number.isFinite(rawReset)) {
-    resetMs = rawReset > 1e10 ? rawReset : rawReset * 1e3;
-  }
+  const resetMs = normalizeEpochMs(o.resetsAt);
   const status = typeof o.status === "string" ? o.status : null;
   const overageReason = typeof o.overageDisabledReason === "string" ? o.overageDisabledReason : null;
   const parts = [`Rate limit (${rateLimitTypeRaw})`];
@@ -303,9 +306,8 @@ function safeFormatRateLimitPayload(o) {
     return formatAnthropicRateLimitPayload(o);
   } catch {
     const rt = typeof o.rateLimitType === "string" ? o.rateLimitType : "unknown";
-    const rawReset = o.resetsAt;
-    if (typeof rawReset === "number" && Number.isFinite(rawReset)) {
-      const ms = rawReset > 1e10 ? rawReset : rawReset * 1e3;
+    const ms = normalizeEpochMs(o.resetsAt);
+    if (ms !== null) {
       return `Rate limit (${rt}) \u2014 resets at ${new Date(ms).toISOString()} UTC`;
     }
     return `Rate limit (${rt})`;
@@ -326,88 +328,40 @@ 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;
+  return info.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;
-    if (typeof raw !== "number" || !Number.isFinite(raw)) continue;
-    const ms = raw > 1e10 ? raw : raw * 1e3;
+    const ms = normalizeEpochMs(info.resetsAt);
+    if (ms === null) continue;
     return { errorType: "rate_limit", retryAfterMs: ms };
   }
   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 +371,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) {
@@ -490,31 +434,32 @@ function spawnClaudeCode(prompt, config, runOptions, resumeSessionId, cwdOverrid
       const match = combined.match(GITHUB_PR_URL_RE);
       if (match) capturedPrUrl = match[match.length - 1];
     }
+    function processLine(trimmed) {
+      try {
+        const event = JSON.parse(trimmed);
+        if (event.type === "system" && event.subtype === "init" && event.session_id) {
+          capturedSessionId = event.session_id;
+        }
+        if (event.type === "result") lastResultJson = trimmed;
+        checkEventForPrUrl(event);
+        if (config.verbose) {
+          const formatted = formatStreamEvent(event, pid);
+          if (formatted) console.log(formatted);
+        }
+      } catch {
+        if (config.verbose) {
+          console.log(`${pidTag(pid)} ${C.dim}${trimmed}${C.reset}`);
+        }
+      }
+    }
     child.stdout?.on("data", (data) => {
       chunks.push(data);
-      const text = data.toString("utf-8");
-      lineBuf += text;
+      lineBuf += data.toString("utf-8");
       const lines = lineBuf.split("\n");
       lineBuf = lines.pop() ?? "";
       for (const line of lines) {
         const trimmed = line.trim();
-        if (!trimmed) continue;
-        try {
-          const event = JSON.parse(trimmed);
-          if (event.type === "system" && event.subtype === "init" && event.session_id) {
-            capturedSessionId = event.session_id;
-          }
-          if (event.type === "result") lastResultJson = trimmed;
-          checkEventForPrUrl(event);
-          if (config.verbose) {
-            const formatted = formatStreamEvent(event, pid);
-            if (formatted) console.log(formatted);
-          }
-        } catch {
-          if (config.verbose) {
-            console.log(`${pidTag(pid)} ${C.dim}${trimmed}${C.reset}`);
-          }
-        }
+        if (trimmed) processLine(trimmed);
       }
     });
     child.stderr?.on("data", (data) => {
@@ -526,24 +471,8 @@ function spawnClaudeCode(prompt, config, runOptions, resumeSessionId, cwdOverrid
     });
     child.on("error", (err) => reject(new Error(`Failed to spawn claude: ${err.message}`)));
     child.on("close", (code) => {
-      if (lineBuf.trim()) {
-        try {
-          const event = JSON.parse(lineBuf.trim());
-          if (event.type === "system" && event.subtype === "init" && event.session_id) {
-            capturedSessionId = event.session_id;
-          }
-          if (event.type === "result") lastResultJson = lineBuf.trim();
-          checkEventForPrUrl(event);
-          if (config.verbose) {
-            const formatted = formatStreamEvent(event, pid);
-            if (formatted) console.log(formatted);
-          }
-        } catch {
-          if (config.verbose) {
-            console.log(`${pidTag(pid)} ${C.dim}${lineBuf.trim()}${C.reset}`);
-          }
-        }
-      }
+      const remaining = lineBuf.trim();
+      if (remaining) processLine(remaining);
       const rawOutput = Buffer.concat(chunks).toString("utf-8");
       const stdout = config.verbose ? lastResultJson || rawOutput : rawOutput;
       const stderr = Buffer.concat(errChunks).toString("utf-8");
@@ -613,10 +542,9 @@ function extractPullRequestUrlFromText(text) {
   return void 0;
 }
 function extractPullRequestUrlFromOutput(stdout) {
-  const event = findResultEvent(stdout);
-  if (event) {
-    const text = typeof event.result === "string" ? event.result : typeof event.text === "string" ? event.text : "";
-    const found = extractPullRequestUrlFromText(text);
+  const resultText = extractResultText(stdout);
+  if (resultText !== stdout) {
+    const found = extractPullRequestUrlFromText(resultText);
     if (found) return found;
   }
   return extractPullRequestUrlFromText(stdout);
@@ -808,7 +736,7 @@ async function removeWorktree(workDir, info) {
     }
     return true;
   } catch (err) {
-    console.error(`  Failed to remove ${info.name}: ${err instanceof Error ? err.message : err}`);
+    console.error(`  Failed to remove ${info.name}: ${errMsg(err)}`);
     return false;
   }
 }
@@ -892,23 +820,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}`);
 }
@@ -958,7 +914,7 @@ async function processRun(client, run, config, worktreeDir, detail) {
   try {
     await client.startRun(run.id, startMsg);
   } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
+    const msg = errMsg(err);
     if (msg.includes("not pending") || msg.includes("not PENDING") || msg.includes("400")) {
       log(`\u23ED  Run was already claimed, skipping.`);
       return;
@@ -967,11 +923,13 @@ async function processRun(client, run, config, worktreeDir, detail) {
   }
   log("\u25B6  Run started");
   const effectiveCwd = worktreeDir ?? config.workDir;
-  let lastClaudeStderr = "";
-  let lastClaudeStdout = "";
-  let lastClaudeRawOutput = "";
-  let lastClaudeExitCode = null;
-  let lastClaudeSessionId;
+  let lastClaude = {
+    stderr: "",
+    stdout: "",
+    rawOutput: "",
+    exitCode: null,
+    sessionId: void 0
+  };
   try {
     if (!worktreeDir && runOptions.branch) {
       log(`\u{1F33F} Checking out branch: ${runOptions.branch}`);
@@ -1001,45 +959,23 @@ async function processRun(client, run, config, worktreeDir, detail) {
     );
     log(`\u{1F916} Claude Code spawned (pid ${child.pid})${isFollowUp ? " (follow-up)" : ""}`);
     let { stdout, rawOutput, stderr, exitCode, sessionId, streamPrUrl } = await output;
-    lastClaudeStderr = stderr;
-    lastClaudeStdout = stdout;
-    lastClaudeRawOutput = rawOutput;
-    lastClaudeExitCode = exitCode;
-    lastClaudeSessionId = sessionId;
+    lastClaude = { stderr, stdout, rawOutput, exitCode, sessionId };
     if (exitCode !== 0 && isFollowUp) {
       log(`\u26A0  Session resume failed, retrying with fresh session\u2026`);
       sessionCache.delete(run.taskId);
       const retry = spawnClaudeCode(prompt, config, runOptions, void 0, effectiveCwd);
       log(`\u{1F916} Claude Code spawned (pid ${retry.process.pid}) (fresh)`);
-      const retryResult = await retry.output;
-      stdout = retryResult.stdout;
-      rawOutput = retryResult.rawOutput;
-      stderr = retryResult.stderr;
-      exitCode = retryResult.exitCode;
-      sessionId = retryResult.sessionId;
-      streamPrUrl = retryResult.streamPrUrl;
-      lastClaudeStderr = stderr;
-      lastClaudeStdout = stdout;
-      lastClaudeRawOutput = rawOutput;
-      lastClaudeExitCode = exitCode;
-      lastClaudeSessionId = sessionId;
+      ({ stdout, rawOutput, stderr, exitCode, sessionId, streamPrUrl } = await retry.output);
+      lastClaude = { stderr, stdout, rawOutput, exitCode, sessionId };
     }
     if (sessionId) {
       sessionCache.set(run.taskId, sessionId);
     }
     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 +986,6 @@ ${rawOutput}`);
           taskId: run.taskId,
           taskTitle: run.taskTitle,
           exitCode,
-          usageCap,
           sessionId: sessionId ?? null,
           streamPrUrl: streamPrUrl ?? null,
           pullRequestUrl: pullRequestUrl ?? null,
@@ -1062,8 +997,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 +1021,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;
     }
@@ -1097,11 +1039,11 @@ ${rawOutput}`);
     if (pullRequestUrl) logGreen(`\u{1F517} PR: ${pullRequestUrl}`);
     logGreen(`\u2705 Run completed`);
   } catch (err) {
-    const message = err instanceof Error ? err.message : String(err);
+    const message = errMsg(err);
     const stack = err instanceof Error ? err.stack : void 0;
-    const stderrDbg = truncateClaudeDebugString(stripAnsi(lastClaudeStderr));
-    const stdoutDbg = truncateClaudeDebugString(stripAnsi(lastClaudeStdout));
-    const rawDbg = truncateClaudeDebugString(stripAnsi(lastClaudeRawOutput));
+    const stderrDbg = truncateClaudeDebugString(stripAnsi(lastClaude.stderr));
+    const stdoutDbg = truncateClaudeDebugString(stripAnsi(lastClaude.stdout));
+    const rawDbg = truncateClaudeDebugString(stripAnsi(lastClaude.rawOutput));
     if (process.env.GCA_DEBUG_CLAUDE_RAW === "1") {
       logClaudeRawFailureJson({
         runId: run.id,
@@ -1109,8 +1051,8 @@ ${rawOutput}`);
         taskTitle: run.taskTitle,
         thrownMessage: message,
         thrownStack: stack ?? null,
-        exitCode: lastClaudeExitCode,
-        sessionId: lastClaudeSessionId ?? null,
+        exitCode: lastClaude.exitCode,
+        sessionId: lastClaude.sessionId ?? null,
         note: "Thrown before or after Claude finished; fields may be empty.",
         stderr: stderrDbg.text,
         stderrMeta: { fullLength: stderrDbg.fullLength, truncated: stderrDbg.truncated },
@@ -1214,6 +1156,7 @@ function parseArgs() {
     workDir: process.cwd(),
     pollInterval: 3e4,
     maxConcurrent: 5,
+    command: "run",
     poll: false,
     dryRun: false,
     once: false,
@@ -1263,20 +1206,23 @@ function parseArgs() {
         config.useWorktrees = false;
         break;
       case "cleanup":
+        config.command = "cleanup";
         break;
       default:
         console.error(`Unknown argument: ${arg}`);
         process.exit(1);
     }
   }
-  if (!config.token) {
-    console.error("Error: No agent token found.");
-    console.error("  Add GCA_TOKEN=gca_... to .env.local, or pass --token gca_...");
-    process.exit(1);
-  }
-  if (!config.token.startsWith("gca_")) {
-    console.error(`Error: Token must start with gca_ (got "${config.token.slice(0, 8)}\u2026")`);
-    process.exit(1);
+  if (config.command !== "cleanup") {
+    if (!config.token) {
+      console.error("Error: No agent token found.");
+      console.error("  Add GCA_TOKEN=gca_... to .env.local, or pass --token gca_...");
+      process.exit(1);
+    }
+    if (!config.token.startsWith("gca_")) {
+      console.error(`Error: Token must start with gca_ (got "${config.token.slice(0, 8)}\u2026")`);
+      process.exit(1);
+    }
   }
   return config;
 }
@@ -1477,7 +1423,7 @@ async function runWithPolling(client, config, scheduler) {
       const pending = await client.listPendingRuns();
       handlePendingRuns(pending, scheduler, client, config);
     } catch (err) {
-      console.error(`Poll error: ${err instanceof Error ? err.message : err}`);
+      console.error(`Poll error: ${errMsg(err)}`);
     }
     while (!scheduler.isEmpty()) await sleep(1e3);
     return;
@@ -1487,7 +1433,7 @@ async function runWithPolling(client, config, scheduler) {
       const pending = await client.listPendingRuns();
       handlePendingRuns(pending, scheduler, client, config);
     } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err);
+      const msg = errMsg(err);
       if (config.verbose || !msg.includes("fetch")) {
         console.error(`Poll error: ${msg}`);
       }
@@ -1495,29 +1441,18 @@ async function runWithPolling(client, config, scheduler) {
     await sleep(config.pollInterval);
   }
 }
-function wantsVersionOnly(argv) {
-  return argv.some((a) => a === "--version" || a === "-v" || a === "-version");
-}
 async function main() {
-  const argv = process.argv.slice(2);
-  if (wantsVersionOnly(argv)) {
-    showVersion();
-  }
-  if (process.argv.includes("cleanup")) {
-    loadEnvFile();
-    const workDir = process.cwd();
-    const workDirIdx = process.argv.indexOf("--work-dir");
-    const resolvedDir = workDirIdx >= 0 ? path.resolve(process.argv[workDirIdx + 1] ?? ".") : workDir;
-    await interactiveCleanup(resolvedDir);
+  const config = parseArgs();
+  if (config.command === "cleanup") {
+    await interactiveCleanup(config.workDir);
     return;
   }
-  const config = parseArgs();
   const client = new GroupChatAgentClient(config.apiUrl, config.token);
   let me;
   try {
     me = await client.getMe();
   } catch (err) {
-    console.error("Failed to authenticate:", err instanceof Error ? err.message : err);
+    console.error("Failed to authenticate:", errMsg(err));
     process.exit(1);
   }
   console.log(`
@@ -1540,10 +1475,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.7",
   "description": "Run GroupChat AI agent tasks locally with Claude Code",
   "type": "module",
   "bin": {