@tangle-network/agent-runtime 0.141.0 → 0.141.1

package/dist/{supervisor-3cq3UHmU.js → supervisor-eo3t-RFb.js}

@@ -2,10 +2,10 @@ import { f as RuntimeRunStateError, m as ValidationError, r as BackendTransportE
 import { t as detachedSnapshot } from "./snapshot-cK9K420n.js";
 import { S as contentAddress, a as aggregateProviderModelEvidence, c as pendingWaits, g as runtimeOwnedNestedDriverTreeRoot, h as nestedDriverTreeRoot, l as replaySpawnTree, m as driverRuntime, o as loadSpawnForest, p as attestNestedDriverTreeOwner, s as materializeTreeView, v as captureWorkerTraceEvidence } from "./spawn-journal-D2HKUImC.js";
 import { _ as zeroTokenUsage, a as hasCompleteCacheBreakdown, c as promptCacheTokenClasses, d as sleep, f as stringifySafe, g as withTimeout, h as usdEstimatedOf, i as deleteBoxSafe, l as randomSuffix, m as throwIfAborted, n as chargedTokens, p as throwAbort, r as cloneTokenUsage, s as mapWithConcurrency, t as addTokenUsage, u as randomUuid } from "./util-C1bv6yog.js";
-import { o as notifySandboxEventObserver, r as extractLlmCallEvent } from "./sandbox-events-DPmXlcKw.js";
+import { a as extractLlmCallEvent, c as notifySandboxEventObserver, n as assertSandboxServedModel, t as assertSandboxEventSucceeded } from "./sandbox-events-kbgcTyiC.js";
 import { a as concreteProfileModel, l as resolveRouterRetryPolicy, o as profileBridgeWireModel, s as profileModelExecutionSettings, t as assertExecutableAgentProfile, u as agentHarness } from "./model-policy-DgRJIJse.js";
 import { C as unknownExecutionBindingReceipt, E as executableAgentSpecSnapshot, S as runtimeOwnedScopeOwnerRuntime, T as executableAgentProfileSnapshot, a as authoredProfileDigest, b as runtimeOwnedExecutorProviderEvidence, c as knownExecutionBindingReceipt, f as recordRuntimeOwnedProviderAttemptStart, g as runtimeOwnedDeferredExecutorRuntime, h as recordRuntimeOwnedProviderModel, l as knownMaterializationReceipt, m as recordRuntimeOwnedProviderIdentityConflict, n as attestRuntimeOwnedExecutor, o as finalizeRuntimeOwnedPendingExecutor, p as recordRuntimeOwnedProviderDispatchNotStarted, r as attestRuntimeOwnedPendingExecutor, t as attestRuntimeOwnedDeferredExecutor, u as newExecutionAttemptId, v as runtimeOwnedExecutorExecutionBinding, w as unknownMaterializationReceipt, x as runtimeOwnedPendingExecutorMaterialization, y as runtimeOwnedExecutorMaterialization } from "./materialization-CrdcfWXp.js";
-import { i as resolveAgentEnvironmentProvider, n as providerAsExecutor, r as providerAsSandboxClient } from "./environment-provider-BAO8wt1_.js";
+import { i as resolveAgentEnvironmentProvider, n as providerAsExecutor, r as providerAsSandboxClient } from "./environment-provider-BEU4devP.js";
 import { i as notifyRuntimeHookEvent } from "./runtime-hooks-tXpAarhW.js";
 import { AGENT_PROFILE_MATERIALIZATION_AXES, AgentTurnInputSchema, REASONING_EFFORTS, agentProfileSchema, canonicalAgentProfileDigest, canonicalCandidateDigest, profileMaterializationAxes, profileMaterializationAxes as profileMaterializationAxes$1, renderInputPartsAsText, sha256DigestSchema } from "@tangle-network/agent-interface";
 import { estimateCost, isModelPriced } from "@tangle-network/agent-eval";
@@ -4033,20 +4033,31 @@ function resolveBackendType(profile, override) {
 }
 /**
 * Build `CreateSandboxOptions` for `profile`, merging `overrides` and setting
-* `backend.profile`. `model`/`server` from an override backend pass through.
+* `backend.profile`. The exact provider and model always ride the create
+* request as separate canonical fields; omitting either lets the sandbox select
+* an ambient default while Runtime records a different executed instrument.
+* Other model/server override fields pass through after identity validation.
 */
 function buildBackendOptions(profile, overrides) {
 	assertExecutableAgentProfile(profile, "buildBackendOptions");
 	const base = overrides ?? {};
 	const overrideBackend = base.backend;
+	const overrideProvider = overrideBackend?.model?.provider;
 	const overrideModel = overrideBackend?.model?.model;
+	const profileProvider = profile.model?.provider?.trim();
 	const profileModel = concreteProfileModel(profile);
+	if (overrideProvider !== void 0 && overrideProvider !== profileProvider) throw new Error(`buildBackendOptions: backend provider ${JSON.stringify(overrideProvider)} conflicts with AgentProfile provider ${JSON.stringify(profileProvider)}`);
 	if (overrideModel !== void 0 && overrideModel !== profileModel) throw new Error(`buildBackendOptions: backend model ${JSON.stringify(overrideModel)} conflicts with AgentProfile model ${JSON.stringify(profileModel)}`);
 	return {
 		...base,
 		backend: {
 			type: resolveBackendType(profile, overrideBackend),
 			profile,
+			model: {
+				...overrideBackend?.model,
+				provider: profileProvider,
+				model: profileModel
+			},
 			...overrideBackend?.server ? { server: overrideBackend.server } : {}
 		}
 	};
@@ -4684,6 +4695,12 @@ async function executeIteration(args) {
 			}
 		});
 		const events = [];
+		slot.events = events;
+		const requestedModel = concreteProfileModel(spec.profile);
+		const requested = {
+			...spec.profile.model?.provider !== void 0 ? { provider: spec.profile.model.provider } : {},
+			...requestedModel !== void 0 ? { model: requestedModel } : {}
+		};
 		let sawLlmCall = false;
 		for await (const event of stream) {
 			events.push(event);
@@ -4691,6 +4708,8 @@ async function executeIteration(args) {
 				iterationIndex: args.item.index,
 				agentRunName: slot.agentRunName
 			});
+			assertSandboxEventSucceeded(event);
+			assertSandboxServedModel(event, requested);
 			const llmCall = extractLlmCallEvent(event, slot.agentRunName);
 			if (llmCall) {
 				sawLlmCall = true;
@@ -4714,7 +4733,6 @@ async function executeIteration(args) {
 			slot.tokenUsage.tokensKnown = false;
 			slot.costUsdKnown = false;
 		}
-		slot.events = events;
 		slot.output = args.output.parse(events);
 		if (args.validator) slot.verdict = await args.validator.validate(slot.output, {
 			iteration: args.item.index,
@@ -5894,6 +5912,11 @@ function createSteerableSandboxSession(args) {
 			}
 		};
 		const promptOptions = readPromptOptions(args.loopCtx);
+		const requestedModel = concreteProfileModel(args.profile);
+		const requested = {
+			...args.profile.model?.provider !== void 0 ? { provider: args.profile.model.provider } : {},
+			...requestedModel !== void 0 ? { model: requestedModel } : {}
+		};
 		const started = now();
 		const tokens = zeroTokenUsage();
 		let tokensKnown = true;
@@ -5943,6 +5966,8 @@ function createSteerableSandboxSession(args) {
 					} else events = await lineage.continue(handle, prompt, turnController.signal, promptOptions);
 					for await (const event of events) {
 						recordEvent(event);
+						assertSandboxEventSucceeded(event);
+						assertSandboxServedModel(event, requested);
 						const call = extractLlmCallEvent(event, spec.name ?? String(args.harness));
 						if (!call) continue;
 						sawLlmCall = true;
@@ -9505,6 +9530,75 @@ function mergeAbortSignals(...signals) {
 	return c.signal;
 }
 //#endregion
+//#region src/runtime/supervise/abortable.ts
+/**
+* One abort race for the supervision tree.
+*
+* Every layer that can be cancelled needs the same two things: an `AbortError` that
+* carries the signal's own reason, and a settle-once race between the work and the
+* signal. Written per layer, the race drifts — the listener stops being removed on
+* one path, or a late resolution overwrites a cancellation that already won.
+*
+* The fallback message is the only thing a layer supplies, so the error still names
+* which layer cancelled.
+*/
+/** An `AbortError` carrying the signal's own string reason, or `fallback` when it states none. */
+function abortError(signal, fallback) {
+	const reason = signal.reason;
+	const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : fallback);
+	error.name = "AbortError";
+	return error;
+}
+/**
+* Settle `act()` against `signal`. The first outcome wins and the listener is always
+* removed, so neither a late resolution nor a late abort can settle the promise twice.
+* The losing promise stays observed, so a late rejection cannot surface as an unhandled
+* process error.
+*
+* The abort rejection is deferred one microtask so a result the action had ALREADY
+* produced still wins. It does not hand the race to a listener the action registers
+* from inside `act()`: this function subscribes before it calls `act()`, so its own
+* abort handler runs first and settles the promise. A caller that must let the action
+* observe the abort itself has to hold a live promise and await that instead.
+*
+* A synchronous throw from `act()` propagates as the rejection, not as an abort.
+*/
+async function runAbortable(act, signal, fallback) {
+	if (signal.aborted) throw abortError(signal, fallback);
+	return await new Promise((resolve, reject) => {
+		let settled = false;
+		const cleanup = () => signal.removeEventListener("abort", onAbort);
+		const onAbort = () => {
+			queueMicrotask(() => {
+				if (settled) return;
+				settled = true;
+				cleanup();
+				reject(abortError(signal, fallback));
+			});
+		};
+		signal.addEventListener("abort", onAbort, { once: true });
+		let work;
+		try {
+			work = Promise.resolve(act());
+		} catch (error) {
+			cleanup();
+			reject(error);
+			return;
+		}
+		work.then((value) => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			resolve(value);
+		}, (error) => {
+			if (settled) return;
+			settled = true;
+			cleanup();
+			reject(error);
+		});
+	});
+}
+//#endregion
 //#region src/runtime/supervise/budget.ts
 /**
 *
@@ -11417,7 +11511,7 @@ async function runChild(live, executor, childAbort, task, opts, pool, ticket, bl
 	};
 	try {
 		await executionReady;
-		if (childAbort.signal.aborted) throw abortError(childAbort.signal);
+		if (childAbort.signal.aborted) throw abortError(childAbort.signal, "execution aborted");
 		live.status = "running";
 		started = true;
 		const ran = executor.execute(task, childAbort.signal);
@@ -11687,7 +11781,7 @@ function preserveUnknownTelemetry(streamed, terminal) {
 async function awaitAbortable(work, signal) {
 	if (signal.aborted) {
 		work.catch(() => void 0);
-		throw abortError(signal);
+		throw abortError(signal, "execution aborted");
 	}
 	return await new Promise((resolve, reject) => {
 		let settled = false;
@@ -11696,7 +11790,7 @@ async function awaitAbortable(work, signal) {
 				if (settled) return;
 				settled = true;
 				cleanup();
-				reject(abortError(signal));
+				reject(abortError(signal, "execution aborted"));
 			});
 		};
 		const cleanup = () => signal.removeEventListener("abort", onAbort);
@@ -11714,12 +11808,6 @@ async function awaitAbortable(work, signal) {
 		});
 	});
 }
-function abortError(signal) {
-	const reason = signal.reason;
-	const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "execution aborted");
-	error.name = "AbortError";
-	return error;
-}
 function downRecord(reason, infra, trace, metered, providerModel) {
 	return {
 		kind: "down",
@@ -11847,7 +11935,7 @@ const driverExecutorFactory = (rawSpec, ctx) => {
 				scope: nestedScope
 			};
 			try {
-				const out = await driverActAbortable(() => driver.act(task, nestedScope), controller.signal);
+				const out = await runAbortable(() => driver.act(task, nestedScope), controller.signal, "driver aborted");
 				await finalizeScopeOwnerMaterialization(nestedScope);
 				await closeActive("driver completed");
 				const events = await loadTreeEvents(journal, nestedRoot);
@@ -11927,47 +12015,6 @@ async function closeNestedScope(scope, controller, reason) {
 	const view = scope.view;
 	if (view.inFlight > 0 || view.waiting > 0) throw new ValidationError(`driverExecutor: nested cleanup left ${view.inFlight} running and ${view.waiting} waiting nodes`);
 }
-async function driverActAbortable(act, signal) {
-	if (signal.aborted) throw driverAbortError(signal);
-	return await new Promise((resolve, reject) => {
-		let settled = false;
-		const cleanup = () => signal.removeEventListener("abort", onAbort);
-		const onAbort = () => {
-			queueMicrotask(() => {
-				if (settled) return;
-				settled = true;
-				cleanup();
-				reject(driverAbortError(signal));
-			});
-		};
-		signal.addEventListener("abort", onAbort, { once: true });
-		let work;
-		try {
-			work = Promise.resolve(act());
-		} catch (error) {
-			cleanup();
-			reject(error);
-			return;
-		}
-		work.then((value) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			resolve(value);
-		}, (error) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			reject(error);
-		});
-	});
-}
-function driverAbortError(signal) {
-	const reason = signal.reason;
-	const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "driver aborted");
-	error.name = "AbortError";
-	return error;
-}
 /** The nested tree's full event list — the one evidence the spend, verdict, AND driver-inference
 *  roll-ups read off the same journal the supervisor sums. */
 async function loadTreeEvents(journal, nestedRoot) {
@@ -12581,7 +12628,7 @@ function createSupervisor() {
 			try {
 				actOutcome = {
 					ok: true,
-					out: await runAbortable(() => rootAct(task, scope), controller.signal)
+					out: await runAbortable(() => rootAct(task, scope), controller.signal, "supervisor aborted")
 				};
 			} catch (error) {
 				actOutcome = {
@@ -12819,49 +12866,6 @@ function boundedSettleGrace(graceMs, deadlineAtMs, now) {
 async function drainCursor(scope) {
 	for (;;) if (await scope.next() === null) return;
 }
-/** Race root policy execution against the same signal that stops every child. The losing promise
-* remains observed, so a late rejection cannot surface as an unhandled process error. */
-async function runAbortable(act, signal) {
-	if (signal.aborted) throw supervisorAbortError(signal);
-	return await new Promise((resolve, reject) => {
-		let settled = false;
-		const cleanup = () => signal.removeEventListener("abort", onAbort);
-		const onAbort = () => {
-			queueMicrotask(() => {
-				if (settled) return;
-				settled = true;
-				cleanup();
-				reject(supervisorAbortError(signal));
-			});
-		};
-		signal.addEventListener("abort", onAbort, { once: true });
-		let work;
-		try {
-			work = Promise.resolve(act());
-		} catch (error) {
-			cleanup();
-			reject(error);
-			return;
-		}
-		work.then((value) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			resolve(value);
-		}, (error) => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			reject(error);
-		});
-	});
-}
-function supervisorAbortError(signal) {
-	const reason = signal.reason;
-	const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "supervisor aborted");
-	error.name = "AbortError";
-	return error;
-}
 /**
 * The lifecycle cause of a no-winner, or `undefined` when the supervisor's own state proves
 * nothing. Returning `undefined` rather than falling through to `all-children-down` is what lets
@@ -13041,4 +13045,4 @@ function isNonEmptySpend(s) {
 //#endregion
 export { createInbox as $, AGENT_PROFILE_MATERIALIZATION_AXES as $t, createBudgetPool as A, exportEvalRuns as At, WORKER_TRACE_PROPAGATION as B, sanitizeKnowledgeReadinessReport as Bt, effectiveConcurrency as C, traceContextToEnv as Ct, DEFAULT_SUCCESSFUL_SHUTDOWN_MS as D, buildRuntimeEventOtelSpans as Dt, rollingDispatch as E, buildLoopSpanNodes as Et, cliWorktreeExecutor as F, padTraceId as Ft, DEFAULT_SANDBOX_STEERING_MAX_TURNS as G, createWorktree as Gt, workerTraceEnv as H, runSettledCommand as Ht, createExecutor as I, toOtelAttributes as It, decodeToolPart as J, LOCAL_HARNESSES as Jt, createSteerableSandboxSession as K, removeWorktree as Kt, createExecutorRegistry as L, createRuntimeEventCollector as Lt, bindReusableExecutorExecutionId as M, generateSpanId as Mt, bridgeStopSignalKey as N, loopEventToOtelSpan as Nt, teardownExecutor as O, createOpenInferenceFileExporter as Ot, captureReusableExecutorConfig as P, padSpanId as Pt, readWorkerProgress as Q, CodexExecutionDiagnosticError as Qt, snapshotExecutorConfig as R, createRuntimeStreamEventCollector as Rt, waitUntil as S, readTraceContextFromEnv as St, queueOf as T, buildLoopOtelSpans as Tt, workerTraceHeaders as U, runWorktreeHarness as Ut, readWorkerTraceContext as V, sanitizeRuntimeStreamEvent as Vt, workerTraceSeamKey as W, captureWorktreeDiff as Wt, DEFAULT_STALL_AFTER_MS as X, localHarnessExecutable as Xt, sandboxSessionTraceSource as Y, harnessSupportsReasoningEffort as Yt, createActivityLog as Z, parseCodexTokenUsage as Zt, createWaitProbes as _, runBrainLoop as _t, pickBestDelivered as a, promptControlProfileMaterialization as an, isPeerMailEnvelope as at, timerAt as b, createPropagatingTraceEmitter as bt, driverChild as c, promptResourceProfileMaterialization as cn, TERMINAL_DECISIONS as ct, deriveNodeExecutionIdentity as d, validateProfileMaterialization as dn, isTerminalDecision as dt, assertProfileMaterialization as en, AUTHORITY_MARKERS as et, meterRuntimeOwnedAccounting as f, worktreeCliProfileMaterialization as fn, runAgentRounds as ft, settledToIteration as g, routerBrain as gt, scopeOwnerExecutorNodeContext as h, acquireSandbox as ht, collectDelivered as i, profileMaterializationAxes$1 as in, createPeerMailbox as it, spendFromUsageEvents as j, flatOtelSpan as jt, assertValidBudget as k, createOtelExporter as kt, withDriverExecutor as l, renderProfileMaterializationIssues as ln, createSandboxForSpec as lt, recordScopeOwnerMaterialization as m, probeSandboxCapabilities as mt, createSupervisor as n, defineProfileMaterializationContract as nn, PEER_MAIL_WIRE_KEY as nt, runFinalizer as o, promptModelProfileMaterialization as on, peerMailTools as ot, meterRuntimeOwnedProviderAttempt as p, createSandboxLineage as pt, createPushTraceSource as q, DEFAULT_LOCAL_HARNESS as qt, bestDelivered as r, fullProfileMaterialization as rn, claimsAuthority as rt, runTree as s, promptOnlyProfileMaterialization as sn, peerMailVerbNames as st, createRootHandle as t, controlProfileMaterialization as tn, DEFAULT_PEER_MAIL_LIMITS as tt, createScope as u, sandboxActProfileMaterialization as un, defaultSelectWinner as ut, isWaitOutcome as v, canonicalObservedModel as vt, freeSlots as w, INTELLIGENCE_WIRE_VERSION as wt, validateWaitSpec as x, mergeTraceEnv as xt, pollFor as y, observedModelMatchesDeclared as yt, createWorktreeCliExecutor as z, sanitizeAgentRuntimeEvent as zt };
 
-//# sourceMappingURL=supervisor-3cq3UHmU.js.map
+//# sourceMappingURL=supervisor-eo3t-RFb.js.map