@groupchatai/claude-runner 0.4.11 → 0.4.13

package/dist/index.js

@@ -2,8 +2,18 @@
 
 // src/index.ts
 import { spawn, execFileSync } from "child_process";
-import { readFileSync, readdirSync, statSync, writeFileSync, existsSync, rmSync } from "fs";
+import {
+  readFileSync,
+  readdirSync,
+  statSync,
+  writeFileSync,
+  existsSync,
+  rmSync,
+  mkdirSync,
+  unlinkSync
+} from "fs";
 import path from "path";
+import { homedir } from "os";
 import { fileURLToPath } from "url";
 var API_URL = "https://groupchat.ai";
 var CONVEX_URL = "https://fantastic-jay-464.convex.cloud";
@@ -83,14 +93,19 @@ function buildResumedPrompt(detail, agentUserId) {
   const comments = detail.activity.filter(
     (a) => a.type === "comment" && a.body && a.body.trim().length > 0
   );
-  let lastAgentCommentIdx = -1;
-  for (let i = comments.length - 1; i >= 0; i--) {
+  const agentCommentIndices = [];
+  for (let i = 0; i < comments.length; i++) {
     if (comments[i].userId === agentUserId) {
-      lastAgentCommentIdx = i;
-      break;
+      agentCommentIndices.push(i);
     }
   }
-  const newComments = comments.slice(lastAgentCommentIdx + 1).filter((c) => c.userId !== agentUserId);
+  let cutoffIdx = -1;
+  if (agentCommentIndices.length >= 2) {
+    cutoffIdx = agentCommentIndices[agentCommentIndices.length - 2];
+  } else if (agentCommentIndices.length === 1) {
+    cutoffIdx = agentCommentIndices[0];
+  }
+  const newComments = comments.slice(cutoffIdx + 1).filter((c) => c.userId !== agentUserId);
   const parts = [];
   if (newComments.length > 0) {
     parts.push("New comments since your last response:");
@@ -200,8 +215,7 @@ Due: ${dueStr}`);
       ...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.",
-      "- When you are done, provide a clear summary of what you accomplished."
+      "- NEVER run `git push --force` or `git push -f`. No force pushes."
     ].join("\n")
   );
   return parts.join("\n");
@@ -230,13 +244,13 @@ function wrapLines(tag, pad, text, color) {
   const rest = lines.slice(1).map((l) => `${pad}${color}${l}${C.reset}`);
   return [first, ...rest].join("\n");
 }
-function formatStreamEvent(event, pid) {
+function formatStreamEvent(event, pid, isResumed) {
   const tag = pidTag(pid);
   const pad = padForTag(pid);
   switch (event.type) {
     case "system":
       if (event.subtype === "init") {
-        let line = `${tag} ${C.dim}session started`;
+        let line = `${tag} ${C.dim}session ${isResumed ? "resumed" : "started"}`;
         if (event.session_id) line += ` (${event.session_id})`;
         line += C.reset;
         return line;
@@ -521,7 +535,7 @@ function spawnClaudeCode(prompt, config, runOptions, resumeSessionId, cwdOverrid
         if (event.type === "result") lastResultJson = trimmed;
         checkEventForPrUrl(event);
         if (config.verbose) {
-          const formatted = formatStreamEvent(event, pid);
+          const formatted = formatStreamEvent(event, pid, !!resumeSessionId);
           if (formatted) console.log(formatted);
         }
       } catch {
@@ -703,12 +717,22 @@ function createWorktree(repoDir, taskId, existingBranch) {
     return worktreePath;
   }
   const baseBranch = getDefaultBranch(repoDir);
-  const branchName = `agent/${name}-${Date.now()}`;
+  const branchName = `agent/${name}`;
   try {
     execGit(["fetch", "origin", baseBranch, "--quiet"], repoDir);
   } catch {
   }
-  execGit(["worktree", "add", "-b", branchName, worktreePath, `origin/${baseBranch}`], repoDir);
+  let branchExists = false;
+  try {
+    execGit(["rev-parse", "--verify", branchName], repoDir);
+    branchExists = true;
+  } catch {
+  }
+  if (branchExists) {
+    execGit(["worktree", "add", worktreePath, branchName], repoDir);
+  } else {
+    execGit(["worktree", "add", "-b", branchName, worktreePath, `origin/${baseBranch}`], repoDir);
+  }
   writeFileSync(path.join(worktreePath, ".agent-branch"), branchName, "utf-8");
   return worktreePath;
 }
@@ -819,11 +843,6 @@ async function removeWorktree(workDir, info) {
   }
 }
 function removeWorktreeSimple(repoDir, worktreePath) {
-  let branchName;
-  try {
-    branchName = readFileSync(path.join(worktreePath, ".agent-branch"), "utf-8").trim();
-  } catch {
-  }
   try {
     execGit(["worktree", "remove", worktreePath, "--force"], repoDir);
   } catch {
@@ -833,12 +852,6 @@ function removeWorktreeSimple(repoDir, worktreePath) {
     } catch {
     }
   }
-  if (branchName) {
-    try {
-      execGit(["branch", "-D", branchName], repoDir);
-    } catch {
-    }
-  }
 }
 async function startupSweep(workDir) {
   const worktrees = await listOurWorktrees(workDir);
@@ -1213,6 +1226,76 @@ ${message.slice(0, 2e3)}
     log(`${C.red}\u274C Error: ${message}${C.reset}`);
   }
 }
+function globalConfigDir() {
+  return path.join(homedir(), ".config", "groupchat");
+}
+function globalConfigPath() {
+  return path.join(globalConfigDir(), "config");
+}
+function readGlobalConfig() {
+  try {
+    const contents = readFileSync(globalConfigPath(), "utf-8");
+    const config = {};
+    for (const line of contents.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const eqIdx = trimmed.indexOf("=");
+      if (eqIdx === -1) continue;
+      const key = trimmed.slice(0, eqIdx).trim();
+      let value = trimmed.slice(eqIdx + 1).trim();
+      if (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'")) {
+        value = value.slice(1, -1);
+      }
+      config[key] = value;
+    }
+    return config;
+  } catch {
+    return {};
+  }
+}
+function writeGlobalConfig(config) {
+  const dir = globalConfigDir();
+  mkdirSync(dir, { recursive: true });
+  const lines = Object.entries(config).map(([k, v]) => `${k}=${v}`);
+  writeFileSync(globalConfigPath(), lines.join("\n") + "\n", "utf-8");
+}
+function handleLogin(token) {
+  if (!token) {
+    console.error("Usage: npx @groupchatai/claude-runner login <gca_token>");
+    process.exit(1);
+  }
+  if (!token.startsWith("gca_")) {
+    console.error(`Error: Token must start with gca_ (got "${token.slice(0, 8)}\u2026")`);
+    process.exit(1);
+  }
+  const config = readGlobalConfig();
+  config.GCA_TOKEN = token;
+  writeGlobalConfig(config);
+  console.log(`\u2705 Token saved to ${globalConfigPath()}`);
+  console.log(`   You can now run the agent from any directory.`);
+}
+function handleLogout() {
+  const configFile = globalConfigPath();
+  if (!existsSync(configFile)) {
+    console.log("No saved token found.");
+    return;
+  }
+  const config = readGlobalConfig();
+  if (!config.GCA_TOKEN) {
+    console.log("No saved token found.");
+    return;
+  }
+  delete config.GCA_TOKEN;
+  if (Object.keys(config).length === 0) {
+    try {
+      unlinkSync(configFile);
+    } catch {
+    }
+  } else {
+    writeGlobalConfig(config);
+  }
+  console.log("\u2705 Token removed.");
+}
 function loadEnvFile() {
   const candidates = [".env.local", ".env"];
   for (const file of candidates) {
@@ -1321,8 +1404,10 @@ function showHelp() {
 Usage: npx @groupchatai/claude-runner [command] [options]
 
 Commands:
-  (default)    Start the agent runner
-  cleanup      Interactively review and remove stale worktrees
+  (default)           Start the agent runner
+  login <gca_token>   Save your agent token for use from any directory
+  logout              Remove saved agent token
+  cleanup             Interactively review and remove stale worktrees
 
 Options:
   --work-dir <path>     Repo directory for Claude Code to work in (default: cwd)
@@ -1338,6 +1423,12 @@ Options:
   -h, --help            Show this help message
   -v, -version, --version  Print version and exit
 
+Token resolution order:
+  1. --token flag
+  2. GCA_TOKEN env var
+  3. .env.local / .env in current directory
+  4. ~/.config/groupchat/config (saved via 'login' command)
+
 Environment variables:
   GCA_TOKEN             Agent token (gca_...)
   GCA_API_URL           API URL override
@@ -1347,9 +1438,20 @@ Environment variables:
 }
 function parseArgs() {
   loadEnvFile();
-  const args = process.argv.slice(2);
+  const rawArgs = process.argv.slice(2);
+  if (rawArgs[0] === "login") {
+    handleLogin(rawArgs[1] ?? "");
+    process.exit(0);
+  }
+  if (rawArgs[0] === "logout") {
+    handleLogout();
+    process.exit(0);
+  }
+  const globalConfig = readGlobalConfig();
+  const resolvedToken = process.env.GCA_TOKEN || globalConfig.GCA_TOKEN || "";
+  const args = rawArgs;
   const config = {
-    token: process.env.GCA_TOKEN ?? "",
+    token: resolvedToken,
     apiUrl: process.env.GCA_API_URL ?? API_URL,
     convexUrl: process.env.GCA_CONVEX_URL ?? CONVEX_URL,
     workDir: process.cwd(),
@@ -1415,7 +1517,12 @@ function parseArgs() {
   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_...");
+      console.error("");
+      console.error("  To save your token globally (recommended):");
+      console.error("    npx @groupchatai/claude-runner login gca_...");
+      console.error("");
+      console.error("  Or pass it directly:");
+      console.error("    --token gca_...  or  GCA_TOKEN=gca_... in .env.local");
       process.exit(1);
     }
     if (!config.token.startsWith("gca_")) {

package/package.json

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