pr-shepherd 0.11.0 → 0.12.1

package/bin/commands/resolve.mjs

@@ -6,7 +6,6 @@ import { loadConfig } from "../config/load.mjs";
 import { extractSuggestion } from "../suggestions/extract.mjs";
 import { buildFetchInstructions } from "./resolve-instructions.mjs";
 import { loadSeenMap, markSeen, classifyItem } from "../state/seen-comments.mjs";
-/** Fetch mode: auto-resolve outdated threads and return all active items for LLM triage. */
 export async function runResolveFetch(opts) {
     const repo = await getRepoInfo();
     const prNumber = opts.prNumber ?? (await getCurrentPrNumber());
@@ -15,7 +14,7 @@ export async function runResolveFetch(opts) {
     }
     const { data } = await fetchPrBatch(prNumber, repo);
     const stateKey = { owner: repo.owner, repo: repo.name, pr: prNumber };
-    const unresolvedThreads = data.reviewThreads.filter((t) => !t.isResolved && !t.isMinimized);
+    const unresolvedThreads = data.reviewThreads.filter((t) => !t.isResolved);
     const visibleComments = data.comments.filter((c) => !c.isMinimized);
     const outdatedCandidates = data.reviewThreads.filter((t) => t.isOutdated);
     const resolvedCandidates = data.reviewThreads.filter((t) => t.isResolved && !t.isOutdated);
@@ -68,7 +67,8 @@ export async function runResolveFetch(opts) {
             process.stderr.write(`pr-shepherd: auto-resolve outdated threads failed (continuing): ${errors.join(", ")}\n`);
         }
     }
-    const activeThreads = unresolvedThreads.filter((t) => !t.isOutdated);
+    const activeThreads = unresolvedThreads.filter((t) => !t.isOutdated && !t.isMinimized);
+    const resolutionOnlyThreads = unresolvedThreads.filter((t) => !autoResolvedIds.has(t.id) && (t.isOutdated || t.isMinimized));
     const cfg = loadConfig();
     const actionableThreads = activeThreads.map(({ isResolved: _r, isOutdated: _o, ...rest }) => {
         const thread = rest;
@@ -118,6 +118,7 @@ export async function runResolveFetch(opts) {
     const result = {
         prNumber,
         actionableThreads,
+        resolutionOnlyThreads,
         firstLookThreads,
         actionableComments: visibleComments,
         firstLookComments,
@@ -127,7 +128,6 @@ export async function runResolveFetch(opts) {
     };
     return { ...result, instructions: buildFetchInstructions(prNumber, result) };
 }
-/** Mutation mode: resolve/minimize/dismiss by ID. */
 export async function runResolveMutate(opts) {
     const repo = await getRepoInfo();
     const prNumber = opts.prNumber ?? (await getCurrentPrNumber());

package/bin/github/http.mjs

@@ -30,7 +30,12 @@ async function resolveToken() {
     catch {
         // fall through to error
     }
-    throw new Error("No GitHub token found. Set GH_TOKEN or GITHUB_TOKEN, or run `gh auth login`.");
+    const codexToken = process.env["GITHUB_PERSONAL_ACCESS_TOKEN"];
+    if (codexToken) {
+        _token = codexToken;
+        return _token;
+    }
+    throw new Error("No GitHub token found. Set GH_TOKEN, GITHUB_TOKEN, or GITHUB_PERSONAL_ACCESS_TOKEN, or run `gh auth login`.");
 }
 async function makeHeaders() {
     return {

package/bin/index.mjs

@@ -3,6 +3,7 @@
  * pr-shepherd — unified GitHub PR status + auto-resolve CLI
  *
  * Usage:
+ *   pr-shepherd [PR]
  *   pr-shepherd check [PR]
  *   pr-shepherd resolve [PR]
  *   pr-shepherd iterate [PR]

package/bin/reporters/check-instructions.mjs

@@ -3,11 +3,15 @@
  * All rebase policy, CI budget policy, and ready-to-merge gating live here so the
  * skill stays a thin dispatcher and these rules co-evolve with the CLI data model.
  */
-export function buildCheckInstructions(report) {
+export function buildCheckInstructions(report, opts) {
+    const runtime = opts?.runtime ?? "claude";
     const { mergeStatus, checks, threads, comments, changesRequestedReviews, status } = report;
     const instructions = [];
     // 1. Summary
-    const totalActionable = threads.actionable.length + comments.actionable.length + changesRequestedReviews.length;
+    const totalActionable = threads.actionable.length +
+        threads.resolutionOnly.length +
+        comments.actionable.length +
+        changesRequestedReviews.length;
     const total = checks.passing.length +
         checks.failing.length +
         checks.inProgress.length +
@@ -54,7 +58,9 @@ export function buildCheckInstructions(report) {
     }
     // 5. Continuous monitoring pointer (suppressed only when truly ready to merge)
     if (!isReady) {
-        instructions.push("This is a one-shot check. For continuous monitoring that acts on these signals automatically, use `/pr-shepherd:monitor`.");
+        instructions.push(runtime === "codex"
+            ? `This is a one-shot check. For follow-up monitoring, run \`npx pr-shepherd ${report.pr}\`.`
+            : "This is a one-shot check. For continuous monitoring that acts on these signals automatically, use `/pr-shepherd:monitor`.");
     }
     return instructions;
 }

package/bin/reporters/json.mjs

@@ -5,6 +5,6 @@
  * without string-scraping the human-readable text reporter.
  */
 import { buildCheckInstructions } from "./check-instructions.mjs";
-export function formatJson(report) {
-    return JSON.stringify({ ...report, instructions: buildCheckInstructions(report) }, null, 2);
+export function formatJson(report, opts) {
+    return JSON.stringify({ ...report, instructions: buildCheckInstructions(report, opts) }, null, 2);
 }

package/bin/reporters/text.mjs

@@ -1,7 +1,7 @@
 import { buildCheckInstructions } from "./check-instructions.mjs";
-import { renderThreadBullet, renderCommentBullet, renderReviewBullet, renderFirstLookStatusTag, } from "../cli/list-formatters.mjs";
+import { renderThreadBullet, renderCommentBullet, renderFirstLookStatusTag, renderReviewListSection, renderThreadResolutionStatusTag, } from "../cli/list-formatters.mjs";
 import { joinSections } from "../util/markdown.mjs";
-export function formatText(report) {
+export function formatText(report, opts) {
     const header = [
         `# PR #${report.pr} [CHECK] — ${report.repo}`,
         `Status: ${report.status}`,
@@ -60,8 +60,11 @@ export function formatText(report) {
         ciSubsections.push(lines.join("\n"));
     }
     const ciSection = `## CI Checks\n\n${ciSubsections.join("\n\n")}`;
-    const { actionable: actionableThreads, autoResolved, autoResolveErrors, firstLook: firstLookThreads, } = report.threads;
-    const hasThreadSection = autoResolved.length > 0 || autoResolveErrors.length > 0 || actionableThreads.length > 0;
+    const { actionable: actionableThreads, resolutionOnly: resolutionOnlyThreads, autoResolved, autoResolveErrors, firstLook: firstLookThreads, } = report.threads;
+    const hasThreadSection = autoResolved.length > 0 ||
+        autoResolveErrors.length > 0 ||
+        actionableThreads.length > 0 ||
+        resolutionOnlyThreads.length > 0;
     let threadsSection = null;
     if (hasThreadSection) {
         const subparts = [];
@@ -86,6 +89,13 @@ export function formatText(report) {
             }
             subparts.push(lines.join("\n"));
         }
+        if (resolutionOnlyThreads.length > 0) {
+            const lines = [`### Needs resolution only (${resolutionOnlyThreads.length})`, ""];
+            for (const t of resolutionOnlyThreads) {
+                lines.push(renderThreadBullet(t, { statusTag: renderThreadResolutionStatusTag(t) }));
+            }
+            subparts.push(lines.join("\n"));
+        }
         threadsSection = `## Review Threads\n\n${subparts.join("\n\n")}`;
     }
     const { actionable: actionableComments, firstLook: firstLookComments } = report.comments;
@@ -97,15 +107,15 @@ export function formatText(report) {
         }
         commentsSection = `## PR Comments\n\n${lines.join("\n")}`;
     }
-    const changesRequestedSection = reviewListSection("CHANGES_REQUESTED Reviews", report.changesRequestedReviews);
+    const changesRequestedSection = renderReviewListSection("CHANGES_REQUESTED Reviews", report.changesRequestedReviews);
     const allSummaries = [...report.firstLookSummaries, ...report.reviewSummaries];
-    const reviewSummariesSection = reviewListSection("Review Summaries", allSummaries);
-    const approvedReviewsSection = reviewListSection("Approved Reviews", report.approvedReviews);
+    const reviewSummariesSection = renderReviewListSection("Review Summaries", allSummaries);
+    const approvedReviewsSection = renderReviewListSection("Approved Reviews", report.approvedReviews);
     const firstLookTotal = firstLookThreads.length + firstLookComments.length;
     let firstLookSection = null;
     if (firstLookTotal > 0) {
         const lines = [
-            `## First-look items (${firstLookTotal}) — already closed on GitHub; acknowledge only`,
+            `## First-look items (${firstLookTotal}) — acknowledge status before acting`,
             "",
         ];
         for (const t of firstLookThreads) {
@@ -117,15 +127,18 @@ export function formatText(report) {
         }
         firstLookSection = lines.join("\n");
     }
-    const totalActionable = actionableThreads.length + actionableComments.length + report.changesRequestedReviews.length;
+    const totalActionable = actionableThreads.length +
+        resolutionOnlyThreads.length +
+        actionableComments.length +
+        report.changesRequestedReviews.length;
     const counts = [];
     if (totalActionable > 0)
         counts.push(`${totalActionable} actionable`);
     if (firstLookTotal > 0)
         counts.push(`${firstLookTotal} first-look`);
-    const summaryLine = counts.join(", ") || "0 actionable — all threads resolved/minimized";
+    const summaryLine = counts.join(", ") || "0 actionable — no unresolved review items";
     const summarySection = `## Summary\n\n${summaryLine}`;
-    const instructions = buildCheckInstructions(report);
+    const instructions = buildCheckInstructions(report, opts);
     const instructionsSection = `## Instructions\n\n${instructions.map((step, i) => `${i + 1}. ${step}`).join("\n")}`;
     return joinSections([
         header,
@@ -141,8 +154,3 @@ export function formatText(report) {
         instructionsSection,
     ]);
 }
-function reviewListSection(heading, items) {
-    if (items.length === 0)
-        return null;
-    return `## ${heading}\n\n${items.map((r) => renderReviewBullet(r, { includeBody: true })).join("\n")}`;
-}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pr-shepherd",
-  "version": "0.11.0",
-  "description": "Autonomous PR CI monitor and review-comment resolver for Claude Code",
+  "version": "0.12.1",
+  "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "license": "MIT",
   "author": "Jonathan Ong",
   "type": "module",
@@ -49,6 +49,7 @@
     "ci",
     "code-review",
     "automation",
+    "codex",
     "claude",
     "claude-code"
   ],