@inkeep/agents-core 0.0.0-dev-20260331174912 → 0.0.0-dev-20260331192950

package/dist/utils/model-factory.js

@@ -1,3 +1,4 @@
+import { GATEWAY_ROUTABLE_PROVIDERS_SET } from "../constants/models.js";
 import { getLogger } from "./logger.js";
 import { createMockModel } from "./mock-provider.js";
 import { gatewayCostMiddleware } from "./usage-cost-middleware.js";
@@ -12,11 +13,6 @@ import { createOpenRouter, openrouter } from "@openrouter/ai-sdk-provider";
 
 //#region src/utils/model-factory.ts
 const logger = getLogger("ModelFactory");
-const GATEWAY_ROUTABLE_PROVIDERS = [
-	"anthropic",
-	"openai",
-	"google"
-];
 const nimDefault = createOpenAICompatible({
 	name: "nim",
 	baseURL: "https://integrate.api.nvidia.com/v1",
@@ -114,9 +110,9 @@ var ModelFactory = class ModelFactory {
 			hasProviderOptions: !!modelSettings.providerOptions
 		}, "Creating language model from config");
 		const providerConfig = ModelFactory.extractProviderConfig(modelSettings.providerOptions);
-		const shouldRouteViaGateway = !!process.env.AI_GATEWAY_API_KEY && GATEWAY_ROUTABLE_PROVIDERS.includes(provider) && Object.keys(providerConfig).length === 0;
+		const shouldRouteViaGateway = !!process.env.AI_GATEWAY_API_KEY && GATEWAY_ROUTABLE_PROVIDERS_SET.has(provider) && Object.keys(providerConfig).length === 0;
 		let model;
-		if (shouldRouteViaGateway) model = gateway(`${provider}/${modelName}`);
+		if (shouldRouteViaGateway) model = gateway(!!modelSettings.allowedProviders?.length ? modelName : `${provider}/${modelName}`);
 		else if (provider !== "mock" && (provider === "azure" || Object.keys(providerConfig).length > 0)) {
 			logger.info({ config: providerConfig }, `Applying custom ${provider} provider configuration`);
 			model = ModelFactory.createProvider(provider, providerConfig).languageModel(modelName);
@@ -208,11 +204,30 @@ var ModelFactory = class ModelFactory {
 		const modelString = modelSettings?.model?.trim();
 		const model = ModelFactory.createModel({
 			model: modelString,
-			providerOptions: modelSettings?.providerOptions
+			providerOptions: modelSettings?.providerOptions,
+			allowedProviders: modelSettings?.allowedProviders
 		});
 		const generationParams = ModelFactory.getGenerationParams(modelSettings?.providerOptions);
-		const streamProviderOptions = ModelFactory.extractStreamProviderOptions(modelSettings?.providerOptions);
+		let streamProviderOptions = ModelFactory.extractStreamProviderOptions(modelSettings?.providerOptions);
 		const maxDuration = modelSettings?.providerOptions?.maxDuration;
+		if (process.env.AI_GATEWAY_API_KEY) {
+			const hasAllowedProviders = !!modelSettings?.allowedProviders?.length;
+			const hasFallbackModels = !!modelSettings?.fallbackModels?.length;
+			if (hasAllowedProviders || hasFallbackModels) {
+				const existingGateway = streamProviderOptions?.gateway ?? {};
+				streamProviderOptions = {
+					...streamProviderOptions,
+					gateway: {
+						...existingGateway,
+						...hasFallbackModels && { models: modelSettings.fallbackModels },
+						...hasAllowedProviders && {
+							order: modelSettings.allowedProviders,
+							only: modelSettings.allowedProviders
+						}
+					}
+				};
+			}
+		}
 		return {
 			model,
 			...generationParams,

package/dist/utils/usage-cost-middleware.d.ts

@@ -8,6 +8,7 @@ declare function extractUsageTokens(usage: any): {
   cachedReadTokens?: number;
   cachedWriteTokens?: number;
 };
+declare function normalizeModelId(modelId: string): string;
 declare const gatewayCostMiddleware: LanguageModelMiddleware;
 //#endregion
-export { extractUsageTokens, gatewayCostMiddleware };
+export { extractUsageTokens, gatewayCostMiddleware, normalizeModelId };

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

@@ -1,4 +1,5 @@
 import { SPAN_KEYS } from "../constants/otel-attributes.js";
+import { GATEWAY_ROUTABLE_PROVIDERS_SET } from "../constants/models.js";
 import { getLogger } from "./logger.js";
 import { trace } from "@opentelemetry/api";
 
@@ -22,19 +23,35 @@ function extractGatewayCost(providerMetadata) {
 	if (!Number.isNaN(marketCost) && marketCost > 0) return marketCost;
 	return 0;
 }
-function setGatewayCostOnSpan(providerMetadata) {
+function normalizeModelId(modelId) {
+	const slashIndex = modelId.indexOf("/");
+	if (slashIndex === -1) return modelId;
+	const prefix = modelId.slice(0, slashIndex);
+	if (GATEWAY_ROUTABLE_PROVIDERS_SET.has(prefix)) return modelId.slice(slashIndex + 1);
+	return modelId;
+}
+function setGatewayAttributesOnSpan(providerMetadata) {
 	const activeSpan = trace.getActiveSpan();
 	if (!activeSpan) return;
 	const cost = extractGatewayCost(providerMetadata);
 	activeSpan.setAttribute(SPAN_KEYS.GEN_AI_COST_ESTIMATED_USD, cost);
-	if (providerMetadata?.gateway && cost === 0) logger.warn({ gateway: providerMetadata.gateway }, "Routed through gateway but no cost data in response");
+	const gw = providerMetadata?.gateway;
+	if (gw) {
+		if (cost === 0) logger.warn({ gateway: gw }, "Routed through gateway but no cost data in response");
+		const routing = gw.routing;
+		if (routing?.finalProvider) activeSpan.setAttribute(SPAN_KEYS.GEN_AI_RESPONSE_PROVIDER, routing.finalProvider);
+		if (routing?.resolvedProvider) activeSpan.setAttribute(SPAN_KEYS.GEN_AI_REQUEST_PROVIDER, routing.resolvedProvider);
+	}
 }
 const gatewayCostMiddleware = {
 	specificationVersion: "v3",
+	overrideModelId({ model }) {
+		return normalizeModelId(model.modelId);
+	},
 	async wrapGenerate({ doGenerate }) {
 		const result = await doGenerate();
 		try {
-			setGatewayCostOnSpan(result.providerMetadata);
+			setGatewayAttributesOnSpan(result.providerMetadata);
 		} catch (error) {
 			logger.warn({ error }, "Failed to extract gateway cost in wrapGenerate");
 		}
@@ -46,7 +63,7 @@ const gatewayCostMiddleware = {
 			stream: stream.pipeThrough(new TransformStream({ transform(chunk, controller) {
 				controller.enqueue(chunk);
 				if (chunk.type === "finish") try {
-					setGatewayCostOnSpan(chunk.providerMetadata);
+					setGatewayAttributesOnSpan(chunk.providerMetadata);
 				} catch (error) {
 					logger.warn({ error }, "Failed to extract gateway cost in wrapStream");
 				}
@@ -57,4 +74,4 @@ const gatewayCostMiddleware = {
 };
 
 //#endregion
-export { extractUsageTokens, gatewayCostMiddleware };
+export { extractUsageTokens, gatewayCostMiddleware, normalizeModelId };

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

@@ -1,10 +1,10 @@
 import { z } from "@hono/zod-openapi";
-import * as drizzle_zod0 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_zod0.BuildSchema<"select", T["_"]["columns"], drizzle_zod0.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_zod0.BuildSchema<"insert", T["_"]["columns"], drizzle_zod0.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,5 +1,5 @@
 import { z } from "@hono/zod-openapi";
-import * as drizzle_orm_pg_core1766 from "drizzle-orm/pg-core";
+import * as drizzle_orm_pg_core1432 from "drizzle-orm/pg-core";
 import * as drizzle_zod363 from "drizzle-zod";
 
 //#region src/validation/schemas/skills.d.ts
@@ -28,7 +28,7 @@ declare const SkillFileContentInputSchema: z.ZodObject<{
   content: z.ZodString;
 }, z.core.$strip>;
 declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
-  createdAt: drizzle_orm_pg_core1766.PgColumn<{
+  createdAt: drizzle_orm_pg_core1432.PgColumn<{
     name: "created_at";
     tableName: "skill_files";
     dataType: "string";
@@ -45,7 +45,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  updatedAt: drizzle_orm_pg_core1766.PgColumn<{
+  updatedAt: drizzle_orm_pg_core1432.PgColumn<{
     name: "updated_at";
     tableName: "skill_files";
     dataType: "string";
@@ -62,7 +62,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  skillId: drizzle_orm_pg_core1766.PgColumn<{
+  skillId: drizzle_orm_pg_core1432.PgColumn<{
     name: "skill_id";
     tableName: "skill_files";
     dataType: "string";
@@ -81,7 +81,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 64;
   }>;
-  filePath: drizzle_orm_pg_core1766.PgColumn<{
+  filePath: drizzle_orm_pg_core1432.PgColumn<{
     name: "file_path";
     tableName: "skill_files";
     dataType: "string";
@@ -100,7 +100,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 1024;
   }>;
-  content: drizzle_orm_pg_core1766.PgColumn<{
+  content: drizzle_orm_pg_core1432.PgColumn<{
     name: "content";
     tableName: "skill_files";
     dataType: "string";
@@ -117,7 +117,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  projectId: drizzle_orm_pg_core1766.PgColumn<{
+  projectId: drizzle_orm_pg_core1432.PgColumn<{
     name: "project_id";
     tableName: "skill_files";
     dataType: "string";
@@ -136,7 +136,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  tenantId: drizzle_orm_pg_core1766.PgColumn<{
+  tenantId: drizzle_orm_pg_core1432.PgColumn<{
     name: "tenant_id";
     tableName: "skill_files";
     dataType: "string";
@@ -155,7 +155,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  id: drizzle_orm_pg_core1766.PgColumn<{
+  id: drizzle_orm_pg_core1432.PgColumn<{
     name: "id";
     tableName: "skill_files";
     dataType: "string";
@@ -175,7 +175,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     length: 256;
   }>;
 }, drizzle_zod363.BuildRefine<{
-  createdAt: drizzle_orm_pg_core1766.PgColumn<{
+  createdAt: drizzle_orm_pg_core1432.PgColumn<{
     name: "created_at";
     tableName: "skill_files";
     dataType: "string";
@@ -192,7 +192,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  updatedAt: drizzle_orm_pg_core1766.PgColumn<{
+  updatedAt: drizzle_orm_pg_core1432.PgColumn<{
     name: "updated_at";
     tableName: "skill_files";
     dataType: "string";
@@ -209,7 +209,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  skillId: drizzle_orm_pg_core1766.PgColumn<{
+  skillId: drizzle_orm_pg_core1432.PgColumn<{
     name: "skill_id";
     tableName: "skill_files";
     dataType: "string";
@@ -228,7 +228,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 64;
   }>;
-  filePath: drizzle_orm_pg_core1766.PgColumn<{
+  filePath: drizzle_orm_pg_core1432.PgColumn<{
     name: "file_path";
     tableName: "skill_files";
     dataType: "string";
@@ -247,7 +247,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 1024;
   }>;
-  content: drizzle_orm_pg_core1766.PgColumn<{
+  content: drizzle_orm_pg_core1432.PgColumn<{
     name: "content";
     tableName: "skill_files";
     dataType: "string";
@@ -264,7 +264,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
     identity: undefined;
     generated: undefined;
   }, {}, {}>;
-  projectId: drizzle_orm_pg_core1766.PgColumn<{
+  projectId: drizzle_orm_pg_core1432.PgColumn<{
     name: "project_id";
     tableName: "skill_files";
     dataType: "string";
@@ -283,7 +283,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  tenantId: drizzle_orm_pg_core1766.PgColumn<{
+  tenantId: drizzle_orm_pg_core1432.PgColumn<{
     name: "tenant_id";
     tableName: "skill_files";
     dataType: "string";
@@ -302,7 +302,7 @@ declare const SkillFileSelectSchema: drizzle_zod363.BuildSchema<"select", {
   }, {}, {
     length: 256;
   }>;
-  id: drizzle_orm_pg_core1766.PgColumn<{
+  id: drizzle_orm_pg_core1432.PgColumn<{
     name: "id";
     tableName: "skill_files";
     dataType: "string";
@@ -337,8 +337,8 @@ declare const SkillFileInsertSchema: z.ZodObject<{
 }>;
 declare const SkillInsertSchema: z.ZodObject<{
   name: z.ZodString;
-  metadata: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>>;
   description: z.ZodString;
+  metadata: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>>;
   content: z.ZodString;
 }, {
   out: {};
@@ -352,11 +352,11 @@ declare const SkillUpdateSchema: z.ZodObject<{
 }, z.core.$strip>;
 declare const SkillApiSelectSchema: z.ZodObject<{
   id: z.ZodString;
-  name: z.ZodString;
   createdAt: z.ZodString;
+  name: z.ZodString;
   updatedAt: z.ZodString;
-  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   description: z.ZodString;
+  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
 }, z.core.$strip>;
 declare const SkillApiInsertSchema: z.ZodPipe<z.ZodPipe<z.ZodObject<{
@@ -413,8 +413,8 @@ declare const SkillFileApiSelectSchema: z.ZodObject<{
   createdAt: z.ZodString;
   updatedAt: z.ZodString;
   content: z.ZodString;
-  filePath: z.ZodString;
   skillId: z.ZodString;
+  filePath: z.ZodString;
 }, z.core.$strip>;
 declare const SkillFileApiInsertSchema: z.ZodObject<{
   filePath: z.ZodString;
@@ -425,19 +425,19 @@ declare const SkillFileApiUpdateSchema: z.ZodObject<{
 }, z.core.$strip>;
 declare const SkillWithFilesApiSelectSchema: z.ZodObject<{
   id: z.ZodString;
-  name: z.ZodString;
   createdAt: z.ZodString;
+  name: z.ZodString;
   updatedAt: z.ZodString;
-  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   description: z.ZodString;
+  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
   files: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
     createdAt: z.ZodString;
     updatedAt: z.ZodString;
     content: z.ZodString;
-    filePath: z.ZodString;
     skillId: z.ZodString;
+    filePath: z.ZodString;
   }, z.core.$strip>>;
 }, z.core.$strip>;
 declare const SubAgentSkillSelectSchema: z.ZodObject<{
@@ -489,17 +489,17 @@ declare const SubAgentSkillApiSelectSchema: z.ZodObject<{
   id: z.ZodString;
   createdAt: z.ZodString;
   updatedAt: z.ZodString;
+  skillId: z.ZodString;
   subAgentId: z.ZodString;
   index: z.ZodInt;
   alwaysLoaded: z.ZodBoolean;
-  skillId: z.ZodString;
 }, z.core.$strip>;
 declare const SubAgentSkillApiInsertSchema: z.ZodObject<{
-  subAgentId: z.ZodString;
   agentId: z.ZodString;
+  skillId: z.ZodString;
+  subAgentId: z.ZodString;
   index: z.ZodInt;
   alwaysLoaded: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-  skillId: z.ZodString;
 }, {
   out: {};
   in: {};
@@ -508,18 +508,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>>;
   subAgentId: 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<{
   id: z.ZodString;
-  name: z.ZodString;
   createdAt: z.ZodString;
+  name: z.ZodString;
   updatedAt: z.ZodString;
-  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   description: z.ZodString;
+  metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
   content: z.ZodString;
   subAgentSkillId: z.ZodString;
   subAgentId: z.ZodString;
@@ -532,37 +532,37 @@ declare const SkillFileResponse: z.ZodObject<{
     createdAt: z.ZodString;
     updatedAt: z.ZodString;
     content: z.ZodString;
-    filePath: z.ZodString;
     skillId: z.ZodString;
+    filePath: z.ZodString;
   }, z.core.$strip>;
 }, z.core.$strip>;
 declare const SkillWithFilesResponse: z.ZodObject<{
   data: z.ZodObject<{
     id: z.ZodString;
-    name: z.ZodString;
     createdAt: z.ZodString;
+    name: z.ZodString;
     updatedAt: z.ZodString;
-    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     description: z.ZodString;
+    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
     files: z.ZodArray<z.ZodObject<{
       id: z.ZodString;
       createdAt: z.ZodString;
       updatedAt: z.ZodString;
       content: z.ZodString;
-      filePath: z.ZodString;
       skillId: z.ZodString;
+      filePath: z.ZodString;
     }, z.core.$strip>>;
   }, z.core.$strip>;
 }, z.core.$strip>;
 declare const SkillListResponse: z.ZodObject<{
   data: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
-    name: z.ZodString;
     createdAt: z.ZodString;
+    name: z.ZodString;
     updatedAt: z.ZodString;
-    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     description: z.ZodString;
+    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
   }, z.core.$strip>>;
   pagination: z.ZodObject<{
@@ -577,20 +577,20 @@ declare const SubAgentSkillResponse: z.ZodObject<{
     id: z.ZodString;
     createdAt: z.ZodString;
     updatedAt: z.ZodString;
+    skillId: z.ZodString;
     subAgentId: z.ZodString;
     index: z.ZodInt;
     alwaysLoaded: z.ZodBoolean;
-    skillId: z.ZodString;
   }, z.core.$strip>;
 }, z.core.$strip>;
 declare const SubAgentSkillWithIndexArrayResponse: z.ZodObject<{
   data: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
-    name: z.ZodString;
     createdAt: z.ZodString;
+    name: z.ZodString;
     updatedAt: z.ZodString;
-    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     description: z.ZodString;
+    metadata: z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodString>>;
     content: z.ZodString;
     subAgentSkillId: z.ZodString;
     subAgentId: z.ZodString;