@groupchatai/claude-runner 0.2.0 → 0.2.2

package/dist/index.js

@@ -111,11 +111,12 @@ Due: ${new Date(detail.task.dueDate).toLocaleDateString()}`);
     [
       "\n---",
       "RULES:",
-      "- You may create PRs with `gh pr create`. You may push 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.",
       "- 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.",
-      "- When you are done, provide a clear summary of what you accomplished. If you created a PR or made commits, include the PR URL and branch name."
+      "- When you are done, provide a clear summary of what you accomplished including the PR URL and branch name."
     ].join("\n")
   );
   return parts.join("\n");
@@ -125,6 +126,7 @@ var C = {
   dim: "\x1B[2m",
   white: "\x1B[97m",
   grey: "\x1B[90m",
+  lightGrey: "\x1B[37m",
   green: "\x1B[32m",
   red: "\x1B[31m",
   pid: "\x1B[38;2;193;95;60m"
@@ -132,8 +134,21 @@ var C = {
 function pidTag(pid) {
   return `  ${C.pid}[pid ${pid}]${C.reset}`;
 }
+function padForTag(pid) {
+  const tagLen = `  [pid ${pid}] `.length;
+  return " ".repeat(tagLen);
+}
+function wrapLines(tag, pad, text, color) {
+  const lines = text.split("\n").filter((l) => l.trim());
+  if (lines.length === 0) return "";
+  const first = `${tag} ${color}${lines[0]}${C.reset}`;
+  if (lines.length === 1) return first;
+  const rest = lines.slice(1).map((l) => `${pad}${color}${l}${C.reset}`);
+  return [first, ...rest].join("\n");
+}
 function formatStreamEvent(event, pid) {
   const tag = pidTag(pid);
+  const pad = padForTag(pid);
   switch (event.type) {
     case "system":
       if (event.subtype === "init") {
@@ -149,18 +164,17 @@ function formatStreamEvent(event, pid) {
       const parts = [];
       for (const block of blocks) {
         if (block.type === "text" && block.text) {
-          for (const line of block.text.split("\n")) {
-            if (line.trim()) parts.push(`${tag} ${C.white}${line}${C.reset}`);
-          }
+          const wrapped = wrapLines(tag, pad, block.text, C.white);
+          if (wrapped) parts.push(wrapped);
         } else if (block.type === "tool_use" && block.name) {
           let detail = block.name;
           const input = block.input;
           if (input) {
             if (typeof input.file_path === "string") {
-              detail += ` ${C.dim}\u2192${C.grey} ${input.file_path}`;
+              detail += ` ${C.grey}\u2192${C.lightGrey} ${input.file_path}`;
             } else if (typeof input.command === "string") {
               const cmd = input.command.length > 80 ? input.command.slice(0, 77) + "\u2026" : input.command;
-              detail += ` ${C.dim}\u2192${C.grey} ${cmd}`;
+              detail += ` ${C.grey}\u2192${C.lightGrey} ${cmd}`;
             }
           }
           parts.push(`${tag} ${C.grey}${detail}${C.reset}`);
@@ -177,8 +191,8 @@ function formatStreamEvent(event, pid) {
         lines.push(`${tag} ${C.dim}cost: $${cost?.toFixed(4)}${C.reset}`);
       }
       if (event.result) {
-        const preview = event.result.length > 120 ? event.result.slice(0, 117) + "\u2026" : event.result;
-        lines.push(`${tag} ${C.green}\u2713${C.reset} ${C.white}${preview}${C.reset}`);
+        const wrapped = wrapLines(tag, pad, `\u2713 ${event.result}`, C.green);
+        if (wrapped) lines.push(wrapped);
       }
       return lines.length > 0 ? lines.join("\n") : null;
     }
@@ -350,19 +364,50 @@ function extractCost(stdout) {
   return void 0;
 }
 var GITHUB_PR_URL_RE = /https:\/\/github\.com\/[^\s"'<>]+\/pull\/\d+/g;
-function extractPullRequestUrl(stdout) {
+function extractPullRequestUrlFromText(text) {
+  const match = text.match(GITHUB_PR_URL_RE);
+  if (match) return match[match.length - 1];
+  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 match2 = text.match(GITHUB_PR_URL_RE);
-    if (match2) return match2[match2.length - 1];
+    const found = extractPullRequestUrlFromText(text);
+    if (found) return found;
+  }
+  return extractPullRequestUrlFromText(stdout);
+}
+async function detectPullRequestUrl(workDir) {
+  try {
+    const branch = await runShellCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"], workDir);
+    if (!branch || branch === "main" || branch === "master") return void 0;
+    const prUrl = await runShellCommand(
+      "gh",
+      ["pr", "view", branch, "--json", "url", "--jq", ".url"],
+      workDir
+    );
+    if (prUrl && prUrl.includes("github.com")) return prUrl;
+  } catch {
   }
-  const match = stdout.match(GITHUB_PR_URL_RE);
-  if (match) return match[match.length - 1];
   return void 0;
 }
+function runShellCommand(cmd, args, cwd) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(cmd, args, { cwd, stdio: ["ignore", "pipe", "pipe"] });
+    const chunks = [];
+    child.stdout?.on("data", (d) => chunks.push(d));
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code !== 0) return reject(new Error(`${cmd} exited with ${code}`));
+      resolve(Buffer.concat(chunks).toString("utf-8").trim());
+    });
+  });
+}
 async function processRun(client, run, config) {
-  const log = (msg) => console.log(`  [${run.id.slice(-8)}] ${msg}`);
+  const runTag = `  ${C.pid}[${run.id.slice(-8)}]${C.reset}`;
+  const log = (msg) => console.log(`${runTag} ${msg}`);
+  const logGreen = (msg) => console.log(`${runTag} ${C.green}${msg}${C.reset}`);
   const detail = await client.getRunDetail(run.id);
   const ownerName = run.owner?.name ?? detail.owner?.name ?? "unknown";
   log(`\u{1F4CB} "${run.taskTitle}" \u2014 delegated by ${ownerName}`);
@@ -408,22 +453,21 @@ async function processRun(client, run, config) {
     const { process: child, output } = spawnClaudeCode(prompt, config, runOptions);
     log(`\u{1F916} Claude Code spawned (pid ${child.pid})`);
     const { stdout, rawOutput, exitCode } = await output;
-    const pullRequestUrl = extractPullRequestUrl(stdout) ?? extractPullRequestUrl(rawOutput);
+    const pullRequestUrl = await detectPullRequestUrl(config.workDir) ?? extractPullRequestUrlFromOutput(stdout) ?? extractPullRequestUrlFromOutput(rawOutput);
     if (exitCode !== 0) {
       const errorMsg = `Claude Code exited with code ${exitCode}:
 \`\`\`
 ${stdout.slice(0, 2e3)}
 \`\`\``;
       await client.errorRun(run.id, errorMsg, { pullRequestUrl });
-      log(`\u274C Run errored (exit code ${exitCode})`);
+      log(`${C.red}\u274C Run errored (exit code ${exitCode})${C.reset}`);
       return;
     }
     const resultText = extractResultText(stdout);
     const cost = extractCost(stdout);
-    const summary = resultText;
-    await client.completeRun(run.id, summary, { ...cost, pullRequestUrl });
-    if (pullRequestUrl) log(`\u{1F517} PR: ${pullRequestUrl}`);
-    log(`\u2705 Run completed`);
+    await client.completeRun(run.id, resultText, { ...cost, pullRequestUrl });
+    if (pullRequestUrl) logGreen(`\u{1F517} PR: ${pullRequestUrl}`);
+    logGreen(`\u2705 Run completed`);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     const errorBody = `Claude Code runner error:
@@ -433,9 +477,9 @@ ${message.slice(0, 2e3)}
     try {
       await client.errorRun(run.id, errorBody);
     } catch {
-      log(`\u26A0  Failed to report error to API`);
+      log(`${C.dim}\u26A0  Failed to report error to API${C.reset}`);
     }
-    log(`\u274C Error: ${message}`);
+    log(`${C.red}\u274C Error: ${message}${C.reset}`);
   }
 }
 function loadEnvFile() {

package/package.json

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