@economic/agents 2.3.9 → 2.3.11

package/README.md

@@ -571,5 +571,3 @@ npm install
 npm test
 npm run build
 ```
-
-.

package/dist/index.d.mts

@@ -40,7 +40,7 @@ declare function tool<Context extends Record<string, unknown> = Record<string, u
 //#endregion
 //#region src/server/agents/Agent.d.ts
 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 agentType: AgentConnectionType;
   protected clientIp?: string;
   protected forwardedFor?: string;
   /**
@@ -51,7 +51,6 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
   abstract getModel(ctx?: ToolContext<RequestContext, UserContext>): LanguageModel;
   abstract getSystemPrompt(ctx?: ToolContext<RequestContext, UserContext>): string;
   onStart(): Promise<void>;
-  onClose(): Promise<void>;
   onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   configureSession(session: Session): Session;
   private _toolsForCurrentTurn;
@@ -182,6 +181,7 @@ declare function migrateUserFromV1(deps: MigrationDeps): Promise<{
 //#endregion
 //#region src/server/agents/ChatAgent.d.ts
 declare abstract class ChatAgent<RequestContext extends Record<string, unknown> = Record<string, unknown>, UserContext extends Record<string, unknown> = Record<string, unknown>> extends Agent<RequestContext, UserContext> {
+  protected agentType: AgentConnectionType;
   initialState: AgentConnectionState;
   onStart(): Promise<void>;
   configureSession(session: Session): Session;
@@ -225,11 +225,10 @@ declare const DELETE_CHAT_CALLBACK: "deleteChatCallback";
 //#endregion
 //#region src/server/agents/Assistant.d.ts
 declare abstract class Assistant extends Agent$1<Cloudflare.Env & AgentEnv, AgentConnectionState> {
-  initialState: AgentConnectionState;
-  protected abstract agent: SubAgentClass<ChatAgent>;
+  private _fix;
   protected abstract fastModel: LanguageModel;
+  protected abstract agent: SubAgentClass<ChatAgent>;
   onStart(): void;
-  onClose(): Promise<void>;
   onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   createChat(): Promise<string>;
   deleteChat(id: string): Promise<void>;

package/dist/index.mjs

@@ -36,12 +36,23 @@ async function registerAgentInstance(db, input) {
        ON CONFLICT (agent_name, durable_object_name) DO NOTHING`).bind(input.agentName, input.durableObjectName, input.actorId, input.createdAt).run();
 }
 //#endregion
+//#region src/server/util/agent.ts
+function sendConnectionStatus(connection, status) {
+	connection.send(JSON.stringify({
+		type: "connection_status",
+		status
+	}));
+}
+function sendAgentType(connection, agentType) {
+	connection.send(JSON.stringify({
+		type: "agent_type",
+		agentType
+	}));
+}
+//#endregion
 //#region src/server/agents/Agent.ts
 var Agent = class extends Think {
-	initialState = {
-		status: "connecting",
-		type: "agent"
-	};
+	agentType = "agent";
 	clientIp;
 	forwardedFor;
 	/**
@@ -58,10 +69,6 @@ var Agent = class extends Think {
 		}
 	}
 	async onStart() {
-		this.setState({
-			...this.initialState,
-			status: "connecting"
-		});
 		let hasCorrectBindings = true;
 		if (!this.env.AGENTS_DB) {
 			hasCorrectBindings = false;
@@ -72,22 +79,12 @@ 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 (!hasCorrectBindings) {
-			this.setState({
-				...this.initialState,
-				status: "disconnected"
-			});
-			throw new Error("Could not connect to agent, bindings not found");
-		}
+		if (!hasCorrectBindings) throw new Error("Could not connect to agent, bindings not found");
 		this.registerInstance();
 	}
-	async onClose() {
-		this.setState({
-			...this.initialState,
-			status: "disconnected"
-		});
-	}
 	async onConnect(connection, ctx) {
+		sendAgentType(connection, this.agentType);
+		sendConnectionStatus(connection, "connecting");
 		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;
 		const getJwtAuthConfig = this.constructor.getJwtAuthConfig;
@@ -98,37 +95,24 @@ var Agent = class extends Think {
 				try {
 					result = await verifyJwt(ctx.request, config);
 				} catch (error) {
-					this.setState({
-						...this.initialState,
-						status: "unauthorized"
-					});
+					sendConnectionStatus(connection, "unauthorized");
 					console.error(`[Agent] JWT verification error - ${error}`);
 					connection.close(4001, "Unauthorized");
 					return;
 				}
 				if (!result.success) {
-					this.setState({
-						...this.initialState,
-						status: "unauthorized"
-					});
+					sendConnectionStatus(connection, "unauthorized");
 					console.error(`[Agent] JWT verification error - ${result.message}`);
 					connection.close(result.status === 401 ? 4001 : 4003, result.message);
 					return;
 				}
-				connection.setState({
-					authenticated: true,
-					claims: result.claims
-				});
 				const token = extractTokenFromConnectRequest(ctx.request);
 				if (token && this.getUserContext) this._pendingUserContextRequest = this.getUserContext(token).then((userContext) => {
 					this.userContext = userContext;
 				});
 			}
 		}
-		this.setState({
-			...this.initialState,
-			status: "connected"
-		});
+		sendConnectionStatus(connection, "connected");
 	}
 	configureSession(session) {
 		return session.withContext("soul", { provider: { get: async () => {
@@ -629,39 +613,20 @@ var Assistant = class extends Agent$1 {
 			]
 		], 0, void 0, Agent$1).e;
 	}
-	initialState = (_initProto$1(this), {
-		status: "connecting",
-		type: "assistant"
-	});
+	_fix = (_initProto$1(this), "fix");
 	onStart() {
-		this.setState({
-			...this.initialState,
-			status: "connecting",
-			subAgentName: this.agent.name
-		});
 		ensureChatsTableExists(this.sql.bind(this));
 		let hasCorrectBindings = true;
 		if (!this.env.AGENTS_DB) {
 			hasCorrectBindings = false;
 			console.warn("[Agent] Connection rejected: no AGENTS_DB bound. Agents database is required for registration.");
 		}
-		if (!hasCorrectBindings) {
-			this.setState({
-				...this.initialState,
-				status: "disconnected"
-			});
-			throw new Error("Could not connect to agent, bindings not found");
-		}
+		if (!hasCorrectBindings) throw new Error("Could not connect to agent, bindings not found");
 		this.registerInstance();
 	}
-	async onClose() {
-		this.setState({
-			...this.initialState,
-			status: "disconnected",
-			subAgentName: this.agent.name
-		});
-	}
 	async onConnect(connection, ctx) {
+		sendAgentType(connection, "assistant");
+		sendConnectionStatus(connection, "connecting");
 		const getJwtAuthConfig = this.agent.getJwtAuthConfig;
 		if (getJwtAuthConfig) {
 			const config = getJwtAuthConfig(this.env);
@@ -670,37 +635,21 @@ var Assistant = class extends Agent$1 {
 				try {
 					result = await verifyJwt(ctx.request, config);
 				} catch (error) {
-					this.setState({
-						...this.initialState,
-						status: "unauthorized",
-						subAgentName: this.agent.name
-					});
+					sendConnectionStatus(connection, "unauthorized");
 					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
-					});
+					sendConnectionStatus(connection, "unauthorized");
 					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
-				});
 			}
 		}
 		await this.ensureMigrated();
-		this.setState({
-			...this.initialState,
-			status: "connected",
-			subAgentName: this.agent.name
-		});
+		sendConnectionStatus(connection, "connected");
 	}
 	async createChat() {
 		const id = nanoid();
@@ -997,10 +946,11 @@ var ChatAgent = class extends Agent {
 			"getMessageFeedback"
 		]], 0, void 0, Agent).e;
 	}
-	initialState = (_initProto(this), {
+	agentType = (_initProto(this), "chat");
+	initialState = {
 		status: "connecting",
 		type: "chat"
-	});
+	};
 	async onStart() {
 		await super.onStart();
 		ensureFeedbackTableExists(this.sql.bind(this));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "2.3.9",
+  "version": "2.3.11",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "files": [