CI: narrow release-check hardening diff

hxy91819 · Copilot · hxy91819 · commit 4f96fb09f751 · 2026-04-25T21:58:06.000+08:00
Co-authored-by: Copilot &lt;223556219+Copilot@users.noreply.github.com&gt;
diff --git a/.github/workflows/openclaw-cross-os-release-checks-reusable.yml b/.github/workflows/openclaw-cross-os-release-checks-reusable.yml
@@ -430,35 +430,37 @@ jobs:
           OPENCLAW_DISCORD_SMOKE_BOT_TOKEN: ${{ secrets.OPENCLAW_DISCORD_SMOKE_BOT_TOKEN }}
           OPENCLAW_DISCORD_SMOKE_GUILD_ID: ${{ secrets.OPENCLAW_DISCORD_SMOKE_GUILD_ID }}
           OPENCLAW_DISCORD_SMOKE_CHANNEL_ID: ${{ secrets.OPENCLAW_DISCORD_SMOKE_CHANNEL_ID }}
-          CANDIDATE_FILE_NAME: ${{ needs.prepare.outputs.candidate_file_name }}
+          OPENCLAW_RELEASE_CHECK_OS: ${{ matrix.os_id }}
+          OPENCLAW_RELEASE_CHECK_RUNNER: ${{ matrix.runner }}
+          CANDIDATE_TGZ: ${{ runner.temp }}/openclaw-cross-os-release-checks/candidate/${{ needs.prepare.outputs.candidate_file_name }}
           CANDIDATE_VERSION: ${{ needs.prepare.outputs.candidate_version }}
           SOURCE_SHA: ${{ needs.prepare.outputs.source_sha }}
           BASELINE_SPEC: ${{ needs.prepare.outputs.baseline_spec }}
           PREVIOUS_VERSION: ${{ inputs.previous_version }}
-          BASELINE_FILE_NAME: ${{ needs.prepare.outputs.baseline_file_name }}
+          BASELINE_TGZ: ${{ runner.temp }}/openclaw-cross-os-release-checks/baseline/${{ needs.prepare.outputs.baseline_file_name }}
           PROVIDER: ${{ inputs.provider }}
-          RELEASE_SUITE: ${{ matrix.suite }}
-          TARGET_REF: ${{ inputs.ref }}
-          ARTIFACT_NAME: ${{ matrix.artifact_name }}
-          OPENCLAW_RELEASE_CHECK_OS: ${{ matrix.os_id }}
-          OPENCLAW_RELEASE_CHECK_RUNNER: ${{ matrix.runner }}
+          MODE: ${{ matrix.lane }}
+          SUITE: ${{ matrix.suite }}
+          REF: ${{ inputs.ref }}
+          OUTPUT_DIR: ${{ runner.temp }}/openclaw-cross-os-release-checks/${{ matrix.artifact_name }}-${{ matrix.suite }}
         run: |
           DISCORD_ARGS=()
           if [[ -n "${OPENCLAW_DISCORD_SMOKE_BOT_TOKEN}" ]] && [[ -n "${OPENCLAW_DISCORD_SMOKE_GUILD_ID}" ]] && [[ -n "${OPENCLAW_DISCORD_SMOKE_CHANNEL_ID}" ]]; then
             DISCORD_ARGS+=(--run-discord-roundtrip true)
           fi
           pnpm dlx "tsx@${TSX_VERSION}" workflow/scripts/openclaw-cross-os-release-checks.ts \
-            --candidate-tgz "$RUNNER_TEMP/openclaw-cross-os-release-checks/candidate/${CANDIDATE_FILE_NAME}" \
+            --candidate-tgz "${CANDIDATE_TGZ}" \
             --candidate-version "${CANDIDATE_VERSION}" \
             --source-sha "${SOURCE_SHA}" \
             --baseline-spec "${BASELINE_SPEC}" \
             --previous-version "${PREVIOUS_VERSION}" \
-            --baseline-tgz "$RUNNER_TEMP/openclaw-cross-os-release-checks/baseline/${BASELINE_FILE_NAME}" \
+            --baseline-tgz "${BASELINE_TGZ}" \
             --provider "${PROVIDER}" \
-            --suite "${RELEASE_SUITE}" \
-            --ref "${TARGET_REF}" \
+            --mode "${MODE}" \
+            --suite "${SUITE}" \
+            --ref "${REF}" \
             "${DISCORD_ARGS[@]}" \
-            --output-dir "$RUNNER_TEMP/openclaw-cross-os-release-checks/${ARTIFACT_NAME}-${RELEASE_SUITE}"
+            --output-dir "${OUTPUT_DIR}"
 
       - name: Summarize release checks
         if: always()
diff --git a/scripts/openclaw-cross-os-release-checks.ts b/scripts/openclaw-cross-os-release-checks.ts
@@ -53,10 +53,6 @@ const providerConfig = {
 };
 
 const PACKAGE_DIST_INVENTORY_RELATIVE_PATH = "dist/postinstall-inventory.json";
-const PACKAGED_QA_RUNTIME_PATHS = new Set([
-  "dist/extensions/qa-channel/runtime-api.js",
-  "dist/extensions/qa-lab/runtime-api.js",
-]);
 const OMITTED_QA_EXTENSION_PREFIXES = [
   "dist/extensions/qa-channel/",
   "dist/extensions/qa-lab/",
@@ -186,11 +182,13 @@ export function resolveRunnerMatrix(params) {
   ];
   return {
     include: runners.flatMap((runner) =>
-      suites.map((suite) => ({
-        ...runner,
-        suite,
-        suite_label: formatSuiteLabel(suite),
-      })),
+      suites.map((suite) =>
+        Object.assign({}, runner, {
+          suite,
+          suite_label: formatSuiteLabel(suite),
+          lane: suite.includes(`upgrade`) || suite === `dev-update` ? `upgrade` : `fresh`,
+        }),
+      ),
     ),
   };
 }
@@ -508,7 +506,7 @@ function isPackagedDistPath(relativePath) {
     return false;
   }
   if (OMITTED_QA_EXTENSION_PREFIXES.some((prefix) => relativePath.startsWith(prefix))) {
-    return PACKAGED_QA_RUNTIME_PATHS.has(relativePath);
+    return false;
   }
   return true;
 }
@@ -1790,8 +1788,7 @@ async function runInstalledAgentTurn(params) {
     logPath: params.logPath,
     timeoutMs: 10 * 60 * 1000,
   });
-  const payloadTexts = parseAgentPayloadTexts(result.stdout);
-  if (!payloadTexts.some((text) => text.trim() === "OK")) {
+  if (!agentOutputHasExpectedOkMarker(result.stdout, { logPath: params.logPath })) {
     throw new Error("Agent output did not contain the expected OK marker.");
   }
   return result;
@@ -2439,27 +2436,57 @@ async function runAgentTurn(params) {
     logPath: params.logPath,
     timeoutMs: 10 * 60 * 1000,
   });
-  const payloadTexts = parseAgentPayloadTexts(result.stdout);
-  if (!payloadTexts.some((text) => text.trim() === "OK")) {
+  if (!agentOutputHasExpectedOkMarker(result.stdout, { logPath: params.logPath })) {
     throw new Error("Agent output did not contain the expected OK marker.");
   }
   return result;
 }
 
+export function agentOutputHasExpectedOkMarker(stdout, options = {}) {
+  const payloadTexts = parseAgentPayloadTexts(stdout);
+  if (payloadTexts.some((text) => text.trim() === "OK")) {
+    return true;
+  }
+  if (typeof options.logPath !== "string") {
+    return false;
+  }
+  try {
+    const logTexts = parseAgentPayloadTexts(readFileSync(options.logPath, "utf8"));
+    return logTexts.some((text) => text.trim() === "OK");
+  } catch {
+    return false;
+  }
+}
+
 function parseAgentPayloadTexts(stdout) {
   try {
     const payload = JSON.parse(stdout);
+    const directTexts = [
+      payload?.finalAssistantVisibleText,
+      payload?.finalAssistantRawText,
+      payload?.meta?.finalAssistantVisibleText,
+      payload?.meta?.finalAssistantRawText,
+      payload?.result?.finalAssistantVisibleText,
+      payload?.result?.finalAssistantRawText,
+      payload?.result?.meta?.finalAssistantVisibleText,
+      payload?.result?.meta?.finalAssistantRawText,
+    ].filter((text): text is string => typeof text === "string");
     const entries = Array.isArray(payload?.payloads)
       ? payload.payloads
       : Array.isArray(payload?.result?.payloads)
         ? payload.result.payloads
         : [];
-    if (!Array.isArray(entries)) {
-      return [];
-    }
-    return entries.flatMap((entry) => (typeof entry?.text === "string" ? [entry.text] : []));
+    const payloadTexts = Array.isArray(entries)
+      ? entries.flatMap((entry) => (typeof entry?.text === "string" ? [entry.text] : []))
+      : [];
+    return [...directTexts, ...payloadTexts];
   } catch {
-    return stdout.trim() ? [stdout] : [];
+    const finalTextMatches = [
+      ...stdout.matchAll(
+        /"(?:finalAssistantVisibleText|finalAssistantRawText|text)"\s*:\s*"([^"]*)"/gu,
+      ),
+    ].map((match) => match[1]);
+    return finalTextMatches.length > 0 ? finalTextMatches : stdout.trim() ? [stdout] : [];
   }
 }
 
diff --git a/test/scripts/openclaw-cross-os-release-checks.test.ts b/test/scripts/openclaw-cross-os-release-checks.test.ts
@@ -2,8 +2,10 @@ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { createServer as createNetServer } from "node:net";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
 import { describe, expect, it } from "vitest";
 import {
+  agentOutputHasExpectedOkMarker,
   buildWindowsDevUpdateToolchainCheckScript,
   buildWindowsFreshShellVersionCheckScript,
   buildWindowsPathBootstrapScript,
@@ -37,6 +39,27 @@ import {
 } from "../../scripts/openclaw-cross-os-release-checks.ts";
 
 describe("scripts/openclaw-cross-os-release-checks", () => {
+  it("accepts OK agent output from the captured log when stdout is empty", () => {
+    const dir = mkdtempSync(join(tmpdir(), "openclaw-cross-os-agent-output-"));
+    try {
+      const logPath = join(dir, "agent.log");
+      writeFileSync(
+        logPath,
+        [
+          "2026-04-24T15:00:00.000Z command stdout",
+          JSON.stringify({
+            finalAssistantVisibleText: "OK",
+            payloads: [{ type: "text", text: "OK" }],
+          }),
+        ].join("\n"),
+      );
+
+      expect(agentOutputHasExpectedOkMarker("", { logPath })).toBe(true);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
+
   it("treats explicit empty-string args as values instead of boolean flags", () => {
     expect(parseArgs(["--ubuntu-runner", "", "--mode", "both"])).toEqual({
       "ubuntu-runner": "",
@@ -122,12 +145,14 @@ describe("scripts/openclaw-cross-os-release-checks", () => {
         os_id: "windows",
         runner: "blacksmith-32vcpu-windows-2025",
         suite: "dev-update",
+        lane: "upgrade",
       }),
     );
     expect(matrix.include).toContainEqual(
       expect.objectContaining({
         os_id: "ubuntu",
         suite: "installer-fresh",
+        lane: "fresh",
       }),
     );
   });
@@ -295,7 +320,13 @@ describe("scripts/openclaw-cross-os-release-checks", () => {
     await new Promise((resolvePromise) => {
       server.close(resolvePromise);
     });
-    expect(await canConnectToLoopbackPort(port)).toBe(false);
+    for (let attempt = 0; attempt < 20; attempt += 1) {
+      if (!(await canConnectToLoopbackPort(port, 100))) {
+        return;
+      }
+      await delay(25);
+    }
+    expect(await canConnectToLoopbackPort(port, 100)).toBe(false);
   });
 
   it("writes Discord smoke config using the strict guild channel schema", () => {
