npm - @nanobpm/nano-workforce - Versions diffs - 0.26.0 - Mend

@nanobpm/nano-workforce 0.26.0

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 (115) hide show

package/.github/workflows/ci.yml +60 -0
package/.github/workflows/release.yml +58 -0
package/.releaserc.json +17 -0
package/AGENTS.md +168 -0
package/CHANGELOG.md +231 -0
package/LICENSE +202 -0
package/README.md +303 -0
package/SPEC.md +492 -0
package/actions/abandon.test.ts +93 -0
package/actions/abandon.ts +23 -0
package/actions/blackboard.test.ts +195 -0
package/actions/blackboard.ts +76 -0
package/actions/cancel.ts +29 -0
package/actions/feature-answer-hook.ts +44 -0
package/actions/message.ts +49 -0
package/actions/plan-hook.ts +19 -0
package/actions/plan-start.ts +17 -0
package/actions/start.ts +19 -0
package/actions/status.ts +22 -0
package/actions/webhook-submit.ts +21 -0
package/app/abandon.test.ts +97 -0
package/app/abandon.ts +105 -0
package/app/baseGuard.test.ts +35 -0
package/app/baseGuard.ts +62 -0
package/app/blackboard.test.ts +295 -0
package/app/blackboard.ts +301 -0
package/app/github.test.ts +59 -0
package/app/github.ts +647 -0
package/app/mergeExclusion.test.ts +168 -0
package/app/mergeExclusion.ts +211 -0
package/app/mergeProtocol.test.ts +124 -0
package/app/mergeProtocol.ts +193 -0
package/app/mergeRebaseArm.test.ts +72 -0
package/app/mergeTrain.test.ts +91 -0
package/app/mergeTrain.ts +117 -0
package/app/persist-escalation.test.ts +119 -0
package/app/persist-round.test.ts +65 -0
package/app/plan.test.ts +317 -0
package/app/plan.ts +321 -0
package/app/record-plan-review.test.ts +38 -0
package/app/reviewWait.test.ts +70 -0
package/app/reviewWait.ts +59 -0
package/app/rounds.test.ts +74 -0
package/app/rounds.ts +48 -0
package/app/service.test.ts +101 -0
package/app/service.ts +895 -0
package/app/taskDelta.test.ts +144 -0
package/app/taskDelta.ts +175 -0
package/app/trialMerge.test.ts +15 -0
package/app/trialMerge.ts +102 -0
package/app/waves.test.ts +128 -0
package/app/waves.ts +116 -0
package/assets/icon.svg +13 -0
package/components/review-round.json +69 -0
package/db/migrations/001_init.sql +46 -0
package/db/migrations/002_transcript.sql +7 -0
package/db/migrations/003_open_escalation.sql +8 -0
package/db/migrations/004_merge.sql +36 -0
package/db/migrations/004_planning.sql +37 -0
package/db/migrations/005_job_activation.sql +15 -0
package/db/migrations/005_plan_deps.sql +20 -0
package/db/migrations/006_plan_review.sql +22 -0
package/db/migrations/006_task_escalation.sql +52 -0
package/db/migrations/007_plan_review_job_key.sql +14 -0
package/db/migrations/007_wave_gate.sql +16 -0
package/db/migrations/008_review_nudge.sql +9 -0
package/db/migrations/009_plan_blackboard.sql +46 -0
package/db/migrations/010_plan_task_deltas.sql +27 -0
package/db/migrations/011_plan_merge_exclusions.sql +26 -0
package/db/migrations/012_merge_protocol_attempt.sql +4 -0
package/db/migrations/013_merge_train_waiting_lane.sql +6 -0
package/db/migrations/014_plan_trial_merges.sql +21 -0
package/db/migrations/015_pr_abandon_token.sql +9 -0
package/deno.json +24 -0
package/deno.lock +1776 -0
package/main.ts +71 -0
package/nano-ide.ext.json +7 -0
package/nano.app.json +138 -0
package/nanobpm.project.json +20 -0
package/package.json +56 -0
package/pages/epic.page.json +195 -0
package/pages/home.page.json +296 -0
package/prompts/feature.md +132 -0
package/prompts/fix-ci.md +65 -0
package/prompts/plan-review.md +69 -0
package/prompts/plan.md +183 -0
package/prompts/rebase.md +82 -0
package/prompts/review-round.md +171 -0
package/prompts/trial-merge.md +43 -0
package/renovate.json +21 -0
package/resources/processes/convergence-loop.bpmn +399 -0
package/resources/processes/merge-loop.bpmn +585 -0
package/resources/processes/plan-fanout.bpmn +546 -0
package/scripts/check-agent-prompts.test.ts +84 -0
package/scripts/check-agent-prompts.ts +143 -0
package/scripts/layout-bpmn.ts +99 -0
package/scripts/purge-db.ts +57 -0
package/scripts/upgrade-from-pack.ts +334 -0
package/tsconfig.json +51 -0
package/workers/arm-merge/worker.ts +18 -0
package/workers/finalize/worker.ts +89 -0
package/workers/mark-merged/worker.ts +21 -0
package/workers/merge/worker.ts +119 -0
package/workers/persist-escalation/worker.ts +107 -0
package/workers/persist-round/worker.ts +52 -0
package/workers/persist-task-escalation/worker.ts +112 -0
package/workers/record-plan/worker.ts +135 -0
package/workers/record-plan-review/worker.ts +92 -0
package/workers/record-results/worker.ts +30 -0
package/workers/record-trial-merge/worker.test.ts +104 -0
package/workers/record-trial-merge/worker.ts +88 -0
package/workers/record-wave/worker.test.ts +221 -0
package/workers/record-wave/worker.ts +308 -0
package/workers/select-wave/worker.test.ts +130 -0
package/workers/select-wave/worker.ts +84 -0

package/resources/processes/merge-loop.bpmn ADDED Viewed

@@ -0,0 +1,585 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:nano="https://nanobpm.io/schema/shapes/1.0" id="Definitions_nano_workforce_merge" targetNamespace="http://nanobpm.io/nano-workforce">
+  <bpmn:message id="Message_depsCleared" name="deps-cleared">
+    <bpmn:extensionElements>
+      <zeebe:subscription correlationKey="=prKey" />
+    </bpmn:extensionElements>
+  </bpmn:message>
+  <bpmn:message id="Message_mergeReady" name="merge-ready">
+    <bpmn:extensionElements>
+      <zeebe:subscription correlationKey="=prKey" />
+      <zeebe:properties>
+        <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeReady" />
+      </zeebe:properties>
+    </bpmn:extensionElements>
+  </bpmn:message>
+  <bpmn:message id="Message_mergeLanded" name="merge-landed">
+    <bpmn:extensionElements>
+      <zeebe:subscription correlationKey="=prKey" />
+    </bpmn:extensionElements>
+  </bpmn:message>
+  <bpmn:message id="Message_mergeEscAnswered" name="escalation-answered">
+    <bpmn:extensionElements>
+      <zeebe:subscription correlationKey="=prKey" />
+      <zeebe:properties>
+        <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeEscalationAnswered" />
+      </zeebe:properties>
+    </bpmn:extensionElements>
+  </bpmn:message>
+  <bpmn:process id="merge-loop" name="PR Merge" isExecutable="true">
+    <bpmn:extensionElements>
+      <nano:shapes>
+        <nano:shape id="MergeArmIn" name="Arm merge poller — input">
+          <nano:extend name="prKey" type="string" />
+        </nano:shape>
+        <nano:shape id="MergeAttemptIn" name="Attempt merge — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="repo" type="string" />
+          <nano:extend name="prNumber" type="integer" />
+        </nano:shape>
+        <nano:shape id="MergeAttemptOut" name="Attempt merge — result">
+          <nano:extend name="mergeStatus" type="string" />
+          <nano:extend name="status" type="string" optional="true" />
+          <nano:extend name="question" type="string" optional="true" />
+        </nano:shape>
+        <nano:shape id="MergeEscalationIn" name="Record merge escalation — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="round" type="integer" />
+          <nano:extend name="status" type="string" optional="true" />
+          <nano:extend name="summary" type="string" optional="true" />
+          <nano:extend name="question" type="string" optional="true" />
+        </nano:shape>
+        <nano:shape id="MergeEscalationOut" name="Record merge escalation — result">
+          <nano:extend name="escalationId" type="integer" />
+        </nano:shape>
+        <nano:shape id="MarkMergedIn" name="Mark merged — input">
+          <nano:extend name="prKey" type="string" />
+        </nano:shape>
+        <nano:shape id="MergeReady" name="merge-ready message payload">
+          <nano:extend name="mergeState" type="string" />
+          <nano:extend name="failingChecks" type="integer" optional="true" />
+          <nano:extend name="failingChecksList" type="string" optional="true" />
+        </nano:shape>
+        <nano:shape id="FixCiIn" name="CI fix — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="repo" type="string" />
+          <nano:extend name="prNumber" type="integer" />
+          <nano:extend name="prUrl" type="string" />
+          <nano:extend name="ciFixRound" type="integer" />
+        </nano:shape>
+        <nano:shape id="FixCiOut" name="CI fix — result">
+          <nano:extend name="status" type="string" />
+          <nano:extend name="summary" type="string" optional="true" />
+          <nano:extend name="question" type="string" optional="true" />
+        </nano:shape>
+        <nano:shape id="RebaseIn" name="Rebase — input">
+          <nano:extend name="prKey" type="string" />
+          <nano:extend name="repo" type="string" />
+          <nano:extend name="prNumber" type="integer" />
+          <nano:extend name="prUrl" type="string" />
+          <nano:extend name="rebaseRound" type="integer" />
+        </nano:shape>
+        <nano:shape id="RebaseOut" name="Rebase — result">
+          <nano:extend name="status" type="string" />
+          <nano:extend name="summary" type="string" optional="true" />
+          <nano:extend name="question" type="string" optional="true" />
+        </nano:shape>
+        <nano:shape id="MergeEscalationAnswered" name="escalation-answered message payload">
+          <nano:extend name="answer" type="string" />
+          <nano:extend name="escalationId" type="integer" />
+        </nano:shape>
+      </nano:shapes>
+    </bpmn:extensionElements>
+    <bpmn:startEvent id="MergeStart" name="PR converged">
+      <bpmn:outgoing>f_m_start</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:intermediateCatchEvent id="wait-deps" name="Wait: dependencies merged">
+      <bpmn:incoming>f_m_start</bpmn:incoming>
+      <bpmn:outgoing>f_m_deps</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="med_depsCleared" messageRef="Message_depsCleared" />
+    </bpmn:intermediateCatchEvent>
+    <bpmn:serviceTask id="arm-merge" name="Arm merge poller">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.arm-merge" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeArmIn" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_deps</bpmn:incoming>
+      <bpmn:incoming>f_m_answer</bpmn:incoming>
+      <bpmn:incoming>f_ci_fixed</bpmn:incoming>
+      <bpmn:incoming>f_reb_rebased</bpmn:incoming>
+      <bpmn:outgoing>f_m_arm</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:intermediateCatchEvent id="wait-mergeable" name="Wait: mergeable">
+      <bpmn:incoming>f_m_arm</bpmn:incoming>
+      <bpmn:outgoing>f_m_ready</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="med_mergeReady" messageRef="Message_mergeReady" />
+    </bpmn:intermediateCatchEvent>
+    <bpmn:exclusiveGateway id="gw-mergeable" name="mergeable?" default="f_m_mBlocked">
+      <bpmn:incoming>f_m_ready</bpmn:incoming>
+      <bpmn:outgoing>f_m_mReady</bpmn:outgoing>
+      <bpmn:outgoing>f_m_mCiFix</bpmn:outgoing>
+      <bpmn:outgoing>f_m_mRebase</bpmn:outgoing>
+      <bpmn:outgoing>f_m_mBlocked</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="attempt-merge" name="Merge PR">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.merge" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeAttemptIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="MergeAttemptOut" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_mReady</bpmn:incoming>
+      <bpmn:outgoing>f_m_attempt</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-merge" name="merge result?" default="f_m_gBlocked">
+      <bpmn:incoming>f_m_attempt</bpmn:incoming>
+      <bpmn:outgoing>f_m_gMerged</bpmn:outgoing>
+      <bpmn:outgoing>f_m_gQueued</bpmn:outgoing>
+      <bpmn:outgoing>f_m_gBlocked</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:intermediateCatchEvent id="wait-landed" name="Wait: merge queue landed">
+      <bpmn:incoming>f_m_gQueued</bpmn:incoming>
+      <bpmn:outgoing>f_m_landed</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="med_mergeLanded" messageRef="Message_mergeLanded" />
+    </bpmn:intermediateCatchEvent>
+    <bpmn:serviceTask id="mark-merged" name="Mark merged">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.mark-merged" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MarkMergedIn" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_gMerged</bpmn:incoming>
+      <bpmn:incoming>f_m_landed</bpmn:incoming>
+      <bpmn:outgoing>f_m_done</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:endEvent id="MergeEnd" name="Merged">
+      <bpmn:incoming>f_m_done</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="merge-esc-conflict" name="Escalate: not mergeable">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.persist-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeEscalationIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="MergeEscalationOut" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=&#34;blocked&#34;" target="status" />
+          <zeebe:input source="=&#34;This PR is not mergeable (state: &#34; + mergeState + &#34;). Resolve the conflict or failing required check on the branch, then reply to retry.&#34;" target="question" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_mBlocked</bpmn:incoming>
+      <bpmn:incoming>f_ci_giveup</bpmn:incoming>
+      <bpmn:incoming>f_reb_giveup</bpmn:incoming>
+      <bpmn:outgoing>f_m_escC</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="merge-esc-attempt" name="Escalate: merge blocked">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.persist-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="MergeEscalationIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="MergeEscalationOut" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_gBlocked</bpmn:incoming>
+      <bpmn:incoming>f_ci_blocked</bpmn:incoming>
+      <bpmn:incoming>f_reb_blocked</bpmn:incoming>
+      <bpmn:outgoing>f_m_escA</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:intermediateCatchEvent id="wait-merge-answer" name="Wait: escalation answered">
+      <bpmn:incoming>f_m_escC</bpmn:incoming>
+      <bpmn:incoming>f_m_escA</bpmn:incoming>
+      <bpmn:outgoing>f_m_answer</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="med_mergeEscAnswered" messageRef="Message_mergeEscAnswered" />
+    </bpmn:intermediateCatchEvent>
+    <bpmn:exclusiveGateway id="gw-ci-fix" name="auto-fix CI?" default="f_ci_giveup">
+      <bpmn:incoming>f_m_mCiFix</bpmn:incoming>
+      <bpmn:outgoing>f_ci_go</bpmn:outgoing>
+      <bpmn:outgoing>f_ci_giveup</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="fix-ci" name="Fix CI (agent)">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="senior:fix-ci" />
+        <zeebe:taskHeaders>
+          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{fix-ci}}" />
+        </zeebe:taskHeaders>
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="FixCiIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="FixCiOut" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <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" />
+          <zeebe:output source="=ciFixRound + 1" target="ciFixRound" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_ci_go</bpmn:incoming>
+      <bpmn:outgoing>f_ci_done</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-ci-result" name="fixed?" default="f_ci_blocked">
+      <bpmn:incoming>f_ci_done</bpmn:incoming>
+      <bpmn:outgoing>f_ci_fixed</bpmn:outgoing>
+      <bpmn:outgoing>f_ci_blocked</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:exclusiveGateway id="gw-rebase" name="auto-rebase?" default="f_reb_giveup">
+      <bpmn:incoming>f_m_mRebase</bpmn:incoming>
+      <bpmn:outgoing>f_reb_go</bpmn:outgoing>
+      <bpmn:outgoing>f_reb_giveup</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="rebase" name="Rebase (agent)">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="senior:rebase" />
+        <zeebe:taskHeaders>
+          <zeebe:header key="io.nanobpm.agentTask.task.prompt" value="{{rebase}}" />
+        </zeebe:taskHeaders>
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RebaseIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="RebaseOut" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=(if (abandonBrief = null) then &#34;&#34; else abandonBrief)" target="appendPrompt" />
+          <zeebe:output source="=rebaseRound + 1" target="rebaseRound" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_reb_go</bpmn:incoming>
+      <bpmn:outgoing>f_reb_done</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="gw-rebase-result" name="rebased?" default="f_reb_blocked">
+      <bpmn:incoming>f_reb_done</bpmn:incoming>
+      <bpmn:outgoing>f_reb_rebased</bpmn:outgoing>
+      <bpmn:outgoing>f_reb_blocked</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="f_m_start" sourceRef="MergeStart" targetRef="wait-deps" />
+    <bpmn:sequenceFlow id="f_m_deps" sourceRef="wait-deps" targetRef="arm-merge" />
+    <bpmn:sequenceFlow id="f_m_arm" sourceRef="arm-merge" targetRef="wait-mergeable" />
+    <bpmn:sequenceFlow id="f_m_ready" sourceRef="wait-mergeable" targetRef="gw-mergeable" />
+    <bpmn:sequenceFlow id="f_m_mReady" name="ready" sourceRef="gw-mergeable" targetRef="attempt-merge">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "ready"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_m_mCiFix" name="blocked (failing checks)" sourceRef="gw-mergeable" targetRef="gw-ci-fix">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "blocked"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_m_mRebase" name="conflict" sourceRef="gw-mergeable" targetRef="gw-rebase">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeState = "conflict"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_m_mBlocked" name="not landable" sourceRef="gw-mergeable" targetRef="merge-esc-conflict" />
+    <bpmn:sequenceFlow id="f_ci_go" name="within budget" sourceRef="gw-ci-fix" targetRef="fix-ci">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=ciFixRound &lt; ciFixMax and failingChecks &gt; 0</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_ci_giveup" name="budget exhausted" sourceRef="gw-ci-fix" targetRef="merge-esc-conflict" />
+    <bpmn:sequenceFlow id="f_ci_done" sourceRef="fix-ci" targetRef="gw-ci-result" />
+    <bpmn:sequenceFlow id="f_ci_fixed" name="fixed" sourceRef="gw-ci-result" targetRef="arm-merge">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "fixed"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_ci_blocked" name="could not fix" sourceRef="gw-ci-result" targetRef="merge-esc-attempt" />
+    <bpmn:sequenceFlow id="f_reb_go" name="within budget" sourceRef="gw-rebase" targetRef="rebase">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=rebaseRound &lt; rebaseMax</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_reb_giveup" name="budget exhausted" sourceRef="gw-rebase" targetRef="merge-esc-conflict" />
+    <bpmn:sequenceFlow id="f_reb_done" sourceRef="rebase" targetRef="gw-rebase-result" />
+    <bpmn:sequenceFlow id="f_reb_rebased" name="rebased" sourceRef="gw-rebase-result" targetRef="arm-merge">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "rebased"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_reb_blocked" name="could not resolve" sourceRef="gw-rebase-result" targetRef="merge-esc-attempt" />
+    <bpmn:sequenceFlow id="f_m_attempt" sourceRef="attempt-merge" targetRef="gw-merge" />
+    <bpmn:sequenceFlow id="f_m_gMerged" name="merged" sourceRef="gw-merge" targetRef="mark-merged">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeStatus = "merged"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_m_gQueued" name="queued" sourceRef="gw-merge" targetRef="wait-landed">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=mergeStatus = "queued"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_m_gBlocked" name="blocked" sourceRef="gw-merge" targetRef="merge-esc-attempt" />
+    <bpmn:sequenceFlow id="f_m_landed" sourceRef="wait-landed" targetRef="mark-merged" />
+    <bpmn:sequenceFlow id="f_m_done" sourceRef="mark-merged" targetRef="MergeEnd" />
+    <bpmn:sequenceFlow id="f_m_escC" sourceRef="merge-esc-conflict" targetRef="wait-merge-answer" />
+    <bpmn:sequenceFlow id="f_m_escA" sourceRef="merge-esc-attempt" targetRef="wait-merge-answer" />
+    <bpmn:sequenceFlow id="f_m_answer" sourceRef="wait-merge-answer" targetRef="arm-merge" />
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_merge-loop">
+    <bpmndi:BPMNPlane id="BPMNPlane_merge-loop" bpmnElement="merge-loop">
+      <bpmndi:BPMNShape id="BPMNShape_MergeStart" bpmnElement="MergeStart">
+        <dc:Bounds x="80" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="54" y="143" width="89" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-deps" bpmnElement="wait-deps">
+        <dc:Bounds x="216" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="190" y="143" width="88" height="42" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_arm-merge" bpmnElement="arm-merge">
+        <dc:Bounds x="352" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-mergeable" bpmnElement="wait-mergeable">
+        <dc:Bounds x="552" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="535" y="143" width="70" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-mergeable" bpmnElement="gw-mergeable" isMarkerVisible="true">
+        <dc:Bounds x="688" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="675" y="76" width="77" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_attempt-merge" bpmnElement="attempt-merge">
+        <dc:Bounds x="838" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-merge" bpmnElement="gw-merge" isMarkerVisible="true">
+        <dc:Bounds x="1063" y="95" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1062" y="62" width="53" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
+        <dc:Bounds x="1245" y="262" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1221" y="229" width="85" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_mark-merged" bpmnElement="mark-merged">
+        <dc:Bounds x="1388" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
+        <dc:Bounds x="1588" y="102" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1581" y="143" width="50" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
+        <dc:Bounds x="1038" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
+        <dc:Bounds x="1388" y="400" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
+        <dc:Bounds x="1588" y="422" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1649" y="463" width="74" height="42" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
+        <dc:Bounds x="863" y="575" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="844" y="556" width="89" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_fix-ci" bpmnElement="fix-ci">
+        <dc:Bounds x="1038" y="720" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-ci-result" bpmnElement="gw-ci-result" isMarkerVisible="true">
+        <dc:Bounds x="1238" y="735" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1240" y="716" width="46" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-rebase" bpmnElement="gw-rebase" isMarkerVisible="true">
+        <dc:Bounds x="863" y="255" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="844" y="236" width="88" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_rebase" bpmnElement="rebase">
+        <dc:Bounds x="1038" y="880" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_gw-rebase-result" bpmnElement="gw-rebase-result" isMarkerVisible="true">
+        <dc:Bounds x="1238" y="895" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1233" y="876" width="60" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
+        <di:waypoint x="116" y="120" />
+        <di:waypoint x="216" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_deps" bpmnElement="f_m_deps">
+        <di:waypoint x="252" y="120" />
+        <di:waypoint x="352" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_arm" bpmnElement="f_m_arm">
+        <di:waypoint x="452" y="120" />
+        <di:waypoint x="552" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_ready" bpmnElement="f_m_ready">
+        <di:waypoint x="588" y="120" />
+        <di:waypoint x="688" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mReady" bpmnElement="f_m_mReady">
+        <di:waypoint x="738" y="120" />
+        <di:waypoint x="838" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="769" y="98" width="39" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_attempt" bpmnElement="f_m_attempt">
+        <di:waypoint x="938" y="120" />
+        <di:waypoint x="1063" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_gMerged" bpmnElement="f_m_gMerged">
+        <di:waypoint x="1113" y="120" />
+        <di:waypoint x="1388" y="120" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1216" y="98" width="49" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
+        <di:waypoint x="1488" y="120" />
+        <di:waypoint x="1588" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
+        <di:waypoint x="913" y="600" />
+        <di:waypoint x="1038" y="600" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="942" y="605" width="67" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
+        <di:waypoint x="1288" y="760" />
+        <di:waypoint x="1438" y="760" />
+        <di:waypoint x="1438" y="480" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1319" y="738" width="89" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
+        <di:waypoint x="913" y="280" />
+        <di:waypoint x="1088" y="280" />
+        <di:waypoint x="1088" y="560" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="977" y="247" width="67" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_blocked" bpmnElement="f_reb_blocked">
+        <di:waypoint x="1288" y="920" />
+        <di:waypoint x="1438" y="920" />
+        <di:waypoint x="1438" y="480" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1331" y="887" width="64" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
+        <di:waypoint x="1138" y="580" />
+        <di:waypoint x="1158" y="580" />
+        <di:waypoint x="1158" y="380" />
+        <di:waypoint x="1606" y="380" />
+        <di:waypoint x="1606" y="422" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
+        <di:waypoint x="1488" y="440" />
+        <di:waypoint x="1588" y="440" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
+        <di:waypoint x="1606" y="458" />
+        <di:waypoint x="1606" y="500" />
+        <di:waypoint x="402" y="500" />
+        <di:waypoint x="402" y="160" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
+        <di:waypoint x="713" y="145" />
+        <di:waypoint x="713" y="600" />
+        <di:waypoint x="863" y="600" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="718" y="438" width="60" height="42" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
+        <di:waypoint x="713" y="145" />
+        <di:waypoint x="713" y="280" />
+        <di:waypoint x="863" y="280" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="758" y="258" width="60" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_mBlocked" bpmnElement="f_m_mBlocked">
+        <di:waypoint x="713" y="145" />
+        <di:waypoint x="713" y="318" />
+        <di:waypoint x="1018" y="318" />
+        <di:waypoint x="1018" y="580" />
+        <di:waypoint x="1038" y="580" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="823" y="326" width="85" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
+        <di:waypoint x="888" y="625" />
+        <di:waypoint x="888" y="760" />
+        <di:waypoint x="1038" y="760" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="893" y="679" width="49" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_go" bpmnElement="f_reb_go">
+        <di:waypoint x="913" y="280" />
+        <di:waypoint x="933" y="280" />
+        <di:waypoint x="933" y="305" />
+        <di:waypoint x="1158" y="305" />
+        <di:waypoint x="1158" y="920" />
+        <di:waypoint x="1138" y="920" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1101" y="310" width="49" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
+        <di:waypoint x="1088" y="145" />
+        <di:waypoint x="1088" y="280" />
+        <di:waypoint x="1245" y="280" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1093" y="206" width="46" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
+        <di:waypoint x="1113" y="120" />
+        <di:waypoint x="1368" y="120" />
+        <di:waypoint x="1368" y="440" />
+        <di:waypoint x="1388" y="440" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1373" y="273" width="53" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_done" bpmnElement="f_ci_done">
+        <di:waypoint x="1138" y="760" />
+        <di:waypoint x="1238" y="760" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_done" bpmnElement="f_reb_done">
+        <di:waypoint x="1138" y="940" />
+        <di:waypoint x="1158" y="940" />
+        <di:waypoint x="1158" y="965" />
+        <di:waypoint x="1238" y="965" />
+        <di:waypoint x="1263" y="965" />
+        <di:waypoint x="1263" y="945" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
+        <di:waypoint x="1263" y="298" />
+        <di:waypoint x="1263" y="318" />
+        <di:waypoint x="1281" y="318" />
+        <di:waypoint x="1281" y="540" />
+        <di:waypoint x="1644" y="540" />
+        <di:waypoint x="1644" y="180" />
+        <di:waypoint x="1468" y="180" />
+        <di:waypoint x="1468" y="160" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_fixed" bpmnElement="f_ci_fixed">
+        <di:waypoint x="1263" y="785" />
+        <di:waypoint x="1263" y="820" />
+        <di:waypoint x="402" y="820" />
+        <di:waypoint x="402" y="160" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="813" y="798" width="39" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rebased" bpmnElement="f_reb_rebased">
+        <di:waypoint x="1263" y="945" />
+        <di:waypoint x="1263" y="980" />
+        <di:waypoint x="402" y="980" />
+        <di:waypoint x="402" y="160" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="806" y="958" width="53" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</bpmn:definitions>