pr-shepherd 0.42.0 → 0.43.0

package/bin/types/merge-action.d.mts

@@ -0,0 +1,12 @@
+interface ShellCommand {
+    argv: string[];
+}
+export interface MergeCommandPlan {
+    mode: "auto" | "queue";
+    command: ShellCommand;
+    /** Ordinary merge retry without `--auto`, used only when auto-merge is unavailable. */
+    fallbackCommand?: ShellCommand;
+    /** Direct enqueuePullRequest fallback for the known gh CLI queue limitation. */
+    queueApiFallbackCommand?: ShellCommand;
+}
+export {};

package/bin/types/merge-action.mjs

@@ -0,0 +1 @@
+export {};

package/bin/types/merge-queue.d.mts

@@ -0,0 +1,13 @@
+import type { AutoMergeRequestStatus, MergeQueueEntryStatus, MergeQueueRemovalStatus } from "./merge-requirements.mts";
+export interface MergeQueueReport {
+    enabled: boolean;
+    inQueue: boolean;
+    autoMergeRequest?: AutoMergeRequestStatus;
+    entry?: MergeQueueEntryStatus;
+    latestRemoval?: MergeQueueRemovalStatus;
+    checkCommitOid?: string;
+    /** GitHub reported more than the first 100 contexts on the queue commit. */
+    checksIncomplete?: true;
+    /** The current PR head is not a parent of the removed synthetic queue commit. */
+    headUpdatedAfterRemoval?: true;
+}

package/bin/types/merge-queue.mjs

@@ -0,0 +1 @@
+export {};

package/bin/types/merge-requirements.d.mts

@@ -17,6 +17,21 @@ export interface MergeQueueEntryStatus {
     position: number;
     state: string;
     estimatedTimeToMerge: number | null;
+    headCommitOid?: string;
+    enqueuedAtUnix?: number;
+    enqueuer?: string;
+}
+export interface AutoMergeRequestStatus {
+    enabledAtUnix: number;
+    mergeMethod: string;
+    enabledBy?: string;
+}
+export interface MergeQueueRemovalStatus {
+    reason: string | null;
+    actor?: string;
+    createdAtUnix: number;
+    beforeCommitOid?: string;
+    beforeCommitParentOids?: string[];
 }
 export interface StackStatus {
     number: number;
@@ -30,6 +45,8 @@ export interface BatchPrMergeFields {
     isInMergeQueue?: boolean;
     isMergeQueueEnabled?: boolean;
     mergeQueueEntry?: MergeQueueEntryStatus | null;
+    autoMergeRequest?: AutoMergeRequestStatus | null;
+    latestMergeQueueRemoval?: MergeQueueRemovalStatus | null;
     stack?: StackStatus | null;
 }
 /** Snapshot of "why can't I merge" requirements vs current PR state. */

package/bin/types/report.d.mts

@@ -3,6 +3,7 @@ import type { ClassifiedCheck, TriagedCheck } from "./check-classification.mts";
 import type { AgentThreadComment } from "./agent-thread.mts";
 import type { CheckAnnotation } from "./check-annotations.mts";
 import type { PrActivitySummary } from "./activity.mts";
+import type { MergeQueueReport } from "./merge-queue.mts";
 export interface FirstLookThread extends ReviewThread {
     firstLookStatus: "outdated" | "resolved" | "minimized";
     autoResolved?: boolean;
@@ -20,6 +21,8 @@ export interface ShepherdReport {
     pr: number;
     /** GitHub node ID of the PR — used for mutations (e.g. markPullRequestReadyForReview). */
     nodeId: string;
+    /** GitHub PR head OID from the same batch used to decide the action. */
+    headSha?: string;
     repo: string;
     status: ShepherdStatus;
     /** PR base branch from the GraphQL batch. */
@@ -71,6 +74,7 @@ export interface ShepherdReport {
     /** Branch protection rule for the PR's base branch. Null when no rule exists or the base ref is unavailable. */
     branchProtection: import("./github.mts").BranchProtection | null;
     activity?: PrActivitySummary;
+    mergeQueue?: MergeQueueReport;
 }
 export interface ResolveOptions {
     resolveThreadIds?: string[];
@@ -125,6 +129,8 @@ export interface AgentCheck {
     logExcerpt?: string;
     annotations?: CheckAnnotation[];
     annotationOnly?: true;
+    scope?: "merge_group";
+    commitOid?: string;
 }
 /**
  * A single CI check that is relevant to PR readiness — triggered by a PR event
@@ -149,6 +155,8 @@ export interface RelevantCheck {
     logExcerpt?: string;
     /** Marker-gated inline annotations from this check. */
     annotations?: CheckAnnotation[];
+    scope?: "merge_group";
+    commitOid?: string;
 }
 export interface GlobalOptions {
     prNumber?: number;

package/bin/types.d.mts

@@ -9,3 +9,6 @@ export * from "./types/report.mts";
 export * from "./types/suggestion-patch.mts";
 export * from "./types/iterate.mts";
 export * from "./types/merge-requirements.mts";
+export * from "./types/merge-action.mts";
+export * from "./types/escalate.mts";
+export * from "./types/merge-queue.mts";

package/bin/types.mjs

@@ -9,3 +9,6 @@ export * from "./types/report.mjs";
 export * from "./types/suggestion-patch.mjs";
 export * from "./types/iterate.mjs";
 export * from "./types/merge-requirements.mjs";
+export * from "./types/merge-action.mjs";
+export * from "./types/escalate.mjs";
+export * from "./types/merge-queue.mjs";

package/bin/util/markdown.d.mts

@@ -1 +1,3 @@
 export declare function joinSections(sections: (string | null | undefined)[]): string;
+/** Wrap arbitrary text in a CommonMark code span without colliding with embedded backticks. */
+export declare function inlineCode(value: string): string;

package/bin/util/markdown.mjs

@@ -5,3 +5,10 @@ export function joinSections(sections) {
         .filter((s) => s !== "")
         .join("\n\n");
 }
+/** Wrap arbitrary text in a CommonMark code span without colliding with embedded backticks. */
+export function inlineCode(value) {
+    const longestRun = Math.max(0, ...Array.from(value.matchAll(/`+/g), (match) => match[0].length));
+    const delimiter = "`".repeat(longestRun + 1);
+    const padding = value.startsWith("`") || value.endsWith("`") ? " " : "";
+    return `${delimiter}${padding}${value}${padding}${delimiter}`;
+}

package/package.json

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

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

@@ -1,6 +1,6 @@
 {
   "name": "pr-shepherd",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "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.42.0", "pr-shepherd-mcp"]
+      "args": ["--yes", "--package", "pr-shepherd@0.43.0", "pr-shepherd-mcp"]
     }
   }
 }

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

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

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

@@ -2,7 +2,7 @@
 name: pr-shepherd
 description: 'Iterate a GitHub pull request with pr-shepherd (MCP or CLI). Use for requests like "use pr-shepherd", "iterate PR #123", or "run pr-shepherd until this PR is ready".'
 user-invocable: true
-argument-hint: "[PR number or URL]"
+argument-hint: "[PR number or URL] [--merge]"
 allowed-tools: ["MCP", "Bash", "Read", "Grep", "Glob", "Edit", "Write"]
 ---
 
@@ -12,9 +12,9 @@ Thin dispatcher for iterating a PR. Poll with the CLI; use MCP `iterate` only wh
 
 ## Arguments: $ARGUMENTS
 
-1. Parse an optional PR number, repository-qualified `owner/repo#N`, or GitHub PR URL from `$ARGUMENTS`; otherwise let pr-shepherd infer the current branch PR.
+1. Parse an optional PR number, repository-qualified `owner/repo#N`, or GitHub PR URL and an optional `--merge` flag from `$ARGUMENTS`; otherwise let pr-shepherd infer the current branch PR. Reject any remaining argument. Follow the target repository's local `AGENTS.md` and `CLAUDE.md` standards while making changes.
 
-2. Before passing a supplied GitHub PR URL or `owner/repo#N` to the CLI, run `gh repo view --json nameWithOwner --jq .nameWithOwner` and verify that repository matches the reference case-insensitively. Stop on a mismatch or failed lookup; the CLI does not validate the URL repository. Convert a verified `owner/repo#N` to `https://github.com/owner/repo/pull/N`, then run the poll command `pr-shepherd` with the optional PR argument and print its full result. Do not run `pr-shepherd iterate`. If the CLI is unavailable and the `iterate` MCP tool is available, first obtain a repository-qualified reference: use a supplied GitHub PR URL or `owner/repo#N` unchanged; for a bare number, run `gh pr view <number> --json url --jq .url`; when omitted, run `gh pr view --json url --jq .url`. If that does not produce one qualified PR reference, stop and report that MCP cannot safely determine the PR. Otherwise call `iterate` with that qualified reference and print its full result.
+2. Before passing a supplied GitHub PR URL or `owner/repo#N` to the CLI, run `gh repo view --json nameWithOwner --jq .nameWithOwner` and verify that repository matches the reference case-insensitively. Stop on a mismatch or failed lookup; the CLI does not validate the URL repository. Convert a verified `owner/repo#N` to `https://github.com/owner/repo/pull/N`, then run the poll command `pr-shepherd` with the optional PR argument and forward `--merge` when supplied; print its full result. Do not run `pr-shepherd iterate`. If the CLI is unavailable and the `iterate` MCP tool is available, first obtain a repository-qualified reference: use a supplied GitHub PR URL or `owner/repo#N` unchanged; for a bare number, run `gh pr view <number> --json url --jq .url`; when omitted, run `gh pr view --json url --jq .url`. If that does not produce one qualified PR reference, stop and report that MCP cannot safely determine the PR. Otherwise call `iterate` with that qualified reference, plus `merge: true` when `--merge` was supplied, and print its full result.
 
 3. Print the full result and follow every returned `## Instructions` step exactly. For CLI output, run each printed mutation command when instructed. For MCP output, use MCP `apply` and `build_suggestion_patches` with the same qualified PR reference; do not run a shell `pr-shepherd apply` command.