@wdio/nightwatch-devtools 1.3.0 → 1.4.0

package/dist/{bidi-OH4ZFDN5.js → bidi-FIHBBGT4.js}

@@ -71,6 +71,15 @@ async function attachLogInspector(driver, factory, sinks, log2) {
     return false;
   }
 }
+var isFiniteNumber = (value) => typeof value === "number" && Number.isFinite(value);
+function bidiResponseTiming(timings, startTime, timestamp) {
+  if (timings && isFiniteNumber(timings.requestTime) && isFiniteNumber(timings.responseEnd) && timings.responseEnd > timings.requestTime) {
+    const time = Math.round(timings.responseEnd - timings.requestTime);
+    return { endTime: startTime + time, time };
+  }
+  const endTime = Number(timestamp ?? Date.now());
+  return { endTime, time: Math.max(0, endTime - startTime) };
+}
 function handleBidiRequestSent(rawEvent, pending, sinks, log2) {
   const event = rawEvent;
   try {
@@ -101,14 +110,19 @@ function handleBidiResponseCompleted(rawEvent, pending, sinks, log2) {
     if (!previous) {
       return;
     }
+    const { endTime, time } = bidiResponseTiming(
+      event?.request?.timings,
+      previous.startTime,
+      event?.timestamp
+    );
     const finalized = {
       ...previous,
       status: Number(event?.response?.status) || previous.status,
       statusText: event?.response?.statusText ?? previous.statusText,
       responseHeaders: arrayHeadersToObject(event?.response?.headers),
       type: getRequestType(previous.url, event?.response?.mimeType),
-      endTime: Number(event?.timestamp ?? Date.now()),
-      time: Number(event?.timestamp ?? Date.now()) - previous.startTime,
+      endTime,
+      time,
       size: Number(event?.response?.bytesReceived) || void 0
     };
     pending.delete(requestId);
@@ -212,4 +226,4 @@ export {
   attachBidiHandlers2 as attachBidiHandlers,
   buildBidiSinks
 };
-//# sourceMappingURL=bidi-OH4ZFDN5.js.map
+//# sourceMappingURL=bidi-FIHBBGT4.js.map

package/dist/bidi-FIHBBGT4.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/bidi.ts","../../core/src/bidi.ts"],"sourcesContent":["import logger from '@wdio/logger'\nimport {\n  type BidiHandlerSinks,\n  attachBidiHandlers as attachBidiHandlersCore\n} from '@wdio/devtools-core'\nimport type { SessionCapturer } from './session.js'\n\nconst log = logger('@wdio/nightwatch-devtools:bidi')\n\n/**\n * Nightwatch wrapper around the core BiDi attach helper. Nightwatch ships\n * selenium-webdriver under the hood (via chromedriver), so the same\n * `selenium-webdriver/bidi` inspectors selenium-devtools uses are available\n * whenever the user has set `webSocketUrl: true` in their capabilities.\n *\n * Opt-in via the plugin's `bidi: true` option. When attached, the per-command\n * Chrome performance-log network capture is gated off to avoid duplicate\n * entries in the dashboard.\n */\nexport async function attachBidiHandlers(\n  driver: unknown,\n  sinks: BidiHandlerSinks\n): Promise<boolean> {\n  return attachBidiHandlersCore(driver, sinks, (level, message) =>\n    log[level](message)\n  )\n}\n\n/**\n * Build sinks that route BiDi events into the SessionCapturer's local arrays\n * and broadcast them upstream. Mirrors selenium-devtools' `buildBidiSinks` —\n * separate per-adapter because the SessionCapturer concrete types differ.\n */\nexport function buildBidiSinks(capturer: SessionCapturer): BidiHandlerSinks {\n  return {\n    pushConsoleLog: (entry) => {\n      capturer.consoleLogs.push(entry)\n      capturer.sendUpstream('consoleLogs', [entry])\n    },\n    pushNetworkRequest: (entry) => {\n      capturer.networkRequests.push(entry)\n      capturer.sendUpstream('networkRequests', [entry])\n    },\n    replaceNetworkRequest: (id, entry) => {\n      const idx = capturer.networkRequests.findIndex(\n        (r: { id?: string }) => r.id === id\n      )\n      if (idx !== -1) {\n        capturer.networkRequests[idx] = entry\n      } else {\n        capturer.networkRequests.push(entry)\n      }\n      capturer.sendUpstream('networkRequests', [entry])\n    }\n  }\n}\n","import { createRequire } from 'node:module'\nimport type {\n  ConsoleLog,\n  LogLevel,\n  NetworkRequest\n} from '@wdio/devtools-shared'\nimport {\n  LOG_SOURCES,\n  chromeLogLevelToLogLevel,\n  type LogSource\n} from './console.js'\nimport { errorMessage } from './error.js'\nimport { getRequestType } from './net.js'\n\n/**\n * Generic sinks the BiDi handlers push into. Each adapter wires these to its\n * own SessionCapturer state — selenium's `buildBidiSinks` is the canonical\n * example; nightwatch can mirror the pattern when it wires up BiDi.\n */\nexport interface BidiHandlerSinks {\n  pushConsoleLog: (entry: ConsoleLog) => void\n  pushNetworkRequest: (entry: NetworkRequest) => void\n  replaceNetworkRequest: (id: string, entry: NetworkRequest) => void\n}\n\n/**\n * Resolve a `selenium-webdriver/<subpath>` module from the user's install\n * (preferred) or the package's local install (fallback). Returns `null` if\n * neither resolves — caller should treat as \"BiDi not available on this\n * runtime\" and degrade gracefully.\n *\n * Used by both selenium-devtools and (when wired up) nightwatch-devtools —\n * both ship selenium-webdriver-style drivers under the hood.\n */\nexport function loadSeleniumSubmodule<T = unknown>(subpath: string): T | null {\n  try {\n    const userRequire = createRequire(`${process.cwd()}/`)\n    return userRequire(`selenium-webdriver/${subpath}`) as T\n  } catch {\n    try {\n      const localRequire = createRequire(import.meta.url)\n      return localRequire(`selenium-webdriver/${subpath}`) as T\n    } catch {\n      return null\n    }\n  }\n}\n\ntype BidiLogger = (level: 'info' | 'warn', message: string) => void\ntype InspectorFactory = (driver: unknown) => Promise<unknown>\n\ninterface LogInspector {\n  onConsoleEntry: (cb: (entry: unknown) => void) => Promise<void>\n  onJavascriptException: (cb: (exc: unknown) => void) => Promise<void>\n}\n\ninterface NetworkInspector {\n  beforeRequestSent: (cb: (e: unknown) => void) => Promise<void>\n  responseCompleted: (cb: (e: unknown) => void) => Promise<void>\n}\n\nexport function handleBidiConsoleEntry(\n  rawEntry: unknown,\n  sinks: BidiHandlerSinks,\n  log: BidiLogger\n): void {\n  const entry = rawEntry as {\n    level?: string\n    type?: string\n    text?: string\n    message?: string\n    timestamp?: number\n  }\n  try {\n    const level = (entry?.level ?? entry?.type ?? 'info').toString()\n    const text = entry?.text ?? entry?.message ?? ''\n    sinks.pushConsoleLog({\n      timestamp: Number(entry?.timestamp) || Date.now(),\n      type: chromeLogLevelToLogLevel(level) as LogLevel,\n      args: [text],\n      source: LOG_SOURCES.BROWSER as LogSource\n    })\n  } catch (err) {\n    log('warn', `onConsoleEntry handler threw: ${errorMessage(err)}`)\n  }\n}\n\nexport function handleBidiJsException(\n  rawExc: unknown,\n  sinks: BidiHandlerSinks,\n  log: BidiLogger\n): void {\n  const exception = rawExc as { text?: string; message?: string }\n  try {\n    const text = exception?.text ?? exception?.message ?? String(rawExc)\n    const trimmed = String(text).replace(/\\s+/g, ' ').slice(0, 200)\n    log(\n      'warn',\n      `🐛 JS error in page: ${trimmed}${String(text).length > 200 ? '…' : ''}`\n    )\n    sinks.pushConsoleLog({\n      timestamp: Date.now(),\n      type: 'error',\n      args: [text],\n      source: LOG_SOURCES.BROWSER as LogSource\n    })\n  } catch (err) {\n    log('warn', `onJavascriptException handler threw: ${errorMessage(err)}`)\n  }\n}\n\nasync function attachLogInspector(\n  driver: unknown,\n  factory: InspectorFactory,\n  sinks: BidiHandlerSinks,\n  log: BidiLogger\n): Promise<boolean> {\n  try {\n    const inspector = (await factory(driver)) as LogInspector\n    await inspector.onConsoleEntry((e) => handleBidiConsoleEntry(e, sinks, log))\n    await inspector.onJavascriptException((e) =>\n      handleBidiJsException(e, sinks, log)\n    )\n    log('info', '✓ BiDi LogInspector attached (console + JS exceptions)')\n    return true\n  } catch (err) {\n    log('warn', `BiDi LogInspector attach failed: ${errorMessage(err)}`)\n    return false\n  }\n}\n\n/** Subset of WebDriver BiDi `FetchTimingInfo` (selenium exposes these via\n *  getters). Values are ms offsets from the request baseline `requestTime`\n *  (usually 0), so `responseEnd - requestTime` is the request duration. */\ninterface FetchTimings {\n  requestTime?: number\n  responseEnd?: number\n}\n\nconst isFiniteNumber = (value: unknown): value is number =>\n  typeof value === 'number' && Number.isFinite(value)\n\ninterface BeforeRequestSentEvent {\n  request?: {\n    request?: string\n    url?: string\n    method?: string\n    headers?: unknown\n    timings?: FetchTimings\n  }\n  id?: string\n  timestamp?: number\n}\n\ninterface ResponseCompletedEvent {\n  request?: { request?: string; timings?: FetchTimings }\n  id?: string\n  timestamp?: number\n  response?: {\n    status?: number\n    statusText?: string\n    headers?: unknown\n    mimeType?: string\n    bytesReceived?: number\n  }\n}\n\n/** Request duration (ms) from the browser's FetchTimingInfo, plus a derived\n *  endTime anchored to `startTime`. The browser timings are immune to BiDi\n *  events arriving batched in one tick (which collapses the event-level\n *  `timestamp`/`Date.now()` to a single value and yields 0-duration requests).\n *  Falls back to the timestamp diff only when timings are unavailable. */\nfunction bidiResponseTiming(\n  timings: FetchTimings | undefined,\n  startTime: number,\n  timestamp?: number\n): { endTime: number; time: number } {\n  if (\n    timings &&\n    isFiniteNumber(timings.requestTime) &&\n    isFiniteNumber(timings.responseEnd) &&\n    timings.responseEnd > timings.requestTime\n  ) {\n    const time = Math.round(timings.responseEnd - timings.requestTime)\n    return { endTime: startTime + time, time }\n  }\n  const endTime = Number(timestamp ?? Date.now())\n  return { endTime, time: Math.max(0, endTime - startTime) }\n}\n\nexport function handleBidiRequestSent(\n  rawEvent: unknown,\n  pending: Map<string, NetworkRequest>,\n  sinks: BidiHandlerSinks,\n  log: BidiLogger\n): void {\n  const event = rawEvent as BeforeRequestSentEvent\n  try {\n    const requestId = String(event?.request?.request ?? event?.id ?? '')\n    if (!requestId) {\n      return\n    }\n    const entry: NetworkRequest = {\n      id: requestId,\n      url: event?.request?.url ?? '',\n      method: event?.request?.method ?? 'GET',\n      requestHeaders: arrayHeadersToObject(event?.request?.headers),\n      timestamp: Date.now(),\n      startTime: Number(event?.timestamp ?? Date.now()),\n      type: getRequestType(event?.request?.url ?? '')\n    }\n    pending.set(requestId, entry)\n    sinks.pushNetworkRequest(entry)\n  } catch (err) {\n    log('warn', `beforeRequestSent threw: ${errorMessage(err)}`)\n  }\n}\n\nexport function handleBidiResponseCompleted(\n  rawEvent: unknown,\n  pending: Map<string, NetworkRequest>,\n  sinks: BidiHandlerSinks,\n  log: BidiLogger\n): void {\n  const event = rawEvent as ResponseCompletedEvent\n  try {\n    const requestId = String(event?.request?.request ?? event?.id ?? '')\n    const previous = pending.get(requestId)\n    if (!previous) {\n      return\n    }\n    const { endTime, time } = bidiResponseTiming(\n      event?.request?.timings,\n      previous.startTime,\n      event?.timestamp\n    )\n    const finalized: NetworkRequest = {\n      ...previous,\n      status: Number(event?.response?.status) || previous.status,\n      statusText: event?.response?.statusText ?? previous.statusText,\n      responseHeaders: arrayHeadersToObject(event?.response?.headers),\n      type: getRequestType(previous.url, event?.response?.mimeType),\n      endTime,\n      time,\n      size: Number(event?.response?.bytesReceived) || undefined\n    }\n    pending.delete(requestId)\n    sinks.replaceNetworkRequest(requestId, finalized)\n  } catch (err) {\n    log('warn', `responseCompleted threw: ${errorMessage(err)}`)\n  }\n}\n\nasync function attachNetworkInspector(\n  driver: unknown,\n  factory: InspectorFactory,\n  sinks: BidiHandlerSinks,\n  log: BidiLogger\n): Promise<boolean> {\n  try {\n    const inspector = (await factory(driver)) as NetworkInspector\n    const pending = new Map<string, NetworkRequest>()\n    await inspector.beforeRequestSent((e) =>\n      handleBidiRequestSent(e, pending, sinks, log)\n    )\n    await inspector.responseCompleted((e) =>\n      handleBidiResponseCompleted(e, pending, sinks, log)\n    )\n    log('info', '✓ BiDi NetworkInspector attached (request + response)')\n    return true\n  } catch (err) {\n    log('warn', `BiDi NetworkInspector attach failed: ${errorMessage(err)}`)\n    return false\n  }\n}\n\n/**\n * Attach the selenium-webdriver BiDi LogInspector + NetworkInspector to a\n * driver and route their events into the given sinks. Returns `true` when at\n * least one inspector connected — caller can disable the equivalent\n * script-injection collectors to avoid duplicates.\n *\n * Tolerant of older / non-BiDi runtimes: if either submodule fails to load\n * or the inspector factory throws (driver session doesn't have webSocketUrl\n * capability set, etc.), the corresponding stream is silently skipped and\n * the function returns false.\n *\n * @param onLog Optional callback for adapter-side logging. Receives ('info' |\n * 'warn', message) on lifecycle events. Default: silent — adapters wire their\n * own logger when they want visibility into BiDi attach state.\n */\nexport async function attachBidiHandlers(\n  driver: unknown,\n  sinks: BidiHandlerSinks,\n  onLog?: (level: 'info' | 'warn', message: string) => void\n): Promise<boolean> {\n  const log: BidiLogger = (level, message) => onLog?.(level, message)\n  const logFactory =\n    loadSeleniumSubmodule<InspectorFactory>('bidi/logInspector')\n  const networkFactory = loadSeleniumSubmodule<InspectorFactory>(\n    'bidi/networkInspector'\n  )\n\n  let attached = 0\n  if (typeof logFactory === 'function') {\n    if (await attachLogInspector(driver, logFactory, sinks, log)) {\n      attached++\n    }\n  } else {\n    log('info', 'selenium-webdriver/bidi/logInspector not available — skipping')\n  }\n  if (typeof networkFactory === 'function') {\n    if (await attachNetworkInspector(driver, networkFactory, sinks, log)) {\n      attached++\n    }\n  } else {\n    log(\n      'info',\n      'selenium-webdriver/bidi/networkInspector not available — skipping'\n    )\n  }\n  return attached > 0\n}\n\n/**\n * Flatten BiDi's `Array<{name, value:{value|type}}>` header shape to a\n * lowercased `Record<string, string>`. Exported so adapter-side helpers can\n * reuse it for their own header normalization.\n */\nexport function arrayHeadersToObject(\n  headers: unknown\n): Record<string, string> | undefined {\n  if (!Array.isArray(headers)) {\n    return undefined\n  }\n  const out: Record<string, string> = {}\n  for (const h of headers as Array<{\n    name?: string\n    value?: string | { value?: string; type?: string }\n  }>) {\n    const name = String(h?.name ?? '').toLowerCase()\n    if (!name) {\n      continue\n    }\n    const v = h?.value\n    out[name] =\n      typeof v === 'string'\n        ? v\n        : typeof (v as { value?: string })?.value === 'string'\n          ? (v as { value: string }).value\n          : JSON.stringify(v ?? '')\n  }\n  return out\n}\n"],"mappings":"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","names":["log","attachBidiHandlers"]}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ScreencastOptions, DevToolsMode, TraceFormat } from '@wdio/devtools-shared';
+import { ScreencastOptions, DevToolsMode, TraceFormat, TraceGranularity } from '@wdio/devtools-shared';
 
 /** Nightwatch `eventHub` shape — only `runner` + `on()` are documented; the
  *  rest of the public surface is `unknown` to us. */
@@ -30,6 +30,10 @@ interface DevToolsOptions {
     /** Trace output layout — `zip` (default) writes a single archive,
      *  `ndjson-directory` unpacks into `trace-<id>/`. Only applies in trace mode. */
     traceFormat?: TraceFormat;
+    /** Trace output granularity — `session` (default) writes one trace per
+     *  worker session; `spec` writes one trace per spec file. Only applies in
+     *  trace mode. */
+    traceGranularity?: TraceGranularity;
 }
 interface NightwatchBrowser {
     url: (url: string) => Promise<unknown>;

package/dist/index.js

@@ -2060,15 +2060,46 @@ function buildContextOptions(trace, contextId, wallTime) {
     }
   };
 }
-function buildActionEvents(commands, pageId, wallTime) {
+function buildActionEvents(commands, pageId, wallTime, testMetadata) {
   const events = [];
   let prevEndMs = 0;
   let callCounter = 0;
+  let lastTestUid;
+  let groupCallId;
   for (const cmd of commands) {
     const action = mapCommandToAction(cmd.command);
     if (!action) {
       continue;
     }
+    if (cmd.testUid && cmd.testUid !== lastTestUid) {
+      if (lastTestUid && groupCallId) {
+        callCounter++;
+        events.push({
+          type: "after",
+          callId: groupCallId,
+          endTime: prevEndMs
+        });
+      }
+      callCounter++;
+      groupCallId = `call@${callCounter}`;
+      const meta = testMetadata?.get(cmd.testUid);
+      const groupName = meta?.title ?? cmd.testUid;
+      events.push({
+        type: "before",
+        callId: groupCallId,
+        startTime: Math.max(
+          prevEndMs,
+          (cmd.startTime ?? cmd.timestamp) - wallTime
+        ),
+        class: "Tracing",
+        method: "tracingGroup",
+        pageId,
+        params: { name: groupName },
+        title: groupName,
+        apiName: "tracing.tracingGroup"
+      });
+      lastTestUid = cmd.testUid;
+    }
     callCounter++;
     const callId = `call@${callCounter}`;
     const rawStartMs = (cmd.startTime ?? cmd.timestamp) - wallTime;
@@ -2098,7 +2129,8 @@ function buildActionEvents(commands, pageId, wallTime) {
       pageId,
       params,
       title: formatActionTitle(action, cmd.args, params),
-      apiName: `${action.class.toLowerCase()}.${action.method}`
+      apiName: `${action.class.toLowerCase()}.${action.method}`,
+      parentId: groupCallId
     });
     const afterEvent = {
       type: "after",
@@ -2112,6 +2144,14 @@ function buildActionEvents(commands, pageId, wallTime) {
     events.push(afterEvent);
     prevEndMs = endMs;
   }
+  if (lastTestUid && groupCallId) {
+    callCounter++;
+    events.push({
+      type: "after",
+      callId: groupCallId,
+      endTime: prevEndMs
+    });
+  }
   return events;
 }
 function buildNetworkNdjson(requests, wallTime, pageId) {
@@ -2268,7 +2308,7 @@ function buildTraceBundle(trace, opts = {}) {
       wallTime,
       viewport
     ),
-    ...buildActionEvents(trace.commands, pageId, wallTime)
+    ...buildActionEvents(trace.commands, pageId, wallTime, opts.testMetadata)
   );
   events.sort(compareEvents);
   const ctxBName = ctxOptions.title;
@@ -2326,7 +2366,8 @@ async function writeTraceZip(capturer, opts) {
   await fs.mkdir(opts.outputDir, { recursive: true });
   const exportOpts = {
     sessionId: opts.sessionId,
-    wallTimeOverride: capturer.startWallTime
+    wallTimeOverride: capturer.startWallTime,
+    testMetadata: opts.testMetadata
   };
   if (opts.format === "ndjson-directory") {
     const dir = path.join(opts.outputDir, `trace-${opts.sessionId}`);
@@ -2424,6 +2465,15 @@ function runFfmpeg(ffmpeg, manifestPath, outputPath) {
       "cfr",
       "-r",
       "10",
+      // Force a keyframe every frame. VP8 can only seek to keyframes, and
+      // libvpx's default GOP places a single keyframe on near-static
+      // screencast content — so scrubber/marker seeks snap back to the
+      // start. At 10fps over short recordings, all-intra keeps seeking
+      // frame-accurate at an acceptable size.
+      "-g",
+      "1",
+      "-keyint_min",
+      "1",
       "-auto-alt-ref",
       "0",
       "-disposition:v",
@@ -2487,7 +2537,8 @@ async function finalizeScreencast({
       videoPath,
       videoFile: fileName,
       frameCount: frames.length,
-      duration: recorder.duration
+      duration: recorder.duration,
+      startTime: frames[0]?.timestamp
     });
   } catch (err) {
     log12("warn", `Screencast encode failed: ${errorMessage(err)}`);
@@ -2951,9 +3002,12 @@ var SessionCapturerBase = class {
   metadata;
   // ── Construction ────────────────────────────────────────────────────────
   constructor(opts = {}) {
-    const { hostname, port } = opts;
+    const { hostname, port, reconnect } = opts;
     if (hostname && port) {
-      this.ws = new WebSocket(`ws://${hostname}:${port}${WS_PATHS.worker}`);
+      const query = reconnect ? "?reconnect=1" : "";
+      this.ws = new WebSocket(
+        `ws://${hostname}:${port}${WS_PATHS.worker}${query}`
+      );
       this.ws.on("open", () => {
         this.#hasConnected = true;
         this.onWsOpen();
@@ -3285,6 +3339,100 @@ function safeStringify(value) {
   }
 }
 
+// ../core/src/spec-trace-helpers.ts
+function sanitizeSpecName(specFile) {
+  return specFile.replace(/^.*[/\\]/, "").replace(/\.[^.]+$/, "").replace(/[^a-zA-Z0-9_-]/g, "_").replace(/^_+|_+$/g, "") || "unknown-spec";
+}
+function buildSpecSessionId(specFile, sessionId) {
+  const base = sanitizeSpecName(specFile);
+  const hash = deterministicUid(specFile).split("-").pop().slice(0, 8);
+  return `${base}-${hash}-${sessionId.slice(0, 8)}`;
+}
+function buildSpecCapturer(capturer, range, nextRange) {
+  const end = nextRange ? {
+    commands: nextRange.commandStartIdx,
+    console: nextRange.consoleStartIdx,
+    network: nextRange.networkStartIdx,
+    mutations: nextRange.mutationStartIdx,
+    traceLogs: nextRange.traceLogStartIdx
+  } : void 0;
+  return {
+    mutations: capturer.mutations.slice(range.mutationStartIdx, end?.mutations),
+    traceLogs: capturer.traceLogs.slice(range.traceLogStartIdx, end?.traceLogs),
+    consoleLogs: capturer.consoleLogs.slice(
+      range.consoleStartIdx,
+      end?.console
+    ),
+    networkRequests: capturer.networkRequests.slice(
+      range.networkStartIdx,
+      end?.network
+    ),
+    commandsLog: capturer.commandsLog.slice(
+      range.commandStartIdx,
+      end?.commands
+    ),
+    sources: new Map(capturer.sources),
+    metadata: capturer.metadata,
+    startWallTime: capturer.startWallTime
+  };
+}
+function filterTestMetadataBySpec(allMetadata, specFile) {
+  const filtered = /* @__PURE__ */ new Map();
+  for (const [uid, meta] of allMetadata) {
+    if (meta.specFile === specFile) {
+      filtered.set(uid, meta);
+    }
+  }
+  return filtered;
+}
+function recordSpecBoundary(ctx, specFile, traceGranularity) {
+  if (traceGranularity !== "spec") {
+    return null;
+  }
+  const lastRange = ctx.specRanges[ctx.specRanges.length - 1];
+  if (lastRange && lastRange.specFile === specFile) {
+    return null;
+  }
+  const prevRange = lastRange && !ctx.flushedSpecs.has(lastRange.specFile) ? lastRange : null;
+  ctx.specRanges.push({
+    specFile,
+    commandStartIdx: ctx.capturer.commandsLog.length,
+    consoleStartIdx: ctx.capturer.consoleLogs.length,
+    networkStartIdx: ctx.capturer.networkRequests.length,
+    mutationStartIdx: ctx.capturer.mutations.length,
+    traceLogStartIdx: ctx.capturer.traceLogs.length,
+    snapshotCount: ctx.actionSnapshots.length
+  });
+  return prevRange;
+}
+async function writeSpecTrace(input) {
+  const specCapturer = buildSpecCapturer(
+    input.capturer,
+    input.range,
+    input.nextRange
+  );
+  const specSnapshots = input.actionSnapshots.slice(
+    input.range.snapshotCount,
+    input.nextRange?.snapshotCount ?? input.actionSnapshots.length
+  );
+  const specSessionId = buildSpecSessionId(
+    input.range.specFile,
+    input.sessionId
+  );
+  const testMetadata = filterTestMetadataBySpec(
+    input.testMetadata,
+    input.range.specFile
+  );
+  return writeTraceZip(specCapturer, {
+    outputDir: input.outputDir,
+    sessionId: specSessionId,
+    capabilities: input.capabilities,
+    actionSnapshots: specSnapshots.length > 0 ? specSnapshots : void 0,
+    format: input.format,
+    testMetadata
+  });
+}
+
 // ../core/src/suite-helpers.ts
 function createSuiteStats(init) {
   return {
@@ -3824,6 +3972,13 @@ async function openDevtoolsBrowser(ctx, url) {
             "--no-first-run",
             "--no-default-browser-check"
           ]
+        },
+        // Dashboard uses the Puppeteer-based 'devtools' protocol; drop the
+        // "controlled by automated test software" infobar by ignoring
+        // Puppeteer's --enable-automation default. (Runtime-valid capability
+        // not present in the type.)
+        "wdio:devtoolsOptions": {
+          ignoreDefaultArgs: ["--enable-automation"]
         }
       }
     });
@@ -4515,18 +4670,22 @@ function applyResponseReceived(p, response) {
   p.mimeType = response.mimeType;
   p.type = getRequestType(p.url, response.mimeType);
 }
+function eventTimeMs(params, entry) {
+  return typeof params.timestamp === "number" ? Math.round(params.timestamp * 1e3) : entry.timestamp;
+}
 function startPendingRequest(params, entry, pending) {
   const { requestId, request: req, timestamp } = params;
   if (!req || typeof timestamp !== "number") {
     return;
   }
+  const startTime = eventTimeMs(params, entry);
   pending.set(requestId, {
     id: `${entry.timestamp}-${requestId}`,
     url: req.url,
     method: req.method,
     requestHeaders: req.headers ?? {},
-    timestamp: Math.round(timestamp * 1e3),
-    startTime: entry.timestamp
+    timestamp: startTime,
+    startTime
   });
 }
 function handlePerfLogEvent(method, params, entry, pending, completed) {
@@ -4545,8 +4704,8 @@ function handlePerfLogEvent(method, params, entry, pending, completed) {
     const p = pending.get(params.requestId);
     if (p && p.status !== void 0) {
       p.size = params.encodedDataLength;
-      p.endTime = entry.timestamp;
-      p.time = entry.timestamp - p.startTime;
+      p.endTime = eventTimeMs(params, entry);
+      p.time = Math.max(0, p.endTime - p.startTime);
       completed.push({ ...p });
       pending.delete(params.requestId);
     }
@@ -4556,8 +4715,8 @@ function handlePerfLogEvent(method, params, entry, pending, completed) {
     const p = pending.get(params.requestId);
     if (p) {
       p.error = params.errorText;
-      p.endTime = entry.timestamp;
-      p.time = entry.timestamp - p.startTime;
+      p.endTime = eventTimeMs(params, entry);
+      p.time = Math.max(0, p.endTime - p.startTime);
       completed.push({ ...p });
       pending.delete(params.requestId);
     }
@@ -5754,7 +5913,7 @@ async function tryAttachBidi(ctx, browser) {
     log10.warn("bidi:true set but browser.driver unavailable \u2014 skipping");
     return;
   }
-  const { attachBidiHandlers, buildBidiSinks } = await import("./bidi-OH4ZFDN5.js");
+  const { attachBidiHandlers, buildBidiSinks } = await import("./bidi-FIHBBGT4.js");
   const ok = await attachBidiHandlers(
     driver,
     buildBidiSinks(ctx.sessionCapturer)
@@ -5790,7 +5949,13 @@ async function ensureSessionInitialized(ctx, browser, finalizeCurrentScreencast2
     (resolve2) => setTimeout(resolve2, TIMING.INITIAL_CONNECTION_WAIT)
   );
   ctx.sessionCapturer = new SessionCapturer(
-    ctx.mode === "trace" ? {} : { port: ctx.port, hostname: ctx.hostname },
+    ctx.mode === "trace" ? {} : {
+      port: ctx.port,
+      hostname: ctx.hostname,
+      // A session change reopens the WS mid-run — tell the backend to keep
+      // the accumulated run state so earlier tests' commands survive.
+      reconnect: Boolean(isSessionChange)
+    },
     browser
   );
   ctx.sessionCapturer.traceMode = ctx.mode;
@@ -5851,6 +6016,10 @@ var NightwatchDevToolsPlugin = class {
   #skipCount = 0;
   #configPath;
   #srcFolders = [];
+  /** Index ranges into the session capturer's flat arrays, one per spec file. */
+  #specRanges = [];
+  /** Set of spec files already flushed to disk. */
+  #flushedSpecs = /* @__PURE__ */ new Set();
   #getRerunLabel() {
     return process.env[REUSE_ENV.RERUN_ENTRY_TYPE] === "test" ? process.env[REUSE_ENV.RERUN_LABEL]?.trim() : void 0;
   }
@@ -5872,7 +6041,8 @@ var NightwatchDevToolsPlugin = class {
       screencast,
       bidi: options.bidi ?? false,
       mode,
-      traceFormat: options.traceFormat ?? "zip"
+      traceFormat: options.traceFormat ?? "zip",
+      traceGranularity: options.traceGranularity ?? "session"
     };
     this.#screencastOptions = { ...SCREENCAST_DEFAULTS, ...screencast };
     this.#bidiEnabled = options.bidi === true;
@@ -6130,6 +6300,25 @@ var NightwatchDevToolsPlugin = class {
       this.sessionCapturer.captureSource(fullPath).catch(() => {
       });
     }
+    if (fullPath) {
+      const prevRange = recordSpecBoundary(
+        {
+          specRanges: this.#specRanges,
+          flushedSpecs: this.#flushedSpecs,
+          capturer: this.sessionCapturer,
+          actionSnapshots: this.sessionCapturer.actionSnapshots
+        },
+        fullPath,
+        this.options.traceGranularity
+      );
+      if (prevRange) {
+        void this.#flushSpecTrace(prevRange).catch(
+          (err) => log11.warn(
+            `Failed to flush trace for spec "${prevRange.specFile}": ${errorMessage(err)}`
+          )
+        );
+      }
+    }
     await this.#closePreviousRunningTest(currentSuite, testFile, currentTest);
     const processedTests = this.testManager.getProcessedTests(testFile);
     const currentTestName = this.#pickCurrentTestName(
@@ -6187,6 +6376,42 @@ var NightwatchDevToolsPlugin = class {
   #logRunSummary() {
     logRunSummary(this.#getInternals());
   }
+  async #flushSpecTrace(range, nextRange) {
+    if (this.#flushedSpecs.has(range.specFile)) {
+      return void 0;
+    }
+    this.#flushedSpecs.add(range.specFile);
+    const sessionId = this.sessionCapturer.metadata?.sessionId;
+    if (!sessionId) {
+      return void 0;
+    }
+    const allMetadata = /* @__PURE__ */ new Map();
+    if (this.suiteManager) {
+      for (const suite of this.suiteManager.getAllSuites().values()) {
+        for (const entry of suite.tests) {
+          if (typeof entry === "string") {
+            continue;
+          }
+          allMetadata.set(entry.uid, {
+            title: entry.fullTitle,
+            specFile: entry.file
+          });
+        }
+      }
+    }
+    const tracePath = await writeSpecTrace({
+      range,
+      nextRange,
+      capturer: this.sessionCapturer,
+      actionSnapshots: this.sessionCapturer.actionSnapshots,
+      sessionId,
+      outputDir: resolveAdapterOutputDir({ configPath: this.#configPath }),
+      format: this.options.traceFormat,
+      testMetadata: allMetadata
+    });
+    log11.info(`Trace for spec "${range.specFile}" saved to ${tracePath}`);
+    return tracePath;
+  }
   async #writeTraceZipIfNeeded() {
     if (this.options.mode !== "trace" || !this.sessionCapturer) {
       return;
@@ -6199,6 +6424,28 @@ var NightwatchDevToolsPlugin = class {
       if (this.sessionCapturer.snapshotCaptures.length) {
         await Promise.allSettled(this.sessionCapturer.snapshotCaptures);
       }
+      if (this.options.traceGranularity === "spec") {
+        for (const range of this.#specRanges) {
+          if (!this.#flushedSpecs.has(range.specFile)) {
+            await this.#flushSpecTrace(range);
+          }
+        }
+        return;
+      }
+      const testMetadata = /* @__PURE__ */ new Map();
+      if (this.suiteManager) {
+        for (const suite of this.suiteManager.getAllSuites().values()) {
+          for (const entry of suite.tests) {
+            if (typeof entry === "string") {
+              continue;
+            }
+            testMetadata.set(entry.uid, {
+              title: entry.fullTitle,
+              specFile: entry.file
+            });
+          }
+        }
+      }
       const snapshots = this.sessionCapturer.actionSnapshots;
       const tracePath = await writeTraceZip(this.sessionCapturer, {
         outputDir: resolveAdapterOutputDir({
@@ -6206,7 +6453,8 @@ var NightwatchDevToolsPlugin = class {
         }),
         sessionId,
         actionSnapshots: snapshots.length ? snapshots : void 0,
-        format: this.options.traceFormat
+        format: this.options.traceFormat,
+        testMetadata
       });
       log11.info(`Trace saved to ${tracePath}`);
     } catch (err) {