@economic/agents 2.1.1 → 2.1.3

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-BKgBMVF0.mjs";
+import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-BDxmv_R7.mjs";
 import { Output, convertToModelMessages, generateText, jsonSchema, stepCountIs, streamText, tool } from "ai";
 import { Agent as Agent$1, callable, getCurrentAgent, routeAgentRequest as routeAgentRequest$1 } from "agents";
 import { AIChatAgent } from "@cloudflare/ai-chat";
@@ -359,16 +359,16 @@ var Agent = class extends Agent$1 {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
 					agentName: this.constructor.name,
-					chatId: this.name,
-					userId: this.getUserId(),
+					durableObjectName: this.name,
+					actorId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {}
 				}),
 				metadata: {
 					agentName: this.constructor.name,
 					version: "v1",
-					chatId: this.name,
-					userId: this.getUserId(),
+					durableObjectName: this.name,
+					actorId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {},
 					...config.experimental_telemetry?.metadata
@@ -769,16 +769,16 @@ var ChatAgent = class extends AIChatAgent {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
 					agentName: this.constructor.name,
-					chatId: this.name,
-					userId: this.getUserId(),
+					durableObjectName: this.name,
+					actorId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {}
 				}),
 				metadata: {
 					agentName: this.constructor.name,
 					version: "v1",
-					chatId: this.name,
-					userId: this.getUserId(),
+					durableObjectName: this.name,
+					actorId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {},
 					...config.experimental_telemetry?.metadata

package/dist/{telemetry-BKgBMVF0.mjs → telemetry-BDxmv_R7.mjs}

@@ -125,12 +125,12 @@ function parseJson(value) {
 function safePathSegment(value, fallback) {
 	return (value || fallback).replace(/[^a-zA-Z0-9._-]/g, "_");
 }
-function createAuditLogKey(agentName, chatId) {
+function createAuditLogKey(agentName, durableObjectName) {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-");
 	const id = crypto.randomUUID().slice(0, 8);
 	return [
 		safePathSegment(agentName, "unknown-agent"),
-		safePathSegment(chatId, "unknown-chat"),
+		safePathSegment(durableObjectName, "unknown-chat"),
 		`${timestamp}-${id}.json`
 	].join("/");
 }
@@ -208,34 +208,34 @@ function rememberToolCall(span) {
 	if (parentSpanId) pushToolCall(toolCallsByParentSpan, parentSpanId, toolCall);
 	pendingToolCalls.push(toolCall);
 }
-function attachToolCallsToChat(span, chatId) {
+function attachToolCallsToChat(span, durableObjectName) {
 	const spanId = span.spanContext().spanId;
 	const toolCalls = toolCallsByParentSpan.get(spanId) ?? pendingToolCalls.splice(0);
 	if (!toolCalls.length) return;
 	toolCallsByParentSpan.delete(spanId);
-	const currentSkill = currentSkillByChat.get(chatId);
+	const currentSkill = currentSkillByChat.get(durableObjectName);
 	const attributedToolCalls = toolCalls.map((toolCall) => {
 		const skillName = toolCall.skillName ?? currentSkill;
-		if (toolCall.skillName) currentSkillByChat.set(chatId, toolCall.skillName);
+		if (toolCall.skillName) currentSkillByChat.set(durableObjectName, toolCall.skillName);
 		return {
 			...toolCall,
 			...skillName ? { skillName } : {}
 		};
 	});
-	toolCallsByChat.set(chatId, [...toolCallsByChat.get(chatId) ?? [], ...attributedToolCalls]);
+	toolCallsByChat.set(durableObjectName, [...toolCallsByChat.get(durableObjectName) ?? [], ...attributedToolCalls]);
 }
 function buildAuditLog(span, context) {
-	const lastDoStream = lastDoStreamByChat.get(context.chatId);
-	lastDoStreamByChat.delete(context.chatId);
+	const lastDoStream = lastDoStreamByChat.get(context.durableObjectName);
+	lastDoStreamByChat.delete(context.durableObjectName);
 	const promptMessages = parseJson(stringAttribute(lastDoStream ?? span, "ai.prompt.messages"));
 	const fallbackPrompt = parseJson(stringAttribute(span, "ai.prompt"));
 	const inputMessages = promptMessages ?? fallbackPrompt?.messages ?? [];
-	const spanToolCalls = toolCallsByChat.get(context.chatId) ?? [];
-	toolCallsByChat.delete(context.chatId);
+	const spanToolCalls = toolCallsByChat.get(context.durableObjectName) ?? [];
+	toolCallsByChat.delete(context.durableObjectName);
 	return {
-		id: createAuditLogKey(context.agentName, context.chatId),
+		id: createAuditLogKey(context.agentName, context.durableObjectName),
 		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-		chatId: context.chatId,
+		durableObjectName: context.durableObjectName,
 		agent: {
 			name: context.agentName,
 			llm: {
@@ -244,7 +244,7 @@ function buildAuditLog(span, context) {
 			}
 		},
 		actor: {
-			userId: context.userId,
+			id: context.actorId,
 			ip: {
 				client: context.clientIp ?? context.forwardedFor?.split(",").map((ip) => ip.trim()).filter(Boolean)[0],
 				forwardedFor: context.forwardedFor?.split(",").map((ip) => ip.trim()).filter(Boolean) ?? []
@@ -256,8 +256,8 @@ function buildAuditLog(span, context) {
 		tools: [...extractTools(inputMessages), ...spanToolCalls]
 	};
 }
-function rememberDoStream(span, chatId) {
-	lastDoStreamByChat.set(chatId, span);
+function rememberDoStream(span, durableObjectName) {
+	lastDoStreamByChat.set(durableObjectName, span);
 }
 async function handleAuditSpan(span, auditLogs, context) {
 	const auditLog = buildAuditLog(span, context);
@@ -280,11 +280,11 @@ function handleAnalyticsSpan(span, analytics) {
 		const promptMessages = parseJson(stringAttribute(span, "ai.prompt.messages"));
 		const responseText = stringAttribute(span, "ai.response.text") ?? "";
 		writeAnalyticsDatapoint(analytics, {
-			indexes: [stringAttribute(span, "ai.telemetry.metadata.userId") ?? ""],
+			indexes: [stringAttribute(span, "ai.telemetry.metadata.actorId") ?? ""],
 			blobs: [
 				"llm_call",
 				stringAttribute(span, "ai.telemetry.metadata.agentName") ?? "",
-				stringAttribute(span, "ai.telemetry.metadata.chatId") ?? "",
+				stringAttribute(span, "ai.telemetry.metadata.durableObjectName") ?? "",
 				stringAttribute(span, "ai.model.id") ?? "",
 				stringAttribute(span, "ai.model.provider") ?? "",
 				stringAttribute(span, "ai.response.finishReason") ?? ""
@@ -305,15 +305,15 @@ 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 chatId = stringAttribute(span, "ai.telemetry.metadata.chatId") ?? "";
-		const skillName = extractSkillName(toolName, toolInput) ?? currentSkillByChat.get(chatId) ?? "";
+		const durableObjectName = stringAttribute(span, "ai.telemetry.metadata.durableObjectName") ?? "";
+		const skillName = extractSkillName(toolName, toolInput) ?? currentSkillByChat.get(durableObjectName) ?? "";
 		const success = span.status.code === 0;
 		writeAnalyticsDatapoint(analytics, {
-			indexes: [stringAttribute(span, "ai.telemetry.metadata.userId") ?? ""],
+			indexes: [stringAttribute(span, "ai.telemetry.metadata.actorId") ?? ""],
 			blobs: [
 				"tool_call",
 				stringAttribute(span, "ai.telemetry.metadata.agentName") ?? "",
-				chatId,
+				durableObjectName,
 				toolName ?? "",
 				skillName,
 				success ? "success" : "error"
@@ -346,8 +346,8 @@ var AgentSpanExporter = class {
 		(async () => {
 			try {
 				for (const span of spans) if (span.name === "ai.streamText.doStream") {
-					rememberDoStream(span, this.context.chatId);
-					attachToolCallsToChat(span, this.context.chatId);
+					rememberDoStream(span, this.context.durableObjectName);
+					attachToolCallsToChat(span, this.context.durableObjectName);
 					handleAnalyticsSpan(span, this.analytics);
 				} else if (span.name === "ai.streamText") await handleAuditSpan(span, this.auditLogs, this.context);
 				else if (span.name === "ai.toolCall") {

package/dist/v2.d.mts

@@ -53,7 +53,7 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
   /**
    * Returns the user ID from the durable object name.
    */
-  protected getUserIdFromDurableObjectName(): string;
+  protected getActorIdFromDurableObjectName(): string;
   protected getParentAgent<T extends Agent$1>(): T | undefined;
   abstract getModel(ctx?: ToolContext<RequestContext, UserContext>): LanguageModel;
   abstract getSystemPrompt(ctx?: ToolContext<RequestContext, UserContext>): string;
@@ -155,7 +155,7 @@ declare abstract class Assistant extends Agent$1<Cloudflare.Env, AgentConnection
   protected abstract fastModel: LanguageModel;
   onStart(): void;
   onClose(): Promise<void>;
-  onConnect(): Promise<void>;
+  onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   createChat(): Promise<string>;
   deleteChat(id: string): Promise<void>;
   getChats(): Promise<Chat[]>;

package/dist/v2.mjs

@@ -1,4 +1,4 @@
-import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-BKgBMVF0.mjs";
+import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-BDxmv_R7.mjs";
 import { Output, convertToModelMessages, generateText, jsonSchema, pruneMessages, tool as tool$1 } from "ai";
 import { Agent as Agent$1, callable, getCurrentAgent } from "agents";
 import { Think } from "@cloudflare/think";
@@ -56,8 +56,9 @@ var Agent = class extends Think {
 	/**
 	* Returns the user ID from the durable object name.
 	*/
-	getUserIdFromDurableObjectName() {
-		return this.name.split(":")[0];
+	getActorIdFromDurableObjectName() {
+		if (this.name.includes(":")) return this.name.split(":")[0];
+		return "system";
 	}
 	getParentAgent() {
 		if (this.parentPath.length) {
@@ -94,10 +95,6 @@ var Agent = class extends Think {
 			console.error("[Agent] Connection rejected: no AGENTS_AUDIT_LOGS bound. Audit logs are required.");
 		}
 		if (!this.env.AGENTS_ANALYTICS) console.warn("[Agent] No AGENTS_ANALYTICS bound. Analytics will not be collected.");
-		if (!this.getUserIdFromDurableObjectName()) {
-			hasCorrectBindings = false;
-			console.error("[Agent] Connection rejected: name must be in the format userId:uniqueChatId");
-		}
 		if (!hasCorrectBindings) {
 			this.setState({
 				...this.initialState,
@@ -185,16 +182,16 @@ var Agent = class extends Think {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
 					agentName: this.constructor.name,
-					chatId: this.name,
-					userId: this.getUserIdFromDurableObjectName(),
+					durableObjectName: this.name,
+					actorId: this.getActorIdFromDurableObjectName(),
 					clientIp: this.clientIp,
 					forwardedFor: this.forwardedFor
 				}),
 				metadata: {
 					agentName: this.constructor.name,
 					version: "v2",
-					chatId: this.name,
-					userId: this.getUserIdFromDurableObjectName()
+					durableObjectName: this.name,
+					actorId: this.getActorIdFromDurableObjectName()
 				}
 			}
 		};
@@ -379,7 +376,7 @@ var Assistant = class extends Agent$1 {
 	};
 	onStart() {
 		this.setState({
-			type: "assistant",
+			...this.initialState,
 			status: "connecting",
 			subAgentName: this.agent.name
 		});
@@ -387,14 +384,47 @@ var Assistant = class extends Agent$1 {
 	}
 	async onClose() {
 		this.setState({
-			type: "assistant",
+			...this.initialState,
 			status: "disconnected",
 			subAgentName: this.agent.name
 		});
 	}
-	async onConnect() {
+	async onConnect(connection, ctx) {
+		const getJwtAuthConfig = this.agent.getJwtAuthConfig;
+		if (getJwtAuthConfig) {
+			const config = getJwtAuthConfig(this.env);
+			if (config) {
+				let result;
+				try {
+					result = await verifyJwt(ctx.request, config);
+				} catch (error) {
+					this.setState({
+						...this.initialState,
+						status: "unauthorized",
+						subAgentName: this.agent.name
+					});
+					console.error(`[Assistant] JWT verification error - ${error}`);
+					connection.close(4001, "Unauthorized");
+					return;
+				}
+				if (!result.success) {
+					this.setState({
+						...this.initialState,
+						status: "unauthorized",
+						subAgentName: this.agent.name
+					});
+					console.error(`[Assistant] JWT verification error - ${result.message}`);
+					connection.close(result.status === 401 ? 4001 : 4003, result.message);
+					return;
+				}
+				connection.setState({
+					authenticated: true,
+					claims: result.claims
+				});
+			}
+		}
 		this.setState({
-			type: "assistant",
+			...this.initialState,
 			status: "connected",
 			subAgentName: this.agent.name
 		});
@@ -443,12 +473,11 @@ function ensureRatingsTableExists(sql) {
 	try {
 		sql`CREATE TABLE IF NOT EXISTS assistant_messages_ratings (
         message_id          TEXT NOT NULL,
-        durable_object_name TEXT NOT NULL,
         rating              INTEGER,
         comment             TEXT,
-        created_at          TEXT NOT NULL,
-        updated_at          TEXT NOT NULL,
-        PRIMARY KEY (message_id, durable_object_name)
+        created_at          INTEGER NOT NULL,
+        updated_at          INTEGER NOT NULL,
+        PRIMARY KEY (message_id)
       )`;
 	} catch (error) {
 		console.error("[Agent] Failed to create ratings table", error);
@@ -458,15 +487,14 @@ function ensureRatingsTableExists(sql) {
 * Rates a message.
 * @param sql - The SQL function to use to execute the query.
 * @param messageId - The ID of the message to rate.
-* @param durable_object_name - The name of the Durable Object to rate the message for.
 * @param rating - The rating to give the message.
 * @param now - The date and time to use for the created_at and updated_at columns.
 */
-function rateMessage(sql, messageId, durable_object_name, rating, comment, now = /* @__PURE__ */ new Date()) {
+function rateMessage(sql, messageId, rating, comment, now = /* @__PURE__ */ new Date()) {
 	try {
-		sql`INSERT INTO assistant_messages_ratings (message_id, durable_object_name, rating, comment, created_at, updated_at)
-        VALUES (${messageId}, ${durable_object_name}, ${rating}, ${comment ?? null}, ${now.toISOString()}, ${now.toISOString()})
-        ON CONFLICT (message_id, durable_object_name) DO UPDATE SET
+		sql`INSERT INTO assistant_messages_ratings (message_id, rating, comment, created_at, updated_at)
+        VALUES (${messageId}, ${rating}, ${comment ?? null}, ${now.getTime()}, ${now.getTime()})
+        ON CONFLICT (message_id) DO UPDATE SET
           rating = excluded.rating,
           comment = excluded.comment,
         updated_at = excluded.updated_at`;
@@ -477,12 +505,11 @@ function rateMessage(sql, messageId, durable_object_name, rating, comment, now =
 /**
 * Gets the ratings for a message.
 * @param sql - The SQL function to use to execute the query.
-* @param durable_object_name - The name of the Durable Object to get the ratings for.
 * @returns A record of message IDs and their ratings.
 */
-function getMessageRatings(sql, durable_object_name) {
+function getMessageRatings(sql) {
 	try {
-		const ratings = sql`SELECT message_id, rating, comment FROM assistant_messages_ratings WHERE durable_object_name = ${durable_object_name}`;
+		const ratings = sql`SELECT message_id, rating, comment FROM assistant_messages_ratings`;
 		return Object.fromEntries(ratings.map((row) => [row.message_id, {
 			rating: row.rating,
 			comment: row.comment
@@ -516,14 +543,14 @@ var ChatAgent = class extends Agent {
 	* @returns The message id and the rating.
 	*/
 	@callable({ description: "Rate a message by its id" }) async rateMessage(messageId, rating, comment) {
-		return rateMessage(this.sql.bind(this), messageId, this.name, rating, comment);
+		return rateMessage(this.sql.bind(this), messageId, rating, comment);
 	}
 	/**
 	* Returns all message ratings for the current chat.
 	* @returns All message ratings for the current chat.
 	*/
 	@callable({ description: "Returns all message ratings for the current chat" }) async getMessageRatings() {
-		return getMessageRatings(this.sql.bind(this), this.name);
+		return getMessageRatings(this.sql.bind(this));
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "bin": {