@economic/agents 1.1.0 → 1.2.1

package/dist/hono.d.mts

@@ -1,4 +1,4 @@
-import { MiddlewareHandler } from "hono";
+import { Context, MiddlewareHandler } from "hono";
 
 //#region src/hono/jwt-auth.d.ts
 interface JwtAuthConfig {
@@ -8,13 +8,20 @@ interface JwtAuthConfig {
   audience: string;
   /** Required OAuth scopes; token `scope` must include all (empty = no scope check). */
   requiredScopes?: readonly string[];
+  /**
+   * Custom token extraction function.
+   * If provided, replaces the default extraction entirely.
+   * Default checks Authorization header, then Sec-WebSocket-Protocol.
+   */
+  getToken?: (c: Context) => string | null | Promise<string | null>;
 }
 /**
  * Hono middleware: verify JWT via JWKS derived from the token `iss` claim,
  * after `iss` passes `allowedIssuers`.
  *
- * Reads the token from `Authorization: Bearer` only. Browser WebSocket clients
- * cannot set that header; use `routeAgentRequest` `onBeforeConnect` for those.
+ * By default, reads the token from `Authorization: Bearer` header first,
+ * then falls back to `Sec-WebSocket-Protocol: bearer, <token>` for WebSocket connections.
+ * Provide a custom `getToken` function to replace this behavior entirely.
  */
 declare function jwtAuth(config: JwtAuthConfig): MiddlewareHandler;
 //#endregion

package/dist/hono.mjs

@@ -5,7 +5,9 @@ function getJwksForIssuer(issuer) {
 	const normalized = issuer.replace(/\/$/, "");
 	let jwks = jwksByIssuer.get(normalized);
 	if (!jwks) {
-		jwks = createRemoteJWKSet(new URL(`${normalized}/.well-known/openid-configuration/jwks`));
+		const jwksUrl = new URL(`${normalized}/.well-known/openid-configuration/jwks`);
+		console.log("jwksUrl", jwksUrl);
+		jwks = createRemoteJWKSet(jwksUrl);
 		jwksByIssuer.set(normalized, jwks);
 	}
 	return jwks;
@@ -17,6 +19,17 @@ function bearerTokenFromAuthorizationHeader(authorization) {
 	if (!authorization) return null;
 	return authorization.match(/^Bearer\s+(.+)$/i)?.[1]?.trim() ?? null;
 }
+function tokenFromWebSocketProtocol(header) {
+	if (!header) return null;
+	const parts = header.split(",").map((p) => p.trim());
+	const idx = parts.indexOf("bearer");
+	return idx !== -1 && parts[idx + 1] ? parts[idx + 1] : null;
+}
+function defaultGetToken(c) {
+	const authToken = bearerTokenFromAuthorizationHeader(c.req.header("Authorization"));
+	if (authToken) return authToken;
+	return tokenFromWebSocketProtocol(c.req.header("Sec-WebSocket-Protocol"));
+}
 function hasRequiredScopes(tokenScope, required) {
 	if (required.length === 0) return true;
 	if (tokenScope === void 0) return false;
@@ -31,13 +44,15 @@ function authErrorResponse(status, message) {
 * Hono middleware: verify JWT via JWKS derived from the token `iss` claim,
 * after `iss` passes `allowedIssuers`.
 *
-* Reads the token from `Authorization: Bearer` only. Browser WebSocket clients
-* cannot set that header; use `routeAgentRequest` `onBeforeConnect` for those.
+* By default, reads the token from `Authorization: Bearer` header first,
+* then falls back to `Sec-WebSocket-Protocol: bearer, <token>` for WebSocket connections.
+* Provide a custom `getToken` function to replace this behavior entirely.
 */
 function jwtAuth(config) {
 	const requiredScopes = config.requiredScopes ?? [];
+	const getToken = config.getToken ?? defaultGetToken;
 	return async (c, next) => {
-		const token = bearerTokenFromAuthorizationHeader(c.req.header("Authorization"));
+		const token = await getToken(c);
 		if (!token) return authErrorResponse(401, "Unauthorized: Missing authentication token");
 		let unverifiedPayload;
 		try {

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Agent as Agent$1, Connection, ConnectionContext } from "agents";
+import { Agent as Agent$1, AgentOptions, Connection, ConnectionContext } from "agents";
 import { AIChatAgent, OnChatMessageOptions } from "@cloudflare/ai-chat";
 import { LanguageModel, StreamTextOnFinishCallback, ToolSet, UIMessage, generateText, streamText } from "ai";
 
@@ -176,17 +176,6 @@ declare abstract class ChatAgent<Env extends Cloudflare.Env = Cloudflare.Env> ex
   protected buildLLMParams<TBody = Record<string, unknown>>(config: BuildLLMParamsConfig & {
     options?: OnChatMessageOptions;
   }): Promise<LLMParams>;
-  /**
-   * Extracts skill state from activate_skill results, persists to DO SQLite,
-   * then strips all skill meta-tool messages before delegating to super.
-   *
-   * 1. Scans activate_skill tool results for SKILL_STATE_SENTINEL. When found,
-   *    the embedded JSON array of loaded skill names is written to DO SQLite.
-   *
-   * 2. Strips all activate_skill and list_capabilities messages from history.
-   *
-   * 3. Delegates to super.persistMessages for message storage and WS broadcast.
-   */
   persistMessages(messages: UIMessage[], excludeBroadcastIds?: string[], options?: {
     _deleteStaleRows?: boolean;
   }): Promise<void>;
@@ -244,4 +233,7 @@ 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 };
+//#region src/server/route-agent-request.d.ts
+declare function routeAgentRequest<Env>(request: Request, env: Env, options?: AgentOptions<Env>): Promise<Response | null>;
+//#endregion
+export { Agent, type AgentToolContext, type BuildLLMParamsConfig, ChatAgent, ChatAgentHarness, type Skill, buildLLMParams, routeAgentRequest };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { Agent as Agent$1, callable } from "agents";
+import { Agent as Agent$1, callable, routeAgentRequest as routeAgentRequest$1 } from "agents";
 import { AIChatAgent } from "@cloudflare/ai-chat";
 import { Output, convertToModelMessages, generateText, jsonSchema, stepCountIs, streamText, tool } from "ai";
 //#region src/server/features/skills/index.ts
@@ -162,9 +162,23 @@ function getStoredSkills(sql) {
 * Persists the current list of loaded skill names to DO SQLite.
 * Upserts the single `skill_state` row (id = 1).
 */
-function saveStoredSkills(sql, skills) {
+function saveSkillStateFromMessages(sql, messages) {
+	let latestSkillState;
+	for (const msg of messages) {
+		if (msg.role !== "assistant" || !msg.parts) continue;
+		for (const part of msg.parts) {
+			if (!("toolCallId" in part)) continue;
+			if (part.type !== `tool-activate_skill` || typeof part.output !== "string") continue;
+			const sentinelIndex = part.output.indexOf(SKILL_STATE_SENTINEL);
+			if (sentinelIndex !== -1) try {
+				const stateJson = part.output.slice(sentinelIndex + 18);
+				latestSkillState = JSON.parse(stateJson);
+			} catch {}
+		}
+	}
+	if (latestSkillState == void 0) return;
 	ensureSkillTable(sql);
-	sql`INSERT OR REPLACE INTO skill_state(id, active_skills) VALUES(1, ${JSON.stringify(skills)})`;
+	sql`INSERT OR REPLACE INTO skill_state(id, active_skills) VALUES(1, ${JSON.stringify(latestSkillState)})`;
 }
 //#endregion
 //#region src/server/llm.ts
@@ -732,37 +746,11 @@ var ChatAgent = class extends AIChatAgent {
 			onFinish
 		});
 	}
-	/**
-	* Extracts skill state from activate_skill results, persists to DO SQLite,
-	* then strips all skill meta-tool messages before delegating to super.
-	*
-	* 1. Scans activate_skill tool results for SKILL_STATE_SENTINEL. When found,
-	*    the embedded JSON array of loaded skill names is written to DO SQLite.
-	*
-	* 2. Strips all activate_skill and list_capabilities messages from history.
-	*
-	* 3. Delegates to super.persistMessages for message storage and WS broadcast.
-	*/
 	async persistMessages(messages, excludeBroadcastIds = [], options) {
-		let latestSkillState;
-		for (const msg of messages) {
-			if (msg.role !== "assistant" || !msg.parts) continue;
-			for (const part of msg.parts) {
-				if (!("toolCallId" in part)) continue;
-				const { type, output } = part;
-				if (type !== `tool-activate_skill` || typeof output !== "string") continue;
-				const sentinelIdx = output.indexOf(SKILL_STATE_SENTINEL);
-				if (sentinelIdx !== -1) try {
-					const stateJson = output.slice(sentinelIdx + 18);
-					latestSkillState = JSON.parse(stateJson);
-				} catch {}
-			}
-		}
-		if (latestSkillState !== void 0) saveStoredSkills(this.sql.bind(this), latestSkillState);
 		const filtered = filterEphemeralMessages(messages);
-		const result = await super.persistMessages(filtered, excludeBroadcastIds, options);
+		await super.persistMessages(filtered, excludeBroadcastIds, options);
+		saveSkillStateFromMessages(this.sql.bind(this), messages);
 		this.scheduleConversationForDeletion();
-		return result;
 	}
 	@callable({ description: "Returns all conversations for the current user" }) async getConversations() {
 		return getConversations(this.env.AGENT_DB, this.getUserId());
@@ -880,4 +868,17 @@ var ChatAgentHarness = class extends ChatAgent {
 	}
 };
 //#endregion
-export { Agent, ChatAgent, ChatAgentHarness, buildLLMParams };
+//#region src/server/route-agent-request.ts
+async function routeAgentRequest(request, env, options) {
+	const response = await routeAgentRequest$1(request, env, options);
+	if (!response) return null;
+	const protocol = request.headers.get("sec-websocket-protocol");
+	if (response.status === 101 && protocol) {
+		const newResponse = new Response(null, response);
+		newResponse.headers.set("Sec-WebSocket-Protocol", protocol.split(",")[0].trim());
+		return newResponse;
+	}
+	return response;
+}
+//#endregion
+export { Agent, ChatAgent, ChatAgentHarness, buildLLMParams, routeAgentRequest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@economic/agents",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "A starter for creating a TypeScript package.",
   "license": "MIT",
   "bin": {
@@ -43,7 +43,7 @@
   },
   "peerDependencies": {
     "@cloudflare/ai-chat": ">=0.1.0 <1.0.0",
-    "agents": "^0.10.1",
+    "agents": "^0.10.2",
     "ai": "^6.0.0",
     "hono": "^4.0.0",
     "jose": "^6.0.0"