@nanobpm/nano-workforce 0.40.0 → 0.40.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.40.2](https://github.com/nanobpm/nano-workforce/compare/v0.40.1...v0.40.2) (2026-08-11)
+
+
+### Bug Fixes
+
+* **merge-loop:** escape wait-landed when a queued PR is evicted on conflict ([#117](https://github.com/nanobpm/nano-workforce/issues/117)) ([df7f850](https://github.com/nanobpm/nano-workforce/commit/df7f85050624f11490d715c90e054a5c7fb6d0fa)), closes [Magikcraft/nano-bpm#727](https://github.com/Magikcraft/nano-bpm/issues/727)
+
+## [0.40.1](https://github.com/nanobpm/nano-workforce/compare/v0.40.0...v0.40.1) (2026-08-11)
+
+
+### Bug Fixes
+
+* **convergence:** safe default for resultless review rounds ([#116](https://github.com/nanobpm/nano-workforce/issues/116)) ([de85188](https://github.com/nanobpm/nano-workforce/commit/de85188f57b69496596f4c41cf555c9f6f2090da))
+
 # [0.40.0](https://github.com/nanobpm/nano-workforce/compare/v0.39.3...v0.40.0) (2026-08-11)
 
 

package/app/persist-escalation.test.ts

@@ -95,11 +95,17 @@ test("a padded question is persisted trimmed (no whitespace drift)", async () =>
   assertEquals((updates.pull_requests![0] as any).patch.open_escalation_question, "needs a decision", "denormalised question is trimmed too");
 });
 
-// A round that fell through the `gw-status` default (no `converged`/`addressed` status and no
-// question — the prompt-less-agent failure behind the empty "(no question provided)" escalations
-// on Magikcraft/nano-bpm #597/#599) must NOT throw (which parked an un-remediable JobNoRetries
-// incident). It now opens an *answerable* escalation with a fabricated, concrete question and the
-// agent's transcript attached, so a human can unblock the loop entirely from the UI.
+// Defence-in-depth for the persist-escalation worker: if the gateway ever DOES route a
+// blank-status / blank-question job here (an agent-raised `needs_input`/`blocked` with no
+// question, or the max-rounds / review-stalled arms), the worker must NOT throw — throwing
+// parked an un-remediable JobNoRetries incident (the empty "(no question provided)" escalations
+// on Magikcraft/nano-bpm #597/#599). It opens an *answerable* escalation with a fabricated,
+// concrete question and the agent's transcript attached, so a human can unblock the loop from
+// the UI.
+//
+// NOTE: the `gw-status` gateway no longer routes an empty/unknown status here — that now
+// defaults to `f_addressed` and re-enters the review wait (see roundResultDefault.test.ts).
+// This fabrication path stays as a worker-level backstop for the explicit escalation arms.
 test("blank question fabricates an answerable escalation (no throw, no incident)", async () => {
   for (const question of [undefined, "", "   "]) {
     const { app, inserts, updates } = fakeApp();

package/app/queuedVerdict.test.ts

@@ -0,0 +1,40 @@
+// The merge-loop enqueues a "ready" PR (mergeStatus="queued") and parks at `wait-landed`. This
+// decision drives what the poller does next from the PR's live GitHub state. The regression it
+// guards: a PR that develops a merge CONFLICT after being enqueued (#727/instance 729) must be
+// EVICTED back to the mergeable gate, not left waiting forever — while a PR still legitimately in
+// the queue (reported BLOCKED/UNSTABLE by GitHub) must keep waiting, never be falsely evicted.
+import { test } from "node:test";
+import { assertEquals } from "#test-assert";
+import type { PrState } from "./github.ts";
+import { queuedVerdict } from "./service.ts";
+
+function st(over: Partial<PrState>): PrState {
+  return {
+    merged: false,
+    mergeStateStatus: "CLEAN",
+    failingChecks: 0,
+    failingCheckNames: [],
+    presentCheckNames: [],
+    totalChecks: 0,
+    isDraft: false,
+    headRefOid: null,
+    ...over,
+  };
+}
+
+test("a landed PR advances (merge-landed)", () => {
+  assertEquals(queuedVerdict(st({ merged: true, mergeStateStatus: "CLEAN" })), "landed");
+  // `merged` wins even if a stale mergeStateStatus lags.
+  assertEquals(queuedVerdict(st({ merged: true, mergeStateStatus: "DIRTY" })), "landed");
+});
+
+test("a DIRTY (conflicting) PR is evicted — this is the #727 wedge", () => {
+  assertEquals(queuedVerdict(st({ merged: false, mergeStateStatus: "DIRTY" })), "evicted");
+});
+
+test("a PR still legitimately in the queue keeps waiting (never falsely evicted)", () => {
+  // Queuing PRs commonly report these; none is a conflict, so none may evict.
+  for (const s of ["CLEAN", "BLOCKED", "UNSTABLE", "BEHIND", "HAS_HOOKS", "UNKNOWN", "DRAFT"]) {
+    assertEquals(queuedVerdict(st({ merged: false, mergeStateStatus: s })), "waiting", s);
+  }
+});

package/app/roundResultDefault.test.ts

@@ -0,0 +1,94 @@
+// Structural regression guard for the review-round "safe default" routing.
+//
+// A review round that exits without a machine-readable result (empty/unknown status)
+// used to fall through the `gw-status` exclusive gateway's `default="f_escalate"`
+// arm and escalate to a human — even after a benign rebase/force-push with no
+// reviewer comments. That is premature: the round-cap gate (`gw-guard`) and the
+// review-wait timeout already provide the human-escalation safety nets, and
+// `persist-round` defaults an absent status to `addressed`.
+//
+// The fix inverts the gateway: escalation is now an EXPLICIT arm gated on
+// `needs_input`/`blocked`, and `f_addressed` is the default, so any unknown/empty
+// status re-enters the durable review wait instead of paging a human.
+//
+// This is a pure text assertion over the committed BPMN (no engine), matching the
+// repo's lightweight model-guard style (see mergeRebaseArm.test.ts).
+
+import { test } from "node:test";
+import { assert, assertStringIncludes } from "#test-assert";
+import { readFileSync } from "node:fs";
+
+const bpmn = readFileSync("resources/processes/convergence-loop.bpmn", "utf8");
+
+// Collapse whitespace so attribute-order / line-wrapping churn doesn't make the assertions brittle.
+const flat = bpmn.replace(/\s+/g, " ");
+
+// The `<sequenceFlow id="...">` element (whole element, up to its close), whether
+// self-closing or with children. Returns the matched text or null.
+//
+// The body branch uses a tempered negative lookahead — `(?:(?!<bpmn:sequenceFlow\b).)*?`
+// — so it can never over-match across a following `<bpmn:sequenceFlow>` element; it
+// captures only up to *this* element's own close.
+function flowElement(id: string): string | null {
+  const re = new RegExp(
+    `<bpmn:sequenceFlow\\b[^>]*?\\bid="${id}"[^>]*?(?:/>|>(?:(?!<bpmn:sequenceFlow\\b).)*?</bpmn:sequenceFlow>)`,
+  );
+  const m = flat.match(re);
+  return m ? m[0] : null;
+}
+
+// Every `<bpmn:sequenceFlow>` element (whole element, self-closing or with children),
+// using the same tempered-lookahead boundary as flowElement() so a captured element can
+// never bleed into the next one.
+function allFlows(): string[] {
+  const re = new RegExp(
+    "<bpmn:sequenceFlow\\b[^>]*?(?:/>|>(?:(?!<bpmn:sequenceFlow\\b).)*?</bpmn:sequenceFlow>)",
+    "g",
+  );
+  return flat.match(re) ?? [];
+}
+
+test("gw-status defaults to the addressed arm, not escalation", () => {
+  const gw = flat.match(/<bpmn:exclusiveGateway\b[^>]*\bid="gw-status"[^>]*>/);
+  assert(gw, "gw-status gateway missing");
+  assertStringIncludes(gw[0], 'default="f_addressed"');
+  // The old premature-escalation default must be gone.
+  assert(
+    !/id="gw-status"[^>]*default="f_escalate"/.test(flat),
+    "gw-status must no longer default to escalation",
+  );
+});
+
+test("escalation is an explicit needs_input/blocked arm", () => {
+  const esc = flowElement("f_escalate");
+  assert(esc, "f_escalate flow missing");
+  assertStringIncludes(esc, 'targetRef="persist-escalation"');
+  // Escalation now only fires on an explicit human-blocking status.
+  assertStringIncludes(esc, 'status = "needs_input" or status = "blocked"');
+});
+
+test("the default (addressed) arm carries no condition and re-enters the guard", () => {
+  const addressed = flowElement("f_addressed");
+  assert(addressed, "f_addressed flow missing");
+  assertStringIncludes(addressed, 'targetRef="gw-guard"');
+  // A default flow must have NO conditionExpression.
+  assert(
+    !/conditionExpression/.test(addressed),
+    "f_addressed is the default flow and must not carry a conditionExpression",
+  );
+});
+
+test("regression: an empty/unknown status no longer routes to persist-escalation", () => {
+  // Escalation is reachable ONLY via an explicit condition (the needs_input/blocked arm),
+  // never as a catch-all default. Enumerate EVERY sequenceFlow into `persist-escalation`
+  // and assert each one carries a conditionExpression — so no future edit can slip an
+  // unconditional (default) arm into escalation.
+  const intoEscalation = allFlows().filter((f) => /targetRef="persist-escalation"/.test(f));
+  assert(intoEscalation.length > 0, "no flow targets persist-escalation");
+  for (const f of intoEscalation) {
+    assertStringIncludes(f, "conditionExpression");
+  }
+  // The addressed default must land on the guard (which re-solicits the review), not escalation.
+  const addressed = flowElement("f_addressed");
+  assert(addressed && /targetRef="gw-guard"/.test(addressed), "default arm must re-enter gw-guard");
+});

package/app/service.ts

@@ -17,6 +17,7 @@ import {
   fetchPrState,
   hasPendingCopilotReviewer,
   type MergeMethod,
+  type PrState,
   requestCopilotReview,
 } from "./github.ts";
 import { mergeLanes, readExclusions } from "./mergeExclusion.ts";
@@ -637,7 +638,7 @@ async function mirrorTaskStatusForPr(data: DataLayer, prKey: string, status: "op
  *   • waiting_deps  → every declared dependency has merged        → `deps-cleared`
  *   • waiting_merge → GitHub settled the PR as mergeable/blocked  → `merge-ready` {mergeState}
  *   • waiting_lane  → predecessor in same exclusion lane merged    → re-arm `waiting_merge`
- *   • queued        → the queued PR has landed on GitHub          → `merge-landed`
+ *   • queued        → the queued PR landed → `merge-landed`; or it conflicts (DIRTY) → `merge-evicted`
  * On publish we flip status to the transient `merging` (which no branch scans) so a slow pass
  * can't double-signal, exactly as `pollReviews` flips to `converging`; `flipToMergingThenPublish`
  * reverts the flip if the publish fails so a failed handoff can't wedge the PR. */
@@ -756,25 +757,60 @@ async function pollMerges(data: DataLayer, engine: EngineClient, token: string)
     }
   }
 
-  // 4) Queued PR landed?
+  // 4) Queued PR landed — or fell out of the merge queue?
+  //
+  // A PR enqueued by `attempt-merge` (mergeStatus="queued") parks the process at `wait-landed`.
+  // Two things can end that wait: the queue lands the PR (→ `merge-landed`), or the PR is EVICTED
+  // from the queue because its base moved under it and it now conflicts (`DIRTY`). Without the
+  // eviction path a conflicted-after-enqueue PR waits forever (nothing ever publishes
+  // `merge-landed`), which is exactly how #727/instance 729 wedged. We must NOT treat a merely
+  // "not yet landed" PR as evicted: while it is legitimately queuing GitHub often reports it as
+  // BLOCKED (a pending queue check) or UNSTABLE, which `classifyMergeability` calls not-ready. Only
+  // a genuine merge CONFLICT (`DIRTY`) means it has dropped out — evict on that alone and re-arm the
+  // merge poller (`merge-evicted` → `arm-merge`), which re-runs the mergeable gate so the existing
+  // auto-rebase / escalate machinery resolves the conflict.
   for (const pr of await prs(data).find({ status: "queued" })) {
     const { repo, number, pr_key: prKey } = pr;
     try {
       const st = await fetchPrState(repo, number, token);
       if (st === null) continue; // no transport → skip this PR (others may still advance)
-      if (!st.merged) continue; // still in the queue
-      await flipToMergingThenPublish(data, engine, prKey, "queued", {
-        name: "merge-landed",
-        correlationKey: prKey,
-        variables: {},
-      });
-      console.log(`[poller] queued PR landed -> ${prKey}`);
+      const verdict = queuedVerdict(st);
+      if (verdict === "landed") {
+        await flipToMergingThenPublish(data, engine, prKey, "queued", {
+          name: "merge-landed",
+          correlationKey: prKey,
+          variables: {},
+        });
+        console.log(`[poller] queued PR landed -> ${prKey}`);
+      } else if (verdict === "evicted") {
+        await flipToMergingThenPublish(data, engine, prKey, "queued", {
+          name: "merge-evicted",
+          correlationKey: prKey,
+          variables: {},
+        });
+        console.log(`[poller] queued PR evicted (conflict) -> ${prKey}`);
+      }
+      // otherwise: still legitimately in the queue — keep waiting.
     } catch (err) {
       console.error(`[poller] queued ${prKey}: ${err}`);
     }
   }
 }
 
+/** Decide what to do with a PR the process enqueued (parked at `wait-landed`), from its current
+ *  GitHub merge state:
+ *   • `landed`  — the queue merged it → publish `merge-landed` (advance to mark-merged).
+ *   • `evicted` — it fell out of the queue with a real merge CONFLICT (`DIRTY`) → publish
+ *     `merge-evicted` so the process re-arms the merge poller and the mergeable gate re-runs
+ *     (auto-rebase / escalate). Without this a conflicted-after-enqueue PR waits forever.
+ *   • `waiting` — still legitimately in the queue. Crucially, a queuing PR is frequently reported
+ *     BLOCKED/UNSTABLE (a pending queue check), which is NOT eviction — only `DIRTY` is. */
+export function queuedVerdict(st: PrState): "landed" | "evicted" | "waiting" {
+  if (st.merged) return "landed";
+  if (st.mergeStateStatus === "DIRTY") return "evicted";
+  return "waiting";
+}
+
 /** The subset of a Camunda-8 `/v2/jobs/search` result item this app reads. `worker` is the
  * leasing worker's name (empty/absent until an agent activates the job); `deadline` is the
  * activation lock's expiry (ISO ts). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.40.0",
+  "version": "0.40.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/prompts/review-round.md

@@ -58,7 +58,11 @@ Because several agents may run on the same host at once:
 3. **Act.** Make the code changes for all fixes + nitpicks in your workspace (`cwd`)
    in one coherent, signed-off commit (`git commit -s`). Run the repo's
    build/test/lint locally before pushing. Push to the PR's head branch (the branch
-   you are already on) — do not open a new branch or PR.
+   you are already on) — do not open a new branch or PR. If the branch has drifted
+   behind its base and you need to **rebase / resolve a merge conflict** to keep it
+   mergeable, that is allowed: do it in place on this branch and **force-push**
+   (`--force-with-lease`). Any push this round — including a rebase/force-push with
+   no reviewer comments to act on — is an **`addressed`** round (see the return table).
 4. **Reply in-thread** to each comment you addressed or pushed back on, one reply
    per comment, so the trail lives on the PR.
 5. **Resolve the thread** for every comment you handled — every *fix*, *nitpick*,
@@ -128,7 +132,7 @@ Return **one** of:
 | `status`      | when                                                          | also set        |
 |---------------|---------------------------------------------------------------|-----------------|
 | `converged`   | nothing actionable left (see above)                           | `summary`       |
-| `addressed`   | you made changes + pushed this round                          | `summary`       |
+| `addressed`   | you pushed anything this round — code fixes, nitpicks, **or** a rebase/force-push to resolve a conflict | `summary`       |
 | `waiting`     | nothing to triage yet — you are awaiting a pending review (typically round 1) | `summary` |
 | `needs_input` | you hit a decision only a human can make                      | `summary`, `question` |
 | `blocked`     | you are stuck on something external (auth, failing push, missing secret) | `summary`, `question` |
@@ -143,7 +147,8 @@ Never guess on a `needs_input` decision — raise it and let a human answer.
 
 Your result variables only reach the process if you emit them through the harness's
 result channel. Prose in your normal output is **not** parsed — if you only "say"
-your status in the transcript, the round escalates with an empty question. So:
+your status in the transcript, the process can't read it, falls back to a safe
+default, and you waste a round. So emit a machine-readable result one of two ways:
 
 1. **Write a JSON object to the file at `$AGENT_RESULT_FILE`** (an env var the
    harness sets for you). The object's keys become process variables. Example for a
@@ -169,3 +174,12 @@ your status in the transcript, the round escalates with an empty question. So:
 Do not put the result file inside the repo checkout or `git add` it — it lives
 outside your workspace. Exit `0` for every status (including `blocked`/`needs_input`);
 a non-zero exit means a genuine crash and the job is retried.
+
+**Emitting a machine-readable result is your mandatory final step — never exit
+silently.** Emitting a result (the `$AGENT_RESULT_FILE` write, or the stdout fallback
+above if you truly cannot write the file) is the last thing you do on every path out of
+this round (including after a rebase/force-push, or when nothing needed doing). If you
+are ever unsure which status applies and you are not blocked on a human decision,
+return **`addressed`** (or **`waiting`** if you are still awaiting the first review) —
+never leave without a result. A missing result is treated as a safe `addressed` and
+re-enters the review wait, but relying on that instead of emitting one wastes a round.

package/resources/processes/convergence-loop.bpmn

@@ -90,7 +90,7 @@
       <bpmn:incoming>f_answerLoop</bpmn:incoming>
       <bpmn:outgoing>f_toStatus</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:exclusiveGateway id="gw-status" name="status?" default="f_escalate">
+    <bpmn:exclusiveGateway id="gw-status" name="status?" default="f_addressed">
       <bpmn:incoming>f_toStatus</bpmn:incoming>
       <bpmn:outgoing>f_converged</bpmn:outgoing>
       <bpmn:outgoing>f_addressed</bpmn:outgoing>
@@ -202,13 +202,13 @@
     <bpmn:sequenceFlow id="f_converged" name="converged" sourceRef="gw-status" targetRef="persist-converged">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "converged"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="f_addressed" name="addressed" sourceRef="gw-status" targetRef="gw-guard">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "addressed"</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_addressed" name="addressed / default" sourceRef="gw-status" targetRef="gw-guard" />
     <bpmn:sequenceFlow id="f_waiting" name="waiting" sourceRef="gw-status" targetRef="gw-guard">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="f_escalate" name="needs_input / blocked" sourceRef="gw-status" targetRef="persist-escalation" />
+    <bpmn:sequenceFlow id="f_escalate" name="needs_input / blocked" sourceRef="gw-status" targetRef="persist-escalation">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "needs_input" or status = "blocked"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="f_guardMax" name="max rounds" sourceRef="gw-guard" targetRef="persist-escalation-maxrounds">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=round &gt;= maxRounds</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -337,7 +337,7 @@
         <di:waypoint x="441" y="280" />
         <di:waypoint x="591" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="446" y="206" width="67" height="14" />
+          <dc:Bounds x="446" y="199" width="78" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_waiting" bpmnElement="f_waiting">

package/resources/processes/merge-loop.bpmn

@@ -18,6 +18,11 @@
       <zeebe:subscription correlationKey="=prKey" />
     </bpmn:extensionElements>
   </bpmn:message>
+  <bpmn:message id="Message_mergeEvicted" name="merge-evicted">
+    <bpmn:extensionElements>
+      <zeebe:subscription correlationKey="=prKey" />
+    </bpmn:extensionElements>
+  </bpmn:message>
   <bpmn:message id="Message_mergeEscAnswered" name="escalation-answered">
     <bpmn:extensionElements>
       <zeebe:subscription correlationKey="=prKey" />
@@ -109,6 +114,7 @@
       <bpmn:incoming>f_m_answer</bpmn:incoming>
       <bpmn:incoming>f_ci_fixed</bpmn:incoming>
       <bpmn:incoming>f_reb_rebased</bpmn:incoming>
+      <bpmn:incoming>f_m_evicted</bpmn:incoming>
       <bpmn:outgoing>f_m_arm</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:intermediateCatchEvent id="wait-mergeable" name="Wait: mergeable">
@@ -140,11 +146,21 @@
       <bpmn:outgoing>f_m_gQueued</bpmn:outgoing>
       <bpmn:outgoing>f_m_gBlocked</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:intermediateCatchEvent id="wait-landed" name="Wait: merge queue landed">
+    <bpmn:eventBasedGateway id="eg-landed" name="landed or evicted?">
       <bpmn:incoming>f_m_gQueued</bpmn:incoming>
+      <bpmn:outgoing>f_eg_landed</bpmn:outgoing>
+      <bpmn:outgoing>f_eg_evicted</bpmn:outgoing>
+    </bpmn:eventBasedGateway>
+    <bpmn:intermediateCatchEvent id="wait-landed" name="Wait: merge queue landed">
+      <bpmn:incoming>f_eg_landed</bpmn:incoming>
       <bpmn:outgoing>f_m_landed</bpmn:outgoing>
       <bpmn:messageEventDefinition id="med_mergeLanded" messageRef="Message_mergeLanded" />
     </bpmn:intermediateCatchEvent>
+    <bpmn:intermediateCatchEvent id="wait-evicted" name="Wait: evicted from queue">
+      <bpmn:incoming>f_eg_evicted</bpmn:incoming>
+      <bpmn:outgoing>f_m_evicted</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="med_mergeEvicted" messageRef="Message_mergeEvicted" />
+    </bpmn:intermediateCatchEvent>
     <bpmn:serviceTask id="mark-merged" name="Mark merged">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.mark-merged" />
@@ -287,9 +303,12 @@
     <bpmn:sequenceFlow id="f_m_gMerged" name="merged" sourceRef="gw-merge" targetRef="mark-merged">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeStatus = "merged"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="f_m_gQueued" name="queued" sourceRef="gw-merge" targetRef="wait-landed">
+    <bpmn:sequenceFlow id="f_m_gQueued" name="queued" sourceRef="gw-merge" targetRef="eg-landed">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeStatus = "queued"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_eg_landed" sourceRef="eg-landed" targetRef="wait-landed" />
+    <bpmn:sequenceFlow id="f_eg_evicted" sourceRef="eg-landed" targetRef="wait-evicted" />
+    <bpmn:sequenceFlow id="f_m_evicted" sourceRef="wait-evicted" targetRef="arm-merge" />
     <bpmn:sequenceFlow id="f_m_gBlocked" name="blocked" sourceRef="gw-merge" targetRef="merge-esc-attempt" />
     <bpmn:sequenceFlow id="f_m_landed" sourceRef="wait-landed" targetRef="mark-merged" />
     <bpmn:sequenceFlow id="f_m_done" sourceRef="mark-merged" targetRef="MergeEnd" />
@@ -332,49 +351,61 @@
       <bpmndi:BPMNShape id="BPMNShape_gw-merge" bpmnElement="gw-merge" isMarkerVisible="true">
         <dc:Bounds x="1063" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1062" y="62" width="53" height="28" />
+          <dc:Bounds x="1022" y="150" width="53" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_eg-landed" bpmnElement="eg-landed" isMarkerVisible="true">
+        <dc:Bounds x="1238" y="255" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1231" y="222" width="64" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
-        <dc:Bounds x="1245" y="262" width="36" height="36" />
+        <dc:Bounds x="1420" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1221" y="229" width="85" height="28" />
+          <dc:Bounds x="1396" y="303" width="85" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-evicted" bpmnElement="wait-evicted">
+        <dc:Bounds x="1420" y="422" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1394" y="375" width="88" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_mark-merged" bpmnElement="mark-merged">
-        <dc:Bounds x="1388" y="80" width="100" height="80" />
+        <dc:Bounds x="1588" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
-        <dc:Bounds x="1588" y="102" width="36" height="36" />
+        <dc:Bounds x="1788" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1581" y="143" width="50" height="14" />
+          <dc:Bounds x="1781" y="143" width="50" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
-        <dc:Bounds x="1038" y="560" width="100" height="80" />
+        <dc:Bounds x="1038" y="720" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
-        <dc:Bounds x="1388" y="400" width="100" height="80" />
+        <dc:Bounds x="1388" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
-        <dc:Bounds x="1588" y="422" width="36" height="36" />
+        <dc:Bounds x="1620" y="582" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1649" y="463" width="74" height="42" />
+          <dc:Bounds x="1661" y="579" width="74" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
-        <dc:Bounds x="863" y="575" width="50" height="50" />
+        <dc:Bounds x="863" y="735" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="844" y="556" width="89" height="14" />
+          <dc:Bounds x="844" y="716" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_fix-ci" bpmnElement="fix-ci">
-        <dc:Bounds x="1038" y="720" width="100" height="80" />
+        <dc:Bounds x="1038" y="880" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-result" bpmnElement="gw-ci-result" isMarkerVisible="true">
-        <dc:Bounds x="1238" y="735" width="50" height="50" />
+        <dc:Bounds x="1238" y="895" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1240" y="716" width="46" height="14" />
+          <dc:Bounds x="1240" y="876" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase" bpmnElement="gw-rebase" isMarkerVisible="true">
@@ -384,12 +415,12 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_rebase" bpmnElement="rebase">
-        <dc:Bounds x="1038" y="880" width="100" height="80" />
+        <dc:Bounds x="1038" y="1040" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase-result" bpmnElement="gw-rebase-result" isMarkerVisible="true">
-        <dc:Bounds x="1238" y="895" width="50" height="50" />
+        <dc:Bounds x="1238" y="1055" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1233" y="876" width="60" height="14" />
+          <dc:Bounds x="1233" y="1036" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
@@ -421,69 +452,78 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gMerged" bpmnElement="f_m_gMerged">
         <di:waypoint x="1113" y="120" />
-        <di:waypoint x="1388" y="120" />
+        <di:waypoint x="1588" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1216" y="98" width="49" height="14" />
+          <dc:Bounds x="1326" y="98" width="49" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
-        <di:waypoint x="1488" y="120" />
-        <di:waypoint x="1588" y="120" />
+        <di:waypoint x="1688" y="120" />
+        <di:waypoint x="1788" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
-        <di:waypoint x="913" y="600" />
-        <di:waypoint x="1038" y="600" />
+        <di:waypoint x="913" y="760" />
+        <di:waypoint x="1038" y="760" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="942" y="605" width="67" height="28" />
+          <dc:Bounds x="942" y="765" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
-        <di:waypoint x="1288" y="760" />
-        <di:waypoint x="1438" y="760" />
-        <di:waypoint x="1438" y="480" />
+        <di:waypoint x="1288" y="920" />
+        <di:waypoint x="1438" y="920" />
+        <di:waypoint x="1438" y="640" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1319" y="738" width="89" height="14" />
+          <dc:Bounds x="1319" y="898" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
         <di:waypoint x="913" y="280" />
         <di:waypoint x="1088" y="280" />
-        <di:waypoint x="1088" y="560" />
+        <di:waypoint x="1088" y="720" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="977" y="247" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_blocked" bpmnElement="f_reb_blocked">
-        <di:waypoint x="1288" y="920" />
-        <di:waypoint x="1438" y="920" />
-        <di:waypoint x="1438" y="480" />
+        <di:waypoint x="1288" y="1080" />
+        <di:waypoint x="1438" y="1080" />
+        <di:waypoint x="1438" y="640" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1331" y="887" width="64" height="28" />
+          <dc:Bounds x="1331" y="1047" width="64" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
+        <di:waypoint x="1288" y="280" />
+        <di:waypoint x="1420" y="280" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
+        <di:waypoint x="1456" y="280" />
+        <di:waypoint x="1638" y="280" />
+        <di:waypoint x="1638" y="160" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
-        <di:waypoint x="1138" y="580" />
-        <di:waypoint x="1158" y="580" />
-        <di:waypoint x="1158" y="380" />
-        <di:waypoint x="1606" y="380" />
-        <di:waypoint x="1606" y="422" />
+        <di:waypoint x="1138" y="740" />
+        <di:waypoint x="1158" y="740" />
+        <di:waypoint x="1158" y="540" />
+        <di:waypoint x="1638" y="540" />
+        <di:waypoint x="1638" y="582" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
-        <di:waypoint x="1488" y="440" />
-        <di:waypoint x="1588" y="440" />
+        <di:waypoint x="1488" y="600" />
+        <di:waypoint x="1620" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
-        <di:waypoint x="1606" y="458" />
-        <di:waypoint x="1606" y="500" />
-        <di:waypoint x="402" y="500" />
+        <di:waypoint x="1638" y="618" />
+        <di:waypoint x="1638" y="660" />
+        <di:waypoint x="402" y="660" />
         <di:waypoint x="402" y="160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
         <di:waypoint x="713" y="145" />
-        <di:waypoint x="713" y="600" />
-        <di:waypoint x="863" y="600" />
+        <di:waypoint x="713" y="760" />
+        <di:waypoint x="863" y="760" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="718" y="438" width="60" height="42" />
+          <dc:Bounds x="718" y="518" width="60" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
@@ -498,18 +538,18 @@
         <di:waypoint x="713" y="145" />
         <di:waypoint x="713" y="318" />
         <di:waypoint x="1018" y="318" />
-        <di:waypoint x="1018" y="580" />
-        <di:waypoint x="1038" y="580" />
+        <di:waypoint x="1018" y="740" />
+        <di:waypoint x="1038" y="740" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="823" y="326" width="85" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
-        <di:waypoint x="888" y="625" />
-        <di:waypoint x="888" y="760" />
-        <di:waypoint x="1038" y="760" />
+        <di:waypoint x="888" y="785" />
+        <di:waypoint x="888" y="920" />
+        <di:waypoint x="1038" y="920" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="893" y="679" width="49" height="28" />
+          <dc:Bounds x="893" y="839" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_go" bpmnElement="f_reb_go">
@@ -517,8 +557,8 @@
         <di:waypoint x="933" y="280" />
         <di:waypoint x="933" y="305" />
         <di:waypoint x="1158" y="305" />
-        <di:waypoint x="1158" y="920" />
-        <di:waypoint x="1138" y="920" />
+        <di:waypoint x="1158" y="1080" />
+        <di:waypoint x="1138" y="1080" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1101" y="310" width="49" height="28" />
         </bpmndi:BPMNLabel>
@@ -526,60 +566,64 @@
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
         <di:waypoint x="1088" y="145" />
         <di:waypoint x="1088" y="280" />
-        <di:waypoint x="1245" y="280" />
+        <di:waypoint x="1238" y="280" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1093" y="206" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_eg_evicted" bpmnElement="f_eg_evicted">
+        <di:waypoint x="1263" y="305" />
+        <di:waypoint x="1263" y="440" />
+        <di:waypoint x="1420" y="440" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
-        <di:waypoint x="1113" y="120" />
-        <di:waypoint x="1368" y="120" />
-        <di:waypoint x="1368" y="440" />
-        <di:waypoint x="1388" y="440" />
+        <di:waypoint x="1088" y="95" />
+        <di:waypoint x="1088" y="75" />
+        <di:waypoint x="1844" y="75" />
+        <di:waypoint x="1844" y="478" />
+        <di:waypoint x="1368" y="478" />
+        <di:waypoint x="1368" y="580" />
+        <di:waypoint x="1388" y="580" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1373" y="273" width="53" height="14" />
+          <dc:Bounds x="1849" y="270" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_done" bpmnElement="f_ci_done">
-        <di:waypoint x="1138" y="760" />
-        <di:waypoint x="1238" y="760" />
+        <di:waypoint x="1138" y="920" />
+        <di:waypoint x="1238" y="920" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_done" bpmnElement="f_reb_done">
-        <di:waypoint x="1138" y="940" />
-        <di:waypoint x="1158" y="940" />
-        <di:waypoint x="1158" y="965" />
-        <di:waypoint x="1238" y="965" />
-        <di:waypoint x="1263" y="965" />
-        <di:waypoint x="1263" y="945" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
-        <di:waypoint x="1263" y="298" />
-        <di:waypoint x="1263" y="318" />
-        <di:waypoint x="1281" y="318" />
-        <di:waypoint x="1281" y="540" />
-        <di:waypoint x="1644" y="540" />
-        <di:waypoint x="1644" y="180" />
-        <di:waypoint x="1468" y="180" />
-        <di:waypoint x="1468" y="160" />
+        <di:waypoint x="1138" y="1100" />
+        <di:waypoint x="1158" y="1100" />
+        <di:waypoint x="1158" y="1125" />
+        <di:waypoint x="1238" y="1125" />
+        <di:waypoint x="1263" y="1125" />
+        <di:waypoint x="1263" y="1105" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_fixed" bpmnElement="f_ci_fixed">
-        <di:waypoint x="1263" y="785" />
-        <di:waypoint x="1263" y="820" />
-        <di:waypoint x="402" y="820" />
+        <di:waypoint x="1263" y="945" />
+        <di:waypoint x="1263" y="980" />
+        <di:waypoint x="402" y="980" />
         <di:waypoint x="402" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="813" y="798" width="39" height="14" />
+          <dc:Bounds x="813" y="958" width="39" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rebased" bpmnElement="f_reb_rebased">
-        <di:waypoint x="1263" y="945" />
-        <di:waypoint x="1263" y="980" />
-        <di:waypoint x="402" y="980" />
+        <di:waypoint x="1263" y="1105" />
+        <di:waypoint x="1263" y="1140" />
+        <di:waypoint x="402" y="1140" />
         <di:waypoint x="402" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="806" y="958" width="53" height="14" />
+          <dc:Bounds x="806" y="1118" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
+        <di:waypoint x="1438" y="458" />
+        <di:waypoint x="1438" y="478" />
+        <di:waypoint x="402" y="478" />
+        <di:waypoint x="402" y="160" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>