@nanobpm/nano-workforce 0.69.1 → 0.70.1

package/resources/processes/convergence-loop.bpmn

@@ -33,6 +33,24 @@
           <nano:extend name="prUrl" type="string" optional="true" />
           <nano:extend name="abandonUrl" type="string" optional="true" />
         </nano:shape>
+        <nano:shape id="PrProgressCheckIn" name="Check progress — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="status" type="string" optional="true" />
+          <nano:extend name="repo" type="string" optional="true" />
+          <nano:extend name="prNumber" type="integer" optional="true" />
+        </nano:shape>
+        <nano:shape id="PrProgressCheckOut" name="Check progress — result">
+          <nano:extend name="progressed" type="boolean" />
+        </nano:shape>
+        <nano:shape id="PrConvergeGateIn" name="Converge gate — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="repo" type="string" optional="true" />
+          <nano:extend name="prNumber" type="integer" optional="true" />
+        </nano:shape>
+        <nano:shape id="PrConvergeGateOut" name="Converge gate — result">
+          <nano:extend name="convergeBlocked" type="boolean" />
+          <nano:extend name="convergeBlockReason" type="string" optional="true" />
+        </nano:shape>
         <nano:shape id="EscalationIn" name="Record escalation — input">
           <nano:extend name="prKey" type="string" />
           <nano:extend name="round" type="integer" />
@@ -118,8 +136,40 @@
       <bpmn:incoming>f_guardOk</bpmn:incoming>
       <bpmn:outgoing>f_roundWait</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:eventBasedGateway id="gw-review-wait" name="review ready or timeout?">
+    <bpmn:serviceTask id="check-progress" name="Check progress">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.progress-check" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="PrProgressCheckIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="PrProgressCheckOut" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
       <bpmn:incoming>f_roundWait</bpmn:incoming>
+      <bpmn:outgoing>f_checkGate</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-progress" name="progress made?" default="f_progressOk">
+      <bpmn:incoming>f_checkGate</bpmn:incoming>
+      <bpmn:outgoing>f_noProgress</bpmn:outgoing>
+      <bpmn:outgoing>f_progressOk</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="persist-escalation-noprogress" name="Escalate: no progress">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.persist-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="EscalationIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="EscalationOut" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=&#34;blocked&#34;" target="status" />
+          <zeebe:input source="=false" target="recordRound" />
+          <zeebe:input source="=&#34;Round &#34; + string(round) + &#34; reported the review comments were addressed, but the PR head did not advance (no commit was pushed), so another review round would loop on identical code. A human must decide how to proceed (reply to resume the loop).&#34;" target="question" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_noProgress</bpmn:incoming>
+      <bpmn:outgoing>f_noprogressWait</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:eventBasedGateway id="gw-review-wait" name="review ready or timeout?">
+      <bpmn:incoming>f_progressOk</bpmn:incoming>
       <bpmn:outgoing>f_toReviewWait</bpmn:outgoing>
       <bpmn:outgoing>f_toReviewTimeout</bpmn:outgoing>
     </bpmn:eventBasedGateway>
@@ -199,6 +249,8 @@
       <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">
@@ -222,17 +274,55 @@
           <zeebe:property name="io.nanobpm.dataEnvelope.in" value="PrFinalizeIn" />
         </zeebe:properties>
       </bpmn:extensionElements>
-      <bpmn:incoming>f_converged</bpmn:incoming>
+      <bpmn:incoming>f_convergeOk</bpmn:incoming>
       <bpmn:outgoing>f_finalize</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:serviceTask id="check-converge" name="Check review comments">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.converge-gate" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="PrConvergeGateIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="PrConvergeGateOut" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_converged</bpmn:incoming>
+      <bpmn:outgoing>f_toConvergeGate</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-converge-gate" name="comments addressed?" default="f_convergeOk">
+      <bpmn:incoming>f_toConvergeGate</bpmn:incoming>
+      <bpmn:outgoing>f_convergeBlocked</bpmn:outgoing>
+      <bpmn:outgoing>f_convergeOk</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="persist-escalation-blockedcomments" name="Escalate: unaddressed comments">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.persist-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="EscalationIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="EscalationOut" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=&#34;blocked&#34;" target="status" />
+          <zeebe:input source="=false" target="recordRound" />
+          <zeebe:input source="=convergeBlockReason" target="question" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_convergeBlocked</bpmn:incoming>
+      <bpmn:outgoing>f_blockedWait</bpmn:outgoing>
+    </bpmn:serviceTask>
     <bpmn:endEvent id="End" name="Converged">
       <bpmn:incoming>f_finalize</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="f_start" sourceRef="Start" targetRef="review-round" />
     <bpmn:sequenceFlow id="f_toStatus" sourceRef="review-round" targetRef="gw-status" />
-    <bpmn:sequenceFlow id="f_converged" name="converged" sourceRef="gw-status" targetRef="persist-converged">
+    <bpmn:sequenceFlow id="f_converged" name="converged" sourceRef="gw-status" targetRef="check-converge">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "converged"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_toConvergeGate" sourceRef="check-converge" targetRef="gw-converge-gate" />
+    <bpmn:sequenceFlow id="f_convergeBlocked" name="unaddressed comments" sourceRef="gw-converge-gate" targetRef="persist-escalation-blockedcomments">
+      <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_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>
@@ -244,7 +334,13 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=round &gt;= maxRounds</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="f_guardOk" name="continue" sourceRef="gw-guard" targetRef="persist-round" />
-    <bpmn:sequenceFlow id="f_roundWait" sourceRef="persist-round" targetRef="gw-review-wait" />
+    <bpmn:sequenceFlow id="f_roundWait" sourceRef="persist-round" targetRef="check-progress" />
+    <bpmn:sequenceFlow id="f_checkGate" sourceRef="check-progress" targetRef="gw-progress" />
+    <bpmn:sequenceFlow id="f_noProgress" name="no progress" sourceRef="gw-progress" targetRef="persist-escalation-noprogress">
+      <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_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" />
@@ -278,34 +374,46 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-guard" bpmnElement="gw-guard" isMarkerVisible="true">
-        <dc:Bounds x="916" y="255" width="50" height="50" />
+        <dc:Bounds x="941" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="899" y="310" width="85" height="14" />
+          <dc:Bounds x="924" y="470" width="85" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-round" bpmnElement="persist-round">
-        <dc:Bounds x="1066" y="240" width="100" height="80" />
+        <dc:Bounds x="1116" 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" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-progress" bpmnElement="gw-progress" isMarkerVisible="true">
+        <dc:Bounds x="1516" y="415" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1511" 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" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-review-wait" bpmnElement="gw-review-wait" isMarkerVisible="true">
-        <dc:Bounds x="1266" y="255" width="50" height="50" />
+        <dc:Bounds x="1691" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1247" y="222" width="88" height="28" />
+          <dc:Bounds x="1672" y="382" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-review" bpmnElement="wait-review">
-        <dc:Bounds x="1416" y="262" width="36" height="36" />
+        <dc:Bounds x="1866" y="422" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1390" y="229" width="88" height="28" />
+          <dc:Bounds x="1840" y="389" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-review-timeout" bpmnElement="wait-review-timeout">
-        <dc:Bounds x="1416" y="422" width="36" height="36" />
+        <dc:Bounds x="1866" y="582" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1406" y="463" width="56" height="42" />
+          <dc:Bounds x="1856" y="623" width="56" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-review-stalled" bpmnElement="persist-review-stalled">
-        <dc:Bounds x="1552" y="400" width="100" height="80" />
+        <dc:Bounds x="2002" 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" />
@@ -317,21 +425,33 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_persist-escalation-maxrounds" bpmnElement="persist-escalation-maxrounds">
-        <dc:Bounds x="1066" y="560" width="100" height="80" />
+        <dc:Bounds x="1116" y="880" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-answer" bpmnElement="wait-answer">
-        <dc:Bounds x="1752" y="400" width="100" height="80" />
+        <dc:Bounds x="2202" y="240" 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" />
+        <dc:Bounds x="2402" 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" />
+      </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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="754" 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" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_End" bpmnElement="End">
-        <dc:Bounds x="773" y="102" width="36" height="36" />
+        <dc:Bounds x="1148" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="757" y="143" width="69" height="14" />
+          <dc:Bounds x="1132" y="143" width="69" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_start" bpmnElement="f_start">
@@ -349,53 +469,83 @@
           <dc:Bounds x="483" y="98" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_finalize" bpmnElement="f_finalize">
+      <bpmndi:BPMNEdge id="BPMNEdge_f_toConvergeGate" bpmnElement="f_toConvergeGate">
         <di:waypoint x="666" y="120" />
-        <di:waypoint x="773" y="120" />
+        <di:waypoint x="766" 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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="827" y="125" 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" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_guardOk" bpmnElement="f_guardOk">
-        <di:waypoint x="966" y="280" />
-        <di:waypoint x="1066" y="280" />
+        <di:waypoint x="991" y="440" />
+        <di:waypoint x="1116" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="976" y="258" width="60" height="14" />
+          <dc:Bounds x="1014" y="418" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_roundWait" bpmnElement="f_roundWait">
-        <di:waypoint x="1166" y="280" />
-        <di:waypoint x="1266" y="280" />
+        <di:waypoint x="1216" y="440" />
+        <di:waypoint x="1316" 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" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_progressOk" bpmnElement="f_progressOk">
+        <di:waypoint x="1566" y="440" />
+        <di:waypoint x="1691" y="440" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1591" y="407" width="71" height="28" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReviewWait" bpmnElement="f_toReviewWait">
-        <di:waypoint x="1316" y="280" />
-        <di:waypoint x="1416" y="280" />
+        <di:waypoint x="1741" y="440" />
+        <di:waypoint x="1866" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reviewLoop" bpmnElement="f_reviewLoop">
-        <di:waypoint x="1434" y="298" />
-        <di:waypoint x="1434" y="340" />
-        <di:waypoint x="266" y="340" />
+        <di:waypoint x="1884" y="458" />
+        <di:waypoint x="1884" 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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="796" y="507" 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" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="796" y="407" width="74" height="42" />
+          <dc:Bounds x="796" y="199" 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="280" />
-        <di:waypoint x="916" y="280" />
+        <di:waypoint x="441" y="440" />
+        <di:waypoint x="941" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="446" y="199" width="78" height="28" />
+          <dc:Bounds x="446" y="279" width="78" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_waiting" bpmnElement="f_waiting">
         <di:waypoint x="441" y="145" />
-        <di:waypoint x="441" y="280" />
-        <di:waypoint x="916" y="280" />
+        <di:waypoint x="441" y="440" />
+        <di:waypoint x="941" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="380" y="206" width="56" height="14" />
+          <dc:Bounds x="380" y="286" width="56" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_escalate" bpmnElement="f_escalate">
@@ -403,57 +553,78 @@
         <di:waypoint x="441" y="600" />
         <di:waypoint x="566" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="446" y="426" width="81" height="28" />
+          <dc:Bounds x="446" y="506" width="81" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_guardMax" bpmnElement="f_guardMax">
-        <di:waypoint x="966" y="280" />
-        <di:waypoint x="1046" y="280" />
-        <di:waypoint x="1046" y="600" />
-        <di:waypoint x="1066" y="600" />
+        <di:waypoint x="991" y="440" />
+        <di:waypoint x="1096" y="440" />
+        <di:waypoint x="1096" y="920" />
+        <di:waypoint x="1116" y="920" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1101" 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" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1051" y="433" width="74" height="14" />
+          <dc:Bounds x="1563" y="593" width="78" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_toReviewTimeout" bpmnElement="f_toReviewTimeout">
-        <di:waypoint x="1291" y="305" />
-        <di:waypoint x="1291" y="440" />
-        <di:waypoint x="1416" y="440" />
+        <di:waypoint x="1716" y="465" />
+        <di:waypoint x="1716" y="600" />
+        <di:waypoint x="1866" y="600" />
       </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" />
+        <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>
+      <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>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reviewStalled" bpmnElement="f_reviewStalled">
-        <di:waypoint x="1452" y="440" />
-        <di:waypoint x="1552" y="440" />
+        <di:waypoint x="1902" y="600" />
+        <di:waypoint x="2002" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_stalledWait" bpmnElement="f_stalledWait">
-        <di:waypoint x="1652" y="440" />
-        <di:waypoint x="1752" y="440" />
+        <di:waypoint x="2052" y="560" />
+        <di:waypoint x="2052" y="280" />
+        <di:waypoint x="2202" y="280" />
       </bpmndi:BPMNEdge>
       <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="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" />
+        <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>
       <bpmndi:BPMNEdge id="BPMNEdge_f_answerRecord" bpmnElement="f_answerRecord">
-        <di:waypoint x="1852" y="440" />
-        <di:waypoint x="1952" y="440" />
+        <di:waypoint x="2302" y="280" />
+        <di:waypoint x="2402" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_answerLoop" bpmnElement="f_answerLoop">
-        <di:waypoint x="2002" y="480" />
-        <di:waypoint x="2002" y="660" />
-        <di:waypoint x="266" y="660" />
+        <di:waypoint x="2452" y="320" />
+        <di:waypoint x="2452" y="340" />
+        <di:waypoint x="266" y="340" />
         <di:waypoint x="266" y="160" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>

package/workers/converge-gate/worker.ts

@@ -0,0 +1,101 @@
+// pr.converge-gate — the deterministic review-comment gate for the convergence loop.
+//
+// The loop declares convergence on the review-round AGENT's self-reported `status = "converged"`.
+// That trusts the agent to only converge once every Copilot comment is addressed — which failed on
+// Magikcraft/nano-bpm#770 (20 rounds, a suppressed advisory never applied, then auto-merged with
+// the comment unaddressed). This step runs on the converged path, BEFORE pr.finalize hands off to
+// the merge loop, and blocks handoff while GitHub still shows unaddressed comments:
+//   • any review THREAD is still unresolved (GraphQL `isResolved = false`), or
+//   • any SUPPRESSED advisory in the latest Copilot review body lacks a matching RESOLVED ack
+//     thread (a `nano-ack: <path>:<line>` marker copied from Copilot's `**path:line**` header).
+// A blocked gate returns `convergeBlocked = true`; the model's `gw-converge-gate` gateway routes to
+// the human `wait-answer` escalation (recoverable), never a hard wedge.
+//
+// It FAILS CLOSED: if the live GitHub state cannot be read, it blocks (escalates) rather than
+// letting an unverifiable "converged" through — the opposite of the no-progress guard, because a
+// merge-gating check must escalate-on-uncertainty so #770 cannot recur.
+import type { AppJobHandler } from "@nanobpm/urban";
+import { type ConvergeGateResult, evaluateConvergeGate } from "../../app/convergeGate.ts";
+import {
+  fetchLatestCopilotReviewBody,
+  fetchReviewThreads,
+  parseAckedAdvisories,
+  parseSuppressedAdvisories,
+  type ReviewThread,
+} from "../../app/github.ts";
+import { parsePr } from "../../app/service.ts";
+import type { WorkerInputs, WorkerOutputs } from "../../nano-generated/worker-io.d.ts";
+
+// Input/output typed off the model data envelopes (`PrConvergeGateIn` / `PrConvergeGateOut` in
+// convergence-loop.bpmn), the single source of truth for this worker's wire contract (ADR 0040).
+type In = WorkerInputs["pr.converge-gate"];
+type Out = WorkerOutputs["pr.converge-gate"];
+
+// Reads a PR's review threads. `null` = no usable transport (treated as an unverifiable read →
+// fail closed). Throws propagate to the fail-closed catch below.
+export type ThreadsReader = (repo: string, prNumber: number) => Promise<ReviewThread[] | null>;
+// Reads the latest Copilot review body. `null` = no usable transport (unverifiable → fail closed);
+// `""` = transport usable but no Copilot review yet (verified: no suppressed advisories).
+export type ReviewBodyReader = (repo: string, prNumber: number) => Promise<string | null>;
+
+const defaultReadThreads: ThreadsReader = (repo, prNumber) =>
+  fetchReviewThreads(repo, prNumber, process.env.GITHUB_TOKEN ?? "");
+const defaultReadReviewBody: ReviewBodyReader = (repo, prNumber) =>
+  fetchLatestCopilotReviewBody(repo, prNumber, process.env.GITHUB_TOKEN ?? "");
+
+const BLOCK_UNVERIFIABLE =
+  "Convergence blocked: could not verify the PR's review comments against GitHub. A human must confirm every Copilot review thread is resolved and every suppressed advisory acknowledged before this PR converges (reply to resume the loop).";
+
+/** Build the handler with injectable GitHub readers. The default export binds the real readers;
+ * tests inject stubs. Fails CLOSED — any unreadable/errored state blocks convergence. */
+export function makeHandler(deps: {
+  readThreads: ThreadsReader;
+  readReviewBody: ReviewBodyReader;
+}): AppJobHandler<In, Out> {
+  return async (job) => {
+    const { prKey, repo, prNumber } = job.variables;
+    // `parsePr` is total on any input (fails closed to `null` on a missing/non-string prKey), so
+    // pass it straight through — a malformed prKey degrades to the fail-closed target check below.
+    const parsed = parsePr(prKey);
+    const ghRepo = repo ?? parsed?.repo;
+    const ghNumber = typeof prNumber === "number" ? prNumber : parsed?.number;
+    if (!ghRepo || typeof ghNumber !== "number") {
+      return { convergeBlocked: true, convergeBlockReason: BLOCK_UNVERIFIABLE };
+    }
+
+    let result: ConvergeGateResult;
+    try {
+      const threads = await deps.readThreads(ghRepo, ghNumber);
+      // A null threads read is an unverifiable gate — fail closed. (An empty ARRAY is a verified
+      // "no threads" and is fine.)
+      if (threads === null) {
+        return { convergeBlocked: true, convergeBlockReason: BLOCK_UNVERIFIABLE };
+      }
+      const reviewBody = await deps.readReviewBody(ghRepo, ghNumber);
+      // A null review body is an unverifiable read (no usable transport) — fail closed, same as a
+      // null threads read. (An empty STRING is a verified "no Copilot review / no advisories".)
+      if (reviewBody === null) {
+        return { convergeBlocked: true, convergeBlockReason: BLOCK_UNVERIFIABLE };
+      }
+      const unresolvedThreadCount = threads.filter((t) => !t.isResolved).length;
+      result = evaluateConvergeGate({
+        unresolvedThreadCount,
+        suppressedKeys: parseSuppressedAdvisories(reviewBody),
+        acknowledgedKeys: parseAckedAdvisories(threads),
+      });
+    } catch {
+      return { convergeBlocked: true, convergeBlockReason: BLOCK_UNVERIFIABLE };
+    }
+
+    return {
+      convergeBlocked: result.convergeBlocked,
+      convergeBlockReason: result.convergeBlockReason,
+    };
+  };
+}
+
+const handler = makeHandler({
+  readThreads: defaultReadThreads,
+  readReviewBody: defaultReadReviewBody,
+});
+export default handler;

package/workers/progress-check/worker.ts

@@ -0,0 +1,77 @@
+// pr.progress-check — the deterministic no-progress guard for the convergence loop.
+//
+// After a round is recorded (pr.persist-round), this step reads the PR's current head SHA and
+// compares it to the head observed at the previous recorded round. An `addressed` round whose head
+// did NOT advance pushed no commit, so requesting another Copilot review would loop on
+// byte-identical code — the same comments, round after round, until the round cap escalates. It
+// returns `progressed:false`, and the model's `gw-progress` gateway escalates to the human
+// `wait-answer` task instead of soliciting another review.
+//
+// Every other case returns `progressed:true` (continue): a `waiting` round (round 1, awaiting the
+// first review) legitimately has no push; an advanced head means real work landed; and a head we
+// could not read fails OPEN — the round cap and the review-wait timeout stay the safety nets so a
+// transient GitHub hiccup can never fabricate a no-progress escalation. The routing decision lives
+// in app/roundProgress.ts, the single source of truth this worker and `gw-progress` both mirror.
+import type { AppJobHandler } from "@nanobpm/urban";
+import { fetchPrHead } from "../../app/github.ts";
+import { isAddressedStatus, routeProgress } from "../../app/roundProgress.ts";
+import { parsePr } from "../../app/service.ts";
+import type { WorkerInputs, WorkerOutputs } from "../../nano-generated/worker-io.d.ts";
+
+// Input/output typed off the model data envelopes (`PrProgressCheckIn` / `PrProgressCheckOut` in
+// convergence-loop.bpmn), the single source of truth for this worker's wire contract (ADR 0040).
+type In = WorkerInputs["pr.progress-check"];
+type Out = WorkerOutputs["pr.progress-check"];
+
+// Reads a PR's current head SHA. Injectable so unit tests never touch git/network; the default
+// binds the real GitHub reader (the shared gh | token transport) and swallows any failure to
+// `null` so the guard fails OPEN.
+export type HeadReader = (repo: string, prNumber: number) => Promise<string | null>;
+
+const defaultReadHead: HeadReader = async (repo, prNumber) => {
+  const token = process.env.GITHUB_TOKEN ?? "";
+  const head = await fetchPrHead(repo, prNumber, token).catch(() => null);
+  return head?.headSha ?? null;
+};
+
+/** Build the handler with an injectable head reader (see {@link HeadReader}). The default export
+ * binds the real GitHub reader; tests inject a stub. */
+export function makeHandler(deps: { readHead: HeadReader }): AppJobHandler<In, Out> {
+  return async (job, app) => {
+    const { prKey, status, repo, prNumber } = job.variables;
+
+    // Only an `addressed` round claims a push, so only it can be a no-progress round — and a
+    // blank/unknown status counts as `addressed` here (gw-status defaults it down the addressed
+    // arm and pr.persist-round records a missing status as `addressed`), so it is the safe-default
+    // trap this guard exists for. Skip the GitHub read entirely only for an explicitly recognized
+    // non-addressed status — a `waiting` round costs nothing and continues.
+    if (!isAddressedStatus(status)) return { progressed: true };
+
+    // Prefer the carried repo/prNumber; fall back to parsing the canonical `owner/repo#N` prKey so
+    // an older in-flight instance (or a process-variable regression) still resolves a target. If
+    // neither yields one, fail open rather than guess.
+    const parsed = parsePr(prKey);
+    const ghRepo = repo ?? parsed?.repo;
+    const ghNumber = typeof prNumber === "number" ? prNumber : parsed?.number;
+    if (!ghRepo || typeof ghNumber !== "number") return { progressed: true };
+
+    const currentHead = await deps.readHead(ghRepo, ghNumber).catch(() => null);
+    const prs = app.data.table<{ pr_key: string; last_round_head: string | null }>(
+      "pull_requests",
+      "pr_key",
+    );
+    const row = await prs.get(prKey);
+    const previousHead = row?.last_round_head ?? null;
+
+    // Record the observed head as the baseline for the next round's comparison — but only when we
+    // actually read one, so a null (unreadable) head never clobbers a good baseline.
+    if (currentHead) {
+      await prs.update(prKey, { last_round_head: currentHead });
+    }
+
+    return { progressed: routeProgress(status, previousHead, currentHead) === "continue" };
+  };
+}
+
+const handler = makeHandler({ readHead: defaultReadHead });
+export default handler;