@tangle-network/agent-runtime 0.206.1 → 0.208.0

package/dist/{supervise-BN5VMhRq.js → supervise-D3r_gEyO.js}

@@ -1,9 +1,9 @@
-import { $ as bridgeAdmissionRefusal, $r as providerAttemptEvidence, $t as spendFromUsageEvents, A as consumeScopeRetainedOwnerResult, Ar as profileMaterializationAxes$1, Br as worktreeCliProfileMaterialization, Ct as createInbox, Dr as controlProfileMaterialization, Er as assertProfileMaterialization, Ir as renderUnsupported, Kr as attestRuntimeOwnedScopeOwner, M as scopeRetainedOwnerContext, Mn as zeroSpend, Mr as promptModelProfileMaterialization, N as scopeRetainedOwnerPriorSpend, Nn as registerRetainedExecutorPreparation, Or as defineProfileMaterializationContract, P as scopeRetainedOwnerResult, Pn as retainedExecutorSeamKey, Q as bindReusableExecutorExecutionId, Rr as unsupportedProfileDimensions, S as scopeOwnerExecutorNodeContext, X as DEFAULT_SUCCESSFUL_SHUTDOWN_MS, Xt as contentAddress, Yr as inheritRuntimeOwnedExecutorAttestation, Z as teardownExecutor, Zt as assertValidBudget, _ as deriveNodeExecutionIdentity, _n as resolveAgentEnvironmentProvider, a as createSupervisor, ai as runtimeOwnedPendingExecutorMaterialization, b as recordScopeOwnerMaterialization, cr as toOtelAttributes, ct as snapshotExecutorConfig, d as driverChild, ei as recordRuntimeOwnedDriveHarnessProviderEvidence, et as bridgeModelRouteRefusal, f as driverExecutorFactory, fi as detachedSnapshot, h as beginScopeOwnerAttempt, i as createRootHandle, ii as runtimeOwnedExecutorProviderEvidence, ir as generateSpanId, j as prepareScopeRetainedOwnerTask, jn as unmeteredSpend, jr as promptControlProfileMaterialization, kr as fullProfileMaterialization, l as runFinalizer, ni as runtimeOwnedExecutorExecutionBinding, nt as bridgeStopSignalKey, o as bestDelivered, oi as runtimeOwnedScopeOwnerRuntime, ot as createExecutor, p as isDriverSpec, ri as runtimeOwnedExecutorMaterialization, rt as captureReusableExecutorConfig, ti as runtimeOwnedDriveHarnessProviderEvidence, tr as createOtelExporter, tt as bridgeRuntimeAttachmentsKey, u as runTree, un as routerBrain, ut as WORKER_TRACE_PROPAGATION, v as meterRuntimeOwnedAccounting, x as restoreScopeOwnerAcceptedExecution, y as meterRuntimeOwnedProviderAttempt, yn as addSpend } from "./redact-CLRRxkXF.js";
+import { $ as bridgeAdmissionRefusal, $t as spendFromUsageEvents, A as consumeScopeRetainedOwnerResult, Ar as fullProfileMaterialization, Ct as createInbox, Dr as assertProfileMaterialization, Fn as RunCancellationReason, Lr as renderUnsupported, M as scopeRetainedOwnerContext, Mn as zeroSpend, Mr as promptControlProfileMaterialization, N as scopeRetainedOwnerPriorSpend, Nn as registerRetainedExecutorPreparation, Nr as promptModelProfileMaterialization, Or as controlProfileMaterialization, P as scopeRetainedOwnerResult, Pn as retainedExecutorSeamKey, Q as bindReusableExecutorExecutionId, S as scopeOwnerExecutorNodeContext, Vr as worktreeCliProfileMaterialization, X as DEFAULT_SUCCESSFUL_SHUTDOWN_MS, Xr as inheritRuntimeOwnedExecutorAttestation, Xt as contentAddress, Z as teardownExecutor, Zt as assertValidBudget, _ as deriveNodeExecutionIdentity, _n as resolveAgentEnvironmentProvider, a as createSupervisor, ai as runtimeOwnedExecutorProviderEvidence, ar as generateSpanId, b as recordScopeOwnerMaterialization, ct as snapshotExecutorConfig, d as driverChild, ei as providerAttemptEvidence, et as bridgeModelRouteRefusal, f as driverExecutorFactory, h as beginScopeOwnerAttempt, i as createRootHandle, ii as runtimeOwnedExecutorMaterialization, j as prepareScopeRetainedOwnerTask, jn as unmeteredSpend, jr as profileMaterializationAxes$1, kr as defineProfileMaterializationContract, l as runFinalizer, lr as toOtelAttributes, ni as runtimeOwnedDriveHarnessProviderEvidence, nr as createOtelExporter, nt as bridgeStopSignalKey, o as bestDelivered, oi as runtimeOwnedPendingExecutorMaterialization, ot as createExecutor, p as isDriverSpec, pi as detachedSnapshot, qr as attestRuntimeOwnedScopeOwner, ri as runtimeOwnedExecutorExecutionBinding, rt as captureReusableExecutorConfig, si as runtimeOwnedScopeOwnerRuntime, ti as recordRuntimeOwnedDriveHarnessProviderEvidence, tt as bridgeRuntimeAttachmentsKey, u as runTree, un as routerBrain, ut as WORKER_TRACE_PROPAGATION, v as meterRuntimeOwnedAccounting, x as restoreScopeOwnerAcceptedExecution, y as meterRuntimeOwnedProviderAttempt, yn as addSpend, zr as unsupportedProfileDimensions } from "./redact-BMwd8IBm.js";
 import { f as RuntimeRunStateError, i as ConfigError, m as ValidationError, r as BackendTransportError, t as AgentEvalError } from "./errors-DodWX-cb.js";
 import { a as concreteProfileModel, c as profileModelExecutionSettings, d as agentHarness, f as harnessRunsAgent, n as assertModelAllowed, o as enforceTokenLimits, r as assertProfileModelsAllowed, s as profileBridgeWireModel, t as assertExecutableAgentProfile } from "./model-policy-DKDyr-fc.js";
 import { t as composeRuntimeHooks } from "./runtime-hooks-tXpAarhW.js";
-import { k as writeRunCancellation, o as readRunCancelRequest, s as readRunCancellation } from "./run-layout-B8I_LXN-.js";
-import { C as createCoordinationTools, F as watchRunCancellation, M as createInMemoryRunContext, P as applyRunCancellation, S as coordinationVerbNames, c as createProgressTracker, d as progressStop, j as createFileRunContext, r as driverAgent } from "./coordination-driver-CwT-9dXa.js";
+import { k as writeRunCancellation, o as readRunCancelRequest, s as readRunCancellation } from "./run-layout-hZREkcfu.js";
+import { C as createCoordinationTools, F as watchRunCancellation, M as createInMemoryRunContext, P as applyRunCancellation, S as coordinationVerbNames, c as createProgressTracker, d as progressStop, j as createFileRunContext, r as driverAgent } from "./coordination-driver-CqZGBqdt.js";
 import { t as createStdioToolServer } from "./tool-server-BJbCPhoW.js";
 import { agentProfileSchema, canonicalAgentProfileDigest, canonicalCandidateDigest, validateAgentProfileSecurity } from "@tangle-network/agent-interface";
 import { createHash, createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
@@ -2942,12 +2942,15 @@ function recordRunCancellationOutcome(runDir, result, now) {
 	if (request === void 0) return;
 	const record = readRunCancellation(dir, request.operationId);
 	if (record !== void 0 && record.effect !== "cancel_requested") return;
-	const aborted = result.kind === "no-winner" && result.reason === "aborted";
+	const aborted = result.kind === "no-winner" && result.reason === "cancelled" && result.operationId === request.operationId;
 	const observedAt = new Date(now()).toISOString();
 	const base = {
 		operationId: request.operationId,
 		requestedAt: request.at,
 		observedAt,
+		...record?.path === void 0 ? {} : { path: record.path },
+		...record?.appliedAfterMs === void 0 ? {} : { appliedAfterMs: record.appliedAfterMs },
+		...record?.deadlineExceeded === void 0 ? {} : { deadlineExceeded: record.deadlineExceeded },
 		...request.reason === void 0 ? {} : { reason: request.reason }
 	};
 	if (record === void 0) {
@@ -2969,7 +2972,7 @@ function recordRunCancellationOutcome(runDir, result, now) {
 	writeRunCancellation(dir, aborted ? {
 		...base,
 		effect: "cancelled",
-		detail: "the run reached its terminal aborted state"
+		detail: "the run reached its terminal cancelled state"
 	} : {
 		...base,
 		effect: "not_live",
@@ -3309,7 +3312,7 @@ function superviseInternal(profile, task, opts, testBrain) {
 					...options.runDir === void 0 ? {} : {
 						controlDir: resolve(options.runDir),
 						controlScope: "subtree",
-						abortRun: (reason) => runControl?.abort(reason)
+						abortRun: cancelDurableRun
 					}
 				}), journal, childExecution.ref, () => acceptedSubmission, recoveryFactories.get(childFactory));
 			};
@@ -3342,6 +3345,10 @@ function superviseInternal(profile, task, opts, testBrain) {
 		makeWorkerAgent = makeRecursiveWorkerFor(canonicalProfile, rootExecution.identity, 1, rootOwnerId);
 	}
 	const runControl = options.rootHandle ?? (options.runDir === void 0 ? void 0 : createRootHandle());
+	const durableCancellation = new AbortController();
+	const cancelDurableRun = (reason, request) => {
+		durableCancellation.abort(request === void 0 ? new Error(reason) : new RunCancellationReason(request.source, reason, request.operationId));
+	};
 	const workerFactory = makeWorkerAgent;
 	const start = async () => {
 		const priorCoordination = log ? await log.load(runId, rootOwnerId) : void 0;
@@ -3394,13 +3401,7 @@ function superviseInternal(profile, task, opts, testBrain) {
 			...options.onUnmetContract ? { onUnmetContract: options.onUnmetContract } : {},
 			...options.runDir === void 0 || runControl === void 0 ? {} : {
 				controlDir: resolve(options.runDir),
-				abortRun: (reason) => {
-					try {
-						runControl.abort(reason);
-					} catch (error) {
-						if (!(error instanceof RuntimeRunStateError)) throw error;
-					}
-				}
+				abortRun: cancelDurableRun
 			}
 		};
 		const agent = testBrain === void 0 ? supervisorAgent(canonicalProfile, agentDeps) : supervisorAgentWithTestBrain(canonicalProfile, {
@@ -3416,13 +3417,13 @@ function superviseInternal(profile, task, opts, testBrain) {
 		const hooks = recorder ? composeRuntimeHooks(options.hooks, recorder.hooks) : options.hooks;
 		const supervisor = createSupervisor();
 		if (runControl !== void 0) supervisor.attach(runControl);
-		const cancellation = options.runDir !== void 0 && runControl !== void 0 ? watchRunCancellation(resolve(options.runDir), (reason) => {
-			try {
-				runControl.abort(reason);
-			} catch (error) {
-				if (!(error instanceof RuntimeRunStateError)) throw error;
-			}
-		}) : void 0;
+		const cancellation = options.runDir !== void 0 && runControl !== void 0 ? watchRunCancellation(resolve(options.runDir), cancelDurableRun) : void 0;
+		try {
+			cancellation?.check();
+		} catch (error) {
+			cancellation?.close();
+			throw error;
+		}
 		const run = supervisor.run(agent, canonicalTask, {
 			budget: options.budget,
 			runId,
@@ -3442,7 +3443,7 @@ function superviseInternal(profile, task, opts, testBrain) {
 			...probes ? { probes } : {},
 			...ctx.resume === true ? { resume: true } : {},
 			...options.now ? { now: options.now } : {},
-			...options.signal ? { signal: options.signal } : {},
+			signal: options.signal ? AbortSignal.any([options.signal, durableCancellation.signal]) : durableCancellation.signal,
 			...hooks ? { hooks } : {},
 			...recorder ? { workerTrace: recorder.workerTrace } : {},
 			...recorder && traceUnpropagated ? { workerTraceUnpropagated: traceUnpropagated } : {},
@@ -3454,6 +3455,7 @@ function superviseInternal(profile, task, opts, testBrain) {
 				result = await run;
 			} finally {
 				cancellation?.close();
+				cancellation?.check();
 			}
 			recordRunCancellationOutcome(options.runDir, result, now);
 			const rootProviderModel = ctx.resume === true ? rootProviderModelEvidence([]) : rootProviderModels.length > 0 ? rootProviderModelEvidence(rootProviderModels) : rootDriveHarness === void 0 ? rootProviderModelEvidence([]) : rootProviderModelEvidenceFromExecution(runtimeOwnedDriveHarnessProviderEvidence(rootDriveHarness));
@@ -3495,4 +3497,4 @@ function rootProviderModelEvidenceFromExecution(evidence) {
 //#endregion
 export { serveCoordinationMcp as _, isPreSpawnExecutorFailure as a, mapExecutorResult as b, withWorkerSpawnRetry as c, resolveSupervisorProfile as d, supervisorAgent as f, defaultUnmetContractSteer as g, classifyDriverFailure as h, workerFromBackend as i, assertCoordinationBinding as l, DriverAttemptsExhaustedError as m, supervise as n, resolveWorkerSpawnRetry as o, supervisorAgentWithTestBrain as p, superviseWithTestBrain as r, retryPreSpawnRefusals as s, DEFAULT_AUTHORED_PROFILE_SECURITY_POLICY as t, coordinationProfileToolPrefix as u, createSupervisorSpanRecorder as v, gateOnDeliverable as y };
 
-//# sourceMappingURL=supervise-BN5VMhRq.js.map
+//# sourceMappingURL=supervise-D3r_gEyO.js.map