@nanobpm/nano-workforce 0.39.1 → 0.39.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.39.3](https://github.com/nanobpm/nano-workforce/compare/v0.39.2...v0.39.3) (2026-08-11)
+
+
+### Bug Fixes
+
+* **merge-loop:** judge fresh-head-run by required checks, not rollup length ([#113](https://github.com/nanobpm/nano-workforce/issues/113)) ([a10c4c5](https://github.com/nanobpm/nano-workforce/commit/a10c4c5b3ee5c452591eeb6c6206c4815674959a))
+
+## [0.39.2](https://github.com/nanobpm/nano-workforce/compare/v0.39.1...v0.39.2) (2026-08-11)
+
+
+### Bug Fixes
+
+* **merge:** recover PRs merged out-of-band instead of wedging in "merging" ([#112](https://github.com/nanobpm/nano-workforce/issues/112)) ([037d8aa](https://github.com/nanobpm/nano-workforce/commit/037d8aa2538b85f9c1b43927378f3578530a924e)), closes [Magikcraft/nano-bpm#723](https://github.com/Magikcraft/nano-bpm/issues/723)
+
 ## [0.39.1](https://github.com/nanobpm/nano-workforce/compare/v0.39.0...v0.39.1) (2026-08-10)
 
 

package/app/github.ts

@@ -214,6 +214,12 @@ export interface PrState {
    * frugal-CI stuck state the fresh-head-run remedy targets); `-1` when the transport can't
    * enumerate checks (token mode). */
   totalChecks: number;
+  /** Names of every head check present in any state (pending/failed/passed). Empty in token mode
+   * (the REST fallback can't enumerate checks). Lets the fresh-head-run remedy judge whether the
+   * repo's *required* checks (per its merge protocol) are actually present on the head — an
+   * unrelated always-on check (e.g. Mergify's "Merge Queue") must not read as "the required run
+   * already happened". */
+  presentCheckNames: string[];
   /** Whether the PR is a draft (a fresh head run is produced by marking it ready, not reopen). */
   isDraft: boolean;
   /** Current head commit. Used to scope one-shot merge-protocol nudges to a landing attempt. */
@@ -248,6 +254,19 @@ function failingCheckNames(rollup: RollupEntry[]): string[] {
   return names;
 }
 
+/** Names of every head check present, regardless of state. Covers both the CheckRun shape
+ * (`name`/`workflowName`) and the legacy StatusContext shape (`context`). Used to test whether a
+ * repo's *required* checks are present on the head — so an unrelated always-on check (e.g.
+ * Mergify's "Merge Queue") doesn't masquerade as the required CI run having already happened. */
+function allCheckNames(rollup: RollupEntry[]): string[] {
+  const names: string[] = [];
+  for (const c of rollup) {
+    const name = c.name || c.context || c.workflowName;
+    if (name) names.push(name);
+  }
+  return names;
+}
+
 export async function fetchPrState(
   repo: string,
   number: number | string,
@@ -280,6 +299,7 @@ export async function fetchPrState(
       failingChecks: names.length,
       failingCheckNames: names,
       totalChecks: rollup.length,
+      presentCheckNames: allCheckNames(rollup),
       isDraft: !!j.isDraft,
       headRefOid: j.headRefOid ?? null,
     };
@@ -305,6 +325,7 @@ export async function fetchPrState(
     failingChecks: -1, // REST here doesn't enumerate checks → classifier treats BLOCKED as "wait"
     failingCheckNames: [], // …and the CI-fix agent gets no per-check list in token mode
     totalChecks: -1, // …and the fresh-head-run remedy stays conservative (never reopens blind)
+    presentCheckNames: [], // …can't enumerate checks in token mode → no required-check presence signal
     isDraft: !!j.draft,
     headRefOid: j.head?.sha ?? null,
   };

package/app/mergeProtocol.test.ts

@@ -10,8 +10,10 @@ import {
   DEFAULT_MERGE_PROTOCOL,
   extractProtocolBlock,
   freshHeadRunAction,
+  headRunPresenceCount,
   type MergeProtocol,
   parseMergeProtocol,
+  presentRequiredCheckCount,
 } from "./mergeProtocol.ts";
 
 test("parseMergeProtocol: non-object / junk → defaults (total, never throws)", () => {
@@ -27,7 +29,10 @@ test("parseMergeProtocol: full nano-bpm-style descriptor", () => {
     freshHeadRun: "ready-or-reopen",
     waitForChecks: true,
     land: { method: "mergify-queue", comment: "@mergifyio queue" },
-    requiredChecks: ["rustfmt (pinned nightly)", "server (clippy + test)"],
+    requiredChecks: [
+      { name: "rustfmt (pinned nightly)", acceptedConclusions: ["success"] },
+      { name: "processos (clippy + test)", acceptedConclusions: ["success", "skipped"] },
+    ],
     doc: "AGENTS.md#merging-prs",
   });
   assertEquals(got.autoMerge, false);
@@ -35,20 +40,38 @@ test("parseMergeProtocol: full nano-bpm-style descriptor", () => {
   assertEquals(got.waitForChecks, true);
   assertEquals(got.land, { method: "mergify-queue", comment: "@mergifyio queue" });
   assertEquals(got.requiredChecks.length, 2);
+  assertEquals(got.requiredChecks[0], { name: "rustfmt (pinned nightly)", acceptedConclusions: ["success"] });
+  assertEquals(got.requiredChecks[1].acceptedConclusions, ["success", "skipped"]);
   assertEquals(got.doc, "AGENTS.md#merging-prs");
 });
 
+test("parseMergeProtocol: requiredChecks tolerates bare-string entries + drops nameless/junk", () => {
+  const got = parseMergeProtocol({
+    requiredChecks: [
+      "server (clippy + test)", // bare name → default acceptedConclusions ["success"]
+      { name: "engine-core (clippy + test)" }, // object, no acceptedConclusions → default
+      { name: "", acceptedConclusions: ["success"] }, // empty name → dropped
+      { acceptedConclusions: ["success"] }, // no name → dropped
+      42, // junk → dropped
+    ],
+  });
+  assertEquals(got.requiredChecks, [
+    { name: "server (clippy + test)", acceptedConclusions: ["success"] },
+    { name: "engine-core (clippy + test)", acceptedConclusions: ["success"] },
+  ]);
+});
+
 test("parseMergeProtocol: invalid enums / wrong types fall back per-field", () => {
   const got = parseMergeProtocol({
     autoMerge: "yes", // not a boolean → default
     freshHeadRun: "sometimes", // not in the enum → default (none)
     land: { method: "teleport" }, // not in the enum → default (gh-merge)
-    requiredChecks: ["ok", 7, null], // keep only strings
+    requiredChecks: ["ok", 7, null], // keep only usable names
   });
   assertEquals(got.autoMerge, DEFAULT_MERGE_PROTOCOL.autoMerge);
   assertEquals(got.freshHeadRun, "none");
   assertEquals(got.land.method, "gh-merge");
-  assertEquals(got.requiredChecks, ["ok"]);
+  assertEquals(got.requiredChecks, [{ name: "ok", acceptedConclusions: ["success"] }]);
 });
 
 test("parseMergeProtocol: comment dropped when absent", () => {
@@ -123,3 +146,52 @@ test("freshHeadRunAction: mode=ready only acts on drafts", () => {
   assertEquals(freshHeadRunAction(readyOnly, "waiting", 0, true), "ready");
   assertEquals(freshHeadRunAction(readyOnly, "waiting", 0, false), null); // not a draft → nothing to ready
 });
+
+// The nano-bpm merge protocol: 3 required checks, one skip-tolerant.
+const NANO_REQ: MergeProtocol = parseMergeProtocol({
+  freshHeadRun: "ready-or-reopen",
+  land: { method: "mergify-queue" },
+  requiredChecks: [
+    { name: "rustfmt (pinned nightly)", acceptedConclusions: ["success"] },
+    { name: "server (clippy + test)", acceptedConclusions: ["success"] },
+    { name: "processos (clippy + test)", acceptedConclusions: ["success", "skipped"] },
+  ],
+});
+
+test("presentRequiredCheckCount: counts only declared required checks present on the head", () => {
+  // Only an unrelated always-on check (Mergify) is present → zero required checks present.
+  assertEquals(presentRequiredCheckCount(NANO_REQ, ["Mergify Merge Queue"]), 0);
+  // Two of the three required checks present (plus the incidental Mergify one).
+  assertEquals(
+    presentRequiredCheckCount(NANO_REQ, ["Mergify Merge Queue", "server (clippy + test)", "rustfmt (pinned nightly)"]),
+    2,
+  );
+  // A repo that declares no required checks → nothing to count.
+  assertEquals(presentRequiredCheckCount(DEFAULT_MERGE_PROTOCOL, ["anything"]), 0);
+});
+
+test("headRunPresenceCount: required-aware — Mergify's incidental check doesn't mask a missing run", () => {
+  // The #727 stuck state: BLOCKED head carries only Mergify's neutral check, none of the 3
+  // required checks ran. Raw rollup length is 1, but the required-check presence is 0 → the
+  // remedy must see 0 and fire the reopen.
+  const st = { totalChecks: 1, presentCheckNames: ["Mergify Merge Queue"] };
+  assertEquals(headRunPresenceCount(NANO_REQ, st), 0);
+  assertEquals(freshHeadRunAction(NANO_REQ, "waiting", headRunPresenceCount(NANO_REQ, st), false), "reopen");
+});
+
+test("headRunPresenceCount: a present required check reads as run-exists (no reopen)", () => {
+  const st = { totalChecks: 2, presentCheckNames: ["Mergify Merge Queue", "server (clippy + test)"] };
+  assertEquals(headRunPresenceCount(NANO_REQ, st), 1);
+  assertEquals(freshHeadRunAction(NANO_REQ, "waiting", headRunPresenceCount(NANO_REQ, st), false), null);
+});
+
+test("headRunPresenceCount: no declared required checks → falls back to total rollup length", () => {
+  const proto = parseMergeProtocol({ freshHeadRun: "ready-or-reopen", land: { method: "gh-merge" } });
+  assertEquals(headRunPresenceCount(proto, { totalChecks: 0, presentCheckNames: [] }), 0);
+  assertEquals(headRunPresenceCount(proto, { totalChecks: 3, presentCheckNames: ["a", "b", "c"] }), 3);
+});
+
+test("headRunPresenceCount: token mode (totalChecks < 0) stays conservative (-1)", () => {
+  assertEquals(headRunPresenceCount(NANO_REQ, { totalChecks: -1, presentCheckNames: [] }), -1);
+  assertEquals(freshHeadRunAction(NANO_REQ, "waiting", -1, false), null);
+});

package/app/mergeProtocol.ts

@@ -28,6 +28,16 @@ export type FreshHeadRun = "none" | "ready" | "reopen" | "ready-or-reopen";
  * `ui` = a human clicks Merge (Merlin can't do it → escalate). */
 export type LandMethod = "gh-merge" | "admin" | "mergify-queue" | "ui";
 
+/** One required status check a repo declares in its merge protocol. `name` is the check-run /
+ * status-context name exactly as GitHub reports it in the head `statusCheckRollup`.
+ * `acceptedConclusions` are the conclusions that count as satisfied (default `["success"]`); a
+ * change-gated check that is skipped for irrelevant PRs also lists `"skipped"` so a skip counts
+ * as satisfied (required-when-run, skip-tolerant). */
+export interface RequiredCheck {
+  name: string;
+  acceptedConclusions: string[];
+}
+
 export interface MergeProtocol {
   /** Does the repo auto-merge a PR once its checks go green? (Informational; Merlin never relies
    * on auto-merge — it lands deliberately.) */
@@ -38,8 +48,10 @@ export interface MergeProtocol {
   waitForChecks: boolean;
   /** How to land the PR. */
   land: { method: LandMethod; comment?: string };
-  /** Names of the required checks (informational; the poller reads live state). */
-  requiredChecks: string[];
+  /** The checks that gate the merge. A repo publishing these lets the fresh-head-run remedy judge
+   * "is the required CI run present on the head?" by *these* checks — not by total rollup length,
+   * which an unrelated always-on check (e.g. Mergify's "Merge Queue") would otherwise satisfy. */
+  requiredChecks: RequiredCheck[];
   /** Pointer to the human doc, for escalation messages. */
   doc?: string;
 }
@@ -70,6 +82,30 @@ function strArray(v: unknown): string[] | undefined {
   if (!Array.isArray(v)) return undefined;
   return v.filter((x): x is string => typeof x === "string");
 }
+/** Parse `requiredChecks`, tolerating both the rich object shape (`{ name, acceptedConclusions }`)
+ * and a bare list of check names (each → `{ name, acceptedConclusions: ["success"] }`). Entries
+ * without a usable `name` are dropped. Total — never throws. */
+function requiredCheckArray(v: unknown): RequiredCheck[] {
+  if (!Array.isArray(v)) return [];
+  const out: RequiredCheck[] = [];
+  for (const entry of v) {
+    if (typeof entry === "string") {
+      const name = entry.trim();
+      if (name === "") continue;
+      out.push({ name, acceptedConclusions: ["success"] });
+      continue;
+    }
+    if (!isRecord(entry)) continue;
+    const name = str(entry.name)?.trim();
+    if (name === undefined || name === "") continue;
+    const accepted = strArray(entry.acceptedConclusions);
+    out.push({
+      name,
+      acceptedConclusions: accepted && accepted.length > 0 ? accepted : ["success"],
+    });
+  }
+  return out;
+}
 function oneOf<T extends string>(v: unknown, allowed: ReadonlySet<string>): T | undefined {
   const s = str(v);
   // biome-ignore lint/plugin: runtime/framework contract boundary for external data shape
@@ -88,7 +124,7 @@ export function parseMergeProtocol(raw: unknown): MergeProtocol {
     freshHeadRun: oneOf<FreshHeadRun>(raw.freshHeadRun, FRESH_HEAD_RUNS) ?? DEFAULT_MERGE_PROTOCOL.freshHeadRun,
     waitForChecks: bool(raw.waitForChecks) ?? DEFAULT_MERGE_PROTOCOL.waitForChecks,
     land: comment !== undefined ? { method, comment } : { method },
-    requiredChecks: strArray(raw.requiredChecks) ?? [],
+    requiredChecks: requiredCheckArray(raw.requiredChecks),
     doc: str(raw.doc),
   };
 }
@@ -159,27 +195,53 @@ export interface FreshHeadRunAttempt {
   lastActionHeadRefOid?: string | null;
 }
 
+/** Count of the protocol's required checks currently present on the head (in any state). This is
+ * the signal the fresh-head-run remedy actually wants — "has the required CI run happened?" — as
+ * opposed to the raw rollup length, which an unrelated always-on check (e.g. Mergify's "Merge
+ * Queue") inflates. A required check matches by exact name against the head `statusCheckRollup`. */
+export function presentRequiredCheckCount(protocol: MergeProtocol, presentCheckNames: string[]): number {
+  const present = new Set(presentCheckNames);
+  return protocol.requiredChecks.filter((c) => present.has(c.name)).length;
+}
+
+/** The "does a head run already exist?" count to feed {@link freshHeadRunAction}. When the repo
+ * declares `requiredChecks`, judge presence by *those* checks — so an incidental always-on check
+ * (Mergify) never masks a genuinely-missing required run and wedges the merge. When it declares
+ * none, fall back to the total rollup length (legacy behaviour, default repos unchanged). Token
+ * mode (`totalChecks < 0`, checks unenumerable) stays `-1` so the remedy remains conservative and
+ * never reopens blind. */
+export function headRunPresenceCount(
+  protocol: MergeProtocol,
+  state: { totalChecks: number; presentCheckNames: string[] },
+): number {
+  if (state.totalChecks < 0) return -1; // token mode → unknown → conservative
+  if (protocol.requiredChecks.length === 0) return state.totalChecks;
+  return presentRequiredCheckCount(protocol, state.presentCheckNames);
+}
+
 /** Whether the merge poller should produce a synthetic fresh head run *now*, and how.
  *
- * Fires only when the protocol asks for a fresh run AND the PR currently has **no head check run
- * at all** (`totalChecks === 0`) while GitHub still reports it un-landable-but-not-conflicting
+ * Fires only when the protocol asks for a fresh run AND the PR currently has **no required head
+ * run** (`headRunCount === 0`) while GitHub still reports it un-landable-but-not-conflicting
  * (`waiting`). That is exactly the frugal-CI stuck state: review converged, the last push produced
- * no run, so branch protection's required checks read as *expected* forever. Once a run exists for
- * the current head (`totalChecks > 0`, pending or done), or this same head already got its nudge,
- * this returns `null`, so the poller never re-triggers inside one landing attempt. A rebase changes
- * `headRefOid`, so the decision is re-derived and can fire again for the fresh post-rebase head.
- * A genuinely-failing check (`blocked`) is left to the fix-ci arm, a conflict (`conflict`) to the
- * rebase arm (#42). */
+ * no run, so branch protection's required checks read as *expected* forever. `headRunCount` is the
+ * required-check-aware presence count from {@link headRunPresenceCount} — NOT the raw rollup
+ * length — so an incidental always-on check (e.g. Mergify's "Merge Queue") does not read as "a run
+ * already exists". Once the required run is present (`headRunCount > 0`, pending or done), or this
+ * same head already got its nudge, this returns `null`, so the poller never re-triggers inside one
+ * landing attempt. A rebase changes `headRefOid`, so the decision is re-derived and can fire again
+ * for the fresh post-rebase head. A genuinely-failing check (`blocked`) is left to the fix-ci arm,
+ * a conflict (`conflict`) to the rebase arm (#42). */
 export function freshHeadRunAction(
   protocol: MergeProtocol,
   verdict: "ready" | "waiting" | "conflict" | "blocked",
-  totalChecks: number,
+  headRunCount: number,
   isDraft: boolean,
   attempt: FreshHeadRunAttempt = {},
 ): "ready" | "reopen" | null {
   if (protocol.freshHeadRun === "none") return null;
   if (verdict !== "waiting") return null; // ready = go land; blocked/conflict = other arms
-  if (totalChecks !== 0) return null; // a run already exists (or unknown in token mode) → wait
+  if (headRunCount !== 0) return null; // required run already present (or unknown in token mode) → wait
   if (attempt.headRefOid && attempt.headRefOid === attempt.lastActionHeadRefOid) return null;
   switch (protocol.freshHeadRun) {
     case "ready":

package/app/service.ts

@@ -20,7 +20,7 @@ import {
   requestCopilotReview,
 } from "./github.ts";
 import { mergeLanes, readExclusions } from "./mergeExclusion.ts";
-import { freshHeadRunAction, loadMergeProtocol } from "./mergeProtocol.ts";
+import { freshHeadRunAction, headRunPresenceCount, loadMergeProtocol } from "./mergeProtocol.ts";
 import { type PrLaneDecision, planPrLane, taskDependencyDepths } from "./mergeTrain.ts";
 import { plans, planTaskDeps, planTasks } from "./plan.ts";
 import { clampNudgeMinutes, reviewWaitTimeout } from "./reviewWait.ts";
@@ -668,11 +668,17 @@ async function pollMerges(data: DataLayer, engine: EngineClient, token: string)
       const st = await fetchPrState(repo, number, token);
       if (st === null) continue; // no transport → skip this PR (others may still advance)
       if (st.merged) {
-        // Landed out-of-band (someone merged it) — skip straight to done.
+        // Landed out-of-band (a maintainer clicked Merge, a mergify queue merged it, etc.). The
+        // instance is parked at `wait-mergeable`, which subscribes to `merge-ready` — NOT
+        // `merge-landed` (that catch, `wait-landed`, only exists later, after we enqueue). Publishing
+        // `merge-landed` here has no subscription to correlate to, so the engine drops it and the PR
+        // wedges forever in the transient `merging` status (which no poller branch re-scans).
+        // Publish `merge-ready` with a `ready` verdict instead: it routes through `gw-mergeable` to
+        // `attempt-merge`, whose idempotent already-merged check completes the loop (`mark-merged`).
         await flipToMergingThenPublish(data, engine, prKey, "waiting_merge", {
-          name: "merge-landed",
+          name: "merge-ready",
           correlationKey: prKey,
-          variables: {},
+          variables: { mergeState: "ready", failingChecks: 0, failingChecksList: "" },
         });
         console.log(`[poller] already merged -> ${prKey}`);
         continue;
@@ -680,14 +686,17 @@ async function pollMerges(data: DataLayer, engine: EngineClient, token: string)
       const verdict = classifyMergeability(st);
       if (verdict === "waiting") {
         // Frugal-CI remedy (#43): when the repo publishes a merge protocol that wants a fresh
-        // head run and the PR has NO head run at all, review has converged but the last push
+        // head run and the PR has NO required head run yet, review has converged but the last push
         // produced no CI run — so branch protection's required checks read as "expected" forever
-        // and this PR would wait indefinitely. Produce a fresh `pull_request` run once per head
-        // (mark ready / close+reopen); rebases change `headRefOid`, so downstream merge-train PRs
-        // get a new nudge after every post-rebase landing attempt.
+        // and this PR would wait indefinitely. Judge "no run yet" by the protocol's *required*
+        // checks (headRunPresenceCount), not the raw rollup length, so an incidental always-on
+        // check (e.g. Mergify's "Merge Queue") doesn't mask a missing run. Produce a fresh
+        // `pull_request` run once per head (mark ready / close+reopen); rebases change
+        // `headRefOid`, so downstream merge-train PRs get a new nudge after every post-rebase
+        // landing attempt.
         const protocol = await loadMergeProtocol(repo, token).catch(() => null);
         if (protocol) {
-          const action = freshHeadRunAction(protocol, verdict, st.totalChecks, st.isDraft, {
+          const action = freshHeadRunAction(protocol, verdict, headRunPresenceCount(protocol, st), st.isDraft, {
             headRefOid: st.headRefOid,
             lastActionHeadRefOid: pr.fresh_head_run_head,
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.39.1",
+  "version": "0.39.3",
   "description": "Nano Workforce — an Agent Graph Orchestration application for Agentic SDLC: durable BPMN processes that coordinate a graph of AI agents across the software delivery lifecycle.",
   "type": "module",
   "main": "main.ts",
@@ -45,7 +45,7 @@
     "lint:fix": "biome check --write app operations workers pages components scripts main.ts"
   },
   "dependencies": {
-    "@nanobpm/urban": "^0.38.0"
+    "@nanobpm/urban": "^0.40.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.11",

package/workers/merge/worker.test.ts

@@ -0,0 +1,96 @@
+// Regression for the out-of-band merge wedge (Magikcraft/nano-bpm#723): when a PR is merged
+// independently of the process (a maintainer clicks Merge, a mergify queue lands it), the poller
+// routes the merge-loop instance back through `attempt-merge`. This worker must detect the
+// already-merged state and complete the loop directly — NOT re-run the land protocol, which would post a
+// spurious `@mergifyio queue` comment (mergify-queue repos) or a redundant merge call. Forces the
+// token transport and stubs `globalThis.fetch` so the single-PR GET reports `merged: true`.
+import { test } from "node:test";
+import { assertEquals } from "#test-assert";
+import handler from "./worker.ts";
+
+function fakeApp() {
+  const stores: Record<string, Record<string, unknown>[]> = {
+    pull_requests: [],
+    merges: [],
+  };
+  return {
+    app: {
+      data: {
+        table(name: string, key: string) {
+          const store = (stores[name] ??= []);
+          return {
+            get: (k: any) => Promise.resolve(store.find((r) => r[key] === k)),
+            find: (q: any) =>
+              Promise.resolve(
+                store.filter((r) => Object.entries(q).every(([f, v]) => r[f] === v)),
+              ),
+            insert: (row: any) => {
+              store.push(row);
+              return Promise.resolve(store.length);
+            },
+            update: (k: any, patch: any) => {
+              const row = store.find((r) => r[key] === k);
+              if (row) Object.assign(row, patch);
+              return Promise.resolve(row);
+            },
+          };
+        },
+      },
+      log: () => undefined,
+      engine: {},
+    } as any,
+    stores,
+  };
+}
+
+function withMergedPr(run: (calls: string[]) => Promise<void>): Promise<void> {
+  const oldTransport = process.env["NANO_PR_GITHUB_TRANSPORT"];
+  const oldToken = process.env["GITHUB_TOKEN"];
+  const oldFetch = globalThis.fetch;
+  const calls: string[] = [];
+  process.env["NANO_PR_GITHUB_TRANSPORT"] = "token";
+  process.env["GITHUB_TOKEN"] = "test-token";
+  globalThis.fetch = ((input: string | URL | Request) => {
+    const url = String(input);
+    calls.push(url);
+    // Single-PR GET → report the PR as already merged.
+    if (/\/pulls\/\d+$/.test(url)) {
+      return Promise.resolve(new Response(JSON.stringify({ merged: true, mergeable_state: "clean" })));
+    }
+    return Promise.resolve(new Response("not found", { status: 404 }));
+  }) as typeof fetch;
+  return run(calls).finally(() => {
+    if (oldTransport == null) delete process.env["NANO_PR_GITHUB_TRANSPORT"];
+    else process.env["NANO_PR_GITHUB_TRANSPORT"] = oldTransport;
+    if (oldToken == null) delete process.env["GITHUB_TOKEN"];
+    else process.env["GITHUB_TOKEN"] = oldToken;
+    globalThis.fetch = oldFetch;
+  });
+}
+
+test("pr.merge short-circuits an already-merged PR without re-running the land protocol", async () => {
+  await withMergedPr(async (calls) => {
+    const { app, stores } = fakeApp();
+    const out = (await handler(
+      {
+        variables: {
+          prKey: "Magikcraft/nano-bpm#723",
+          repo: "Magikcraft/nano-bpm",
+          prNumber: 723,
+        },
+      } as any,
+      app,
+    )) as Record<string, unknown>;
+
+    // Completes the loop directly.
+    assertEquals(out, { mergeStatus: "merged" });
+
+    // Records exactly one audit row, tagged as the idempotent already-merged path.
+    assertEquals(stores.merges.length, 1);
+    assertEquals(stores.merges[0].outcome, "merged");
+    assertEquals(stores.merges[0].method, "already-merged");
+
+    // Never posts an enqueue comment or issues a merge call (only the read GET happened).
+    assertEquals(calls.some((u) => /comments|merge$/.test(u)), false);
+  });
+});

package/workers/merge/worker.ts

@@ -11,7 +11,7 @@
 import type { AppJobHandler } from "@nanobpm/urban";
 import { abandonTokenFromUrl } from "../../app/abandon.ts";
 import { checkBaseTarget } from "../../app/baseGuard.ts";
-import { enqueueViaComment, mergePr } from "../../app/github.ts";
+import { enqueueViaComment, fetchPrState, mergePr } from "../../app/github.ts";
 import { loadMergeProtocol } from "../../app/mergeProtocol.ts";
 import { ensurePr, MERGE_ADMIN, MERGE_METHOD } from "../../app/service.ts";
 
@@ -51,6 +51,25 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
     abandonToken: abandonTokenFromUrl(abandonUrl),
   });
 
+  // Idempotent already-merged short-circuit. When the poller routes an out-of-band-merged PR back
+  // through `attempt-merge` (service.ts publishes `merge-ready` on the `waiting_merge` out-of-band
+  // branch), the PR is already landed on GitHub. Re-running the land protocol would post a spurious
+  // `@mergifyio queue` comment (mergify-queue repos) or a redundant merge call, so detect the merged
+  // state first and complete the loop directly. Runs AFTER ensurePr so the `merges` audit row has its
+  // FK parent, and BEFORE the base-guard/protocol logic. Best-effort: a transport hiccup falls through
+  // to the normal path rather than blocking a genuine merge.
+  const pre = await fetchPrState(repo, prNumber, token).catch(() => null);
+  if (pre?.merged) {
+    await app.data.table("merges", "id").insert({
+      pr_key: prKey,
+      outcome: "merged",
+      method: "already-merged",
+      detail: "PR was already merged on GitHub (landed out-of-band)",
+      at: now,
+    });
+    return { mergeStatus: "merged" };
+  }
+
   // Dead-end-base guard (#60): never land a PR into a base branch that has itself already merged
   // to the default branch — the merge would land into a dead branch and never reach `main`.
   // GitHub only auto-retargets a PR when its base is *deleted* on merge; a merged-but-undeleted