@groupchatai/claude-runner 0.4.7 → 0.4.9

package/dist/index.js

@@ -79,7 +79,7 @@ var GroupChatAgentClient = class {
     return this.request("POST", `/runs/${runId}/comment`, { body });
   }
 };
-function buildClaudePrompt(detail) {
+function buildClaudePrompt(detail, repoResolved) {
   const parts = [];
   parts.push(`# Task: ${detail.task.title}`);
   if (detail.task.description) {
@@ -87,6 +87,19 @@ function buildClaudePrompt(detail) {
 ## Description
 ${detail.task.description}`);
   }
+  if (detail.repoUrl && !repoResolved) {
+    parts.push(
+      [
+        "\n## Repository",
+        detail.repoUrl,
+        "Check if the current working directory is already this repo (compare `git remote get-url origin`).",
+        "If not, check if it exists locally in common locations like ~/Developer, ~/Projects, ~/src, or ~.",
+        "If you find it locally, `cd` into it before starting work.",
+        "If you cannot find it locally, ask the user if they would like you to clone it and where.",
+        "Do NOT clone without the user's confirmation."
+      ].join("\n")
+    );
+  }
   if (detail.prompt && detail.prompt !== detail.task.title) {
     parts.push(`
 ## Instructions
@@ -114,6 +127,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 +145,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 +340,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 +422,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";
@@ -576,6 +613,14 @@ function runShellCommand(cmd, args, cwd) {
   });
 }
 var sessionCache = /* @__PURE__ */ new Map();
+var activeProcesses = /* @__PURE__ */ new Map();
+var stoppedRunIds = /* @__PURE__ */ new Set();
+function stopActiveProcess(runId) {
+  const child = activeProcesses.get(runId);
+  if (!child || child.killed) return;
+  stoppedRunIds.add(runId);
+  child.kill("SIGINT");
+}
 var runCounter = 0;
 var claudeRunnerSignalTeardownDone = false;
 function tryBeginClaudeRunnerSignalTeardown() {
@@ -628,25 +673,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",
@@ -889,7 +925,7 @@ function truncateClaudeDebugString(text) {
     truncated: true
   };
 }
-async function processRun(client, run, config, worktreeDir, detail) {
+async function processRun(client, run, config, worktreeDir, detail, runBaseDir, repoFound) {
   const runNum = ++runCounter;
   const runTag = `  ${C.pid}[${runNum}]${C.reset}`;
   const log = (msg) => console.log(`${runTag} ${msg}`);
@@ -900,7 +936,7 @@ async function processRun(client, run, config, worktreeDir, detail) {
     log(`\u23ED  Run is no longer PENDING (now ${detail.status}), skipping.`);
     return;
   }
-  const prompt = buildClaudePrompt(detail);
+  const prompt = buildClaudePrompt(detail, !!repoFound);
   if (config.dryRun) {
     log("\u{1F3DC}  DRY RUN \u2014 would execute Claude Code with prompt:");
     console.log("---");
@@ -922,7 +958,7 @@ async function processRun(client, run, config, worktreeDir, detail) {
     throw err;
   }
   log("\u25B6  Run started");
-  const effectiveCwd = worktreeDir ?? config.workDir;
+  const effectiveCwd = worktreeDir ?? runBaseDir ?? config.workDir;
   let lastClaude = {
     stderr: "",
     stdout: "",
@@ -958,8 +994,19 @@ async function processRun(client, run, config, worktreeDir, detail) {
       effectiveCwd
     );
     log(`\u{1F916} Claude Code spawned (pid ${child.pid})${isFollowUp ? " (follow-up)" : ""}`);
+    activeProcesses.set(run.id, child);
+    if (stoppedRunIds.has(run.id)) {
+      child.kill("SIGINT");
+    }
     let { stdout, rawOutput, stderr, exitCode, sessionId, streamPrUrl } = await output;
+    activeProcesses.delete(run.id);
     lastClaude = { stderr, stdout, rawOutput, exitCode, sessionId };
+    if (stoppedRunIds.has(run.id)) {
+      stoppedRunIds.delete(run.id);
+      if (sessionId) sessionCache.set(run.taskId, sessionId);
+      log(`\u{1F6D1} Run stopped from UI`);
+      return;
+    }
     if (exitCode !== 0 && isFollowUp) {
       log(`\u26A0  Session resume failed, retrying with fresh session\u2026`);
       sessionCache.delete(run.taskId);
@@ -1098,6 +1145,66 @@ function loadEnvFile() {
     }
   }
 }
+var repoRegistry = /* @__PURE__ */ new Map();
+function normalizeRepoUrl(url) {
+  return url.replace(/\.git$/, "").replace(/^git@github\.com:/, "https://github.com/").toLowerCase();
+}
+function gitRemoteUrl(dir) {
+  try {
+    return execFileSync("git", ["remote", "get-url", "origin"], {
+      cwd: dir,
+      encoding: "utf-8",
+      stdio: "pipe"
+    }).trim();
+  } catch {
+    return void 0;
+  }
+}
+function dirMatchesRepo(dir, repoUrl) {
+  const remote = gitRemoteUrl(dir);
+  if (!remote) return false;
+  return normalizeRepoUrl(remote) === normalizeRepoUrl(repoUrl);
+}
+function scanForRepo(repoUrl) {
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? "";
+  if (!home) return void 0;
+  const searchDirs = ["Developer", "Projects", "src", "dev", "code", "repos"].map(
+    (d) => path.join(home, d)
+  );
+  for (const searchDir of searchDirs) {
+    let entries;
+    try {
+      entries = readdirSync(searchDir);
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (entry.startsWith(".")) continue;
+      const candidate = path.join(searchDir, entry);
+      try {
+        if (!statSync(candidate).isDirectory()) continue;
+      } catch {
+        continue;
+      }
+      if (dirMatchesRepo(candidate, repoUrl)) return candidate;
+    }
+  }
+  return void 0;
+}
+function resolveRepoCwd(repoUrl, currentWorkDir) {
+  const cached = repoRegistry.get(normalizeRepoUrl(repoUrl));
+  if (cached) return cached;
+  if (dirMatchesRepo(currentWorkDir, repoUrl)) {
+    repoRegistry.set(normalizeRepoUrl(repoUrl), currentWorkDir);
+    return currentWorkDir;
+  }
+  const found = scanForRepo(repoUrl);
+  if (found) {
+    repoRegistry.set(normalizeRepoUrl(repoUrl), found);
+    return found;
+  }
+  return void 0;
+}
 function getRunnerPackageInfo() {
   try {
     const here = path.dirname(fileURLToPath(import.meta.url));
@@ -1312,12 +1419,21 @@ async function processRunWithDrain(client, run, scheduler, config) {
     drainSchedulerSlot(scheduler, run);
     return;
   }
+  let runBaseDir = config.workDir;
+  let repoFound = false;
+  if (detail.repoUrl) {
+    const resolved = resolveRepoCwd(detail.repoUrl, config.workDir);
+    if (resolved) {
+      runBaseDir = resolved;
+      repoFound = true;
+    }
+  }
   let worktreeDir;
-  if (config.useWorktrees) {
+  if (config.useWorktrees && (!detail.repoUrl || repoFound)) {
     try {
-      const existingBranch = await resolveExistingPrBranch(detail, config.workDir);
-      worktreeDir = createWorktree(config.workDir, run.taskId, existingBranch);
-      const rel = path.relative(config.workDir, worktreeDir);
+      const existingBranch = await resolveExistingPrBranch(detail, runBaseDir);
+      worktreeDir = createWorktree(runBaseDir, run.taskId, existingBranch);
+      const rel = path.relative(runBaseDir, worktreeDir);
       if (existingBranch) {
         console.log(`  \u{1F333} Worktree from existing PR branch ${existingBranch} \u2192 ${rel}`);
       } else {
@@ -1331,7 +1447,7 @@ async function processRunWithDrain(client, run, scheduler, config) {
   let currentDetail = detail;
   while (current) {
     try {
-      await processRun(client, current, config, worktreeDir, currentDetail);
+      await processRun(client, current, config, worktreeDir, currentDetail, runBaseDir, repoFound);
     } catch (err) {
       console.error(`Unhandled error processing run ${current.id}:`, err);
     }
@@ -1348,14 +1464,19 @@ async function processRunWithDrain(client, run, scheduler, config) {
     }
   }
   if (worktreeDir) {
-    sessionCache.delete(run.taskId);
     try {
-      removeWorktreeSimple(config.workDir, worktreeDir);
+      removeWorktreeSimple(runBaseDir, worktreeDir);
       console.log(`  \u{1F9F9} Worktree cleaned up`);
     } catch (err) {
       console.error(`  \u26A0  Failed to clean up worktree:`, err);
     }
   }
+  if (detail.repoUrl && !repoFound) {
+    const found = resolveRepoCwd(detail.repoUrl, config.workDir);
+    if (found) {
+      console.log(`  \u{1F4C2} Repo cached for future runs: ${found}`);
+    }
+  }
 }
 async function runWithWebSocket(client, config, scheduler) {
   let ConvexClient;
@@ -1380,6 +1501,30 @@ async function runWithWebSocket(client, config, scheduler) {
       handlePendingRuns(runs, scheduler, client, config);
     }
   );
+  let stoppedRunsWarned = false;
+  convex.onUpdate(
+    anyApi.agentWebSocket.stoppedRuns,
+    { token: config.token },
+    (runIds) => {
+      if (!runIds) return;
+      for (const runId of runIds) {
+        if (activeProcesses.has(runId)) {
+          console.log(`  \u{1F6D1} Run stopped from UI \u2014 sending stop signal to Claude Code\u2026`);
+          stopActiveProcess(runId);
+        }
+      }
+    },
+    () => {
+      if (!stoppedRunsWarned) {
+        stoppedRunsWarned = true;
+        if (config.verbose) {
+          console.log(
+            `${C.dim}\u2139  stoppedRuns query not available on server \u2014 stop-from-UI disabled${C.reset}`
+          );
+        }
+      }
+    }
+  );
   await new Promise((resolve) => {
     function shutdown() {
       if (!tryBeginClaudeRunnerSignalTeardown()) return;
@@ -1429,6 +1574,16 @@ async function runWithPolling(client, config, scheduler) {
     return;
   }
   while (running) {
+    for (const runId of activeProcesses.keys()) {
+      try {
+        const detail = await client.getRunDetail(runId);
+        if (detail.status === "STOPPED") {
+          console.log(`  \u{1F6D1} Run stopped from UI \u2014 sending stop signal to Claude Code\u2026`);
+          stopActiveProcess(runId);
+        }
+      } catch {
+      }
+    }
     try {
       const pending = await client.listPendingRuns();
       handlePendingRuns(pending, scheduler, client, config);

package/package.json

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