@nanobpm/nano-workforce 0.99.0 → 0.100.0

package/resources/processes/convergence-loop.bpmn

@@ -161,7 +161,7 @@
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>f_noProgress</bpmn:incoming>
-      <bpmn:outgoing>f_noprogressWait</bpmn:outgoing>
+      <bpmn:outgoing>f_noprogressGate</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:eventBasedGateway id="gw-review-wait" name="review ready or timeout?">
       <bpmn:incoming>f_progressOk</bpmn:incoming>
@@ -199,7 +199,7 @@
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>f_reviewStalled</bpmn:incoming>
-      <bpmn:outgoing>f_stalledWait</bpmn:outgoing>
+      <bpmn:outgoing>f_stalledGate</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:serviceTask id="persist-escalation" name="Record escalation">
       <bpmn:extensionElements>
@@ -214,6 +214,10 @@
     </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="gw-escalated" name="escalation opened?" default="f_escReenter">
       <bpmn:incoming>f_escGate</bpmn:incoming>
+      <bpmn:incoming>f_noprogressGate</bpmn:incoming>
+      <bpmn:incoming>f_stalledGate</bpmn:incoming>
+      <bpmn:incoming>f_blockedGate</bpmn:incoming>
+      <bpmn:incoming>f_maxGate</bpmn:incoming>
       <bpmn:outgoing>f_escWait</bpmn:outgoing>
       <bpmn:outgoing>f_escReenter</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -230,7 +234,7 @@
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>f_guardMax</bpmn:incoming>
-      <bpmn:outgoing>f_maxWait</bpmn:outgoing>
+      <bpmn:outgoing>f_maxGate</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:userTask id="wait-answer" name="Answer escalation">
       <bpmn:extensionElements>
@@ -242,10 +246,6 @@
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>f_escWait</bpmn:incoming>
-      <bpmn:incoming>f_maxWait</bpmn:incoming>
-      <bpmn:incoming>f_stalledWait</bpmn:incoming>
-      <bpmn:incoming>f_noprogressWait</bpmn:incoming>
-      <bpmn:incoming>f_blockedWait</bpmn:incoming>
       <bpmn:outgoing>f_answerRecord</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:serviceTask id="record-answer" name="Record answer">
@@ -302,7 +302,7 @@
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>f_convergeBlocked</bpmn:incoming>
-      <bpmn:outgoing>f_blockedWait</bpmn:outgoing>
+      <bpmn:outgoing>f_blockedGate</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:endEvent id="End" name="Converged">
       <bpmn:incoming>f_finalize</bpmn:incoming>
@@ -317,7 +317,7 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=convergeBlocked = true</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="f_convergeOk" name="addressed / default" sourceRef="gw-converge-gate" targetRef="persist-converged" />
-    <bpmn:sequenceFlow id="f_blockedWait" sourceRef="persist-escalation-blockedcomments" targetRef="wait-answer" />
+    <bpmn:sequenceFlow id="f_blockedGate" sourceRef="persist-escalation-blockedcomments" targetRef="gw-escalated" />
     <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>
@@ -335,18 +335,18 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=progressed = false</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="f_progressOk" name="progress / default" sourceRef="gw-progress" targetRef="gw-review-wait" />
-    <bpmn:sequenceFlow id="f_noprogressWait" sourceRef="persist-escalation-noprogress" targetRef="wait-answer" />
+    <bpmn:sequenceFlow id="f_noprogressGate" sourceRef="persist-escalation-noprogress" targetRef="gw-escalated" />
     <bpmn:sequenceFlow id="f_toReviewWait" sourceRef="gw-review-wait" targetRef="wait-review" />
     <bpmn:sequenceFlow id="f_toReviewTimeout" sourceRef="gw-review-wait" targetRef="wait-review-timeout" />
     <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_stalledGate" sourceRef="persist-review-stalled" targetRef="gw-escalated" />
     <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_maxGate" sourceRef="persist-escalation-maxrounds" targetRef="gw-escalated" />
     <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" />
@@ -369,84 +369,84 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-guard" bpmnElement="gw-guard" isMarkerVisible="true">
-        <dc:Bounds x="941" y="415" width="50" height="50" />
+        <dc:Bounds x="591" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="924" y="470" width="85" height="14" />
+          <dc:Bounds x="574" y="470" width="85" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-round" bpmnElement="persist-round">
-        <dc:Bounds x="1116" y="400" width="100" height="80" />
+        <dc:Bounds x="766" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_check-progress" bpmnElement="check-progress">
-        <dc:Bounds x="1316" y="400" width="100" height="80" />
+        <dc:Bounds x="966" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-progress" bpmnElement="gw-progress" isMarkerVisible="true">
-        <dc:Bounds x="1516" y="415" width="50" height="50" />
+        <dc:Bounds x="1166" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1511" y="382" width="60" height="28" />
+          <dc:Bounds x="1161" y="382" width="60" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation-noprogress" bpmnElement="persist-escalation-noprogress">
-        <dc:Bounds x="1666" y="720" width="100" height="80" />
+        <dc:Bounds x="1316" y="720" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-review-wait" bpmnElement="gw-review-wait" isMarkerVisible="true">
-        <dc:Bounds x="1691" y="415" width="50" height="50" />
+        <dc:Bounds x="1341" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1672" y="382" width="88" height="28" />
+          <dc:Bounds x="1322" y="382" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-review" bpmnElement="wait-review">
-        <dc:Bounds x="1866" y="422" width="36" height="36" />
+        <dc:Bounds x="1516" y="422" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1840" y="389" width="88" height="28" />
+          <dc:Bounds x="1490" y="389" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-review-timeout" bpmnElement="wait-review-timeout">
-        <dc:Bounds x="1866" y="582" width="36" height="36" />
+        <dc:Bounds x="1516" y="582" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1856" y="623" width="56" height="42" />
+          <dc:Bounds x="1506" y="623" width="56" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-review-stalled" bpmnElement="persist-review-stalled">
-        <dc:Bounds x="2002" y="560" width="100" height="80" />
+        <dc:Bounds x="1652" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation" bpmnElement="persist-escalation">
-        <dc:Bounds x="566" y="560" width="100" height="80" />
+        <dc:Bounds x="566" y="1040" 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" />
+        <dc:Bounds x="1852" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="821" y="586" width="74" height="28" />
+          <dc:Bounds x="1760" y="290" width="74" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation-maxrounds" bpmnElement="persist-escalation-maxrounds">
-        <dc:Bounds x="1116" y="880" width="100" height="80" />
+        <dc:Bounds x="766" y="880" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-answer" bpmnElement="wait-answer">
-        <dc:Bounds x="2202" y="240" width="100" height="80" />
+        <dc:Bounds x="2002" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-answer" bpmnElement="record-answer">
-        <dc:Bounds x="2402" y="240" width="100" height="80" />
+        <dc:Bounds x="2202" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-converged" bpmnElement="persist-converged">
-        <dc:Bounds x="916" y="80" width="100" height="80" />
+        <dc:Bounds x="966" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_check-converge" bpmnElement="check-converge">
         <dc:Bounds x="566" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-converge-gate" bpmnElement="gw-converge-gate" isMarkerVisible="true">
-        <dc:Bounds x="766" y="95" width="50" height="50" />
+        <dc:Bounds x="791" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="754" y="62" width="74" height="28" />
+          <dc:Bounds x="779" y="62" width="74" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation-blockedcomments" bpmnElement="persist-escalation-blockedcomments">
-        <dc:Bounds x="916" y="240" width="100" height="80" />
+        <dc:Bounds x="966" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_End" bpmnElement="End">
-        <dc:Bounds x="1148" y="102" width="36" height="36" />
+        <dc:Bounds x="1173" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1132" y="143" width="69" height="14" />
+          <dc:Bounds x="1157" y="143" width="69" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_start" bpmnElement="f_start">
@@ -466,71 +466,73 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toConvergeGate" bpmnElement="f_toConvergeGate">
         <di:waypoint x="666" y="120" />
-        <di:waypoint x="766" y="120" />
+        <di:waypoint x="791" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_convergeOk" bpmnElement="f_convergeOk">
-        <di:waypoint x="816" y="120" />
-        <di:waypoint x="916" y="120" />
+        <di:waypoint x="841" y="120" />
+        <di:waypoint x="966" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="827" y="125" width="78" height="28" />
+          <dc:Bounds x="865" y="87" width="78" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_finalize" bpmnElement="f_finalize">
-        <di:waypoint x="1016" y="120" />
-        <di:waypoint x="1148" y="120" />
+        <di:waypoint x="1066" y="120" />
+        <di:waypoint x="1173" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_guardOk" bpmnElement="f_guardOk">
-        <di:waypoint x="991" y="440" />
-        <di:waypoint x="1116" y="440" />
+        <di:waypoint x="641" y="440" />
+        <di:waypoint x="766" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1014" y="418" width="60" height="14" />
+          <dc:Bounds x="664" y="418" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_roundWait" bpmnElement="f_roundWait">
-        <di:waypoint x="1216" y="440" />
-        <di:waypoint x="1316" y="440" />
+        <di:waypoint x="866" y="440" />
+        <di:waypoint x="966" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_checkGate" bpmnElement="f_checkGate">
-        <di:waypoint x="1416" y="440" />
-        <di:waypoint x="1516" y="440" />
+        <di:waypoint x="1066" y="440" />
+        <di:waypoint x="1166" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_progressOk" bpmnElement="f_progressOk">
-        <di:waypoint x="1566" y="440" />
-        <di:waypoint x="1691" y="440" />
+        <di:waypoint x="1216" y="440" />
+        <di:waypoint x="1341" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1591" y="407" width="71" height="28" />
+          <dc:Bounds x="1241" y="407" width="71" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReviewWait" bpmnElement="f_toReviewWait">
-        <di:waypoint x="1741" y="440" />
-        <di:waypoint x="1866" y="440" />
+        <di:waypoint x="1391" y="440" />
+        <di:waypoint x="1516" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reviewLoop" bpmnElement="f_reviewLoop">
-        <di:waypoint x="1884" y="458" />
-        <di:waypoint x="1884" y="500" />
+        <di:waypoint x="1534" y="458" />
+        <di:waypoint x="1534" y="500" />
         <di:waypoint x="266" y="500" />
         <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="440" />
-        <di:waypoint x="941" y="440" />
+        <di:waypoint x="1877" y="255" />
+        <di:waypoint x="1877" y="220" />
+        <di:waypoint x="616" y="220" />
+        <di:waypoint x="616" y="415" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="796" y="507" width="74" height="42" />
+          <dc:Bounds x="1410" y="173" width="74" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_convergeBlocked" bpmnElement="f_convergeBlocked">
-        <di:waypoint x="791" y="145" />
-        <di:waypoint x="791" y="280" />
-        <di:waypoint x="916" y="280" />
+        <di:waypoint x="816" y="145" />
+        <di:waypoint x="816" y="220" />
+        <di:waypoint x="1016" y="220" />
+        <di:waypoint x="1016" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="796" y="199" width="81" height="28" />
+          <dc:Bounds x="821" y="169" width="81" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_addressed" bpmnElement="f_addressed">
         <di:waypoint x="441" y="145" />
         <di:waypoint x="441" y="440" />
-        <di:waypoint x="941" y="440" />
+        <di:waypoint x="591" y="440" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="446" y="279" width="78" height="28" />
         </bpmndi:BPMNLabel>
@@ -538,87 +540,81 @@
       <bpmndi:BPMNEdge id="BPMNEdge_f_waiting" bpmnElement="f_waiting">
         <di:waypoint x="441" y="145" />
         <di:waypoint x="441" y="440" />
-        <di:waypoint x="941" y="440" />
+        <di:waypoint x="591" y="440" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="380" y="286" 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="600" />
-        <di:waypoint x="566" y="600" />
+        <di:waypoint x="441" y="1080" />
+        <di:waypoint x="566" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="446" y="506" width="81" height="28" />
+          <dc:Bounds x="446" y="746" width="81" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_guardMax" bpmnElement="f_guardMax">
-        <di:waypoint x="991" y="440" />
-        <di:waypoint x="1096" y="440" />
-        <di:waypoint x="1096" y="920" />
-        <di:waypoint x="1116" y="920" />
+        <di:waypoint x="641" y="440" />
+        <di:waypoint x="746" y="440" />
+        <di:waypoint x="746" y="920" />
+        <di:waypoint x="766" y="920" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1101" y="673" width="74" height="14" />
+          <dc:Bounds x="751" y="673" width="74" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_noProgress" bpmnElement="f_noProgress">
-        <di:waypoint x="1566" y="440" />
-        <di:waypoint x="1646" y="440" />
-        <di:waypoint x="1646" y="760" />
-        <di:waypoint x="1666" y="760" />
+        <di:waypoint x="1216" y="440" />
+        <di:waypoint x="1296" y="440" />
+        <di:waypoint x="1296" y="760" />
+        <di:waypoint x="1316" y="760" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1563" y="593" width="78" height="14" />
+          <dc:Bounds x="1213" y="593" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReviewTimeout" bpmnElement="f_toReviewTimeout">
-        <di:waypoint x="1716" y="465" />
-        <di:waypoint x="1716" y="600" />
-        <di:waypoint x="1866" y="600" />
+        <di:waypoint x="1366" y="465" />
+        <di:waypoint x="1366" y="600" />
+        <di:waypoint x="1516" y="600" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_escWait" bpmnElement="f_escWait">
-        <di:waypoint x="791" y="625" />
-        <di:waypoint x="791" y="980" />
-        <di:waypoint x="2182" y="980" />
-        <di:waypoint x="2182" y="300" />
-        <di:waypoint x="2202" y="300" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_blockedGate" bpmnElement="f_blockedGate">
+        <di:waypoint x="1066" y="280" />
+        <di:waypoint x="1852" y="280" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_blockedWait" bpmnElement="f_blockedWait">
-        <di:waypoint x="1016" y="280" />
-        <di:waypoint x="2202" y="280" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_noprogressWait" bpmnElement="f_noprogressWait">
-        <di:waypoint x="1766" y="780" />
-        <di:waypoint x="1786" y="780" />
-        <di:waypoint x="1786" y="980" />
-        <di:waypoint x="2252" y="980" />
-        <di:waypoint x="2252" y="320" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_noprogressGate" bpmnElement="f_noprogressGate">
+        <di:waypoint x="1416" y="760" />
+        <di:waypoint x="1877" y="760" />
+        <di:waypoint x="1877" y="305" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reviewStalled" bpmnElement="f_reviewStalled">
-        <di:waypoint x="1902" y="600" />
-        <di:waypoint x="2002" y="600" />
+        <di:waypoint x="1552" y="600" />
+        <di:waypoint x="1652" y="600" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_stalledWait" bpmnElement="f_stalledWait">
-        <di:waypoint x="2052" y="560" />
-        <di:waypoint x="2052" y="280" />
-        <di:waypoint x="2202" y="280" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_stalledGate" bpmnElement="f_stalledGate">
+        <di:waypoint x="1752" y="600" />
+        <di:waypoint x="1877" y="600" />
+        <di:waypoint x="1877" y="305" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_escGate" bpmnElement="f_escGate">
-        <di:waypoint x="666" y="600" />
-        <di:waypoint x="766" y="600" />
+        <di:waypoint x="666" y="1080" />
+        <di:waypoint x="1877" y="1080" />
+        <di:waypoint x="1877" y="305" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_maxWait" bpmnElement="f_maxWait">
-        <di:waypoint x="1216" y="940" />
-        <di:waypoint x="1236" y="940" />
-        <di:waypoint x="1236" y="980" />
-        <di:waypoint x="2252" y="980" />
-        <di:waypoint x="2252" y="320" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_escWait" bpmnElement="f_escWait">
+        <di:waypoint x="1902" y="280" />
+        <di:waypoint x="2002" y="280" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_maxGate" bpmnElement="f_maxGate">
+        <di:waypoint x="866" y="920" />
+        <di:waypoint x="1877" y="920" />
+        <di:waypoint x="1877" y="305" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_answerRecord" bpmnElement="f_answerRecord">
-        <di:waypoint x="2302" y="280" />
-        <di:waypoint x="2402" y="280" />
+        <di:waypoint x="2102" y="280" />
+        <di:waypoint x="2202" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_answerLoop" bpmnElement="f_answerLoop">
-        <di:waypoint x="2452" y="320" />
-        <di:waypoint x="2452" y="340" />
+        <di:waypoint x="2252" y="320" />
+        <di:waypoint x="2252" y="340" />
         <di:waypoint x="266" y="340" />
         <di:waypoint x="266" y="160" />
       </bpmndi:BPMNEdge>

package/workers/persist-escalation/worker.ts

@@ -9,10 +9,13 @@
 // durable review wait instead of routing here (see app/roundResultDefault.ts). This worker keeps
 // the same rule as defence-in-depth via the canonical taxonomy: if a blank-question job ever
 // reaches it, it opens NO escalation and reports `escalated:false` rather than FABRICATING a
-// question (the retired failure mode) or throwing an un-remediable incident. The convergence-loop
-// model branches on that `escalated` output (`gw-escalated`): a `false` return re-enters the loop
-// via `gw-guard` instead of flowing into the `wait-answer` catch, so a non-escalation can never
-// wedge a token on a durable wait that has no escalation for a human to answer.
+// question (the retired failure mode) or throwing an un-remediable incident. EVERY convergence-loop
+// escalation arm — the agent-verdict `persist-escalation` AND the four control-flow arms
+// (`persist-escalation-noprogress`, `persist-review-stalled`, `persist-escalation-blockedcomments`,
+// `persist-escalation-maxrounds`) — now routes its `escalated` output through the `gw-escalated`
+// gateway (issue #333): a `false` return re-enters the loop via `gw-guard` instead of flowing into
+// the `wait-answer` catch, so a non-escalation (e.g. a blank `convergeBlockReason`) can never wedge
+// a token on a durable wait that has no escalation for a human to answer.
 import type { AppJobHandler } from "@nanobpm/urban";
 import { abandonTokenFromUrl } from "../../app/abandon.ts";
 import { classifyEscalation } from "../../app/escalationTaxonomy.ts";

package/workers/record-blocked-ack/worker.test.ts

@@ -32,15 +32,12 @@ function fakeApp(rows: Record<string, unknown>[]) {
 }
 
 test("record-blocked-ack: settles the parked run at terminal blocked and records the operator note", async () => {
-  const rows = [{ feature_key: "owner/repo#7", status: "awaiting_operator", delivery_label: null, blocked_user_task_key: "ut-7" }];
+  const rows = [{ feature_key: "owner/repo#7", status: "awaiting_operator", delivery_label: null }];
   const app = fakeApp(rows);
   const out = await handler({ variables: { featureKey: "owner/repo#7", note: "reassigned to a human" } } as any, app);
   assertEquals(out, {});
   assertEquals(rows[0].status, "blocked");
   assertEquals(rows[0].delivery_label, "operator: reassigned to a human");
-  // The completable-task pointer is cleared on the terminal-ward transition so the pages stop offering
-  // the acknowledge affordance for a now-completed task (pollFeatureBlocked no longer sweeps this row).
-  assertEquals(rows[0].blocked_user_task_key, null);
 });
 
 test("record-blocked-ack: a blank note falls back to an 'acknowledged' label", async () => {

package/workers/record-blocked-ack/worker.ts

@@ -26,11 +26,6 @@ const handler: AppJobHandler<In, Record<string, never>> = async (job, app) => {
   await featureRuns(app.data).update(featureKey, {
     status: "blocked",
     delivery_label: note ? `operator: ${note}` : "acknowledged",
-    // The run has left the `feature-blocked` wait, so clear the denormalised completable-task pointer
-    // the pages gate the "Acknowledge blocked" affordance on. pollFeatureBlocked only sweeps
-    // `awaiting_operator` runs, so this terminal-ward transition must clear it itself or a stale pointer
-    // would linger on the now-terminal row.
-    blocked_user_task_key: null,
     updated_at: ts,
   });
   app.log.info("record-blocked-ack", { featureKey, note: note ?? null });

package/workers/record-feature/worker.ts

@@ -54,12 +54,6 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
     status: rowStatus,
     pr_key: prKey,
     outcome: summary ?? null,
-    // The run has left the `feature-escalation` wait (answered → abandon, SLA auto-abandon, or the
-    // agent finished without escalating), so clear the denormalised escalation pointer the pages gate
-    // on. pollFeatureEscalations only sweeps `running`/`escalated` runs, so a terminal-ward transition
-    // through here must clear it itself or the stale question would linger on the row.
-    escalation_question: null,
-    escalation_user_task_key: null,
     updated_at: ts,
   });
   app.log.info("record-feature", { featureKey, featureStatus, rowStatus, prKey });

package/workers/record-feature-escalation/worker.test.ts

@@ -1,9 +1,10 @@
 // Unit coverage for pr.record-feature-escalation — a feature run parked on the native
 // `feature-escalation` user task (issue #210). Runs on the `escalated` arm, before the user task
-// exists, and must flip the row to the non-terminal `escalated` status and persist the agent's
-// `question` so the nwf UI can surface it (the poller can't read task-local vars, so this is the
-// question's source of truth). It clears the completable-task pointer to NULL (the task does not
-// exist yet, so any non-null value is stale); the poller fills the real key once it is observable.
+// exists, and must flip the row to the non-terminal `escalated` status and append the agent's
+// `question` to the canonical `feature_escalations` audit log so the nwf UI can surface it (the poller
+// can't read task-local vars, so this is the question's source of truth). Issue #332 dropped the
+// denormalised `feature_runs.escalation_question` / `escalation_user_task_key` columns, so this worker
+// now only flips the status and appends the audit row.
 import { test } from "node:test";
 import { assertEquals } from "#test-assert";
 import { noopLog } from "../../test/log.ts";
@@ -43,8 +44,8 @@ function fakeApp(rows: Record<string, unknown>[]): any {
   };
 }
 
-test("record-feature-escalation: flips the run to escalated and persists the question", async () => {
-  const rows = [{ feature_key: "owner/repo#7", status: "running", escalation_question: null, escalation_user_task_key: null }];
+test("record-feature-escalation: flips the run to escalated and appends the question to the audit log", async () => {
+  const rows = [{ feature_key: "owner/repo#7", status: "running" }];
   const app = fakeApp(rows);
   const out = await handler(
     { jobKey: "job-1", variables: { featureKey: "owner/repo#7", question: "Which API should I use?" } } as never,
@@ -52,11 +53,8 @@ test("record-feature-escalation: flips the run to escalated and persists the que
   );
   assertEquals(out, {});
   assertEquals(rows[0].status, "escalated");
-  assertEquals(rows[0].escalation_question, "Which API should I use?");
-  // The user task does not exist yet — the pointer is cleared to NULL here (poller fills the real key).
-  assertEquals(rows[0].escalation_user_task_key, null);
-  // Dual-write (issue #305): the question is ALSO appended to the canonical `feature_escalations`
-  // audit log so `pollUserTasks` can source it from a surviving table once the denormalised column drops.
+  // Issue #305/#332: the question is the sole responsibility of the canonical `feature_escalations`
+  // audit log so `pollUserTasks` can source it from a surviving table (the denormalised column is gone).
   assertEquals(app.stores.feature_escalations.length, 1);
   assertEquals(app.stores.feature_escalations[0].feature_key, "owner/repo#7");
   assertEquals(app.stores.feature_escalations[0].question, "Which API should I use?");
@@ -68,7 +66,7 @@ test("record-feature-escalation: a retried job (same jobKey) reuses its audit ro
   // before job completion re-runs with the SAME jobKey. The `job_key` idempotency guard must reuse the
   // existing `feature_escalations` row rather than append a duplicate (which would bloat the append-only
   // log and could skew "latest question" selection). Mirrors `record-plan-review`'s `plan_reviews` guard.
-  const rows = [{ feature_key: "owner/repo#7", status: "running", escalation_question: null, escalation_user_task_key: null }];
+  const rows = [{ feature_key: "owner/repo#7", status: "running" }];
   const app = fakeApp(rows);
   const job = { jobKey: "job-retry", variables: { featureKey: "owner/repo#7", question: "Which API?" } } as never;
   await handler(job, app);
@@ -77,22 +75,11 @@ test("record-feature-escalation: a retried job (same jobKey) reuses its audit ro
   assertEquals(app.stores.feature_escalations[0].job_key, "job-retry");
 });
 
-test("record-feature-escalation: clears a stale completable-task pointer at escalation entry", async () => {
-  // The task does not exist yet here, so a non-null key can only be stale (a prior escalation's key
-  // left behind, a manual DB repair, etc). Leaving it would bind the pages' answer/abandon affordance
-  // to the wrong task until the poller overwrites it; clear it so the row reads "key unknown here".
-  const rows = [{ feature_key: "owner/repo#9", status: "running", escalation_question: null, escalation_user_task_key: "stale-ut" }];
-  const app = fakeApp(rows);
-  await handler({ jobKey: "job-9", variables: { featureKey: "owner/repo#9", question: "Q?" } } as never, app);
-  assertEquals(rows[0].status, "escalated");
-  assertEquals(rows[0].escalation_question, "Q?");
-  assertEquals(rows[0].escalation_user_task_key, null);
-});
-
-test("record-feature-escalation: a blank/absent question is persisted as NULL (badge/affordance stay off)", async () => {
-  const rows = [{ feature_key: "owner/repo#8", status: "running", escalation_question: null }];
+test("record-feature-escalation: a blank/absent question is appended as NULL (badge/affordance stay off)", async () => {
+  const rows = [{ feature_key: "owner/repo#8", status: "running" }];
   const app = fakeApp(rows);
   await handler({ jobKey: "job-8", variables: { featureKey: "owner/repo#8", question: "   " } } as never, app);
   assertEquals(rows[0].status, "escalated");
-  assertEquals(rows[0].escalation_question, null);
+  assertEquals(app.stores.feature_escalations.length, 1);
+  assertEquals(app.stores.feature_escalations[0].question, null);
 });