@crvy/rprtr 0.0.5 → 0.0.8

package/dist/reporter.d.ts

@@ -1,9 +1,12 @@
-import type { Reporter, FullConfig, Suite, TestCase, TestResult, FullResult } from '@playwright/test/reporter';
+import type { FullConfig, FullResult, Reporter, Suite, TestCase, TestResult } from '@playwright/test/reporter';
 export interface CrvyRprtrOptions {
     serverUrl?: string;
     screenshotDir?: string;
     offlineReportPath?: string;
     reportHtmlPath?: string;
+    playwrightSnapshotDir?: string;
+    playwrightSnapshotPathTemplate?: string;
+    playwrightToHaveScreenshotPathTemplate?: string;
 }
 export declare class CrvyRprtr implements Reporter {
     private ws;
@@ -13,6 +16,11 @@ export declare class CrvyRprtr implements Reporter {
     private workerIndex;
     private offlineReportPath;
     private reportHtmlPath;
+    private configDir;
+    private testMetadata;
+    private playwrightSnapshotDir?;
+    private playwrightSnapshotPathTemplate?;
+    private playwrightToHaveScreenshotPathTemplate?;
     private isOfflineMode;
     private hadOfflineMode;
     private runEvents;
@@ -20,13 +28,12 @@ export declare class CrvyRprtr implements Reporter {
     onBegin(config: FullConfig, suite: Suite): Promise<void>;
     private connect;
     private enableOfflineMode;
+    private describeTitlePath;
+    private reporterTitlePath;
     onTestBegin(test: TestCase): void;
     onTestEnd(test: TestCase, result: TestResult): Promise<void>;
+    private baselineInput;
     private copySnapshotBaselines;
-    private saveAttachments;
-    private sanitizeId;
-    private writeOfflineReport;
-    private writeStaticArtifact;
     onEnd(result: FullResult): Promise<void>;
     private send;
 }

package/dist/reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAO9G,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AACD,qBAAa,SAAU,YAAW,QAAQ;IACxC,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,SAAS,CAA4E;gBAEjF,OAAO,GAAE,gBAAqB;IAQpC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9D,OAAO,CAAC,OAAO;IA8Bf,OAAO,CAAC,iBAAiB;IAQzB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAsB3B,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAoBpD,qBAAqB;YA8CrB,eAAe;IAwC7B,OAAO,CAAC,UAAU;YAIJ,kBAAkB;YAyBlB,mBAAmB;IAa3B,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B9C,OAAO,CAAC,IAAI;CAkBb;AACD,eAAe,SAAS,CAAA"}
+{"version":3,"file":"reporter.d.ts","sourceRoot":"","sources":["../src/reporter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAA;AAgB9G,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,8BAA8B,CAAC,EAAE,MAAM,CAAA;IACvC,sCAAsC,CAAC,EAAE,MAAM,CAAA;CAChD;AAED,qBAAa,SAAU,YAAW,QAAQ;IACxC,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,YAAY,CAAqD;IACzE,OAAO,CAAC,qBAAqB,CAAC,CAAQ;IACtC,OAAO,CAAC,8BAA8B,CAAC,CAAQ;IAC/C,OAAO,CAAC,sCAAsC,CAAC,CAAQ;IACvD,OAAO,CAAC,aAAa,CAAQ;IAC7B,OAAO,CAAC,cAAc,CAAQ;IAC9B,OAAO,CAAC,SAAS,CAAiB;gBAEtB,OAAO,GAAE,gBAAqB;IAWpC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAO9D,OAAO,CAAC,OAAO;IA6Bf,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,iBAAiB;IAMzB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAc3B,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBlE,OAAO,CAAC,aAAa;YAqBP,qBAAqB;IAqB7B,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB9C,OAAO,CAAC,IAAI;CAUb;AAED,eAAe,SAAS,CAAA"}

package/dist/reporter.js

@@ -6,11 +6,27 @@ import {
   applyTestEndEvent,
   createMutableReportState,
   finalizeRunEvent,
+  resolveBaselineTargets,
   safeParse
-} from "./chunk-MWLM3HWS.js";
+} from "./chunk-EJRLZZ22.js";
 
 // src/reporter.ts
-import { mkdir as mkdir2, copyFile, writeFile as writeFile2 } from "fs/promises";
+import { existsSync } from "fs";
+import { mkdir as mkdir3 } from "fs/promises";
+import { dirname as dirname3, join as join2 } from "path";
+import pLimit2 from "p-limit";
+
+// src/debug-log.ts
+var isDebug = () => process.env.DEBUG !== void 0 && process.env.DEBUG !== "";
+var log = (...args) => {
+  if (isDebug()) console.log(...args);
+};
+var logError = (...args) => {
+  if (isDebug()) console.error(...args);
+};
+
+// src/reporter-artifact-ops.ts
+import { copyFile, mkdir as mkdir2, writeFile as writeFile2 } from "fs/promises";
 import { dirname as dirname2, join } from "path";
 import pLimit from "p-limit";
 
@@ -135,32 +151,129 @@ async function writeReportArtifact(options) {
   await writeFile(reportHtmlPath, html);
 }
 
+// src/reporter-artifact-ops.ts
+var CURRENT_DIRECTORY_ARTIFACT_SEGMENT = "+dot+";
+var PARENT_DIRECTORY_ARTIFACT_SEGMENT = "+dotdot+";
+var MAX_CONCURRENT_FILE_OPS = 5;
+var SAFE_ARTIFACT_CHARACTER = /^[A-Za-z0-9._-]$/;
+function encodeArtifactPathSegment(segment) {
+  if (segment === ".") return CURRENT_DIRECTORY_ARTIFACT_SEGMENT;
+  if (segment === "..") return PARENT_DIRECTORY_ARTIFACT_SEGMENT;
+  return Array.from(
+    segment,
+    (character) => SAFE_ARTIFACT_CHARACTER.test(character) ? character : encodeURIComponent(character)
+  ).join("");
+}
+function safeArtifactPath(name) {
+  return name.split("/").map(encodeArtifactPathSegment).join("/");
+}
+function sanitizeId(id) {
+  return id.replace(/[^a-zA-Z0-9-_]/g, "_");
+}
+async function copyResolvedBaseline(safeTestId, testScreenshotDir, target, savedAttachments) {
+  const attachmentName = `${target.attachmentBaseName}-expected.png`;
+  const artifactPath = safeArtifactPath(attachmentName);
+  const destPath = join(testScreenshotDir, artifactPath);
+  try {
+    await mkdir2(dirname2(destPath), { recursive: true });
+    await copyFile(target.snapshotPath, destPath);
+    savedAttachments.push({ name: attachmentName, path: `${safeTestId}/${artifactPath}`, contentType: "image/png" });
+    log(`[CrvyRprtr] Attached baseline: ${target.snapshotPath}`);
+  } catch {
+  }
+}
+async function saveAttachments(screenshotDir, testId, result) {
+  const savedAttachments = [];
+  const safeTestId = sanitizeId(testId);
+  const testScreenshotDir = join(screenshotDir, safeTestId);
+  const limit = pLimit(MAX_CONCURRENT_FILE_OPS);
+  await Promise.all(
+    result.attachments.filter(
+      (attachment) => attachment.contentType === "image/png" && attachment.path !== void 0
+    ).map(
+      (attachment) => limit(async () => {
+        try {
+          const artifactPath = safeArtifactPath(attachment.name);
+          const destPath = join(testScreenshotDir, artifactPath);
+          await mkdir2(dirname2(destPath), { recursive: true });
+          await copyFile(attachment.path, destPath);
+          savedAttachments.push({
+            name: attachment.name,
+            path: `${safeTestId}/${artifactPath}`,
+            contentType: attachment.contentType ?? "image/png"
+          });
+          log(`[CrvyRprtr] Saved screenshot: ${destPath}`);
+        } catch (error) {
+          logError(`[CrvyRprtr] Failed to save screenshot: ${attachment.path}`, error);
+          savedAttachments.push({
+            name: attachment.name,
+            path: attachment.path,
+            contentType: attachment.contentType ?? "image/png"
+          });
+        }
+      })
+    )
+  );
+  return savedAttachments;
+}
+async function writeOfflineReport(runEvents, offlineReportPath, workerIndex) {
+  if (runEvents.length === 0) {
+    log("[CrvyRprtr] No offline events to write");
+    return;
+  }
+  try {
+    const report = {
+      version: 1,
+      generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+      workers: workerIndex + 1,
+      events: runEvents.map((event) => ({ ...event, timestamp: Date.now(), workerIndex }))
+    };
+    await writeFile2(offlineReportPath, JSON.stringify(report, null, 2));
+    log(`[CrvyRprtr] Wrote offline report: ${offlineReportPath}`);
+  } catch (error) {
+    logError("[CrvyRprtr] Failed to write offline report:", error);
+  }
+}
+async function writeStaticArtifact(runEvents, screenshotDir, reportHtmlPath) {
+  try {
+    await writeReportArtifact({ events: runEvents, screenshotDir, reportHtmlPath });
+    log(`[CrvyRprtr] Wrote report artifact: ${reportHtmlPath}`);
+  } catch (error) {
+    logError("[CrvyRprtr] Failed to write report artifact:", error);
+  }
+}
+
 // src/reporter-utils.ts
 var NAMED_SCREENSHOT_STEP_TITLE = /toHaveScreenshot\((.+?)\)/;
 var UNNAMED_SCREENSHOT_STEP_TITLE = /^Expect "toHaveScreenshot"(?:\s|$)/;
 var SYNTHETIC_SCREENSHOT_PREFIX = "__unnamed-screenshot-";
-function normalizeNamedScreenshot(titleMatch) {
+function addVisualSuffix(visualName, occurrenceIndex) {
+  if (occurrenceIndex === 1) {
+    return visualName;
+  }
+  const slashIndex = visualName.lastIndexOf("/");
+  return slashIndex === -1 ? `${visualName}-${occurrenceIndex - 1}` : `${visualName.slice(0, slashIndex + 1)}${visualName.slice(slashIndex + 1)}-${occurrenceIndex - 1}`;
+}
+function normalizeNamedScreenshot(titleMatch, state) {
   const unquotedName = titleMatch.trim().replace(/^['"`]|['"`]$/g, "");
   if (unquotedName === "") {
     return null;
   }
   const normalizedPath = unquotedName.replace(/\\/g, "/");
-  const normalizedName = normalizedPath.replace(/\.png$/, "");
-  if (normalizedName === "") {
+  const declaredName = normalizedPath.replace(/\.png$/, "");
+  if (declaredName === "") {
     return null;
   }
+  const occurrenceIndex = (state.namedOccurrences.get(declaredName) ?? 0) + 1;
+  state.namedOccurrences.set(declaredName, occurrenceIndex);
   return {
-    visualName: normalizedName,
-    snapshotBaseName: normalizedName
+    visualName: addVisualSuffix(declaredName, occurrenceIndex),
+    kind: "named",
+    declaredName,
+    snapshotBaseName: declaredName,
+    occurrenceIndex
   };
 }
-function appendDeclaration(state, declaration) {
-  if (state.seenVisualNames.has(declaration.visualName)) {
-    return;
-  }
-  state.seenVisualNames.add(declaration.visualName);
-  state.declarations.push(declaration);
-}
 function visitStep(step, state) {
   const declarationsBeforeChildren = state.declarations.length;
   for (const nestedStep of step.steps) {
@@ -168,16 +281,19 @@ function visitStep(step, state) {
   }
   const namedMatch = step.title.match(NAMED_SCREENSHOT_STEP_TITLE);
   if (namedMatch?.[1] !== void 0) {
-    const declaration = normalizeNamedScreenshot(namedMatch[1]);
+    const declaration = normalizeNamedScreenshot(namedMatch[1], state);
     if (declaration !== null) {
-      appendDeclaration(state, declaration);
+      state.declarations.push(declaration);
       return true;
     }
   }
   const hasNestedScreenshotDeclaration = state.declarations.length > declarationsBeforeChildren;
   if (UNNAMED_SCREENSHOT_STEP_TITLE.test(step.title) && !hasNestedScreenshotDeclaration) {
-    appendDeclaration(state, {
-      visualName: `${SYNTHETIC_SCREENSHOT_PREFIX}${state.nextUnnamedIndex}`
+    const occurrenceIndex = state.nextUnnamedIndex;
+    state.declarations.push({
+      visualName: `${SYNTHETIC_SCREENSHOT_PREFIX}${occurrenceIndex}`,
+      kind: "unnamed",
+      occurrenceIndex
     });
     state.nextUnnamedIndex += 1;
     return true;
@@ -187,7 +303,7 @@ function visitStep(step, state) {
 function extractScreenshotDeclarations(steps) {
   const state = {
     declarations: [],
-    seenVisualNames: /* @__PURE__ */ new Set(),
+    namedOccurrences: /* @__PURE__ */ new Map(),
     nextUnnamedIndex: 1
   };
   for (const step of steps) {
@@ -197,7 +313,6 @@ function extractScreenshotDeclarations(steps) {
 }
 
 // src/reporter.ts
-var MAX_CONCURRENT_FILE_OPS = 5;
 var CrvyRprtr = class {
   ws = null;
   serverUrl;
@@ -206,6 +321,11 @@ var CrvyRprtr = class {
   workerIndex;
   offlineReportPath;
   reportHtmlPath;
+  configDir = process.cwd();
+  testMetadata = /* @__PURE__ */ new Map();
+  playwrightSnapshotDir;
+  playwrightSnapshotPathTemplate;
+  playwrightToHaveScreenshotPathTemplate;
   isOfflineMode = false;
   hadOfflineMode = false;
   runEvents = [];
@@ -215,198 +335,132 @@ var CrvyRprtr = class {
     this.workerIndex = parseInt(process.env.TEST_WORKER_INDEX ?? "0", 10) || 0;
     this.offlineReportPath = options.offlineReportPath ?? `./crvy-rprtr-${this.workerIndex}.json`;
     this.reportHtmlPath = options.reportHtmlPath ?? "./crvy-rprtr.html";
+    this.playwrightSnapshotDir = options.playwrightSnapshotDir;
+    this.playwrightSnapshotPathTemplate = options.playwrightSnapshotPathTemplate;
+    this.playwrightToHaveScreenshotPathTemplate = options.playwrightToHaveScreenshotPathTemplate;
   }
   async onBegin(config, suite) {
-    console.log(`[CrvyRprtr] Starting run with ${suite.allTests().length} tests`);
-    await mkdir2(this.screenshotDir, { recursive: true });
+    this.configDir = config.configFile === void 0 ? config.rootDir : dirname3(config.configFile);
+    log(`[CrvyRprtr] Starting run with ${suite.allTests().length} tests`);
+    await mkdir3(this.screenshotDir, { recursive: true });
     this.connect();
   }
   connect() {
     const WebSocketConstructor = globalThis.WebSocket;
     if (typeof WebSocketConstructor !== "function") {
-      console.log("[CrvyRprtr] WebSocket unavailable in current runtime; offline mode enabled");
+      log("[CrvyRprtr] WebSocket unavailable in current runtime; offline mode enabled");
       this.enableOfflineMode();
       return;
     }
     try {
       this.ws = new WebSocketConstructor(this.serverUrl);
       this.ws.onopen = () => {
-        console.log("[CrvyRprtr] Connected to Crvy Rprtr server");
+        log("[CrvyRprtr] Connected to Crvy Rprtr server");
         this.isOfflineMode = false;
-        for (const msg of this.queue) this.ws.send(msg);
+        for (const message of this.queue) this.ws.send(message);
         this.queue = [];
       };
       this.ws.onerror = (error) => {
-        console.error("[CrvyRprtr] WebSocket error:", error);
+        logError("[CrvyRprtr] WebSocket error:", error);
         this.enableOfflineMode();
       };
       this.ws.onclose = () => {
-        console.log("[CrvyRprtr] Disconnected from Crvy Rprtr server");
+        log("[CrvyRprtr] Disconnected from Crvy Rprtr server");
         this.enableOfflineMode();
       };
-    } catch (e) {
-      console.error("[CrvyRprtr] Failed to connect:", e);
+    } catch (error) {
+      logError("[CrvyRprtr] Failed to connect:", error);
       this.enableOfflineMode();
     }
   }
   enableOfflineMode() {
-    if (!this.isOfflineMode) {
-      this.isOfflineMode = true;
-      this.hadOfflineMode = true;
-      console.log("[CrvyRprtr] Offline mode enabled - events will be queued to file");
-    }
+    if (this.isOfflineMode) return;
+    this.isOfflineMode = this.hadOfflineMode = true;
+    log("[CrvyRprtr] Offline mode enabled - events will be queued to file");
   }
-  onTestBegin(test) {
+  describeTitlePath(test) {
     const titlePath = [];
-    let suite = test.parent;
-    while (suite && suite.type === "describe") {
+    for (let suite = test.parent; suite?.type === "describe"; suite = suite.parent)
       titlePath.unshift(suite.title);
-      suite = suite.parent;
-    }
+    return titlePath;
+  }
+  reporterTitlePath(test) {
+    return typeof test.titlePath === "function" ? test.titlePath() : ["", test.parent.project()?.name ?? "chromium", test.location.file, ...this.describeTitlePath(test), test.title];
+  }
+  onTestBegin(test) {
+    this.testMetadata.set(test.id, { reporterTitlePath: this.reporterTitlePath(test) });
     this.send({
       type: "test-begin",
       data: {
         id: test.id,
         title: test.title,
-        titlePath,
+        titlePath: this.describeTitlePath(test),
         browser: test.parent.project()?.name ?? "chromium",
-        location: {
-          file: test.location.file,
-          line: test.location.line
-        }
+        location: { file: test.location.file, line: test.location.line }
       }
     });
   }
   async onTestEnd(test, result) {
     const screenshotDeclarations = extractScreenshotDeclarations(result.steps);
-    const visualNames = screenshotDeclarations.map(({ visualName }) => visualName);
-    const savedAttachments = await this.saveAttachments(test.id, result);
-    await this.copySnapshotBaselines(test, result.status, screenshotDeclarations, savedAttachments);
-    this.send({
-      type: "test-end",
-      data: {
-        id: test.id,
-        title: test.title,
-        status: result.status,
-        attachments: savedAttachments,
-        visualNames,
-        error: result.errors.length > 0 ? result.errors[0]?.message : void 0,
-        duration: result.duration
-      }
-    });
-  }
-  async copySnapshotBaselines(test, status, screenshotDeclarations, savedAttachments) {
-    if (status !== "passed") return;
-    const namedDeclarations = screenshotDeclarations.filter(
-      (declaration) => declaration.snapshotBaseName !== void 0
-    );
-    if (namedDeclarations.length === 0) return;
-    const projectName = test.parent.project()?.name;
-    const snapshotDir = `${test.location.file}-snapshots`;
-    const testScreenshotDir = join(this.screenshotDir, this.sanitizeId(test.id));
-    const limit = pLimit(MAX_CONCURRENT_FILE_OPS);
-    const copyPromises = namedDeclarations.map(
-      ({ visualName, snapshotBaseName }) => limit(async () => {
-        const destName = `${visualName}-expected.png`;
-        const destPath = join(testScreenshotDir, destName);
-        const snapshotPath = projectName === "" ? join(snapshotDir, `${snapshotBaseName}-${process.platform}.png`) : join(snapshotDir, `${snapshotBaseName}-${projectName ?? "chromium"}-${process.platform}.png`);
-        try {
-          await mkdir2(dirname2(destPath), { recursive: true });
-          await copyFile(snapshotPath, destPath);
-          savedAttachments.push({
-            name: destName,
-            path: `${this.sanitizeId(test.id)}/${destName}`,
-            contentType: "image/png"
-          });
-          console.log(`[CrvyRprtr] Attached baseline: ${snapshotPath}`);
-        } catch {
-        }
-      })
-    );
-    await Promise.all(copyPromises);
-  }
-  async saveAttachments(testId, result) {
-    const savedAttachments = [];
-    const testScreenshotDir = join(this.screenshotDir, this.sanitizeId(testId));
-    const limit = pLimit(MAX_CONCURRENT_FILE_OPS);
-    const attachmentPromises = result.attachments.filter(
-      (attachment) => attachment.contentType === "image/png" && attachment.path !== void 0
-    ).map(
-      (attachment) => limit(async () => {
-        try {
-          await mkdir2(testScreenshotDir, { recursive: true });
-          const fileName = attachment.name;
-          const destPath = join(testScreenshotDir, fileName);
-          await copyFile(attachment.path, destPath);
-          const attachmentData = {
-            name: attachment.name,
-            path: `${this.sanitizeId(testId)}/${fileName}`,
-            contentType: attachment.contentType
-          };
-          savedAttachments.push(attachmentData);
-          console.log(`[CrvyRprtr] Saved screenshot: ${destPath}`);
-        } catch (e) {
-          console.error(`[CrvyRprtr] Failed to save screenshot: ${attachment.path}`, e);
-          const fallbackData = {
-            name: attachment.name,
-            path: attachment.path,
-            contentType: attachment.contentType
-          };
-          savedAttachments.push(fallbackData);
-        }
-      })
-    );
-    await Promise.all(attachmentPromises);
-    return savedAttachments;
-  }
-  sanitizeId(id) {
-    return id.replace(/[^a-zA-Z0-9-_]/g, "_");
-  }
-  async writeOfflineReport() {
-    if (this.runEvents.length === 0) {
-      console.log("[CrvyRprtr] No offline events to write");
-      return;
-    }
-    try {
-      const report = {
-        version: 1,
-        generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
-        workers: this.workerIndex + 1,
-        events: this.runEvents.map((e) => ({
-          ...e,
-          timestamp: Date.now(),
-          workerIndex: this.workerIndex
-        }))
-      };
-      await writeFile2(this.offlineReportPath, JSON.stringify(report, null, 2));
-      console.log(`[CrvyRprtr] Wrote offline report: ${this.offlineReportPath}`);
-    } catch (e) {
-      console.error("[CrvyRprtr] Failed to write offline report:", e);
-    }
-  }
-  async writeStaticArtifact() {
+    const savedAttachments = await saveAttachments(this.screenshotDir, test.id, result);
     try {
-      await writeReportArtifact({
-        events: this.runEvents,
-        screenshotDir: this.screenshotDir,
-        reportHtmlPath: this.reportHtmlPath
+      await this.copySnapshotBaselines(test, result.status, screenshotDeclarations, savedAttachments);
+      this.send({
+        type: "test-end",
+        data: {
+          id: test.id,
+          title: test.title,
+          status: result.status,
+          attachments: savedAttachments,
+          visualNames: screenshotDeclarations.map(({ visualName }) => visualName),
+          visualDeclarations: screenshotDeclarations,
+          error: result.errors.length > 0 ? result.errors[0]?.message : void 0,
+          duration: result.duration
+        }
       });
-      console.log(`[CrvyRprtr] Wrote report artifact: ${this.reportHtmlPath}`);
-    } catch (e) {
-      console.error("[CrvyRprtr] Failed to write report artifact:", e);
+    } finally {
+      this.testMetadata.delete(test.id);
     }
   }
+  baselineInput(test, shots) {
+    const project = test.parent.project();
+    const snapshotDir = this.playwrightSnapshotDir ?? project?.snapshotDir;
+    if (project === void 0 || typeof project.testDir !== "string" || typeof snapshotDir !== "string") return null;
+    return {
+      testFile: test.location.file,
+      reporterTitlePath: this.testMetadata.get(test.id)?.reporterTitlePath ?? this.reporterTitlePath(test),
+      declarations: shots,
+      config: {
+        configDir: this.configDir,
+        testDir: project.testDir,
+        snapshotDir,
+        projectName: project.name,
+        snapshotSuffix: process.platform,
+        snapshotPathTemplate: this.playwrightSnapshotPathTemplate,
+        toHaveScreenshotPathTemplate: this.playwrightToHaveScreenshotPathTemplate
+      },
+      snapshotPathExists: existsSync
+    };
+  }
+  async copySnapshotBaselines(test, status, screenshotDeclarations, savedAttachments) {
+    if (status !== "passed" || screenshotDeclarations.length === 0) return;
+    const input = this.baselineInput(test, screenshotDeclarations);
+    if (input === null) return;
+    const targets = resolveBaselineTargets(input);
+    if (targets.length === 0) return;
+    const safeTestId = sanitizeId(test.id);
+    const testScreenshotDir = join2(this.screenshotDir, safeTestId);
+    const limit = pLimit2(5);
+    await Promise.all(
+      targets.map(
+        (target) => limit(() => copyResolvedBaseline(safeTestId, testScreenshotDir, target, savedAttachments))
+      )
+    );
+  }
   async onEnd(result) {
-    this.send({
-      type: "run-end",
-      data: {
-        status: result.status
-      }
-    });
-    await this.writeStaticArtifact();
-    if (this.hadOfflineMode) {
-      await this.writeOfflineReport();
-    }
+    this.send({ type: "run-end", data: { status: result.status } });
+    await writeStaticArtifact(this.runEvents, this.screenshotDir, this.reportHtmlPath);
+    if (this.hadOfflineMode) await writeOfflineReport(this.runEvents, this.offlineReportPath, this.workerIndex);
     await new Promise((resolve2) => {
       if (!this.ws || this.ws.readyState === WebSocket.CLOSED) {
         resolve2();
@@ -422,21 +476,14 @@ var CrvyRprtr = class {
       this.ws.close();
     });
   }
-  send(msg) {
-    const msgObj = msg;
-    if (msgObj.type === "test-begin" || msgObj.type === "test-end" || msgObj.type === "run-end") {
-      this.runEvents.push({
-        type: msgObj.type,
-        data: msgObj.data
-      });
-    }
-    const payload = JSON.stringify(msg);
+  send(message) {
+    const event = message;
+    if (event.type === "test-begin" || event.type === "test-end" || event.type === "run-end")
+      this.runEvents.push({ type: event.type, data: event.data });
+    const payload = JSON.stringify(message);
     if (!this.isOfflineMode) {
-      if (this.ws?.readyState === WebSocket.OPEN) {
-        this.ws.send(payload);
-      } else {
-        this.queue.push(payload);
-      }
+      if (this.ws?.readyState === WebSocket.OPEN) this.ws.send(payload);
+      else this.queue.push(payload);
     }
   }
 };