@economic/agents 2.3.20 → 2.3.22

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as verifyJwt, i as extractTokenFromConnectRequest, n as createAgentTracer, r as recordFeedbackAnalytics, t as routeAgentRequest } from "./route-agent-request-sspiKVkm.mjs";
+import { a as verifyJwt, i as extractTokenFromConnectRequest, n as createAgentTracer, r as recordFeedbackAnalytics, t as routeAgentRequest } from "./route-agent-request-DBGSXu2O.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";

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

@@ -105,14 +105,16 @@ async function verifyJwt(request, config) {
 /**
 * 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.
+* v1 `activate_skill` input is `{ skills: string[] }`; v2 uses
+* `{ name: string }`. Return every requested skill name while ignoring empty
+* values so analytics does not group activations under a blank skill.
 */
 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");
+	const { name, skills } = input;
+	if (typeof name === "string" && name) return [name];
+	if (Array.isArray(skills)) return skills.filter((skill) => typeof skill === "string" && skill !== "");
+	return [];
 }
 /**
 * Single-skill variant used where one representative skill name is sufficient
@@ -277,6 +279,15 @@ async function handleAuditSpan(span, auditLogs, context) {
 }
 //#endregion
 //#region src/server/features/telemetry/analytics.ts
+const emittedToolCallIds = /* @__PURE__ */ new Set();
+function safeJsonString(value) {
+	if (value === void 0) return void 0;
+	try {
+		return JSON.stringify(value);
+	} catch {
+		return;
+	}
+}
 function writeAnalyticsDatapoint(analytics, dataPoint) {
 	if (!analytics) return;
 	try {
@@ -308,6 +319,7 @@ 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") ?? "";
+		const responseToolCalls = parseJson(stringAttribute(span, "ai.response.toolCalls"));
 		writeAnalyticsDatapoint(analytics, {
 			indexes: [context.actorId],
 			blobs: [
@@ -329,10 +341,48 @@ function handleAnalyticsSpan(span, analytics, context) {
 				responseText.length
 			]
 		});
+		if (Array.isArray(responseToolCalls)) for (const value of responseToolCalls) {
+			if (!value || typeof value !== "object") continue;
+			const toolCall = value;
+			const toolCallId = typeof toolCall.toolCallId === "string" ? toolCall.toolCallId : void 0;
+			if (toolCallId && emittedToolCallIds.has(toolCallId)) continue;
+			const toolName = typeof toolCall.toolName === "string" ? toolCall.toolName : void 0;
+			if (!toolName) continue;
+			const input = toolCall.input;
+			const argsRaw = safeJsonString(input);
+			const success = span.status.code === 0;
+			const activatedSkills = extractSkillNames(toolName, input);
+			const skillNames = activatedSkills.length ? activatedSkills : [currentSkillByChat.get(context.durableObjectName) ?? ""];
+			if (toolCallId) emittedToolCallIds.add(toolCallId);
+			for (const skillName of skillNames) writeAnalyticsDatapoint(analytics, {
+				indexes: [context.actorId],
+				blobs: [
+					"tool_call",
+					context.agentName,
+					context.durableObjectName,
+					toolName,
+					skillName,
+					success ? "success" : "error"
+				],
+				doubles: [
+					0,
+					success ? 1 : 0,
+					argsRaw?.length ?? 0,
+					0,
+					0,
+					0,
+					0,
+					0
+				]
+			});
+		}
 		return;
 	}
 	if (span.name === "ai.toolCall") {
 		const toolName = stringAttribute(span, "ai.toolCall.name");
+		const toolCallId = stringAttribute(span, "ai.toolCall.id");
+		if (toolCallId && emittedToolCallIds.has(toolCallId)) return;
+		if (toolCallId) emittedToolCallIds.add(toolCallId);
 		const argsRaw = stringAttribute(span, "ai.toolCall.args");
 		const toolInput = parseJson(argsRaw);
 		const success = span.status.code === 0;

package/dist/v1.mjs

@@ -1,4 +1,4 @@
-import { a as verifyJwt, i as extractTokenFromConnectRequest, n as createAgentTracer, t as routeAgentRequest } from "./route-agent-request-sspiKVkm.mjs";
+import { a as verifyJwt, i as extractTokenFromConnectRequest, n as createAgentTracer, t as routeAgentRequest } from "./route-agent-request-DBGSXu2O.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.20",
+  "version": "2.3.22",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "files": [