@groupchatai/claude-runner 0.4.7 → 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.",
@@ -315,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 {
@@ -381,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";
@@ -628,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",

package/package.json

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