@nanobpm/nano-workforce 0.188.0 → 0.189.0

package/resources/processes/implement-cell.bpmn

@@ -37,6 +37,23 @@
       <bpmn:outgoing>ic_escalate</bpmn:outgoing>
       <bpmn:outgoing>ic_done</bpmn:outgoing>
     </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="reconcile-implement" name="Reconcile from GitHub">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.reconcile-implement" />
+        <zeebe:ioMapping>
+          <zeebe:output source="=reconciled" target="reconciled" />
+          <zeebe:output source="=status" target="status" />
+          <zeebe:output source="=pr" target="pr" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>ic_escalate</bpmn:incoming>
+      <bpmn:outgoing>ic_toReconcileGw</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <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_toRecordEscalation</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
     <bpmn:callActivity id="escalate" name="Human escalation">
       <bpmn:extensionElements>
         <zeebe:calledElement processId="human-escalation" />
@@ -61,7 +78,7 @@
           <zeebe:output source="=question" target="question" />
         </zeebe:ioMapping>
       </bpmn:extensionElements>
-      <bpmn:incoming>ic_escalate</bpmn:incoming>
+      <bpmn:incoming>ic_toRecordEscalation</bpmn:incoming>
       <bpmn:outgoing>ic_toEscalate</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="ic_gw_answer" name="answer?" default="ic_abandon">
@@ -81,6 +98,7 @@
     </bpmn:serviceTask>
     <bpmn:endEvent id="ic_end" name="Task done">
       <bpmn:incoming>ic_done</bpmn:incoming>
+      <bpmn:incoming>ic_reconciled</bpmn:incoming>
       <bpmn:incoming>ic_abandon</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="ic_toImplement" sourceRef="Start" targetRef="implement-task" />
@@ -88,7 +106,12 @@
     <bpmn:sequenceFlow id="ic_done" name="done" sourceRef="ic_gw" targetRef="ic_end">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "opened" or status = "blocked" or status = "skipped"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="ic_escalate" name="escalated" sourceRef="ic_gw" targetRef="record-escalation" />
+    <bpmn:sequenceFlow id="ic_escalate" name="reconcile" sourceRef="ic_gw" targetRef="reconcile-implement" />
+    <bpmn:sequenceFlow id="ic_toReconcileGw" sourceRef="reconcile-implement" targetRef="ic_reconcile_gw" />
+    <bpmn:sequenceFlow id="ic_reconciled" name="adopted" sourceRef="ic_reconcile_gw" targetRef="ic_end">
+      <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_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">
@@ -114,25 +137,34 @@
           <dc:Bounds x="406" 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" />
+      </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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="751" y="76" width="81" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_escalate" bpmnElement="escalate">
-        <dc:Bounds x="766" y="80" width="100" height="80" />
+        <dc:Bounds x="1116" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-escalation" bpmnElement="record-escalation">
-        <dc:Bounds x="566" y="80" width="100" height="80" />
+        <dc:Bounds x="916" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ic_gw_answer" bpmnElement="ic_gw_answer" isMarkerVisible="true">
-        <dc:Bounds x="966" y="95" width="50" height="50" />
+        <dc:Bounds x="1316" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="963" y="76" width="56" height="14" />
+          <dc:Bounds x="1313" y="76" width="56" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-implementing" bpmnElement="record-implementing">
-        <dc:Bounds x="1116" y="240" width="100" height="80" />
+        <dc:Bounds x="1466" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_ic_end" bpmnElement="ic_end">
-        <dc:Bounds x="1148" y="102" width="36" height="36" />
+        <dc:Bounds x="1498" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1133" y="83" width="66" height="14" />
+          <dc:Bounds x="1483" y="83" width="66" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toImplement" bpmnElement="ic_toImplement">
@@ -150,41 +182,61 @@
           <dc:Bounds x="483" y="128" width="67" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_ic_toEscalate" bpmnElement="ic_toEscalate">
+      <bpmndi:BPMNEdge id="BPMNEdge_ic_toReconcileGw" bpmnElement="ic_toReconcileGw">
         <di:waypoint x="666" y="120" />
         <di:waypoint x="766" 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" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="833" 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" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_toAnswerGw" bpmnElement="ic_toAnswerGw">
-        <di:waypoint x="866" y="120" />
-        <di:waypoint x="966" y="120" />
+        <di:waypoint x="1216" y="120" />
+        <di:waypoint x="1316" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_abandon" bpmnElement="ic_abandon">
-        <di:waypoint x="1016" y="120" />
-        <di:waypoint x="1148" y="120" />
+        <di:waypoint x="1366" y="120" />
+        <di:waypoint x="1498" y="120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1056" y="98" width="53" height="14" />
+          <dc:Bounds x="1406" y="98" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_answerLoop" bpmnElement="ic_answerLoop">
-        <di:waypoint x="991" y="145" />
-        <di:waypoint x="991" y="280" />
-        <di:waypoint x="1116" y="280" />
+        <di:waypoint x="1341" y="145" />
+        <di:waypoint x="1341" y="280" />
+        <di:waypoint x="1466" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="996" y="206" width="49" height="14" />
+          <dc:Bounds x="1346" 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="180" />
-        <di:waypoint x="1166" y="180" />
-        <di:waypoint x="1166" y="138" />
+        <di:waypoint x="441" y="200" />
+        <di:waypoint x="1516" y="200" />
+        <di:waypoint x="1516" y="138" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="963" 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" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="788" y="188" width="32" height="14" />
+          <dc:Bounds x="1047" y="158" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_ic_reImplement" bpmnElement="ic_reImplement">
-        <di:waypoint x="1166" y="320" />
-        <di:waypoint x="1166" y="340" />
+        <di:waypoint x="1516" y="320" />
+        <di:waypoint x="1516" y="340" />
         <di:waypoint x="266" y="340" />
         <di:waypoint x="266" y="160" />
       </bpmndi:BPMNEdge>

package/resources/processes/plan-fanout.bpmn

@@ -443,6 +443,7 @@
           <zeebe:ioMapping>
             <zeebe:input source="=task" target="task" />
             <zeebe:input source="=planKey" target="subjectKey" />
+            <zeebe:input source="=baseBranch" target="baseBranch" />
             <zeebe:input source="=escalationSlaTimeout" target="escalationSlaTimeout" />
             <zeebe:input source="=if (is defined(escalationAssignee)) then escalationAssignee else null" target="escalationAssignee" />
             <zeebe:input source="=if (is defined(baseBranchBrief)) then baseBranchBrief else null" target="baseBranchBrief" />

package/test/worldDb.ts

@@ -69,12 +69,18 @@ function gateway(db: DatabaseSync, name: string, pk: string) {
  * that decorates `table` on the returned source sees its decoration inside the transaction too. */
 type MemDataSource = {
   table: (name: string, pk?: string) => ReturnType<typeof gateway>;
+  query<T = unknown>(sql: string, params?: unknown[]): Promise<T[]>;
   tx<T>(fn: (t: MemDataSource) => Promise<T>): Promise<T>;
 };
 
 function openDataSource(db: DatabaseSync): MemDataSource {
   const ds: MemDataSource = {
     table: (name, pk = "id") => gateway(db, name, pk),
+    // The row-returning raw-SQL surface (mirrors the runtime `DataSource.query`) so tests exercise a
+    // handler's bounded `WHERE … IN (…)` reads against genuine SQLite rather than a mock.
+    async query<T = unknown>(sql: string, params: unknown[] = []): Promise<T[]> {
+      return db.prepare(sql).all(...params.map(coerce)) as T[];
+    },
     async tx(fn) {
       db.exec("BEGIN");
       try {

package/workers/reconcile-implement/worker.test.ts

@@ -0,0 +1,87 @@
+// Unit coverage for pr.reconcile-implement — the implement-cell's reconcile-before-escalate step
+// (issue #801). It wraps the canonical `reconcileImplement` decision with the injected GitHub read;
+// here we assert the handler wires job variables through and re-emits the decision (the gate variable
+// `reconciled` plus the adopted `status`/`pr`). The decision logic itself is exhaustively covered in
+// app/implementReconcile.test.ts.
+import { test } from "node:test";
+import { assertEquals } from "#test-assert";
+import { noopLog } from "../../test/log.ts";
+import handler from "./worker.ts";
+
+// biome-ignore lint/suspicious/noExplicitAny: tiny app double — the handler only touches app.log.
+const fakeApp: any = { log: noopLog() };
+
+test("adopts an open PR on the branch: emits reconciled + status=opened + pr", async () => {
+  const prevToken = process.env.GITHUB_TOKEN;
+  const prevTransport = process.env.NANO_PR_GITHUB_TRANSPORT;
+  const prevFetch = globalThis.fetch;
+  process.env.GITHUB_TOKEN = "t";
+  process.env.NANO_PR_GITHUB_TRANSPORT = "token";
+  // Token transport (never shells out to `gh`): stub the pulls listing so `listPrsForHead` returns one
+  // open PR opened from `feat/issue-801`.
+  globalThis.fetch = (async () =>
+    new Response(JSON.stringify([{ number: 801, html_url: "https://github.com/owner/repo/pull/801", state: "open", base: { ref: "main" } }]), {
+      status: 200,
+    })) as typeof fetch;
+  try {
+    const out = await handler(
+      { jobKey: "j1", variables: { subjectKey: "owner/repo#801", task: { id: "issue-801" }, status: null } } as never,
+      fakeApp,
+    );
+    assertEquals(out, { reconciled: true, status: "opened", pr: "owner/repo#801" });
+  } finally {
+    globalThis.fetch = prevFetch;
+    if (prevToken === undefined) delete process.env.GITHUB_TOKEN;
+    else process.env.GITHUB_TOKEN = prevToken;
+    if (prevTransport === undefined) delete process.env.NANO_PR_GITHUB_TRANSPORT;
+    else process.env.NANO_PR_GITHUB_TRANSPORT = prevTransport;
+  }
+});
+
+test("wires baseBranch through: a wrong-base open PR is NOT adopted → escalate", async () => {
+  const prevToken = process.env.GITHUB_TOKEN;
+  const prevTransport = process.env.NANO_PR_GITHUB_TRANSPORT;
+  const prevFetch = globalThis.fetch;
+  process.env.GITHUB_TOKEN = "t";
+  process.env.NANO_PR_GITHUB_TRANSPORT = "token";
+  // The only open PR on the head branch targets a different base than the run's pinned `baseBranch`.
+  globalThis.fetch = (async () =>
+    new Response(JSON.stringify([{ number: 55, html_url: "https://github.com/owner/repo/pull/55", state: "open", base: { ref: "stale-base" } }]), {
+      status: 200,
+    })) as typeof fetch;
+  try {
+    const out = await handler(
+      { jobKey: "j3", variables: { subjectKey: "owner/repo#7", task: { id: "issue-7" }, status: null, baseBranch: "epic/feat-x" } } as never,
+      fakeApp,
+    );
+    assertEquals(out, { reconciled: false, status: null, pr: null });
+  } finally {
+    globalThis.fetch = prevFetch;
+    if (prevToken === undefined) delete process.env.GITHUB_TOKEN;
+    else process.env.GITHUB_TOKEN = prevToken;
+    if (prevTransport === undefined) delete process.env.NANO_PR_GITHUB_TRANSPORT;
+    else process.env.NANO_PR_GITHUB_TRANSPORT = prevTransport;
+  }
+});
+
+test("no open PR on the branch: falls through to escalate (reconciled=false)", async () => {
+  const prevToken = process.env.GITHUB_TOKEN;
+  const prevTransport = process.env.NANO_PR_GITHUB_TRANSPORT;
+  const prevFetch = globalThis.fetch;
+  process.env.GITHUB_TOKEN = "t";
+  process.env.NANO_PR_GITHUB_TRANSPORT = "token";
+  globalThis.fetch = (async () => new Response(JSON.stringify([]), { status: 200 })) as typeof fetch;
+  try {
+    const out = await handler(
+      { jobKey: "j2", variables: { subjectKey: "owner/repo#7", task: { id: "issue-7" }, status: null } } as never,
+      fakeApp,
+    );
+    assertEquals(out, { reconciled: false, status: null, pr: null });
+  } finally {
+    globalThis.fetch = prevFetch;
+    if (prevToken === undefined) delete process.env.GITHUB_TOKEN;
+    else process.env.GITHUB_TOKEN = prevToken;
+    if (prevTransport === undefined) delete process.env.NANO_PR_GITHUB_TRANSPORT;
+    else process.env.NANO_PR_GITHUB_TRANSPORT = prevTransport;
+  }
+});

package/workers/reconcile-implement/worker.ts

@@ -0,0 +1,60 @@
+// pr.reconcile-implement — reconcile the implement-cell result from GitHub before escalating (issue #801).
+//
+// Runs on the shared `implement-cell`'s escalate arm (`ic_gw` "clean terminal?" → here), IMMEDIATELY
+// before the human escalation, for EVERY caller that composes the cell: a standalone `feature` run and
+// a plan-fanout wave slice. When the implement step returned no machine-readable `status` (a harness
+// that opened a green PR but reported nothing — #796's implement-stage twin), it looks for an OPEN PR
+// on the cell's deterministic `feat/<task.id>` branch and, when one exists, ADOPTS it — emitting
+// `reconciled = true` (the `ic_reconcile_gw` gate routes straight to the cell's done end) plus
+// `status = "opened"` and a `pr` key so the caller converges the adopted PR exactly as if the agent
+// had reported it. Only when nothing is observable does it fall through (`reconciled = false`) to the
+// human escalation as today.
+//
+// The decision + the injected GitHub read (`listPrsForHead`) live in the canonical, exhaustively
+// tested `app/implementReconcile.ts` mirror — this handler is the thin engine seam. `taskId` is
+// derived from the in-scope `task` process variable (`task.id`) — `implement-cell.bpmn` defines no
+// `<zeebe:ioMapping>` input for this step; the engine populates `task` (and `subjectKey`, `status`,
+// `pr`, `baseBranch`) from process scope. `pr` is passed through so the reconcile step's `pr` output
+// never wipes a PR key the implement harness already set. `baseBranch` (the run's pinned base) is
+// passed through so an open PR on the deterministic head branch is only adopted when it targets that
+// base — never a stale/unrelated PR sharing the head branch but aimed at a different base.
+import type { AppJobHandler } from "@nanobpm/urban";
+import { listPrsForHead } from "../../app/github.ts";
+import { type ReconcileImplementResult, reconcileImplement } from "../../app/implementReconcile.ts";
+
+interface In extends Record<string, unknown> {
+  subjectKey?: unknown;
+  task?: unknown;
+  status?: unknown;
+  pr?: unknown;
+  baseBranch?: unknown;
+}
+
+/** The cell's deterministic branch is `feat/<task.id>`; `task` is the implement-cell's slice object.
+ *  Read it defensively (the process variable is untyped at the engine seam). */
+function taskId(task: unknown): unknown {
+  if (task !== null && typeof task === "object" && "id" in task) return task.id;
+  return undefined;
+}
+
+const handler: AppJobHandler<In, ReconcileImplementResult> = async (job, app) => {
+  const res = await reconcileImplement(
+    {
+      status: job.variables.status,
+      subjectKey: job.variables.subjectKey,
+      taskId: taskId(job.variables.task),
+      pr: job.variables.pr,
+      baseBranch: job.variables.baseBranch,
+    },
+    listPrsForHead,
+    process.env.GITHUB_TOKEN ?? "",
+  );
+  app.log.info("reconcile-implement", {
+    subjectKey: job.variables.subjectKey ?? null,
+    reconciled: res.reconciled,
+    pr: res.pr,
+  });
+  return res;
+};
+
+export default handler;