@nanobpm/nano-workforce 0.171.2 → 0.171.3

package/e2e/plan-fanout-sla.e2e.ts

@@ -108,7 +108,10 @@ describe("plan-fanout escalation SLA + assignment (U5)", () => {
   }
 
   async function openTask(app: TestApp, processKey: string, elementId: string): Promise<InboxTask> {
-    const tasks = await app.engine.searchUserTasks({ processInstanceKey: processKey });
+    // Root-scoped: the implement-stage escalation now parks on a `human-escalation` grandchild the
+    // shared `implement-cell` spawns (ADR 0006 S4); plan-level tasks (plan-review, trial-merge) still
+    // park on the root instance and remain discoverable under a root-scoped search (superset).
+    const tasks = await app.engine.searchUserTasks({ rootProcessInstanceKey: processKey });
     const match = tasks.find((t) => t.elementId === elementId);
     assert.ok(match, `expected an open ${elementId} user task (open: ${tasks.map((t) => t.elementId).join(", ")})`);
     return match!;
@@ -118,7 +121,7 @@ describe("plan-fanout escalation SLA + assignment (U5)", () => {
    *  filter) and NOT by a bogus group — proving `zeebe:assignmentDefinition candidateGroups` took. */
   async function assertAssignmentFilterable(app: TestApp, processKey: string, elementId: string) {
     const byOperators = await app.engine.searchUserTasks({
-      processInstanceKey: processKey,
+      rootProcessInstanceKey: processKey,
       candidateGroup: "operators",
     });
     assert.ok(
@@ -126,7 +129,7 @@ describe("plan-fanout escalation SLA + assignment (U5)", () => {
       `${elementId} is filterable by the operators candidate group`,
     );
     const byBogus = await app.engine.searchUserTasks({
-      processInstanceKey: processKey,
+      rootProcessInstanceKey: processKey,
       candidateGroup: "nobody-here",
     });
     assert.ok(
@@ -150,20 +153,21 @@ describe("plan-fanout escalation SLA + assignment (U5)", () => {
         }),
       },
       async ({ app, processKey }) => {
-        await openTask(app, processKey, "feature-escalation");
-        await assertAssignmentFilterable(app, processKey, "feature-escalation");
+        await openTask(app, processKey, "escalation");
+        await assertAssignmentFilterable(app, processKey, "escalation");
 
-        // Never answer — let the SLA elapse. The interrupting boundary cancels the parked task and
-        // routes to the task-done end (the safe auto-abandon default).
+        // Never answer — let the SLA elapse. The interrupting boundary (on the human-escalation cell's
+        // `escalation` task) cancels the parked task and routes to its SLA auto-abandon end; the cell
+        // then takes its abandon default (the safe auto-abandon of the slice).
         await advancePastTimer(app, PAST_SLA_MS);
 
         const flows = takenFlows(app);
         assert.ok(
-          flows.includes("be_feature_sla->w_end"),
-          `the SLA boundary auto-abandoned to the task-done end (flows: ${flows.join(", ")})`,
+          flows.includes("be_he_sla->he_end_sla"),
+          `the SLA boundary auto-abandoned to the human-escalation cell's SLA end (flows: ${flows.join(", ")})`,
         );
         assert.ok(
-          !flows.includes("w_gw_answer->implement-task"),
+          !flows.includes("ic_gw_answer->record-implementing"),
           "the human answer loop was NOT taken",
         );
       },

package/e2e/plan-fanout.e2e.ts

@@ -106,7 +106,11 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
   }
 
   async function openTask(app: TestApp, processKey: string, elementId: string): Promise<InboxTask> {
-    const tasks = await app.engine.searchUserTasks({ processInstanceKey: processKey });
+    // Root-scoped: the implement-stage escalation now parks on a `human-escalation` grandchild the
+    // shared `implement-cell` spawns (ADR 0006 S4); plan-level tasks (plan-review, empty-plan,
+    // trial-merge, the caps-timeout `feature-escalation`) still park on the root and remain
+    // discoverable under a root-scoped search (a superset of the parent's own tasks).
+    const tasks = await app.engine.searchUserTasks({ rootProcessInstanceKey: processKey });
     const match = tasks.find((t) => t.elementId === elementId);
     assert.ok(match, `expected an open ${elementId} user task (open: ${tasks.map((t) => t.elementId).join(", ")})`);
     return match!;
@@ -131,20 +135,20 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
         },
       },
       async ({ app, processKey }) => {
-        const task = await openTask(app, processKey, "feature-escalation");
-        assert.ok(task.userTaskKey, "the feature escalation carries a completable userTaskKey");
+        const task = await openTask(app, processKey, "escalation");
+        assert.ok(task.userTaskKey, "the human-escalation cell task carries a completable userTaskKey");
 
-        // Answer it: the typed resolution loops the child back to re-dispatch the SAME task.
+        // Answer it: the typed resolution loops the cell back to re-dispatch the SAME task.
         await app.engine.completeUserTask(task.userTaskKey, { resolution: "answer", answer: "use v2" });
         await app.settle();
 
         const flows = takenFlows(app);
         assert.ok(
-          flows.includes("w_gw_answer->implement-task"),
-          `answer routed back to implement-task (flows: ${flows.join(", ")})`,
+          flows.includes("ic_gw_answer->record-implementing") && flows.includes("record-implementing->implement-task"),
+          `answer routed back to implement-task through the cell reset (flows: ${flows.join(", ")})`,
         );
         assert.ok(
-          !flows.includes("w_gw_answer->w_end"),
+          !flows.includes("ic_gw_answer->ic_end"),
           "the abandon (default) flow was NOT taken",
         );
       },
@@ -163,17 +167,17 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
         }),
       },
       async ({ app, processKey }) => {
-        const task = await openTask(app, processKey, "feature-escalation");
+        const task = await openTask(app, processKey, "escalation");
         await app.engine.completeUserTask(task.userTaskKey, { resolution: "abandon" });
         await app.settle();
 
         const flows = takenFlows(app);
         assert.ok(
-          flows.includes("w_gw_answer->w_end"),
-          `abandon routed to the task-done end (flows: ${flows.join(", ")})`,
+          flows.includes("ic_gw_answer->ic_end"),
+          `abandon routed to the cell's task-done end (flows: ${flows.join(", ")})`,
         );
         assert.ok(
-          !flows.includes("w_gw_answer->implement-task"),
+          !flows.includes("ic_gw_answer->record-implementing"),
           "the answer loop was NOT taken",
         );
       },
@@ -454,7 +458,7 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
           `task with needs routed through the barrier gateway to wait-caps-resolved (flows: ${parked.join(", ")})`,
         );
         assert.ok(
-          !parked.includes("w_gw_needs->implement-task"),
+          !parked.includes("w_gw_needs->implement-cell-call"),
           "the no-needs shortcut was NOT taken for a task that declares needs",
         );
         assert.equal(featureBrief, undefined, "the agent has not been dispatched while parked at the barrier");
@@ -471,8 +475,8 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
 
         const flows = takenFlows(app);
         assert.ok(
-          flows.includes("wait-caps-resolved->implement-task"),
-          `caps-resolved released the barrier into implement-task (flows: ${flows.join(", ")})`,
+          flows.includes("wait-caps-resolved->implement-cell-call") && flows.includes("Start->implement-task"),
+          `caps-resolved released the barrier into the implement cell (flows: ${flows.join(", ")})`,
         );
         assert.equal(
           featureBrief,
@@ -534,15 +538,16 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
           `the caps bound escalated the parked task to the operator (flows: ${flows.join(", ")})`,
         );
         assert.ok(
-          !flows.includes("wait-caps-resolved->implement-task"),
+          !flows.includes("wait-caps-resolved->implement-cell-call"),
           "the resolve arm was withdrawn — the token did not also proceed as if resolved",
         );
         assert.equal(featureRan, false, "the agent was NOT dispatched — the unresolved task escalated instead");
 
-        // The escalation is a genuine, operable operator decision point: answering it loops the
-        // child back to re-dispatch the task (the operator having unblocked/decided), exactly like an
-        // agent-raised escalation — proving this is a real bounded wait + operator escalation, not a
-        // dead end.
+        // The escalation is a genuine, operable operator decision point: answering it releases the
+        // caps barrier into the implement cell (the operator having unblocked/decided), proving this is
+        // a real bounded wait + operator escalation, not a dead end. This is the plan-fanout's OWN
+        // caps-timeout `feature-escalation` task (the fan-out-specific barrier is surrounding
+        // orchestration, retained per ADR 0006 S4), distinct from the implement cell's `escalation`.
         const task = await openTask(app, processKey, "feature-escalation");
         assert.ok(task.userTaskKey, "the caps-timeout escalation carries a completable userTaskKey");
         await app.engine.completeUserTask(task.userTaskKey, { resolution: "answer", answer: "shipped it manually" });
@@ -550,8 +555,8 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
 
         const answered = takenFlows(app);
         assert.ok(
-          answered.includes("w_gw_answer->implement-task"),
-          `answering the caps escalation routed back to implement-task (flows: ${answered.join(", ")})`,
+          answered.includes("w_gw_answer->implement-cell-call") && answered.includes("Start->implement-task"),
+          `answering the caps escalation released the barrier into the implement cell (flows: ${answered.join(", ")})`,
         );
         assert.equal(featureRan, true, "the agent was dispatched once the operator answered the caps escalation");
       },

package/nano.app.json

@@ -172,10 +172,6 @@
       "taskType": "pr.record-wave",
       "handler": "workers/record-wave/worker.ts"
     },
-    {
-      "taskType": "pr.record-wave-escalation",
-      "handler": "workers/record-wave-escalation/worker.ts"
-    },
     {
       "taskType": "pr.record-feature",
       "handler": "workers/record-feature/worker.ts"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.171.2",
+  "version": "0.171.3",
   "description": "Nano Workforce — an Agent Graph Orchestration application for Agentic SDLC: durable BPMN processes that coordinate a graph of AI agents across the software delivery lifecycle.",
   "type": "module",
   "main": "main.ts",
@@ -63,12 +63,12 @@
   },
   "dependencies": {
     "@nanobpm/agentic": "^0.10.0",
-    "@nanobpm/urban": "^0.88.1",
+    "@nanobpm/urban": "^0.90.0",
     "bpmn-auto-layout": "^2.0.0-alpha.2"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.11",
-    "@nanobpm/urban-testkit": "^1.0.1",
+    "@nanobpm/urban-testkit": "^1.2.0",
     "@nanobpm/workflow": "^0.14.0",
     "@semantic-release/changelog": "^7.0.0",
     "@semantic-release/git": "^11.0.0",

package/resources/processes/feature.bpmn

@@ -9,12 +9,9 @@
           <nano:extend name="pr" type="string" optional="true" />
           <nano:extend name="summary" type="string" optional="true" />
         </nano:shape>
-        <nano:shape id="RecordFeatureEscalationIn" name="Record feature escalation — input">
-          <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:extend name="featureKey" type="string" optional="true" />
+          <nano:extend name="subjectKey" type="string" optional="true" />
         </nano:shape>
         <nano:shape id="ConvergeFeatureIn" name="Converge feature PR — input">
           <nano:extend name="featureKey" type="string" />
@@ -172,23 +169,28 @@
       <bpmn:incoming>f_readiness_done</bpmn:incoming>
       <bpmn:outgoing>f_toImplement</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="implement-task" name="Implement (agent)">
+    <bpmn:callActivity id="implement" name="Implement cell">
       <bpmn:extensionElements>
-        <zeebe:taskDefinition type="senior:feature" />
-        <zeebe:linkedResources>
-          <zeebe:linkedResource resourceId="prompts/feature.md" bindingType="latest" resourceType="GenericScript" linkName="prompt" />
-        </zeebe:linkedResources>
+        <zeebe:calledElement processId="implement-cell" />
         <zeebe:ioMapping>
-          <zeebe:input source="=&#34;&#10;&#10;---&#10;&#10;&#34; + task.prompt + (if (baseBranchBrief = null) then &#34;&#34; else baseBranchBrief) + (if (resolvedArtifacts = null or count(resolvedArtifacts[item != null]) = 0) then &#34;&#34; else (&#34;&#10;&#10;---&#10;&#10;**Bound upstream readiness (intake gate).** This feature was scheduled to wait until an upstream landed and published. Build/install/clone against EXACTLY these resolved published versions (the ones first carrying the awaited capability), and bump the consumer dependency to them — never merely the newest:&#10;&#10;&#34; + string join(resolvedArtifacts[item != null], &#34;&#10;&#34;))) + (if (customInstructions = null) then &#34;&#34; else &#34;&#10;&#10;---&#10;&#10;## Operator custom instructions&#10;&#10;The operator supplied these instructions for this run — follow them:&#10;&#10;&#34; + customInstructions)" target="appendPrompt" />
+          <zeebe:input source="=task" target="task" />
+          <zeebe:input source="=if (is defined(baseBranchBrief)) then baseBranchBrief else null" target="baseBranchBrief" />
+          <zeebe:input source="=if (is defined(resolvedArtifacts)) then resolvedArtifacts else null" target="resolvedArtifacts" />
+          <zeebe:input source="=if (is defined(customInstructions)) then customInstructions else null" target="customInstructions" />
           <zeebe:input source="=if (is defined(transcriptUrlBase)) then transcriptUrlBase else null" target="transcriptUrlBase" />
+          <zeebe:input source="=if (is defined(escalationAssignee)) then escalationAssignee else null" target="escalationAssignee" />
+          <zeebe:input source="=escalationSlaTimeout" target="escalationSlaTimeout" />
+          <zeebe:input source="=featureKey" target="subjectKey" />
           <zeebe:output source="=status" target="status" />
-          <zeebe:output source="=question" target="question" />
+          <zeebe:output source="=if (is defined(summary)) then summary else null" target="summary" />
+          <zeebe:output source="=if (is defined(pr)) then pr else null" target="pr" />
+          <zeebe:output source="=if (is defined(question)) then question else null" target="question" />
           <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:outgoing>w_toRecord</bpmn:outgoing>
+    </bpmn:callActivity>
     <bpmn:serviceTask id="record-feature-implementing" name="Record implementing">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.record-feature-implementing" />
@@ -197,44 +199,8 @@
         </zeebe:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>f_toImplement</bpmn:incoming>
-      <bpmn:incoming>w_answerLoop</bpmn:incoming>
       <bpmn:outgoing>f_implementing</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:exclusiveGateway id="w_gw" name="escalated?" default="w_done">
-      <bpmn:incoming>w_toGw</bpmn:incoming>
-      <bpmn:outgoing>w_escalate</bpmn:outgoing>
-      <bpmn:outgoing>w_done</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:serviceTask id="record-feature-escalation" name="Record escalation">
-      <bpmn:extensionElements>
-        <zeebe:taskDefinition type="pr.record-feature-escalation" />
-        <zeebe:properties>
-          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordFeatureEscalationIn" />
-        </zeebe:properties>
-      </bpmn:extensionElements>
-      <bpmn:incoming>w_escalate</bpmn:incoming>
-      <bpmn:outgoing>w_toEscalationTask</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:userTask id="feature-escalation" name="Task escalation (human)">
-      <bpmn:extensionElements>
-        <zeebe:formDefinition formId="feature-escalation" />
-        <zeebe:userTask />
-        <zeebe:assignmentDefinition candidateGroups="operators" assignee="=if (is defined(escalationAssignee) and escalationAssignee != null and trim(string(escalationAssignee)) != &#34;&#34;) then escalationAssignee else null" />
-      </bpmn:extensionElements>
-      <bpmn:incoming>w_toEscalationTask</bpmn:incoming>
-      <bpmn:outgoing>w_toAnswerGw</bpmn:outgoing>
-    </bpmn:userTask>
-    <bpmn:boundaryEvent id="be_feature_sla" name="SLA elapsed" attachedToRef="feature-escalation">
-      <bpmn:outgoing>w_sla</bpmn:outgoing>
-      <bpmn:timerEventDefinition id="ted_feature_sla">
-        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=escalationSlaTimeout</bpmn:timeDuration>
-      </bpmn:timerEventDefinition>
-    </bpmn:boundaryEvent>
-    <bpmn:exclusiveGateway id="w_gw_answer" name="answer?" default="w_abandon">
-      <bpmn:incoming>w_toAnswerGw</bpmn:incoming>
-      <bpmn:outgoing>w_answerLoop</bpmn:outgoing>
-      <bpmn:outgoing>w_abandon</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
     <bpmn:serviceTask id="record-feature" name="Record result">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.record-feature" />
@@ -242,9 +208,7 @@
           <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordFeatureIn" />
         </zeebe:properties>
       </bpmn:extensionElements>
-      <bpmn:incoming>w_done</bpmn:incoming>
-      <bpmn:incoming>w_abandon</bpmn:incoming>
-      <bpmn:incoming>w_sla</bpmn:incoming>
+      <bpmn:incoming>w_toRecord</bpmn:incoming>
       <bpmn:outgoing>f_toBlockedGw</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="gw-blocked" name="blocked?" default="f_notBlocked">
@@ -301,19 +265,8 @@
     <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="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>
-    </bpmn:sequenceFlow>
-    <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="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" />
-    <bpmn:sequenceFlow id="w_sla" name="SLA auto-abandon" sourceRef="be_feature_sla" targetRef="record-feature" />
+    <bpmn:sequenceFlow id="f_implementing" sourceRef="record-feature-implementing" targetRef="implement" />
+    <bpmn:sequenceFlow id="w_toRecord" sourceRef="implement" targetRef="record-feature" />
     <bpmn:sequenceFlow id="f_toBlockedGw" sourceRef="record-feature" targetRef="gw-blocked" />
     <bpmn:sequenceFlow id="f_blocked" name="blocked" sourceRef="gw-blocked" targetRef="feature-blocked">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=featureStatus = "blocked"</bpmn:conditionExpression>
@@ -347,64 +300,40 @@
       <bpmndi:BPMNShape id="BPMNShape_ensure-base-branch" bpmnElement="ensure-base-branch">
         <dc:Bounds x="566" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_implement-task" bpmnElement="implement-task">
+      <bpmndi:BPMNShape id="BPMNShape_implement" bpmnElement="implement">
         <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="1166" y="95" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <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="1316" y="240" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_feature-escalation" bpmnElement="feature-escalation">
-        <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="1716" y="255" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <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="1866" y="80" width="100" height="80" />
+        <dc:Bounds x="1166" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-blocked" bpmnElement="gw-blocked" isMarkerVisible="true">
-        <dc:Bounds x="2066" y="95" width="50" height="50" />
+        <dc:Bounds x="1366" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2061" y="76" width="60" height="14" />
+          <dc:Bounds x="1361" y="76" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_feature-blocked" bpmnElement="feature-blocked">
-        <dc:Bounds x="2216" y="400" width="100" height="80" />
+        <dc:Bounds x="1516" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-blocked-ack" bpmnElement="record-blocked-ack">
-        <dc:Bounds x="2416" y="400" width="100" height="80" />
+        <dc:Bounds x="1716" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-converge" bpmnElement="gw-converge" isMarkerVisible="true">
-        <dc:Bounds x="2241" y="95" width="50" height="50" />
+        <dc:Bounds x="1541" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2233" y="76" width="67" height="14" />
+          <dc:Bounds x="1533" y="76" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_converge" bpmnElement="converge">
-        <dc:Bounds x="2416" y="240" width="100" height="80" />
+        <dc:Bounds x="1716" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_End" bpmnElement="End">
-        <dc:Bounds x="2616" y="102" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <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="1548" y="302" width="36" height="36" />
+        <dc:Bounds x="1916" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1524" y="383" width="84" height="14" />
+          <dc:Bounds x="1917" y="83" width="34" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReadinessGw" bpmnElement="f_toReadinessGw">
@@ -426,41 +355,26 @@
         <di:waypoint x="866" y="120" />
         <di:waypoint x="966" y="120" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_w_toGw" bpmnElement="w_toGw">
+      <bpmndi:BPMNEdge id="BPMNEdge_w_toRecord" bpmnElement="w_toRecord">
         <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="1216" y="120" />
-        <di:waypoint x="1866" y="120" />
-        <bpmndi:BPMNLabel>
-          <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="1966" y="120" />
-        <di:waypoint x="2066" y="120" />
+        <di:waypoint x="1266" y="120" />
+        <di:waypoint x="1366" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_notBlocked" bpmnElement="f_notBlocked">
-        <di:waypoint x="2116" y="120" />
-        <di:waypoint x="2241" y="120" />
+        <di:waypoint x="1416" y="120" />
+        <di:waypoint x="1541" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2140" y="98" width="78" height="14" />
+          <dc:Bounds x="1440" y="98" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_noConverge" bpmnElement="f_noConverge">
-        <di:waypoint x="2291" y="120" />
-        <di:waypoint x="2616" y="120" />
-        <bpmndi:BPMNLabel>
-          <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="1766" y="280" />
-        <di:waypoint x="1916" y="280" />
-        <di:waypoint x="1916" y="160" />
+        <di:waypoint x="1591" y="120" />
+        <di:waypoint x="1916" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1815" y="258" width="53" height="14" />
+          <dc:Bounds x="1718" y="98" width="71" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_readiness_gate" bpmnElement="f_readiness_gate">
@@ -471,28 +385,20 @@
           <dc:Bounds x="246" y="206" width="39" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_w_escalate" bpmnElement="w_escalate">
-        <di:waypoint x="1191" y="145" />
-        <di:waypoint x="1191" y="280" />
-        <di:waypoint x="1316" y="280" />
-        <bpmndi:BPMNLabel>
-          <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="2091" y="145" />
-        <di:waypoint x="2091" y="440" />
-        <di:waypoint x="2216" y="440" />
+        <di:waypoint x="1391" y="145" />
+        <di:waypoint x="1391" y="440" />
+        <di:waypoint x="1516" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2096" y="286" width="53" height="14" />
+          <dc:Bounds x="1396" y="286" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_converge" bpmnElement="f_converge">
-        <di:waypoint x="2266" y="145" />
-        <di:waypoint x="2266" y="280" />
-        <di:waypoint x="2416" y="280" />
+        <di:waypoint x="1566" y="145" />
+        <di:waypoint x="1566" y="280" />
+        <di:waypoint x="1716" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2271" y="206" width="60" height="14" />
+          <dc:Bounds x="1571" y="206" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_readiness_done" bpmnElement="f_readiness_done">
@@ -500,45 +406,19 @@
         <di:waypoint x="616" y="280" />
         <di:waypoint x="616" y="160" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_w_toEscalationTask" bpmnElement="w_toEscalationTask">
-        <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="2316" y="440" />
-        <di:waypoint x="2416" y="440" />
+        <di:waypoint x="1616" y="440" />
+        <di:waypoint x="1716" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_blockedEnd" bpmnElement="f_blockedEnd">
-        <di:waypoint x="2516" y="440" />
-        <di:waypoint x="2634" y="440" />
-        <di:waypoint x="2634" y="138" />
+        <di:waypoint x="1816" y="440" />
+        <di:waypoint x="1934" y="440" />
+        <di:waypoint x="1934" y="138" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toEndConverged" bpmnElement="f_toEndConverged">
-        <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="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="1757" y="325" width="88" height="28" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_w_answerLoop" bpmnElement="w_answerLoop">
-        <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="1254" y="338" width="49" height="14" />
-        </bpmndi:BPMNLabel>
+        <di:waypoint x="1816" y="280" />
+        <di:waypoint x="1934" y="280" />
+        <di:waypoint x="1934" y="138" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>