@overkill-dev/run 0.0.60 → 0.0.61

package/run/run-if-main.js

@@ -1,88 +1,82 @@
-import { assertDirectTestPlanMatchesTestFamily, directRunFacts, finalizeDirectRunResult, runConfig } from "./run-if-main-facts.js";
-import { assertTestPlanCasesMatchProfilePolicy, createSeededTestPlan } from "./run-selection.js";
-import { executionMode, rootAnnotations, rootControls, rootTitle, selectedOutputRenderer, selectedReporters, warnOnSupervisedDowngrade } from "./run-if-main-options.js";
+import { formatRunnerErrorDiagnostics } from "./command-line-command.js";
+import { rootAnnotations, rootControls, rootTitle, selectedOutputRenderer, selectedReporters } from "./run-if-main-options.js";
 const failureExitCodes = new Set([undefined, null, 0, '0']);
 function shouldSetFailureExitCode(exitCode) {
     return failureExitCodes.has(exitCode);
 }
-async function createDirectRunContext(meta, testNode, options, dependencies) {
-    const context = await dependencies.resolveDirectProfile(meta, dependencies.currentWorkingDirectory());
+function directRunRequest(context) {
     return {
-        ...context,
-        options,
-        testNode
+        baselineUpdateMode: 'none',
+        capabilityRestrictions: { mode: 'enabled' },
+        capture: 'buffered',
+        coverage: false,
+        debug: { mode: 'off', selectors: [] },
+        execution: { mode: 'profile-default' },
+        measureResourceUsage: null,
+        order: 'seeded',
+        paths: [context.file],
+        profile: context.name,
+        resourceBudgetOverrides: null,
+        resourceUsageSamplingIntervalMilliseconds: null,
+        seed: { value: null },
+        selection: { kind: 'all' },
+        shard: { index: 1, total: 1 },
+        timingCollection: 'profile-default',
+        verbose: false,
+        workers: null
     };
 }
-function directTestPlan(context, dependencies) {
-    return dependencies.runEngine.createTestPlan(dependencies.runEngine.createRoot({
-        annotations: rootAnnotations(context.options),
-        children: [context.testNode],
-        controls: rootControls(context.options),
-        title: rootTitle(context.options, context.projectRoot)
-    }));
-}
-async function executeDirectTestPlan(context, testPlan, dependencies) {
-    const wallClock = dependencies.createClock();
+async function directRunConfig(context) {
     const reporters = await selectedReporters(context.profile, context.config, context.options);
-    const config = runConfig(context.config, reporters);
-    const ordered = createSeededTestPlan(testPlan);
-    const runFacts = directRunFacts({
-        config,
-        fileSet: context.fileSet,
-        profileName: context.name,
-        projectRoot: context.projectRoot,
-        seed: ordered.seed,
-        testPlan: ordered.testPlan
-    });
-    const runtimePolicy = dependencies.createRuntimePolicy();
-    const { resourceUsagePolicy } = runFacts.execution;
-    const startedAt = new Date(wallClock.currentUnixEpochMilliseconds);
-    warnOnSupervisedDowngrade(context.profile, dependencies.stderr);
-    return await dependencies.runEngine.execute(ordered.testPlan, {
-        execution: { mode: executionMode(context.profile) },
-        async finalizeResult(result) {
-            return finalizeDirectRunResult(runFacts, result);
-        },
+    return {
+        loader: context.config.loader,
         outputRenderer: selectedOutputRenderer(context.config, context.options),
+        profiles: {
+            ...context.config.profiles,
+            [context.name]: { ...context.profile, reporters }
+        },
         reporters,
-        resourceBudgets: resourceUsagePolicy.budgets,
-        resourceUsageTracker: resourceUsagePolicy.measure
-            ? dependencies.createResourceUsageTracker(wallClock, {
-                samplingIntervalMilliseconds: resourceUsagePolicy.samplingIntervalMilliseconds
-            })
-            : null,
-        runtimePolicy,
-        runFacts,
-        startedAt: startedAt.toISOString(),
-        timeoutPolicy: {
-            hardTimeoutMilliseconds: runFacts.execution.timeoutPolicy.hardMilliseconds,
-            timeoutMilliseconds: runFacts.execution.timeoutPolicy.softMilliseconds
-        }
-    });
+        runtimeStateDir: context.config.runtimeStateDir
+    };
+}
+async function directRunCommand(context) {
+    return {
+        config: await directRunConfig(context),
+        cwd: context.projectRoot,
+        engine: { kind: 'default' },
+        request: directRunRequest(context)
+    };
 }
 function hasFailure(result) {
     return result.summary.failed > 0 || result.runnerErrors.length > 0;
 }
-function applyFailureExitCode(result, dependencies) {
-    if (hasFailure(result) && shouldSetFailureExitCode(dependencies.readExitCode())) {
-        dependencies.setExitCode(1);
+function writeUndeliveredErrors(errors, dependencies) {
+    for (const diagnostic of formatRunnerErrorDiagnostics(errors)) {
+        dependencies.stderr.write(`${diagnostic}\n`);
     }
 }
 async function executeDirectRun(context, dependencies) {
-    const testPlan = directTestPlan(context, dependencies);
-    assertDirectTestPlanMatchesTestFamily(testPlan, context.profile.testFamily);
-    assertTestPlanCasesMatchProfilePolicy(testPlan, context.profile);
-    applyFailureExitCode(await executeDirectTestPlan(context, testPlan, dependencies), dependencies);
-}
-async function runDirectEntrypoint(meta, testNode, options, dependencies) {
-    await executeDirectRun(await createDirectRunContext(meta, testNode, options, dependencies), dependencies);
+    const delivery = await dependencies.runDirectEntrypoint(await directRunCommand(context), {
+        kind: 'direct-entrypoint',
+        root: {
+            annotations: rootAnnotations(context.options),
+            controls: rootControls(context.options),
+            title: rootTitle(context.options, context.projectRoot)
+        },
+        testNode: context.testNode
+    });
+    writeUndeliveredErrors(delivery.undeliveredRunnerErrors, dependencies);
+    if (hasFailure(delivery.result) && shouldSetFailureExitCode(dependencies.readExitCode())) {
+        dependencies.setExitCode(1);
+    }
 }
 export function createRunIfMain(dependencies) {
     return async function runIfMain(meta, testNode, options) {
         if (!meta.main) {
             return;
         }
-        await runDirectEntrypoint(meta, testNode, options, dependencies);
+        const profile = await dependencies.resolveDirectProfile(meta, dependencies.currentWorkingDirectory());
+        await executeDirectRun({ ...profile, options, testNode }, dependencies);
     };
 }
 //# sourceMappingURL=run-if-main.js.map

package/run/run-if-main.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-if-main.js","sourceRoot":"","sources":["../../../../source/run/run-if-main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-if-main.js","sourceRoot":"","sources":["../../../../source/run/run-if-main.ts"],"names":[],"mappings":"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"}

package/run/run-in-process-execution.js

@@ -3,13 +3,13 @@ import { executeLocalResolvedRun } from "./run-local-execution.js";
 function isLocalResolvedRun(resolvedRun) {
     return resolvedRun.plan.kind === 'local';
 }
-export async function executeInProcessResolvedRun(resolvedRun, dependencies, runtimePolicy, timing = null) {
+export async function executeInProcessResolvedRun(resolvedRun, dependencies, options) {
     if (resolvedRun.plan.kind === 'empty-shard') {
-        return await executeEmptyShardRun(resolvedRun, dependencies, runtimePolicy, timing);
+        return await executeEmptyShardRun(resolvedRun, dependencies, options.finalizeResult, options.runtimePolicy);
     }
     if (!isLocalResolvedRun(resolvedRun)) {
         throw new Error('In-process execution requires a local test plan.');
     }
-    return await executeLocalResolvedRun(resolvedRun, dependencies, runtimePolicy, timing);
+    return await executeLocalResolvedRun(resolvedRun, dependencies, options);
 }
 //# sourceMappingURL=run-in-process-execution.js.map

package/run/run-in-process-execution.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-in-process-execution.js","sourceRoot":"","sources":["../../../../source/run/run-in-process-execution.ts"],"names":[],"mappings":"AACA,OAAO,EACH,oBAAoB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACH,uBAAuB,EAC1B,MAAM,0BAA0B,CAAC;AAiBlC,SAAS,kBAAkB,CAAC,WAAwB;IAChD,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC7C,WAAwB,EACxB,YAAyC,EACzC,aAAsC,EACtC,SAAsC,IAAI;IAE1C,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC1C,OAAO,MAAM,oBAAoB,CAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;IACxF,CAAC;IAED,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;AAC3F,CAAC"}
+{"version":3,"file":"run-in-process-execution.js","sourceRoot":"","sources":["../../../../source/run/run-in-process-execution.ts"],"names":[],"mappings":"AACA,OAAO,EACH,oBAAoB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACH,uBAAuB,EAE1B,MAAM,0BAA0B,CAAC;AAelC,SAAS,kBAAkB,CAAC,WAAwB;IAChD,OAAO,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC7C,WAAwB,EACxB,YAAyC,EACzC,OAA8B;IAE9B,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAC1C,OAAO,MAAM,oBAAoB,CAC7B,WAAW,EACX,YAAY,EACZ,OAAO,CAAC,cAAc,EACtB,OAAO,CAAC,aAAa,CACxB,CAAC;IACN,CAAC;IAED,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,MAAM,uBAAuB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;AAC7E,CAAC"}

package/run/run-input-resolution.js

@@ -12,13 +12,22 @@ function assertWorkerCountSupported(request, profile) {
         invalidRequest('Worker count can only be requested for worker-pool profiles.');
     }
 }
+function assertCoverageSupported(request, profile) {
+    if (request.coverage && profile.testFamily !== 'microtest') {
+        invalidRequest('Coverage can only be requested for microtest profiles.');
+    }
+}
+function assertProfileRequestSupported(request, profile) {
+    assertCoverageSupported(request, profile);
+    assertMicrotestCaptureSupported(request, profile);
+    assertWorkerCountSupported(request, profile);
+}
 export async function readResolvedRunInput(command, dependencies) {
     validateRunInput(command);
     const request = freezeValue(copyRunRequest(command.request));
     const config = freezeValue(copyRunConfig(command.config));
     const profile = selectedProfile(request, config);
-    assertMicrotestCaptureSupported(request, profile);
-    assertWorkerCountSupported(request, profile);
+    assertProfileRequestSupported(request, profile);
     assertSupportedProcessEngine(command, profile);
     const discovery = freezeValue(await dependencies.discoverRunFilesWithProjectRoot({
         cwd: command.cwd,

package/run/run-input-resolution.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-input-resolution.js","sourceRoot":"","sources":["../../../../source/run/run-input-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACH,sBAAsB,EACtB,aAAa,EACb,cAAc,EACd,WAAW,EACd,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EACH,4BAA4B,EAC5B,gBAAgB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAWjD,SAAS,+BAA+B,CACpC,OAAmB,EACnB,OAAyB;IAEzB,IAAI,OAAO,CAAC,UAAU,KAAK,WAAW,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;QACnE,cAAc,CAAC,iDAAiD,CAAC,CAAC;IACtE,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAmB,EAAE,OAAyB;IAC9E,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,KAAK,aAAa,EAAE,CAAC;QAC/E,cAAc,CAAC,8DAA8D,CAAC,CAAC;IACnF,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,OAAmB,EACnB,YAAyC;IAEzC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1B,MAAM,OAAO,GAAG,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,4BAA4B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CACzB,MAAM,YAAY,CAAC,+BAA+B,CAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,OAAO,CAAC,KAAK;KAC9B,CAAC,CACL,CAAC;IACF,MAAM,MAAM,GAAG,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;AAC5G,CAAC"}
+{"version":3,"file":"run-input-resolution.js","sourceRoot":"","sources":["../../../../source/run/run-input-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACH,sBAAsB,EACtB,aAAa,EACb,cAAc,EACd,WAAW,EACd,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EACH,4BAA4B,EAC5B,gBAAgB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAWjD,SAAS,+BAA+B,CACpC,OAAmB,EACnB,OAAyB;IAEzB,IAAI,OAAO,CAAC,UAAU,KAAK,WAAW,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;QACnE,cAAc,CAAC,iDAAiD,CAAC,CAAC;IACtE,CAAC;AACL,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAmB,EAAE,OAAyB;IAC9E,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,KAAK,aAAa,EAAE,CAAC;QAC/E,cAAc,CAAC,8DAA8D,CAAC,CAAC;IACnF,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,OAAmB,EAAE,OAAyB;IAC3E,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,UAAU,KAAK,WAAW,EAAE,CAAC;QACzD,cAAc,CAAC,wDAAwD,CAAC,CAAC;IAC7E,CAAC;AACL,CAAC;AAED,SAAS,6BAA6B,CAAC,OAAmB,EAAE,OAAyB;IACjF,uBAAuB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,+BAA+B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClD,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACtC,OAAmB,EACnB,YAAyC;IAEzC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC1B,MAAM,OAAO,GAAG,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC1D,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChD,4BAA4B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,WAAW,CACzB,MAAM,YAAY,CAAC,+BAA+B,CAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,OAAO,CAAC,KAAK;KAC9B,CAAC,CACL,CAAC;IACF,MAAM,MAAM,GAAG,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;AAC5G,CAAC"}

package/run/run-isolated-command.js

@@ -1,10 +1,30 @@
+import { assertDirectEntrypointCollectionMatches } from "./direct-entrypoint-collection.js";
+import { createLocalTestPlan } from "./run-local-test-plan.js";
 import { resolveResourceUsagePolicy } from "./run-facts.js";
+import { runCollectionRoot } from "./run-collection-source.js";
 function isolatedEngine(command) {
     if (command.engine.kind === 'instance') {
         throw new Error('Instance engines cannot run in supervised children.');
     }
     return command.engine;
 }
+export async function createExpectedDirectEntrypointPlan(command, dependencies, input, source) {
+    return source.kind === 'direct-entrypoint'
+        ? await createLocalTestPlan({
+            command,
+            definitionLocationCapture: 'enabled',
+            dependencies,
+            files: input.files,
+            profile: input.profile,
+            source
+        })
+        : null;
+}
+export function assertExpectedDirectEntrypointCollection(expected, actual) {
+    if (expected !== null) {
+        assertDirectEntrypointCollectionMatches(expected, actual);
+    }
+}
 function supervisedCapabilityRestrictions(profile, command) {
     if (profile.testFamily === 'integration') {
         return { mode: 'disabled' };
@@ -26,57 +46,63 @@ function createSupervisedCommandBase(input) {
         definitionLocationCapture: input.definitionLocationCapture,
         engine: isolatedEngine(input.command),
         hardTimeoutMilliseconds: input.profile.timeouts.hardMilliseconds,
+        maxConcurrency: input.profile.execution.maxConcurrency,
         paths: resolvedPaths(input.files),
         resourceBudgets: resourceUsagePolicy.budgets,
         resourceUsageSamplingIntervalMilliseconds: resourceUsagePolicy.samplingIntervalMilliseconds,
+        root: runCollectionRoot(input.source, input.command.cwd),
         scheduling: input.profile.execution.scheduling,
         testFamily: input.profile.testFamily,
         timeoutMilliseconds: input.profile.timeouts.softMilliseconds
     };
 }
-export function createSupervisedCollectCommand(command, profile, files) {
+export function createSupervisedCollectCommand(command, profile, files, source) {
     return {
         ...createSupervisedCommandBase({
             capture: 'buffered',
             command,
             definitionLocationCapture: 'enabled',
             files,
-            profile
+            profile,
+            source
         }),
         kind: 'collect'
     };
 }
-export function createSupervisedRunCommand(command, profile, files) {
+export function createSupervisedRunCommand(command, profile, files, source) {
     return {
         ...createSupervisedCommandBase({
             capture: command.request.capture,
             command,
-            definitionLocationCapture: 'disabled',
+            definitionLocationCapture: source.kind === 'direct-entrypoint' ? 'enabled' : 'disabled',
             files,
-            profile
+            profile,
+            source
         }),
         kind: 'run'
     };
 }
-export function createWorkerPoolCommand(command, definitionLocationCapture, profile, files) {
-    const resourceUsagePolicy = resolveResourceUsagePolicy(command.request, profile);
+export function createWorkerPoolCommand(input) {
+    const resourceUsagePolicy = resolveResourceUsagePolicy(input.command.request, input.profile);
     return {
-        collectionTimeoutMilliseconds: profile.timeouts.collectionMilliseconds,
-        cwd: command.cwd,
-        definitionLocationCapture,
-        engine: isolatedEngine(command),
-        hardTimeoutMilliseconds: profile.timeouts.hardMilliseconds,
-        hostProcess: profile.execution.processModel === 'worker-pool'
-            ? profile.execution.hostProcess
+        collectionTimeoutMilliseconds: input.profile.timeouts.collectionMilliseconds,
+        cwd: input.command.cwd,
+        definitionLocationCapture: input.definitionLocationCapture,
+        engine: isolatedEngine(input.command),
+        hardTimeoutMilliseconds: input.profile.timeouts.hardMilliseconds,
+        hostProcess: input.profile.execution.processModel === 'worker-pool'
+            ? input.profile.execution.hostProcess
             : { kind: 'direct' },
-        paths: resolvedPaths(files),
+        maxConcurrency: input.profile.execution.maxConcurrency,
+        paths: resolvedPaths(input.files),
         resourceBudgets: resourceUsagePolicy.budgets,
         resourceUsageSamplingIntervalMilliseconds: resourceUsagePolicy.samplingIntervalMilliseconds,
-        scheduling: profile.execution.scheduling,
-        testFamily: profile.testFamily,
-        timeoutMilliseconds: profile.timeouts.softMilliseconds,
-        workerLifecycle: profile.execution.processModel === 'worker-pool'
-            ? profile.execution.workerLifecycle
+        root: runCollectionRoot(input.source, input.command.cwd),
+        scheduling: input.profile.execution.scheduling,
+        testFamily: input.profile.testFamily,
+        timeoutMilliseconds: input.profile.timeouts.softMilliseconds,
+        workerLifecycle: input.profile.execution.processModel === 'worker-pool'
+            ? input.profile.execution.workerLifecycle
             : 'reuse'
     };
 }

package/run/run-isolated-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-isolated-command.js","sourceRoot":"","sources":["../../../../source/run/run-isolated-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAuC5D,SAAS,cAAc,CAAC,OAAmB;IACvC,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC;AAC1B,CAAC;AAED,SAAS,gCAAgC,CACrC,OAAyB,EACzB,OAAmB;IAEnB,IAAI,OAAO,CAAC,UAAU,KAAK,aAAa,EAAE,CAAC;QACvC,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAChC,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC;AAClD,CAAC;AAED,SAAS,aAAa,CAAC,KAAgC;IACnD,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,UAAU,CAAC,IAAI;QACrC,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,2BAA2B,CAAC,KAAiC;IAClE,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAE7F,OAAO;QACH,sBAAsB,EAAE,gCAAgC,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;QACtF,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,6BAA6B,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;QAC5E,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG;QACtB,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;QAC1D,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC;QACrC,uBAAuB,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;QAChE,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC;QACjC,eAAe,EAAE,mBAAmB,CAAC,OAAO;QAC5C,yCAAyC,EAAE,mBAAmB,CAAC,4BAA4B;QAC3F,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU;QAC9C,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU;QACpC,mBAAmB,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;KAC/D,CAAC;AACN,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC1C,OAAmB,EACnB,OAAyB,EACzB,KAAgC;IAEhC,OAAO;QACH,GAAG,2BAA2B,CAAC;YAC3B,OAAO,EAAE,UAAU;YACnB,OAAO;YACP,yBAAyB,EAAE,SAAS;YACpC,KAAK;YACL,OAAO;SACV,CAAC;QACF,IAAI,EAAE,SAAS;KAClB,CAAC;AACN,CAAC;AAED,MAAM,UAAU,0BAA0B,CACtC,OAAmB,EACnB,OAAyB,EACzB,KAAgC;IAEhC,OAAO;QACH,GAAG,2BAA2B,CAAC;YAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;YAChC,OAAO;YACP,yBAAyB,EAAE,UAAU;YACrC,KAAK;YACL,OAAO;SACV,CAAC;QACF,IAAI,EAAE,KAAK;KACd,CAAC;AACN,CAAC;AAED,MAAM,UAAU,uBAAuB,CACnC,OAAmB,EACnB,yBAAoD,EACpD,OAAyB,EACzB,KAAgC;IAEhC,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAEjF,OAAO;QACH,6BAA6B,EAAE,OAAO,CAAC,QAAQ,CAAC,sBAAsB;QACtE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,yBAAyB;QACzB,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC;QAC/B,uBAAuB,EAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;QAC1D,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,KAAK,aAAa;YACzD,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW;YAC/B,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE;QACxB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC;QAC3B,eAAe,EAAE,mBAAmB,CAAC,OAAO;QAC5C,yCAAyC,EAAE,mBAAmB,CAAC,4BAA4B;QAC3F,UAAU,EAAE,OAAO,CAAC,SAAS,CAAC,UAAU;QACxC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB;QACtD,eAAe,EAAE,OAAO,CAAC,SAAS,CAAC,YAAY,KAAK,aAAa;YAC7D,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,eAAe;YACnC,CAAC,CAAC,OAAO;KAChB,CAAC;AACN,CAAC"}
+{"version":3,"file":"run-isolated-command.js","sourceRoot":"","sources":["../../../../source/run/run-isolated-command.ts"],"names":[],"mappings":"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"}

package/run/run-isolated-process.js

@@ -1,11 +1,10 @@
 import { createResultFromResolutionError, reportCollectionErrorResult } from "./run-collection-error-result.js";
 import { createResolvedRunFromCollection } from "./run-collected-resolution.js";
 import { readResolvedRunInput } from "./run-input-resolution.js";
-import { createSupervisedCollectCommand, createSupervisedRunCommand, createWorkerPoolCommand } from "./run-isolated-command.js";
+import { assertExpectedDirectEntrypointCollection, createExpectedDirectEntrypointPlan, createWorkerPoolCommand } from "./run-isolated-command.js";
 import { finalizeResultWithDurationHistory, readRunDurationHistory } from "./run-support.js";
-import { collectSupervisedRun } from "./supervised-run-collection.js";
-import { executeSupervisedRun, runSupervisedCommand } from "./supervised-run.js";
-import { collectWorkerPoolRun, executeWorkerPoolRun, runWorkerPoolCommand } from "./worker-pool-run.js";
+import { collectWorkerPoolRun, runWorkerPoolCommand } from "./worker-pool-run.js";
+import { createSupervisedResolvedRun, createSupervisedRunResult } from "./run-supervised-process.js";
 const emptyCollectionTimingMetadata = Object.freeze({
     label: null,
     processId: null,
@@ -13,6 +12,9 @@ const emptyCollectionTimingMetadata = Object.freeze({
     workerId: null
 });
 async function createResolvedExecutionRun(resolution) {
+    if (resolution.expectedDirectPlan !== null) {
+        assertExpectedDirectEntrypointCollection(resolution.expectedDirectPlan, resolution.collection.collectedPlan);
+    }
     return await createResolvedRunFromCollection({
         allowEmptySelection: resolution.allowEmptySelection,
         collection: resolution.collection,
@@ -36,10 +38,25 @@ async function readWorkerPoolDurationHistory(input, dependencies) {
     }
     return await readRunDurationHistory(dependencies, input.projectRoot, input.config.runtimeStateDir);
 }
-async function createWorkerPoolResolvedRun(command, dependencies, input, timing) {
-    const collection = await (timing?.measureAsync('collection.import', emptyCollectionTimingMetadata, async function collectTimedWorkerPoolRun() {
-        return await collectWorkerPoolRun(createWorkerPoolCommand(command, 'enabled', input.profile, input.files), dependencies, timing);
-    }) ?? collectWorkerPoolRun(createWorkerPoolCommand(command, 'enabled', input.profile, input.files), dependencies, null));
+async function createWorkerPoolResolvedRun(command, dependencies, input, options) {
+    const expected = options.source.kind === 'direct-entrypoint'
+        ? await createExpectedDirectEntrypointPlan(command, dependencies, input, options.source)
+        : null;
+    const collection = await (options.timing?.measureAsync('collection.import', emptyCollectionTimingMetadata, async function collectTimedWorkerPoolRun() {
+        return await collectWorkerPoolRun(createWorkerPoolCommand({
+            command,
+            definitionLocationCapture: 'enabled',
+            files: input.files,
+            profile: input.profile,
+            source: options.source
+        }), dependencies, options.timing);
+    }) ?? collectWorkerPoolRun(createWorkerPoolCommand({
+        command,
+        definitionLocationCapture: 'enabled',
+        files: input.files,
+        profile: input.profile,
+        source: options.source
+    }), dependencies, null));
     const durationHistoryIndex = await readWorkerPoolDurationHistory(input, dependencies);
     return await createResolvedExecutionRun({
         allowEmptySelection: false,
@@ -47,125 +64,75 @@ async function createWorkerPoolResolvedRun(command, dependencies, input, timing)
         command,
         dependencies,
         durationHistoryIndex,
+        expectedDirectPlan: expected,
         input,
         planKind: 'worker-pool'
     });
 }
-async function createSupervisedResolvedRun(command, dependencies, input, timing) {
-    const collection = await (timing?.measureAsync('collection.import', emptyCollectionTimingMetadata, async function collectTimedSupervisedRun() {
-        return await collectSupervisedRun(createSupervisedCollectCommand(command, input.profile, input.files), dependencies, timing);
-    }) ?? collectSupervisedRun(createSupervisedCollectCommand(command, input.profile, input.files), dependencies, null));
-    return await createResolvedExecutionRun({
-        allowEmptySelection: false,
-        collection,
-        command,
-        dependencies,
-        durationHistoryIndex: null,
-        input,
-        planKind: 'supervised'
-    });
-}
-export function createIsolatedResolvedRun(command, dependencies, input, timing = null) {
+export function createIsolatedResolvedRun(command, dependencies, input, options) {
     if (input.profile.execution.processModel === 'supervised-process') {
-        return createSupervisedResolvedRun(command, dependencies, input, timing);
+        return createSupervisedResolvedRun({
+            command,
+            dependencies,
+            input,
+            source: options.source,
+            timing: options.timing
+        });
     }
     if (input.profile.execution.processModel === 'worker-pool') {
-        return createWorkerPoolResolvedRun(command, dependencies, input, timing);
+        return createWorkerPoolResolvedRun(command, dependencies, input, options);
     }
     return null;
 }
-function addRunnerErrors(result, runnerErrors) {
-    if (runnerErrors.length === 0) {
-        return result;
-    }
-    return {
-        ...result,
-        runnerErrors: [...runnerErrors, ...result.runnerErrors],
-        status: 'failed'
-    };
-}
-async function createSupervisedRunResult(command, dependencies, timing) {
-    const input = await readResolvedRunInput(command, dependencies);
-    if (input.profile.execution.processModel !== 'supervised-process') {
-        throw new Error('Expected supervised-process profile.');
-    }
-    try {
-        return await runSupervisedCommand(createSupervisedRunCommand(command, input.profile, input.files), dependencies, async function createResolvedRunAfterCollection(collection) {
-            return await createResolvedExecutionRun({
-                allowEmptySelection: true,
-                collection,
-                command,
-                dependencies,
-                durationHistoryIndex: null,
-                input,
-                planKind: 'supervised'
-            });
-        }, {
-            async finalizeResult(resolvedRun, result) {
-                return await finalizeResultWithDurationHistory(dependencies, resolvedRun, result, timing);
-            },
-            timing
+async function executeWorkerPoolRunResult(options) {
+    const { command, dependencies, input, source, timing } = options;
+    const expected = source.kind === 'direct-entrypoint'
+        ? await createExpectedDirectEntrypointPlan(command, dependencies, input, source)
+        : null;
+    const durationHistoryIndex = await readWorkerPoolDurationHistory(input, dependencies);
+    return await runWorkerPoolCommand(createWorkerPoolCommand({
+        command,
+        definitionLocationCapture: source.kind === 'direct-entrypoint' ? 'enabled' : 'disabled',
+        files: input.files,
+        profile: input.profile,
+        source
+    }), dependencies, async function createResolvedRunAfterCollection(collection) {
+        return await createResolvedExecutionRun({
+            allowEmptySelection: true,
+            collection,
+            command,
+            dependencies,
+            durationHistoryIndex,
+            expectedDirectPlan: expected,
+            input,
+            planKind: 'worker-pool'
         });
-    }
-    catch (error) {
-        return await reportCollectionErrorResult(command, dependencies, createResultFromResolutionError(error, null), timing);
-    }
+    }, {
+        async finalizeResult(resolvedRun, completion) {
+            return await finalizeResultWithDurationHistory(dependencies, resolvedRun, completion.result, timing);
+        },
+        timing
+    });
 }
-async function createWorkerPoolRunResult(command, dependencies, timing) {
+async function createWorkerPoolRunResult(command, dependencies, timing, source) {
     const input = await readResolvedRunInput(command, dependencies);
     if (input.profile.execution.processModel !== 'worker-pool') {
         throw new Error('Expected worker-pool profile.');
     }
     try {
-        const durationHistoryIndex = await readWorkerPoolDurationHistory(input, dependencies);
-        return await runWorkerPoolCommand(createWorkerPoolCommand(command, 'disabled', input.profile, input.files), dependencies, async function createResolvedRunAfterCollection(collection) {
-            return await createResolvedExecutionRun({
-                allowEmptySelection: true,
-                collection,
-                command,
-                dependencies,
-                durationHistoryIndex,
-                input,
-                planKind: 'worker-pool'
-            });
-        }, {
-            async finalizeResult(resolvedRun, completion) {
-                return await finalizeResultWithDurationHistory(dependencies, resolvedRun, completion.result, timing);
-            },
-            timing
-        });
+        return await executeWorkerPoolRunResult({ command, dependencies, input, source, timing });
     }
     catch (error) {
         return await reportCollectionErrorResult(command, dependencies, createResultFromResolutionError(error, null), timing);
     }
 }
-export function runIsolatedProcessCommand(command, dependencies, timing = null) {
+export function runIsolatedProcessCommand(command, dependencies, options) {
     const processModel = command.config.profiles[command.request.profile]?.execution.processModel;
     if (processModel === 'supervised-process') {
-        return createSupervisedRunResult(command, dependencies, timing);
+        return createSupervisedRunResult(command, dependencies, options.timing, options.source);
     }
     if (processModel === 'worker-pool') {
-        return createWorkerPoolRunResult(command, dependencies, timing);
-    }
-    return null;
-}
-export async function executeNonLocalResolvedRun(resolvedRun, dependencies, runtimePolicy, timing = null) {
-    if (resolvedRun.facts.execution.processModel === 'supervised-process') {
-        const result = await executeSupervisedRun(resolvedRun, dependencies, {
-            async finalizeResult(supervisedRun, finalResult) {
-                return await finalizeResultWithDurationHistory(dependencies, supervisedRun, finalResult, timing);
-            },
-            timing
-        });
-        return addRunnerErrors(result, runtimePolicy?.takeRunErrors() ?? []);
-    }
-    if (resolvedRun.facts.execution.processModel === 'worker-pool') {
-        return await executeWorkerPoolRun(resolvedRun, dependencies, {
-            async finalizeResult(workerPoolRun, completion) {
-                return await finalizeResultWithDurationHistory(dependencies, workerPoolRun, completion.result, timing);
-            },
-            timing
-        });
+        return createWorkerPoolRunResult(command, dependencies, options.timing, options.source);
     }
     return null;
 }