From 73b9a7717acca064a3e3d1e8818602156b0adcc2 Mon Sep 17 00:00:00 2001
From: unidesk-code-queue-runner <code-queue-runner@users.noreply.github.com>
Date: Sat, 23 May 2026 23:11:37 +0000
Subject: [PATCH] fix: allow scoped dev cd rollout verification

---
 scripts/src/dev-cd-apply.mjs      | 43 +++++++++++++++++++------------
 scripts/src/dev-cd-apply.test.mjs | 35 +++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/scripts/src/dev-cd-apply.mjs b/scripts/src/dev-cd-apply.mjs
index 25cb14e7..b65b038a 100644
--- a/scripts/src/dev-cd-apply.mjs
+++ b/scripts/src/dev-cd-apply.mjs
@@ -84,6 +84,7 @@ export function parseArgs(argv) {
     ownerTaskId: null,
     breakStaleLock: false,
     skipLiveVerify: false,
+    skipRuntimePostflight: false,
     status: false,
     dryRun: false,
     fullOutput: false,
@@ -118,6 +119,9 @@ export function parseArgs(argv) {
     } else if (arg === "--skip-live-verify") {
       args.skipLiveVerify = true;
       args.flags.add(arg);
+    } else if (arg === "--skip-runtime-postflight") {
+      args.skipRuntimePostflight = true;
+      args.flags.add(arg);
     } else if (arg === "--report") {
       args.reportPath = readOption(argv, ++index, arg);
       args.flags.add(arg);
@@ -194,6 +198,7 @@ export function usage() {
       "--report PATH": `default: ${defaultReportPath}`,
       "--write-report": "Write the full report to --report.",
       "--full-output": "Print the full report to stdout instead of the concise summary.",
+      "--skip-runtime-postflight": "Skip the M3/durable runtime postflight while still applying DEV and verifying 16666/16667 health.",
       "--skip-live-verify": "test-only escape hatch; do not use for DEV acceptance"
     }
   };
@@ -2718,23 +2723,27 @@ export async function runDevCdApply(argv, io = {}) {
         timeoutMs: 20 * 60 * 1000,
         reportPath: "reports/dev-gate/dev-deploy-report.json"
       },
-      {
-        id: "runtime-durable-postflight",
-        phase: "verifying",
-        command: process.execPath,
-        args: [
-          "scripts/dev-runtime-postflight.mjs",
-          "--live",
-          "--confirm-dev",
-          "--confirmed-non-production",
-          "--target",
-          "api",
-          "--write-report",
-          "--fail-on-blocked"
-        ],
-        timeoutMs: 2 * 60 * 1000,
-        reportPath: runtimePostflightReportPath
-      }
+      ...(
+        args.skipRuntimePostflight
+          ? []
+          : [{
+            id: "runtime-durable-postflight",
+            phase: "verifying",
+            command: process.execPath,
+            args: [
+              "scripts/dev-runtime-postflight.mjs",
+              "--live",
+              "--confirm-dev",
+              "--confirmed-non-production",
+              "--target",
+              "api",
+              "--write-report",
+              "--fail-on-blocked"
+            ],
+            timeoutMs: 2 * 60 * 1000,
+            reportPath: runtimePostflightReportPath
+          }]
+      )
     ];
 
     if (blockers.length === 0) {
diff --git a/scripts/src/dev-cd-apply.test.mjs b/scripts/src/dev-cd-apply.test.mjs
index 7f44a0dc..def3519a 100644
--- a/scripts/src/dev-cd-apply.test.mjs
+++ b/scripts/src/dev-cd-apply.test.mjs
@@ -1313,6 +1313,41 @@ test("transaction runs phases, allows internal side-effect env, releases lock, a
   assert.equal(writtenReport.devCdApply.liveVerify.summary.checked, 2);
 });
 
+test("transaction can skip runtime postflight while preserving publish apply and live verify", async () => {
+  const repoRoot = await makeRepo();
+  const commandLog = [];
+  let output = "";
+  const code = await runDevCdApply([
+    "--apply",
+    "--confirm-dev",
+    "--confirmed-non-production",
+    "--owner-task-id",
+    "task-skip-postflight",
+    "--kubeconfig",
+    "/etc/rancher/k3s/k3s.yaml",
+    "--write-report",
+    "--full-output",
+    "--skip-runtime-postflight"
+  ], {
+    repoRoot,
+    env: {},
+    runCommand: makeRunCommand({ commandLog }),
+    httpGetJson: makeHttpGetJson(),
+    now: () => new Date(iso(100000)),
+    stdout: { write: (chunk) => { output += chunk; } }
+  });
+
+  const report = JSON.parse(output);
+  assert.equal(code, 0);
+  assert.equal(report.status, "pass");
+  assert.equal(report.devCdApply.steps.some((step) => step.id === "artifact-publish"), true);
+  assert.equal(report.devCdApply.steps.some((step) => step.id === "dev-deploy-apply"), true);
+  assert.equal(report.devCdApply.steps.some((step) => step.id === "runtime-durable-postflight"), false);
+  assert.equal(commandLog.some((entry) => entry.args.includes("scripts/dev-runtime-postflight.mjs")), false);
+  assert.equal(report.devCdApply.liveVerify.status, "pass");
+  assert.equal(report.devCdApply.liveVerify.summary.checked, 2);
+});
+
 test("transaction blocks with structured runtime postflight blocker when M3 evidence is not persisted", async () => {
   const repoRoot = await makeRepo();
   const commandLog = [];