@midscene/core 1.17.4 → 1.17.5

package/dist/lib/report.js

@@ -27,8 +27,10 @@ __webpack_require__.d(__webpack_exports__, {
     readReportArtifactManifestAsync: ()=>report_artifact_reader_js_namespaceObject.readReportArtifactManifestAsync,
     readReportDumpScripts: ()=>report_artifact_reader_js_namespaceObject.readReportDumpScripts,
     ReportMergingTool: ()=>ReportMergingTool,
+    ReportSession: ()=>report_session_js_namespaceObject.ReportSession,
     TestRunReportAssembler: ()=>TestRunReportAssembler,
     collectDedupedExecutions: ()=>collectDedupedExecutions,
+    exportReportArtifact: ()=>exportReportArtifact,
     splitReportHtmlByExecution: ()=>splitReportHtmlByExecution,
     streamReportDumpScripts: ()=>report_artifact_reader_js_namespaceObject.streamReportDumpScripts,
     isDirectoryModeReport: ()=>isDirectoryModeReport,
@@ -54,7 +56,9 @@ const report_artifact_reader_js_namespaceObject = require("./dump/report-artifac
 const screenshot_store_js_namespaceObject = require("./dump/screenshot-store.js");
 const execution_recorder_js_namespaceObject = require("./dump/execution-recorder.js");
 const report_artifact_store_js_namespaceObject = require("./dump/report-artifact-store.js");
-const test_report_images_js_namespaceObject = require("./dump/test-report-images.js");
+const report_session_js_namespaceObject = require("./dump/report-session.js");
+const report_artifact_publication_js_namespaceObject = require("./dump/report-artifact-publication.js");
+const report_artifact_writer_js_namespaceObject = require("./dump/report-artifact-writer.js");
 const external_report_stats_js_namespaceObject = require("./report-stats.js");
 const merge_report_js_namespaceObject = require("./test-runner/reporting/merge-report.js");
 const metrics_js_namespaceObject = require("./test-runner/reporting/metrics.js");
@@ -71,6 +75,64 @@ function _define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
+async function exportReportArtifact(options) {
+    validateTestRunReportFileName(options.reportFileName);
+    const input = external_node_path_namespaceObject.resolve(options.reportPath);
+    const output = external_node_path_namespaceObject.resolve(options.outputDir);
+    const external = 'html-and-external-assets' === options.outputFormat;
+    const artifact = external_node_path_namespaceObject.join(output, options.reportFileName);
+    const destination = external ? external_node_path_namespaceObject.join(artifact, 'index.html') : `${artifact}.html`;
+    if (input === destination || external && input.startsWith(`${artifact}${external_node_path_namespaceObject.sep}`)) throw new Error('Export destination must differ from the input report.');
+    if (!options.overwrite && (0, external_node_fs_namespaceObject.existsSync)(external ? artifact : destination)) throw new Error(`Report artifact already exists: ${artifact}`);
+    const manifest = (0, report_artifact_reader_js_namespaceObject.readReportArtifactManifest)(input);
+    const runner = (0, report_artifact_reader_js_namespaceObject.readReportRunnerDump)(input);
+    const groups = new Map();
+    for (const source of (0, report_artifact_reader_js_namespaceObject.readReportDumpScripts)(input)){
+        const attributes = Object.fromEntries([
+            ...source.openTag.matchAll(/([^\s=]+)="([^"]*)"/g)
+        ].filter(([, key])=>'type' !== key).map(([, key, value])=>[
+                key,
+                decodeURIComponent(value)
+            ]));
+        const id = attributes['data-group-id'];
+        if (!id) throw new Error('Report execution group is missing its ID.');
+        const dump = external_types_js_namespaceObject.ReportActionDump.fromSerializedString(manifest ? source.content : (0, utils_namespaceObject.antiEscapeScriptTag)(source.content));
+        const previous = groups.get(id);
+        dump.executions = dedupeExecutionsKeepLatest([
+            ...previous?.dump.executions ?? [],
+            ...dump.executions
+        ]);
+        groups.set(id, {
+            dump,
+            attributes
+        });
+    }
+    if (!groups.size && !runner) throw new Error('No report execution data was found in the input.');
+    const hint = [
+        ...groups.values()
+    ][0]?.attributes['data-report-kind'];
+    const kind = manifest?.kind ?? ('agent' === hint || 'test' === hint ? hint : runner ? 'test' : 'agent');
+    await promises_namespaceObject.mkdir(output, {
+        recursive: true
+    });
+    const temporary = await promises_namespaceObject.mkdtemp(external_node_path_namespaceObject.join(output, '.report-export-'));
+    const entry = external_node_path_namespaceObject.join(temporary, 'index.html');
+    try {
+        const writer = new report_artifact_writer_js_namespaceObject.ReportArtifactWriter(entry, external, kind, manifest?.reportId ?? runner?.runId);
+        await writer.initialize();
+        for (const [id, group] of groups)await writer.addGroup(id, group.dump.serialize(), input, group.attributes);
+        await writer.finish(runner, mergedAgentReportComment([
+            ...groups.values()
+        ].map((group)=>group.dump)));
+        await (0, report_artifact_publication_js_namespaceObject.publishReportArtifact)(external ? temporary : entry, external ? artifact : destination, external, options.overwrite);
+        return destination;
+    } finally{
+        await promises_namespaceObject.rm(temporary, {
+            recursive: true,
+            force: true
+        });
+    }
+}
 const screenshotModeAttrRegExp = new RegExp(`${html_utils_js_namespaceObject.DATA_SCREENSHOT_MODE_ATTR}="(inline|directory)"`);
 function readDeclaredScreenshotMode(reportFilePath) {
     let mode;
@@ -174,8 +236,8 @@ class ReportMergingTool {
     clear() {
         this.reportInfos = [];
     }
-    mergeDumpScripts(contents) {
-        const unescaped = contents.map((c)=>(0, utils_namespaceObject.antiEscapeScriptTag)(c)).filter((c)=>c.length > 0);
+    mergeDumpScripts(contents, external) {
+        const unescaped = contents.map((c)=>external ? c : (0, utils_namespaceObject.antiEscapeScriptTag)(c)).filter((c)=>c.length > 0);
         if (0 === unescaped.length) return '';
         if (1 === unescaped.length) return unescaped[0];
         const base = external_types_js_namespaceObject.ReportActionDump.fromSerializedString(unescaped[0]);
@@ -189,99 +251,67 @@ class ReportMergingTool {
         base.executions = dedupeExecutionsKeepLatest(allExecutions);
         return base.serialize();
     }
-    mergeReports(reportFileName = 'AUTO', opts) {
-        const { rmOriginalReports = false, overwrite = false, outputDir } = opts ?? {};
-        if (0 === this.reportInfos.length) {
+    mergeReports(reportFileName = 'AUTO', opts = {}) {
+        const { rmOriginalReports = false, overwrite = false, outputDir, outputFormat } = opts;
+        if (!this.reportInfos.length) {
             (0, utils_namespaceObject.logMsg)('No reports to merge');
             return null;
         }
         const runnerDumps = this.reportInfos.map((info)=>info.reportFilePath ? (0, report_artifact_reader_js_namespaceObject.readReportRunnerDump)(info.reportFilePath) : void 0);
         const hasRunnerDump = runnerDumps.some(Boolean);
+        const external = 'html-and-external-assets' === outputFormat;
+        const name = 'AUTO' === reportFileName ? (0, report_file_name_js_namespaceObject.getReportFileName)('merged-report') : reportFileName;
+        validateTestRunReportFileName(name);
         const targetDir = outputDir ? external_node_path_namespaceObject.resolve(outputDir) : (0, common_namespaceObject.getMidsceneRunSubDir)('report');
-        if (outputDir) (0, external_node_fs_namespaceObject.mkdirSync)(targetDir, {
-            recursive: true
-        });
-        const isDirModeByIndex = this.reportInfos.map((info)=>Boolean(info.reportFilePath && isDirectoryModeReport(info.reportFilePath)));
-        const hasDirectoryModeReport = isDirModeByIndex.some(Boolean);
-        const resolvedName = 'AUTO' === reportFileName ? (0, report_file_name_js_namespaceObject.getReportFileName)('merged-report') : reportFileName;
-        const outputFilePath = hasDirectoryModeReport ? external_node_path_namespaceObject.resolve(targetDir, resolvedName, 'index.html') : external_node_path_namespaceObject.resolve(targetDir, `${resolvedName}.html`);
-        if ('AUTO' !== reportFileName && (0, external_node_fs_namespaceObject.existsSync)(outputFilePath)) {
-            if (!overwrite) throw new Error(`Report file already exists: ${outputFilePath}\nSet overwrite to true to overwrite this file.`);
-            if (hasDirectoryModeReport) (0, external_node_fs_namespaceObject.rmSync)(external_node_path_namespaceObject.dirname(outputFilePath), {
-                recursive: true,
-                force: true
-            });
-            else (0, external_node_fs_namespaceObject.unlinkSync)(outputFilePath);
-        }
-        if (hasDirectoryModeReport) (0, external_node_fs_namespaceObject.mkdirSync)(external_node_path_namespaceObject.dirname(outputFilePath), {
+        (0, external_node_fs_namespaceObject.mkdirSync)(targetDir, {
             recursive: true
         });
-        (0, utils_namespaceObject.logMsg)(`Start merging ${this.reportInfos.length} reports...\nCreating template file...`);
+        const artifact = external_node_path_namespaceObject.join(targetDir, name);
+        const outputFilePath = external ? external_node_path_namespaceObject.join(artifact, 'index.html') : `${artifact}.html`;
+        if (!overwrite && (0, external_node_fs_namespaceObject.existsSync)(external ? artifact : outputFilePath)) throw new Error(`Report file already exists: ${outputFilePath}\nSet overwrite to true to overwrite this file.`);
+        if (rmOriginalReports && this.reportInfos.some((info)=>info.reportFilePath && isDirectoryBasedReport(info.reportFilePath) && outputFilePath.startsWith(`${external_node_path_namespaceObject.dirname(external_node_path_namespaceObject.resolve(info.reportFilePath))}${external_node_path_namespaceObject.sep}`))) throw new Error('Merged output must be outside source report directories when removing originals.');
+        const temporary = (0, external_node_fs_namespaceObject.mkdtempSync)(external_node_path_namespaceObject.join(targetDir, '.merged-report-'));
+        const entry = external_node_path_namespaceObject.join(temporary, 'index.html');
         try {
-            const htmlEndTag = '</html>';
-            const tpl = (0, external_utils_js_namespaceObject.getReportTpl)();
-            const htmlEndIdx = tpl.lastIndexOf(htmlEndTag);
-            const tplWithoutClose = -1 !== htmlEndIdx ? tpl.slice(0, htmlEndIdx) : tpl;
-            (0, external_node_fs_namespaceObject.appendFileSync)(outputFilePath, tplWithoutClose);
-            if (hasDirectoryModeReport) (0, external_node_fs_namespaceObject.appendFileSync)(outputFilePath, (0, html_utils_js_namespaceObject.getBaseUrlFixScript)());
+            const writer = new report_artifact_writer_js_namespaceObject.ReportArtifactWriter(entry, external, hasRunnerDump ? 'test' : 'agent');
+            writer.initializeSync();
             const agentReports = [];
             const runnerSources = [];
-            const writtenInlineImageIds = new Set();
-            for(let i = 0; i < this.reportInfos.length; i++){
-                const reportInfo = this.reportInfos[i];
-                (0, utils_namespaceObject.logMsg)(`Processing report ${i + 1}/${this.reportInfos.length}`);
-                const { reportAttributes } = reportInfo;
-                let dumpString = this.createEmptyDumpString(reportAttributes.testTitle, reportAttributes.testDescription);
-                let mergedGroupId = `merged-group-${i}`;
-                if (reportInfo.reportFilePath) {
-                    if (isDirModeByIndex[i]) {
-                        const reportDir = external_node_path_namespaceObject.dirname(reportInfo.reportFilePath);
-                        const screenshotsDir = external_node_path_namespaceObject.join(reportDir, 'screenshots');
-                        if ((0, external_node_fs_namespaceObject.existsSync)(screenshotsDir)) {
-                            const mergedScreenshotsDir = external_node_path_namespaceObject.join(external_node_path_namespaceObject.dirname(outputFilePath), 'screenshots');
-                            (0, external_node_fs_namespaceObject.mkdirSync)(mergedScreenshotsDir, {
-                                recursive: true
-                            });
-                            for (const file of (0, external_node_fs_namespaceObject.readdirSync)(screenshotsDir)){
-                                const src = external_node_path_namespaceObject.join(screenshotsDir, file);
-                                const dest = external_node_path_namespaceObject.join(mergedScreenshotsDir, file);
-                                (0, external_node_fs_namespaceObject.copyFileSync)(src, dest);
-                            }
-                        }
-                    } else (0, html_utils_js_namespaceObject.streamImageScriptsToFile)(reportInfo.reportFilePath, outputFilePath, writtenInlineImageIds);
-                    const allDumps = (0, report_artifact_reader_js_namespaceObject.readReportDumpScripts)(reportInfo.reportFilePath).filter((d)=>d.openTag.includes('data-group-id'));
-                    const groupIdMatch = allDumps[0]?.openTag.match(/data-group-id="([^"]+)"/);
-                    if (groupIdMatch && !hasRunnerDump) mergedGroupId = decodeURIComponent(groupIdMatch[1]);
-                    const extractedDumpString = allDumps.length > 0 ? this.mergeDumpScripts(allDumps.map((d)=>d.content)) : (0, html_utils_js_namespaceObject.extractLastDumpScriptSync)(reportInfo.reportFilePath);
-                    if (extractedDumpString) dumpString = extractedDumpString;
+            const groupIds = new Set();
+            for (const [index, info] of this.reportInfos.entries()){
+                const attributes = info.reportAttributes;
+                let serialized = this.createEmptyDumpString(attributes.testTitle, attributes.testDescription);
+                let groupId = `merged-group-${index}`;
+                if (info.reportFilePath) {
+                    const dumps = (0, report_artifact_reader_js_namespaceObject.readReportDumpScripts)(info.reportFilePath);
+                    const originalId = dumps[0]?.openTag.match(/data-group-id="([^"]+)"/)?.[1];
+                    if (originalId && !hasRunnerDump && !groupIds.has(decodeURIComponent(originalId))) groupId = decodeURIComponent(originalId);
+                    serialized = dumps.length ? this.mergeDumpScripts(dumps.map((dump)=>dump.content), Boolean((0, report_artifact_reader_js_namespaceObject.readReportArtifactManifest)(info.reportFilePath))) : (0, html_utils_js_namespaceObject.extractLastDumpScriptSync)(info.reportFilePath) ?? serialized;
                 }
-                const agentReport = tryParseAgentReportDump(dumpString);
+                if (groupIds.has(groupId)) groupId = `merged-group-${(0, utils_namespaceObject.uuid)()}`;
+                groupIds.add(groupId);
+                const agentReport = tryParseAgentReportDump(serialized);
                 if (agentReport) agentReports.push(agentReport);
                 if (hasRunnerDump) runnerSources.push({
-                    reportId: mergedGroupId,
-                    sourcePath: reportInfo.reportFilePath ?? '<skipped-agent-report>',
-                    attributes: reportAttributes,
-                    dump: runnerDumps[i],
-                    timing: agentReport ? agentReportTiming(agentReport, reportAttributes.testDuration) : void 0
+                    reportId: groupId,
+                    sourcePath: info.reportFilePath ?? '<skipped-agent-report>',
+                    attributes,
+                    dump: runnerDumps[index],
+                    timing: agentReport ? agentReportTiming(agentReport, attributes.testDuration) : void 0
+                });
+                writer.addGroupSync(groupId, serialized, info.reportFilePath ?? entry, {
+                    ...hasRunnerDump ? {
+                        'data-report-id': groupId
+                    } : {},
+                    playwright_test_duration: attributes.testDuration,
+                    playwright_test_status: attributes.testStatus,
+                    playwright_test_title: attributes.testTitle,
+                    playwright_test_id: attributes.testId,
+                    playwright_test_description: attributes.testDescription,
+                    is_merged: true
                 });
-                const reportHtmlStr = `${(0, external_utils_js_namespaceObject.reportHTMLContent)({
-                    dumpString,
-                    attributes: {
-                        'data-group-id': mergedGroupId,
-                        ...hasRunnerDump ? {
-                            'data-report-id': mergedGroupId
-                        } : {},
-                        [html_utils_js_namespaceObject.DATA_SCREENSHOT_MODE_ATTR]: hasDirectoryModeReport ? 'directory' : 'inline',
-                        playwright_test_duration: reportAttributes.testDuration,
-                        playwright_test_status: reportAttributes.testStatus,
-                        playwright_test_title: reportAttributes.testTitle,
-                        playwright_test_id: reportAttributes.testId,
-                        playwright_test_description: reportAttributes.testDescription,
-                        is_merged: true
-                    }
-                }, void 0, void 0, false)}\n`;
-                (0, external_node_fs_namespaceObject.appendFileSync)(outputFilePath, reportHtmlStr);
             }
+            let runner;
             if (hasRunnerDump) {
                 const executions = dedupeExecutionsKeepLatest(agentReports.flatMap((report)=>report.executions));
                 const metrics = (0, metrics_js_namespaceObject.collectTestRunReportMetrics)({
@@ -297,30 +327,22 @@ class ReportMergingTool {
                             })
                         ]
                     ] : []));
-                (0, external_node_fs_namespaceObject.appendFileSync)(outputFilePath, (0, html_utils_js_namespaceObject.generateTestRunReportScriptTag)((0, merge_report_js_namespaceObject.mergeTestRunReportDumps)(runnerSources, metrics, (0, utils_namespaceObject.uuid)(), executionMetrics)));
+                runner = (0, merge_report_js_namespaceObject.mergeTestRunReportDumps)(runnerSources, metrics, (0, utils_namespaceObject.uuid)(), executionMetrics);
             }
-            const agentComment = mergedAgentReportComment(agentReports);
-            if (agentComment) (0, external_node_fs_namespaceObject.appendFileSync)(outputFilePath, agentComment);
-            (0, external_node_fs_namespaceObject.appendFileSync)(outputFilePath, `${htmlEndTag}\n`);
-            (0, utils_namespaceObject.logMsg)(`Successfully merged new report: ${outputFilePath}`);
+            writer.finishSync(runner, mergedAgentReportComment(agentReports));
+            (0, report_artifact_publication_js_namespaceObject.publishReportArtifactSync)(external ? temporary : entry, external ? artifact : outputFilePath, external, overwrite);
             if (rmOriginalReports) {
-                let removedReportCount = 0;
-                let reportCountWithFilePath = 0;
-                for (const info of this.reportInfos)if (info.reportFilePath) {
-                    reportCountWithFilePath += 1;
-                    try {
-                        removeReportArtifact(info.reportFilePath);
-                        removedReportCount += 1;
-                    } catch (error) {
-                        (0, utils_namespaceObject.logMsg)(`Error deleting report ${info.reportFilePath}: ${error}`);
-                    }
-                }
-                (0, utils_namespaceObject.logMsg)(`Removed ${removedReportCount}/${reportCountWithFilePath} original reports`);
+                for (const sourcePath of new Set(this.reportInfos.flatMap((info)=>info.reportFilePath ? [
+                        external_node_path_namespaceObject.resolve(info.reportFilePath)
+                    ] : [])))if (sourcePath !== outputFilePath) removeReportArtifact(sourcePath);
             }
+            (0, utils_namespaceObject.logMsg)(`Successfully merged new report: ${outputFilePath}`);
             return outputFilePath;
-        } catch (error) {
-            (0, utils_namespaceObject.logMsg)(`Error in mergeReports: ${error}`);
-            throw error;
+        } finally{
+            (0, external_node_fs_namespaceObject.rmSync)(temporary, {
+                recursive: true,
+                force: true
+            });
         }
     }
     constructor(){
@@ -395,8 +417,15 @@ const prepareTestRunReportSources = (sources, loadedDumps)=>{
             continue;
         }
         const sourceKey = source.sourcePath;
+        const imageOrigins = new Map();
+        JSON.parse(baseDump.serialize(), (_key, value)=>{
+            const ref = (0, image_reference_js_namespaceObject.normalizeStoredImageRef)(value);
+            if (ref) imageOrigins.set(ref.id, 'file' === ref.storage ? source.dumpPath ?? source.sourcePath : source.sourcePath);
+            return value;
+        });
         const shared = preparedByPath.get(sourceKey);
         if (shared) {
+            for (const [id, origin] of imageOrigins)shared.imageOrigins.set(id, origin);
             if (source.dumpPath) shared.dump.executions = dedupeExecutionsKeepLatest([
                 ...shared.dump.executions,
                 ...baseDump.executions
@@ -456,6 +485,7 @@ const prepareTestRunReportSources = (sources, loadedDumps)=>{
             executionIds,
             collection: source.collection,
             dump,
+            imageOrigins,
             ...source.dumpPath ? {
                 dumpPath: source.dumpPath
             } : {}
@@ -530,41 +560,25 @@ class TestRunReportAssembler {
         });
         const artifact = external_node_path_namespaceObject.join(outputDir, options.reportFileName);
         const finalPath = directoryMode ? external_node_path_namespaceObject.join(artifact, 'index.html') : `${artifact}.html`;
-        if (!options.overwrite && ((0, external_node_fs_namespaceObject.existsSync)(artifact) || (0, external_node_fs_namespaceObject.existsSync)(`${artifact}.html`))) throw new Error(`Report artifact already exists: ${artifact}`);
+        if (!options.overwrite && (0, external_node_fs_namespaceObject.existsSync)(directoryMode ? artifact : finalPath)) throw new Error(`Report artifact already exists: ${artifact}`);
         const temporary = await promises_namespaceObject.mkdtemp(external_node_path_namespaceObject.join(outputDir, '.test-run-report-'));
         const htmlPath = external_node_path_namespaceObject.join(temporary, 'index.html');
         try {
-            await promises_namespaceObject.writeFile(htmlPath, (0, external_utils_js_namespaceObject.getReportTpl)());
-            if (directoryMode) await promises_namespaceObject.appendFile(htmlPath, (0, html_utils_js_namespaceObject.getBaseUrlFixScript)());
-            const images = new test_report_images_js_namespaceObject.TestReportImages(htmlPath, directoryMode);
+            const writer = new report_artifact_writer_js_namespaceObject.ReportArtifactWriter(htmlPath, directoryMode, 'test', dump.runId);
+            await writer.initialize();
             const reports = [];
             for (const source of new Map(prepared.sources.map((source)=>[
                     source.reportId,
                     source
                 ])).values()){
-                const serialized = await images.rewriteAsync(source.dump.serialize(), source.dumpPath ?? source.sourcePath);
                 reports.push(source.dump);
-                await promises_namespaceObject.appendFile(htmlPath, (0, external_utils_js_namespaceObject.reportHTMLContent)({
-                    dumpString: serialized,
-                    attributes: {
-                        'data-group-id': source.reportId,
-                        'data-report-id': source.reportId,
-                        'data-runner-scope-id': source.scopeId,
-                        [html_utils_js_namespaceObject.DATA_SCREENSHOT_MODE_ATTR]: directoryMode ? 'directory' : 'inline'
-                    }
-                }, void 0, void 0, false));
-            }
-            await promises_namespaceObject.appendFile(htmlPath, (0, html_utils_js_namespaceObject.generateTestRunReportScriptTag)(dump) + mergedAgentReportComment(reports));
-            if (options.overwrite) {
-                await promises_namespaceObject.rm(artifact, {
-                    recursive: true,
-                    force: true
-                });
-                await promises_namespaceObject.rm(`${artifact}.html`, {
-                    force: true
-                });
+                await writer.addGroup(source.reportId, source.dump.serialize(), source.dumpPath ?? source.sourcePath, {
+                    'data-report-id': source.reportId,
+                    'data-runner-scope-id': source.scopeId
+                }, source.imageOrigins);
             }
-            await promises_namespaceObject.rename(directoryMode ? temporary : htmlPath, directoryMode ? artifact : finalPath);
+            await writer.finish(dump, mergedAgentReportComment(reports));
+            await (0, report_artifact_publication_js_namespaceObject.publishReportArtifact)(directoryMode ? temporary : htmlPath, directoryMode ? artifact : finalPath, directoryMode, options.overwrite);
             return finalPath;
         } finally{
             await promises_namespaceObject.rm(temporary, {
@@ -602,8 +616,7 @@ class TestRunReportAssembler {
         const standaloneReportPath = `${finalArtifactPath}.html`;
         const finalReportPath = directoryMode ? directoryReportPath : standaloneReportPath;
         const existingArtifacts = [
-            finalArtifactPath,
-            standaloneReportPath
+            directoryMode ? finalArtifactPath : standaloneReportPath
         ].filter(external_node_fs_namespaceObject.existsSync);
         if (existingArtifacts.length > 0 && !options.overwrite) throw new Error(`Report artifact already exists: ${existingArtifacts[0]}\nSet overwrite to true to overwrite this report.`);
         const temporaryRoot = (0, external_node_fs_namespaceObject.mkdtempSync)(external_node_path_namespaceObject.join(outputDir, '.test-run-report-'));
@@ -613,39 +626,21 @@ class TestRunReportAssembler {
             if (directoryMode) (0, external_node_fs_namespaceObject.mkdirSync)(temporaryArtifactPath, {
                 recursive: true
             });
-            const htmlEndTag = '</html>';
-            const template = (0, external_utils_js_namespaceObject.getReportTpl)();
-            const htmlEndIndex = template.lastIndexOf(htmlEndTag);
-            (0, external_node_fs_namespaceObject.appendFileSync)(temporaryReportPath, -1 === htmlEndIndex ? template : template.slice(0, htmlEndIndex));
-            if (directoryMode) (0, external_node_fs_namespaceObject.appendFileSync)(temporaryReportPath, (0, html_utils_js_namespaceObject.getBaseUrlFixScript)());
-            const images = new test_report_images_js_namespaceObject.TestReportImages(temporaryReportPath, directoryMode);
+            const writer = new report_artifact_writer_js_namespaceObject.ReportArtifactWriter(temporaryReportPath, directoryMode, 'test', runnerDump.runId);
+            writer.initializeSync();
             const agentReports = [];
             for (const source of new Map(prepared.sources.map((source)=>[
                     source.reportId,
                     source
                 ])).values()){
-                const serialized = images.rewriteSync(source.dump.serialize(), source.dumpPath ?? source.sourcePath);
                 agentReports.push(source.dump);
-                (0, external_node_fs_namespaceObject.appendFileSync)(temporaryReportPath, `${(0, external_utils_js_namespaceObject.reportHTMLContent)({
-                    dumpString: serialized,
-                    attributes: {
-                        'data-group-id': source.reportId,
-                        'data-report-id': source.reportId,
-                        'data-runner-scope-id': source.scopeId,
-                        [html_utils_js_namespaceObject.DATA_SCREENSHOT_MODE_ATTR]: directoryMode ? 'directory' : 'inline'
-                    }
-                }, void 0, void 0, false)}\n`);
+                writer.addGroupSync(source.reportId, source.dump.serialize(), source.dumpPath ?? source.sourcePath, {
+                    'data-report-id': source.reportId,
+                    'data-runner-scope-id': source.scopeId
+                }, source.imageOrigins);
             }
-            (0, external_node_fs_namespaceObject.appendFileSync)(temporaryReportPath, (0, html_utils_js_namespaceObject.generateTestRunReportScriptTag)(runnerDump));
-            const agentComment = mergedAgentReportComment(agentReports);
-            if (agentComment) (0, external_node_fs_namespaceObject.appendFileSync)(temporaryReportPath, agentComment);
-            (0, external_node_fs_namespaceObject.appendFileSync)(temporaryReportPath, `${htmlEndTag}\n`);
-            if ((0, external_node_fs_namespaceObject.existsSync)(finalArtifactPath)) (0, external_node_fs_namespaceObject.rmSync)(finalArtifactPath, {
-                recursive: true,
-                force: true
-            });
-            if ((0, external_node_fs_namespaceObject.existsSync)(standaloneReportPath)) (0, external_node_fs_namespaceObject.unlinkSync)(standaloneReportPath);
-            (0, external_node_fs_namespaceObject.renameSync)(directoryMode ? temporaryArtifactPath : temporaryReportPath, directoryMode ? finalArtifactPath : standaloneReportPath);
+            writer.finishSync(runnerDump, mergedAgentReportComment(agentReports));
+            (0, report_artifact_publication_js_namespaceObject.publishReportArtifactSync)(directoryMode ? temporaryArtifactPath : temporaryReportPath, directoryMode ? finalArtifactPath : standaloneReportPath, directoryMode, options.overwrite);
             (0, external_node_fs_namespaceObject.rmSync)(temporaryRoot, {
                 recursive: true,
                 force: true
@@ -764,11 +759,13 @@ function splitReportHtmlByExecution(options) {
 exports.ExecutionRecorder = __webpack_exports__.ExecutionRecorder;
 exports.ReportArtifactStore = __webpack_exports__.ReportArtifactStore;
 exports.ReportMergingTool = __webpack_exports__.ReportMergingTool;
+exports.ReportSession = __webpack_exports__.ReportSession;
 exports.TestRunReportAssembler = __webpack_exports__.TestRunReportAssembler;
 exports.calculateTestRunHealth = __webpack_exports__.calculateTestRunHealth;
 exports.classifyTestRunCase = __webpack_exports__.classifyTestRunCase;
 exports.collectDedupedExecutions = __webpack_exports__.collectDedupedExecutions;
 exports.dedupeExecutionsKeepLatest = __webpack_exports__.dedupeExecutionsKeepLatest;
+exports.exportReportArtifact = __webpack_exports__.exportReportArtifact;
 exports.isDirectoryModeReport = __webpack_exports__.isDirectoryModeReport;
 exports.readReportActionDump = __webpack_exports__.readReportActionDump;
 exports.readReportArtifactManifest = __webpack_exports__.readReportArtifactManifest;
@@ -782,11 +779,13 @@ for(var __rspack_i in __webpack_exports__)if (-1 === [
     "ExecutionRecorder",
     "ReportArtifactStore",
     "ReportMergingTool",
+    "ReportSession",
     "TestRunReportAssembler",
     "calculateTestRunHealth",
     "classifyTestRunCase",
     "collectDedupedExecutions",
     "dedupeExecutionsKeepLatest",
+    "exportReportArtifact",
     "isDirectoryModeReport",
     "readReportActionDump",
     "readReportArtifactManifest",