@inkeep/agents-core 0.59.4 → 0.61.0

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

@@ -12,31 +12,28 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
+  createdAt: string;
+  updatedAt: string;
   description: string | null;
-  defaultSubAgentId: string | null;
-  tenantId: string;
   projectId: string;
-  prompt: string | null;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     structuredOutput?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     summarizer?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  createdAt: string;
-  updatedAt: string;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -52,37 +49,38 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  executionMode: "classic" | "durable";
 } | null>;
 declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
   name: string;
+  createdAt: string;
+  updatedAt: string;
   description: string | null;
-  defaultSubAgentId: string | null;
-  tenantId: string;
   projectId: string;
-  prompt: string | null;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     structuredOutput?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     summarizer?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  createdAt: string;
-  updatedAt: string;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -98,34 +96,38 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  executionMode: "classic" | "durable";
   defaultSubAgent: {
     id: string;
     name: string;
+    createdAt: string;
+    updatedAt: string;
     description: string | null;
-    tenantId: string;
-    projectId: string;
     agentId: string;
-    prompt: string | null;
-    conversationHistoryConfig: ConversationHistoryConfig | null;
+    projectId: string;
+    tenantId: string;
     models: {
       base?: {
         model?: string | undefined;
-        providerOptions?: Record<string, any> | undefined;
+        providerOptions?: Record<string, unknown> | undefined;
       } | undefined;
       structuredOutput?: {
         model?: string | undefined;
-        providerOptions?: Record<string, any> | undefined;
+        providerOptions?: Record<string, unknown> | undefined;
       } | undefined;
       summarizer?: {
         model?: string | undefined;
-        providerOptions?: Record<string, any> | undefined;
+        providerOptions?: Record<string, unknown> | undefined;
       } | undefined;
     } | null;
+    prompt: string | null;
     stopWhen: {
       stepCountIs?: number | undefined;
     } | null;
-    createdAt: string;
-    updatedAt: string;
+    conversationHistoryConfig: ConversationHistoryConfig | null;
   } | null;
 } | null>;
 declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
@@ -133,31 +135,28 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
+  createdAt: string;
+  updatedAt: string;
   description: string | null;
-  defaultSubAgentId: string | null;
-  tenantId: string;
   projectId: string;
-  prompt: string | null;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     structuredOutput?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     summarizer?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  createdAt: string;
-  updatedAt: string;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -173,6 +172,10 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  executionMode: "classic" | "durable";
 }[]>;
 declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -186,15 +189,15 @@ declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params:
     models: {
       base?: {
         model?: string | undefined;
-        providerOptions?: Record<string, any> | undefined;
+        providerOptions?: Record<string, unknown> | undefined;
       } | undefined;
       structuredOutput?: {
         model?: string | undefined;
-        providerOptions?: Record<string, any> | undefined;
+        providerOptions?: Record<string, unknown> | undefined;
       } | undefined;
       summarizer?: {
         model?: string | undefined;
-        providerOptions?: Record<string, any> | undefined;
+        providerOptions?: Record<string, unknown> | undefined;
       } | undefined;
     } | null;
     statusUpdates: {
@@ -216,6 +219,7 @@ declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params:
     stopWhen: {
       transferCountIs?: number | undefined;
     } | null;
+    executionMode: "classic" | "durable";
     name: string;
     description: string | null;
     projectId: string;
@@ -249,31 +253,28 @@ declare function listAgentsAcrossProjectMainBranches(db: AgentsManageDatabaseCli
 declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInsert) => Promise<{
   id: string;
   name: string;
+  createdAt: string;
+  updatedAt: string;
   description: string | null;
-  defaultSubAgentId: string | null;
-  tenantId: string;
   projectId: string;
-  prompt: string | null;
+  tenantId: string;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     structuredOutput?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     summarizer?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
-  createdAt: string;
-  updatedAt: string;
-  contextConfigId: string | null;
+  prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
     numEvents?: number | undefined;
@@ -289,6 +290,10 @@ declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInser
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  executionMode: "classic" | "durable";
 }>;
 declare const updateAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -301,15 +306,15 @@ declare const updateAgent: (db: AgentsManageDatabaseClient) => (params: {
   models: {
     base?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     structuredOutput?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
     summarizer?: {
       model?: string | undefined;
-      providerOptions?: Record<string, any> | undefined;
+      providerOptions?: Record<string, unknown> | undefined;
     } | undefined;
   } | null;
   statusUpdates: {
@@ -331,6 +336,7 @@ declare const updateAgent: (db: AgentsManageDatabaseClient) => (params: {
   stopWhen: {
     transferCountIs?: number | undefined;
   } | null;
+  executionMode: "classic" | "durable";
   name: string;
   description: string | null;
   projectId: string;

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

@@ -86,6 +86,7 @@ const createAgent = (db) => async (data) => {
 		...data,
 		createdAt: now,
 		updatedAt: now,
+		executionMode: data.executionMode ?? "classic",
 		...data.description !== void 0 && { description: data.description },
 		...data.contextConfigId !== void 0 && { contextConfigId: data.contextConfigId },
 		...data.models !== void 0 && { models: data.models },
@@ -423,6 +424,7 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 	if (agent.statusUpdates) result.statusUpdates = agent.statusUpdates;
 	if (agent.prompt) result.prompt = agent.prompt;
 	if (agent.stopWhen) result.stopWhen = agent.stopWhen;
+	if (agent.executionMode) result.executionMode = agent.executionMode;
 	if (contextConfig) {
 		const { id, headersSchema, contextVariables } = contextConfig;
 		result.contextConfig = {

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

@@ -11,11 +11,11 @@ declare const getArtifactComponentById: (db: AgentsManageDatabaseClient) => (par
 }) => Promise<{
   id: string;
   name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -67,11 +67,11 @@ declare const listArtifactComponentsPaginated: (db: AgentsManageDatabaseClient)
 declare const createArtifactComponent: (db: AgentsManageDatabaseClient) => (params: ArtifactComponentInsert) => Promise<{
   id: string;
   name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  projectId: string;
+  tenantId: string;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -142,10 +142,10 @@ declare const associateArtifactComponentWithAgent: (db: AgentsManageDatabaseClie
   artifactComponentId: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   artifactComponentId: string;
 }>;
@@ -185,10 +185,10 @@ declare const upsertAgentArtifactComponentRelation: (db: AgentsManageDatabaseCli
   artifactComponentId: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   artifactComponentId: string;
 } | null>;

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

@@ -10,25 +10,25 @@ declare const getContextConfigById: (db: AgentsManageDatabaseClient) => (params:
   id: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: 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<{
   id: string;
-  tenantId: string;
-  projectId: 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;
@@ -44,13 +44,13 @@ declare const listContextConfigsPaginated: (db: AgentsManageDatabaseClient) => (
 }>;
 declare const createContextConfig: (db: AgentsManageDatabaseClient) => (params: ContextConfigInsert) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: 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;
@@ -84,13 +84,13 @@ declare const upsertContextConfig: (db: AgentsManageDatabaseClient) => (params:
   data: ContextConfigInsert;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: 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

@@ -66,10 +66,10 @@ declare const associateDataComponentWithAgent: (db: AgentsManageDatabaseClient)
   dataComponentId: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   dataComponentId: string;
 }>;
@@ -108,10 +108,10 @@ declare const upsertAgentDataComponentRelation: (db: AgentsManageDatabaseClient)
   dataComponentId: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   dataComponentId: string;
 } | null>;

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

@@ -55,12 +55,12 @@ declare const createFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   functionId: string;
 }>;
 /**
@@ -97,12 +97,12 @@ declare const upsertFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  description: string | null;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   functionId: string;
 }>;
 declare const getFunctionToolsForSubAgent: (db: AgentsManageDatabaseClient) => (params: {
@@ -158,16 +158,16 @@ declare const addFunctionToolToSubAgent: (db: AgentsManageDatabaseClient) => (pa
   }> | null;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
+  subAgentId: string;
+  functionToolId: string;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
-  subAgentId: string;
-  functionToolId: string;
 }>;
 /**
  * Update an agent-function tool relation
@@ -223,16 +223,16 @@ declare const associateFunctionToolWithSubAgent: (db: AgentsManageDatabaseClient
   }> | null;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
+  subAgentId: string;
+  functionToolId: string;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
-  subAgentId: string;
-  functionToolId: string;
 }>;
 //#endregion
 export { addFunctionToolToSubAgent, associateFunctionToolWithSubAgent, createFunctionTool, deleteFunctionTool, getFunctionToolById, getFunctionToolsForSubAgent, getSubAgentsUsingFunctionTool, isFunctionToolAssociatedWithSubAgent, listFunctionTools, removeFunctionToolFromSubAgent, updateFunctionTool, updateSubAgentFunctionToolRelation, upsertFunctionTool, upsertSubAgentFunctionToolRelation };

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

@@ -1,6 +1,6 @@
 import { functionTools, subAgentFunctionToolRelations } from "../../db/manage/manage-schema.js";
 import { getLogger } from "../../utils/logger.js";
-import { generateId } from "../../utils/conversations.js";
+import { deriveRelationId } from "../../utils/conversations.js";
 import { agentScopedWhere } from "./scope-helpers.js";
 import { and, count, desc, eq } from "drizzle-orm";
 
@@ -170,7 +170,7 @@ const addFunctionToolToSubAgent = (db) => {
 	return async (params) => {
 		const { scopes, subAgentId, functionToolId, toolPolicies } = params;
 		try {
-			const relationId = generateId();
+			const relationId = deriveRelationId(scopes.tenantId, scopes.projectId, scopes.agentId, subAgentId, functionToolId);
 			const [result] = await db.insert(subAgentFunctionToolRelations).values({
 				id: relationId,
 				...scopes,

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

@@ -326,7 +326,14 @@ const createFullProjectServerSide = (db, logger = defaultLogger) => async (param
 					throw error;
 				}
 			});
-			await Promise.all(agentPromises);
+			const phase1Errors = (await Promise.allSettled(agentPromises)).filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (phase1Errors.length > 0) {
+				logger.error({
+					projectId: typed.id,
+					errorCount: phase1Errors.length
+				}, `Some agents failed to create in phase 1: ${phase1Errors.join(", ")}`);
+				throw phase1Errors[0];
+			}
 			logger.info({
 				projectId: typed.id,
 				agentCount: Object.keys(typed.agents).length
@@ -362,7 +369,14 @@ const createFullProjectServerSide = (db, logger = defaultLogger) => async (param
 					throw error;
 				}
 			});
-			await Promise.all(updatePromises);
+			const phase2Errors = (await Promise.allSettled(updatePromises)).filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (phase2Errors.length > 0) {
+				logger.error({
+					projectId: typed.id,
+					errorCount: phase2Errors.length
+				}, `Some agents failed to add sub-agents in phase 2: ${phase2Errors.join(", ")}`);
+				throw phase2Errors[0];
+			}
 			logger.info({
 				projectId: typed.id,
 				agentCount: Object.keys(typed.agents).length
@@ -894,7 +908,14 @@ const updateFullProjectServerSide = (db, logger = defaultLogger) => async (param
 					throw error;
 				}
 			});
-			await Promise.all(agentPromises);
+			const agentErrors = (await Promise.allSettled(agentPromises)).filter((r) => r.status === "rejected").map((r) => r.reason);
+			if (agentErrors.length > 0) {
+				logger.error({
+					projectId: typed.id,
+					errorCount: agentErrors.length
+				}, `Some agents failed to update in project: ${agentErrors.join(", ")}`);
+				throw agentErrors[0];
+			}
 			logger.info({
 				projectId: typed.id,
 				agentCount: Object.keys(typed.agents).length

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

@@ -10,12 +10,12 @@ declare const getSkillById: (db: AgentsManageDatabaseClient) => (params: {
 }) => Promise<{
   id: string;
   name: string;
-  description: string;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: Record<string, string> | null;
+  description: string;
+  projectId: string;
+  tenantId: string;
   content: string;
 } | null>;
 declare const listSkills: (db: AgentsManageDatabaseClient) => (params: {
@@ -43,23 +43,23 @@ declare const listSkills: (db: AgentsManageDatabaseClient) => (params: {
 declare const createSkill: (db: AgentsManageDatabaseClient) => (data: SkillInsert) => Promise<{
   id: string;
   name: string;
-  description: string;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: Record<string, string> | null;
+  description: string;
+  projectId: string;
+  tenantId: string;
   content: string;
 }>;
 declare const upsertSkill: (db: AgentsManageDatabaseClient) => (data: SkillInsert) => Promise<{
   id: string;
   name: string;
-  description: string;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: Record<string, string> | null;
+  description: string;
+  projectId: string;
+  tenantId: string;
   content: string;
 }>;
 declare const updateSkill: (db: AgentsManageDatabaseClient) => (params: {
@@ -92,15 +92,15 @@ declare const upsertSubAgentSkill: (db: AgentsManageDatabaseClient) => (params:
   alwaysLoaded?: boolean;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
+  subAgentId: string;
+  skillId: string;
   index: number;
   alwaysLoaded: boolean;
-  skillId: string;
-  subAgentId: string;
 }>;
 declare const deleteSubAgentSkill: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;

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

@@ -1,8 +1,7 @@
 import { skills, subAgentSkills } from "../../db/manage/manage-schema.js";
 import { getLogger } from "../../utils/logger.js";
-import { generateId } from "../../utils/conversations.js";
+import { deriveRelationId } from "../../utils/conversations.js";
 import { agentScopedWhere, projectScopedWhere, subAgentScopedWhere } from "./scope-helpers.js";
-import "../../index.js";
 import { and, asc, count, desc, eq, inArray } from "drizzle-orm";
 
 //#region src/data-access/manage/skills.ts
@@ -109,7 +108,7 @@ const upsertSubAgentSkill = (db) => async (params) => {
 	}
 	const insertData = {
 		...params.scopes,
-		id: generateId(),
+		id: deriveRelationId(params.scopes.tenantId, params.scopes.projectId, params.scopes.agentId, params.scopes.subAgentId, params.skillId),
 		skillId: params.skillId,
 		index: params.index,
 		alwaysLoaded: params.alwaysLoaded ?? false,