@overkill-dev/run 0.0.42 → 0.0.44

package/run/worker-pool-runtime.js

@@ -1,17 +1,15 @@
 import { createReporterDelivery, createReporterEventQueue } from "./supervised-run-runtime.js";
 import { createStoredRunValue } from "./supervised-run-state.js";
 import { loadTinypoolConstructor } from "./tinypool-node-compatibility.js";
+import { createResourceUsageFromSamples } from "./resource-usage.js";
 import { runTask as workerPoolWorkerEntryPoint } from "./worker-pool-worker.js";
 const Tinypool = loadTinypoolConstructor();
-function workerPoolEntryPointHref(entryPoint) {
-    const entryPointWorkerName = entryPoint.worker.name;
+function workerPoolEntryPointHref(worker) {
+    const entryPointWorkerName = worker.name;
     const workerPoolEntryPointUrl = new URL('./worker-pool-worker.ts', import.meta.url);
     return workerPoolEntryPointUrl.href + entryPointWorkerName.slice(0, 0);
 }
-const workerPoolEntryPoint = workerPoolEntryPointHref({
-    compatibility: null,
-    worker: workerPoolWorkerEntryPoint
-});
+export const workerPoolEntryPoint = workerPoolEntryPointHref(workerPoolWorkerEntryPoint);
 export function runStartTimeFromMilliseconds(milliseconds) {
     const startedAt = new Date(milliseconds);
     return startedAt.toISOString();
@@ -35,26 +33,274 @@ export function createPool(options) {
         filename: workerPoolEntryPoint
     });
 }
+function copiedHostProcess(execution) {
+    return execution.hostProcess.kind === 'direct'
+        ? { kind: 'direct' }
+        : {
+            kind: 'child',
+            nodeArguments: Array.from(execution.hostProcess.nodeArguments)
+        };
+}
+export function workerPoolExecutionFacts(resolvedRun) {
+    if (resolvedRun.facts.execution.processModel !== 'worker-pool') {
+        throw new Error('Worker-pool execution requires worker-pool execution facts.');
+    }
+    return resolvedRun.facts.execution;
+}
+function unitsByKey(units) {
+    return new Map(units.map(function toEntry(unit) {
+        return [JSON.stringify(unit.id), unit];
+    }));
+}
+function assignedUnits(plan) {
+    const units = unitsByKey(plan.units);
+    return plan.assignments.map(function toUnit(assignment) {
+        const unit = units.get(JSON.stringify(assignment.unit));
+        if (unit === undefined) {
+            throw new Error('Placement assignment referenced an unknown work unit.');
+        }
+        return unit;
+    });
+}
+function laneLifecycle(laneLifecycles, lane, workerLifecycle) {
+    const existingLifecycle = laneLifecycles.get(lane);
+    if (existingLifecycle !== undefined && existingLifecycle !== workerLifecycle) {
+        throw new Error('Placement lane cannot mix worker lifecycle policies.');
+    }
+    return workerLifecycle;
+}
+function placementLaneLifecycles(plan) {
+    const laneLifecycles = new Map();
+    const units = assignedUnits(plan);
+    plan.assignments.forEach(function recordLaneLifecycle(assignment, index) {
+        const unit = units[index];
+        if (unit === undefined) {
+            throw new Error('Placement assignment referenced an unknown work unit.');
+        }
+        laneLifecycles.set(assignment.lane, laneLifecycle(laneLifecycles, assignment.lane, unit.workerLifecycle));
+    });
+    return laneLifecycles;
+}
+function laneLifecycleCount(laneLifecycles, workerLifecycle) {
+    return Array
+        .from(laneLifecycles.values())
+        .filter(function hasWorkerLifecycle(laneWorkerLifecycle) {
+        return laneWorkerLifecycle === workerLifecycle;
+    })
+        .length;
+}
+function laneCountsByLifecycle(plan) {
+    const laneLifecycles = placementLaneLifecycles(plan);
+    const lifecycles = ['reuse', 'fresh-worker-per-unit'];
+    return new Map(lifecycles.map(function toLifecycleCount(workerLifecycle) {
+        return [workerLifecycle, laneLifecycleCount(laneLifecycles, workerLifecycle)];
+    }));
+}
+function workerLifecycles(plan) {
+    return Array.from(new Set(assignedUnits(plan).map(function toWorkerLifecycle(unit) {
+        return unit.workerLifecycle;
+    })));
+}
+function workerPoolOptions(resolvedRun, execution, workerCount, workerLifecycle) {
+    return {
+        cwd: resolvedRun.cwd,
+        hostProcess: copiedHostProcess(execution),
+        workerCount,
+        workerLifecycle
+    };
+}
+function poolMatchesLifecycle(pool, workerLifecycle) {
+    return pool.options.isolateWorkers === (workerLifecycle === 'fresh-worker-per-unit');
+}
+function routeForLifecycle(routes, workerLifecycle) {
+    const route = routes.find(function hasWorkerLifecycle(candidate) {
+        return candidate.workerLifecycle === workerLifecycle;
+    });
+    if (route === undefined) {
+        throw new Error(`Worker-pool task has no "${workerLifecycle}" route.`);
+    }
+    return route;
+}
+function isWorkerPoolTask(value) {
+    return typeof value === 'object' &&
+        value !== null &&
+        Object.hasOwn(value, 'command') &&
+        (Reflect.get(value, 'kind') === 'collect' || Reflect.get(value, 'kind') === 'run');
+}
+function taskWorkerLifecycle(task) {
+    if (!isWorkerPoolTask(task)) {
+        throw new Error('Worker-pool received an invalid task.');
+    }
+    return task.command.workerLifecycle;
+}
+function uniqueSorted(values) {
+    return Array.from(new Set(values)).toSorted(function compareText(left, right) {
+        return left.localeCompare(right);
+    });
+}
+function combinedSnapshot(samples) {
+    const firstSample = samples[0];
+    if (firstSample === undefined) {
+        throw new Error('Routed worker-pool resource tracking requires at least one sample.');
+    }
+    return {
+        activeResourceCount: samples.reduce(function sumActiveResources(total, sample) {
+            return total + sample.activeResourceCount;
+        }, 0),
+        activeResourceTypes: uniqueSorted(samples.flatMap(function toActiveTypes(sample) {
+            return sample.activeResourceTypes;
+        })),
+        capturedAtMilliseconds: Math.max(...samples.map(function toCapturedAt(sample) {
+            return sample.capturedAtMilliseconds;
+        })),
+        javaScriptEngineHeapBytes: samples.reduce(function sumHeap(total, sample) {
+            return total + sample.javaScriptEngineHeapBytes;
+        }, 0),
+        residentSetBytes: samples.reduce(function sumResidentSet(total, sample) {
+            return total + sample.residentSetBytes;
+        }, 0)
+    };
+}
+function createRoutedResourceUsage(usages, samples) {
+    const start = combinedSnapshot(usages.map(function toStart(usage) {
+        return usage.start;
+    }));
+    const end = combinedSnapshot(usages.map(function toEnd(usage) {
+        return usage.end;
+    }));
+    return createResourceUsageFromSamples(start, end, [start, ...samples, end]);
+}
+function createRoutedResourceUsageTracker(trackers) {
+    const latestSamples = new Map();
+    let combinedSamples = [];
+    return {
+        finish() {
+            return createRoutedResourceUsage(trackers.map(function finishTracker(tracker) {
+                return tracker.finish();
+            }), combinedSamples);
+        },
+        start(onSample) {
+            trackers.forEach(function startTracker(tracker, index) {
+                tracker.start(function recordSample(sample) {
+                    latestSamples.set(index, sample);
+                    if (latestSamples.size === trackers.length) {
+                        const combined = combinedSnapshot(Array.from(latestSamples.values()));
+                        combinedSamples = [...combinedSamples, combined];
+                        onSample?.(combined);
+                    }
+                });
+            });
+        },
+        async waitForStart() {
+            await Promise.all(trackers.map(async function waitForTracker(tracker) {
+                await tracker.waitForStart?.();
+            }));
+        }
+    };
+}
+function createRoutedPool(routes) {
+    const basePool = {
+        async destroy() {
+            await Promise.all(routes.map(async function destroyRoute(route) {
+                await route.pool.destroy();
+            }));
+        },
+        options: {
+            isolateWorkers: routes.some(function hasFreshWorkers(route) {
+                return route.workerLifecycle === 'fresh-worker-per-unit';
+            }),
+            maxThreads: routes.reduce(function sumThreads(total, route) {
+                return total + route.pool.options.maxThreads;
+            }, 0)
+        },
+        async run(task, options) {
+            return await routeForLifecycle(routes, taskWorkerLifecycle(task)).pool.run(task, options);
+        },
+        setHostOutputSink(sink) {
+            for (const route of routes) {
+                route.pool.setHostOutputSink?.(sink);
+            }
+        }
+    };
+    if (routes.every(function routeProvidesTracker(route) {
+        return route.pool.createResourceUsageTracker !== undefined;
+    })) {
+        return {
+            ...basePool,
+            createResourceUsageTracker(options) {
+                return createRoutedResourceUsageTracker(routes.map(function toTracker(route) {
+                    const tracker = route.pool.createResourceUsageTracker?.(options);
+                    if (tracker === undefined) {
+                        throw new Error('Routed worker-pool lost resource tracking support.');
+                    }
+                    return tracker;
+                }));
+            }
+        };
+    }
+    return basePool;
+}
+function createEmptyExecutionPool(input, execution) {
+    return {
+        destroyPool: input.createdPool === null,
+        pool: input.createdPool ?? input.dependencies.createWorkerPool(workerPoolOptions(input.resolvedRun, execution, 0, execution.workerLifecycle))
+    };
+}
+function createSingleLifecycleExecutionPool(input, execution, placementPlan, workerLifecycle) {
+    if (input.createdPool !== null && poolMatchesLifecycle(input.createdPool, workerLifecycle)) {
+        return {
+            destroyPool: false,
+            pool: input.createdPool
+        };
+    }
+    return {
+        destroyPool: true,
+        pool: input.dependencies.createWorkerPool(workerPoolOptions(input.resolvedRun, execution, placementPlan.lanes.length, workerLifecycle))
+    };
+}
+function createMixedLifecycleExecutionPool(input, execution, placementPlan, lifecycles) {
+    const laneCounts = laneCountsByLifecycle(placementPlan);
+    const routes = lifecycles.map(function toRoute(workerLifecycle) {
+        return {
+            pool: input.dependencies.createWorkerPool(workerPoolOptions(input.resolvedRun, execution, laneCounts.get(workerLifecycle) ?? 0, workerLifecycle)),
+            workerLifecycle
+        };
+    });
+    return {
+        destroyPool: true,
+        pool: createRoutedPool(routes)
+    };
+}
+function createExecutionPool(input, placementPlan) {
+    const execution = workerPoolExecutionFacts(input.resolvedRun);
+    const lifecycles = workerLifecycles(placementPlan);
+    const firstLifecycle = lifecycles[0];
+    if (firstLifecycle === undefined) {
+        return createEmptyExecutionPool(input, execution);
+    }
+    return lifecycles.length === 1
+        ? createSingleLifecycleExecutionPool(input, execution, placementPlan, firstLifecycle)
+        : createMixedLifecycleExecutionPool(input, execution, placementPlan, lifecycles);
+}
 export function workerPoolCollectedPlan(resolvedRun) {
     if (resolvedRun.plan.kind !== 'worker-pool') {
         throw new Error('Worker-pool execution requires a worker-pool collected plan.');
     }
     return resolvedRun.plan.collectedPlan;
 }
-function createPoolResourceUsageTracker(resolvedRun, dependencies) {
+function createPoolResourceUsageTracker(pool, resolvedRun, dependencies) {
     if (!resolvedRun.facts.execution.resourceUsagePolicy.measure) {
         return null;
     }
+    if (pool.createResourceUsageTracker !== undefined) {
+        return pool.createResourceUsageTracker({
+            samplingIntervalMilliseconds: resolvedRun.facts.execution.resourceUsagePolicy.samplingIntervalMilliseconds
+        });
+    }
     return dependencies.createResourceUsageTracker({
         samplingIntervalMilliseconds: resolvedRun.facts.execution.resourceUsagePolicy.samplingIntervalMilliseconds
     });
 }
-function workerPoolExecutionFacts(resolvedRun) {
-    if (resolvedRun.facts.execution.processModel !== 'worker-pool') {
-        throw new Error('Worker-pool execution requires worker-pool execution facts.');
-    }
-    return resolvedRun.facts.execution;
-}
 export function workerPoolPlacementPlan(resolvedRun) {
     const { placementPlan } = workerPoolExecutionFacts(resolvedRun);
     if (placementPlan === null) {
@@ -62,20 +308,28 @@ export function workerPoolPlacementPlan(resolvedRun) {
     }
     return placementPlan;
 }
-export async function createWorkerPoolRuntime(resolvedRun, dependencies, collectionRunnerErrors, runState) {
+export async function createWorkerPoolRuntime(input) {
+    const { collectionRunnerErrors, dependencies, resolvedRun, runState } = input;
     const placementPlan = workerPoolPlacementPlan(resolvedRun);
     const execution = workerPoolExecutionFacts(resolvedRun);
     const taskResults = [];
+    const executionPool = createExecutionPool(input, placementPlan);
+    const { destroyPool, pool } = executionPool;
+    pool.setHostOutputSink?.(function recordHostOutput(stream, chunk) {
+        if (execution.capture === 'live') {
+            dependencies.liveOutput[stream].write(chunk);
+            return;
+        }
+        runState.recordCapturedOutput(stream, chunk, dependencies.wallClock.currentTimestampInMilliseconds);
+    });
     return {
         activeTasks: new Set(),
         collectedPlan: workerPoolCollectedPlan(resolvedRun),
         collectionRunnerErrors,
         dependencies,
-        pool: dependencies.createWorkerPool({
-            workerCount: placementPlan.lanes.length,
-            workerLifecycle: execution.workerLifecycle
-        }),
-        poolResourceUsageTracker: createPoolResourceUsageTracker(resolvedRun, dependencies),
+        destroyPool,
+        pool,
+        poolResourceUsageTracker: createPoolResourceUsageTracker(pool, resolvedRun, dependencies),
         previousPoolSample: createStoredRunValue(null),
         reporterDelivery: await createReporterDelivery(resolvedRun, dependencies),
         reporterEvents: createReporterEventQueue(),

package/run/worker-pool-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-pool-runtime.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-runtime.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-pool-runtime.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-runtime.ts"],"names":[],"mappings":"AAqBA,OAAO,EACH,sBAAsB,EACtB,wBAAwB,EAE3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACH,oBAAoB,EAGvB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,uBAAuB,EAE1B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAGhF,MAAM,QAAQ,GAAG,uBAAuB,EAAE,CAAC;AAqE3C,SAAS,wBAAwB,CAAC,MAAyC;IACvE,MAAM,oBAAoB,GAAG,MAAM,CAAC,IAAI,CAAC;IACzC,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,yBAAyB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEpF,OAAO,uBAAuB,CAAC,IAAI,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,wBAAwB,CAAC,0BAA0B,CAAC,CAAC;AAEzF,MAAM,UAAU,4BAA4B,CAAC,YAAoB;IAC7D,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC;IAEzC,OAAO,SAAS,CAAC,WAAW,EAAE,CAAC;AACnC,CAAC;AAQD,SAAS,cAAc,CAAC,OAAkC;IACtD,OAAO,OAAO,CAAC,eAAe,KAAK,uBAAuB,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAkC;IACvE,OAAO,IAAI,QAAQ,CAAC;QAChB,wBAAwB,EAAE,CAAC;QAC3B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,cAAc,EAAE,cAAc,CAAC,OAAO,CAAC;QACvC,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,UAAU,EAAE,OAAO,CAAC,WAAW;QAC/B,OAAO,EAAE,gBAAgB;KAC5B,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,OAAkC;IACzD,OAAO,wBAAwB,CAAC;QAC5B,GAAG,OAAO;QACV,QAAQ,EAAE,oBAAoB;KACjC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,iBAAiB,CAAC,SAAmC;IAC1D,OAAO,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ;QAC1C,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;QACpB,CAAC,CAAC;YACE,IAAI,EAAE,OAAO;YACb,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,CAAC;SACjE,CAAC;AACV,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,WAAwB;IAC7D,IAAI,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,KAAK,aAAa,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;IACnF,CAAC;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,KAA0B;IAC1C,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,IAAI;QAC1C,OAAO,CAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAE,CAAC;IAC7C,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,SAAS,aAAa,CAAC,IAAmB;IACtC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAErC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,UAAU;QAClD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAExD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,aAAa,CAClB,cAAuD,EACvD,IAAY,EACZ,eAAmC;IAEnC,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,iBAAiB,KAAK,SAAS,IAAI,iBAAiB,KAAK,eAAe,EAAE,CAAC;QAC3E,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC5E,CAAC;IAED,OAAO,eAAe,CAAC;AAC3B,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAmB;IAChD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA8B,CAAC;IAC7D,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAElC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,mBAAmB,CAAC,UAAU,EAAE,KAAK;QACnE,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC7E,CAAC;QAED,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,cAAc,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9G,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,SAAS,kBAAkB,CACvB,cAAuD,EACvD,eAAmC;IAEnC,OAAO,KAAK;SACP,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;SAC7B,MAAM,CAAC,SAAS,kBAAkB,CAAC,mBAAmB;QACnD,OAAO,mBAAmB,KAAK,eAAe,CAAC;IACnD,CAAC,CAAC;SACD,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAmB;IAC9C,MAAM,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACrD,MAAM,UAAU,GAAkC,CAAE,OAAO,EAAE,uBAAuB,CAAE,CAAC;IAEvF,OAAO,IAAI,GAAG,CACV,UAAU,CAAC,GAAG,CAAC,SAAS,gBAAgB,CAAC,eAAe;QACpD,OAAO,CAAE,eAAe,EAAE,kBAAkB,CAAC,cAAc,EAAE,eAAe,CAAC,CAAE,CAAC;IACpF,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAmB;IACzC,OAAO,KAAK,CAAC,IAAI,CACb,IAAI,GAAG,CACH,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,iBAAiB,CAAC,IAAI;QACnD,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC,CAAC,CACL,CACJ,CAAC;AACN,CAAC;AAED,SAAS,iBAAiB,CACtB,WAAwB,EACxB,SAAmC,EACnC,WAAmB,EACnB,eAAmC;IAEnC,OAAO;QACH,GAAG,EAAE,WAAW,CAAC,GAAG;QACpB,WAAW,EAAE,iBAAiB,CAAC,SAAS,CAAC;QACzC,WAAW;QACX,eAAe;KAClB,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAuB,EAAE,eAAmC;IACtF,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,KAAK,CAAC,eAAe,KAAK,uBAAuB,CAAC,CAAC;AACzF,CAAC;AAED,SAAS,iBAAiB,CACtB,MAAkC,EAClC,eAAmC;IAEnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,SAAS;QAC3D,OAAO,SAAS,CAAC,eAAe,KAAK,eAAe,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,4BAA4B,eAAe,UAAU,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ;QAC5B,KAAK,KAAK,IAAI;QACd,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC;QAC/B,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,KAAK,CAAC,CAAC;AAC3F,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAa;IACtC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;AACxC,CAAC;AAED,SAAS,YAAY,CAAC,MAAyB;IAC3C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,WAAW,CAAC,IAAI,EAAE,KAAK;QACxE,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAyC;IAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE/B,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO;QACH,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,kBAAkB,CAAC,KAAK,EAAE,MAAM;YACzE,OAAO,KAAK,GAAG,MAAM,CAAC,mBAAmB,CAAC;QAC9C,CAAC,EAAE,CAAC,CAAC;QACL,mBAAmB,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,aAAa,CAAC,MAAM;YAC3E,OAAO,MAAM,CAAC,mBAAmB,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,sBAAsB,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,YAAY,CAAC,MAAM;YACxE,OAAO,MAAM,CAAC,sBAAsB,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,yBAAyB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,OAAO,CAAC,KAAK,EAAE,MAAM;YACpE,OAAO,KAAK,GAAG,MAAM,CAAC,yBAAyB,CAAC;QACpD,CAAC,EAAE,CAAC,CAAC;QACL,gBAAgB,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,cAAc,CAAC,KAAK,EAAE,MAAM;YAClE,OAAO,KAAK,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAC3C,CAAC,EAAE,CAAC,CAAC;KACR,CAAC;AACN,CAAC;AAED,SAAS,yBAAyB,CAC9B,MAAmC,EACnC,OAAyC;IAEzC,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,KAAK;QAC5D,OAAO,KAAK,CAAC,KAAK,CAAC;IACvB,CAAC,CAAC,CAAC,CAAC;IACJ,MAAM,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,KAAK;QACxD,OAAO,KAAK,CAAC,GAAG,CAAC;IACrB,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,8BAA8B,CAAC,KAAK,EAAE,GAAG,EAAE,CAAE,KAAK,EAAE,GAAG,OAAO,EAAE,GAAG,CAAE,CAAC,CAAC;AAClF,CAAC;AAED,SAAS,gCAAgC,CACrC,QAAmD;IAEnD,MAAM,aAAa,GAAG,IAAI,GAAG,EAAiC,CAAC;IAC/D,IAAI,eAAe,GAAqC,EAAE,CAAC;IAE3D,OAAO;QACH,MAAM;YACF,OAAO,yBAAyB,CAC5B,QAAQ,CAAC,GAAG,CAAC,SAAS,aAAa,CAAC,OAAO;gBACvC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;YAC5B,CAAC,CAAC,EACF,eAAe,CAClB,CAAC;QACN,CAAC;QACD,KAAK,CAAC,QAAQ;YACV,QAAQ,CAAC,OAAO,CAAC,SAAS,YAAY,CAAC,OAAO,EAAE,KAAK;gBACjD,OAAO,CAAC,KAAK,CAAC,SAAS,YAAY,CAAC,MAAM;oBACtC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;oBAEjC,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;wBACzC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;wBAEtE,eAAe,GAAG,CAAE,GAAG,eAAe,EAAE,QAAQ,CAAE,CAAC;wBACnD,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC;oBACzB,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC;QACD,KAAK,CAAC,YAAY;YACd,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,UAAU,cAAc,CAAC,OAAO;gBAChE,MAAM,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;YACnC,CAAC,CAAC,CAAC,CAAC;QACR,CAAC;KACJ,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkC;IACxD,MAAM,QAAQ,GAAsB;QAChC,KAAK,CAAC,OAAO;YACT,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,UAAU,YAAY,CAAC,KAAK;gBAC1D,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC,CAAC;QACR,CAAC;QACD,OAAO,EAAE;YACL,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,eAAe,CAAC,KAAK;gBACtD,OAAO,KAAK,CAAC,eAAe,KAAK,uBAAuB,CAAC;YAC7D,CAAC,CAAC;YACF,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,UAAU,CAAC,KAAK,EAAE,KAAK;gBACtD,OAAO,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACjD,CAAC,EAAE,CAAC,CAAC;SACR;QACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO;YACnB,OAAO,MAAM,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9F,CAAC;QACD,iBAAiB,CAAC,IAAI;YAClB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBACzB,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;KACJ,CAAC;IAEF,IACI,MAAM,CAAC,KAAK,CAAC,SAAS,oBAAoB,CAAC,KAAK;QAC5C,OAAO,KAAK,CAAC,IAAI,CAAC,0BAA0B,KAAK,SAAS,CAAC;IAC/D,CAAC,CAAC,EACJ,CAAC;QACC,OAAO;YACH,GAAG,QAAQ;YACX,0BAA0B,CAAC,OAAO;gBAC9B,OAAO,gCAAgC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,SAAS,CAAC,KAAK;oBACvE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC,OAAO,CAAC,CAAC;oBAEjE,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBACxB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;oBAC1E,CAAC;oBAED,OAAO,OAAO,CAAC;gBACnB,CAAC,CAAC,CAAC,CAAC;YACR,CAAC;SACJ,CAAC;IACN,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,wBAAwB,CAC7B,KAA6B,EAC7B,SAAmC;IAEnC,OAAO;QACH,WAAW,EAAE,KAAK,CAAC,WAAW,KAAK,IAAI;QACvC,IAAI,EAAE,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAC1D,iBAAiB,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,CAAC,eAAe,CAAC,CAChF;KACJ,CAAC;AACN,CAAC;AAED,SAAS,kCAAkC,CACvC,KAA6B,EAC7B,SAAmC,EACnC,aAA4B,EAC5B,eAAmC;IAEnC,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,IAAI,oBAAoB,CAAC,KAAK,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;QACzF,OAAO;YACH,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,KAAK,CAAC,WAAW;SAC1B,CAAC;IACN,CAAC;IAED,OAAO;QACH,WAAW,EAAE,IAAI;QACjB,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,gBAAgB,CACrC,iBAAiB,CAAC,KAAK,CAAC,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,CAC/F;KACJ,CAAC;AACN,CAAC;AAED,SAAS,iCAAiC,CACtC,KAA6B,EAC7B,SAAmC,EACnC,aAA4B,EAC5B,UAAyC;IAEzC,MAAM,UAAU,GAAG,qBAAqB,CAAC,aAAa,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,eAAe;QAC1D,OAAO;YACH,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,iBAAiB,CACvD,KAAK,CAAC,WAAW,EACjB,SAAS,EACT,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EACpC,eAAe,CAClB,CAAC;YACF,eAAe;SAClB,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,WAAW,EAAE,IAAI;QACjB,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC;KACjC,CAAC;AACN,CAAC;AAED,SAAS,mBAAmB,CAAC,KAA6B,EAAE,aAA4B;IACpF,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAErC,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,UAAU,CAAC,MAAM,KAAK,CAAC;QAC1B,CAAC,CAAC,kCAAkC,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC;QACrF,CAAC,CAAC,iCAAiC,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,WAAwB;IAC5D,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;IACpF,CAAC;IAED,OAAO,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC;AAC1C,CAAC;AAED,SAAS,8BAA8B,CACnC,IAAsB,EACtB,WAAwB,EACxB,YAAyC;IAEzC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAC3D,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,IAAI,CAAC,0BAA0B,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,IAAI,CAAC,0BAA0B,CAAC;YACnC,4BAA4B,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,4BAA4B;SAC7G,CAAC,CAAC;IACP,CAAC;IAED,OAAO,YAAY,CAAC,0BAA0B,CAAC;QAC3C,4BAA4B,EAAE,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,4BAA4B;KAC7G,CAAC,CAAC;AACP,CAAC;AACD,MAAM,UAAU,uBAAuB,CAAC,WAAwB;IAC5D,MAAM,EAAE,aAAa,EAAE,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IAEhE,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,KAA6B;IAE7B,MAAM,EAAE,sBAAsB,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC9E,MAAM,aAAa,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;IACxD,MAAM,WAAW,GAAgB,EAAE,CAAC;IACpC,MAAM,aAAa,GAAG,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAChE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;IAE5C,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,gBAAgB,CAAC,MAAM,EAAE,KAAK;QAC5D,IAAI,SAAS,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAC/B,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAE7C,OAAO;QACX,CAAC;QAED,QAAQ,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;IACxG,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,WAAW,EAAE,IAAI,GAAG,EAAE;QACtB,aAAa,EAAE,uBAAuB,CAAC,WAAW,CAAC;QACnD,sBAAsB;QACtB,YAAY;QACZ,WAAW;QACX,IAAI;QACJ,wBAAwB,EAAE,8BAA8B,CAAC,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC;QACzF,kBAAkB,EAAE,oBAAoB,CAA+B,IAAI,CAAC;QAC5E,gBAAgB,EAAE,MAAM,sBAAsB,CAAC,WAAW,EAAE,YAAY,CAAC;QACzE,cAAc,EAAE,wBAAwB,EAAE;QAC1C,WAAW;QACX,QAAQ;QACR,WAAW;QACX,eAAe,EAAE,oBAAoB,CAAC,KAAK,CAAC;KAC/C,CAAC;AACN,CAAC"}

package/run/worker-pool-worker-plan.js

@@ -29,12 +29,15 @@ export function sendCollectedPlan(collectedPlan) {
     };
 }
 export function selectedAssignedCases(testPlan, assignedCases) {
-    const assigned = new Set(assignedCases.map(caseIdentityKey));
-    const cases = testPlan.cases.filter(function assignedCase(testCase) {
-        return assigned.has(caseIdentityKey(testCase.id));
+    const casesByIdentity = new Map(testPlan.cases.map(function toCaseEntry(testCase) {
+        return [caseIdentityKey(testCase.id), testCase];
+    }));
+    const cases = assignedCases.flatMap(function toAssignedCase(testCase) {
+        const matchedCase = casesByIdentity.get(caseIdentityKey(testCase));
+        return matchedCase === undefined ? [] : [matchedCase];
     });
     const firstCase = cases[0];
-    if (firstCase === undefined || cases.length !== assigned.size) {
+    if (firstCase === undefined || cases.length !== assignedCases.length) {
         throw new Error('Worker-pool test plan did not match assigned case identities.');
     }
     return {

package/run/worker-pool-worker-plan.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-pool-worker-plan.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker-plan.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EACH,4BAA4B,EAC5B,gCAAgC,EACnC,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EACH,mBAAmB,EACnB,kBAAkB,EAClB,YAAY,EACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAgBvD,KAAK,UAAU,cAAc,CAAC,OAA0B;IACpD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAC3G,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAA0B;IAC9D,OAAO,MAAM,iBAAiB,CAAC;QAC3B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,gBAAgB,EAAE,YAAY,CAAC,gBAAgB;QAC/C,MAAM,EAAE,MAAM,cAAc,CAAC,OAAO,CAAC;QACrC,kBAAkB;QAClB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU;KACjC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA0B;IAC5D,OAAO;QACH,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,MAAM,wBAAwB,CAAC,OAAO,CAAC;KACpD,CAAC;AACN,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,aAA0C;IACxE,OAAO;QACH,aAAa,EAAE,4BAA4B,CAAC,aAAa,CAAC,QAAQ,CAAC;QACnE,YAAY,EAAE,aAAa,CAAC,YAAY;KAC3C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,QAAkB,EAAE,aAAgC;IACtF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,QAAQ;QAC9D,OAAO,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAE3B,IAAI,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;IACrF,CAAC;IAED,OAAO;QACH,GAAG,QAAQ;QACX,KAAK,EAAE,CAAE,SAAS,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE;KAC1C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,QAAkB,EAAE,YAA0B;IAC/E,OAAO,qBAAqB,CACxB,QAAQ,EACR,YAAY,CAAC,GAAG,CAAC,SAAS,QAAQ,CAAC,IAAI;QACnC,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,2BAA2B,CACvC,QAAkB,EAClB,SAA6C,EAC7C,qBAA6B;IAE7B,OAAO;QACH,MAAM,EAAE,gCAAgC,CACpC,4BAA4B,CAAC,QAAQ,CAAC,EACtC,EAAE,EACF,EAAE,EACF;YACI,aAAa,EAAE,IAAI;YACnB,WAAW,EAAE,qBAAqB;YAClC,SAAS;SACZ,CACJ;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"worker-pool-worker-plan.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-worker-plan.ts"],"names":[],"mappings":"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"}

package/sbom.cdx.json

@@ -16,9 +16,9 @@
         "component": {
             "type": "library",
             "name": "@overkill-dev/run",
-            "version": "0.0.42",
-            "bom-ref": "pkg:npm/@overkill-dev/run@0.0.42",
-            "purl": "pkg:npm/@overkill-dev/run@0.0.42"
+            "version": "0.0.44",
+            "bom-ref": "pkg:npm/@overkill-dev/run@0.0.44",
+            "purl": "pkg:npm/@overkill-dev/run@0.0.44"
         }
     },
     "components": [
@@ -158,7 +158,7 @@
             "ref": "pkg:npm/@enormora/wall-clock@0.0.3"
         },
         {
-            "ref": "pkg:npm/@overkill-dev/run@0.0.42",
+            "ref": "pkg:npm/@overkill-dev/run@0.0.44",
             "dependsOn": [
                 "pkg:npm/@enormora/wall-clock@0.0.3",
                 "pkg:npm/@schema-hub/zod-error-formatter@0.0.16",

package/run/supervised-child-process.entry-point.js

@@ -1,6 +0,0 @@
-import { runSupervisedChildProcessEntryPoint } from "./supervised-child-process.js";
-export const supervisedChildProcessEntryPointUrl = import.meta.url;
-await runSupervisedChildProcessEntryPoint(process.argv, async function loadSupervisedChild() {
-    return await import("./supervised-child.entry-point.js");
-});
-//# sourceMappingURL=supervised-child-process.entry-point.js.map

package/run/supervised-child-process.entry-point.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"supervised-child-process.entry-point.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-process.entry-point.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mCAAmC,EACtC,MAAM,+BAA+B,CAAC;AAEvC,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;AAEnE,MAAM,mCAAmC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,UAAU,mBAAmB;IACtF,OAAO,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC"}

package/run/supervised-protocol.d.ts

@@ -1,49 +0,0 @@
-import type { CaseId } from '../engine/identity.ts';
-import type { ReporterEvent } from '../engine/reporter.ts';
-import type { ResourceUsageSnapshot, RunResult } from '../engine/run-result.ts';
-import type { CollectedRunPlan, RunRequest, RunEngineSelection, RunResourceBudgets, RunScheduling, RunTestFamily } from './run-types.ts';
-type SupervisedCommandBase = {
-    readonly capabilityRestrictions: {
-        readonly mode: 'disabled' | 'enabled';
-    };
-    readonly capture: RunRequest['capture'];
-    readonly collectionTimeoutMilliseconds: number;
-    readonly cwd: string;
-    readonly engine: Exclude<RunEngineSelection, {
-        readonly kind: 'instance';
-    }>;
-    readonly paths: readonly string[];
-    readonly hardTimeoutMilliseconds: number;
-    readonly resourceBudgets: RunResourceBudgets;
-    readonly resourceUsageSamplingIntervalMilliseconds: number;
-    readonly scheduling: RunScheduling;
-    readonly testFamily: RunTestFamily;
-    readonly timeoutMilliseconds: number;
-};
-export type SupervisedCollectCommand = SupervisedCommandBase & {
-    readonly kind: 'collect';
-};
-export type SupervisedRunCommand = SupervisedCommandBase & {
-    readonly kind: 'run';
-};
-export type SupervisedChildCommand = SupervisedCollectCommand | SupervisedRunCommand;
-export type SupervisedAssignmentCommand = {
-    readonly assignedCases: readonly CaseId[];
-    readonly kind: 'assign';
-};
-export type SupervisedChildMessage = {
-    readonly collectedPlan: CollectedRunPlan;
-    readonly kind: 'collected';
-    readonly runnerErrors: readonly RunResult['runnerErrors'][number][];
-} | {
-    readonly event: ReporterEvent;
-    readonly kind: 'event';
-} | {
-    readonly kind: 'result';
-    readonly result: RunResult;
-} | {
-    readonly kind: 'sample';
-    readonly sample: ResourceUsageSnapshot;
-};
-export {};
-//# sourceMappingURL=supervised-protocol.d.ts.map

package/run/supervised-protocol.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"supervised-protocol.d.ts","sourceRoot":"","sources":["../../../../source/run/supervised-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,KAAK,EACR,gBAAgB,EAChB,UAAU,EACV,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,EACb,aAAa,EAChB,MAAM,gBAAgB,CAAC;AAExB,KAAK,qBAAqB,GAAG;IACzB,QAAQ,CAAC,sBAAsB,EAAE;QAC7B,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;KACzC,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACxC,QAAQ,CAAC,6BAA6B,EAAE,MAAM,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;KAAE,CAAC,CAAC;IAC7E,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,QAAQ,CAAC,eAAe,EAAE,kBAAkB,CAAC;IAC7C,QAAQ,CAAC,yCAAyC,EAAE,MAAM,CAAC;IAC3D,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC;IACnC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,qBAAqB,GAAG;IAC3D,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,qBAAqB,GAAG;IACvD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,wBAAwB,GAAG,oBAAoB,CAAC;AAErF,MAAM,MAAM,2BAA2B,GAAG;IACtC,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,CAAC,aAAa,EAAE,gBAAgB,CAAC;IACzC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,YAAY,EAAE,SAAS,SAAS,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;CACvE,GAAG;IACA,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CAC1B,GAAG;IACA,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;CAC9B,GAAG;IACA,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;CAC1C,CAAC"}