@economic/agents 2.3.18 → 2.3.20

package/dist/index.d.mts

@@ -114,6 +114,32 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
    * cold start, so registration is not allowed to block the connection.
    */
   protected registerInstance(): Promise<void>;
+  /**
+   * The `(agent_name, durable_object_name)` key of the registered row for this
+   * DO. For a parented (facet) agent this resolves to the top-level parent's
+   * row, since facets are not registered themselves.
+   */
+  protected getRegisteredInstanceKey(): {
+    agentName: string;
+    durableObjectName: string;
+  };
+  /**
+   * Records activity against this DO's registered row by advancing its
+   * `updated_at`, so instances can be ordered by recency of activity.
+   * Best-effort and non-blocking — never allowed to interfere with a turn.
+   */
+  protected touchInstance(): Promise<void>;
+  /**
+   * Resolves the analytics/telemetry agent name to the entry-point agent: the
+   * top-level DO registered in the `agent` catalog table.
+   *
+   * `parentPath` is root-first and empty for top-level DOs, so:
+   * - chat agent running under an Assistant → the Assistant's class name
+   *   (e.g. `EvaAssistant`), since the Assistant is the catalog entry point;
+   * - standalone chat agent → its own class name (e.g. `EvaAgent`).
+   */
+  protected getTelemetryAgentName(): string;
+  protected getTelemetryActorId(): string;
 }
 //#endregion
 //#region src/server/features/messages.d.ts
@@ -238,6 +264,13 @@ declare abstract class Assistant<State = unknown> extends Agent$1<Cloudflare.Env
    * Best-effort and idempotent: no-ops on conflict, retried on the next start.
    */
   private registerInstance;
+  /**
+   * Records activity against this Assistant's registry row by advancing its
+   * `updated_at`, so instances can be ordered by recency of activity. An
+   * Assistant is a top-level DO, so its row is keyed by its own class + name.
+   * Best-effort and non-blocking.
+   */
+  private touchInstance;
   /**
    * Binding of the legacy v1 chat Durable Object class, used to migrate a
    * user's v1 chats into facets the first time they connect. Set this on the

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { i as verifyJwt, n as createAgentTracer, r as extractTokenFromConnectRequest, t as routeAgentRequest } from "./route-agent-request-lVm3eus2.mjs";
+import { a as verifyJwt, i as extractTokenFromConnectRequest, n as createAgentTracer, r as recordFeedbackAnalytics, t as routeAgentRequest } from "./route-agent-request-sspiKVkm.mjs";
 import { Agent as Agent$1, callable, getCurrentAgent } from "agents";
 import { Think, skills } from "@cloudflare/think";
 import { Output, convertToModelMessages, generateText, jsonSchema, pruneMessages, tool as tool$1 } from "ai";
@@ -28,12 +28,31 @@ const TURN_PROTOCOL_RULES_PROMPT = `These rules are specific for responding to u
 * Registers a top-level DO in the global registry.
 *
 * Idempotent: keyed on `(agent_name, durable_object_name)`, so repeated calls
-* across cold starts no-op and `created_at` reflects the first registration.
+* across cold starts no-op and timestamps reflect the first registration.
+* `updated_at` is seeded to `created_at`; ongoing activity is recorded
+* separately via {@link touchAgentInstance} so cold-start re-registration
+* never inflates the activity timestamp.
 */
 async function registerAgentInstance(db, input) {
-	await db.prepare(`INSERT INTO agent_registry (agent_name, durable_object_name, actor_id, created_at)
-       VALUES (?, ?, ?, ?)
-       ON CONFLICT (agent_name, durable_object_name) DO NOTHING`).bind(input.agentName, input.durableObjectName, input.actorId, input.createdAt).run();
+	await db.prepare(`INSERT INTO agent_registry (agent_name, durable_object_name, actor_id, created_at, updated_at)
+       VALUES (?, ?, ?, ?, ?)
+       ON CONFLICT (agent_name, durable_object_name) DO NOTHING`).bind(input.agentName, input.durableObjectName, input.actorId, input.createdAt, input.createdAt).run();
+}
+/**
+* Records activity on a registered top-level DO by advancing its `updated_at`.
+*
+* Used to order instances by recency of activity. Keyed on
+* `(agent_name, durable_object_name)` to target the exact registered row —
+* for a parented (facet) agent this is the top-level parent's row, since
+* facets are not registered themselves.
+*
+* Best-effort: a no-op if the row does not yet exist (registration is
+* retried on the next cold start).
+*/
+async function touchAgentInstance(db, input) {
+	await db.prepare(`UPDATE agent_registry
+       SET updated_at = ?
+       WHERE agent_name = ? AND durable_object_name = ?`).bind(input.updatedAt, input.agentName, input.durableObjectName).run();
 }
 //#endregion
 //#region src/server/util/agent.ts
@@ -172,6 +191,7 @@ var Agent = class extends Think {
 	* `returned.tools` into your own `TurnConfig.tools` if you return tools.
 	*/
 	async beforeTurn(ctx) {
+		this.touchInstance();
 		this._toolContextForCurrentTurn = this.getToolContextForCurrentTurn(ctx.body);
 		this._toolsForCurrentTurn = ctx.tools;
 		const activeSkillName = this._getLastActivatedSkillName(ctx.messages);
@@ -195,17 +215,17 @@ var Agent = class extends Think {
 			experimental_telemetry: {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
-					agentName: this.constructor.name,
+					agentName: this.getTelemetryAgentName(),
 					durableObjectName: this.name,
-					actorId: this.getActorIdFromDurableObjectName(),
+					actorId: this.getTelemetryActorId(),
 					clientIp: this.clientIp,
 					forwardedFor: this.forwardedFor
 				}),
 				metadata: {
-					agentName: this.constructor.name,
+					agentName: this.getTelemetryAgentName(),
 					version: "v2",
 					durableObjectName: this.name,
-					actorId: this.getActorIdFromDurableObjectName()
+					actorId: this.getTelemetryActorId()
 				}
 			}
 		};
@@ -312,6 +332,47 @@ var Agent = class extends Think {
 			console.error("[Agent] Failed to register in agent_registry", error);
 		}
 	}
+	/**
+	* The `(agent_name, durable_object_name)` key of the registered row for this
+	* DO. For a parented (facet) agent this resolves to the top-level parent's
+	* row, since facets are not registered themselves.
+	*/
+	getRegisteredInstanceKey() {
+		return {
+			agentName: this.parentPath[0]?.className ?? this.constructor.name,
+			durableObjectName: this.parentPath[0]?.name ?? this.name
+		};
+	}
+	/**
+	* Records activity against this DO's registered row by advancing its
+	* `updated_at`, so instances can be ordered by recency of activity.
+	* Best-effort and non-blocking — never allowed to interfere with a turn.
+	*/
+	async touchInstance() {
+		try {
+			await touchAgentInstance(this.env.AGENTS_DB, {
+				...this.getRegisteredInstanceKey(),
+				updatedAt: Date.now()
+			});
+		} catch (error) {
+			console.error("[Agent] Failed to update agent_registry activity", error);
+		}
+	}
+	/**
+	* Resolves the analytics/telemetry agent name to the entry-point agent: the
+	* top-level DO registered in the `agent` catalog table.
+	*
+	* `parentPath` is root-first and empty for top-level DOs, so:
+	* - chat agent running under an Assistant → the Assistant's class name
+	*   (e.g. `EvaAssistant`), since the Assistant is the catalog entry point;
+	* - standalone chat agent → its own class name (e.g. `EvaAgent`).
+	*/
+	getTelemetryAgentName() {
+		return this.parentPath[0]?.className ?? this.constructor.name;
+	}
+	getTelemetryActorId() {
+		return this.parentPath[0]?.name ?? this.getActorIdFromDurableObjectName();
+	}
 };
 //#endregion
 //#region src/server/features/chats.ts
@@ -703,6 +764,7 @@ var Assistant = class extends Agent$1 {
 		const now = Date.now();
 		await this.subAgent(this.agent, id);
 		registerChat(this.sql.bind(this), id, now);
+		this.touchInstance(now);
 		return id;
 	}
 	async deleteChat(id) {
@@ -747,6 +809,23 @@ var Assistant = class extends Agent$1 {
 		}
 	}
 	/**
+	* Records activity against this Assistant's registry row by advancing its
+	* `updated_at`, so instances can be ordered by recency of activity. An
+	* Assistant is a top-level DO, so its row is keyed by its own class + name.
+	* Best-effort and non-blocking.
+	*/
+	async touchInstance(updatedAt) {
+		try {
+			await touchAgentInstance(this.env.AGENTS_DB, {
+				agentName: this.constructor.name,
+				durableObjectName: this.name,
+				updatedAt
+			});
+		} catch (error) {
+			console.error("[Assistant] Failed to update agent_registry activity", error);
+		}
+	}
+	/**
 	* Binding of the legacy v1 chat Durable Object class, used to migrate a
 	* user's v1 chats into facets the first time they connect. Set this on the
 	* concrete subclass to enable lazy v1 -> v2 migration; leave undefined to
@@ -1012,7 +1091,13 @@ var ChatAgent = class extends Agent {
 	* @returns The message id and the rating.
 	*/
 	async submitMessageFeedback(messageId, rating, comment) {
-		return submitMessageFeedback(this.sql.bind(this), messageId, rating, comment);
+		const result = submitMessageFeedback(this.sql.bind(this), messageId, rating, comment);
+		recordFeedbackAnalytics(this.env.AGENTS_ANALYTICS, {
+			agentName: this.getTelemetryAgentName(),
+			durableObjectName: this.name,
+			actorId: this.getTelemetryActorId()
+		}, messageId, rating);
+		return result;
 	}
 	/**
 	* Returns all message feedback for the current chat.

package/dist/{route-agent-request-lVm3eus2.mjs → route-agent-request-sspiKVkm.mjs}

@@ -101,6 +101,27 @@ async function verifyJwt(request, config) {
 	};
 }
 //#endregion
+//#region src/server/features/telemetry/skills.ts
+/**
+* Extracts the skill names loaded by an `activate_skill` tool call.
+*
+* v2 `activate_skill` input is `{ skills: string[] }` — a single call can load
+* multiple skills, so this returns every requested skill name.
+*/
+function extractSkillNames(toolName, input) {
+	if (toolName !== "activate_skill" || !input || typeof input !== "object") return [];
+	const { skills } = input;
+	if (!Array.isArray(skills)) return [];
+	return skills.filter((skill) => typeof skill === "string");
+}
+/**
+* Single-skill variant used where one representative skill name is sufficient
+* (e.g. audit-log attribution and current-skill tracking).
+*/
+function extractSkillName(toolName, input) {
+	return extractSkillNames(toolName, input)[0];
+}
+//#endregion
 //#region src/server/features/telemetry/utils.ts
 function durationMs(duration) {
 	return duration[0] * 1e3 + duration[1] / 1e6;
@@ -169,18 +190,6 @@ function extractTools(messages) {
 	}
 	return tools;
 }
-function extractSkillName(toolName, input) {
-	if (!input || typeof input !== "object") return;
-	const record = input;
-	if (toolName === "load_context") {
-		const key = record.key;
-		return typeof key === "string" ? key : void 0;
-	}
-	if (toolName === "activate_skill") {
-		const skill = record.skill ?? record.name ?? record.key;
-		return typeof skill === "string" ? skill : void 0;
-	}
-}
 function pushToolCall(map, key, toolCall) {
 	const existing = map.get(key);
 	if (existing) existing.push(toolCall);
@@ -276,16 +285,35 @@ function writeAnalyticsDatapoint(analytics, dataPoint) {
 		console.error("[Agent] Failed to write analytics datapoint", error);
 	}
 }
-function handleAnalyticsSpan(span, analytics) {
+/**
+* Writes a message-feedback rating to Analytics Engine so sentiment can be
+* aggregated across all chats without fanning out to every chat DO.
+*
+* Emitted on every rating change; the dashboard takes the latest rating per
+* `messageId` (blob4) so re-rates and clears are idempotent.
+*/
+function recordFeedbackAnalytics(analytics, context, messageId, rating) {
+	writeAnalyticsDatapoint(analytics, {
+		indexes: [context.actorId],
+		blobs: [
+			"feedback",
+			context.agentName,
+			context.durableObjectName,
+			messageId
+		],
+		doubles: [rating]
+	});
+}
+function handleAnalyticsSpan(span, analytics, context) {
 	if (span.name === "ai.streamText.doStream") {
 		const promptMessages = parseJson(stringAttribute(span, "ai.prompt.messages"));
 		const responseText = stringAttribute(span, "ai.response.text") ?? "";
 		writeAnalyticsDatapoint(analytics, {
-			indexes: [stringAttribute(span, "ai.telemetry.metadata.actorId") ?? ""],
+			indexes: [context.actorId],
 			blobs: [
 				"llm_call",
-				stringAttribute(span, "ai.telemetry.metadata.agentName") ?? "",
-				stringAttribute(span, "ai.telemetry.metadata.durableObjectName") ?? "",
+				context.agentName,
+				context.durableObjectName,
 				stringAttribute(span, "ai.model.id") ?? "",
 				stringAttribute(span, "ai.model.provider") ?? "",
 				stringAttribute(span, "ai.response.finishReason") ?? ""
@@ -305,25 +333,29 @@ function handleAnalyticsSpan(span, analytics) {
 	}
 	if (span.name === "ai.toolCall") {
 		const toolName = stringAttribute(span, "ai.toolCall.name");
-		const toolInput = parseJson(stringAttribute(span, "ai.toolCall.args"));
-		const durableObjectName = stringAttribute(span, "ai.telemetry.metadata.durableObjectName") ?? "";
-		const skillName = extractSkillName(toolName, toolInput) ?? currentSkillByChat.get(durableObjectName) ?? "";
+		const argsRaw = stringAttribute(span, "ai.toolCall.args");
+		const toolInput = parseJson(argsRaw);
 		const success = span.status.code === 0;
-		writeAnalyticsDatapoint(analytics, {
-			indexes: [stringAttribute(span, "ai.telemetry.metadata.actorId") ?? ""],
+		const duration = durationMs(span.duration);
+		const argsSize = argsRaw?.length ?? 0;
+		const resultSize = stringAttribute(span, "ai.toolCall.result")?.length ?? 0;
+		const activatedSkills = extractSkillNames(toolName, toolInput);
+		const skillNames = activatedSkills.length ? activatedSkills : [currentSkillByChat.get(context.durableObjectName) ?? ""];
+		for (const skillName of skillNames) writeAnalyticsDatapoint(analytics, {
+			indexes: [context.actorId],
 			blobs: [
 				"tool_call",
-				stringAttribute(span, "ai.telemetry.metadata.agentName") ?? "",
-				durableObjectName,
+				context.agentName,
+				context.durableObjectName,
 				toolName ?? "",
 				skillName,
 				success ? "success" : "error"
 			],
 			doubles: [
-				durationMs(span.duration),
+				duration,
 				success ? 1 : 0,
-				0,
-				0,
+				argsSize,
+				resultSize,
 				0,
 				0,
 				0,
@@ -349,11 +381,11 @@ var AgentSpanExporter = class {
 				for (const span of spans) if (span.name === "ai.streamText.doStream") {
 					rememberDoStream(span, this.context.durableObjectName);
 					attachToolCallsToChat(span, this.context.durableObjectName);
-					handleAnalyticsSpan(span, this.analytics);
+					handleAnalyticsSpan(span, this.analytics, this.context);
 				} else if (span.name === "ai.streamText") await handleAuditSpan(span, this.auditLogs, this.context);
 				else if (span.name === "ai.toolCall") {
 					rememberToolCall(span);
-					handleAnalyticsSpan(span, this.analytics);
+					handleAnalyticsSpan(span, this.analytics, this.context);
 				}
 				resultCallback({ code: 0 });
 			} catch (error) {
@@ -383,4 +415,4 @@ async function routeAgentRequest$1(request, env, options) {
 	return response;
 }
 //#endregion
-export { verifyJwt as i, createAgentTracer as n, extractTokenFromConnectRequest as r, routeAgentRequest$1 as t };
+export { verifyJwt as a, extractTokenFromConnectRequest as i, createAgentTracer as n, recordFeedbackAnalytics as r, routeAgentRequest$1 as t };

package/dist/v1.mjs

@@ -1,4 +1,4 @@
-import { i as verifyJwt, n as createAgentTracer, r as extractTokenFromConnectRequest, t as routeAgentRequest } from "./route-agent-request-lVm3eus2.mjs";
+import { a as verifyJwt, i as extractTokenFromConnectRequest, n as createAgentTracer, t as routeAgentRequest } from "./route-agent-request-sspiKVkm.mjs";
 import { Agent as Agent$1, callable, getCurrentAgent } from "agents";
 import { Output, convertToModelMessages, generateText, jsonSchema, stepCountIs, streamText, tool } from "ai";
 import { AIChatAgent } from "@cloudflare/ai-chat";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "2.3.18",
+  "version": "2.3.20",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "files": [
@@ -26,9 +26,9 @@
     "@ai-sdk/anthropic": "^3.0.77",
     "@ai-sdk/google": "^3.0.73",
     "@cloudflare/ai-chat": "^0.8.5",
-    "@cloudflare/think": "^0.9.0",
+    "@cloudflare/think": ">=0.9.0",
     "@opentelemetry/sdk-trace-base": "^2.8.0",
-    "agents": "^0.16.0",
+    "agents": ">=0.16.0 <1.0.0",
     "ai": "^6.0.197",
     "jose": "^6.2.3",
     "nanoid": "^5.1.11"
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@cloudflare/think": ">=0.9.0",
-    "@cloudflare/vite-plugin": ">=1.40.2",
+    "@cloudflare/vite-plugin": "^1.42.0",
     "@cloudflare/worker-bundler": ">=0.2.1",
     "agents": ">=0.16.0 <1.0.0",
     "vite": ">=8.0.0"

package/schema/0002_agent_registry_updated_at.sql

@@ -0,0 +1,13 @@
+-- ─── agent_registry.updated_at ────────────────────────────────────────────────────
+-- Adds an activity timestamp to the registry so top-level DOs (one row per
+-- Assistant, i.e. per user) can be ordered by recency of activity. Bumped by
+-- the owning DO whenever a chat is created or has a turn.
+--
+-- Existing rows are backfilled to created_at so ordering remains sensible
+-- before any new activity updates the column.
+
+ALTER TABLE agent_registry ADD COLUMN updated_at INTEGER;
+
+UPDATE agent_registry SET updated_at = created_at WHERE updated_at IS NULL;
+
+CREATE INDEX IF NOT EXISTS agent_registry_updated ON agent_registry(updated_at);