@inkeep/agents-core 0.42.0 → 0.44.0

package/dist/data-access/manage/agentFull.js

@@ -1,6 +1,6 @@
 import { projects, subAgentFunctionToolRelations, subAgentToolRelations, subAgents } from "../../db/manage/manage-schema.js";
-import { generateId } from "../../utils/conversations.js";
 import { validateAgentStructure, validateAndTypeAgentData } from "../../validation/agentFull.js";
+import { generateId } from "../../utils/conversations.js";
 import { upsertContextConfig } from "./contextConfigs.js";
 import { upsertFunction } from "./functions.js";
 import { deleteFunctionTool, listFunctionTools, upsertFunctionTool, upsertSubAgentFunctionToolRelation } from "./functionTools.js";
@@ -345,6 +345,7 @@ const createFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 						},
 						subAgentId,
 						functionToolId: toolId,
+						toolPolicies,
 						relationId: agentToolRelationId
 					});
 					logger.info({
@@ -855,31 +856,33 @@ const updateFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 				triggerCount: Object.keys(typedAgentDefinition.triggers).length
 			}, "All triggers updated successfully");
 		}
-		const incomingTriggerIds = new Set(typedAgentDefinition.triggers ? Object.keys(typedAgentDefinition.triggers) : []);
-		const existingTriggers = await listTriggers(db)({ scopes: {
-			tenantId,
-			projectId,
-			agentId: finalAgentId
-		} });
-		let deletedTriggerCount = 0;
-		for (const trigger of existingTriggers) if (!incomingTriggerIds.has(trigger.id)) try {
-			await deleteTrigger(db)({
-				scopes: {
-					tenantId,
-					projectId,
-					agentId: finalAgentId
-				},
-				triggerId: trigger.id
-			});
-			deletedTriggerCount++;
-			logger.info({ triggerId: trigger.id }, "Deleted orphaned trigger");
-		} catch (error) {
-			logger.error({
-				triggerId: trigger.id,
-				error
-			}, "Failed to delete orphaned trigger");
+		if (typedAgentDefinition.triggers !== void 0) {
+			const incomingTriggerIds = new Set(Object.keys(typedAgentDefinition.triggers));
+			const existingTriggers = await listTriggers(db)({ scopes: {
+				tenantId,
+				projectId,
+				agentId: finalAgentId
+			} });
+			let deletedTriggerCount = 0;
+			for (const trigger of existingTriggers) if (!incomingTriggerIds.has(trigger.id)) try {
+				await deleteTrigger(db)({
+					scopes: {
+						tenantId,
+						projectId,
+						agentId: finalAgentId
+					},
+					triggerId: trigger.id
+				});
+				deletedTriggerCount++;
+				logger.info({ triggerId: trigger.id }, "Deleted orphaned trigger");
+			} catch (error) {
+				logger.error({
+					triggerId: trigger.id,
+					error
+				}, "Failed to delete orphaned trigger");
+			}
+			if (deletedTriggerCount > 0) logger.info({ deletedTriggerCount }, "Deleted orphaned triggers from agent");
 		}
-		if (deletedTriggerCount > 0) logger.info({ deletedTriggerCount }, "Deleted orphaned triggers from agent");
 		const subAgentPromises = Object.entries(typedAgentDefinition.subAgents).map(async ([subAgentId, agentData$1]) => {
 			const subAgent = agentData$1;
 			let existingSubAgent = null;
@@ -937,6 +940,47 @@ const updateFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 		await Promise.all(subAgentPromises);
 		const subAgentCount = Object.entries(typedAgentDefinition.subAgents).length;
 		logger.info({ subAgentCount }, "All sub-agents created/updated successfully");
+		const relinkToolRelationPromises = [];
+		for (const [subAgentId, agentData$1] of Object.entries(typedAgentDefinition.subAgents)) if (agentData$1.canUse && Array.isArray(agentData$1.canUse)) for (const canUseItem of agentData$1.canUse) {
+			if (!canUseItem.agentToolRelationId) continue;
+			relinkToolRelationPromises.push((async () => {
+				try {
+					const { toolId, toolSelection, headers, toolPolicies, agentToolRelationId } = canUseItem;
+					if (typedAgentDefinition.functionTools && toolId in typedAgentDefinition.functionTools) await upsertSubAgentFunctionToolRelation(db)({
+						scopes: {
+							tenantId,
+							projectId,
+							agentId: finalAgentId
+						},
+						subAgentId,
+						functionToolId: toolId,
+						toolPolicies,
+						relationId: agentToolRelationId
+					});
+					else await upsertSubAgentToolRelation(db)({
+						scopes: {
+							tenantId,
+							projectId,
+							agentId: finalAgentId
+						},
+						subAgentId,
+						toolId,
+						selectedTools: toolSelection,
+						headers,
+						toolPolicies,
+						relationId: agentToolRelationId
+					});
+				} catch (error) {
+					logger.error({
+						subAgentId,
+						relationId: canUseItem.agentToolRelationId,
+						toolId: canUseItem.toolId,
+						error
+					}, "Failed to relink tool relation during sub-agent update");
+				}
+			})());
+		}
+		if (relinkToolRelationPromises.length > 0) await Promise.all(relinkToolRelationPromises);
 		logger.info({}, "External agents are project-scoped and managed at the project level.");
 		const incomingSubAgentIds = new Set(Object.keys(typedAgentDefinition.subAgents));
 		const existingSubAgents = await listSubAgents(db)({ scopes: {
@@ -1090,6 +1134,7 @@ const updateFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 						},
 						subAgentId,
 						functionToolId: toolId,
+						toolPolicies,
 						relationId: agentToolRelationId
 					});
 					logger.info({

package/dist/data-access/manage/agents.d.ts

@@ -8,14 +8,15 @@ import { PgTable } from "drizzle-orm/pg-core";
 declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string;
-  description: string | null;
-  prompt: string | null;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -30,11 +31,7 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -50,18 +47,22 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
 } | null>;
 declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string;
-  description: string | null;
-  prompt: string | null;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -76,11 +77,7 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -96,16 +93,18 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
   defaultSubAgent: {
-    tenantId: string;
-    projectId: string;
     id: string;
     name: string;
-    description: string | null;
-    prompt: string | null;
-    agentId: string;
     createdAt: string;
     updatedAt: string;
+    description: string | null;
+    agentId: string;
+    projectId: string;
+    tenantId: string;
     models: {
       base?: {
         model?: string | undefined;
@@ -120,6 +119,7 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
         providerOptions?: Record<string, any> | undefined;
       } | undefined;
     } | null;
+    prompt: string | null;
     stopWhen: {
       stepCountIs?: number | undefined;
     } | null;
@@ -129,14 +129,15 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
 declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string;
-  description: string | null;
-  prompt: string | null;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -151,11 +152,7 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -171,6 +168,9 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
 }[]>;
 declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -228,14 +228,15 @@ declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params:
   };
 }>;
 declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string;
-  description: string | null;
-  prompt: string | null;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -250,11 +251,7 @@ declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInser
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -270,6 +267,9 @@ declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInser
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
 }>;
 declare const updateAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;

package/dist/data-access/manage/agents.js

@@ -198,7 +198,8 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 			tenantId: functionTools.tenantId,
 			projectId: functionTools.projectId,
 			agentId: functionTools.agentId,
-			agentToolRelationId: subAgentFunctionToolRelations.id
+			agentToolRelationId: subAgentFunctionToolRelations.id,
+			toolPolicies: subAgentFunctionToolRelations.toolPolicies
 		}).from(subAgentFunctionToolRelations).innerJoin(functionTools, and(eq(subAgentFunctionToolRelations.functionToolId, functionTools.id), eq(subAgentFunctionToolRelations.tenantId, functionTools.tenantId), eq(subAgentFunctionToolRelations.projectId, functionTools.projectId), eq(subAgentFunctionToolRelations.agentId, functionTools.agentId))).where(and(eq(subAgentFunctionToolRelations.tenantId, tenantId), eq(subAgentFunctionToolRelations.projectId, projectId), eq(subAgentFunctionToolRelations.agentId, agentId), eq(subAgentFunctionToolRelations.subAgentId, agent$1.id)));
 		const agentDataComponentIds = (await db.query.subAgentDataComponents.findMany({ where: and(eq(subAgentDataComponents.tenantId, tenantId), eq(subAgentDataComponents.subAgentId, agent$1.id)) })).map((rel) => rel.dataComponentId);
 		const agentArtifactComponentIds = (await db.query.subAgentArtifactComponents.findMany({ where: and(eq(subAgentArtifactComponents.tenantId, tenantId), eq(subAgentArtifactComponents.subAgentId, agent$1.id)) })).map((rel) => rel.artifactComponentId);
@@ -214,7 +215,7 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 			toolId: tool.id,
 			toolSelection: null,
 			headers: null,
-			toolPolicies: null
+			toolPolicies: tool.toolPolicies || null
 		}));
 		const canUse = [...mcpToolCanUse, ...functionToolCanUse];
 		return {
@@ -389,25 +390,31 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 		console.warn("Failed to apply agent stepCountIs inheritance:", error);
 	}
 	try {
-		const toolsList = await listTools(db)({
-			scopes: {
-				tenantId,
-				projectId
-			},
-			pagination: {
-				page: 1,
-				limit: 1e3
-			}
-		});
+		const usedToolIds = new Set(Object.values(agentsObject).flatMap((a) => Array.isArray(a?.canUse) ? a.canUse : []).map((ref) => ref?.toolId).filter(Boolean));
 		const toolsObject = {};
-		for (const tool of toolsList.data) toolsObject[tool.id] = {
-			id: tool.id,
-			name: tool.name,
-			description: tool.description,
-			config: tool.config,
-			credentialReferenceId: tool.credentialReferenceId,
-			imageUrl: tool.imageUrl
-		};
+		if (usedToolIds.size > 0) {
+			const { data } = await listTools(db)({
+				scopes: {
+					tenantId,
+					projectId
+				},
+				pagination: {
+					page: 1,
+					limit: 1e3
+				}
+			});
+			for (const tool of data) {
+				if (!usedToolIds.has(tool.id)) continue;
+				toolsObject[tool.id] = {
+					id: tool.id,
+					name: tool.name,
+					description: tool.description,
+					config: tool.config,
+					credentialReferenceId: tool.credentialReferenceId,
+					imageUrl: tool.imageUrl
+				};
+			}
+		}
 		result.tools = toolsObject;
 		const functionToolsList = await listFunctionTools(db)({
 			scopes: {
@@ -469,7 +476,8 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 				outputTransform: trigger.outputTransform,
 				messageTemplate: trigger.messageTemplate,
 				authentication: trigger.authentication,
-				signingSecret: trigger.signingSecret
+				signingSecretCredentialReferenceId: trigger.signingSecretCredentialReferenceId,
+				signatureVerification: trigger.signatureVerification
 			};
 			result.triggers = triggersObject;
 			console.log(`[getFullAgentDefinitionInternal] Added triggers to result:`, Object.keys(triggersObject));

package/dist/data-access/manage/artifactComponents.d.ts

@@ -7,13 +7,13 @@ declare const getArtifactComponentById: (db: AgentsManageDatabaseClient) => (par
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string;
-  description: string | null;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
   props: Record<string, unknown> | null;
   render: {
     component: string;
@@ -49,13 +49,13 @@ declare const listArtifactComponentsPaginated: (db: AgentsManageDatabaseClient)
   };
 }>;
 declare const createArtifactComponent: (db: AgentsManageDatabaseClient) => (params: ArtifactComponentInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   name: string;
-  description: string | null;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
   props: Record<string, unknown> | null;
   render: {
     component: string;
@@ -104,11 +104,11 @@ declare const associateArtifactComponentWithAgent: (db: AgentsManageDatabaseClie
   scopes: SubAgentScopeConfig;
   artifactComponentId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   artifactComponentId: string;
 }>;
@@ -147,11 +147,11 @@ declare const upsertAgentArtifactComponentRelation: (db: AgentsManageDatabaseCli
   scopes: SubAgentScopeConfig;
   artifactComponentId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   artifactComponentId: string;
 } | null>;

package/dist/data-access/manage/artifactComponents.js

@@ -1,7 +1,7 @@
 import { artifactComponents, subAgentArtifactComponents, subAgentRelations, subAgents } from "../../db/manage/manage-schema.js";
 import { validatePropsAsJsonSchema } from "../../validation/props-validation.js";
-import { generateId } from "../../utils/conversations.js";
 import { validateRender } from "../../validation/render-validation.js";
+import { generateId } from "../../utils/conversations.js";
 import { and, count, desc, eq } from "drizzle-orm";
 
 //#region src/data-access/manage/artifactComponents.ts

package/dist/data-access/manage/contextConfigs.d.ts

@@ -8,26 +8,26 @@ declare const getContextConfigById: (db: AgentsManageDatabaseClient) => (params:
   scopes: AgentScopeConfig;
   id: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
 } | undefined>;
 declare const listContextConfigs: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
 }[]>;
 declare const listContextConfigsPaginated: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -42,14 +42,14 @@ declare const listContextConfigsPaginated: (db: AgentsManageDatabaseClient) => (
   };
 }>;
 declare const createContextConfig: (db: AgentsManageDatabaseClient) => (params: ContextConfigInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
 }>;
 declare const updateContextConfig: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -82,14 +82,14 @@ declare const countContextConfigs: (db: AgentsManageDatabaseClient) => (params:
 declare const upsertContextConfig: (db: AgentsManageDatabaseClient) => (params: {
   data: ContextConfigInsert;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
 }>;
 //#endregion
 export { countContextConfigs, createContextConfig, deleteContextConfig, getContextConfigById, hasContextConfig, listContextConfigs, listContextConfigsPaginated, updateContextConfig, upsertContextConfig };

package/dist/data-access/manage/dataComponents.d.ts

@@ -64,11 +64,11 @@ declare const associateDataComponentWithAgent: (db: AgentsManageDatabaseClient)
   scopes: SubAgentScopeConfig;
   dataComponentId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   dataComponentId: string;
 }>;
@@ -106,11 +106,11 @@ declare const upsertAgentDataComponentRelation: (db: AgentsManageDatabaseClient)
   scopes: SubAgentScopeConfig;
   dataComponentId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   dataComponentId: string;
 } | null>;

package/dist/data-access/manage/dataComponents.js

@@ -1,9 +1,9 @@
 import { dataComponents, subAgentDataComponents } from "../../db/manage/manage-schema.js";
 import { validatePropsAsJsonSchema } from "../../validation/props-validation.js";
+import { validateRender } from "../../validation/render-validation.js";
 import { generateId } from "../../utils/conversations.js";
 import { createApiError } from "../../utils/error.js";
 import "../../utils/index.js";
-import { validateRender } from "../../validation/render-validation.js";
 import { and, count, desc, eq } from "drizzle-orm";
 
 //#region src/data-access/manage/dataComponents.ts