pr-shepherd 0.19.0 → 0.21.0

package/bin/comments/visible-comments.mjs

@@ -13,8 +13,9 @@ export function classifyVisibleComments(comments, seenMap, minimizeComments) {
         const cls = classifyItem(c.id, c.body, seenMap);
         if (cls === "unchanged")
             continue;
-        actionable.push(c);
-        toMarkSeen.push(c);
+        const comment = cls === "edited" ? { ...c, edited: true } : c;
+        actionable.push(comment);
+        toMarkSeen.push(comment);
     }
     return { actionable, minimizeIds, toMarkSeen };
 }

package/bin/config/load.mjs

@@ -3,7 +3,6 @@ import { join, dirname } from "node:path";
 import { homedir } from "node:os";
 import { parse } from "yaml";
 import builtins from "../config.json" with { type: "json" };
-import { parseCliRunner } from "../cli/runner.mjs";
 const MINIMIZE_COMMENTS_POLICIES = ["all", "bots", "users", "none"];
 const RC_FILENAME = ".pr-shepherdrc.yml";
 function findRcFile(startDir) {
@@ -61,12 +60,6 @@ export function loadConfig() {
         const raw = readFileSync(rcPath, "utf8");
         const parsed = (parse(raw) ?? {});
         const config = deepMerge(defaults, parsed);
-        // Validate cli and watch at load time so misconfigurations are caught once
-        // with the rc file path in context, rather than during instruction rendering.
-        if (config.cli === null || Array.isArray(config.cli) || typeof config.cli !== "object") {
-            throw new Error(`Invalid config: cli must be a plain object, got ${JSON.stringify(config.cli)}`);
-        }
-        config.cli.runner = parseCliRunner(config.cli.runner);
         config.iterate.minimizeComments = parseMinimizeCommentsPolicy(config.iterate.minimizeComments);
         configCache.set(cwd, config);
         return config;

package/bin/config.json

@@ -1,7 +1,4 @@
 {
-  "cli": {
-    "runner": "auto"
-  },
   "iterate": {
     "fixAttemptsPerThread": 3,
     "stallTimeoutMinutes": 30,

package/bin/github/batch-parsers.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 vi.mock("./client.mts", () => ({
     graphql: vi.fn(),
     graphqlWithRateLimit: vi.fn(),

package/bin/github/batch.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 vi.mock("./client.mts", () => ({
     graphql: vi.fn(),
     graphqlWithRateLimit: vi.fn(),

package/bin/github/http.test-support.mjs

@@ -1,5 +1,4 @@
-// @ts-nocheck
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { vi, beforeEach } from "vitest";
 // ---------------------------------------------------------------------------
 // Stub fetch and child_process globally before any imports.
 // ---------------------------------------------------------------------------

package/bin/reporters/agent.mjs

@@ -32,6 +32,7 @@ export function toAgentComment(c) {
         ...(c.authorType !== undefined && { authorType: c.authorType }),
         body: c.body,
         url: c.url,
+        ...(c.edited === true && { edited: true }),
     };
 }
 export function toAgentCheck(c) {

package/bin/suggestions/patch.test-support.mjs

@@ -1,4 +1,2 @@
-// @ts-nocheck
-import { describe, it, expect } from "vitest";
 import { buildUnifiedDiff } from "./patch.mjs";
 export { buildUnifiedDiff };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "description": "Autonomous PR CI monitor and review-comment resolver for agentic coding tools",
   "license": "MIT",
   "author": "Jonathan Ong",

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

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

package/plugins/pr-shepherd/skills/pr-shepherd/SKILL.md

@@ -8,7 +8,7 @@ allowed-tools: ["Bash", "Read", "Grep", "Edit", "Write", "Glob", "Skill"]
 
 # pr-shepherd
 
-One-tick dispatcher for iterating a PR to completion.
+Poll dispatcher for iterating a PR to completion.
 
 ## Arguments: $ARGUMENTS
 
@@ -20,40 +20,24 @@ One-tick dispatcher for iterating a PR to completion.
    - Otherwise, infer: `gh pr view --json number --jq .number`
    - If no PR found, report an error and stop.
 
-2. **Short-circuit if merged or closed:**
+2. **Run `pr-shepherd`:**
 
    ```bash
-   gh pr view <N> --json state --jq '.state'
+   pr-shepherd <N> --interval 45s --timeout 4m
    ```
 
-   If `MERGED` or `CLOSED`, output: `PR #N is already merged/closed. Nothing to do.` and stop.
+   Do not pass `$ARGUMENTS` through as extra flags. If you need to inspect supported options, run `pr-shepherd --help`.
 
-3. **Select the package runner** from the target repository root:
-   - Prefer `package.json` `packageManager`: `pnpm@...` → `pnpm exec`, `yarn@...` → `yarn run`, `bun@...` → `bunx`, `npm@...` → `npx`.
-   - If `packageManager` is absent, use lockfiles: `pnpm-lock.yaml` → `pnpm exec`, `yarn.lock` → `yarn run`, `bun.lock` / `bun.lockb` → `bunx`, `package-lock.json` or no signal → `npx`.
+   Print the full output. Follow the `## Instructions` section exactly for the current action.
 
-4. **Run one iterate tick:**
+3. **Persistence:** Continuously call `pr-shepherd <N> --interval 45s --timeout 4m` until the CLI returns `[CANCEL]` or `[ESCALATE]`, unless the human directs you to stop. Every other action is non-terminal:
+   - `[WAIT]`: call `pr-shepherd <N> --interval 45s --timeout 4m` again.
+   - `[MARK_READY]`: call `pr-shepherd <N> --interval 45s --timeout 4m` again.
+   - `[FIX_CODE]`: follow the output's `## Instructions`, then call `pr-shepherd <N> --interval 45s --timeout 4m` again.
 
-   If the package is missing in the target repository, tell the user to install pr-shepherd with the matching dev-dependency command: `pnpm add -D pr-shepherd`, `yarn add -D pr-shepherd`, `bun add -d pr-shepherd`, or `npm install --save-dev pr-shepherd`.
+   Treat a nonzero poll exit code as PR state only when the output contains a matching `# PR #N [ACTION]` heading. Exit code `1` can also mean a command or validation failure; if there is no `[FIX_CODE]` heading, surface the error and stop instead of looping.
 
-   ```bash
-   <runner> pr-shepherd <N>
-   ```
-
-   Print the full output. Follow the `## Instructions` section exactly.
-
-5. **Persistence:** Do not stop polling/iterating unless directed by the human or until the CLI returns a terminal state (`[CANCEL]` or `[ESCALATE]`). Every other action — `[WAIT]`, `[MARK_READY]`, `[FIX_CODE]` — is non-terminal and must be followed by another tick via one of the strategies below.
-
-6. **Stop conditions (terminal states):**
+4. **Stop conditions (terminal states):**
    - Stop when the CLI emits `[CANCEL]` (ready-delay completed, or PR merged/closed).
    - Stop when the CLI emits `[ESCALATE]`, including `stall-timeout` for repeated unchanged CI failures.
    - **Do NOT merge the pull request** unless the human has explicitly requested or allowed it.
-
-7. **Non-terminal actions** (`[WAIT]`, `[MARK_READY]`, `[FIX_CODE]`) — follow the `## Instructions` in the output. Pick one iteration strategy:
-   - **Blocking poll** — rerun as `<runner> pr-shepherd poll <N> [--interval <duration>] [--timeout <duration>]` (defaults: interval 30s, timeout 5m). Holds the agent turn until the action is non-WAIT or the timeout fires. Simplest when the agent cannot reliably schedule its own follow-up.
-   - **Scheduled wakeup + one tick** — schedule a single session-only follow-up task to rerun `<runner> pr-shepherd <N>` after a fresh 30s–4m delay, then end the turn.
-   - **Inline sleep + rerun** — sleep inline for a fresh 30s–4m delay, then rerun.
-
-   **Never write a custom polling loop** (shell `while`/`until` loops, script files that loop over pr-shepherd output, etc.). Custom loops poll only for terminal states and silently skip `[FIX_CODE]` handling — actionable review threads, failing checks, and resolve commands get missed. Use `pr-shepherd poll` for WAIT-state waiting; it exits on any non-WAIT action so the caller handles `[FIX_CODE]` and other actionable outputs normally.
-
-   Do not combine strategies (e.g., poll AND schedule a wakeup). Remember step 5 — every non-terminal output requires a follow-up tick.

package/bin/cli/default-iterate.mjs

@@ -1,50 +0,0 @@
-import { parsePrNumber } from "./args.mjs";
-import { USAGE } from "./help.mjs";
-const DEFAULT_ITERATE_FLAGS_WITH_VALUES = new Set(["--format", "--ready-delay", "--stall-timeout"]);
-const DEFAULT_ITERATE_BOOLEAN_FLAGS = new Set([
-    "--verbose",
-    "--no-auto-mark-ready",
-    "--no-auto-cancel-actionable",
-]);
-export function isDefaultIterateInvocation(subcommand) {
-    if (subcommand === "--help" || subcommand === "-h")
-        return false;
-    return (subcommand === undefined ||
-        parsePrNumber(subcommand) !== null ||
-        isDefaultIterateFlag(subcommand));
-}
-export function validateDefaultIterateArgs(args) {
-    let sawPr = false;
-    for (let i = 0; i < args.length; i += 1) {
-        const arg = args[i];
-        if (DEFAULT_ITERATE_FLAGS_WITH_VALUES.has(arg)) {
-            if (i + 1 >= args.length || args[i + 1].startsWith("--")) {
-                writeDefaultUsageError(arg);
-                return false;
-            }
-            i += 1;
-            continue;
-        }
-        const inlineFlag = arg.split("=", 1)[0];
-        if (DEFAULT_ITERATE_FLAGS_WITH_VALUES.has(inlineFlag))
-            continue;
-        if (DEFAULT_ITERATE_BOOLEAN_FLAGS.has(arg))
-            continue;
-        if (parsePrNumber(arg) !== null && !sawPr) {
-            sawPr = true;
-            continue;
-        }
-        writeDefaultUsageError(arg);
-        return false;
-    }
-    return true;
-}
-function isDefaultIterateFlag(arg) {
-    const name = arg.split("=", 1)[0];
-    return DEFAULT_ITERATE_FLAGS_WITH_VALUES.has(name) || DEFAULT_ITERATE_BOOLEAN_FLAGS.has(arg);
-}
-function writeDefaultUsageError(arg) {
-    process.stderr.write(`Unknown subcommand: ${arg}\n`);
-    process.stderr.write(`${USAGE.top}\n`);
-    process.exitCode = 1;
-}