@elench/testkit 0.1.29 → 0.1.31

package/lib/runner/index.mjs

@@ -631,7 +631,7 @@ async function runPlaywrightBatch(targetConfig, batch) {
   }
 
   console.log(
-    `\n── ${targetConfig.workerLabel} playwright:${targetConfig.name} (${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"}) ──`
+    `\n── ${targetConfig.workerLabel} playwright:${targetConfig.name} (${batch.tasks.length} file${batch.tasks.length === 1 ? "" : "s"})${formatPlaywrightBatchFiles(batch)} ──`
   );
 
   const cwd = resolveServiceCwd(targetConfig.productDir, local.cwd);
@@ -655,7 +655,8 @@ async function runPlaywrightBatch(targetConfig, batch) {
   }
 
   const parsed = parsePlaywrightJsonResults(result.stdout, cwd);
-  const batchDurationMs = Date.now() - startedAt;
+  const finishedAt = Date.now();
+  const batchDurationMs = finishedAt - startedAt;
   const genericError =
     result.exitCode === 0
       ? parsed.errors[0] || null
@@ -677,6 +678,8 @@ async function runPlaywrightBatch(targetConfig, batch) {
           fileResult.durationMs > 0
             ? fileResult.durationMs
             : Math.round(batchDurationMs / Math.max(1, batch.tasks.length)),
+        startedAt,
+        finishedAt,
       };
     }
 
@@ -685,6 +688,8 @@ async function runPlaywrightBatch(targetConfig, batch) {
       failed: result.exitCode !== 0,
       error: result.exitCode !== 0 ? genericError : null,
       durationMs: Math.round(batchDurationMs / Math.max(1, batch.tasks.length)),
+      startedAt,
+      finishedAt,
     };
   });
 }
@@ -912,6 +917,15 @@ function formatBatchDescriptor(batch) {
   return frameworkLabel ? ` (${frameworkLabel}, ${fileLabel})` : ` (${fileLabel})`;
 }
 
+function formatPlaywrightBatchFiles(batch) {
+  if (!batch?.tasks?.length) return "";
+  const files = batch.tasks.map((task) => task.file);
+  if (files.length === 1) return ` · ${files[0]}`;
+  const preview = files.slice(0, 3).join(", ");
+  const suffix = files.length > 3 ? `, +${files.length - 3} more` : "";
+  return ` · ${preview}${suffix}`;
+}
+
 function formatFrameworkLabel(framework) {
   if (!framework || framework === "k6") return "";
   return framework;
@@ -1087,12 +1101,15 @@ async function runDefaultRuntimeTask(targetConfig, task, args) {
 
   const summary = readDefaultRuntimeSummary(summaryFile);
   const runtimeError = determineDefaultRuntimeFailure(result, summary);
+  const finishedAt = Date.now();
 
   return {
     task,
     failed: runtimeError !== null,
     error: runtimeError,
-    durationMs: Date.now() - startedAt,
+    durationMs: finishedAt - startedAt,
+    startedAt,
+    finishedAt,
   };
 }
 

package/lib/runner/planning.mjs

@@ -69,7 +69,9 @@ export function collectSuites(config, suiteType, suiteNames, frameworkFilter, fi
             ? Math.max(2, files.length)
             : Math.max(1, files.length)),
         maxFileConcurrency:
-          framework === "k6" ? suite.testkit?.maxFileConcurrency || 1 : 1,
+          framework === "k6" || framework === "playwright"
+            ? suite.testkit?.maxFileConcurrency || 1
+            : 1,
       });
       orderIndex += 1;
     }
@@ -183,9 +185,7 @@ export function buildTaskQueue(servicePlans, graphs, timings) {
           timingKey,
           estimatedDurationMs: estimateTaskDuration(timings, timingKey, suite),
           maxBatchSize:
-            suite.framework === "playwright"
-              ? Number.POSITIVE_INFINITY
-              : suite.maxFileConcurrency || 1,
+            suite.maxFileConcurrency || 1,
         });
         nextId += 1;
       }
@@ -213,20 +213,9 @@ export function claimNextBatch(queue, preferredGraphKey) {
   const seed = queue.splice(index, 1)[0];
   const tasks = [seed];
 
-  if (seed.framework === "playwright") {
-    for (let cursor = queue.length - 1; cursor >= 0; cursor -= 1) {
-      const candidate = queue[cursor];
-      if (
-        candidate.framework === "playwright" &&
-        candidate.graphKey === seed.graphKey &&
-        candidate.targetName === seed.targetName
-      ) {
-        tasks.push(candidate);
-        queue.splice(cursor, 1);
-      }
-    }
-  } else if (seed.maxBatchSize > 1) {
-    for (let cursor = queue.length - 1; cursor >= 0 && tasks.length < seed.maxBatchSize; cursor -= 1) {
+  if (seed.maxBatchSize > 1) {
+    for (let cursor = 0; cursor < queue.length; cursor += 1) {
+      if (tasks.length >= seed.maxBatchSize) break;
       const candidate = queue[cursor];
       if (
         candidate.framework === seed.framework &&
@@ -237,6 +226,7 @@ export function claimNextBatch(queue, preferredGraphKey) {
       ) {
         tasks.push(candidate);
         queue.splice(cursor, 1);
+        cursor -= 1;
       }
     }
   }

package/lib/runner/planning.test.mjs

@@ -137,11 +137,51 @@ describe("runner-planning", () => {
     expect(queue).toHaveLength(4);
 
     const firstBatch = claimNextBatch(queue, "api|frontend");
-    expect(firstBatch.tasks).toHaveLength(2);
+    expect(firstBatch.tasks).toHaveLength(1);
     expect(firstBatch.framework).toBe("playwright");
 
     const secondBatch = claimNextBatch(queue, "api|frontend");
-    expect(secondBatch.tasks).toHaveLength(2);
-    expect(secondBatch.framework).toBe("k6");
+    expect(secondBatch.tasks).toHaveLength(1);
+    expect(secondBatch.framework).toBe("playwright");
+
+    const thirdBatch = claimNextBatch(queue, "api|frontend");
+    expect(thirdBatch.tasks).toHaveLength(2);
+    expect(thirdBatch.framework).toBe("k6");
+  });
+
+  it("allows Playwright suites to opt into bounded multi-file batches", () => {
+    const frontend = makeConfig("frontend");
+    const plans = [
+      {
+        config: frontend,
+        skipped: false,
+        runtimeConfigs: [frontend],
+        runtimeNames: ["frontend"],
+        runtimeKey: "frontend",
+        suites: [
+          {
+            name: "auth",
+            type: "e2e",
+            framework: "playwright",
+            files: ["a.spec.js", "b.spec.js", "c.spec.js"],
+            orderIndex: 0,
+            weight: 3,
+            maxFileConcurrency: 2,
+          },
+        ],
+      },
+    ];
+
+    const graphs = buildRuntimeGraphs(plans);
+    const queue = buildTaskQueue(plans, graphs, { files: {} });
+
+    const firstBatch = claimNextBatch(queue, "frontend");
+    expect(firstBatch.tasks.map((task) => task.file)).toEqual(["a.spec.js", "b.spec.js"]);
+    expect(firstBatch.tasks).toHaveLength(2);
+    expect(firstBatch.framework).toBe("playwright");
+
+    const secondBatch = claimNextBatch(queue, "frontend");
+    expect(secondBatch.tasks).toHaveLength(1);
+    expect(secondBatch.framework).toBe("playwright");
   });
 });

package/lib/runner/results.mjs

@@ -17,6 +17,7 @@ export function buildServiceTrackers(servicePlans, startedAt) {
         startedAt,
         firstTaskAt: null,
         lastTaskAt: null,
+        totalTaskDurationMs: 0,
       });
       continue;
     }
@@ -72,6 +73,7 @@ export function buildServiceTrackers(servicePlans, startedAt) {
       startedAt,
       firstTaskAt: null,
       lastTaskAt: null,
+      totalTaskDurationMs: 0,
     });
   }
 
@@ -82,26 +84,38 @@ export function recordTaskOutcome(trackers, task, outcome, finishedAt = Date.now
   const tracker = trackers.get(task.serviceName);
   if (!tracker || tracker.skipped) return;
 
-  if (!tracker.firstTaskAt) tracker.firstTaskAt = finishedAt;
-  tracker.lastTaskAt = finishedAt;
-
   const suite = tracker.suitesByKey.get(task.suiteKey);
   if (!suite) return;
 
+  const outcomeDurationMs = Number(outcome.durationMs ?? 0);
+  const outcomeFinishedAt = Number(outcome.finishedAt ?? finishedAt);
+  const outcomeStartedAt = Number(
+    outcome.startedAt ?? Math.max(0, outcomeFinishedAt - outcomeDurationMs)
+  );
+  tracker.firstTaskAt =
+    tracker.firstTaskAt === null
+      ? outcomeStartedAt
+      : Math.min(tracker.firstTaskAt, outcomeStartedAt);
+  tracker.lastTaskAt =
+    tracker.lastTaskAt === null
+      ? outcomeFinishedAt
+      : Math.max(tracker.lastTaskAt, outcomeFinishedAt);
+  tracker.totalTaskDurationMs += outcomeDurationMs;
+
   suite.completedFileCount += 1;
-  suite.durationMs += outcome.durationMs;
+  suite.durationMs += outcomeDurationMs;
   const normalizedPath = normalizePathSeparators(task.file);
   const existingFileResult = suite.fileResultsByPath.get(normalizedPath);
   if (existingFileResult) {
     existingFileResult.failed = outcome.failed;
-    existingFileResult.durationMs = outcome.durationMs;
+    existingFileResult.durationMs = outcomeDurationMs;
     existingFileResult.error = outcome.error;
     existingFileResult.status = outcome.failed ? "failed" : "passed";
   } else {
     const fileResult = {
       path: normalizedPath,
       failed: outcome.failed,
-      durationMs: outcome.durationMs,
+      durationMs: outcomeDurationMs,
       error: outcome.error,
       status: outcome.failed ? "failed" : "passed",
     };
@@ -144,6 +158,7 @@ export function finalizeServiceResult(tracker, startedAt, finishedAt) {
       completedSuiteCount: 0,
       failedSuiteCount: 0,
       durationMs: 0,
+      totalTaskDurationMs: 0,
       suites: [],
       errors: [],
     };
@@ -169,11 +184,12 @@ export function finalizeServiceResult(tracker, startedAt, finishedAt) {
     0
   );
   const notRunFileCount = totalFileCount - completedFileCount;
-  const accumulatedDurationMs = suites.reduce((sum, suite) => sum + suite.durationMs, 0);
+  const totalTaskDurationMs =
+    tracker.totalTaskDurationMs || suites.reduce((sum, suite) => sum + suite.durationMs, 0);
   const durationMs =
-    tracker.firstTaskAt && tracker.lastTaskAt
-      ? Math.max(tracker.lastTaskAt - tracker.firstTaskAt, accumulatedDurationMs)
-      : Math.max(finishedAt - startedAt, accumulatedDurationMs);
+    tracker.firstTaskAt !== null && tracker.lastTaskAt !== null
+      ? Math.max(0, tracker.lastTaskAt - tracker.firstTaskAt)
+      : Math.max(0, finishedAt - startedAt);
 
   return {
     name: tracker.name,
@@ -192,6 +208,7 @@ export function finalizeServiceResult(tracker, startedAt, finishedAt) {
     failedFileCount,
     notRunFileCount,
     durationMs,
+    totalTaskDurationMs,
     suites: suites.map((suite) => ({
       name: suite.name,
       type: suite.type,
@@ -385,6 +402,7 @@ export function buildRunArtifact({
       failedFileCount: result.failedFileCount,
       notRunFileCount: result.notRunFileCount,
       durationMs: result.durationMs,
+      totalTaskDurationMs: result.totalTaskDurationMs,
       dbBackend: result.dbBackend,
       suites: result.suites,
       errors: result.errors,

package/lib/runner/results.test.mjs

@@ -81,6 +81,123 @@ describe("runner-results", () => {
     ]);
   });
 
+  it("reports service duration as wall-clock time, not accumulated file time", () => {
+    const trackers = buildServiceTrackers(
+      [
+        {
+          skipped: false,
+          config: {
+            name: "frontend",
+            testkit: {
+              database: {
+                selectedBackend: null,
+              },
+            },
+          },
+          suites: [
+            {
+              name: "browser",
+              type: "e2e",
+              framework: "playwright",
+              files: ["tests/a.pw.testkit.ts", "tests/b.pw.testkit.ts"],
+              orderIndex: 0,
+            },
+          ],
+        },
+      ],
+      1000
+    );
+
+    recordTaskOutcome(
+      trackers,
+      {
+        serviceName: "frontend",
+        suiteKey: "e2e:browser",
+        file: "tests/a.pw.testkit.ts",
+      },
+      {
+        failed: false,
+        durationMs: 30_000,
+        startedAt: 1000,
+        finishedAt: 8000,
+        error: null,
+      },
+      8000
+    );
+    recordTaskOutcome(
+      trackers,
+      {
+        serviceName: "frontend",
+        suiteKey: "e2e:browser",
+        file: "tests/b.pw.testkit.ts",
+      },
+      {
+        failed: false,
+        durationMs: 45_000,
+        startedAt: 3000,
+        finishedAt: 9000,
+        error: null,
+      },
+      9000
+    );
+
+    const result = finalizeServiceResult(trackers.get("frontend"), 1000, 10_000);
+
+    expect(result.durationMs).toBe(8000);
+    expect(result.totalTaskDurationMs).toBe(75_000);
+    expect(result.suites[0].durationMs).toBe(75_000);
+  });
+
+  it("handles epoch-zero task timestamps when calculating wall-clock duration", () => {
+    const trackers = buildServiceTrackers(
+      [
+        {
+          skipped: false,
+          config: {
+            name: "frontend",
+            testkit: {
+              database: {
+                selectedBackend: null,
+              },
+            },
+          },
+          suites: [
+            {
+              name: "browser",
+              type: "e2e",
+              framework: "playwright",
+              files: ["tests/a.pw.testkit.ts"],
+              orderIndex: 0,
+            },
+          ],
+        },
+      ],
+      0
+    );
+
+    recordTaskOutcome(
+      trackers,
+      {
+        serviceName: "frontend",
+        suiteKey: "e2e:browser",
+        file: "tests/a.pw.testkit.ts",
+      },
+      {
+        failed: false,
+        durationMs: 3_000,
+        startedAt: 0,
+        finishedAt: 8_000,
+        error: null,
+      },
+      8_000
+    );
+
+    const result = finalizeServiceResult(trackers.get("frontend"), 0, 10_000);
+
+    expect(result.durationMs).toBe(8_000);
+    expect(result.totalTaskDurationMs).toBe(3_000);
+  });
+
   it("builds run artifacts and formatting helpers", () => {
     const results = [
       {
@@ -96,6 +213,7 @@ describe("runner-results", () => {
         failedFileCount: 0,
         notRunFileCount: 0,
         durationMs: 1200,
+        totalTaskDurationMs: 2400,
         dbBackend: "local",
         suites: [],
         errors: [],
@@ -113,6 +231,7 @@ describe("runner-results", () => {
         failedFileCount: 0,
         notRunFileCount: 0,
         durationMs: 0,
+        totalTaskDurationMs: 0,
         dbBackend: null,
         suites: [],
         errors: [],
@@ -154,6 +273,8 @@ describe("runner-results", () => {
       failed: 0,
       notRun: 0,
     });
+    expect(artifact.services[0].durationMs).toBe(1200);
+    expect(artifact.services[0].totalTaskDurationMs).toBe(2400);
     expect(summarizeDbBackend(results)).toBe("local");
     expect(formatDuration(65_000)).toBe("1m 05s");
     expect(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elench/testkit",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "CLI for discovering and running local HTTP, DAL, and Playwright test suites",
   "type": "module",
   "types": "./lib/index.d.ts",