@warlock.js/ai 4.3.0 → 4.5.0

package/esm/supervisor/execution.mjs

@@ -4,6 +4,8 @@ import { MaxIterationsError } from "../errors/max-iterations-error.mjs";
 import { SchemaValidationError } from "../errors/schema-validation-error.mjs";
 import { SupervisorCancelledError } from "../errors/supervisor-cancelled-error.mjs";
 import "../errors/index.mjs";
+import { mergeUsage } from "../utils/compute-cost.mjs";
+import { withRunFrame, withoutRunFrame } from "../utils/run-context.mjs";
 import { stampReportLineage } from "../utils/stamp-report-lineage.mjs";
 import "../utils/index.mjs";
 import { runPipeline } from "../middleware/pipeline.mjs";
@@ -472,7 +474,7 @@ var SupervisorExecution = class {
 			total: 0
 		};
 		try {
-			rawResult = await this.invokeUnit(entry, resolvedInput, placeholders, routeContext);
+			rawResult = await withoutRunFrame(() => this.invokeUnit(entry, resolvedInput, placeholders, routeContext));
 			if (rawResult.error) branchError = rawResult.error;
 			branchUsage = rawResult.usage;
 			if (rawResult.report) this.childReports.push(rawResult.report);
@@ -572,12 +574,18 @@ var SupervisorExecution = class {
 	async runCallback(entry, input, callStack, reportSink) {
 		const childReports = [];
 		const dispatchCtx = this.seedDispatchContext(entry.intent, input, callStack, childReports);
+		const callbackRunId = `${this.runId}.${entry.intent}`;
 		const startedAt = /* @__PURE__ */ new Date();
 		const startPerf = performance.now();
 		let rawOutput;
 		let error;
 		try {
-			rawOutput = await entry.callback(dispatchCtx);
+			rawOutput = await withRunFrame({
+				sink: childReports,
+				rootRunId: this.runId,
+				parentRunId: callbackRunId,
+				sessionId: this.options?.sessionId
+			}, () => Promise.resolve(entry.callback(dispatchCtx)));
 		} catch (thrown) {
 			error = thrown instanceof AIError ? thrown : new SupervisorFailedError(`callback intent "${entry.intent}" threw: ${thrown instanceof Error ? thrown.message : String(thrown)}`, { cause: thrown });
 		}
@@ -593,7 +601,7 @@ var SupervisorExecution = class {
 		const duration = performance.now() - startPerf;
 		const rolledUsage = aggregateChildUsage(childReports);
 		const report = {
-			runId: `${this.runId}.${entry.intent}`,
+			runId: callbackRunId,
 			rootRunId: this.runId,
 			name: entry.intent,
 			type: "callback",
@@ -669,15 +677,15 @@ var SupervisorExecution = class {
 			const inputString = typeof callerInput === "string" ? callerInput : safeStringify(callerInput);
 			if (entry.type === "agent") {
 				const reentryHistory = this.applyAgentsWindow();
-				const result = await entry.unit.execute(inputString, {
+				const result = await withoutRunFrame(() => entry.unit.execute(inputString, {
 					signal: this.options?.signal,
 					...reentryHistory.length > 0 ? { history: reentryHistory } : {}
-				});
+				}));
 				if (result.report) reportSink.push(result.report);
 				if (result.error) throw result.error;
 				return result.data ?? result.text ?? void 0;
 			}
-			const result = await entry.unit.execute(inputString, { signal: this.options?.signal });
+			const result = await withoutRunFrame(() => entry.unit.execute(inputString, { signal: this.options?.signal }));
 			if (result.report) reportSink.push(result.report);
 			if (result.error) throw result.error;
 			return result.data;
@@ -722,7 +730,7 @@ var SupervisorExecution = class {
 		try {
 			const merged = this.mergeInlineOptions(options);
 			const inputForExecutable = this.coerceInlineInput(executable, input);
-			const result = await executable.execute(inputForExecutable, merged);
+			const result = await withoutRunFrame(() => executable.execute(inputForExecutable, merged));
 			if (result.report) reportSink.push(result.report);
 			return result;
 		} finally {
@@ -759,7 +767,7 @@ var SupervisorExecution = class {
 	*/
 	streamSupervisedExecutable(executable, input, options, callerIntent, reportSink, release) {
 		const merged = this.mergeInlineOptions(options);
-		const stream = executable.stream(input, merged);
+		const stream = withoutRunFrame(() => executable.stream(input, merged));
 		stream.on({
 			"agent.trip.streaming": ({ delta }) => {
 				this.emit("supervisor.agent.streaming", {
@@ -1181,7 +1189,7 @@ var SupervisorExecution = class {
 				usage,
 				error
 			};
-			this.aggregateUsage(this.usage, usage);
+			mergeUsage(this.usage, usage);
 			this.emit("supervisor.classifier.failed", { error });
 			throw error;
 		}
@@ -1201,7 +1209,7 @@ var SupervisorExecution = class {
 				usage,
 				error
 			};
-			this.aggregateUsage(this.usage, usage);
+			mergeUsage(this.usage, usage);
 			this.emit("supervisor.classifier.failed", { error });
 			throw error;
 		}
@@ -1226,7 +1234,7 @@ var SupervisorExecution = class {
 					usage,
 					error
 				};
-				this.aggregateUsage(this.usage, usage);
+				mergeUsage(this.usage, usage);
 				this.emit("supervisor.classifier.failed", { error });
 				throw error;
 			}
@@ -1243,7 +1251,7 @@ var SupervisorExecution = class {
 					usage,
 					error: interpretation.error
 				};
-				this.aggregateUsage(this.usage, usage);
+				mergeUsage(this.usage, usage);
 				this.emit("supervisor.classifier.failed", { error: interpretation.error });
 				throw interpretation.error;
 			}
@@ -1265,7 +1273,7 @@ var SupervisorExecution = class {
 			duration: performance.now() - startPerf,
 			usage
 		};
-		this.aggregateUsage(this.usage, usage);
+		mergeUsage(this.usage, usage);
 		this.emit("supervisor.classifier.completed", {
 			output: {
 				intent: this.classifierSnapshot.intent,
@@ -1655,17 +1663,18 @@ var SupervisorExecution = class {
 			this.terminatedBy = "error";
 		}
 		const endedAt = /* @__PURE__ */ new Date();
-		const finalStatus = this.status === "max-iterations" || this.status === "awaiting-input" ? "failed" : this.status;
+		const finalStatus = this.status === "max-iterations" || this.status === "awaiting-input" || this.status === "awaiting-approval" ? "failed" : this.status;
 		await this.checkpoint(finalStatus);
 		const report = {
 			runId: this.runId,
 			rootRunId: this.runId,
 			name: this.config.name,
 			version: this.config.version,
-			type: "supervisor",
+			type: this.config.reportType ?? "supervisor",
 			supervisorName: this.config.name,
 			signature: this.signature,
 			status: this.status,
+			...this.error ? { error: this.error } : {},
 			terminatedBy: this.terminatedBy,
 			iterations: this.snapshots.length,
 			startedAt: this.startedAtIso,
@@ -1683,7 +1692,7 @@ var SupervisorExecution = class {
 			sessionId: this.options?.sessionId
 		});
 		return {
-			type: "supervisor",
+			type: this.config.reportType ?? "supervisor",
 			data: this.data,
 			report,
 			usage: this.usage,
@@ -1770,12 +1779,8 @@ var SupervisorExecution = class {
 	*/
 	aggregateUsage(iterationUsage, partial) {
 		if (!partial) return;
-		this.usage.input += partial.input;
-		this.usage.output += partial.output;
-		this.usage.total += partial.total;
-		iterationUsage.input += partial.input;
-		iterationUsage.output += partial.output;
-		iterationUsage.total += partial.total;
+		mergeUsage(this.usage, partial);
+		mergeUsage(iterationUsage, partial);
 	}
 	/**
 	* Fan an event out through the three-tier emitter AND mirror it
@@ -1883,15 +1888,13 @@ function toAIError(thrown) {
 * `ctx.intents.X.execute()`. Mirrors `compositeAsTool` semantics.
 */
 function aggregateChildUsage(children) {
-	return children.reduce((acc, child) => ({
-		input: acc.input + child.usage.input,
-		output: acc.output + child.usage.output,
-		total: acc.total + child.usage.total
-	}), {
+	const total = {
 		input: 0,
 		output: 0,
 		total: 0
-	});
+	};
+	for (const child of children) mergeUsage(total, child.usage);
+	return total;
 }
 /**
 * Best-effort stringification for the snapshot's `input` field when