@economic/agents 1.6.3 → 1.6.4

package/dist/index.d.mts

@@ -57,9 +57,9 @@ declare function buildLLMParams(config: BuildLLMParamsConfig): LLMParams;
  * type MyContext = AgentToolContext<MyBody>;
  * ```
  */
-type AgentToolContext<TBody = Record<string, unknown>, TSession = Record<string, unknown> | undefined> = TBody & {
-  logEvent: (message: string, payload?: Record<string, unknown>) => void | Promise<void>;
-  session?: TSession;
+type AgentToolContext<TBody = Record<string, unknown>, TJwtIdentity = Record<string, unknown> | undefined> = TBody & {
+  _logEvent: (message: string, payload?: Record<string, unknown>) => void | Promise<void>;
+  _jwtIdentity?: TJwtIdentity;
 };
 interface AgentEnv {
   AGENT_DB: D1Database;
@@ -95,12 +95,7 @@ interface JwtAuthConfig<TClaims extends Record<string, unknown> = Record<string,
  * For chat agents with message history, compaction, and conversation recording,
  * extend {@link ChatAgent} instead.
  */
-declare abstract class Agent<Env extends Cloudflare.Env = Cloudflare.Env> extends Agent$1<Env & AgentEnv> {
-  /**
-   * Verified session claims from JWT authentication.
-   * Set in `onConnect` when `getJwtAuthConfig` is implemented.
-   */
-  private session?;
+declare abstract class Agent<Env extends Cloudflare.Env = Cloudflare.Env, TJwtIdentity extends Record<string, unknown> = Record<string, unknown>> extends Agent$1<Env & AgentEnv> {
   /**
    * Override to enable JWT authentication on WebSocket connections.
    * Return the auth config based on the incoming request, or undefined to skip auth.
@@ -109,6 +104,17 @@ declare abstract class Agent<Env extends Cloudflare.Env = Cloudflare.Env> extend
    * @returns JWT auth config or undefined to skip authentication
    */
   protected getJwtAuthConfig?(request: Request): JwtAuthConfig<Record<string, unknown>> | undefined;
+  /**
+   * The identity associated with the session.
+   * Define getIdentity to return the identity from the request.
+   */
+  protected jwtIdentity: TJwtIdentity;
+  /**
+   * Returns the identity following verification of the JWT token - getJwtAuthConfig is required.
+   * @returns The identity from the request.
+   * @param token - The token from the request.
+   */
+  protected getJwtIdentity?(token: string): Promise<TJwtIdentity>;
   /**
    * Returns the user ID from the durable object name.
    */
@@ -152,7 +158,7 @@ interface MessageRating {
  * Skill loading, compaction, and LLM calls use `buildLLMParams` from
  * `@economic/agents` inside `onChatMessage`.
  */
-declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env, TSessionIdentity extends Record<string, unknown> = Record<string, unknown>> extends AIChatAgent<Env & ChatAgentEnv> {
+declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env, TJwtIdentity extends Record<string, unknown> = Record<string, unknown>> extends AIChatAgent<Env & ChatAgentEnv> {
   /**
    * The binding of the Durable Object instance for this agent.
    */
@@ -188,11 +194,6 @@ declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env, TS
    * Default is 15.
    */
   protected maxMessagesBeforeCompaction?: number | undefined;
-  /**
-   * Verified session claims from JWT authentication.
-   * Set in `onConnect` when `getJwtAuthConfig` is implemented.
-   */
-  private session?;
   /**
    * Override to enable JWT authentication on WebSocket connections.
    * Return the auth config based on the incoming request, or undefined to skip auth.
@@ -205,13 +206,13 @@ declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env, TS
    * The identity associated with the session.
    * Define getIdentity to return the identity from the request.
    */
-  protected identity: TSessionIdentity;
+  protected jwtIdentity: TJwtIdentity;
   /**
-   * Returns the identity from the request.
+   * Returns the identity following verification of the JWT token - getJwtAuthConfig is required.
    * @returns The identity from the request.
    * @param token - The token from the request.
    */
-  protected getIdentity(_token: string): Promise<TSessionIdentity>;
+  protected getJwtIdentity?(token: string): Promise<TJwtIdentity>;
   /**
    * Returns the user ID from the durable object name.
    */

package/dist/index.mjs

@@ -474,10 +474,10 @@ async function verifyJwt(request, config) {
 */
 var Agent = class extends Agent$1 {
 	/**
-	* Verified session claims from JWT authentication.
-	* Set in `onConnect` when `getJwtAuthConfig` is implemented.
+	* The identity associated with the session.
+	* Define getIdentity to return the identity from the request.
 	*/
-	session;
+	jwtIdentity = {};
 	/**
 	* Returns the user ID from the durable object name.
 	*/
@@ -510,7 +510,8 @@ var Agent = class extends Agent$1 {
 					connection.close(result.status === 401 ? 4001 : 4003, result.message);
 					return;
 				}
-				this.session = result.claims;
+				const token = extractTokenFromConnectRequest(ctx.request);
+				if (token) this.jwtIdentity = await this.getJwtIdentity?.(token) ?? {};
 			}
 		}
 		return super.onConnect(connection, ctx);
@@ -541,8 +542,8 @@ var Agent = class extends Agent$1 {
 		const experimental_context = {
 			...config.experimental_context,
 			...config.options?.body,
-			session: this.session,
-			logEvent: this.logEvent.bind(this)
+			_jwtIdentity: this.jwtIdentity,
+			_logEvent: this.logEvent.bind(this)
 		};
 		const onFinish = async (event) => {
 			this.logEvent("Turn completed", buildTurnLogPayload(event));
@@ -844,23 +845,10 @@ var ChatAgent = class extends AIChatAgent {
 	*/
 	maxMessagesBeforeCompaction = 15;
 	/**
-	* Verified session claims from JWT authentication.
-	* Set in `onConnect` when `getJwtAuthConfig` is implemented.
-	*/
-	session;
-	/**
 	* The identity associated with the session.
 	* Define getIdentity to return the identity from the request.
 	*/
-	identity = {};
-	/**
-	* Returns the identity from the request.
-	* @returns The identity from the request.
-	* @param token - The token from the request.
-	*/
-	async getIdentity(_token) {
-		return Promise.resolve({});
-	}
+	jwtIdentity = {};
 	/**
 	* Returns the user ID from the durable object name.
 	*/
@@ -893,11 +881,10 @@ var ChatAgent = class extends AIChatAgent {
 					connection.close(result.status === 401 ? 4001 : 4003, result.message);
 					return;
 				}
-				this.session = result.claims;
 			}
+			const token = extractTokenFromConnectRequest(ctx.request);
+			if (token) this.jwtIdentity = await this.getJwtIdentity?.(token) ?? {};
 		}
-		const token = extractTokenFromConnectRequest(ctx.request);
-		if (token) this.identity = await this.getIdentity(token);
 		return super.onConnect(connection, ctx);
 	}
 	/**
@@ -931,8 +918,8 @@ var ChatAgent = class extends AIChatAgent {
 		const experimental_context = {
 			...config.experimental_context,
 			...config.options?.body,
-			session: this.session,
-			logEvent: this.logEvent.bind(this)
+			_jwtIdentity: this.jwtIdentity,
+			_logEvent: this.logEvent.bind(this)
 		};
 		const messages = await convertToModelMessages(this.messages);
 		const fastModel = this.getFastModel();

package/package.json

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