@overkill-dev/run 0.0.56 → 0.0.58

package/run/worker-pool-placement-planning.js

@@ -2,7 +2,7 @@ import { workIdentityKey } from "../engine/identity.js";
 import { collectedRunCaseEntries } from "./collected-run-plan.js";
 import { selectDurationHistoryPlacement } from "./duration-history.js";
 import { workUnitsFromCollectedPlan } from "./work-unit-planning.js";
-import { workerPoolLanes, workerPoolPlacementAssignments } from "./worker-pool-lanes.js";
+import { resolveWorkerCount, workerPoolLanesForCount, workerPoolPlacementAssignments } from "./worker-pool-lanes.js";
 
 function collectedEntriesByWorkKey(collectedPlan) {
     return new Map(collectedRunCaseEntries(collectedPlan).map(function toEntry(entry) {
@@ -26,18 +26,23 @@ export function createWorkerPoolPlacementResolution(input) {
     const durationHistory = input.assignmentPolicy === 'duration-history-balanced'
         ? selectDurationHistoryPlacement(units, input.durationHistoryIndex, input.nowMilliseconds)
         : { facts: null, unitDuration: null };
-    const lanes = workerPoolLanes({
+    const laneInput = {
         assignmentPolicy: input.assignmentPolicy,
         availableParallelism: input.availableParallelism,
+        profileMaximum: input.profileMaximumWorkers,
+        requestedWorkers: input.requestedWorkers,
         units
-    });
+    };
+    const workerCount = resolveWorkerCount(laneInput);
+    const lanes = workerPoolLanesForCount(workerCount.resolved);
     return {
         durationHistory: durationHistory.facts,
         placementPlan: {
             assignments: workerPoolPlacementAssignments(units, lanes, input.assignmentPolicy, durationHistory.unitDuration),
             lanes,
             units
-        }
+        },
+        workerCount
     };
 }
 

package/run/worker-pool-placement-planning.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-pool-placement-planning.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-placement-planning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACH,uBAAuB,EAC1B,MAAM,yBAAyB,CAAC;AAYjC,OAAO,EACH,8BAA8B,EAGjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,0BAA0B,EAC7B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACH,eAAe,EACf,8BAA8B,EACjC,MAAM,wBAAwB,CAAC;AAEA;AA+BhC,SAAS,yBAAyB,CAC9B,aAA+B;IAE/B,OAAO,IAAI,GAAG,CACV,uBAAuB,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,KAAK;QAC7D,OAAO,CAAE,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAE,CAAC;IACpD,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oCAAoC,CAChD,aAA+B,EAC/B,KAA6B;IAE7B,MAAM,OAAO,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAEzD,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,gBAAgB,CAAC,IAAI;QAC/C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,cAAc,CAAC,IAAI;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YAEjD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC5E,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,mCAAmC,CAC/C,KAAyC;IAEzC,MAAM,KAAK,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,KAAK,CAAC,gBAAgB,KAAK,2BAA2B;QAC1E,CAAC,CAAC,8BAA8B,CAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,eAAe,CAAC;QAC1F,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,eAAe,CAAC;QAC1B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;QAChD,KAAK;KACR,CAAC,CAAC;IAEH,OAAO;QACH,eAAe,EAAE,eAAe,CAAC,KAAK;QACtC,aAAa,EAAE;YACX,WAAW,EAAE,8BAA8B,CACvC,KAAK,EACL,KAAK,EACL,KAAK,CAAC,gBAAgB,EACtB,eAAe,CAAC,YAAY,CAC/B;YACD,KAAK;YACL,KAAK;SACR;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"worker-pool-placement-planning.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-placement-planning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACH,uBAAuB,EAC1B,MAAM,yBAAyB,CAAC;AAajC,OAAO,EACH,8BAA8B,EAGjC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACH,0BAA0B,EAC7B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACH,kBAAkB,EAClB,uBAAuB,EACvB,8BAA8B,EAEjC,MAAM,wBAAwB,CAAC;AAEA;AAkChC,SAAS,yBAAyB,CAC9B,aAA+B;IAE/B,OAAO,IAAI,GAAG,CACV,uBAAuB,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,KAAK;QAC7D,OAAO,CAAE,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAE,CAAC;IACpD,CAAC,CAAC,CACL,CAAC;AACN,CAAC;AAED,MAAM,UAAU,oCAAoC,CAChD,aAA+B,EAC/B,KAA6B;IAE7B,MAAM,OAAO,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;IAEzD,OAAO,KAAK,CAAC,OAAO,CAAC,SAAS,gBAAgB,CAAC,IAAI;QAC/C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,cAAc,CAAC,IAAI;YAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YAEjD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC5E,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,mCAAmC,CAC/C,KAAyC;IAEzC,MAAM,KAAK,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,KAAK,CAAC,gBAAgB,KAAK,2BAA2B;QAC1E,CAAC,CAAC,8BAA8B,CAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,eAAe,CAAC;QAC1F,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IAC1C,MAAM,SAAS,GAAwB;QACnC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB;QAChD,cAAc,EAAE,KAAK,CAAC,qBAAqB;QAC3C,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,KAAK;KACR,CAAC;IACF,MAAM,WAAW,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,uBAAuB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAE5D,OAAO;QACH,eAAe,EAAE,eAAe,CAAC,KAAK;QACtC,aAAa,EAAE;YACX,WAAW,EAAE,8BAA8B,CACvC,KAAK,EACL,KAAK,EACL,KAAK,CAAC,gBAAgB,EACtB,eAAe,CAAC,YAAY,CAC/B;YACD,KAAK;YACL,KAAK;SACR;QACD,WAAW;KACd,CAAC;AACN,CAAC"}

package/run/worker-pool-protocol.js

@@ -0,0 +1,2 @@
+export const workerPoolRunResourceOwnerLane = 'run-resource-owner';
+//# sourceMappingURL=worker-pool-protocol.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"worker-pool-protocol.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-protocol.ts"],"names":[],"mappings":"AAyCA,MAAM,CAAC,MAAM,8BAA8B,GAAG,oBAAoB,CAAC"}

package/run/worker-pool-resource-lifecycle-execution.js

@@ -0,0 +1,155 @@
+import { MessageChannel as NodeMessageChannel } from 'node:worker_threads';
+import { workIdentityKey } from "../engine/identity.js";
+import { createBatchRunCommand, createRunCommand, firstPlanUnit, placementRunWork } from "./worker-pool-command.js";
+import { workerPoolRunResourceOwnerLane } from "./worker-pool-protocol.js";
+import { collectedPlanNeedsRunResourceOwner } from "./worker-pool-runtime.js";
+function portTransferList(port) {
+    return [port];
+}
+function freshSignal() {
+    const controller = new AbortController();
+    return controller.signal;
+}
+function isWorkerPoolRunResourceOutput(value) {
+    return value !== null &&
+        typeof value === 'object' &&
+        Object.hasOwn(value, 'projectedResources') &&
+        Object.hasOwn(value, 'runnerErrors');
+}
+function isWorkerPoolDisposeResourceOutput(value) {
+    return value !== null &&
+        typeof value === 'object' &&
+        Object.hasOwn(value, 'runnerErrors');
+}
+function resourceTaskChannel() {
+    const { port1, port2 } = new NodeMessageChannel();
+    return {
+        close() {
+            port2.close();
+        },
+        port: port1
+    };
+}
+function recordResourceRunnerErrors(runtime, errors) {
+    if (errors.length > 0) {
+        runtime.runState.recordRunnerErrors(errors);
+        runtime.terminalFailure.write(true);
+    }
+}
+function recordResourceLifecycleFailure(runtime, message, cause) {
+    if (runtime.terminalFailure.read()) {
+        return;
+    }
+    runtime.runState.recordRunnerError({
+        attributedTo: null,
+        attributedToWork: null,
+        cause,
+        diagnostics: [],
+        message,
+        subtype: 'runtime-policy'
+    });
+}
+export function createWorkerPoolBatchRunCommand(runtime, members) {
+    return {
+        ...createBatchRunCommand(runtime, members)
+    };
+}
+export function workerPoolWorkHasStarted(startedCases, work) {
+    return startedCases.has(workIdentityKey(work));
+}
+async function acquireRunResourceOutput(runtime, plan, work) {
+    const channel = resourceTaskChannel();
+    try {
+        return await runtime.pool.run({
+            assignedWork: work,
+            boundaryUseCounts: [],
+            command: createRunCommand(runtime, firstPlanUnit(plan)),
+            kind: 'acquire-run-resources',
+            lane: workerPoolRunResourceOwnerLane,
+            lifecycle: runtime.lifecycle,
+            port: channel.port
+        }, {
+            name: 'runTask',
+            signal: freshSignal(),
+            transferList: portTransferList(channel.port)
+        });
+    }
+    finally {
+        channel.close();
+    }
+}
+async function acquireRunResources(runtime, plan) {
+    const work = placementRunWork(plan);
+    const output = await acquireRunResourceOutput(runtime, plan, work);
+    if (!isWorkerPoolRunResourceOutput(output)) {
+        throw new Error('Worker-pool run resource task returned an invalid result.');
+    }
+    recordResourceRunnerErrors(runtime, output.runnerErrors);
+    return { projectedResources: output.projectedResources, runResourceOwner: true, runWork: work };
+}
+async function runDisposalTaskOutput(runtime, lane, kind) {
+    const channel = resourceTaskChannel();
+    try {
+        return await runtime.pool.run({
+            kind,
+            lane,
+            lifecycle: runtime.lifecycle,
+            port: channel.port
+        }, {
+            name: 'runTask',
+            signal: freshSignal(),
+            transferList: portTransferList(channel.port)
+        });
+    }
+    finally {
+        channel.close();
+    }
+}
+async function runDisposalTask(runtime, lane, kind) {
+    const output = await runDisposalTaskOutput(runtime, lane, kind);
+    if (!isWorkerPoolDisposeResourceOutput(output)) {
+        throw new Error('Worker-pool resource disposal returned an invalid result.');
+    }
+    recordResourceRunnerErrors(runtime, output.runnerErrors);
+}
+async function disposeRunResources(runtime) {
+    try {
+        await runDisposalTask(runtime, workerPoolRunResourceOwnerLane, 'dispose-run-resources');
+    }
+    catch (error) {
+        recordResourceLifecycleFailure(runtime, 'Worker-pool run resource disposal failed.', error);
+    }
+}
+async function disposeLaneLifecycles(runtime, plan) {
+    await Promise.all(plan.lanes.map(async function disposeLane(lane) {
+        try {
+            await runDisposalTask(runtime, lane.id, 'dispose-lane-lifecycle');
+        }
+        catch (error) {
+            recordResourceLifecycleFailure(runtime, 'Worker-pool lane resource disposal failed.', error);
+        }
+    }));
+}
+export function collectedPlanNeedsLaneResourceLifecycle(runtime) {
+    return runtime.collectedPlan.files.some(function fileHasLaneResource(file) {
+        return file.cases.some(function caseHasLaneResource(testCase) {
+            return testCase.resourceAttachments.resourceGraph.some(function isLaneResource(resource) {
+                return resource.scope !== 'per-run';
+            });
+        });
+    });
+}
+export async function acquireWorkerPoolResourceLifecycle(runtime, placementPlan) {
+    return collectedPlanNeedsRunResourceOwner(runtime.resolvedRun)
+        ? await acquireRunResources(runtime, placementPlan)
+        : { projectedResources: { resources: [] }, runResourceOwner: false, runWork: placementRunWork(placementPlan) };
+}
+export async function disposeWorkerPoolResourceLifecycles(runtime, placementPlan, resourceLifecycle) {
+    if (!runtime.terminalFailure.read() && collectedPlanNeedsLaneResourceLifecycle(runtime)) {
+        await disposeLaneLifecycles(runtime, placementPlan);
+    }
+    if (resourceLifecycle.runResourceOwner) {
+        await disposeRunResources(runtime);
+    }
+}
+//# sourceMappingURL=worker-pool-resource-lifecycle-execution.js.map

package/run/worker-pool-resource-lifecycle-execution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-pool-resource-lifecycle-execution.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-resource-lifecycle-execution.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,cAAc,IAAI,kBAAkB,EAEvC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EACH,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EACH,8BAA8B,EAIjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACH,kCAAkC,EAErC,MAAM,0BAA0B,CAAC;AAiBlC,SAAS,gBAAgB,CAAC,IAAqB;IAC3C,OAAO,CAAE,IAAI,CAAE,CAAC;AACpB,CAAC;AAED,SAAS,WAAW;IAChB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IAEzC,OAAO,UAAU,CAAC,MAAM,CAAC;AAC7B,CAAC;AAED,SAAS,6BAA6B,CAAC,KAAc;IACjD,OAAO,KAAK,KAAK,IAAI;QACjB,OAAO,KAAK,KAAK,QAAQ;QACzB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,oBAAoB,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,iCAAiC,CAAC,KAAc;IACrD,OAAO,KAAK,KAAK,IAAI;QACjB,OAAO,KAAK,KAAK,QAAQ;QACzB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,mBAAmB;IACxB,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAElD,OAAO;QACH,KAAK;YACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QACD,IAAI,EAAE,KAAK;KACd,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAAC,OAA6B,EAAE,MAA8B;IAC7F,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC5C,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;AACL,CAAC;AAED,SAAS,8BAA8B,CAAC,OAA6B,EAAE,OAAe,EAAE,KAAc;IAClG,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC;QACjC,OAAO;IACX,CAAC;IAED,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QAC/B,YAAY,EAAE,IAAI;QAClB,gBAAgB,EAAE,IAAI;QACtB,KAAK;QACL,WAAW,EAAE,EAAE;QACf,OAAO;QACP,OAAO,EAAE,gBAAgB;KAC5B,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,+BAA+B,CAC3C,OAA6B,EAC7B,OAA8E;IAE9E,OAAO;QACH,GAAG,qBAAqB,CAAC,OAAO,EAAE,OAAO,CAAC;KAC7C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,YAA+B,EAC/B,IAAY;IAEZ,OAAO,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,wBAAwB,CACnC,OAA6B,EAC7B,IAAmB,EACnB,IAAyC;IAEzC,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IAEtC,IAAI,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1B,YAAY,EAAE,IAAI;YAClB,iBAAiB,EAAE,EAAE;YACrB,OAAO,EAAE,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,EAAE,uBAAuB;YAC7B,IAAI,EAAE,8BAA8B;YACpC,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,EAAE;YACC,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,WAAW,EAAE;YACrB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC;SAC/C,CAAC,CAAC;IACP,CAAC;YAAS,CAAC;QACP,OAAO,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;AACL,CAAC;AAED,KAAK,UAAU,mBAAmB,CAC9B,OAA6B,EAC7B,IAAmB;IAEnB,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEnE,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IACjF,CAAC;IAED,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,EAAE,gBAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACpG,CAAC;AAED,KAAK,UAAU,qBAAqB,CAChC,OAA6B,EAC7B,IAAY,EACZ,IAAwD;IAExD,MAAM,OAAO,GAAG,mBAAmB,EAAE,CAAC;IAEtC,IAAI,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;YAC1B,IAAI;YACJ,IAAI;YACJ,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;SACrB,EAAE;YACC,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,WAAW,EAAE;YACrB,YAAY,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC;SAC/C,CAAC,CAAC;IACP,CAAC;YAAS,CAAC;QACP,OAAO,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAC1B,OAA6B,EAC7B,IAAY,EACZ,IAAwD;IAExD,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAEhE,IAAI,CAAC,iCAAiC,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;IACjF,CAAC;IAED,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,OAA6B;IAC5D,IAAI,CAAC;QACD,MAAM,eAAe,CAAC,OAAO,EAAE,8BAA8B,EAAE,uBAAuB,CAAC,CAAC;IAC5F,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,8BAA8B,CAAC,OAAO,EAAE,2CAA2C,EAAE,KAAK,CAAC,CAAC;IAChG,CAAC;AACL,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,OAA6B,EAAE,IAAmB;IACnF,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,UAAU,WAAW,CAAC,IAAI;QAC5D,IAAI,CAAC;YACD,MAAM,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACtE,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,8BAA8B,CAAC,OAAO,EAAE,4CAA4C,EAAE,KAAK,CAAC,CAAC;QACjG,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,UAAU,uCAAuC,CAAC,OAA6B;IACjF,OAAO,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,mBAAmB,CAAC,IAAI;QACrE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,mBAAmB,CAAC,QAAQ;YACxD,OAAO,QAAQ,CAAC,mBAAmB,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,cAAc,CAAC,QAAQ;gBACnF,OAAO,QAAQ,CAAC,KAAK,KAAK,SAAS,CAAC;YACxC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACpD,OAA6B,EAC7B,aAA4B;IAE5B,OAAO,kCAAkC,CAAC,OAAO,CAAC,WAAW,CAAC;QAC1D,CAAC,CAAC,MAAM,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC;QACnD,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,CAAC,aAAa,CAAC,EAAE,CAAC;AACvH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mCAAmC,CACrD,OAA6B,EAC7B,aAA4B,EAC5B,iBAA8C;IAE9C,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,uCAAuC,CAAC,OAAO,CAAC,EAAE,CAAC;QACtF,MAAM,qBAAqB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;QACrC,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;AACL,CAAC"}

package/run/worker-pool-routing.js

@@ -1,4 +1,5 @@
 import { createResourceUsageFromSamples } from "./resource-usage.js";
+import { isWorkerPoolTaskKind } from "./worker-pool-task-validation.js";
 function routeForLifecycle(routes, workerLifecycle) {
     const route = routes.find(function hasWorkerLifecycle(candidate) {
         return candidate.workerLifecycle === workerLifecycle;
@@ -20,20 +21,22 @@ function routeForLane(routes, lane) {
 function isWorkerPoolTask(value) {
     return typeof value === 'object' &&
         value !== null &&
-        Object.hasOwn(value, 'command') &&
-        (Reflect.get(value, 'kind') === 'collect' || Reflect.get(value, 'kind') === 'run');
+        isWorkerPoolTaskKind(Reflect.get(value, 'kind'));
 }
 function taskWorkerLifecycle(task) {
     if (!isWorkerPoolTask(task)) {
         throw new Error('Worker-pool received an invalid task.');
     }
+    if (task.kind === 'dispose-lane-lifecycle' || task.kind === 'dispose-run-resources') {
+        return 'reuse';
+    }
     return task.command.workerLifecycle;
 }
 function taskLane(task) {
     if (!isWorkerPoolTask(task)) {
         throw new Error('Worker-pool received an invalid task.');
     }
-    return task.kind === 'run' ? task.lane : null;
+    return task.kind === 'collect' ? null : task.lane;
 }
 function routeForTask(routes, task) {
     const lane = taskLane(task);

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

@@ -1 +1 @@
-{"version":3,"file":"worker-pool-routing.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-routing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker-pool-routing.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-routing.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAGrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAQxE,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,YAAY,CACjB,MAAkC,EAClC,IAAY;IAEZ,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,SAAS;QAChD,OAAO,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,UAAU,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACpC,OAAO,OAAO,KAAK,KAAK,QAAQ;QAC5B,KAAK,KAAK,IAAI;QACd,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;AACzD,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,IAAI,IAAI,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,IAAI,KAAK,uBAAuB,EAAE,CAAC;QAClF,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;AACxC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAa;IAC3B,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,YAAY,CAAC,MAAkC,EAAE,IAAa;IACnE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAE5B,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAC7G,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,MAAM,UAAU,gBAAgB,CAAC,MAAkC;IAC/D,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,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpE,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;QACD,oBAAoB;YAChB,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,eAAe,CAAC,KAAK;gBAChD,OAAO,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,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"}

package/run/worker-pool-run.js

@@ -4,8 +4,20 @@ import { executeWorkerPoolUnits } from "./worker-pool-execution.js";
 import { reportRunStart, startPoolResourceTracking } from "./worker-pool-resource-tracking.js";
 import { createEmptyWorkerPoolResult, finishWorkerPoolRun } from "./worker-pool-results.js";
 import { createWorkerPoolRuntime, workerPoolPlacementPlan } from "./worker-pool-runtime.js";
-export async function collectWorkerPoolRun(command, dependencies) {
-    return await collectInWorkerPool(command, dependencies, createSupervisedRunState());
+const emptyWorkerPoolTimingMetadata = Object.freeze({
+    label: null,
+    processId: null,
+    resource: null,
+    workerId: null
+});
+export async function collectWorkerPoolRun(command, dependencies, timing = null) {
+    return await collectInWorkerPool({
+        command,
+        createdPool: null,
+        dependencies,
+        runState: createSupervisedRunState(),
+        timing
+    });
 }
 async function releaseRuntimePool(runtime) {
     runtime.pool.setHostOutputSink?.(null);
@@ -13,16 +25,23 @@ async function releaseRuntimePool(runtime) {
         await runtime.pool.destroy();
     }
 }
+async function releaseTimedRuntimePool(runtime, timing) {
+    if (runtime.destroyPool) {
+        await (timing?.measureAsync('worker-pool.shutdown', emptyWorkerPoolTimingMetadata, async function releaseTimedWorkerPoolRuntime() {
+            await releaseRuntimePool(runtime);
+        }) ?? releaseRuntimePool(runtime));
+    }
+    else {
+        await releaseRuntimePool(runtime);
+    }
+}
 async function finishExecution(runtime, resolvedRun, startedAtMilliseconds, startedAtMicroseconds) {
     await reportRunStart(runtime, startedAtMilliseconds);
     await startPoolResourceTracking(runtime);
     return await finishWorkerPoolRun(runtime, await executeWorkerPoolUnits(runtime, workerPoolPlacementPlan(resolvedRun), startedAtMilliseconds), startedAtMicroseconds);
 }
-async function executeWorkerPoolRunWithState(resolvedRun, dependencies, state) {
-    if (workerPoolPlacementPlan(resolvedRun).units.length === 0) {
-        return await createEmptyWorkerPoolResult(resolvedRun, dependencies, state.collectionRunState);
-    }
-    const runtime = await createWorkerPoolRuntime({
+async function createRuntime(resolvedRun, dependencies, state) {
+    return await createWorkerPoolRuntime({
         collectionRunnerErrors: resolvedRun.collectionRunnerErrors,
         createdPool: state.createdPool,
         dependencies,
@@ -30,15 +49,33 @@ async function executeWorkerPoolRunWithState(resolvedRun, dependencies, state) {
             return await state.finalizeResult(resolvedRun, result);
         },
         resolvedRun,
-        runState: state.collectionRunState
+        runState: state.collectionRunState,
+        timing: state.timing
     });
+}
+async function finishExecutionWithRuntime(resolvedRun, dependencies, state, runtime) {
     const startedAtMilliseconds = dependencies.wallClock.currentEpochMilliseconds;
     const startedAtMicroseconds = dependencies.wallClock.currentMonotonicMicroseconds;
+    const readyAtMicroseconds = dependencies.wallClock.currentMonotonicMicroseconds;
+    state.timing?.record({
+        completedAtMicroseconds: readyAtMicroseconds,
+        kind: 'worker-pool.ready',
+        metadata: emptyWorkerPoolTimingMetadata,
+        startedAtMicroseconds: readyAtMicroseconds,
+        status: 'success'
+    });
+    return await finishExecution(runtime, resolvedRun, startedAtMilliseconds, startedAtMicroseconds);
+}
+async function executeWorkerPoolRunWithState(resolvedRun, dependencies, state) {
+    if (workerPoolPlacementPlan(resolvedRun).units.length === 0) {
+        return await createEmptyWorkerPoolResult(resolvedRun, dependencies, state.collectionRunState);
+    }
+    const runtime = await createRuntime(resolvedRun, dependencies, state);
     try {
-        return await finishExecution(runtime, resolvedRun, startedAtMilliseconds, startedAtMicroseconds);
+        return await finishExecutionWithRuntime(resolvedRun, dependencies, state, runtime);
     }
     finally {
-        await releaseRuntimePool(runtime);
+        await releaseTimedRuntimePool(runtime, state.timing);
     }
 }
 export async function executeWorkerPoolRun(resolvedRun, dependencies, options) {
@@ -48,19 +85,37 @@ export async function executeWorkerPoolRun(resolvedRun, dependencies, options) {
         createdPool: null
     });
 }
+async function destroyCommandPool(pool, timing) {
+    if (pool !== null) {
+        await (timing?.measureAsync('worker-pool.shutdown', emptyWorkerPoolTimingMetadata, async function destroyTimedCollectionWorkerPool() {
+            await pool.destroy();
+        }) ?? pool.destroy());
+    }
+}
 export async function runWorkerPoolCommand(command, dependencies, createResolvedRun, options) {
     const collectionRunState = createSupervisedRunState();
+    const timingOption = options.timing === null ? {} : { timing: options.timing };
+    const poolOptions = {
+        cwd: command.cwd,
+        hostProcess: command.hostProcess,
+        testFamily: command.testFamily,
+        ...timingOption,
+        workerCount: 1,
+        workerLifecycle: command.workerLifecycle
+    };
     const pool = command.hostProcess.kind === 'child'
-        ? dependencies.createWorkerPool({
-            cwd: command.cwd,
-            hostProcess: command.hostProcess,
-            testFamily: command.testFamily,
-            workerCount: dependencies.availableParallelism,
-            workerLifecycle: command.workerLifecycle
-        })
+        ? options.timing?.measure('worker-pool.start', emptyWorkerPoolTimingMetadata, function createTimedHostedWorkerPool() {
+            return dependencies.createWorkerPool(poolOptions);
+        }) ?? dependencies.createWorkerPool(poolOptions)
         : null;
     try {
-        const collection = await collectInWorkerPool(command, dependencies, collectionRunState, pool);
+        const collection = await collectInWorkerPool({
+            command,
+            createdPool: pool,
+            dependencies,
+            runState: collectionRunState,
+            timing: options.timing
+        });
         return await executeWorkerPoolRunWithState(await createResolvedRun(collection), dependencies, {
             ...options,
             collectionRunState,
@@ -68,7 +123,7 @@ export async function runWorkerPoolCommand(command, dependencies, createResolved
         });
     }
     finally {
-        await pool?.destroy();
+        await destroyCommandPool(pool, options.timing);
     }
 }
 //# sourceMappingURL=worker-pool-run.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"worker-pool-run.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-run.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,wBAAwB,EAE3B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EACH,sBAAsB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACH,cAAc,EACd,yBAAyB,EAC5B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EACH,2BAA2B,EAC3B,mBAAmB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACH,uBAAuB,EACvB,uBAAuB,EAE1B,MAAM,0BAA0B,CAAC;AAalC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,OAA0B,EAC1B,YAAyC;IAEzC,OAAO,MAAM,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC7B,OAA4D;IAE5D,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;IAEvC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACtB,MAAM,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IACjC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAC1B,OAA4D,EAC5D,WAAwB,EACxB,qBAA6B,EAC7B,qBAA6B;IAE7B,MAAM,cAAc,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC;IACrD,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAEzC,OAAO,MAAM,mBAAmB,CAC5B,OAAO,EACP,MAAM,sBAAsB,CAAC,OAAO,EAAE,uBAAuB,CAAC,WAAW,CAAC,EAAE,qBAAqB,CAAC,EAClG,qBAAqB,CACxB,CAAC;AACN,CAAC;AAED,KAAK,UAAU,6BAA6B,CACxC,WAAwB,EACxB,YAAyC,EACzC,KAA+B;IAE/B,IAAI,uBAAuB,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,OAAO,MAAM,2BAA2B,CAAC,WAAW,EAAE,YAAY,EAAE,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAClG,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,uBAAuB,CAAC;QAC1C,sBAAsB,EAAE,WAAW,CAAC,sBAAsB;QAC1D,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,YAAY;QACZ,KAAK,CAAC,cAAc,CAAC,MAAiB;YAClC,OAAO,MAAM,KAAK,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC3D,CAAC;QACD,WAAW;QACX,QAAQ,EAAE,KAAK,CAAC,kBAAkB;KACrC,CAAC,CAAC;IACH,MAAM,qBAAqB,GAAG,YAAY,CAAC,SAAS,CAAC,wBAAwB,CAAC;IAC9E,MAAM,qBAAqB,GAAG,YAAY,CAAC,SAAS,CAAC,4BAA4B,CAAC;IAElF,IAAI,CAAC;QACD,OAAO,MAAM,eAAe,CAAC,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;IACrG,CAAC;YAAS,CAAC;QACP,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,WAAwB,EACxB,YAAyC,EACzC,OAAmC;IAEnC,OAAO,MAAM,6BAA6B,CAAC,WAAW,EAAE,YAAY,EAAE;QAClE,GAAG,OAAO;QACV,kBAAkB,EAAE,wBAAwB,EAAE;QAC9C,WAAW,EAAE,IAAI;KACpB,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,OAA0B,EAC1B,YAAyC,EACzC,iBAAmF,EACnF,OAAmC;IAEnC,MAAM,kBAAkB,GAAG,wBAAwB,EAAE,CAAC;IACtD,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO;QAC7C,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC;YAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,YAAY,CAAC,oBAAoB;YAC9C,eAAe,EAAE,OAAO,CAAC,eAAe;SAC3C,CAAC;QACF,CAAC,CAAC,IAAI,CAAC;IAEX,IAAI,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;QAE9F,OAAO,MAAM,6BAA6B,CACtC,MAAM,iBAAiB,CAAC,UAAU,CAAC,EACnC,YAAY,EACZ;YACI,GAAG,OAAO;YACV,kBAAkB;YAClB,WAAW,EAAE,IAAI;SACpB,CACJ,CAAC;IACN,CAAC;YAAS,CAAC;QACP,MAAM,IAAI,EAAE,OAAO,EAAE,CAAC;IAC1B,CAAC;AACL,CAAC"}
+{"version":3,"file":"worker-pool-run.js","sourceRoot":"","sources":["../../../../source/run/worker-pool-run.ts"],"names":[],"mappings":"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"}

package/run/worker-pool-runtime.js

@@ -3,7 +3,9 @@ import { createStoredRunValue } from "./supervised-run-state.js";
 import { loadTinypoolConstructor } from "./tinypool-node-compatibility.js";
 import { runTask as workerPoolWorkerEntryPoint } from "./worker-pool-worker.js";
 import { createRoutedPool } from "./worker-pool-routing.js";
+import { emptyTimingSpanMetadata } from "./run-timing-collection.js";
 const Tinypool = loadTinypoolConstructor();
+const workerPoolRunResourceOwnerLane = 'run-resource-owner';
 function workerPoolEntryPointHref(worker) {
     const entryPointWorkerName = worker.name;
     const workerPoolEntryPointUrl = new URL('./worker-pool-worker.ts', import.meta.url);
@@ -81,28 +83,94 @@ function placementLaneLifecycles(plan) {
     });
     return laneLifecycles;
 }
-function workerPoolOptions(resolvedRun, execution, workerCount, workerLifecycle) {
+function workerPoolOptions(input) {
+    const timingOption = input.timing === null ? {} : { timing: input.timing };
     return {
-        cwd: resolvedRun.cwd,
-        hostProcess: copiedHostProcess(execution),
-        testFamily: execution.testFamily,
-        workerCount,
-        workerLifecycle
+        cwd: input.resolvedRun.cwd,
+        hostProcess: copiedHostProcess(input.execution),
+        testFamily: input.execution.testFamily,
+        ...timingOption,
+        workerCount: input.workerCount,
+        workerLifecycle: input.workerLifecycle
     };
 }
 function createEmptyExecutionPool(input, execution) {
     return {
         destroyPool: input.createdPool === null,
-        pool: input.createdPool ?? input.dependencies.createWorkerPool(workerPoolOptions(input.resolvedRun, execution, 0, execution.workerLifecycle))
+        pool: input.createdPool ?? input.timing?.measure('worker-pool.start', emptyTimingSpanMetadata(), function createTimedEmptyWorkerPool() {
+            return input.dependencies.createWorkerPool(workerPoolOptions({
+                execution,
+                resolvedRun: input.resolvedRun,
+                timing: input.timing ?? null,
+                workerCount: 0,
+                workerLifecycle: execution.workerLifecycle
+            }));
+        }) ?? input.dependencies.createWorkerPool(workerPoolOptions({
+            execution,
+            resolvedRun: input.resolvedRun,
+            timing: input.timing ?? null,
+            workerCount: 0,
+            workerLifecycle: execution.workerLifecycle
+        }))
     };
 }
+function createExecutionWorkerPool(input, execution, workerCount, workerLifecycle) {
+    const options = workerPoolOptions({
+        execution,
+        resolvedRun: input.resolvedRun,
+        timing: input.timing ?? null,
+        workerCount,
+        workerLifecycle
+    });
+    return input.timing?.measure('worker-pool.start', emptyTimingSpanMetadata(), function createTimedWorkerPool() {
+        return input.dependencies.createWorkerPool(options);
+    }) ?? input.dependencies.createWorkerPool(options);
+}
+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;
+}
+export function collectedPlanNeedsRunResourceOwner(resolvedRun) {
+    return workerPoolCollectedPlan(resolvedRun).files.some(function fileHasRunResource(file) {
+        return file.cases.some(function caseHasRunResource(testCase) {
+            return testCase.resourceAttachments.resourceGraph.some(function isRunResource(resource) {
+                return resource.scope === 'per-run';
+            });
+        });
+    });
+}
+function runResourceOwnerRoutes(input, execution, needsRunResourceOwner) {
+    if (!needsRunResourceOwner) {
+        return [];
+    }
+    return [
+        {
+            lane: workerPoolRunResourceOwnerLane,
+            pool: createExecutionWorkerPool(input, execution, 1, 'reuse'),
+            workerLifecycle: 'reuse'
+        }
+    ];
+}
+function shareableSingleLaneLifecycle(placementPlan, laneLifecycles, needsRunResourceOwner) {
+    const [lane] = placementPlan.lanes;
+    if (placementPlan.lanes.length !== 1 || lane === undefined) {
+        return null;
+    }
+    const workerLifecycle = laneLifecycles.get(lane.id);
+    return workerLifecycle !== undefined && (!needsRunResourceOwner || workerLifecycle === 'reuse')
+        ? workerLifecycle
+        : null;
+}
 function createLaneExecutionPool(input, execution, placementPlan) {
     const laneLifecycles = placementLaneLifecycles(placementPlan);
-    const singleLane = placementPlan.lanes[0];
-    if (input.createdPool !== null && placementPlan.lanes.length === 1 && singleLane !== undefined) {
+    const needsRunResourceOwner = collectedPlanNeedsRunResourceOwner(input.resolvedRun);
+    const singleLaneLifecycle = shareableSingleLaneLifecycle(placementPlan, laneLifecycles, needsRunResourceOwner);
+    if (singleLaneLifecycle !== null) {
         return {
-            destroyPool: false,
-            pool: input.createdPool
+            destroyPool: input.createdPool === null,
+            pool: input.createdPool ?? createExecutionWorkerPool(input, execution, 1, singleLaneLifecycle)
         };
     }
     const routes = placementPlan.lanes.map(function toRoute(lane) {
@@ -111,14 +179,15 @@ function createLaneExecutionPool(input, execution, placementPlan) {
             throw new Error('Placement lane has no assigned worker lifecycle.');
         }
         return {
-            pool: input.dependencies.createWorkerPool(workerPoolOptions(input.resolvedRun, execution, 1, workerLifecycle)),
             lane: lane.id,
+            pool: createExecutionWorkerPool(input, execution, 1, workerLifecycle),
             workerLifecycle
         };
     });
+    const ownerRoutes = runResourceOwnerRoutes(input, execution, needsRunResourceOwner);
     return {
         destroyPool: true,
-        pool: createRoutedPool(routes)
+        pool: createRoutedPool([...routes, ...ownerRoutes])
     };
 }
 function createExecutionPool(input, placementPlan) {
@@ -128,12 +197,6 @@ function createExecutionPool(input, placementPlan) {
     }
     return createLaneExecutionPool(input, execution, placementPlan);
 }
-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(pool, resolvedRun, dependencies) {
     if (!resolvedRun.facts.execution.resourceUsagePolicy.measure) {
         return null;
@@ -188,7 +251,11 @@ export async function createWorkerPoolRuntime(input) {
         resolvedRun,
         runState,
         taskResults,
-        terminalFailure: createStoredRunValue(false)
+        terminalFailure: createStoredRunValue(false),
+        timing: input.timing ?? null,
+        lifecycle: {
+            token: dependencies.createSeed().toString()
+        }
     };
 }
 //# sourceMappingURL=worker-pool-runtime.js.map