pr-shepherd 0.56.6 → 0.57.0

package/bin/cli/event-state-scope.d.mts

@@ -0,0 +1,19 @@
+/**
+ * Run a dispatched command, entering the durable state scope first when it resolves to event
+ * mode. Entering before log setup keeps the per-worktree log a peer of the seen markers and
+ * stall state an event session writes. Invalid flags or config fall through unscoped so the
+ * command handler reports them.
+ */
+export declare function runInEventStateScope<T>(args: string[], work: () => Promise<T>): Promise<T>;
+/**
+ * Report an invalid `--poll-mode` value as a usage error. Commands that only use the flag to
+ * pick a state scope (`log-file`, `clean`) call this before `runInPollModeScope`, because no
+ * later handler would reject a typo there. Returns true after printing the error.
+ */
+export declare function rejectInvalidPollModeFlag(args: string[], command: string): boolean;
+/**
+ * Run `work` in the durable state scope when `--poll-mode` in `args`, or else `poll.mode`,
+ * resolves to event mode. `log-file` and `clean` use this to reach the state an event tick
+ * writes.
+ */
+export declare function runInPollModeScope<T>(args: string[], work: () => Promise<T>): Promise<T>;

package/bin/cli/event-state-scope.mjs

@@ -0,0 +1,60 @@
+import { loadConfig } from "../config/load.mjs";
+import { EXIT } from "../exit-codes.mjs";
+import { resolvePollMode } from "../commands/poll-mode.mjs";
+import { runWithDurableState } from "../state/durable-state.mjs";
+import { getFlag } from "./args.mjs";
+import { isDefaultPollInvocation } from "./default-poll.mjs";
+/** Subcommands that honor `--poll-mode`; the default poll invocation honors it too. */
+const POLL_MODE_SUBCOMMANDS = new Set(["iterate", "poll"]);
+const REQUESTABLE = ["auto", "poll", "event"];
+function requestedPollMode(value) {
+    return REQUESTABLE.find((mode) => mode === value);
+}
+/**
+ * Run a dispatched command, entering the durable state scope first when it resolves to event
+ * mode. Entering before log setup keeps the per-worktree log a peer of the seen markers and
+ * stall state an event session writes. Invalid flags or config fall through unscoped so the
+ * command handler reports them.
+ */
+export function runInEventStateScope(args, work) {
+    const subcommand = args[0];
+    const honorsPollMode = isDefaultPollInvocation(subcommand) || POLL_MODE_SUBCOMMANDS.has(subcommand ?? "");
+    return honorsPollMode ? runInPollModeScope(args, work) : work();
+}
+/**
+ * Report an invalid `--poll-mode` value as a usage error. Commands that only use the flag to
+ * pick a state scope (`log-file`, `clean`) call this before `runInPollModeScope`, because no
+ * later handler would reject a typo there. Returns true after printing the error.
+ */
+export function rejectInvalidPollModeFlag(args, command) {
+    if (!args.some((arg) => arg === "--poll-mode" || arg.startsWith("--poll-mode=")))
+        return false;
+    const value = getFlag(args, "--poll-mode");
+    if (requestedPollMode(value))
+        return false;
+    process.stderr.write(`pr-shepherd: ${command}: --poll-mode must be one of ${REQUESTABLE.join(", ")}, got ${JSON.stringify(value ?? "")}\n`);
+    process.exitCode = EXIT.USAGE;
+    return true;
+}
+/**
+ * Run `work` in the durable state scope when `--poll-mode` in `args`, or else `poll.mode`,
+ * resolves to event mode. `log-file` and `clean` use this to reach the state an event tick
+ * writes.
+ */
+export function runInPollModeScope(args, work) {
+    return resolvesToEvent(args) ? runWithDurableState(work) : work();
+}
+function resolvesToEvent(args) {
+    const flag = getFlag(args, "--poll-mode");
+    const requested = requestedPollMode(flag);
+    // An explicit poll or event request wins without reading config, so a malformed config
+    // cannot drop an explicit `--poll-mode event` out of the durable scope.
+    if (requested === "event" || requested === "poll")
+        return requested === "event";
+    try {
+        return resolvePollMode(requested, loadConfig().poll.mode) === "event";
+    }
+    catch {
+        return false;
+    }
+}

package/bin/cli/fix-formatter.mjs

@@ -1,5 +1,4 @@
 /* eslint-disable max-lines */
-import { renderResolveCommand } from "../commands/iterate/render.mjs";
 import { inlineCode, joinSections } from "../util/markdown.mjs";
 import { renderSuggestionBlock, renderLineRange } from "./suggestion-renderer.mjs";
 import { renderThreadBullet, renderReviewBullet, renderThreadResolutionStatusTag, renderAuthor, buildFirstLookBullets, renderThreadConversation, blockquote, } from "./list-formatters.mjs";
@@ -77,9 +76,8 @@ export function formatFixCodeResult(header, result, opts = {}) {
             const scopeTag = ch.scope
                 ? ` [scope: ${ch.scope}${ch.commitOid ? `, commit: ${ch.commitOid}` : ""}]`
                 : "";
-            const rerunTag = ch.rerunCommand ? " [rerun authorized]" : "";
             const lines = [
-                `- ${locator} — \`${workflowPrefix}${jobLabel}\`${conclusionTag}${attemptTag}${scopeTag}${rerunTag}`,
+                `- ${locator} — \`${workflowPrefix}${jobLabel}\`${conclusionTag}${attemptTag}${scopeTag}`,
             ];
             if (ch.conclusion !== "CANCELLED") {
                 if (ch.failedStep)
@@ -184,13 +182,8 @@ export function formatFixCodeResult(header, result, opts = {}) {
         sections.push("## Cancelled runs");
         sections.push(result.cancelled.map((id) => `- \`${id}\``).join("\n"));
     }
-    sections.push("## Post-fix actions");
-    const postFixLines = [`- base: \`${result.baseBranch}\``];
-    if (result.fix.resolveOnlyCommand?.hasMutations)
-        postFixLines.push(`- resolve-only: \`${renderResolveCommand(result.fix.resolveOnlyCommand)}\``);
-    if (result.fix.resolveCommand.hasMutations) {
-        postFixLines.push(`- apply review: \`${renderResolveCommand(result.fix.resolveCommand)}\``);
-    }
+    // The review mutation commands render inline in their `## Instructions` steps.
+    const postFixLines = verbose ? [`- base: \`${result.baseBranch}\``] : [];
     if (result.fix.requeue) {
         postFixLines.push(`- requeue: ${inlineCode(renderMergeCommand(result.fix.requeue.command))}`);
         if (result.fix.requeue.queueApiFallbackCommand) {
@@ -200,7 +193,8 @@ export function formatFixCodeResult(header, result, opts = {}) {
     if (result.fix.queueRemovalAcknowledgment) {
         postFixLines.push(`- acknowledge queue removal: ${inlineCode(renderMergeCommand(result.fix.queueRemovalAcknowledgment))}`);
     }
-    sections.push(postFixLines.join("\n"));
+    if (postFixLines.length > 0)
+        sections.push("## Post-fix actions", postFixLines.join("\n"));
     sections.push("## Instructions");
     sections.push(numberInstructions(result.fix.instructions));
     return joinSections(sections);

package/bin/cli/handlers.d.mts

@@ -1,4 +1,3 @@
-export declare function handleClean(args: string[], command?: "admin clean" | "clean"): Promise<void>;
 export declare function handleCommitSuggestion(args: string[], command?: "build-suggestion-patch" | "commit-suggestion"): Promise<void>;
 export declare function handleSuggestionPatches(args: string[]): Promise<void>;
 export declare function handleIterate(args: string[]): Promise<void>;

package/bin/cli/handlers.mjs

@@ -1,73 +1,16 @@
 import { runCommitSuggestion } from "../commands/commit-suggestion.mjs";
 import { runSuggestionPatches } from "../commands/suggestion-patches.mjs";
 import { runMarkFilesAsViewed } from "../commands/mark-files-as-viewed.mjs";
-import { runIterate } from "../commands/iterate/index.mjs";
-import { runClean } from "../commands/clean.mjs";
+import { runIterateForMode } from "../commands/event-mode.mjs";
 import { loadConfig } from "../config/load.mjs";
 import { EXIT } from "../exit-codes.mjs";
 import { parseCommonArgs, getFlag } from "./args.mjs";
 import { USAGE } from "./help.mjs";
-import { formatCommitSuggestionResult, formatSuggestionPatchesResult, formatCleanResult, formatMarkFilesAsViewedResult, } from "./formatters.mjs";
+import { formatCommitSuggestionResult, formatSuggestionPatchesResult, formatMarkFilesAsViewedResult, } from "./formatters.mjs";
 import { parseSuggestionPatchGroups } from "./suggestion-patch-flags.mjs";
-import { parseIterateFlags } from "./iterate-flags.mjs";
+import { hasInvalidIterateFlags, parseIterateFlags } from "./iterate-flags.mjs";
 import { emitIterateResult } from "./iterate-emitter.mjs";
 import { parseMarkFilesAsViewedArgs } from "./mark-files-as-viewed-flags.mjs";
-const CLEAN_VARIANTS = new Set(["pr", "branch", "current", "repo", "all"]);
-export async function handleClean(args, command = "admin clean") {
-    const usage = command === "admin clean" ? USAGE["admin clean"] : USAGE.clean;
-    const variant = args[0];
-    if (!variant || !CLEAN_VARIANTS.has(variant)) {
-        process.stderr.write(`${usage}\n`);
-        process.exitCode = EXIT.USAGE;
-        return;
-    }
-    const rest = args.slice(1);
-    for (const a of rest) {
-        if (!a.startsWith("--"))
-            continue;
-        if (a === "--dry-run" || a === "--format" || a.startsWith("--format="))
-            continue;
-        process.stderr.write(`pr-shepherd: ${command}: unknown flag: "${a}"\n`);
-        process.exitCode = EXIT.USAGE;
-        return;
-    }
-    const fmtIdx = rest.indexOf("--format");
-    const fmtEqEntry = rest.find((a) => a.startsWith("--format="));
-    let formatValue;
-    if (fmtEqEntry !== undefined) {
-        formatValue = fmtEqEntry.slice("--format=".length);
-    }
-    else if (fmtIdx !== -1 && fmtIdx + 1 < rest.length && !rest[fmtIdx + 1].startsWith("--")) {
-        formatValue = rest[fmtIdx + 1];
-    }
-    if (formatValue !== undefined && formatValue !== "text" && formatValue !== "json") {
-        process.stderr.write(`pr-shepherd: ${command}: invalid --format value: "${formatValue}". Expected "text" or "json".\n`);
-        process.exitCode = EXIT.USAGE;
-        return;
-    }
-    const jsonOut = formatValue === "json";
-    const dryRun = rest.includes("--dry-run");
-    // Skip the value consumed by --format <value> so it isn't mistaken for the positional.
-    const flagConsumedIndices = new Set();
-    if (fmtIdx !== -1 && fmtIdx + 1 < rest.length && !rest[fmtIdx + 1].startsWith("--")) {
-        flagConsumedIndices.add(fmtIdx);
-        flagConsumedIndices.add(fmtIdx + 1);
-    }
-    const positionals = rest.filter((a, i) => !flagConsumedIndices.has(i) && !a.startsWith("--"));
-    if (positionals.length > 1) {
-        process.stderr.write(`pr-shepherd: ${command}: too many positional arguments (expected at most 1, got ${positionals.length})\n`);
-        process.exitCode = EXIT.USAGE;
-        return;
-    }
-    const value = positionals[0];
-    const result = await runClean({ variant: variant, value, dryRun });
-    if (!result.ok) {
-        process.stderr.write(`pr-shepherd: ${command}: ${result.error}\n`);
-        process.exitCode = EXIT.SOFTWARE;
-        return;
-    }
-    process.stdout.write(jsonOut ? `${JSON.stringify(result, null, 2)}\n` : `${formatCleanResult(result)}\n`);
-}
 export async function handleCommitSuggestion(args, command = "build-suggestion-patch") {
     const { prNumber, global: globalOpts, extra } = parseCommonArgs(args);
     const threadId = getFlag(extra, "--thread-id");
@@ -113,11 +56,10 @@ export async function handleSuggestionPatches(args) {
 }
 export async function handleIterate(args) {
     const { prNumber, global: globalOpts, extra } = parseCommonArgs(args);
-    const cfg = loadConfig();
-    const flags = parseIterateFlags(extra, cfg);
-    if (flags.readyDelaySuffix === null || flags.stallTimeoutSuffix === null)
+    const flags = parseIterateFlags(extra, loadConfig());
+    if (hasInvalidIterateFlags(flags))
         return;
-    const result = await runIterate({
+    const result = await runIterateForMode({
         ...globalOpts,
         prNumber,
         readyDelaySeconds: flags.readyDelaySeconds,
@@ -125,6 +67,8 @@ export async function handleIterate(args) {
         noAutoMarkReady: flags.noAutoMarkReady,
         noAutoCancelActionable: flags.noAutoCancelActionable,
         merge: flags.merge,
+        instructions: flags.instructions ?? undefined,
+        pollMode: flags.pollMode ?? undefined,
     });
     emitIterateResult(result, {
         format: globalOpts.format,

package/bin/cli/help-command-pages.d.mts

@@ -1,10 +1,29 @@
 export declare const COMMAND_USAGE: {
     readonly default: string;
+    readonly "apply merge": `pr-shepherd apply merge
+
+Submit one SHA-guarded asynchronous merge or enqueue request with REST.
+Rerun the same command to resume its persisted UUID. Pending and enqueued requests are not merged.
+An enqueued result records that request's outcome; it does not confirm current queue membership.
+An uncertain submission is never repeated automatically.
+
+Usage:
+  pr-shepherd apply merge [PR] --require-sha SHA --merge-action direct_merge|merge_queue|default
+    [--method merge|squash|rebase] [--expected-stack JSON] --transport rest [--format text|json]
+
+--require-sha <sha>             Full 40-character lowercase PR head SHA.
+--merge-action <action>         direct_merge, merge_queue, or default.
+--method <method>               Optional merge method, only for direct_merge.
+--expected-stack <json>         Bind native stack number, baseRefName, and ordered prefix PRs/refs/head SHAs.
+--transport rest               Required REST transport; repository rules are never bypassed.
+--format text|json              Output format. Default: text.
+--help, -h                     Print this help before validation or I/O.`;
     readonly apply: `pr-shepherd apply
 
 Apply review mutations, mark selected changed files as viewed, append a PR journal item, or record an external check blocker.
 
 Usage:
+  pr-shepherd apply merge [PR] --require-sha SHA --merge-action ACTION --transport rest
   pr-shepherd apply review [PR] [review-flags]
   pr-shepherd apply files [PR] [files...] [--tests] [--match REGEX]
   pr-shepherd apply journal [PR] <item> [--dry-run] [--format text|json]
@@ -13,7 +32,7 @@ Usage:
   pr-shepherd apply check-blocker [PR] --check <name> --clear
   pr-shepherd apply queue-removal [PR] --require-sha <head> --queue-commit <commit> --removed-at <unix>
 
-Run 'pr-shepherd apply <review|files|journal|check-blocker|queue-removal> --help' for command-specific details.
+Run 'pr-shepherd apply <merge|review|files|journal|check-blocker|queue-removal> --help' for command-specific details.
 --help, -h                      Print this help and exit before GitHub I/O.`;
     readonly "apply review": `pr-shepherd apply review
 
@@ -32,7 +51,11 @@ Flags:
   --minimize-comment-ids <ids>    Comma-separated issue/review comment IDs to minimize.
   --dismiss-review-ids <ids>      Comma-separated review IDs to dismiss.
   --message <text>                Reply/dismiss message. Required with reply or dismiss IDs.
-  --require-sha <sha>             Wait for this full 40-character lowercase PR head SHA.
+  --require-sha <sha>             Wait for this full 40-character lowercase PR head SHA, or HEAD
+                                  for this checkout's commit.
+  --adopt-existing-replies        Generated durable-state commands only: count a thread whose last
+                                  comment is already this exact Shepherd reply from you as replied
+                                  instead of posting it again. Omit it to forward every reply ID.
   --format text|json              Output format. Default: text.
 
 At least one action flag is required.
@@ -143,14 +166,16 @@ Run 'pr-shepherd admin <clean|log-file> --help' for command-specific details.
 Remove pr-shepherd state files from PR_SHEPHERD_STATE_DIR.
 
 Usage:
-  pr-shepherd admin clean pr [number] [--dry-run] [--format text|json]
-  pr-shepherd admin clean branch [name] [--dry-run] [--format text|json]
-  pr-shepherd admin clean current [--dry-run] [--format text|json]
-  pr-shepherd admin clean repo [--dry-run] [--format text|json]
-  pr-shepherd admin clean all [--dry-run] [--format text|json]
+  pr-shepherd admin clean pr [number] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean branch [name] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean current [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean repo [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean all [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
 
 Variants remove state for one PR, branch, current branch, repository, or all repositories.
 Use --dry-run to preview paths without removing them.
+--poll-mode auto|poll|event      Clean the state for that poll mode; event mode keeps it in durable
+                                state under the git common directory. Default: poll.mode (auto).
 --help, -h                      Print this help and exit before any cleanup.`;
     readonly "admin log-file": string;
     readonly resolve: `pr-shepherd resolve
@@ -172,9 +197,10 @@ Flags:
   --dismiss-review-ids <ids>      Comma-separated review IDs to dismiss.
   --message <text>                Reply/dismiss message. Required with --reply-thread-ids
                                   or --dismiss-review-ids.
-  --require-sha <sha>             Wait until GitHub reports this PR head SHA before mutating.
-                                  Must be a full 40-character lowercase hex SHA. Local HEAD is valid
-                                  only when it equals the current remote PR head.
+  --require-sha <sha>             Wait until GitHub reports this PR head SHA (or HEAD) before mutating.
+                                  Must be a full 40-character lowercase hex SHA, or HEAD for this
+                                  checkout's commit. Local HEAD is valid only when it equals the
+                                  current remote PR head.
   --format text|json              Output format. Default: text.
   --help, -h                      Print this help and exit before GitHub I/O.
 
@@ -227,18 +253,18 @@ Flags:
 
 PR may be a number or GitHub pull request URL. When omitted, the current branch PR is inferred.
 Exit code: 0 on success; nonzero on failure (sysexits.h — see docs/exit-codes.md).`;
-    readonly iterate: "pr-shepherd iterate\n\nRun one iterate tick for a pull request. The no-subcommand form polls; use this subcommand for a single tick.\nThe output contains one action and an action-specific ## Instructions section.\n\nUsage:\n  pr-shepherd iterate [PR] [iterate-flags]\n\nIterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number is minutes; decimals are allowed only with an explicit unit (4.5m).\n\nActions:\n  WAIT        No immediate action; continue with the next poll.\n  MARK_READY  Draft PR was marked ready; continue with the next poll.\n  READY       Clean PR is inside the ready-delay. Schedule the rerun for when remainingSeconds elapses. Do not invent unrelated work. Already-owned later work may continue.\n  FIX_CODE    Agent action is required; follow the instructions, then continue polling.\n  CANCEL      Stop polling this pull request: merged/closed or ready-delay elapsed. Continue remaining work from the original request.\n  ESCALATE    Stop polling until a human provides direction.\n  MERGE       Run the emitted merge/queue command, then continue monitoring.\n\nExit codes:\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
-    readonly poll: "pr-shepherd poll\n\nRun iterate repeatedly for one PR, or read compact summaries for an explicit PR set or native\nGitHub stack. Aggregate mode returns when any row needs work, every row is terminal, or timeout.\nPoll exits as soon as iterate returns READY, MARK_READY, CANCEL, or ESCALATE, or when timeout\nreturns the last WAIT result. FIX_CODE starts a --debounce settle window (default:\npoll.debounceSeconds; built-in 1m): poll keeps\niterating at --interval, then runs one more tick after the window and returns that result.\nWith --until-terminal or --merge, poll also continues through MARK_READY.\n\nUsage:\n  pr-shepherd poll [PR ...] [poll-flags] [iterate-flags]\n  pr-shepherd poll --stack PR [poll-flags] [iterate-flags]\n\nPoll flags:\n  --stack PR                    Select all entries in PR's native GitHub stack, bottom to top.\n  --interval <duration>          Sleep between WAIT ticks. Bare number = seconds. Default: poll.intervalSeconds (built-in 60s). Stack and multi-PR polls multiply that by poll.stackIntervalFactor (built-in 2) unless this flag is set.\n  --timeout <duration>           Maximum wall-clock wait for WAIT ticks. Bare number = seconds. Default: poll.timeoutSeconds (built-in 4.5m).\n  --debounce <duration>          Settle window after first FIX_CODE or stack SHEPHERD before returning. Bare number = seconds. Default: poll.debounceSeconds (built-in 60s). 0 disables.\n  --quiet-status                 Print only changed WAIT snapshots. Overrides poll.quietStatus.\n  --no-quiet-status              Print every WAIT snapshot. Overrides poll.quietStatus.\n  --until-terminal               Continue through WAIT/MARK_READY until READY/FIX_CODE/MERGE/CANCEL/ESCALATE or stack SHEPHERD.\n\nForwarded iterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields and detailed per-tick lines.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number uses each flag's default unit (seconds\nfor --interval/--timeout/--debounce, minutes for --ready-delay/--stall-timeout); decimals are allowed only with\nan explicit unit (4.5m).\nEach WAIT tick writes a stderr line naming what it is waiting on by default; poll.quietStatus can change that default, --quiet-status/--no-quiet-status override it, and --verbose emits detailed per-tick lines.\nFIX_CODE debounce writes a remaining-seconds line to stderr. --timeout does not cut an in-flight debounce short.\nWith --until-terminal, --timeout is ignored for WAIT ticks and polling continues until READY, FIX_CODE, MERGE, CANCEL, or ESCALATE. With --merge, --timeout still bounds WAIT ticks; it only continues through MARK_READY while polling remains within that timeout.\n\nExit codes: same as iterate (the final tick's action/reason decides the code).\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY (including a WAIT returned by --timeout)\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  16  SHEPHERD (--stack only: run the listed one-PR sessions, then rerun the selector)\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
+    readonly iterate: "pr-shepherd iterate\n\nRun one iterate tick for a pull request. The no-subcommand form polls; use this subcommand for a single tick.\nThe output contains one action and an action-specific ## Instructions section.\n\nUsage:\n  pr-shepherd iterate [PR] [iterate-flags]\n\nIterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --instructions playbook|inline Render fix_code steps inline every tick (default) or fold the invariant ones into a playbook pointer. Default: iterate.instructions (inline).\n  --poll-mode auto|poll|event    event runs one tick, never sleeps, and prints nextCheck; auto picks event when CLAUDE_CODE_REMOTE=true. Default: poll.mode (auto).\n  --transport auto|graphql|rest  Select GitHub transport. Default: github.transport (auto).\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number is minutes; decimals are allowed only with an explicit unit (4.5m).\n\nActions:\n  WAIT        No immediate action; continue with the next poll.\n  MARK_READY  Draft PR was marked ready; continue with the next poll.\n  READY       Clean PR is inside the ready-delay. Schedule the rerun for when remainingSeconds elapses. Do not invent unrelated work. Already-owned later work may continue.\n  FIX_CODE    Agent action is required; follow the instructions, then continue polling.\n  CANCEL      Stop polling this pull request: merged/closed or ready-delay elapsed. Continue remaining work from the original request.\n  ESCALATE    Stop polling until a human provides direction.\n  MERGE       Run the emitted merge/queue command, then continue monitoring.\n\nExit codes:\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
+    readonly poll: "pr-shepherd poll\n\nRun iterate repeatedly for one PR, or read compact summaries for an explicit PR set or native\nGitHub stack. Aggregate mode returns when any row needs work, every row is terminal, or timeout.\nPoll exits as soon as iterate returns READY, MARK_READY, CANCEL, or ESCALATE, or when timeout\nreturns the last WAIT result. FIX_CODE starts a --debounce settle window (default:\npoll.debounceSeconds; built-in 1m): poll keeps\niterating at --interval, then runs one more tick after the window and returns that result.\nWith --until-terminal or --merge, poll also continues through MARK_READY.\n\nUsage:\n  pr-shepherd poll [PR ...] [poll-flags] [iterate-flags]\n  pr-shepherd poll --stack PR [poll-flags] [iterate-flags]\n\nPoll flags:\n  --stack PR                    Select all entries in PR's native GitHub stack, bottom to top.\n  --interval <duration>          Sleep between WAIT ticks. Bare number = seconds. Default: poll.intervalSeconds (built-in 60s). Stack and multi-PR polls multiply that by poll.stackIntervalFactor (built-in 2) unless this flag is set.\n  --timeout <duration>           Maximum wall-clock wait for WAIT ticks. Bare number = seconds. Default: poll.timeoutSeconds (built-in 4.5m).\n  --debounce <duration>          Settle window after first FIX_CODE or stack SHEPHERD before returning. Bare number = seconds. Default: poll.debounceSeconds (built-in 60s). 0 disables.\n  --quiet-status                 Print only changed WAIT snapshots. Overrides poll.quietStatus.\n  --no-quiet-status              Print every WAIT snapshot. Overrides poll.quietStatus.\n  --until-terminal               Continue through WAIT/MARK_READY until READY/FIX_CODE/MERGE/CANCEL/ESCALATE or stack SHEPHERD.\n\nForwarded iterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --instructions playbook|inline Render fix_code steps inline every tick (default) or fold the invariant ones into a playbook pointer. Default: iterate.instructions (inline).\n  --poll-mode auto|poll|event    event runs one tick, never sleeps, and prints nextCheck; auto picks event when CLAUDE_CODE_REMOTE=true. Default: poll.mode (auto).\n  --transport auto|graphql|rest  Select GitHub transport. Default: github.transport (auto).\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields and detailed per-tick lines.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number uses each flag's default unit (seconds\nfor --interval/--timeout/--debounce, minutes for --ready-delay/--stall-timeout); decimals are allowed only with\nan explicit unit (4.5m).\nEach WAIT tick writes a stderr line naming what it is waiting on by default; poll.quietStatus can change that default, --quiet-status/--no-quiet-status override it, and --verbose emits detailed per-tick lines.\nFIX_CODE debounce writes a remaining-seconds line to stderr. --timeout does not cut an in-flight debounce short.\nWith --until-terminal, --timeout is ignored for WAIT ticks and polling continues until READY, FIX_CODE, MERGE, CANCEL, or ESCALATE. With --merge, --timeout still bounds WAIT ticks; it only continues through MARK_READY while polling remains within that timeout.\n\nExit codes: same as iterate (the final tick's action/reason decides the code).\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY (including a WAIT returned by --timeout)\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  16  SHEPHERD (--stack only: run the listed one-PR sessions, then rerun the selector)\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
     readonly clean: `pr-shepherd clean
 
 Remove pr-shepherd state files from PR_SHEPHERD_STATE_DIR.
 
 Usage:
-  pr-shepherd clean pr [number] [--dry-run] [--format text|json]
-  pr-shepherd clean branch [name] [--dry-run] [--format text|json]
-  pr-shepherd clean current [--dry-run] [--format text|json]
-  pr-shepherd clean repo [--dry-run] [--format text|json]
-  pr-shepherd clean all [--dry-run] [--format text|json]
+  pr-shepherd clean pr [number] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean branch [name] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean current [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean repo [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean all [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
 
 Variants:
   pr [number]          Remove state for one PR. Defaults to current branch PR.
@@ -251,6 +277,9 @@ Variants:
 Flags:
   --dry-run            Preview paths without removing them.
   --format text|json   Output format. Default: text.
+  --poll-mode auto|poll|event
+                       Clean the state for that poll mode; event mode keeps it in durable
+                       state under the git common directory. Default: poll.mode (auto).
   --help, -h           Print this help and exit before any cleanup.
 
 Exit code: 0 on success (including a no-op --dry-run on a nonexistent target); nonzero on failure (sysexits.h — see docs/exit-codes.md).`;
@@ -291,5 +320,20 @@ Malformed or unrecognized journal content is returned as {"ok":false,...} with e
 On POSIX, the final body-file path entry must be a readable regular file in a trusted parent directory;
 symlinks, FIFOs, devices, and unreadable paths exit 66. Unsupported platforms fail closed with exit 66.
 --help, -h                      Print this help and exit before any I/O.`;
-    readonly "log-file": "pr-shepherd log-file\n\nPrint the per-worktree append-only debug log path for the current repository.\nThe log is created by the first non-help pr-shepherd command that initializes logging.\n\nUsage:\n  pr-shepherd log-file [--format text|json]\n\nFlags:\n  --format text|json   Print a raw path or {\"path\": \"...\"} JSON. Default: text.\n  --help, -h           Print this help and exit before logging setup.\n\nEnvironment:\n  PR_SHEPHERD_LOG_DISABLED=1 disables logging.\n  PR_SHEPHERD_STATE_DIR overrides the base state directory.\n\nExit code: 0 on success; 1 if repository identity cannot be resolved.";
+    readonly playbook: `pr-shepherd playbook
+
+Print a playbook named by a playbook pointer in the output's ## Instructions. Playbooks ship with the
+package, so this works without the pr-shepherd skill installed. With no name, lists every playbook.
+This command performs no GitHub, git, or log I/O.
+
+Usage:
+  pr-shepherd playbook [name] [--format text|json]
+
+Flags:
+  --format text|json   Markdown text (default) or one JSON line: {"name","content"} or {"playbooks":[...]}.
+
+The name is case-insensitive; spaces and hyphens are equivalent ("Fix-code loop" and fix-code-loop match).
+Unknown names exit 64 and list the available playbooks.
+--help, -h                      Print this help and exit before any I/O.`;
+    readonly "log-file": "pr-shepherd log-file\n\nPrint the per-worktree append-only debug log path for the current repository.\nThe log is created by the first non-help pr-shepherd command that initializes logging.\n\nUsage:\n  pr-shepherd log-file [--format text|json] [--poll-mode auto|poll|event]\n\nFlags:\n  --format text|json   Print a raw path or {\"path\": \"...\"} JSON. Default: text.\n  --poll-mode auto|poll|event\n                       Report the log for that poll mode; event mode keeps it in durable\n                       state under the git common directory. Default: poll.mode (auto).\n  --help, -h           Print this help and exit before logging setup.\n\nEnvironment:\n  PR_SHEPHERD_LOG_DISABLED=1 disables logging.\n  PR_SHEPHERD_STATE_DIR overrides the base state directory.\n\nExit code: 0 on success; 1 if repository identity cannot be resolved.";
 };

package/bin/cli/help-command-pages.mjs

@@ -3,11 +3,30 @@ import { LOG_FILE_USAGE } from "./help-log-file-page.mjs";
 import { DEFAULT_USAGE, ITERATE_USAGE, POLL_USAGE } from "./help-iterate-poll-pages.mjs";
 export const COMMAND_USAGE = {
     default: DEFAULT_USAGE,
+    "apply merge": `pr-shepherd apply merge
+
+Submit one SHA-guarded asynchronous merge or enqueue request with REST.
+Rerun the same command to resume its persisted UUID. Pending and enqueued requests are not merged.
+An enqueued result records that request's outcome; it does not confirm current queue membership.
+An uncertain submission is never repeated automatically.
+
+Usage:
+  pr-shepherd apply merge [PR] --require-sha SHA --merge-action direct_merge|merge_queue|default
+    [--method merge|squash|rebase] [--expected-stack JSON] --transport rest [--format text|json]
+
+--require-sha <sha>             Full 40-character lowercase PR head SHA.
+--merge-action <action>         direct_merge, merge_queue, or default.
+--method <method>               Optional merge method, only for direct_merge.
+--expected-stack <json>         Bind native stack number, baseRefName, and ordered prefix PRs/refs/head SHAs.
+--transport rest               Required REST transport; repository rules are never bypassed.
+--format text|json              Output format. Default: text.
+--help, -h                     Print this help before validation or I/O.`,
     apply: `pr-shepherd apply
 
 Apply review mutations, mark selected changed files as viewed, append a PR journal item, or record an external check blocker.
 
 Usage:
+  pr-shepherd apply merge [PR] --require-sha SHA --merge-action ACTION --transport rest
   pr-shepherd apply review [PR] [review-flags]
   pr-shepherd apply files [PR] [files...] [--tests] [--match REGEX]
   pr-shepherd apply journal [PR] <item> [--dry-run] [--format text|json]
@@ -16,7 +35,7 @@ Usage:
   pr-shepherd apply check-blocker [PR] --check <name> --clear
   pr-shepherd apply queue-removal [PR] --require-sha <head> --queue-commit <commit> --removed-at <unix>
 
-Run 'pr-shepherd apply <review|files|journal|check-blocker|queue-removal> --help' for command-specific details.
+Run 'pr-shepherd apply <merge|review|files|journal|check-blocker|queue-removal> --help' for command-specific details.
 --help, -h                      Print this help and exit before GitHub I/O.`,
     "apply review": `pr-shepherd apply review
 
@@ -35,7 +54,11 @@ Flags:
   --minimize-comment-ids <ids>    Comma-separated issue/review comment IDs to minimize.
   --dismiss-review-ids <ids>      Comma-separated review IDs to dismiss.
   --message <text>                Reply/dismiss message. Required with reply or dismiss IDs.
-  --require-sha <sha>             Wait for this full 40-character lowercase PR head SHA.
+  --require-sha <sha>             Wait for this full 40-character lowercase PR head SHA, or HEAD
+                                  for this checkout's commit.
+  --adopt-existing-replies        Generated durable-state commands only: count a thread whose last
+                                  comment is already this exact Shepherd reply from you as replied
+                                  instead of posting it again. Omit it to forward every reply ID.
   --format text|json              Output format. Default: text.
 
 At least one action flag is required.
@@ -146,14 +169,16 @@ Run 'pr-shepherd admin <clean|log-file> --help' for command-specific details.
 Remove pr-shepherd state files from PR_SHEPHERD_STATE_DIR.
 
 Usage:
-  pr-shepherd admin clean pr [number] [--dry-run] [--format text|json]
-  pr-shepherd admin clean branch [name] [--dry-run] [--format text|json]
-  pr-shepherd admin clean current [--dry-run] [--format text|json]
-  pr-shepherd admin clean repo [--dry-run] [--format text|json]
-  pr-shepherd admin clean all [--dry-run] [--format text|json]
+  pr-shepherd admin clean pr [number] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean branch [name] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean current [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean repo [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd admin clean all [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
 
 Variants remove state for one PR, branch, current branch, repository, or all repositories.
 Use --dry-run to preview paths without removing them.
+--poll-mode auto|poll|event      Clean the state for that poll mode; event mode keeps it in durable
+                                state under the git common directory. Default: poll.mode (auto).
 --help, -h                      Print this help and exit before any cleanup.`,
     "admin log-file": LOG_FILE_USAGE.replaceAll("pr-shepherd log-file", "pr-shepherd admin log-file"),
     resolve: `pr-shepherd resolve
@@ -175,9 +200,10 @@ Flags:
   --dismiss-review-ids <ids>      Comma-separated review IDs to dismiss.
   --message <text>                Reply/dismiss message. Required with --reply-thread-ids
                                   or --dismiss-review-ids.
-  --require-sha <sha>             Wait until GitHub reports this PR head SHA before mutating.
-                                  Must be a full 40-character lowercase hex SHA. Local HEAD is valid
-                                  only when it equals the current remote PR head.
+  --require-sha <sha>             Wait until GitHub reports this PR head SHA (or HEAD) before mutating.
+                                  Must be a full 40-character lowercase hex SHA, or HEAD for this
+                                  checkout's commit. Local HEAD is valid only when it equals the
+                                  current remote PR head.
   --format text|json              Output format. Default: text.
   --help, -h                      Print this help and exit before GitHub I/O.
 
@@ -237,11 +263,11 @@ Exit code: 0 on success; nonzero on failure (sysexits.h — see docs/exit-codes.
 Remove pr-shepherd state files from PR_SHEPHERD_STATE_DIR.
 
 Usage:
-  pr-shepherd clean pr [number] [--dry-run] [--format text|json]
-  pr-shepherd clean branch [name] [--dry-run] [--format text|json]
-  pr-shepherd clean current [--dry-run] [--format text|json]
-  pr-shepherd clean repo [--dry-run] [--format text|json]
-  pr-shepherd clean all [--dry-run] [--format text|json]
+  pr-shepherd clean pr [number] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean branch [name] [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean current [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean repo [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
+  pr-shepherd clean all [--dry-run] [--format text|json] [--poll-mode auto|poll|event]
 
 Variants:
   pr [number]          Remove state for one PR. Defaults to current branch PR.
@@ -254,6 +280,9 @@ Variants:
 Flags:
   --dry-run            Preview paths without removing them.
   --format text|json   Output format. Default: text.
+  --poll-mode auto|poll|event
+                       Clean the state for that poll mode; event mode keeps it in durable
+                       state under the git common directory. Default: poll.mode (auto).
   --help, -h           Print this help and exit before any cleanup.
 
 Exit code: 0 on success (including a no-op --dry-run on a nonexistent target); nonzero on failure (sysexits.h — see docs/exit-codes.md).`,
@@ -293,6 +322,21 @@ The output is exactly one JSON line: the typed result from extractShepherdJourna
 Malformed or unrecognized journal content is returned as {"ok":false,...} with exit code 0.
 On POSIX, the final body-file path entry must be a readable regular file in a trusted parent directory;
 symlinks, FIFOs, devices, and unreadable paths exit 66. Unsupported platforms fail closed with exit 66.
+--help, -h                      Print this help and exit before any I/O.`,
+    playbook: `pr-shepherd playbook
+
+Print a playbook named by a playbook pointer in the output's ## Instructions. Playbooks ship with the
+package, so this works without the pr-shepherd skill installed. With no name, lists every playbook.
+This command performs no GitHub, git, or log I/O.
+
+Usage:
+  pr-shepherd playbook [name] [--format text|json]
+
+Flags:
+  --format text|json   Markdown text (default) or one JSON line: {"name","content"} or {"playbooks":[...]}.
+
+The name is case-insensitive; spaces and hyphens are equivalent ("Fix-code loop" and fix-code-loop match).
+Unknown names exit 64 and list the available playbooks.
 --help, -h                      Print this help and exit before any I/O.`,
     "log-file": LOG_FILE_USAGE,
 };

package/bin/cli/help-iterate-poll-pages.d.mts

@@ -1,4 +1,4 @@
-export declare const ITERATE_USAGE = "pr-shepherd iterate\n\nRun one iterate tick for a pull request. The no-subcommand form polls; use this subcommand for a single tick.\nThe output contains one action and an action-specific ## Instructions section.\n\nUsage:\n  pr-shepherd iterate [PR] [iterate-flags]\n\nIterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number is minutes; decimals are allowed only with an explicit unit (4.5m).\n\nActions:\n  WAIT        No immediate action; continue with the next poll.\n  MARK_READY  Draft PR was marked ready; continue with the next poll.\n  READY       Clean PR is inside the ready-delay. Schedule the rerun for when remainingSeconds elapses. Do not invent unrelated work. Already-owned later work may continue.\n  FIX_CODE    Agent action is required; follow the instructions, then continue polling.\n  CANCEL      Stop polling this pull request: merged/closed or ready-delay elapsed. Continue remaining work from the original request.\n  ESCALATE    Stop polling until a human provides direction.\n  MERGE       Run the emitted merge/queue command, then continue monitoring.\n\nExit codes:\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
-export declare const POLL_USAGE = "pr-shepherd poll\n\nRun iterate repeatedly for one PR, or read compact summaries for an explicit PR set or native\nGitHub stack. Aggregate mode returns when any row needs work, every row is terminal, or timeout.\nPoll exits as soon as iterate returns READY, MARK_READY, CANCEL, or ESCALATE, or when timeout\nreturns the last WAIT result. FIX_CODE starts a --debounce settle window (default:\npoll.debounceSeconds; built-in 1m): poll keeps\niterating at --interval, then runs one more tick after the window and returns that result.\nWith --until-terminal or --merge, poll also continues through MARK_READY.\n\nUsage:\n  pr-shepherd poll [PR ...] [poll-flags] [iterate-flags]\n  pr-shepherd poll --stack PR [poll-flags] [iterate-flags]\n\nPoll flags:\n  --stack PR                    Select all entries in PR's native GitHub stack, bottom to top.\n  --interval <duration>          Sleep between WAIT ticks. Bare number = seconds. Default: poll.intervalSeconds (built-in 60s). Stack and multi-PR polls multiply that by poll.stackIntervalFactor (built-in 2) unless this flag is set.\n  --timeout <duration>           Maximum wall-clock wait for WAIT ticks. Bare number = seconds. Default: poll.timeoutSeconds (built-in 4.5m).\n  --debounce <duration>          Settle window after first FIX_CODE or stack SHEPHERD before returning. Bare number = seconds. Default: poll.debounceSeconds (built-in 60s). 0 disables.\n  --quiet-status                 Print only changed WAIT snapshots. Overrides poll.quietStatus.\n  --no-quiet-status              Print every WAIT snapshot. Overrides poll.quietStatus.\n  --until-terminal               Continue through WAIT/MARK_READY until READY/FIX_CODE/MERGE/CANCEL/ESCALATE or stack SHEPHERD.\n\nForwarded iterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields and detailed per-tick lines.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number uses each flag's default unit (seconds\nfor --interval/--timeout/--debounce, minutes for --ready-delay/--stall-timeout); decimals are allowed only with\nan explicit unit (4.5m).\nEach WAIT tick writes a stderr line naming what it is waiting on by default; poll.quietStatus can change that default, --quiet-status/--no-quiet-status override it, and --verbose emits detailed per-tick lines.\nFIX_CODE debounce writes a remaining-seconds line to stderr. --timeout does not cut an in-flight debounce short.\nWith --until-terminal, --timeout is ignored for WAIT ticks and polling continues until READY, FIX_CODE, MERGE, CANCEL, or ESCALATE. With --merge, --timeout still bounds WAIT ticks; it only continues through MARK_READY while polling remains within that timeout.\n\nExit codes: same as iterate (the final tick's action/reason decides the code).\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY (including a WAIT returned by --timeout)\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  16  SHEPHERD (--stack only: run the listed one-PR sessions, then rerun the selector)\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
+export declare const ITERATE_USAGE = "pr-shepherd iterate\n\nRun one iterate tick for a pull request. The no-subcommand form polls; use this subcommand for a single tick.\nThe output contains one action and an action-specific ## Instructions section.\n\nUsage:\n  pr-shepherd iterate [PR] [iterate-flags]\n\nIterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --instructions playbook|inline Render fix_code steps inline every tick (default) or fold the invariant ones into a playbook pointer. Default: iterate.instructions (inline).\n  --poll-mode auto|poll|event    event runs one tick, never sleeps, and prints nextCheck; auto picks event when CLAUDE_CODE_REMOTE=true. Default: poll.mode (auto).\n  --transport auto|graphql|rest  Select GitHub transport. Default: github.transport (auto).\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number is minutes; decimals are allowed only with an explicit unit (4.5m).\n\nActions:\n  WAIT        No immediate action; continue with the next poll.\n  MARK_READY  Draft PR was marked ready; continue with the next poll.\n  READY       Clean PR is inside the ready-delay. Schedule the rerun for when remainingSeconds elapses. Do not invent unrelated work. Already-owned later work may continue.\n  FIX_CODE    Agent action is required; follow the instructions, then continue polling.\n  CANCEL      Stop polling this pull request: merged/closed or ready-delay elapsed. Continue remaining work from the original request.\n  ESCALATE    Stop polling until a human provides direction.\n  MERGE       Run the emitted merge/queue command, then continue monitoring.\n\nExit codes:\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
+export declare const POLL_USAGE = "pr-shepherd poll\n\nRun iterate repeatedly for one PR, or read compact summaries for an explicit PR set or native\nGitHub stack. Aggregate mode returns when any row needs work, every row is terminal, or timeout.\nPoll exits as soon as iterate returns READY, MARK_READY, CANCEL, or ESCALATE, or when timeout\nreturns the last WAIT result. FIX_CODE starts a --debounce settle window (default:\npoll.debounceSeconds; built-in 1m): poll keeps\niterating at --interval, then runs one more tick after the window and returns that result.\nWith --until-terminal or --merge, poll also continues through MARK_READY.\n\nUsage:\n  pr-shepherd poll [PR ...] [poll-flags] [iterate-flags]\n  pr-shepherd poll --stack PR [poll-flags] [iterate-flags]\n\nPoll flags:\n  --stack PR                    Select all entries in PR's native GitHub stack, bottom to top.\n  --interval <duration>          Sleep between WAIT ticks. Bare number = seconds. Default: poll.intervalSeconds (built-in 60s). Stack and multi-PR polls multiply that by poll.stackIntervalFactor (built-in 2) unless this flag is set.\n  --timeout <duration>           Maximum wall-clock wait for WAIT ticks. Bare number = seconds. Default: poll.timeoutSeconds (built-in 4.5m).\n  --debounce <duration>          Settle window after first FIX_CODE or stack SHEPHERD before returning. Bare number = seconds. Default: poll.debounceSeconds (built-in 60s). 0 disables.\n  --quiet-status                 Print only changed WAIT snapshots. Overrides poll.quietStatus.\n  --no-quiet-status              Print every WAIT snapshot. Overrides poll.quietStatus.\n  --until-terminal               Continue through WAIT/MARK_READY until READY/FIX_CODE/MERGE/CANCEL/ESCALATE or stack SHEPHERD.\n\nForwarded iterate flags:\n  --ready-delay <duration>       Settle window before a clean PR cancels. Bare number = minutes. Example: 15m.\n  --stall-timeout <duration>     Escalate repeated unchanged failures after this duration. Bare number = minutes. 0 disables.\n  --no-auto-mark-ready           Do not convert draft PRs to ready for review.\n  --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.\n  --merge                        Shepherd through readiness, then emit a merge or merge-queue command.\n  --instructions playbook|inline Render fix_code steps inline every tick (default) or fold the invariant ones into a playbook pointer. Default: iterate.instructions (inline).\n  --poll-mode auto|poll|event    event runs one tick, never sleeps, and prints nextCheck; auto picks event when CLAUDE_CODE_REMOTE=true. Default: poll.mode (auto).\n  --transport auto|graphql|rest  Select GitHub transport. Default: github.transport (auto).\n  --format text|json             Output Markdown text or JSON. Default: text.\n  --verbose                      Include verbose iterate fields and detailed per-tick lines.\n  --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.\n\nDurations accept s/m/h suffixes: 30s, 4.5m, 1h. A bare number uses each flag's default unit (seconds\nfor --interval/--timeout/--debounce, minutes for --ready-delay/--stall-timeout); decimals are allowed only with\nan explicit unit (4.5m).\nEach WAIT tick writes a stderr line naming what it is waiting on by default; poll.quietStatus can change that default, --quiet-status/--no-quiet-status override it, and --verbose emits detailed per-tick lines.\nFIX_CODE debounce writes a remaining-seconds line to stderr. --timeout does not cut an in-flight debounce short.\nWith --until-terminal, --timeout is ignored for WAIT ticks and polling continues until READY, FIX_CODE, MERGE, CANCEL, or ESCALATE. With --merge, --timeout still bounds WAIT ticks; it only continues through MARK_READY while polling remains within that timeout.\n\nExit codes: same as iterate (the final tick's action/reason decides the code).\n  0   CANCEL (merged or ready-delay elapsed)\n  10  WAIT or READY (including a WAIT returned by --timeout)\n  11  MARK_READY\n  12  FIX_CODE\n  13  ESCALATE\n  14  CANCEL (closed without merging)\n  15  MERGE\n  16  SHEPHERD (--stack only: run the listed one-PR sessions, then rerun the selector)\n  A command/validation/GitHub failure exits with a sysexits.h code instead (see docs/exit-codes.md).";
 /** Public help page for the default PR polling invocation. */
 export declare const DEFAULT_USAGE: string;

package/bin/cli/help-iterate-poll-pages.mjs

@@ -12,6 +12,9 @@ Iterate flags:
   --no-auto-mark-ready           Do not convert draft PRs to ready for review.
   --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.
   --merge                        Shepherd through readiness, then emit a merge or merge-queue command.
+  --instructions playbook|inline Render fix_code steps inline every tick (default) or fold the invariant ones into a playbook pointer. Default: iterate.instructions (inline).
+  --poll-mode auto|poll|event    event runs one tick, never sleeps, and prints nextCheck; auto picks event when CLAUDE_CODE_REMOTE=true. Default: poll.mode (auto).
+  --transport auto|graphql|rest  Select GitHub transport. Default: github.transport (auto).
   --format text|json             Output Markdown text or JSON. Default: text.
   --verbose                      Include verbose iterate fields.
   --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.
@@ -65,6 +68,9 @@ Forwarded iterate flags:
   --no-auto-mark-ready           Do not convert draft PRs to ready for review.
   --no-auto-cancel-actionable    Legacy no-op; workflow runs are never cancelled.
   --merge                        Shepherd through readiness, then emit a merge or merge-queue command.
+  --instructions playbook|inline Render fix_code steps inline every tick (default) or fold the invariant ones into a playbook pointer. Default: iterate.instructions (inline).
+  --poll-mode auto|poll|event    event runs one tick, never sleeps, and prints nextCheck; auto picks event when CLAUDE_CODE_REMOTE=true. Default: poll.mode (auto).
+  --transport auto|graphql|rest  Select GitHub transport. Default: github.transport (auto).
   --format text|json             Output Markdown text or JSON. Default: text.
   --verbose                      Include verbose iterate fields and detailed per-tick lines.
   --help, -h                     Print this help and exit before GitHub, git, config, or log I/O.

package/bin/cli/help-log-file-page.d.mts

@@ -1 +1 @@
-export declare const LOG_FILE_USAGE = "pr-shepherd log-file\n\nPrint the per-worktree append-only debug log path for the current repository.\nThe log is created by the first non-help pr-shepherd command that initializes logging.\n\nUsage:\n  pr-shepherd log-file [--format text|json]\n\nFlags:\n  --format text|json   Print a raw path or {\"path\": \"...\"} JSON. Default: text.\n  --help, -h           Print this help and exit before logging setup.\n\nEnvironment:\n  PR_SHEPHERD_LOG_DISABLED=1 disables logging.\n  PR_SHEPHERD_STATE_DIR overrides the base state directory.\n\nExit code: 0 on success; 1 if repository identity cannot be resolved.";
+export declare const LOG_FILE_USAGE = "pr-shepherd log-file\n\nPrint the per-worktree append-only debug log path for the current repository.\nThe log is created by the first non-help pr-shepherd command that initializes logging.\n\nUsage:\n  pr-shepherd log-file [--format text|json] [--poll-mode auto|poll|event]\n\nFlags:\n  --format text|json   Print a raw path or {\"path\": \"...\"} JSON. Default: text.\n  --poll-mode auto|poll|event\n                       Report the log for that poll mode; event mode keeps it in durable\n                       state under the git common directory. Default: poll.mode (auto).\n  --help, -h           Print this help and exit before logging setup.\n\nEnvironment:\n  PR_SHEPHERD_LOG_DISABLED=1 disables logging.\n  PR_SHEPHERD_STATE_DIR overrides the base state directory.\n\nExit code: 0 on success; 1 if repository identity cannot be resolved.";

package/bin/cli/help-log-file-page.mjs

@@ -4,10 +4,13 @@ Print the per-worktree append-only debug log path for the current repository.
 The log is created by the first non-help pr-shepherd command that initializes logging.
 
 Usage:
-  pr-shepherd log-file [--format text|json]
+  pr-shepherd log-file [--format text|json] [--poll-mode auto|poll|event]
 
 Flags:
   --format text|json   Print a raw path or {"path": "..."} JSON. Default: text.
+  --poll-mode auto|poll|event
+                       Report the log for that poll mode; event mode keeps it in durable
+                       state under the git common directory. Default: poll.mode (auto).
   --help, -h           Print this help and exit before logging setup.
 
 Environment: