pr-shepherd 0.19.0 → 0.21.0

package/bin/cli/iterate-lean.mjs

@@ -6,8 +6,7 @@ import { adaptIterateLog, adaptFixCodeInstructions, buildSimpleIterateInstructio
  */
 export function projectIterateLean(result, opts) {
     const readyDelaySuffix = opts?.readyDelaySuffix;
-    const runner = opts?.runner;
-    const simpleInstructions = (r) => buildSimpleIterateInstructions(r, readyDelaySuffix, runner);
+    const simpleInstructions = (r) => buildSimpleIterateInstructions(r, readyDelaySuffix);
     const base = {
         action: result.action,
         pr: result.pr,
@@ -94,7 +93,7 @@ export function projectIterateLean(result, opts) {
                     }),
                     resolveCommand: result.fix.resolveCommand,
                     ...(result.fix.instructions.length > 0 && {
-                        instructions: adaptFixCodeInstructions(result.fix.instructions, result.pr, readyDelaySuffix, runner),
+                        instructions: adaptFixCodeInstructions(result.fix.instructions, result.pr, readyDelaySuffix),
                     }),
                 },
             };
@@ -125,13 +124,12 @@ export function projectIterateLean(result, opts) {
 }
 export function projectIterateVerbose(result, opts) {
     const readyDelaySuffix = opts?.readyDelaySuffix;
-    const runner = opts?.runner;
     if (result.action === "fix_code") {
         return {
             ...result,
             fix: {
                 ...result.fix,
-                instructions: adaptFixCodeInstructions(result.fix.instructions, result.pr, readyDelaySuffix, runner),
+                instructions: adaptFixCodeInstructions(result.fix.instructions, result.pr, readyDelaySuffix),
             },
         };
     }
@@ -139,6 +137,6 @@ export function projectIterateVerbose(result, opts) {
     return {
         ...result,
         ...log,
-        instructions: buildSimpleIterateInstructions(result, readyDelaySuffix, runner),
+        instructions: buildSimpleIterateInstructions(result, readyDelaySuffix),
     };
 }

package/bin/cli/iterate-lean.test-support.mjs

@@ -1,5 +1,3 @@
-// @ts-nocheck
-import { describe, it, expect } from "vitest";
 import { projectIterateLean, projectIterateVerbose } from "./iterate-lean.mjs";
 import { makeIterateResult } from "../cli-parser.iterate-fixtures.mjs";
 export { makeIterateResult, projectIterateLean, projectIterateVerbose };

package/bin/cli/list-formatters.mjs

@@ -39,6 +39,9 @@ export function renderCommentBullet(c, opts = {}) {
     const statusSuffix = opts.statusTag ? ` ${opts.statusTag}` : "";
     return `- \`commentId=${c.id}\`${link} (${renderAuthor(c.author, c.authorType)})${statusSuffix}: ${renderBodyPreview(c.body)}`;
 }
+export function renderEditedCommentTag(c) {
+    return c.edited ? "[edited since first look]" : undefined;
+}
 export function renderReviewBullet(r, opts = {}) {
     const bodySuffix = opts.includeBody && r.body != null && r.body !== "" ? `: ${renderBodyPreview(r.body)}` : "";
     return `- \`reviewId=${r.id}\` (${renderAuthor(r.author, r.authorType)})${bodySuffix}`;

package/bin/cli/poll-handler.mjs

@@ -37,6 +37,5 @@ export async function handlePoll(args) {
         format: globalOpts.format,
         verbose: globalOpts.verbose ?? false,
         readyDelaySuffix: flags.readyDelaySuffix ?? undefined,
-        runner: cfg.cli?.runner,
     });
 }

package/bin/cli/runner.mjs

@@ -1,111 +1,10 @@
-import { readFileSync, statSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { homedir } from "node:os";
-export function buildPrShepherdCommand(args, opts) {
-    const runner = resolveCliRunner(opts.runner, opts.cwd);
-    const argv = baseArgvForRunner(runner).concat(args);
+export function buildPrShepherdCommand(args) {
+    const argv = ["pr-shepherd", ...args];
     return { argv, text: renderShellCommand(argv) };
 }
-export function resolveCliRunner(runner, cwd = process.cwd()) {
-    const configured = parseCliRunner(runner);
-    return configured === "auto" ? detectPackageRunner(cwd) : configured;
-}
-const VALID_RUNNERS = ["auto", "npx", "pnpm", "yarn", "bun"];
-const VALID_RUNNERS_LIST = VALID_RUNNERS.map((v) => `"${v}"`).join(", ");
-export function parseCliRunner(runner) {
-    if (runner === undefined)
-        return "auto";
-    if (typeof runner !== "string") {
-        throw new Error(`Invalid config: cli.runner must be one of ${VALID_RUNNERS_LIST}, got ${JSON.stringify(runner)}`);
-    }
-    const value = runner.trim();
-    if (VALID_RUNNERS.includes(value))
-        return value;
-    throw new Error(`Invalid config: cli.runner must be one of ${VALID_RUNNERS_LIST}, got ${JSON.stringify(runner)}`);
-}
 export function renderShellCommand(argv) {
     return argv.map(renderShellArg).join(" ");
 }
-function baseArgvForRunner(runner) {
-    switch (runner) {
-        case "npx":
-            return ["npx", "pr-shepherd"];
-        case "pnpm":
-            return ["pnpm", "exec", "pr-shepherd"];
-        case "yarn":
-            return ["yarn", "run", "pr-shepherd"];
-        case "bun":
-            return ["bunx", "pr-shepherd"];
-    }
-}
-const runnerCache = new Map();
-export function __resetRunnerCache() {
-    runnerCache.clear();
-}
-function detectPackageRunner(startDir) {
-    const cached = runnerCache.get(startDir);
-    if (cached)
-        return cached;
-    const home = homedir();
-    const repoRoot = findRepoRoot(startDir);
-    let current = startDir;
-    while (true) {
-        const atBoundary = current === repoRoot || current === home || current === dirname(current);
-        // Read signals for this directory unless it is home without being the repo root.
-        // This lets dotfiles repos (repoRoot === home) detect their own package manager
-        // while still preventing home's lockfiles from influencing unrelated projects.
-        if (!atBoundary || current === repoRoot) {
-            const packageManager = readPackageManager(current);
-            if (packageManager?.startsWith("pnpm@"))
-                return cacheRunner(startDir, "pnpm");
-            if (packageManager?.startsWith("yarn@"))
-                return cacheRunner(startDir, "yarn");
-            if (packageManager?.startsWith("npm@"))
-                return cacheRunner(startDir, "npx");
-            if (packageManager?.startsWith("bun@"))
-                return cacheRunner(startDir, "bun");
-            if (isFile(join(current, "pnpm-lock.yaml")))
-                return cacheRunner(startDir, "pnpm");
-            if (isFile(join(current, "yarn.lock")))
-                return cacheRunner(startDir, "yarn");
-            if (isFile(join(current, "bun.lock")))
-                return cacheRunner(startDir, "bun");
-            if (isFile(join(current, "bun.lockb")))
-                return cacheRunner(startDir, "bun");
-            if (isFile(join(current, "package-lock.json")))
-                return cacheRunner(startDir, "npx");
-        }
-        if (atBoundary)
-            return cacheRunner(startDir, "npx");
-        current = dirname(current);
-    }
-}
-function cacheRunner(startDir, runner) {
-    runnerCache.set(startDir, runner);
-    return runner;
-}
-function readPackageManager(packageDir) {
-    try {
-        const parsed = JSON.parse(readFileSync(join(packageDir, "package.json"), "utf8"));
-        return typeof parsed.packageManager === "string" ? parsed.packageManager.trim() : null;
-    }
-    catch {
-        return null;
-    }
-}
-function findRepoRoot(startDir) {
-    let current = startDir;
-    while (true) {
-        if (statSync(join(current, ".git"), { throwIfNoEntry: false }))
-            return current;
-        if (current === dirname(current))
-            return null;
-        current = dirname(current);
-    }
-}
-function isFile(path) {
-    return statSync(path, { throwIfNoEntry: false })?.isFile() === true;
-}
 function renderShellArg(arg) {
     if (/^\$[A-Z_][A-Z0-9_]*$/.test(arg))
         return `"${arg}"`;

package/bin/cli/validate-default-args.mjs

@@ -0,0 +1,32 @@
+import { parsePrNumber } from "./args.mjs";
+/**
+ * Validate args for default-dispatch paths (e.g. `pr-shepherd [PR] [flags]`).
+ * Returns false when an unexpected token is found; calls onError with the
+ * offending arg so callers can print their own usage message.
+ */
+export function validateDefaultArgs(args, flagsWithValues, booleanFlags, onError) {
+    let sawPr = false;
+    for (let i = 0; i < args.length; i += 1) {
+        const arg = args[i];
+        if (flagsWithValues.has(arg)) {
+            if (i + 1 >= args.length || args[i + 1].startsWith("--")) {
+                onError(arg);
+                return false;
+            }
+            i += 1;
+            continue;
+        }
+        const inlineFlag = arg.split("=", 1)[0];
+        if (flagsWithValues.has(inlineFlag))
+            continue;
+        if (booleanFlags.has(arg))
+            continue;
+        if (parsePrNumber(arg) !== null && !sawPr) {
+            sawPr = true;
+            continue;
+        }
+        onError(arg);
+        return false;
+    }
+    return true;
+}

package/bin/cli-parser.clean.test-support.mjs

@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { vi, beforeEach, afterEach } from "vitest";
 vi.mock("./commands/clean.mts", () => ({
     runClean: vi.fn(),

package/bin/cli-parser.commit-suggestion.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { vi, beforeEach, afterEach } from "vitest";
 vi.mock("./commands/check.mts", () => ({ runCheck: vi.fn() }));
 vi.mock("./commands/resolve.mts", () => ({
     runResolveFetch: vi.fn(),
@@ -43,7 +42,7 @@ const SUGGESTION_RESULT = {
         "Apply the patch to `a.ts`: run `git apply` with the diff shown above.",
         "Stage the file: `git add -- a.ts`",
         'Commit: `git commit -m "apply fix" -m "Co-authored-by: alice <alice@users.noreply.github.com>"`',
-        "Resolve the thread on GitHub: `npx pr-shepherd resolve 42 --resolve-thread-ids t1`",
+        "Resolve the thread on GitHub: `pr-shepherd resolve 42 --resolve-thread-ids t1`",
         "Push when ready: `git push` (or `git push --force-with-lease` after rebasing).",
     ],
 };

package/bin/cli-parser.iterate-fix.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { vi, beforeEach, afterEach } from "vitest";
 vi.mock("./commands/check.mts", () => ({ runCheck: vi.fn() }));
 vi.mock("./commands/resolve.mts", () => ({
     runResolveFetch: vi.fn(),

package/bin/cli-parser.iterate-fixtures.mjs

@@ -35,7 +35,7 @@ export function makeIterateResult(action = "wait") {
                 checks: [],
                 changesRequestedReviews: [],
                 resolveCommand: {
-                    argv: ["npx", "pr-shepherd", "resolve", "42"],
+                    argv: ["pr-shepherd", "resolve", "42"],
                     requiresHeadSha: true,
                     requiresDismissMessage: false,
                     hasMutations: false,

package/bin/cli-parser.iterate.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { vi, beforeEach, afterEach } from "vitest";
 vi.mock("./commands/check.mts", () => ({ runCheck: vi.fn() }));
 vi.mock("./commands/resolve.mts", () => ({
     runResolveFetch: vi.fn(),

package/bin/cli-parser.mjs

@@ -3,7 +3,7 @@
  *
  * Usage:
  *   pr-shepherd --version
- *   pr-shepherd [PR] [--format text|json] [--ready-delay Nm]
+ *   pr-shepherd [PR] [--interval 45s] [--timeout 4m] [--format text|json] [--ready-delay Nm]
  *                  [--stall-timeout <duration>] [--no-auto-mark-ready]
  *                  [--no-auto-cancel-actionable]
  *   pr-shepherd resolve [PR] [--fetch] [--resolve-thread-ids A,B] [--minimize-comment-ids X,Y]
@@ -22,7 +22,7 @@ import { readFileSync } from "node:fs";
 import { runResolveFetch, runResolveMutate } from "./commands/resolve.mjs";
 import { runLogFile } from "./commands/log-file.mjs";
 import { parseCommonArgs, getFlag, hasFlag, parseList } from "./cli/args.mjs";
-import { isDefaultIterateInvocation, validateDefaultIterateArgs } from "./cli/default-iterate.mjs";
+import { isDefaultPollInvocation, validateDefaultPollArgs } from "./cli/default-poll.mjs";
 import { USAGE, maybePrintHelp } from "./cli/help.mjs";
 import { formatFetchResult, formatMutateResult } from "./cli/formatters.mjs";
 import { handleClean, handleCommitSuggestion, handleIterate } from "./cli/handlers.mjs";
@@ -49,8 +49,8 @@ export async function main(argv) {
     }
     // Short-circuit all --help/-h before any I/O or logging.
     if (hasFlag(args, "--help") || hasFlag(args, "-h")) {
-        if (isDefaultIterateInvocation(subcommand)) {
-            process.stdout.write(`${USAGE.iterate}\n`);
+        if (isDefaultPollInvocation(subcommand)) {
+            process.stdout.write(`${USAGE.poll}\n`);
         }
         else {
             const key = subcommand != null && subcommand in USAGE
@@ -62,10 +62,10 @@ export async function main(argv) {
     }
     // Initialize the per-worktree log and install a stdout tee.
     await setupLog(argv);
-    if (isDefaultIterateInvocation(subcommand)) {
-        if (!validateDefaultIterateArgs(args))
+    if (isDefaultPollInvocation(subcommand)) {
+        if (!validateDefaultPollArgs(args))
             return;
-        await handleIterate(args);
+        await handlePoll(args);
         return;
     }
     switch (subcommand) {

package/bin/cli-parser.test-support.mjs

@@ -1,6 +1,5 @@
-// @ts-nocheck
 import { readFileSync } from "node:fs";
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { vi, beforeEach, afterEach } from "vitest";
 vi.mock("./commands/resolve.mts", () => ({
     runResolveFetch: vi.fn(),
     runResolveMutate: vi.fn(),

package/bin/commands/check.mjs

@@ -46,7 +46,8 @@ export async function runCheck(opts) {
     let autoResolveErrors = [];
     if (opts.autoResolve && outdated.length > 0) {
         const { resolved: resolvedIds, errors } = await autoResolveOutdated(outdated.map((t) => t.id));
-        autoResolved = outdated.filter((t) => resolvedIds.includes(t.id));
+        const resolvedIdsSet = new Set(resolvedIds); // ⚡ Bolt optimization: O(1) lookup
+        autoResolved = outdated.filter((t) => resolvedIdsSet.has(t.id));
         autoResolveErrors = errors;
     }
     const activeThreads = unresolvedThreads.filter((t) => !t.isOutdated && !t.isMinimized);

package/bin/commands/check.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 vi.mock("../github/batch.mts", () => ({ fetchPrBatch: vi.fn() }));
 vi.mock("../github/client.mts", () => ({
     getRepoInfo: vi.fn().mockResolvedValue({ owner: "owner", name: "repo" }),

package/bin/commands/clean.test-support.mjs

@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { vi, beforeEach, afterEach } from "vitest";
 import { join } from "node:path";
 import { mkdtemp, realpath, rm, mkdir, writeFile, stat } from "node:fs/promises";

package/bin/commands/commit-suggestion-instruction.mjs

@@ -6,7 +6,7 @@ import { buildPrShepherdCommand } from "../cli/runner.mjs";
  *   (e.g. `"## Review threads"` for iterate, `"## Actionable Review Threads"` for resolve).
  * @param includeDriftHint - Whether to add the trailing note about drift on failed apply.
  */
-export function buildCommitSuggestionInstruction(prNumber, sectionName, includeDriftHint, runner) {
+export function buildCommitSuggestionInstruction(prNumber, sectionName, includeDriftHint) {
     const command = buildPrShepherdCommand([
         "commit-suggestion",
         String(prNumber),
@@ -15,7 +15,7 @@ export function buildCommitSuggestionInstruction(prNumber, sectionName, includeD
         "--message",
         "<one-sentence headline>",
         "--format=json",
-    ], { runner }).text;
+    ]).text;
     const driftHint = includeDriftHint
         ? " If the patch fails to apply (drift since the suggestion was written), fall through to the manual fix step."
         : " If the patch fails to apply, fall through to the manual-edit step.";

package/bin/commands/commit-suggestion.apply.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi } from "vitest";
 // ---------------------------------------------------------------------------
 // Hoisted mocks
 // ---------------------------------------------------------------------------

package/bin/commands/commit-suggestion.mjs

@@ -5,7 +5,6 @@ import { getRepoInfo, getCurrentPrNumber, getCurrentBranch } from "../github/cli
 import { fetchPrBatch } from "../github/batch.mjs";
 import { parseSuggestion, isCommittableSuggestion } from "../suggestions/parse.mjs";
 import { buildUnifiedDiff } from "../suggestions/patch.mjs";
-import { loadConfig } from "../config/load.mjs";
 import { buildPrShepherdCommand } from "../cli/runner.mjs";
 const execFile = promisify(execFileCb);
 export async function runCommitSuggestion(opts) {
@@ -93,7 +92,12 @@ export async function runCommitSuggestion(opts) {
         `-m ${sq(commitMessageArg)}`,
         ...commitBodyArg.split("\n\n").map((p) => `-m ${sq(p)}`),
     ].join(" ");
-    const resolveCommand = buildPrShepherdCommand(["resolve", String(prNumber), "--resolve-thread-ids", opts.threadId], { runner: loadConfig().cli?.runner }).text;
+    const resolveCommand = buildPrShepherdCommand([
+        "resolve",
+        String(prNumber),
+        "--resolve-thread-ids",
+        opts.threadId,
+    ]).text;
     const postActionInstructions = [
         `Apply the patch to \`${filePath}\`: run \`git apply\` with the diff shown above, or edit the file directly using the line range (${range}).`,
         `Stage the file: \`git add -- ${quotedPath}\``,

package/bin/commands/commit-suggestion.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 // ---------------------------------------------------------------------------
 // Hoisted mocks
 // ---------------------------------------------------------------------------
@@ -107,7 +106,7 @@ function setupHappyPath() {
 // ---------------------------------------------------------------------------
 export function registerHooks() {
     beforeEach(() => {
-        mockLoadConfig.mockReturnValue({ cli: { runner: "auto" } });
+        mockLoadConfig.mockReturnValue({});
     });
 }
 export { FILE_CONTENT, GLOBAL_OPTS, fetchPrBatch, getCurrentBranch, getCurrentPrNumber, makeBatch, makeGitSuccess, makeThread, mockExecFile, mockFetchBatch, mockGetCurrentBranch, mockGetCurrentPrNumber, mockLoadConfig, mockReadFile, readFile, runCommitSuggestion, setupHappyPath, };

package/bin/commands/iterate/classify.mjs

@@ -37,8 +37,8 @@ export function classifyReviewSummaries(summaries, approvals, minimizeApprovals,
         surfacedApprovals: approvals,
     };
 }
-export function buildResolveCommand(threads, resolutionOnlyThreads, allCommentIds, reviews, checks, prNumber, runner) {
-    const argv = buildPrShepherdCommand(["resolve", String(prNumber)], { runner }).argv;
+export function buildResolveCommand(threads, resolutionOnlyThreads, allCommentIds, reviews, checks, prNumber) {
+    const argv = buildPrShepherdCommand(["resolve", String(prNumber)]).argv;
     const resolveThreadIds = dedupeIds(threads.map((t) => t.id));
     const threadIds = dedupeIds([...resolveThreadIds, ...resolutionOnlyThreads.map((t) => t.id)]);
     if (threadIds.length > 0) {

package/bin/commands/iterate/fix-code.mjs

@@ -7,7 +7,7 @@ import { buildFixInstructions } from "./render.mjs";
 import { applyStallGuard } from "./stall.mjs";
 import { tryCancelRun, buildInProgressRunIds } from "./helpers.mjs";
 export async function handleFixCode(ctx) {
-    const { base, report, opts, headSha, stallKey, prNumber, stallTimeoutSeconds, repoOwner, repoName, reviewSummaryIds, firstLookSummaries, editedSummaries, surfacedApprovals, cliRunner, } = ctx;
+    const { base, report, opts, headSha, stallKey, prNumber, stallTimeoutSeconds, repoOwner, repoName, reviewSummaryIds, firstLookSummaries, editedSummaries, surfacedApprovals, } = ctx;
     const failingChecks = report.checks.failing;
     const stored = await readFixAttempts({ owner: repoOwner, repo: repoName, pr: prNumber });
     const isNewSha = stored?.headSha !== headSha;
@@ -64,7 +64,7 @@ export async function handleFixCode(ctx) {
     const inProgressRunIds = pushLikely ? buildInProgressRunIds(report, cancelledSet) : [];
     const commentMinimizeIds = report.comments.minimizeIds ?? actionableComments.map((c) => c.id);
     const allCommentIds = [...commentMinimizeIds, ...reviewSummaryIds];
-    const resolveCommand = buildResolveCommand(threads, resolutionOnlyThreads, allCommentIds, changesRequestedReviews, checks, prNumber, cliRunner);
+    const resolveCommand = buildResolveCommand(threads, resolutionOnlyThreads, allCommentIds, changesRequestedReviews, checks, prNumber);
     const overlappingReviewIds = resolveCommand.droppedDismissReviewIds ?? [];
     if (overlappingReviewIds.length > 0) {
         process.stderr.write(`pr-shepherd: resolve command overlap: ${overlappingReviewIds.length} ` +
@@ -100,7 +100,7 @@ export async function handleFixCode(ctx) {
     }
     const firstLookThreads = report.threads.firstLook;
     const firstLookComments = report.comments.firstLook;
-    const instructions = buildFixInstructions(threads, actionableComments, checks, changesRequestedReviews, baseLookup.branch, resolveCommand, hasConflicts, prNumber, cancelled.length, firstLookThreads, firstLookComments, firstLookSummaries, editedSummaries, inProgressRunIds, resolutionOnlyThreads, cliRunner);
+    const instructions = buildFixInstructions(threads, actionableComments, checks, changesRequestedReviews, baseLookup.branch, resolveCommand, hasConflicts, prNumber, cancelled.length, firstLookThreads, firstLookComments, firstLookSummaries, editedSummaries, inProgressRunIds, resolutionOnlyThreads);
     return applyStallGuard(stallKey, stallTimeoutSeconds, headSha, base, prNumber, {
         ...base,
         baseBranch: baseLookup.branch,

package/bin/commands/iterate/index.mjs

@@ -122,7 +122,6 @@ export async function runIterate(opts) {
             firstLookSummaries,
             editedSummaries,
             surfacedApprovals,
-            cliRunner: config.cli?.runner,
         });
     }
     const canMarkReady = report.status === "READY" &&

package/bin/commands/iterate/render.mjs

@@ -15,7 +15,7 @@ export function renderResolveCommand(rc) {
     }
     return renderShellCommand(parts);
 }
-export function buildFixInstructions(threads, actionableComments, checks, changesRequestedReviews, baseBranch, resolveCommand, hasConflicts, prNumber, cancelledCount, firstLookThreads = [], firstLookComments = [], firstLookSummaries = [], editedSummaries = [], inProgressRunIds = [], resolutionOnlyThreads = [], runner) {
+export function buildFixInstructions(threads, actionableComments, checks, changesRequestedReviews, baseBranch, resolveCommand, hasConflicts, prNumber, cancelledCount, firstLookThreads = [], firstLookComments = [], firstLookSummaries = [], editedSummaries = [], inProgressRunIds = [], resolutionOnlyThreads = []) {
     const instructions = [];
     const hasNonConflictHints = threads.length > 0 ||
         checks.length > 0 ||
@@ -53,7 +53,7 @@ export function buildFixInstructions(threads, actionableComments, checks, change
     }
     const hasSuggestions = threads.some((t) => t.suggestion);
     if (hasSuggestions) {
-        instructions.push(buildCommitSuggestionInstruction(prNumber, "## Review threads", false, runner));
+        instructions.push(buildCommitSuggestionInstruction(prNumber, "## Review threads", false));
     }
     if (threads.length > 0 || actionableComments.length > 0) {
         const suggestionFallback = hasSuggestions
@@ -93,10 +93,11 @@ export function buildFixInstructions(threads, actionableComments, checks, change
         instructions.push(SHEPHERD_JOURNAL_FIRST_LOOK_GUIDANCE);
     }
     const editedTotal = editedSummaries.length +
+        actionableComments.filter((c) => c.edited).length +
         firstLookThreads.filter((t) => t.edited).length +
         firstLookComments.filter((c) => c.edited).length;
     if (editedTotal > 0) {
-        instructions.push(`Items under \`## Review summaries (edited since first look)\` and any first-look bullet tagged \`, edited\` were updated by their author after you previously acknowledged them. Read the updated body before deciding whether any matching \`## Review threads to resolve\` item should be resolved.`);
+        instructions.push(`Items marked \`[edited since first look]\`, items under \`## Review summaries (edited since first look)\`, and any first-look bullet tagged \`, edited\` were updated by their author after you previously acknowledged them. Read the updated body before deciding whether any matching \`## Review threads to resolve\` item should be resolved.`);
     }
     if (resolveCommand.hasMutations) {
         instructions.push(buildShepherdJournalInstruction(prNumber, SHEPHERD_JOURNAL_REFERENCE_GUIDANCE_THREADS_AND_COMMENTS_IN_ITEM_HEADINGS));

package/bin/commands/iterate-stall.test-support.mjs

@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { vi } from "vitest";
 import { NOW, makeOpts } from "./iterate-test-support.mjs";
 import { readStallState, writeStallState } from "../state/iterate-stall.mjs";

package/bin/commands/iterate.fix-code-in-progress.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { vi, beforeEach, afterEach } from "vitest";
 const mockFetch = vi.fn();
 vi.stubGlobal("fetch", mockFetch);
 const { mockExecFile } = vi.hoisted(() => ({ mockExecFile: vi.fn() }));
@@ -44,6 +43,7 @@ function makeReport(overrides = {}) {
         repo: "owner/repo",
         status: "READY",
         baseBranch: "main",
+        branchProtection: null,
         mergeStatus: {
             status: "CLEAN",
             state: "OPEN",

package/bin/commands/poll.mjs

@@ -3,9 +3,12 @@ function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function writeTickProgress(tick, elapsedSeconds, sleepSeconds, verbose) {
-    if (process.stderr.isTTY || verbose) {
+    if (verbose) {
         process.stderr.write(`[poll tick ${tick} / +${elapsedSeconds}s] WAIT — sleeping ${sleepSeconds}s\n`);
     }
+    else {
+        process.stderr.write(".");
+    }
 }
 const MAX_TIMER_MS = 2 ** 31 - 1;
 export async function runPoll(opts) {
@@ -16,17 +19,23 @@ export async function runPoll(opts) {
     let tick = 0;
     let lastResult;
     const verbose = opts.verbose === true;
+    let dotsPrinted = false;
     while (true) {
         tick += 1;
         lastResult = await runIterate(iterateOpts);
         if (lastResult.action !== "wait")
-            return lastResult;
+            break;
         const elapsedMs = Date.now() - start;
         const remainingMs = timeoutMs - elapsedMs;
         if (remainingMs <= 0)
-            return lastResult;
+            break;
         const nextSleepMs = Math.min(intervalMs, remainingMs);
         writeTickProgress(tick, Math.round(elapsedMs / 1000), Math.round(nextSleepMs / 1000), verbose);
+        if (!verbose)
+            dotsPrinted = true;
         await sleep(nextSleepMs);
     }
+    if (dotsPrinted)
+        process.stderr.write("\n");
+    return lastResult;
 }

package/bin/commands/resolve-instructions.mjs

@@ -6,7 +6,7 @@ import { buildCommitSuggestionInstruction } from "./commit-suggestion-instructio
  * Steps are conditionally emitted based on what the fetch returned (mirrors
  * `buildFixInstructions` in `commands/iterate/render.mts`).
  */
-export function buildFetchInstructions(prNumber, result, runner) {
+export function buildFetchInstructions(prNumber, result) {
     const { actionableThreads, resolutionOnlyThreads, firstLookThreads, actionableComments, firstLookComments, changesRequestedReviews, reviewSummaries, commitSuggestionsEnabled, } = result;
     const firstLookTotal = firstLookThreads.length + firstLookComments.length;
     const total = actionableThreads.length +
@@ -27,13 +27,14 @@ export function buildFetchInstructions(prNumber, result, runner) {
     if (firstLookTotal > 0) {
         instructions.push(`Items in \`## First-look items\` are shown so you can acknowledge their current status before acting. If a first-look thread also appears under \`## Review threads to resolve\`, include its ID in \`--resolve-thread-ids\`; otherwise do not pass first-look-only IDs to mutation flags.`);
     }
-    const editedTotal = firstLookThreads.filter((t) => t.edited).length +
+    const editedTotal = actionableComments.filter((c) => c.edited).length +
+        firstLookThreads.filter((t) => t.edited).length +
         firstLookComments.filter((c) => c.edited).length;
     if (editedTotal > 0) {
-        instructions.push(`First-look bullets tagged \`, edited\` were updated by their author after you previously acknowledged them. Read the updated body before deciding whether any matching \`## Review threads to resolve\` item should be resolved.`);
+        instructions.push(`Actionable comments marked \`[edited since first look]\` and first-look bullets tagged \`, edited\` were updated by their author after you previously acknowledged them. Read the updated body before deciding whether any matching \`## Review threads to resolve\` item should be resolved.`);
     }
     if (hasSuggestions) {
-        instructions.push(buildCommitSuggestionInstruction(prNumber, "## Actionable Review Threads", true, runner));
+        instructions.push(buildCommitSuggestionInstruction(prNumber, "## Actionable Review Threads", true));
     }
     if (hasCodeItems) {
         instructions.push(`Read and edit each file referenced under \`## Actionable Review Threads\`, \`## Actionable PR Comments\`, and \`## Pending CHANGES_REQUESTED reviews\` above. Reclassify each fixed item as Fixed. If an item is too complex to address, leave it as Actionable for the final report.`);
@@ -50,9 +51,7 @@ export function buildFetchInstructions(prNumber, result, runner) {
         : reviewSummaries.length > 0
             ? ` Review-summary IDs (\`PRR_…\` from \`## Review summaries\`) go into \`--minimize-comment-ids\`.`
             : "";
-    const resolveCommand = `${buildPrShepherdCommand(["resolve", String(prNumber)], {
-        runner,
-    }).text} [--resolve-thread-ids <ids>] [--minimize-comment-ids <ids>] [--dismiss-review-ids <ids> --message "<reason>"]`;
+    const resolveCommand = `${buildPrShepherdCommand(["resolve", String(prNumber)]).text} [--resolve-thread-ids <ids>] [--minimize-comment-ids <ids>] [--dismiss-review-ids <ids> --message "<reason>"]`;
     instructions.push(`Run \`${resolveCommand}\` with only the non-empty flag subsets. Skip the command entirely if all three ID lists are empty.${requireShaHint}${dismissNote}`);
     instructions.push(buildShepherdJournalInstruction(prNumber, SHEPHERD_JOURNAL_REFERENCE_GUIDANCE_THREADS_AND_COMMENTS_IN_ITEMS));
     instructions.push(`Report: echo the CLI's mutation output, then one line per Acknowledged item: \`Acknowledged <id> (@<author>): <reason>\`. If any fetched item was neither resolved nor acknowledged, stop and escalate: "<N> item(s) fetched but not acted on or acknowledged — need human direction before closing".`);

package/bin/commands/resolve.mjs

@@ -129,5 +129,5 @@ export async function runResolveFetch(opts) {
         reviewSummaries: cfg.resolve.fetchReviewSummaries ? data.reviewSummaries : [],
         commitSuggestionsEnabled: cfg.actions.commitSuggestions,
     };
-    return { ...result, instructions: buildFetchInstructions(prNumber, result, cfg.cli?.runner) };
+    return { ...result, instructions: buildFetchInstructions(prNumber, result) };
 }

package/bin/commands/resolve.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 vi.mock("../github/client.mts", () => ({
     getRepoInfo: vi.fn().mockResolvedValue({ owner: "owner", name: "repo" }),
     getCurrentPrNumber: vi.fn().mockResolvedValue(42),
@@ -67,6 +66,7 @@ function makeBatchData(overrides = {}) {
         reviewSummaries: [],
         approvedReviews: [],
         checks: [],
+        branchProtection: null,
         ...overrides,
     };
 }

package/bin/commands/shepherd-journal.test-support.mjs

@@ -1,5 +1,3 @@
-// @ts-nocheck
-import { describe, expect, it } from "vitest";
 import { buildShepherdJournalInstruction, SHEPHERD_JOURNAL_APPEND_HINT, SHEPHERD_JOURNAL_FIRST_LOOK_GUIDANCE, SHEPHERD_JOURNAL_REFERENCE_GUIDANCE_THREADS_AND_COMMENTS_IN_ITEM_HEADINGS, SHEPHERD_JOURNAL_REFERENCE_GUIDANCE_THREADS_AND_COMMENTS_IN_ITEMS, SHEPHERD_JOURNAL_SECTION, SHEPHERD_JOURNAL_SECTION_PATTERN, } from "./shepherd-journal.mjs";
 import { buildFixInstructions } from "./iterate/render.mjs";
 import { buildFetchInstructions } from "./resolve-instructions.mjs";

package/bin/comments/resolve.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 // ---------------------------------------------------------------------------
 // Mock github/client.mts before any imports.
 // ---------------------------------------------------------------------------