@economic/agents 2.0.0 → 2.1.0

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
@@ -152,6 +154,7 @@ 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>;
@@ -161,4 +164,4 @@ declare abstract class Assistant extends Agent$1<Cloudflare.Env, AgentConnection
   private scheduleConversationForAutoDeletion;
 }
 //#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

@@ -3,8 +3,8 @@ import { Output, convertToModelMessages, generateText, jsonSchema, pruneMessages
 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);
@@ -81,7 +81,7 @@ var Agent = class extends Think {
 	}
 	async onStart() {
 		this.setState({
-			type: "agent",
+			...this.initialState,
 			status: "connecting"
 		});
 		let hasCorrectBindings = true;
@@ -100,12 +100,18 @@ var Agent = class extends Think {
 		}
 		if (!hasCorrectBindings) {
 			this.setState({
-				type: "agent",
+				...this.initialState,
 				status: "disconnected"
 			});
 			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;
@@ -118,7 +124,7 @@ var Agent = class extends Think {
 					result = await verifyJwt(ctx.request, config);
 				} catch (error) {
 					this.setState({
-						type: "agent",
+						...this.initialState,
 						status: "unauthorized"
 					});
 					console.error(`[Agent] JWT verification error - ${error}`);
@@ -127,7 +133,7 @@ var Agent = class extends Think {
 				}
 				if (!result.success) {
 					this.setState({
-						type: "agent",
+						...this.initialState,
 						status: "unauthorized"
 					});
 					console.error(`[Agent] JWT verification error - ${result.message}`);
@@ -145,7 +151,7 @@ var Agent = class extends Think {
 			}
 		}
 		this.setState({
-			type: "agent",
+			...this.initialState,
 			status: "connected"
 		});
 	}
@@ -271,69 +277,6 @@ 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
 /**
 * Ensures that the conversations table exists.
@@ -437,14 +380,23 @@ var Assistant = class extends Agent$1 {
 	onStart() {
 		this.setState({
 			type: "assistant",
-			status: "connecting"
+			status: "connecting",
+			subAgentName: this.agent.name
 		});
 		ensureConversationsTableExists(this.sql.bind(this));
 	}
+	async onClose() {
+		this.setState({
+			type: "assistant",
+			status: "disconnected",
+			subAgentName: this.agent.name
+		});
+	}
 	async onConnect() {
 		this.setState({
 			type: "assistant",
-			status: "connected"
+			status: "connected",
+			subAgentName: this.agent.name
 		});
 	}
 	@callable() async createConversation() {
@@ -477,6 +429,69 @@ var Assistant = class extends Agent$1 {
 	}
 };
 //#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 = {

package/package.json

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