@elench/testkit 0.1.38 → 0.1.39

package/lib/runner/worker-loop.mjs

@@ -1,11 +1,6 @@
 import { formatError } from "./formatting.mjs";
 import { runDalBatch, runHttpK6Batch } from "./default-runtime-runner.mjs";
 import { runPlaywrightBatch } from "./playwright-runner.mjs";
-import {
-  cleanupWorker,
-  ensureWorkerGraph,
-  resetCurrentGraph,
-} from "./runtime-contexts.mjs";
 
 const HTTP_K6_TYPES = new Set(["integration", "e2e", "load"]);
 
@@ -14,7 +9,6 @@ export function createWorker(workerId, productDir) {
     workerId,
     productDir,
     currentGraphKey: null,
-    graphContexts: new Map(),
     graphSwitches: 0,
     taskCount: 0,
   };
@@ -23,7 +17,7 @@ export function createWorker(workerId, productDir) {
 export async function runWorker(
   worker,
   queue,
-  graphByKey,
+  stackManager,
   trackers,
   timingUpdates,
   lifecycle,
@@ -32,7 +26,7 @@ export async function runWorker(
   recordGraphError
 ) {
   const startedAt = Date.now();
-  console.log(`\n══ global worker ${worker.workerId} ══`);
+  console.log(`\n══ worker ${worker.workerId} ══`);
   const errors = [];
 
   try {
@@ -41,9 +35,14 @@ export async function runWorker(
       const batch = claimNextBatch(queue, worker.currentGraphKey);
       if (!batch) break;
 
+      let lease = null;
       try {
-        const context = await ensureWorkerGraph(worker, batch, graphByKey, lifecycle);
-        const outcomes = await runBatch(context, batch, lifecycle);
+        if (worker.currentGraphKey && worker.currentGraphKey !== batch.graphKey) {
+          worker.graphSwitches += 1;
+        }
+        worker.currentGraphKey = batch.graphKey;
+        lease = await stackManager.acquire(batch);
+        const outcomes = await runBatch(lease.context, batch, lifecycle);
         for (const outcome of outcomes) {
           recordTaskOutcome(trackers, outcome.task, outcome);
           timingUpdates.push({
@@ -52,15 +51,19 @@ export async function runWorker(
           });
           worker.taskCount += 1;
         }
+        await stackManager.release(lease, { accessMode: batch.accessMode });
       } catch (error) {
         const message = formatError(error);
         errors.push(message);
-        recordGraphError(trackers, graphByKey.get(batch.graphKey), message);
-        await resetCurrentGraph(worker, lifecycle);
+        recordGraphError(trackers, { assignedTargets: lease?.context?.assignedTargets || [batch.targetName] }, message);
+        await stackManager.release(lease, {
+          accessMode: batch.accessMode,
+          invalidate: lease !== null,
+        });
       }
     }
   } finally {
-    await cleanupWorker(worker, lifecycle);
+    worker.currentGraphKey = null;
   }
 
   return {
@@ -76,7 +79,7 @@ export async function runWorker(
 async function runBatch(context, batch, lifecycle) {
   const targetConfig = context.configByName.get(batch.targetName);
   if (!targetConfig) {
-    throw new Error(`Worker graph missing target config "${batch.targetName}"`);
+    throw new Error(`Stack is missing target config "${batch.targetName}"`);
   }
 
   if (batch.framework === "playwright") {

package/lib/setup/index.d.ts

@@ -33,6 +33,27 @@ export interface SkipConfig {
   suites?: SkipSuiteRule[];
 }
 
+export interface SuiteExecutionRule {
+  selector: string;
+  stackMode: "shared" | "pooled" | "isolated";
+}
+
+export interface FileExecutionRule {
+  path: string;
+  stackMode: "shared" | "pooled" | "isolated";
+}
+
+export interface ServiceExecutionConfig {
+  suites?: SuiteExecutionRule[];
+  files?: FileExecutionRule[];
+}
+
+export interface TestkitExecutionConfig {
+  workers?: number;
+  stackMode?: "shared" | "pooled" | "isolated";
+  stackCount?: number;
+}
+
 export interface ServiceConfig {
   database?: LocalDatabaseConfig;
   databaseFrom?: string;
@@ -55,9 +76,11 @@ export interface ServiceConfig {
   migrate?: LifecycleConfig;
   seed?: LifecycleConfig;
   skip?: SkipConfig;
+  execution?: ServiceExecutionConfig;
 }
 
 export interface TestkitSetup {
+  execution?: TestkitExecutionConfig;
   profiles?: {
     http?: Record<string, HttpSuiteConfig>;
   };

package/package.json

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