@nanobpm/nano-workforce 0.186.1 → 0.186.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.186.2](https://github.com/nanobpm/nano-workforce/compare/v0.186.1...v0.186.2) (2026-09-11)
+
+### Bug Fixes
+
+* **merge-loop:** re-poll a 'waiting' mergeability verdict instead of escalating ([#775](https://github.com/nanobpm/nano-workforce/issues/775)) ([4812fe9](https://github.com/nanobpm/nano-workforce/commit/4812fe9689088f21e41ef50ba8f1dbec2093fb23)), closes [#774](https://github.com/nanobpm/nano-workforce/issues/774) [#774](https://github.com/nanobpm/nano-workforce/issues/774) [#774](https://github.com/nanobpm/nano-workforce/issues/774)
+
 ## [0.186.1](https://github.com/nanobpm/nano-workforce/compare/v0.186.0...v0.186.1) (2026-09-11)
 
 ### Bug Fixes

package/SPEC.md

@@ -216,7 +216,7 @@ Consequences the prompt (`resources/prompts/review-round.md`) encodes:
 | `pr-submitted` | — (start) | submit route/webhook | `{repo, prNumber, prUrl, prKey}` |
 | `readiness-ready` | `prKey` | **poller** | `{ready, detail?}` (ADR 0001 §2 wait-gate; the review-ready wait, re-expressed on the ReadinessProbe gate — #259) |
 | `deps-cleared` | `prKey` | **poller** (merge) | — (all `Depends-on` PRs merged) |
-| `merge-ready` | `prKey` | **poller** (merge) | `{mergeState}` (`ready` \| `conflict` \| `blocked`); when `blocked`, also `{failingChecks, failingChecksList}` for the `senior:fix-ci` branch |
+| `merge-ready` | `prKey` | **poller** (merge) | `{mergeState}` (`ready` \| `conflict` \| `blocked` \| `draft`); when `blocked`, also `{failingChecks, failingChecksList}` for the `senior:fix-ci` branch. A transient `UNKNOWN`/`waiting` verdict is NOT published — the poller keeps polling (fast self-heal); the merge loop's `gw-mergeable` sees `waiting` only via the dead-poller stall-probe re-derivation, where it re-polls (bounded, #774) instead of escalating |
 | `merge-landed` | `prKey` | **poller** (merge) | — (queued PR merged, or merged out-of-band) |
 
 The `escalation-answered` message was retired (#256): the merge-loop escalation is
@@ -466,10 +466,21 @@ start ─► wait: deps merged ─► arm merge ─► wait: mergeable ─┬─
   time** by a `fix-ci`/`rebase` agent (`status: "waiting-on-pr"`, above). `merge-loop`
   parks at *wait: deps merged*; the poller checks each dependency (own tracked row
   first, else GitHub `merged` state) and publishes `deps-cleared` once all have landed.
-- **Mergeability** — the poller classifies GitHub's `mergeStateStatus`:
+- **Mergeability** — the poller classifies GitHub's `mergeStateStatus`, but a
+  first-class `isDraft` guard runs *first* (`classifyMergeability`, `app/github.ts`):
+  a draft PR is `draft` regardless of `mergeStateStatus`. Otherwise, by status:
   `CLEAN`/`HAS_HOOKS`/`UNSTABLE`/`BEHIND` → `ready`; `DIRTY` → `conflict`;
   `BLOCKED` → `blocked` if a required check is failing, else keep waiting;
-  `DRAFT`/`UNKNOWN`/empty → keep waiting. It publishes `merge-ready {mergeState}`.
+  `UNKNOWN`/empty (and any other status, including `DRAFT`) → keep polling (GitHub
+  still computing). It
+  publishes `merge-ready {mergeState}` for the settled verdicts. When the live
+  poller is dead the `wait-mergeable-timeout` backstop's stall-probe re-derives
+  mergeability; a still-unsettled `UNKNOWN`/`waiting` verdict then routes to a
+  **bounded re-poll** (`wait-mergeable-repoll`, `NANO_PR_MERGEABLE_REPOLL_INTERVAL`)
+  rather than escalating (bounded by `NANO_PR_MAX_MERGE_STALL_ROUNDS`), and an
+  unclassified/default verdict routes to auto-rebase (`gw-rebase`, bounded by its
+  own `NANO_PR_MAX_REBASE_ROUNDS` budget); once either budget is exhausted the loop
+  escalates to a human (#774).
 - **Merge** — `pr.merge` attempts the merge (`NANO_PR_MERGE_METHOD`, default
   `squash`). GitHub auto-enqueues on merge-queue-required branches → the process
   waits for `merge-landed` (poller detects the landed PR). Every attempt is

package/app/contracts.ts

@@ -137,7 +137,7 @@ export const ENV_CONTRACTS = {
     name: "NANO_PR_MAX_MERGE_STALL_ROUNDS",
     owner: "app/service.ts",
     semantics:
-      "Maximum mergeable-wait-timeout stall-probe re-derivations (dead-poller backstop, #636) before escalating; 0 escalates on the first stall.",
+      "Maximum mergeable-wait-timeout stall-probe re-derivations (dead-poller backstop, #636) AND `waiting`-verdict re-poll probes (#774) before escalating; 0 escalates on the first stall.",
     default: "3",
   },
   NANO_PR_REVIEW_WAIT_TIMEOUT: {
@@ -166,6 +166,13 @@ export const ENV_CONTRACTS = {
     semantics:
       "How long the merge loop waits for the poller's `merge-ready` before the stall-probe timer arm fires (dead-poller backstop, #636; FEEL/ISO-8601 duration).",
   },
+  NANO_PR_MERGEABLE_REPOLL_INTERVAL: {
+    category: "env",
+    name: "NANO_PR_MERGEABLE_REPOLL_INTERVAL",
+    owner: "app/service.ts",
+    semantics:
+      "How long the merge loop waits before re-deriving mergeability when `gw-mergeable` sees an async-`UNKNOWN` `\"waiting\"` verdict, instead of escalating to a human (#774; bounded by `NANO_PR_MAX_MERGE_STALL_ROUNDS`; FEEL/ISO-8601 duration).",
+  },
   NANO_PR_AUTO_MERGE: {
     category: "env",
     name: "NANO_PR_AUTO_MERGE",

package/app/mergeLoopBehaviour.test.ts

@@ -43,6 +43,7 @@ const MODEL = readFileSync("resources/processes/merge-loop.bpmn", "utf8");
 const AGENT_SLA_MS = 30 * 60 * 1000; // matches the PT30M we start instances with
 const LANDED_WAIT_MS = 30 * 60 * 1000; // matches the PT30M landedWaitTimeout we start instances with
 const MERGEABLE_WAIT_MS = 30 * 60 * 1000; // matches the PT30M mergeableWaitTimeout we start instances with
+const MERGEABLE_REPOLL_MS = 2 * 60 * 1000; // matches the PT2M mergeableRepollInterval we start instances with
 
 type Output = Record<string, unknown>;
 type Responder = Output | Output[] | ((job: { variables: Record<string, unknown> }) => Output);
@@ -85,6 +86,7 @@ const DEFAULT_VARS: Record<string, unknown> = {
   agentSlaTimeout: "PT30M",
   landedWaitTimeout: "PT30M",
   mergeableWaitTimeout: "PT30M",
+  mergeableRepollInterval: "PT2M",
   mergeStallRounds: 0,
   mergeStallMax: 3,
   abandonBrief: null,
@@ -349,6 +351,94 @@ test("the stall-round cap escalates to a human instead of looping forever (#636)
   assert(!completedElementIds(engine).has("mark-merged"), "an exhausted stall must not mark-merged");
 });
 
+// ---------------------------------------------------------------------------
+// Async-UNKNOWN "waiting" verdict → bounded re-poll, NOT a human (issue #774)
+// ---------------------------------------------------------------------------
+// GitHub returns `mergeable=UNKNOWN` transiently while it computes mergeability in the background,
+// which `classifyMergeability` maps to `"waiting"`. Before the fix, a `"waiting"` verdict at
+// `gw-mergeable` hit the DEFAULT arm and escalated straight to the `wait-merge-answer` human task —
+// so a PR whose real state was still settling (e.g. to `"conflict"`, which would auto-fire
+// `senior:rebase`) paged a human instead of self-healing. The fix routes `"waiting"` to a bounded
+// re-poll (`wait-mergeable-repoll` timer → `merge-stall-probe` → the existing `gw-mergeable` arms),
+// bounded by the shared `mergeStallMax` budget, and routes the true DEFAULT to auto-rebase.
+
+test("a 'waiting' (async UNKNOWN) verdict re-polls instead of escalating to a human (#774)", async () => {
+  // RED (before the fix): `waiting` → DEFAULT → `merge-esc-conflict` → `wait-merge-answer`. GREEN:
+  // `waiting` parks on the re-poll timer; when it fires, `merge-stall-probe` re-derives `ready` and
+  // the PR merges — no human ever touched.
+  const engine = await boot({
+    responses: {
+      "pr.merge-stall-probe": { mergeState: "ready", failingChecks: 0, failingChecksList: "" },
+      "pr.merge": { mergeStatus: "merged" },
+    },
+  });
+  await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
+  await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "waiting" } });
+  // Parks on the bounded re-poll timer — NOT on a human task, NOT escalated.
+  assertThatInstance(engine, byProcessId("merge-loop")).isActive().hasActiveElement("wait-mergeable-repoll");
+  assert(!completedElementIds(engine).has("merge-esc-conflict"), "a waiting verdict must NOT escalate to a human");
+  const openTasks = await engine.searchUserTasks({});
+  assert(!openTasks.some((t) => t.elementId === "wait-merge-answer"), "a waiting verdict must not park a user task");
+  // The timer fires → the probe re-derives ground truth (`ready`) → the PR merges.
+  await engine.advanceTime(MERGEABLE_REPOLL_MS + 1);
+  assertThatInstance(engine, byProcessId("merge-loop"))
+    .hasCompleted()
+    .hasNoIncident()
+    .hasCompletedElements("wait-mergeable-repoll", "merge-stall-probe", "attempt-merge", "mark-merged");
+});
+
+test("a 'waiting' verdict that settles to conflict on re-poll reaches the rebase arm (#774)", async () => {
+  // The incident (Magikcraft/nano-bpm#1166): the PR was really CONFLICTING, but GitHub reported
+  // UNKNOWN transiently. The re-poll must let it settle to `conflict` → `senior:rebase`, the arm that
+  // would have fixed it, rather than paging a human on the transient UNKNOWN.
+  const engine = await boot({
+    responses: {
+      "pr.merge-stall-probe": { mergeState: "conflict", failingChecks: 0, failingChecksList: "" },
+      "senior:rebase": { status: "rebased" },
+    },
+  });
+  await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
+  await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "waiting" } });
+  await engine.advanceTime(MERGEABLE_REPOLL_MS + 1);
+  assertThatInstance(engine, byProcessId("merge-loop"))
+    .isActive()
+    .hasCompletedElements("wait-mergeable-repoll", "merge-stall-probe", "rebase")
+    .hasVariable("rebaseRound", 1);
+  assert(!completedElementIds(engine).has("merge-esc-conflict"), "settling to conflict must rebase, not escalate");
+});
+
+test("the 'waiting' re-poll is bounded — exhausting mergeStallMax escalates to a human (#774)", async () => {
+  // A permanently-UNKNOWN PR cannot re-poll forever: the re-poll shares the `mergeStallMax` budget.
+  // `mergeStallMax: 0` — escalate on the first re-poll. The probe runs once, `gw-merge-stall` finds
+  // the budget exhausted, and routes to the human `wait-merge-answer` (last resort, not first).
+  const engine = await boot({
+    vars: { mergeStallMax: 0 },
+    responses: {
+      "pr.merge-stall-probe": { mergeState: "waiting", failingChecks: 0, failingChecksList: "" },
+    },
+  });
+  await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
+  await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "waiting" } });
+  assert(!completedElementIds(engine).has("merge-esc-conflict"), "must re-poll before ever escalating");
+  await engine.advanceTime(MERGEABLE_REPOLL_MS + 1);
+  await assertThatUserTask(engine, { instance: byProcessId("merge-loop"), elementId: "wait-merge-answer" }).isCreated();
+  assertThatInstance(engine, byProcessId("merge-loop")).hasCompletedElements("wait-mergeable-repoll", "merge-stall-probe", "merge-esc-conflict");
+});
+
+test("an unclassified verdict routes to auto-rebase (DEFAULT), not to a human (#774)", async () => {
+  // The DEFAULT arm is a last-resort self-heal, not a page: an unexpected/garbage `mergeState` routes
+  // to the bounded rebase agent (which reconciles from ground truth), never straight to a human.
+  const engine = await boot({ responses: { "senior:rebase": { status: "rebased" } } });
+  await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
+  await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "bogus" } });
+  assertThatInstance(engine, byProcessId("merge-loop"))
+    .isActive()
+    .hasCompletedElements("rebase")
+    .hasVariable("rebaseRound", 1);
+  const openTasks = await engine.searchUserTasks({});
+  assert(!openTasks.some((t) => t.elementId === "wait-merge-answer"), "the default arm must not page a human");
+});
+
 test("an evicted queued merge re-arms the poller rather than completing", async () => {
   const engine = await boot({ responses: { "pr.merge": { mergeStatus: "queued" } } });
   await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });

package/app/mergeableWait.test.ts

@@ -6,7 +6,8 @@
 
 import assert from "node:assert/strict";
 import { test } from "node:test";
-import { DEFAULT_MERGEABLE_WAIT_TIMEOUT, mergeableWaitTimeout } from "./mergeableWait.ts";
+import { DEFAULT_MERGEABLE_REPOLL_INTERVAL, DEFAULT_MERGEABLE_WAIT_TIMEOUT, mergeableRepollInterval, mergeableWaitTimeout } from "./mergeableWait.ts";
+import { isoDurationToMs } from "./reviewWait.ts";
 
 test("mergeableWaitTimeout: blank / absent / malformed → default", () => {
   assert.equal(mergeableWaitTimeout(undefined), DEFAULT_MERGEABLE_WAIT_TIMEOUT);
@@ -37,3 +38,43 @@ test("the default is itself a well-formed ISO-8601 duration (never an uninterpre
   assert.notEqual(DEFAULT_MERGEABLE_WAIT_TIMEOUT, sentinel);
   assert.equal(mergeableWaitTimeout(DEFAULT_MERGEABLE_WAIT_TIMEOUT, sentinel), DEFAULT_MERGEABLE_WAIT_TIMEOUT);
 });
+
+// --- Mergeability re-poll interval (issue #774) -----------------------------------------------
+// Baked into every merge-loop instance's `mergeableRepollInterval` process variable and evaluated by
+// the `wait-mergeable-repoll` timer catch, which bounds the `"waiting"` (async UNKNOWN) verdict's
+// re-poll before it re-derives mergeability from ground truth — so a malformed operator env must
+// never deploy an uninterpretable `<bpmn:timeDuration>`.
+
+test("mergeableRepollInterval: blank / absent / malformed → default", () => {
+  assert.equal(mergeableRepollInterval(undefined), DEFAULT_MERGEABLE_REPOLL_INTERVAL);
+  assert.equal(mergeableRepollInterval(""), DEFAULT_MERGEABLE_REPOLL_INTERVAL);
+  assert.equal(mergeableRepollInterval("   "), DEFAULT_MERGEABLE_REPOLL_INTERVAL);
+  assert.equal(mergeableRepollInterval("2m"), DEFAULT_MERGEABLE_REPOLL_INTERVAL); // missing leading P/T
+  assert.equal(mergeableRepollInterval("garbage"), DEFAULT_MERGEABLE_REPOLL_INTERVAL);
+});
+
+test("mergeableRepollInterval: a valid ISO-8601 duration is honoured and upper-cased", () => {
+  assert.equal(mergeableRepollInterval("PT2M"), "PT2M");
+  assert.equal(mergeableRepollInterval("pt90s"), "PT90S");
+  assert.equal(mergeableRepollInterval("  pt5m  "), "PT5M");
+});
+
+test("mergeableRepollInterval: the re-poll interval is shorter than the poller-death backstop", () => {
+  // The re-poll (GitHub settling UNKNOWN, ~seconds) must fire far sooner than the 30-minute
+  // dead-poller backstop, so a transient UNKNOWN self-heals briskly rather than parking for tens of
+  // minutes per round.
+  assert.equal(DEFAULT_MERGEABLE_REPOLL_INTERVAL, "PT2M");
+  // `notEqual` only proves the values differ — a future `PT1H` would pass despite being LONGER than
+  // the backstop. Assert the actual ordering invariant on parsed durations via the canonical helper.
+  assert.ok(
+    isoDurationToMs(DEFAULT_MERGEABLE_REPOLL_INTERVAL, "PT0S") <
+      isoDurationToMs(DEFAULT_MERGEABLE_WAIT_TIMEOUT, "PT0S"),
+    "the re-poll interval must be strictly shorter than the poller-death backstop",
+  );
+});
+
+test("mergeableRepollInterval: the default is itself a well-formed ISO-8601 duration", () => {
+  const sentinel = "PT1S";
+  assert.notEqual(DEFAULT_MERGEABLE_REPOLL_INTERVAL, sentinel);
+  assert.equal(mergeableRepollInterval(DEFAULT_MERGEABLE_REPOLL_INTERVAL, sentinel), DEFAULT_MERGEABLE_REPOLL_INTERVAL);
+});

package/app/mergeableWait.ts

@@ -36,3 +36,26 @@ export function mergeableWaitTimeout(
 ): string {
   return isoDuration(raw, def);
 }
+
+/** Default mergeability re-poll interval (ISO-8601 duration): how long the merge loop waits before
+ * re-deriving mergeability from ground truth when `gw-mergeable` sees an async-`UNKNOWN` `"waiting"`
+ * verdict (issue #774). GitHub returns `mergeable=UNKNOWN` transiently while it computes mergeability
+ * in the background; a `"waiting"` verdict must therefore route to a *bounded re-poll* — not straight
+ * to a human — so the loop self-heals once GitHub settles (to `"conflict"` → `senior:rebase`, etc.).
+ * Deliberately SHORT (unlike the 30-minute {@link DEFAULT_MERGEABLE_WAIT_TIMEOUT} poller-death
+ * backstop): GitHub usually settles UNKNOWN within seconds, so re-poll briskly rather than parking
+ * the PR for tens of minutes per round. The re-poll is bounded by the shared `mergeStallMax` budget
+ * (`NANO_PR_MAX_MERGE_STALL_ROUNDS`): once exhausted, `gw-merge-stall` escalates to a human. */
+export const DEFAULT_MERGEABLE_REPOLL_INTERVAL = "PT2M";
+
+/** Validate the operator-supplied mergeability re-poll interval (env
+ * `NANO_PR_MERGEABLE_REPOLL_INTERVAL`, ISO-8601 duration), falling back to
+ * {@link DEFAULT_MERGEABLE_REPOLL_INTERVAL} when absent, blank, or malformed — a bad env value must
+ * never deploy an uninterpretable timer expression. Derives its validation from the single canonical
+ * {@link isoDuration}. */
+export function mergeableRepollInterval(
+  raw: string | undefined,
+  def: string = DEFAULT_MERGEABLE_REPOLL_INTERVAL,
+): string {
+  return isoDuration(raw, def);
+}

package/app/service.ts

@@ -53,7 +53,7 @@ import {
 } from "./github.ts";
 import { activeStatusesFor, derivedTrackingTable } from "./instanceTracking.ts";
 import { pollLineage } from "./lineage.ts";
-import { mergeableWaitTimeout } from "./mergeableWait.ts";
+import { mergeableRepollInterval, mergeableWaitTimeout } from "./mergeableWait.ts";
 import { mergeLanes, readExclusions } from "./mergeExclusion.ts";
 import { mergeLandedWaitTimeout } from "./mergeLandedWait.ts";
 import {
@@ -206,6 +206,19 @@ export const MERGEABLE_WAIT_TIMEOUT = mergeableWaitTimeout(
   process.env.NANO_PR_MERGEABLE_WAIT_TIMEOUT,
 );
 
+/** How long the merge loop waits before re-deriving mergeability from ground truth when
+ * `gw-mergeable` sees an async-`UNKNOWN` `"waiting"` verdict (issue #774). Seeded as the
+ * `mergeableRepollInterval` process variable at merge start and evaluated by the merge-loop's
+ * `wait-mergeable-repoll` timer catch. A `"waiting"` verdict means GitHub is still computing
+ * mergeability in the background — so route it to a *bounded re-poll* (this timer → `merge-stall-probe`
+ * → the existing `gw-mergeable` arms), not to a human. The re-poll shares the `mergeStallMax` budget
+ * (`NANO_PR_MAX_MERGE_STALL_ROUNDS`) with the dead-poller stall backstop; once exhausted,
+ * `gw-merge-stall` escalates. ISO-8601 duration; a malformed `NANO_PR_MERGEABLE_REPOLL_INTERVAL`
+ * falls back to the default so an uninterpretable timer is never deployed. */
+export const MERGEABLE_REPOLL_INTERVAL = mergeableRepollInterval(
+  process.env.NANO_PR_MERGEABLE_REPOLL_INTERVAL,
+);
+
 /** Cooldown (ms) between the poller's automatic Copilot re-request nudges for a single waiting PR.
  * Copilot dismisses re-requests, so the poller retries — but not on every tick; this throttles it
  * to one attempt per window. Set via `NANO_PR_REVIEW_NUDGE_MINUTES` (minutes). */
@@ -678,6 +691,7 @@ export async function startMerge(
       agentSlaTimeout: AGENT_SLA_TIMEOUT,
       landedWaitTimeout: MERGE_LANDED_WAIT_TIMEOUT,
       mergeableWaitTimeout: MERGEABLE_WAIT_TIMEOUT,
+      mergeableRepollInterval: MERGEABLE_REPOLL_INTERVAL,
       mergeStallRounds: 0,
       mergeStallMax: MAX_MERGE_STALL_ROUNDS,
       // Lineage (issue #245): thread the origin identity onto the merge instance (see startMerge).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.186.1",
+  "version": "0.186.2",
   "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",

package/resources/processes/merge-loop.bpmn

@@ -155,8 +155,16 @@
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>f_mw_stall</bpmn:incoming>
+      <bpmn:incoming>f_mrp_probe</bpmn:incoming>
       <bpmn:outgoing>f_msp_gate</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:intermediateCatchEvent id="wait-mergeable-repoll" name="Re-poll: mergeability settling">
+      <bpmn:incoming>f_m_mWaiting</bpmn:incoming>
+      <bpmn:outgoing>f_mrp_probe</bpmn:outgoing>
+      <bpmn:timerEventDefinition id="ted_mergeableRepoll">
+        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=mergeableRepollInterval</bpmn:timeDuration>
+      </bpmn:timerEventDefinition>
+    </bpmn:intermediateCatchEvent>
     <bpmn:exclusiveGateway id="gw-merge-stall" name="stall rounds within budget?" default="f_msp_giveup">
       <bpmn:incoming>f_msp_gate</bpmn:incoming>
       <bpmn:outgoing>f_msp_rederive</bpmn:outgoing>
@@ -168,6 +176,8 @@
       <bpmn:outgoing>f_m_mReady</bpmn:outgoing>
       <bpmn:outgoing>f_m_mCiFix</bpmn:outgoing>
       <bpmn:outgoing>f_m_mRebase</bpmn:outgoing>
+      <bpmn:outgoing>f_m_mWaiting</bpmn:outgoing>
+      <bpmn:outgoing>f_m_mDraft</bpmn:outgoing>
       <bpmn:outgoing>f_m_mBlocked</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:serviceTask id="attempt-merge" name="Merge PR">
@@ -247,10 +257,10 @@
         </zeebe:properties>
         <zeebe:ioMapping>
           <zeebe:input source="=&#34;blocked&#34;" target="status" />
-          <zeebe:input source="=if mergeState = &#34;draft&#34; then &#34;This PR is in draft and can&#39;t be merged. Mark it ready (gh pr ready), then reply to retry.&#34; else &#34;This PR is not mergeable (state: &#34; + mergeState + &#34;). Resolve the conflict or failing required check on the branch, then reply to retry.&#34;" target="question" />
+          <zeebe:input source="=if mergeState = &#34;draft&#34; then &#34;This PR is in draft and can&#39;t be merged. Mark it ready (gh pr ready), then reply to retry.&#34; else if mergeState = &#34;waiting&#34; then &#34;GitHub never settled this PR&#39;s mergeability (still computing after repeated re-polls, or the state could not be read). Check the PR on GitHub — resolve any conflict or failing required check if present — then reply to retry.&#34; else &#34;This PR is not mergeable (state: &#34; + mergeState + &#34;). Resolve the conflict or failing required check on the branch, then reply to retry.&#34;" target="question" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
-      <bpmn:incoming>f_m_mBlocked</bpmn:incoming>
+      <bpmn:incoming>f_m_mDraft</bpmn:incoming>
       <bpmn:incoming>f_ci_giveup</bpmn:incoming>
       <bpmn:incoming>f_reb_giveup</bpmn:incoming>
       <bpmn:incoming>f_reb_escConflict</bpmn:incoming>
@@ -484,6 +494,7 @@
     <bpmn:sequenceFlow id="f_ci_rearm" name="fixed / re-attempt / reconcile — re-arm" sourceRef="gw-ci-outcome" targetRef="arm-merge" />
     <bpmn:exclusiveGateway id="gw-rebase" name="auto-rebase?" default="f_reb_giveup">
       <bpmn:incoming>f_m_mRebase</bpmn:incoming>
+      <bpmn:incoming>f_m_mBlocked</bpmn:incoming>
       <bpmn:outgoing>f_reb_go</bpmn:outgoing>
       <bpmn:outgoing>f_reb_giveup</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -629,7 +640,14 @@
     <bpmn:sequenceFlow id="f_m_mRebase" name="conflict" sourceRef="gw-mergeable" targetRef="gw-rebase">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "conflict"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="f_m_mBlocked" name="not landable" sourceRef="gw-mergeable" targetRef="merge-esc-conflict" />
+    <bpmn:sequenceFlow id="f_m_mWaiting" name="waiting (GitHub still computing) — re-poll" sourceRef="gw-mergeable" targetRef="wait-mergeable-repoll">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "waiting"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_m_mDraft" name="draft — mark ready (human)" sourceRef="gw-mergeable" targetRef="merge-esc-conflict">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "draft"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_mrp_probe" sourceRef="wait-mergeable-repoll" targetRef="merge-stall-probe" />
+    <bpmn:sequenceFlow id="f_m_mBlocked" name="unclassified — auto-rebase" sourceRef="gw-mergeable" targetRef="gw-rebase" />
     <bpmn:sequenceFlow id="f_ci_go" name="within budget" sourceRef="gw-ci-fix" targetRef="SP_cifix">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciFixRound &lt; ciFixMax and failingChecks &gt; 0</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -708,137 +726,143 @@
       <bpmndi:BPMNShape id="BPMNShape_wait-mergeable" bpmnElement="wait-mergeable">
         <dc:Bounds x="852" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="835" y="303" width="70" height="28" />
+          <dc:Bounds x="835" y="229" width="70" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-mergeable-timeout" bpmnElement="wait-mergeable-timeout">
-        <dc:Bounds x="852" y="422" width="36" height="36" />
+        <dc:Bounds x="852" y="582" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="835" y="463" width="70" height="42" />
+          <dc:Bounds x="893" y="579" width="70" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-stall-probe" bpmnElement="merge-stall-probe">
-        <dc:Bounds x="988" y="400" width="100" height="80" />
+        <dc:Bounds x="1338" y="1520" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-mergeable-repoll" bpmnElement="wait-mergeable-repoll">
+        <dc:Bounds x="1170" y="1542" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1146" y="1495" width="84" height="42" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge-stall" bpmnElement="gw-merge-stall" isMarkerVisible="true">
-        <dc:Bounds x="1188" y="415" width="50" height="50" />
+        <dc:Bounds x="1538" y="1535" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1191" y="470" width="85" height="42" />
+          <dc:Bounds x="1521" y="1650" width="85" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-mergeable" bpmnElement="gw-mergeable" isMarkerVisible="true">
-        <dc:Bounds x="1338" y="255" width="50" height="50" />
+        <dc:Bounds x="988" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1325" y="236" width="77" height="14" />
+          <dc:Bounds x="975" y="236" width="77" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_attempt-merge" bpmnElement="attempt-merge">
-        <dc:Bounds x="1488" y="240" width="100" height="80" />
+        <dc:Bounds x="1138" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge" bpmnElement="gw-merge" isMarkerVisible="true">
-        <dc:Bounds x="1713" y="255" width="50" height="50" />
+        <dc:Bounds x="1363" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1712" y="350" width="53" height="28" />
+          <dc:Bounds x="1362" y="350" width="53" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge-retry" bpmnElement="gw-merge-retry" isMarkerVisible="true">
-        <dc:Bounds x="1888" y="735" width="50" height="50" />
+        <dc:Bounds x="1538" y="735" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1869" y="830" width="88" height="28" />
+          <dc:Bounds x="1519" y="702" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_eg-landed" bpmnElement="eg-landed" isMarkerVisible="true">
-        <dc:Bounds x="1888" y="415" width="50" height="50" />
+        <dc:Bounds x="1538" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1881" y="490" width="64" height="28" />
+          <dc:Bounds x="1531" y="490" width="64" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
-        <dc:Bounds x="2070" y="422" width="36" height="36" />
+        <dc:Bounds x="1720" y="422" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2066" y="483" width="85" height="28" />
+          <dc:Bounds x="1736" y="483" width="85" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-evicted" bpmnElement="wait-evicted">
-        <dc:Bounds x="2070" y="582" width="36" height="36" />
+        <dc:Bounds x="1720" y="582" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2111" y="579" width="88" height="42" />
+          <dc:Bounds x="1761" y="579" width="88" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-landed-timeout" bpmnElement="wait-landed-timeout">
-        <dc:Bounds x="2070" y="102" width="36" height="36" />
+        <dc:Bounds x="1720" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1981" y="92" width="84" height="56" />
+          <dc:Bounds x="1596" y="143" width="84" height="56" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_mark-merged" bpmnElement="mark-merged">
-        <dc:Bounds x="2238" y="240" width="100" height="80" />
+        <dc:Bounds x="1888" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
-        <dc:Bounds x="2445" y="262" width="36" height="36" />
+        <dc:Bounds x="2095" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2438" y="303" width="50" height="14" />
+          <dc:Bounds x="2088" y="303" width="50" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_MergeAbandoned" bpmnElement="MergeAbandoned">
-        <dc:Bounds x="1895" y="902" width="36" height="36" />
+        <dc:Bounds x="1545" y="902" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1872" y="943" width="82" height="28" />
+          <dc:Bounds x="1522" y="943" width="82" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
-        <dc:Bounds x="2038" y="1040" width="100" height="80" />
+        <dc:Bounds x="1688" y="1040" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
-        <dc:Bounds x="2038" y="720" width="100" height="80" />
+        <dc:Bounds x="1688" y="720" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge-escalated" bpmnElement="gw-merge-escalated" isMarkerVisible="true">
-        <dc:Bounds x="2438" y="95" width="50" height="50" />
+        <dc:Bounds x="2088" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2406" y="150" width="74" height="28" />
+          <dc:Bounds x="2056" y="170" width="74" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-landed" bpmnElement="merge-esc-landed">
-        <dc:Bounds x="2238" y="80" width="100" height="80" />
+        <dc:Bounds x="1888" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
-        <dc:Bounds x="2588" y="80" width="100" height="80" />
+        <dc:Bounds x="2238" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-merge-answer" bpmnElement="record-merge-answer">
-        <dc:Bounds x="2788" y="80" width="100" height="80" />
+        <dc:Bounds x="2438" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
-        <dc:Bounds x="1513" y="1055" width="50" height="50" />
+        <dc:Bounds x="1163" y="1055" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1494" y="1036" width="89" height="14" />
+          <dc:Bounds x="1204" y="1110" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_SP_cifix" bpmnElement="SP_cifix">
-        <dc:Bounds x="1688" y="1200" width="100" height="80" />
+        <dc:Bounds x="1338" y="1200" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-outcome" bpmnElement="gw-ci-outcome" isMarkerVisible="true">
-        <dc:Bounds x="1888" y="1215" width="50" height="50" />
+        <dc:Bounds x="1538" y="1215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1882" y="1310" width="63" height="28" />
+          <dc:Bounds x="1532" y="1310" width="63" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase" bpmnElement="gw-rebase" isMarkerVisible="true">
-        <dc:Bounds x="1513" y="415" width="50" height="50" />
+        <dc:Bounds x="1163" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1494" y="470" width="88" height="14" />
+          <dc:Bounds x="1144" y="370" width="88" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_SP_rebase" bpmnElement="SP_rebase">
-        <dc:Bounds x="1688" y="1360" width="100" height="80" />
+        <dc:Bounds x="1338" y="1360" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase-outcome" bpmnElement="gw-rebase-outcome" isMarkerVisible="true">
-        <dc:Bounds x="1888" y="1375" width="50" height="50" />
+        <dc:Bounds x="1538" y="1375" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1922" y="1430" width="63" height="28" />
+          <dc:Bounds x="1532" y="1470" width="63" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-merge-dep" bpmnElement="record-merge-dep">
-        <dc:Bounds x="2038" y="1200" width="100" height="80" />
+        <dc:Bounds x="1688" y="1200" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
         <di:waypoint x="116" y="280" />
@@ -862,33 +886,33 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_ready" bpmnElement="f_m_ready">
         <di:waypoint x="888" y="280" />
-        <di:waypoint x="1338" y="280" />
+        <di:waypoint x="988" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mReady" bpmnElement="f_m_mReady">
-        <di:waypoint x="1388" y="280" />
-        <di:waypoint x="1488" y="280" />
+        <di:waypoint x="1038" y="280" />
+        <di:waypoint x="1138" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1419" y="258" width="39" height="14" />
+          <dc:Bounds x="1069" y="258" width="39" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_attempt" bpmnElement="f_m_attempt">
-        <di:waypoint x="1588" y="280" />
-        <di:waypoint x="1713" y="280" />
+        <di:waypoint x="1238" y="280" />
+        <di:waypoint x="1363" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gMerged" bpmnElement="f_m_gMerged">
-        <di:waypoint x="1763" y="280" />
-        <di:waypoint x="2238" y="280" />
+        <di:waypoint x="1413" y="280" />
+        <di:waypoint x="1888" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2051" y="258" width="49" height="14" />
+          <dc:Bounds x="1721" y="258" width="49" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
-        <di:waypoint x="2338" y="280" />
-        <di:waypoint x="2445" y="280" />
+        <di:waypoint x="1988" y="280" />
+        <di:waypoint x="2095" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_rearm" bpmnElement="f_ci_rearm">
-        <di:waypoint x="1913" y="1265" />
-        <di:waypoint x="1913" y="1300" />
+        <di:waypoint x="1563" y="1265" />
+        <di:waypoint x="1563" y="1300" />
         <di:waypoint x="402" y="1300" />
         <di:waypoint x="402" y="320" />
         <bpmndi:BPMNLabel>
@@ -896,316 +920,348 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rearm" bpmnElement="f_reb_rearm">
-        <di:waypoint x="1913" y="1425" />
-        <di:waypoint x="1913" y="1460" />
+        <di:waypoint x="1563" y="1425" />
+        <di:waypoint x="1563" y="1460" />
         <di:waypoint x="402" y="1460" />
         <di:waypoint x="402" y="320" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1119" y="1413" width="78" height="42" />
+          <dc:Bounds x="924" y="1413" width="78" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_msp_giveup" bpmnElement="f_msp_giveup">
-        <di:waypoint x="1238" y="440" />
-        <di:waypoint x="1258" y="440" />
-        <di:waypoint x="1258" y="465" />
-        <di:waypoint x="1651" y="465" />
-        <di:waypoint x="1651" y="1060" />
-        <di:waypoint x="2038" y="1060" />
+        <di:waypoint x="1588" y="1560" />
+        <di:waypoint x="1608" y="1560" />
+        <di:waypoint x="1608" y="1535" />
+        <di:waypoint x="1601" y="1535" />
+        <di:waypoint x="1601" y="1140" />
+        <di:waypoint x="1708" y="1140" />
+        <di:waypoint x="1708" y="1120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1378" y="470" width="85" height="28" />
+          <dc:Bounds x="1606" y="1441" width="85" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
-        <di:waypoint x="1563" y="1080" />
-        <di:waypoint x="2038" y="1080" />
+        <di:waypoint x="1213" y="1080" />
+        <di:waypoint x="1688" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1757" y="1085" width="67" height="28" />
+          <dc:Bounds x="1424" y="1085" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
-        <di:waypoint x="1563" y="440" />
-        <di:waypoint x="1583" y="440" />
-        <di:waypoint x="1583" y="465" />
-        <di:waypoint x="1813" y="465" />
-        <di:waypoint x="1813" y="1060" />
-        <di:waypoint x="2038" y="1060" />
+        <di:waypoint x="1213" y="440" />
+        <di:waypoint x="1233" y="440" />
+        <di:waypoint x="1233" y="465" />
+        <di:waypoint x="1463" y="465" />
+        <di:waypoint x="1463" y="1060" />
+        <di:waypoint x="1688" y="1060" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1699" y="432" width="67" height="28" />
+          <dc:Bounds x="1391" y="749" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_mr_giveup" bpmnElement="f_mr_giveup">
-        <di:waypoint x="1938" y="760" />
-        <di:waypoint x="2038" y="760" />
+        <di:waypoint x="1588" y="760" />
+        <di:waypoint x="1688" y="760" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1935" y="687" width="67" height="28" />
+          <dc:Bounds x="1605" y="765" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
-        <di:waypoint x="1938" y="440" />
-        <di:waypoint x="2070" y="440" />
+        <di:waypoint x="1588" y="440" />
+        <di:waypoint x="1720" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
-        <di:waypoint x="2106" y="440" />
-        <di:waypoint x="2288" y="440" />
-        <di:waypoint x="2288" y="320" />
+        <di:waypoint x="1756" y="440" />
+        <di:waypoint x="1938" y="440" />
+        <di:waypoint x="1938" y="320" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
-        <di:waypoint x="2138" y="1080" />
-        <di:waypoint x="2638" y="1080" />
-        <di:waypoint x="2638" y="160" />
+        <di:waypoint x="1788" y="1080" />
+        <di:waypoint x="2288" y="1080" />
+        <di:waypoint x="2288" y="160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
-        <di:waypoint x="2138" y="760" />
-        <di:waypoint x="2501" y="760" />
-        <di:waypoint x="2501" y="145" />
-        <di:waypoint x="2508" y="145" />
-        <di:waypoint x="2508" y="120" />
-        <di:waypoint x="2488" y="120" />
+        <di:waypoint x="1788" y="760" />
+        <di:waypoint x="2151" y="760" />
+        <di:waypoint x="2151" y="145" />
+        <di:waypoint x="2158" y="145" />
+        <di:waypoint x="2158" y="120" />
+        <di:waypoint x="2138" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escReenter" bpmnElement="f_m_escReenter">
-        <di:waypoint x="2463" y="95" />
-        <di:waypoint x="2463" y="60" />
+        <di:waypoint x="2113" y="95" />
+        <di:waypoint x="2113" y="60" />
         <di:waypoint x="402" y="60" />
         <di:waypoint x="402" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1396" y="13" width="74" height="42" />
+          <dc:Bounds x="1221" y="13" width="74" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answerRecord" bpmnElement="f_m_answerRecord">
-        <di:waypoint x="2688" y="120" />
-        <di:waypoint x="2788" y="120" />
+        <di:waypoint x="2338" y="120" />
+        <di:waypoint x="2438" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
-        <di:waypoint x="2838" y="160" />
-        <di:waypoint x="2838" y="340" />
+        <di:waypoint x="2488" y="160" />
+        <di:waypoint x="2488" y="340" />
         <di:waypoint x="402" y="340" />
         <di:waypoint x="402" y="320" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_escAttempt" bpmnElement="f_ci_escAttempt">
-        <di:waypoint x="1913" y="1215" />
-        <di:waypoint x="1913" y="1195" />
-        <di:waypoint x="1168" y="1195" />
-        <di:waypoint x="1168" y="402" />
-        <di:waypoint x="1868" y="402" />
-        <di:waypoint x="1868" y="478" />
-        <di:waypoint x="2018" y="478" />
-        <di:waypoint x="2018" y="740" />
-        <di:waypoint x="2038" y="740" />
+        <di:waypoint x="1563" y="1215" />
+        <di:waypoint x="1563" y="1195" />
+        <di:waypoint x="1150" y="1195" />
+        <di:waypoint x="1150" y="402" />
+        <di:waypoint x="1518" y="402" />
+        <di:waypoint x="1518" y="478" />
+        <di:waypoint x="1668" y="478" />
+        <di:waypoint x="1668" y="740" />
+        <di:waypoint x="1688" y="740" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1551" y="1203" width="60" height="14" />
+          <dc:Bounds x="1327" y="1173" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_waitDep" bpmnElement="f_reb_waitDep">
-        <di:waypoint x="1938" y="1400" />
-        <di:waypoint x="2088" y="1400" />
-        <di:waypoint x="2088" y="1280" />
+        <di:waypoint x="1588" y="1400" />
+        <di:waypoint x="1738" y="1400" />
+        <di:waypoint x="1738" y="1280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1996" y="1405" width="75" height="28" />
+          <dc:Bounds x="1636" y="1367" width="75" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escAttempt" bpmnElement="f_reb_escAttempt">
-        <di:waypoint x="1913" y="1375" />
-        <di:waypoint x="1913" y="1355" />
-        <di:waypoint x="1168" y="1355" />
-        <di:waypoint x="1168" y="402" />
-        <di:waypoint x="1868" y="402" />
-        <di:waypoint x="1868" y="478" />
-        <di:waypoint x="2018" y="478" />
-        <di:waypoint x="2018" y="740" />
-        <di:waypoint x="2038" y="740" />
+        <di:waypoint x="1563" y="1375" />
+        <di:waypoint x="1563" y="1355" />
+        <di:waypoint x="1150" y="1355" />
+        <di:waypoint x="1150" y="402" />
+        <di:waypoint x="1518" y="402" />
+        <di:waypoint x="1518" y="478" />
+        <di:waypoint x="1668" y="478" />
+        <di:waypoint x="1668" y="740" />
+        <di:waypoint x="1688" y="740" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1173" y="1234" width="64" height="42" />
+          <dc:Bounds x="1081" y="1234" width="64" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escConflict" bpmnElement="f_reb_escConflict">
-        <di:waypoint x="1938" y="1400" />
-        <di:waypoint x="2018" y="1400" />
-        <di:waypoint x="2018" y="1080" />
-        <di:waypoint x="2038" y="1080" />
+        <di:waypoint x="1588" y="1400" />
+        <di:waypoint x="1608" y="1400" />
+        <di:waypoint x="1608" y="1375" />
+        <di:waypoint x="1601" y="1375" />
+        <di:waypoint x="1601" y="1080" />
+        <di:waypoint x="1688" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1953" y="1246" width="60" height="28" />
+          <dc:Bounds x="1606" y="1264" width="60" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_mw_timeout" bpmnElement="f_mw_timeout">
-        <di:waypoint x="727" y="305" />
-        <di:waypoint x="727" y="440" />
-        <di:waypoint x="852" y="440" />
+        <di:waypoint x="752" y="280" />
+        <di:waypoint x="832" y="280" />
+        <di:waypoint x="832" y="600" />
+        <di:waypoint x="852" y="600" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_msp_rederive" bpmnElement="f_msp_rederive">
-        <di:waypoint x="1213" y="415" />
-        <di:waypoint x="1213" y="280" />
-        <di:waypoint x="1338" y="280" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
+        <di:waypoint x="1013" y="305" />
+        <di:waypoint x="1013" y="1080" />
+        <di:waypoint x="1163" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1218" y="354" width="85" height="28" />
+          <dc:Bounds x="1058" y="1033" width="60" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
-        <di:waypoint x="1363" y="305" />
-        <di:waypoint x="1363" y="1080" />
-        <di:waypoint x="1513" y="1080" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
+        <di:waypoint x="1013" y="305" />
+        <di:waypoint x="1013" y="440" />
+        <di:waypoint x="1163" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1368" y="739" width="60" height="42" />
+          <dc:Bounds x="948" y="366" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
-        <di:waypoint x="1363" y="305" />
-        <di:waypoint x="1363" y="440" />
-        <di:waypoint x="1513" y="440" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mWaiting" bpmnElement="f_m_mWaiting">
+        <di:waypoint x="1013" y="305" />
+        <di:waypoint x="1013" y="1560" />
+        <di:waypoint x="1170" y="1560" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1048" y="1485" width="88" height="70" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mDraft" bpmnElement="f_m_mDraft">
+        <di:waypoint x="1013" y="305" />
+        <di:waypoint x="1013" y="478" />
+        <di:waypoint x="1226" y="478" />
+        <di:waypoint x="1226" y="1080" />
+        <di:waypoint x="1688" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1408" y="418" width="60" height="14" />
+          <dc:Bounds x="1057" y="483" width="85" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mBlocked" bpmnElement="f_m_mBlocked">
-        <di:waypoint x="1363" y="305" />
-        <di:waypoint x="1363" y="325" />
-        <di:waypoint x="1875" y="325" />
-        <di:waypoint x="1875" y="805" />
-        <di:waypoint x="2126" y="805" />
-        <di:waypoint x="2126" y="1040" />
+        <di:waypoint x="1013" y="305" />
+        <di:waypoint x="1013" y="440" />
+        <di:waypoint x="1163" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1880" y="558" width="85" height="14" />
+          <dc:Bounds x="1018" y="352" width="88" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
-        <di:waypoint x="1538" y="1105" />
-        <di:waypoint x="1538" y="1240" />
-        <di:waypoint x="1688" y="1240" />
+        <di:waypoint x="1188" y="1105" />
+        <di:waypoint x="1188" y="1240" />
+        <di:waypoint x="1338" y="1240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1543" y="1159" width="49" height="28" />
+          <dc:Bounds x="1193" y="1159" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_go" bpmnElement="f_reb_go">
-        <di:waypoint x="1563" y="440" />
-        <di:waypoint x="1668" y="440" />
-        <di:waypoint x="1668" y="1400" />
-        <di:waypoint x="1688" y="1400" />
+        <di:waypoint x="1213" y="440" />
+        <di:waypoint x="1233" y="440" />
+        <di:waypoint x="1233" y="465" />
+        <di:waypoint x="2158" y="465" />
+        <di:waypoint x="2158" y="75" />
+        <di:waypoint x="2558" y="75" />
+        <di:waypoint x="2558" y="1125" />
+        <di:waypoint x="1318" y="1125" />
+        <di:waypoint x="1318" y="1380" />
+        <di:waypoint x="1338" y="1380" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1673" y="906" width="49" height="28" />
+          <dc:Bounds x="2334" y="42" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
-        <di:waypoint x="1763" y="280" />
-        <di:waypoint x="1913" y="280" />
-        <di:waypoint x="1913" y="415" />
+        <di:waypoint x="1413" y="280" />
+        <di:waypoint x="1563" y="280" />
+        <di:waypoint x="1563" y="415" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1918" y="361" width="46" height="14" />
+          <dc:Bounds x="1568" y="354" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gRetry" bpmnElement="f_m_gRetry">
-        <di:waypoint x="1763" y="280" />
-        <di:waypoint x="1868" y="280" />
-        <di:waypoint x="1868" y="760" />
-        <di:waypoint x="1888" y="760" />
+        <di:waypoint x="1388" y="255" />
+        <di:waypoint x="1388" y="235" />
+        <di:waypoint x="2218" y="235" />
+        <di:waypoint x="2218" y="805" />
+        <di:waypoint x="1538" y="805" />
+        <di:waypoint x="1563" y="805" />
+        <di:waypoint x="1563" y="785" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1785" y="419" width="78" height="28" />
+          <dc:Bounds x="1852" y="772" width="78" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_eg_evicted" bpmnElement="f_eg_evicted">
-        <di:waypoint x="1938" y="440" />
-        <di:waypoint x="2050" y="440" />
-        <di:waypoint x="2050" y="600" />
-        <di:waypoint x="2070" y="600" />
+        <di:waypoint x="1563" y="415" />
+        <di:waypoint x="1563" y="402" />
+        <di:waypoint x="1720" y="402" />
+        <di:waypoint x="1720" y="562" />
+        <di:waypoint x="1738" y="562" />
+        <di:waypoint x="1738" y="582" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landedTimeout" bpmnElement="f_eg_landedTimeout">
-        <di:waypoint x="1938" y="440" />
-        <di:waypoint x="1958" y="440" />
-        <di:waypoint x="1958" y="415" />
-        <di:waypoint x="2070" y="415" />
-        <di:waypoint x="2070" y="478" />
-        <di:waypoint x="2508" y="478" />
-        <di:waypoint x="2508" y="235" />
-        <di:waypoint x="2070" y="235" />
-        <di:waypoint x="2070" y="158" />
-        <di:waypoint x="2088" y="158" />
-        <di:waypoint x="2088" y="138" />
+        <di:waypoint x="1588" y="440" />
+        <di:waypoint x="1700" y="440" />
+        <di:waypoint x="1700" y="120" />
+        <di:waypoint x="1720" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
-        <di:waypoint x="1763" y="280" />
-        <di:waypoint x="1783" y="280" />
-        <di:waypoint x="1783" y="305" />
-        <di:waypoint x="1868" y="305" />
-        <di:waypoint x="1868" y="820" />
-        <di:waypoint x="2018" y="820" />
-        <di:waypoint x="2018" y="780" />
-        <di:waypoint x="2038" y="780" />
+        <di:waypoint x="1388" y="255" />
+        <di:waypoint x="1388" y="82" />
+        <di:waypoint x="1776" y="82" />
+        <di:waypoint x="1776" y="165" />
+        <di:waypoint x="2218" y="165" />
+        <di:waypoint x="2218" y="638" />
+        <di:waypoint x="1668" y="638" />
+        <di:waypoint x="1668" y="740" />
+        <di:waypoint x="1688" y="740" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1977" y="828" width="53" height="14" />
+          <dc:Bounds x="1952" y="616" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gAbandoned" bpmnElement="f_m_gAbandoned">
-        <di:waypoint x="1738" y="255" />
-        <di:waypoint x="1738" y="242" />
-        <di:waypoint x="2126" y="242" />
-        <di:waypoint x="2126" y="220" />
-        <di:waypoint x="2568" y="220" />
-        <di:waypoint x="2568" y="920" />
-        <di:waypoint x="1931" y="920" />
+        <di:waypoint x="1388" y="255" />
+        <di:waypoint x="1388" y="82" />
+        <di:waypoint x="1776" y="82" />
+        <di:waypoint x="1776" y="165" />
+        <di:waypoint x="2218" y="165" />
+        <di:waypoint x="2218" y="920" />
+        <di:waypoint x="1581" y="920" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2306" y="187" width="82" height="28" />
+          <dc:Bounds x="2131" y="849" width="82" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_waitDep" bpmnElement="f_ci_waitDep">
-        <di:waypoint x="1938" y="1240" />
-        <di:waypoint x="2038" y="1240" />
+        <di:waypoint x="1588" y="1240" />
+        <di:waypoint x="1688" y="1240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1931" y="1167" width="75" height="28" />
+          <dc:Bounds x="1621" y="1167" width="75" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_mw_stall" bpmnElement="f_mw_stall">
-        <di:waypoint x="888" y="440" />
-        <di:waypoint x="988" y="440" />
+        <di:waypoint x="870" y="618" />
+        <di:waypoint x="870" y="638" />
+        <di:waypoint x="888" y="638" />
+        <di:waypoint x="888" y="1598" />
+        <di:waypoint x="1338" y="1598" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_msp_gate" bpmnElement="f_msp_gate">
-        <di:waypoint x="1088" y="440" />
-        <di:waypoint x="1188" y="440" />
+        <di:waypoint x="1438" y="1560" />
+        <di:waypoint x="1538" y="1560" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_mrp_probe" bpmnElement="f_mrp_probe">
+        <di:waypoint x="1206" y="1560" />
+        <di:waypoint x="1338" y="1560" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_spdone" bpmnElement="f_ci_spdone">
-        <di:waypoint x="1788" y="1240" />
-        <di:waypoint x="1888" y="1240" />
+        <di:waypoint x="1438" y="1240" />
+        <di:waypoint x="1538" y="1240" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_spdone" bpmnElement="f_reb_spdone">
-        <di:waypoint x="1788" y="1400" />
-        <di:waypoint x="1888" y="1400" />
+        <di:waypoint x="1438" y="1400" />
+        <di:waypoint x="1538" y="1400" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_landedStalled" bpmnElement="f_m_landedStalled">
-        <di:waypoint x="2106" y="120" />
-        <di:waypoint x="2238" y="120" />
+        <di:waypoint x="1756" y="120" />
+        <di:waypoint x="1888" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escLanded" bpmnElement="f_m_escLanded">
-        <di:waypoint x="2338" y="120" />
-        <di:waypoint x="2438" y="120" />
+        <di:waypoint x="1988" y="120" />
+        <di:waypoint x="2088" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escWait" bpmnElement="f_m_escWait">
-        <di:waypoint x="2488" y="120" />
-        <di:waypoint x="2588" y="120" />
+        <di:waypoint x="2138" y="120" />
+        <di:waypoint x="2238" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_recheck" bpmnElement="f_ci_recheck">
-        <di:waypoint x="1913" y="1265" />
-        <di:waypoint x="1913" y="1300" />
+        <di:waypoint x="1563" y="1265" />
+        <di:waypoint x="1563" y="1300" />
         <di:waypoint x="577" y="1300" />
         <di:waypoint x="577" y="305" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="582" y="769" width="85" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_msp_rederive" bpmnElement="f_msp_rederive">
+        <di:waypoint x="1563" y="1585" />
+        <di:waypoint x="1563" y="1620" />
+        <di:waypoint x="1013" y="1620" />
+        <di:waypoint x="1013" y="305" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1446" y="1587" width="85" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
-        <di:waypoint x="2088" y="1280" />
-        <di:waypoint x="2088" y="1480" />
-        <di:waypoint x="234" y="1480" />
+        <di:waypoint x="1738" y="1280" />
+        <di:waypoint x="1738" y="1640" />
+        <di:waypoint x="234" y="1640" />
         <di:waypoint x="234" y="298" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_mr_go" bpmnElement="f_mr_go">
-        <di:waypoint x="1913" y="785" />
-        <di:waypoint x="1913" y="805" />
+        <di:waypoint x="1563" y="785" />
+        <di:waypoint x="1563" y="805" />
         <di:waypoint x="402" y="805" />
         <di:waypoint x="402" y="320" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1114" y="772" width="49" height="28" />
+          <dc:Bounds x="946" y="772" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
-        <di:waypoint x="2088" y="618" />
-        <di:waypoint x="2088" y="638" />
+        <di:waypoint x="1738" y="618" />
+        <di:waypoint x="1738" y="638" />
         <di:waypoint x="402" y="638" />
         <di:waypoint x="402" y="320" />
       </bpmndi:BPMNEdge>

package/workers/merge-stall-probe/worker.ts

@@ -8,7 +8,10 @@
 //   • ready    → attempt-merge
 //   • conflict → rebase arm
 //   • blocked  → CI-fix arm
-//   • draft / waiting (still computing) → not-landable escalation (gw-mergeable default)
+//   • waiting (GitHub still computing) → bounded re-poll (`wait-mergeable-repoll`), NOT a terminal
+//     escalation (#774); it only escalates once the shared `mergeStallMax` budget is exhausted
+//   • draft → not-landable escalation
+//   • unclassified/default → auto-rebase (`gw-rebase`, the `gw-mergeable` default arm)
 // The timer only guarantees the remediation machinery is ENTERED when the poller is dead; every
 // downstream arm is the same one the live poller feeds. A bounded `mergeStallRounds` counter
 // (incremented by this task's output mapping, capped by `mergeStallMax`) stops the probe from
@@ -23,9 +26,10 @@ type In = WorkerInputs["pr.merge-stall-probe"];
 
 interface Out extends Record<string, unknown> {
   // Mirrors the poller's `merge-ready {mergeState}` payload so the existing `gw-mergeable` FEEL
-  // routes it. `waiting` (GitHub still computing / no verdict) is surfaced verbatim; gw-mergeable
-  // has no `waiting` arm, so it falls to the not-landable default and escalates — the correct
-  // backstop when the poller is dead and 30 minutes on GitHub still cannot settle the PR.
+  // routes it. `waiting` (GitHub still computing / no verdict) is surfaced verbatim; `gw-mergeable`
+  // routes it to a bounded re-poll (`wait-mergeable-repoll`, #774) — re-probing until the verdict
+  // settles or the shared `mergeStallMax` budget is exhausted, at which point it escalates to a
+  // human. This backstops a dead poller without wedging a PR GitHub is merely slow to settle.
   mergeState: string;
   failingChecks: number;
   failingChecksList: string;
@@ -39,8 +43,8 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
   // protocol so the protocol-aware backstop (#392) gates a red DECLARED-required check even when
   // GitHub reports UNSTABLE. Any transport hiccup is treated as "still waiting" — never a spurious
   // ready/conflict verdict — so a bad read is surfaced as `waiting`, which `gw-mergeable` routes to
-  // its not-landable default (human escalation), erring toward a human rather than misrouting the
-  // token to a wrong remediation arm.
+  // a bounded re-poll (#774) rather than misrouting the token to a wrong remediation arm; a
+  // genuinely stuck verdict still escalates once the `mergeStallMax` budget is exhausted.
   const st = await fetchPrState(repo, prNumber, token).catch(() => null);
   if (st === null) {
     return { mergeState: "waiting", failingChecks: 0, failingChecksList: "" };