@economic/agents 1.6.0 → 1.6.2

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 { AIChatAgent, ChatResponseResult, OnChatMessageOptions } from "@cloudflare/ai-chat";
 import { JWTPayload } from "jose";
+import { AIChatAgent, ChatResponseResult, OnChatMessageOptions } from "@cloudflare/ai-chat";
 
 //#region src/server/shared/features/skills/index.d.ts
 /**
@@ -83,6 +83,7 @@ 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
 /**
@@ -277,4 +278,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, routeAgentRequest };
+export { Agent, type AgentToolContext, type BuildLLMParamsConfig, ChatAgent, ChatAgentHarness, type Skill, buildLLMParams, extractTokenFromConnectRequest, 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 { AIChatAgent } from "@cloudflare/ai-chat";
 import { createRemoteJWKSet, decodeJwt, errors, jwtVerify } from "jose";
+import { AIChatAgent } from "@cloudflare/ai-chat";
 //#region src/server/shared/features/skills/index.ts
 const TOOL_NAME_ACTIVATE_SKILL = "activate_skill";
 const TOOL_NAME_LIST_CAPABILITIES = "list_capabilities";
@@ -269,98 +269,6 @@ 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) {
@@ -375,7 +283,7 @@ function getJwksForIssuer(issuer) {
 function isIssuerAllowed(iss, allowed) {
 	return allowed.some((rule) => typeof rule === "string" ? rule === iss : rule.test(iss));
 }
-function extractTokenFromRequest(request) {
+function extractTokenFromConnectRequest(request) {
 	const authorization = request.headers.get("Authorization");
 	if (authorization) {
 		const match = authorization.match(/^Bearer\s+(.+)$/i);
@@ -412,7 +320,7 @@ function hasRequiredScopes(tokenScope, required) {
 * @throws Error for unexpected failures that should be logged
 */
 async function verifyJwt(request, config) {
-	const token = extractTokenFromRequest(request);
+	const token = extractTokenFromConnectRequest(request);
 	if (!token) return {
 		success: false,
 		status: 401,
@@ -461,6 +369,98 @@ 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,
@@ -1036,8 +1036,8 @@ var ChatAgentHarness = class extends ChatAgent {
 			system: this.getSystemPrompt(ctx),
 			skills: this.getSkills(ctx),
 			tools: this.getTools(ctx)
-		})).toUIMessageStreamResponse();
+		})).toUIMessageStreamResponse({ sendSources: true });
 	}
 };
 //#endregion
-export { Agent, ChatAgent, ChatAgentHarness, buildLLMParams, routeAgentRequest };
+export { Agent, ChatAgent, ChatAgentHarness, buildLLMParams, extractTokenFromConnectRequest, routeAgentRequest };

package/package.json

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