pr-shepherd 0.5.1 → 0.6.0

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pr-shepherd",
   "description": "Autonomous PR CI monitor and review-comment resolver for Claude Code",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"
@@ -16,5 +16,5 @@
     "code-review",
     "automation"
   ],
-  "skills": "./skills/"
+  "skills": "./plugin/skills/"
 }

package/bin/commands/check.mjs

@@ -85,7 +85,7 @@ export async function runCheck(opts) {
         !verdict.anyInProgress &&
         verdict.filteredNames.length > 0;
     // Compute overall status.
-    const status = computeStatus(verdict, actionableThreads.length, actionableComments.length, mergeStatus.status, batchData.changesRequestedReviews.length);
+    const status = computeStatus(verdict, actionableThreads.length, actionableComments.length, mergeStatus, batchData.changesRequestedReviews.length);
     return {
         pr: prNumber,
         repo: `${repo.owner}/${repo.name}`,
@@ -117,7 +117,7 @@ export async function runCheck(opts) {
 // ---------------------------------------------------------------------------
 function computeStatus(verdict, unresolvedThreads, unresolvedComments, mergeStatus, changesRequestedReviews) {
     // Merge conflicts are always terminal regardless of CI state.
-    if (mergeStatus === "CONFLICTS")
+    if (mergeStatus.status === "CONFLICTS")
         return "FAILING";
     // Check CI state before merge-blocking states: BLOCKED/UNSTABLE/BEHIND are
     // often caused by CI not having passed yet, so they shouldn't mask IN_PROGRESS.
@@ -125,16 +125,29 @@ function computeStatus(verdict, unresolvedThreads, unresolvedComments, mergeStat
         return "FAILING";
     if (verdict.anyInProgress)
         return "IN_PROGRESS";
-    if (mergeStatus === "BLOCKED" || mergeStatus === "UNSTABLE" || mergeStatus === "BEHIND")
+    // BLOCKED solely because a human reviewer hasn't approved yet — shepherd is done, hand off.
+    // copilotReviewInProgress means a bot still owes a review, which is not this case.
+    if (verdict.allPassed &&
+        unresolvedThreads === 0 &&
+        unresolvedComments === 0 &&
+        changesRequestedReviews === 0 &&
+        mergeStatus.status === "BLOCKED" &&
+        !mergeStatus.copilotReviewInProgress &&
+        mergeStatus.reviewDecision === "REVIEW_REQUIRED") {
+        return "READY";
+    }
+    if (mergeStatus.status === "BLOCKED" ||
+        mergeStatus.status === "UNSTABLE" ||
+        mergeStatus.status === "BEHIND")
         return "FAILING";
-    if (mergeStatus === "UNKNOWN")
+    if (mergeStatus.status === "UNKNOWN")
         return "UNKNOWN";
     if (changesRequestedReviews > 0)
         return "UNRESOLVED_COMMENTS";
     if (unresolvedThreads > 0 || unresolvedComments > 0)
         return "UNRESOLVED_COMMENTS";
     // DRAFT is treated the same as CLEAN for readiness — marking the PR ready resolves it.
-    if ((mergeStatus === "CLEAN" || mergeStatus === "DRAFT") && verdict.allPassed)
+    if ((mergeStatus.status === "CLEAN" || mergeStatus.status === "DRAFT") && verdict.allPassed)
         return "READY";
     return "UNKNOWN";
 }

package/bin/commands/resolve.mjs

@@ -40,7 +40,7 @@ export async function runResolveFetch(opts) {
     }
     const activeThreads = unresolvedThreads.filter((t) => !t.isOutdated);
     return {
-        actionableThreads: activeThreads.map(({ isResolved, isOutdated, ...rest }) => rest),
+        actionableThreads: activeThreads.map(({ isResolved: _r, isOutdated: _o, ...rest }) => rest),
         actionableComments: visibleComments,
         changesRequestedReviews: data.changesRequestedReviews,
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Autonomous PR CI monitor and review-comment resolver for Claude Code",
   "license": "MIT",
   "author": "Jonathan Ong",

package/plugin/skills/monitor/SKILL.md

@@ -39,6 +39,14 @@ Invoke `/loop <INTERVAL> --max-turns 50 --expires 8h` via the Skill tool. Use th
 
 ````
 # pr-shepherd-loop:pr=<PR_NUMBER>
+
+**IMPORTANT — recurrence rules for this session:**
+- **Do NOT call `ScheduleWakeup`.** This session was fired by a recurring cron job. Calling `ScheduleWakeup` (with a `/loop` prompt) would create a duplicate cron job, leading to concurrent git operations and `.git/index.lock` collisions.
+- **Do NOT invoke `/loop`.** Same reason — `/loop` with an interval calls `CronCreate`, which creates a second recurrent runner.
+- After completing the actions below, end the turn cleanly. The cron job handles the next fire automatically.
+
+**Self-dedup:** Run `CronList`. If more than one job has a prompt containing `# pr-shepherd-loop:pr=<PR_NUMBER>`, duplicate runners exist. Keep the job with the lowest job ID and `CronDelete` the rest (ignore errors if a job is already gone — another concurrent runner may have deleted it first), then continue this iteration.
+
 Run the following in a single Bash invocation:
   npx pr-shepherd iterate <PR_NUMBER> --ready-delay <READY_DELAY> --no-cache --last-push-time "$(git log -1 --format=%ct HEAD)" --format=json