@nanobpm/nano-workforce 0.209.1 → 0.210.0

package/workers/reconverge/worker.test.ts

@@ -108,3 +108,53 @@ test("a head read that resolves no SHA degrades to the checkpoint restore (no ov
   await makeHandler(submit, head)({ processInstanceKey: "4242", variables: { prKey: "acme/w#7" } } as any, app);
   assertEquals(args[11], null, "no live head SHA → no override (checkpoint restore, the pre-fix behaviour)");
 });
+
+// Issue #956 review (Copilot thread 4547353262): a merge-stage reconverge re-enters `submitPr`
+// WITHOUT the run's operator custom instructions, so the replacement convergence loop runs
+// unsteered (and `submitPr`'s run-scoped reopen resets `custom_instructions` to 0). The worker must
+// read the durable text off the PR row (`custom_instructions_text`, stamped by `submitPr`) and pass
+// it through, so convergence → merge → reconvergence keeps the steering.
+test("preserves the run's custom instructions across the merge→reconvergence handoff (#956)", async () => {
+  const app = {
+    data: {
+      table: (name: string) => ({
+        get: async () =>
+          name === "pull_requests"
+            ? { auto_resolve_escalations: 1, custom_instructions_text: "  commit as josh.wulf@camunda.com  " }
+            : undefined,
+        insert: async () => 1,
+      }),
+    },
+    engine: {},
+    log: noopLog(),
+  } as any;
+  let args: unknown[] = [];
+  const submit = (async (...a: unknown[]) => {
+    args = a;
+    return { prKey: "acme/w#7", processKey: "999" };
+  }) as unknown as Submit;
+  const head = (async () => null) as unknown as FetchPrHead;
+  await makeHandler(submit, head)({ processInstanceKey: "4242", variables: { prKey: "acme/w#7" } } as any, app);
+  assertEquals(args[12], "  commit as josh.wulf@camunda.com  ", "the durable instruction text rides the handoff into the fresh convergence run");
+});
+
+test("a PR row with no stored instructions hands off with null (no steering)", async () => {
+  const app = {
+    data: {
+      table: (name: string) => ({
+        get: async () => (name === "pull_requests" ? { auto_resolve_escalations: 0, custom_instructions_text: null } : undefined),
+        insert: async () => 1,
+      }),
+    },
+    engine: {},
+    log: noopLog(),
+  } as any;
+  let args: unknown[] = [];
+  const submit = (async (...a: unknown[]) => {
+    args = a;
+    return { prKey: "acme/w#7", processKey: "999" };
+  }) as unknown as Submit;
+  const head = (async () => null) as unknown as FetchPrHead;
+  await makeHandler(submit, head)({ processInstanceKey: "4242", variables: { prKey: "acme/w#7" } } as any, app);
+  assertEquals(args[12], null, "no stored text → null (the fresh run's prompts stay byte-identical to no-instructions)");
+});

package/workers/reconverge/worker.ts

@@ -27,6 +27,12 @@ export function makeHandler(submit: Submit, fetchHead: FetchPrHead = fetchPrHead
     const row = await app.data.table("pull_requests", "pr_key").get(prKey);
     // biome-ignore lint/plugin: runtime/framework contract boundary for the untyped row shape
     const optIn = (row as { auto_resolve_escalations?: number } | undefined)?.auto_resolve_escalations === 1;
+    // Operator steering (issue #956 review): re-supply the run's durable instruction text so the
+    // merge→reconvergence handoff never starts an unsteered replacement loop (and never resets the
+    // `custom_instructions` projection). Read the SAME `pull_requests` row the opt-in came from.
+    // biome-ignore lint/plugin: runtime/framework contract boundary for the untyped row shape
+    const rowInstructions = (row as { custom_instructions_text?: string | null } | undefined)?.custom_instructions_text;
+    const customInstructions = typeof rowInstructions === "string" && rowInstructions.trim() !== "" ? rowInstructions : null;
     await app.data.table("merges", "id").insert({
       pr_key: prKey,
       outcome: "reconverge",
@@ -63,6 +69,7 @@ export function makeHandler(submit: Submit, fetchHead: FetchPrHead = fetchPrHead
       true,
       job.processInstanceKey != null ? String(job.processInstanceKey) : null,
       headSha,
+      customInstructions,
     );
     // `submitPr` can return `processKey: null` after rewriting the row to `converging` with no owner
     // (the create-instance failure window). Completing HERE would end the merge loop at