claude-teammate 0.1.313 → 0.1.314

package/package.json

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

package/src/repo.js

@@ -770,6 +770,31 @@ export async function branchHasChangesAgainstMain(repoPath, baseRef) {
   return Number.isFinite(count) && count > 0;
 }
 
+/**
+ * True when HEAD's own work has already landed on the base branch (e.g. the
+ * branch was merged via another MR / a human merged it directly). In that case
+ * HEAD is an ancestor of the base tip while still being a distinct commit, so a
+ * branch-vs-base diff is empty and re-running Claude can never produce changes.
+ * Callers use this to terminate instead of looping on "no changes to commit".
+ * A brand-new branch that merely points at the base tip (HEAD === base) returns
+ * false — that is an unstarted PR, not a merged one. Best-effort; never throws.
+ */
+export async function branchMergedIntoBase(repoPath, baseRef) {
+  const branch = baseRef || (await resolveRemoteDefaultBranch(repoPath));
+  try {
+    const headSha = (await execGitOutput(repoPath, ["rev-parse", "HEAD"])).trim();
+    const baseSha = (await execGitOutput(repoPath, ["rev-parse", `origin/${branch}`])).trim();
+    if (!headSha || !baseSha || headSha === baseSha) {
+      return false;
+    }
+    // exit 0 → HEAD is an ancestor of the base tip → already merged.
+    await execGit(repoPath, ["merge-base", "--is-ancestor", "HEAD", `origin/${branch}`]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function resolveRemoteDefaultBranch(repoPath) {
   try {
     const output = await execGitOutput(repoPath, ["symbolic-ref", "refs/remotes/origin/HEAD"]);

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

@@ -6,6 +6,7 @@ import {
 } from "../claude.js";
 import {
   branchHasChangesAgainstMain,
+  branchMergedIntoBase,
   commitAndPushRepoChanges,
   ensureWorktreeForBranch,
   getBranchDiffAgainstBase,
@@ -331,6 +332,16 @@ export async function processPullRequestImplementation({
         pr: detail.number
       });
       result = { result: "implemented", summary: "Implementation already committed on previous run." };
+    } else if (!latestComment && (await branchMergedIntoBase(repoPath, detail.baseRef).catch(() => false))) {
+      // The branch's work already landed on the base (merged via another MR or
+      // by a human). There is nothing left to implement, so skip Claude
+      // entirely — running it would only report "no changes" and loop. A human
+      // comment overrides this so feedback can still be addressed.
+      await logger.info("Head branch already merged into base; skipping Claude (nothing to implement)", {
+        repo: repo.url,
+        pr: detail.number
+      });
+      result = { result: "implemented", summary: "Changes already merged into the base branch." };
     } else {
       result = await services.runClaudeImplementation({
         pullRequest: { ...detail, body: nextBody },
@@ -440,7 +451,53 @@ export async function processPullRequestImplementation({
       );
 
       if (!commitResult.committed && !commitResult.branchHasImplementation) {
-        throw new Error("Claude reported success but no repository changes were available to commit.");
+        // No diff to commit. If the branch's work already landed on the base
+        // (merged via another MR / by a human), re-running Claude can never
+        // produce changes — treat it as terminally implemented instead of
+        // looping. Otherwise stop without preserving STUCK_AT so the bot waits
+        // for human guidance rather than machine-gun retrying an unchangeable
+        // no-op every retry window.
+        const mergedIntoBase = await branchMergedIntoBase(repoPath, detail.baseRef).catch(() => false);
+        if (mergedIntoBase) {
+          const mergedBody = setPullRequestStatus(nextBody, "IMPLEMENTED");
+          await github.updatePullRequest(repo.url, detail.number, { title: detail.title, body: mergedBody });
+          await services.clearForgePullRequestBlocked(github, { ...detail, repoUrl: repo.url });
+          if (markReadyOnSuccess) {
+            await github.markPullRequestReady(repo.url, detail.number);
+            await services.transitionLinkedJiraIssueToReview(detail.title, jira, logger, detail.number);
+          }
+          const mergedComment =
+            successCommentBody ||
+            formatPullRequestOutcomeComment(
+              result.summary,
+              "The requested changes are already merged into the base branch; nothing left to implement."
+            );
+          await postPullRequestComment(github, repo.url, detail.number, mergedComment);
+          await postLinkedJiraComment(extractJiraKey(detail.title), mergedComment, jira, logger);
+          await logger.info("Branch already merged into base; PR marked IMPLEMENTED", {
+            repo: repo.url,
+            pr: detail.number
+          });
+          return buildDraftPrState(
+            { ...detail, body: mergedBody, draft: markReadyOnSuccess ? false : detail.draft },
+            "IMPLEMENTED",
+            "implemented"
+          );
+        }
+        const noChangeBody = clearStuckAt(setPullRequestStatus(nextBody, "STUCK"));
+        await github.updatePullRequest(repo.url, detail.number, { title: detail.title, body: noChangeBody });
+        await services.setForgePullRequestBlocked(github, { ...detail, repoUrl: repo.url });
+        const noChangeComment = formatPullRequestOutcomeComment(
+          result.summary,
+          "Claude reported success but produced no repository changes, so there was nothing to commit. Halting automatic retries until there is new guidance."
+        );
+        await postPullRequestComment(github, repo.url, detail.number, noChangeComment);
+        await postLinkedJiraComment(extractJiraKey(detail.title), noChangeComment, jira, logger);
+        await logger.error("Pull request produced no repository changes; halting auto-retry", {
+          repo: repo.url,
+          pr: detail.number
+        });
+        return buildDraftPrState({ ...detail, body: noChangeBody }, "STUCK", "stuck");
       }
 
       const implementedBody = setPullRequestStatus(nextBody, "IMPLEMENTED");