@groupchatai/claude-runner 0.4.6 → 0.4.8

package/dist/index.js

@@ -114,6 +114,12 @@ ${comment.body}`
       );
     }
   }
+  const existingPrUrl = detail.pullRequestUrl ?? detail.task.pullRequestUrl;
+  if (existingPrUrl) {
+    parts.push(`
+## Existing Pull Request
+${existingPrUrl}`);
+  }
   if (detail.task.dueDate) {
     let dueStr = new Date(detail.task.dueDate).toLocaleDateString();
     if (detail.task.dueTime != null) {
@@ -126,12 +132,18 @@ ${comment.body}`
     parts.push(`
 Due: ${dueStr}`);
   }
+  const prRules = existingPrUrl ? [
+    `- This task already has a PR: ${existingPrUrl}. Push your changes to the EXISTING branch. Do NOT create a new PR.`,
+    "- You may push to existing branches and contribute to existing PRs."
+  ] : [
+    "- When you have made code changes, you MUST create a new branch, commit your changes, push to the remote, and open a PR using `gh pr create`. Do NOT skip PR creation \u2014 always open a real PR.",
+    "- You may push to existing branches and contribute to existing PRs."
+  ];
   parts.push(
     [
       "\n---",
       "RULES:",
-      "- When you have made code changes, you MUST create a new branch, commit your changes, push to the remote, and open a PR using `gh pr create`. Do NOT skip PR creation \u2014 always open a real PR.",
-      "- You may push to existing branches and contribute to existing PRs.",
+      ...prRules,
       "- NEVER run `gh pr merge`. Do NOT merge any PR.",
       "- NEVER run `gh pr close`. Do NOT close any PR.",
       "- NEVER run `git push --force` or `git push -f`. No force pushes.",
@@ -154,8 +166,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());
@@ -277,13 +288,16 @@ function clampUserFacingDetail(text, maxChars) {
 function stripAnsi(text) {
   return text.replace(/\x1b\[[0-9;]*m/g, "");
 }
+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})`];
@@ -304,9 +318,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})`;
@@ -314,7 +327,23 @@ function safeFormatRateLimitPayload(o) {
 }
 function parseClaudeNdjsonEvents(rawOutput) {
   const events = [];
-  for (const line of stripAnsi(rawOutput).split("\n")) {
+  const cleaned = stripAnsi(rawOutput).trim();
+  try {
+    const parsed = JSON.parse(cleaned);
+    if (Array.isArray(parsed)) {
+      for (const item of parsed) {
+        if (item && typeof item === "object" && typeof item.type === "string") {
+          events.push(item);
+        }
+      }
+      return events;
+    }
+    if (parsed && typeof parsed === "object" && typeof parsed.type === "string") {
+      return [parsed];
+    }
+  } catch {
+  }
+  for (const line of cleaned.split("\n")) {
     const t = line.trim();
     if (!t.startsWith("{")) continue;
     try {
@@ -330,8 +359,7 @@ function parseClaudeNdjsonEvents(rawOutput) {
 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");
+  return info.status !== "allowed";
 }
 function extractRateLimitRetryInfo(events) {
   for (const ev of events) {
@@ -339,9 +367,8 @@ function extractRateLimitRetryInfo(events) {
     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;
@@ -382,11 +409,7 @@ function claudeRunShouldReportAsError(exitCode, events) {
   return false;
 }
 function compactTaskErrorForApi(detail) {
-  const s = detail.trim();
-  if (/^rate limit \(/i.test(s)) {
-    return s.split(/\s*—\s*/)[0]?.trim() ?? s;
-  }
-  return s;
+  return detail.trim();
 }
 function spawnClaudeCode(prompt, config, runOptions, resumeSessionId, cwdOverride) {
   const format = config.verbose ? "stream-json" : "json";
@@ -435,31 +458,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) => {
@@ -471,24 +495,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");
@@ -558,10 +566,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);
@@ -645,25 +652,16 @@ function createWorktree(repoDir, taskId, existingBranch) {
 async function resolveExistingPrBranch(detail, workDir) {
   try {
     if (detail.branchName) return detail.branchName;
-    if (detail.pullRequestUrl) {
-      try {
-        const branch2 = await runShellCommand(
-          "gh",
-          ["pr", "view", detail.pullRequestUrl, "--json", "headRefName", "--jq", ".headRefName"],
-          workDir
-        );
-        if (branch2?.trim()) return branch2.trim();
-      } catch {
-      }
-    }
-    const prUrls = [];
+    const candidatePrUrls = [];
+    if (detail.pullRequestUrl) candidatePrUrls.push(detail.pullRequestUrl);
+    if (detail.task.pullRequestUrl) candidatePrUrls.push(detail.task.pullRequestUrl);
     for (const item of detail.activity) {
       if (item.body) {
         const matches = item.body.match(GITHUB_PR_URL_RE);
-        if (matches) prUrls.push(...matches);
+        if (matches) candidatePrUrls.push(...matches);
       }
     }
-    const prUrl = prUrls[prUrls.length - 1];
+    const prUrl = candidatePrUrls[0];
     if (!prUrl) return void 0;
     const branch = await runShellCommand(
       "gh",
@@ -753,7 +751,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;
   }
 }
@@ -931,7 +929,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;
@@ -940,11 +938,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}`);
@@ -974,28 +974,14 @@ 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);
@@ -1068,11 +1054,11 @@ async function processRun(client, run, config, worktreeDir, detail) {
     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,
@@ -1080,8 +1066,8 @@ async function processRun(client, run, config, worktreeDir, detail) {
         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 },
@@ -1185,6 +1171,7 @@ function parseArgs() {
     workDir: process.cwd(),
     pollInterval: 3e4,
     maxConcurrent: 5,
+    command: "run",
     poll: false,
     dryRun: false,
     once: false,
@@ -1234,20 +1221,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;
 }
@@ -1448,7 +1438,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;
@@ -1458,7 +1448,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}`);
       }
@@ -1466,29 +1456,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(`

package/package.json

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