@tangle-network/agent-runtime 0.109.2 → 0.111.0

package/dist/{supervisor-sTJC9psT.js → supervisor-ByCPHcp9.js}

@@ -1,10 +1,10 @@
 import { c as RuntimeRunStateError, u as ValidationError } from "./errors-DEAvWQPy.js";
-import { f as zeroTokenUsage, t as addTokenUsage } from "./util-MVgdwuIS.js";
-import { a as contentAddress, c as replaySpawnTree, o as materializeTreeView, s as pendingWaits } from "./spawn-journal-CwPvKUTa.js";
+import { n as addTokenUsage, p as zeroTokenUsage } from "./util-Cc9g9Y-o.js";
+import { a as contentAddress, c as replaySpawnTree, o as materializeTreeView, s as pendingWaits } from "./spawn-journal-DLhnom3e.js";
 import { i as notifyRuntimeHookEvent } from "./runtime-hooks-C7iJOWm3.js";
 import { estimateCost, isModelPriced } from "@tangle-network/agent-eval";
 import { createHash, randomUUID } from "node:crypto";
-import { applyWorkspacePlan, materializeProfile } from "@tangle-network/agent-profile-materialize";
+import { applyWorkspacePlan, materializeProfile, resolveAgentProfileResources } from "@tangle-network/agent-profile-materialize";
 import { access, chmod, copyFile, mkdir, mkdtemp, open, readFile, realpath, rm, symlink, writeFile } from "node:fs/promises";
 import { constants, createReadStream } from "node:fs";
 import { basename, delimiter, dirname, isAbsolute, join, resolve, sep, win32 } from "node:path";
@@ -1330,6 +1330,21 @@ const defaultCheckOutputCap = 16e3;
 function materializerHarness(harness) {
 	return harness === "claude" ? "claude-code" : harness;
 }
+/** This harness runs public plans only — it has no secret provider, so any
+*  templated argument or secret-ref env value is refused rather than leaked
+*  or silently stringified. */
+function publicPlanString(value) {
+	if (typeof value === "string") return value;
+	throw new Error("runWorktreeHarness: plan value requires a secret provider; this harness applies public plans only");
+}
+function resolvePublicPlanEnv(env) {
+	const resolved = {};
+	for (const [name, value] of Object.entries(env)) {
+		if (value === void 0) continue;
+		resolved[name] = publicPlanString(value);
+	}
+	return resolved;
+}
 /**
 * Run the one worktree-harness operation. A failed run attempts cleanup before propagating; if
 * cleanup also fails, both errors are preserved. The caller cleans up a successful run.
@@ -1354,13 +1369,15 @@ async function runWorktreeHarness(opts) {
 	try {
 		assertSupportedWorktreeProfile(opts.profile, opts.harness);
 		assertSafeProfileResourcePaths(opts.profile);
-		const resourceInstructions = resolveResourceInstructions(opts.profile);
-		const plan = materializeProfile(materializationOnlyProfile(opts.profile), materializerHarness(opts.harness));
+		const profile = await resolveAgentProfileResources(opts.profile, resourceResolutionOptions(opts.resourceResolution, opts.signal));
+		opts.signal?.throwIfAborted();
+		const resourceInstructions = resolveResourceInstructions(profile);
+		const plan = materializeProfile(materializationOnlyProfile(profile), materializerHarness(opts.harness));
 		if (plan.unsupported.length > 0) throw new Error(`runWorktreeHarness: profile cannot be materialized for ${opts.harness}: ${plan.unsupported.map(({ dimension, reason }) => `${dimension}: ${reason}`).join("; ")}`);
 		assertSafeMaterializedPaths(plan);
 		const applied = applyWorkspacePlan(plan, worktree.path, { existingFiles: "reject" });
 		if (applied.unsupported.length > 0) throw new Error("runWorktreeHarness: applied profile unexpectedly retained unsupported rows");
-		const invocationProfile = profileWithResourceInstructions(opts.profile, resourceInstructions);
+		const invocationProfile = profileWithResourceInstructions(profile, resourceInstructions);
 		const { command, args } = harnessInvocation(opts.harness, invocationProfile, opts.taskPrompt, {
 			dangerouslySkipPermissions: opts.harness === "claude",
 			...opts.codexReproducible ? { codexReproducible: true } : {}
@@ -1371,11 +1388,11 @@ async function runWorktreeHarness(opts) {
 			taskPrompt: opts.taskPrompt,
 			invocation: {
 				command,
-				args: [...args, ...applied.flags]
+				args: [...args, ...applied.flags.map(publicPlanString)]
 			},
 			env: {
 				...process.env,
-				...applied.env
+				...resolvePublicPlanEnv(applied.env)
 			},
 			...opts.codexReproducible ? { codexReproducible: true } : {},
 			...opts.codexReadDeniedPaths ? { codexReadDeniedPaths: opts.codexReadDeniedPaths } : {},
@@ -1442,6 +1459,21 @@ async function runWorktreeHarness(opts) {
 		throw err;
 	}
 }
+function resourceResolutionOptions(options, signal) {
+	if (!signal) return options;
+	const fetchResource = options?.fetch ?? globalThis.fetch;
+	return {
+		...options,
+		fetch: (input, init) => {
+			signal.throwIfAborted();
+			const requestSignal = init?.signal;
+			return fetchResource(input, {
+				...init,
+				signal: requestSignal ? AbortSignal.any([signal, requestSignal]) : signal
+			});
+		}
+	};
+}
 function resolveResourceInstructions(profile) {
 	const instructions = profile.resources?.instructions;
 	if (instructions === void 0) return void 0;
@@ -1525,7 +1557,7 @@ function profileMaterializationReceipt(applied, resourceInstructions) {
 		writtenPaths: [...applied.written],
 		unsupported: [...applied.unsupported],
 		environmentNames: Object.keys(applied.env).sort(),
-		flags: [...applied.flags],
+		flags: applied.flags.map(publicPlanString),
 		resourceInstructions: instructionBytes ? {
 			delivery: "invocation-prompt",
 			sha256: `sha256:${createHash("sha256").update(instructionBytes).digest("hex")}`,
@@ -2009,6 +2041,7 @@ function readWorkerProgress(scope, executor, now, stallAfterMs = DEFAULT_STALL_A
 		turns: executor?.turns ?? scope.turns,
 		tokens: scope.tokens,
 		usd: scope.usd,
+		...scope.usdKnown === false ? { usdKnown: false } : {},
 		pendingMessages: executor?.pendingMessages ?? 0,
 		recentActivity: executor?.recentActivity ?? [],
 		...note ? { note } : {}
@@ -2611,7 +2644,8 @@ function createScope(args) {
 			lastActivityAt: child.lastActivityAt,
 			turns: child.spent.iterations,
 			tokens: child.spent.tokens,
-			usd: child.spent.usd
+			usd: child.spent.usd,
+			...child.spent.usdKnown === false ? { usdKnown: false } : {}
 		}, fromExecutor, opts.now ?? now(), opts.stallAfterMs ?? 18e4);
 	}
 	function traceSource(nodeId) {
@@ -2962,17 +2996,21 @@ async function foldStream(stream, onProgress) {
 		output: 0
 	};
 	let usd = 0;
+	let usdKnown = true;
 	let iterations = 0;
 	for await (const ev of stream) {
 		if (ev.kind === "tokens") {
 			tokens.input += ev.input;
 			tokens.output += ev.output;
-		} else if (ev.kind === "cost") usd += ev.usd;
-		else iterations += 1;
+		} else if (ev.kind === "cost") {
+			usd += ev.usd;
+			if (ev.usdKnown === false) usdKnown = false;
+		} else iterations += 1;
 		onProgress?.({
 			iterations,
 			tokens: { ...tokens },
 			usd,
+			...usdKnown ? {} : { usdKnown: false },
 			ms: 0
 		});
 	}
@@ -2980,6 +3018,7 @@ async function foldStream(stream, onProgress) {
 		iterations,
 		tokens,
 		usd,
+		...usdKnown ? {} : { usdKnown: false },
 		ms: 0
 	};
 }
@@ -3312,7 +3351,7 @@ function isAgent(value) {
 * quantities (tokens, usd, iterations) plus an absolute deadline. Children reserve
 * atomically at spawn and reconcile at settle:
 *
-*   total ≡ free + reserved + committed          (invariant, always)
+*   total ≡ free + reserved + committed          (for every known quantity)
 *
 * `reserve` moves a child's whole ceiling from `free` → `reserved` and fails closed
 * when `free` can't cover it (never read-then-spawn overcommit, so `Σk(treatment) ≡
@@ -3322,7 +3361,9 @@ function isAgent(value) {
 *
 * Pure and deterministic: `now()` is injected, there is no I/O, and no wall-clock or
 * RNG read. A `reserve`/`reconcile` ticket is single-use (fail-loud on double or
-* unknown reconcile) so a child can never refund twice.
+* unknown reconcile) so a child can never refund twice. If dollar cost is unknowable under a
+* dollar limit, reconciliation closes the known token/iteration work, marks the dollar channel
+* unusable, and refuses later reservations; inventing a numeric dollar total would be worse.
 *
 * @experimental
 */
@@ -3332,17 +3373,21 @@ function isAgent(value) {
 function spendFromUsageEvents(events) {
 	const tokens = zeroTokenUsage();
 	let usd = 0;
+	let usdKnown = true;
 	let iterations = 0;
 	for (const ev of events) if (ev.kind === "tokens") addTokenUsage(tokens, {
 		input: ev.input,
 		output: ev.output
 	});
-	else if (ev.kind === "cost") usd += ev.usd;
-	else iterations += 1;
+	else if (ev.kind === "cost") {
+		usd += ev.usd;
+		if (ev.usdKnown === false) usdKnown = false;
+	} else iterations += 1;
 	return {
 		iterations,
 		tokens,
 		usd,
+		...usdKnown ? {} : { usdKnown: false },
 		ms: 0
 	};
 }
@@ -3350,17 +3395,21 @@ async function foldUsage(events) {
 	if (Array.isArray(events)) return spendFromUsageEvents(events);
 	const tokens = zeroTokenUsage();
 	let usd = 0;
+	let usdKnown = true;
 	let iterations = 0;
 	for await (const ev of events) if (ev.kind === "tokens") addTokenUsage(tokens, {
 		input: ev.input,
 		output: ev.output
 	});
-	else if (ev.kind === "cost") usd += ev.usd;
-	else iterations += 1;
+	else if (ev.kind === "cost") {
+		usd += ev.usd;
+		if (ev.usdKnown === false) usdKnown = false;
+	} else iterations += 1;
 	return {
 		iterations,
 		tokens,
 		usd,
+		...usdKnown ? {} : { usdKnown: false },
 		ms: 0
 	};
 }
@@ -3381,6 +3430,7 @@ function createBudgetPool(root, now = Date.now) {
 	let freeUsd = root.maxUsd ?? 0;
 	let reservedUsd = 0;
 	let committedUsd = 0;
+	let usdTainted = false;
 	let freeIterations = root.maxIterations;
 	let reservedIterations = 0;
 	let committedIterations = 0;
@@ -3391,6 +3441,10 @@ function createBudgetPool(root, now = Date.now) {
 		const wantTokens = b.maxTokens;
 		const wantUsd = b.maxUsd ?? 0;
 		const wantIterations = b.maxIterations;
+		if (usdCapped && usdTainted) return {
+			ok: false,
+			reason: "budget-exhausted"
+		};
 		if (wantTokens > freeTokens) return {
 			ok: false,
 			reason: "budget-exhausted"
@@ -3427,24 +3481,28 @@ function createBudgetPool(root, now = Date.now) {
 	}
 	function reconcile(ticket, spent) {
 		if (!open.has(ticket.id)) throw new Error(`budget pool: reconcile of unknown or already-settled ticket ${ticket.id}`);
-		open.delete(ticket.id);
 		const { tokens: rTokens, usd: rUsd, iterations: rIterations } = ticket.reserved;
-		if (usdCapped && spent.usdKnown === false) throw new Error(`budget pool: ticket ${ticket.id} reported unknown dollar cost under a dollar-capped budget`);
+		const unknownUnderCap = usdCapped && spent.usdKnown === false;
 		const spentTokens = totalTokens(spent.tokens);
 		if (spentTokens > rTokens) throw new Error(`budget pool: ticket ${ticket.id} spent ${spentTokens} tokens > reserved ${rTokens}`);
 		if (spent.iterations > rIterations) throw new Error(`budget pool: ticket ${ticket.id} spent ${spent.iterations} iterations > reserved ${rIterations}`);
 		if (usdCapped && spent.usd > rUsd) throw new Error(`budget pool: ticket ${ticket.id} spent $${spent.usd} > reserved $${rUsd}`);
+		open.delete(ticket.id);
 		reservedTokens -= rTokens;
 		committedTokens += spentTokens;
 		freeTokens += rTokens - spentTokens;
 		reservedIterations -= rIterations;
 		committedIterations += spent.iterations;
 		freeIterations += rIterations - spent.iterations;
-		if (usdCapped && rUsd > 0) {
+		if (usdCapped) {
 			reservedUsd -= rUsd;
 			committedUsd += spent.usd;
-			freeUsd += rUsd - spent.usd;
+			if (unknownUnderCap) {
+				usdTainted = true;
+				freeUsd = 0;
+			} else freeUsd += rUsd - spent.usd;
 		} else committedUsd += spent.usd;
+		if (unknownUnderCap) throw new Error(`budget pool: ticket ${ticket.id} reported unknown dollar cost under a dollar-capped budget`);
 	}
 	function observe(spend) {
 		if (usdCapped && spend.usdKnown === false) throw new Error("budget pool: cannot observe unknown dollar cost under a dollar-capped budget");
@@ -3459,7 +3517,7 @@ function createBudgetPool(root, now = Date.now) {
 	function readout() {
 		return {
 			tokensLeft: freeTokens,
-			usdLeft: usdCapped ? freeUsd : 0,
+			usdLeft: usdCapped ? usdTainted ? 0 : freeUsd : 0,
 			usdCapped,
 			deadlineMs: absoluteDeadlineMs,
 			reservedTokens
@@ -3933,4 +3991,4 @@ function isNonEmptySpend(s) {
 //#endregion
 export { createWorktree as A, routerChatWithUsage as C, runWorktreeChecks as D, runSettledCommand as E, CodexExecutionDiagnosticError as F, harnessInvocation as M, parseCodexTokenUsage as N, runWorktreeHarness as O, runLocalHarness as P, routerChatWithTools as S, runBrainLoop as T, waitUntil as _, runFinalizer as a, readWorkerProgress as b, spendFromUsageEvents as c, settledToIteration as d, createWaitProbes as f, validateWaitSpec as g, timerAt as h, pickBestDelivered as i, removeWorktree as j, captureWorktreeDiff as k, withDriverExecutor as l, pollFor as m, bestDelivered as n, runTree as o, isWaitOutcome as p, collectDelivered as r, createBudgetPool as s, createSupervisor as t, createScope as u, DEFAULT_STALL_AFTER_MS as v, routerToolLoop as w, routerBrain as x, createActivityLog as y };
 
-//# sourceMappingURL=supervisor-sTJC9psT.js.map
+//# sourceMappingURL=supervisor-ByCPHcp9.js.map