@empiricalrun/test-run 0.16.0 → 0.17.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @empiricalrun/test-run
 
+## 0.17.0
+
+### Minor Changes
+
+- 6fb8170: feat: playwright utils upgraded to use new core
+
+### Patch Changes
+
+- Updated dependencies [6fb8170]
+  - @empiricalrun/reporter@0.29.0
+
+## 0.16.1
+
+### Patch Changes
+
+- Updated dependencies [3a315aa]
+  - @empiricalrun/reporter@0.28.1
+
 ## 0.16.0
 
 ### Minor Changes

package/dist/bin/commands/failed-list.js

@@ -23,7 +23,7 @@ function registerFailedListCommand(program) {
                 repoPath: options.repoPath,
                 verbose: options.verbose,
             });
-            console.log(`Found ${result.failedTests.length} failed tests`);
+            console.log(`Found ${result.testsToRun.length} failed tests`);
             console.log(`Test list written to: ${result.outputPath}`);
         }
         catch (error) {

package/dist/bin/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAezC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,QAsLlD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/bin/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,QAiLlD"}

package/dist/bin/commands/run.js

@@ -50,10 +50,6 @@ function registerRunCommand(program) {
             ...options.project,
         ];
         const pwOptions = command.args.filter((arg) => !optionsToStrip.includes(arg));
-        const projectName = process.env.PROJECT_NAME || (await (0, utils_1.pickNameFromPackageJson)());
-        if (!projectName) {
-            throw new Error("Project name is required");
-        }
         const directory = options.dir || "tests";
         const suites = options.suites && options.suites.trim() !== ""
             ? options.suites?.split(",")
@@ -70,16 +66,13 @@ function registerRunCommand(program) {
                 ]
                 : undefined);
         const environmentSlug = process.env.TEST_RUN_ENVIRONMENT || "";
-        const useEnvFilePrecedence = process.env.ENV_FILE_PRECEDENCE === "true";
         const envOverrides = {};
-        if (!useEnvFilePrecedence) {
-            const environmentVariables = await (0, dashboard_1.fetchEnvironmentVariables)();
-            environmentVariables.forEach((envVar) => {
-                envOverrides[envVar.name] = envVar.value;
-            });
-            if (Object.keys(envOverrides).length > 0) {
-                console.log(`Loaded environment variables: ${Object.keys(envOverrides).join(", ")}`);
-            }
+        const environmentVariables = await (0, dashboard_1.fetchEnvironmentVariables)();
+        environmentVariables.forEach((envVar) => {
+            envOverrides[envVar.name] = envVar.value;
+        });
+        if (Object.keys(envOverrides).length > 0) {
+            console.log(`Loaded environment variables: ${Object.keys(envOverrides).join(", ")}`);
         }
         if (environmentSlug) {
             (0, env_files_1.writeEnvFiles)({
@@ -100,7 +93,7 @@ function registerRunCommand(program) {
         let environmentIgnore = [];
         try {
             if (environmentSlug) {
-                const environment = await (0, dashboard_1.fetchEnvironment)(projectName, environmentSlug);
+                const environment = await (0, dashboard_1.fetchEnvironment)(environmentSlug);
                 if (environment.playwright_projects_match &&
                     environment.playwright_projects_match.length > 0) {
                     environmentMatch = environment.playwright_projects_match;
@@ -124,6 +117,11 @@ function registerRunCommand(program) {
             if (options.skipTeardown) {
                 await (0, utils_1.handleTeardownSkipFlag)(directory, repoDir);
             }
+            const grepTags = process.env.GREP_TAGS
+                ? process.env.GREP_TAGS.split(",")
+                    .filter(Boolean)
+                    .map((tag) => (tag.startsWith("@") ? tag : `@${tag}`))
+                : [];
             const hasTestsFilter = tests && tests.length > 0;
             let commandToRun;
             if (hasTestsFilter) {
@@ -140,6 +138,7 @@ function registerRunCommand(program) {
                     projects: projectFilters,
                     passthroughArgs: pwOptions.join(" "),
                     envOverrides,
+                    patternsToGrep: grepTags.length > 0 ? grepTags : undefined,
                 });
             }
             const { hasTestPassed } = await (0, cmd_1.runTestsForCmd)(commandToRun, repoDir);

package/dist/bin/index.js

@@ -6,10 +6,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const dotenv_1 = __importDefault(require("dotenv"));
-const estimate_time_shard_1 = require("./commands/estimate-time-shard");
 const failed_list_1 = require("./commands/failed-list");
 const merge_1 = require("./commands/merge");
-const optimize_shards_1 = require("./commands/optimize-shards");
 const run_1 = require("./commands/run");
 dotenv_1.default.config({
     path: [".env.local", ".env"],
@@ -21,6 +19,4 @@ commander_1.program
 (0, run_1.registerRunCommand)(commander_1.program);
 (0, merge_1.registerMergeCommand)(commander_1.program);
 (0, failed_list_1.registerFailedListCommand)(commander_1.program);
-(0, estimate_time_shard_1.registerEstimateTimeShardCommand)(commander_1.program);
-(0, optimize_shards_1.registerOptimizeShardsCommand)(commander_1.program);
 commander_1.program.parse(process.argv);

package/dist/dashboard.d.ts

@@ -7,6 +7,6 @@ export type EnvironmentVariable = {
     created_at: string;
     updated_at: string;
 };
-export declare const fetchEnvironment: (projectName: string, environmentSlug: string) => Promise<Environment>;
+export declare const fetchEnvironment: (environmentSlug: string) => Promise<Environment>;
 export declare const fetchEnvironmentVariables: () => Promise<EnvironmentVariable[]>;
 //# sourceMappingURL=dashboard.d.ts.map

package/dist/dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../src/dashboard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGtC,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAIF,eAAO,MAAM,gBAAgB,GAC3B,aAAa,MAAM,EACnB,iBAAiB,MAAM,KACtB,OAAO,CAAC,WAAW,CAyDrB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAa,OAAO,CACxD,mBAAmB,EAAE,CAkDtB,CAAC"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../src/dashboard.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAIF,eAAO,MAAM,gBAAgB,GAC3B,iBAAiB,MAAM,KACtB,OAAO,CAAC,WAAW,CAwDrB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAa,OAAO,CACxD,mBAAmB,EAAE,CAkDtB,CAAC"}

package/dist/dashboard.js

@@ -5,16 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchEnvironmentVariables = exports.fetchEnvironment = void 0;
 const async_retry_1 = __importDefault(require("async-retry"));
-const utils_1 = require("./utils");
 const DOMAIN = process.env.DASHBOARD_DOMAIN || "https://dash.empirical.run";
-const fetchEnvironment = async (projectName, environmentSlug) => {
-    const projectRepo = (0, utils_1.buildRepoName)(projectName);
+const fetchEnvironment = async (environmentSlug) => {
     const data = await (0, async_retry_1.default)(async (bail) => {
         if (!process.env.EMPIRICALRUN_API_KEY) {
             console.error("No API token found. Skipping fetch environment from dashboard.");
             return;
         }
-        const resp = await fetch(`${DOMAIN}/api/environments/list?project_repo_name=${projectRepo}&environment_slug=${environmentSlug}&is_disabled=false`, {
+        const resp = await fetch(`${DOMAIN}/api/environments/list?environment_slug=${environmentSlug}&is_disabled=false`, {
             method: "GET",
             headers: {
                 "Content-Type": "application/json",
@@ -27,7 +25,7 @@ const fetchEnvironment = async (projectName, environmentSlug) => {
                 bail(new Error(erroredResponse?.error?.message));
                 return;
             }
-            throw new Error(`Failed to fetch environment from dashboard for project: ${projectRepo} and env slug: ${environmentSlug}`);
+            throw new Error(`Failed to fetch environment from dashboard for env slug: ${environmentSlug}`);
         }
         return (await resp.json());
     }, {
@@ -38,7 +36,7 @@ const fetchEnvironment = async (projectName, environmentSlug) => {
     });
     const environment = data?.data?.environments?.find((env) => env.slug === environmentSlug);
     if (!environment) {
-        throw new Error(`Failed to fetch environment from dashboard for project: ${projectRepo} and env slug: ${environmentSlug}.`);
+        throw new Error(`Failed to fetch environment from dashboard for env slug: ${environmentSlug}.`);
     }
     return environment;
 };

package/dist/failed-test-list.d.ts

@@ -1,9 +1,28 @@
-export interface FailedTest {
+/**
+ * Normalize a test line for comparison between manifest and ran tests.
+ * Strips `:line:col` suffixes from file paths.
+ *
+ * e.g. `[chromium] › foo/bar.spec.ts:4:5 › has title`
+ *    → `[chromium] › foo/bar.spec.ts › has title`
+ */
+export declare function normalizeTestLine(line: string): string;
+export declare function parseTestListLine(line: string): TestList | null;
+/**
+ * Runs `npx playwright test --list <file>` and returns all test lines for the file.
+ */
+export declare function getAllTestsForFile(file: string, repoPath: string): Promise<string[]>;
+export interface TestList {
     projectName: string;
     file: string;
     title: string;
     suites: string[];
 }
+export interface SerialBlockInfo {
+    file: string;
+    serialDescribeName: string | null;
+    isFileSerial: boolean;
+}
+export declare function getSerialBlockInfo(test: TestList, repoPath: string, verbose: boolean): Promise<SerialBlockInfo | null>;
 export interface BuildTestListOptions {
     outputPath?: string;
     verbose?: boolean;
@@ -11,9 +30,13 @@ export interface BuildTestListOptions {
     repoPath?: string;
 }
 export interface BuildTestListResult {
-    failedTests: FailedTest[];
+    testsToRun: TestList[];
     testListContent: string;
     outputPath: string;
 }
+export declare function buildTestList(testsToRun: TestList[], allTests: TestList[], options: BuildTestListOptions & {
+    verbose: boolean;
+}): Promise<BuildTestListResult>;
 export declare function buildTestListFromFailedTestRun(runId: string, options?: BuildTestListOptions): Promise<BuildTestListResult>;
+export declare function expandSerialDependencies(testListContent: string, outputPath: string, repoPath: string): Promise<string>;
 //# sourceMappingURL=failed-test-list.d.ts.map

package/dist/failed-test-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"failed-test-list.d.ts","sourceRoot":"","sources":["../src/failed-test-list.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAgPD,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAyG9B"}
+{"version":3,"file":"failed-test-list.d.ts","sourceRoot":"","sources":["../src/failed-test-list.ts"],"names":[],"mappings":"AAsBA;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAgB/D;AAID;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,EAAE,CAAC,CAsBnB;AAED,MAAM,WAAW,QAAQ;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAmED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,OAAO,CAAC;CACvB;AAoBD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CA+CjC;AA0FD,MAAM,WAAW,oBAAoB;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,QAAQ,EAAE,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AA0DD,wBAAsB,aAAa,CACjC,UAAU,EAAE,QAAQ,EAAE,EACtB,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,oBAAoB,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,GACnD,OAAO,CAAC,mBAAmB,CAAC,CA0D9B;AAED,wBAAsB,8BAA8B,CAClD,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAa9B;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAmCjB"}

package/dist/failed-test-list.js

@@ -3,13 +3,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeTestLine = normalizeTestLine;
+exports.parseTestListLine = parseTestListLine;
+exports.getAllTestsForFile = getAllTestsForFile;
+exports.getSerialBlockInfo = getSerialBlockInfo;
+exports.buildTestList = buildTestList;
 exports.buildTestListFromFailedTestRun = buildTestListFromFailedTestRun;
+exports.expandSerialDependencies = expandSerialDependencies;
+const node_child_process_1 = require("node:child_process");
+const node_util_1 = require("node:util");
 const reporter_1 = require("@empiricalrun/reporter");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
 const DOMAIN = process.env.DASHBOARD_DOMAIN || "https://dash.empirical.run";
 const SUITES_DELIMITER = " › ";
+/**
+ * Normalize a test line for comparison between manifest and ran tests.
+ * Strips `:line:col` suffixes from file paths.
+ *
+ * e.g. `[chromium] › foo/bar.spec.ts:4:5 › has title`
+ *    → `[chromium] › foo/bar.spec.ts › has title`
+ */
+function normalizeTestLine(line) {
+    return line.replace(/(\.spec\.ts|\.test\.ts|\.ts|\.js):\d+:\d+/g, "$1");
+}
+function parseTestListLine(line) {
+    const trimmed = normalizeTestLine(line.trim());
+    if (!trimmed || trimmed.startsWith("#"))
+        return null;
+    const match = trimmed.match(/^\[(.*?)\]\s*[›>]\s*(.*)/);
+    if (!match?.[1] || !match[2])
+        return null;
+    const projectName = match[1];
+    const parts = match[2].split(/\s*[›>]\s*/);
+    if (parts.length < 2)
+        return null;
+    const file = parts[0].trim();
+    const suites = parts.slice(1, -1);
+    const title = parts[parts.length - 1].trim();
+    return { projectName, file, suites, title };
+}
+const execFileAsync = (0, node_util_1.promisify)(node_child_process_1.execFile);
+/**
+ * Runs `npx playwright test --list <file>` and returns all test lines for the file.
+ */
+async function getAllTestsForFile(file, repoPath) {
+    try {
+        const playwrightCli = path_1.default.join(repoPath, "node_modules", "@playwright", "test", "cli.js");
+        const { stdout } = await execFileAsync("node", [playwrightCli, "test", "--list", file], { cwd: repoPath });
+        return stdout
+            .split("\n")
+            .map((line) => line.trim())
+            .filter((line) => line.includes(" › "));
+    }
+    catch (error) {
+        console.error(`Failed to list tests for file: ${file}`, error);
+        throw error;
+    }
+}
 async function fetchTestRun(runId, options) {
     if (!process.env.EMPIRICALRUN_API_KEY) {
         throw new Error("EMPIRICALRUN_API_KEY environment variable is required");
@@ -45,8 +97,12 @@ function getFailedTests(specs) {
     const failedTests = [];
     for (const spec of specs) {
         for (const test of spec.tests) {
-            const status = (0, reporter_1.deriveTestStatus)(test.results);
-            if (status === "fail") {
+            const retries = test.results.map((r) => ({
+                status: r.status ?? "unknown",
+                expectedStatus: test.expectedStatus,
+            }));
+            const status = (0, reporter_1.getTestStatusFromRetries)(retries);
+            if (status === "failed") {
                 const suites = spec.nesting.slice(1, -1);
                 failedTests.push({
                     projectName: test.projectName,
@@ -141,17 +197,12 @@ function isTestInSerialBlock(test, serialBlock) {
     }
     return false;
 }
-function generateTestListContent(failedTests, allTests, serialBlocks = []) {
-    const lines = [
-        `# Failed tests from test run`,
-        `# Generated: ${new Date().toISOString()}`,
-        `# Total failed tests: ${failedTests.length}`,
-        "",
-    ];
+function generateTestListContent(testsToRun, allTests, serialBlocks = []) {
+    const lines = [];
     const addedEntries = new Set();
     for (const serialBlock of serialBlocks) {
         const projectNames = [
-            ...new Set(failedTests
+            ...new Set(testsToRun
                 .filter((t) => t.file === serialBlock.file)
                 .map((t) => t.projectName)),
         ];
@@ -166,7 +217,7 @@ function generateTestListContent(failedTests, allTests, serialBlocks = []) {
             }
         }
     }
-    for (const test of failedTests) {
+    for (const test of testsToRun) {
         const isInSerialBlock = serialBlocks.some((s) => s.file === test.file);
         if (!isInSerialBlock) {
             const line = formatTestListLine(test);
@@ -178,8 +229,8 @@ function generateTestListContent(failedTests, allTests, serialBlocks = []) {
     }
     return lines.join("\n");
 }
-async function buildTestListFromFailedTestRun(runId, options = {}) {
-    const verbose = options.verbose ?? false;
+async function fetchFailedTestList(runId, options) {
+    const { verbose } = options;
     const testRunResponse = await fetchTestRun(runId, {
         verbose,
         repoName: options.repoName,
@@ -214,12 +265,16 @@ async function buildTestListFromFailedTestRun(runId, options = {}) {
     if (verbose) {
         console.log(`Found ${failedTests.length} failed tests, ${allTests.length} total tests`);
     }
+    return { failedTests, allTests };
+}
+async function buildTestList(testsToRun, allTests, options) {
+    const { verbose } = options;
     const serialBlocks = [];
     if (options.repoPath) {
         if (verbose) {
             console.log(`Checking for serial blocks in repo: ${options.repoPath}`);
         }
-        for (const test of failedTests) {
+        for (const test of testsToRun) {
             try {
                 const serialInfo = await getSerialBlockInfo(test, options.repoPath, verbose);
                 if (serialInfo) {
@@ -241,16 +296,59 @@ async function buildTestListFromFailedTestRun(runId, options = {}) {
             console.log(`Found ${serialBlocks.length} serial blocks to expand`);
         }
     }
-    const testListContent = generateTestListContent(failedTests, allTests, serialBlocks);
-    const outputPath = options.outputPath || path_1.default.join(process.cwd(), `failed-tests-${runId}.txt`);
+    const testListContent = generateTestListContent(testsToRun, allTests, serialBlocks);
+    const outputPath = options.outputPath || path_1.default.join(process.cwd(), "failed-tests.txt");
     const outputDir = path_1.default.dirname(outputPath);
     if (!fs_1.default.existsSync(outputDir)) {
         fs_1.default.mkdirSync(outputDir, { recursive: true });
     }
     fs_1.default.writeFileSync(outputPath, testListContent, "utf-8");
     return {
-        failedTests,
+        testsToRun,
         testListContent,
         outputPath,
     };
 }
+async function buildTestListFromFailedTestRun(runId, options = {}) {
+    const verbose = options.verbose ?? false;
+    const { failedTests, allTests } = await fetchFailedTestList(runId, {
+        verbose,
+        repoName: options.repoName,
+    });
+    return buildTestList(failedTests, allTests, {
+        ...options,
+        verbose,
+        outputPath: options.outputPath ||
+            path_1.default.join(process.cwd(), `failed-tests-${runId}.txt`),
+    });
+}
+async function expandSerialDependencies(testListContent, outputPath, repoPath) {
+    const lines = testListContent.split("\n");
+    const testsToRun = [];
+    for (const line of lines) {
+        const parsed = parseTestListLine(line);
+        if (parsed)
+            testsToRun.push(parsed);
+    }
+    if (testsToRun.length === 0) {
+        console.log("testListContent could not be parsed. Returning original tests");
+        fs_1.default.writeFileSync(outputPath, testListContent, "utf-8");
+        return testListContent;
+    }
+    const uniqueFiles = [...new Set(testsToRun.map((t) => t.file))];
+    const allTests = [];
+    for (const file of uniqueFiles) {
+        const allLines = await getAllTestsForFile(file, repoPath);
+        for (const line of allLines) {
+            const parsed = parseTestListLine(line);
+            if (parsed)
+                allTests.push(parsed);
+        }
+    }
+    const result = await buildTestList(testsToRun, allTests, {
+        repoPath,
+        outputPath,
+        verbose: false,
+    });
+    return result.testListContent;
+}

package/dist/index.d.ts

@@ -5,9 +5,8 @@ import { parseTestListOutput } from "./stdout-parser";
 import { TestCase } from "./types";
 import { getProjectsFromPlaywrightConfig } from "./utils/config";
 export { getProjectsFromPlaywrightConfig, parseTestListOutput, runSpecificTestsCmd, spawnCmd, };
-export { type BuildTestListOptions, type BuildTestListResult, buildTestListFromFailedTestRun, type FailedTest, } from "./failed-test-list";
+export { type BuildTestListOptions, type BuildTestListResult, buildTestList, buildTestListFromFailedTestRun, expandSerialDependencies, getAllTestsForFile, normalizeTestLine, parseTestListLine, type TestList, } from "./failed-test-list";
 export * from "./glob-matcher";
-export { type CancellationWatcher, startCancellationWatcher, } from "./lib/cancellation-watcher";
 export { filterArrayByGlobMatchersSet, generateProjectFilters, generateProjectFiltersV2, } from "./utils";
 export declare function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, stdout, stderr, }: {
     testName: string;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,OAAO,EAAkB,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,8BAA8B,EAC9B,KAAK,UAAU,GAChB,MAAM,oBAAoB,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EACL,KAAK,mBAAmB,EACxB,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,SAAS,CAAC;AAQjB,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,MAAM,EACN,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAmBD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CAAC,CAeD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,OAAO,EAAkB,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,aAAa,EACb,8BAA8B,EAC9B,wBAAwB,EACxB,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,KAAK,QAAQ,GACd,MAAM,oBAAoB,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,SAAS,CAAC;AAQjB,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,MAAM,EACN,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAmBD;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACnE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CAAC,CAeD"}

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProjectFiltersV2 = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.startCancellationWatcher = exports.buildTestListFromFailedTestRun = exports.spawnCmd = exports.runSpecificTestsCmd = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
+exports.generateProjectFiltersV2 = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.parseTestListLine = exports.normalizeTestLine = exports.getAllTestsForFile = exports.expandSerialDependencies = exports.buildTestListFromFailedTestRun = exports.buildTestList = exports.spawnCmd = exports.runSpecificTestsCmd = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
 exports.runSingleTest = runSingleTest;
 exports.listProjectsAndTests = listProjectsAndTests;
 const fs_1 = __importDefault(require("fs"));
@@ -31,10 +31,13 @@ Object.defineProperty(exports, "parseTestListOutput", { enumerable: true, get: f
 const config_1 = require("./utils/config");
 Object.defineProperty(exports, "getProjectsFromPlaywrightConfig", { enumerable: true, get: function () { return config_1.getProjectsFromPlaywrightConfig; } });
 var failed_test_list_1 = require("./failed-test-list");
+Object.defineProperty(exports, "buildTestList", { enumerable: true, get: function () { return failed_test_list_1.buildTestList; } });
 Object.defineProperty(exports, "buildTestListFromFailedTestRun", { enumerable: true, get: function () { return failed_test_list_1.buildTestListFromFailedTestRun; } });
+Object.defineProperty(exports, "expandSerialDependencies", { enumerable: true, get: function () { return failed_test_list_1.expandSerialDependencies; } });
+Object.defineProperty(exports, "getAllTestsForFile", { enumerable: true, get: function () { return failed_test_list_1.getAllTestsForFile; } });
+Object.defineProperty(exports, "normalizeTestLine", { enumerable: true, get: function () { return failed_test_list_1.normalizeTestLine; } });
+Object.defineProperty(exports, "parseTestListLine", { enumerable: true, get: function () { return failed_test_list_1.parseTestListLine; } });
 __exportStar(require("./glob-matcher"), exports);
-var cancellation_watcher_1 = require("./lib/cancellation-watcher");
-Object.defineProperty(exports, "startCancellationWatcher", { enumerable: true, get: function () { return cancellation_watcher_1.startCancellationWatcher; } });
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "filterArrayByGlobMatchersSet", { enumerable: true, get: function () { return utils_1.filterArrayByGlobMatchersSet; } });
 Object.defineProperty(exports, "generateProjectFilters", { enumerable: true, get: function () { return utils_1.generateProjectFilters; } });

package/dist/lib/cmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/lib/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,eAAe,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAMxC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAeA;AAED,wBAAsB,cAAc,CAClC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,YAAY,EACpC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC;;;GAqEF;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CACxC,GACA,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiD5C"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/lib/cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,eAAe,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAeA;AAED,wBAAsB,cAAc,CAClC,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,YAAY,EACpC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE;IACR,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;CAChC;;;GAqBF;AAED,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IACP,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC/B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;CACxC,GACA,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAiD5C"}

package/dist/lib/cmd.js

@@ -5,7 +5,6 @@ exports.runTestsForCmd = runTestsForCmd;
 exports.spawnCmd = spawnCmd;
 const child_process_1 = require("child_process");
 const logger_1 = require("../logger");
-const cancellation_watcher_1 = require("./cancellation-watcher");
 function getCommandFromString(command) {
     const regex = /[^\s"']+|"([^"]*)"|'([^']*)'/g;
     const matches = command.match(regex) || [];
@@ -22,37 +21,8 @@ function getCommandFromString(command) {
 }
 async function runTestsForCmd({ command, args, env }, cwd, options) {
     logger_1.logger.debug(`Running cmd: ${command} with args: ${args}`);
-    const testRunId = process.env.TEST_RUN_GITHUB_ACTION_ID;
-    const apiKey = process.env.EMPIRICALRUN_API_KEY;
-    console.log(`[CancellationWatcher] Environment: TEST_RUN_GITHUB_ACTION_ID=${testRunId}, EMPIRICALRUN_API_KEY=${apiKey ? "***" : "undefined"}`);
     let hasTestPassed = true;
     let wasCancelled = false;
-    let cancellationWatcher;
-    let childProcess;
-    const cancelHandler = () => {
-        wasCancelled = true;
-        console.log(`[CancellationWatcher] Cancel handler invoked, killing child process (pid: ${childProcess?.pid})`);
-        if (childProcess && !childProcess.killed) {
-            // Use SIGTERM for more forceful termination that propagates to child processes
-            childProcess.kill("SIGTERM");
-            // Also try to kill the process group to ensure Playwright workers are stopped
-            if (childProcess.pid) {
-                try {
-                    process.kill(-childProcess.pid, "SIGTERM");
-                    console.log(`[CancellationWatcher] Sent SIGTERM to process group ${childProcess.pid}`);
-                }
-                catch {
-                    // Process group kill may fail if not a group leader
-                }
-            }
-        }
-    };
-    if (testRunId && apiKey) {
-        cancellationWatcher = (0, cancellation_watcher_1.startCancellationWatcher)(testRunId, apiKey, cancelHandler);
-    }
-    else {
-        console.log("[CancellationWatcher] Not starting watcher - missing testRunId or apiKey");
-    }
     try {
         await spawnCmd(command, args, {
             cwd,
@@ -61,17 +31,11 @@ async function runTestsForCmd({ command, args, env }, cwd, options) {
             throwOnError: true,
             stdout: options?.stdout,
             stderr: options?.stderr,
-            onSpawn: (proc) => {
-                childProcess = proc;
-            },
         });
     }
     catch {
         hasTestPassed = false;
     }
-    finally {
-        cancellationWatcher?.stop();
-    }
     return { hasTestPassed, wasCancelled };
 }
 async function spawnCmd(command, args, options) {
@@ -122,9 +86,16 @@ async function spawnCmd(command, args, options) {
 function setupProcessSignalHandlers(proc) {
     const handleSignal = async (signal) => {
         logger_1.logger.debug(`\nReceived ${signal}, gracefully shutting down...`);
-        if (proc && !proc.killed) {
-            // Forward the signal to the child process
-            proc.kill(signal);
+        if (proc && !proc.killed && proc.pid) {
+            // Forward the signal to the entire process group so all children
+            // (including Playwright workers and reporters) receive it
+            try {
+                process.kill(-proc.pid, signal);
+            }
+            catch {
+                // Process group may have already exited
+                proc.kill(signal);
+            }
             // Wait for the child process to exit
             await new Promise((resolve) => {
                 proc.once("exit", () => {

package/dist/lib/merge-reports/index.d.ts

@@ -6,7 +6,10 @@ export declare function runPlaywrightMergeReports(options: MergeReportsOptions):
     success: boolean;
 }>;
 export declare function extractUrlMappingsFromBlobs(blobDir: string): Promise<Record<string, string>>;
-export declare function uploadMergedReports(cwd: string, outputDir: string, uploadOptions: UploadOptions): Promise<void>;
+export declare function uploadMergedReports({ outputDir, uploadOptions, }: {
+    outputDir: string;
+    uploadOptions: UploadOptions;
+}): Promise<void>;
 export declare function mergeReports(options: {
     blobDir?: string;
     cwd?: string;

package/dist/lib/merge-reports/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0DlE,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA+B/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoCjC;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC,CAsDf;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA+EhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0DlE,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAsC/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoCjC;AAED,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,aAAa,GACd,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAgFhC"}