@tangle-network/agent-runtime 0.131.6 → 0.131.7

package/dist/{supervisor-C16p9KqO.js → supervisor-CMtutocL.js}

@@ -1,11 +1,11 @@
 import { c as RuntimeRunStateError, r as BackendTransportError, u as ValidationError } from "./errors-DEAvWQPy.js";
 import { t as detachedSnapshot } from "./snapshot-CXiiuHhL.js";
-import { _ as captureWorkerTraceEvidence, c as replaySpawnTree, f as attestNestedDriverTreeOwner, h as runtimeOwnedNestedDriverTreeRoot, m as nestedDriverTreeRoot, o as materializeTreeView, p as driverRuntime, s as pendingWaits, x as contentAddress } from "./spawn-journal-saHQzqYi.js";
-import { a as randomSuffix, c as stringifySafe, d as withTimeout, f as zeroTokenUsage, i as mapWithConcurrency, l as throwAbort, n as deleteBoxSafe, o as randomUuid, s as sleep, t as addTokenUsage, u as throwIfAborted } from "./util-Bw6srryQ.js";
+import { _ as captureWorkerTraceEvidence, c as replaySpawnTree, f as attestNestedDriverTreeOwner, h as runtimeOwnedNestedDriverTreeRoot, m as nestedDriverTreeRoot, o as materializeTreeView, p as driverRuntime, s as pendingWaits, x as contentAddress } from "./spawn-journal-Cd5L-Ie9.js";
+import { c as randomUuid, d as throwAbort, f as throwIfAborted, l as sleep, m as zeroTokenUsage, n as cloneTokenUsage, o as mapWithConcurrency, p as withTimeout, r as deleteBoxSafe, s as randomSuffix, t as addTokenUsage, u as stringifySafe } from "./util-Dr--8wAL.js";
 import { a as notifySandboxEventObserver, n as extractLlmCallEvent } from "./sandbox-events-CRDwc5WN.js";
 import { a as concreteProfileModel, l as resolveRouterRetryPolicy, o as profileBridgeWireModel, s as profileModelExecutionSettings, t as assertExecutableAgentProfile, u as agentHarness } from "./model-policy-mWSoToiQ.js";
 import { _ as unknownMaterializationReceipt, a as authoredProfileDigest, c as knownExecutionBindingReceipt, d as runtimeOwnedDeferredExecutorRuntime, f as runtimeOwnedExecutorExecutionBinding, g as unknownExecutionBindingReceipt, h as runtimeOwnedScopeOwnerRuntime, l as knownMaterializationReceipt, m as runtimeOwnedPendingExecutorMaterialization, n as attestRuntimeOwnedExecutor, o as finalizeRuntimeOwnedPendingExecutor, p as runtimeOwnedExecutorMaterialization, r as attestRuntimeOwnedPendingExecutor, t as attestRuntimeOwnedDeferredExecutor, u as newExecutionAttemptId, v as executableAgentProfileSnapshot, y as executableAgentSpecSnapshot } from "./materialization-DBXuH34A.js";
-import { i as resolveAgentEnvironmentProvider, n as providerAsExecutor, r as providerAsSandboxClient } from "./environment-provider-Dyg8DtLK.js";
+import { i as resolveAgentEnvironmentProvider, n as providerAsExecutor, r as providerAsSandboxClient } from "./environment-provider-mDsjfGjY.js";
 import { i as notifyRuntimeHookEvent } from "./runtime-hooks-C7iJOWm3.js";
 import { estimateCost, isModelPriced } from "@tangle-network/agent-eval";
 import { AGENT_PROFILE_MATERIALIZATION_AXES, REASONING_EFFORTS, agentProfileSchema, canonicalAgentProfileDigest, canonicalCandidateDigest, profileMaterializationAxes, profileMaterializationAxes as profileMaterializationAxes$1, sha256DigestSchema } from "@tangle-network/agent-interface";
@@ -6030,10 +6030,11 @@ const routerInlineExecutor = (spec, ctx) => {
 			}));
 			const spent = {
 				iterations: 1,
-				tokens: r.usage ? {
+				tokens: r.usage ? cloneTokenUsage({
 					input: r.usage.input,
-					output: r.usage.output
-				} : zeroTokenUsage(),
+					output: r.usage.output,
+					...routerPromptCacheUsage(r.usage.input, r.cache)
+				}) : zeroTokenUsage(),
 				usd: r.billedCostUsd ?? 0,
 				...r.usage ? {} : { tokensKnown: false },
 				...r.billedCostUsd === void 0 ? { usdKnown: false } : {},
@@ -6126,6 +6127,22 @@ function mergePromptCache(target, cache) {
 	}
 	if (cache.status !== void 0) target.status = cache.status;
 }
+/** Preserve a complete Router cache split; an incomplete provider receipt stays unknown. */
+function routerPromptCacheUsage(input, cache) {
+	if (cache === void 0) return {};
+	const read = cache.readTokens;
+	const write = cache.writeTokens;
+	if (read === void 0 && write === void 0) return {};
+	if (input === void 0 || !isCacheTokenCount(read) || !isCacheTokenCount(write) || read + write > input) return { cacheBreakdownKnown: false };
+	return {
+		freshInput: input - read - write,
+		cacheRead: read,
+		cacheWrite: write
+	};
+}
+function isCacheTokenCount(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0;
+}
 async function runRouterTransport(context, call) {
 	try {
 		return await call();
@@ -6239,11 +6256,15 @@ const routerToolsInlineExecutor = (spec, ctx) => {
 					if (res.model !== void 0) observedModel = res.model;
 					mergePromptCache(promptCache, res.cache);
 					if (res.usage) {
-						tokens.input += res.usage.input;
-						tokens.output += res.usage.output;
+						addTokenUsage(tokens, {
+							input: res.usage.input,
+							output: res.usage.output,
+							...routerPromptCacheUsage(res.usage.input, res.cache)
+						});
 						if (res.usage.reasoning !== void 0) reasoningTokens += res.usage.reasoning;
 						else reasoningKnown = false;
 					} else {
+						addTokenUsage(tokens, routerPromptCacheUsage(void 0, res.cache));
 						tokensKnown = false;
 						reasoningKnown = false;
 					}
@@ -6610,10 +6631,7 @@ async function* streamSandboxLeaf(args) {
 		};
 		const spent = {
 			iterations: result.iterations.length,
-			tokens: {
-				input: result.tokenUsage.input,
-				output: result.tokenUsage.output
-			},
+			tokens: cloneTokenUsage(result.tokenUsage),
 			...tokensKnown ? {} : { tokensKnown: false },
 			usd: result.costUsd,
 			...usdKnown ? {} : { usdKnown: false },
@@ -6633,7 +6651,11 @@ async function* streamSandboxLeaf(args) {
 			kind: "tokens",
 			input: result.tokenUsage.input,
 			output: result.tokenUsage.output,
-			...tokensKnown ? {} : { tokensKnown: false }
+			...tokensKnown ? {} : { tokensKnown: false },
+			...result.tokenUsage.freshInput !== void 0 ? { freshInput: result.tokenUsage.freshInput } : {},
+			...result.tokenUsage.cacheRead !== void 0 ? { cacheRead: result.tokenUsage.cacheRead } : {},
+			...result.tokenUsage.cacheWrite !== void 0 ? { cacheWrite: result.tokenUsage.cacheWrite } : {},
+			...result.tokenUsage.cacheBreakdownKnown === false ? { cacheBreakdownKnown: false } : {}
 		};
 		if (result.iterations.length > 0 || result.costUsd) yield {
 			kind: "cost",
@@ -7194,14 +7216,17 @@ async function* streamBridgeSession(args) {
 				if (chunk.usage) {
 					sawTurnTokenUsage = true;
 					if (!chunk.usage.known) turnTokensKnown = false;
-					tokens.input += chunk.usage.input;
-					tokens.output += chunk.usage.output;
-					yield {
+					const usageEvent = {
 						kind: "tokens",
 						input: chunk.usage.input,
 						output: chunk.usage.output,
-						...chunk.usage.known ? {} : { tokensKnown: false }
+						...chunk.usage.known ? {} : { tokensKnown: false },
+						...chunk.usage.promptCache?.freshInput !== void 0 ? { freshInput: chunk.usage.promptCache.freshInput } : {},
+						...chunk.usage.promptCache?.readInput !== void 0 ? { cacheRead: chunk.usage.promptCache.readInput } : {},
+						...chunk.usage.promptCache?.writeInput !== void 0 ? { cacheWrite: chunk.usage.promptCache.writeInput } : {}
 					};
+					addTokenUsage(tokens, usageEvent);
+					yield usageEvent;
 					if (chunk.usage.promptCache) {
 						if (chunk.usage.promptCache.freshInput !== void 0) promptCache.freshInput = (promptCache.freshInput ?? 0) + chunk.usage.promptCache.freshInput;
 						if (chunk.usage.promptCache.readInput !== void 0) promptCache.readInput = (promptCache.readInput ?? 0) + chunk.usage.promptCache.readInput;
@@ -7909,9 +7934,9 @@ function parseSseFrame(frame) {
 	if (u) {
 		const input = optionalBridgeTokenCount(u.prompt_tokens, "prompt_tokens");
 		const output = optionalBridgeTokenCount(u.completion_tokens, "completion_tokens");
-		const freshInput = optionalBridgeTokenCount(u.fresh_input_tokens, "fresh_input_tokens");
-		const readInput = optionalBridgeTokenCount(u.cache_read_input_tokens, "cache_read_input_tokens");
-		const writeInput = optionalBridgeTokenCount(u.cache_write_input_tokens, "cache_write_input_tokens");
+		const readInput = optionalBridgeTokenCount(u.cache_read_input_tokens ?? u.prompt_cache?.read_tokens ?? u.prompt_cache_hit_tokens ?? u.prompt_tokens_details?.cached_tokens, "cache read input tokens");
+		const writeInput = optionalBridgeTokenCount(u.cache_write_input_tokens ?? u.prompt_cache?.write_tokens, "cache write input tokens");
+		const freshInput = optionalBridgeTokenCount(u.fresh_input_tokens, "fresh_input_tokens") ?? (input !== void 0 && readInput !== void 0 && writeInput !== void 0 && input >= readInput + writeInput ? input - readInput - writeInput : void 0);
 		if (input !== void 0 || output !== void 0 || freshInput !== void 0 || readInput !== void 0 || writeInput !== void 0) out.usage = {
 			input: input ?? 0,
 			output: output ?? 0,
@@ -8696,7 +8721,19 @@ function assertValidBudget(budget, label = "budget") {
 }
 function assertValidSpend(spend, label) {
 	if (!Number.isSafeInteger(spend.iterations) || spend.iterations < 0) throw new Error(`${label}.iterations must be a non-negative safe integer`);
-	for (const [field, value] of Object.entries(spend.tokens)) if (!Number.isSafeInteger(value) || value < 0) throw new Error(`${label}.tokens.${field} must be a non-negative safe integer`);
+	for (const [field, value] of [
+		["input", spend.tokens.input],
+		["output", spend.tokens.output],
+		["freshInput", spend.tokens.freshInput],
+		["cacheRead", spend.tokens.cacheRead],
+		["cacheWrite", spend.tokens.cacheWrite]
+	]) {
+		if (value === void 0) continue;
+		if (!Number.isSafeInteger(value) || value < 0) throw new Error(`${label}.tokens.${field} must be a non-negative safe integer`);
+	}
+	for (const [field, value] of [["tokensKnown", spend.tokens.tokensKnown], ["cacheBreakdownKnown", spend.tokens.cacheBreakdownKnown]]) if (value !== void 0 && value !== false) throw new Error(`${label}.tokens.${field} must be false when present`);
+	const { freshInput, cacheRead, cacheWrite } = spend.tokens;
+	if (freshInput !== void 0 && cacheRead !== void 0 && cacheWrite !== void 0 && freshInput + cacheRead + cacheWrite !== spend.tokens.input) throw new Error(`${label}.tokens cache classes must sum to input`);
 	for (const [field, value] of [["usd", spend.usd], ["ms", spend.ms]]) if (!Number.isFinite(value) || value < 0) throw new Error(`${label}.${field} must be a non-negative finite number`);
 }
 /** Fold a normalized `UsageEvent` array into a `Spend`. Tokens and usd are separate
@@ -8709,10 +8746,7 @@ function spendFromUsageEvents(events) {
 	let usdKnown = true;
 	let iterations = 0;
 	for (const ev of events) if (ev.kind === "tokens") {
-		addTokenUsage(tokens, {
-			input: ev.input,
-			output: ev.output
-		});
+		addTokenUsage(tokens, ev);
 		if (ev.tokensKnown === false) tokensKnown = false;
 	} else if (ev.kind === "cost") {
 		usd += ev.usd;
@@ -8735,10 +8769,7 @@ async function foldUsage(events) {
 	let usdKnown = true;
 	let iterations = 0;
 	for await (const ev of events) if (ev.kind === "tokens") {
-		addTokenUsage(tokens, {
-			input: ev.input,
-			output: ev.output
-		});
+		addTokenUsage(tokens, ev);
 		if (ev.tokensKnown === false) tokensKnown = false;
 	} else if (ev.kind === "cost") {
 		usd += ev.usd;
@@ -10595,10 +10626,7 @@ function settledToIteration(settled) {
 		startedAt: 0,
 		endedAt: settled.spent.ms,
 		costUsd: settled.spent.usd,
-		tokenUsage: {
-			input: settled.spent.tokens.input,
-			output: settled.spent.tokens.output
-		}
+		tokenUsage: cloneTokenUsage(settled.spent.tokens)
 	};
 }
 function normalizeLiveWorkerLimit(value) {
@@ -10704,10 +10732,7 @@ function freezeCorrelation(value) {
 * now reconciles its real partial spend instead of refunding work the provider already billed.
 */
 async function foldStream(stream, onProgress, signal) {
-	const tokens = {
-		input: 0,
-		output: 0
-	};
+	const tokens = zeroTokenUsage();
 	let tokensKnown = true;
 	let usd = 0;
 	let usdKnown = true;
@@ -10719,8 +10744,7 @@ async function foldStream(stream, onProgress, signal) {
 			if (next.done) break;
 			const ev = next.value;
 			if (ev.kind === "tokens") {
-				tokens.input += ev.input;
-				tokens.output += ev.output;
+				addTokenUsage(tokens, ev);
 				if (ev.tokensKnown === false) tokensKnown = false;
 			} else if (ev.kind === "cost") {
 				usd += ev.usd;
@@ -10728,7 +10752,7 @@ async function foldStream(stream, onProgress, signal) {
 			} else iterations += 1;
 			onProgress?.({
 				iterations,
-				tokens: { ...tokens },
+				tokens: cloneTokenUsage(tokens),
 				...tokensKnown ? {} : { tokensKnown: false },
 				usd,
 				...usdKnown ? {} : { usdKnown: false },
@@ -10751,8 +10775,16 @@ async function foldStream(stream, onProgress, signal) {
 /** Usage events carry measured increments; the terminal artifact carries whether a provider omitted
 * a whole accounting channel. Preserve those unknowns on the common streaming path. */
 function preserveUnknownTelemetry(streamed, terminal) {
+	const terminalTokens = cloneTokenUsage(terminal.tokens);
 	return {
 		...streamed,
+		tokens: {
+			...streamed.tokens,
+			...streamed.tokens.freshInput === void 0 && terminalTokens.freshInput !== void 0 ? { freshInput: terminalTokens.freshInput } : {},
+			...streamed.tokens.cacheRead === void 0 && terminalTokens.cacheRead !== void 0 ? { cacheRead: terminalTokens.cacheRead } : {},
+			...streamed.tokens.cacheWrite === void 0 && terminalTokens.cacheWrite !== void 0 ? { cacheWrite: terminalTokens.cacheWrite } : {},
+			...streamed.tokens.cacheBreakdownKnown === false || terminalTokens.cacheBreakdownKnown === false ? { cacheBreakdownKnown: false } : {}
+		},
 		...terminal.tokensKnown === false ? { tokensKnown: false } : {},
 		...terminal.usdKnown === false ? { usdKnown: false } : {},
 		ms: terminal.ms
@@ -10807,10 +10839,7 @@ function downRecord(reason, infra, trace, metered) {
 function zeroSpend$1() {
 	return {
 		iterations: 0,
-		tokens: {
-			input: 0,
-			output: 0
-		},
+		tokens: zeroTokenUsage(),
 		usd: 0,
 		ms: 0
 	};
@@ -11059,20 +11088,15 @@ function isSettled(ev) {
 function sumSpend(settled) {
 	const total = {
 		iterations: 0,
-		tokens: {
-			input: 0,
-			output: 0
-		},
+		tokens: zeroTokenUsage(),
 		usd: 0,
 		ms: 0
 	};
 	for (const ev of settled) {
 		total.iterations += ev.spent.iterations;
-		total.tokens.input += ev.spent.tokens.input;
-		total.tokens.output += ev.spent.tokens.output;
+		addTokenUsage(total.tokens, ev.spent.tokens);
 		if (ev.spent.tokensKnown === false) total.tokensKnown = false;
 		total.usd += ev.spent.usd;
-		if (ev.spent.tokensKnown === false) total.tokensKnown = false;
 		if (ev.spent.usdKnown === false) total.usdKnown = false;
 		total.ms += ev.spent.ms;
 	}
@@ -11084,21 +11108,16 @@ function sumSpend(settled) {
 function sumMetered(events) {
 	const total = {
 		iterations: 0,
-		tokens: {
-			input: 0,
-			output: 0
-		},
+		tokens: zeroTokenUsage(),
 		usd: 0,
 		ms: 0
 	};
 	for (const ev of events) {
 		if (ev.kind !== "metered") continue;
 		total.iterations += ev.spend.iterations;
-		total.tokens.input += ev.spend.tokens.input;
-		total.tokens.output += ev.spend.tokens.output;
+		addTokenUsage(total.tokens, ev.spend.tokens);
 		if (ev.spend.tokensKnown === false) total.tokensKnown = false;
 		total.usd += ev.spend.usd;
-		if (ev.spend.tokensKnown === false) total.tokensKnown = false;
 		if (ev.spend.usdKnown === false) total.usdKnown = false;
 		total.ms += ev.spend.ms;
 	}
@@ -11107,10 +11126,7 @@ function sumMetered(events) {
 function zeroSpend() {
 	return {
 		iterations: 0,
-		tokens: {
-			input: 0,
-			output: 0
-		},
+		tokens: zeroTokenUsage(),
 		usd: 0,
 		ms: 0
 	};
@@ -11118,10 +11134,11 @@ function zeroSpend() {
 function addSpend$1(a, b) {
 	return {
 		iterations: a.iterations + b.iterations,
-		tokens: {
-			input: a.tokens.input + b.tokens.input,
-			output: a.tokens.output + b.tokens.output
-		},
+		tokens: (() => {
+			const tokens = cloneTokenUsage(a.tokens);
+			addTokenUsage(tokens, b.tokens);
+			return tokens;
+		})(),
 		...a.tokensKnown === false || b.tokensKnown === false ? { tokensKnown: false } : {},
 		usd: a.usd + b.usd,
 		...a.usdKnown === false || b.usdKnown === false ? { usdKnown: false } : {},
@@ -11969,19 +11986,13 @@ function sumSpendFromEvents(events) {
 function sumMeasuredSpendFromEvents(events) {
 	const childWork = {
 		iterations: 0,
-		tokens: {
-			input: 0,
-			output: 0
-		},
+		tokens: zeroTokenUsage(),
 		usd: 0,
 		ms: 0
 	};
 	const driverInference = {
 		iterations: 0,
-		tokens: {
-			input: 0,
-			output: 0
-		},
+		tokens: zeroTokenUsage(),
 		usd: 0,
 		ms: 0
 	};
@@ -11995,8 +12006,7 @@ function sumMeasuredSpendFromEvents(events) {
 /** Add `b` into `a` in place, per channel. */
 function accumulate(a, b) {
 	a.iterations += b.iterations;
-	a.tokens.input += b.tokens.input;
-	a.tokens.output += b.tokens.output;
+	addTokenUsage(a.tokens, b.tokens);
 	if (b.tokensKnown === false) a.tokensKnown = false;
 	a.usd += b.usd;
 	if (b.usdKnown === false) a.usdKnown = false;
@@ -12007,10 +12017,11 @@ function accumulate(a, b) {
 function addSpend(a, b) {
 	return {
 		iterations: a.iterations + b.iterations,
-		tokens: {
-			input: a.tokens.input + b.tokens.input,
-			output: a.tokens.output + b.tokens.output
-		},
+		tokens: (() => {
+			const tokens = cloneTokenUsage(a.tokens);
+			addTokenUsage(tokens, b.tokens);
+			return tokens;
+		})(),
 		...a.tokensKnown === false || b.tokensKnown === false ? { tokensKnown: false } : {},
 		usd: a.usd + b.usd,
 		...a.usdKnown === false || b.usdKnown === false ? { usdKnown: false } : {},
@@ -12026,4 +12037,4 @@ function isNonEmptySpend(s) {
 //#endregion
 export { createSandboxLineage as $, bindReusableExecutorExecutionId as A, removeWorktree as At, workerTraceSeamKey as B, defineProfileMaterializationContract as Bt, queueOf as C, sanitizeAgentRuntimeEvent as Ct, assertValidBudget as D, runWorktreeHarness as Dt, teardownExecutor as E, runSettledCommand as Et, snapshotExecutorConfig as F, parseCodexTokenUsage as Ft, sandboxSessionTraceSource as G, promptOnlyProfileMaterialization as Gt, createSteerableSandboxSession as H, profileMaterializationAxes$1 as Ht, createWorktreeCliExecutor as I, CodexExecutionDiagnosticError as It, readWorkerProgress as J, sandboxActProfileMaterialization as Jt, DEFAULT_STALL_AFTER_MS as K, promptResourceProfileMaterialization as Kt, WORKER_TRACE_PROPAGATION as L, AGENT_PROFILE_MATERIALIZATION_AXES as Lt, cliWorktreeExecutor as M, LOCAL_HARNESSES as Mt, createExecutor as N, harnessSupportsReasoningEffort as Nt, createBudgetPool as O, captureWorktreeDiff as Ot, createExecutorRegistry as P, localHarnessExecutable as Pt, runAgentRounds as Q, readWorkerTraceContext as R, assertProfileMaterialization as Rt, freeSlots as S, createRuntimeStreamEventCollector as St, DEFAULT_SUCCESSFUL_SHUTDOWN_MS as T, sanitizeRuntimeStreamEvent as Tt, createPushTraceSource as U, promptControlProfileMaterialization as Ut, DEFAULT_SANDBOX_STEERING_MAX_TURNS as V, fullProfileMaterialization as Vt, decodeToolPart as W, promptModelProfileMaterialization as Wt, createSandboxForSpec as X, worktreeCliProfileMaterialization as Xt, createInbox as Y, validateProfileMaterialization as Yt, defaultSelectWinner as Z, pollFor as _, loopEventToOtelSpan as _t, pickBestDelivered as a, mergeTraceEnv as at, waitUntil as b, toOtelAttributes as bt, driverChild as c, INTELLIGENCE_WIRE_VERSION as ct, deriveNodeExecutionIdentity as d, buildRuntimeEventOtelSpans as dt, probeSandboxCapabilities as et, recordScopeOwnerMaterialization as f, createOpenInferenceFileExporter as ft, isWaitOutcome as g, generateSpanId as gt, createWaitProbes as h, flatOtelSpan as ht, collectDelivered as i, createPropagatingTraceEmitter as it, captureReusableExecutorConfig as j, DEFAULT_LOCAL_HARNESS as jt, spendFromUsageEvents as k, createWorktree as kt, withDriverExecutor as l, buildLoopOtelSpans as lt, settledToIteration as m, exportEvalRuns as mt, createSupervisor as n, routerBrain as nt, runFinalizer as o, readTraceContextFromEnv as ot, scopeOwnerExecutorNodeContext as p, createOtelExporter as pt, createActivityLog as q, renderProfileMaterializationIssues as qt, bestDelivered as r, runBrainLoop as rt, runTree as s, traceContextToEnv as st, createRootHandle as t, acquireSandbox as tt, createScope as u, buildLoopSpanNodes as ut, timerAt as v, padSpanId as vt, rollingDispatch as w, sanitizeKnowledgeReadinessReport as wt, effectiveConcurrency as x, createRuntimeEventCollector as xt, validateWaitSpec as y, padTraceId as yt, workerTraceEnv as z, controlProfileMaterialization as zt };
 
-//# sourceMappingURL=supervisor-C16p9KqO.js.map
+//# sourceMappingURL=supervisor-CMtutocL.js.map