@tangle-network/agent-runtime 0.292.0 → 0.292.4

package/dist/{supervisor-B-LtKizU.js → supervisor-BnL7JHEI.js}

@@ -11167,7 +11167,8 @@ async function* streamProviderExecutor(args) {
 				workspaceCapture: providerWorkspaceCaptureReceipt(args, environment, retainedWorkspace, turn.sessionId ?? null)
 			});
 		} catch (captureError) {
-			failure = captureError instanceof Error ? Object.assign(captureError, { cause: captureError.cause ?? failure }) : captureError;
+			if (captureError instanceof Error && captureError !== error) failure = captureError.cause === void 0 ? Object.assign(captureError, { cause: failure }) : new AggregateError([captureError, failure], captureError.message, { cause: captureError });
+			else failure = captureError;
 		}
 		args.onHarnessTranscript(await captureHarnessTranscript(environment, args.profile.harness, linked));
 	} finally {
@@ -11279,8 +11280,25 @@ async function* streamProviderExecutor(args) {
 		} else if (input > 0 || output > 0 || receipt.tokensKnown === false) pendingUnpricedWork = true;
 	}
 }
+/** Subscription selection needs the same complete profile on creation and every new turn. */
+function subscriptionTurnProfile(turn, profile) {
+	if (profile.model?.metadata?.credentialSource !== "subscription") return turn;
+	const backend = promptOptionsFromAgentTurnInput(turn).backend ?? {};
+	if (backend.profile !== void 0 && canonicalAgentProfileDigest(backend.profile) !== canonicalAgentProfileDigest(profile)) throw new ValidationError("provider subscription turn cannot replace its exact AgentProfile");
+	return {
+		...turn,
+		providerOptions: {
+			...turn.providerOptions,
+			backend: {
+				...backend,
+				profile
+			}
+		}
+	};
+}
 /** One retained dispatch owns creation, replay, result identity, and cancellation. */
 async function providerExecutionSource(args, turn, signal) {
+	const selectedTurn = subscriptionTurnProfile(turn, args.profile);
 	const capabilities = args.retention ? await args.provider.capabilities() : void 0;
 	if (!(args.retention !== void 0 && capabilities?.retainedControl !== void 0)) {
 		if (args.recovering) throw new Error(`provider ${args.provider.name} cannot recover retained executions`);
@@ -11291,7 +11309,7 @@ async function providerExecutionSource(args, turn, signal) {
 		});
 		return {
 			environment,
-			events: environment.stream(turn),
+			events: environment.stream(selectedTurn),
 			retained: false
 		};
 	}
@@ -11320,7 +11338,7 @@ async function providerExecutionSource(args, turn, signal) {
 			signal
 		},
 		turn: {
-			...turn,
+			...selectedTurn,
 			turnId
 		},
 		...priorSession === void 0 ? {} : {
@@ -11338,7 +11356,20 @@ async function providerExecutionSource(args, turn, signal) {
 		const environmentAdmission = admissions.find((admission) => admission.phase === "environment");
 		if (args.recovering && admissions.length > 0) {
 			if (!intent) throw new Error("retained provider execution has no original intent");
-			assertRetainedRunReplayMaterial(args.provider, material, intent);
+			try {
+				assertRetainedRunReplayMaterial(args.provider, material, intent);
+			} catch (error) {
+				if (selectedTurn === turn) throw error;
+				const original = {
+					...material,
+					turn: {
+						...turn,
+						turnId
+					}
+				};
+				assertRetainedRunReplayMaterial(args.provider, original, intent);
+				material.turn = original.turn;
+			}
 		}
 		let handle;
 		if (args.recovering && dispatched?.phase === "dispatched") {
@@ -23407,6 +23438,7 @@ const pauseRecorders = /* @__PURE__ */ new WeakMap();
 const driverAttemptRecorders = /* @__PURE__ */ new WeakMap();
 const recoveryStarters = /* @__PURE__ */ new WeakMap();
 const retainedReleasers = /* @__PURE__ */ new WeakMap();
+const childDrains = /* @__PURE__ */ new WeakMap();
 const retainedSlotClosers = /* @__PURE__ */ new WeakMap();
 const teardownRetriers = /* @__PURE__ */ new WeakMap();
 const teardownRetriable = /* @__PURE__ */ new WeakMap();
@@ -23575,6 +23607,10 @@ function hasRetriableTeardowns(scope, release) {
 function closeScopeAdmission(scope) {
 	admissionSeals.get(scope)?.();
 }
+/** Join local observers after abort without requiring a writable settlement journal. */
+async function waitForScopeChildren(scope) {
+	await childDrains.get(scope)?.();
+}
 /** Fail before execution when a reservation policy is malformed. */
 function assertRecursiveReservationPolicy(policy) {
 	if (policy === void 0) return;
@@ -23794,9 +23830,9 @@ function createScope(args) {
 			...assignment === void 0 ? {} : { assignment },
 			label: opts.label,
 			stage: "admitted"
-		}, recovery ? {} : {
+		}, {
 			wait: true,
-			...ownerFloor ? { keep: ownerFloor } : {}
+			...!recovery && ownerFloor ? { keep: ownerFloor } : {}
 		});
 		if (!reservation.ok) return {
 			ok: false,
@@ -23828,7 +23864,7 @@ function createScope(args) {
 			throw error;
 		}
 		const budgetGranted = reservation.granted;
-		const permit = budgetGranted === void 0 ? slotGroup.acquire(args.depth + 1, { force: recovery !== void 0 }) : deferSlot(budgetGranted, () => slotGroup.acquire(args.depth + 1));
+		const permit = budgetGranted === void 0 ? slotGroup.acquire(args.depth + 1, { force: recovery !== void 0 }) : deferSlot(budgetGranted, () => slotGroup.acquire(args.depth + 1, { force: recovery !== void 0 }));
 		let cascadeAbort;
 		let clearChildDeadline;
 		try {
@@ -23850,7 +23886,7 @@ function createScope(args) {
 			const deferredOwner = {};
 			const workerTrace = args.workerTrace?.(args.parentId);
 			let markRecoveryReady;
-			const recoveryReady = recovery?.spawned.ownedTreeRoot === void 0 ? void 0 : new Promise((resolve) => {
+			const recoveryReady = recovery?.spawned.ownedTreeRoot === void 0 || budgetGranted !== void 0 ? void 0 : new Promise((resolve) => {
 				markRecoveryReady = resolve;
 			});
 			const retainedWrites = /* @__PURE__ */ new Set();
@@ -24248,7 +24284,7 @@ function createScope(args) {
 				const ready = await readInteractiveReadyUntilWorkerEnds(live.readInteractiveReady, childRun, controller.signal);
 				if (ready !== void 0 && (ready.status === "available" || ready.reason !== "interactive-session-not-started")) writeWorkerInteractiveBinding(args.interactiveBindingDir, id, opts.label, args.root, ready, now);
 			});
-			live.settled = childRun.then(async (s) => {
+			const settled = childRun.then(async (s) => {
 				let resolution = s;
 				try {
 					await interactiveBindingCommitted;
@@ -24262,6 +24298,8 @@ function createScope(args) {
 				clearChildDeadline?.();
 				if (cascadeAbort) args.signal.removeEventListener("abort", cascadeAbort);
 			});
+			settled.catch(() => void 0);
+			live.settled = settled;
 			return {
 				ok: true,
 				handle,
@@ -24610,6 +24648,14 @@ function createScope(args) {
 			};
 		}
 	};
+	childDrains.set(scope, async () => {
+		await Promise.allSettled([...children.values()].map((child) => child.settled));
+		await Promise.allSettled([...settlementWrites]);
+		await Promise.all([...children.values()].map(async (child) => {
+			const nested = child.readNestedScope?.();
+			if (nested !== void 0) await waitForScopeChildren(nested);
+		}));
+	});
 	admissionSeals.set(scope, () => {
 		admissionClosed = true;
 	});
@@ -27477,6 +27523,51 @@ async function runFinalizer(finalizer, args) {
 	return await accepted(candidate) ? candidate : void 0;
 }
 //#endregion
+//#region src/runtime/supervise/run-persistence.ts
+/** One failed store operation revokes this controller's writes, never its retained executions. */
+function guardRunPersistence(journal, blobs, interrupt) {
+	let failure;
+	const pending = /* @__PURE__ */ new Set();
+	const operation = (perform) => {
+		const result = Promise.resolve().then(async () => {
+			if (failure !== void 0) throw failure;
+			try {
+				return await perform();
+			} catch (cause) {
+				if (failure === void 0) {
+					failure = new RuntimeRunStateError(`supervisor: durable state unavailable; restore storage and resume the same run (${cause instanceof Error ? cause.message : String(cause)})`, { cause });
+					interrupt(failure);
+				}
+				throw failure;
+			}
+		});
+		pending.add(result);
+		result.then(() => pending.delete(result), () => pending.delete(result));
+		return result;
+	};
+	return {
+		journal: {
+			loadTree: (root) => operation(() => journal.loadTree(root)),
+			beginTree: (root, at) => operation(() => journal.beginTree(root, at)),
+			appendEvent: (root, event) => operation(() => journal.appendEvent(root, event)),
+			...journal.appendEvents === void 0 ? {} : { appendEvents: (root, events) => operation(() => journal.appendEvents(root, events)) }
+		},
+		blobs: {
+			get: (ref) => operation(() => blobs.get(ref)),
+			put: (ref, artifact) => operation(() => blobs.put(ref, artifact))
+		},
+		get failed() {
+			return failure !== void 0;
+		},
+		async drain() {
+			await Promise.allSettled([...pending]);
+		},
+		assertAvailable() {
+			if (failure !== void 0) throw failure;
+		}
+	};
+}
+//#endregion
 //#region src/runtime/supervise/supervisor.ts
 /**
 *
@@ -27673,10 +27764,14 @@ function createSupervisor() {
 		const slots = resolveWorkerSlots(workerSlots);
 		if (teardownConfirmMs !== void 0 && (typeof teardownConfirmMs !== "number" || !Number.isFinite(teardownConfirmMs) || teardownConfirmMs < 0)) throw new ValidationError$1(`supervisor: teardownConfirmMs must be a nonnegative finite number of milliseconds, got ${JSON.stringify(teardownConfirmMs)}`);
 		if (requestedRetainedAtSettlement !== void 0 && requestedRetainedAtSettlement !== "release" && requestedRetainedAtSettlement !== "keep") throw new ValidationError$1(`supervisor: retainedAtSettlement must be 'release' or 'keep', got ${JSON.stringify(requestedRetainedAtSettlement)}`);
+		const controller = new AbortController();
+		const persistence = guardRunPersistence(journalStore, blobStore, (error) => {
+			controller.abort(error);
+		});
 		opts = Object.freeze({
 			...input.options,
-			journal: journalStore,
-			blobs: blobStore,
+			journal: persistence.journal,
+			blobs: persistence.blobs,
 			executors: executorRegistry,
 			...recoverExecutor ? { recoverExecutor } : {},
 			...probes === void 0 ? {} : { probes },
@@ -27755,7 +27850,6 @@ function createSupervisor() {
 					at: runStartedAt
 				});
 			}
-			const controller = new AbortController();
 			let cascadeAborted = false;
 			const cascadeAbort = (reason) => {
 				if (controller.signal.aborted) return false;
@@ -27845,9 +27939,9 @@ function createSupervisor() {
 				const settleGraceMs = !controller.signal.aborted ? boundedSettleGrace(opts.childSettleGraceMs, rootDeadlineAtMs, now) : 0;
 				try {
 					teardownUnconfirmed = await drainLiveChildren(openScope, controller, settleGraceMs);
-					if (retainedAtSettlement === "release") teardownUnconfirmed = await releaseRetainedEnvironments(openScope);
+					if (!persistence.failed && retainedAtSettlement === "release") teardownUnconfirmed = await releaseRetainedEnvironments(openScope);
 					const confirmWindowMs = opts.teardownConfirmMs ?? DEFAULT_TEARDOWN_CONFIRM_MS;
-					const releasing = retainedAtSettlement === "release";
+					const releasing = !persistence.failed && retainedAtSettlement === "release";
 					if (teardownUnconfirmed.length > 0 && confirmWindowMs > 0 && hasRetriableTeardowns(openScope, releasing)) {
 						const pending = teardownUnconfirmed;
 						for (const node of pending) await opts.journal.appendEvent(opts.runId, {
@@ -27907,7 +28001,7 @@ function createSupervisor() {
 						error
 					};
 				}
-				try {
+				if (!persistence.failed) try {
 					await finalizeScopeOwnerMaterialization(openScope);
 				} catch (error) {
 					if (actOutcome?.ok !== false) actOutcome = {
@@ -27915,10 +28009,15 @@ function createSupervisor() {
 						error
 					};
 				}
+				if (persistence.failed) {
+					await waitForScopeChildren(openScope);
+					await persistence.drain();
+				}
 				executionAborted ||= cascadeAborted;
 				if (opts.signal) opts.signal.removeEventListener("abort", onCallerAbort);
 				rootLease?.release();
 			}
+			persistence.assertAvailable();
 			const tree = runTree(scope);
 			const leakedReservations = pool.openReservations();
 			if (controller.signal.reason instanceof RunCancellationReason) return noWinner();
@@ -28413,4 +28512,4 @@ function isNonEmptySpend(s) {
 //#endregion
 export { waitUntil as $, projectSandboxOutcome as $i, captureWorkerTraceEvidence as $n, runWorktreeHarness as $r, claimsAuthority as $t, driverExecutorFactory as A, withBudgetResources as Aa, writeAllBytes as Ai, providerAsExecutor as An, mergeTraceEnv as Ar, cliInPlaceExecutor as At, recordScopeOwnerDriverAttempt as B, providerMessageText as Ba, recordRuntimeOwnedDriveHarnessProviderEvidence as Bi, FileResultBlobStore as Bn, createOtelExporter as Br, WORKER_TRACE_PROPAGATION as Bt, createContinuationKeeper as C, throwAbort as Ca, sandboxActProfileMaterialization as Ci, captureBeforeDestroy as Cn, runAbortable as Cr, recoverRetainedInteractiveRun as Ct, passedItems as D, zeroSpend as Da, isNoEntError as Di, runBrainLoop as Dn, readHarnessTranscript as Dr, rollingDispatch as Dt, failedItems as E, withTimeout as Ea, worktreeCliProfileMaterialization as Ei, routerBrain as En, persistHarnessTranscript as Er, queueOf as Et, beginScopeOwnerAttempt as F, armDeadlineTimer as Fa, inheritRuntimeOwnedExecutorAttestation as Fi, createPushTraceSource as Fn, resolveRedactor as Fr, createWorktreeCliExecutor as Ft, settledToIteration as G, runtimeOwnedPendingExecutorMaterialization as Gi, assertContentAddress as Gn, padTraceId as Gr, taskToPrompt as Gt, recordScopeOwnerPause as H, runtimeOwnedExecutorExecutionBinding as Hi, InMemoryResultBlobStore as Hn, generateSpanId as Hr, workerTraceEnv as Ht, createScope as I, teardownExecutor as Ia, knownExecutionBindingReceipt as Ii, decodeToolPart as In, buildLoopOtelSpans as Ir, DEFAULT_SANDBOX_STEERING_MAX_TURNS as It, createWaitProbes as J, unknownMaterializationReceipt as Ji, loadSpawnForest as Jn, createRuntimeStreamEventCollector as Jr, readWorkerProgress as Jt, createWorkerSlots as K, runtimeOwnedScopeOwnerRuntime as Ki, encodeResultBlob as Kn, toOtelAttributes as Kr, DEFAULT_STALL_AFTER_MS as Kt, deriveNodeExecutionIdentity as L, teardownSurfaces as La, knownMaterializationReceipt as Li, sandboxSessionTraceSource as Ln, buildLoopSpanNodes as Lr, createSteerableSandboxSession as Lt, withDriverExecutor as M, abortError$2 as Ma, attestRuntimeOwnedScopeOwner as Mi, resolveAgentEnvironmentProvider as Mn, traceContextToEnv as Mr, createExecutor as Mt, SUBTREE_RESULT_LIMIT as N, awaitAbortable$1 as Na, authoredProfileDigest as Ni, unavailablePauseMs as Nn, defaultRedactor as Nr, createExecutorRegistry as Nt, verdictFromJudgeScore as O, addResourceSpend as Oa, prepareJsonlAppend as Oi, LEAF_CONTINUATION_TASK as On, contentAddress as Or, bindReusableExecutorExecutionId as Ot, assertRecursiveReservationPolicy as P, DEFAULT_SUCCESSFUL_SHUTDOWN_MS as Pa, finalizeRuntimeOwnedPendingExecutor as Pi, unavailableSignalOfFailure as Pn, defaultRedactorIdentityMaterial as Pr, snapshotExecutorConfig as Pt, validateWaitSpec as Q, detachedSnapshot as Qi, WORKER_TOOL_TRACE_SCHEMA_VERSION as Qn, runSettledCommand as Qr, PEER_MAIL_WIRE_KEY as Qt, meterRuntimeOwnedAccounting as R, promptFromAgentTurnInput as Ra, newExecutionAttemptId as Ri, registerRetainedExecutorPreparation as Rn, buildRuntimeEventOtelSpans as Rr, createRouterTranscript as Rt, composeContinuationNote as S, stringifySafe as Sa, renderUnsupported as Si, SandboxEvidenceRetentionError as Sn, linkAbort as Sr, reconnectRetainedInteractiveRun as St, expandQuestions as T, unmeteredSpend as Ta, validateProfileMaterialization as Ti, readPromptOptions as Tn, harnessTranscriptArtifact as Tr, freeSlots as Tt, restoreScopeOwnerAcceptedExecution as U, runtimeOwnedExecutorMaterialization as Ui, InMemorySpawnJournal as Un, loopEventToOtelSpan as Ur, workerTraceHeaders as Ut, recordScopeOwnerMaterialization as V, runtimeOwnedDriveHarnessProviderEvidence as Vi, FileSpawnJournal as Vn, flatOtelSpan as Vr, readWorkerTraceContext as Vt, scopeOwnerExecutorNodeContext as W, runtimeOwnedExecutorProviderEvidence as Wi, SpawnEventIndex as Wn, padSpanId as Wr, workerTraceSeamKey as Wt, pollFor as X, executableAgentSpecSnapshot as Xi, pendingWaits as Xn, sanitizeKnowledgeReadinessReport as Xr, AUTHORITY_MARKERS as Xt, isWaitOutcome as Y, executableAgentProfileSnapshot as Yi, materializeTreeView as Yn, sanitizeAgentRuntimeEvent as Yr, createInbox as Yt, timerAt as Z, detachedFrozen as Zi, replaySpawnTree as Zn, sanitizeRuntimeStreamEvent as Zr, DEFAULT_PEER_MAIL_LIMITS as Zt, CheckUnavailableError as _, hasCompleteCacheBreakdown as _a, promptControlProfileMaterialization as _i, isTerminalDecision as _n, retainedCreateMaterial as _r, workerInteractiveAdmissionFile as _t, collectDelivered as a, extractLlmCallEvent as aa, harnessInvocation as ai, isTerminalNodeStatus as an, ReservationWaitRefused as ar, reconcileScopeRetainedOwnerEnvironment as at, bestComposite as b, randomSuffix as ba, promptResourceProfileMaterialization as bi, probeSandboxCapabilities as bn, RunCancellationReason as br, workerInteractiveBindingFile as bt, runTree as c, mapSandboxToolEvent as ca, parseCodexTokenUsage as ci, addHarnessUsage as cn, meterUsageEvent as cr, scopeRetainedOwnerResourceReader as ct, classifyDriverFailure as d, sandboxProgressEvents as da, AGENT_PROFILE_MATERIALIZATION_AXES as di, readCodexRolloutSession as dn, spendFromUsageTotals as dr, SPAWN_RESOURCE_PATH_MAX_BYTES as dt, readSandboxOutcome as ea, captureWorktreeDiff as ei, createPeerMailbox as en, isTraceAnalysisStore as er, bindScopeRetainedOwnerEnvironmentId as et, runDriverWithRetry as f, sumSandboxUsage as fa, assertProfileMaterialization as fi, bridgeRuntimeAttachmentsKey as fn, errMessage as fr, environmentReader as ft, CONTINUATION_FACTS as g, deleteBoxSafe as ga, profileMaterializationAxes$1 as gi, defaultSelectWinner as gn, startRetainedRunInEnvironment as gr, readWorkerInteractiveAdmissions as gt, CONTINUATIONS_DIR as h, cloneSpend as ha, fullProfileMaterialization as hi, createSandboxForSpec as hn, startRetainedRun as hr, interactiveAdmissionSeamKey as ht, bestDelivered as i, createSandboxUsageLedger as ia, LOCAL_HARNESSES as ii, isLiveNodeStatus as in, BudgetReconcileFault as ir, prepareScopeRetainedOwnerTask as it, isDriverSpec as j, decodeHarnessUsage as ja, attestRuntimeOwnedPendingExecutor as ji, providerAsSandboxClient as jn, readTraceContextFromEnv as jr, cliWorktreeExecutor as jt, driverChild as k, resourceTelemetry as ka, readCommittedJsonLines as ki, createAgentEnvironmentProviderRegistry as kn, createPropagatingTraceEmitter as kr, captureReusableExecutorConfig as kt, DriverAttemptsExhaustedError as l, notifySandboxEventObserver as la, CodexExecutionDiagnosticError as li, createCodexRolloutStoreReader as ln, newUsageTotals as lr, scopeRetainedOwnerRestorePoint as lt, upstreamUnavailableSignal as m, chargedTokens as ma, defineProfileMaterializationContract as mi, TERMINAL_DECISIONS as mn, recoverRetainedRun as mr, resolveSpawnResourcePaths as mt, createRootHandle as n, canonicalStreamEventFromSandboxEvent as na, removeWorktree as ni, peerMailTools as nn, workerTraceAnalysisStore as nr, consumeScopeRetainedOwnerResult as nt, pickBestDelivered as o, isSandboxTerminalEvent as oa, harnessSupportsReasoningEffort as oi, bridgeAdmissionRefusal as on, assertValidBudget as or, scopeRetainedOwnerContext as ot, summarizeDriverAttempts as p, addSpend as pa, controlProfileMaterialization as pi, bridgeStopSignalKey as pn, reconnectRetainedRun as pr, hostDirectoryReader as pt, openSlotGroup as q, unknownExecutionBindingReceipt as qi, insideCursorNamespace as qn, createRuntimeEventCollector as qr, createActivityLog as qt, createSupervisor as r, createSandboxToolPartState as ra, DEFAULT_LOCAL_HARNESS as ri, peerMailVerbNames as rn, executorFailure as rr, noteScopeRetainedOwnerCoordination as rt, runFinalizer as s, mapSandboxEvent as sa, localHarnessExecutable as si, bridgeModelRouteRefusal as sn, createBudgetPool as sr, scopeRetainedOwnerPriorSpend as st, DEFAULT_MAX_DEPTH as t, assertSandboxServedModel as ta, createWorktree as ti, isPeerMailEnvelope as tn, parseWorkerToolTraceArtifact as tr, bindScopeRetainedOwnerProvider as tt, HarnessTurnFailedError as u, sandboxEventServedBackend as ua, terminateProcessTreeAndConfirm as ui, harnessUsageIsEmpty as un, spendFromUsageEvents as ur, scopeRetainedOwnerResult as ut, admitContinuationPolicy as v, isAbortError$2 as va, promptModelProfileMaterialization as vi, runAgentRounds as vn, destroyInteractiveEnvironment as vr, attachWorker as vt, distillFindings as w, throwIfAborted as wa, unsupportedProfileDimensions as wi, assertBoxlessPromptOptions as wn, captureHarnessTranscript as wr, startRetainedInteractiveRun as wt, checkVerdictOf as x, sleep as xa, renderProfileMaterializationIssues as xi, acquireSandbox as xn, abortError as xr, workerInteractiveBindingsDir as xt, admitFinding as y, promptCacheTokenClasses as ya, promptOnlyProfileMaterialization as yi, createSandboxLineage as yn, environmentGone as yr, readWorkerInteractiveBinding as yt, meterRuntimeOwnedProviderAttempt as z, promptOptionsFromAgentTurnInput as za, providerAttemptEvidence as zi, retainedExecutorSeamKey as zn, createOpenInferenceFileExporter as zr, createInPlaceCliExecutor as zt };
 
-//# sourceMappingURL=supervisor-B-LtKizU.js.map
+//# sourceMappingURL=supervisor-BnL7JHEI.js.map