@nanobpm/nano-workforce 0.129.0 → 0.129.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.
Files changed (12) hide show
  1. package/.github/workflows/pr-title-lint.yml +5 -3
  2. package/.releaserc.json +36 -2
  3. package/AGENTS.md +10 -6
  4. package/CHANGELOG.md +6 -0
  5. package/app/mergeEscalationUserTask.test.ts +21 -55
  6. package/app/mergeLoopBehaviour.test.ts +446 -0
  7. package/package.json +2 -1
  8. package/resources/processes/merge-loop.bpmn +692 -395
  9. package/app/mergeCiReattempt.test.ts +0 -138
  10. package/app/mergeEscalationQuestion.test.ts +0 -190
  11. package/app/mergeRebaseArm.test.ts +0 -140
  12. package/app/mergeRetryArm.test.ts +0 -100
package/resources/processes/merge-loop.bpmn CHANGED
@@ -104,9 +104,8 @@
104
104
  </bpmn:extensionElements>
105
105
  <bpmn:incoming>f_m_deps</bpmn:incoming>
106
106
  <bpmn:incoming>f_m_answer</bpmn:incoming>
107
- <bpmn:incoming>f_ci_fixed</bpmn:incoming>
108
- <bpmn:incoming>f_ci_reattempt</bpmn:incoming>
109
- <bpmn:incoming>f_reb_rebased</bpmn:incoming>
107
+ <bpmn:incoming>f_ci_rearm</bpmn:incoming>
108
+ <bpmn:incoming>f_reb_rearm</bpmn:incoming>
110
109
  <bpmn:incoming>f_m_evicted</bpmn:incoming>
111
110
  <bpmn:incoming>f_m_escReenter</bpmn:incoming>
112
111
  <bpmn:incoming>f_mr_go</bpmn:incoming>
@@ -114,7 +113,7 @@
114
113
  </bpmn:serviceTask>
115
114
  <bpmn:intermediateCatchEvent id="wait-mergeable" name="Wait: mergeable">
116
115
  <bpmn:incoming>f_m_arm</bpmn:incoming>
117
- <bpmn:incoming>f_cib_armed</bpmn:incoming>
116
+ <bpmn:incoming>f_ci_recheck</bpmn:incoming>
118
117
  <bpmn:outgoing>f_m_ready</bpmn:outgoing>
119
118
  <bpmn:messageEventDefinition id="med_mergeReady" messageRef="Message_mergeReady" />
120
119
  </bpmn:intermediateCatchEvent>
@@ -200,7 +199,7 @@
200
199
  <bpmn:incoming>f_m_mBlocked</bpmn:incoming>
201
200
  <bpmn:incoming>f_ci_giveup</bpmn:incoming>
202
201
  <bpmn:incoming>f_reb_giveup</bpmn:incoming>
203
- <bpmn:incoming>f_reb_sla</bpmn:incoming>
202
+ <bpmn:incoming>f_reb_escConflict</bpmn:incoming>
204
203
  <bpmn:outgoing>f_m_escC</bpmn:outgoing>
205
204
  </bpmn:serviceTask>
206
205
  <bpmn:serviceTask id="merge-esc-attempt" name="Escalate: merge blocked">
@@ -212,14 +211,13 @@
212
211
  </zeebe:properties>
213
212
  <zeebe:ioMapping>
214
213
  <zeebe:input source="=status" target="agentVerdict" />
215
- <zeebe:input source="=&#34;This PR cannot be merged and needs a human decision. &#34; + (if mergeState = &#34;conflict&#34; then &#34;The automated rebase agent could not resolve the merge conflicts on this branch. Resolve them manually (or reply with guidance), then reply to retry.&#34; else if mergeStatus = &#34;retry&#34; then &#34;The merge kept losing a race with concurrent updates to the base branch and exhausted its automatic retry budget (&#34; + string(mergeRetryMax) + &#34; 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.&#34; else if mergeState = &#34;ready&#34; then &#34;The merge attempt did not land (merge result: &#34; + mergeStatus + &#34;). Investigate why GitHub refused the merge, then reply to retry.&#34; else if agentVerdict = &#34;blocked&#34; then &#34;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.&#34; else &#34;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.&#34;)" target="question" />
214
+ <zeebe:input source="=&#34;This PR cannot be merged and needs a human decision. &#34; + (if mergeState = &#34;conflict&#34; then &#34;The automated rebase agent could not resolve the merge conflicts on this branch. Resolve them manually (or reply with guidance), then reply to retry.&#34; else if mergeStatus = &#34;retry&#34; then &#34;The merge kept losing a race with concurrent updates to the base branch and exhausted its automatic retry budget (&#34; + string(mergeRetryMax) + &#34; 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.&#34; else if mergeState = &#34;ready&#34; then &#34;The merge attempt did not land (merge result: &#34; + mergeStatus + &#34;). Investigate why GitHub refused the merge, then reply to retry.&#34; else if status = &#34;blocked&#34; then &#34;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.&#34; else &#34;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.&#34;)" target="question" />
216
215
  <zeebe:input source="=&#34;blocked&#34;" target="status" />
217
216
  </zeebe:ioMapping>
218
217
  </bpmn:extensionElements>
219
218
  <bpmn:incoming>f_m_gBlocked</bpmn:incoming>
220
- <bpmn:incoming>f_cib_esc</bpmn:incoming>
221
- <bpmn:incoming>f_reb_blocked</bpmn:incoming>
222
- <bpmn:incoming>f_ci_sla</bpmn:incoming>
219
+ <bpmn:incoming>f_ci_escAttempt</bpmn:incoming>
220
+ <bpmn:incoming>f_reb_escAttempt</bpmn:incoming>
223
221
  <bpmn:incoming>f_mr_giveup</bpmn:incoming>
224
222
  <bpmn:outgoing>f_m_escA</bpmn:outgoing>
225
223
  </bpmn:serviceTask>
@@ -260,93 +258,271 @@
260
258
  <bpmn:outgoing>f_ci_go</bpmn:outgoing>
261
259
  <bpmn:outgoing>f_ci_giveup</bpmn:outgoing>
262
260
  </bpmn:exclusiveGateway>
263
- <bpmn:serviceTask id="fix-ci" name="Fix CI (agent)">
264
- <bpmn:extensionElements>
265
- <zeebe:taskDefinition type="senior:fix-ci" />
266
- <zeebe:linkedResources>
267
- <zeebe:linkedResource resourceId="fix-ci.md" bindingType="latest" resourceType="GenericScript" linkName="prompt" />
268
- </zeebe:linkedResources>
269
- <zeebe:properties>
270
- <zeebe:property name="io.nanobpm.dataEnvelope.in" value="FixCiIn" />
271
- <zeebe:property name="io.nanobpm.dataEnvelope.out" value="FixCiOut" />
272
- </zeebe:properties>
273
- <zeebe:ioMapping>
274
- <zeebe:input source="=(if (failingChecksList = null or failingChecksList = &#34;&#34;) then &#34;&#34; else &#34;&#10;&#10;Failing checks to make green:&#10;&#34; + failingChecksList) + (if (abandonBrief = null) then &#34;&#34; else abandonBrief)" target="appendPrompt" />
275
- <zeebe:output source="=ciFixRound + 1" target="ciFixRound" />
276
- </zeebe:ioMapping>
277
- </bpmn:extensionElements>
261
+ <bpmn:subProcess id="SP_cifix" name="CI fix">
278
262
  <bpmn:incoming>f_ci_go</bpmn:incoming>
279
- <bpmn:outgoing>f_ci_done</bpmn:outgoing>
280
- </bpmn:serviceTask>
281
- <bpmn:boundaryEvent id="be_fixci_sla" name="SLA elapsed" attachedToRef="fix-ci">
282
- <bpmn:outgoing>f_ci_sla</bpmn:outgoing>
283
- <bpmn:timerEventDefinition id="ted_fixci_sla">
284
- <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=agentSlaTimeout</bpmn:timeDuration>
285
- </bpmn:timerEventDefinition>
286
- </bpmn:boundaryEvent>
287
- <bpmn:exclusiveGateway id="gw-ci-result" name="fixed?" default="f_ci_reconcile">
288
- <bpmn:incoming>f_ci_done</bpmn:incoming>
289
- <bpmn:outgoing>f_ci_fixed</bpmn:outgoing>
290
- <bpmn:outgoing>f_ci_wait</bpmn:outgoing>
291
- <bpmn:outgoing>f_ci_reattempt</bpmn:outgoing>
292
- <bpmn:outgoing>f_ci_blocked</bpmn:outgoing>
293
- <bpmn:outgoing>f_ci_reconcile</bpmn:outgoing>
294
- </bpmn:exclusiveGateway>
295
- <bpmn:exclusiveGateway id="gw-ci-blocked" name="reconcile then escalate?" default="f_cib_esc">
296
- <bpmn:incoming>f_ci_blocked</bpmn:incoming>
297
- <bpmn:outgoing>f_cib_recon</bpmn:outgoing>
298
- <bpmn:outgoing>f_cib_esc</bpmn:outgoing>
263
+ <bpmn:outgoing>f_ci_spdone</bpmn:outgoing>
264
+ <bpmn:startEvent id="ci_start">
265
+ <bpmn:outgoing>f_ci_s0</bpmn:outgoing>
266
+ </bpmn:startEvent>
267
+ <bpmn:sequenceFlow id="f_ci_s0" sourceRef="ci_start" targetRef="fix-ci" />
268
+ <bpmn:serviceTask id="fix-ci" name="Fix CI (agent)">
269
+ <bpmn:extensionElements>
270
+ <zeebe:taskDefinition type="senior:fix-ci" />
271
+ <zeebe:linkedResources>
272
+ <zeebe:linkedResource resourceId="fix-ci.md" bindingType="latest" resourceType="GenericScript" linkName="prompt" />
273
+ </zeebe:linkedResources>
274
+ <zeebe:properties>
275
+ <zeebe:property name="io.nanobpm.dataEnvelope.in" value="FixCiIn" />
276
+ <zeebe:property name="io.nanobpm.dataEnvelope.out" value="FixCiOut" />
277
+ </zeebe:properties>
278
+ <zeebe:ioMapping>
279
+ <zeebe:input source="=(if (failingChecksList = null or failingChecksList = &#34;&#34;) then &#34;&#34; else &#34;&#10;&#10;Failing checks to make green:&#10;&#34; + failingChecksList) + (if (abandonBrief = null) then &#34;&#34; else abandonBrief)" target="appendPrompt" />
280
+ <zeebe:output source="=ciFixRound + 1" target="ciFixRound" />
281
+ </zeebe:ioMapping>
282
+ </bpmn:extensionElements>
283
+ <bpmn:incoming>f_ci_s0</bpmn:incoming>
284
+ <bpmn:outgoing>f_ci_done</bpmn:outgoing>
285
+ </bpmn:serviceTask>
286
+ <bpmn:boundaryEvent id="be_fixci_sla" name="SLA elapsed" attachedToRef="fix-ci">
287
+ <bpmn:outgoing>f_ci_sla</bpmn:outgoing>
288
+ <bpmn:timerEventDefinition id="ted_fixci_sla">
289
+ <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=agentSlaTimeout</bpmn:timeDuration>
290
+ </bpmn:timerEventDefinition>
291
+ </bpmn:boundaryEvent>
292
+ <bpmn:sequenceFlow id="f_ci_done" sourceRef="fix-ci" targetRef="gw-ci-result" />
293
+ <bpmn:exclusiveGateway id="gw-ci-result" name="fixed?" default="f_ci_reconcile">
294
+ <bpmn:incoming>f_ci_done</bpmn:incoming>
295
+ <bpmn:outgoing>f_ci_fixed</bpmn:outgoing>
296
+ <bpmn:outgoing>f_ci_wait</bpmn:outgoing>
297
+ <bpmn:outgoing>f_ci_reattempt</bpmn:outgoing>
298
+ <bpmn:outgoing>f_ci_blocked</bpmn:outgoing>
299
+ <bpmn:outgoing>f_ci_reconcile</bpmn:outgoing>
300
+ </bpmn:exclusiveGateway>
301
+ <bpmn:sequenceFlow id="f_ci_fixed" name="fixed" sourceRef="gw-ci-result" targetRef="end_ci_fixed">
302
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "fixed"</bpmn:conditionExpression>
303
+ </bpmn:sequenceFlow>
304
+ <bpmn:sequenceFlow id="f_ci_reattempt" name="stale/transient checks — re-attempt" sourceRef="gw-ci-result" targetRef="end_ci_reattempt">
305
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "reattempt"</bpmn:conditionExpression>
306
+ </bpmn:sequenceFlow>
307
+ <bpmn:sequenceFlow id="f_ci_wait" name="waits on another PR" sourceRef="gw-ci-result" targetRef="end_ci_waiting">
308
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting-on-pr"</bpmn:conditionExpression>
309
+ </bpmn:sequenceFlow>
310
+ <bpmn:sequenceFlow id="f_ci_blocked" name="could not fix" sourceRef="gw-ci-result" targetRef="gw-ci-blocked">
311
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "blocked"</bpmn:conditionExpression>
312
+ </bpmn:sequenceFlow>
313
+ <bpmn:sequenceFlow id="f_ci_reconcile" name="no verdict — reconcile from ground truth" sourceRef="gw-ci-result" targetRef="end_ci_reconcile" />
314
+ <bpmn:exclusiveGateway id="gw-ci-blocked" name="reconcile then escalate?" default="f_cib_esc">
315
+ <bpmn:incoming>f_ci_blocked</bpmn:incoming>
316
+ <bpmn:outgoing>f_cib_recon</bpmn:outgoing>
317
+ <bpmn:outgoing>f_cib_esc</bpmn:outgoing>
318
+ </bpmn:exclusiveGateway>
319
+ <bpmn:sequenceFlow id="f_cib_recon" name="pushed nothing — reconcile once" sourceRef="gw-ci-blocked" targetRef="ci-reconcile">
320
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=pushed != true and ciBlockedReconciled != true</bpmn:conditionExpression>
321
+ </bpmn:sequenceFlow>
322
+ <bpmn:sequenceFlow id="f_cib_esc" name="still blocked — escalate" sourceRef="gw-ci-blocked" targetRef="end_ci_esc" />
323
+ <bpmn:serviceTask id="ci-reconcile" name="Reconcile blocked from ground truth">
324
+ <bpmn:extensionElements>
325
+ <zeebe:taskDefinition type="pr.arm-merge" />
326
+ <zeebe:properties>
327
+ <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeArmIn" />
328
+ </zeebe:properties>
329
+ <zeebe:ioMapping>
330
+ <zeebe:output source="=null" target="status" />
331
+ <zeebe:output source="=true" target="ciBlockedReconciled" />
332
+ </zeebe:ioMapping>
333
+ </bpmn:extensionElements>
334
+ <bpmn:incoming>f_cib_recon</bpmn:incoming>
335
+ <bpmn:outgoing>f_cib_armed</bpmn:outgoing>
336
+ </bpmn:serviceTask>
337
+ <bpmn:sequenceFlow id="f_cib_armed" sourceRef="ci-reconcile" targetRef="end_ci_recheck" />
338
+ <bpmn:sequenceFlow id="f_ci_sla" name="agent SLA elapsed" sourceRef="be_fixci_sla" targetRef="end_ci_sla" />
339
+ <bpmn:endEvent id="end_ci_fixed" name="fixed — re-arm">
340
+ <bpmn:extensionElements>
341
+ <zeebe:ioMapping>
342
+ <zeebe:output source="=&#34;fixed&#34;" target="ciOutcome" />
343
+ </zeebe:ioMapping>
344
+ </bpmn:extensionElements>
345
+ <bpmn:incoming>f_ci_fixed</bpmn:incoming>
346
+ </bpmn:endEvent>
347
+ <bpmn:endEvent id="end_ci_reattempt" name="re-attempt">
348
+ <bpmn:extensionElements>
349
+ <zeebe:ioMapping>
350
+ <zeebe:output source="=&#34;reattempt&#34;" target="ciOutcome" />
351
+ </zeebe:ioMapping>
352
+ </bpmn:extensionElements>
353
+ <bpmn:incoming>f_ci_reattempt</bpmn:incoming>
354
+ </bpmn:endEvent>
355
+ <bpmn:endEvent id="end_ci_reconcile" name="reconcile from ground truth">
356
+ <bpmn:extensionElements>
357
+ <zeebe:ioMapping>
358
+ <zeebe:output source="=&#34;reconcile&#34;" target="ciOutcome" />
359
+ </zeebe:ioMapping>
360
+ </bpmn:extensionElements>
361
+ <bpmn:incoming>f_ci_reconcile</bpmn:incoming>
362
+ </bpmn:endEvent>
363
+ <bpmn:endEvent id="end_ci_recheck" name="reconciled — re-check mergeable">
364
+ <bpmn:extensionElements>
365
+ <zeebe:ioMapping>
366
+ <zeebe:output source="=&#34;recheck&#34;" target="ciOutcome" />
367
+ </zeebe:ioMapping>
368
+ </bpmn:extensionElements>
369
+ <bpmn:incoming>f_cib_armed</bpmn:incoming>
370
+ </bpmn:endEvent>
371
+ <bpmn:endEvent id="end_ci_waiting" name="waits on another PR">
372
+ <bpmn:extensionElements>
373
+ <zeebe:ioMapping>
374
+ <zeebe:output source="=&#34;waiting&#34;" target="ciOutcome" />
375
+ </zeebe:ioMapping>
376
+ </bpmn:extensionElements>
377
+ <bpmn:incoming>f_ci_wait</bpmn:incoming>
378
+ </bpmn:endEvent>
379
+ <bpmn:endEvent id="end_ci_esc" name="escalate">
380
+ <bpmn:extensionElements>
381
+ <zeebe:ioMapping>
382
+ <zeebe:output source="=&#34;escalate&#34;" target="ciOutcome" />
383
+ </zeebe:ioMapping>
384
+ </bpmn:extensionElements>
385
+ <bpmn:incoming>f_cib_esc</bpmn:incoming>
386
+ </bpmn:endEvent>
387
+ <bpmn:endEvent id="end_ci_sla" name="SLA — escalate">
388
+ <bpmn:extensionElements>
389
+ <zeebe:ioMapping>
390
+ <zeebe:output source="=&#34;escalate&#34;" target="ciOutcome" />
391
+ </zeebe:ioMapping>
392
+ </bpmn:extensionElements>
393
+ <bpmn:incoming>f_ci_sla</bpmn:incoming>
394
+ </bpmn:endEvent>
395
+ </bpmn:subProcess>
396
+ <bpmn:exclusiveGateway id="gw-ci-outcome" name="CI fix outcome?" default="f_ci_rearm">
397
+ <bpmn:incoming>f_ci_spdone</bpmn:incoming>
398
+ <bpmn:outgoing>f_ci_recheck</bpmn:outgoing>
399
+ <bpmn:outgoing>f_ci_waitDep</bpmn:outgoing>
400
+ <bpmn:outgoing>f_ci_escAttempt</bpmn:outgoing>
401
+ <bpmn:outgoing>f_ci_rearm</bpmn:outgoing>
299
402
  </bpmn:exclusiveGateway>
300
- <bpmn:serviceTask id="ci-reconcile" name="Reconcile blocked from ground truth">
301
- <bpmn:extensionElements>
302
- <zeebe:taskDefinition type="pr.arm-merge" />
303
- <zeebe:properties>
304
- <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeArmIn" />
305
- </zeebe:properties>
306
- <zeebe:ioMapping>
307
- <zeebe:output source="=null" target="status" />
308
- <zeebe:output source="=true" target="ciBlockedReconciled" />
309
- </zeebe:ioMapping>
310
- </bpmn:extensionElements>
311
- <bpmn:incoming>f_cib_recon</bpmn:incoming>
312
- <bpmn:outgoing>f_cib_armed</bpmn:outgoing>
313
- </bpmn:serviceTask>
403
+ <bpmn:sequenceFlow id="f_ci_recheck" name="reconciled — re-check" sourceRef="gw-ci-outcome" targetRef="wait-mergeable">
404
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciOutcome = "recheck"</bpmn:conditionExpression>
405
+ </bpmn:sequenceFlow>
406
+ <bpmn:sequenceFlow id="f_ci_waitDep" name="waits on another PR" sourceRef="gw-ci-outcome" targetRef="record-merge-dep">
407
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciOutcome = "waiting"</bpmn:conditionExpression>
408
+ </bpmn:sequenceFlow>
409
+ <bpmn:sequenceFlow id="f_ci_escAttempt" name="escalate" sourceRef="gw-ci-outcome" targetRef="merge-esc-attempt">
410
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciOutcome = "escalate"</bpmn:conditionExpression>
411
+ </bpmn:sequenceFlow>
412
+ <bpmn:sequenceFlow id="f_ci_rearm" name="fixed / re-attempt / reconcile — re-arm" sourceRef="gw-ci-outcome" targetRef="arm-merge" />
314
413
  <bpmn:exclusiveGateway id="gw-rebase" name="auto-rebase?" default="f_reb_giveup">
315
414
  <bpmn:incoming>f_m_mRebase</bpmn:incoming>
316
415
  <bpmn:outgoing>f_reb_go</bpmn:outgoing>
317
416
  <bpmn:outgoing>f_reb_giveup</bpmn:outgoing>
318
417
  </bpmn:exclusiveGateway>
319
- <bpmn:serviceTask id="rebase" name="Rebase (agent)">
320
- <bpmn:extensionElements>
321
- <zeebe:taskDefinition type="senior:rebase" />
322
- <zeebe:linkedResources>
323
- <zeebe:linkedResource resourceId="rebase.md" bindingType="latest" resourceType="GenericScript" linkName="prompt" />
324
- </zeebe:linkedResources>
325
- <zeebe:properties>
326
- <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RebaseIn" />
327
- <zeebe:property name="io.nanobpm.dataEnvelope.out" value="RebaseOut" />
328
- </zeebe:properties>
329
- <zeebe:ioMapping>
330
- <zeebe:input source="=(if (abandonBrief = null) then &#34;&#34; else abandonBrief)" target="appendPrompt" />
331
- <zeebe:output source="=rebaseRound + 1" target="rebaseRound" />
332
- </zeebe:ioMapping>
333
- </bpmn:extensionElements>
418
+ <bpmn:subProcess id="SP_rebase" name="Rebase">
334
419
  <bpmn:incoming>f_reb_go</bpmn:incoming>
335
- <bpmn:outgoing>f_reb_done</bpmn:outgoing>
336
- </bpmn:serviceTask>
337
- <bpmn:boundaryEvent id="be_rebase_sla" name="SLA elapsed" attachedToRef="rebase">
338
- <bpmn:outgoing>f_reb_sla</bpmn:outgoing>
339
- <bpmn:timerEventDefinition id="ted_rebase_sla">
340
- <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=agentSlaTimeout</bpmn:timeDuration>
341
- </bpmn:timerEventDefinition>
342
- </bpmn:boundaryEvent>
343
- <bpmn:exclusiveGateway id="gw-rebase-result" name="rebased?" default="f_reb_reconcile">
344
- <bpmn:incoming>f_reb_done</bpmn:incoming>
345
- <bpmn:outgoing>f_reb_rebased</bpmn:outgoing>
346
- <bpmn:outgoing>f_reb_wait</bpmn:outgoing>
347
- <bpmn:outgoing>f_reb_blocked</bpmn:outgoing>
348
- <bpmn:outgoing>f_reb_reconcile</bpmn:outgoing>
420
+ <bpmn:outgoing>f_reb_spdone</bpmn:outgoing>
421
+ <bpmn:startEvent id="reb_start">
422
+ <bpmn:outgoing>f_reb_s0</bpmn:outgoing>
423
+ </bpmn:startEvent>
424
+ <bpmn:sequenceFlow id="f_reb_s0" sourceRef="reb_start" targetRef="rebase" />
425
+ <bpmn:serviceTask id="rebase" name="Rebase (agent)">
426
+ <bpmn:extensionElements>
427
+ <zeebe:taskDefinition type="senior:rebase" />
428
+ <zeebe:linkedResources>
429
+ <zeebe:linkedResource resourceId="rebase.md" bindingType="latest" resourceType="GenericScript" linkName="prompt" />
430
+ </zeebe:linkedResources>
431
+ <zeebe:properties>
432
+ <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RebaseIn" />
433
+ <zeebe:property name="io.nanobpm.dataEnvelope.out" value="RebaseOut" />
434
+ </zeebe:properties>
435
+ <zeebe:ioMapping>
436
+ <zeebe:input source="=(if (abandonBrief = null) then &#34;&#34; else abandonBrief)" target="appendPrompt" />
437
+ <zeebe:output source="=rebaseRound + 1" target="rebaseRound" />
438
+ </zeebe:ioMapping>
439
+ </bpmn:extensionElements>
440
+ <bpmn:incoming>f_reb_s0</bpmn:incoming>
441
+ <bpmn:outgoing>f_reb_done</bpmn:outgoing>
442
+ </bpmn:serviceTask>
443
+ <bpmn:boundaryEvent id="be_rebase_sla" name="SLA elapsed" attachedToRef="rebase">
444
+ <bpmn:outgoing>f_reb_sla</bpmn:outgoing>
445
+ <bpmn:timerEventDefinition id="ted_rebase_sla">
446
+ <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=agentSlaTimeout</bpmn:timeDuration>
447
+ </bpmn:timerEventDefinition>
448
+ </bpmn:boundaryEvent>
449
+ <bpmn:sequenceFlow id="f_reb_done" sourceRef="rebase" targetRef="gw-rebase-result" />
450
+ <bpmn:exclusiveGateway id="gw-rebase-result" name="rebased?" default="f_reb_reconcile">
451
+ <bpmn:incoming>f_reb_done</bpmn:incoming>
452
+ <bpmn:outgoing>f_reb_rebased</bpmn:outgoing>
453
+ <bpmn:outgoing>f_reb_wait</bpmn:outgoing>
454
+ <bpmn:outgoing>f_reb_blocked</bpmn:outgoing>
455
+ <bpmn:outgoing>f_reb_reconcile</bpmn:outgoing>
456
+ </bpmn:exclusiveGateway>
457
+ <bpmn:sequenceFlow id="f_reb_rebased" name="rebased" sourceRef="gw-rebase-result" targetRef="end_reb_rebased">
458
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "rebased"</bpmn:conditionExpression>
459
+ </bpmn:sequenceFlow>
460
+ <bpmn:sequenceFlow id="f_reb_wait" name="waits on another PR" sourceRef="gw-rebase-result" targetRef="end_reb_waiting">
461
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting-on-pr"</bpmn:conditionExpression>
462
+ </bpmn:sequenceFlow>
463
+ <bpmn:sequenceFlow id="f_reb_blocked" name="could not resolve" sourceRef="gw-rebase-result" targetRef="end_reb_blocked">
464
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "blocked"</bpmn:conditionExpression>
465
+ </bpmn:sequenceFlow>
466
+ <bpmn:sequenceFlow id="f_reb_reconcile" name="no verdict — reconcile from ground truth" sourceRef="gw-rebase-result" targetRef="end_reb_reconcile" />
467
+ <bpmn:sequenceFlow id="f_reb_sla" name="agent SLA elapsed" sourceRef="be_rebase_sla" targetRef="end_reb_sla" />
468
+ <bpmn:endEvent id="end_reb_rebased" name="rebased — re-arm">
469
+ <bpmn:extensionElements>
470
+ <zeebe:ioMapping>
471
+ <zeebe:output source="=&#34;rebased&#34;" target="rebaseOutcome" />
472
+ </zeebe:ioMapping>
473
+ </bpmn:extensionElements>
474
+ <bpmn:incoming>f_reb_rebased</bpmn:incoming>
475
+ </bpmn:endEvent>
476
+ <bpmn:endEvent id="end_reb_reconcile" name="reconcile from ground truth">
477
+ <bpmn:extensionElements>
478
+ <zeebe:ioMapping>
479
+ <zeebe:output source="=&#34;reconcile&#34;" target="rebaseOutcome" />
480
+ </zeebe:ioMapping>
481
+ </bpmn:extensionElements>
482
+ <bpmn:incoming>f_reb_reconcile</bpmn:incoming>
483
+ </bpmn:endEvent>
484
+ <bpmn:endEvent id="end_reb_waiting" name="waits on another PR">
485
+ <bpmn:extensionElements>
486
+ <zeebe:ioMapping>
487
+ <zeebe:output source="=&#34;waiting&#34;" target="rebaseOutcome" />
488
+ </zeebe:ioMapping>
489
+ </bpmn:extensionElements>
490
+ <bpmn:incoming>f_reb_wait</bpmn:incoming>
491
+ </bpmn:endEvent>
492
+ <bpmn:endEvent id="end_reb_blocked" name="could not resolve — escalate">
493
+ <bpmn:extensionElements>
494
+ <zeebe:ioMapping>
495
+ <zeebe:output source="=&#34;escalate-attempt&#34;" target="rebaseOutcome" />
496
+ </zeebe:ioMapping>
497
+ </bpmn:extensionElements>
498
+ <bpmn:incoming>f_reb_blocked</bpmn:incoming>
499
+ </bpmn:endEvent>
500
+ <bpmn:endEvent id="end_reb_sla" name="SLA — escalate">
501
+ <bpmn:extensionElements>
502
+ <zeebe:ioMapping>
503
+ <zeebe:output source="=&#34;escalate-conflict&#34;" target="rebaseOutcome" />
504
+ </zeebe:ioMapping>
505
+ </bpmn:extensionElements>
506
+ <bpmn:incoming>f_reb_sla</bpmn:incoming>
507
+ </bpmn:endEvent>
508
+ </bpmn:subProcess>
509
+ <bpmn:exclusiveGateway id="gw-rebase-outcome" name="Rebase outcome?" default="f_reb_rearm">
510
+ <bpmn:incoming>f_reb_spdone</bpmn:incoming>
511
+ <bpmn:outgoing>f_reb_waitDep</bpmn:outgoing>
512
+ <bpmn:outgoing>f_reb_escAttempt</bpmn:outgoing>
513
+ <bpmn:outgoing>f_reb_escConflict</bpmn:outgoing>
514
+ <bpmn:outgoing>f_reb_rearm</bpmn:outgoing>
349
515
  </bpmn:exclusiveGateway>
516
+ <bpmn:sequenceFlow id="f_reb_waitDep" name="waits on another PR" sourceRef="gw-rebase-outcome" targetRef="record-merge-dep">
517
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=rebaseOutcome = "waiting"</bpmn:conditionExpression>
518
+ </bpmn:sequenceFlow>
519
+ <bpmn:sequenceFlow id="f_reb_escAttempt" name="could not resolve — escalate" sourceRef="gw-rebase-outcome" targetRef="merge-esc-attempt">
520
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=rebaseOutcome = "escalate-attempt"</bpmn:conditionExpression>
521
+ </bpmn:sequenceFlow>
522
+ <bpmn:sequenceFlow id="f_reb_escConflict" name="SLA — escalate" sourceRef="gw-rebase-outcome" targetRef="merge-esc-conflict">
523
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=rebaseOutcome = "escalate-conflict"</bpmn:conditionExpression>
524
+ </bpmn:sequenceFlow>
525
+ <bpmn:sequenceFlow id="f_reb_rearm" name="rebased / reconcile — re-arm" sourceRef="gw-rebase-outcome" targetRef="arm-merge" />
350
526
  <bpmn:serviceTask id="record-merge-dep" name="Wait on another PR">
351
527
  <bpmn:extensionElements>
352
528
  <zeebe:taskDefinition type="pr.record-dependency" />
@@ -354,8 +530,8 @@
354
530
  <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordDepIn" />
355
531
  </zeebe:properties>
356
532
  </bpmn:extensionElements>
357
- <bpmn:incoming>f_ci_wait</bpmn:incoming>
358
- <bpmn:incoming>f_reb_wait</bpmn:incoming>
533
+ <bpmn:incoming>f_ci_waitDep</bpmn:incoming>
534
+ <bpmn:incoming>f_reb_waitDep</bpmn:incoming>
359
535
  <bpmn:outgoing>f_dep_rewait</bpmn:outgoing>
360
536
  </bpmn:serviceTask>
361
537
  <bpmn:sequenceFlow id="f_m_start" sourceRef="MergeStart" targetRef="wait-deps" />
@@ -372,44 +548,16 @@
372
548
  <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "conflict"</bpmn:conditionExpression>
373
549
  </bpmn:sequenceFlow>
374
550
  <bpmn:sequenceFlow id="f_m_mBlocked" name="not landable" sourceRef="gw-mergeable" targetRef="merge-esc-conflict" />
375
- <bpmn:sequenceFlow id="f_ci_go" name="within budget" sourceRef="gw-ci-fix" targetRef="fix-ci">
551
+ <bpmn:sequenceFlow id="f_ci_go" name="within budget" sourceRef="gw-ci-fix" targetRef="SP_cifix">
376
552
  <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciFixRound &lt; ciFixMax and failingChecks &gt; 0</bpmn:conditionExpression>
377
553
  </bpmn:sequenceFlow>
378
554
  <bpmn:sequenceFlow id="f_ci_giveup" name="budget exhausted" sourceRef="gw-ci-fix" targetRef="merge-esc-conflict" />
379
- <bpmn:sequenceFlow id="f_ci_done" sourceRef="fix-ci" targetRef="gw-ci-result" />
380
- <bpmn:sequenceFlow id="f_ci_fixed" name="fixed" sourceRef="gw-ci-result" targetRef="arm-merge">
381
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "fixed"</bpmn:conditionExpression>
382
- </bpmn:sequenceFlow>
383
- <bpmn:sequenceFlow id="f_ci_blocked" name="could not fix" sourceRef="gw-ci-result" targetRef="gw-ci-blocked">
384
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "blocked"</bpmn:conditionExpression>
385
- </bpmn:sequenceFlow>
386
- <bpmn:sequenceFlow id="f_ci_reattempt" name="stale/transient checks — re-attempt" sourceRef="gw-ci-result" targetRef="arm-merge">
387
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "reattempt"</bpmn:conditionExpression>
388
- </bpmn:sequenceFlow>
389
- <bpmn:sequenceFlow id="f_cib_recon" name="pushed nothing — reconcile once" sourceRef="gw-ci-blocked" targetRef="ci-reconcile">
390
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=pushed != true and ciBlockedReconciled != true</bpmn:conditionExpression>
391
- </bpmn:sequenceFlow>
392
- <bpmn:sequenceFlow id="f_cib_esc" name="still blocked — escalate" sourceRef="gw-ci-blocked" targetRef="merge-esc-attempt" />
393
- <bpmn:sequenceFlow id="f_cib_armed" sourceRef="ci-reconcile" targetRef="wait-mergeable" />
394
- <bpmn:sequenceFlow id="f_ci_reconcile" name="no verdict — reconcile from ground truth" sourceRef="gw-ci-result" targetRef="arm-merge" />
395
- <bpmn:sequenceFlow id="f_ci_wait" name="waits on another PR" sourceRef="gw-ci-result" targetRef="record-merge-dep">
396
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting-on-pr"</bpmn:conditionExpression>
397
- </bpmn:sequenceFlow>
398
- <bpmn:sequenceFlow id="f_reb_go" name="within budget" sourceRef="gw-rebase" targetRef="rebase">
555
+ <bpmn:sequenceFlow id="f_ci_spdone" sourceRef="SP_cifix" targetRef="gw-ci-outcome" />
556
+ <bpmn:sequenceFlow id="f_reb_go" name="within budget" sourceRef="gw-rebase" targetRef="SP_rebase">
399
557
  <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=rebaseRound &lt; rebaseMax</bpmn:conditionExpression>
400
558
  </bpmn:sequenceFlow>
401
559
  <bpmn:sequenceFlow id="f_reb_giveup" name="budget exhausted" sourceRef="gw-rebase" targetRef="merge-esc-conflict" />
402
- <bpmn:sequenceFlow id="f_reb_done" sourceRef="rebase" targetRef="gw-rebase-result" />
403
- <bpmn:sequenceFlow id="f_reb_rebased" name="rebased" sourceRef="gw-rebase-result" targetRef="arm-merge">
404
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "rebased"</bpmn:conditionExpression>
405
- </bpmn:sequenceFlow>
406
- <bpmn:sequenceFlow id="f_reb_blocked" name="could not resolve" sourceRef="gw-rebase-result" targetRef="merge-esc-attempt">
407
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "blocked"</bpmn:conditionExpression>
408
- </bpmn:sequenceFlow>
409
- <bpmn:sequenceFlow id="f_reb_reconcile" name="no verdict — reconcile from ground truth" sourceRef="gw-rebase-result" targetRef="arm-merge" />
410
- <bpmn:sequenceFlow id="f_reb_wait" name="waits on another PR" sourceRef="gw-rebase-result" targetRef="record-merge-dep">
411
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting-on-pr"</bpmn:conditionExpression>
412
- </bpmn:sequenceFlow>
560
+ <bpmn:sequenceFlow id="f_reb_spdone" sourceRef="SP_rebase" targetRef="gw-rebase-outcome" />
413
561
  <bpmn:sequenceFlow id="f_dep_rewait" sourceRef="record-merge-dep" targetRef="wait-deps" />
414
562
  <bpmn:sequenceFlow id="f_m_attempt" sourceRef="attempt-merge" targetRef="gw-merge" />
415
563
  <bpmn:sequenceFlow id="f_m_gMerged" name="merged" sourceRef="gw-merge" targetRef="mark-merged">
@@ -442,8 +590,6 @@
442
590
  <bpmn:sequenceFlow id="f_m_escReenter" name="no escalation opened" sourceRef="gw-merge-escalated" targetRef="arm-merge" />
443
591
  <bpmn:sequenceFlow id="f_m_answerRecord" sourceRef="wait-merge-answer" targetRef="record-merge-answer" />
444
592
  <bpmn:sequenceFlow id="f_m_answer" sourceRef="record-merge-answer" targetRef="arm-merge" />
445
- <bpmn:sequenceFlow id="f_reb_sla" name="agent SLA elapsed" sourceRef="be_rebase_sla" targetRef="merge-esc-conflict" />
446
- <bpmn:sequenceFlow id="f_ci_sla" name="agent SLA elapsed" sourceRef="be_fixci_sla" targetRef="merge-esc-attempt" />
447
593
  </bpmn:process>
448
594
  <bpmndi:BPMNDiagram id="BPMNDiagram_merge-loop">
449
595
  <bpmndi:BPMNPlane id="BPMNPlane_merge-loop" bpmnElement="merge-loop">
@@ -480,119 +626,98 @@
480
626
  <bpmndi:BPMNShape id="BPMNShape_gw-merge" bpmnElement="gw-merge" isMarkerVisible="true">
481
627
  <dc:Bounds x="1063" y="95" width="50" height="50" />
482
628
  <bpmndi:BPMNLabel>
483
- <dc:Bounds x="1102" y="150" width="53" height="28" />
629
+ <dc:Bounds x="1022" y="150" width="53" height="28" />
484
630
  </bpmndi:BPMNLabel>
485
631
  </bpmndi:BPMNShape>
486
632
  <bpmndi:BPMNShape id="BPMNShape_gw-merge-retry" bpmnElement="gw-merge-retry" isMarkerVisible="true">
487
- <dc:Bounds x="1263" y="1375" width="50" height="50" />
633
+ <dc:Bounds x="1238" y="575" width="50" height="50" />
488
634
  <bpmndi:BPMNLabel>
489
- <dc:Bounds x="1224" y="1470" width="88" height="28" />
635
+ <dc:Bounds x="1219" y="670" width="88" height="28" />
490
636
  </bpmndi:BPMNLabel>
491
637
  </bpmndi:BPMNShape>
492
638
  <bpmndi:BPMNShape id="BPMNShape_eg-landed" bpmnElement="eg-landed" isMarkerVisible="true">
493
- <dc:Bounds x="1263" y="255" width="50" height="50" />
639
+ <dc:Bounds x="1238" y="255" width="50" height="50" />
494
640
  <bpmndi:BPMNLabel>
495
- <dc:Bounds x="1256" y="222" width="64" height="28" />
641
+ <dc:Bounds x="1231" y="222" width="64" height="28" />
496
642
  </bpmndi:BPMNLabel>
497
643
  </bpmndi:BPMNShape>
498
644
  <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
499
- <dc:Bounds x="1470" y="262" width="36" height="36" />
645
+ <dc:Bounds x="1420" y="262" width="36" height="36" />
500
646
  <bpmndi:BPMNLabel>
501
- <dc:Bounds x="1446" y="229" width="85" height="28" />
647
+ <dc:Bounds x="1396" y="303" width="85" height="28" />
502
648
  </bpmndi:BPMNLabel>
503
649
  </bpmndi:BPMNShape>
504
650
  <bpmndi:BPMNShape id="BPMNShape_wait-evicted" bpmnElement="wait-evicted">
505
- <dc:Bounds x="1470" y="422" width="36" height="36" />
651
+ <dc:Bounds x="1420" y="422" width="36" height="36" />
506
652
  <bpmndi:BPMNLabel>
507
- <dc:Bounds x="1344" y="483" width="88" height="42" />
653
+ <dc:Bounds x="1394" y="375" width="88" height="42" />
508
654
  </bpmndi:BPMNLabel>
509
655
  </bpmndi:BPMNShape>
510
656
  <bpmndi:BPMNShape id="BPMNShape_mark-merged" bpmnElement="mark-merged">
511
- <dc:Bounds x="1638" y="80" width="100" height="80" />
657
+ <dc:Bounds x="1588" y="80" width="100" height="80" />
512
658
  </bpmndi:BPMNShape>
513
659
  <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
514
- <dc:Bounds x="1845" y="102" width="36" height="36" />
660
+ <dc:Bounds x="1820" y="102" width="36" height="36" />
515
661
  <bpmndi:BPMNLabel>
516
- <dc:Bounds x="1838" y="83" width="50" height="14" />
662
+ <dc:Bounds x="1813" y="143" width="50" height="14" />
517
663
  </bpmndi:BPMNLabel>
518
664
  </bpmndi:BPMNShape>
519
665
  <bpmndi:BPMNShape id="BPMNShape_MergeAbandoned" bpmnElement="MergeAbandoned">
520
- <dc:Bounds x="1270" y="582" width="36" height="36" />
666
+ <dc:Bounds x="1245" y="742" width="36" height="36" />
521
667
  <bpmndi:BPMNLabel>
522
- <dc:Bounds x="1227" y="623" width="82" height="28" />
668
+ <dc:Bounds x="1222" y="783" width="82" height="28" />
523
669
  </bpmndi:BPMNLabel>
524
670
  </bpmndi:BPMNShape>
525
671
  <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
526
- <dc:Bounds x="1238" y="2000" width="100" height="80" />
672
+ <dc:Bounds x="1388" y="880" width="100" height="80" />
527
673
  </bpmndi:BPMNShape>
528
674
  <bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
529
- <dc:Bounds x="1638" y="1360" width="100" height="80" />
675
+ <dc:Bounds x="1388" y="560" width="100" height="80" />
530
676
  </bpmndi:BPMNShape>
531
677
  <bpmndi:BPMNShape id="BPMNShape_gw-merge-escalated" bpmnElement="gw-merge-escalated" isMarkerVisible="true">
532
- <dc:Bounds x="1838" y="1375" width="50" height="50" />
678
+ <dc:Bounds x="1613" y="575" width="50" height="50" />
533
679
  <bpmndi:BPMNLabel>
534
- <dc:Bounds x="1826" y="1470" width="74" height="28" />
680
+ <dc:Bounds x="1601" y="670" width="74" height="28" />
535
681
  </bpmndi:BPMNLabel>
536
682
  </bpmndi:BPMNShape>
537
683
  <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
538
- <dc:Bounds x="1988" y="1360" width="100" height="80" />
684
+ <dc:Bounds x="1788" y="560" width="100" height="80" />
539
685
  </bpmndi:BPMNShape>
540
686
  <bpmndi:BPMNShape id="BPMNShape_record-merge-answer" bpmnElement="record-merge-answer">
541
- <dc:Bounds x="2188" y="1360" width="100" height="80" />
687
+ <dc:Bounds x="1988" y="560" width="100" height="80" />
542
688
  </bpmndi:BPMNShape>
543
689
  <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
544
- <dc:Bounds x="863" y="2015" width="50" height="50" />
690
+ <dc:Bounds x="863" y="895" width="50" height="50" />
545
691
  <bpmndi:BPMNLabel>
546
- <dc:Bounds x="769" y="2033" width="89" height="14" />
692
+ <dc:Bounds x="784" y="950" width="89" height="14" />
547
693
  </bpmndi:BPMNLabel>
548
694
  </bpmndi:BPMNShape>
549
- <bpmndi:BPMNShape id="BPMNShape_fix-ci" bpmnElement="fix-ci">
550
- <dc:Bounds x="1038" y="720" width="100" height="80" />
551
- </bpmndi:BPMNShape>
552
- <bpmndi:BPMNShape id="BPMNShape_gw-ci-result" bpmnElement="gw-ci-result" isMarkerVisible="true">
553
- <dc:Bounds x="1263" y="735" width="50" height="50" />
554
- <bpmndi:BPMNLabel>
555
- <dc:Bounds x="1225" y="790" width="46" height="14" />
556
- </bpmndi:BPMNLabel>
695
+ <bpmndi:BPMNShape id="BPMNShape_SP_cifix" bpmnElement="SP_cifix">
696
+ <dc:Bounds x="1038" y="1040" width="100" height="80" />
557
697
  </bpmndi:BPMNShape>
558
- <bpmndi:BPMNShape id="BPMNShape_gw-ci-blocked" bpmnElement="gw-ci-blocked" isMarkerVisible="true">
559
- <dc:Bounds x="1463" y="735" width="50" height="50" />
698
+ <bpmndi:BPMNShape id="BPMNShape_gw-ci-outcome" bpmnElement="gw-ci-outcome" isMarkerVisible="true">
699
+ <dc:Bounds x="1238" y="1055" width="50" height="50" />
560
700
  <bpmndi:BPMNLabel>
561
- <dc:Bounds x="1455" y="810" width="67" height="42" />
701
+ <dc:Bounds x="1232" y="1150" width="63" height="28" />
562
702
  </bpmndi:BPMNLabel>
563
703
  </bpmndi:BPMNShape>
564
- <bpmndi:BPMNShape id="BPMNShape_ci-reconcile" bpmnElement="ci-reconcile">
565
- <dc:Bounds x="1638" y="560" width="100" height="80" />
566
- </bpmndi:BPMNShape>
567
704
  <bpmndi:BPMNShape id="BPMNShape_gw-rebase" bpmnElement="gw-rebase" isMarkerVisible="true">
568
705
  <dc:Bounds x="863" y="255" width="50" height="50" />
569
706
  <bpmndi:BPMNLabel>
570
707
  <dc:Bounds x="844" y="236" width="88" height="14" />
571
708
  </bpmndi:BPMNLabel>
572
709
  </bpmndi:BPMNShape>
573
- <bpmndi:BPMNShape id="BPMNShape_rebase" bpmnElement="rebase">
574
- <dc:Bounds x="1038" y="1040" width="100" height="80" />
710
+ <bpmndi:BPMNShape id="BPMNShape_SP_rebase" bpmnElement="SP_rebase">
711
+ <dc:Bounds x="1038" y="1200" width="100" height="80" />
575
712
  </bpmndi:BPMNShape>
576
- <bpmndi:BPMNShape id="BPMNShape_gw-rebase-result" bpmnElement="gw-rebase-result" isMarkerVisible="true">
577
- <dc:Bounds x="1263" y="1055" width="50" height="50" />
713
+ <bpmndi:BPMNShape id="BPMNShape_gw-rebase-outcome" bpmnElement="gw-rebase-outcome" isMarkerVisible="true">
714
+ <dc:Bounds x="1238" y="1215" width="50" height="50" />
578
715
  <bpmndi:BPMNLabel>
579
- <dc:Bounds x="1218" y="1110" width="60" height="14" />
716
+ <dc:Bounds x="1232" y="1310" width="63" height="28" />
580
717
  </bpmndi:BPMNLabel>
581
718
  </bpmndi:BPMNShape>
582
719
  <bpmndi:BPMNShape id="BPMNShape_record-merge-dep" bpmnElement="record-merge-dep">
583
- <dc:Bounds x="1438" y="880" width="100" height="80" />
584
- </bpmndi:BPMNShape>
585
- <bpmndi:BPMNShape id="BPMNShape_be_fixci_sla" bpmnElement="be_fixci_sla">
586
- <dc:Bounds x="1070" y="782" width="36" height="36" />
587
- <bpmndi:BPMNLabel>
588
- <dc:Bounds x="1046" y="863" width="84" height="14" />
589
- </bpmndi:BPMNLabel>
590
- </bpmndi:BPMNShape>
591
- <bpmndi:BPMNShape id="BPMNShape_be_rebase_sla" bpmnElement="be_rebase_sla">
592
- <dc:Bounds x="1070" y="1102" width="36" height="36" />
593
- <bpmndi:BPMNLabel>
594
- <dc:Bounds x="1046" y="1183" width="84" height="14" />
595
- </bpmndi:BPMNLabel>
720
+ <dc:Bounds x="1388" y="1040" width="100" height="80" />
596
721
  </bpmndi:BPMNShape>
597
722
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
598
723
  <di:waypoint x="116" y="120" />
@@ -623,115 +748,143 @@
623
748
  </bpmndi:BPMNEdge>
624
749
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gMerged" bpmnElement="f_m_gMerged">
625
750
  <di:waypoint x="1113" y="120" />
626
- <di:waypoint x="1638" y="120" />
751
+ <di:waypoint x="1588" y="120" />
627
752
  <bpmndi:BPMNLabel>
628
- <dc:Bounds x="1351" y="98" width="49" height="14" />
753
+ <dc:Bounds x="1379" y="98" width="49" height="14" />
629
754
  </bpmndi:BPMNLabel>
630
755
  </bpmndi:BPMNEdge>
631
756
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
632
- <di:waypoint x="1738" y="120" />
633
- <di:waypoint x="1845" y="120" />
757
+ <di:waypoint x="1688" y="120" />
758
+ <di:waypoint x="1820" y="120" />
634
759
  </bpmndi:BPMNEdge>
635
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
636
- <di:waypoint x="913" y="2040" />
637
- <di:waypoint x="1238" y="2040" />
760
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_rearm" bpmnElement="f_ci_rearm">
761
+ <di:waypoint x="1263" y="1105" />
762
+ <di:waypoint x="1263" y="1140" />
763
+ <di:waypoint x="402" y="1140" />
764
+ <di:waypoint x="402" y="160" />
638
765
  <bpmndi:BPMNLabel>
639
- <dc:Bounds x="1032" y="2007" width="67" height="28" />
766
+ <dc:Bounds x="789" y="1079" width="88" height="56" />
640
767
  </bpmndi:BPMNLabel>
641
768
  </bpmndi:BPMNEdge>
642
- <bpmndi:BPMNEdge id="BPMNEdge_f_cib_esc" bpmnElement="f_cib_esc">
643
- <di:waypoint x="1513" y="760" />
644
- <di:waypoint x="1688" y="760" />
645
- <di:waypoint x="1688" y="1360" />
769
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rearm" bpmnElement="f_reb_rearm">
770
+ <di:waypoint x="1263" y="1265" />
771
+ <di:waypoint x="1263" y="1300" />
772
+ <di:waypoint x="402" y="1300" />
773
+ <di:waypoint x="402" y="160" />
646
774
  <bpmndi:BPMNLabel>
647
- <dc:Bounds x="1569" y="765" width="64" height="42" />
775
+ <dc:Bounds x="794" y="1253" width="78" height="42" />
648
776
  </bpmndi:BPMNLabel>
649
777
  </bpmndi:BPMNEdge>
650
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_reconcile" bpmnElement="f_ci_reconcile">
651
- <di:waypoint x="1288" y="785" />
652
- <di:waypoint x="1288" y="840" />
653
- <di:waypoint x="402" y="840" />
654
- <di:waypoint x="402" y="160" />
778
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
779
+ <di:waypoint x="913" y="920" />
780
+ <di:waypoint x="1388" y="920" />
655
781
  <bpmndi:BPMNLabel>
656
- <dc:Bounds x="804" y="779" width="82" height="56" />
782
+ <dc:Bounds x="1127" y="925" width="67" height="28" />
657
783
  </bpmndi:BPMNLabel>
658
784
  </bpmndi:BPMNEdge>
659
785
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
660
786
  <di:waypoint x="913" y="280" />
661
787
  <di:waypoint x="933" y="280" />
662
788
  <di:waypoint x="933" y="305" />
663
- <di:waypoint x="1326" y="305" />
664
- <di:waypoint x="1326" y="1980" />
665
- <di:waypoint x="1288" y="1980" />
666
- <di:waypoint x="1288" y="2000" />
667
- <bpmndi:BPMNLabel>
668
- <dc:Bounds x="1331" y="1646" width="67" height="28" />
669
- </bpmndi:BPMNLabel>
670
- </bpmndi:BPMNEdge>
671
- <bpmndi:BPMNEdge id="BPMNEdge_f_reb_reconcile" bpmnElement="f_reb_reconcile">
672
- <di:waypoint x="1288" y="1105" />
673
- <di:waypoint x="1288" y="1160" />
674
- <di:waypoint x="402" y="1160" />
675
- <di:waypoint x="402" y="160" />
789
+ <di:waypoint x="1163" y="305" />
790
+ <di:waypoint x="1163" y="900" />
791
+ <di:waypoint x="1388" y="900" />
676
792
  <bpmndi:BPMNLabel>
677
- <dc:Bounds x="804" y="1099" width="82" height="56" />
793
+ <dc:Bounds x="1035" y="310" width="67" height="28" />
678
794
  </bpmndi:BPMNLabel>
679
795
  </bpmndi:BPMNEdge>
680
796
  <bpmndi:BPMNEdge id="BPMNEdge_f_mr_giveup" bpmnElement="f_mr_giveup">
681
- <di:waypoint x="1313" y="1400" />
682
- <di:waypoint x="1638" y="1400" />
797
+ <di:waypoint x="1288" y="600" />
798
+ <di:waypoint x="1388" y="600" />
683
799
  <bpmndi:BPMNLabel>
684
- <dc:Bounds x="1432" y="1367" width="67" height="28" />
800
+ <dc:Bounds x="1305" y="605" width="67" height="28" />
685
801
  </bpmndi:BPMNLabel>
686
802
  </bpmndi:BPMNEdge>
687
803
  <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
688
- <di:waypoint x="1313" y="280" />
689
- <di:waypoint x="1470" y="280" />
804
+ <di:waypoint x="1288" y="280" />
805
+ <di:waypoint x="1420" y="280" />
690
806
  </bpmndi:BPMNEdge>
691
807
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
692
- <di:waypoint x="1506" y="280" />
693
- <di:waypoint x="1688" y="280" />
694
- <di:waypoint x="1688" y="160" />
808
+ <di:waypoint x="1456" y="280" />
809
+ <di:waypoint x="1638" y="280" />
810
+ <di:waypoint x="1638" y="160" />
695
811
  </bpmndi:BPMNEdge>
696
812
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
697
- <di:waypoint x="1338" y="2040" />
698
- <di:waypoint x="2038" y="2040" />
699
- <di:waypoint x="2038" y="1440" />
813
+ <di:waypoint x="1488" y="920" />
814
+ <di:waypoint x="1838" y="920" />
815
+ <di:waypoint x="1838" y="640" />
700
816
  </bpmndi:BPMNEdge>
701
817
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
702
- <di:waypoint x="1738" y="1400" />
703
- <di:waypoint x="1838" y="1400" />
818
+ <di:waypoint x="1488" y="600" />
819
+ <di:waypoint x="1613" y="600" />
704
820
  </bpmndi:BPMNEdge>
705
821
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escReenter" bpmnElement="f_m_escReenter">
706
- <di:waypoint x="1863" y="1425" />
707
- <di:waypoint x="1863" y="1460" />
708
- <di:waypoint x="402" y="1460" />
822
+ <di:waypoint x="1638" y="625" />
823
+ <di:waypoint x="1638" y="660" />
824
+ <di:waypoint x="402" y="660" />
709
825
  <di:waypoint x="402" y="160" />
710
826
  <bpmndi:BPMNLabel>
711
- <dc:Bounds x="1096" y="1465" width="74" height="42" />
827
+ <dc:Bounds x="1023" y="665" width="74" height="42" />
712
828
  </bpmndi:BPMNLabel>
713
829
  </bpmndi:BPMNEdge>
714
830
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_answerRecord" bpmnElement="f_m_answerRecord">
715
- <di:waypoint x="2088" y="1400" />
716
- <di:waypoint x="2188" y="1400" />
831
+ <di:waypoint x="1888" y="600" />
832
+ <di:waypoint x="1988" y="600" />
717
833
  </bpmndi:BPMNEdge>
718
834
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
719
- <di:waypoint x="2238" y="1440" />
720
- <di:waypoint x="2238" y="1460" />
721
- <di:waypoint x="402" y="1460" />
835
+ <di:waypoint x="2038" y="640" />
836
+ <di:waypoint x="2038" y="980" />
837
+ <di:waypoint x="402" y="980" />
722
838
  <di:waypoint x="402" y="160" />
723
839
  </bpmndi:BPMNEdge>
840
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_escAttempt" bpmnElement="f_ci_escAttempt">
841
+ <di:waypoint x="1263" y="1055" />
842
+ <di:waypoint x="1263" y="1035" />
843
+ <di:waypoint x="1908" y="1035" />
844
+ <di:waypoint x="1908" y="555" />
845
+ <di:waypoint x="1368" y="555" />
846
+ <di:waypoint x="1368" y="580" />
847
+ <di:waypoint x="1388" y="580" />
848
+ <bpmndi:BPMNLabel>
849
+ <dc:Bounds x="1556" y="1013" width="60" height="14" />
850
+ </bpmndi:BPMNLabel>
851
+ </bpmndi:BPMNEdge>
852
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_waitDep" bpmnElement="f_reb_waitDep">
853
+ <di:waypoint x="1288" y="1240" />
854
+ <di:waypoint x="1438" y="1240" />
855
+ <di:waypoint x="1438" y="1120" />
856
+ <bpmndi:BPMNLabel>
857
+ <dc:Bounds x="1366" y="1245" width="75" height="28" />
858
+ </bpmndi:BPMNLabel>
859
+ </bpmndi:BPMNEdge>
860
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escAttempt" bpmnElement="f_reb_escAttempt">
861
+ <di:waypoint x="1288" y="1240" />
862
+ <di:waypoint x="1308" y="1240" />
863
+ <di:waypoint x="1308" y="1215" />
864
+ <di:waypoint x="1908" y="1215" />
865
+ <di:waypoint x="1908" y="555" />
866
+ <di:waypoint x="1368" y="555" />
867
+ <di:waypoint x="1368" y="580" />
868
+ <di:waypoint x="1388" y="580" />
869
+ <bpmndi:BPMNLabel>
870
+ <dc:Bounds x="1913" y="1104" width="64" height="42" />
871
+ </bpmndi:BPMNLabel>
872
+ </bpmndi:BPMNEdge>
873
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escConflict" bpmnElement="f_reb_escConflict">
874
+ <di:waypoint x="1288" y="1240" />
875
+ <di:waypoint x="1368" y="1240" />
876
+ <di:waypoint x="1368" y="920" />
877
+ <di:waypoint x="1388" y="920" />
878
+ <bpmndi:BPMNLabel>
879
+ <dc:Bounds x="1303" y="1086" width="60" height="28" />
880
+ </bpmndi:BPMNLabel>
881
+ </bpmndi:BPMNEdge>
724
882
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
725
883
  <di:waypoint x="713" y="145" />
726
- <di:waypoint x="713" y="318" />
727
- <di:waypoint x="1333" y="318" />
728
- <di:waypoint x="1333" y="1340" />
729
- <di:waypoint x="863" y="1340" />
730
- <di:waypoint x="863" y="1995" />
731
- <di:waypoint x="888" y="1995" />
732
- <di:waypoint x="888" y="2015" />
884
+ <di:waypoint x="713" y="920" />
885
+ <di:waypoint x="863" y="920" />
733
886
  <bpmndi:BPMNLabel>
734
- <dc:Bounds x="1011" y="1293" width="60" height="42" />
887
+ <dc:Bounds x="718" y="598" width="60" height="42" />
735
888
  </bpmndi:BPMNLabel>
736
889
  </bpmndi:BPMNEdge>
737
890
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
@@ -745,226 +898,370 @@
745
898
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_mBlocked" bpmnElement="f_m_mBlocked">
746
899
  <di:waypoint x="713" y="145" />
747
900
  <di:waypoint x="713" y="318" />
748
- <di:waypoint x="1326" y="318" />
749
- <di:waypoint x="1326" y="1340" />
750
- <di:waypoint x="1218" y="1340" />
751
- <di:waypoint x="1218" y="2020" />
752
- <di:waypoint x="1238" y="2020" />
901
+ <di:waypoint x="933" y="318" />
902
+ <di:waypoint x="933" y="920" />
903
+ <di:waypoint x="1388" y="920" />
753
904
  <bpmndi:BPMNLabel>
754
- <dc:Bounds x="1236" y="862" width="85" height="14" />
905
+ <dc:Bounds x="781" y="326" width="85" height="14" />
755
906
  </bpmndi:BPMNLabel>
756
907
  </bpmndi:BPMNEdge>
757
908
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
758
- <di:waypoint x="888" y="2065" />
759
- <di:waypoint x="888" y="2085" />
760
- <di:waypoint x="2308" y="2085" />
761
- <di:waypoint x="2308" y="715" />
762
- <di:waypoint x="1018" y="715" />
763
- <di:waypoint x="1018" y="740" />
764
- <di:waypoint x="1038" y="740" />
765
- <bpmndi:BPMNLabel>
766
- <dc:Bounds x="2313" y="1386" width="49" height="28" />
767
- </bpmndi:BPMNLabel>
768
- </bpmndi:BPMNEdge>
769
- <bpmndi:BPMNEdge id="BPMNEdge_f_cib_recon" bpmnElement="f_cib_recon">
770
- <di:waypoint x="1488" y="735" />
771
- <di:waypoint x="1488" y="600" />
772
- <di:waypoint x="1638" y="600" />
773
- <bpmndi:BPMNLabel>
774
- <dc:Bounds x="1513" y="460" width="67" height="56" />
775
- </bpmndi:BPMNLabel>
776
- </bpmndi:BPMNEdge>
777
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_wait" bpmnElement="f_ci_wait">
778
- <di:waypoint x="1313" y="760" />
779
- <di:waypoint x="1418" y="760" />
780
- <di:waypoint x="1418" y="920" />
781
- <di:waypoint x="1438" y="920" />
909
+ <di:waypoint x="888" y="945" />
910
+ <di:waypoint x="888" y="1080" />
911
+ <di:waypoint x="1038" y="1080" />
782
912
  <bpmndi:BPMNLabel>
783
- <dc:Bounds x="1338" y="826" width="75" height="28" />
913
+ <dc:Bounds x="893" y="999" width="49" height="28" />
784
914
  </bpmndi:BPMNLabel>
785
915
  </bpmndi:BPMNEdge>
786
916
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_go" bpmnElement="f_reb_go">
787
917
  <di:waypoint x="913" y="280" />
788
- <di:waypoint x="933" y="280" />
789
- <di:waypoint x="933" y="305" />
790
- <di:waypoint x="1443" y="305" />
791
- <di:waypoint x="1443" y="805" />
792
- <di:waypoint x="1558" y="805" />
793
- <di:waypoint x="1558" y="980" />
794
- <di:waypoint x="1018" y="980" />
795
- <di:waypoint x="1018" y="1060" />
796
- <di:waypoint x="1038" y="1060" />
918
+ <di:waypoint x="1018" y="280" />
919
+ <di:waypoint x="1018" y="1240" />
920
+ <di:waypoint x="1038" y="1240" />
797
921
  <bpmndi:BPMNLabel>
798
- <dc:Bounds x="1448" y="561" width="49" height="28" />
799
- </bpmndi:BPMNLabel>
800
- </bpmndi:BPMNEdge>
801
- <bpmndi:BPMNEdge id="BPMNEdge_f_reb_blocked" bpmnElement="f_reb_blocked">
802
- <di:waypoint x="1313" y="1080" />
803
- <di:waypoint x="1688" y="1080" />
804
- <di:waypoint x="1688" y="1360" />
805
- <bpmndi:BPMNLabel>
806
- <dc:Bounds x="1469" y="1047" width="64" height="28" />
807
- </bpmndi:BPMNLabel>
808
- </bpmndi:BPMNEdge>
809
- <bpmndi:BPMNEdge id="BPMNEdge_f_reb_wait" bpmnElement="f_reb_wait">
810
- <di:waypoint x="1288" y="1055" />
811
- <di:waypoint x="1288" y="920" />
812
- <di:waypoint x="1438" y="920" />
813
- <bpmndi:BPMNLabel>
814
- <dc:Bounds x="1208" y="994" width="75" height="28" />
922
+ <dc:Bounds x="1023" y="746" width="49" height="28" />
815
923
  </bpmndi:BPMNLabel>
816
924
  </bpmndi:BPMNEdge>
817
925
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
818
926
  <di:waypoint x="1088" y="145" />
819
927
  <di:waypoint x="1088" y="280" />
820
- <di:waypoint x="1263" y="280" />
928
+ <di:waypoint x="1238" y="280" />
821
929
  <bpmndi:BPMNLabel>
822
- <dc:Bounds x="1093" y="216" width="46" height="14" />
930
+ <dc:Bounds x="1093" y="206" width="46" height="14" />
823
931
  </bpmndi:BPMNLabel>
824
932
  </bpmndi:BPMNEdge>
825
933
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gRetry" bpmnElement="f_m_gRetry">
826
- <di:waypoint x="1088" y="95" />
827
- <di:waypoint x="1088" y="75" />
828
- <di:waypoint x="1901" y="75" />
829
- <di:waypoint x="1901" y="145" />
830
- <di:waypoint x="1825" y="145" />
831
- <di:waypoint x="1825" y="1445" />
832
- <di:waypoint x="1263" y="1445" />
833
- <di:waypoint x="1288" y="1445" />
834
- <di:waypoint x="1288" y="1425" />
934
+ <di:waypoint x="1113" y="120" />
935
+ <di:waypoint x="1218" y="120" />
936
+ <di:waypoint x="1218" y="600" />
937
+ <di:waypoint x="1238" y="600" />
835
938
  <bpmndi:BPMNLabel>
836
- <dc:Bounds x="1414" y="1412" width="78" height="28" />
939
+ <dc:Bounds x="1135" y="246" width="78" height="28" />
837
940
  </bpmndi:BPMNLabel>
838
941
  </bpmndi:BPMNEdge>
839
942
  <bpmndi:BPMNEdge id="BPMNEdge_f_eg_evicted" bpmnElement="f_eg_evicted">
840
- <di:waypoint x="1288" y="305" />
841
- <di:waypoint x="1288" y="440" />
842
- <di:waypoint x="1470" y="440" />
943
+ <di:waypoint x="1263" y="305" />
944
+ <di:waypoint x="1263" y="440" />
945
+ <di:waypoint x="1420" y="440" />
843
946
  </bpmndi:BPMNEdge>
844
947
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
845
948
  <di:waypoint x="1088" y="95" />
846
949
  <di:waypoint x="1088" y="75" />
847
- <di:waypoint x="1901" y="75" />
848
- <di:waypoint x="1901" y="145" />
849
- <di:waypoint x="1825" y="145" />
850
- <di:waypoint x="1825" y="1445" />
851
- <di:waypoint x="1618" y="1445" />
852
- <di:waypoint x="1618" y="1420" />
853
- <di:waypoint x="1638" y="1420" />
950
+ <di:waypoint x="1876" y="75" />
951
+ <di:waypoint x="1876" y="478" />
952
+ <di:waypoint x="1368" y="478" />
953
+ <di:waypoint x="1368" y="580" />
954
+ <di:waypoint x="1388" y="580" />
854
955
  <bpmndi:BPMNLabel>
855
- <dc:Bounds x="1837" y="153" width="53" height="14" />
956
+ <dc:Bounds x="1577" y="456" width="53" height="14" />
856
957
  </bpmndi:BPMNLabel>
857
958
  </bpmndi:BPMNEdge>
858
959
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_gAbandoned" bpmnElement="f_m_gAbandoned">
859
- <di:waypoint x="1088" y="145" />
860
- <di:waypoint x="1088" y="165" />
861
- <di:waypoint x="818" y="165" />
862
- <di:waypoint x="818" y="145" />
863
- <di:waypoint x="668" y="145" />
864
- <di:waypoint x="668" y="600" />
865
- <di:waypoint x="1270" y="600" />
960
+ <di:waypoint x="1088" y="95" />
961
+ <di:waypoint x="1088" y="75" />
962
+ <di:waypoint x="1876" y="75" />
963
+ <di:waypoint x="1876" y="478" />
964
+ <di:waypoint x="1768" y="478" />
965
+ <di:waypoint x="1768" y="760" />
966
+ <di:waypoint x="1281" y="760" />
866
967
  <bpmndi:BPMNLabel>
867
- <dc:Bounds x="722" y="150" width="82" height="28" />
968
+ <dc:Bounds x="1681" y="605" width="82" height="28" />
868
969
  </bpmndi:BPMNLabel>
869
970
  </bpmndi:BPMNEdge>
870
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_done" bpmnElement="f_ci_done">
871
- <di:waypoint x="1138" y="760" />
872
- <di:waypoint x="1263" y="760" />
873
- </bpmndi:BPMNEdge>
874
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
875
- <di:waypoint x="1313" y="760" />
876
- <di:waypoint x="1463" y="760" />
971
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_waitDep" bpmnElement="f_ci_waitDep">
972
+ <di:waypoint x="1288" y="1080" />
973
+ <di:waypoint x="1388" y="1080" />
877
974
  <bpmndi:BPMNLabel>
878
- <dc:Bounds x="1341" y="738" width="89" height="14" />
975
+ <dc:Bounds x="1281" y="987" width="75" height="28" />
879
976
  </bpmndi:BPMNLabel>
880
977
  </bpmndi:BPMNEdge>
881
- <bpmndi:BPMNEdge id="BPMNEdge_f_reb_done" bpmnElement="f_reb_done">
978
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_spdone" bpmnElement="f_ci_spdone">
882
979
  <di:waypoint x="1138" y="1080" />
883
- <di:waypoint x="1263" y="1080" />
980
+ <di:waypoint x="1238" y="1080" />
981
+ </bpmndi:BPMNEdge>
982
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_spdone" bpmnElement="f_reb_spdone">
983
+ <di:waypoint x="1138" y="1240" />
984
+ <di:waypoint x="1238" y="1240" />
884
985
  </bpmndi:BPMNEdge>
885
986
  <bpmndi:BPMNEdge id="BPMNEdge_f_m_escWait" bpmnElement="f_m_escWait">
886
- <di:waypoint x="1888" y="1400" />
887
- <di:waypoint x="1988" y="1400" />
987
+ <di:waypoint x="1663" y="600" />
988
+ <di:waypoint x="1788" y="600" />
888
989
  </bpmndi:BPMNEdge>
889
- <bpmndi:BPMNEdge id="BPMNEdge_f_reb_sla" bpmnElement="f_reb_sla">
890
- <di:waypoint x="1088" y="1138" />
891
- <di:waypoint x="1088" y="1158" />
892
- <di:waypoint x="1218" y="1158" />
893
- <di:waypoint x="1218" y="2040" />
894
- <di:waypoint x="1238" y="2040" />
990
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_recheck" bpmnElement="f_ci_recheck">
991
+ <di:waypoint x="1263" y="1105" />
992
+ <di:waypoint x="1263" y="1140" />
993
+ <di:waypoint x="570" y="1140" />
994
+ <di:waypoint x="570" y="138" />
895
995
  <bpmndi:BPMNLabel>
896
- <dc:Bounds x="1118" y="1125" width="70" height="28" />
996
+ <dc:Bounds x="575" y="605" width="85" height="28" />
897
997
  </bpmndi:BPMNLabel>
898
998
  </bpmndi:BPMNEdge>
899
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_sla" bpmnElement="f_ci_sla">
900
- <di:waypoint x="1088" y="818" />
901
- <di:waypoint x="1088" y="838" />
902
- <di:waypoint x="1018" y="838" />
903
- <di:waypoint x="1018" y="700" />
904
- <di:waypoint x="1358" y="700" />
905
- <di:waypoint x="1358" y="540" />
906
- <di:waypoint x="1758" y="540" />
907
- <di:waypoint x="1758" y="1980" />
908
- <di:waypoint x="1618" y="1980" />
909
- <di:waypoint x="1618" y="1400" />
910
- <di:waypoint x="1638" y="1400" />
999
+ <bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
1000
+ <di:waypoint x="1438" y="1120" />
1001
+ <di:waypoint x="1438" y="1140" />
1002
+ <di:waypoint x="234" y="1140" />
1003
+ <di:waypoint x="234" y="138" />
1004
+ </bpmndi:BPMNEdge>
1005
+ <bpmndi:BPMNEdge id="BPMNEdge_f_mr_go" bpmnElement="f_mr_go">
1006
+ <di:waypoint x="1263" y="625" />
1007
+ <di:waypoint x="1263" y="645" />
1008
+ <di:waypoint x="402" y="645" />
1009
+ <di:waypoint x="402" y="160" />
911
1010
  <bpmndi:BPMNLabel>
912
- <dc:Bounds x="1363" y="606" width="70" height="28" />
1011
+ <dc:Bounds x="808" y="612" width="49" height="28" />
913
1012
  </bpmndi:BPMNLabel>
914
1013
  </bpmndi:BPMNEdge>
915
- <bpmndi:BPMNEdge id="BPMNEdge_f_ci_fixed" bpmnElement="f_ci_fixed">
916
- <di:waypoint x="1288" y="785" />
917
- <di:waypoint x="1288" y="840" />
918
- <di:waypoint x="402" y="840" />
1014
+ <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
1015
+ <di:waypoint x="1438" y="458" />
1016
+ <di:waypoint x="1438" y="478" />
1017
+ <di:waypoint x="402" y="478" />
919
1018
  <di:waypoint x="402" y="160" />
1019
+ </bpmndi:BPMNEdge>
1020
+ </bpmndi:BPMNPlane>
1021
+ </bpmndi:BPMNDiagram>
1022
+ <bpmndi:BPMNDiagram id="BPMNDiagram_SP_cifix">
1023
+ <bpmndi:BPMNPlane id="BPMNPlane_SP_cifix" bpmnElement="SP_cifix">
1024
+ <bpmndi:BPMNShape id="BPMNShape_ci_start" bpmnElement="ci_start">
1025
+ <dc:Bounds x="80" y="102" width="36" height="36" />
1026
+ </bpmndi:BPMNShape>
1027
+ <bpmndi:BPMNShape id="BPMNShape_fix-ci" bpmnElement="fix-ci">
1028
+ <dc:Bounds x="216" y="80" width="100" height="80" />
1029
+ </bpmndi:BPMNShape>
1030
+ <bpmndi:BPMNShape id="BPMNShape_gw-ci-result" bpmnElement="gw-ci-result" isMarkerVisible="true">
1031
+ <dc:Bounds x="552" y="95" width="50" height="50" />
1032
+ <bpmndi:BPMNLabel>
1033
+ <dc:Bounds x="554" y="76" width="46" height="14" />
1034
+ </bpmndi:BPMNLabel>
1035
+ </bpmndi:BPMNShape>
1036
+ <bpmndi:BPMNShape id="BPMNShape_gw-ci-blocked" bpmnElement="gw-ci-blocked" isMarkerVisible="true">
1037
+ <dc:Bounds x="702" y="735" width="50" height="50" />
1038
+ <bpmndi:BPMNLabel>
1039
+ <dc:Bounds x="694" y="688" width="67" height="42" />
1040
+ </bpmndi:BPMNLabel>
1041
+ </bpmndi:BPMNShape>
1042
+ <bpmndi:BPMNShape id="BPMNShape_ci-reconcile" bpmnElement="ci-reconcile">
1043
+ <dc:Bounds x="852" y="880" width="100" height="80" />
1044
+ </bpmndi:BPMNShape>
1045
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_fixed" bpmnElement="end_ci_fixed">
1046
+ <dc:Bounds x="709" y="262" width="36" height="36" />
1047
+ <bpmndi:BPMNLabel>
1048
+ <dc:Bounds x="702" y="303" width="50" height="28" />
1049
+ </bpmndi:BPMNLabel>
1050
+ </bpmndi:BPMNShape>
1051
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_reattempt" bpmnElement="end_ci_reattempt">
1052
+ <dc:Bounds x="709" y="422" width="36" height="36" />
1053
+ <bpmndi:BPMNLabel>
1054
+ <dc:Bounds x="689" y="463" width="77" height="14" />
1055
+ </bpmndi:BPMNLabel>
1056
+ </bpmndi:BPMNShape>
1057
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_reconcile" bpmnElement="end_ci_reconcile">
1058
+ <dc:Bounds x="709" y="102" width="36" height="36" />
1059
+ <bpmndi:BPMNLabel>
1060
+ <dc:Bounds x="687" y="143" width="81" height="42" />
1061
+ </bpmndi:BPMNLabel>
1062
+ </bpmndi:BPMNShape>
1063
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_recheck" bpmnElement="end_ci_recheck">
1064
+ <dc:Bounds x="1052" y="902" width="36" height="36" />
1065
+ <bpmndi:BPMNLabel>
1066
+ <dc:Bounds x="1028" y="943" width="85" height="42" />
1067
+ </bpmndi:BPMNLabel>
1068
+ </bpmndi:BPMNShape>
1069
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_waiting" bpmnElement="end_ci_waiting">
1070
+ <dc:Bounds x="709" y="582" width="36" height="36" />
1071
+ <bpmndi:BPMNLabel>
1072
+ <dc:Bounds x="690" y="623" width="75" height="28" />
1073
+ </bpmndi:BPMNLabel>
1074
+ </bpmndi:BPMNShape>
1075
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_esc" bpmnElement="end_ci_esc">
1076
+ <dc:Bounds x="884" y="742" width="36" height="36" />
1077
+ <bpmndi:BPMNLabel>
1078
+ <dc:Bounds x="872" y="783" width="60" height="14" />
1079
+ </bpmndi:BPMNLabel>
1080
+ </bpmndi:BPMNShape>
1081
+ <bpmndi:BPMNShape id="BPMNShape_end_ci_sla" bpmnElement="end_ci_sla">
1082
+ <dc:Bounds x="416" y="262" width="36" height="36" />
1083
+ <bpmndi:BPMNLabel>
1084
+ <dc:Bounds x="404" y="303" width="60" height="28" />
1085
+ </bpmndi:BPMNLabel>
1086
+ </bpmndi:BPMNShape>
1087
+ <bpmndi:BPMNShape id="BPMNShape_be_fixci_sla" bpmnElement="be_fixci_sla">
1088
+ <dc:Bounds x="248" y="142" width="36" height="36" />
1089
+ <bpmndi:BPMNLabel>
1090
+ <dc:Bounds x="164" y="183" width="84" height="14" />
1091
+ </bpmndi:BPMNLabel>
1092
+ </bpmndi:BPMNShape>
1093
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_s0" bpmnElement="f_ci_s0">
1094
+ <di:waypoint x="116" y="120" />
1095
+ <di:waypoint x="216" y="120" />
1096
+ </bpmndi:BPMNEdge>
1097
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_done" bpmnElement="f_ci_done">
1098
+ <di:waypoint x="316" y="120" />
1099
+ <di:waypoint x="552" y="120" />
1100
+ </bpmndi:BPMNEdge>
1101
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_reconcile" bpmnElement="f_ci_reconcile">
1102
+ <di:waypoint x="602" y="120" />
1103
+ <di:waypoint x="709" y="120" />
1104
+ <bpmndi:BPMNLabel>
1105
+ <dc:Bounds x="615" y="59" width="82" height="56" />
1106
+ </bpmndi:BPMNLabel>
1107
+ </bpmndi:BPMNEdge>
1108
+ <bpmndi:BPMNEdge id="BPMNEdge_f_cib_esc" bpmnElement="f_cib_esc">
1109
+ <di:waypoint x="752" y="760" />
1110
+ <di:waypoint x="884" y="760" />
1111
+ <bpmndi:BPMNLabel>
1112
+ <dc:Bounds x="786" y="713" width="64" height="42" />
1113
+ </bpmndi:BPMNLabel>
1114
+ </bpmndi:BPMNEdge>
1115
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_fixed" bpmnElement="f_ci_fixed">
1116
+ <di:waypoint x="577" y="145" />
1117
+ <di:waypoint x="577" y="280" />
1118
+ <di:waypoint x="709" y="280" />
920
1119
  <bpmndi:BPMNLabel>
921
- <dc:Bounds x="906" y="818" width="39" height="14" />
1120
+ <dc:Bounds x="624" y="258" width="39" height="14" />
922
1121
  </bpmndi:BPMNLabel>
923
1122
  </bpmndi:BPMNEdge>
924
1123
  <bpmndi:BPMNEdge id="BPMNEdge_f_ci_reattempt" bpmnElement="f_ci_reattempt">
925
- <di:waypoint x="1288" y="785" />
926
- <di:waypoint x="1288" y="840" />
927
- <di:waypoint x="402" y="840" />
928
- <di:waypoint x="402" y="160" />
1124
+ <di:waypoint x="577" y="145" />
1125
+ <di:waypoint x="577" y="440" />
1126
+ <di:waypoint x="709" y="440" />
1127
+ <bpmndi:BPMNLabel>
1128
+ <dc:Bounds x="599" y="393" width="88" height="42" />
1129
+ </bpmndi:BPMNLabel>
1130
+ </bpmndi:BPMNEdge>
1131
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_wait" bpmnElement="f_ci_wait">
1132
+ <di:waypoint x="577" y="145" />
1133
+ <di:waypoint x="577" y="600" />
1134
+ <di:waypoint x="709" y="600" />
1135
+ <bpmndi:BPMNLabel>
1136
+ <dc:Bounds x="606" y="567" width="75" height="28" />
1137
+ </bpmndi:BPMNLabel>
1138
+ </bpmndi:BPMNEdge>
1139
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
1140
+ <di:waypoint x="577" y="145" />
1141
+ <di:waypoint x="577" y="760" />
1142
+ <di:waypoint x="702" y="760" />
929
1143
  <bpmndi:BPMNLabel>
930
- <dc:Bounds x="801" y="845" width="88" height="42" />
1144
+ <dc:Bounds x="582" y="673" width="89" height="14" />
1145
+ </bpmndi:BPMNLabel>
1146
+ </bpmndi:BPMNEdge>
1147
+ <bpmndi:BPMNEdge id="BPMNEdge_f_cib_recon" bpmnElement="f_cib_recon">
1148
+ <di:waypoint x="727" y="785" />
1149
+ <di:waypoint x="727" y="920" />
1150
+ <di:waypoint x="852" y="920" />
1151
+ <bpmndi:BPMNLabel>
1152
+ <dc:Bounds x="732" y="825" width="67" height="56" />
931
1153
  </bpmndi:BPMNLabel>
932
1154
  </bpmndi:BPMNEdge>
933
1155
  <bpmndi:BPMNEdge id="BPMNEdge_f_cib_armed" bpmnElement="f_cib_armed">
934
- <di:waypoint x="1688" y="640" />
935
- <di:waypoint x="1688" y="660" />
936
- <di:waypoint x="570" y="660" />
937
- <di:waypoint x="570" y="138" />
1156
+ <di:waypoint x="952" y="920" />
1157
+ <di:waypoint x="1052" y="920" />
1158
+ </bpmndi:BPMNEdge>
1159
+ <bpmndi:BPMNEdge id="BPMNEdge_f_ci_sla" bpmnElement="f_ci_sla">
1160
+ <di:waypoint x="266" y="178" />
1161
+ <di:waypoint x="266" y="280" />
1162
+ <di:waypoint x="416" y="280" />
1163
+ <bpmndi:BPMNLabel>
1164
+ <dc:Bounds x="271" y="215" width="70" height="28" />
1165
+ </bpmndi:BPMNLabel>
1166
+ </bpmndi:BPMNEdge>
1167
+ </bpmndi:BPMNPlane>
1168
+ </bpmndi:BPMNDiagram>
1169
+ <bpmndi:BPMNDiagram id="BPMNDiagram_SP_rebase">
1170
+ <bpmndi:BPMNPlane id="BPMNPlane_SP_rebase" bpmnElement="SP_rebase">
1171
+ <bpmndi:BPMNShape id="BPMNShape_reb_start" bpmnElement="reb_start">
1172
+ <dc:Bounds x="80" y="102" width="36" height="36" />
1173
+ </bpmndi:BPMNShape>
1174
+ <bpmndi:BPMNShape id="BPMNShape_rebase" bpmnElement="rebase">
1175
+ <dc:Bounds x="216" y="80" width="100" height="80" />
1176
+ </bpmndi:BPMNShape>
1177
+ <bpmndi:BPMNShape id="BPMNShape_gw-rebase-result" bpmnElement="gw-rebase-result" isMarkerVisible="true">
1178
+ <dc:Bounds x="552" y="95" width="50" height="50" />
1179
+ <bpmndi:BPMNLabel>
1180
+ <dc:Bounds x="547" y="76" width="60" height="14" />
1181
+ </bpmndi:BPMNLabel>
1182
+ </bpmndi:BPMNShape>
1183
+ <bpmndi:BPMNShape id="BPMNShape_end_reb_rebased" bpmnElement="end_reb_rebased">
1184
+ <dc:Bounds x="702" y="262" width="36" height="36" />
1185
+ <bpmndi:BPMNLabel>
1186
+ <dc:Bounds x="688" y="303" width="64" height="28" />
1187
+ </bpmndi:BPMNLabel>
1188
+ </bpmndi:BPMNShape>
1189
+ <bpmndi:BPMNShape id="BPMNShape_end_reb_reconcile" bpmnElement="end_reb_reconcile">
1190
+ <dc:Bounds x="702" y="102" width="36" height="36" />
1191
+ <bpmndi:BPMNLabel>
1192
+ <dc:Bounds x="680" y="55" width="81" height="42" />
1193
+ </bpmndi:BPMNLabel>
1194
+ </bpmndi:BPMNShape>
1195
+ <bpmndi:BPMNShape id="BPMNShape_end_reb_waiting" bpmnElement="end_reb_waiting">
1196
+ <dc:Bounds x="702" y="422" width="36" height="36" />
1197
+ <bpmndi:BPMNLabel>
1198
+ <dc:Bounds x="683" y="463" width="75" height="28" />
1199
+ </bpmndi:BPMNLabel>
1200
+ </bpmndi:BPMNShape>
1201
+ <bpmndi:BPMNShape id="BPMNShape_end_reb_blocked" bpmnElement="end_reb_blocked">
1202
+ <dc:Bounds x="702" y="582" width="36" height="36" />
1203
+ <bpmndi:BPMNLabel>
1204
+ <dc:Bounds x="688" y="623" width="64" height="42" />
1205
+ </bpmndi:BPMNLabel>
1206
+ </bpmndi:BPMNShape>
1207
+ <bpmndi:BPMNShape id="BPMNShape_end_reb_sla" bpmnElement="end_reb_sla">
1208
+ <dc:Bounds x="416" y="262" width="36" height="36" />
1209
+ <bpmndi:BPMNLabel>
1210
+ <dc:Bounds x="404" y="303" width="60" height="28" />
1211
+ </bpmndi:BPMNLabel>
1212
+ </bpmndi:BPMNShape>
1213
+ <bpmndi:BPMNShape id="BPMNShape_be_rebase_sla" bpmnElement="be_rebase_sla">
1214
+ <dc:Bounds x="248" y="142" width="36" height="36" />
1215
+ <bpmndi:BPMNLabel>
1216
+ <dc:Bounds x="164" y="183" width="84" height="14" />
1217
+ </bpmndi:BPMNLabel>
1218
+ </bpmndi:BPMNShape>
1219
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_s0" bpmnElement="f_reb_s0">
1220
+ <di:waypoint x="116" y="120" />
1221
+ <di:waypoint x="216" y="120" />
1222
+ </bpmndi:BPMNEdge>
1223
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_done" bpmnElement="f_reb_done">
1224
+ <di:waypoint x="316" y="120" />
1225
+ <di:waypoint x="552" y="120" />
1226
+ </bpmndi:BPMNEdge>
1227
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_reconcile" bpmnElement="f_reb_reconcile">
1228
+ <di:waypoint x="602" y="120" />
1229
+ <di:waypoint x="702" y="120" />
1230
+ <bpmndi:BPMNLabel>
1231
+ <dc:Bounds x="611" y="125" width="82" height="56" />
1232
+ </bpmndi:BPMNLabel>
938
1233
  </bpmndi:BPMNEdge>
939
1234
  <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rebased" bpmnElement="f_reb_rebased">
940
- <di:waypoint x="1288" y="1105" />
941
- <di:waypoint x="1288" y="1160" />
942
- <di:waypoint x="402" y="1160" />
943
- <di:waypoint x="402" y="160" />
1235
+ <di:waypoint x="577" y="145" />
1236
+ <di:waypoint x="577" y="280" />
1237
+ <di:waypoint x="702" y="280" />
944
1238
  <bpmndi:BPMNLabel>
945
- <dc:Bounds x="819" y="1168" width="53" height="14" />
1239
+ <dc:Bounds x="613" y="258" width="53" height="14" />
946
1240
  </bpmndi:BPMNLabel>
947
1241
  </bpmndi:BPMNEdge>
948
- <bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
949
- <di:waypoint x="1488" y="960" />
950
- <di:waypoint x="1488" y="980" />
951
- <di:waypoint x="234" y="980" />
952
- <di:waypoint x="234" y="138" />
1242
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_wait" bpmnElement="f_reb_wait">
1243
+ <di:waypoint x="577" y="145" />
1244
+ <di:waypoint x="577" y="440" />
1245
+ <di:waypoint x="702" y="440" />
1246
+ <bpmndi:BPMNLabel>
1247
+ <dc:Bounds x="602" y="407" width="75" height="28" />
1248
+ </bpmndi:BPMNLabel>
953
1249
  </bpmndi:BPMNEdge>
954
- <bpmndi:BPMNEdge id="BPMNEdge_f_mr_go" bpmnElement="f_mr_go">
955
- <di:waypoint x="1288" y="1425" />
956
- <di:waypoint x="1288" y="1445" />
957
- <di:waypoint x="402" y="1445" />
958
- <di:waypoint x="402" y="160" />
1250
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_blocked" bpmnElement="f_reb_blocked">
1251
+ <di:waypoint x="577" y="145" />
1252
+ <di:waypoint x="577" y="600" />
1253
+ <di:waypoint x="702" y="600" />
959
1254
  <bpmndi:BPMNLabel>
960
- <dc:Bounds x="808" y="1412" width="49" height="28" />
1255
+ <dc:Bounds x="582" y="506" width="64" height="28" />
961
1256
  </bpmndi:BPMNLabel>
962
1257
  </bpmndi:BPMNEdge>
963
- <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
964
- <di:waypoint x="1488" y="458" />
965
- <di:waypoint x="1488" y="478" />
966
- <di:waypoint x="402" y="478" />
967
- <di:waypoint x="402" y="160" />
1258
+ <bpmndi:BPMNEdge id="BPMNEdge_f_reb_sla" bpmnElement="f_reb_sla">
1259
+ <di:waypoint x="266" y="178" />
1260
+ <di:waypoint x="266" y="280" />
1261
+ <di:waypoint x="416" y="280" />
1262
+ <bpmndi:BPMNLabel>
1263
+ <dc:Bounds x="271" y="215" width="70" height="28" />
1264
+ </bpmndi:BPMNLabel>
968
1265
  </bpmndi:BPMNEdge>
969
1266
  </bpmndi:BPMNPlane>
970
1267
  </bpmndi:BPMNDiagram>