@overkill-dev/run 0.0.80 → 0.0.81

package/run/execution-session-observation.js

@@ -0,0 +1,95 @@
+import { createStoredValue } from "../stored-value.js";
+import { InvocationDeadlineExceededError } from "../invocation-budget.js";
+import { executionTermination } from "../execution-termination.js";
+import { envelopeMessage } from "./child-process-protocol.js";
+import { supervisedChildMessageSchema } from "./supervised-protocol-schema.js";
+import { supervisedChildCorrelationId } from "./supervised-protocol.js";
+import { runExecutionFailure } from "./execution-failure.js";
+function storeExecutionData(observation, message) {
+    if (observation.delivered.read()) {
+        throw new Error('Duplicate execution lifecycle data.');
+    }
+    observation.delivered.write(message.kind === 'execution-data');
+    observation.data.write(message.data);
+}
+function readExecutionData(observation, message) {
+    const decoded = envelopeMessage(message, supervisedChildCorrelationId, supervisedChildMessageSchema);
+    if (decoded === null) {
+        return;
+    }
+    if (decoded.kind === 'result') {
+        observation.result.write(decoded.result);
+    }
+    else if (decoded.kind === 'execution-data' || decoded.kind === 'execution-checkpoint') {
+        storeExecutionData(observation, decoded);
+    }
+}
+export function observeExecutionMessage(observation, message) {
+    try {
+        readExecutionData(observation, message);
+    }
+    catch (error) {
+        observation.failure.write(error instanceof Error ? error : new Error('Invalid execution lifecycle data.', { cause: error }));
+        observation.invalid.abort();
+    }
+}
+function missingDataReply(result, call, observation) {
+    const data = observation.data.read();
+    if (call.signal.aborted && result.runnerErrors.every(function (error) {
+        return error.subtype === 'crash';
+    })) {
+        return { kind: 'failure', failure: runExecutionFailure(call.signal.reason), data };
+    }
+    const errors = result
+        .runnerErrors
+        .map(function (error) {
+        return error.message;
+    })
+        .join('\n');
+    return {
+        kind: 'failure',
+        failure: runExecutionFailure(new Error(`Execution lifecycle data was not delivered. ${errors}`)),
+        data
+    };
+}
+function interruptedExecutionReply(result, call, observation) {
+    const timedOut = result.runnerErrors.some(function hardTimeout(error) {
+        return error.subtype === 'crash' && executionTermination(error.cause) === 'hard-timeout';
+    }) || call.signal.reason instanceof InvocationDeadlineExceededError;
+    if (!timedOut) {
+        return missingDataReply(result, call, observation);
+    }
+    const onlyInterruption = result.runnerErrors.every(function timeoutError(error) {
+        return error.subtype === 'crash' && executionTermination(error.cause) !== null;
+    });
+    return onlyInterruption
+        ? { kind: 'timeout', data: observation.data.read() }
+        : { kind: 'result', result, data: observation.data.read(), deadlineExceeded: true };
+}
+export function observedReply(result, call, observation) {
+    const failure = observation.failure.read();
+    if (failure !== null) {
+        return { kind: 'failure', failure: runExecutionFailure(failure), data: observation.data.read() };
+    }
+    if (!observation.delivered.read()) {
+        return interruptedExecutionReply(result, call, observation);
+    }
+    const completed = observation.result.read();
+    const selected = completed === null ? result : {
+        ...result,
+        bySuite: completed.bySuite,
+        planStatus: completed.planStatus,
+        summary: { ...result.summary, planned: completed.summary.planned }
+    };
+    return { kind: 'result', result: selected, data: observation.data.read(), deadlineExceeded: false };
+}
+export function createExecutionDataObservation() {
+    return {
+        data: createStoredValue(null),
+        delivered: createStoredValue(false),
+        failure: createStoredValue(null),
+        invalid: new AbortController(),
+        result: createStoredValue(null)
+    };
+}
+//# sourceMappingURL=execution-session-observation.js.map

package/run/execution-session-observation.js.map

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

package/run/execution-session-ownership.js

@@ -0,0 +1,23 @@
+import { kill } from "./supervised-child-process.js";
+export function createExecutionHostOwnership(start, signal) {
+    const children = new Map();
+    return {
+        async start(input) {
+            const child = await start(input);
+            children.set(child, new Promise(function observeClose(resolve) {
+                child.on('close', resolve);
+            }));
+            if (signal.aborted) {
+                kill(child);
+            }
+            return child;
+        },
+        async dispose() {
+            for (const child of children.keys()) {
+                kill(child);
+            }
+            await Promise.all(children.values());
+        }
+    };
+}
+//# sourceMappingURL=execution-session-ownership.js.map

package/run/execution-session-ownership.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"execution-session-ownership.js","sourceRoot":"","sources":["../../../../source/run/execution-session-ownership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA+B,MAAM,+BAA+B,CAAC;AAQlF,MAAM,UAAU,4BAA4B,CACxC,KAA0D,EAC1D,MAA6B;IAE7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAyC,CAAC;IAClE,OAAO;QACH,KAAK,CAAC,KAAK,CAAC,KAAK;YACb,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;YACjC,QAAQ,CAAC,GAAG,CACR,KAAK,EACL,IAAI,OAAO,CAAO,SAAS,YAAY,CAAC,OAAO;gBAC3C,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CACL,CAAC;YACF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,KAAK,CAAC,OAAO;YACT,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;gBAClC,IAAI,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;YACD,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QACzC,CAAC;KACJ,CAAC;AACN,CAAC"}

package/run/execution-session-process.js

@@ -1,9 +1,26 @@
 import { fork } from 'node:child_process';
 import { fileURLToPath } from 'node:url';
 import { sanitizedChildEnvironment } from "./supervised-child-process.js";
-import { executionReplySchema } from "./execution-session-schema.js";
+import { executionHostMessageSchema } from "./execution-session-schema.js";
 import { executionSessionProcessArgument, executionSessionProcessUrl, readExecutionSessionEnvironment } from "./execution-session-process.entry-point.js";
-export async function runFreshExecutionSession(command, transport, timeoutMilliseconds, signal) {
+async function deliverCheckpoint(message, delivery) {
+    try {
+        await delivery.observation.checkpoint(message.data);
+    }
+    catch (error) {
+        delivery.reject(error);
+    }
+}
+function deliverHostMessage(message, delivery) {
+    const decoded = executionHostMessageSchema.parse(message);
+    if (decoded.kind === 'execution-checkpoint') {
+        delivery.pending.add(deliverCheckpoint(decoded, delivery));
+    }
+    else {
+        delivery.resolve(decoded);
+    }
+}
+function startFreshExecutionHost(command, signal) {
     signal.throwIfAborted();
     const child = fork(fileURLToPath(executionSessionProcessUrl), [executionSessionProcessArgument], {
         cwd: command.policy.cwd,
@@ -19,15 +36,19 @@ export async function runFreshExecutionSession(command, transport, timeoutMillis
     const closed = new Promise(function (resolve) {
         child.once('close', resolve);
     });
+    return { child, closed, pending: new Set() };
+}
+export async function runFreshExecutionSession(command, transport, timeoutMilliseconds, observation) {
+    const { child, closed, pending } = startFreshExecutionHost(command, observation.signal);
     try {
         return await new Promise(function (resolve, reject) {
             child.once('error', reject);
             child.once('exit', function (code, termination) {
                 reject(new Error(`Execution host exited without a result (${String(code)}, ${String(termination)}).`));
             });
-            child.once('message', function (message) {
+            child.on('message', function (message) {
                 try {
-                    resolve(executionReplySchema.parse(message));
+                    deliverHostMessage(message, { observation, pending, resolve, reject });
                 }
                 catch (error) {
                     reject(error instanceof Error
@@ -51,6 +72,7 @@ export async function runFreshExecutionSession(command, transport, timeoutMillis
     finally {
         child.kill('SIGKILL');
         await closed;
+        await Promise.all(pending);
     }
 }
 //# sourceMappingURL=execution-session-process.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"execution-session-process.js","sourceRoot":"","sources":["../../../../source/run/execution-session-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EACH,+BAA+B,EAC/B,0BAA0B,EAC1B,+BAA+B,EAClC,MAAM,4CAA4C,CAAC;AAKpD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC1C,OAAyB,EACzB,SAAgC,EAChC,mBAA2B,EAC3B,MAAmB;IAEnB,MAAM,CAAC,cAAc,EAAE,CAAC;IACxB,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,EAAE,CAAE,+BAA+B,CAAE,EAAE;QAC/F,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG;QACvB,GAAG,EAAE,yBAAyB,CAAC,+BAA+B,EAAE,EAAE,WAAW,CAAC;QAC9E,QAAQ,EAAE,EAAE;QACZ,aAAa,EAAE,UAAU;QACzB,UAAU,EAAE,SAAS;QACrB,MAAM;QACN,KAAK,EAAE,CAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAE;KAC7C,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,MAAM,GAAG,IAAI,OAAO,CAAO,UAAU,OAAO;QAC9C,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACD,OAAO,MAAM,IAAI,OAAO,CAAoB,UAAU,OAAO,EAAE,MAAM;YACjE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,KAAK,CAAC,IAAI,CACN,MAAM,EACN,UAAU,IAAI,EAAE,WAAW;gBACvB,MAAM,CACF,IAAI,KAAK,CAAC,2CAA2C,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CACjG,CAAC;YACN,CAAC,CACJ,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,OAAO;gBACnC,IAAI,CAAC;oBACD,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBACjD,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACtB,MAAM,CACF,KAAK,YAAY,KAAK;wBAClB,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,IAAI,KAAK,CAAC,2CAA2C,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CACjF,CAAC;gBACN,CAAC;YACL,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,CACN;gBACI,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI;gBAC7B,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,SAAS;gBACvC,SAAS;gBACT,mBAAmB;aACtB,EACD,UAAU,KAAK;gBACX,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBACjB,MAAM,CAAC,KAAK,CAAC,CAAC;gBAClB,CAAC;YACL,CAAC,CACJ,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;YAAS,CAAC;QACP,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtB,MAAM,MAAM,CAAC;IACjB,CAAC;AACL,CAAC"}
+{"version":3,"file":"execution-session-process.js","sourceRoot":"","sources":["../../../../source/run/execution-session-process.ts"],"names":[],"mappings":"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"}

package/run/execution-session-schema.js

@@ -38,6 +38,8 @@ export const executionReplySchema = z.discriminatedUnion('kind', [
     z.strictObject({ kind: z.literal('failure'), failure: runExecutionFailureSchema, data: z.json() }),
     z.strictObject({ kind: z.literal('timeout'), data: z.json() })
 ]);
+const executionCheckpointSchema = z.strictObject({ kind: z.literal('execution-checkpoint'), data: z.json() });
+export const executionHostMessageSchema = z.union([executionReplySchema, executionCheckpointSchema]);
 export const executionHostRequestSchema = z.strictObject({
     policy: frozenMicrotestPolicySchema,
     seed: z.strictObject({ value: z.bigint().nonnegative() }),

package/run/execution-session-schema.js.map

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

package/run/execution-session-supervised.js

@@ -1,38 +1,14 @@
-import { createStoredValue } from "../stored-value.js";
-import { envelopeMessage } from "./child-process-protocol.js";
-import { supervisedChildMessageSchema } from "./supervised-protocol-schema.js";
-import { supervisedChildCorrelationId } from "./supervised-protocol.js";
+import { InvocationDeadlineExceededError, isInvocationCancellation } from "../invocation-budget.js";
 import { createRunOperations } from "./run-operations.js";
 import { withExecutionSession } from "./execution-session-context.js";
+import { createExecutionHostOwnership } from "./execution-session-ownership.js";
+import { createExecutionDataObservation, observedReply, observeExecutionMessage } from "./execution-session-observation.js";
 import { runExecutionFailure } from "./execution-failure.js";
-function readExecutionData(observation, message) {
-    const decoded = envelopeMessage(message, supervisedChildCorrelationId, supervisedChildMessageSchema);
-    if (decoded?.kind === 'result') {
-        observation.result.write(decoded.result);
-    }
-    if (decoded?.kind !== 'execution-data') {
-        return;
-    }
-    if (observation.delivered.read()) {
-        throw new Error('Duplicate execution lifecycle data.');
-    }
-    observation.delivered.write(true);
-    observation.data.write(decoded.data);
-}
-function observeExecutionMessage(observation, message) {
-    try {
-        readExecutionData(observation, message);
-    }
-    catch (error) {
-        observation.failure.write(error instanceof Error ? error : new Error('Invalid execution lifecycle data.', { cause: error }));
-        observation.invalid.abort();
-    }
-}
-function observedDependencies(dependencies, observation) {
+function observedDependencies(dependencies, observation, start) {
     return {
         ...dependencies,
         async startSupervisedChild(input) {
-            const child = await dependencies.startSupervisedChild(input);
+            const child = await start(input);
             child.on('message', function (message) {
                 observeExecutionMessage(observation, message);
             });
@@ -40,54 +16,24 @@ function observedDependencies(dependencies, observation) {
         }
     };
 }
-function missingDataReply(result, call) {
-    if (call.signal.aborted && result.runnerErrors.every(function (error) {
-        return error.subtype === 'crash';
-    })) {
-        return { kind: 'failure', failure: runExecutionFailure(call.signal.reason), data: null };
+export async function runSupervisedExecutionSession(options, dependencies, call) {
+    const observation = createExecutionDataObservation();
+    const ownership = createExecutionHostOwnership(dependencies.startSupervisedChild, call.signal);
+    const operations = createRunOperations(observedDependencies(dependencies, observation, ownership.start), 'test');
+    const signal = AbortSignal.any([call.signal, observation.invalid.signal]);
+    try {
+        const result = await withExecutionSession(call.transport, async function () {
+            return await operations.run(options.command, { signal, timing: null });
+        });
+        return observedReply(result, call, observation);
     }
-    const errors = result
-        .runnerErrors
-        .map(function (error) {
-        return error.message;
-    })
-        .join('\n');
-    return {
-        kind: 'failure',
-        failure: runExecutionFailure(new Error(`Execution lifecycle data was not delivered. ${errors}`)),
-        data: null
-    };
-}
-function observedReply(result, call, observation) {
-    const failure = observation.failure.read();
-    if (failure !== null) {
-        return { kind: 'failure', failure: runExecutionFailure(failure), data: observation.data.read() };
+    catch (error) {
+        return signal.reason instanceof InvocationDeadlineExceededError && isInvocationCancellation(error, signal)
+            ? { kind: 'timeout', data: observation.data.read() }
+            : { kind: 'failure', failure: runExecutionFailure(error), data: observation.data.read() };
     }
-    if (!observation.delivered.read()) {
-        return missingDataReply(result, call);
+    finally {
+        await ownership.dispose();
     }
-    const completed = observation.result.read();
-    const selected = completed === null ? result : {
-        ...result,
-        bySuite: completed.bySuite,
-        planStatus: completed.planStatus,
-        summary: { ...result.summary, planned: completed.summary.planned }
-    };
-    return { kind: 'result', result: selected, data: observation.data.read(), deadlineExceeded: false };
-}
-export async function runSupervisedExecutionSession(options, dependencies, call) {
-    const observation = {
-        data: createStoredValue(null),
-        delivered: createStoredValue(false),
-        failure: createStoredValue(null),
-        invalid: new AbortController(),
-        result: createStoredValue(null)
-    };
-    const operations = createRunOperations(observedDependencies(dependencies, observation), 'test');
-    const signal = AbortSignal.any([call.signal, observation.invalid.signal]);
-    const result = await withExecutionSession(call.transport, async function () {
-        return await operations.run(options.command, { signal, timing: null });
-    });
-    return observedReply(result, call, observation);
 }
 //# sourceMappingURL=execution-session-supervised.js.map

package/run/execution-session-supervised.js.map

@@ -1 +1 @@
-{"version":3,"file":"execution-session-supervised.js","sourceRoot":"","sources":["../../../../source/run/execution-session-supervised.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"execution-session-supervised.js","sourceRoot":"","sources":["../../../../source/run/execution-session-supervised.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EACH,8BAA8B,EAC9B,aAAa,EACb,uBAAuB,EAE1B,MAAM,oCAAoC,CAAC;AAI5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAG7D,SAAS,oBAAoB,CACzB,YAAyC,EACzC,WAAqC,EACrC,KAA0D;IAE1D,OAAO;QACH,GAAG,YAAY;QACf,KAAK,CAAC,oBAAoB,CAAC,KAAK;YAC5B,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;YACjC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,UAAU,OAAgB;gBAC1C,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;QACjB,CAAC;KACJ,CAAC;AACN,CAAC;AACD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAC/C,OAAmC,EACnC,YAAyC,EACzC,IAA0B;IAE1B,MAAM,WAAW,GAAG,8BAA8B,EAAE,CAAC;IACrD,MAAM,SAAS,GAAG,4BAA4B,CAAC,YAAY,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/F,MAAM,UAAU,GAAG,mBAAmB,CAAC,oBAAoB,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;IACjH,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAE,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAE,CAAC,CAAC;IAC5E,IAAI,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACrC,IAAI,CAAC,SAAS,EACd,KAAK;YACD,OAAO,MAAM,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC,CACJ,CAAC;QACF,OAAO,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,MAAM,YAAY,+BAA+B,IAAI,wBAAwB,CAAC,KAAK,EAAE,MAAM,CAAC;YACtG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE;YACpD,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;IAClG,CAAC;YAAS,CAAC;QACP,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;AACL,CAAC"}

package/run/execution-session.js

@@ -1,55 +1,49 @@
-import { setTimeout as scheduleDeadline, clearTimeout as cancelDeadline } from 'node:timers';
 import { createStoredValue } from "../stored-value.js";
+import { createInvocationBudget, InvocationDeadlineExceededError, isInvocationCancellation } from "../invocation-budget.js";
 import { runExecutionFailure } from "./execution-failure.js";
 import { executionTransportSchema, normalizeExecutionSessionOptions } from "./execution-session-schema.js";
 async function initializeExecutionEnvironment(options, dependencies) {
     const { createExecutionSessionEnvironment } = await import("./execution-session-environment.js");
     return createExecutionSessionEnvironment(options, dependencies);
 }
-function deadlineCancelledReply(reply, signal, expired) {
-    return reply.kind === 'failure' && expired && signal.reason instanceof Error &&
-        reply.failure.message === signal.reason.message;
+function deadlineCancelledReply(reply, signal) {
+    return reply.kind === 'failure' && signal.reason instanceof InvocationDeadlineExceededError &&
+        isInvocationCancellation(reply.failure.cause, signal);
 }
 async function completeInvocation(environment, execution) {
-    const { invocation, signal, expired, lifecycle } = execution;
+    const { invocation, budget, lifecycle, data } = execution;
+    const { signal } = budget;
     signal.throwIfAborted();
     const transport = executionTransportSchema.parse({ lifecycle, data: structuredClone(invocation.data) });
     const initialized = await environment;
-    const reply = await initialized.execute({ transport, timeoutMilliseconds: invocation.timeoutMilliseconds, signal });
-    if (deadlineCancelledReply(reply, signal, expired())) {
+    signal.throwIfAborted();
+    const reply = await initialized.execute({
+        transport,
+        timeoutMilliseconds: budget.remainingMilliseconds(),
+        signal,
+        async checkpoint(snapshot) {
+            data.write(structuredClone(snapshot));
+        }
+    });
+    if (deadlineCancelledReply(reply, signal)) {
         return { kind: 'timeout', data: reply.data };
     }
-    return reply.kind === 'result' ? { ...reply, deadlineExceeded: reply.deadlineExceeded || expired() } : reply;
-}
-function cancelledDeadline(error, signal, expired) {
-    return expired && (error === signal.reason || error instanceof Error && error.cause === signal.reason);
+    return reply.kind === 'result' ? { ...reply, deadlineExceeded: reply.deadlineExceeded || budget.expired() } : reply;
 }
-async function executeInvocation(environment, invocation, disposed, lifecycle) {
-    const cancellation = new AbortController();
-    const signal = AbortSignal.any([
-        disposed,
-        cancellation.signal,
-        ...invocation.signal === null ? [] : [invocation.signal]
-    ]);
-    const expired = createStoredValue(false);
-    const started = performance.now();
-    const deadlineExpired = function () {
-        return expired.read() || performance.now() - started >= invocation.timeoutMilliseconds;
-    };
-    const timer = scheduleDeadline(function cancelExpiredInvocation() {
-        expired.write(true);
-        cancellation.abort();
-    }, invocation.timeoutMilliseconds);
+async function executeInvocation(environment, invocation, budget, lifecycle) {
+    const data = createStoredValue(null);
     try {
-        return await completeInvocation(environment, { invocation, signal, expired: deadlineExpired, lifecycle });
+        return await completeInvocation(environment, { invocation, budget, lifecycle, data });
     }
     catch (error) {
-        return cancelledDeadline(error, signal, expired.read())
-            ? { kind: 'timeout', data: null }
-            : { kind: 'failure', failure: runExecutionFailure(error), data: null };
+        const timedOut = budget.signal.reason instanceof InvocationDeadlineExceededError &&
+            isInvocationCancellation(error, budget.signal);
+        return timedOut
+            ? { kind: 'timeout', data: data.read() }
+            : { kind: 'failure', failure: runExecutionFailure(error), data: data.read() };
     }
     finally {
-        cancelDeadline(timer);
+        budget.dispose();
     }
 }
 function assertSessionAdmission(disposed, active) {
@@ -70,6 +64,11 @@ export function createExecutionSession(supplied, dependencies) {
     const environment = createStoredValue(null);
     const disposed = new AbortController();
     const active = createStoredValue(null);
+    async function initializedEnvironment() {
+        const initialized = environment.read() ?? initializeExecutionEnvironment(options, dependencies);
+        environment.write(initialized);
+        return initialized;
+    }
     return {
         environmentLifetime: executionLifetime(options),
         async run(invocation) {
@@ -77,9 +76,12 @@ export function createExecutionSession(supplied, dependencies) {
             if (!Number.isFinite(invocation.timeoutMilliseconds) || invocation.timeoutMilliseconds <= 0) {
                 return { kind: 'timeout', data: null };
             }
-            const initialized = environment.read() ?? initializeExecutionEnvironment(options, dependencies);
-            environment.write(initialized);
-            const running = executeInvocation(initialized, invocation, disposed.signal, options.lifecycle);
+            const signal = AbortSignal.any([
+                disposed.signal,
+                ...invocation.signal === null ? [] : [invocation.signal]
+            ]);
+            const budget = createInvocationBudget(invocation.timeoutMilliseconds, signal, dependencies.wallClock);
+            const running = executeInvocation(initializedEnvironment(), invocation, budget, options.lifecycle);
             active.write(running);
             try {
                 return await running;

package/run/execution-session.js.map

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

package/run/frozen-policy-validation.js

@@ -1,5 +1,7 @@
 import { isDeepStrictEqual } from 'node:util';
-import { loadConfig } from "../packages/run/config.entry-point.js";
+import { ConfigError, loadConfig } from "../packages/run/config.entry-point.js";
+import { runExecutionFailure } from "./execution-failure.js";
+import { currentExecutionSession } from "./execution-session-context.js";
 import { freezeRunPolicy } from "./freeze-run-policy.js";
 import { policyBaselineCommand } from "./frozen-run-policy.js";
 import { resolveProcessUsagePolicy, resolveRunScheduling, resolveTimingCollection } from "./run-profile-facts.js";
@@ -60,7 +62,11 @@ async function reevaluatePolicy(policy, dependencies) {
         }, dependencies);
     }
     catch (error) {
-        throw new RunResolutionError(`Frozen policy revalidation failed: ${revalidationFailure(error)}`, { cause: error }, 'invalid-request');
+        throw new RunResolutionError(`Frozen policy revalidation failed: ${revalidationFailure(error)}`, {
+            cause: currentExecutionSession() !== null && error instanceof ConfigError
+                ? { kind: 'configuration-loading', failure: runExecutionFailure(error) }
+                : error
+        }, 'invalid-request');
     }
 }
 export async function validateFrozenPolicySource(policy, dependencies) {

package/run/frozen-policy-validation.js.map

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

package/run/node-child-process-starters.js

@@ -1,6 +1,7 @@
 import { fork } from 'node:child_process';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { currentExecutionSession } from "./execution-session-context.js";
 import { childProcessEntryPointUrl } from "./child-process.entry-point.js";
 import { runFileSystem } from "./node-run-dependencies.entry-point.js";
 import { createSupervisedChildProcessStarter } from "./supervised-child-process.js";
@@ -12,6 +13,7 @@ function forkSupervisedChildProcess(modulePath, childArguments, options) {
         cwd: options.cwd,
         env: options.env,
         execArgv: Array.from(options.execArgv),
+        serialization: currentExecutionSession() === null ? 'json' : 'advanced',
         stdio: Array.from(options.stdio)
     });
     return {

package/run/node-child-process-starters.js.map

@@ -1 +1 @@
-{"version":3,"file":"node-child-process-starters.js","sourceRoot":"","sources":["../../../../source/run/node-child-process-starters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACH,yBAAyB,EAC5B,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACH,aAAa,EAChB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACH,mCAAmC,EAEtC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACH,kCAAkC,EACrC,MAAM,uCAAuC,CAAC;AAE/C,MAAM,sBAAsB,GAAG,aAAa,CAAC,yBAAyB,CAAC,CAAC;AACxE,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC;AASlE,SAAS,0BAA0B,CAC/B,UAAkB,EAClB,cAAiC,EACjC,OAAyB;IAEzB,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QACvD,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;KACnC,CAAC,CAAC;IAEH,OAAO;QACH,cAAc;YACV,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACxB,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACxB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBAClB,KAAK,CAAC,UAAU,EAAE,CAAC;YACvB,CAAC;QACL,CAAC;QACD,IAAI,QAAQ;YACR,OAAO,KAAK,CAAC,QAAQ,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,MAAM;YACP,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,EAAE,CAAC,GAAG,YAAY;YACd,MAAM,CAAE,KAAK,EAAE,QAAQ,CAAE,GAAG,YAAY,CAAC;YAEzC,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACpB,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC;YAED,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACtB,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC;YAED,OAAO,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrC,CAAC;QACD,IAAI,GAAG;YACH,OAAO,KAAK,CAAC,GAAG,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,OAAO;YACR,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;QACD,IAAI,UAAU;YACV,OAAO,KAAK,CAAC,UAAU,CAAC;QAC5B,CAAC;QACD,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;KACvB,CAAC;AACN,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,mCAAmC,CAAC;IACpE,gBAAgB;IAChB,sBAAsB;IACtB,IAAI,EAAE,0BAA0B;IAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,kCAAkC,CAAC;IAClE,sBAAsB;IACtB,IAAI,EAAE,0BAA0B;CACnC,CAAC,CAAC"}
+{"version":3,"file":"node-child-process-starters.js","sourceRoot":"","sources":["../../../../source/run/node-child-process-starters.ts"],"names":[],"mappings":"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"}

package/run/supervised-child-failure.js

@@ -1,5 +1,5 @@
 import { crashError } from "./supervised-run-process-policy.js";
-export function recordChildProtocolFailure(state, reason, observedAtMicroseconds, restricted) {
+export function recordChildProtocolFailure(state, reason, observedAtMicroseconds, interruption) {
     const activeAttempts = Array.from(state.activeCases.values(), function affectedAttempt(active) {
         return { attempt: active.attempt, case: active.id, work: active.workId };
     });
@@ -7,10 +7,16 @@ export function recordChildProtocolFailure(state, reason, observedAtMicroseconds
         attributedTo: null,
         attributedToAttempt: null,
         attributedToWork: null,
-        cause: { activeAttempts, capability: 'child-process', reason, strictness: 'observed' },
+        cause: {
+            activeAttempts,
+            capability: 'child-process',
+            reason,
+            strictness: 'observed',
+            ...interruption.termination === 'cancelled' ? { termination: 'cancelled' } : {}
+        },
         diagnostics: [{ label: 'strictness', value: 'observed' }],
         message: reason,
-        subtype: restricted ? 'runtime-policy' : 'crash'
+        subtype: interruption.restricted ? 'runtime-policy' : 'crash'
     });
     state.recordTerminalActiveCases('crashed', observedAtMicroseconds);
 }

package/run/supervised-child-failure.js.map

@@ -1 +1 @@
-{"version":3,"file":"supervised-child-failure.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGhE,MAAM,UAAU,0BAA0B,CACtC,KAAyB,EACzB,MAAc,EACd,sBAA8B,EAC9B,UAAmB;IAEnB,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,SAAS,eAAe,CAAC,MAAM;QACzF,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,iBAAiB,CAAC;QACpB,YAAY,EAAE,IAAI;QAClB,mBAAmB,EAAE,IAAI;QACzB,gBAAgB,EAAE,IAAI;QACtB,KAAK,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE;QACtF,WAAW,EAAE,CAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAE;QAC3D,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO;KACnD,CAAC,CAAC;IACH,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,KAA6B,EAC7B,KAAyB,EACzB,sBAA8B;IAE9B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAExC,KAAK,CAAC,iBAAiB,CAAC;QACpB,GAAG,UAAU,CACT,KAAK,EACL,6EAA6E,IAAI,aAAa,MAAM,IAAI,CAC3G;QACD,WAAW,EAAE,CAAE,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAE;KAC3F,CAAC,CAAC;IACH,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AACvE,CAAC"}
+{"version":3,"file":"supervised-child-failure.js","sourceRoot":"","sources":["../../../../source/run/supervised-child-failure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAQhE,MAAM,UAAU,0BAA0B,CACtC,KAAyB,EACzB,MAAc,EACd,sBAA8B,EAC9B,YAAkC;IAElC,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,SAAS,eAAe,CAAC,MAAM;QACzF,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAC7E,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,iBAAiB,CAAC;QACpB,YAAY,EAAE,IAAI;QAClB,mBAAmB,EAAE,IAAI;QACzB,gBAAgB,EAAE,IAAI;QACtB,KAAK,EAAE;YACH,cAAc;YACd,UAAU,EAAE,eAAe;YAC3B,MAAM;YACN,UAAU,EAAE,UAAU;YACtB,GAAG,YAAY,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE;SAClF;QACD,WAAW,EAAE,CAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAE;QAC3D,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO;KAChE,CAAC,CAAC;IACH,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACpC,KAA6B,EAC7B,KAAyB,EACzB,sBAA8B;IAE9B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAExC,KAAK,CAAC,iBAAiB,CAAC;QACpB,GAAG,UAAU,CACT,KAAK,EACL,6EAA6E,IAAI,aAAa,MAAM,IAAI,CAC3G;QACD,WAAW,EAAE,CAAE,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAE;KAC3F,CAAC,CAAC;IACH,KAAK,CAAC,yBAAyB,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC;AACvE,CAAC"}