@economic/agents 2.3.14 → 2.3.16

package/dist/index.d.mts

@@ -46,10 +46,11 @@ 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>;
-  onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   configureSession(session: Session): Session;
+  onConnect(connection: Connection, ctx: ConnectionContext): Promise<void>;
   private _toolsForCurrentTurn;
   private _toolContextForCurrentTurn?;
+  private getToolContextForCurrentTurn;
   /**
    * Merges the client request `body` into `experimental_context` for tools
    * returned from {@link getTools} only (Think-internal tools are unchanged).
@@ -91,8 +92,6 @@ declare abstract class Agent<RequestContext extends Record<string, unknown> = Re
    * @returns JWT auth config or undefined to skip authentication
    */
   static getJwtAuthConfig?(env: Cloudflare.Env): JwtAuthConfig<Record<string, unknown>> | undefined;
-  /** Store the pending user context request to defer awaiting it until after the connection is established */
-  private _pendingUserContextRequest?;
   /**
    * The user context for the session.
    * Define getUserContext to set a user context.

package/dist/index.mjs

@@ -88,6 +88,9 @@ var Agent = class extends Think {
 		if (!hasCorrectBindings) throw new Error("Could not connect to agent, bindings not found");
 		this.registerInstance();
 	}
+	configureSession(session) {
+		return session.withContext("soul", { provider: { get: async () => this.getSystemPrompt(this._toolContextForCurrentTurn) } }).withContext("critical-rules", { provider: { get: async () => SECURITY_RULES_PROMPT } }).withContext("turn-protocol-rules", { provider: { get: async () => TURN_PROTOCOL_RULES_PROMPT } }).withCachedPrompt();
+	}
 	async onConnect(connection, ctx) {
 		sendAgentType(connection, this.agentType);
 		sendConnectionStatus(connection, "connecting");
@@ -113,20 +116,23 @@ var Agent = class extends Think {
 					return;
 				}
 				const token = extractTokenFromConnectRequest(ctx.request);
-				if (token && this.getUserContext) this._pendingUserContextRequest = this.getUserContext(token).then((userContext) => {
-					this.userContext = userContext;
-				});
+				if (token && this.getUserContext) {
+					this.userContext = await this.getUserContext(token);
+					this._toolContextForCurrentTurn = this.getToolContextForCurrentTurn();
+					await this.session.refreshSystemPrompt();
+				}
 			}
 		}
 		sendConnectionStatus(connection, "connected");
 	}
-	configureSession(session) {
-		return session.withContext("soul", { provider: { get: async () => {
-			return this.getSystemPrompt(this._toolContextForCurrentTurn !== void 0 ? this._toolContextForCurrentTurn : void 0);
-		} } }).withContext("critical-rules", { provider: { get: async () => SECURITY_RULES_PROMPT } }).withContext("turn-protocol-rules", { provider: { get: async () => TURN_PROTOCOL_RULES_PROMPT } }).withCachedPrompt();
-	}
 	_toolsForCurrentTurn = {};
 	_toolContextForCurrentTurn;
+	getToolContextForCurrentTurn(requestContext = {}) {
+		return {
+			...requestContext,
+			_userContext: this.userContext
+		};
+	}
 	/**
 	* Merges the client request `body` into `experimental_context` for tools
 	* returned from {@link getTools} only (Think-internal tools are unchanged).
@@ -135,16 +141,12 @@ var Agent = class extends Think {
 	* `returned.tools` into your own `TurnConfig.tools` if you return tools.
 	*/
 	async beforeTurn(ctx) {
-		if (this._pendingUserContextRequest) await this._pendingUserContextRequest;
-		this._toolContextForCurrentTurn = {
-			...ctx.body ?? {},
-			_userContext: this.userContext
-		};
-		await this.session.refreshSystemPrompt();
+		this._toolContextForCurrentTurn = this.getToolContextForCurrentTurn(ctx.body);
 		this._toolsForCurrentTurn = ctx.tools;
 		const activeSkillName = this._getLastActivatedSkillName(ctx.messages);
 		const { tools, activeTools } = await this._getAuthorizedTools(ctx.tools, activeSkillName);
 		return {
+			system: await this.session.refreshSystemPrompt(),
 			model: this.getModel(this._toolContextForCurrentTurn),
 			messages: pruneMessages({
 				messages: ctx.messages,
@@ -251,8 +253,6 @@ var Agent = class extends Think {
 			}
 		}
 	}
-	/** Store the pending user context request to defer awaiting it until after the connection is established */
-	_pendingUserContextRequest;
 	/**
 	* The user context for the session.
 	* Define getUserContext to set a user context.

package/package.json

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