@nanobpm/nano-workforce 0.77.0 → 0.79.0

package/resources/processes/merge-loop.bpmn

@@ -23,14 +23,6 @@
       <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>
@@ -87,10 +79,6 @@
           <nano:extend name="prKey" type="string" />
           <nano:extend name="dependsOn" 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">
@@ -206,12 +194,33 @@
       <bpmn:incoming>f_ci_sla</bpmn:incoming>
       <bpmn:outgoing>f_m_escA</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:intermediateCatchEvent id="wait-merge-answer" name="Wait: escalation answered">
+    <bpmn:userTask id="wait-merge-answer" name="Answer escalation">
+      <bpmn:extensionElements>
+        <zeebe:formDefinition formId="pr-escalation" />
+        <zeebe:userTask />
+        <zeebe:ioMapping>
+          <zeebe:input source="=question" target="question" />
+          <zeebe:input source="=prKey" target="prKey" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
       <bpmn:incoming>f_m_escC</bpmn:incoming>
       <bpmn:incoming>f_m_escA</bpmn:incoming>
+      <bpmn:outgoing>f_m_answerRecord</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:serviceTask id="record-merge-answer" name="Record answer">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.answer-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="PrAnswerEscalationIn" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=prKey" target="prKey" />
+          <zeebe:input source="=answer" target="answer" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_answerRecord</bpmn:incoming>
       <bpmn:outgoing>f_m_answer</bpmn:outgoing>
-      <bpmn:messageEventDefinition id="med_mergeEscAnswered" messageRef="Message_mergeEscAnswered" />
-    </bpmn:intermediateCatchEvent>
+    </bpmn:serviceTask>
     <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>
@@ -355,7 +364,8 @@
     <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:sequenceFlow id="f_m_answerRecord" sourceRef="wait-merge-answer" targetRef="record-merge-answer" />
+    <bpmn:sequenceFlow id="f_m_answer" sourceRef="record-merge-answer" targetRef="arm-merge" />
     <bpmn:sequenceFlow id="f_reb_sla" name="agent SLA elapsed" sourceRef="be_rebase_sla" targetRef="merge-esc-conflict" />
     <bpmn:sequenceFlow id="f_ci_sla" name="agent SLA elapsed" sourceRef="be_fixci_sla" targetRef="merge-esc-attempt" />
   </bpmn:process>
@@ -419,9 +429,9 @@
         <dc:Bounds x="1638" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
-        <dc:Bounds x="1838" y="102" width="36" height="36" />
+        <dc:Bounds x="1870" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1831" y="143" width="50" height="14" />
+          <dc:Bounds x="1863" y="143" width="50" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
@@ -431,10 +441,10 @@
         <dc:Bounds x="1438" y="1040" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
-        <dc:Bounds x="1670" y="1062" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1731" y="1103" width="74" height="42" />
-        </bpmndi:BPMNLabel>
+        <dc:Bounds x="1638" y="1040" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_record-merge-answer" bpmnElement="record-merge-answer">
+        <dc:Bounds x="1838" y="1040" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
         <dc:Bounds x="863" y="1535" width="50" height="50" />
@@ -517,7 +527,7 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
         <di:waypoint x="1738" y="120" />
-        <di:waypoint x="1838" y="120" />
+        <di:waypoint x="1870" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
         <di:waypoint x="913" y="1560" />
@@ -568,11 +578,15 @@
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
         <di:waypoint x="1338" y="1560" />
         <di:waypoint x="1688" y="1560" />
-        <di:waypoint x="1688" y="1098" />
+        <di:waypoint x="1688" y="1120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_answerRecord" bpmnElement="f_m_answerRecord">
+        <di:waypoint x="1738" y="1080" />
+        <di:waypoint x="1838" y="1080" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
-        <di:waypoint x="1688" y="1098" />
-        <di:waypoint x="1688" y="1140" />
+        <di:waypoint x="1888" y="1120" />
+        <di:waypoint x="1888" y="1140" />
         <di:waypoint x="402" y="1140" />
         <di:waypoint x="402" y="160" />
       </bpmndi:BPMNEdge>
@@ -612,13 +626,13 @@
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
         <di:waypoint x="888" y="1585" />
         <di:waypoint x="888" y="1605" />
-        <di:waypoint x="1726" y="1605" />
-        <di:waypoint x="1726" y="555" />
+        <di:waypoint x="1958" y="1605" />
+        <di:waypoint x="1958" y="555" />
         <di:waypoint x="1018" y="555" />
         <di:waypoint x="1018" y="580" />
         <di:waypoint x="1038" y="580" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1731" y="1046" width="49" height="28" />
+          <dc:Bounds x="1963" y="1066" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
@@ -685,13 +699,13 @@
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
         <di:waypoint x="1088" y="95" />
         <di:waypoint x="1088" y="75" />
-        <di:waypoint x="1894" y="75" />
-        <di:waypoint x="1894" y="820" />
+        <di:waypoint x="1926" y="75" />
+        <di:waypoint x="1926" y="820" />
         <di:waypoint x="1418" y="820" />
         <di:waypoint x="1418" y="1060" />
         <di:waypoint x="1438" y="1060" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1899" y="441" width="53" height="14" />
+          <dc:Bounds x="1931" y="441" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_done" bpmnElement="f_ci_done">
@@ -704,7 +718,7 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
         <di:waypoint x="1538" y="1080" />
-        <di:waypoint x="1670" y="1080" />
+        <di:waypoint x="1638" y="1080" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_sla" bpmnElement="f_reb_sla">
         <di:waypoint x="1088" y="978" />

package/workers/answer-escalation/worker.ts

@@ -1,6 +1,7 @@
-// pr.answer-escalation — retires the review-loop escalation the operator just answered.
-//
-// The review-loop escalation is a native `wait-answer` userTask (backed by `pr-escalation.form`).
+// pr.answer-escalation — retires the escalation the operator just answered, for BOTH the review loop
+// (`wait-answer`, convergence-loop.bpmn) and the merge loop (`wait-merge-answer`, merge-loop.bpmn).
+// Both loops now park on a native `wait-*` userTask (backed by `pr-escalation.form`) and run this same
+// reconcile step on completion (#256) — there is one answer path, not two.
 // Completing that task resumes the token, but the engine folds the completed instance's variables
 // away — so without this step the durable `escalations` audit row raised by `pr.persist-escalation`
 // would stay `status="open"` forever, its `answer`/`answered_at` never recorded. That both loses the
@@ -8,9 +9,8 @@
 // single source of truth, ADR "derivation over duplication") would keep surfacing a phantom open
 // escalation on `/status` after it was answered.
 //
-// This mirrors the merge-loop's message-catch answer path (`answerEscalation` in app/service.ts):
-// both answer the newest still-open `escalations` row, mark any duplicate open rows `stale` (a
-// retry of `pr.persist-escalation` can leave more than one open), AND move the `pull_requests` row
+// It answers the newest still-open `escalations` row, marks any duplicate open rows `stale` (a
+// retry of `pr.persist-escalation` can leave more than one open), AND moves the `pull_requests` row
 // off `status="escalated"` back to `"converging"`, so an answered escalation is never left dangling
 // and `/status` never shows an escalated PR with a null question or a phantom open row. The token
 // resume itself is owned by the engine (userTask completion), so this worker only reconciles the
@@ -28,7 +28,7 @@ interface Escalation extends Record<string, unknown> {
 }
 
 // The PR-row fields this worker reconciles when an escalation is answered. Only `status`/`updated_at`
-// are written (mirroring `answerEscalation`); the rest of the row is untouched.
+// are written; the rest of the row is untouched.
 interface PullRequest extends Record<string, unknown> {
   pr_key: string;
   status: string;
@@ -51,7 +51,7 @@ const handler: AppJobHandler<In> = async (job, app) => {
   // open row, so a retry/duplicate activation can leave more than one open — answering only the
   // newest would leave an older duplicate `open`, a phantom `activePrs` keeps deriving while the PR
   // is still `escalated`. Answer the newest (it carries the operator's reply) and mark any remaining
-  // open rows `stale`, mirroring `answerEscalation` and `submitPr`'s resubmit cleanup.
+  // open rows `stale`, mirroring `submitPr`'s resubmit cleanup.
   const open = (await escs.find({ pr_key: prKey, status: "open" })).sort((a, b) => b.id - a.id);
   if (open.length > 0) {
     const ts = new Date().toISOString();
@@ -63,7 +63,7 @@ const handler: AppJobHandler<In> = async (job, app) => {
     for (const dup of open.slice(1)) {
       await escs.update(dup.id, { status: "stale" });
     }
-    // Mirror the merge loop's `answerEscalation`: move the PR off `status="escalated"` back to
+    // Move the PR off `status="escalated"` back to
     // `"converging"` now that the question is answered. Without this the row stays `escalated` (with
     // a now-null derived `openEscalation`) until the re-entered round's `persist-round` runs — a
     // `/status` inconsistency and a divergence from the merge path both loops are meant to share.

package/app/answerEscalation.test.ts

@@ -1,67 +0,0 @@
-// Red/green regression for answerEscalation (merge-loop message path) — Copilot review of PR #180.
-//
-// `pr.persist-escalation` always INSERTs a fresh `escalations` row with `status="open"`, so a
-// retry/duplicate activation can leave more than one open row for the same PR. answerEscalation
-// only closed the NEWEST open row, leaving older duplicates `open` — a phantom that keeps
-// `activePrs` deriving an open escalation while the PR is still `escalated`. Every open row for the
-// PR must leave `open` in this completion (newest answered, the rest marked `stale`), exactly as
-// `submitPr`'s resubmit cleanup already does. Mirrors the review loop's `pr.answer-escalation`.
-import { test } from "node:test";
-import { assertEquals } from "#test-assert";
-import type { DataLayer, EngineClient } from "@nanobpm/urban";
-import { answerEscalation } from "./service.ts";
-
-function memData(escalations: any[], prs: any[]): DataLayer {
-  const table = (name: string, key: string) => ({
-    async find(where: Record<string, unknown>) {
-      const src = name === "escalations" ? escalations : prs;
-      return src.filter((r) => Object.entries(where).every(([k, v]) => r[k] === v));
-    },
-    async update(k: unknown, patch: Record<string, unknown>) {
-      const src = name === "escalations" ? escalations : prs;
-      const r = src.find((x) => x[key] === k);
-      if (r) Object.assign(r, patch);
-      return r;
-    },
-  });
-  return { table } as any as DataLayer;
-}
-
-function fakeEngine(published: any[]): EngineClient {
-  return {
-    async publishMessage(m: any) {
-      published.push(m);
-    },
-  } as any as EngineClient;
-}
-
-test("answerEscalation answers the newest open row and marks duplicate open rows stale", async () => {
-  const escalations = [
-    { id: 3, pr_key: "o/r#1", status: "open", answer: null, answered_at: null },
-    { id: 7, pr_key: "o/r#1", status: "open", answer: null, answered_at: null },
-    { id: 9, pr_key: "o/r#2", status: "open", answer: null, answered_at: null },
-  ];
-  const prs = [{ pr_key: "o/r#1", status: "escalated", updated_at: "t0" }];
-  const published: any[] = [];
-  const res = await answerEscalation(memData(escalations, prs), fakeEngine(published), "o/r#1", "Cap at 5.");
-
-  assertEquals(res, { ok: true, escalationId: 7 }, "the newest open row is the one answered");
-  const answered = escalations.find((e) => e.id === 7);
-  const stale = escalations.find((e) => e.id === 3);
-  const other = escalations.find((e) => e.id === 9);
-  assertEquals(answered?.status, "answered");
-  assertEquals(answered?.answer, "Cap at 5.");
-  assertEquals(stale?.status, "stale", "the older duplicate open row is retired to stale");
-  assertEquals(other?.status, "open", "the other PR's open row is untouched");
-  assertEquals(prs[0].status, "converging", "the PR row is moved off escalated");
-  assertEquals(published.length, 1, "the resume message is published once");
-  assertEquals(published[0].variables.escalationId, 7);
-});
-
-test("answerEscalation is a no-op when no row is open", async () => {
-  const escalations = [{ id: 7, pr_key: "o/r#1", status: "answered", answer: "x", answered_at: "t" }];
-  const published: any[] = [];
-  const res = await answerEscalation(memData(escalations, []), fakeEngine(published), "o/r#1", "again");
-  assertEquals(res, { ok: false, reason: "no open escalation" });
-  assertEquals(published.length, 0);
-});