ci(release): pass vitest batch options before roots

steipete · steipete · commit 3b023e9bdb62 · 2026-05-26T07:50:52.000+01:00
diff --git a/scripts/lib/vitest-batch-runner.mjs b/scripts/lib/vitest-batch-runner.mjs
@@ -16,15 +16,7 @@ export async function runVitestBatch(params) {
       cwd: repoRoot,
       detached: shouldUseDetachedVitestProcessGroup(),
       env: params.env,
-      pnpmArgs: [
-        "exec",
-        "vitest",
-        "run",
-        "--config",
-        params.config,
-        ...params.targets,
-        ...params.args,
-      ],
+      pnpmArgs: buildVitestBatchPnpmArgs(params),
       stdio: "inherit",
     });
     const teardownChildCleanup = installVitestProcessGroupCleanup({ child });
@@ -44,6 +36,10 @@ export async function runVitestBatch(params) {
   });
 }
 
+export function buildVitestBatchPnpmArgs(params) {
+  return ["exec", "vitest", "run", "--config", params.config, ...params.args, ...params.targets];
+}
+
 export function isDirectScriptRun(metaUrl) {
   const entryHref = process.argv[1] ? pathToFileURL(path.resolve(process.argv[1])).href : "";
   return metaUrl === entryHref;
diff --git a/test/scripts/test-extension.test.ts b/test/scripts/test-extension.test.ts
@@ -13,6 +13,7 @@ import {
   resolveExtensionBatchPlan,
   resolveExtensionTestPlan,
 } from "../../scripts/lib/extension-test-plan.mjs";
+import { buildVitestBatchPnpmArgs } from "../../scripts/lib/vitest-batch-runner.mjs";
 import {
   parseExtensionIds,
   resolveExtensionBatchParallelism,
@@ -606,6 +607,25 @@ describe("scripts/test-extension.mjs", () => {
     });
   });
 
+  it("places Vitest passthrough options before batch target roots", () => {
+    expect(
+      buildVitestBatchPnpmArgs({
+        args: ["--exclude", "extensions/codex/src/app-server/run-attempt.test.ts"],
+        config: "test/vitest/vitest.extensions.config.ts",
+        targets: ["extensions/codex"],
+      }),
+    ).toEqual([
+      "exec",
+      "vitest",
+      "run",
+      "--config",
+      "test/vitest/vitest.extensions.config.ts",
+      "--exclude",
+      "extensions/codex/src/app-server/run-attempt.test.ts",
+      "extensions/codex",
+    ]);
+  });
+
   it("treats extensions without tests as a no-op by default", () => {
     const extensionId = findExtensionWithoutTests();
     const stdout = runScript([extensionId]);
