@economic/agents 2.0.1 → 2.1.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-a-1XBTxr.mjs";
+import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-BKgBMVF0.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,7 +359,7 @@ var Agent = class extends Agent$1 {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
 					agentName: this.constructor.name,
-					conversationId: this.name,
+					chatId: this.name,
 					userId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {}
@@ -367,7 +367,7 @@ var Agent = class extends Agent$1 {
 				metadata: {
 					agentName: this.constructor.name,
 					version: "v1",
-					conversationId: this.name,
+					chatId: this.name,
 					userId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {},
@@ -769,7 +769,7 @@ var ChatAgent = class extends AIChatAgent {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
 					agentName: this.constructor.name,
-					conversationId: this.name,
+					chatId: this.name,
 					userId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {}
@@ -777,7 +777,7 @@ var ChatAgent = class extends AIChatAgent {
 				metadata: {
 					agentName: this.constructor.name,
 					version: "v1",
-					conversationId: this.name,
+					chatId: this.name,
 					userId: this.getUserId(),
 					...this.clientIp ? { clientIp: this.clientIp } : {},
 					...this.forwardedFor ? { forwardedFor: this.forwardedFor } : {},

package/dist/{telemetry-a-1XBTxr.mjs → telemetry-BKgBMVF0.mjs}

@@ -125,12 +125,12 @@ function parseJson(value) {
 function safePathSegment(value, fallback) {
 	return (value || fallback).replace(/[^a-zA-Z0-9._-]/g, "_");
 }
-function createAuditLogKey(agentName, conversationId) {
+function createAuditLogKey(agentName, chatId) {
 	const timestamp = (/* @__PURE__ */ new Date()).toISOString().replaceAll(":", "-");
 	const id = crypto.randomUUID().slice(0, 8);
 	return [
 		safePathSegment(agentName, "unknown-agent"),
-		safePathSegment(conversationId, "unknown-conversation"),
+		safePathSegment(chatId, "unknown-chat"),
 		`${timestamp}-${id}.json`
 	].join("/");
 }
@@ -186,15 +186,15 @@ function pushToolCall(map, key, toolCall) {
 	else map.set(key, [toolCall]);
 }
 /**
-* Stores the last ai.streamText.doStream span per conversation.
-* Its ai.prompt.messages contains the full conversation history including all
+* Stores the last ai.streamText.doStream span per chat.
+* Its ai.prompt.messages contains the full chat history including all
 * intermediate tool_use + tool_result turns from the agentic loop.
 */
-const lastDoStreamByConversation = /* @__PURE__ */ new Map();
+const lastDoStreamByChat = /* @__PURE__ */ new Map();
 const toolCallsByParentSpan = /* @__PURE__ */ new Map();
-const toolCallsByConversation = /* @__PURE__ */ new Map();
+const toolCallsByChat = /* @__PURE__ */ new Map();
 const pendingToolCalls = [];
-const currentSkillByConversation = /* @__PURE__ */ new Map();
+const currentSkillByChat = /* @__PURE__ */ new Map();
 function rememberToolCall(span) {
 	const parentSpanId = span.parentSpanContext?.spanId;
 	const toolName = stringAttribute(span, "ai.toolCall.name");
@@ -208,34 +208,34 @@ function rememberToolCall(span) {
 	if (parentSpanId) pushToolCall(toolCallsByParentSpan, parentSpanId, toolCall);
 	pendingToolCalls.push(toolCall);
 }
-function attachToolCallsToConversation(span, conversationId) {
+function attachToolCallsToChat(span, chatId) {
 	const spanId = span.spanContext().spanId;
 	const toolCalls = toolCallsByParentSpan.get(spanId) ?? pendingToolCalls.splice(0);
 	if (!toolCalls.length) return;
 	toolCallsByParentSpan.delete(spanId);
-	const currentSkill = currentSkillByConversation.get(conversationId);
+	const currentSkill = currentSkillByChat.get(chatId);
 	const attributedToolCalls = toolCalls.map((toolCall) => {
 		const skillName = toolCall.skillName ?? currentSkill;
-		if (toolCall.skillName) currentSkillByConversation.set(conversationId, toolCall.skillName);
+		if (toolCall.skillName) currentSkillByChat.set(chatId, toolCall.skillName);
 		return {
 			...toolCall,
 			...skillName ? { skillName } : {}
 		};
 	});
-	toolCallsByConversation.set(conversationId, [...toolCallsByConversation.get(conversationId) ?? [], ...attributedToolCalls]);
+	toolCallsByChat.set(chatId, [...toolCallsByChat.get(chatId) ?? [], ...attributedToolCalls]);
 }
 function buildAuditLog(span, context) {
-	const lastDoStream = lastDoStreamByConversation.get(context.conversationId);
-	lastDoStreamByConversation.delete(context.conversationId);
+	const lastDoStream = lastDoStreamByChat.get(context.chatId);
+	lastDoStreamByChat.delete(context.chatId);
 	const promptMessages = parseJson(stringAttribute(lastDoStream ?? span, "ai.prompt.messages"));
 	const fallbackPrompt = parseJson(stringAttribute(span, "ai.prompt"));
 	const inputMessages = promptMessages ?? fallbackPrompt?.messages ?? [];
-	const spanToolCalls = toolCallsByConversation.get(context.conversationId) ?? [];
-	toolCallsByConversation.delete(context.conversationId);
+	const spanToolCalls = toolCallsByChat.get(context.chatId) ?? [];
+	toolCallsByChat.delete(context.chatId);
 	return {
-		id: createAuditLogKey(context.agentName, context.conversationId),
+		id: createAuditLogKey(context.agentName, context.chatId),
 		timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-		conversationId: context.conversationId,
+		chatId: context.chatId,
 		agent: {
 			name: context.agentName,
 			llm: {
@@ -256,8 +256,8 @@ function buildAuditLog(span, context) {
 		tools: [...extractTools(inputMessages), ...spanToolCalls]
 	};
 }
-function rememberDoStream(span, conversationId) {
-	lastDoStreamByConversation.set(conversationId, span);
+function rememberDoStream(span, chatId) {
+	lastDoStreamByChat.set(chatId, span);
 }
 async function handleAuditSpan(span, auditLogs, context) {
 	const auditLog = buildAuditLog(span, context);
@@ -284,7 +284,7 @@ function handleAnalyticsSpan(span, analytics) {
 			blobs: [
 				"llm_call",
 				stringAttribute(span, "ai.telemetry.metadata.agentName") ?? "",
-				stringAttribute(span, "ai.telemetry.metadata.conversationId") ?? "",
+				stringAttribute(span, "ai.telemetry.metadata.chatId") ?? "",
 				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 conversationId = stringAttribute(span, "ai.telemetry.metadata.conversationId") ?? "";
-		const skillName = extractSkillName(toolName, toolInput) ?? currentSkillByConversation.get(conversationId) ?? "";
+		const chatId = stringAttribute(span, "ai.telemetry.metadata.chatId") ?? "";
+		const skillName = extractSkillName(toolName, toolInput) ?? currentSkillByChat.get(chatId) ?? "";
 		const success = span.status.code === 0;
 		writeAnalyticsDatapoint(analytics, {
 			indexes: [stringAttribute(span, "ai.telemetry.metadata.userId") ?? ""],
 			blobs: [
 				"tool_call",
 				stringAttribute(span, "ai.telemetry.metadata.agentName") ?? "",
-				conversationId,
+				chatId,
 				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.conversationId);
-					attachToolCallsToConversation(span, this.context.conversationId);
+					rememberDoStream(span, this.context.chatId);
+					attachToolCallsToChat(span, this.context.chatId);
 					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

@@ -19,6 +19,13 @@ interface AgentEnv {
   AGENTS_ANALYTICS: AnalyticsEngineDataset;
   SKILLS_BUCKET: R2Bucket;
 }
+type AgentConnectionStatus = "connecting" | "connected" | "disconnected" | "unauthorized";
+type AgentConnectionType = "agent" | "chat" | "assistant";
+type AgentConnectionState = {
+  status: AgentConnectionStatus;
+  type: AgentConnectionType; /** Set by `Assistant` so clients can derive the sub-agent routing name from state. */
+  subAgentName?: string;
+};
 //#endregion
 //#region src/server/v2/util/tools.d.ts
 type ToolSet = Record<string, Tool>;
@@ -39,12 +46,6 @@ declare function skill<Context extends Record<string, unknown> = Record<string,
 //#endregion
 //#region src/server/v2/agents/Agent.d.ts
 declare function getCurrentToolContext(): any;
-type AgentConnectionStatus = "connecting" | "connected" | "disconnected" | "unauthorized";
-type AgentConnectionType = "agent" | "chat" | "assistant";
-type AgentConnectionState = {
-  status: AgentConnectionStatus;
-  type: AgentConnectionType;
-};
 declare abstract class Agent<RequestContext extends Record<string, unknown> = Record<string, unknown>, UserContext extends Record<string, unknown> = Record<string, unknown>> extends Think<Cloudflare.Env & AgentEnv, AgentConnectionState> {
   initialState: AgentConnectionState;
   protected clientIp?: string;
@@ -58,6 +59,7 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
   abstract getSystemPrompt(ctx?: ToolContext<RequestContext, UserContext>): string;
   configureSession(session: Session): Session;
   onStart(): Promise<void>;
+  onClose(): Promise<void>;
   onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   /**
    * Merges the client request `body` into `experimental_context` for tools
@@ -130,21 +132,21 @@ declare abstract class ChatAgent<RequestContext extends Record<string, unknown>
    */
   rateMessage(messageId: string, rating: number, comment?: string): Promise<void>;
   /**
-   * Returns all message ratings for the current conversation.
-   * @returns All message ratings for the current conversation.
+   * Returns all message ratings for the current chat.
+   * @returns All message ratings for the current chat.
    */
   getMessageRatings(): Promise<any>;
 }
 //#endregion
-//#region src/server/v2/features/conversations.d.ts
-type Conversation = {
+//#region src/server/v2/features/chats.d.ts
+type Chat = {
   durable_object_name: string;
   title?: string;
   summary?: string;
   created_at: number;
   updated_at: number;
 };
-declare const DELETE_CONVERSATION_CALLBACK: "deleteConversationCallback";
+declare const DELETE_CHAT_CALLBACK: "deleteChatCallback";
 //#endregion
 //#region src/server/v2/agents/Assistant.d.ts
 declare abstract class Assistant extends Agent$1<Cloudflare.Env, AgentConnectionState> {
@@ -152,13 +154,14 @@ declare abstract class Assistant extends Agent$1<Cloudflare.Env, AgentConnection
   protected abstract agent: SubAgentClass<ChatAgent>;
   protected abstract fastModel: LanguageModel;
   onStart(): void;
+  onClose(): Promise<void>;
   onConnect(): Promise<void>;
-  createConversation(): Promise<string>;
-  deleteConversation(id: string): Promise<void>;
-  getConversations(): Promise<Conversation[]>;
-  recordConversationTurn(durableObjectName: string, messages: UIMessage[]): Promise<void>;
-  private [DELETE_CONVERSATION_CALLBACK];
-  private scheduleConversationForAutoDeletion;
+  createChat(): Promise<string>;
+  deleteChat(id: string): Promise<void>;
+  getChats(): Promise<Chat[]>;
+  recordChatTurn(durableObjectName: string, messages: UIMessage[]): Promise<void>;
+  private [DELETE_CHAT_CALLBACK];
+  private scheduleChatForAutoDeletion;
 }
 //#endregion
-export { Agent, type AgentEnv, Assistant, ChatAgent, type Skill, type Tool, type ToolContext, type ToolSet, getCurrentToolContext, skill, tool };
+export { Agent, type AgentConnectionState, type AgentConnectionStatus, type AgentConnectionType, type AgentEnv, Assistant, ChatAgent, type Skill, type Tool, type ToolContext, type ToolSet, getCurrentToolContext, skill, tool };

package/dist/v2.mjs

@@ -1,10 +1,10 @@
-import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-a-1XBTxr.mjs";
+import { n as extractTokenFromConnectRequest, r as verifyJwt, t as createAgentTracer } from "./telemetry-BKgBMVF0.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";
 import { R2SkillProvider } from "agents/experimental/memory/session";
-import { createCompactFunction } from "agents/experimental/memory/utils";
 import { nanoid } from "nanoid";
+import { createCompactFunction } from "agents/experimental/memory/utils";
 //#region src/server/v2/util/tools.ts
 function tool(tool) {
 	return tool$1(tool);
@@ -106,6 +106,12 @@ var Agent = class extends Think {
 			throw new Error("Could not connect to agent, bindings not found");
 		}
 	}
+	async onClose() {
+		this.setState({
+			...this.initialState,
+			status: "disconnected"
+		});
+	}
 	async onConnect(connection, ctx) {
 		this.clientIp = ctx.request.headers.get("CF-Connecting-IP") ?? ctx.request.headers.get("X-Forwarded-For")?.split(",")[0]?.trim();
 		this.forwardedFor = ctx.request.headers.get("X-Forwarded-For") ?? void 0;
@@ -179,7 +185,7 @@ var Agent = class extends Think {
 				isEnabled: true,
 				tracer: createAgentTracer(this.env.AGENTS_AUDIT_LOGS, this.env.AGENTS_ANALYTICS, {
 					agentName: this.constructor.name,
-					conversationId: this.name,
+					chatId: this.name,
 					userId: this.getUserIdFromDurableObjectName(),
 					clientIp: this.clientIp,
 					forwardedFor: this.forwardedFor
@@ -187,7 +193,7 @@ var Agent = class extends Think {
 				metadata: {
 					agentName: this.constructor.name,
 					version: "v2",
-					conversationId: this.name,
+					chatId: this.name,
 					userId: this.getUserIdFromDurableObjectName()
 				}
 			}
@@ -271,77 +277,14 @@ var Agent = class extends Think {
 	_userContext;
 };
 //#endregion
-//#region src/server/v2/features/messages.ts
-const COMPACTION_TOKEN_THRESHOLD = 1e5;
-const createCompactFn = (model) => createCompactFunction({ summarize: (prompt) => generateText({
-	model,
-	prompt
-}).then((r) => r.text) });
-/**
-* Ensures that the ratings table exists.
-* @param sql - The SQL function to use to execute the query.
-*/
-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)
-      )`;
-	} catch (error) {
-		console.error("[Agent] Failed to create ratings table", error);
-	}
-}
-/**
-* 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()) {
-	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
-          rating = excluded.rating,
-          comment = excluded.comment,
-        updated_at = excluded.updated_at`;
-	} catch (error) {
-		console.error("[Agent] Failed to rate message", error);
-	}
-}
-/**
-* 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) {
-	try {
-		const ratings = sql`SELECT message_id, rating, comment FROM assistant_messages_ratings WHERE durable_object_name = ${durable_object_name}`;
-		return Object.fromEntries(ratings.map((row) => [row.message_id, {
-			rating: row.rating,
-			comment: row.comment
-		}]));
-	} catch {
-		return {};
-	}
-}
-//#endregion
-//#region src/server/v2/features/conversations.ts
+//#region src/server/v2/features/chats.ts
 /**
-* Ensures that the conversations table exists.
+* Ensures that the chats table exists.
 * @param sql - The SQL function to use to execute the query.
 */
-function ensureConversationsTableExists(sql) {
+function ensureChatsTableExists(sql) {
 	try {
-		sql`CREATE TABLE IF NOT EXISTS conversations (
+		sql`CREATE TABLE IF NOT EXISTS chats (
         durable_object_name TEXT NOT NULL,
         title               TEXT,
         summary             TEXT,
@@ -350,80 +293,80 @@ function ensureConversationsTableExists(sql) {
         PRIMARY KEY (durable_object_name)
       )`;
 	} catch (error) {
-		console.error("[Agent] Failed to create conversations table", error);
+		console.error("[Agent] Failed to create chats table", error);
 	}
 }
-function registerConversation(sql, durableObjectName, dateTime) {
-	sql`INSERT INTO conversations (durable_object_name, created_at, updated_at)
+function registerChat(sql, durableObjectName, dateTime) {
+	sql`INSERT INTO chats (durable_object_name, created_at, updated_at)
     VALUES (${durableObjectName}, ${dateTime}, ${dateTime})`;
 }
-function deleteConversation(sql, durableObjectName) {
-	sql`DELETE FROM conversations WHERE durable_object_name = ${durableObjectName}`;
+function deleteChat(sql, durableObjectName) {
+	sql`DELETE FROM chats WHERE durable_object_name = ${durableObjectName}`;
 }
-function getConversation(sql, durableObjectName) {
-	return sql`SELECT * FROM conversations WHERE durable_object_name = ${durableObjectName}`[0] ?? null;
+function getChat(sql, durableObjectName) {
+	return sql`SELECT * FROM chats WHERE durable_object_name = ${durableObjectName}`[0] ?? null;
 }
-async function getConversations(sql) {
-	return sql`SELECT * FROM conversations ORDER BY updated_at DESC`;
+async function getChats(sql) {
+	return sql`SELECT * FROM chats ORDER BY updated_at DESC`;
 }
-function getDeleteConversationScheduleIds(schedules) {
-	return schedules.filter((schedule) => schedule.callback === DELETE_CONVERSATION_CALLBACK).map((schedule) => schedule.id);
+function getDeleteChatScheduleIds(schedules) {
+	return schedules.filter((schedule) => schedule.callback === DELETE_CHAT_CALLBACK).map((schedule) => schedule.id);
 }
 /**
 * Number of recent messages passed to `generateSummary` for rolling
 * summarization. Keeping this bounded prevents the prompt growing
-* unboundedly regardless of conversation length.
+* unboundedly regardless of chat length.
 */
-const CONVERSATION_RECENT_MESSAGES_COUNT = 20;
-async function summariseConversationWithAI(sql, durableObjectName, messages, model) {
-	const conversation = getConversation(sql, durableObjectName);
-	if (!(!conversation || !conversation.title || messages.length % CONVERSATION_RECENT_MESSAGES_COUNT === 0)) return;
+const CHAT_RECENT_MESSAGES_COUNT = 20;
+async function summariseChatWithAI(sql, durableObjectName, messages, model) {
+	const chat = getChat(sql, durableObjectName);
+	if (!(!chat || !chat.title || messages.length % CHAT_RECENT_MESSAGES_COUNT === 0)) return;
 	let systemPrompt = `
-    You are a helpful assistant that summarises conversations.
-    You will be given a list of messages and you need to generate a title and summary for the conversation.
-    The title should be a short title for the conversation, max 8-10 words.
-    The summary should be a short 1-2 sentence summary of the conversation.
-    The summary should reflect the direction of the conversation.`;
-	if (conversation) systemPrompt += `${systemPrompt}\n\nThe previous summary: ${conversation.summary}`;
+    You are a helpful assistant that summarises chats.
+    You will be given a list of messages and you need to generate a title and summary for the chat.
+    The title should be a short title for the chat, max 8-10 words.
+    The summary should be a short 1-2 sentence summary of the chat.
+    The summary should reflect the direction of the chat.`;
+	if (chat) systemPrompt += `${systemPrompt}\n\nThe previous summary: ${chat.summary}`;
 	try {
 		const { output: { title, summary } } = await generateText({
 			model,
 			system: systemPrompt,
-			messages: await convertToModelMessages(messages.slice(-CONVERSATION_RECENT_MESSAGES_COUNT)),
+			messages: await convertToModelMessages(messages.slice(-CHAT_RECENT_MESSAGES_COUNT)),
 			output: Output.object({ schema: jsonSchema({
 				type: "object",
 				properties: {
 					title: {
 						type: "string",
-						description: "Short title for the conversation, max 8-10 words"
+						description: "Short title for the chat, max 8-10 words"
 					},
 					summary: {
 						type: "string",
-						description: "A short 1-2 sentence summary of the conversation. If the conversation direction has changed from the previous summary, reflect the new direction."
+						description: "A short 1-2 sentence summary of the chat. If the chat direction has changed from the previous summary, reflect the new direction."
 					}
 				},
 				required: ["title", "summary"]
 			}) })
 		});
 		if (!title || !summary) {
-			console.error("[Assistant] Failed to generate conversation title and summary", { durableObjectName });
+			console.error("[Assistant] Failed to generate chat title and summary", { durableObjectName });
 			return;
 		}
-		sql`UPDATE conversations
+		sql`UPDATE chats
       SET title = ${title},
           summary = ${summary},
           updated_at = ${Date.now()}
       WHERE durable_object_name = ${durableObjectName}`;
-		console.info("[Assistant] Generated conversation summary", { durableObjectName });
+		console.info("[Assistant] Generated chat summary", { durableObjectName });
 	} catch (error) {
-		console.error("[Assistant] Failed to generate conversation title and summary", {
+		console.error("[Assistant] Failed to generate chat title and summary", {
 			durableObjectName,
 			error
 		});
 	}
 }
-const DELETE_CONVERSATION_CALLBACK = "deleteConversationCallback";
-function getConversationRetentionMs(days) {
+const DELETE_CHAT_CALLBACK = "deleteChatCallback";
+function getChatRetentionMs(days) {
 	if (typeof days !== "number" || !Number.isFinite(days) || days <= 0) return null;
 	return Math.floor(days * 24 * 60 * 60 * 1e3);
 }
@@ -437,46 +380,118 @@ var Assistant = class extends Agent$1 {
 	onStart() {
 		this.setState({
 			type: "assistant",
-			status: "connecting"
+			status: "connecting",
+			subAgentName: this.agent.name
+		});
+		ensureChatsTableExists(this.sql.bind(this));
+	}
+	async onClose() {
+		this.setState({
+			type: "assistant",
+			status: "disconnected",
+			subAgentName: this.agent.name
 		});
-		ensureConversationsTableExists(this.sql.bind(this));
 	}
 	async onConnect() {
 		this.setState({
 			type: "assistant",
-			status: "connected"
+			status: "connected",
+			subAgentName: this.agent.name
 		});
 	}
-	@callable() async createConversation() {
+	@callable() async createChat() {
 		const id = nanoid();
 		const now = Date.now();
 		await this.subAgent(this.agent, id);
-		registerConversation(this.sql.bind(this), id, now);
+		registerChat(this.sql.bind(this), id, now);
 		return id;
 	}
-	@callable() async deleteConversation(id) {
+	@callable() async deleteChat(id) {
 		await this.deleteSubAgent(this.agent, id);
-		deleteConversation(this.sql.bind(this), id);
+		deleteChat(this.sql.bind(this), id);
 	}
-	@callable() async getConversations() {
-		return getConversations(this.sql.bind(this));
+	@callable() async getChats() {
+		return getChats(this.sql.bind(this));
 	}
-	async recordConversationTurn(durableObjectName, messages) {
-		summariseConversationWithAI(this.sql.bind(this), durableObjectName, messages, this.fastModel);
-		this.scheduleConversationForAutoDeletion(durableObjectName);
+	async recordChatTurn(durableObjectName, messages) {
+		summariseChatWithAI(this.sql.bind(this), durableObjectName, messages, this.fastModel);
+		this.scheduleChatForAutoDeletion(durableObjectName);
 	}
-	async [DELETE_CONVERSATION_CALLBACK](durableObjectName) {
-		await this.deleteConversation(durableObjectName);
+	async [DELETE_CHAT_CALLBACK](durableObjectName) {
+		await this.deleteChat(durableObjectName);
 	}
-	async scheduleConversationForAutoDeletion(durableObjectName) {
-		const retentionMs = getConversationRetentionMs(90);
+	async scheduleChatForAutoDeletion(durableObjectName) {
+		const retentionMs = getChatRetentionMs(90);
 		if (retentionMs === null) return;
-		const scheduleIds = getDeleteConversationScheduleIds(await this.listSchedules());
+		const scheduleIds = getDeleteChatScheduleIds(await this.listSchedules());
 		await Promise.all(scheduleIds.map((scheduleId) => this.cancelSchedule(scheduleId)));
-		await this.schedule(new Date(Date.now() + retentionMs), DELETE_CONVERSATION_CALLBACK, durableObjectName, { idempotent: true });
+		await this.schedule(new Date(Date.now() + retentionMs), DELETE_CHAT_CALLBACK, durableObjectName, { idempotent: true });
 	}
 };
 //#endregion
+//#region src/server/v2/features/messages.ts
+const COMPACTION_TOKEN_THRESHOLD = 1e5;
+const createCompactFn = (model) => createCompactFunction({ summarize: (prompt) => generateText({
+	model,
+	prompt
+}).then((r) => r.text) });
+/**
+* Ensures that the ratings table exists.
+* @param sql - The SQL function to use to execute the query.
+*/
+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)
+      )`;
+	} catch (error) {
+		console.error("[Agent] Failed to create ratings table", error);
+	}
+}
+/**
+* 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()) {
+	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
+          rating = excluded.rating,
+          comment = excluded.comment,
+        updated_at = excluded.updated_at`;
+	} catch (error) {
+		console.error("[Agent] Failed to rate message", error);
+	}
+}
+/**
+* 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) {
+	try {
+		const ratings = sql`SELECT message_id, rating, comment FROM assistant_messages_ratings WHERE durable_object_name = ${durable_object_name}`;
+		return Object.fromEntries(ratings.map((row) => [row.message_id, {
+			rating: row.rating,
+			comment: row.comment
+		}]));
+	} catch {
+		return {};
+	}
+}
+//#endregion
 //#region src/server/v2/agents/ChatAgent.ts
 var ChatAgent = class extends Agent {
 	initialState = {
@@ -492,7 +507,7 @@ var ChatAgent = class extends Agent {
 	}
 	async onChatResponse(_result) {
 		const parent = await this.getParentAgent();
-		if (parent?.recordConversationTurn) await parent.recordConversationTurn(this.name, this.messages);
+		if (parent?.recordChatTurn) await parent.recordChatTurn(this.name, this.messages);
 	}
 	/**
 	* Rate a message by its id.
@@ -504,10 +519,10 @@ var ChatAgent = class extends Agent {
 		return rateMessage(this.sql.bind(this), messageId, this.name, rating, comment);
 	}
 	/**
-	* Returns all message ratings for the current conversation.
-	* @returns All message ratings for the current conversation.
+	* 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 conversation" }) async getMessageRatings() {
+	@callable({ description: "Returns all message ratings for the current chat" }) async getMessageRatings() {
 		return getMessageRatings(this.sql.bind(this), this.name);
 	}
 };

package/package.json

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