@empiricalrun/playwright-utils 0.58.1 → 0.58.2

package/dist/reporter/harness.d.ts

@@ -29,6 +29,48 @@ export interface RunResult {
     stderr: string;
 }
 export type WaitFor = "first-passed" | "first-failed";
+/** A `@@ NAME @@` line printed by a fixture suite, with its offset from run start. */
+export interface Marker {
+    name: string;
+    atMs: number;
+}
+export interface SignalRunResult extends RunResult {
+    exitCode: number | null;
+    exitSignal: NodeJS.Signals | null;
+    markers: Marker[];
+    /** Offset from run start at which the first signal was delivered. */
+    signalSentAtMs: number;
+    /** Wall clock at run start, so `atMs` offsets can be compared to file mtimes. */
+    startedAtEpochMs: number;
+}
+export interface SignalRunOptions {
+    workers: number;
+    /**
+     * Signal as soon as this `@@ MARKER @@` is printed. Preferred over `waitFor`:
+     * it pins the signal to a known point in the run instead of a sleep.
+     */
+    waitForMarker?: string;
+    /** Legacy trigger: wait for the first pass/fail line in stdout. */
+    waitFor?: WaitFor;
+    /** Settling delay between the trigger and the signal. */
+    delayBeforeSignalMs?: number;
+    /** Defaults to SIGINT, which is what production sends. */
+    signal?: NodeJS.Signals;
+    /** Send the same signal again this long after the first one. */
+    secondSignalAfterMs?: number;
+    /** SIGKILL the group this long after the first signal, like the cmd.ts grace cap. */
+    killAfterMs?: number;
+    /** How long to wait for the trigger before giving up and signalling anyway. */
+    triggerTimeoutMs?: number;
+}
+/**
+ * Spawns `playwright test` with the IBR reporter in its own process group,
+ * signals the group mid-run, and waits for exit.
+ *
+ * The process group and the signal both match production: `cmd.ts` spawns the
+ * runner detached and does `process.kill(-pid, signal)`.
+ */
+export declare function runPlaywrightWithSignal(ctx: IBRTestContext, opts: SignalRunOptions): Promise<SignalRunResult>;
 /**
  * Spawns `playwright test` with the IBR reporter, waits for a test outcome,
  * sends SIGINT, and waits for the process to exit.
@@ -39,6 +81,8 @@ export declare function runPlaywrightWithSigint(ctx: IBRTestContext, opts: {
     workers: number;
     waitFor: WaitFor;
 }): Promise<RunResult>;
+/** Marker names in the order they were printed. */
+export declare function markerNames(result: SignalRunResult): string[];
 export declare function runPlaywrightList(ctx: TestCaseSyncTestContext): Promise<RunResult>;
 export interface BlobEvent {
     method: string;

package/dist/reporter/harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../src/reporter/harness.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAErD;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACzD,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC,CAaD;AAqCD,wBAAsB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACrE,GAAG,EAAE,uBAAuB,CAAC;IAC7B,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC,CAaD;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAI3E;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,OAAO,GAAG,cAAc,GAAG,cAAc,CAAC;AAOtD;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAC1C,OAAO,CAAC,SAAS,CAAC,CAiDpB;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,uBAAuB,GAC3B,OAAO,CAAC,SAAS,CAAC,CA6BpB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;GAEG;AACH,wBAAsB,cAAc,CAClC,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,SAAS,EAAE,CAAC,CAUtB"}
+{"version":3,"file":"harness.d.ts","sourceRoot":"","sources":["../../src/reporter/harness.ts"],"names":[],"mappings":"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"}

package/dist/reporter/harness.js

@@ -7,7 +7,9 @@ exports.sleep = sleep;
 exports.setupFixture = setupFixture;
 exports.setupTestCaseSyncFixture = setupTestCaseSyncFixture;
 exports.cleanBlobArtifacts = cleanBlobArtifacts;
+exports.runPlaywrightWithSignal = runPlaywrightWithSignal;
 exports.runPlaywrightWithSigint = runPlaywrightWithSigint;
+exports.markerNames = markerNames;
 exports.runPlaywrightList = runPlaywrightList;
 exports.readBlobEvents = readBlobEvents;
 const zip_1 = require("@empiricalrun/r2-uploader/zip");
@@ -85,15 +87,18 @@ const WAIT_FOR_PATTERNS = {
     "first-passed": /passed|✓/,
     "first-failed": /failed|✘|×/,
 };
+const MARKER_RE = /@@ ([A-Z0-9-]+) @@/g;
 /**
- * Spawns `playwright test` with the IBR reporter, waits for a test outcome,
- * sends SIGINT, and waits for the process to exit.
+ * Spawns `playwright test` with the IBR reporter in its own process group,
+ * signals the group mid-run, and waits for exit.
  *
- * Returns captured stdout/stderr.
+ * The process group and the signal both match production: `cmd.ts` spawns the
+ * runner detached and does `process.kill(-pid, signal)`.
  */
-async function runPlaywrightWithSigint(ctx, opts) {
-    const { workers, waitFor } = opts;
-    const pattern = WAIT_FOR_PATTERNS[waitFor];
+async function runPlaywrightWithSignal(ctx, opts) {
+    const { workers, waitForMarker, waitFor, delayBeforeSignalMs = 0, signal = "SIGINT", secondSignalAfterMs, killAfterMs, triggerTimeoutMs = 30_000, } = opts;
+    const startedAt = Date.now();
+    const since = () => Date.now() - startedAt;
     const child = (0, child_process_1.spawn)(PLAYWRIGHT_BIN, ["test", `--workers=${workers}`], {
         cwd: ctx.tempDir,
         env: {
@@ -101,40 +106,120 @@ async function runPlaywrightWithSigint(ctx, opts) {
             LOCAL_TEST: "false",
             SHARD_INDEX: "1",
             TOTAL_SHARDS: "1",
+            FORCE_COLOR: "0",
         },
         stdio: ["pipe", "pipe", "pipe"],
         detached: true,
     });
     let stdout = "";
     let stderr = "";
-    child.stdout?.on("data", (data) => {
-        stdout += data.toString();
-    });
-    child.stderr?.on("data", (data) => {
-        stderr += data.toString();
-    });
-    // Wait for at least one test to complete before sending SIGINT
-    await new Promise((resolve) => {
-        const checkInterval = setInterval(() => {
-            if (pattern.test(stdout)) {
-                clearInterval(checkInterval);
-                resolve(true);
-            }
-        }, 200);
-        setTimeout(() => {
-            clearInterval(checkInterval);
-            resolve(false);
-        }, 30_000);
+    const markers = [];
+    const collect = (chunk, isStderr) => {
+        const text = chunk.toString();
+        if (isStderr) {
+            stderr += text;
+        }
+        else {
+            stdout += text;
+        }
+        for (const match of text.matchAll(MARKER_RE)) {
+            markers.push({ name: match[1], atMs: since() });
+        }
+    };
+    child.stdout?.on("data", (data) => collect(data, false));
+    child.stderr?.on("data", (data) => collect(data, true));
+    let exitCode = null;
+    let exitSignal = null;
+    let hasExited = false;
+    const closed = new Promise((resolve) => {
+        child.on("close", (code, sig) => {
+            hasExited = true;
+            exitCode = code;
+            exitSignal = sig;
+            resolve();
+        });
     });
-    // Waiting for 1 sec to ensure second test has started
-    await sleep(1_000);
-    // Send SIGINT to the process group (negative PID) so all processes
-    // (Playwright + browsers) receive it, matching production behavior.
-    process.kill(-child.pid, "SIGINT");
-    await new Promise((resolve) => {
-        child.on("close", () => resolve());
+    const signalGroup = (sig) => {
+        if (hasExited || !child.pid) {
+            return;
+        }
+        try {
+            process.kill(-child.pid, sig);
+        }
+        catch {
+            // The group is already gone.
+        }
+    };
+    const pattern = waitFor ? WAIT_FOR_PATTERNS[waitFor] : undefined;
+    const isTriggered = () => waitForMarker
+        ? markers.some((m) => m.name === waitForMarker)
+        : pattern
+            ? pattern.test(stdout)
+            : true;
+    await Promise.race([
+        new Promise((resolve) => {
+            const interval = setInterval(() => {
+                if (isTriggered()) {
+                    clearInterval(interval);
+                    resolve();
+                }
+            }, 50);
+            setTimeout(() => {
+                clearInterval(interval);
+                resolve();
+            }, triggerTimeoutMs);
+        }),
+        closed,
+    ]);
+    if (delayBeforeSignalMs > 0) {
+        await sleep(delayBeforeSignalMs);
+    }
+    const signalSentAtMs = since();
+    signalGroup(signal);
+    const timers = [];
+    if (secondSignalAfterMs !== undefined) {
+        timers.push(setTimeout(() => signalGroup(signal), secondSignalAfterMs));
+    }
+    if (killAfterMs !== undefined) {
+        timers.push(setTimeout(() => signalGroup("SIGKILL"), killAfterMs));
+    }
+    // Backstop: never leave a runner behind if the suite misbehaves.
+    timers.push(setTimeout(() => signalGroup("SIGKILL"), 120_000));
+    try {
+        await closed;
+    }
+    finally {
+        for (const timer of timers) {
+            clearTimeout(timer);
+        }
+    }
+    return {
+        stdout,
+        stderr,
+        exitCode,
+        exitSignal,
+        markers,
+        signalSentAtMs,
+        startedAtEpochMs: startedAt,
+    };
+}
+/**
+ * Spawns `playwright test` with the IBR reporter, waits for a test outcome,
+ * sends SIGINT, and waits for the process to exit.
+ *
+ * Returns captured stdout/stderr.
+ */
+async function runPlaywrightWithSigint(ctx, opts) {
+    return runPlaywrightWithSignal(ctx, {
+        workers: opts.workers,
+        waitFor: opts.waitFor,
+        // Waiting for 1 sec to ensure second test has started
+        delayBeforeSignalMs: 1_000,
     });
-    return { stdout, stderr };
+}
+/** Marker names in the order they were printed. */
+function markerNames(result) {
+    return result.markers.map((m) => m.name);
 }
 async function runPlaywrightList(ctx) {
     const child = (0, child_process_1.spawn)(PLAYWRIGHT_BIN, ["test", "--list"], {

package/dist/reporter/incremental-blob-reporter.d.ts

@@ -31,7 +31,13 @@ declare class IncrementalBlobReporter implements Reporter {
     private _removeSignalHandler;
     private _buildSyntheticResult;
     private _finalizeAndMaybeUpload;
-    private _finalizeReport;
+    /**
+     * Computes the lines to write, without touching `_reportLines`: recording
+     * continues after the SIGINT salvage, and the onEnd pass re-finalizes from
+     * the full stream — mutating here would make the second pass work from the
+     * first pass's pruned leftovers.
+     */
+    private _buildFinalReportLines;
     private _computeCompletedSets;
     private _removeIncompleteTestArtifacts;
     private _patchProjectSuites;

package/dist/reporter/incremental-blob-reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"incremental-blob-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/incremental-blob-reporter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,UAAU,EACV,QAAQ,EACT,MAAM,2BAA2B,CAAC;AAwBnC;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD,cAAM,uBAAwB,YAAW,QAAQ;IAC/C,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,WAAW,CAIjB;IACF,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,mBAAmB,CAA0B;IACrD,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,YAAY,CAGN;IACd,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,gBAAgB,CAA8B;IAEtD,cAWC;IAED,OAAO,CAAC,cAAc,CAA6B;IAEnD,OAAO,CAAC,mBAAmB;IA+B3B,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,qBAAqB;YASf,uBAAuB;IAqErC,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,8BAA8B;IAWtC,OAAO,CAAC,mBAAmB;IAoB3B,OAAO,KAAK,QAAQ,GAKnB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,aAAa;YAUP,SAAS;IAwBvB,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAc9C;IAED,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAEpD;IAED,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAuBlD;IAED,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAUpE;IAED,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAUlE;IAEK,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB7C;IAED;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAE3D;IAED,aAAa,IAAI,OAAO,CAEvB;CACF;AAID,wBAAgB,0BAA0B,IAAI,uBAAuB,GAAG,IAAI,CAE3E;AAED,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CAEN;eAEc,uBAAuB"}
+{"version":3,"file":"incremental-blob-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/incremental-blob-reporter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,UAAU,EACV,QAAQ,EACT,MAAM,2BAA2B,CAAC;AAwBnC;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AASnD,cAAM,uBAAwB,YAAW,QAAQ;IAC/C,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,WAAW,CAIjB;IACF,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,iBAAiB,CAA0B;IACnD,OAAO,CAAC,mBAAmB,CAA0B;IACrD,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,YAAY,CAAsD;IAC1E,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,gBAAgB,CAA8B;IAEtD,cAWC;IAED,OAAO,CAAC,cAAc,CAA6B;IAEnD,OAAO,CAAC,mBAAmB;IA+B3B,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,qBAAqB;YASf,uBAAuB;IAqErC;;;;;OAKG;IACH,OAAO,CAAC,sBAAsB;IAuB9B,OAAO,CAAC,qBAAqB;IA0B7B,OAAO,CAAC,8BAA8B;IAWtC,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,KAAK,QAAQ,GAKnB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,aAAa;YAUP,SAAS;IAwBvB,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAc9C;IAED,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAEpD;IAED,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CA0BlD;IAED,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAUpE;IAED,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAUlE;IAEK,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC7C;IAED;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAE3D;IAED,aAAa,IAAI,OAAO,CAEvB;CACF;AAID,wBAAgB,0BAA0B,IAAI,uBAAuB,GAAG,IAAI,CAE3E;AAED,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CAEN;eAEc,uBAAuB"}

package/dist/reporter/incremental-blob-reporter.js

@@ -28,7 +28,7 @@ class IncrementalBlobReporter {
     _completedTestIds = new Set();
     _completedResultIds = new Set();
     _testRetries = new Map(); // testId → configured retries
-    _testResults = new Map(); // testId → retryIndex → {resultId, status, expectedStatus}
+    _testResults = new Map(); // testId → retryIndex → RecordedRetry
     _startTime = Date.now();
     _finalizePromise = null;
     constructor() {
@@ -101,8 +101,8 @@ class IncrementalBlobReporter {
         if (this._uploader) {
             await this._uploader.waitForUploads();
         }
-        this._finalizeReport(result, pruneIncompleteTests);
-        await this._writeZip();
+        const lines = this._buildFinalReportLines(result, pruneIncompleteTests);
+        await this._writeZip(lines);
         if (!upload) {
             logFinalizeComplete();
             return;
@@ -120,32 +120,49 @@ class IncrementalBlobReporter {
         }
         logFinalizeComplete();
     }
-    _finalizeReport(result, pruneIncompleteTests) {
+    /**
+     * Computes the lines to write, without touching `_reportLines`: recording
+     * continues after the SIGINT salvage, and the onEnd pass re-finalizes from
+     * the full stream — mutating here would make the second pass work from the
+     * first pass's pruned leftovers.
+     */
+    _buildFinalReportLines(result, pruneIncompleteTests) {
+        let lines = [...this._reportLines];
         if (pruneIncompleteTests) {
             // Determine which tests are fully complete (passed or all retries finished)
             this._computeCompletedSets();
             // Remove unrun tests from onProject suites
-            this._patchProjectSuites();
+            lines = this._patchProjectSuites(lines);
             // Remove events (onTestBegin, onStepBegin, etc.) for incomplete tests
-            this._removeIncompleteTestArtifacts();
+            lines = this._removeIncompleteTestArtifacts(lines);
         }
-        // Push onEnd directly. SIGINT marks the reporter finalized before this,
-        // so using _appendEvent would drop the synthetic onEnd event.
-        this._reportLines.push(JSON.stringify((0, lifecycle_events_1.buildOnEndEvent)(result)));
+        // The onEnd event belongs only in the written report, never in the
+        // in-memory stream — a later finalize pass appends its own.
+        lines.push(JSON.stringify((0, lifecycle_events_1.buildOnEndEvent)(result)));
+        return lines;
     }
     _computeCompletedSets() {
         for (const [testId, results] of this._testResults) {
             const maxRetries = this._testRetries.get(testId);
-            if ((0, reporter_1.areRetriesComplete)(maxRetries, results)) {
+            // Shutdown artifacts are not finished retries: an "interrupted" result
+            // is a test cut off mid-flight, and a post-signal "skipped" is a serial
+            // sibling Playwright marks off while shutting down. The resume shard
+            // re-runs both, so counting them as complete would put their results in
+            // the final zip alongside the resume shard's, duplicating tests in the
+            // merge. A post-signal passed/failed is real, though: the test finished
+            // its body and only its aftermath overlapped the shutdown.
+            const finished = new Map([...results].filter(([, r]) => r.status !== "interrupted" &&
+                !(r.postSignal && r.status === "skipped")));
+            if ((0, reporter_1.areRetriesComplete)(maxRetries, finished)) {
                 this._completedTestIds.add(testId);
-                for (const { resultId } of results.values()) {
+                for (const { resultId } of finished.values()) {
                     this._completedResultIds.add(resultId);
                 }
             }
         }
     }
-    _removeIncompleteTestArtifacts() {
-        this._reportLines = this._reportLines.filter((line) => {
+    _removeIncompleteTestArtifacts(lines) {
+        return lines.filter((line) => {
             const parsed = JSON.parse(line);
             const resultId = parsed.params?.resultId ?? parsed.params?.result?.id;
             if (!resultId) {
@@ -154,20 +171,19 @@ class IncrementalBlobReporter {
             return this._completedResultIds.has(resultId);
         });
     }
-    _patchProjectSuites() {
-        for (let i = 0; i < this._reportLines.length; i++) {
-            const line = this._reportLines[i];
+    _patchProjectSuites(lines) {
+        return lines.map((line) => {
             const parsed = JSON.parse(line);
             if (parsed.method !== "onProject") {
-                continue;
+                return line;
             }
             const project = parsed.params.project;
             const filteredSuites = project.suites
                 .map((suite) => (0, ibr_utils_1.filterSuiteByCompletedTests)(suite, this._completedTestIds))
                 .filter(Boolean);
             project.suites = filteredSuites;
-            this._reportLines[i] = JSON.stringify(parsed);
-        }
+            return JSON.stringify(parsed);
+        });
     }
     get _zipPath() {
         return path_1.default.join(this._outputDir, `incremental-report-${this._shardIndex}.zip`);
@@ -183,9 +199,10 @@ class IncrementalBlobReporter {
         fs_1.default.mkdirSync(this._outputDir, { recursive: true });
     }
     _appendEvent(event) {
-        if ((0, reporter_state_1.isFinalized)()) {
-            return false;
-        }
+        // Deliberately not gated on isFinalized(): the SIGINT salvage seals a
+        // *snapshot*, not the stream. Playwright keeps running afterEach/afterAll
+        // teardown after the signal, and those events feed the second finalize
+        // pass in onEnd.
         this._reportLines.push(JSON.stringify(event));
         return true;
     }
@@ -198,10 +215,10 @@ class IncrementalBlobReporter {
         }
         return allAppended;
     }
-    async _writeZip() {
+    async _writeZip(lines) {
         this._ensureDirs();
         // Write report.jsonl to the output directory
-        const jsonlContent = this._reportLines.join("\n") + "\n";
+        const jsonlContent = lines.join("\n") + "\n";
         fs_1.default.writeFileSync(this._jsonlPath, jsonlContent, "utf8");
         // Write _empirical_urls.json with attachment URL mappings
         const urlsJson = (0, ibr_utils_1.buildUrlsJson)(this._attachmentUrlMap);
@@ -209,7 +226,7 @@ class IncrementalBlobReporter {
         // Create zip from the staging directory
         const zipBuffer = await (0, zip_1.createZipFromDirectory)(this._stagingDir);
         fs_1.default.writeFileSync(this._zipPath, zipBuffer);
-        console.log(`[IncrementalBlobReporter] Zip updated: ${this._zipPath} (${this._reportLines.length} events, ${this._attachmentUrlMap.size} attachments)`);
+        console.log(`[IncrementalBlobReporter] Zip updated: ${this._zipPath} (${lines.length} events, ${this._attachmentUrlMap.size} attachments)`);
     }
     onBegin(config, suite) {
         this._ensureDirs();
@@ -234,6 +251,9 @@ class IncrementalBlobReporter {
                     resultId,
                     status: result.status,
                     expectedStatus: test.expectedStatus,
+                    // The SIGINT salvage has started; this result arrived during
+                    // interruption shutdown rather than the normal run.
+                    postSignal: this._finalizePromise !== null,
                 });
             }
         }
@@ -246,9 +266,19 @@ class IncrementalBlobReporter {
     }
     async onEnd(result) {
         this._removeSignalHandler();
-        // If SIGINT already started the partial-report finalization, let that
-        // finish instead of appending a second onEnd or racing another zip write.
+        // Second phase of an interrupted run: the SIGINT pass salvaged a snapshot
+        // within milliseconds (SIGKILL insurance); by the time Playwright calls
+        // onEnd the teardown chain has finished, so re-finalize from the full
+        // stream and overwrite the salvage blob with the post-teardown report.
         if (this._finalizePromise) {
+            await this._finalizePromise;
+            this._finalizePromise = this._finalizeAndMaybeUpload({
+                result,
+                source: "onEnd",
+                markGlobalFinalized: false,
+                pruneIncompleteTests: true,
+                upload: true,
+            });
             await this._finalizePromise;
             return;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.58.1",
+  "version": "0.58.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -30,16 +30,16 @@
   },
   "author": "Empirical Team <hey@empirical.run>",
   "devDependencies": {
-    "@playwright/test": "1.60.0",
+    "@playwright/test": "1.62.1",
     "@types/async-retry": "^1.4.8",
     "@types/authenticator": "^1.1.4",
     "@types/babel__code-frame": "^7.0.6",
     "@types/console-log-level": "^1.4.5",
     "@types/mime": "3.0.0",
-    "@types/node": "^20.14.9",
+    "@types/node": "^22",
     "@types/serve-handler": "^6.1.4",
     "openapi-typescript": "7.6.1",
-    "playwright-core": "1.60.0",
+    "playwright-core": "1.62.1",
     "serve-handler": "^6.1.6",
     "@empiricalrun/shared-types": "0.15.3"
   },