@nanobpm/nano-workforce 0.200.7 → 0.200.9

package/e2e/plan-fanout.e2e.ts

@@ -587,11 +587,84 @@ describe("plan-fanout escalations (U2 — task + plan-review + trial-merge → u
 
         const answered = takenFlows(app);
         assert.ok(
-          answered.includes("w_gw_answer->implement-cell-call") && answered.includes("Start->implement-task"),
-          `answering the caps escalation released the barrier into the implement cell (flows: ${answered.join(", ")})`,
+          answered.includes("w_gw_answer->record-task-implementing") &&
+            answered.includes("record-task-implementing->implement-cell-call") &&
+            answered.includes("Start->implement-task"),
+          `answering the caps escalation reset the stale question and released the barrier into the implement cell (flows: ${answered.join(", ")})`,
         );
         assert.equal(featureRan, true, "the agent was dispatched once the operator answered the caps escalation");
       },
     );
   });
+
+  // Regression (review: "Reset stale result fields on initial implementation entry"). The capability
+  // barrier's timeout seeds an operator `question` (`wait-caps-timeout`), and answering the
+  // `feature-escalation` loops back into the implement cell (`w_answerLoop`). The cell's
+  // `record-implementing` reset clears the result fields only on its OWN retry/answer re-entry — the
+  // INITIAL `Start -> implement-task` entry bypasses it, so the inherited caps-timeout question would
+  // still be in scope. If the agent then returns an off-vocabulary `completed` (no PR delivered), a
+  // stale question makes `shouldReconcileImplement` honour it as a genuine escalation — skipping the
+  // auto-retry and re-escalating the ALREADY-ANSWERED caps question. The fix clears `question` on the
+  // plan-fanout answer loop-back, so the cell is entered clean and the claimed completion auto-retries.
+  test("capability edge: an answered caps escalation enters the cell clean — a claimed completion auto-retries, not re-escalates the stale question", async () => {
+    const capTaskPlan: Stub = () => ({
+      tasks: [
+        {
+          id: "t1",
+          title: "T1",
+          prompt: "do t1",
+          // A bare handle names no owner/repo releases source — unresolvable, so the barrier times out.
+          needs: [{ capabilityRef: "#274", package: "@nanobpm/urban" }],
+        },
+      ],
+    });
+    let featureCalls = 0;
+    await withApp(
+      {
+        "senior:plan": capTaskPlan,
+        "senior:plan-review": approveReview,
+        // The implement agent claims completion WITHOUT opening a PR (the github stub lists none) — the
+        // #865 claimed-completion-without-delivery the reconcile step auto-retries ONCE.
+        "senior:feature": () => {
+          featureCalls += 1;
+          return { status: "completed", summary: "done, no PR" };
+        },
+      },
+      async ({ app, processKey }) => {
+        // Let the unresolvable barrier time out into the operator escalation.
+        await advancePastTimer(app, 25 * 60 * 60 * 1000);
+        const task = await openTask(app, processKey, "feature-escalation");
+        await app.engine.completeUserTask(task.userTaskKey, { resolution: "answer", answer: "shipped it manually" });
+        await settleFully(app);
+
+        // The answered barrier released the token through the answer loop-back's reset into the
+        // implement cell, and the agent ran.
+        const entered = takenFlows(app);
+        assert.ok(
+          entered.includes("w_gw_answer->record-task-implementing") &&
+            entered.includes("record-task-implementing->implement-cell-call") &&
+            entered.includes("Start->implement-task"),
+          `answering the caps escalation reset the stale question and released the barrier into the implement cell (flows: ${entered.join(", ")})`,
+        );
+
+        // With the stale caps-timeout question cleared on cell entry, the off-vocabulary `completed`
+        // (no adoptable PR) takes the reconcile AUTO-RETRY arm — re-dispatching the agent once — rather
+        // than re-escalating the ALREADY-ANSWERED caps question. `settleFully` above drove the whole
+        // loop to quiescence: the agent ran exactly TWICE (the initial dispatch + the one bounded
+        // auto-retry), and only then — the retry consumed — did the cell escalate (the bounded
+        // claimed-completion behaviour of #865). The retry is the proof the stale question was cleared:
+        // an inherited question would have routed the FIRST `completed` straight to escalation.
+        const flows = takenFlows(app);
+        assert.ok(
+          flows.includes("ic_reconcile_gw->record-implementing"),
+          `the claimed completion auto-retried through the cell's reset (flows: ${flows.join(", ")})`,
+        );
+        assert.ok(
+          flows.includes("record-implementing->implement-task"),
+          `the retry re-entered the implement task (flows: ${flows.join(", ")})`,
+        );
+        assert.equal(featureCalls, 2, "the auto-retry re-dispatched the implement agent exactly once");
+      },
+    );
+  });
 });

package/e2e/support/pin-agent-sla.ts

@@ -0,0 +1,47 @@
+// Isolate the agent-SLA e2e suite from ambient `NANO_PR_AGENT_SLA_TIMEOUT`.
+//
+// `app/agentSla.ts` resolves its `AGENT_SLA_TIMEOUT` constant ONCE, at import time, from the ambient
+// `NANO_PR_AGENT_SLA_TIMEOUT` env (through the typed env schema). That frozen constant is what every
+// process start seeds as the `agentSlaTimeout` process variable — including the app-booted feature
+// run, whose `app/feature.ts` imports the same const. So the SLA the boundary fires on is whatever
+// env was present when the module graph loaded, NOT a value the test can set in a `before` hook.
+//
+// If a CI box or a developer shell exports e.g. `NANO_PR_AGENT_SLA_TIMEOUT=PT30M`, the suite's
+// "under SLA" advance (shorter than the default PT2H) would suddenly EXCEED the SLA and fire the
+// boundary; with `PT4H` the "past SLA" advance would no longer reach it. Either way the suite fails
+// for a reason that has nothing to do with the code under test — a non-deterministic,
+// ambient-config-driven failure (AGENTS.md: "no such thing as flaky tests").
+//
+// This module pins a FIXED duration BEFORE `app/agentSla.ts` can be evaluated, so the frozen const
+// is deterministic regardless of the ambient env. `agent-sla-boundary.e2e.ts` imports it FIRST (no
+// support module nor the engine testkit imports `app/agentSla.ts`, so this side effect lands before
+// that module's const is computed). Both the direct-instance seeds and the advance thresholds derive
+// from the SAME pinned duration, so they can never drift apart.
+
+/** The fixed agent SLA this suite runs against (ISO-8601 duration), pinned into the env before any
+ * app module reads it. Kept equal to the production default `DEFAULT_AGENT_SLA_TIMEOUT` (PT2H). */
+export const PINNED_AGENT_SLA = "PT2H";
+
+process.env.NANO_PR_AGENT_SLA_TIMEOUT = PINNED_AGENT_SLA;
+
+/** Parse the subset of ISO-8601 durations this suite uses (`PT#H#M#S`) to milliseconds. Throws on an
+ * unparseable value so a mistyped pin fails loudly rather than silently yielding a 0ms threshold. */
+function isoDurationToMs(iso: string): number {
+  const match = /^PT(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?$/.exec(iso);
+  if (!match || (!match[1] && !match[2] && !match[3])) {
+    throw new Error(`pin-agent-sla: cannot parse pinned duration "${iso}" (expected PT#H#M#S)`);
+  }
+  const [, h, m, s] = match;
+  return ((Number(h ?? 0) * 60 + Number(m ?? 0)) * 60 + Number(s ?? 0)) * 1000;
+}
+
+/** The pinned SLA in ms — the single source both advance thresholds derive from. */
+export const PINNED_AGENT_SLA_MS = isoDurationToMs(PINNED_AGENT_SLA);
+
+/** Comfortably PAST the SLA (1.5×) so the agent boundary fires, yet well under the downstream
+ * human-escalation SLA (PT24H) so that one stays dormant — isolating the agent-SLA arm. */
+export const PAST_AGENT_SLA_MS = Math.round(PINNED_AGENT_SLA_MS * 1.5);
+
+/** Comfortably UNDER the SLA (0.25×) so the boundary is proven genuinely armed on the seeded
+ * duration, not firing spuriously. */
+export const UNDER_AGENT_SLA_MS = Math.round(PINNED_AGENT_SLA_MS * 0.25);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.200.7",
+  "version": "0.200.9",
   "description": "Nano Workforce — an Agent Graph Orchestration application for Agentic SDLC: durable BPMN processes that coordinate a graph of AI agents across the software delivery lifecycle.",
   "type": "module",
   "main": "main.ts",

package/resources/processes/feature.bpmn

@@ -182,6 +182,7 @@
           <zeebe:input source="=if (is defined(transcriptUrlBase)) then transcriptUrlBase else null" target="transcriptUrlBase" />
           <zeebe:input source="=if (is defined(escalationAssignee)) then escalationAssignee else null" target="escalationAssignee" />
           <zeebe:input source="=escalationSlaTimeout" target="escalationSlaTimeout" />
+          <zeebe:input source="=agentSlaTimeout" target="agentSlaTimeout" />
           <zeebe:input source="=featureKey" target="subjectKey" />
           <zeebe:output source="=status" target="status" />
           <zeebe:output source="=if (is defined(summary)) then summary else null" target="summary" />

package/resources/processes/implement-cell.bpmn

@@ -7,6 +7,10 @@
           <nano:extend name="subjectKey" type="string" />
           <nano:extend name="status" type="string" optional="true" />
           <nano:extend name="question" type="string" optional="true" />
+          <nano:extend name="summary" type="string" optional="true" />
+          <nano:extend name="transcriptUrl" type="string" optional="true" />
+          <nano:extend name="pr" type="string" optional="true" />
+          <nano:extend name="deliveryVerified" type="boolean" optional="true" />
         </nano:shape>
       </nano:shapes>
     </bpmn:extensionElements>
@@ -21,10 +25,11 @@
           <zeebe:linkedResource resourceId="prompts/feature.md" bindingType="latest" resourceType="GenericScript" linkName="prompt" />
         </zeebe:linkedResources>
         <zeebe:ioMapping>
-          <zeebe:input source="=&#34;&#10;&#10;---&#10;&#10;&#34; + task.prompt + (if (is defined(baseBranchBrief) and baseBranchBrief != null) then baseBranchBrief else &#34;&#34;) + (if (is defined(blackboardBrief) and blackboardBrief != null) then blackboardBrief else &#34;&#34;) + (if (is defined(resolvedDepsBrief) and resolvedDepsBrief != null) then resolvedDepsBrief else &#34;&#34;) + (if (is defined(resolvedArtifacts) = false or resolvedArtifacts = null or count(resolvedArtifacts[item != null]) = 0) then &#34;&#34; else (&#34;&#10;&#10;---&#10;&#10;**Bound upstream readiness.** Build/install/clone against EXACTLY these resolved published versions (the ones first carrying the awaited capability), and bump the consumer dependency to them — never merely the newest:&#10;&#10;&#34; + string join(resolvedArtifacts[item != null], &#34;&#10;&#34;))) + (if (is defined(customInstructions) = false or customInstructions = null) then &#34;&#34; else &#34;&#10;&#10;---&#10;&#10;## Operator custom instructions&#10;&#10;The operator supplied these instructions for this run — follow them:&#10;&#10;&#34; + customInstructions)" target="appendPrompt" />
+          <zeebe:input source="=&#34;&#10;&#10;---&#10;&#10;&#34; + task.prompt + (if (is defined(baseBranchBrief) and baseBranchBrief != null) then baseBranchBrief else &#34;&#34;) + (if (is defined(blackboardBrief) and blackboardBrief != null) then blackboardBrief else &#34;&#34;) + (if (is defined(resolvedDepsBrief) and resolvedDepsBrief != null) then resolvedDepsBrief else &#34;&#34;) + (if (is defined(resolvedArtifacts) = false or resolvedArtifacts = null or count(resolvedArtifacts[item != null]) = 0) then &#34;&#34; else (&#34;&#10;&#10;---&#10;&#10;**Bound upstream readiness.** Build/install/clone against EXACTLY these resolved published versions (the ones first carrying the awaited capability), and bump the consumer dependency to them — never merely the newest:&#10;&#10;&#34; + string join(resolvedArtifacts[item != null], &#34;&#10;&#34;))) + (if (is defined(customInstructions) = false or customInstructions = null) then &#34;&#34; else &#34;&#10;&#10;---&#10;&#10;## Operator custom instructions&#10;&#10;The operator supplied these instructions for this run — follow them:&#10;&#10;&#34; + customInstructions) + (if (is defined(retryNudge) and retryNudge != null) then retryNudge else &#34;&#34;)" target="appendPrompt" />
           <zeebe:input source="=if (is defined(transcriptUrlBase)) then transcriptUrlBase else null" target="transcriptUrlBase" />
           <zeebe:output source="=status" target="status" />
           <zeebe:output source="=question" target="question" />
+          <zeebe:output source="=if (is defined(summary)) then summary else null" target="summary" />
           <zeebe:output source="=if (is defined(transcriptUrl)) then transcriptUrl else null" target="transcriptUrl" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
@@ -32,6 +37,12 @@
       <bpmn:incoming>ic_answerLoop</bpmn:incoming>
       <bpmn:outgoing>ic_toGw</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:boundaryEvent id="be_implement_sla" name="Agent SLA elapsed" attachedToRef="implement-task">
+      <bpmn:outgoing>ic_sla</bpmn:outgoing>
+      <bpmn:timerEventDefinition id="ted_implement_sla">
+        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=agentSlaTimeout</bpmn:timeDuration>
+      </bpmn:timerEventDefinition>
+    </bpmn:boundaryEvent>
     <bpmn:exclusiveGateway id="ic_gw" name="clean terminal?" default="ic_escalate">
       <bpmn:incoming>ic_toGw</bpmn:incoming>
       <bpmn:outgoing>ic_escalate</bpmn:outgoing>
@@ -44,6 +55,10 @@
           <zeebe:output source="=reconciled" target="reconciled" />
           <zeebe:output source="=status" target="status" />
           <zeebe:output source="=pr" target="pr" />
+          <zeebe:output source="=retry" target="retry" />
+          <zeebe:output source="=retryNudge" target="retryNudge" />
+          <zeebe:output source="=retried" target="implementRetried" />
+          <zeebe:output source="=deliveryVerified" target="deliveryVerified" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>ic_escalate</bpmn:incoming>
@@ -52,6 +67,7 @@
     <bpmn:exclusiveGateway id="ic_reconcile_gw" name="reconciled?" default="ic_toRecordEscalation">
       <bpmn:incoming>ic_toReconcileGw</bpmn:incoming>
       <bpmn:outgoing>ic_reconciled</bpmn:outgoing>
+      <bpmn:outgoing>ic_retry</bpmn:outgoing>
       <bpmn:outgoing>ic_toRecordEscalation</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:callActivity id="escalate" name="Human escalation">
@@ -81,6 +97,20 @@
       <bpmn:incoming>ic_toRecordEscalation</bpmn:incoming>
       <bpmn:outgoing>ic_toEscalate</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:serviceTask id="record-escalation-sla" name="Record escalation (agent SLA)">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.record-feature-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordEscalationIn" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=&#34;The implementation agent exceeded its time budget (SLA &#34; + agentSlaTimeout + &#34;) without completing — it is hung or looping. Check its progress or intervene, then answer to resume (the run continues on its deterministic feat/&#60;task.id&#62; branch), or abandon it.&#34;" target="question" />
+          <zeebe:output source="=question" target="question" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>ic_sla</bpmn:incoming>
+      <bpmn:outgoing>ic_slaToEscalate</bpmn:outgoing>
+    </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="ic_gw_answer" name="answer?" default="ic_abandon">
       <bpmn:incoming>ic_toAnswerGw</bpmn:incoming>
       <bpmn:outgoing>ic_answerLoop</bpmn:outgoing>
@@ -92,8 +122,16 @@
         <zeebe:properties>
           <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordFeatureImplementingIn" />
         </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:output source="=null" target="status" />
+          <zeebe:output source="=null" target="question" />
+          <zeebe:output source="=null" target="summary" />
+          <zeebe:output source="=null" target="transcriptUrl" />
+          <zeebe:output source="=null" target="deliveryVerified" />
+        </zeebe:ioMapping>
       </bpmn:extensionElements>
       <bpmn:incoming>ic_answerLoop</bpmn:incoming>
+      <bpmn:incoming>ic_retry</bpmn:incoming>
       <bpmn:outgoing>ic_reImplement</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:endEvent id="ic_end" name="Task done">
@@ -112,6 +150,11 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=reconciled = true</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="ic_toRecordEscalation" name="escalated" sourceRef="ic_reconcile_gw" targetRef="record-escalation" />
+    <bpmn:sequenceFlow id="ic_sla" name="agent SLA elapsed" sourceRef="be_implement_sla" targetRef="record-escalation-sla" />
+    <bpmn:sequenceFlow id="ic_slaToEscalate" sourceRef="record-escalation-sla" targetRef="escalate" />
+    <bpmn:sequenceFlow id="ic_retry" name="retry" sourceRef="ic_reconcile_gw" targetRef="record-implementing">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=retry = true</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="ic_toEscalate" sourceRef="record-escalation" targetRef="escalate" />
     <bpmn:sequenceFlow id="ic_toAnswerGw" sourceRef="escalate" targetRef="ic_gw_answer" />
     <bpmn:sequenceFlow id="ic_answerLoop" name="answer" sourceRef="ic_gw_answer" targetRef="record-implementing">
@@ -132,39 +175,48 @@
         <dc:Bounds x="216" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ic_gw" bpmnElement="ic_gw" isMarkerVisible="true">
-        <dc:Bounds x="416" y="95" width="50" height="50" />
+        <dc:Bounds x="441" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="406" y="62" width="70" height="28" />
+          <dc:Bounds x="431" y="62" width="70" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_reconcile-implement" bpmnElement="reconcile-implement">
-        <dc:Bounds x="566" y="80" width="100" height="80" />
+        <dc:Bounds x="616" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ic_reconcile_gw" bpmnElement="ic_reconcile_gw" isMarkerVisible="true">
-        <dc:Bounds x="766" y="95" width="50" height="50" />
+        <dc:Bounds x="816" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="751" y="76" width="81" height="14" />
+          <dc:Bounds x="801" y="76" width="81" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_escalate" bpmnElement="escalate">
-        <dc:Bounds x="1116" y="80" width="100" height="80" />
+        <dc:Bounds x="1166" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-escalation" bpmnElement="record-escalation">
-        <dc:Bounds x="916" y="80" width="100" height="80" />
+        <dc:Bounds x="966" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_record-escalation-sla" bpmnElement="record-escalation-sla">
+        <dc:Bounds x="416" y="400" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ic_gw_answer" bpmnElement="ic_gw_answer" isMarkerVisible="true">
-        <dc:Bounds x="1316" y="95" width="50" height="50" />
+        <dc:Bounds x="1366" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1313" y="76" width="56" height="14" />
+          <dc:Bounds x="1323" y="150" width="56" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-implementing" bpmnElement="record-implementing">
-        <dc:Bounds x="1466" y="240" width="100" height="80" />
+        <dc:Bounds x="1516" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ic_end" bpmnElement="ic_end">
-        <dc:Bounds x="1498" y="102" width="36" height="36" />
+        <dc:Bounds x="1548" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1483" y="83" width="66" height="14" />
+          <dc:Bounds x="1493" y="143" width="66" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_be_implement_sla" bpmnElement="be_implement_sla">
+        <dc:Bounds x="248" y="142" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="170" y="183" width="72" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toImplement" bpmnElement="ic_toImplement">
@@ -173,72 +225,95 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toGw" bpmnElement="ic_toGw">
         <di:waypoint x="316" y="120" />
-        <di:waypoint x="416" y="120" />
+        <di:waypoint x="441" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_escalate" bpmnElement="ic_escalate">
-        <di:waypoint x="466" y="120" />
-        <di:waypoint x="566" y="120" />
+        <di:waypoint x="491" y="120" />
+        <di:waypoint x="616" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="483" y="128" width="67" height="14" />
+          <dc:Bounds x="520" y="98" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toReconcileGw" bpmnElement="ic_toReconcileGw">
-        <di:waypoint x="666" y="120" />
-        <di:waypoint x="766" y="120" />
+        <di:waypoint x="716" y="120" />
+        <di:waypoint x="816" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toRecordEscalation" bpmnElement="ic_toRecordEscalation">
-        <di:waypoint x="816" y="120" />
-        <di:waypoint x="916" y="120" />
+        <di:waypoint x="866" y="120" />
+        <di:waypoint x="966" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="833" y="128" width="67" height="14" />
+          <dc:Bounds x="883" y="128" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toEscalate" bpmnElement="ic_toEscalate">
-        <di:waypoint x="1016" y="120" />
-        <di:waypoint x="1116" y="120" />
+        <di:waypoint x="1066" y="120" />
+        <di:waypoint x="1166" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toAnswerGw" bpmnElement="ic_toAnswerGw">
-        <di:waypoint x="1216" y="120" />
-        <di:waypoint x="1316" y="120" />
+        <di:waypoint x="1266" y="120" />
+        <di:waypoint x="1366" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_abandon" bpmnElement="ic_abandon">
-        <di:waypoint x="1366" y="120" />
-        <di:waypoint x="1498" y="120" />
+        <di:waypoint x="1416" y="120" />
+        <di:waypoint x="1548" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1406" y="98" width="53" height="14" />
+          <dc:Bounds x="1456" y="98" width="53" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_ic_retry" bpmnElement="ic_retry">
+        <di:waypoint x="841" y="145" />
+        <di:waypoint x="841" y="280" />
+        <di:waypoint x="1516" y="280" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="846" y="223" width="39" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_answerLoop" bpmnElement="ic_answerLoop">
-        <di:waypoint x="1341" y="145" />
-        <di:waypoint x="1341" y="280" />
-        <di:waypoint x="1466" y="280" />
+        <di:waypoint x="1391" y="145" />
+        <di:waypoint x="1391" y="280" />
+        <di:waypoint x="1516" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1346" y="206" width="49" height="14" />
+          <dc:Bounds x="1396" y="206" width="49" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_done" bpmnElement="ic_done">
-        <di:waypoint x="441" y="145" />
-        <di:waypoint x="441" y="200" />
-        <di:waypoint x="1516" y="200" />
-        <di:waypoint x="1516" y="138" />
+        <di:waypoint x="466" y="145" />
+        <di:waypoint x="466" y="200" />
+        <di:waypoint x="1566" y="200" />
+        <di:waypoint x="1566" y="138" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="963" y="208" width="32" height="14" />
+          <dc:Bounds x="1000" y="208" width="32" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_reconciled" bpmnElement="ic_reconciled">
-        <di:waypoint x="791" y="145" />
-        <di:waypoint x="791" y="180" />
-        <di:waypoint x="1516" y="180" />
-        <di:waypoint x="1516" y="138" />
+        <di:waypoint x="841" y="145" />
+        <di:waypoint x="841" y="180" />
+        <di:waypoint x="1566" y="180" />
+        <di:waypoint x="1566" y="138" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1097" y="158" width="53" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_ic_slaToEscalate" bpmnElement="ic_slaToEscalate">
+        <di:waypoint x="516" y="440" />
+        <di:waypoint x="1636" y="440" />
+        <di:waypoint x="1636" y="82" />
+        <di:waypoint x="1266" y="82" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_ic_sla" bpmnElement="ic_sla">
+        <di:waypoint x="266" y="178" />
+        <di:waypoint x="266" y="440" />
+        <di:waypoint x="416" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1047" y="158" width="53" height="14" />
+          <dc:Bounds x="271" y="295" width="70" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_reImplement" bpmnElement="ic_reImplement">
-        <di:waypoint x="1516" y="320" />
-        <di:waypoint x="1516" y="340" />
-        <di:waypoint x="266" y="340" />
-        <di:waypoint x="266" y="160" />
+        <di:waypoint x="1516" y="280" />
+        <di:waypoint x="60" y="280" />
+        <di:waypoint x="60" y="60" />
+        <di:waypoint x="266" y="60" />
+        <di:waypoint x="266" y="80" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

package/resources/processes/merge-cell.bpmn

@@ -24,6 +24,12 @@
       <bpmn:incoming>mc_sla</bpmn:incoming>
       <bpmn:outgoing>mc_toRecord</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:boundaryEvent id="be_trial_agent_sla" name="Agent SLA elapsed" attachedToRef="trial-merge">
+      <bpmn:outgoing>mc_agentSla</bpmn:outgoing>
+      <bpmn:timerEventDefinition id="ted_trial_agent_sla">
+        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=agentSlaTimeout</bpmn:timeDuration>
+      </bpmn:timerEventDefinition>
+    </bpmn:boundaryEvent>
     <bpmn:serviceTask id="record-trial-merge" name="Record trial merge">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.record-trial-merge" />
@@ -34,8 +40,25 @@
       <bpmn:incoming>mc_toRecord</bpmn:incoming>
       <bpmn:outgoing>mc_toGwTrial</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:serviceTask id="record-trial-merge-sla" name="Record trial merge (agent SLA)">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.record-trial-merge" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="RecordTrialMergeIn" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=&#34;suite-failed&#34;" target="result" />
+          <zeebe:input source="=&#34;The trial-merge agent exceeded its time budget (SLA &#34; + agentSlaTimeout + &#34;) without returning a machine-readable result — it is hung or looping. Acknowledge to record the timeout and decide whether to rerun the trial merge.&#34;" target="summary" />
+          <zeebe:input source="=null" target="conflicts" />
+          <zeebe:input source="=null" target="failing" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>mc_agentSla</bpmn:incoming>
+      <bpmn:outgoing>mc_slaToGwTrial</bpmn:outgoing>
+    </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="gw-trial" name="trial red?" default="mc_proceed">
       <bpmn:incoming>mc_toGwTrial</bpmn:incoming>
+      <bpmn:incoming>mc_slaToGwTrial</bpmn:incoming>
       <bpmn:outgoing>mc_escalate</bpmn:outgoing>
       <bpmn:outgoing>mc_proceed</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -80,6 +103,7 @@
     <bpmn:sequenceFlow id="mc_toTrial" sourceRef="Start" targetRef="trial-merge" />
     <bpmn:sequenceFlow id="mc_toRecord" sourceRef="trial-merge" targetRef="record-trial-merge" />
     <bpmn:sequenceFlow id="mc_toGwTrial" sourceRef="record-trial-merge" targetRef="gw-trial" />
+    <bpmn:sequenceFlow id="mc_slaToGwTrial" sourceRef="record-trial-merge-sla" targetRef="gw-trial" />
     <bpmn:sequenceFlow id="mc_escalate" name="suite failed" sourceRef="gw-trial" targetRef="trial-merge-decision">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=trialMergeRed</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -94,6 +118,7 @@
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="mc_rerun" name="rebase" sourceRef="gw-trial-answer" targetRef="trial-merge" />
     <bpmn:sequenceFlow id="mc_sla" name="SLA auto-rerun" sourceRef="be_trial_sla" targetRef="trial-merge" />
+    <bpmn:sequenceFlow id="mc_agentSla" name="agent SLA elapsed" sourceRef="be_trial_agent_sla" targetRef="record-trial-merge-sla" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_merge-cell">
     <bpmndi:BPMNPlane id="BPMNPlane_merge-cell" bpmnElement="merge-cell">
@@ -109,6 +134,9 @@
       <bpmndi:BPMNShape id="BPMNShape_record-trial-merge" bpmnElement="record-trial-merge">
         <dc:Bounds x="416" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_record-trial-merge-sla" bpmnElement="record-trial-merge-sla">
+        <dc:Bounds x="416" y="400" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-trial" bpmnElement="gw-trial" isMarkerVisible="true">
         <dc:Bounds x="616" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
@@ -139,10 +167,16 @@
           <dc:Bounds x="1300" y="463" width="69" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_be_trial_agent_sla" bpmnElement="be_trial_agent_sla">
+        <dc:Bounds x="248" y="142" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="290" y="183" width="72" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_be_trial_sla" bpmnElement="be_trial_sla">
         <dc:Bounds x="798" y="302" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="774" y="383" width="84" height="14" />
+          <dc:Bounds x="714" y="343" width="84" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_mc_toTrial" bpmnElement="mc_toTrial">
@@ -165,12 +199,12 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_mc_rerun" bpmnElement="mc_rerun">
-        <di:waypoint x="1191" y="305" />
-        <di:waypoint x="1191" y="360" />
-        <di:waypoint x="266" y="360" />
-        <di:waypoint x="266" y="160" />
+        <di:waypoint x="1191" y="255" />
+        <di:waypoint x="1191" y="60" />
+        <di:waypoint x="266" y="60" />
+        <di:waypoint x="266" y="80" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="706" y="338" width="46" height="14" />
+          <dc:Bounds x="706" y="38" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_mc_escalate" bpmnElement="mc_escalate">
@@ -178,7 +212,7 @@
         <di:waypoint x="641" y="280" />
         <di:waypoint x="766" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="646" y="206" width="85" height="14" />
+          <dc:Bounds x="646" y="216" width="85" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_mc_answerProceed" bpmnElement="mc_answerProceed">
@@ -194,9 +228,15 @@
         <di:waypoint x="1191" y="440" />
         <di:waypoint x="1316" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1196" y="393" width="53" height="14" />
+          <dc:Bounds x="1196" y="366" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_mc_slaToGwTrial" bpmnElement="mc_slaToGwTrial">
+        <di:waypoint x="466" y="400" />
+        <di:waypoint x="466" y="165" />
+        <di:waypoint x="641" y="165" />
+        <di:waypoint x="641" y="145" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_mc_toResolve" bpmnElement="mc_toResolve">
         <di:waypoint x="866" y="280" />
         <di:waypoint x="966" y="280" />
@@ -205,13 +245,21 @@
         <di:waypoint x="1066" y="280" />
         <di:waypoint x="1166" y="280" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_mc_agentSla" bpmnElement="mc_agentSla">
+        <di:waypoint x="266" y="178" />
+        <di:waypoint x="266" y="440" />
+        <di:waypoint x="416" y="440" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="271" y="295" width="70" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_mc_sla" bpmnElement="mc_sla">
         <di:waypoint x="816" y="338" />
-        <di:waypoint x="816" y="358" />
-        <di:waypoint x="266" y="358" />
-        <di:waypoint x="266" y="160" />
+        <di:waypoint x="816" y="498" />
+        <di:waypoint x="241" y="498" />
+        <di:waypoint x="241" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="504" y="325" width="74" height="28" />
+          <dc:Bounds x="492" y="503" width="74" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>