fix(ci): preserve compact whole-job timeout

obviyus · obviyus · commit d914e378e2b2 · 2026-07-11T19:58:16.000+05:30
diff --git a/docs/ci.md b/docs/ci.md
@@ -97,7 +97,7 @@ The slowest Node test families are split or balanced so each job stays small wit
 - Auto-reply runs as balanced workers, with the reply subtree split into agent-runner, commands, dispatch, session, and state-routing shards.
 - Agentic gateway/server (control-plane) configs split across chat, auth, model, HTTP/plugin, runtime, and startup lanes instead of waiting on built artifacts.
 - Normal CI packs only isolated infra include-pattern shards into deterministic bundles of at most 64 test files, reducing the Node matrix without merging non-isolated command/cron, stateful agents-core, or gateway/server suites. Heavy fixed suites stay on 8 vCPU while the bundled and lower-weight lanes use 4 vCPU.
-- Pull requests on the canonical repository use a compact admission plan: the same per-config groups run in isolated subprocesses, currently 19 Node test jobs instead of the 74-job full matrix. A single whole-config batch is spread across existing same-runner compact jobs, and the serial tooling config is striped across three PR-only groups; `main` pushes, manual dispatches, and release gates retain the full matrix.
+- Pull requests on the canonical repository use a compact admission plan: the same per-config groups run in isolated subprocesses, currently 19 Node test jobs instead of the 74-job full matrix. A single whole-config batch is spread across existing same-runner compact jobs while retaining its 120-minute timeout, and the serial tooling config is striped across three PR-only groups; `main` pushes, manual dispatches, and release gates retain the full matrix.
 - Broad browser, QA, media, and miscellaneous plugin tests use their dedicated Vitest configs instead of the shared plugin catch-all. Include-pattern shards record timing entries using the CI shard name, so `.artifacts/vitest-shard-timings.json` can distinguish a whole config from a filtered shard.
 - `check-additional-*` stripes the supplemental boundary guard list (`scripts/run-additional-boundary-checks.mjs`) into one prompt-heavy shard (`check-additional-boundaries-a`, which includes the Codex prompt snapshot drift check) and one combined shard for the remaining stripes (`check-additional-boundaries-bcd`), each running independent guards concurrently and printing per-check timings. Package-boundary compile/canary work stays together, and runtime topology architecture runs separately from the gateway watch coverage embedded in `build-artifacts`.
 - Gateway watch, channel tests, and the core support-boundary shard run concurrently inside `build-artifacts` after `dist/` and `dist-runtime/` are already built.
diff --git a/scripts/lib/ci-node-test-plan.mjs b/scripts/lib/ci-node-test-plan.mjs
@@ -1191,7 +1191,7 @@ function createCompactNodeTestShardBundles(options = {}) {
     const wholeGroups = sortedGroups.filter((candidate) => !candidate.includePatterns);
     const wholeJobCount = Math.ceil(wholeGroups.length / COMPACT_WHOLE_NODE_TEST_JOB_GROUPS);
     // A lone whole-config job serializes every fixed suite and owns PR wall time.
-    // Fold it into already-admitted same-runner jobs when their group caps allow it.
+    // Fold it into same-runner jobs when caps allow, retaining the whole-config timeout.
     const canSpreadWholeGroups =
       wholeJobCount === 1 &&
       bins.length > 1 &&
@@ -1205,7 +1205,9 @@ function createCompactNodeTestShardBundles(options = {}) {
       : createStripedBatches(wholeGroups, wholeJobCount);
     if (canSpreadWholeGroups) {
       for (const [index, group] of wholeGroups.entries()) {
-        bins[index % bins.length].groups.push(group);
+        const bin = bins[index % bins.length];
+        bin.groups.push(group);
+        bin.timeoutMinutes = COMPACT_WHOLE_NODE_TEST_TIMEOUT_MINUTES;
       }
     }
     for (const [index, groupBatch] of wholeGroupBatches.entries()) {
@@ -1230,6 +1232,7 @@ function createCompactNodeTestShardBundles(options = {}) {
         requiresDist: bin.groups[0].requiresDist,
         runner: bin.groups[0].runner,
         shardName: `compact-${runnerClass}-${index + 1}`,
+        ...(bin.timeoutMinutes ? { timeoutMinutes: bin.timeoutMinutes } : {}),
       });
     }
   }
diff --git a/test/scripts/ci-node-test-plan.test.ts b/test/scripts/ci-node-test-plan.test.ts
@@ -225,7 +225,7 @@ describe("scripts/lib/ci-node-test-plan.mjs", () => {
     ).toEqual({ OPENCLAW_VITEST_NO_OUTPUT_TIMEOUT_MS: "60000" });
     expect(
       compact
-        .filter((shard) => shard.checkName.includes("-whole-"))
+        .filter((shard) => shard.groups.some((group) => !group.includePatterns))
         .every((shard) => shard.timeoutMinutes === 120),
     ).toBe(true);
     const largeJobs = compact.filter((shard) =>
