@groupchatai/claude-runner 0.4.9 → 0.4.11

package/dist/index.js

@@ -79,6 +79,39 @@ var GroupChatAgentClient = class {
     return this.request("POST", `/runs/${runId}/comment`, { body });
   }
 };
+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--) {
+    if (comments[i].userId === agentUserId) {
+      lastAgentCommentIdx = i;
+      break;
+    }
+  }
+  const newComments = comments.slice(lastAgentCommentIdx + 1).filter((c) => c.userId !== agentUserId);
+  const parts = [];
+  if (newComments.length > 0) {
+    parts.push("New comments since your last response:");
+    for (const c of newComments) {
+      const author = c.userName ?? "Someone";
+      parts.push(`
+**${author}**:
+${c.body}`);
+    }
+  }
+  if (detail.lastFollowUpMessage && detail.lastFollowUpMessage !== "Continue working on this task.") {
+    parts.push(`
+Follow-up request: ${detail.lastFollowUpMessage}`);
+  }
+  if (parts.length === 0) {
+    parts.push(
+      "The user has asked you to continue working on this task. Check the conversation history and address any outstanding requests."
+    );
+  }
+  return parts.join("\n");
+}
 function buildClaudePrompt(detail, repoResolved) {
   const parts = [];
   parts.push(`# Task: ${detail.task.title}`);
@@ -127,6 +160,14 @@ ${comment.body}`
       );
     }
   }
+  if (detail.lastFollowUpMessage) {
+    parts.push(
+      `
+## Latest Follow-up Request
+The user has sent a follow-up message. Address this:
+${detail.lastFollowUpMessage}`
+    );
+  }
   const existingPrUrl = detail.pullRequestUrl ?? detail.task.pullRequestUrl;
   if (existingPrUrl) {
     parts.push(`
@@ -613,6 +654,7 @@ function runShellCommand(cmd, args, cwd) {
   });
 }
 var sessionCache = /* @__PURE__ */ new Map();
+var currentAgentUserId = "";
 var activeProcesses = /* @__PURE__ */ new Map();
 var stoppedRunIds = /* @__PURE__ */ new Set();
 function stopActiveProcess(runId) {
@@ -932,6 +974,23 @@ async function processRun(client, run, config, worktreeDir, detail, runBaseDir,
   const logGreen = (msg) => console.log(`${runTag} ${C.green}${msg}${C.reset}`);
   const ownerName = run.owner?.name ?? detail.owner?.name ?? "unknown";
   log(`\u{1F4CB} "${run.taskTitle}" \u2014 delegated by ${ownerName}`);
+  if (config.verbose) {
+    log(`\u{1F4CE} Run ID: ${run.id} | Task ID: ${run.taskId}`);
+    log(
+      `\u{1F4CE} Detail status: ${detail.status} | Has lastFollowUpMessage: ${!!detail.lastFollowUpMessage} | Has lastSessionId: ${!!detail.lastSessionId}`
+    );
+    log(
+      `\u{1F4CE} In-memory session cache hit: ${sessionCache.has(run.taskId)} | Activity items: ${detail.activity.length}`
+    );
+    if (detail.lastFollowUpMessage) {
+      log(
+        `\u{1F4CE} lastFollowUpMessage: "${detail.lastFollowUpMessage.slice(0, 150)}${detail.lastFollowUpMessage.length > 150 ? "\u2026" : ""}"`
+      );
+    }
+    if (detail.lastSessionId) {
+      log(`\u{1F4CE} Server lastSessionId: ${detail.lastSessionId.slice(0, 12)}\u2026`);
+    }
+  }
   if (detail.status !== "PENDING") {
     log(`\u23ED  Run is no longer PENDING (now ${detail.status}), skipping.`);
     return;
@@ -975,16 +1034,41 @@ async function processRun(client, run, config, worktreeDir, detail, runBaseDir,
       });
       await new Promise((resolve) => git.on("close", () => resolve()));
     }
-    const cachedSessionId = sessionCache.get(run.taskId);
+    const cachedSessionId = sessionCache.get(run.taskId) ?? detail.lastSessionId;
     const isFollowUp = cachedSessionId !== void 0;
-    const effectivePrompt = isFollowUp ? detail.prompt : prompt;
+    let effectivePrompt;
+    if (isFollowUp && cachedSessionId) {
+      effectivePrompt = buildResumedPrompt(detail, currentAgentUserId);
+    } else {
+      effectivePrompt = prompt;
+    }
     const resumeSession = isFollowUp ? cachedSessionId : void 0;
     if (config.verbose) {
       if (isFollowUp) {
-        log(`\u{1F504} Resuming session ${cachedSessionId.slice(0, 12)}\u2026`);
+        const sessionSource = sessionCache.has(run.taskId) ? "in-memory cache" : "server (lastSessionId)";
+        log(`\u{1F504} Resuming session ${cachedSessionId.slice(0, 12)}\u2026 (source: ${sessionSource})`);
+        if (detail.lastFollowUpMessage) {
+          log(
+            `\u{1F4AC} Follow-up message: "${detail.lastFollowUpMessage.slice(0, 200)}${detail.lastFollowUpMessage.length > 200 ? "\u2026" : ""}"`
+          );
+        } else {
+          log(`\u26A0  No lastFollowUpMessage found \u2014 using full prompt for resumed session`);
+        }
+      } else {
+        log(`\u{1F195} Initial run (no session to resume)`);
       }
-      log(`\u{1F4DD} Prompt (${effectivePrompt.length} chars)`);
+      log(
+        `\u{1F4DD} Prompt (${effectivePrompt.length} chars)${isFollowUp ? " [follow-up]" : " [initial]"}`
+      );
+      const previewLen = 500;
+      log(
+        `\u{1F4DD} Prompt preview:
+${effectivePrompt.slice(0, previewLen)}${effectivePrompt.length > previewLen ? "\n... (truncated)" : ""}`
+      );
       if (effectiveModel) log(`\u{1F9E0} Model: ${effectiveModel}`);
+      log(
+        `\u{1F4CA} Activity items: ${detail.activity.length}, Comments: ${detail.activity.filter((a) => a.type === "comment").length}`
+      );
     }
     const { process: child, output } = spawnClaudeCode(
       effectivePrompt,
@@ -1017,6 +1101,9 @@ async function processRun(client, run, config, worktreeDir, detail, runBaseDir,
     }
     if (sessionId) {
       sessionCache.set(run.taskId, sessionId);
+      if (config.verbose) {
+        log(`\u{1F4BE} Session ${sessionId.slice(0, 12)}\u2026 cached for task ${run.taskId}`);
+      }
     }
     const pullRequestUrl = streamPrUrl ?? await detectPullRequestUrl(effectiveCwd) ?? extractPullRequestUrlFromOutput(stdout) ?? extractPullRequestUrlFromOutput(rawOutput);
     const streamEvents = parseClaudeNdjsonEvents(rawOutput);
@@ -1051,7 +1138,8 @@ async function processRun(client, run, config, worktreeDir, detail, runBaseDir,
       await client.errorRun(run.id, errorMsg, {
         pullRequestUrl,
         errorType: retryInfo?.errorType,
-        retryAfter: retryInfo?.retryAfterMs
+        retryAfter: retryInfo?.retryAfterMs,
+        sessionId: lastClaude.sessionId
       });
       if (retryInfo) {
         const retryAt = new Date(retryInfo.retryAfterMs).toLocaleString(void 0, {
@@ -1082,7 +1170,11 @@ async function processRun(client, run, config, worktreeDir, detail, runBaseDir,
     }
     const resultText = extractResultText(stdout);
     const cost = extractCost(stdout);
-    await client.completeRun(run.id, resultText, { ...cost, pullRequestUrl });
+    await client.completeRun(run.id, resultText, {
+      ...cost,
+      pullRequestUrl,
+      sessionId: lastClaude.sessionId
+    });
     if (pullRequestUrl) logGreen(`\u{1F517} PR: ${pullRequestUrl}`);
     logGreen(`\u2705 Run completed`);
   } catch (err) {
@@ -1114,7 +1206,7 @@ async function processRun(client, run, config, worktreeDir, detail, runBaseDir,
 ${message.slice(0, 2e3)}
 \`\`\``;
     try {
-      await client.errorRun(run.id, errorBody);
+      await client.errorRun(run.id, errorBody, { sessionId: lastClaude.sessionId });
     } catch {
       log(`${C.dim}\u26A0  Failed to report error to API${C.reset}`);
     }
@@ -1610,6 +1702,7 @@ async function main() {
     console.error("Failed to authenticate:", errMsg(err));
     process.exit(1);
   }
+  currentAgentUserId = me.agentUserId;
   console.log(`
 \u{1F916} Agent Runner \u2014 ${me.name}`);
   console.log(`   Owner: ${me.ownerName}`);

package/package.json

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