@empiricalrun/test-run 0.15.0 → 0.16.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @empiricalrun/test-run
 
+## 0.16.1
+
+### Patch Changes
+
+- Updated dependencies [3a315aa]
+  - @empiricalrun/reporter@0.28.1
+
+## 0.16.0
+
+### Minor Changes
+
+- ab403b8: fix: move json report location to avoid accidental agent commits
+
 ## 0.15.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/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,7 +5,7 @@ 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";

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;AAcjB,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,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"}

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.startCancellationWatcher = 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,7 +31,12 @@ 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; } });
@@ -40,11 +45,9 @@ Object.defineProperty(exports, "filterArrayByGlobMatchersSet", { enumerable: tru
 Object.defineProperty(exports, "generateProjectFilters", { enumerable: true, get: function () { return utils_1.generateProjectFilters; } });
 Object.defineProperty(exports, "generateProjectFiltersV2", { enumerable: true, get: function () { return utils_1.generateProjectFiltersV2; } });
 function getSummaryJsonPath(repoDir) {
-    const pathForPlaywright147 = path_1.default.join(repoDir, "playwright-report", "summary.json");
-    const pathForOtherPlaywrightVersions = path_1.default.join(repoDir, "summary.json");
-    return fs_1.default.existsSync(pathForPlaywright147)
-        ? pathForPlaywright147
-        : pathForOtherPlaywrightVersions;
+    const newPath = path_1.default.join(repoDir, "playwright-report", "summary.json");
+    const legacyPath = path_1.default.join(repoDir, "summary.json");
+    return fs_1.default.existsSync(newPath) ? newPath : legacyPath;
 }
 async function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, stdout, stderr, }) {
     const testDir = "tests";

package/dist/lib/cmd.js

@@ -122,9 +122,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/html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/html.ts"],"names":[],"mappings":"AAaA,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAgIf"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/html.ts"],"names":[],"mappings":"AAaA,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAsIf"}

package/dist/lib/merge-reports/html.js

@@ -24,7 +24,11 @@ async function patchMergedHtmlReport(htmlFilePath, summaryJsonFilePath) {
             // Ensure attachment.name includes a file extension so that
             // Playwright's downloadFileNameForAttachment() uses it as-is
             // instead of parsing the (now URL) path for an extension.
-            if (attachment.path && !attachment.name.includes(".")) {
+            // Exception: keep "trace" as-is because the HTML reporter checks
+            // `attachment.name === 'trace'` to show the "View Trace" button.
+            if (attachment.path &&
+                attachment.name !== "trace" &&
+                !attachment.name.includes(".")) {
                 const ext = attachment.path.match(/\.[^/.]+$/)?.[0];
                 if (ext) {
                     return { ...attachment, name: attachment.name + ext };

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,CA2B/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,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"}

package/dist/lib/merge-reports/index.js

@@ -75,7 +75,7 @@ async function runPlaywrightMergeReports(options) {
             envOverrides: {
                 PLAYWRIGHT_HTML_OPEN: "never",
                 PLAYWRIGHT_HTML_OUTPUT_DIR: outputDir,
-                PLAYWRIGHT_JSON_OUTPUT_NAME: path_1.default.join(cwd, "summary.json"),
+                PLAYWRIGHT_JSON_OUTPUT_NAME: path_1.default.join(cwd, "playwright-report", "summary.json"),
             },
             captureOutput: false,
             throwOnError: true,
@@ -116,7 +116,7 @@ async function uploadMergedReports(cwd, outputDir, uploadOptions) {
     const { projectName, runId, baseUrl, uploadBucket, credentials } = uploadOptions;
     const destinationDir = path_1.default.join(projectName, runId);
     const htmlFilePath = path_1.default.join(outputDir, "index.html");
-    const jsonFilePath = path_1.default.join(cwd, "summary.json");
+    const jsonFilePath = path_1.default.join(outputDir, "summary.json");
     if (fs_1.default.existsSync(htmlFilePath)) {
         logger_1.logger.debug(`[Merge Reports] Uploading HTML report`);
         const task = (0, r2_uploader_1.createUploadTask)({
@@ -132,7 +132,7 @@ async function uploadMergedReports(cwd, outputDir, uploadOptions) {
     if (fs_1.default.existsSync(jsonFilePath)) {
         logger_1.logger.debug(`[Merge Reports] Uploading summary.json`);
         const task = (0, r2_uploader_1.createUploadTask)({
-            sourceDir: cwd,
+            sourceDir: outputDir,
             fileList: [jsonFilePath],
             destinationDir,
             uploadBucket,
@@ -193,7 +193,7 @@ async function mergeReports(options) {
             return { success: false };
         }
         const htmlFilePath = path_1.default.join(outputDir, "index.html");
-        const jsonFilePath = path_1.default.join(cwd, "summary.json");
+        const jsonFilePath = path_1.default.join(outputDir, "summary.json");
         // Patch summary.json first (replaces local paths with URLs),
         // then patch the HTML report (reads the patched summary.json to build an attachment map).
         await (0, json_1.patchSummaryJson)(jsonFilePath, urlMappings);

package/dist/lib/run-specific-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-specific-test.d.ts","sourceRoot":"","sources":["../../src/lib/run-specific-test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAYlD,wBAAsB,mBAAmB,CAAC,EACxC,KAAU,EACV,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,OAAO,GACR,EAAE;IACD,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,YAAY,CAAC,CAsFxB"}
+{"version":3,"file":"run-specific-test.d.ts","sourceRoot":"","sources":["../../src/lib/run-specific-test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAIlD,wBAAsB,mBAAmB,CAAC,EACxC,KAAU,EACV,QAAQ,EACR,eAAe,EACf,YAAY,EACZ,OAAO,GACR,EAAE;IACD,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,YAAY,CAAC,CAkFxB"}

package/dist/lib/run-specific-test.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runSpecificTestsCmd = runSpecificTestsCmd;
-const path_1 = __importDefault(require("path"));
+const failed_test_list_1 = require("../failed-test-list");
 const utils_1 = require("../utils");
 const run_all_tests_1 = require("./run-all-tests");
 async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, envOverrides, repoDir, }) {
@@ -16,6 +13,7 @@ async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, envO
     for (const testCase of tests) {
         // TODO: Why do we have this getAllFilePaths call?
         // TODO: Can we remove `dir` from the test case entity?
+        // TODO: After 1.57 is present in all repo, replace grep with --test-list
         const files = await (0, utils_1.getAllFilePaths)(testCase.dir, repoDir, {
             filePath: testCase.filePath,
         });
@@ -43,24 +41,17 @@ async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, envO
         else {
             filesToRun.push(matchingFilePath);
         }
-        const { testCaseNode } = await (0, utils_1.getTestCaseNode)({
-            filePath: matchingFilePath,
-            scenarioName: testCase.name,
-            suites: testCase.suites,
-            repoDir,
-        });
-        const isFileMarkedSerial = await (0, utils_1.hasTopLevelDescribeConfigureWithSerialMode)(path_1.default.join(repoDir, matchingFilePath));
-        if (!isFileMarkedSerial && testCaseNode) {
-            const parentDescribe = (0, utils_1.findFirstSerialDescribeBlock)(testCaseNode);
-            if (!parentDescribe) {
-                patternsToGrep.push(testCase.name);
-            }
-            else {
-                const parentDescribeName = (0, utils_1.getDescribeBlockName)(parentDescribe);
-                if (parentDescribeName) {
-                    patternsToGrep.push(parentDescribeName);
-                }
-            }
+        const serialInfo = await (0, failed_test_list_1.getSerialBlockInfo)({
+            file: matchingFilePath,
+            title: testCase.name,
+            suites: testCase.suites ?? [],
+            projectName: "",
+        }, repoDir, false);
+        if (!serialInfo) {
+            patternsToGrep.push(testCase.name);
+        }
+        else if (!serialInfo.isFileSerial && serialInfo.serialDescribeName) {
+            patternsToGrep.push(serialInfo.serialDescribeName);
         }
     }
     const teardownLabels = await (0, utils_1.labelTeardownProjects)(projects, repoDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-run",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -37,7 +37,7 @@
     "minimatch": "^10.0.1",
     "ts-morph": "^23.0.0",
     "@empiricalrun/r2-uploader": "^0.9.1",
-    "@empiricalrun/reporter": "^0.28.0"
+    "@empiricalrun/reporter": "^0.28.1"
   },
   "devDependencies": {
     "@playwright/test": "1.57.0",

package/test-data/expand-serial-fixture/playwright.config.ts

@@ -0,0 +1,6 @@
+import { defineConfig } from "@playwright/test";
+
+export default defineConfig({
+  testDir: ".",
+  projects: [{ name: "chromium" }],
+});

package/test-data/expand-serial-fixture/serial.spec.ts

@@ -0,0 +1,17 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("Serial Tests", () => {
+  test.describe.configure({ mode: "serial" });
+
+  test("Test 1 should pass", async () => {
+    expect(true).toBe(true);
+  });
+
+  test("Test 2 should pass", async () => {
+    expect(1 + 1).toBe(2);
+  });
+
+  test("Test 3 should fail", async () => {
+    expect(true).toBe(true);
+  });
+});

package/vitest.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["src/**/*.test.ts"],
+  },
+});