agents 0.12.3 → 0.12.4

package/dist/index.js

@@ -2,7 +2,7 @@ import { __DO_NOT_USE_WILL_BREAK__agentContext } from "./internal_context.js";
 import { MessageType } from "./types.js";
 import { camelCaseToKebabCase } from "./utils.js";
 import { createHeaderBasedEmailResolver, signAgentHeaders } from "./email.js";
-import { i as _classPrivateFieldInitSpec, n as _classPrivateFieldSet2, t as _classPrivateFieldGet2 } from "./classPrivateFieldGet2-Bqby-AHD.js";
+import { i as _classPrivateFieldInitSpec, n as _classPrivateFieldSet2, t as _classPrivateFieldGet2 } from "./classPrivateFieldGet2-CS51BNGR.js";
 import { SUB_PREFIX, getSubAgentByName, parseSubAgentPath, routeSubAgentRequest } from "./sub-routing.js";
 import { isErrorRetryable, tryN, validateRetryOptions } from "./retries.js";
 import { o as RPC_DO_PREFIX, r as MCPConnectionState, s as DisposableStore, t as MCPClientManager } from "./client-D1kFXo80.js";
@@ -587,6 +587,7 @@ var Agent = class Agent extends Server {
 		this._persistenceHookMode = "none";
 		this._isFacet = false;
 		this._suppressProtocolBroadcasts = false;
+		this._protocolBroadcastExcludeIds = /* @__PURE__ */ new Set();
 		this._cf_virtualSubAgentConnections = /* @__PURE__ */ new Map();
 		this._parentPath = [];
 		this._insideOnStart = false;
@@ -770,8 +771,16 @@ var Agent = class Agent extends Server {
 							type: "cf_agent_identity"
 						}));
 					}
-					if (this.state) connection.send(JSON.stringify({
-						state: this.state,
+					const wasExcludedFromStateInitBroadcast = this._protocolBroadcastExcludeIds.has(connection.id);
+					let currentState;
+					this._protocolBroadcastExcludeIds.add(connection.id);
+					try {
+						currentState = this.state;
+					} finally {
+						if (!wasExcludedFromStateInitBroadcast) this._protocolBroadcastExcludeIds.delete(connection.id);
+					}
+					if (currentState !== void 0) connection.send(JSON.stringify({
+						state: currentState,
 						type: "cf_agent_state"
 					}));
 					connection.send(JSON.stringify({
@@ -823,14 +832,17 @@ var Agent = class Agent extends Server {
 					this.broadcastMcpServers();
 					this._checkOrphanedWorkflows();
 					await this._checkRunFibers();
-					await this._reconcileAgentToolRuns();
+					const recoveredAgentToolFinishes = await this._reconcileAgentToolRuns({ deferFinishHooks: true });
 					this._insideOnStart = true;
 					this._warnedScheduleInOnStart.clear();
+					let result;
 					try {
-						return await _onStart(props);
+						result = await _onStart(props);
 					} finally {
 						this._insideOnStart = false;
 					}
+					await this._runDeferredAgentToolFinishHooks(recoveredAgentToolFinishes);
+					return result;
 				});
 			});
 		};
@@ -866,7 +878,7 @@ var Agent = class Agent extends Server {
 	*/
 	_broadcastProtocol(msg, excludeIds = []) {
 		if (this._suppressProtocolBroadcasts) return;
-		const exclude = [...excludeIds];
+		const exclude = [...excludeIds, ...this._protocolBroadcastExcludeIds];
 		for (const conn of this.getConnections()) if (!this.isConnectionProtocolEnabled(conn)) exclude.push(conn.id);
 		this.broadcast(msg, exclude);
 	}
@@ -1101,7 +1113,7 @@ var Agent = class Agent extends Server {
 	*
 	* IMPORTANT: This hook must be synchronous.
 	*/
-	validateStateChange(nextState, source) {}
+	validateStateChange(_nextState, _source) {}
 	/**
 	* Called after the Agent's state has been persisted and broadcast to all clients.
 	* This is a notification hook — errors here are routed to onError and do not
@@ -1110,7 +1122,7 @@ var Agent = class Agent extends Server {
 	* @param state Updated state
 	* @param source Source of the state update ("server" or a client connection)
 	*/
-	onStateChanged(state, source) {}
+	onStateChanged(_state, _source) {}
 	/**
 	* @deprecated Renamed to `onStateChanged` — the behavior is identical.
 	* `onStateUpdate` will be removed in the next major version.
@@ -1122,7 +1134,7 @@ var Agent = class Agent extends Server {
 	* @param state Updated state
 	* @param source Source of the state update ("server" or a client connection)
 	*/
-	onStateUpdate(state, source) {}
+	onStateUpdate(_state, _source) {}
 	/**
 	* Dispatch to the appropriate persistence hook based on the mode
 	* cached in the constructor. No prototype walks at call time.
@@ -2398,11 +2410,16 @@ var Agent = class Agent extends Server {
 		if (!this._isSameAgentPathPrefix(selfPath, ownerPath)) throw new Error(`Schedule owner path does not descend from ${JSON.stringify(selfPath)}.`);
 		if (selfPath.length === ownerPath.length) {
 			await this._executeScheduleCallback(row);
-			return;
+			return true;
 		}
 		const next = ownerPath[selfPath.length];
-		if (!this.hasSubAgent(next.className, next.name)) throw new Error(`Scheduled sub-agent ${next.className} "${next.name}" no longer exists.`);
-		await (await this._cf_resolveSubAgent(next.className, next.name))._cf_dispatchScheduledCallback(ownerPath, row);
+		if (!this.hasSubAgent(next.className, next.name)) {
+			const stalePath = ownerPath.slice(0, selfPath.length + 1);
+			if (this._isFacet) await (await this._rootAlarmOwner())._cf_cleanupFacetPrefix(stalePath);
+			else await this._cf_cleanupFacetPrefix(stalePath);
+			return false;
+		}
+		return (await this._cf_resolveSubAgent(next.className, next.name))._cf_dispatchScheduledCallback(ownerPath, row);
 	}
 	/**
 	* Recursively destroy a descendant facet identified by
@@ -2586,7 +2603,7 @@ var Agent = class Agent extends Server {
 				if (row.type === "interval") this.sql`UPDATE cf_agents_schedules SET running = 1, execution_started_at = ${now} WHERE id = ${row.id}`;
 				if (row.owner_path) try {
 					const ownerPath = JSON.parse(row.owner_path);
-					await this._cf_dispatchScheduledCallback(ownerPath, row);
+					executed = await this._cf_dispatchScheduledCallback(ownerPath, row);
 				} catch (e) {
 					console.error(`error dispatching scheduled callback "${row.callback}"`, e);
 					this._emit("schedule:error", {
@@ -2603,8 +2620,10 @@ var Agent = class Agent extends Server {
               `;
 					continue;
 				}
-				else await this._executeScheduleCallback(row);
-				executed = true;
+				else {
+					await this._executeScheduleCallback(row);
+					executed = true;
+				}
 				if (this._destroyed) return;
 				if (!executed) continue;
 				if (row.type === "cron") {
@@ -3238,7 +3257,7 @@ var Agent = class Agent extends Server {
 				} catch {}
 				return this._resultFromAgentToolRow(existing);
 			}
-			return await this._replayAndInterruptAgentToolRun(cls, existing, "Agent tool run was still running, but live-tail reattachment is not supported in this runtime.");
+			return await this._replayAndInterruptAgentToolRun(existing, "Agent tool run was still running, but live-tail reattachment is not supported in this runtime.");
 		}
 		const displayOrder = options.displayOrder ?? 0;
 		const inputPreview = options.inputPreview ?? this._defaultAgentToolPreview(options.input);
@@ -3321,13 +3340,7 @@ var Agent = class Agent extends Server {
 				status: "aborted",
 				error: options.signal.reason instanceof Error ? options.signal.reason.message : String(options.signal.reason ?? "cancelled")
 			};
-			this._updateAgentToolTerminal(runId, result);
-			this._broadcastAgentToolTerminal(options.parentToolCallId, sequence, result);
-			await this.onAgentToolFinish({
-				...runInfo,
-				status: "aborted",
-				completedAt: Date.now()
-			}, result);
+			await this._finishAgentToolRun(runInfo, result, { sequence });
 			return result;
 		} else {
 			parentAbortListener = () => {
@@ -3351,24 +3364,15 @@ var Agent = class Agent extends Server {
 					status: "aborted",
 					error: options.signal.reason instanceof Error ? options.signal.reason.message : String(options.signal.reason ?? "cancelled")
 				};
-				this._updateAgentToolTerminal(runId, result);
-				this._broadcastAgentToolTerminal(options.parentToolCallId, sequence, result);
-				await this.onAgentToolFinish({
-					...runInfo,
-					status: "aborted",
-					completedAt: Date.now()
-				}, result);
+				await this._finishAgentToolRun(runInfo, result, { sequence });
 				return result;
 			}
 			const inspection = await adapter.inspectAgentToolRun(runId) ?? childStart;
 			const result = this._terminalResultFromInspection(agentType, inspection);
-			this._updateAgentToolTerminal(runId, result, inspection.completedAt);
-			this._broadcastAgentToolTerminal(options.parentToolCallId, sequence, result);
-			await this.onAgentToolFinish({
-				...runInfo,
-				status: result.status,
-				completedAt: Date.now()
-			}, result);
+			await this._finishAgentToolRun(runInfo, result, {
+				sequence,
+				completedAt: inspection.completedAt
+			});
 			return result;
 		} catch (error) {
 			if (options.signal?.aborted) {
@@ -3379,13 +3383,7 @@ var Agent = class Agent extends Server {
 					status: "aborted",
 					error: options.signal.reason instanceof Error ? options.signal.reason.message : String(options.signal.reason ?? "cancelled")
 				};
-				this._updateAgentToolTerminal(runId, result);
-				this._broadcastAgentToolTerminal(options.parentToolCallId, sequence, result);
-				await this.onAgentToolFinish({
-					...runInfo,
-					status: "aborted",
-					completedAt: Date.now()
-				}, result);
+				await this._finishAgentToolRun(runInfo, result, { sequence });
 				return result;
 			}
 			const result = {
@@ -3394,13 +3392,7 @@ var Agent = class Agent extends Server {
 				status: "error",
 				error: error instanceof Error ? error.message : String(error)
 			};
-			this._updateAgentToolTerminal(runId, result);
-			this._broadcastAgentToolTerminal(options.parentToolCallId, sequence, result);
-			await this.onAgentToolFinish({
-				...runInfo,
-				status: "error",
-				completedAt: Date.now()
-			}, result);
+			await this._finishAgentToolRun(runInfo, result, { sequence });
 			return result;
 		} finally {
 			if (parentAbortListener && options.signal) options.signal.removeEventListener("abort", parentAbortListener);
@@ -3481,6 +3473,19 @@ var Agent = class Agent extends Server {
 			...row.error_message !== null ? { error: row.error_message } : {}
 		};
 	}
+	_agentToolRunInfoFromRow(row, status = row.status, completedAt = row.completed_at ?? void 0) {
+		return {
+			runId: row.run_id,
+			parentToolCallId: row.parent_tool_call_id ?? void 0,
+			agentType: row.agent_type,
+			inputPreview: this._parseAgentToolJson(row.input_preview),
+			status,
+			display: this._parseAgentToolJson(row.display_metadata),
+			displayOrder: row.display_order,
+			startedAt: row.started_at,
+			completedAt
+		};
+	}
 	_terminalResultFromInspection(agentType, inspection) {
 		if (inspection.status === "completed") return {
 			runId: inspection.runId,
@@ -3502,6 +3507,27 @@ var Agent = class Agent extends Server {
 			error: inspection.error ?? "Agent tool run failed"
 		};
 	}
+	async _finishAgentToolRun(run, result, options) {
+		const completedAt = options?.completedAt ?? Date.now();
+		this._updateAgentToolTerminal(run.runId, result, completedAt);
+		if (options?.sequence !== void 0) this._broadcastAgentToolTerminal(run.parentToolCallId, options.sequence, result);
+		const finish = () => this.onAgentToolFinish({
+			...run,
+			status: result.status,
+			completedAt
+		}, result);
+		if (options?.deferFinishHook) return finish;
+		await finish();
+	}
+	async _runDeferredAgentToolFinishHooks(hooks) {
+		for (const hook of hooks) try {
+			await hook();
+		} catch (error) {
+			try {
+				await this.onError(error);
+			} catch {}
+		}
+	}
 	_updateAgentToolTerminal(runId, result, completedAt = Date.now()) {
 		this.sql`
       UPDATE cf_agent_tool_runs
@@ -3561,6 +3587,11 @@ var Agent = class Agent extends Server {
 		}, replay, connection);
 		return next;
 	}
+	async _broadcastAgentToolStoredChunks(row, sequence, replay, connection) {
+		const child = await this._cf_resolveSubAgent(row.agent_type, row.run_id);
+		const chunks = await this._asAgentToolChildAdapter(child).getAgentToolChunks(row.run_id);
+		return this._broadcastAgentToolChunks(row.parent_tool_call_id ?? void 0, row.run_id, chunks, sequence, replay, connection);
+	}
 	async _forwardAgentToolStream(stream, parentToolCallId, runId, sequence, signal) {
 		let next = sequence;
 		if (signal?.aborted) return next;
@@ -3656,13 +3687,10 @@ var Agent = class Agent extends Server {
 		if (!cls) throw new Error(`Agent tool class "${className}" is not exported.`);
 		return cls;
 	}
-	async _replayAndInterruptAgentToolRun(cls, row, message) {
-		const parentToolCallId = row.parent_tool_call_id ?? void 0;
+	async _replayAndInterruptAgentToolRun(row, message) {
 		let sequence = 1;
 		try {
-			const child = await this.subAgent(cls, row.run_id);
-			const chunks = await this._asAgentToolChildAdapter(child).getAgentToolChunks(row.run_id);
-			sequence = this._broadcastAgentToolChunks(parentToolCallId, row.run_id, chunks, sequence);
+			sequence = await this._broadcastAgentToolStoredChunks(row, sequence);
 		} catch {}
 		const result = {
 			runId: row.run_id,
@@ -3670,8 +3698,7 @@ var Agent = class Agent extends Server {
 			status: "interrupted",
 			error: message
 		};
-		this._updateAgentToolTerminal(row.run_id, result);
-		this._broadcastAgentToolTerminal(parentToolCallId, sequence, result);
+		await this._finishAgentToolRun(this._agentToolRunInfoFromRow(row), result, { sequence });
 		return result;
 	}
 	async _replayAgentToolRuns(connection) {
@@ -3693,9 +3720,7 @@ var Agent = class Agent extends Server {
 				display: this._parseAgentToolJson(row.display_metadata)
 			}, true, connection);
 			try {
-				const child = await this.subAgent(this._agentToolClassByName(row.agent_type), row.run_id);
-				const chunks = await this._asAgentToolChildAdapter(child).getAgentToolChunks(row.run_id);
-				sequence = this._broadcastAgentToolChunks(parentToolCallId, row.run_id, chunks, sequence, true, connection);
+				sequence = await this._broadcastAgentToolStoredChunks(row, sequence, true, connection);
 			} catch {}
 			if (this._isAgentToolTerminal(row.status)) this._broadcastAgentToolTerminal(parentToolCallId, sequence, {
 				runId: row.run_id,
@@ -3707,40 +3732,52 @@ var Agent = class Agent extends Server {
 			}, true, connection);
 		}
 	}
-	async _reconcileAgentToolRuns() {
+	async _reconcileAgentToolRuns(options) {
+		const deferredFinishes = [];
 		const rows = this.sql`
-      SELECT run_id, agent_type FROM cf_agent_tool_runs
+      SELECT run_id, parent_tool_call_id, agent_type, input_preview, status,
+             summary, output_json, error_message, display_metadata, display_order,
+             started_at, completed_at
+      FROM cf_agent_tool_runs
       WHERE status IN ('starting', 'running')
       ORDER BY started_at ASC
     `;
-		for (const row of rows) try {
-			const cls = this._agentToolClassByName(row.agent_type);
-			if (!this.hasSubAgent(cls, row.run_id)) {
-				this._updateAgentToolTerminal(row.run_id, {
+		for (const row of rows) {
+			let sequence = 1;
+			let completedAt;
+			let result;
+			try {
+				const child = await this._cf_resolveSubAgent(row.agent_type, row.run_id);
+				const inspection = await this._asAgentToolChildAdapter(child).inspectAgentToolRun(row.run_id);
+				try {
+					sequence = await this._broadcastAgentToolStoredChunks(row, sequence);
+				} catch {}
+				if (!inspection || inspection.status === "running" || inspection.status === "starting") result = {
 					runId: row.run_id,
 					agentType: row.agent_type,
 					status: "interrupted",
-					error: "Agent tool child was not found during parent recovery."
-				});
-				continue;
+					error: "Agent tool run was still running, but live-tail reattachment is not supported in this runtime."
+				};
+				else {
+					result = this._terminalResultFromInspection(row.agent_type, inspection);
+					completedAt = inspection.completedAt;
+				}
+			} catch {
+				result = {
+					runId: row.run_id,
+					agentType: row.agent_type,
+					status: "interrupted",
+					error: "Agent tool run could not be inspected during parent recovery."
+				};
 			}
-			const child = await this.subAgent(cls, row.run_id);
-			const inspection = await this._asAgentToolChildAdapter(child).inspectAgentToolRun(row.run_id);
-			if (!inspection || inspection.status === "running" || inspection.status === "starting") this._updateAgentToolTerminal(row.run_id, {
-				runId: row.run_id,
-				agentType: row.agent_type,
-				status: "interrupted",
-				error: "Agent tool run was still running, but live-tail reattachment is not supported in this runtime."
-			});
-			else this._updateAgentToolTerminal(row.run_id, this._terminalResultFromInspection(row.agent_type, inspection), inspection.completedAt);
-		} catch {
-			this._updateAgentToolTerminal(row.run_id, {
-				runId: row.run_id,
-				agentType: row.agent_type,
-				status: "interrupted",
-				error: "Agent tool run could not be inspected during parent recovery."
+			const deferredFinish = await this._finishAgentToolRun(this._agentToolRunInfoFromRow(row), result, {
+				sequence,
+				completedAt,
+				deferFinishHook: options?.deferFinishHooks
 			});
+			if (deferredFinish) deferredFinishes.push(deferredFinish);
 		}
+		return deferredFinishes;
 	}
 	/**
 	* Shared facet resolution — takes a CamelCase class name string