@nanobpm/nano-workforce 0.48.1 → 0.49.0

package/resources/processes/merge-loop.bpmn

@@ -241,11 +241,12 @@
       <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:exclusiveGateway id="gw-ci-result" name="fixed?" default="f_ci_reconcile">
       <bpmn:incoming>f_ci_done</bpmn:incoming>
       <bpmn:outgoing>f_ci_fixed</bpmn:outgoing>
       <bpmn:outgoing>f_ci_wait</bpmn:outgoing>
       <bpmn:outgoing>f_ci_blocked</bpmn:outgoing>
+      <bpmn:outgoing>f_ci_reconcile</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:exclusiveGateway id="gw-rebase" name="auto-rebase?" default="f_reb_giveup">
       <bpmn:incoming>f_m_mRebase</bpmn:incoming>
@@ -270,11 +271,12 @@
       <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:exclusiveGateway id="gw-rebase-result" name="rebased?" default="f_reb_reconcile">
       <bpmn:incoming>f_reb_done</bpmn:incoming>
       <bpmn:outgoing>f_reb_rebased</bpmn:outgoing>
       <bpmn:outgoing>f_reb_wait</bpmn:outgoing>
       <bpmn:outgoing>f_reb_blocked</bpmn:outgoing>
+      <bpmn:outgoing>f_reb_reconcile</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:serviceTask id="record-merge-dep" name="Wait on another PR">
       <bpmn:extensionElements>
@@ -309,7 +311,10 @@
     <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_ci_blocked" name="could not fix" sourceRef="gw-ci-result" targetRef="merge-esc-attempt">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "blocked"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_ci_reconcile" name="no verdict — reconcile from ground truth" sourceRef="gw-ci-result" targetRef="arm-merge" />
     <bpmn:sequenceFlow id="f_ci_wait" name="waits on another PR" sourceRef="gw-ci-result" targetRef="record-merge-dep">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting-on-pr"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -321,7 +326,10 @@
     <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_reb_blocked" name="could not resolve" sourceRef="gw-rebase-result" targetRef="merge-esc-attempt">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "blocked"</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="f_reb_reconcile" name="no verdict — reconcile from ground truth" sourceRef="gw-rebase-result" targetRef="arm-merge" />
     <bpmn:sequenceFlow id="f_reb_wait" name="waits on another PR" sourceRef="gw-rebase-result" targetRef="record-merge-dep">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=status = "waiting-on-pr"</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
@@ -390,7 +398,7 @@
       <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
         <dc:Bounds x="1420" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1396" y="303" width="85" height="28" />
+          <dc:Bounds x="1396" y="229" width="85" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-evicted" bpmnElement="wait-evicted">
@@ -417,7 +425,7 @@
       <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
         <dc:Bounds x="1620" y="582" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1661" y="579" width="74" height="42" />
+          <dc:Bounds x="1541" y="683" width="74" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
@@ -447,7 +455,7 @@
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase-result" bpmnElement="gw-rebase-result" isMarkerVisible="true">
         <dc:Bounds x="1238" y="1215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1173" y="1233" width="60" height="14" />
+          <dc:Bounds x="1193" y="1270" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-merge-dep" bpmnElement="record-merge-dep">
@@ -498,12 +506,13 @@
           <dc:Bounds x="942" y="765" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
-        <di:waypoint x="1288" y="920" />
-        <di:waypoint x="1438" y="920" />
-        <di:waypoint x="1438" y="640" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_reconcile" bpmnElement="f_ci_reconcile">
+        <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="1319" y="928" width="89" height="14" />
+          <dc:Bounds x="792" y="919" width="82" height="56" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
@@ -514,13 +523,13 @@
           <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="1263" y="1215" />
-        <di:waypoint x="1263" y="1020" />
-        <di:waypoint x="1438" y="1020" />
-        <di:waypoint x="1438" y="640" />
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_reconcile" bpmnElement="f_reb_reconcile">
+        <di:waypoint x="1263" y="1265" />
+        <di:waypoint x="1263" y="1300" />
+        <di:waypoint x="402" y="1300" />
+        <di:waypoint x="402" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1319" y="987" width="64" height="28" />
+          <dc:Bounds x="792" y="1239" width="82" height="56" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
@@ -533,15 +542,9 @@
         <di:waypoint x="1638" y="160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
-        <di:waypoint x="1138" y="740" />
-        <di:waypoint x="1158" y="740" />
-        <di:waypoint x="1158" y="540" />
-        <di:waypoint x="1638" y="540" />
-        <di:waypoint x="1638" y="582" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
-        <di:waypoint x="1488" y="600" />
-        <di:waypoint x="1620" y="600" />
+        <di:waypoint x="1138" y="760" />
+        <di:waypoint x="1638" y="760" />
+        <di:waypoint x="1638" y="618" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
         <di:waypoint x="1638" y="618" />
@@ -583,31 +586,56 @@
           <dc:Bounds x="893" y="839" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_wait" bpmnElement="f_ci_wait">
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_blocked" bpmnElement="f_ci_blocked">
         <di:waypoint x="1288" y="920" />
-        <di:waypoint x="1438" y="920" />
-        <di:waypoint x="1438" y="1040" />
+        <di:waypoint x="1308" y="920" />
+        <di:waypoint x="1308" y="895" />
+        <di:waypoint x="1676" y="895" />
+        <di:waypoint x="1676" y="562" />
+        <di:waypoint x="1488" y="562" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1326" y="887" width="75" height="28" />
+          <dc:Bounds x="1448" y="873" width="89" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_ci_wait" bpmnElement="f_ci_wait">
+        <di:waypoint x="1263" y="945" />
+        <di:waypoint x="1263" y="1080" />
+        <di:waypoint x="1388" y="1080" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1268" y="1016" width="75" 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="1240" />
-        <di:waypoint x="1138" y="1240" />
+        <di:waypoint x="1708" y="305" />
+        <di:waypoint x="1708" y="1140" />
+        <di:waypoint x="1018" y="1140" />
+        <di:waypoint x="1018" y="1220" />
+        <di:waypoint x="1038" y="1220" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1101" y="310" width="49" height="28" />
+          <dc:Bounds x="1713" y="709" width="49" height="28" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_blocked" bpmnElement="f_reb_blocked">
+        <di:waypoint x="1288" y="1240" />
+        <di:waypoint x="1308" y="1240" />
+        <di:waypoint x="1308" y="1215" />
+        <di:waypoint x="1676" y="1215" />
+        <di:waypoint x="1676" y="562" />
+        <di:waypoint x="1488" y="562" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1460" y="1182" width="64" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_wait" bpmnElement="f_reb_wait">
         <di:waypoint x="1263" y="1215" />
-        <di:waypoint x="1263" y="1080" />
-        <di:waypoint x="1388" y="1080" />
+        <di:waypoint x="1263" y="1140" />
+        <di:waypoint x="1438" y="1140" />
+        <di:waypoint x="1438" y="1120" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1288" y="1047" width="75" height="28" />
+          <dc:Bounds x="1268" y="1164" width="75" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
@@ -640,12 +668,12 @@
         <di:waypoint x="1238" y="920" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_done" bpmnElement="f_reb_done">
-        <di:waypoint x="1138" y="1260" />
-        <di:waypoint x="1158" y="1260" />
-        <di:waypoint x="1158" y="1285" />
-        <di:waypoint x="1238" y="1285" />
-        <di:waypoint x="1263" y="1285" />
-        <di:waypoint x="1263" y="1265" />
+        <di:waypoint x="1138" y="1240" />
+        <di:waypoint x="1238" y="1240" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
+        <di:waypoint x="1488" y="600" />
+        <di:waypoint x="1620" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_fixed" bpmnElement="f_ci_fixed">
         <di:waypoint x="1263" y="945" />
@@ -653,7 +681,7 @@
         <di:waypoint x="402" y="980" />
         <di:waypoint x="402" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="813" y="958" width="39" height="14" />
+          <dc:Bounds x="813" y="988" width="39" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rebased" bpmnElement="f_reb_rebased">
@@ -662,13 +690,13 @@
         <di:waypoint x="402" y="1300" />
         <di:waypoint x="402" y="160" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="806" y="1278" width="53" height="14" />
+          <dc:Bounds x="806" y="1308" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
         <di:waypoint x="1438" y="1120" />
-        <di:waypoint x="1438" y="1320" />
-        <di:waypoint x="234" y="1320" />
+        <di:waypoint x="1438" y="1140" />
+        <di:waypoint x="234" y="1140" />
         <di:waypoint x="234" y="138" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">

package/scripts/pages-contract.test.ts

@@ -207,12 +207,15 @@ test("every page datasource column exists on its table", async () => {
   }
 });
 
-test("issue #87: plan_reviews is surfaced on the epic and home pages", async () => {
+test("issue #87: plan_reviews is surfaced on the per-epic detail page", async () => {
   const refs = await loadRefs();
-  const onEpic = refs.some((r) => r.page === "epic.page.json" && r.table === "plan_reviews");
-  const onHome = refs.some((r) => r.page === "home.page.json" && r.table === "plan_reviews");
-  assert(onEpic, "epic.page.json must bind a grid to plan_reviews (plan-review trace)");
-  assert(onHome, "home.page.json plan detail must include a plan_reviews child grid");
+  // The operator-visibility redesign (issue #137) moved per-plan detail grids off the flat
+  // epic index onto the param-scoped per-epic page (#/epic-detail/<plan_key>), where the
+  // plan-review trace is filtered to a single epic. Assert the trace lives there.
+  const onEpicDetail = refs.some(
+    (r) => r.page === "epic-detail.page.json" && r.table === "plan_reviews",
+  );
+  assert(onEpicDetail, "epic-detail.page.json must bind a grid to plan_reviews (plan-review trace)");
 
   // The trace is only useful with the verdict + critique columns, so pin them. Assert against the
   // visibly displayed `columns` (not `fields`, which also holds binding refs like orderBy.field) so

package/workers/record-plan/worker.test.ts

@@ -0,0 +1,89 @@
+// Regression coverage for record-plan's operator-visibility wave progress projection (issue #137).
+//
+// record-plan initializes plans.wave_count/current_wave/wave_label when a plan is dispatched. The
+// three fields must stay consistent: a taskful plan gets wave_count N, current_wave 0, "1/N"; a
+// taskless plan gets all three NULL (never wave_count 0 against NULL current_wave/wave_label, which
+// would leak a misleading value to the epics-index — the documented contract is "NULL until
+// dispatched with tasks").
+import { test } from "node:test";
+import { assertEquals } from "#test-assert";
+import handler from "./worker.ts";
+
+interface Row extends Record<string, unknown> {
+  id?: number;
+  plan_key: string;
+}
+
+function fakeApp() {
+  const planTasks: Row[] = [];
+  const planTaskDeps: Row[] = [];
+  const plans: Row[] = [{ plan_key: "owner/repo#137" }];
+  let nextId = 1;
+  const app = {
+    log: { error() {}, info() {}, warn() {} },
+    data: {
+      table(name: string, key: string) {
+        const store = name === "plan_tasks"
+          ? planTasks
+          : name === "plan_task_deps"
+          ? planTaskDeps
+          : plans;
+        return {
+          find: (q: Record<string, unknown>) =>
+            Promise.resolve(
+              store.filter((r) => Object.entries(q).every(([f, v]) => r[f] === v)),
+            ),
+          insert: (row: Row) => {
+            store.push({ ...row, id: row.id ?? nextId++ });
+            return Promise.resolve();
+          },
+          delete: (k: unknown) => {
+            for (let i = store.length - 1; i >= 0; i--) {
+              if (store[i][key] === k) store.splice(i, 1);
+            }
+            return Promise.resolve();
+          },
+          update: (k: unknown, patch: Record<string, unknown>) => {
+            const row = store.find((r) => r[key] === k);
+            if (row) Object.assign(row, patch);
+            return Promise.resolve(row);
+          },
+        };
+      },
+    },
+  } as any;
+  return { app, plans, planTasks };
+}
+
+test("record-plan initializes wave progress fields for a taskful plan", async () => {
+  const { app, plans } = fakeApp();
+  await handler(
+    {
+      variables: {
+        planKey: "owner/repo#137",
+        tasks: [
+          { id: "a", prompt: "do A" },
+          { id: "b", prompt: "do B", dependsOn: ["a"] },
+        ],
+      },
+    } as any,
+    app,
+  );
+  assertEquals(plans[0].status, "dispatched");
+  assertEquals(plans[0].wave_count, 2);
+  assertEquals(plans[0].current_wave, 0);
+  assertEquals(plans[0].wave_label, "1/2");
+});
+
+test("record-plan leaves all three wave progress fields NULL for a taskless plan", async () => {
+  const { app, plans } = fakeApp();
+  await handler(
+    { variables: { planKey: "owner/repo#137", tasks: [], note: "planner emitted no tasks" } } as any,
+    app,
+  );
+  assertEquals(plans[0].status, "done");
+  // No wave to implement => no misleading wave_count: 0 while current_wave/wave_label are NULL.
+  assertEquals(plans[0].wave_count, null);
+  assertEquals(plans[0].current_wave, null);
+  assertEquals(plans[0].wave_label, null);
+});

package/workers/record-plan/worker.ts

@@ -123,6 +123,14 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
   const patch: Record<string, unknown> = {
     status: tasks.length > 0 ? "dispatched" : "done",
     task_count: tasks.length,
+    // Operator-visibility progress projection (issue #137): total waves (N), and the wave the
+    // fleet is actively implementing (0 at dispatch). `select-wave` advances current_wave per
+    // wave; a taskless plan gets no wave (NULL) since there is nothing to implement. Display-only.
+    // All three fields stay NULL until dispatched with tasks — a taskless plan must not leak a
+    // misleading wave_count: 0 while current_wave/wave_label are NULL (inconsistent projection).
+    wave_count: tasks.length > 0 ? waveCount : null,
+    current_wave: tasks.length > 0 ? 0 : null,
+    wave_label: tasks.length > 0 ? `1/${waveCount}` : null,
     updated_at: ts,
   };
   if (tasks.length === 0) patch.outcome = note ? str(note) : "planner emitted no tasks";

package/workers/record-wave/worker.test.ts

@@ -142,6 +142,62 @@ test("record-wave retries the same wave when a task is still pending", async ()
     trialMergeSkipReason: "wave-still-pending",
   });
   assertEquals((planUpdates[0].patch as Record<string, unknown>).gate_wave, 1);
+  // Retry keeps the projection on the same (still-pending) wave.
+  assertEquals((planUpdates[0].patch as Record<string, unknown>).current_wave, 1);
+});
+
+test("record-wave pins current_wave to the last index and clears gate_wave on the final wave", async () => {
+  const rows: Row[] = [{
+    id: 9,
+    plan_key: "owner/repo#63",
+    task_id: "z",
+    status: "opened",
+    wave: 2,
+  }];
+  const { app, planUpdates } = fakeApp(rows);
+
+  await handler(
+    {
+      variables: {
+        planKey: "owner/repo#63",
+        currentWave: 2,
+        waveCount: 3,
+        waveTasks: [],
+        waveResults: [],
+      },
+    } as any,
+    app,
+  );
+
+  // Final wave (2 of 3): no successor wave — gate cleared, projection pinned to N-1 so the
+  // epics-index reads 3/3 rather than the one-past-the-end nextWave (3).
+  assertEquals((planUpdates[0].patch as Record<string, unknown>).gate_wave, null);
+  assertEquals((planUpdates[0].patch as Record<string, unknown>).current_wave, 2);
+  assertEquals((planUpdates[0].patch as Record<string, unknown>).wave_label, "3/3");
+});
+
+test("record-wave keeps all wave-progress fields NULL for a taskless plan (waveCount 0)", async () => {
+  // A taskless plan runs record-wave with waveCount 0 (the MI `implement` step completed
+  // immediately). All three progress fields must stay NULL together — never current_wave=0 against
+  // a NULL wave_label, which would clobber record-plan/select-wave's NULL projection.
+  const { app, planUpdates } = fakeApp([]);
+
+  await handler(
+    {
+      variables: {
+        planKey: "owner/repo#70",
+        currentWave: 0,
+        waveCount: 0,
+        waveTasks: [],
+        waveResults: [],
+      },
+    } as any,
+    app,
+  );
+
+  const patch = planUpdates[0].patch as Record<string, unknown>;
+  assertEquals(patch.current_wave, null);
+  assertEquals(patch.wave_label, null);
 });
 
 test("record-wave skips trial merge for mergify-queue repos with 2+ heads", async () => {

package/workers/record-wave/worker.ts

@@ -278,6 +278,18 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
   const nextWave = stillPendingCurrentWave ? currentWave : currentWave + 1;
   const hasMoreWaves = stillPendingCurrentWave || nextWave < waveCount;
 
+  // Operator-visibility projection (issue #137): keep plans.current_wave tracking the wave the
+  // fleet is on. While more waves remain, point it at the wave about to run (select-wave re-writes
+  // the same value when it dispatches); on the final wave, pin it to the last index so a finished
+  // epic reads N/N (nextWave would be waveCount, one past the last band). Display-only.
+  const projectedCurrentWave = hasMoreWaves ? nextWave : Math.max(0, waveCount - 1);
+  // Keep the three progress fields consistent: a taskless plan (waveCount 0 — the MI `implement`
+  // step completed immediately with no waves) has no wave to be on, so current_wave and wave_label
+  // both stay NULL rather than writing current_wave=0 against a NULL label (and clobbering the NULL
+  // projection record-plan/select-wave already recorded).
+  const currentWaveProjection = waveCount > 0 ? projectedCurrentWave : null;
+  const waveLabel = waveCount > 0 ? `${projectedCurrentWave + 1}/${waveCount}` : null;
+
   // Wave-merge barrier: when another wave follows, park the plan-fanout instance at the
   // `wait-wave-merged` catch event until THIS wave's opened PRs have MERGED (not merely opened).
   // `gate_wave` is that durable marker; the poller (`pollWaveGates`) clears it and publishes
@@ -288,6 +300,8 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
   try {
     await plans(app.data).update(planKey, {
       gate_wave: hasMoreWaves ? currentWave : null,
+      current_wave: currentWaveProjection,
+      wave_label: waveLabel,
       updated_at: ts,
     });
   } catch (err) {

package/workers/select-wave/worker.test.ts

@@ -25,11 +25,12 @@ interface DepRow {
   depends_on_task_id: string;
 }
 
-function fakeApp(rows: Row[], deps: DepRow[]) {
+function fakeApp(rows: Row[], deps: DepRow[], plans: Record<string, unknown>[] = []) {
   return {
+    log: { error() {}, info() {}, warn() {} },
     data: {
       table(name: string, key: string) {
-        const store = name === "plan_tasks" ? rows : deps;
+        const store = name === "plan_tasks" ? rows : name === "plans" ? plans : deps;
         return {
           find: (q: any) =>
             Promise.resolve(
@@ -60,6 +61,36 @@ async function selectWave(rows: Row[], deps: DepRow[]) {
   return out as { waveTasks: unknown[] };
 }
 
+test("select-wave projects the active wave onto plans.current_wave", async () => {
+  const rows: Row[] = [
+    { id: 1, plan_key: "owner/repo#63", task_id: "a", title: "A", prompt: "do A", status: "pending", wave: 1 },
+  ];
+  const plans: Record<string, unknown>[] = [{ plan_key: "owner/repo#63", current_wave: 0 }];
+  const out = await handler(
+    { variables: { planKey: "owner/repo#63", currentWave: 1 } } as any,
+    fakeApp(rows, [], plans),
+  );
+  assertEquals((out as { waveTasks: unknown[] }).waveTasks.length, 1);
+  assertEquals(plans[0].current_wave, 1);
+  // wave_count is derived from the levelized rows (max wave + 1) and the 1-based "X/N" label
+  // is pre-formatted for the epics-index at-a-glance column.
+  assertEquals(plans[0].wave_count, 2);
+  assertEquals(plans[0].wave_label, "2/2");
+});
+
+test("select-wave nulls all three progress fields when there are no levelized rows", async () => {
+  // No plan_tasks rows => waveCount 0. current_wave must be NULL too (not a stray index against a
+  // NULL wave_count/wave_label), matching the documented "NULL until dispatched with tasks".
+  const plans: Record<string, unknown>[] = [{ plan_key: "owner/repo#63", current_wave: 5 }];
+  await handler(
+    { variables: { planKey: "owner/repo#63", currentWave: 0 } } as any,
+    fakeApp([], [], plans),
+  );
+  assertEquals(plans[0].current_wave, null);
+  assertEquals(plans[0].wave_count, null);
+  assertEquals(plans[0].wave_label, null);
+});
+
 test("select-wave leaves dependents pending behind a waiting-for-lane dependency", async () => {
   const rows: Row[] = [
     {

package/workers/select-wave/worker.ts

@@ -15,7 +15,7 @@
 // Emitting an empty `waveTasks` is fine: the MI activity over an empty collection completes
 // immediately (the same 0-task path the flat fan-out already relied on).
 import type { AppJobHandler } from "@nanobpm/urban";
-import { planTaskDeps, planTasks } from "../../app/plan.ts";
+import { plans, planTaskDeps, planTasks } from "../../app/plan.ts";
 
 interface In extends Record<string, unknown> {
   planKey: string;
@@ -47,6 +47,28 @@ const handler: AppJobHandler<In, Out> = async (job, app) => {
   const statusById = new Map<string, string>();
   for (const r of rows) statusById.set(r.task_id, r.status);
 
+  // Operator-visibility projection (issue #137): mark this as the wave the fleet is now
+  // implementing, so the epics-index can show wave X/N at a glance. wave_count is derivable from
+  // the levelized rows (max wave + 1), so the "X/N" label stays correct even if a re-levelize
+  // changed the total. Best-effort + idempotent (a retry re-writes the same value) and
+  // display-only — it must never gate control flow, which stays driven by the process
+  // `currentWave`/`waveCount`/`gate_wave` state.
+  const waveCount = rows.reduce((m, r) => Math.max(m, r.wave ?? 0), -1) + 1;
+  try {
+    await plans(app.data).update(planKey, {
+      // Keep the three progress fields consistent: with no levelized rows (waveCount 0) there is
+      // no wave to implement, so current_wave is NULL too — never a stray index against NULL N.
+      current_wave: waveCount > 0 ? currentWave : null,
+      wave_count: waveCount > 0 ? waveCount : null,
+      wave_label: waveCount > 0 ? `${currentWave + 1}/${waveCount}` : null,
+      updated_at: ts,
+    });
+  } catch (err) {
+    app.log.error(`select-wave: projecting current_wave failed for ${planKey}`, {
+      err: String(err),
+    });
+  }
+
   const deps = await planTaskDeps(app.data).find({ plan_key: planKey });
   const depsByTask = new Map<string, string[]>();
   for (const d of deps) {