claude-teammate 0.1.230 → 0.1.232

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-teammate",
-  "version": "0.1.230",
+  "version": "0.1.232",
   "description": "CLI bootstrapper for Claude Teammate.",
   "license": "MIT",
   "type": "module",

package/src/worker/pollers/draft-pull-requests.js

@@ -66,11 +66,15 @@ export function createDraftPullRequestPoller({
       if (stuckAt && (Date.now() - stuckAt.getTime() >= stuckPrRetryIntervalMs)) {
         return true;
       }
-      await logger.info("Draft PR is stuck but retry window has not elapsed, not queueing for work", {
-        pr: pullRequest.number,
-        repo: pullRequest.repoUrl
-      });
-      return false;
+      if (stuckAt) {
+        await logger.info("Draft PR is stuck but retry window has not elapsed, not queueing for work", {
+          pr: pullRequest.number,
+          repo: pullRequest.repoUrl
+        });
+        return false;
+      }
+      // No STUCK_AT = permanent stuck (e.g. step too large for Claude).
+      // Fall through to the human-comment check so "@BOT retry" can unblock it.
     }
 
     const latestComment = getLatestGitHubComment(detail.comments);

package/src/worker/pull-request-workflow-support.js

@@ -234,7 +234,7 @@ export async function processPullRequestImplementation({
           void logger.info("Claude PR implementation step started", { repo: repo.url, pr: detail.number, step: stepText, pid: child.pid ?? null });
         }
       });
-    } else if (await branchHasChangesAgainstMain(repoPath)) {
+    } else if (await branchHasChangesAgainstMain(repoPath).catch(() => false)) {
       // Branch already has commits from a previous run that crashed before the
       // PR body could be updated. Skip Claude to avoid duplicate work; the
       // commitAndPushRepoChanges call below will detect branchHasImplementation

package/src/worker/pull-request-workflow.js

@@ -142,10 +142,21 @@ export async function processTrackedPullRequest({
   if (currentStatus === "STUCK") {
     const stuckAt = getStuckAt(detail.body);
     const shouldRetry = stuckAt && (Date.now() - stuckAt.getTime() >= stuckPrRetryIntervalMs);
-    if (shouldRetry) {
+    const latestHumanComment = !stuckAt
+      ? getLatestGitHubComment(detail.comments.filter((c) => !isForgeBotAuthor(c.author, githubBotUser)))
+      : null;
+    const humanRetryRequested = latestHumanComment &&
+      !hasEyesReaction(latestHumanComment) &&
+      !hasPlusOneReaction(latestHumanComment);
+    if (shouldRetry || humanRetryRequested) {
       const resetBody = setPullRequestStatus(detail.body, "INITIALIZING");
       await github.updatePullRequest(repo.url, detail.number, { title: detail.title, body: resetBody });
-      await logger.info("Retrying STUCK pull request", { repo: repo.url, pr: detail.number, stuckAt: stuckAt.toISOString() });
+      await logger.info("Retrying STUCK pull request", {
+        repo: repo.url,
+        pr: detail.number,
+        reason: shouldRetry ? "retry_window_elapsed" : "human_comment",
+        stuckAt: stuckAt?.toISOString() ?? null
+      });
       return processPullRequestImplementation({
         repo,
         detail: { ...detail, body: resetBody },