@inkeep/agents-core 0.74.2 → 0.74.3

package/dist/utils/usage-cost-middleware.js

@@ -1,17 +1,27 @@
 import { SPAN_KEYS } from "../constants/otel-attributes.js";
 import { GATEWAY_ROUTABLE_PROVIDERS_SET } from "../constants/models.js";
 import { getLogger } from "./logger.js";
+import { createHash } from "node:crypto";
 import { trace } from "@opentelemetry/api";
 
 //#region src/utils/usage-cost-middleware.ts
 const logger = getLogger("usage-cost-middleware");
 function extractUsageTokens(usage) {
+	const inputTokens = typeof usage?.inputTokens === "object" ? usage.inputTokens.total ?? 0 : usage?.inputTokens ?? 0;
+	const outputTokens = typeof usage?.outputTokens === "object" ? usage.outputTokens.total ?? 0 : usage?.outputTokens ?? 0;
+	const reasoningTokens = typeof usage?.outputTokens === "object" ? usage.outputTokens.reasoning : void 0;
+	let cachedReadTokens = typeof usage?.inputTokens === "object" ? usage.inputTokens.cacheRead : void 0;
+	const cachedWriteTokens = typeof usage?.inputTokens === "object" ? usage.inputTokens.cacheWrite : void 0;
+	if (cachedReadTokens === void 0) {
+		const geminiCacheRead = usage?.inputTokenDetails?.cacheReadTokens ?? usage?.cachedInputTokens;
+		if (typeof geminiCacheRead === "number") cachedReadTokens = geminiCacheRead;
+	}
 	return {
-		inputTokens: typeof usage?.inputTokens === "object" ? usage.inputTokens.total ?? 0 : usage?.inputTokens ?? 0,
-		outputTokens: typeof usage?.outputTokens === "object" ? usage.outputTokens.total ?? 0 : usage?.outputTokens ?? 0,
-		reasoningTokens: typeof usage?.outputTokens === "object" ? usage.outputTokens.reasoning : void 0,
-		cachedReadTokens: typeof usage?.inputTokens === "object" ? usage.inputTokens.cacheRead : void 0,
-		cachedWriteTokens: typeof usage?.inputTokens === "object" ? usage.inputTokens.cacheWrite : void 0
+		inputTokens,
+		outputTokens,
+		reasoningTokens,
+		cachedReadTokens,
+		cachedWriteTokens
 	};
 }
 function extractGatewayCost(providerMetadata) {
@@ -43,29 +53,77 @@ function setGatewayAttributesOnSpan(providerMetadata) {
 		if (routing?.resolvedProvider) activeSpan.setAttribute(SPAN_KEYS.GEN_AI_REQUEST_PROVIDER, routing.resolvedProvider);
 	}
 }
+function countCacheMarkers(prompt, callProviderOptions) {
+	let count = 0;
+	const caching = callProviderOptions?.gateway?.caching;
+	if (caching && caching !== "off" && caching !== "disabled") count++;
+	for (const msg of prompt) if (msg.providerOptions?.anthropic?.cacheControl) count++;
+	return Math.min(count, 4);
+}
+function computePrefixSignature(prompt, tools) {
+	const systemParts = [];
+	for (const msg of prompt) {
+		if (msg.role !== "system") continue;
+		if (typeof msg.content === "string") systemParts.push(msg.content);
+		else if (Array.isArray(msg.content)) {
+			for (const part of msg.content) if (typeof part === "string") systemParts.push(part);
+			else if (part?.text) systemParts.push(part.text);
+		}
+	}
+	const toolParts = (tools ?? []).map((tool) => [
+		tool.name ?? "",
+		tool.description ?? "",
+		tool.parameters ? JSON.stringify(tool.parameters) : ""
+	]);
+	return createHash("sha256").update(JSON.stringify([systemParts, toolParts])).digest("hex").slice(0, 10);
+}
+function setCacheAttributesOnSpan(params, usage) {
+	const activeSpan = trace.getActiveSpan();
+	if (!activeSpan) return;
+	const { cachedReadTokens, cachedWriteTokens } = extractUsageTokens(usage);
+	activeSpan.setAttribute(SPAN_KEYS.GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS, typeof cachedReadTokens === "number" ? cachedReadTokens : 0);
+	activeSpan.setAttribute(SPAN_KEYS.GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS, typeof cachedWriteTokens === "number" ? cachedWriteTokens : 0);
+	const prompt = params.prompt ?? [];
+	const markerCount = countCacheMarkers(prompt, params.providerOptions);
+	activeSpan.setAttribute(SPAN_KEYS.CACHE_INTENT_MARKER_COUNT, markerCount);
+	const prefixSignature = computePrefixSignature(prompt, params.tools);
+	activeSpan.setAttribute(SPAN_KEYS.CACHE_INTENT_PREFIX_SIGNATURE, prefixSignature);
+}
 const gatewayCostMiddleware = {
 	specificationVersion: "v3",
 	overrideModelId({ model }) {
 		return normalizeModelId(model.modelId);
 	},
-	async wrapGenerate({ doGenerate }) {
+	async wrapGenerate({ doGenerate, params }) {
 		const result = await doGenerate();
 		try {
 			setGatewayAttributesOnSpan(result.providerMetadata);
 		} catch (error) {
 			logger.warn({ error }, "Failed to extract gateway cost in wrapGenerate");
 		}
+		try {
+			setCacheAttributesOnSpan(params, result.usage);
+		} catch (error) {
+			logger.warn({ error }, "Failed to set cache attributes in wrapGenerate");
+		}
 		return result;
 	},
-	async wrapStream({ doStream }) {
+	async wrapStream({ doStream, params }) {
 		const { stream, ...rest } = await doStream();
 		return {
 			stream: stream.pipeThrough(new TransformStream({ transform(chunk, controller) {
 				controller.enqueue(chunk);
-				if (chunk.type === "finish") try {
-					setGatewayAttributesOnSpan(chunk.providerMetadata);
-				} catch (error) {
-					logger.warn({ error }, "Failed to extract gateway cost in wrapStream");
+				if (chunk.type === "finish") {
+					try {
+						setGatewayAttributesOnSpan(chunk.providerMetadata);
+					} catch (error) {
+						logger.warn({ error }, "Failed to extract gateway cost in wrapStream");
+					}
+					try {
+						setCacheAttributesOnSpan(params, chunk.usage);
+					} catch (error) {
+						logger.warn({ error }, "Failed to set cache attributes in wrapStream");
+					}
 				}
 			} })),
 			...rest
@@ -74,4 +132,4 @@ const gatewayCostMiddleware = {
 };
 
 //#endregion
-export { extractUsageTokens, gatewayCostMiddleware, normalizeModelId };
+export { computePrefixSignature, countCacheMarkers, extractUsageTokens, gatewayCostMiddleware, normalizeModelId };

package/dist/validation/drizzle-schema-helpers.d.ts

@@ -1,10 +1,10 @@
 import { z } from "@hono/zod-openapi";
-import * as drizzle_zod385 from "drizzle-zod";
+import * as drizzle_zod15 from "drizzle-zod";
 import { AnySQLiteTable } from "drizzle-orm/sqlite-core";
 
 //#region src/validation/drizzle-schema-helpers.d.ts
-declare function createSelectSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod385.BuildSchema<"select", T["_"]["columns"], drizzle_zod385.BuildRefine<T["_"]["columns"], undefined>, undefined>;
-declare function createInsertSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod385.BuildSchema<"insert", T["_"]["columns"], drizzle_zod385.BuildRefine<Pick<T["_"]["columns"], keyof T["$inferInsert"]>, undefined>, undefined>;
+declare function createSelectSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod15.BuildSchema<"select", T["_"]["columns"], drizzle_zod15.BuildRefine<T["_"]["columns"], undefined>, undefined>;
+declare function createInsertSchemaWithModifiers<T extends AnySQLiteTable>(table: T, overrides?: Partial<Record<keyof T['_']['columns'], (schema: z.ZodTypeAny) => z.ZodTypeAny>>): drizzle_zod15.BuildSchema<"insert", T["_"]["columns"], drizzle_zod15.BuildRefine<Pick<T["_"]["columns"], keyof T["$inferInsert"]>, undefined>, undefined>;
 declare const createSelectSchema: typeof createSelectSchemaWithModifiers;
 declare const createInsertSchema: typeof createInsertSchemaWithModifiers;
 /**

package/dist/validation/schemas/skills.d.ts

@@ -1,6 +1,6 @@
 import { z } from "@hono/zod-openapi";
-import * as drizzle_orm_pg_core2053 from "drizzle-orm/pg-core";
-import * as drizzle_zod389 from "drizzle-zod";
+import * as drizzle_orm_pg_core1973 from "drizzle-orm/pg-core";
+import * as drizzle_zod405 from "drizzle-zod";
 
 //#region src/validation/schemas/skills.d.ts
 declare const SkillIndexSchema: z.ZodInt;
@@ -27,8 +27,8 @@ declare const SkillFileContentInputSchema: z.ZodObject<{
   filePath: z.ZodString;
   content: z.ZodString;
 }, z.core.$strip>;
-declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
-  createdAt: drizzle_orm_pg_core2053.PgColumn<{
+declare const SkillFileSelectSchema: drizzle_zod405.BuildSchema<"select", {
+  createdAt: drizzle_orm_pg_core1973.PgColumn<{
     name: "created_at";
     tableName: "skill_files";
     dataType: "string";
@@ -45,7 +45,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  updatedAt: drizzle_orm_pg_core2053.PgColumn<{
+  updatedAt: drizzle_orm_pg_core1973.PgColumn<{
     name: "updated_at";
     tableName: "skill_files";
     dataType: "string";
@@ -62,7 +62,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  skillId: drizzle_orm_pg_core2053.PgColumn<{
+  skillId: drizzle_orm_pg_core1973.PgColumn<{
     name: "skill_id";
     tableName: "skill_files";
     dataType: "string";
@@ -81,7 +81,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 64;
   }>;
-  filePath: drizzle_orm_pg_core2053.PgColumn<{
+  filePath: drizzle_orm_pg_core1973.PgColumn<{
     name: "file_path";
     tableName: "skill_files";
     dataType: "string";
@@ -100,7 +100,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 1024;
   }>;
-  content: drizzle_orm_pg_core2053.PgColumn<{
+  content: drizzle_orm_pg_core1973.PgColumn<{
     name: "content";
     tableName: "skill_files";
     dataType: "string";
@@ -117,7 +117,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  projectId: drizzle_orm_pg_core2053.PgColumn<{
+  projectId: drizzle_orm_pg_core1973.PgColumn<{
     name: "project_id";
     tableName: "skill_files";
     dataType: "string";
@@ -136,7 +136,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  tenantId: drizzle_orm_pg_core2053.PgColumn<{
+  tenantId: drizzle_orm_pg_core1973.PgColumn<{
     name: "tenant_id";
     tableName: "skill_files";
     dataType: "string";
@@ -155,7 +155,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  id: drizzle_orm_pg_core2053.PgColumn<{
+  id: drizzle_orm_pg_core1973.PgColumn<{
     name: "id";
     tableName: "skill_files";
     dataType: "string";
@@ -174,8 +174,8 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-}, drizzle_zod389.BuildRefine<{
-  createdAt: drizzle_orm_pg_core2053.PgColumn<{
+}, drizzle_zod405.BuildRefine<{
+  createdAt: drizzle_orm_pg_core1973.PgColumn<{
     name: "created_at";
     tableName: "skill_files";
     dataType: "string";
@@ -192,7 +192,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  updatedAt: drizzle_orm_pg_core2053.PgColumn<{
+  updatedAt: drizzle_orm_pg_core1973.PgColumn<{
     name: "updated_at";
     tableName: "skill_files";
     dataType: "string";
@@ -209,7 +209,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  skillId: drizzle_orm_pg_core2053.PgColumn<{
+  skillId: drizzle_orm_pg_core1973.PgColumn<{
     name: "skill_id";
     tableName: "skill_files";
     dataType: "string";
@@ -228,7 +228,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 64;
   }>;
-  filePath: drizzle_orm_pg_core2053.PgColumn<{
+  filePath: drizzle_orm_pg_core1973.PgColumn<{
     name: "file_path";
     tableName: "skill_files";
     dataType: "string";
@@ -247,7 +247,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 1024;
   }>;
-  content: drizzle_orm_pg_core2053.PgColumn<{
+  content: drizzle_orm_pg_core1973.PgColumn<{
     name: "content";
     tableName: "skill_files";
     dataType: "string";
@@ -264,7 +264,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  projectId: drizzle_orm_pg_core2053.PgColumn<{
+  projectId: drizzle_orm_pg_core1973.PgColumn<{
     name: "project_id";
     tableName: "skill_files";
     dataType: "string";
@@ -283,7 +283,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  tenantId: drizzle_orm_pg_core2053.PgColumn<{
+  tenantId: drizzle_orm_pg_core1973.PgColumn<{
     name: "tenant_id";
     tableName: "skill_files";
     dataType: "string";
@@ -302,7 +302,7 @@ declare const SkillFileSelectSchema: drizzle_zod389.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  id: drizzle_orm_pg_core2053.PgColumn<{
+  id: drizzle_orm_pg_core1973.PgColumn<{
     name: "id";
     tableName: "skill_files";
     dataType: "string";
@@ -355,9 +355,9 @@ declare const SkillApiSelectSchema: z.ZodObject<{
   name: z.ZodString;
   id: z.ZodString;
   createdAt: z.ZodString;
+  updatedAt: z.ZodString;
   metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
-  updatedAt: z.ZodString;
 }, z.core.$strip>;
 declare const SkillApiInsertSchema: z.ZodPipe<z.ZodPipe<z.ZodObject<{
   files: z.ZodArray<z.ZodObject<{
@@ -411,8 +411,8 @@ declare const SkillApiUpdateSchema: z.ZodPipe<z.ZodPipe<z.ZodObject<{
 declare const SkillFileApiSelectSchema: z.ZodObject<{
   id: z.ZodString;
   createdAt: z.ZodString;
-  content: z.ZodString;
   updatedAt: z.ZodString;
+  content: z.ZodString;
   skillId: z.ZodString;
   filePath: z.ZodString;
 }, z.core.$strip>;
@@ -428,14 +428,14 @@ declare const SkillWithFilesApiSelectSchema: z.ZodObject<{
   name: z.ZodString;
   id: z.ZodString;
   createdAt: z.ZodString;
+  updatedAt: z.ZodString;
   metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
-  updatedAt: z.ZodString;
   files: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
     createdAt: z.ZodString;
-    content: z.ZodString;
     updatedAt: z.ZodString;
+    content: z.ZodString;
     skillId: z.ZodString;
     filePath: z.ZodString;
   }, z.core.$strip>>;
@@ -490,16 +490,16 @@ declare const SubAgentSkillApiSelectSchema: z.ZodObject<{
   id: z.ZodString;
   createdAt: z.ZodString;
   updatedAt: z.ZodString;
+  skillId: z.ZodString;
   index: z.ZodInt;
   alwaysLoaded: z.ZodBoolean;
-  skillId: z.ZodString;
 }, z.core.$strip>;
 declare const SubAgentSkillApiInsertSchema: z.ZodObject<{
   agentId: z.ZodString;
   subAgentId: z.ZodString;
+  skillId: z.ZodString;
   index: z.ZodInt;
   alwaysLoaded: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-  skillId: z.ZodString;
 }, {
   out: {};
   in: {};
@@ -509,18 +509,18 @@ declare const SubAgentSkillApiUpdateSchema: z.ZodObject<{
   id: z.ZodOptional<z.ZodOptional<z.ZodString>>;
   createdAt: z.ZodOptional<z.ZodOptional<z.ZodOptional<z.ZodString>>>;
   updatedAt: z.ZodOptional<z.ZodOptional<z.ZodOptional<z.ZodString>>>;
+  skillId: z.ZodOptional<z.ZodOptional<z.ZodString>>;
   index: z.ZodOptional<z.ZodOptional<z.ZodInt>>;
   alwaysLoaded: z.ZodOptional<z.ZodOptional<z.ZodDefault<z.ZodOptional<z.ZodBoolean>>>>;
-  skillId: z.ZodOptional<z.ZodOptional<z.ZodString>>;
 }, z.core.$strip>;
 declare const SubAgentSkillWithIndexSchema: z.ZodObject<{
   description: z.ZodString;
   name: z.ZodString;
   id: z.ZodString;
   createdAt: z.ZodString;
+  updatedAt: z.ZodString;
   metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
-  updatedAt: z.ZodString;
   subAgentSkillId: z.ZodString;
   subAgentId: z.ZodString;
   index: z.ZodInt;
@@ -530,8 +530,8 @@ declare const SkillFileResponse: z.ZodObject<{
   data: z.ZodObject<{
     id: z.ZodString;
     createdAt: z.ZodString;
-    content: z.ZodString;
     updatedAt: z.ZodString;
+    content: z.ZodString;
     skillId: z.ZodString;
     filePath: z.ZodString;
   }, z.core.$strip>;
@@ -542,14 +542,14 @@ declare const SkillWithFilesResponse: z.ZodObject<{
     name: z.ZodString;
     id: z.ZodString;
     createdAt: z.ZodString;
+    updatedAt: z.ZodString;
     metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
-    updatedAt: z.ZodString;
     files: z.ZodArray<z.ZodObject<{
       id: z.ZodString;
       createdAt: z.ZodString;
-      content: z.ZodString;
       updatedAt: z.ZodString;
+      content: z.ZodString;
       skillId: z.ZodString;
       filePath: z.ZodString;
     }, z.core.$strip>>;
@@ -561,9 +561,9 @@ declare const SkillListResponse: z.ZodObject<{
     name: z.ZodString;
     id: z.ZodString;
     createdAt: z.ZodString;
+    updatedAt: z.ZodString;
     metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
-    updatedAt: z.ZodString;
   }, z.core.$strip>>;
   pagination: z.ZodObject<{
     page: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
@@ -578,9 +578,9 @@ declare const SubAgentSkillResponse: z.ZodObject<{
     id: z.ZodString;
     createdAt: z.ZodString;
     updatedAt: z.ZodString;
+    skillId: z.ZodString;
     index: z.ZodInt;
     alwaysLoaded: z.ZodBoolean;
-    skillId: z.ZodString;
   }, z.core.$strip>;
 }, z.core.$strip>;
 declare const SubAgentSkillWithIndexArrayResponse: z.ZodObject<{
@@ -589,9 +589,9 @@ declare const SubAgentSkillWithIndexArrayResponse: z.ZodObject<{
     name: z.ZodString;
     id: z.ZodString;
     createdAt: z.ZodString;
+    updatedAt: z.ZodString;
     metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
-    updatedAt: z.ZodString;
     subAgentSkillId: z.ZodString;
     subAgentId: z.ZodString;
     index: z.ZodInt;