@empiricalrun/test-run 0.11.1 → 0.12.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @empiricalrun/test-run
 
+## 0.12.0
+
+### Minor Changes
+
+- 79a4e0f: feat: add blob reporters for sharding
+
+### Patch Changes
+
+- Updated dependencies [79a4e0f]
+  - @empiricalrun/r2-uploader@0.6.0
+
 ## 0.11.1
 
 ### Patch Changes

package/dist/bin/merge-reports.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=merge-reports.d.ts.map

package/dist/bin/merge-reports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-reports.d.ts","sourceRoot":"","sources":["../../src/bin/merge-reports.ts"],"names":[],"mappings":""}

package/dist/bin/merge-reports.js

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = require("commander");
+const dotenv_1 = __importDefault(require("dotenv"));
+const merge_reports_1 = require("../lib/merge-reports");
+dotenv_1.default.config({
+    path: [".env.local", ".env"],
+});
+(async function main() {
+    commander_1.program
+        .option("-b, --blob-dir <blob-dir>", "Path to the blob-report directory")
+        .option("-c, --cwd <cwd>", "Working directory")
+        .parse(process.argv);
+    const options = commander_1.program.opts();
+    const { success } = await (0, merge_reports_1.mergeReports)({
+        blobDir: options.blobDir,
+        cwd: options.cwd,
+    });
+    if (!success) {
+        process.exit(1);
+    }
+})();

package/dist/index.d.ts

@@ -1,18 +1,21 @@
 import { JSONReport as PlaywrightJSONReport } from "@playwright/test/reporter";
 import { spawnCmd } from "./lib/cmd";
 import { runSpecificTestsCmd } from "./lib/run-specific-test";
+import { parseTestListOutput } from "./stdout-parser";
 import { Platform, TestCase } from "./types";
 import { getProjectsFromPlaywrightConfig } from "./utils/config";
-export { getProjectsFromPlaywrightConfig, Platform, runSpecificTestsCmd, spawnCmd, };
+export { getProjectsFromPlaywrightConfig, parseTestListOutput, Platform, runSpecificTestsCmd, spawnCmd, };
 export * from "./glob-matcher";
 export { filterArrayByGlobMatchersSet, generateProjectFilters } from "./utils";
-export declare function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, }: {
+export declare function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, stdout, stderr, }: {
     testName: string;
     suites: string[];
     filePath: string;
     projects: string[];
     envOverrides?: Record<string, string>;
     repoDir: string;
+    stdout?: NodeJS.WritableStream;
+    stderr?: NodeJS.WritableStream;
 }): Promise<{
     hasTestPassed: boolean;
     summaryJson: PlaywrightJSONReport;

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;AAE9D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAMjE,OAAO,EACL,+BAA+B,EAC/B,QAAQ,EACR,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAc/E,wBAAsB,aAAa,CAAC,EAClC,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,GACR,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;CACjB,GAAG,OAAO,CAAC;IACV,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,oBAAoB,CAAC;CACnC,CAAC,CAiBD;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,CAaD"}
+{"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,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,gBAAgB,CAAC;AAMjE,OAAO,EACL,+BAA+B,EAC/B,mBAAmB,EACnB,QAAQ,EACR,mBAAmB,EACnB,QAAQ,GACT,CAAC;AACF,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAc/E,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,CAoBD;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.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.spawnCmd = exports.runSpecificTestsCmd = exports.Platform = exports.getProjectsFromPlaywrightConfig = void 0;
+exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.spawnCmd = exports.runSpecificTestsCmd = exports.Platform = exports.parseTestListOutput = exports.getProjectsFromPlaywrightConfig = void 0;
 exports.runSingleTest = runSingleTest;
 exports.listProjectsAndTests = listProjectsAndTests;
 const fs_1 = __importDefault(require("fs"));
@@ -26,7 +26,8 @@ const cmd_1 = require("./lib/cmd");
 Object.defineProperty(exports, "spawnCmd", { enumerable: true, get: function () { return cmd_1.spawnCmd; } });
 const run_specific_test_1 = require("./lib/run-specific-test");
 Object.defineProperty(exports, "runSpecificTestsCmd", { enumerable: true, get: function () { return run_specific_test_1.runSpecificTestsCmd; } });
-const parser_1 = require("./parser");
+const stdout_parser_1 = require("./stdout-parser");
+Object.defineProperty(exports, "parseTestListOutput", { enumerable: true, get: function () { return stdout_parser_1.parseTestListOutput; } });
 const types_1 = require("./types");
 Object.defineProperty(exports, "Platform", { enumerable: true, get: function () { return types_1.Platform; } });
 const utils_1 = require("./utils");
@@ -46,7 +47,7 @@ function getSummaryJsonPath(repoDir) {
         ? pathForPlaywright147
         : pathForOtherPlaywrightVersions;
 }
-async function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, }) {
+async function runSingleTest({ testName, suites, filePath, projects, envOverrides, repoDir, stdout, stderr, }) {
     const testDir = "tests";
     const commandToRun = await (0, run_specific_test_1.runSpecificTestsCmd)({
         tests: [{ name: testName, dir: testDir, filePath, suites }],
@@ -55,7 +56,10 @@ async function runSingleTest({ testName, suites, filePath, projects, envOverride
         platform: supportedPlatform,
         repoDir,
     });
-    const { hasTestPassed } = await (0, cmd_1.runTestsForCmd)(commandToRun, repoDir);
+    const { hasTestPassed } = await (0, cmd_1.runTestsForCmd)(commandToRun, repoDir, {
+        stdout,
+        stderr,
+    });
     const jsonFilePath = getSummaryJsonPath(repoDir);
     const jsonFileContents = fs_1.default.readFileSync(jsonFilePath, "utf8");
     const summaryJson = JSON.parse(jsonFileContents);
@@ -69,12 +73,14 @@ async function listProjectsAndTests(repoDir) {
     const args = [testRunner, "test", "--list"];
     const { output, code } = await (0, cmd_1.spawnCmd)("npx", args, {
         cwd: repoDir,
-        envOverrides: {},
+        envOverrides: {
+            NODE_PATH: path_1.default.join(repoDir, "node_modules"),
+        },
         captureOutput: true,
         throwOnError: true,
     });
     if (!output) {
         throw new Error(`Failed to run list command; exit code: ${code}`);
     }
-    return (0, parser_1.parseTestListOutput)(output);
+    return (0, stdout_parser_1.parseTestListOutput)(output);
 }

package/dist/lib/cmd.d.ts

@@ -3,7 +3,10 @@ export declare function getCommandFromString(command: string): {
     command: string;
     args: string[];
 };
-export declare function runTestsForCmd({ command, args, env }: CommandToRun, cwd: string): Promise<{
+export declare function runTestsForCmd({ command, args, env }: CommandToRun, cwd: string, options?: {
+    stdout?: NodeJS.WritableStream;
+    stderr?: NodeJS.WritableStream;
+}): Promise<{
     hasTestPassed: boolean;
 }>;
 export declare function spawnCmd(command: string, args: string[], options: {
@@ -11,6 +14,8 @@ export declare function spawnCmd(command: string, args: string[], options: {
     envOverrides: Record<string, string>;
     captureOutput: boolean;
     throwOnError: boolean;
+    stdout?: NodeJS.WritableStream;
+    stderr?: NodeJS.WritableStream;
 }): Promise<{
     code: number;
     output?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/lib/cmd.ts"],"names":[],"mappings":"AAGA,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;;GAeZ;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;CACvB,GACA,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA6C5C"}
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/lib/cmd.ts"],"names":[],"mappings":"AAGA,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;;GAiBF;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;CAChC,GACA,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CA+C5C"}

package/dist/lib/cmd.js

@@ -19,7 +19,7 @@ function getCommandFromString(command) {
         }),
     };
 }
-async function runTestsForCmd({ command, args, env }, cwd) {
+async function runTestsForCmd({ command, args, env }, cwd, options) {
     logger_1.logger.debug(`Running cmd: ${command} with args: ${args}`);
     let hasTestPassed = true;
     try {
@@ -28,6 +28,8 @@ async function runTestsForCmd({ command, args, env }, cwd) {
             envOverrides: env,
             captureOutput: false,
             throwOnError: true,
+            stdout: options?.stdout,
+            stderr: options?.stderr,
         });
     }
     catch {
@@ -53,7 +55,8 @@ async function spawnCmd(command, args, options) {
                 output += log;
             }
             else {
-                process.stdout.write(log);
+                const stdout = options.stdout || process.stdout;
+                stdout.write(log);
             }
             if (log.includes("Error")) {
                 errorLogs.push(log);
@@ -61,7 +64,8 @@ async function spawnCmd(command, args, options) {
         });
         p.stderr.on("data", (x) => {
             const log = x.toString();
-            process.stderr.write(log);
+            const stderr = options.stderr || process.stderr;
+            stderr.write(log);
             errorLogs.push(log);
         });
         p.on("exit", (code) => {

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

@@ -0,0 +1,26 @@
+interface MergeReportsOptions {
+    blobDir: string;
+    outputDir: string;
+    cwd: string;
+}
+interface UploadOptions {
+    projectName: string;
+    runId: string;
+    baseUrl: string;
+    uploadBucket: string;
+}
+export declare function runPlaywrightMergeReports(options: MergeReportsOptions): Promise<{
+    success: boolean;
+}>;
+export declare function extractUrlMappingsFromBlobs(blobDir: string): Record<string, string>;
+export declare function patchMergedHtmlReport(htmlFilePath: string, urlMappings: Record<string, string>): Promise<void>;
+export declare function patchSummaryJson(jsonFilePath: string, urlMappings: Record<string, string>): Promise<void>;
+export declare function uploadMergedReports(cwd: string, outputDir: string, uploadOptions: UploadOptions): Promise<void>;
+export declare function mergeReports(options: {
+    blobDir?: string;
+    cwd?: string;
+}): Promise<{
+    success: boolean;
+}>;
+export {};
+//# sourceMappingURL=merge-reports.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"merge-reports.d.ts","sourceRoot":"","sources":["../../src/lib/merge-reports.ts"],"names":[],"mappings":"AAYA,UAAU,mBAAmB;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,UAAU,aAAa;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA2B/B;AAED,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA4BxB;AAED,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAqFf;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAClC,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,IAAI,CAAC,CAkDf;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,CAuDhC"}

package/dist/lib/merge-reports.js

@@ -0,0 +1,231 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runPlaywrightMergeReports = runPlaywrightMergeReports;
+exports.extractUrlMappingsFromBlobs = extractUrlMappingsFromBlobs;
+exports.patchMergedHtmlReport = patchMergedHtmlReport;
+exports.patchSummaryJson = patchSummaryJson;
+exports.uploadMergedReports = uploadMergedReports;
+exports.mergeReports = mergeReports;
+const r2_uploader_1 = require("@empiricalrun/r2-uploader");
+const adm_zip_1 = __importDefault(require("adm-zip"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const logger_1 = require("../logger");
+const cmd_1 = require("./cmd");
+async function runPlaywrightMergeReports(options) {
+    const { blobDir, outputDir, cwd } = options;
+    logger_1.logger.debug(`[Merge Reports] Running playwright merge-reports`);
+    logger_1.logger.debug(`[Merge Reports] Blob dir: ${blobDir}`);
+    logger_1.logger.debug(`[Merge Reports] Output dir: ${outputDir}`);
+    try {
+        await (0, cmd_1.spawnCmd)("npx", ["playwright", "merge-reports", blobDir, "--reporter", "html,json"], {
+            cwd,
+            envOverrides: {
+                PLAYWRIGHT_HTML_OPEN: "never",
+                PLAYWRIGHT_HTML_OUTPUT_DIR: outputDir,
+                PLAYWRIGHT_JSON_OUTPUT_NAME: path_1.default.join(cwd, "summary.json"),
+            },
+            captureOutput: false,
+            throwOnError: true,
+        });
+        return { success: true };
+    }
+    catch (error) {
+        logger_1.logger.error(`[Merge Reports] Failed to merge reports:`, error);
+        return { success: false };
+    }
+}
+function extractUrlMappingsFromBlobs(blobDir) {
+    const combinedMap = {};
+    const files = fs_1.default.readdirSync(blobDir);
+    for (const fileName of files.filter((f) => f.endsWith(".zip"))) {
+        const zipPath = path_1.default.join(blobDir, fileName);
+        try {
+            const zip = new adm_zip_1.default(zipPath);
+            const urlsEntry = zip.getEntry("_empirical_urls.json");
+            if (urlsEntry) {
+                const content = JSON.parse(urlsEntry.getData().toString("utf8"));
+                Object.assign(combinedMap, content);
+                logger_1.logger.debug(`[Merge Reports] Extracted ${Object.keys(content).length} URL mappings from ${fileName}`);
+            }
+        }
+        catch (error) {
+            logger_1.logger.error(`[Merge Reports] Failed to extract URL mappings from ${fileName}:`, error);
+        }
+    }
+    logger_1.logger.info(`[Merge Reports] Total URL mappings: ${Object.keys(combinedMap).length}`);
+    return combinedMap;
+}
+async function patchMergedHtmlReport(htmlFilePath, urlMappings) {
+    if (Object.keys(urlMappings).length === 0) {
+        logger_1.logger.debug(`[Merge Reports] No URL mappings to apply`);
+        return;
+    }
+    let htmlContent;
+    try {
+        htmlContent = await fs_1.default.promises.readFile(htmlFilePath, "utf8");
+    }
+    catch (error) {
+        logger_1.logger.error(`[Merge Reports] Failed to read HTML file:`, error);
+        return;
+    }
+    const oldFormatMatch = htmlContent.match(/window\.playwrightReportBase64\s*=\s*"(?:data:application\/zip;base64,)?([^"]+)"/);
+    const newFormatMatch = htmlContent.match(/<script\s+id="playwrightReportBase64"[^>]*>(?:data:application\/zip;base64,)?([^<]+)<\/script>/);
+    const base64 = oldFormatMatch?.[1] || newFormatMatch?.[1];
+    if (!base64) {
+        logger_1.logger.error(`[Merge Reports] Base64 zip data not found in HTML`);
+        return;
+    }
+    const htmlDir = path_1.default.dirname(path_1.default.resolve(htmlFilePath));
+    const tempDir = fs_1.default.mkdtempSync(path_1.default.join(htmlDir, "merge-patch-"));
+    const zipPath = path_1.default.join(tempDir, "archive.zip");
+    try {
+        await fs_1.default.promises.writeFile(zipPath, Buffer.from(base64, "base64"));
+        const zip = new adm_zip_1.default(zipPath);
+        zip.extractAllTo(tempDir, true);
+        await fs_1.default.promises.unlink(zipPath);
+        const jsonFiles = (await fs_1.default.promises.readdir(tempDir)).filter((f) => f.endsWith(".json"));
+        for (const file of jsonFiles) {
+            const filePath = path_1.default.join(tempDir, file);
+            const content = await fs_1.default.promises.readFile(filePath, "utf8");
+            let modified = content;
+            for (const [resourcePath, url] of Object.entries(urlMappings)) {
+                const resourceFileName = resourcePath.replace(/^resources\//, "");
+                const regex = new RegExp(`[^"]*${resourceFileName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
+                modified = modified.replace(regex, url);
+            }
+            if (modified !== content) {
+                await fs_1.default.promises.writeFile(filePath, modified, "utf8");
+                logger_1.logger.debug(`[Merge Reports] Patched ${file}`);
+            }
+        }
+        const newZip = new adm_zip_1.default();
+        newZip.addLocalFolder(tempDir);
+        const newBase64 = newZip.toBuffer().toString("base64");
+        let updatedHtml;
+        if (oldFormatMatch) {
+            updatedHtml = htmlContent.replace(/(window\.playwrightReportBase64\s*=\s*")(?:data:application\/zip;base64,)?[^"]*(")/, `$1data:application/zip;base64,${newBase64}$2`);
+        }
+        else {
+            updatedHtml = htmlContent.replace(/(<script\s+id="playwrightReportBase64"[^>]*>)(?:data:application\/zip;base64,)?[^<]*(<\/script>)/, `$1data:application/zip;base64,${newBase64}$2`);
+        }
+        await fs_1.default.promises.writeFile(htmlFilePath, updatedHtml, "utf8");
+        logger_1.logger.info(`[Merge Reports] HTML file patched successfully`);
+    }
+    catch (error) {
+        logger_1.logger.error(`[Merge Reports] Failed to patch HTML:`, error);
+    }
+    finally {
+        await fs_1.default.promises.rm(tempDir, { recursive: true, force: true });
+    }
+}
+async function patchSummaryJson(jsonFilePath, urlMappings) {
+    if (Object.keys(urlMappings).length === 0) {
+        logger_1.logger.debug(`[Merge Reports] No URL mappings to apply to summary.json`);
+        return;
+    }
+    try {
+        let content = await fs_1.default.promises.readFile(jsonFilePath, "utf8");
+        for (const [resourcePath, url] of Object.entries(urlMappings)) {
+            const resourceFileName = resourcePath.replace(/^resources\//, "");
+            const regex = new RegExp(`[^"]*${resourceFileName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
+            content = content.replace(regex, url);
+        }
+        await fs_1.default.promises.writeFile(jsonFilePath, content, "utf8");
+        logger_1.logger.info(`[Merge Reports] summary.json patched successfully`);
+    }
+    catch (error) {
+        logger_1.logger.error(`[Merge Reports] Failed to patch summary.json:`, error);
+    }
+}
+async function uploadMergedReports(cwd, outputDir, uploadOptions) {
+    const { projectName, runId, baseUrl, uploadBucket } = 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");
+    if (fs_1.default.existsSync(htmlFilePath)) {
+        logger_1.logger.debug(`[Merge Reports] Uploading HTML report`);
+        const task = (0, r2_uploader_1.createUploadTask)({
+            sourceDir: outputDir,
+            fileList: [htmlFilePath],
+            destinationDir,
+            uploadBucket,
+            baseUrl,
+        });
+        void (0, r2_uploader_1.sendTaskToQueue)(task);
+    }
+    if (fs_1.default.existsSync(jsonFilePath)) {
+        logger_1.logger.debug(`[Merge Reports] Uploading summary.json`);
+        const task = (0, r2_uploader_1.createUploadTask)({
+            sourceDir: cwd,
+            fileList: [jsonFilePath],
+            destinationDir,
+            uploadBucket,
+            baseUrl,
+        });
+        void (0, r2_uploader_1.sendTaskToQueue)(task);
+    }
+    const traceDir = path_1.default.join(outputDir, "trace");
+    if (fs_1.default.existsSync(traceDir)) {
+        logger_1.logger.debug(`[Merge Reports] Uploading trace folder`);
+        const task = (0, r2_uploader_1.createUploadTask)({
+            sourceDir: traceDir,
+            destinationDir: path_1.default.join(destinationDir, "trace"),
+            uploadBucket,
+            baseUrl,
+        });
+        void (0, r2_uploader_1.sendTaskToQueue)(task);
+    }
+    await (0, r2_uploader_1.waitForTaskQueueToFinish)();
+    const reportUrl = `${baseUrl}/${destinationDir}/index.html`;
+    const jsonUrl = `${baseUrl}/${destinationDir}/summary.json`;
+    logger_1.logger.info(`[Merge Reports] All uploads completed`);
+    logger_1.logger.info(`[Merge Reports] HTML Report: ${reportUrl}`);
+    logger_1.logger.info(`[Merge Reports] Summary JSON: ${jsonUrl}`);
+}
+async function mergeReports(options) {
+    const cwd = options.cwd || process.cwd();
+    const blobDir = options.blobDir || path_1.default.join(cwd, "blob-report");
+    const outputDir = path_1.default.join(cwd, "playwright-report");
+    const projectName = process.env.PROJECT_NAME;
+    const runId = process.env.TEST_RUN_GITHUB_ACTION_ID;
+    if (!projectName || !runId) {
+        logger_1.logger.error(`[Merge Reports] PROJECT_NAME and TEST_RUN_GITHUB_ACTION_ID must be set`);
+        return { success: false };
+    }
+    if (!fs_1.default.existsSync(blobDir)) {
+        logger_1.logger.error(`[Merge Reports] Blob directory does not exist: ${blobDir}`);
+        return { success: false };
+    }
+    const urlMappings = extractUrlMappingsFromBlobs(blobDir);
+    const { success } = await runPlaywrightMergeReports({
+        blobDir,
+        outputDir,
+        cwd,
+    });
+    if (!success) {
+        return { success: false };
+    }
+    const htmlFilePath = path_1.default.join(outputDir, "index.html");
+    const jsonFilePath = path_1.default.join(cwd, "summary.json");
+    await patchMergedHtmlReport(htmlFilePath, urlMappings);
+    await patchSummaryJson(jsonFilePath, urlMappings);
+    const hasR2Creds = process.env.R2_ACCOUNT_ID &&
+        process.env.R2_ACCESS_KEY_ID &&
+        process.env.R2_SECRET_ACCESS_KEY;
+    if (hasR2Creds) {
+        await uploadMergedReports(cwd, outputDir, {
+            projectName,
+            runId,
+            baseUrl: "https://reports.empirical.run",
+            uploadBucket: "test-report",
+        });
+    }
+    else {
+        logger_1.logger.info(`[Merge Reports] R2 credentials not found, skipping upload`);
+    }
+    return { success: true };
+}

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,QAAQ,EAAE,MAAM,UAAU,CAAC;AAY5D,wBAAsB,mBAAmB,CAAC,EACxC,KAAU,EACV,QAAQ,EACR,eAAe,EACf,QAAQ,EACR,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,QAAQ,EAAE,QAAQ,CAAC;IACnB,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,CA0FxB"}
+{"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,QAAQ,EAAE,MAAM,UAAU,CAAC;AAY5D,wBAAsB,mBAAmB,CAAC,EACxC,KAAU,EACV,QAAQ,EACR,eAAe,EACf,QAAQ,EACR,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,QAAQ,EAAE,QAAQ,CAAC;IACnB,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,CA2FxB"}

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

@@ -33,7 +33,7 @@ async function runSpecificTestsCmd({ tests = [], projects, passthroughArgs, plat
             }
         }
         if (!matchingFilePath) {
-            const suitesPrefix = testCase.suites
+            const suitesPrefix = testCase.suites && testCase.suites.length > 0
                 ? `${testCase.suites.join(" > ")} > `
                 : "";
             const fullTestName = `${suitesPrefix}${testCase.name}`;

package/dist/stdout-parser/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/stdout-parser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG;IACnD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CA0CA"}

package/dist/utils/config.d.ts

@@ -1,4 +1,4 @@
-import { PlaywrightProject } from "@empiricalrun/shared-types";
+import { PlaywrightProject } from "@empiricalrun/shared-types/tool-results";
 import { Platform } from "../types";
 export declare function getProjectsFromPlaywrightConfig(platform: Platform, repoDir: string): Promise<PlaywrightProject[]>;
 //# sourceMappingURL=config.d.ts.map

package/dist/utils/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAK/D,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAyE9B"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAK5E,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAsB,+BAA+B,CACnD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAyE9B"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@empiricalrun/test-run",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "bin": {
-    "@empiricalrun/test-run": "dist/bin/index.js"
+    "@empiricalrun/test-run": "dist/bin/index.js",
+    "@empiricalrun/merge-reports": "dist/bin/merge-reports.js"
   },
   "main": "dist/index.js",
   "exports": {
@@ -25,26 +26,29 @@
   },
   "author": "Empirical Team <hey@empirical.run>",
   "dependencies": {
+    "adm-zip": "^0.5.16",
     "async-retry": "^1.3.3",
     "commander": "^12.1.0",
     "console-log-level": "^1.4.1",
     "dotenv": "^16.4.5",
     "minimatch": "^10.0.1",
-    "ts-morph": "^23.0.0"
+    "ts-morph": "^23.0.0",
+    "@empiricalrun/r2-uploader": "^0.6.0"
   },
   "devDependencies": {
+    "@playwright/test": "1.53.2",
+    "@types/adm-zip": "^0.5.7",
     "@types/async-retry": "^1.4.8",
     "@types/console-log-level": "^1.4.5",
     "@types/node": "^22.5.5",
-    "@playwright/test": "1.53.2",
     "memfs": "^4.17.1",
-    "@empiricalrun/shared-types": "0.10.1"
+    "@empiricalrun/shared-types": "0.12.0"
   },
   "scripts": {
     "dev": "tsc --build --watch",
     "build": "tsc --build",
     "clean": "tsc --build --clean",
-    "lint": "eslint .",
+    "lint": "biome check --unsafe",
     "test": "vitest run",
     "test:watch": "vitest"
   }

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/dashboard.ts","./src/glob-matcher.ts","./src/index.ts","./src/logger.ts","./src/bin/index.ts","./src/lib/cmd.ts","./src/lib/run-all-tests.ts","./src/lib/run-specific-test.ts","./src/lib/memfs/read-hello-world.ts","./src/parser/index.ts","./src/types/index.ts","./src/utils/config-parser.ts","./src/utils/config.ts","./src/utils/index.ts"],"version":"5.8.3"}
+{"root":["./src/dashboard.ts","./src/glob-matcher.ts","./src/index.ts","./src/logger.ts","./src/bin/index.ts","./src/bin/merge-reports.ts","./src/lib/cmd.ts","./src/lib/merge-reports.ts","./src/lib/run-all-tests.ts","./src/lib/run-specific-test.ts","./src/lib/memfs/read-hello-world.ts","./src/stdout-parser/index.ts","./src/types/index.ts","./src/utils/config-parser.ts","./src/utils/config.ts","./src/utils/index.ts"],"version":"5.8.3"}

package/dist/parser/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG;IACnD,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;CACjD,CA0CA"}

package/eslint.config.mjs

@@ -1,16 +0,0 @@
-import libraryConfig from "../eslint-config/library.mjs";
-import tsParser from "@typescript-eslint/parser";
-
-export default [
-  ...libraryConfig,
-  {
-    files: ["src/**/*.ts", "src/**/*.tsx"],
-    languageOptions: {
-      parser: tsParser,
-      parserOptions: {
-        project: "./tsconfig.lint.json",
-        tsconfigRootDir: import.meta.dirname,
-      },
-    },
-  },
-];