@tangle-network/agent-runtime 0.203.0 → 0.203.2

package/dist/{redact-B5g0jY2n.js → redact-hBRYKHwa.js}

@@ -5108,7 +5108,8 @@ const ROLLOUT_SUFFIX = ".jsonl";
 const INTERESTING = [
 	"\"session_meta\"",
 	"\"token_count\"",
-	"\"task_started\""
+	"\"task_started\"",
+	"\"token_usage_record\""
 ];
 /**
 * Read one rollout's rows into a session record.
@@ -5134,22 +5135,22 @@ function createCodexRolloutStoreReader(ref) {
 	const files = /* @__PURE__ */ new Map();
 	return { async read() {
 		const sessions = [];
+		const staged = /* @__PURE__ */ new Map();
 		for (const path of await listRollouts(root)) {
-			const cursor = files.get(path) ?? newCursor();
-			files.set(path, cursor);
+			let cursor = cloneCursor(files.get(path) ?? newCursor());
 			const size = await fileSize(path);
 			if (size === void 0) continue;
-			if (size < cursor.offset) {
-				const fresh = newCursor();
-				files.set(path, fresh);
-				cursor.offset = fresh.offset;
-				cursor.state = fresh.state;
-				cursor.pending = fresh.pending;
-			}
+			if (size < cursor.offset) cursor = newCursor();
 			if (size === cursor.offset) continue;
-			await consumeAppendedBytes(path, cursor, size);
+			try {
+				await consumeAppendedBytes(path, cursor, size);
+			} catch (error) {
+				if (cursor.state.identity && !includesWorkspace(cursor.state.identity, workspaceRoot)) continue;
+				throw error;
+			}
+			staged.set(path, cursor);
 			const read = finishSession(cursor.state);
-			if (read === void 0 || !includesWorkspace(read.session, workspaceRoot)) continue;
+			if (read === void 0 || !includesWorkspace(read.session.identity, workspaceRoot)) continue;
 			const from = read.ownFrom === void 0 ? void 0 : laterCounters(read.ownFrom, cursor.credited);
 			const incremental = from === void 0 ? void 0 : counterDelta(from, cursor.state.cumulative);
 			cursor.credited = cursor.state.cumulative;
@@ -5158,6 +5159,7 @@ function createCodexRolloutStoreReader(ref) {
 				...incremental === void 0 ? {} : { incremental }
 			});
 		}
+		for (const [path, cursor] of staged) files.set(path, cursor);
 		return reduceDelta(sessions);
 	} };
 }
@@ -5178,6 +5180,7 @@ function harnessUsageIsEmpty(usage) {
 }
 function createSessionState() {
 	return {
+		canonical: /* @__PURE__ */ new Map(),
 		cumulative: zeroCounters,
 		marks: [],
 		markEnds: [],
@@ -5192,6 +5195,11 @@ function consumeRow(state, row) {
 		readIdentity(state, record);
 		return;
 	}
+	if (record.type === "token_usage_record") {
+		consumeCanonical(state, record);
+		return;
+	}
+	if (state.canonical.size > 0) return;
 	if (record.type !== "event_msg") return;
 	const payload = plainRecord(record.payload);
 	if (payload === void 0) return;
@@ -5215,19 +5223,59 @@ function consumeRow(state, row) {
 	if (state.marks.length === 0) state.beforeFirstMark = total;
 	else state.markEnds[state.marks.length - 1] = total;
 }
+function canonicalCounters(value) {
+	const record = plainRecord(value);
+	const counters = readCumulative(value);
+	if (!record || !counters || record.total_tokens !== counters.input + counters.output || counters.cachedInput + counters.cacheWriteInput > counters.input || counters.reasoningOutput > counters.output || [
+		"cached_input_tokens",
+		"cache_write_input_tokens",
+		"reasoning_output_tokens"
+	].some((key) => record[key] !== void 0 && naturalNumber(record[key]) === void 0)) throw new ValidationError$1("codex rollout: malformed canonical usage");
+	return counters;
+}
+function consumeCanonical(state, record) {
+	const payload = plainRecord(record.payload);
+	if (!payload || !state.identity || typeof payload.thread_id !== "string") throw new ValidationError$1("codex rollout: canonical usage has no thread identity");
+	if (payload.thread_id !== state.identity.sessionId) return;
+	if (typeof payload.response_id !== "string" || !payload.response_id || typeof payload.turn_id !== "string" || !payload.turn_id) throw new ValidationError$1("codex rollout: canonical usage has no response or turn identity");
+	const usage = canonicalCounters(payload.usage);
+	const total = canonicalCounters(payload.thread_token_usage);
+	const previous = state.canonical.get(payload.response_id);
+	if (previous) {
+		if (previous.turnId !== payload.turn_id || !sameCounters(previous.usage, usage) || !sameCounters(previous.total, total)) throw new ValidationError$1("codex rollout: conflicting canonical response usage");
+		return;
+	}
+	const before = state.canonical.size === 0 ? zeroCounters : state.cumulative;
+	if (!sameCounters({
+		input: before.input + usage.input,
+		output: before.output + usage.output,
+		cachedInput: before.cachedInput + usage.cachedInput,
+		cacheWriteInput: before.cacheWriteInput + usage.cacheWriteInput,
+		reasoningOutput: before.reasoningOutput + usage.reasoningOutput
+	}, total)) throw new ValidationError$1("codex rollout: incomplete or conflicting canonical cumulative usage");
+	state.canonical.set(payload.response_id, {
+		turnId: payload.turn_id,
+		usage,
+		total
+	});
+	state.cumulative = total;
+}
 function readIdentity(state, record) {
+	if (state.identity !== void 0) return;
 	const payload = plainRecord(record.payload);
 	if (payload === void 0) return;
 	const sessionId = typeof payload.id === "string" ? payload.id : void 0;
 	if (sessionId === void 0) return;
 	const spawn = plainRecord(plainRecord(plainRecord(payload.source)?.subagent)?.thread_spawn);
+	const parentThreadId = payload.parent_thread_id ?? spawn?.parent_thread_id;
+	const agentPath = payload.agent_path ?? spawn?.agent_path;
 	const startedAtMs = Date.parse(typeof payload.timestamp === "string" ? payload.timestamp : String(record.timestamp ?? ""));
 	state.identity = {
 		sessionId,
-		...typeof payload.parent_thread_id === "string" ? { parentThreadId: payload.parent_thread_id } : {},
+		...typeof parentThreadId === "string" ? { parentThreadId } : {},
 		...typeof payload.forked_from_id === "string" ? { forkedFromId: payload.forked_from_id } : {},
-		nativeChild: payload.thread_source === "subagent",
-		...typeof payload.agent_path === "string" ? { agentPath: payload.agent_path } : {},
+		nativeChild: payload.thread_source === "subagent" || spawn !== void 0,
+		...typeof agentPath === "string" ? { agentPath } : {},
 		...typeof payload.agent_nickname === "string" ? { agentNickname: payload.agent_nickname } : {},
 		...typeof spawn?.depth === "number" ? { depth: spawn.depth } : {},
 		...typeof payload.cwd === "string" ? { cwd: payload.cwd } : {},
@@ -5239,6 +5287,24 @@ function readIdentity(state, record) {
 function finishSession(state) {
 	const identity = state.identity;
 	if (identity === void 0) return void 0;
+	if (state.canonical.size > 0) {
+		const byTurn = /* @__PURE__ */ new Map();
+		for (const { turnId, usage } of state.canonical.values()) byTurn.set(turnId, addHarnessUsage(byTurn.get(turnId) ?? emptyUsage(), counterDelta(zeroCounters, usage) ?? emptyUsage()));
+		return {
+			ownFrom: zeroCounters,
+			session: {
+				identity,
+				boundary: { kind: "whole-file" },
+				fileCumulativeInput: state.cumulative.input,
+				fileCumulativeOutput: state.cumulative.output,
+				own: counterDelta(zeroCounters, state.cumulative) ?? emptyUsage(),
+				turns: [...byTurn].map(([turnId, usage]) => ({
+					turnId,
+					usage
+				}))
+			}
+		};
+	}
 	const boundary = resolveBoundary(state, identity);
 	const base = {
 		identity,
@@ -5346,6 +5412,17 @@ function newCursor() {
 		credited: zeroCounters
 	};
 }
+function cloneCursor(cursor) {
+	return {
+		...cursor,
+		state: {
+			...cursor.state,
+			canonical: new Map(cursor.state.canonical),
+			marks: [...cursor.state.marks],
+			markEnds: [...cursor.state.markEnds]
+		}
+	};
+}
 async function listRollouts(root) {
 	const found = [];
 	const walk = async (dir) => {
@@ -5395,13 +5472,18 @@ async function consumeAppendedBytes(path, cursor, size) {
 }
 function consumeLine(state, line) {
 	if (!INTERESTING.some((marker) => line.includes(marker))) return;
+	let row;
 	try {
-		consumeRow(state, JSON.parse(line));
-	} catch {}
+		row = JSON.parse(line);
+	} catch {
+		if (line.includes("\"token_usage_record\"")) throw new ValidationError$1("codex rollout: malformed canonical JSON receipt");
+		return;
+	}
+	consumeRow(state, row);
 }
-function includesWorkspace(session, workspaceRoot) {
+function includesWorkspace(identity, workspaceRoot) {
 	if (workspaceRoot === void 0) return true;
-	const cwd = session.identity.cwd;
+	const cwd = identity.cwd;
 	if (cwd === void 0) return false;
 	const rel = relative(workspaceRoot, resolve(cwd));
 	return rel === "" || !rel.startsWith(`..${sep}`) && rel !== ".." && !isAbsolute(rel);
@@ -14183,7 +14265,6 @@ const routerToolsInlineExecutor = (spec, ctx) => {
 					role: "user",
 					content: inbox.fold(pending)
 				});
-				return pending.length > 0;
 			};
 			const external = linkAbort(signal, controller.signal).signal;
 			try {
@@ -14252,7 +14333,7 @@ const routerToolsInlineExecutor = (spec, ctx) => {
 					if (res.content) lastText = res.content;
 					const toolCalls = res.toolCalls;
 					if (toolCalls.length === 0) {
-						if (flush()) continue;
+						if (inbox.pendingAuthority() > 0) continue;
 						messages.push({
 							role: "assistant",
 							content: res.content ?? ""
@@ -22023,4 +22104,4 @@ function resolveRedactor(redact) {
 //#endregion
 export { bridgeAdmissionRefusal as $, buildRuntimeEventOtelSpans as $n, providerAttemptEvidence as $r, spendFromUsageEvents as $t, consumeScopeRetainedOwnerResult as A, promptFromAgentTurnInput as Ai, throwIfAborted as An, profileMaterializationAxes$1 as Ar, peerMailTools as At, workerInteractiveBindingFile as B, startRetainedRunInEnvironment as Bn, worktreeCliProfileMaterialization as Br, insideCursorNamespace as Bt, settledToIteration as C, notifySandboxEventObserver as Ci, hasCompleteCacheBreakdown as Cn, parseCodexTokenUsage as Cr, createInbox as Ct, timerAt as D, decodeHarnessUsage as Di, sleep as Dn, controlProfileMaterialization as Dr, claimsAuthority as Dt, pollFor as E, sumSandboxUsage as Ei, randomSuffix as En, assertProfileMaterialization as Er, PEER_MAIL_WIRE_KEY as Et, interactiveAdmissionSeamKey as F, abortError$1 as Fn, renderProfileMaterializationIssues as Fr, taskToPrompt as Ft, destroyInteractiveEnvironment as G, readCodexRolloutSession as Gn, attestRuntimeOwnedPendingExecutor as Gr, WORKER_TOOL_TRACE_SCHEMA_VERSION as Gt, reconnectRetainedInteractiveRun as H, addHarnessUsage as Hn, parseCommittedJsonLines as Hr, materializeTreeView as Ht, readWorkerInteractiveAdmissions as I, linkAbort as In, renderUnsupported as Ir, FileResultBlobStore as It, queueOf as J, readTraceContextFromEnv as Jn, finalizeRuntimeOwnedPendingExecutor as Jr, parseWorkerToolTraceArtifact as Jt, effectiveConcurrency as K, createPropagatingTraceEmitter as Kn, attestRuntimeOwnedScopeOwner as Kr, captureWorkerTraceEvidence as Kt, workerInteractiveAdmissionFile as L, reconnectRetainedRun as Ln, sandboxActProfileMaterialization as Lr, FileSpawnJournal as Lt, scopeRetainedOwnerContext as M, providerMessageText as Mi, zeroSpend as Mn, promptModelProfileMaterialization as Mr, isLiveNodeStatus as Mt, scopeRetainedOwnerPriorSpend as N, registerRetainedExecutorPreparation as Nn, promptOnlyProfileMaterialization as Nr, isTerminalNodeStatus as Nt, validateWaitSpec as O, abortError$2 as Oi, stringifySafe as On, defineProfileMaterializationContract as Or, createPeerMailbox as Ot, scopeRetainedOwnerResult as P, retainedExecutorSeamKey as Pn, promptResourceProfileMaterialization as Pr, createInPlaceCliExecutor as Pt, bindReusableExecutorExecutionId as Q, buildLoopSpanNodes as Qn, newExecutionAttemptId as Qr, createBudgetPool as Qt, attachWorker as R, recoverRetainedRun as Rn, unsupportedProfileDimensions as Rr, InMemoryResultBlobStore as Rt, scopeOwnerExecutorNodeContext as S, mapSandboxToolEvent as Si, deleteBoxSafe as Sn, localHarnessExecutable as Sr, readWorkerProgress as St, isWaitOutcome as T, sandboxProgressEvents as Ti, promptCacheTokenClasses as Tn, AGENT_PROFILE_MATERIALIZATION_AXES as Tr, DEFAULT_PEER_MAIL_LIMITS as Tt, recoverRetainedInteractiveRun as U, createCodexRolloutStoreReader as Un, prepareJsonlAppend as Ur, pendingWaits as Ut, workerInteractiveBindingsDir as V, retainedCreateMaterial as Vn, isNoEntError as Vr, loadSpawnForest as Vt, startRetainedInteractiveRun as W, harnessUsageIsEmpty as Wn, writeAllBytes as Wr, replaySpawnTree as Wt, DEFAULT_SUCCESSFUL_SHUTDOWN_MS as X, INTELLIGENCE_WIRE_VERSION as Xn, knownExecutionBindingReceipt as Xr, contentAddress as Xt, rollingDispatch as Y, traceContextToEnv as Yn, inheritRuntimeOwnedExecutorAttestation as Yr, workerTraceAnalysisStore as Yt, teardownExecutor as Z, buildLoopOtelSpans as Zn, knownMaterializationReceipt as Zr, assertValidBudget as Zt, deriveNodeExecutionIdentity as _, createSandboxToolPartState as _i, resolveAgentEnvironmentProvider as _n, createWorktree as _r, createPushTraceSource as _t, createSupervisor as a, runtimeOwnedPendingExecutorMaterialization as ai, createSandboxLineage as an, loopEventToOtelSpan as ar, cliWorktreeExecutor as at, recordScopeOwnerMaterialization as b, isSandboxTerminalEvent as bi, chargedTokens as bn, LOCAL_HARNESSES as br, DEFAULT_STALL_AFTER_MS as bt, pickBestDelivered as c, unknownMaterializationReceipt as ci, assertBoxlessPromptOptions as cn, toOtelAttributes as cr, snapshotExecutorConfig as ct, driverChild as d, detachedFrozen as di, runBrainLoop as dn, sanitizeAgentRuntimeEvent as dr, readWorkerTraceContext as dt, recordRuntimeOwnedDriveHarnessProviderEvidence as ei, TERMINAL_DECISIONS as en, createOpenInferenceFileExporter as er, bridgeModelRouteRefusal as et, driverExecutorFactory as f, detachedSnapshot as fi, canonicalObservedModelParts as fn, sanitizeKnowledgeReadinessReport as fr, workerTraceEnv as ft, createScope as g, canonicalStreamEventFromSandboxEvent as gi, providerAsSandboxClient as gn, captureWorktreeDiff as gr, createSteerableSandboxSession as gt, beginScopeOwnerAttempt as h, assertSandboxServedModel as hi, providerAsExecutor as hn, runWorktreeHarness as hr, DEFAULT_SANDBOX_STEERING_MAX_TURNS as ht, createRootHandle as i, runtimeOwnedExecutorProviderEvidence as ii, runAgentRounds as in, generateSpanId as ir, cliInPlaceExecutor as it, prepareScopeRetainedOwnerTask as j, promptOptionsFromAgentTurnInput as ji, unmeteredSpend as jn, promptControlProfileMaterialization as jr, peerMailVerbNames as jt, waitUntil as k, awaitAbortable$1 as ki, throwAbort as kn, fullProfileMaterialization as kr, isPeerMailEnvelope as kt, runFinalizer as l, executableAgentProfileSnapshot as li, readPromptOptions as ln, createRuntimeEventCollector as lr, createWorktreeCliExecutor as lt, withDriverExecutor as m, readSandboxOutcome as mi, createAgentEnvironmentProviderRegistry as mn, runSettledCommand as mr, workerTraceSeamKey as mt, defaultRedactorIdentityMaterial as n, runtimeOwnedExecutorExecutionBinding as ni, defaultSelectWinner as nn, exportEvalRuns as nr, bridgeStopSignalKey as nt, bestDelivered as o, runtimeOwnedScopeOwnerRuntime as oi, probeSandboxCapabilities as on, padSpanId as or, createExecutor as ot, isDriverSpec as p, projectSandboxOutcome as pi, observedModelMatchesDeclared as pn, sanitizeRuntimeStreamEvent as pr, workerTraceHeaders as pt, freeSlots as q, mergeTraceEnv as qn, authoredProfileDigest as qr, isTraceAnalysisStore as qt, resolveRedactor as r, runtimeOwnedExecutorMaterialization as ri, isTerminalDecision as rn, flatOtelSpan as rr, captureReusableExecutorConfig as rt, collectDelivered as s, unknownExecutionBindingReceipt as si, acquireSandbox as sn, padTraceId as sr, createExecutorRegistry as st, defaultRedactor as t, runtimeOwnedDriveHarnessProviderEvidence as ti, createSandboxForSpec as tn, createOtelExporter as tr, bridgeRuntimeAttachmentsKey as tt, runTree as u, executableAgentSpecSnapshot as ui, routerBrain as un, createRuntimeStreamEventCollector as ur, WORKER_TRACE_PROPAGATION as ut, meterRuntimeOwnedAccounting as v, createSandboxUsageLedger as vi, sandboxClientAsProvider as vn, removeWorktree as vr, decodeToolPart as vt, createWaitProbes as w, sandboxEventServedBackend as wi, isAbortError$2 as wn, CodexExecutionDiagnosticError as wr, AUTHORITY_MARKERS as wt, restoreScopeOwnerAcceptedExecution as x, mapSandboxEvent as xi, cloneSpend as xn, harnessSupportsReasoningEffort as xr, createActivityLog as xt, meterRuntimeOwnedProviderAttempt as y, extractLlmCallEvent as yi, addSpend as yn, DEFAULT_LOCAL_HARNESS as yr, sandboxSessionTraceSource as yt, readWorkerInteractiveBinding as z, startRetainedRun as zn, validateProfileMaterialization as zr, InMemorySpawnJournal as zt };
 
-//# sourceMappingURL=redact-B5g0jY2n.js.map
+//# sourceMappingURL=redact-hBRYKHwa.js.map