@economic/agents 2.3.17 → 2.3.19

package/dist/index.d.mts

@@ -23,7 +23,7 @@ interface AgentEnv {
   LOCAL_AGENT_DB?: D1Database;
 }
 type SqlFn = InstanceType<typeof Agent$1>["sql"];
-type AgentConnectionStatus = "connecting" | "connected" | "disconnected" | "unauthorized";
+type AgentConnectionStatus = "connecting" | "connected" | "disconnected" | "unauthorized" | "error";
 type AgentConnectionType = "agent" | "chat" | "assistant";
 //#endregion
 //#region src/server/util/tools.d.ts
@@ -114,6 +114,17 @@ 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>;
+  /**
+   * 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

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";
@@ -195,17 +195,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 +312,21 @@ var Agent = class extends Think {
 			console.error("[Agent] Failed to register in agent_registry", 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
@@ -1012,7 +1027,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.17",
+  "version": "2.3.19",
   "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",
-    "@opentelemetry/sdk-trace-base": "^2.7.1",
-    "agents": "^0.16.0",
+    "@cloudflare/think": ">=0.9.0",
+    "@opentelemetry/sdk-trace-base": "^2.8.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"