@economic/agents 1.6.2 → 1.6.4

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { LanguageModel, StreamTextOnFinishCallback, ToolSet, UIMessage, generateText, streamText } from "ai";
 import { Agent as Agent$1, AgentOptions, Connection, ConnectionContext } from "agents";
-import { JWTPayload } from "jose";
 import { AIChatAgent, ChatResponseResult, OnChatMessageOptions } from "@cloudflare/ai-chat";
+import { JWTPayload } from "jose";
 
 //#region src/server/shared/features/skills/index.d.ts
 /**
@@ -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;
@@ -83,7 +83,6 @@ interface JwtAuthConfig<TClaims extends Record<string, unknown> = Record<string,
    */
   getClaims: (payload: JWTPayload) => TClaims;
 }
-declare function extractTokenFromConnectRequest(request: Request): string | null;
 //#endregion
 //#region src/server/agent/Agent.d.ts
 /**
@@ -96,12 +95,7 @@ declare function extractTokenFromConnectRequest(request: Request): string | null
  * 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.
@@ -110,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.
    */
@@ -153,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> 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.
    */
@@ -189,11 +194,6 @@ declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env> ex
    * 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.
@@ -202,6 +202,17 @@ declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env> ex
    * @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.
    */
@@ -244,7 +255,7 @@ declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env> ex
 }
 //#endregion
 //#region src/server/agent-chat/ChatAgentHarness.d.ts
-declare abstract class ChatAgentHarness<Env extends Cloudflare.Env, RequestBody extends Record<string, unknown> = Record<string, unknown>> extends ChatAgent<Env> {
+declare abstract class ChatAgentHarness<Env extends Cloudflare.Env, RequestBody extends Record<string, unknown> = Record<string, unknown>, SessionIdentity extends Record<string, unknown> = Record<string, unknown>> extends ChatAgent<Env, SessionIdentity> {
   get binding(): {
     getByName(name: string): {
       destroy(): Promise<void>;
@@ -278,4 +289,4 @@ declare abstract class ChatAgentHarness<Env extends Cloudflare.Env, RequestBody
   onChatMessage(onFinish: StreamTextOnFinishCallback<ToolSet>, options?: OnChatMessageOptions): Promise<Response>;
 }
 //#endregion
-export { Agent, type AgentToolContext, type BuildLLMParamsConfig, ChatAgent, ChatAgentHarness, type Skill, buildLLMParams, extractTokenFromConnectRequest, routeAgentRequest };
+export { Agent, type AgentToolContext, type BuildLLMParamsConfig, ChatAgent, ChatAgentHarness, type Skill, buildLLMParams, routeAgentRequest };

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { Output, convertToModelMessages, generateText, jsonSchema, stepCountIs, streamText, tool } from "ai";
 import { Agent as Agent$1, callable, routeAgentRequest as routeAgentRequest$1 } from "agents";
-import { createRemoteJWKSet, decodeJwt, errors, jwtVerify } from "jose";
 import { AIChatAgent } from "@cloudflare/ai-chat";
+import { createRemoteJWKSet, decodeJwt, errors, jwtVerify } from "jose";
 //#region src/server/shared/features/skills/index.ts
 const TOOL_NAME_ACTIVATE_SKILL = "activate_skill";
 const TOOL_NAME_LIST_CAPABILITIES = "list_capabilities";
@@ -269,6 +269,98 @@ async function routeAgentRequest(request, env, options) {
 	return response;
 }
 //#endregion
+//#region src/server/shared/features/audit/audit.ts
+/**
+* Inserts a single audit event row into the shared `audit_events` D1 table.
+*
+* Called by `ChatAgentHarness.logEvent()` (and `AgentHarness.logEvent()`). Not intended for direct use.
+*/
+const SENSITIVE_KEYS = /^(password|token|secret|api_key|apikey|authorization|credentials)$/i;
+const REDACTED = "[REDACTED]";
+/** Deep-clone and redact values for keys that look like secrets (for audit logging). */
+function sanitizePayload(value) {
+	if (value === null || value === void 0) return value;
+	if (Array.isArray(value)) return value.map(sanitizePayload);
+	if (typeof value === "object") {
+		const result = {};
+		for (const [key, val] of Object.entries(value)) result[key] = SENSITIVE_KEYS.test(key) ? REDACTED : sanitizePayload(val);
+		return result;
+	}
+	return value;
+}
+async function insertAuditEvent(db, durableObjectName, message, payload) {
+	await db.prepare(`INSERT INTO audit_events (id, durable_object_name, message, payload, created_at)
+       VALUES (?, ?, ?, ?, ?)`).bind(crypto.randomUUID(), durableObjectName, message, payload ? JSON.stringify(sanitizePayload(payload)) : null, (/* @__PURE__ */ new Date()).toISOString()).run();
+}
+function stringifyForSkillScan(output) {
+	if (typeof output === "string") return output;
+	if (output === null || output === void 0) return "";
+	try {
+		return JSON.stringify(output);
+	} catch {
+		return "";
+	}
+}
+function forEachStep(event, fn) {
+	if (event.steps.length > 0) for (const step of event.steps) fn(step);
+	else fn(event);
+}
+/**
+* User text from provider request body (`contents` is e.g. Gemini format).
+*/
+function extractUserInputFromRequestBody(body) {
+	const firstContent = body?.contents?.[0];
+	if (firstContent?.role !== "user" || !firstContent.parts?.length) return "";
+	return firstContent.parts.map((p) => p.text).filter((t) => typeof t === "string").join(" ").trim();
+}
+/**
+* Builds the payload for a "Turn completed" audit event from the AI SDK
+* `OnFinishEvent`.
+*
+* Returns:
+* - `input`: user message text from `request.body.contents[0]` (Gemini-style)
+* - `output`: assistant response text (truncated to 200 chars)
+* - `toolCalls`: array of { toolName, toolInput, toolOutput }
+* - `loadedSkills`: skill names extracted from activate_skill results
+*/
+function buildTurnLogPayload(event) {
+	const toolCalls = [];
+	let latestSkills;
+	const toolOutputs = /* @__PURE__ */ new Map();
+	forEachStep(event, (step) => {
+		for (const tr of step.toolResults) toolOutputs.set(tr.toolCallId, tr.output);
+	});
+	forEachStep(event, (step) => {
+		for (const tc of step.toolCalls) toolCalls.push({
+			name: tc.toolName,
+			input: tc.input,
+			output: toolOutputs.get(tc.toolCallId)
+		});
+		const considerToolResultForSkills = (toolName, output) => {
+			if (toolName !== "activate_skill") return;
+			const s = stringifyForSkillScan(output);
+			const sentinelIdx = s.indexOf(SKILL_STATE_SENTINEL);
+			if (sentinelIdx === -1) return;
+			try {
+				const stateJson = s.slice(sentinelIdx + 18);
+				latestSkills = JSON.parse(stateJson);
+			} catch {}
+		};
+		for (const tr of step.toolResults) considerToolResultForSkills(tr.toolName, tr.output);
+	});
+	const input = extractUserInputFromRequestBody(event.request?.body);
+	return {
+		detail: {
+			model: event.model.modelId,
+			tokens: event.usage?.totalTokens
+		},
+		loadedSkills: latestSkills ?? [],
+		toolCalls,
+		input: input.slice(0, 200),
+		output: (event.text ?? "").slice(0, 200)
+	};
+}
+//#endregion
 //#region src/server/shared/features/auth/index.ts
 const jwksByIssuer = /* @__PURE__ */ new Map();
 function getJwksForIssuer(issuer) {
@@ -369,98 +461,6 @@ async function verifyJwt(request, config) {
 	};
 }
 //#endregion
-//#region src/server/shared/features/audit/audit.ts
-/**
-* Inserts a single audit event row into the shared `audit_events` D1 table.
-*
-* Called by `ChatAgentHarness.logEvent()` (and `AgentHarness.logEvent()`). Not intended for direct use.
-*/
-const SENSITIVE_KEYS = /^(password|token|secret|api_key|apikey|authorization|credentials)$/i;
-const REDACTED = "[REDACTED]";
-/** Deep-clone and redact values for keys that look like secrets (for audit logging). */
-function sanitizePayload(value) {
-	if (value === null || value === void 0) return value;
-	if (Array.isArray(value)) return value.map(sanitizePayload);
-	if (typeof value === "object") {
-		const result = {};
-		for (const [key, val] of Object.entries(value)) result[key] = SENSITIVE_KEYS.test(key) ? REDACTED : sanitizePayload(val);
-		return result;
-	}
-	return value;
-}
-async function insertAuditEvent(db, durableObjectName, message, payload) {
-	await db.prepare(`INSERT INTO audit_events (id, durable_object_name, message, payload, created_at)
-       VALUES (?, ?, ?, ?, ?)`).bind(crypto.randomUUID(), durableObjectName, message, payload ? JSON.stringify(sanitizePayload(payload)) : null, (/* @__PURE__ */ new Date()).toISOString()).run();
-}
-function stringifyForSkillScan(output) {
-	if (typeof output === "string") return output;
-	if (output === null || output === void 0) return "";
-	try {
-		return JSON.stringify(output);
-	} catch {
-		return "";
-	}
-}
-function forEachStep(event, fn) {
-	if (event.steps.length > 0) for (const step of event.steps) fn(step);
-	else fn(event);
-}
-/**
-* User text from provider request body (`contents` is e.g. Gemini format).
-*/
-function extractUserInputFromRequestBody(body) {
-	const firstContent = body?.contents?.[0];
-	if (firstContent?.role !== "user" || !firstContent.parts?.length) return "";
-	return firstContent.parts.map((p) => p.text).filter((t) => typeof t === "string").join(" ").trim();
-}
-/**
-* Builds the payload for a "Turn completed" audit event from the AI SDK
-* `OnFinishEvent`.
-*
-* Returns:
-* - `input`: user message text from `request.body.contents[0]` (Gemini-style)
-* - `output`: assistant response text (truncated to 200 chars)
-* - `toolCalls`: array of { toolName, toolInput, toolOutput }
-* - `loadedSkills`: skill names extracted from activate_skill results
-*/
-function buildTurnLogPayload(event) {
-	const toolCalls = [];
-	let latestSkills;
-	const toolOutputs = /* @__PURE__ */ new Map();
-	forEachStep(event, (step) => {
-		for (const tr of step.toolResults) toolOutputs.set(tr.toolCallId, tr.output);
-	});
-	forEachStep(event, (step) => {
-		for (const tc of step.toolCalls) toolCalls.push({
-			name: tc.toolName,
-			input: tc.input,
-			output: toolOutputs.get(tc.toolCallId)
-		});
-		const considerToolResultForSkills = (toolName, output) => {
-			if (toolName !== "activate_skill") return;
-			const s = stringifyForSkillScan(output);
-			const sentinelIdx = s.indexOf(SKILL_STATE_SENTINEL);
-			if (sentinelIdx === -1) return;
-			try {
-				const stateJson = s.slice(sentinelIdx + 18);
-				latestSkills = JSON.parse(stateJson);
-			} catch {}
-		};
-		for (const tr of step.toolResults) considerToolResultForSkills(tr.toolName, tr.output);
-	});
-	const input = extractUserInputFromRequestBody(event.request?.body);
-	return {
-		detail: {
-			model: event.model.modelId,
-			tokens: event.usage?.totalTokens
-		},
-		loadedSkills: latestSkills ?? [],
-		toolCalls,
-		input: input.slice(0, 200),
-		output: (event.text ?? "").slice(0, 200)
-	};
-}
-//#endregion
 //#region src/server/agent/Agent.ts
 /**
 * Base agent for Cloudflare Agents SDK Durable Objects with lazy skill loading,
@@ -474,10 +474,10 @@ function buildTurnLogPayload(event) {
 */
 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,10 +845,10 @@ var ChatAgent = class extends AIChatAgent {
 	*/
 	maxMessagesBeforeCompaction = 15;
 	/**
-	* 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.
 	*/
@@ -880,8 +881,9 @@ 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) ?? {};
 		}
 		return super.onConnect(connection, ctx);
 	}
@@ -916,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();
@@ -1040,4 +1042,4 @@ var ChatAgentHarness = class extends ChatAgent {
 	}
 };
 //#endregion
-export { Agent, ChatAgent, ChatAgentHarness, buildLLMParams, extractTokenFromConnectRequest, routeAgentRequest };
+export { Agent, ChatAgent, ChatAgentHarness, buildLLMParams, routeAgentRequest };

package/package.json

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