pr-shepherd 0.59.2 → 0.59.3

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.59.2",
+  "version": "0.59.3",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

package/README.md

@@ -33,8 +33,8 @@ $ pr-shepherd 123
 
 1. Fix each warranted item.
 2. Triage `## Failing checks`. Playbook: "CI failure triage".
-3. Commit and push any changes.
-4. Journal key decisions or rejections with URLs or IDs: `pr-shepherd apply journal 123 '- <decision>'`
+3. Optional: If you reject a code review suggestion, journal why: `pr-shepherd apply journal 123 '- <reason>'`.
+4. Commit and push any changes.
 5. `$DISMISS_MESSAGE`: one sentence on what changed. Run even if no code changed: `pr-shepherd apply review 123 --reply-thread-ids PRRT_kwDOSGizTs58XB1L --message "$DISMISS_MESSAGE" --require-sha HEAD`
 6. Rerun Shepherd now.
 ```
@@ -151,7 +151,7 @@ See [docs/graphql-usage.md](docs/graphql-usage.md) and [docs/rest-usage.md](docs
 
 1. **Install the MCP server and the CLI.** See [Install](#install) below.
 2. **Write your policy into a skill or agent instruction.** Examples: "skip non-blocking review comments", "reply instead of fixing nits", "never merge". Shepherd reports state and the next action. Your instructions decide how the agent treats each comment. The shipped `pr-shepherd` skill is a thin dispatcher you can wrap ([docs/skills.md](docs/skills.md)).
-3. **Configure Shepherd.** In `.pr-shepherdrc.yml`, turn on the bundled classification rules. They drop known bot noise before it reaches the agent, which saves more tokens and tool calls. With the default `actions.autoMinimizeSuppressed: true`, several rules also minimize matching comments on GitHub and log a Shepherd Journal entry; set it to `false` to keep comments untouched. See [docs/configuration.md](docs/configuration.md#classifystandard--default-).
+3. **Configure Shepherd.** In `.pr-shepherdrc.yml`, turn on the bundled classification rules. They drop known bot noise before it reaches the agent, which saves more tokens and tool calls. With the default `actions.autoMinimizeSuppressed: true`, several rules also minimize matching comments on GitHub and surface the mutation result without editing the PR body. See [docs/configuration.md](docs/configuration.md#classifystandard--default-).
 
    ```yaml
    classify:

package/bin/classify/types.d.mts

@@ -29,7 +29,7 @@ export interface ClassifyAction {
     readonly autoResolve?: boolean;
     /** When true, hides the item from agent output (seen marker is still written). */
     readonly suppress?: boolean;
-    /** Note included in the auto-resolve report, tick line, and Shepherd Journal when this rule fires. */
+    /** Note included in the auto-resolve report and tick line when this rule fires. */
     readonly reason?: string;
 }
 export type ClassifyRule = (item: ClassifyItem) => ClassifyAction | null | undefined;

package/bin/commands/check.mjs

@@ -350,8 +350,6 @@ async function runScopedCheck(opts, context, repo, prNumber, stateKey) {
         enabled: opts.autoMinimizeSuppressed === true,
         partition: authorizedPartition,
         batch: batchData,
-        prNumber,
-        repo,
     });
     const visibleMutationThreadIds = new Set([...threadVisibility.activeThreads, ...threadVisibility.resolutionOnlyThreads].map((thread) => thread.id));
     const ruleAutoResolveThreadIds = [

package/bin/commands/iterate/fix-loop-instruction.d.mts

@@ -1,9 +1,3 @@
 import type { InstructionStyle } from "../../config/load.mts";
-/**
- * The generic commit/push step and the journal step. Playbook style folds both into one pointer
- * only when the generic push applies: the "Fix-code loop" playbook tells the caller to push to the
- * PR head branch, which would conflict with a conflict or queue-recovery push step. Without the
- * generic push, the journal step stays inline with its citation clause. The rerun
- * step stays inline because it is the one step a halted loop cannot recover from.
- */
-export declare function buildPushJournalSteps(style: InstructionStyle, prReference: string | number, genericPush: boolean, wantsJournal: boolean): string[];
+/** The generic push stays separate from conflict and queue-recovery push instructions. */
+export declare function buildPushSteps(style: InstructionStyle, genericPush: boolean): string[];

package/bin/commands/iterate/fix-loop-instruction.mjs

@@ -1,35 +1,14 @@
 import { renderShellCommand } from "../../cli/runner.mjs";
 import { loadConfig } from "../../config/load.mjs";
-import { buildShepherdJournalCommand, buildShepherdJournalInstruction, } from "../shepherd-journal.mjs";
 import { playbookPointer } from "../playbook-pointer.mjs";
 const FIX_CODE_LOOP_PLAYBOOK = "Fix-code loop";
-/**
- * Playbook-style replacement for the invariant commit/push and journal steps. The
- * procedure text lives in the "Fix-code loop" playbook; only the trigger and the concrete
- * journal command stay in the per-tick output. `inline` style never calls this.
- */
-function buildFixLoopInstruction(prReference, journal) {
-    const parts = ["Commit and push any changes."];
-    if (journal)
-        parts.push(`Journal substantial decisions or rejections with \`${buildShepherdJournalCommand(prReference)}\`.`);
+/** The generic push stays separate from conflict and queue-recovery push instructions. */
+export function buildPushSteps(style, genericPush) {
+    if (!genericPush)
+        return [];
+    const push = "Commit and push any changes.";
+    if (style === "inline")
+        return [push];
     const cli = renderShellCommand([...loadConfig().cliCommand, "playbook", FIX_CODE_LOOP_PLAYBOOK]);
-    parts.push(`${playbookPointer(FIX_CODE_LOOP_PLAYBOOK)} CLI: \`${cli}\`.`);
-    return parts.join(" ");
-}
-/**
- * The generic commit/push step and the journal step. Playbook style folds both into one pointer
- * only when the generic push applies: the "Fix-code loop" playbook tells the caller to push to the
- * PR head branch, which would conflict with a conflict or queue-recovery push step. Without the
- * generic push, the journal step stays inline with its citation clause. The rerun
- * step stays inline because it is the one step a halted loop cannot recover from.
- */
-export function buildPushJournalSteps(style, prReference, genericPush, wantsJournal) {
-    if (style === "playbook" && genericPush)
-        return [buildFixLoopInstruction(prReference, wantsJournal)];
-    const steps = [];
-    if (genericPush)
-        steps.push("Commit and push any changes.");
-    if (wantsJournal)
-        steps.push(buildShepherdJournalInstruction(prReference));
-    return steps;
+    return [`${push} ${playbookPointer(FIX_CODE_LOOP_PLAYBOOK)} CLI: \`${cli}\`.`];
 }

package/bin/commands/iterate/render.d.mts

@@ -8,6 +8,6 @@ import type { InstructionStyle } from "../../config/load.mts";
  */
 export declare function renderResolveCommand(rc: ResolveCommand): string;
 export declare function buildFixInstructions(threads: AgentThread[], actionableComments: AgentComment[], checks: AgentCheck[], changesRequestedReviews: Review[], baseBranch: string, resolveCommand: ResolveCommand, hasConflicts: boolean, prReference: string | number, _cancelledCount: number, firstLookThreads?: FirstLookThread[], firstLookComments?: FirstLookComment[], firstLookSummaries?: Review[], editedSummaries?: Review[], _inProgressRunIds?: string[], resolutionOnlyThreads?: ReviewThread[], resolveOnlyCommand?: ResolveCommand, behindBaseHint?: string, // iterate.behindBaseHint — see buildBehindBaseHintInstruction
-isBehind?: boolean, viewerCanUpdate?: boolean, hasExhaustedWorkflowRerun?: boolean, stackRebase?: string, // native stack layers rebase with gh-stack, not branch by branch
+isBehind?: boolean, _viewerCanUpdate?: boolean, hasExhaustedWorkflowRerun?: boolean, stackRebase?: string, // native stack layers rebase with gh-stack, not branch by branch
 queueEjection?: QueueEjectionRecovery, // current merge-queue removal with failing queue checks
 instructionStyle?: InstructionStyle): string[];

package/bin/commands/iterate/render.mjs

@@ -1,12 +1,11 @@
-import { renderShellCommand } from "../../cli/runner.mjs";
+import { buildPrShepherdCommand, renderShellCommand } from "../../cli/runner.mjs";
 import { buildFailingCheckInstructions, buildCrStaleClause, buildBehindBaseHintInstruction, buildRepeatedWorkflowBranchRecoveryInstructions, buildResolveCommandInstruction, buildFixCompletionInstruction, } from "./check-instructions.mjs";
-import { SHEPHERD_JOURNAL_FIRST_LOOK_GUIDANCE } from "../shepherd-journal.mjs";
 import { isFailingAgentCheck } from "../../checks/conclusions.mjs";
 import { buildCommitSuggestionInstruction } from "../commit-suggestion-instruction.mjs";
 import { partitionFixThreads } from "./fix-instruction-threads.mjs";
 import { buildBranchPushInstruction, buildConflictInstruction } from "./native-stack-rebase.mjs";
 import { queueEjectionSteps } from "./queue-recovery-instructions.mjs";
-import { buildPushJournalSteps } from "./fix-loop-instruction.mjs";
+import { buildPushSteps } from "./fix-loop-instruction.mjs";
 /**
  * Render a resolve command as a shell snippet. Appends `--require-sha HEAD` when set: run after
  * the push step, the local HEAD is the pushed PR head, and `apply review` rejects the mutations
@@ -18,7 +17,7 @@ export function renderResolveCommand(rc) {
 }
 const REQUIRE_HEAD_SHA = "--require-sha HEAD";
 export function buildFixInstructions(threads, actionableComments, checks, changesRequestedReviews, baseBranch, resolveCommand, hasConflicts, prReference, _cancelledCount, firstLookThreads = [], firstLookComments = [], firstLookSummaries = [], editedSummaries = [], _inProgressRunIds = [], resolutionOnlyThreads = [], resolveOnlyCommand, behindBaseHint = "", // iterate.behindBaseHint — see buildBehindBaseHintInstruction
-isBehind = false, viewerCanUpdate = false, hasExhaustedWorkflowRerun = false, stackRebase, // native stack layers rebase with gh-stack, not branch by branch
+isBehind = false, _viewerCanUpdate = false, hasExhaustedWorkflowRerun = false, stackRebase, // native stack layers rebase with gh-stack, not branch by branch
 queueEjection, // current merge-queue removal with failing queue checks
 instructionStyle = "inline") {
     const instructions = [];
@@ -48,8 +47,8 @@ instructionStyle = "inline") {
     const firstLookTotal = firstLookThreads.length + firstLookComments.length;
     if (firstLookTotal > 0)
         instructions.push("Review every item under `## First-look items` before acting.");
-    if (firstLookSummaries.length > 0 && viewerCanUpdate)
-        instructions.push(SHEPHERD_JOURNAL_FIRST_LOOK_GUIDANCE);
+    if (firstLookSummaries.length > 0)
+        instructions.push("Read each body under `## Review summaries (first look)` before acting.");
     const editedTotal = editedSummaries.length +
         actionableComments.filter((c) => c.edited).length +
         firstLookThreads.filter((t) => t.edited).length +
@@ -72,19 +71,24 @@ instructionStyle = "inline") {
         instructions.push(staleClause);
     if (!hintWithConflictStep)
         instructions.push(...branchUpdateHint);
+    const hasReviewFeedback = threads.length > 0 ||
+        resolutionOnlyThreads.length > 0 ||
+        firstLookThreads.length > 0 ||
+        changesRequestedReviews.length > 0 ||
+        actionableComments.length > 0 ||
+        firstLookSummaries.length > 0 ||
+        editedSummaries.length > 0;
+    if (hasReviewFeedback) {
+        const journalCommand = buildPrShepherdCommand(["apply", "journal", String(prReference)]).text;
+        instructions.push(`Optional: If you reject a code review suggestion, journal why: \`${journalCommand} '- <reason>'\`.`);
+    }
     const hasReviewMutations = resolveCommand.hasMutations || resolveOnlyCommand?.hasMutations === true;
     const mutationSuffix = hasReviewMutations ? " before review mutations" : "";
     const genericPush = !(branchRecovery || queueEjection) && hasNonConflictHints;
-    const wantsJournal = viewerCanUpdate &&
-        (hasReviewMutations ||
-            hasNonConflictHints ||
-            firstLookTotal > 0 ||
-            firstLookSummaries.length > 0 ||
-            editedTotal > 0);
     if (branchRecovery || queueEjection) {
         instructions.push(buildBranchPushInstruction(stackRebase, hasConflicts, mutationSuffix, !branchRecovery));
     }
-    instructions.push(...buildPushJournalSteps(instructionStyle, prReference, genericPush, wantsJournal));
+    instructions.push(...buildPushSteps(instructionStyle, genericPush));
     if (resolveOnlyCommand?.hasMutations)
         instructions.push(`Run: \`${renderResolveCommand(resolveOnlyCommand)}\``);
     instructions.push(...buildResolveCommandInstruction(resolveCommand, renderResolveCommand(resolveCommand)), buildFixCompletionInstruction());

package/bin/commands/rule-auto-resolve-format.d.mts

@@ -1,17 +1,5 @@
 import type { AutoMinimizedItem, AutoResolvedThread, RuleAutoResolveReport, ShepherdReport } from "../types.mts";
 export declare function uniqueReasons(reasons: readonly string[]): string[];
-export declare function reasonClause(reasons: readonly string[]): string | undefined;
-export declare function ruleAutoResolveBody(counts: {
-    threads: number;
-    comments: number;
-    reviewSummaries: number;
-}): string | undefined;
-export declare function formatRuleAutoResolveJournalItem(input: {
-    body: string;
-    reasons: readonly string[];
-    viewerLogin?: string;
-    urls: readonly string[];
-}): string;
 export declare function decorateAutoResolveError(error: string, reasons: readonly string[]): string;
 export declare function reasonsForError(error: string, ids: readonly string[], ruleReasons: ReadonlyMap<string, readonly string[]>): string[];
 export declare function ruleAutoResolveFromReport(report: ShepherdReport): RuleAutoResolveReport | undefined;

package/bin/commands/rule-auto-resolve-format.mjs

@@ -7,7 +7,7 @@ export function uniqueReasons(reasons) {
     }
     return unique;
 }
-export function reasonClause(reasons) {
+function reasonClause(reasons) {
     const unique = uniqueReasons(reasons);
     if (unique.length === 0)
         return undefined;
@@ -21,7 +21,7 @@ function joinedReason(reasons) {
 function plural(count, singular, pluralForm = `${singular}s`) {
     return `${count} ${count === 1 ? singular : pluralForm}`;
 }
-export function ruleAutoResolveBody(counts) {
+function ruleAutoResolveBody(counts) {
     const parts = [];
     if (counts.threads > 0)
         parts.push(`auto-resolved ${plural(counts.threads, "thread")}`);
@@ -39,15 +39,6 @@ function withReasonClause(body, reasons) {
     const clause = reasonClause(reasons);
     return clause ? `${body} ${clause}` : body;
 }
-export function formatRuleAutoResolveJournalItem(input) {
-    const login = input.viewerLogin?.trim();
-    const actor = login ? `as @${login}` : "(token login unavailable)";
-    const clause = reasonClause(input.reasons);
-    const links = input.urls.map((url) => url.trim()).filter(Boolean);
-    const reasonSuffix = clause ? ` ${clause}` : "";
-    const linkSuffix = links.length > 0 ? `: ${links.join(", ")}` : "";
-    return `- ${input.body} ${actor}${reasonSuffix}${linkSuffix}`;
-}
 export function decorateAutoResolveError(error, reasons) {
     const clause = reasonClause(reasons);
     return clause ? `${error} ${clause}` : error;

package/bin/commands/rule-auto-resolve.d.mts

@@ -13,9 +13,4 @@ export declare function applySuppressedRuleAutoResolve(input: {
     enabled: boolean;
     partition: BatchPartition;
     batch: BatchPrData;
-    prNumber: number;
-    repo: {
-        owner: string;
-        name: string;
-    };
 }): Promise<RuleAutoResolveApplied>;

package/bin/commands/rule-auto-resolve.mjs

@@ -1,7 +1,6 @@
 import { autoMinimizeComments, autoResolveThreads } from "../comments/resolve.mjs";
-import { runJournal } from "./journal/index.mjs";
 import { canGenerateGithubMutation } from "../github/mutation-policy.mjs";
-import { decorateAutoResolveError, formatRuleAutoResolveJournalItem, minimizedItem, reasonClause, reasonsForError, resolvedThread, ruleAutoResolveBody, uniqueReasons, } from "./rule-auto-resolve-format.mjs";
+import { decorateAutoResolveError, minimizedItem, reasonsForError, resolvedThread, uniqueReasons, } from "./rule-auto-resolve-format.mjs";
 const EMPTY = {
     threadIds: [],
     commentIds: [],
@@ -17,9 +16,6 @@ function idsIn(ids, confirmed) {
 function decorateErrors(errors, ids, ruleReasons) {
     return errors.map((error) => decorateAutoResolveError(error, reasonsForError(error, ids, ruleReasons)));
 }
-function successReasons(ids, ruleReasons) {
-    return uniqueReasons(ids.flatMap((id) => [...(ruleReasons.get(id) ?? [])]));
-}
 export async function applySuppressedRuleAutoResolve(input) {
     if (!input.enabled) {
         return {
@@ -70,9 +66,6 @@ export async function applySuppressedRuleAutoResolve(input) {
         ...minimized.errors.flatMap((error) => reasonsForError(error, minimizeIds, input.partition.ruleReasons)),
         ...resolved.errors.flatMap((error) => reasonsForError(error, threadIds, input.partition.ruleReasons)),
     ]);
-    const journalError = await journalSuccesses(input, autoResolved, autoMinimized);
-    if (journalError)
-        autoResolveErrors.push(journalError);
     return {
         threadIds: input.partition.ruleAutoResolveThreadIds.filter((id) => !resolvedSet.has(id)),
         commentIds: input.partition.ruleAutoResolveCommentIds.filter((id) => !minimizedSet.has(id)),
@@ -83,37 +76,3 @@ export async function applySuppressedRuleAutoResolve(input) {
         errorReasons,
     };
 }
-async function journalSuccesses(input, autoResolved, autoMinimized) {
-    const body = ruleAutoResolveBody({
-        threads: autoResolved.length,
-        comments: autoMinimized.filter((item) => item.kind === "pr-comment").length,
-        reviewSummaries: autoMinimized.filter((item) => item.kind === "review-summary").length,
-    });
-    if (!body)
-        return undefined;
-    const ids = [...autoResolved.map((thread) => thread.id), ...autoMinimized.map((item) => item.id)];
-    const reasons = successReasons(ids, input.partition.ruleReasons);
-    const item = formatRuleAutoResolveJournalItem({
-        body,
-        reasons,
-        ...(input.batch.viewerLogin ? { viewerLogin: input.batch.viewerLogin } : {}),
-        urls: [
-            ...autoResolved.map((thread) => thread.url),
-            ...autoMinimized.map((item) => item.url ?? ""),
-        ],
-    });
-    try {
-        await runJournal({
-            prNumber: input.prNumber,
-            targetRepository: { owner: input.repo.owner, name: input.repo.name },
-            rawItem: item,
-            dryRun: false,
-        });
-        return undefined;
-    }
-    catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        const clause = reasonClause(reasons);
-        return clause ? `journal: ${message} ${clause}` : `journal: ${message}`;
-    }
-}

package/bin/commands/shepherd-journal.d.mts

@@ -4,12 +4,3 @@ export declare const SHEPHERD_JOURNAL_DETAILS_OPEN = "<details>";
 export declare const SHEPHERD_JOURNAL_DETAILS_SUMMARY = "<summary>Shepherd Journal</summary>";
 export declare const SHEPHERD_JOURNAL_DETAILS_CLOSE = "</details>";
 export declare const SHEPHERD_JOURNAL_APPEND_HINT = "If Shepherd Journal details already exist, append entries inside them instead of creating another container.";
-export declare const SHEPHERD_JOURNAL_FIRST_LOOK_GUIDANCE = "Read each body under `## Review summaries (first look)` and journal any warranted note before review mutations.";
-/** The concrete `apply journal` command. The placeholder is single-quoted so a substituted decision stays literal in the shell. */
-export declare function buildShepherdJournalCommand(prReference: string | number): string;
-/**
- * Build the Shepherd Journal instruction step. The reference-citation convention (link
- * threads/comments by heading URL, cite reviews by ID) is a short clause, so it stays inline:
- * a separate playbook would cost the agent an extra read turn that outweighs the clause.
- */
-export declare function buildShepherdJournalInstruction(prReference: string | number): string;

package/bin/commands/shepherd-journal.mjs

@@ -1,21 +1,6 @@
-import { buildPrShepherdCommand } from "../cli/runner.mjs";
 export const SHEPHERD_JOURNAL_SECTION = "Shepherd Journal";
 export const SHEPHERD_JOURNAL_SECTION_PATTERN = /^##\s+Shepherd\s+Journal$/;
 export const SHEPHERD_JOURNAL_DETAILS_OPEN = "<details>";
 export const SHEPHERD_JOURNAL_DETAILS_SUMMARY = "<summary>Shepherd Journal</summary>";
 export const SHEPHERD_JOURNAL_DETAILS_CLOSE = "</details>";
 export const SHEPHERD_JOURNAL_APPEND_HINT = "If Shepherd Journal details already exist, append entries inside them instead of creating another container.";
-export const SHEPHERD_JOURNAL_FIRST_LOOK_GUIDANCE = `Read each body under \`## Review summaries (first look)\` and journal any warranted note before review mutations.`;
-/** The concrete `apply journal` command. The placeholder is single-quoted so a substituted decision stays literal in the shell. */
-export function buildShepherdJournalCommand(prReference) {
-    return `${buildPrShepherdCommand(["apply", "journal", String(prReference)]).text} '- <decision>'`;
-}
-/**
- * Build the Shepherd Journal instruction step. The reference-citation convention (link
- * threads/comments by heading URL, cite reviews by ID) is a short clause, so it stays inline:
- * a separate playbook would cost the agent an extra read turn that outweighs the clause.
- */
-export function buildShepherdJournalInstruction(prReference) {
-    const command = buildShepherdJournalCommand(prReference);
-    return `Journal key decisions or rejections with URLs or IDs: \`${command}\``;
-}

package/bin/config/load.d.mts

@@ -81,8 +81,8 @@ export interface PrShepherdConfig {
          */
         resolveOtherHumanThreads: ResolveOtherHumanThreads;
         /**
-         * `inline` (default) prints the commit/push and journal steps of `fix_code` instructions
-         * every tick; `playbook` folds them into one `Playbook: "Fix-code loop"` pointer. The
+         * `inline` (default) prints the commit/push step of `fix_code` instructions
+         * every tick; `playbook` folds it into one `Playbook: "Fix-code loop"` pointer. The
          * default is inline because the token bench measured playbook as a net cost: it adds a read. The `--instructions` flag and MCP `instructions` input override per call.
          */
         instructions: InstructionStyle;

package/bin/mcp/server.mjs

@@ -33,7 +33,7 @@ const iterateInputSchema = z
     instructions: z
         .enum(["playbook", "inline"])
         .optional()
-        .describe("fix_code instruction style. inline (default) prints every step each tick; playbook folds commit, push and journal into the Fix-code loop playbook."),
+        .describe("fix_code instruction style. inline (default) prints every step each tick; playbook folds commit and push into the Fix-code loop playbook."),
     pollMode: z
         .enum(["auto", "poll", "event"])
         .optional()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.59.2",
+  "version": "0.59.3",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "keywords": [
     "automation",

package/plugins/pr-shepherd/.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.59.2",
+  "version": "0.59.3",
   "author": {
     "name": "Jonathan Ong",
     "email": "jonathanrichardong@gmail.com"

package/plugins/pr-shepherd/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.59.2",
+  "version": "0.59.3",
   "description": "Autonomous PR CI monitor and review-comment resolver for Codex.",
   "author": {
     "name": "Jonathan Ong",

package/plugins/pr-shepherd/.codex.mcp.json

@@ -2,7 +2,7 @@
   "mcpServers": {
     "pr-shepherd": {
       "command": "npx",
-      "args": ["--yes", "--package", "pr-shepherd@0.59.2", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.59.3", "pr-shepherd-mcp"]
     }
   }
 }

package/plugins/pr-shepherd/.mcp.json

@@ -1,6 +1,6 @@
 {
   "pr-shepherd": {
     "command": "npx",
-    "args": ["--yes", "--package", "pr-shepherd@0.59.2", "pr-shepherd-mcp"]
+    "args": ["--yes", "--package", "pr-shepherd@0.59.3", "pr-shepherd-mcp"]
   }
 }

package/plugins/pr-shepherd/skills/pr-shepherd/references/fix-code-loop.md

@@ -1,10 +1,9 @@
 # Fix-code loop
 
-Apply when a step says `Playbook: "Fix-code loop"`. It replaces the commit, push, and journal procedure that `--instructions=inline` prints on every `[FIX_CODE]` tick. Run the numbered steps in `## Instructions` in order; this is the one that names it.
+Apply when a step says `Playbook: "Fix-code loop"`. It replaces the commit and push procedure that `--instructions=inline` prints on every `[FIX_CODE]` tick. Run the numbered steps in `## Instructions` in order; this is the one that names it.
 
 - Review and fix first. Decide per item whether it needs a code change; the reply and resolve mutations are generated either way.
 - Commit and push. If you changed any files (code, docs, or config), commit them and push to the PR head branch. If you did not, do not commit. The repository's pre-push hooks and `AGENTS.md` own lint, typecheck, and format, and its conventions own rebase style and push flags.
-- Journal. Only when the step that names this playbook prints an `apply journal` command: for any substantial decision or rejection, run that command with a `- <decision>` item. Link threads and comments by heading URL and cite reviews by ID. Journal before the review mutations. When no `apply journal` command is printed, journaling is unavailable on this tick; do not build or run one.
 - The `apply review` step stays inline because it needs `$DISMISS_MESSAGE` substitution. Push first: its `--require-sha HEAD` must read the pushed SHA.
 - `[FIX_CODE]` is non-terminal. After the last step, iterate again immediately with the same options. Only `[ESCALATE]` hands work to a human, and `[CANCEL]` ends polling.
 - Playbooks named by other steps (`Playbook: "<name>"`) ship with the package. Without the skill, print one with `pr-shepherd playbook "<name>"`, or the MCP `playbook` tool.

package/plugins/pr-shepherd/skills/pr-shepherd/references/merge-queue-ejection.md

@@ -5,7 +5,7 @@ Apply when a step says `Playbook: "Merge queue ejection"`. The `**queue removal*
 1. Update the PR head from the latest base following the repository's branch-update convention. On a native stack, use the printed stack update route instead. Reproduce the failing step on the updated head.
 2. If the failure belongs to this PR, fix it. The printed push step commits and pushes the fix.
 3. If the failure does not reproduce and the update changed the head, the printed push step pushes it (`gh stack push` on a native stack). Never run a printed `requeue:` or `acknowledge queue removal:` command after a push. Shepherd prints a fresh queue command once the new head is READY.
-4. If the failure comes from the base itself, do not requeue or acknowledge it. If a Shepherd Journal step is printed, record the finding with it. Make no change. The unchanged failure escalates through the stall timeout.
+4. If the failure comes from the base itself, do not requeue or acknowledge it. Make no change. The unchanged failure escalates through the stall timeout.
 5. If the removal reason suggests a person dequeued the PR, skip the step 1 update unless a conflict step requires it. Fix a failure that belongs to this PR; otherwise make no change. Never enqueue.
 6. If the step says no queue command was printed, never enqueue. A failure that does not reproduce follows step 4. Shepherd prints no queue command once the same head was already removed before (`removals on this head` in the header), so a flaky failure is not retried indefinitely.
 7. Otherwise, run the printed `requeue:` or `acknowledge queue removal:` command exactly as printed, and only if all of these hold:

package/plugins/pr-shepherd/skills/reduce-pr-noise/references/classifiers.md

@@ -21,6 +21,6 @@ const rule: ClassifyRule = (item) => {
 export default rule;
 ```
 
-`suppress: true` removes a matched item from agent output. Add `autoResolve: true` only when the requested policy also calls for resolving its thread or minimizing its comment or review summary. It is unsupported for `changes-requested` reviews, whose dismissal needs a message. Optional `reason` is the note printed, reported, and journaled when the rule fires. With both flags, `actions.autoMinimizeSuppressed: true` (the default) lets Shepherd perform the authorized mutation, then print a `## Classification auto-resolve` line, record `threads.autoResolved` / `comments.autoMinimized`, and append one Shepherd Journal item for the token login. Failed IDs stay on the generated `apply review` command and the failure is listed under that line. Set `actions.autoMinimizeSuppressed: false` to keep the handoff without mutating, journaling, or printing the line. When GitHub does not confirm capability, the item returns to normal first-look visibility. Matching rules combine their flags and keep every non-empty reason, so inspect existing rules before adding one.
+`suppress: true` removes a matched item from agent output. Add `autoResolve: true` only when the requested policy also calls for resolving its thread or minimizing its comment or review summary. It is unsupported for `changes-requested` reviews, whose dismissal needs a message. Optional `reason` is printed and reported when the rule fires. With both flags, `actions.autoMinimizeSuppressed: true` (the default) lets Shepherd perform the authorized mutation, then print a `## Classification auto-resolve` line and record `threads.autoResolved` / `comments.autoMinimized`. It does not append to the Shepherd Journal. Journal notes are optional agent-authored updates made only through an explicit `apply journal` call. Failed IDs stay on the generated `apply review` command and the failure is listed under that line. Set `actions.autoMinimizeSuppressed: false` to keep the handoff without mutating or printing the line. When GitHub does not confirm capability, the item returns to normal first-look visibility. Matching rules combine their flags and keep every non-empty reason, so inspect existing rules before adding one.
 
 Exercise the exported rule against the observed item and negative examples: a different author, kind, and substantive message from the same bot. Confirm only the intended item matches before enabling automatic resolution. After editing a rule, restart a persistent MCP server or long-running poll process; it caches loaded rule modules. A new CLI process loads the change. A classifier does not retroactively remove already displayed output.

package/src/classify/types.mts

@@ -53,7 +53,7 @@ export interface ClassifyAction {
   readonly autoResolve?: boolean;
   /** When true, hides the item from agent output (seen marker is still written). */
   readonly suppress?: boolean;
-  /** Note included in the auto-resolve report, tick line, and Shepherd Journal when this rule fires. */
+  /** Note included in the auto-resolve report and tick line when this rule fires. */
   readonly reason?: string;
 }