@groupchatai/claude-runner 0.2.3 → 0.3.1

package/dist/index.js

@@ -240,11 +240,15 @@ var ALLOWED_TOOLS = [
   "TodoWrite",
   "NotebookEdit"
 ];
-function spawnClaudeCode(prompt, config, runOptions) {
+function spawnClaudeCode(prompt, config, runOptions, resumeSessionId) {
   const format = config.verbose ? "stream-json" : "json";
-  const args = [
-    "-p",
-    prompt,
+  const args = [];
+  if (resumeSessionId) {
+    args.push("--resume", resumeSessionId, "-p", prompt);
+  } else {
+    args.push("-p", prompt);
+  }
+  args.push(
     "--output-format",
     format,
     "--verbose",
@@ -252,7 +256,7 @@ function spawnClaudeCode(prompt, config, runOptions) {
     "default",
     "--allowedTools",
     ...ALLOWED_TOOLS
-  ];
+  );
   const model = runOptions?.model ?? config.model;
   if (model) {
     args.push("--model", model);
@@ -263,61 +267,97 @@ function spawnClaudeCode(prompt, config, runOptions) {
     env: { ...process.env }
   });
   const pid = child.pid ?? 0;
-  const output = new Promise(
-    (resolve, reject) => {
-      const chunks = [];
-      const errChunks = [];
-      let lineBuf = "";
-      let lastResultJson = "";
-      child.stdout?.on("data", (data) => {
-        chunks.push(data);
-        if (!config.verbose) return;
-        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 === "result") lastResultJson = trimmed;
+  const output = new Promise((resolve, reject) => {
+    const chunks = [];
+    const errChunks = [];
+    let lineBuf = "";
+    let lastResultJson = "";
+    let capturedSessionId;
+    let capturedPrUrl;
+    function checkEventForPrUrl(event) {
+      if (capturedPrUrl) return;
+      const texts = [];
+      if (event.message?.content) {
+        for (const block of event.message.content) {
+          if (block.text) texts.push(block.text);
+        }
+      }
+      if (event.content_block?.text) texts.push(event.content_block.text);
+      if (typeof event.result === "string") texts.push(event.result);
+      const combined = texts.join("\n");
+      const match = combined.match(GITHUB_PR_URL_RE);
+      if (match) capturedPrUrl = match[match.length - 1];
+    }
+    child.stdout?.on("data", (data) => {
+      chunks.push(data);
+      const text = data.toString("utf-8");
+      lineBuf += text;
+      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 {
+          }
+        } catch {
+          if (config.verbose) {
             console.log(`${pidTag(pid)} ${C.dim}${trimmed}${C.reset}`);
           }
         }
-      });
-      child.stderr?.on("data", (data) => {
-        errChunks.push(data);
-        if (config.verbose) {
-          const text = data.toString("utf-8").trimEnd();
-          if (text) console.error(`${pidTag(pid)} ${C.dim}${text}${C.reset}`);
-        }
-      });
-      child.on("error", (err) => reject(new Error(`Failed to spawn claude: ${err.message}`)));
-      child.on("close", (code) => {
-        if (config.verbose && lineBuf.trim()) {
-          try {
-            const event = JSON.parse(lineBuf.trim());
-            if (event.type === "result") lastResultJson = lineBuf.trim();
+      }
+    });
+    child.stderr?.on("data", (data) => {
+      errChunks.push(data);
+      if (config.verbose) {
+        const text = data.toString("utf-8").trimEnd();
+        if (text) console.error(`${pidTag(pid)} ${C.dim}${text}${C.reset}`);
+      }
+    });
+    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 {
+          }
+        } catch {
+          if (config.verbose) {
             console.log(`${pidTag(pid)} ${C.dim}${lineBuf.trim()}${C.reset}`);
           }
         }
-        const rawOutput = Buffer.concat(chunks).toString("utf-8");
-        const stdout = config.verbose ? lastResultJson || rawOutput : rawOutput;
-        const stderr = Buffer.concat(errChunks).toString("utf-8");
-        if (code !== 0 && stdout.trim().length === 0) {
-          reject(new Error(`claude exited with code ${code}: ${stderr}`));
-        } else {
-          resolve({ stdout, rawOutput, exitCode: code ?? 0 });
-        }
-      });
-    }
-  );
+      }
+      const rawOutput = Buffer.concat(chunks).toString("utf-8");
+      const stdout = config.verbose ? lastResultJson || rawOutput : rawOutput;
+      const stderr = Buffer.concat(errChunks).toString("utf-8");
+      if (code !== 0 && stdout.trim().length === 0) {
+        reject(new Error(`claude exited with code ${code}: ${stderr}`));
+      } else {
+        resolve({
+          stdout,
+          rawOutput,
+          exitCode: code ?? 0,
+          sessionId: capturedSessionId,
+          streamPrUrl: capturedPrUrl
+        });
+      }
+    });
+  });
   return { process: child, output };
 }
 function findResultEvent(stdout) {
@@ -404,6 +444,7 @@ function runShellCommand(cmd, args, cwd) {
     });
   });
 }
+var sessionCache = /* @__PURE__ */ new Map();
 async function processRun(client, run, config) {
   const runTag = `  ${C.pid}[${run.id.slice(-8)}]${C.reset}`;
   const log = (msg) => console.log(`${runTag} ${msg}`);
@@ -446,14 +487,41 @@ async function processRun(client, run, config) {
       });
       await new Promise((resolve) => git.on("close", () => resolve()));
     }
+    const cachedSessionId = sessionCache.get(run.taskId);
+    const isFollowUp = cachedSessionId !== void 0;
+    const effectivePrompt = isFollowUp ? detail.prompt : prompt;
+    const resumeSession = isFollowUp ? cachedSessionId : void 0;
     if (config.verbose) {
-      log(`\u{1F4DD} Prompt (${prompt.length} chars)`);
+      if (isFollowUp) {
+        log(`\u{1F504} Resuming session ${cachedSessionId.slice(0, 12)}\u2026`);
+      }
+      log(`\u{1F4DD} Prompt (${effectivePrompt.length} chars)`);
       if (effectiveModel) log(`\u{1F9E0} Model: ${effectiveModel}`);
     }
-    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 = await detectPullRequestUrl(config.workDir) ?? extractPullRequestUrlFromOutput(stdout) ?? extractPullRequestUrlFromOutput(rawOutput);
+    const { process: child, output } = spawnClaudeCode(
+      effectivePrompt,
+      config,
+      runOptions,
+      resumeSession
+    );
+    log(`\u{1F916} Claude Code spawned (pid ${child.pid})${isFollowUp ? " (follow-up)" : ""}`);
+    let { stdout, rawOutput, exitCode, sessionId, streamPrUrl } = await output;
+    if (exitCode !== 0 && isFollowUp) {
+      log(`\u26A0  Session resume failed, retrying with fresh session\u2026`);
+      sessionCache.delete(run.taskId);
+      const retry = spawnClaudeCode(prompt, config, runOptions);
+      log(`\u{1F916} Claude Code spawned (pid ${retry.process.pid}) (fresh)`);
+      const retryResult = await retry.output;
+      stdout = retryResult.stdout;
+      rawOutput = retryResult.rawOutput;
+      exitCode = retryResult.exitCode;
+      sessionId = retryResult.sessionId;
+      streamPrUrl = retryResult.streamPrUrl;
+    }
+    if (sessionId) {
+      sessionCache.set(run.taskId, sessionId);
+    }
+    const pullRequestUrl = streamPrUrl ?? await detectPullRequestUrl(config.workDir) ?? extractPullRequestUrlFromOutput(stdout) ?? extractPullRequestUrlFromOutput(rawOutput);
     if (exitCode !== 0) {
       const errorMsg = `Claude Code exited with code ${exitCode}:
 \`\`\`

package/package.json

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