From 9919d86dbfc8cd6a17c2cc01a5f718f3907e2bfc Mon Sep 17 00:00:00 2001
From: Codex <codex@noreply.local>
Date: Fri, 5 Jun 2026 09:55:30 +0000
Subject: [PATCH] fix: align hwlab v02 rollout service list

---
 scripts/hwlab-g14-contract-test.ts |  7 ++++---
 scripts/src/hwlab-g14.ts           | 14 ++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/hwlab-g14-contract-test.ts b/scripts/hwlab-g14-contract-test.ts
index ecc1edca..3aef1e80 100644
--- a/scripts/hwlab-g14-contract-test.ts
+++ b/scripts/hwlab-g14-contract-test.ts
@@ -62,7 +62,7 @@ assertCondition(
   hwlabHelpUsage,
 );
 assertCondition(
-  hwlabHelpUsage.some((line) => line.includes("observability query --promql 'up{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1"))
+  hwlabHelpUsage.some((line) => line.includes("observability query --promql 'up{namespace=\"hwlab-v02\"}' --expect-count 5 --expect-value 1"))
     && hwlabHelpUsage.some((line) => line.includes("observability targets --lane v02"))
     && hwlabHelpUsage.some((line) => line.includes("observability boundary --lane v02"))
     && hwlabHelpUsage.some((line) => line.includes("observability closeout --lane v02")),
@@ -357,8 +357,9 @@ assertCondition(
 assertCondition(
   !v02PipelineServiceIds().includes("hwlab-cli")
     && !v02PipelineServiceIds().includes("hwlab-agent-mgr")
-    && !v02PipelineServiceIds().includes("hwlab-agent-worker"),
-  "v0.2 PipelineRun service matrix must exclude short-connection cli and removed HWLAB-owned code-agent control-plane services",
+    && !v02PipelineServiceIds().includes("hwlab-agent-worker")
+    && !v02PipelineServiceIds().includes("hwlab-device-pod"),
+  "v0.2 PipelineRun service matrix must exclude short-connection cli, removed HWLAB-owned code-agent control-plane services, and retired device-pod service",
   v02PipelineServiceIds(),
 );
 assertCondition(
diff --git a/scripts/src/hwlab-g14.ts b/scripts/src/hwlab-g14.ts
index 1532b8c4..bad0a6f2 100644
--- a/scripts/src/hwlab-g14.ts
+++ b/scripts/src/hwlab-g14.ts
@@ -53,7 +53,6 @@ const G14_PROMETHEUS_OPERATOR_RELEASE_ASSET = `https://github.com/prometheus-ope
 const V02_SERVICE_IDS = [
   "hwlab-cloud-api",
   "hwlab-cloud-web",
-  "hwlab-device-pod",
   "hwlab-gateway",
   "hwlab-edge-proxy",
   "hwlab-agent-skills",
@@ -65,7 +64,6 @@ const V02_OBSERVABILITY_SERVICE_IDS = [
   "hwlab-cloud-api",
   "hwlab-cloud-web",
   "hwlab-deepseek-proxy",
-  "hwlab-device-pod",
   "hwlab-edge-proxy",
 ];
 const V02_OBSERVABILITY_EXPECTED_TARGET_COUNT = V02_OBSERVABILITY_SERVICE_IDS.length;
@@ -5764,9 +5762,9 @@ function runG14ObservabilityCloseout(options: G14ObservabilityOptions): Record<s
         status: "bun scripts/cli.ts hwlab g14 observability status",
         targets: "bun scripts/cli.ts hwlab g14 observability targets --lane v02",
         boundary: "bun scripts/cli.ts hwlab g14 observability boundary --lane v02",
-        scrapeReachable: "bun scripts/cli.ts hwlab g14 observability query --promql 'up{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1",
-        sidecarServing: "bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_up{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1",
-        businessHealthProbe: "bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_health_probe_success{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1",
+        scrapeReachable: `bun scripts/cli.ts hwlab g14 observability query --promql 'up{namespace=\"hwlab-v02\"}' --expect-count ${V02_OBSERVABILITY_EXPECTED_TARGET_COUNT} --expect-value 1`,
+        sidecarServing: `bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_up{namespace=\"hwlab-v02\"}' --expect-count ${V02_OBSERVABILITY_EXPECTED_TARGET_COUNT} --expect-value 1`,
+        businessHealthProbe: `bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_health_probe_success{namespace=\"hwlab-v02\"}' --expect-count ${V02_OBSERVABILITY_EXPECTED_TARGET_COUNT} --expect-value 1`,
       },
     },
     degradedReason: ok ? undefined : "observability-closeout-failed",
@@ -7440,9 +7438,9 @@ export function hwlabG14Help(): Record<string, unknown> {
       "bun scripts/cli.ts hwlab g14 observability status",
       "bun scripts/cli.ts hwlab g14 observability apply --dry-run",
       "bun scripts/cli.ts hwlab g14 observability apply --confirm",
-      "bun scripts/cli.ts hwlab g14 observability query --promql 'up{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1",
-      "bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_up{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1",
-      "bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_health_probe_success{namespace=\"hwlab-v02\"}' --expect-count 6 --expect-value 1",
+      `bun scripts/cli.ts hwlab g14 observability query --promql 'up{namespace=\"hwlab-v02\"}' --expect-count ${V02_OBSERVABILITY_EXPECTED_TARGET_COUNT} --expect-value 1`,
+      `bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_up{namespace=\"hwlab-v02\"}' --expect-count ${V02_OBSERVABILITY_EXPECTED_TARGET_COUNT} --expect-value 1`,
+      `bun scripts/cli.ts hwlab g14 observability query --promql 'hwlab_service_health_probe_success{namespace=\"hwlab-v02\"}' --expect-count ${V02_OBSERVABILITY_EXPECTED_TARGET_COUNT} --expect-value 1`,
       "bun scripts/cli.ts hwlab g14 observability targets --lane v02",
       "bun scripts/cli.ts hwlab g14 observability boundary --lane v02",
       "bun scripts/cli.ts hwlab g14 observability closeout --lane v02",