agents 0.13.2 → 0.13.3

package/dist/experimental/memory/utils/index.d.ts

@@ -1,5 +1,5 @@
 import {
-  O as SessionMessage,
+  A as SessionMessage,
   a as alignBoundaryForward,
   c as createCompactFunction,
   d as sanitizeToolPairs,
@@ -11,7 +11,7 @@ import {
   s as computeSummaryBudget,
   t as COMPACTION_PREFIX,
   u as isCompactionMessage
-} from "../../../compaction-helpers-DAe-xiVY.js";
+} from "../../../compaction-helpers-B-pG5J22.js";
 
 //#region src/experimental/memory/utils/tokens.d.ts
 /** Approximate characters per token for English text */
@@ -33,7 +33,7 @@ declare function estimateStringTokens(text: string): number;
 /**
  * Estimate total token count for an array of UIMessages.
  *
- * Walks each message's parts (text, tool invocations, tool results)
+ * Walks each message's parts (text, reasoning, tool invocations, tool results)
  * and applies per-message overhead.
  *
  * This is a heuristic. Do not use where exact counts are required.

package/dist/experimental/memory/utils/index.js

@@ -1,5 +1,5 @@
 import { t as truncateToolOutput } from "../../../tool-output-truncation-CH-khbZ3.js";
-import { a as computeSummaryBudget, c as isCompactionMessage, d as TOKENS_PER_MESSAGE, f as WORDS_TOKEN_MULTIPLIER, i as buildSummaryPrompt, l as sanitizeToolPairs, m as estimateStringTokens, n as alignBoundaryBackward, o as createCompactFunction, p as estimateMessageTokens, r as alignBoundaryForward, s as findTailCutByTokens, t as COMPACTION_PREFIX, u as CHARS_PER_TOKEN } from "../../../compaction-helpers-DvcZnvQ1.js";
+import { a as computeSummaryBudget, c as isCompactionMessage, d as TOKENS_PER_MESSAGE, f as WORDS_TOKEN_MULTIPLIER, i as buildSummaryPrompt, l as sanitizeToolPairs, m as estimateStringTokens, n as alignBoundaryBackward, o as createCompactFunction, p as estimateMessageTokens, r as alignBoundaryForward, s as findTailCutByTokens, t as COMPACTION_PREFIX, u as CHARS_PER_TOKEN } from "../../../compaction-helpers-fJyf8j4m.js";
 //#region src/experimental/memory/utils/compaction.ts
 /**
 * Read-time context truncation.

package/dist/index.d.ts

@@ -66,7 +66,7 @@ import {
   y as AgentContext,
   z as MCPServersState,
   zt as SUB_PREFIX
-} from "./agent-tool-types-Dn9n-3SI.js";
+} from "./agent-tool-types-l98LCbBl.js";
 import { t as RetryOptions } from "./retries-BVdRl5ZE.js";
 import {
   n as AgentsOAuthProvider,

package/dist/index.js

@@ -114,6 +114,9 @@ function getNextCronTime(cron) {
 	return parseCronExpression(cron).getNextDate();
 }
 const DEFAULT_KEEP_ALIVE_INTERVAL_MS = 3e4;
+const SUB_AGENT_IDENTITY_VERSION_LEGACY = "legacy";
+const SUB_AGENT_IDENTITY_VERSION_PATH_V2 = "path-v2";
+const SUB_AGENT_IDENTITY_PATH_V2_PREFIX = "cf-agents:v2:";
 /**
 * Schema version for the Agent's internal SQLite tables.
 * Bump this when adding new tables, columns, or migrations.
@@ -125,6 +128,25 @@ const SCHEMA_VERSION_ROW_ID = "cf_schema_version";
 const STATE_ROW_ID = "cf_state_row_id";
 const STATE_WAS_CHANGED = "cf_state_was_changed";
 const DEFAULT_STATE = {};
+async function sha256Hex(value) {
+	const bytes = new TextEncoder().encode(value);
+	const digest = await crypto.subtle.digest("SHA-256", bytes);
+	return [...new Uint8Array(digest)].map((byte) => byte.toString(16).padStart(2, "0")).join("");
+}
+function pathV2IdentityName(logicalName, digest) {
+	return `${SUB_AGENT_IDENTITY_PATH_V2_PREFIX}${encodeURIComponent(logicalName)}:${digest}`;
+}
+function logicalNameFromPathV2Identity(identityName) {
+	if (!identityName.startsWith(SUB_AGENT_IDENTITY_PATH_V2_PREFIX)) return null;
+	const rest = identityName.slice(13);
+	const separator = rest.lastIndexOf(":");
+	if (separator === -1) return null;
+	try {
+		return decodeURIComponent(rest.slice(0, separator));
+	} catch {
+		return null;
+	}
+}
 /**
 * Validate that a stored `parentPath` has the expected shape. Used
 * when restoring from DO storage to guard against corrupted data.
@@ -848,6 +870,8 @@ var Agent = class Agent extends Server {
 				email: void 0
 			}, async () => {
 				if (await this.ctx.storage.get("cf_agents_is_facet")) this._isFacet = true;
+				const storedFacetName = await this.ctx.storage.get("cf_agents_facet_name");
+				if (typeof storedFacetName === "string") this._facetName = storedFacetName;
 				const storedParentPath = await this.ctx.storage.get("cf_agents_parent_path");
 				if (isValidParentPath(storedParentPath)) this._parentPath = storedParentPath;
 				try {
@@ -1569,6 +1593,13 @@ var Agent = class Agent extends Server {
 		if (!binding) throw new Error(`Unable to resolve root scheduler "${root.className}" for sub-agent schedule delegation.`);
 		return await getServerByName(binding, root.name);
 	}
+	_cf_rootResolvesToSelf() {
+		const root = this._parentPath[0];
+		if (!root) return false;
+		const binding = this.ctx.exports?.[root.className];
+		if (!binding?.idFromName) return false;
+		return binding.idFromName(root.name).equals(this.ctx.id);
+	}
 	_validateScheduleCallback(when, callback, options) {
 		if (typeof callback !== "string") throw new Error("Callback must be a string");
 		if (typeof this[callback] !== "function") throw new Error(`this.${callback} is not a function`);
@@ -2545,6 +2576,18 @@ var Agent = class Agent extends Server {
 	async runFiber(name, fn) {
 		return this._runFiberInternal(nanoid(), name, fn);
 	}
+	/**
+	* Internal framework entry point for fibers that need to compose their own
+	* recovery metadata with user checkpoint data while preserving the public
+	* `this.stash()` behavior.
+	*
+	* This deliberately stays protected/internal rather than becoming a public
+	* `runFiber()` option until the durable execution API needs this generality.
+	* @internal
+	*/
+	async _runFiberWithStashWrapper(name, fn, options) {
+		return this._runFiberInternal(nanoid(), name, fn, options);
+	}
 	async startFiber(name, fn, options) {
 		const fiberId = options?.fiberId ?? nanoid();
 		const idempotencyKey = options?.idempotencyKey;
@@ -2642,10 +2685,22 @@ var Agent = class Agent extends Server {
       VALUES (${id}, ${name}, NULL, ${Date.now()})
     `;
 		this._runFiberActiveFibers.add(id);
+		const writeSnapshot = (data) => {
+			const snapshot = JSON.stringify(data);
+			this.sql`
+        UPDATE cf_agents_runs SET snapshot = ${snapshot}
+        WHERE id = ${id}
+      `;
+			if (options?.managed) this.sql`
+          UPDATE cf_agents_fibers SET snapshot = ${snapshot}
+          WHERE fiber_id = ${id}
+        `;
+		};
 		let root;
 		let registeredFacetRun = false;
 		let dispose = () => {};
 		try {
+			if ("initialSnapshot" in (options ?? {})) writeSnapshot(options?.initialSnapshot);
 			if (this._isFacet) {
 				root = await this._rootAlarmOwner();
 				await root._cf_registerFacetRun(this.selfPath, id);
@@ -2653,15 +2708,7 @@ var Agent = class Agent extends Server {
 			}
 			dispose = await this.keepAlive();
 			const stash = (data) => {
-				const snapshot = JSON.stringify(data);
-				this.sql`
-          UPDATE cf_agents_runs SET snapshot = ${snapshot}
-          WHERE id = ${id}
-        `;
-				if (options?.managed) this.sql`
-            UPDATE cf_agents_fibers SET snapshot = ${snapshot}
-            WHERE fiber_id = ${id}
-          `;
+				writeSnapshot(options?.wrapStash ? options.wrapStash(data) : data);
 			};
 			try {
 				const result = await _fiberALS.run({
@@ -3467,6 +3514,7 @@ var Agent = class Agent extends Server {
 	}
 	async _cf_hydrateSubAgentConnectionsFromRoot() {
 		if (!this._isFacet || this._parentPath.length === 0) return;
+		if (this._cf_rootResolvesToSelf()) return;
 		const root = await this._rootAlarmOwner();
 		const metas = await root._cf_subAgentConnectionMetas(this.selfPath);
 		for (const meta of metas) this._cf_virtualSubAgentConnections.set(meta.id, {
@@ -3607,21 +3655,23 @@ var Agent = class Agent extends Server {
 	* broadcast to their own WebSocket clients reached via sub-agent
 	* routing.
 	*
-	* The facet's name (and `this.name` getter) is handled entirely by
-	* partyserver via `ctx.id.name`, which is populated because the
-	* parent passed an explicit named Durable Object id to
-	* `ctx.facets.get()` — see {@link _cf_resolveSubAgent}. No
-	* `setName()` call or `__ps_name` storage write is needed; the
-	* facet's name survives cold wake automatically because the factory
-	* re-runs and `idFromName` is deterministic.
+	* The facet's logical name is persisted separately from its routing id.
+	* Legacy facets used the logical name directly as `ctx.id.name`; newer
+	* facets can use path-scoped routing ids while preserving `this.name`.
 	*
 	* @internal Called by {@link subAgent}.
 	*/
-	async _cf_initAsFacet(name, parentPath = []) {
-		if (this.name !== name) throw new Error(`Facet bootstrap mismatch: expected this.name === "${name}" but got "${this.name}". This usually means the parent passed the wrong (or no) id to ctx.facets.get(). See _cf_resolveSubAgent.`);
+	async _cf_initAsFacet(name, parentPath = [], identityName = name) {
+		const routedName = super.name;
+		if (routedName !== identityName) throw new Error(`Facet bootstrap mismatch: expected routed identity "${identityName}" but got "${routedName}". This usually means the parent passed the wrong id to ctx.facets.get(). See _cf_resolveSubAgent.`);
 		this._isFacet = true;
+		this._facetName = name;
 		this._parentPath = parentPath;
-		await Promise.all([this.ctx.storage.put("cf_agents_is_facet", true), this.ctx.storage.put("cf_agents_parent_path", parentPath)]);
+		await Promise.all([
+			this.ctx.storage.put("cf_agents_is_facet", true),
+			this.ctx.storage.put("cf_agents_facet_name", name),
+			this.ctx.storage.put("cf_agents_parent_path", parentPath)
+		]);
 		this._suppressProtocolBroadcasts = true;
 		try {
 			await this.__unsafe_ensureInitialized();
@@ -3629,6 +3679,9 @@ var Agent = class Agent extends Server {
 			this._suppressProtocolBroadcasts = false;
 		}
 	}
+	get name() {
+		return this._facetName ?? logicalNameFromPathV2Identity(super.name) ?? super.name;
+	}
 	/**
 	* Ancestor chain for this agent, root-first. Empty for top-level
 	* DOs. Populated at facet init time; survives hibernation.
@@ -4333,27 +4386,37 @@ var Agent = class Agent extends Server {
 		if (!Cls) throw new Error(`Sub-agent class "${className}" not found in worker exports. Make sure the class is exported from your worker entry point and that the export name matches the class name.`);
 		if (name.includes("\0")) throw new Error(`Sub-agent name contains null character (\\0), which is reserved.`);
 		const facetKey = `${className}\0${name}`;
+		const childParentPath = this.selfPath;
+		const childPath = [...childParentPath, {
+			className,
+			name
+		}];
 		const rootClassName = this._parentPath[0]?.className ?? this.constructor.name;
 		const rootNs = ctx.exports[rootClassName];
 		if (!rootNs?.idFromName) {
 			const minificationHint = /^_*[a-z][a-z0-9]{0,2}$/.test(rootClassName) ? ` The class name "${rootClassName}" looks minified — make sure your bundler preserves class names (e.g. esbuild's \`keepNames: true\`).` : "";
 			throw new Error(`Sub-agent bootstrap requires the root agent class "${rootClassName}" to be available as a Durable Object namespace, but ctx.exports["${rootClassName}"] is missing or doesn't expose idFromName.${minificationHint} Make sure the root agent class is exported under that class name and registered in your wrangler.jsonc durable_objects.bindings.`);
 		}
-		const facetId = rootNs.idFromName(name);
+		const identity = await this._cf_subAgentIdentity(className, name, childPath);
+		const facetId = rootNs.idFromName(identity.name);
 		const stub = ctx.facets.get(facetKey, () => ({
 			class: Cls,
 			id: facetId
 		}));
-		const childParentPath = this.selfPath;
-		await __DO_NOT_USE_WILL_BREAK__agentContext.run({
-			agent: this,
-			connection: void 0,
-			request: void 0,
-			email: void 0
-		}, async () => {
-			await stub._cf_initAsFacet(name, childParentPath);
-		});
-		this._recordSubAgent(className, name);
+		this._recordSubAgent(className, name, identity);
+		try {
+			await __DO_NOT_USE_WILL_BREAK__agentContext.run({
+				agent: this,
+				connection: void 0,
+				request: void 0,
+				email: void 0
+			}, async () => {
+				await stub._cf_initAsFacet(name, childParentPath, identity.name);
+			});
+		} catch (error) {
+			if (!identity.existing) this._forgetSubAgent(className, name);
+			throw error;
+		}
 		return stub;
 	}
 	/**
@@ -4398,6 +4461,13 @@ var Agent = class Agent extends Server {
 		} catch {}
 		this._forgetSubAgent(cls.name, name);
 	}
+	_addColumnIfNotExists(sql) {
+		try {
+			this.ctx.storage.sql.exec(sql);
+		} catch (e) {
+			if (!(e instanceof Error ? e.message : String(e)).toLowerCase().includes("duplicate column")) throw e;
+		}
+	}
 	/** @internal */
 	_ensureSubAgentRegistry() {
 		if (this._subAgentRegistryReady) return;
@@ -4406,20 +4476,56 @@ var Agent = class Agent extends Server {
         class TEXT NOT NULL,
         name TEXT NOT NULL,
         created_at INTEGER NOT NULL,
+        identity_version TEXT,
+        identity_name TEXT,
         PRIMARY KEY (class, name)
       )
     `;
+		this._addColumnIfNotExists("ALTER TABLE cf_agents_sub_agents ADD COLUMN identity_version TEXT");
+		this._addColumnIfNotExists("ALTER TABLE cf_agents_sub_agents ADD COLUMN identity_name TEXT");
 		this._subAgentRegistryReady = true;
 	}
 	/** @internal */
-	_recordSubAgent(className, name) {
+	_recordSubAgent(className, name, identity) {
 		this._ensureSubAgentRegistry();
 		this.sql`
-      INSERT OR IGNORE INTO cf_agents_sub_agents (class, name, created_at)
-      VALUES (${className}, ${name}, ${Date.now()})
+      INSERT OR IGNORE INTO cf_agents_sub_agents
+        (class, name, created_at, identity_version, identity_name)
+      VALUES
+        (${className}, ${name}, ${Date.now()}, ${identity.version}, ${identity.name})
     `;
 	}
 	/** @internal */
+	_subAgentRegistryRow(className, name) {
+		this._ensureSubAgentRegistry();
+		return this.sql`
+      SELECT identity_version, identity_name
+      FROM cf_agents_sub_agents
+      WHERE class = ${className} AND name = ${name}
+      LIMIT 1
+    `[0] ?? null;
+	}
+	async _cf_subAgentIdentity(className, name, childPath) {
+		const row = this._subAgentRegistryRow(className, name);
+		if (row) {
+			if (row.identity_version === SUB_AGENT_IDENTITY_VERSION_PATH_V2 && typeof row.identity_name === "string") return {
+				version: SUB_AGENT_IDENTITY_VERSION_PATH_V2,
+				name: row.identity_name,
+				existing: true
+			};
+			return {
+				version: SUB_AGENT_IDENTITY_VERSION_LEGACY,
+				name,
+				existing: true
+			};
+		}
+		return {
+			version: SUB_AGENT_IDENTITY_VERSION_PATH_V2,
+			name: pathV2IdentityName(name, await sha256Hex(JSON.stringify(childPath))),
+			existing: false
+		};
+	}
+	/** @internal */
 	_forgetSubAgent(className, name) {
 		this._ensureSubAgentRegistry();
 		this.sql`
@@ -4552,7 +4658,7 @@ var Agent = class Agent extends Server {
 		if (!workflow) throw new Error(`Workflow binding '${workflowName}' not found in environment`);
 		const agentBindingName = options?.agentBinding ?? this._findAgentBindingName();
 		if (!agentBindingName) throw new Error("Could not detect Agent binding name from class name. Pass it explicitly via options.agentBinding");
-		const workflowId = options?.id ?? nanoid();
+		const workflowId = options?.id ?? `wf_${nanoid()}`;
 		const augmentedParams = {
 			...params,
 			__agentName: this.name,