@nanobpm/nano-workforce 0.97.1 → 0.98.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/app/capabilityNeed.test.ts +156 -0
- package/app/capabilityNeed.ts +200 -0
- package/app/capsWait.test.ts +39 -0
- package/app/capsWait.ts +33 -0
- package/app/contracts.ts +15 -0
- package/app/github.ts +22 -4
- package/app/mergeEscalationQuestion.test.ts +17 -0
- package/app/mergeRetry.test.ts +90 -0
- package/app/mergeRetryArm.test.ts +100 -0
- package/app/plan.ts +63 -0
- package/app/service.test.ts +375 -1
- package/app/service.ts +249 -0
- package/app/waitGateVisibility.test.ts +5 -2
- package/db/migrations/049_plan_task_needs.sql +30 -0
- package/db/migrations/050_capability_gates.sql +40 -0
- package/e2e/plan-fanout.e2e.ts +145 -0
- package/nano.app.json +4 -0
- package/package.json +1 -1
- package/resources/processes/merge-loop.bpmn +124 -68
- package/resources/processes/plan-fanout.bpmn +347 -194
- package/resources/prompts/plan.md +29 -1
- package/workers/caps-prepare/worker.test.ts +62 -0
- package/workers/caps-prepare/worker.ts +38 -0
- package/workers/merge/worker.test.ts +38 -0
- package/workers/merge/worker.ts +9 -3
- package/workers/record-plan/worker.test.ts +33 -1
- package/workers/record-plan/worker.ts +24 -1
- package/workers/select-wave/worker.test.ts +34 -2
- package/workers/select-wave/worker.ts +26 -2
|
@@ -106,6 +106,7 @@
|
|
|
106
106
|
<bpmn:incoming>f_reb_rebased</bpmn:incoming>
|
|
107
107
|
<bpmn:incoming>f_m_evicted</bpmn:incoming>
|
|
108
108
|
<bpmn:incoming>f_m_escReenter</bpmn:incoming>
|
|
109
|
+
<bpmn:incoming>f_mr_go</bpmn:incoming>
|
|
109
110
|
<bpmn:outgoing>f_m_arm</bpmn:outgoing>
|
|
110
111
|
</bpmn:serviceTask>
|
|
111
112
|
<bpmn:intermediateCatchEvent id="wait-mergeable" name="Wait: mergeable">
|
|
@@ -127,6 +128,9 @@
|
|
|
127
128
|
<zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeAttemptIn" />
|
|
128
129
|
<zeebe:property name="io.nanobpm.dataEnvelope.out" value="MergeAttemptOut" />
|
|
129
130
|
</zeebe:properties>
|
|
131
|
+
<zeebe:ioMapping>
|
|
132
|
+
<zeebe:output source="=if mergeStatus = "retry" then mergeRetryRound + 1 else mergeRetryRound" target="mergeRetryRound" />
|
|
133
|
+
</zeebe:ioMapping>
|
|
130
134
|
</bpmn:extensionElements>
|
|
131
135
|
<bpmn:incoming>f_m_mReady</bpmn:incoming>
|
|
132
136
|
<bpmn:outgoing>f_m_attempt</bpmn:outgoing>
|
|
@@ -135,8 +139,14 @@
|
|
|
135
139
|
<bpmn:incoming>f_m_attempt</bpmn:incoming>
|
|
136
140
|
<bpmn:outgoing>f_m_gMerged</bpmn:outgoing>
|
|
137
141
|
<bpmn:outgoing>f_m_gQueued</bpmn:outgoing>
|
|
142
|
+
<bpmn:outgoing>f_m_gRetry</bpmn:outgoing>
|
|
138
143
|
<bpmn:outgoing>f_m_gBlocked</bpmn:outgoing>
|
|
139
144
|
</bpmn:exclusiveGateway>
|
|
145
|
+
<bpmn:exclusiveGateway id="gw-merge-retry" name="retry within budget?" default="f_mr_giveup">
|
|
146
|
+
<bpmn:incoming>f_m_gRetry</bpmn:incoming>
|
|
147
|
+
<bpmn:outgoing>f_mr_go</bpmn:outgoing>
|
|
148
|
+
<bpmn:outgoing>f_mr_giveup</bpmn:outgoing>
|
|
149
|
+
</bpmn:exclusiveGateway>
|
|
140
150
|
<bpmn:eventBasedGateway id="eg-landed" name="landed or evicted?">
|
|
141
151
|
<bpmn:incoming>f_m_gQueued</bpmn:incoming>
|
|
142
152
|
<bpmn:outgoing>f_eg_landed</bpmn:outgoing>
|
|
@@ -193,7 +203,7 @@
|
|
|
193
203
|
</zeebe:properties>
|
|
194
204
|
<zeebe:ioMapping>
|
|
195
205
|
<zeebe:input source="=status" target="agentVerdict" />
|
|
196
|
-
<zeebe:input source="="This PR cannot be merged and needs a human decision. " + (if mergeState = "conflict" then "The automated rebase agent could not resolve the merge conflicts on this branch. Resolve them manually (or reply with guidance), then reply to retry." else if mergeState = "ready" then "The merge attempt did not land (merge result: " + mergeStatus + "). Investigate why GitHub refused the merge, then reply to retry." else if agentVerdict = "blocked" then "The automated CI-fix agent could not make the required checks green. Fix the failing checks on the branch (or reply with guidance), then reply to retry." else "The automated CI-fix agent exceeded its time budget (SLA) before the required checks went green. Check its progress or intervene, then reply to retry.")" target="question" />
|
|
206
|
+
<zeebe:input source="="This PR cannot be merged and needs a human decision. " + (if mergeState = "conflict" then "The automated rebase agent could not resolve the merge conflicts on this branch. Resolve them manually (or reply with guidance), then reply to retry." else if mergeStatus = "retry" then "The merge kept losing a race with concurrent updates to the base branch and exhausted its automatic retry budget (" + string(mergeRetryMax) + " retries). This is a repeated transient race, not a conflict, failing check, or permissions block. Reply to retry, or investigate why the base branch keeps moving." else if mergeState = "ready" then "The merge attempt did not land (merge result: " + mergeStatus + "). Investigate why GitHub refused the merge, then reply to retry." else if agentVerdict = "blocked" then "The automated CI-fix agent could not make the required checks green. Fix the failing checks on the branch (or reply with guidance), then reply to retry." else "The automated CI-fix agent exceeded its time budget (SLA) before the required checks went green. Check its progress or intervene, then reply to retry.")" target="question" />
|
|
197
207
|
<zeebe:input source="="blocked"" target="status" />
|
|
198
208
|
</zeebe:ioMapping>
|
|
199
209
|
</bpmn:extensionElements>
|
|
@@ -201,6 +211,7 @@
|
|
|
201
211
|
<bpmn:incoming>f_ci_blocked</bpmn:incoming>
|
|
202
212
|
<bpmn:incoming>f_reb_blocked</bpmn:incoming>
|
|
203
213
|
<bpmn:incoming>f_ci_sla</bpmn:incoming>
|
|
214
|
+
<bpmn:incoming>f_mr_giveup</bpmn:incoming>
|
|
204
215
|
<bpmn:outgoing>f_m_escA</bpmn:outgoing>
|
|
205
216
|
</bpmn:serviceTask>
|
|
206
217
|
<bpmn:exclusiveGateway id="gw-merge-escalated" name="escalation opened?" default="f_m_escReenter">
|
|
@@ -370,6 +381,13 @@
|
|
|
370
381
|
<bpmn:sequenceFlow id="f_m_gQueued" name="queued" sourceRef="gw-merge" targetRef="eg-landed">
|
|
371
382
|
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeStatus = "queued"</bpmn:conditionExpression>
|
|
372
383
|
</bpmn:sequenceFlow>
|
|
384
|
+
<bpmn:sequenceFlow id="f_m_gRetry" name="retry (base moved)" sourceRef="gw-merge" targetRef="gw-merge-retry">
|
|
385
|
+
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeStatus = "retry"</bpmn:conditionExpression>
|
|
386
|
+
</bpmn:sequenceFlow>
|
|
387
|
+
<bpmn:sequenceFlow id="f_mr_go" name="within budget" sourceRef="gw-merge-retry" targetRef="arm-merge">
|
|
388
|
+
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeRetryRound <= mergeRetryMax</bpmn:conditionExpression>
|
|
389
|
+
</bpmn:sequenceFlow>
|
|
390
|
+
<bpmn:sequenceFlow id="f_mr_giveup" name="budget exhausted" sourceRef="gw-merge-retry" targetRef="merge-esc-attempt" />
|
|
373
391
|
<bpmn:sequenceFlow id="f_eg_landed" sourceRef="eg-landed" targetRef="wait-landed" />
|
|
374
392
|
<bpmn:sequenceFlow id="f_eg_evicted" sourceRef="eg-landed" targetRef="wait-evicted" />
|
|
375
393
|
<bpmn:sequenceFlow id="f_m_evicted" sourceRef="wait-evicted" targetRef="arm-merge" />
|
|
@@ -425,6 +443,12 @@
|
|
|
425
443
|
<dc:Bounds x="1022" y="150" width="53" height="28" />
|
|
426
444
|
</bpmndi:BPMNLabel>
|
|
427
445
|
</bpmndi:BPMNShape>
|
|
446
|
+
<bpmndi:BPMNShape id="BPMNShape_gw-merge-retry" bpmnElement="gw-merge-retry" isMarkerVisible="true">
|
|
447
|
+
<dc:Bounds x="1263" y="1215" width="50" height="50" />
|
|
448
|
+
<bpmndi:BPMNLabel>
|
|
449
|
+
<dc:Bounds x="1344" y="1250" width="88" height="28" />
|
|
450
|
+
</bpmndi:BPMNLabel>
|
|
451
|
+
</bpmndi:BPMNShape>
|
|
428
452
|
<bpmndi:BPMNShape id="BPMNShape_eg-landed" bpmnElement="eg-landed" isMarkerVisible="true">
|
|
429
453
|
<dc:Bounds x="1263" y="255" width="50" height="50" />
|
|
430
454
|
<bpmndi:BPMNLabel>
|
|
@@ -453,27 +477,27 @@
|
|
|
453
477
|
</bpmndi:BPMNLabel>
|
|
454
478
|
</bpmndi:BPMNShape>
|
|
455
479
|
<bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
|
|
456
|
-
<dc:Bounds x="1238" y="
|
|
480
|
+
<dc:Bounds x="1238" y="1680" width="100" height="80" />
|
|
457
481
|
</bpmndi:BPMNShape>
|
|
458
482
|
<bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
|
|
459
|
-
<dc:Bounds x="1438" y="
|
|
483
|
+
<dc:Bounds x="1438" y="1200" width="100" height="80" />
|
|
460
484
|
</bpmndi:BPMNShape>
|
|
461
485
|
<bpmndi:BPMNShape id="BPMNShape_gw-merge-escalated" bpmnElement="gw-merge-escalated" isMarkerVisible="true">
|
|
462
|
-
<dc:Bounds x="1663" y="
|
|
486
|
+
<dc:Bounds x="1663" y="1215" width="50" height="50" />
|
|
463
487
|
<bpmndi:BPMNLabel>
|
|
464
|
-
<dc:Bounds x="1651" y="
|
|
488
|
+
<dc:Bounds x="1651" y="1182" width="74" height="28" />
|
|
465
489
|
</bpmndi:BPMNLabel>
|
|
466
490
|
</bpmndi:BPMNShape>
|
|
467
491
|
<bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
|
|
468
|
-
<dc:Bounds x="1838" y="
|
|
492
|
+
<dc:Bounds x="1838" y="1200" width="100" height="80" />
|
|
469
493
|
</bpmndi:BPMNShape>
|
|
470
494
|
<bpmndi:BPMNShape id="BPMNShape_record-merge-answer" bpmnElement="record-merge-answer">
|
|
471
|
-
<dc:Bounds x="2038" y="
|
|
495
|
+
<dc:Bounds x="2038" y="1200" width="100" height="80" />
|
|
472
496
|
</bpmndi:BPMNShape>
|
|
473
497
|
<bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
|
|
474
|
-
<dc:Bounds x="863" y="
|
|
498
|
+
<dc:Bounds x="863" y="1695" width="50" height="50" />
|
|
475
499
|
<bpmndi:BPMNLabel>
|
|
476
|
-
<dc:Bounds x="769" y="
|
|
500
|
+
<dc:Bounds x="769" y="1713" width="89" height="14" />
|
|
477
501
|
</bpmndi:BPMNLabel>
|
|
478
502
|
</bpmndi:BPMNShape>
|
|
479
503
|
<bpmndi:BPMNShape id="BPMNShape_fix-ci" bpmnElement="fix-ci">
|
|
@@ -512,7 +536,7 @@
|
|
|
512
536
|
<bpmndi:BPMNShape id="BPMNShape_be_rebase_sla" bpmnElement="be_rebase_sla">
|
|
513
537
|
<dc:Bounds x="1070" y="942" width="36" height="36" />
|
|
514
538
|
<bpmndi:BPMNLabel>
|
|
515
|
-
<dc:Bounds x="1046" y="
|
|
539
|
+
<dc:Bounds x="1046" y="1023" width="84" height="14" />
|
|
516
540
|
</bpmndi:BPMNLabel>
|
|
517
541
|
</bpmndi:BPMNShape>
|
|
518
542
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
|
|
@@ -554,10 +578,10 @@
|
|
|
554
578
|
<di:waypoint x="1870" y="120" />
|
|
555
579
|
</bpmndi:BPMNEdge>
|
|
556
580
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
|
|
557
|
-
<di:waypoint x="913" y="
|
|
558
|
-
<di:waypoint x="1238" y="
|
|
581
|
+
<di:waypoint x="913" y="1720" />
|
|
582
|
+
<di:waypoint x="1238" y="1720" />
|
|
559
583
|
<bpmndi:BPMNLabel>
|
|
560
|
-
<dc:Bounds x="1032" y="
|
|
584
|
+
<dc:Bounds x="1032" y="1687" width="67" height="28" />
|
|
561
585
|
</bpmndi:BPMNLabel>
|
|
562
586
|
</bpmndi:BPMNEdge>
|
|
563
587
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_reconcile" bpmnElement="f_ci_reconcile">
|
|
@@ -574,11 +598,11 @@
|
|
|
574
598
|
<di:waypoint x="933" y="280" />
|
|
575
599
|
<di:waypoint x="933" y="305" />
|
|
576
600
|
<di:waypoint x="1333" y="305" />
|
|
577
|
-
<di:waypoint x="1333" y="
|
|
578
|
-
<di:waypoint x="1288" y="
|
|
579
|
-
<di:waypoint x="1288" y="
|
|
601
|
+
<di:waypoint x="1333" y="1660" />
|
|
602
|
+
<di:waypoint x="1288" y="1660" />
|
|
603
|
+
<di:waypoint x="1288" y="1680" />
|
|
580
604
|
<bpmndi:BPMNLabel>
|
|
581
|
-
<dc:Bounds x="1338" y="
|
|
605
|
+
<dc:Bounds x="1338" y="1406" width="67" height="28" />
|
|
582
606
|
</bpmndi:BPMNLabel>
|
|
583
607
|
</bpmndi:BPMNEdge>
|
|
584
608
|
<bpmndi:BPMNEdge id="BPMNEdge_f_reb_reconcile" bpmnElement="f_reb_reconcile">
|
|
@@ -590,6 +614,13 @@
|
|
|
590
614
|
<dc:Bounds x="804" y="939" width="82" height="56" />
|
|
591
615
|
</bpmndi:BPMNLabel>
|
|
592
616
|
</bpmndi:BPMNEdge>
|
|
617
|
+
<bpmndi:BPMNEdge id="BPMNEdge_f_mr_giveup" bpmnElement="f_mr_giveup">
|
|
618
|
+
<di:waypoint x="1313" y="1240" />
|
|
619
|
+
<di:waypoint x="1438" y="1240" />
|
|
620
|
+
<bpmndi:BPMNLabel>
|
|
621
|
+
<dc:Bounds x="1352" y="1307" width="67" height="28" />
|
|
622
|
+
</bpmndi:BPMNLabel>
|
|
623
|
+
</bpmndi:BPMNEdge>
|
|
593
624
|
<bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
|
|
594
625
|
<di:waypoint x="1313" y="280" />
|
|
595
626
|
<di:waypoint x="1470" y="280" />
|
|
@@ -600,40 +631,44 @@
|
|
|
600
631
|
<di:waypoint x="1688" y="160" />
|
|
601
632
|
</bpmndi:BPMNEdge>
|
|
602
633
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
|
|
603
|
-
<di:waypoint x="1338" y="
|
|
604
|
-
<di:waypoint x="1888" y="
|
|
605
|
-
<di:waypoint x="1888" y="
|
|
634
|
+
<di:waypoint x="1338" y="1720" />
|
|
635
|
+
<di:waypoint x="1888" y="1720" />
|
|
636
|
+
<di:waypoint x="1888" y="1280" />
|
|
637
|
+
</bpmndi:BPMNEdge>
|
|
638
|
+
<bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
|
|
639
|
+
<di:waypoint x="1538" y="1240" />
|
|
640
|
+
<di:waypoint x="1663" y="1240" />
|
|
606
641
|
</bpmndi:BPMNEdge>
|
|
607
642
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_escReenter" bpmnElement="f_m_escReenter">
|
|
608
|
-
<di:waypoint x="1688" y="
|
|
609
|
-
<di:waypoint x="1688" y="
|
|
610
|
-
<di:waypoint x="402" y="
|
|
643
|
+
<di:waypoint x="1688" y="1265" />
|
|
644
|
+
<di:waypoint x="1688" y="1300" />
|
|
645
|
+
<di:waypoint x="402" y="1300" />
|
|
611
646
|
<di:waypoint x="402" y="160" />
|
|
612
647
|
<bpmndi:BPMNLabel>
|
|
613
|
-
<dc:Bounds x="1008" y="
|
|
648
|
+
<dc:Bounds x="1008" y="1305" width="74" height="42" />
|
|
614
649
|
</bpmndi:BPMNLabel>
|
|
615
650
|
</bpmndi:BPMNEdge>
|
|
616
651
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_answerRecord" bpmnElement="f_m_answerRecord">
|
|
617
|
-
<di:waypoint x="1938" y="
|
|
618
|
-
<di:waypoint x="2038" y="
|
|
652
|
+
<di:waypoint x="1938" y="1240" />
|
|
653
|
+
<di:waypoint x="2038" y="1240" />
|
|
619
654
|
</bpmndi:BPMNEdge>
|
|
620
655
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
|
|
621
|
-
<di:waypoint x="2088" y="
|
|
622
|
-
<di:waypoint x="2088" y="
|
|
623
|
-
<di:waypoint x="402" y="
|
|
656
|
+
<di:waypoint x="2088" y="1280" />
|
|
657
|
+
<di:waypoint x="2088" y="1300" />
|
|
658
|
+
<di:waypoint x="402" y="1300" />
|
|
624
659
|
<di:waypoint x="402" y="160" />
|
|
625
660
|
</bpmndi:BPMNEdge>
|
|
626
661
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
|
|
627
662
|
<di:waypoint x="713" y="145" />
|
|
628
663
|
<di:waypoint x="713" y="318" />
|
|
629
664
|
<di:waypoint x="1358" y="318" />
|
|
630
|
-
<di:waypoint x="1358" y="
|
|
631
|
-
<di:waypoint x="863" y="
|
|
632
|
-
<di:waypoint x="863" y="
|
|
633
|
-
<di:waypoint x="888" y="
|
|
634
|
-
<di:waypoint x="888" y="
|
|
665
|
+
<di:waypoint x="1358" y="1180" />
|
|
666
|
+
<di:waypoint x="863" y="1180" />
|
|
667
|
+
<di:waypoint x="863" y="1675" />
|
|
668
|
+
<di:waypoint x="888" y="1675" />
|
|
669
|
+
<di:waypoint x="888" y="1695" />
|
|
635
670
|
<bpmndi:BPMNLabel>
|
|
636
|
-
<dc:Bounds x="
|
|
671
|
+
<dc:Bounds x="1011" y="1133" width="60" height="42" />
|
|
637
672
|
</bpmndi:BPMNLabel>
|
|
638
673
|
</bpmndi:BPMNEdge>
|
|
639
674
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
|
|
@@ -648,33 +683,33 @@
|
|
|
648
683
|
<di:waypoint x="713" y="145" />
|
|
649
684
|
<di:waypoint x="713" y="318" />
|
|
650
685
|
<di:waypoint x="1333" y="318" />
|
|
651
|
-
<di:waypoint x="1333" y="
|
|
652
|
-
<di:waypoint x="1218" y="
|
|
653
|
-
<di:waypoint x="1218" y="
|
|
654
|
-
<di:waypoint x="1238" y="
|
|
686
|
+
<di:waypoint x="1333" y="1180" />
|
|
687
|
+
<di:waypoint x="1218" y="1180" />
|
|
688
|
+
<di:waypoint x="1218" y="1700" />
|
|
689
|
+
<di:waypoint x="1238" y="1700" />
|
|
655
690
|
<bpmndi:BPMNLabel>
|
|
656
|
-
<dc:Bounds x="1243" y="
|
|
691
|
+
<dc:Bounds x="1243" y="722" width="85" height="14" />
|
|
657
692
|
</bpmndi:BPMNLabel>
|
|
658
693
|
</bpmndi:BPMNEdge>
|
|
659
694
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
|
|
660
|
-
<di:waypoint x="888" y="
|
|
661
|
-
<di:waypoint x="888" y="
|
|
662
|
-
<di:waypoint x="2158" y="
|
|
695
|
+
<di:waypoint x="888" y="1745" />
|
|
696
|
+
<di:waypoint x="888" y="1765" />
|
|
697
|
+
<di:waypoint x="2158" y="1765" />
|
|
663
698
|
<di:waypoint x="2158" y="555" />
|
|
664
699
|
<di:waypoint x="1018" y="555" />
|
|
665
700
|
<di:waypoint x="1018" y="580" />
|
|
666
701
|
<di:waypoint x="1038" y="580" />
|
|
667
702
|
<bpmndi:BPMNLabel>
|
|
668
|
-
<dc:Bounds x="2163" y="
|
|
703
|
+
<dc:Bounds x="2163" y="1146" width="49" height="28" />
|
|
669
704
|
</bpmndi:BPMNLabel>
|
|
670
705
|
</bpmndi:BPMNEdge>
|
|
671
706
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
|
|
672
707
|
<di:waypoint x="1313" y="600" />
|
|
673
708
|
<di:waypoint x="1418" y="600" />
|
|
674
|
-
<di:waypoint x="1418" y="
|
|
675
|
-
<di:waypoint x="1438" y="
|
|
709
|
+
<di:waypoint x="1418" y="1240" />
|
|
710
|
+
<di:waypoint x="1438" y="1240" />
|
|
676
711
|
<bpmndi:BPMNLabel>
|
|
677
|
-
<dc:Bounds x="1423" y="
|
|
712
|
+
<dc:Bounds x="1423" y="853" width="89" height="14" />
|
|
678
713
|
</bpmndi:BPMNLabel>
|
|
679
714
|
</bpmndi:BPMNEdge>
|
|
680
715
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_wait" bpmnElement="f_ci_wait">
|
|
@@ -689,21 +724,23 @@
|
|
|
689
724
|
<di:waypoint x="913" y="280" />
|
|
690
725
|
<di:waypoint x="933" y="280" />
|
|
691
726
|
<di:waypoint x="933" y="305" />
|
|
692
|
-
<di:waypoint x="
|
|
693
|
-
<di:waypoint x="
|
|
694
|
-
<di:waypoint x="
|
|
727
|
+
<di:waypoint x="1733" y="305" />
|
|
728
|
+
<di:waypoint x="1733" y="1660" />
|
|
729
|
+
<di:waypoint x="1243" y="1660" />
|
|
730
|
+
<di:waypoint x="1243" y="1195" />
|
|
731
|
+
<di:waypoint x="1418" y="1195" />
|
|
695
732
|
<di:waypoint x="1418" y="875" />
|
|
696
733
|
<di:waypoint x="1018" y="875" />
|
|
697
734
|
<di:waypoint x="1018" y="900" />
|
|
698
735
|
<di:waypoint x="1038" y="900" />
|
|
699
736
|
<bpmndi:BPMNLabel>
|
|
700
|
-
<dc:Bounds x="
|
|
737
|
+
<dc:Bounds x="1248" y="1414" width="49" height="28" />
|
|
701
738
|
</bpmndi:BPMNLabel>
|
|
702
739
|
</bpmndi:BPMNEdge>
|
|
703
740
|
<bpmndi:BPMNEdge id="BPMNEdge_f_reb_blocked" bpmnElement="f_reb_blocked">
|
|
704
741
|
<di:waypoint x="1313" y="920" />
|
|
705
742
|
<di:waypoint x="1488" y="920" />
|
|
706
|
-
<di:waypoint x="1488" y="
|
|
743
|
+
<di:waypoint x="1488" y="1200" />
|
|
707
744
|
<bpmndi:BPMNLabel>
|
|
708
745
|
<dc:Bounds x="1429" y="887" width="64" height="28" />
|
|
709
746
|
</bpmndi:BPMNLabel>
|
|
@@ -724,6 +761,20 @@
|
|
|
724
761
|
<dc:Bounds x="1093" y="206" width="46" height="14" />
|
|
725
762
|
</bpmndi:BPMNLabel>
|
|
726
763
|
</bpmndi:BPMNEdge>
|
|
764
|
+
<bpmndi:BPMNEdge id="BPMNEdge_f_m_gRetry" bpmnElement="f_m_gRetry">
|
|
765
|
+
<di:waypoint x="1088" y="95" />
|
|
766
|
+
<di:waypoint x="1088" y="75" />
|
|
767
|
+
<di:waypoint x="1926" y="75" />
|
|
768
|
+
<di:waypoint x="1926" y="318" />
|
|
769
|
+
<di:waypoint x="1643" y="318" />
|
|
770
|
+
<di:waypoint x="1643" y="1285" />
|
|
771
|
+
<di:waypoint x="1263" y="1285" />
|
|
772
|
+
<di:waypoint x="1288" y="1285" />
|
|
773
|
+
<di:waypoint x="1288" y="1265" />
|
|
774
|
+
<bpmndi:BPMNLabel>
|
|
775
|
+
<dc:Bounds x="1746" y="285" width="78" height="28" />
|
|
776
|
+
</bpmndi:BPMNLabel>
|
|
777
|
+
</bpmndi:BPMNEdge>
|
|
727
778
|
<bpmndi:BPMNEdge id="BPMNEdge_f_eg_evicted" bpmnElement="f_eg_evicted">
|
|
728
779
|
<di:waypoint x="1288" y="305" />
|
|
729
780
|
<di:waypoint x="1288" y="440" />
|
|
@@ -735,10 +786,10 @@
|
|
|
735
786
|
<di:waypoint x="1926" y="75" />
|
|
736
787
|
<di:waypoint x="1926" y="820" />
|
|
737
788
|
<di:waypoint x="1418" y="820" />
|
|
738
|
-
<di:waypoint x="1418" y="
|
|
739
|
-
<di:waypoint x="1438" y="
|
|
789
|
+
<di:waypoint x="1418" y="1220" />
|
|
790
|
+
<di:waypoint x="1438" y="1220" />
|
|
740
791
|
<bpmndi:BPMNLabel>
|
|
741
|
-
<dc:Bounds x="1931" y="
|
|
792
|
+
<dc:Bounds x="1931" y="562" width="53" height="14" />
|
|
742
793
|
</bpmndi:BPMNLabel>
|
|
743
794
|
</bpmndi:BPMNEdge>
|
|
744
795
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_done" bpmnElement="f_ci_done">
|
|
@@ -749,20 +800,16 @@
|
|
|
749
800
|
<di:waypoint x="1138" y="920" />
|
|
750
801
|
<di:waypoint x="1263" y="920" />
|
|
751
802
|
</bpmndi:BPMNEdge>
|
|
752
|
-
<bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
|
|
753
|
-
<di:waypoint x="1538" y="1080" />
|
|
754
|
-
<di:waypoint x="1663" y="1080" />
|
|
755
|
-
</bpmndi:BPMNEdge>
|
|
756
803
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_escWait" bpmnElement="f_m_escWait">
|
|
757
|
-
<di:waypoint x="1713" y="
|
|
758
|
-
<di:waypoint x="1838" y="
|
|
804
|
+
<di:waypoint x="1713" y="1240" />
|
|
805
|
+
<di:waypoint x="1838" y="1240" />
|
|
759
806
|
</bpmndi:BPMNEdge>
|
|
760
807
|
<bpmndi:BPMNEdge id="BPMNEdge_f_reb_sla" bpmnElement="f_reb_sla">
|
|
761
808
|
<di:waypoint x="1088" y="978" />
|
|
762
809
|
<di:waypoint x="1088" y="998" />
|
|
763
810
|
<di:waypoint x="1218" y="998" />
|
|
764
|
-
<di:waypoint x="1218" y="
|
|
765
|
-
<di:waypoint x="1238" y="
|
|
811
|
+
<di:waypoint x="1218" y="1720" />
|
|
812
|
+
<di:waypoint x="1238" y="1720" />
|
|
766
813
|
<bpmndi:BPMNLabel>
|
|
767
814
|
<dc:Bounds x="1118" y="965" width="70" height="28" />
|
|
768
815
|
</bpmndi:BPMNLabel>
|
|
@@ -772,12 +819,12 @@
|
|
|
772
819
|
<di:waypoint x="1088" y="678" />
|
|
773
820
|
<di:waypoint x="1018" y="678" />
|
|
774
821
|
<di:waypoint x="1018" y="540" />
|
|
775
|
-
<di:waypoint x="
|
|
776
|
-
<di:waypoint x="
|
|
822
|
+
<di:waypoint x="1558" y="540" />
|
|
823
|
+
<di:waypoint x="1558" y="820" />
|
|
777
824
|
<di:waypoint x="1526" y="820" />
|
|
778
|
-
<di:waypoint x="1526" y="
|
|
825
|
+
<di:waypoint x="1526" y="1200" />
|
|
779
826
|
<bpmndi:BPMNLabel>
|
|
780
|
-
<dc:Bounds x="
|
|
827
|
+
<dc:Bounds x="1253" y="507" width="70" height="28" />
|
|
781
828
|
</bpmndi:BPMNLabel>
|
|
782
829
|
</bpmndi:BPMNEdge>
|
|
783
830
|
<bpmndi:BPMNEdge id="BPMNEdge_f_ci_fixed" bpmnElement="f_ci_fixed">
|
|
@@ -795,7 +842,7 @@
|
|
|
795
842
|
<di:waypoint x="402" y="1000" />
|
|
796
843
|
<di:waypoint x="402" y="160" />
|
|
797
844
|
<bpmndi:BPMNLabel>
|
|
798
|
-
<dc:Bounds x="
|
|
845
|
+
<dc:Bounds x="819" y="1008" width="53" height="14" />
|
|
799
846
|
</bpmndi:BPMNLabel>
|
|
800
847
|
</bpmndi:BPMNEdge>
|
|
801
848
|
<bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
|
|
@@ -804,6 +851,15 @@
|
|
|
804
851
|
<di:waypoint x="234" y="820" />
|
|
805
852
|
<di:waypoint x="234" y="138" />
|
|
806
853
|
</bpmndi:BPMNEdge>
|
|
854
|
+
<bpmndi:BPMNEdge id="BPMNEdge_f_mr_go" bpmnElement="f_mr_go">
|
|
855
|
+
<di:waypoint x="1288" y="1265" />
|
|
856
|
+
<di:waypoint x="1288" y="1285" />
|
|
857
|
+
<di:waypoint x="402" y="1285" />
|
|
858
|
+
<di:waypoint x="402" y="160" />
|
|
859
|
+
<bpmndi:BPMNLabel>
|
|
860
|
+
<dc:Bounds x="808" y="1252" width="49" height="28" />
|
|
861
|
+
</bpmndi:BPMNLabel>
|
|
862
|
+
</bpmndi:BPMNEdge>
|
|
807
863
|
<bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
|
|
808
864
|
<di:waypoint x="1488" y="458" />
|
|
809
865
|
<di:waypoint x="1488" y="478" />
|