@nanobpm/nano-workforce 0.57.0 → 0.58.0

package/resources/agent-guide.md

@@ -160,43 +160,71 @@ curl -sS __BASE__/status | jq '.prs[] | select(.openEscalation != null)
   | { prKey, status, round, openEscalation }'
 ```
 
-**Answer a PR/merge escalation** (convergence-loop or merge-loop). Use the message
-name `escalation-answered`; correlate by the PR key:
+The four decision-required escalation kinds — **PR review-loop**, **implementation
+(feature) task**, **plan-review**, and **trial-merge** — are now native BPMN
+`userTask`s bearing a linked `.form`, all answered the same way through the **task
+inbox** surface. There is no bespoke per-kind webhook or answer page any more.
+
+**List the open escalation tasks.** Each task carries its context (e.g. `prKey` /
+`question` / `findings` / `task`) in its `variables`, and its kind in `elementId`:
 
 ```bash
-curl -sS -X POST __BASE__/actions/message \
-  -H 'content-type: application/json' \
-  -d '{
-        "name": "escalation-answered",
-        "correlationKey": "owner/repo#123",
-        "variables": { "answer": "Yes — cap the retries at 5 and proceed." }
-      }'
+# Every parked escalation, across all kinds:
+curl -sS __BASE__/../../tasks/api/tasks | jq '.[] | { userTaskKey, elementId, variables }'
+
+# Filter to one kind (e.g. plan-review decisions) by elementId:
+curl -sS __BASE__/../../tasks/api/tasks \
+  | jq '[.[] | select(.elementId == "plan-review-decision")]'
 ```
 
-The answer is delivered to the agent as the `answer` variable on its next round, and
-the loop resumes.
+The inbox UI is also served at `__BASE__/../../tasks` for a human to browse, filter, and
+answer (assignee/candidate-group and age surface on each task once assignment lands).
 
-**Answer an implementation-phase (feature) task escalation** raised during a
-plan fan-out — a dedicated webhook operation:
+**Answer a task** by completing it with the typed variables its form expects — the
+completion resumes the parked process:
 
 ```bash
-curl -sS -X POST __BASE__/hooks/feature-answer \
-  -H 'content-type: application/json' \
-  -d '{ "correlationKey": "<task-or-pr-key>", "answer": "…" }'
+# PR review-loop (elementId `wait-answer`, pr-escalation form):
+curl -sS -X POST __BASE__/../../tasks/api/complete -H 'content-type: application/json' \
+  -d '{ "userTaskKey": "<key>", "variables": { "answer": "Cap retries at 5 and proceed." } }'
+
+# Implementation (feature) task (elementId `feature-escalation`):
+#   { "resolution": "answer", "answer": "…" }  to resume, or  { "resolution": "abandon" }
+curl -sS -X POST __BASE__/../../tasks/api/complete -H 'content-type: application/json' \
+  -d '{ "userTaskKey": "<key>", "variables": { "resolution": "answer", "answer": "Use v2." } }'
+
+# Plan-review (elementId `plan-review-decision`):
+#   { "directive": "revise", "notes": "…" }  (fresh review budget)  or  { "directive": "proceed" }
+curl -sS -X POST __BASE__/../../tasks/api/complete -H 'content-type: application/json' \
+  -d '{ "userTaskKey": "<key>", "variables": { "directive": "revise", "notes": "Make issue-7 the seam." } }'
+
+# Trial-merge (elementId `trial-merge-decision`):
+#   { "action": "proceed" | "rebase" | "abandon", "notes"?: "…" }
+curl -sS -X POST __BASE__/../../tasks/api/complete -H 'content-type: application/json' \
+  -d '{ "userTaskKey": "<key>", "variables": { "action": "rebase", "notes": "Re-run after the fix." } }'
 ```
 
-If `NANO_PR_WEBHOOK_SECRET` is set on the deployment, add `-H "x-hook-secret: <secret>"`.
-
-**Answer a plan-review escalation** raised when the adversarial plan review cannot
-converge within its round budget. Use `revise` to send guidance back to the planner
-with a fresh review budget, or `proceed` to explicitly approve the current plan as-is:
+**Answer a merge-loop escalation** (the one out-of-scope kind that still uses the
+durable message catch, not a user task). Use the message name `escalation-answered`,
+correlated by the PR key:
 
 ```bash
-curl -sS -X POST __BASE__/hooks/plan-answer \
+curl -sS -X POST __BASE__/actions/message \
   -H 'content-type: application/json' \
-  -d '{ "plan": "owner/repo#123", "directive": "revise", "note": "Keep the sub-issues 1:1; make issue-7 the seam and point siblings at it." }'
+  -d '{
+        "name": "escalation-answered",
+        "correlationKey": "owner/repo#123",
+        "variables": { "answer": "Yes — cap the retries at 5 and proceed." }
+      }'
 ```
 
+If `NANO_PR_WEBHOOK_SECRET` is set on the deployment, add `-H "x-hook-secret: <secret>"`.
+
+The answer is delivered to the agent as its next-round context (e.g. the `answer`,
+`directive`, or `action` variable), and the loop resumes. **Audit** is durable: the
+completed user tasks form the escalation history, and the review/merge loops' rows
+live in the `escalations` table (surfaced read-only per PR on the Convergence page).
+
 Guidance for the human you assist: read the escalation `question` or plan-review
 `findings` first, decide the smallest unblocking answer, and answer it precisely —
 the answer becomes the agent's next-round context.
@@ -209,7 +237,7 @@ the answer becomes the agent's next-round context.
  submit ──► convergence-loop
    round (senior:pr-review) ──► addressed ──► wait review-ready ─┐
                              ├─ converged  ──► finalize ──► merge-loop (unless convergeOnly)
-                             └─ needs_input/blocked ──► escalate ──► wait escalation-answered
+                             └─ needs_input/blocked ──► escalate ──► wait-answer userTask (task inbox)
  merge-loop: wait deps ─► arm merge ─► (queue-aware) merge / land
              blocked (CI red) ─► senior:fix-ci ─► retry     conflict ─► senior:rebase ─► retry
 ```

package/resources/forms/feature-escalation.form

@@ -0,0 +1,27 @@
+{
+  "id": "feature-escalation",
+  "schemaVersion": 18,
+  "type": "default",
+  "components": [
+    {
+      "type": "select",
+      "key": "resolution",
+      "label": "Resolution",
+      "values": [
+        { "label": "Answer — re-dispatch the task with this guidance", "value": "answer" },
+        { "label": "Abandon — give up on this task", "value": "abandon" }
+      ],
+      "validate": {
+        "required": true
+      }
+    },
+    {
+      "type": "textarea",
+      "key": "answer",
+      "label": "Answer / guidance for the implementation agent",
+      "conditional": {
+        "hide": "=resolution != \"answer\""
+      }
+    }
+  ]
+}

package/resources/forms/plan-review-decision.form

@@ -0,0 +1,27 @@
+{
+  "id": "plan-review-decision",
+  "schemaVersion": 18,
+  "type": "default",
+  "components": [
+    {
+      "type": "select",
+      "key": "directive",
+      "label": "Directive",
+      "values": [
+        { "label": "Proceed — dispatch the current plan as-is", "value": "proceed" },
+        { "label": "Revise — send the plan back to the planner", "value": "revise" }
+      ],
+      "validate": {
+        "required": true
+      }
+    },
+    {
+      "type": "textarea",
+      "key": "notes",
+      "label": "Revision guidance for the planner",
+      "conditional": {
+        "hide": "=directive != \"revise\""
+      }
+    }
+  ]
+}

package/resources/forms/pr-escalation.form

@@ -0,0 +1,23 @@
+{
+  "id": "pr-escalation",
+  "schemaVersion": 18,
+  "type": "default",
+  "components": [
+    {
+      "type": "textarea",
+      "key": "question",
+      "label": "Escalation question",
+      "description": "A human decision is needed to resume the PR review-convergence loop.",
+      "readonly": true
+    },
+    {
+      "type": "textarea",
+      "key": "answer",
+      "label": "Your answer",
+      "description": "Your reply resumes the review loop and is handed to the next review round.",
+      "validate": {
+        "required": true
+      }
+    }
+  ]
+}

package/resources/forms/spine-demo.form

@@ -0,0 +1,15 @@
+{
+  "id": "spine-demo",
+  "schemaVersion": 18,
+  "type": "default",
+  "components": [
+    {
+      "type": "textfield",
+      "key": "decision",
+      "label": "Decision",
+      "validate": {
+        "required": true
+      }
+    }
+  ]
+}

package/resources/forms/trial-merge-decision.form

@@ -0,0 +1,25 @@
+{
+  "id": "trial-merge-decision",
+  "schemaVersion": 18,
+  "type": "default",
+  "components": [
+    {
+      "type": "select",
+      "key": "action",
+      "label": "Action",
+      "values": [
+        { "label": "Proceed — accept the red trial merge and continue", "value": "proceed" },
+        { "label": "Rebase — re-run the trial merge", "value": "rebase" },
+        { "label": "Abandon — stop and finalize the plan", "value": "abandon" }
+      ],
+      "validate": {
+        "required": true
+      }
+    },
+    {
+      "type": "textarea",
+      "key": "notes",
+      "label": "Notes"
+    }
+  ]
+}

package/resources/processes/convergence-loop.bpmn

@@ -8,14 +8,6 @@
       </zeebe:properties>
     </bpmn:extensionElements>
   </bpmn:message>
-  <bpmn:message id="Message_escalationAnswered" name="escalation-answered">
-    <bpmn:extensionElements>
-      <zeebe:subscription correlationKey="=prKey" />
-      <zeebe:properties>
-        <zeebe:property name="io.nanobpm.dataEnvelope.in" value="EscalationAnswered" />
-      </zeebe:properties>
-    </bpmn:extensionElements>
-  </bpmn:message>
   <bpmn:process id="convergence-loop" name="PR Review Convergence" isExecutable="true">
     <bpmn:extensionElements>
       <nano:shapes>
@@ -46,7 +38,13 @@
           <nano:extend name="recordRound" type="boolean" optional="true" />
         </nano:shape>
         <nano:shape id="PrPersistEscalationOut" name="Record escalation — result">
-          <nano:extend name="escalationId" type="integer" />
+          <nano:extend name="escalationId" type="integer" optional="true" />
+          <nano:extend name="escalated" type="boolean" optional="true" />
+          <nano:extend name="question" type="string" optional="true" />
+        </nano:shape>
+        <nano:shape id="PrAnswerEscalationIn" name="Answer escalation — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="answer" type="string" optional="true" />
         </nano:shape>
         <nano:shape id="PrFinalizeIn" name="Mark converged — input">
           <nano:extend name="prKey" type="string" />
@@ -61,10 +59,6 @@
           <nano:extend name="reviewState" type="string" />
           <nano:extend name="submittedAt" type="datetime" optional="true" />
         </nano:shape>
-        <nano:shape id="EscalationAnswered" name="escalation-answered message payload">
-          <nano:extend name="answer" type="string" />
-          <nano:extend name="escalationId" type="integer" />
-        </nano:shape>
       </nano:shapes>
     </bpmn:extensionElements>
     <bpmn:startEvent id="Start" name="PR submitted">
@@ -100,6 +94,7 @@
     <bpmn:exclusiveGateway id="gw-guard" name="rounds left?" default="f_guardOk">
       <bpmn:incoming>f_addressed</bpmn:incoming>
       <bpmn:incoming>f_waiting</bpmn:incoming>
+      <bpmn:incoming>f_escReenter</bpmn:incoming>
       <bpmn:outgoing>f_guardMax</bpmn:outgoing>
       <bpmn:outgoing>f_guardOk</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -160,8 +155,13 @@
         </zeebe:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>f_escalate</bpmn:incoming>
-      <bpmn:outgoing>f_escWait</bpmn:outgoing>
+      <bpmn:outgoing>f_escGate</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-escalated" name="escalation opened?" default="f_escReenter">
+      <bpmn:incoming>f_escGate</bpmn:incoming>
+      <bpmn:outgoing>f_escWait</bpmn:outgoing>
+      <bpmn:outgoing>f_escReenter</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
     <bpmn:serviceTask id="persist-escalation-maxrounds" name="Escalate: max rounds">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.persist-escalation" />
@@ -177,13 +177,34 @@
       <bpmn:incoming>f_guardMax</bpmn:incoming>
       <bpmn:outgoing>f_maxWait</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:intermediateCatchEvent id="wait-answer" name="Wait: escalation answered">
+    <bpmn:userTask id="wait-answer" name="Answer escalation">
+      <bpmn:extensionElements>
+        <zeebe:formDefinition formId="pr-escalation" />
+        <zeebe:userTask />
+        <zeebe:ioMapping>
+          <zeebe:input source="=question" target="question" />
+          <zeebe:input source="=prKey" target="prKey" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
       <bpmn:incoming>f_escWait</bpmn:incoming>
       <bpmn:incoming>f_maxWait</bpmn:incoming>
       <bpmn:incoming>f_stalledWait</bpmn:incoming>
+      <bpmn:outgoing>f_answerRecord</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:serviceTask id="record-answer" name="Record answer">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.answer-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="PrAnswerEscalationIn" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=prKey" target="prKey" />
+          <zeebe:input source="=answer" target="answer" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_answerRecord</bpmn:incoming>
       <bpmn:outgoing>f_answerLoop</bpmn:outgoing>
-      <bpmn:messageEventDefinition id="med_escalationAnswered" messageRef="Message_escalationAnswered" />
-    </bpmn:intermediateCatchEvent>
+    </bpmn:serviceTask>
     <bpmn:serviceTask id="persist-converged" name="Mark converged">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.finalize" />
@@ -207,7 +228,7 @@
       <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:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "needs_input" or status = "blocked"</bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=(status = "needs_input" or status = "blocked") and question != null and trim(question) != ""</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>
@@ -219,9 +240,14 @@
     <bpmn:sequenceFlow id="f_reviewLoop" sourceRef="wait-review" targetRef="review-round" />
     <bpmn:sequenceFlow id="f_reviewStalled" sourceRef="wait-review-timeout" targetRef="persist-review-stalled" />
     <bpmn:sequenceFlow id="f_stalledWait" sourceRef="persist-review-stalled" targetRef="wait-answer" />
-    <bpmn:sequenceFlow id="f_escWait" sourceRef="persist-escalation" targetRef="wait-answer" />
+    <bpmn:sequenceFlow id="f_escGate" sourceRef="persist-escalation" targetRef="gw-escalated" />
+    <bpmn:sequenceFlow id="f_escWait" sourceRef="gw-escalated" targetRef="wait-answer">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=escalated = true</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_escReenter" name="no escalation opened" sourceRef="gw-escalated" targetRef="gw-guard" />
     <bpmn:sequenceFlow id="f_maxWait" sourceRef="persist-escalation-maxrounds" targetRef="wait-answer" />
-    <bpmn:sequenceFlow id="f_answerLoop" sourceRef="wait-answer" targetRef="review-round" />
+    <bpmn:sequenceFlow id="f_answerRecord" sourceRef="wait-answer" targetRef="record-answer" />
+    <bpmn:sequenceFlow id="f_answerLoop" sourceRef="record-answer" targetRef="review-round" />
     <bpmn:sequenceFlow id="f_finalize" sourceRef="persist-converged" targetRef="End" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_convergence-loop">
@@ -242,54 +268,60 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-guard" bpmnElement="gw-guard" isMarkerVisible="true">
-        <dc:Bounds x="591" y="255" width="50" height="50" />
+        <dc:Bounds x="916" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="574" y="310" width="85" height="14" />
+          <dc:Bounds x="899" y="310" width="85" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-round" bpmnElement="persist-round">
-        <dc:Bounds x="766" y="240" width="100" height="80" />
+        <dc:Bounds x="1066" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-review-wait" bpmnElement="gw-review-wait" isMarkerVisible="true">
-        <dc:Bounds x="966" y="255" width="50" height="50" />
+        <dc:Bounds x="1266" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="947" y="222" width="88" height="28" />
+          <dc:Bounds x="1247" y="222" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-review" bpmnElement="wait-review">
-        <dc:Bounds x="1116" y="262" width="36" height="36" />
+        <dc:Bounds x="1416" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1090" y="229" width="88" height="28" />
+          <dc:Bounds x="1390" y="229" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-review-timeout" bpmnElement="wait-review-timeout">
-        <dc:Bounds x="1116" y="422" width="36" height="36" />
+        <dc:Bounds x="1416" y="422" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1106" y="375" width="56" height="42" />
+          <dc:Bounds x="1406" y="463" width="56" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-review-stalled" bpmnElement="persist-review-stalled">
-        <dc:Bounds x="1252" y="400" width="100" height="80" />
+        <dc:Bounds x="1552" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation" bpmnElement="persist-escalation">
-        <dc:Bounds x="566" y="720" width="100" height="80" />
+        <dc:Bounds x="566" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-escalated" bpmnElement="gw-escalated" isMarkerVisible="true">
+        <dc:Bounds x="766" y="575" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="821" y="586" width="74" height="28" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation-maxrounds" bpmnElement="persist-escalation-maxrounds">
-        <dc:Bounds x="766" y="560" width="100" height="80" />
+        <dc:Bounds x="1066" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-answer" bpmnElement="wait-answer">
-        <dc:Bounds x="1452" y="422" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1433" y="375" width="74" height="42" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="1752" y="400" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_record-answer" bpmnElement="record-answer">
+        <dc:Bounds x="1952" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-converged" bpmnElement="persist-converged">
         <dc:Bounds x="566" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_End" bpmnElement="End">
-        <dc:Bounds x="798" y="102" width="36" height="36" />
+        <dc:Bounds x="773" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="782" y="143" width="69" height="14" />
+          <dc:Bounds x="757" y="143" width="69" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_start" bpmnElement="f_start">
@@ -309,33 +341,41 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_finalize" bpmnElement="f_finalize">
         <di:waypoint x="666" y="120" />
-        <di:waypoint x="798" y="120" />
+        <di:waypoint x="773" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_guardOk" bpmnElement="f_guardOk">
-        <di:waypoint x="641" y="280" />
-        <di:waypoint x="766" y="280" />
+        <di:waypoint x="966" y="280" />
+        <di:waypoint x="1066" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="664" y="258" width="60" height="14" />
+          <dc:Bounds x="976" y="258" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_roundWait" bpmnElement="f_roundWait">
-        <di:waypoint x="866" y="280" />
-        <di:waypoint x="966" y="280" />
+        <di:waypoint x="1166" y="280" />
+        <di:waypoint x="1266" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReviewWait" bpmnElement="f_toReviewWait">
-        <di:waypoint x="1016" y="280" />
-        <di:waypoint x="1116" y="280" />
+        <di:waypoint x="1316" y="280" />
+        <di:waypoint x="1416" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reviewLoop" bpmnElement="f_reviewLoop">
-        <di:waypoint x="1134" y="298" />
-        <di:waypoint x="1134" y="340" />
+        <di:waypoint x="1434" y="298" />
+        <di:waypoint x="1434" y="340" />
         <di:waypoint x="266" y="340" />
         <di:waypoint x="266" y="160" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_escReenter" bpmnElement="f_escReenter">
+        <di:waypoint x="791" y="575" />
+        <di:waypoint x="791" y="280" />
+        <di:waypoint x="916" y="280" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="796" y="407" width="74" height="42" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_addressed" bpmnElement="f_addressed">
         <di:waypoint x="441" y="145" />
         <di:waypoint x="441" y="280" />
-        <di:waypoint x="591" y="280" />
+        <di:waypoint x="916" y="280" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="446" y="199" width="78" height="28" />
         </bpmndi:BPMNLabel>
@@ -343,55 +383,67 @@
       <bpmndi:BPMNEdge id="BPMNEdge_f_waiting" bpmnElement="f_waiting">
         <di:waypoint x="441" y="145" />
         <di:waypoint x="441" y="280" />
-        <di:waypoint x="591" y="280" />
+        <di:waypoint x="916" y="280" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="380" y="206" width="56" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_escalate" bpmnElement="f_escalate">
         <di:waypoint x="441" y="145" />
-        <di:waypoint x="441" y="760" />
-        <di:waypoint x="566" y="760" />
+        <di:waypoint x="441" y="600" />
+        <di:waypoint x="566" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="446" y="506" width="81" height="28" />
+          <dc:Bounds x="446" y="426" width="81" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_guardMax" bpmnElement="f_guardMax">
-        <di:waypoint x="641" y="280" />
-        <di:waypoint x="746" y="280" />
-        <di:waypoint x="746" y="600" />
-        <di:waypoint x="766" y="600" />
+        <di:waypoint x="966" y="280" />
+        <di:waypoint x="1046" y="280" />
+        <di:waypoint x="1046" y="600" />
+        <di:waypoint x="1066" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="751" y="433" width="74" height="14" />
+          <dc:Bounds x="1051" y="433" width="74" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReviewTimeout" bpmnElement="f_toReviewTimeout">
-        <di:waypoint x="991" y="305" />
-        <di:waypoint x="991" y="440" />
-        <di:waypoint x="1116" y="440" />
+        <di:waypoint x="1291" y="305" />
+        <di:waypoint x="1291" y="440" />
+        <di:waypoint x="1416" y="440" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_escWait" bpmnElement="f_escWait">
+        <di:waypoint x="791" y="625" />
+        <di:waypoint x="791" y="645" />
+        <di:waypoint x="1732" y="645" />
+        <di:waypoint x="1732" y="460" />
+        <di:waypoint x="1752" y="460" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reviewStalled" bpmnElement="f_reviewStalled">
-        <di:waypoint x="1152" y="440" />
-        <di:waypoint x="1252" y="440" />
+        <di:waypoint x="1452" y="440" />
+        <di:waypoint x="1552" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_stalledWait" bpmnElement="f_stalledWait">
-        <di:waypoint x="1352" y="440" />
-        <di:waypoint x="1452" y="440" />
+        <di:waypoint x="1652" y="440" />
+        <di:waypoint x="1752" y="440" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_escWait" bpmnElement="f_escWait">
-        <di:waypoint x="666" y="760" />
-        <di:waypoint x="1470" y="760" />
-        <di:waypoint x="1470" y="458" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_escGate" bpmnElement="f_escGate">
+        <di:waypoint x="666" y="600" />
+        <di:waypoint x="766" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_maxWait" bpmnElement="f_maxWait">
-        <di:waypoint x="866" y="600" />
-        <di:waypoint x="1470" y="600" />
-        <di:waypoint x="1470" y="458" />
+        <di:waypoint x="1166" y="620" />
+        <di:waypoint x="1186" y="620" />
+        <di:waypoint x="1186" y="645" />
+        <di:waypoint x="1802" y="645" />
+        <di:waypoint x="1802" y="480" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_answerRecord" bpmnElement="f_answerRecord">
+        <di:waypoint x="1852" y="440" />
+        <di:waypoint x="1952" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_answerLoop" bpmnElement="f_answerLoop">
-        <di:waypoint x="1470" y="458" />
-        <di:waypoint x="1470" y="500" />
-        <di:waypoint x="266" y="500" />
+        <di:waypoint x="2002" y="480" />
+        <di:waypoint x="2002" y="660" />
+        <di:waypoint x="266" y="660" />
         <di:waypoint x="266" y="160" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>