pr-shepherd 0.46.4 → 0.46.6

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "pr-shepherd",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
-  "version": "0.46.4",
+  "version": "0.46.6",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

package/README.md

@@ -2,6 +2,8 @@
 
 Autonomous PR CI monitor and review-comment resolver for agentic coding tools, including Claude Code and Codex.
 
+**[jongleberry.com/pr-shepherd](https://jongleberry.com/pr-shepherd/)** — the why and the principles behind the design, for humans and agents.
+
 ## Why
 
 An agent finishing a PR should think about code, not reconstruct GitHub state or invent a next-step policy each tick. Without Shepherd it fans out across GitHub MCP, `gh`, and GraphQL, then guesses what to do with the result.
@@ -69,12 +71,12 @@ Conversations Resolved: No [Not Required]
 1. Review each item under `## Review threads` and `## Failing checks` and decide whether it needs a code change.
 2. Apply every warranted review fix in each file referenced above.
 3. Triage every failure under `## Failing checks`. See "CI failure triage" in the pr-shepherd skill for read-only inspection rules.
-4. If you changed code, commit any remaining changes and push to the PR head branch, then run review mutations using the pushed commit SHA and iterate again with the same options. If you did not change code, do not commit and continue.
+4. If you changed code, commit any remaining changes and push to the PR head branch, then run review mutations using the pushed commit SHA and iterate immediately with the same options. If you did not change code, do not commit and continue.
 5. Run the generated thread IDs unchanged. A latest comment beginning `<!-- pr-shepherd -->` is an earlier Shepherd reply: a marked viewer-authored human thread is emitted resolve-only when authorized, while a marked other-human thread is already acknowledged and has no further mutation.
 6. If you did not change code, replace `$HEAD_SHA` with `$(git rev-parse HEAD)`, which must equal the current remote PR head. If you changed code, commit and push to the PR head branch first, then replace `$HEAD_SHA` with the pushed commit SHA.
 7. Replace `$DISMISS_MESSAGE` with one sentence describing what changed.
 8. Run the `apply review:` command shown above. See "Review-mutation mechanics" in the pr-shepherd skill for dismiss-ID retention.
-9. `[FIX_CODE]` is non-terminal: if you changed code, commit and push to the PR head branch, then run review mutations using the pushed commit SHA and iterate again with the same options; without code changes, complete the authorized review mutations and iterate again.
+9. `[FIX_CODE]` is non-terminal: if you changed code, commit and push to the PR head branch, then run review mutations using the pushed commit SHA and iterate immediately with the same options; without code changes, complete the authorized review mutations and iterate immediately.
 ```
 
 See [docs/actions.md](docs/actions.md) for the complete output contract and [docs/escalations.md](docs/escalations.md) for the exact finite human-handoff boundary. Iterate/poll PR outcomes use exit codes `0` and `10`–`15`; command and GitHub failures use `sysexits.h` codes — [docs/exit-codes.md](docs/exit-codes.md).
@@ -88,6 +90,7 @@ This system is opinionated and works best with PRs that use required status chec
 - Shepherd identifies its own latest reply only when that comment begins `<!-- pr-shepherd -->`, not from author equality. A marked viewer-authored thread can be resolved without another reply as a retry.
 - Every review thread/comment/review summary is surfaced at least once, even if already outdated, resolved, or minimized; edited items re-surface through seen markers.
 - Draft PRs can be marked ready automatically when clean; disable with `actions.autoMarkReady: false` or `--no-auto-mark-ready`.
+- With `--merge`, actionable review threads/comments/reviews/summaries are held back (`WAIT`, with raw deferred-work counts) while a PR sits in the merge queue, since a Shepherd-initiated push would eject it; set `actions.workWhileQueued: true` to act on them immediately instead. Failing checks and merge conflicts are never deferred.
 - The CLI never performs git mutations itself — it only emits commit/push instructions for the agent to run. Push access to the PR head is a usage precondition; GitHub viewer fields do not create a separate push-authorization handoff.
 - Generated iterate mutations and automatic actions are capability-aware and omit unauthorized commands. Explicit `apply` operations honor the caller's intent and surface GitHub's result; semantic human-content protections still apply.
 - `build_suggestion_patches` turns one or more ordered GitHub suggestion threads into checked patches and commit metadata, but never edits the working tree or git history. Local HEAD may be ahead when the live PR head is its ancestor.

package/bin/api.d.mts

@@ -8,7 +8,7 @@ export interface CreatePrShepherdOptions {
 }
 /** A positive PR number, GitHub pull-request URL, or owner/repo#number reference. */
 export type PrReference = number | string;
-export type IterateInput = Omit<IterateCommandOptions, "format" | "prNumber" | "targetRepository"> & {
+export type IterateInput = Omit<IterateCommandOptions, "format" | "prNumber" | "targetRepository" | "persistSeen" | "deferQuotaWarning"> & {
     pr?: PrReference;
 };
 export interface ReviewMutationsOperation {

package/bin/checks/triage.mjs

@@ -1,6 +1,7 @@
 /* eslint-disable max-lines */
 import { restWithRateLimit, restText } from "../github/http.mjs";
 import { loadDerived, storeDerived } from "../state/rest-cache.mjs";
+import { loadConfig } from "../config/load.mjs";
 const STARTUP_FAILURE_STATUS = "startup_failure";
 const LOG_EXCERPT_CONTEXT_LINES = 16;
 const LOG_EXCERPT_TAIL_LINES = 28;
@@ -181,10 +182,11 @@ async function fetchJobLogExcerpt(jobId, repo, stateKey, cacheable = false) {
     }
 }
 function buildLogExcerpt(raw) {
+    const ignorePatterns = compileIgnoreLogLinePatterns();
     const lines = raw
         .split(/\r?\n/)
         .map(cleanLogLine)
-        .filter((line) => line.trim() !== "");
+        .filter((line) => line.trim() !== "" && !isNoiseLine(line, ignorePatterns));
     if (lines.length === 0)
         return undefined;
     const aggregateExcerpt = buildAggregateJobResultsExcerpt(lines);
@@ -276,6 +278,15 @@ function truncateAnchoredExcerpt(lines, anchorIndex) {
         return text;
     return truncateLogExcerpt(`${TRUNCATED_SUFFIX.trim()}\n${lines.slice(anchorIndex).join("\n")}`);
 }
+// User-configured via `checks.ignoreLogLines` (regex source strings) — empty by
+// default. What counts as noise varies by CI toolchain, so Shepherd ships no
+// built-in patterns; a project opts in via `.pr-shepherdrc.yml`.
+function compileIgnoreLogLinePatterns() {
+    return loadConfig().checks.ignoreLogLines.map((pattern) => new RegExp(pattern));
+}
+function isNoiseLine(line, patterns) {
+    return patterns.some((re) => re.test(line));
+}
 function cleanLogLine(line) {
     return line
         .replace(/^\uFEFF/, "")

package/bin/cli/api-usage-formatter.mjs

@@ -18,7 +18,7 @@ export function formatQuotaWarning(warning) {
         `- Reset: ${resetTime(warning.resetAt)}`,
         `- Recommended poll interval: ${warning.pollIntervalMinutes} minutes`,
         `- Recommended bounded CLI timeout: ${warning.pollTimeoutMinutes} minutes`,
-        "- Recommendation: prefer non-GraphQL `gh` CLI commands for PR operations until the reset above, then resume pr-shepherd",
+        "- Recommendation: keep polling pr-shepherd at the cadence above; for incidental PR operations prefer REST `gh` (`gh pr view`, `gh pr review`, `gh api`); do not substitute `gh pr checks`/`gh pr watch`",
     ].join("\n");
 }
 export function formatApiUsage(usage) {

package/bin/cli/body-truncate.d.mts

@@ -0,0 +1,12 @@
+export declare const BODY_TRUNCATE_MAX_CHARS = 1200;
+export declare const NESTED_BODY_TRUNCATE_MAX_CHARS = 600;
+/**
+ * Truncates `body` to roughly `maxChars`, keeping a head and tail portion so an
+ * opening question and a trailing summary both survive. Never cuts inside a
+ * ``` or ~~~ fence: the cut points snap outward to the nearest fence-safe line
+ * boundary — an unbalanced fence here would swallow every section rendered
+ * after it in the same tick. A single line too long to fit a budget on its own
+ * (headEnd stays -1, or no line fits from the tail) falls back to a
+ * character-level slice of that line rather than dropping it entirely.
+ */
+export declare function truncateBody(body: string, maxChars: number, url?: string): string;

package/bin/cli/body-truncate.mjs

@@ -0,0 +1,123 @@
+const HEAD_FRACTION = 0.7;
+export const BODY_TRUNCATE_MAX_CHARS = 1200;
+export const NESTED_BODY_TRUNCATE_MAX_CHARS = 600;
+function fenceOpener(trimmed) {
+    const char = trimmed[0];
+    if (char !== "`" && char !== "~")
+        return null;
+    let len = 0;
+    while (trimmed[len] === char)
+        len++;
+    return len >= 3 ? { char, len } : null;
+}
+function isFenceCloser(trimmed, fence) {
+    return trimmed.length >= fence.len && [...trimmed].every((c) => c === fence.char);
+}
+// Backtick and tilde fences close only against their own kind — a run of one
+// character never closes a fence opened with the other (CommonMark semantics).
+function fenceStatesAfterEachLine(lines) {
+    const states = [];
+    let fence = null;
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (fence) {
+            if (isFenceCloser(trimmed, fence))
+                fence = null;
+        }
+        else {
+            fence = fenceOpener(trimmed);
+        }
+        states.push(fence !== null);
+    }
+    return states;
+}
+function cumulativeLengths(lines) {
+    const out = [];
+    let total = 0;
+    for (const line of lines) {
+        total += line.length + 1;
+        out.push(total);
+    }
+    return out;
+}
+/** Last line index keepable within `budget`, extended forward past any fence still open at that point. */
+function findHeadEnd(states, cumLens, budget) {
+    let end = -1;
+    for (let i = 0; i < cumLens.length; i++) {
+        if (cumLens[i] > budget)
+            break;
+        end = i;
+    }
+    while (end >= 0 && end < states.length - 1 && states[end])
+        end++;
+    return end;
+}
+/** First line index keepable within `budget` counted from the end, extended backward past any fence open entering it. */
+function findTailStart(states, cumLens, budget) {
+    const n = cumLens.length;
+    const total = cumLens[n - 1] ?? 0;
+    let start = n;
+    for (let j = n - 1; j >= 0; j--) {
+        const suffixLen = total - (j > 0 ? cumLens[j - 1] : 0);
+        if (suffixLen > budget)
+            break;
+        start = j;
+    }
+    while (start > 0 && states[start - 1])
+        start--;
+    return start;
+}
+const REVIEW_COMMENT_URL_RE = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/\d+#discussion_r(\d+)$/;
+const ISSUE_COMMENT_URL_RE = /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/(?:pull|issues)\/\d+#issuecomment-(\d+)$/;
+// An agent can run this directly — no browser round-trip — to read the full body.
+function commentViewCommand(url) {
+    const review = REVIEW_COMMENT_URL_RE.exec(url);
+    if (review) {
+        const [, owner, repo, id] = review;
+        return `gh api repos/${owner}/${repo}/pulls/comments/${id}`;
+    }
+    const issue = ISSUE_COMMENT_URL_RE.exec(url);
+    if (issue) {
+        const [, owner, repo, id] = issue;
+        return `gh api repos/${owner}/${repo}/issues/comments/${id}`;
+    }
+    return undefined;
+}
+function elisionMarker(charCount, url) {
+    const pointer = url ? (commentViewCommand(url) ?? url) : undefined;
+    return pointer
+        ? `[…${charCount} chars elided — full text: ${pointer}]`
+        : `[…${charCount} chars elided]`;
+}
+/**
+ * Truncates `body` to roughly `maxChars`, keeping a head and tail portion so an
+ * opening question and a trailing summary both survive. Never cuts inside a
+ * ``` or ~~~ fence: the cut points snap outward to the nearest fence-safe line
+ * boundary — an unbalanced fence here would swallow every section rendered
+ * after it in the same tick. A single line too long to fit a budget on its own
+ * (headEnd stays -1, or no line fits from the tail) falls back to a
+ * character-level slice of that line rather than dropping it entirely.
+ */
+export function truncateBody(body, maxChars, url) {
+    if (body.length <= maxChars)
+        return body;
+    const lines = body.split("\n");
+    const states = fenceStatesAfterEachLine(lines);
+    const cumLens = cumulativeLengths(lines);
+    const headBudget = Math.ceil(maxChars * HEAD_FRACTION);
+    const tailBudget = maxChars - headBudget;
+    const headEnd = findHeadEnd(states, cumLens, headBudget);
+    const tailStart = findTailStart(states, cumLens, tailBudget);
+    if (tailStart <= headEnd + 1)
+        return body;
+    const head = headEnd >= 0 ? lines.slice(0, headEnd + 1).join("\n") : lines[0].slice(0, headBudget);
+    const tail = tailStart < lines.length
+        ? lines.slice(tailStart).join("\n")
+        : tailBudget > 0
+            ? lines[lines.length - 1].slice(-tailBudget)
+            : "";
+    const elidedChars = body.length - head.length - tail.length;
+    if (elidedChars <= 0)
+        return body;
+    return [head, elisionMarker(elidedChars, url), tail].join("\n\n");
+}

package/bin/cli/fix-formatter-extra.d.mts

@@ -1,3 +1,4 @@
 import type { CheckAnnotation, IterateResultFixCode } from "../types.mts";
-export declare function renderCheckAnnotation(a: CheckAnnotation): string;
+/** Returns null when the annotation adds nothing beyond the check's own conclusion tag. */
+export declare function renderCheckAnnotation(a: CheckAnnotation, logExcerpt?: string): string | null;
 export declare function renderProtectedRun(run: IterateResultFixCode["fix"]["protectedRuns"][number]): string;

package/bin/cli/fix-formatter-extra.mjs

@@ -1,15 +1,30 @@
 import { blockquote } from "./list-formatters.mjs";
-export function renderCheckAnnotation(a) {
+// A bare "Process completed with exit code N." on its own carries nothing beyond
+// the check's own [conclusion: FAILURE] tag, so the whole annotation is dropped.
+const TRIVIAL_EXIT_CODE_RE = /^Process completed with exit code \d+\.?$/;
+/** Returns null when the annotation adds nothing beyond the check's own conclusion tag. */
+export function renderCheckAnnotation(a, logExcerpt) {
+    const hasRawDetails = a.rawDetails !== undefined && a.rawDetails.trim() !== "";
+    const hasTitle = a.title !== undefined && a.title.trim() !== "";
+    if (TRIVIAL_EXIT_CODE_RE.test(a.message.trim()) && !hasRawDetails && !hasTitle)
+        return null;
     const loc = `${a.path}:${renderAnnotationRange(a)}`;
     const link = a.blobUrl ? ` [↗](${a.blobUrl})` : "";
     const title = a.title ? ` — ${a.title}` : "";
     const lines = [`- \`${a.id}\`${link} \`${loc}\` [${a.level}]${title}`];
-    if (a.message.trim() !== "")
+    if (a.message.trim() !== "" && !duplicatesLog(a.message, logExcerpt)) {
         lines.push(blockquote(a.message));
-    if (a.rawDetails !== undefined && a.rawDetails.trim() !== "")
+    }
+    if (hasRawDetails && !duplicatesLog(a.rawDetails, logExcerpt)) {
         lines.push(blockquote(a.rawDetails));
+    }
     return lines.join("\n");
 }
+// The bullet's path:line + blob link already anchors this text; if the identical
+// text is also in the check's log excerpt, only the blockquote body is redundant.
+function duplicatesLog(text, logExcerpt) {
+    return logExcerpt !== undefined && logExcerpt.includes(text.trim());
+}
 export function renderProtectedRun(run) {
     const label = run.workflowName
         ? `${run.workflowName} (${run.checkNames.join(", ")})`

package/bin/cli/fix-formatter.d.mts

@@ -1,2 +1,4 @@
 import type { IterateResultFixCode } from "../types.mts";
-export declare function formatFixCodeResult(header: string, result: IterateResultFixCode): string;
+export declare function formatFixCodeResult(header: string, result: IterateResultFixCode, opts?: {
+    verbose?: boolean;
+}): string;

package/bin/cli/fix-formatter.mjs

@@ -3,11 +3,14 @@ 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";
+import { BODY_TRUNCATE_MAX_CHARS } from "./body-truncate.mjs";
 import { numberInstructions } from "./iterate-instructions.mjs";
 import { renderCheckAnnotation, renderProtectedRun } from "./fix-formatter-extra.mjs";
 import { isFailingAgentCheck } from "../checks/conclusions.mjs";
 import { renderMergeCommand } from "../commands/iterate/merge.mjs";
-export function formatFixCodeResult(header, result) {
+export function formatFixCodeResult(header, result, opts = {}) {
+    const verbose = opts.verbose ?? false;
+    const topCap = verbose ? undefined : BODY_TRUNCATE_MAX_CHARS;
     const sections = [header];
     const renderThreads = (heading, threads) => {
         if (threads.length === 0)
@@ -21,7 +24,7 @@ export function formatFixCodeResult(header, result) {
             const suggestionMarker = t.suggestion ? " [suggestion]" : "";
             const editedMarker = t.edited ? " [edited since first look]" : "";
             sections.push(`### ${heading} — ${loc} (${renderAuthor(t.author, t.authorType, t.authorAssociation, t.viewerDidAuthor)})${reviewMarker}${suggestionMarker}${editedMarker}`);
-            sections.push(renderThreadConversation(t));
+            sections.push(renderThreadConversation(t, verbose));
             if (t.suggestion) {
                 sections.push(renderSuggestionBlock(t.suggestion, ""));
             }
@@ -34,7 +37,7 @@ export function formatFixCodeResult(header, result) {
     if (result.fix.resolutionOnlyThreads.length > 0) {
         sections.push("## Review threads to resolve");
         sections.push(result.fix.resolutionOnlyThreads
-            .map((t) => renderThreadBullet(t, { statusTag: renderThreadResolutionStatusTag(t) }))
+            .map((t) => renderThreadBullet(t, { statusTag: renderThreadResolutionStatusTag(t), verbose }))
             .join("\n"));
     }
     if (result.fix.actionableComments.length > 0) {
@@ -44,7 +47,7 @@ export function formatFixCodeResult(header, result) {
             const editedMarker = c.edited ? " [edited since first look]" : "";
             const authorizationMarker = c.viewerCanMinimize === false ? " [viewer cannot minimize]" : "";
             sections.push(`### ${heading} (${renderAuthor(c.author, c.authorType, c.authorAssociation)})${authorizationMarker}${editedMarker}`);
-            sections.push(blockquote(c.body));
+            sections.push(blockquote(c.body, topCap, c.url));
         }
     }
     const failingChecks = result.fix.checks.filter((ch) => isFailingAgentCheck(ch));
@@ -87,10 +90,17 @@ export function formatFixCodeResult(header, result) {
         });
         sections.push(bullets.join("\n\n"));
     }
-    const checksWithAnnotations = result.fix.checks.filter((ch) => (ch.annotations?.length ?? 0) > 0);
-    if (checksWithAnnotations.length > 0) {
+    const annotatedChecks = result.fix.checks
+        .map((ch) => ({
+        ch,
+        rendered: (ch.annotations ?? [])
+            .map((a) => renderCheckAnnotation(a, ch.logExcerpt))
+            .filter((s) => s !== null),
+    }))
+        .filter(({ rendered }) => rendered.length > 0);
+    if (annotatedChecks.length > 0) {
         sections.push("## Check annotations");
-        for (const ch of checksWithAnnotations) {
+        for (const { ch, rendered } of annotatedChecks) {
             const workflowPrefix = ch.workflowName ? `${ch.workflowName} › ` : "";
             const jobLabel = ch.jobName ? ch.jobName : ch.name;
             const locator = ch.runId
@@ -99,25 +109,41 @@ export function formatFixCodeResult(header, result) {
                     ? `external \`${ch.detailsUrl}\``
                     : "(no runId)";
             sections.push(`### ${locator} — \`${workflowPrefix}${jobLabel}\``);
-            sections.push(ch.annotations.map(renderCheckAnnotation).join("\n\n"));
+            sections.push(rendered.join("\n\n"));
         }
     }
     if (result.fix.changesRequestedReviews.length > 0) {
         sections.push("## Changes-requested reviews");
-        sections.push(result.fix.changesRequestedReviews.map((r) => renderReviewBullet(r)).join("\n"));
+        for (const r of result.fix.changesRequestedReviews) {
+            // A stale bot CR that already had its full body surfaced on a prior tick stays a terse
+            // one-line reminder (renderReviewBullet's staleBotCr branch) — repeating the full body
+            // every tick would be noise, not new content. Every other review (a bot CR's first
+            // emission, or any human CR) gets the same H3 + blockquote shape as the sibling
+            // review-summary/approval sections below, so the agent actually has a body to read —
+            // the bare bullet this replaced only ever rendered the reviewId, never the body.
+            if (r.staleBotCr) {
+                sections.push(renderReviewBullet(r));
+                continue;
+            }
+            const staleTag = r.staleReview
+                ? " [stale — review is on an old commit, all threads resolved; ask reviewer to re-review or dismiss]"
+                : "";
+            sections.push(`### \`reviewId=${r.id}\` (${renderAuthor(r.author, r.authorType, r.authorAssociation)})${staleTag}`);
+            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body, topCap));
+        }
     }
     if (result.fix.firstLookSummaries.length > 0) {
         sections.push("## Review summaries (first look)");
         for (const r of result.fix.firstLookSummaries) {
             sections.push(`### \`reviewId=${r.id}\` (${renderAuthor(r.author, r.authorType, r.authorAssociation)})${r.viewerCanMinimize === false ? " [viewer cannot minimize]" : ""}`);
-            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body));
+            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body, topCap));
         }
     }
     if (result.fix.editedSummaries.length > 0) {
         sections.push("## Review summaries (edited since first look — already minimized; do not re-minimize)");
         for (const r of result.fix.editedSummaries) {
             sections.push(`### \`reviewId=${r.id}\` (${renderAuthor(r.author, r.authorType, r.authorAssociation)})${r.viewerCanMinimize === false ? " [viewer cannot minimize]" : ""}`);
-            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body));
+            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body, topCap));
         }
     }
     const firstLookSummaryIds = new Set(result.fix.firstLookSummaries.map((r) => r.id));
@@ -130,14 +156,14 @@ export function formatFixCodeResult(header, result) {
         sections.push("## Approvals (surfaced — not minimized)");
         for (const r of result.fix.surfacedApprovals) {
             sections.push(`### \`reviewId=${r.id}\` (${renderAuthor(r.author, r.authorType, r.authorAssociation)})${r.viewerCanMinimize === false ? " [viewer cannot minimize]" : ""}`);
-            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body));
+            sections.push(r.body.trim() === "" ? "(no review body)" : blockquote(r.body, topCap));
         }
     }
     const firstLookTotal = result.fix.firstLookThreads.length + result.fix.firstLookComments.length;
     if (firstLookTotal > 0) {
         sections.push(`## First-look items (${firstLookTotal}) — acknowledge status before acting`);
         const resolutionOnlyIds = new Set(result.fix.resolutionOnlyThreads.map((t) => t.id));
-        sections.push(buildFirstLookBullets(result.fix.firstLookThreads, resolutionOnlyIds, result.fix.firstLookComments).join("\n"));
+        sections.push(buildFirstLookBullets(result.fix.firstLookThreads, resolutionOnlyIds, result.fix.firstLookComments, verbose).join("\n"));
     }
     if (result.fix.inProgressRunIds.length > 0) {
         sections.push("## In-progress runs");

package/bin/cli/iterate-checks-formatter.mjs

@@ -14,7 +14,7 @@ function formatRelevantCheck(check) {
     const lines = [`- \`${workflow}${job}\` [conclusion: ${check.conclusion}]`];
     appendCheckFields(lines, check);
     appendLogExcerpt(lines, check.logExcerpt);
-    appendAnnotations(lines, check.annotations);
+    appendAnnotations(lines, check.annotations, check.logExcerpt);
     return lines;
 }
 function appendCheckFields(lines, check) {
@@ -43,13 +43,15 @@ function appendLogExcerpt(lines, logExcerpt) {
     for (const line of logExcerpt.split("\n"))
         lines.push(`  > ${line}`);
 }
-function appendAnnotations(lines, annotations) {
-    if (!annotations || annotations.length === 0)
+function appendAnnotations(lines, annotations, logExcerpt) {
+    const rendered = (annotations ?? [])
+        .map((a) => renderCheckAnnotation(a, logExcerpt))
+        .filter((s) => s !== null);
+    if (rendered.length === 0)
         return;
     lines.push("  - annotations:");
-    for (const annotation of annotations) {
-        for (const line of renderCheckAnnotation(annotation).split("\n")) {
+    for (const text of rendered) {
+        for (const line of text.split("\n"))
             lines.push(`    ${line}`);
-        }
     }
 }

package/bin/cli/iterate-formatter.mjs

@@ -3,7 +3,7 @@ import { formatRelevantChecks } from "./iterate-checks-formatter.mjs";
 import { joinSections } from "../util/markdown.mjs";
 import { adaptIterateLog, buildSimpleIterateInstructions, numberInstructions, } from "./iterate-instructions.mjs";
 import { formatMergeRequirementLines } from "../merge-status/requirements-format.mjs";
-import { appendMergeQueueHeader, formatMergeAction } from "./iterate-merge-formatter.mjs";
+import { appendMergeQueueHeader, formatDeferredWorkLine, formatMergeAction, } from "./iterate-merge-formatter.mjs";
 import { formatApiUsage, formatQuotaWarning } from "./api-usage-formatter.mjs";
 import { formatActivityLine } from "./iterate-activity-formatter.mjs";
 /**
@@ -115,13 +115,13 @@ export function formatIterateResult(result, opts) {
     const verboseChecks = verbose ? formatRelevantChecks(result.checks) : null;
     const telemetrySections = [quotaWarning, apiUsage, verboseChecks];
     switch (result.action) {
-        case "wait":
-            return joinSections([
-                header,
-                ...telemetrySections,
-                adaptIterateLog(result.log),
-                `## Instructions\n\n${numberInstructions(buildSimpleIterateInstructions(result))}`,
-            ]);
+        case "wait": {
+            const waitLines = [header, ...telemetrySections, adaptIterateLog(result.log)];
+            if (result.deferredWork)
+                waitLines.push(formatDeferredWorkLine(result.deferredWork));
+            waitLines.push(`## Instructions\n\n${numberInstructions(buildSimpleIterateInstructions(result))}`);
+            return joinSections(waitLines);
+        }
         case "mark_ready":
             return joinSections([
                 header,
@@ -147,6 +147,7 @@ export function formatIterateResult(result, opts) {
                 const supersededStr = result.supersededNames.map((n) => "`" + n + "`").join(", ");
                 cancelHeaderLines.push(`**superseded** ${supersededStr}`);
             }
+            appendMergeQueueHeader(cancelHeaderLines, result);
             if (activityLine)
                 cancelHeaderLines.push(activityLine);
             return joinSections([
@@ -166,6 +167,6 @@ export function formatIterateResult(result, opts) {
                 `## Instructions\n\n${numberInstructions(buildSimpleIterateInstructions(result))}`,
             ]);
         case "fix_code":
-            return formatFixCodeResult(joinSections([header, ...telemetrySections]), result);
+            return formatFixCodeResult(joinSections([header, ...telemetrySections]), result, { verbose });
     }
 }

package/bin/cli/iterate-instructions.mjs

@@ -10,7 +10,7 @@ export function buildSimpleIterateInstructions(result) {
                 ];
             }
             return [
-                "Non-terminal — no action needed this tick. Iterate again with the same options to continue.",
+                "Non-terminal — no action needed this tick. Iterate immediately with the same options to continue.",
             ];
         case "mark_ready":
             if (result.quotaWarning) {
@@ -19,7 +19,7 @@ export function buildSimpleIterateInstructions(result) {
                 ];
             }
             return [
-                "The CLI marked the PR ready for review. Iterate again with the same options to continue.",
+                "The CLI marked the PR ready for review. Iterate immediately with the same options to continue.",
             ];
         case "merge": {
             const instructions = [
@@ -33,7 +33,7 @@ export function buildSimpleIterateInstructions(result) {
             }
             instructions.push(result.quotaWarning
                 ? buildQuotaAwareContinuation(result.quotaWarning, "After running the merge command.")
-                : "Then iterate again with the same options to monitor until the PR merges or needs work.");
+                : "Then iterate immediately with the same options to monitor until the PR merges or needs work.");
             return instructions;
         }
         case "cancel":

package/bin/cli/iterate-lean.mjs

@@ -23,6 +23,7 @@ export function projectIterateLean(result, opts) {
         status: result.status,
         state: result.state,
         mergeStateStatus: result.mergeStateStatus,
+        ...(result.mergeStatus !== "CLEAN" && { mergeStatus: result.mergeStatus }), // mergeStateStatus alone can't always reconstruct this
         ...(readyDelaySuffix && { readyDelayOverride: readyDelaySuffix }),
         ...(result.mergeStatus === "BLOCKED" &&
             result.reviewDecision !== null && { reviewDecision: result.reviewDecision }),
@@ -70,6 +71,7 @@ export function projectIterateLean(result, opts) {
         case "wait":
             return {
                 ...base,
+                ...(result.deferredWork && { deferredWork: result.deferredWork }),
                 log: adaptIterateLog(result.log),
                 instructions: simpleInstructions(result),
             };

package/bin/cli/iterate-merge-formatter.d.mts

@@ -1,3 +1,5 @@
-import type { IterateResult, IterateResultMerge } from "../types.mts";
+import type { IterateDeferredWork, IterateResult, IterateResultMerge } from "../types.mts";
+/** One inline rollup line of the non-CI work held back while the PR sits in the merge queue. */
+export declare function formatDeferredWorkLine(dw: IterateDeferredWork): string;
 export declare function appendMergeQueueHeader(lines: string[], result: IterateResult): void;
 export declare function formatMergeAction(header: string, result: IterateResultMerge): string;

package/bin/cli/iterate-merge-formatter.mjs

@@ -1,6 +1,21 @@
 import { renderMergeCommand } from "../commands/iterate/merge.mjs";
 import { inlineCode, joinSections } from "../util/markdown.mjs";
 import { buildSimpleIterateInstructions, numberInstructions } from "./iterate-instructions.mjs";
+/** One inline rollup line of the non-CI work held back while the PR sits in the merge queue. */
+export function formatDeferredWorkLine(dw) {
+    const parts = [];
+    if (dw.threads > 0)
+        parts.push(`${dw.threads} thread${dw.threads === 1 ? "" : "s"}`);
+    if (dw.comments > 0)
+        parts.push(`${dw.comments} comment${dw.comments === 1 ? "" : "s"}`);
+    if (dw.changesRequestedReviews > 0) {
+        parts.push(`${dw.changesRequestedReviews} changes-requested review${dw.changesRequestedReviews === 1 ? "" : "s"}`);
+    }
+    if (dw.reviewSummaries > 0) {
+        parts.push(`${dw.reviewSummaries} review summar${dw.reviewSummaries === 1 ? "y" : "ies"}`);
+    }
+    return `**deferred (in merge queue)** ${parts.join(", ")}`;
+}
 export function appendMergeQueueHeader(lines, result) {
     const queue = result.mergeQueue;
     if (!queue)

package/bin/cli/list-formatters.d.mts

@@ -35,9 +35,10 @@ export declare function renderThreadBullet(t: ThreadBulletInput, opts?: {
     renderSuggestion?: boolean;
     noBody?: boolean;
     suppressEditedMarker?: boolean;
+    verbose?: boolean;
 }): string;
-export declare function renderThreadConversation(t: ThreadBulletInput): string;
-export declare function blockquote(body: string): string;
+export declare function renderThreadConversation(t: ThreadBulletInput, verbose?: boolean): string;
+export declare function blockquote(body: string, maxChars?: number, url?: string): string;
 export declare function renderCommentBullet(c: {
     id: string;
     url?: string;
@@ -74,5 +75,5 @@ export declare function renderReviewListSection(heading: string, items: {
  * Threads that also appear in resolutionOnlyIds have their body suppressed
  * (already shown in `## Review threads to resolve`).
  */
-export declare function buildFirstLookBullets(firstLookThreads: FirstLookThread[], resolutionOnlyIds: Set<string>, firstLookComments: FirstLookComment[]): string[];
+export declare function buildFirstLookBullets(firstLookThreads: FirstLookThread[], resolutionOnlyIds: Set<string>, firstLookComments: FirstLookComment[], verbose?: boolean): string[];
 export {};