@economic/agents 2.7.0 → 2.7.2

package/README.md

@@ -86,6 +86,11 @@ const { anthropic, gemini } = createAiGatewayVertexProviders({
 });
 ```
 
+When these providers are used inside an SDK agent, the SDK automatically adds
+the entry-point agent class as `agentId` in `cf-aig-metadata`. This includes
+requests made by child chat/facet agents and allows a shared gateway's usage to
+be grouped by agent without application configuration or duplicated analytics.
+
 ## Quick start: an agent
 
 Subclass `Agent` and implement `getModel` and `getSystemPrompt`. Add tools with `getTools`, skills with `getSkills`. Expose a `@callable` method to run a turn — `saveMessages` injects a message, runs the turn, and persists the result:

package/dist/providers.d.mts

@@ -2,6 +2,10 @@ import { AnthropicMessagesLanguageModel } from "@ai-sdk/anthropic/internal";
 import { GoogleGenerativeAIProvider } from "@ai-sdk/google";
 import { AnthropicProvider } from "@ai-sdk/anthropic";
 
+//#region src/providers/metadata.d.ts
+/** Custom metadata serialized into Cloudflare's `cf-aig-metadata` header. */
+type AiGatewayMetadata = Record<string, unknown>;
+//#endregion
 //#region src/providers/anthropic.d.ts
 type AnthropicVertexModelId = Parameters<AnthropicProvider>[0];
 interface AnthropicVertexProviderOptions {
@@ -11,8 +15,10 @@ interface AnthropicVertexProviderOptions {
   googleCloudProjectId: string;
   location?: string;
   anthropicVersion?: string;
+  /** Custom metadata included on every request. `agentId` is injected by the SDK. */
+  metadata?: AiGatewayMetadata;
 }
-declare function createAnthropicProvider(options: AnthropicVertexProviderOptions): (modelId: AnthropicVertexModelId, metadata?: Record<string, unknown>) => AnthropicMessagesLanguageModel;
+declare function createAnthropicProvider(options: AnthropicVertexProviderOptions): (modelId: AnthropicVertexModelId, metadata?: AiGatewayMetadata) => AnthropicMessagesLanguageModel;
 //#endregion
 //#region src/providers/gemini.d.ts
 type GeminiModelId = Parameters<GoogleGenerativeAIProvider>[0];
@@ -22,14 +28,16 @@ interface GeminiProviderOptions {
   cloudflareApiToken: string;
   googleCloudProjectId: string;
   location?: string;
+  /** Custom metadata included on every request. `agentId` is injected by the SDK. */
+  metadata?: AiGatewayMetadata;
 }
-declare function createGeminiProvider(options: GeminiProviderOptions, metadata?: Record<string, unknown>): GoogleGenerativeAIProvider;
+declare function createGeminiProvider(options: GeminiProviderOptions, metadata?: AiGatewayMetadata): GoogleGenerativeAIProvider;
 //#endregion
 //#region src/providers/index.d.ts
 interface AiGatewayVertexProvidersOptions extends AnthropicVertexProviderOptions, GeminiProviderOptions {}
 declare function createAiGatewayVertexProviders(options: AiGatewayVertexProvidersOptions): {
-  anthropic: (modelId: AnthropicVertexModelId, metadata?: Record<string, unknown>) => import("@ai-sdk/anthropic/internal").AnthropicMessagesLanguageModel;
+  anthropic: (modelId: AnthropicVertexModelId, metadata?: AiGatewayMetadata) => import("@ai-sdk/anthropic/internal").AnthropicMessagesLanguageModel;
   gemini: import("@ai-sdk/google").GoogleGenerativeAIProvider;
 };
 //#endregion
-export { AiGatewayVertexProvidersOptions, type AnthropicVertexModelId, type AnthropicVertexProviderOptions, type GeminiModelId, type GeminiProviderOptions, createAiGatewayVertexProviders, createAnthropicProvider, createGeminiProvider };
+export { type AiGatewayMetadata, AiGatewayVertexProvidersOptions, type AnthropicVertexModelId, type AnthropicVertexProviderOptions, type GeminiModelId, type GeminiProviderOptions, createAiGatewayVertexProviders, createAnthropicProvider, createGeminiProvider };

package/dist/providers.mjs

@@ -1,16 +1,44 @@
+import { getCurrentAgent } from "agents";
 import { AnthropicMessagesLanguageModel } from "@ai-sdk/anthropic/internal";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
+//#region src/providers/metadata.ts
+function getCurrentAgentId() {
+	const agent = getCurrentAgent().agent;
+	if (!agent) return void 0;
+	return agent.selfPath[0]?.className ?? agent.constructor.name;
+}
+function createAiGatewayHeaders(cloudflareApiToken, defaultMetadata, requestMetadata) {
+	const headers = { "cf-aig-authorization": `Bearer ${cloudflareApiToken}` };
+	const metadata = { ...defaultMetadata };
+	for (const [key, value] of Object.entries(requestMetadata ?? {})) if (!(key in metadata)) metadata[key] = value;
+	const agentId = getCurrentAgentId();
+	if (agentId) metadata.agentId = agentId;
+	if (Object.values(metadata).some((value) => value !== void 0)) headers["cf-aig-metadata"] = JSON.stringify(metadata);
+	return headers;
+}
+/** Adds AI Gateway authentication and SDK-owned agent metadata at request time. */
+function createAiGatewayFetch(cloudflareApiToken, defaultMetadata, requestMetadata) {
+	return (input, init) => {
+		const headers = new Headers(input instanceof Request ? input.headers : void 0);
+		new Headers(init?.headers).forEach((value, key) => headers.set(key, value));
+		for (const [key, value] of Object.entries(createAiGatewayHeaders(cloudflareApiToken, defaultMetadata, requestMetadata))) headers.set(key, value);
+		return globalThis.fetch(input, {
+			...init,
+			headers
+		});
+	};
+}
+//#endregion
 //#region src/providers/anthropic.ts
 function createAnthropicProvider(options) {
-	const { anthropicVersion = "vertex-2023-10-16", cloudflareAccountId, cloudflareAiGatewayId, cloudflareApiToken, googleCloudProjectId, location = "europe-west1" } = options;
+	const { anthropicVersion = "vertex-2023-10-16", cloudflareAccountId, cloudflareAiGatewayId, cloudflareApiToken, googleCloudProjectId, location = "europe-west1", metadata: defaultMetadata } = options;
 	const anthropicBaseURL = `${`${`https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareAiGatewayId}/`}google-vertex-ai/v1/projects/${googleCloudProjectId}/locations/${location}/publishers/`}anthropic/models/`;
 	return function anthropic(modelId, metadata) {
-		const headers = { "cf-aig-authorization": `Bearer ${cloudflareApiToken}` };
-		if (metadata) headers["cf-aig-metadata"] = JSON.stringify(metadata);
 		return new AnthropicMessagesLanguageModel(modelId, {
 			provider: "vertex.anthropic.messages",
 			baseURL: anthropicBaseURL,
-			headers,
+			headers: {},
+			fetch: createAiGatewayFetch(cloudflareApiToken, defaultMetadata, metadata),
 			buildRequestUrl: (baseURL, isStreaming) => `${baseURL}${modelId}:${isStreaming ? "streamRawPredict" : "rawPredict"}`,
 			transformRequestBody: (args) => {
 				const { model, ...rest } = args;
@@ -28,13 +56,11 @@ function createAnthropicProvider(options) {
 //#endregion
 //#region src/providers/gemini.ts
 function createGeminiProvider(options, metadata) {
-	const { cloudflareAccountId, cloudflareAiGatewayId, cloudflareApiToken, googleCloudProjectId, location = "europe-west1" } = options;
-	const headers = { "cf-aig-authorization": `Bearer ${cloudflareApiToken}` };
-	if (metadata) headers["cf-aig-metadata"] = JSON.stringify(metadata);
+	const { cloudflareAccountId, cloudflareAiGatewayId, cloudflareApiToken, googleCloudProjectId, location = "europe-west1", metadata: defaultMetadata } = options;
 	return createGoogleGenerativeAI({
 		apiKey: "unused",
 		baseURL: `https://gateway.ai.cloudflare.com/v1/${cloudflareAccountId}/${cloudflareAiGatewayId}/google-vertex-ai/v1/projects/${googleCloudProjectId}/locations/${location}/publishers/google/models`,
-		headers,
+		fetch: createAiGatewayFetch(cloudflareApiToken, defaultMetadata, metadata),
 		name: "gateway.google.vertex-ai"
 	});
 }

package/package.json

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