@nanobpm/nano-workforce 0.166.0 → 0.167.1

package/pages/delivery-graphs/mount.js

@@ -50,6 +50,32 @@ const DEFAULT_IMPORT_URL = new URL("../app/api/actions/delivery-graph/library/im
 // routes through the single `fillComposer()` seam below; keep new fill sources going through it.
 export const DG_COMPOSE_FILL_MESSAGE = "nano-delivery-graph-compose-fill";
 
+// The ACK half of the reuse-fill bridge (issue #645). An optimistic "✓ Loaded…" toast printed
+// synchronously after the Library posts the fill can never reflect the cross-frame OUTCOME — the fill
+// message is relayed across App-Views (nano-ide #518) and could still be dropped (no relay, wrong
+// origin, a compose view that isn't mounted), yet the toast claimed success regardless (the #645
+// defect). So the delivery is now ACKNOWLEDGED: when THIS compose mount actually fills from a fill
+// message, it posts this ack back UP to the host (relayed across to the Library sibling), echoing the
+// producer's correlation `token`. The Library shows "✓ Loaded…" ONLY on that ack and a clear error on a
+// short timeout — the success is earned, not assumed. The `type` is exported ONCE here as the single
+// source of truth; the Library consumer imports it rather than re-declaring a synonym.
+export const DG_COMPOSE_FILL_ACK_MESSAGE = "nano-delivery-graph-compose-fill-ack";
+
+// The host acknowledgment of a `nano-navigate` (issue #645). "Preview generated DI" posts nano-navigate
+// UP to the console; nano-ide #518 forwards it to the host explorer, but the host does not synchronously
+// confirm, so an optimistic "✓ Opening…" toast printed right after the post claimed success even when the
+// message was dropped (standalone, no relay, a console that never navigated). The compose view now treats
+// Preview as fire-to-host with a bounded budget: it shows a NEUTRAL in-progress status, and only earns a
+// "✓" when the host echoes this ack for the same `target`; if no host ack is observed within the budget it
+// surfaces "Couldn't reach the console explorer" instead. Same-origin, from the parent (the console).
+export const NANO_NAVIGATE_ACK_MESSAGE = "nano-navigate-ack";
+
+// The bounded budget within which a cross-frame delivery (compose-fill relay, or a nano-navigate to the
+// host) must be acknowledged before the producer surfaces an honest "couldn't reach …" error (#645). A
+// couple of seconds is long enough for the App-View relay round-trip yet short enough that a dropped
+// message fails fast instead of leaving a misleading toast up. Overridable via config for tests.
+const ACK_TIMEOUT_MS = 2000;
+
 // A bounded timeout for every door request. Without it a hung endpoint leaves the fetch promise pending
 // forever, so the busy() lock never clears and the UI is stranded (buttons disabled, status stuck) with
 // no way to retry. On timeout the AbortController rejects the fetch, which surfaces as an error banner
@@ -230,6 +256,8 @@ export function mountDeliveryGraphs(host, config = {}) {
   const previewUrl = config.previewUrl ?? DEFAULT_PREVIEW_URL;
   const stageUrl = config.stageUrl ?? DEFAULT_STAGE_URL;
   const importUrl = config.importUrl ?? DEFAULT_IMPORT_URL;
+  const ackTimeoutMs =
+    typeof config.ackTimeoutMs === "number" && config.ackTimeoutMs > 0 ? config.ackTimeoutMs : ACK_TIMEOUT_MS;
   const headers = (url) => ({
     "content-type": "application/json",
     ...(config.hookSecret && isSameOrigin(url) ? { "x-hook-secret": config.hookSecret } : {}),
@@ -324,7 +352,23 @@ export function mountDeliveryGraphs(host, config = {}) {
     if (embedded && ev.source !== window.parent) return;
     const data = ev.data;
     if (!data || data.type !== DG_COMPOSE_FILL_MESSAGE || typeof data.graphJson !== "string") return;
-    fillComposer(data.graphJson, { status: "Reused a saved graph \u2014 Preview or Stage it." });
+    const filled = fillComposer(data.graphJson, { status: "Reused a saved graph \u2014 Preview or Stage it." });
+    // ACK the fill back to the producer (issue #645): the Library shows "✓ Loaded…" ONLY on this ack,
+    // never optimistically. Post UP to the host, which nano-ide #518 relays across to the Library
+    // sibling App-View; echo the correlation `token` so a stale ack from a prior Reuse can't complete a
+    // newer one. Only when actually embedded (there is a parent to relay through) and only when the fill
+    // truly happened — a blank/bad payload earns no ack.
+    if (
+      filled &&
+      embedded &&
+      window.parent &&
+      typeof window.parent.postMessage === "function"
+    ) {
+      window.parent.postMessage(
+        { type: DG_COMPOSE_FILL_ACK_MESSAGE, token: typeof data.token === "string" ? data.token : null },
+        window.location.origin,
+      );
+    }
   }
   if (typeof window !== "undefined" && typeof window.addEventListener === "function") {
     window.addEventListener("message", onFillMessage);
@@ -446,6 +490,17 @@ export function mountDeliveryGraphs(host, config = {}) {
   // the path. Standalone (not embedded) there is no host explorer to drive, so we say so instead of
   // failing silently.
   const isEmbedded = typeof window !== "undefined" && window.parent && window.parent !== window;
+  // A single in-flight Preview→host handshake (issue #645). Posting nano-navigate is fire-to-host: the
+  // console does not synchronously confirm it navigated, so we must not claim success up front. We hold
+  // the pending target + its timeout timer here; a host ack for that target resolves it to "✓ Opened…",
+  // and the timeout resolves it to an honest "Couldn't reach the console explorer". A fresh Preview
+  // supersedes any pending one (its timer is cleared) so only the latest attempt is ever resolved.
+  const DEFINITION_PREVIEW_TARGET = "definitionPreview";
+  let pendingPreview = null;
+  function clearPendingPreview() {
+    if (pendingPreview && pendingPreview.timer) clearTimeout(pendingPreview.timer);
+    pendingPreview = null;
+  }
   function doPreviewDi() {
     if (lastBpmn.trim() === "") {
       setStatus("Preview a graph first — the laid-out BPMN comes from the preview.", "err");
@@ -455,11 +510,40 @@ export function mountDeliveryGraphs(host, config = {}) {
       setStatus("Open this page inside the console cockpit to preview the generated DI.", "err");
       return;
     }
+    clearPendingPreview();
     window.parent.postMessage(
       { type: "nano-navigate", target: "definitionPreview", params: { xml: lastBpmn } },
       window.location.origin,
     );
-    setStatus("\u2713 Opening the generated DI in the process explorer…", "ok");
+    // NEUTRAL in-progress status (no "✓") — the success is only earned on the host ack below (#645).
+    setStatus("Opening the generated DI in the process explorer…", "");
+    const timer = setTimeout(() => {
+      if (!pendingPreview || pendingPreview.target !== DEFINITION_PREVIEW_TARGET) return;
+      pendingPreview = null;
+      setStatus("Couldn't reach the console explorer — is this page open inside the console?", "err");
+    }, ackTimeoutMs);
+    pendingPreview = { target: DEFINITION_PREVIEW_TARGET, timer };
+  }
+  // The host's acknowledgment of a Preview nano-navigate (#645): a same-origin `nano-navigate-ack` from
+  // the parent (the console) for the target we're awaiting resolves the pending Preview to success. A
+  // foreign origin, a non-parent source, or an ack for a different/absent target is ignored — an
+  // unrelated page can't forge a success toast.
+  function onNavAck(ev) {
+    if (!ev || typeof window === "undefined") return;
+    if (ev.origin !== window.location.origin) return;
+    if (ev.source !== window.parent) return;
+    const data = ev.data;
+    if (!data || data.type !== NANO_NAVIGATE_ACK_MESSAGE) return;
+    // Require a string `target` that exactly matches the pending preview. A target-less (or
+    // mismatched) ack must NOT resolve the Preview — otherwise any same-origin parent ack could
+    // forge a "✓ Opened…" toast the target never actually rendered (#645).
+    if (!pendingPreview || typeof data.target !== "string" || data.target !== pendingPreview.target)
+      return;
+    clearPendingPreview();
+    setStatus("\u2713 Opened the generated DI in the process explorer.", "ok");
+  }
+  if (isEmbedded && typeof window !== "undefined" && typeof window.addEventListener === "function") {
+    window.addEventListener("message", onNavAck);
   }
   outputEl.addEventListener("click", (ev) => {
     const btn = ev.target && ev.target.closest ? ev.target.closest("[data-preview-di]") : null;
@@ -469,8 +553,10 @@ export function mountDeliveryGraphs(host, config = {}) {
   });
 
   return () => {
+    clearPendingPreview();
     if (typeof window !== "undefined" && typeof window.removeEventListener === "function") {
       window.removeEventListener("message", onFillMessage);
+      window.removeEventListener("message", onNavAck);
     }
     root.innerHTML = "";
   };

package/pages/delivery-graphs.page.json

@@ -120,11 +120,11 @@
           "source": "app",
           "table": "delivery_graph_read_model",
           "orderBy": { "field": "updated_at", "dir": "desc" },
-          "filter": [{ "field": "status", "in": ["awaiting-approval", "running"] }]
+          "filter": [{ "field": "list_bucket", "in": ["active"] }]
         },
         "tabs": [
-          { "label": "In-flight", "filter": [{ "field": "status", "in": ["awaiting-approval", "running"] }] },
-          { "label": "History", "filter": [{ "field": "status", "in": ["done", "failed", "abandoned"] }] },
+          { "label": "In-flight", "filter": [{ "field": "list_bucket", "in": ["active"] }] },
+          { "label": "History", "filter": [{ "field": "list_bucket", "in": ["history"] }] },
           { "label": "All", "filter": [] }
         ],
         "columns": [
@@ -171,6 +171,15 @@
               "path": "/app/api/actions/delivery-graph/library/save",
               "body": { "name": "{{row.title}}", "digest": "{{row.digest}}" }
             }
+          },
+          {
+            "label": "Dismiss",
+            "confirm": "Dismiss this finished delivery graph? It acknowledges the terminal run and files it under History.",
+            "showWhenField": "ack_open",
+            "action": {
+              "path": "/app/api/actions/acknowledge-delivery-graph",
+              "body": { "run_key": "{{row.run_key}}" }
+            }
           }
         ]
       }

package/pages/home.page.json

@@ -119,23 +119,15 @@
         "data": {
           "kind": "datasource",
           "source": "app",
-          "table": "pull_requests",
+          "table": "pull_requests_read_model",
           "orderBy": {
             "field": "updated_at",
             "dir": "desc"
           },
           "filter": [
             {
-              "field": "status",
-              "in": [
-                "converging",
-                "waiting_review",
-                "escalated",
-                "waiting_deps",
-                "waiting_merge",
-                "queued",
-                "merging"
-              ]
+              "field": "list_bucket",
+              "in": ["active"]
             }
           ]
         },
@@ -144,16 +136,8 @@
             "label": "Active",
             "filter": [
               {
-                "field": "status",
-                "in": [
-                  "converging",
-                  "waiting_review",
-                  "escalated",
-                  "waiting_deps",
-                  "waiting_merge",
-                  "queued",
-                  "merging"
-                ]
+                "field": "list_bucket",
+                "in": ["active"]
               }
             ]
           },
@@ -161,12 +145,8 @@
             "label": "History",
             "filter": [
               {
-                "field": "status",
-                "in": [
-                  "converged",
-                  "merged",
-                  "abandoned"
-                ]
+                "field": "list_bucket",
+                "in": ["history"]
               }
             ]
           }
@@ -224,6 +204,17 @@
                 "processInstanceKey": "{{row.process_key}}"
               }
             }
+          },
+          {
+            "label": "Dismiss",
+            "confirm": "Dismiss this finished PR? It acknowledges the terminal pull request and files it under History.",
+            "showWhenField": "ack_open",
+            "action": {
+              "path": "/app/api/actions/acknowledge-pr",
+              "body": {
+                "pr_key": "{{row.pr_key}}"
+              }
+            }
           }
         ],
         "detail": {

package/pages/overview.page.json

@@ -101,22 +101,9 @@
         "data": {
           "kind": "datasource",
           "source": "app",
-          "table": "pull_requests",
+          "table": "pull_requests_read_model",
           "orderBy": { "field": "updated_at", "dir": "desc" },
-          "filter": [
-            {
-              "field": "status",
-              "in": [
-                "converging",
-                "waiting_review",
-                "escalated",
-                "waiting_deps",
-                "waiting_merge",
-                "queued",
-                "merging"
-              ]
-            }
-          ]
+          "filter": [{ "field": "list_bucket", "in": ["active"] }]
         },
         "columns": [
           { "field": "title", "template": "{{title}}", "header": "Item", "subtitleField": "pr_key", "truncate": true, "width": "36%", "link": { "kind": "page", "page": "home", "keyField": "pr_key" } },
@@ -124,6 +111,17 @@
           { "field": "incident_message", "header": "Incident", "truncate": true, "badge": { "tone": "danger", "label": "1" } },
           { "field": "current_round", "template": "{{current_round}} · {{active_worker}}", "header": "Round · Agent" },
           { "field": "updated_at", "header": "Updated", "width": "9rem", "format": "datetime" }
+        ],
+        "rowActions": [
+          {
+            "label": "Dismiss",
+            "confirm": "Dismiss this finished PR? It acknowledges the terminal pull request and files it under History.",
+            "showWhenField": "ack_open",
+            "action": {
+              "path": "/app/api/actions/acknowledge-pr",
+              "body": { "pr_key": "{{row.pr_key}}" }
+            }
+          }
         ]
       }
     },
@@ -220,7 +218,7 @@
           "source": "app",
           "table": "delivery_graph_read_model",
           "orderBy": { "field": "updated_at", "dir": "desc" },
-          "filter": [{ "field": "status", "in": ["awaiting-approval", "running"] }]
+          "filter": [{ "field": "list_bucket", "in": ["active"] }]
         },
         "columns": [
           { "field": "title", "template": "{{title}}", "header": "Item", "subtitleField": "run_key", "truncate": true, "width": "30%", "link": { "kind": "page", "page": "delivery-graph-detail", "keyField": "run_key" } },
@@ -252,7 +250,18 @@
             { "field": "human_node_count", "label": "Human nodes" },
             { "field": "side_effect_count", "label": "Side effects" }
           ]
-        }
+        },
+        "rowActions": [
+          {
+            "label": "Dismiss",
+            "confirm": "Dismiss this finished delivery graph? It acknowledges the terminal run and files it under History.",
+            "showWhenField": "ack_open",
+            "action": {
+              "path": "/app/api/actions/acknowledge-delivery-graph",
+              "body": { "run_key": "{{row.run_key}}" }
+            }
+          }
+        ]
       }
     }
   ]

package/resources/processes/feature.bpmn

@@ -13,6 +13,9 @@
           <nano:extend name="featureKey" type="string" />
           <nano:extend name="question" type="string" optional="true" />
         </nano:shape>
+        <nano:shape id="RecordFeatureImplementingIn" name="Record feature implementing — input">
+          <nano:extend name="featureKey" type="string" />
+        </nano:shape>
         <nano:shape id="ConvergeFeatureIn" name="Converge feature PR — input">
           <nano:extend name="featureKey" type="string" />
           <nano:extend name="prKey" type="string" optional="true" />
@@ -183,9 +186,19 @@
           <zeebe:output source="=if (is defined(transcriptUrl)) then transcriptUrl else null" target="transcriptUrl" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
+      <bpmn:incoming>f_implementing</bpmn:incoming>
+      <bpmn:outgoing>w_toGw</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="record-feature-implementing" name="Record implementing">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.record-feature-implementing" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordFeatureImplementingIn" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
       <bpmn:incoming>f_toImplement</bpmn:incoming>
       <bpmn:incoming>w_answerLoop</bpmn:incoming>
-      <bpmn:outgoing>w_toGw</bpmn:outgoing>
+      <bpmn:outgoing>f_implementing</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="w_gw" name="escalated?" default="w_done">
       <bpmn:incoming>w_toGw</bpmn:incoming>
@@ -287,7 +300,8 @@
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="f_readiness_skip" name="no gate" sourceRef="gw-readiness" targetRef="ensure-base-branch" />
     <bpmn:sequenceFlow id="f_readiness_done" sourceRef="readiness-preflight" targetRef="ensure-base-branch" />
-    <bpmn:sequenceFlow id="f_toImplement" sourceRef="ensure-base-branch" targetRef="implement-task" />
+    <bpmn:sequenceFlow id="f_toImplement" sourceRef="ensure-base-branch" targetRef="record-feature-implementing" />
+    <bpmn:sequenceFlow id="f_implementing" sourceRef="record-feature-implementing" targetRef="implement-task" />
     <bpmn:sequenceFlow id="w_toGw" sourceRef="implement-task" targetRef="w_gw" />
     <bpmn:sequenceFlow id="w_escalate" name="escalated" sourceRef="w_gw" targetRef="record-feature-escalation">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "escalated" and question != null and trim(question) != ""</bpmn:conditionExpression>
@@ -295,7 +309,7 @@
     <bpmn:sequenceFlow id="w_toEscalationTask" sourceRef="record-feature-escalation" targetRef="feature-escalation" />
     <bpmn:sequenceFlow id="w_done" name="done" sourceRef="w_gw" targetRef="record-feature" />
     <bpmn:sequenceFlow id="w_toAnswerGw" sourceRef="feature-escalation" targetRef="w_gw_answer" />
-    <bpmn:sequenceFlow id="w_answerLoop" name="answer" sourceRef="w_gw_answer" targetRef="implement-task">
+    <bpmn:sequenceFlow id="w_answerLoop" name="answer" sourceRef="w_gw_answer" targetRef="record-feature-implementing">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=resolution = "answer"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="w_abandon" name="abandon" sourceRef="w_gw_answer" targetRef="record-feature" />
@@ -334,60 +348,63 @@
         <dc:Bounds x="566" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_implement-task" bpmnElement="implement-task">
+        <dc:Bounds x="966" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_record-feature-implementing" bpmnElement="record-feature-implementing">
         <dc:Bounds x="766" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_w_gw" bpmnElement="w_gw" isMarkerVisible="true">
-        <dc:Bounds x="966" y="95" width="50" height="50" />
+        <dc:Bounds x="1166" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="954" y="76" width="74" height="14" />
+          <dc:Bounds x="1154" y="76" width="74" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-feature-escalation" bpmnElement="record-feature-escalation">
-        <dc:Bounds x="1116" y="240" width="100" height="80" />
+        <dc:Bounds x="1316" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_feature-escalation" bpmnElement="feature-escalation">
-        <dc:Bounds x="1316" y="240" width="100" height="80" />
+        <dc:Bounds x="1516" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_w_gw_answer" bpmnElement="w_gw_answer" isMarkerVisible="true">
-        <dc:Bounds x="1516" y="255" width="50" height="50" />
+        <dc:Bounds x="1716" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1513" y="236" width="56" height="14" />
+          <dc:Bounds x="1713" y="236" width="56" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-feature" bpmnElement="record-feature">
-        <dc:Bounds x="1666" y="80" width="100" height="80" />
+        <dc:Bounds x="1866" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-blocked" bpmnElement="gw-blocked" isMarkerVisible="true">
-        <dc:Bounds x="1866" y="95" width="50" height="50" />
+        <dc:Bounds x="2066" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1861" y="76" width="60" height="14" />
+          <dc:Bounds x="2061" y="76" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_feature-blocked" bpmnElement="feature-blocked">
-        <dc:Bounds x="2016" y="400" width="100" height="80" />
+        <dc:Bounds x="2216" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-blocked-ack" bpmnElement="record-blocked-ack">
-        <dc:Bounds x="2216" y="400" width="100" height="80" />
+        <dc:Bounds x="2416" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-converge" bpmnElement="gw-converge" isMarkerVisible="true">
-        <dc:Bounds x="2041" y="95" width="50" height="50" />
+        <dc:Bounds x="2241" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2033" y="76" width="67" height="14" />
+          <dc:Bounds x="2233" y="76" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_converge" bpmnElement="converge">
-        <dc:Bounds x="2216" y="240" width="100" height="80" />
+        <dc:Bounds x="2416" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_End" bpmnElement="End">
-        <dc:Bounds x="2416" y="102" width="36" height="36" />
+        <dc:Bounds x="2616" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2417" y="83" width="34" height="14" />
+          <dc:Bounds x="2617" y="83" width="34" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_be_feature_sla" bpmnElement="be_feature_sla">
-        <dc:Bounds x="1348" y="302" width="36" height="36" />
+        <dc:Bounds x="1548" y="302" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1324" y="383" width="84" height="14" />
+          <dc:Bounds x="1524" y="383" width="84" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReadinessGw" bpmnElement="f_toReadinessGw">
@@ -405,41 +422,45 @@
         <di:waypoint x="666" y="120" />
         <di:waypoint x="766" y="120" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_w_toGw" bpmnElement="w_toGw">
+      <bpmndi:BPMNEdge id="BPMNEdge_f_implementing" bpmnElement="f_implementing">
         <di:waypoint x="866" y="120" />
         <di:waypoint x="966" y="120" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_w_toGw" bpmnElement="w_toGw">
+        <di:waypoint x="1066" y="120" />
+        <di:waypoint x="1166" y="120" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_done" bpmnElement="w_done">
-        <di:waypoint x="1016" y="120" />
-        <di:waypoint x="1666" y="120" />
+        <di:waypoint x="1216" y="120" />
+        <di:waypoint x="1866" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1325" y="98" width="32" height="14" />
+          <dc:Bounds x="1525" y="98" width="32" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toBlockedGw" bpmnElement="f_toBlockedGw">
-        <di:waypoint x="1766" y="120" />
-        <di:waypoint x="1866" y="120" />
+        <di:waypoint x="1966" y="120" />
+        <di:waypoint x="2066" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_notBlocked" bpmnElement="f_notBlocked">
-        <di:waypoint x="1916" y="120" />
-        <di:waypoint x="2041" y="120" />
+        <di:waypoint x="2116" y="120" />
+        <di:waypoint x="2241" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1940" y="98" width="78" height="14" />
+          <dc:Bounds x="2140" y="98" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_noConverge" bpmnElement="f_noConverge">
-        <di:waypoint x="2091" y="120" />
-        <di:waypoint x="2416" y="120" />
+        <di:waypoint x="2291" y="120" />
+        <di:waypoint x="2616" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2218" y="98" width="71" height="14" />
+          <dc:Bounds x="2418" y="98" width="71" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_abandon" bpmnElement="w_abandon">
-        <di:waypoint x="1566" y="280" />
-        <di:waypoint x="1716" y="280" />
-        <di:waypoint x="1716" y="160" />
+        <di:waypoint x="1766" y="280" />
+        <di:waypoint x="1916" y="280" />
+        <di:waypoint x="1916" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1615" y="258" width="53" height="14" />
+          <dc:Bounds x="1815" y="258" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_readiness_gate" bpmnElement="f_readiness_gate">
@@ -451,27 +472,27 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_escalate" bpmnElement="w_escalate">
-        <di:waypoint x="991" y="145" />
-        <di:waypoint x="991" y="280" />
-        <di:waypoint x="1116" y="280" />
+        <di:waypoint x="1191" y="145" />
+        <di:waypoint x="1191" y="280" />
+        <di:waypoint x="1316" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="996" y="206" width="67" height="14" />
+          <dc:Bounds x="1196" y="206" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_blocked" bpmnElement="f_blocked">
-        <di:waypoint x="1891" y="145" />
-        <di:waypoint x="1891" y="440" />
-        <di:waypoint x="2016" y="440" />
+        <di:waypoint x="2091" y="145" />
+        <di:waypoint x="2091" y="440" />
+        <di:waypoint x="2216" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1896" y="286" width="53" height="14" />
+          <dc:Bounds x="2096" y="286" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_converge" bpmnElement="f_converge">
-        <di:waypoint x="2066" y="145" />
-        <di:waypoint x="2066" y="280" />
-        <di:waypoint x="2216" y="280" />
+        <di:waypoint x="2266" y="145" />
+        <di:waypoint x="2266" y="280" />
+        <di:waypoint x="2416" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2071" y="206" width="60" height="14" />
+          <dc:Bounds x="2271" y="206" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_readiness_done" bpmnElement="f_readiness_done">
@@ -480,43 +501,43 @@
         <di:waypoint x="616" y="160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_toEscalationTask" bpmnElement="w_toEscalationTask">
-        <di:waypoint x="1216" y="280" />
-        <di:waypoint x="1316" y="280" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_w_toAnswerGw" bpmnElement="w_toAnswerGw">
         <di:waypoint x="1416" y="280" />
         <di:waypoint x="1516" y="280" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_w_toAnswerGw" bpmnElement="w_toAnswerGw">
+        <di:waypoint x="1616" y="280" />
+        <di:waypoint x="1716" y="280" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toBlockedAck" bpmnElement="f_toBlockedAck">
-        <di:waypoint x="2116" y="440" />
-        <di:waypoint x="2216" y="440" />
+        <di:waypoint x="2316" y="440" />
+        <di:waypoint x="2416" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_blockedEnd" bpmnElement="f_blockedEnd">
-        <di:waypoint x="2316" y="440" />
-        <di:waypoint x="2434" y="440" />
-        <di:waypoint x="2434" y="138" />
+        <di:waypoint x="2516" y="440" />
+        <di:waypoint x="2634" y="440" />
+        <di:waypoint x="2634" y="138" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toEndConverged" bpmnElement="f_toEndConverged">
-        <di:waypoint x="2316" y="280" />
-        <di:waypoint x="2434" y="280" />
-        <di:waypoint x="2434" y="138" />
+        <di:waypoint x="2516" y="280" />
+        <di:waypoint x="2634" y="280" />
+        <di:waypoint x="2634" y="138" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_sla" bpmnElement="w_sla">
-        <di:waypoint x="1366" y="338" />
-        <di:waypoint x="1366" y="358" />
-        <di:waypoint x="1716" y="358" />
-        <di:waypoint x="1716" y="160" />
+        <di:waypoint x="1566" y="338" />
+        <di:waypoint x="1566" y="358" />
+        <di:waypoint x="1916" y="358" />
+        <di:waypoint x="1916" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1557" y="325" width="88" height="28" />
+          <dc:Bounds x="1757" y="325" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_w_answerLoop" bpmnElement="w_answerLoop">
-        <di:waypoint x="1541" y="305" />
-        <di:waypoint x="1541" y="360" />
+        <di:waypoint x="1741" y="305" />
+        <di:waypoint x="1741" y="360" />
         <di:waypoint x="816" y="360" />
         <di:waypoint x="816" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1154" y="338" width="49" height="14" />
+          <dc:Bounds x="1254" y="338" width="49" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>