@tangle-network/agent-runtime 3.0.14 → 3.0.15

package/dist/{supervisor-PARoR3aR.js → supervisor-BQaLbLde.js}

@@ -15569,6 +15569,17 @@ const driverExecutorFactory = (rawSpec, ctx) => {
 		}
 		return active.close;
 	};
+	const rollUp = (events) => {
+		const childWork = sumSpend(events.filter(isSettled));
+		const totalMetered = sumMetered(events);
+		const reservation = addSpend(childWork, totalMetered);
+		meteredSpend = nonZeroOrUndef(unreportedSpend(totalMetered, previouslyMetered));
+		accounting = {
+			reported: childWork,
+			reservation
+		};
+		return childWork;
+	};
 	const executor = {
 		runtime: driverRuntime,
 		...spec.traceSource ? { traceSource: spec.traceSource } : {},
@@ -15631,13 +15642,7 @@ const driverExecutorFactory = (rawSpec, ctx) => {
 				await closeActive("driver completed");
 				releaseManagerEnvironment(nestedScope).catch(() => void 0);
 				const events = await loadTreeEvents(journal, nestedRoot);
-				const childWork = sumSpend(events.filter(isSettled));
-				const totalMetered = sumMetered(events);
-				meteredSpend = nonZeroOrUndef(unreportedSpend(totalMetered, previouslyMetered));
-				accounting = {
-					reported: childWork,
-					reservation: addSpend(childWork, totalMetered)
-				};
+				const childWork = rollUp(events);
 				const acceptedSubmission = spec.acceptedSubmission?.() === true;
 				const verdict = !acceptedSubmission && spec.unassessedOutput?.() === true ? void 0 : deriveDeliveryVerdict(events.filter((event) => event.kind === "settled"), out, acceptedSubmission);
 				const finished = spec.finishOutput ? await spec.finishOutput(out) : out;
@@ -15651,13 +15656,18 @@ const driverExecutorFactory = (rawSpec, ctx) => {
 			} catch (err) {
 				await finalizeScopeOwnerMaterialization(active?.scope ?? nestedScope).catch(() => void 0);
 				const cleanupError = await closeActive("driver stopped").then(() => void 0, (error) => error);
-				const partial = await safeRollup(journal, nestedRoot);
-				meteredSpend = partial?.metered ? nonZeroOrUndef(unreportedSpend(partial.metered, previouslyMetered)) : void 0;
-				accounting = partial?.accounting;
+				meteredSpend = void 0;
+				accounting = void 0;
 				const events = await journal.loadTree(nestedRoot).catch(() => void 0);
+				try {
+					if (events) rollUp(events);
+				} catch {}
 				const settledIds = new Set(events?.filter((event) => event.kind === "settled" || event.kind === "cancelled").map((event) => event.id));
 				const terminalAdmissionRefusal = isTerminalAdmissionRefusal(err);
-				if (driver.resultAccepted?.() === true || spec.acceptedSubmission?.() === true || events?.some((event) => event.kind === "execution-admitted" && (event.admission.phase === "dispatched" || event.id === seam.nodeId && (event.admission.phase !== "intent" || !terminalAdmissionRefusal)) || event.kind === "execution-result" || event.kind === "spawned" && event.parent !== void 0 && !settledIds.has(event.id))) throw new RetainedExecutionPendingError(err, "nested-recovery");
+				const turns = events?.filter((event) => event.id === seam.nodeId && (event.kind === "execution-admitted" || event.kind === "execution-result"));
+				const last = turns?.at(-1);
+				const inDoubt = last?.kind === "execution-result" && last.outcome?.success === false ? events?.filter((event) => !turns?.includes(event)) : events;
+				if (driver.resultAccepted?.() === true || spec.acceptedSubmission?.() === true || inDoubt?.some((event) => event.kind === "execution-admitted" && (event.admission.phase === "dispatched" || event.id === seam.nodeId && (event.admission.phase !== "intent" || !terminalAdmissionRefusal)) || event.kind === "execution-result" || event.kind === "spawned" && event.parent !== void 0 && !settledIds.has(event.id))) throw new RetainedExecutionPendingError(err, "nested-recovery");
 				if (cleanupError !== void 0) throw cleanupError;
 				throw err;
 			} finally {
@@ -15757,34 +15767,11 @@ function sumSpend(settled) {
 function sumMetered(events) {
 	return events.reduce((total, ev) => ev.kind === "metered" ? addSpend(total, ev.spend) : total, zeroSpend());
 }
-/** An all-zero spend that carries an UNKNOWN marker counts as non-zero: a sub-driver whose turns
-*  went unmeasured did real work, and dropping its `metered` event here would re-hide upstream the
-*  very turn the driver refused to skip. */
-function isNonZeroSpend(s) {
-	return s.iterations > 0 || s.tokens.input > 0 || s.tokens.output > 0 || s.usd > 0 || s.ms > 0 || s.tokensKnown === false || s.usdKnown === false || Object.keys(s.resources ?? {}).length > 0;
-}
 /** A spend, or `undefined` when it is all-zero — so `metered()` returns undefined for a driver
-*  whose sub-tree did no inference (and the parent journals no empty `metered` event). */
+*  whose sub-tree did no inference (and the parent journals no empty `metered` event). A spend
+*  with an UNKNOWN marker is non-zero: a sub-driver whose turns went unmeasured did real work. */
 function nonZeroOrUndef(s) {
-	return isNonZeroSpend(s) ? s : void 0;
-}
-/** Sum the nested tree's metered events, tolerating a missing tree (a crash before `beginTree`
-*  landed) — never throw here, or it would mask the original `act` error on the crash path. */
-async function safeRollup(journal, nestedRoot) {
-	try {
-		const events = await loadTreeEvents(journal, nestedRoot);
-		const childWork = sumSpend(events.filter(isSettled));
-		const metered = nonZeroOrUndef(sumMetered(events));
-		return {
-			metered,
-			accounting: {
-				reported: childWork,
-				reservation: addSpend(childWork, metered ?? zeroSpend())
-			}
-		};
-	} catch {
-		return;
-	}
+	return s.iterations > 0 || s.tokens.input > 0 || s.tokens.output > 0 || s.usd > 0 || s.ms > 0 || s.tokensKnown === false || s.usdKnown === false || Object.keys(s.resources ?? {}).length > 0 ? s : void 0;
 }
 /** Derive the driver child's delivery verdict from an accepted direct submission, or from its
 *  DIRECT children's settlements and the manager's actual finalized output: `valid` iff the
@@ -17438,4 +17425,4 @@ async function noWinner(settled, rejection) {
 }
 export { DEFAULT_PEER_MAIL_LIMITS as $, sandboxActProfileMaterialization as $t, createSandboxForSpec as A, ROUTER_PRICE_SOURCE as At, createRouterTranscript as B, runWorktreeHarness as Bt, createExecutor as C, checkVerdictOf as Ct, runAgentRounds as D, bridgeAdmissionRefusal as Dt, createSteerableSandboxSession as E, isFiniteNumber as Et, codeModeArguments as F, createPushTraceSource as Ft, LEAF_CONTINUATION_TASK as G, assertProfileMaterializes as Gt, createAgentEnvironmentProviderRegistry as H, harnessInvocation as Ht, codeModeModelOutput as I, bridgeRuntimeAttachmentsKey as It, createInPlaceCliExecutor as J, fullProfileMaterialization as Jt, providerAsSandboxClient as K, controlProfileMaterialization as Kt, createCodeModeTools as L, bridgeStopSignalKey as Lt, acquireSandbox as M, createCodexRolloutStoreReader as Mt, TERMINAL_DECISIONS as N, harnessUsageIsEmpty as Nt, assertBoxlessPromptOptions as O, bridgeModelRouteRefusal as Ot, defaultSelectWinner as P, readCodexRolloutSession as Pt, AUTHORITY_MARKERS as Q, renderUnsupported as Qt, runCodeMode as R, defaultRunCommand as Rt, captureReusableExecutorConfig as S, bestComposite as St, DEFAULT_SANDBOX_STEERING_MAX_TURNS as T, failedItems as Tt, resolveAgentEnvironmentProvider as U, terminateProcessTreeAndConfirm as Ut, routerBrain as V, LOCAL_HARNESSES as Vt, providerAsExecutor as W, assertProfileMaterialization as Wt, createInbox as X, promptControlProfileMaterialization as Xt, INBOX_RECEIPT_KEY as Y, profileMaterializationAxes$1 as Yt, failPendingAfter as Z, promptModelProfileMaterialization as Zt, withDriverExecutor as _, gateOnDeliverable as _t, assertRunParking as a, peerMailVerbNames as at, createExecutorRegistry as b, CONTINUATIONS_DIR as bt, sleepScopeWait as c, HarnessTurnFailedError as ct, runFinalizer as d, classifyDriverFailure as dt, sandboxProfileMaterialization as en, PEER_MAIL_WIRE_KEY as et, runTree as f, summarizeDriverAttempts as ft, isDriverSpec as g, gateFactoryOnDeliverable as gt, driverExecutorFactory as h, CheckUnavailableError as ht, RunParkedError as i, readSandboxOutcome as in, peerMailTools as it, createSandboxLineage as j, addHarnessUsage as jt, readPromptOptions as k, priceTokens as kt, withRunParking as l, abandonablePending as lt, driverChild as m, upstreamUnavailableSignal as mt, createSupervisor as n, worktreeCliProfileMaterialization as nn, createPeerMailbox as nt, bindScopeParkingDrain as o, taskToPrompt$1 as ot, createRootHandle as p, undispatchedCredentialExit as pt, createWorktreeCliExecutor as q, defineProfileMaterializationContract as qt, assertResumeLimits as r, projectSandboxOutcome as rn, isPeerMailEnvelope as rt, readRunParking as s, DriverAttemptsExhaustedError as st, DEFAULT_MAX_DEPTH as t, unsupportedProfileDimensions as tn, claimsAuthority as tt, bestDelivered as u, causedByPartialFailure as ut, InMemoryResultBlobStore as v, mapExecutorResult as vt, snapshotExecutorConfig as w, createContinuationKeeper as wt, bindReusableExecutorExecutionId as x, admitContinuationPolicy as xt, InMemorySpawnJournal as y, verdictFromJudgeScore as yt, toolResultText as z, runSettledCommand as zt };
 
-//# sourceMappingURL=supervisor-PARoR3aR.js.map
+//# sourceMappingURL=supervisor-BQaLbLde.js.map