@inkeep/agents-core 0.0.0-dev-20260325213342 → 0.0.0-dev-20260325220926

package/dist/auth/auth.d.ts

@@ -2,7 +2,7 @@ import { BetterAuthConfig, EmailServiceConfig, OIDCProviderConfig, SAMLProviderC
 import { extractCookieDomain, hasCredentialAccount } from "./auth-config-utils.js";
 import * as zod0 from "zod";
 import * as better_auth0 from "better-auth";
-import * as better_auth_plugins0 from "better-auth/plugins";
+import * as better_auth_plugins20 from "better-auth/plugins";
 
 //#region src/auth/auth.d.ts
 
@@ -38,10 +38,10 @@ declare function _inferAuthType(): better_auth0.Auth<{
         handler: (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<void>;
       }[];
     };
-    options: better_auth_plugins0.BearerOptions | undefined;
+    options: better_auth_plugins20.BearerOptions | undefined;
   }, {
     id: "oauth-proxy";
-    options: NoInfer<better_auth_plugins0.OAuthProxyOptions>;
+    options: NoInfer<better_auth_plugins20.OAuthProxyOptions>;
     endpoints: {
       oAuthProxy: better_auth0.StrictEndpoint<"/oauth-proxy-callback", {
         method: "GET";
@@ -93,7 +93,7 @@ declare function _inferAuthType(): better_auth0.Auth<{
         handler: (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<void>;
       }[];
     };
-  }, better_auth_plugins0.DefaultOrganizationPlugin<{
+  }, better_auth_plugins20.DefaultOrganizationPlugin<{
     schema: {
       invitation: {
         additionalFields: {
@@ -456,8 +456,8 @@ declare function _inferAuthType(): better_auth0.Auth<{
       AUTHENTICATION_REQUIRED: better_auth0.RawError<"AUTHENTICATION_REQUIRED">;
     };
     options: Partial<{
-      expiresIn: better_auth_plugins0.TimeString;
-      interval: better_auth_plugins0.TimeString;
+      expiresIn: better_auth_plugins20.TimeString;
+      interval: better_auth_plugins20.TimeString;
       deviceCodeLength: number;
       userCodeLength: number;
       schema: {

package/dist/auth/permissions.d.ts

@@ -1,29 +1,29 @@
-import * as better_auth_plugins4 from "better-auth/plugins";
+import * as better_auth_plugins0 from "better-auth/plugins";
 import { AccessControl } from "better-auth/plugins/access";
 import { organizationClient } from "better-auth/client/plugins";
 
 //#region src/auth/permissions.d.ts
 declare const ac: AccessControl;
 declare const memberRole: {
-  authorize<K_1 extends "organization" | "member" | "invitation" | "project" | "team" | "ac">(request: K_1 extends infer T extends K ? { [key in T]?: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>[key] | {
-    actions: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>[key];
+  authorize<K_1 extends "project" | "organization" | "team" | "member" | "ac" | "invitation">(request: K_1 extends infer T extends K ? { [key in T]?: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>[key] | {
+    actions: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>[key];
     connector: "OR" | "AND";
-  } | undefined } : never, connector?: "OR" | "AND"): better_auth_plugins4.AuthorizeResponse;
-  statements: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>;
+  } | undefined } : never, connector?: "OR" | "AND"): better_auth_plugins0.AuthorizeResponse;
+  statements: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>;
 };
 declare const adminRole: {
-  authorize<K_1 extends "organization" | "member" | "invitation" | "project" | "team" | "ac">(request: K_1 extends infer T extends K ? { [key in T]?: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>[key] | {
-    actions: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>[key];
+  authorize<K_1 extends "project" | "organization" | "team" | "member" | "ac" | "invitation">(request: K_1 extends infer T extends K ? { [key in T]?: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>[key] | {
+    actions: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>[key];
     connector: "OR" | "AND";
-  } | undefined } : never, connector?: "OR" | "AND"): better_auth_plugins4.AuthorizeResponse;
-  statements: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>;
+  } | undefined } : never, connector?: "OR" | "AND"): better_auth_plugins0.AuthorizeResponse;
+  statements: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>;
 };
 declare const ownerRole: {
-  authorize<K_1 extends "organization" | "member" | "invitation" | "project" | "team" | "ac">(request: K_1 extends infer T extends K ? { [key in T]?: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>[key] | {
-    actions: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>[key];
+  authorize<K_1 extends "project" | "organization" | "team" | "member" | "ac" | "invitation">(request: K_1 extends infer T extends K ? { [key in T]?: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>[key] | {
+    actions: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>[key];
     connector: "OR" | "AND";
-  } | undefined } : never, connector?: "OR" | "AND"): better_auth_plugins4.AuthorizeResponse;
-  statements: better_auth_plugins4.Subset<"organization" | "member" | "invitation" | "project" | "team" | "ac", better_auth_plugins4.Statements>;
+  } | undefined } : never, connector?: "OR" | "AND"): better_auth_plugins0.AuthorizeResponse;
+  statements: better_auth_plugins0.Subset<"project" | "organization" | "team" | "member" | "ac" | "invitation", better_auth_plugins0.Statements>;
 };
 //#endregion
 export { ac, adminRole, memberRole, organizationClient, ownerRole };

package/dist/client-exports.d.ts

@@ -18,9 +18,10 @@ declare const FullAgentDefinitionSchema: z.ZodObject<{
   defaultSubAgentId: z.ZodOptional<z.ZodString>;
   subAgents: z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodObject<{
     id: z.ZodString;
+    createdAt: z.ZodOptional<z.ZodString>;
     name: z.ZodString;
+    updatedAt: z.ZodOptional<z.ZodString>;
     description: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    conversationHistoryConfig: z.ZodOptional<z.ZodNullable<z.ZodType<ConversationHistoryConfig, ConversationHistoryConfig, z.core.$ZodTypeInternals<ConversationHistoryConfig, ConversationHistoryConfig>>>>;
     models: z.ZodOptional<z.ZodObject<{
       base: z.ZodOptional<z.ZodObject<{
         model: z.ZodOptional<z.ZodString>;
@@ -35,8 +36,7 @@ declare const FullAgentDefinitionSchema: z.ZodObject<{
         providerOptions: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
       }, z.core.$strip>>;
     }, z.core.$strip>>;
-    createdAt: z.ZodOptional<z.ZodString>;
-    updatedAt: z.ZodOptional<z.ZodString>;
+    conversationHistoryConfig: z.ZodOptional<z.ZodNullable<z.ZodType<ConversationHistoryConfig, ConversationHistoryConfig, z.core.$ZodTypeInternals<ConversationHistoryConfig, ConversationHistoryConfig>>>>;
     type: z.ZodLiteral<"internal">;
     canUse: z.ZodArray<z.ZodObject<{
       agentToolRelationId: z.ZodOptional<z.ZodString>;

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

@@ -1,6 +1,6 @@
 import { projects, subAgentFunctionToolRelations, subAgentSkills, subAgentToolRelations, subAgents } from "../../db/manage/manage-schema.js";
 import { validateAgentStructure, validateAndTypeAgentData } from "../../validation/agentFull.js";
-import { generateId } from "../../utils/conversations.js";
+import { deriveRelationId, generateId } from "../../utils/conversations.js";
 import { agentScopedWhere, subAgentScopedWhere, tenantScopedWhere } from "./scope-helpers.js";
 import { upsertContextConfig } from "./contextConfigs.js";
 import { upsertFunction } from "./functions.js";
@@ -529,7 +529,7 @@ const createFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 						type: "transfer"
 					}, "Processing agent transfer relation");
 					await upsertSubAgentRelation(db)({
-						id: generateId(),
+						id: deriveRelationId(tenantId, projectId, finalAgentId, subAgentId, targetSubAgentId, "transfer"),
 						tenantId,
 						projectId,
 						agentId: finalAgentId,
@@ -560,7 +560,7 @@ const createFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 							type: "delegate"
 						}, "Processing sub-agent delegation relation");
 						await upsertSubAgentRelation(db)({
-							id: generateId(),
+							id: deriveRelationId(tenantId, projectId, finalAgentId, subAgentId, targetItem, "delegate"),
 							tenantId,
 							projectId,
 							agentId: finalAgentId,
@@ -1419,7 +1419,7 @@ const updateFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 					await createSubAgentRelation(db)({
 						tenantId,
 						projectId,
-						id: generateId(),
+						id: deriveRelationId(tenantId, projectId, typedAgentDefinition.id || "", subAgentId, targetSubAgentId, "transfer"),
 						agentId: typedAgentDefinition.id || "",
 						sourceSubAgentId: subAgentId,
 						targetSubAgentId,
@@ -1443,7 +1443,7 @@ const updateFullAgentServerSide = (db, logger = defaultLogger) => async (scopes,
 						await createSubAgentRelation(db)({
 							tenantId,
 							projectId,
-							id: generateId(),
+							id: deriveRelationId(tenantId, projectId, typedAgentDefinition.id || "", subAgentId, targetItem, "delegate"),
 							agentId: typedAgentDefinition.id || "",
 							sourceSubAgentId: subAgentId,
 							targetSubAgentId: targetItem,

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

@@ -11,12 +11,14 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
+  createdAt: string;
   name: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
   description: string | null;
   defaultSubAgentId: string | null;
-  tenantId: string;
-  projectId: string;
-  prompt: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -31,12 +33,7 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
       providerOptions?: Record<string, any> | 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,17 +49,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<{
   id: string;
+  createdAt: string;
   name: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
   description: string | null;
   defaultSubAgentId: string | null;
-  tenantId: string;
-  projectId: string;
-  prompt: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -77,12 +79,7 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       providerOptions?: Record<string, any> | 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,15 +95,18 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
   defaultSubAgent: {
     id: string;
+    createdAt: string;
     name: string;
-    description: string | null;
-    tenantId: string;
-    projectId: string;
+    updatedAt: string;
     agentId: string;
-    prompt: string | null;
-    conversationHistoryConfig: ConversationHistoryConfig | null;
+    projectId: string;
+    tenantId: string;
+    description: string | null;
     models: {
       base?: {
         model?: string | undefined;
@@ -121,23 +121,25 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
         providerOptions?: Record<string, any> | 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: {
   scopes: ProjectScopeConfig;
 }) => Promise<{
   id: string;
+  createdAt: string;
   name: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
   description: string | null;
   defaultSubAgentId: string | null;
-  tenantId: string;
-  projectId: string;
-  prompt: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -152,12 +154,7 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       providerOptions?: Record<string, any> | 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 +170,9 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
 }[]>;
 declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -248,12 +248,14 @@ declare function listAgentsAcrossProjectMainBranches(db: AgentsManageDatabaseCli
 }): Promise<AvailableAgentInfo[]>;
 declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInsert) => Promise<{
   id: string;
+  createdAt: string;
   name: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
   description: string | null;
   defaultSubAgentId: string | null;
-  tenantId: string;
-  projectId: string;
-  prompt: string | null;
+  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -268,12 +270,7 @@ declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInser
       providerOptions?: Record<string, any> | 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 +286,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/artifactComponents.d.ts

@@ -10,12 +10,12 @@ declare const getArtifactComponentById: (db: AgentsManageDatabaseClient) => (par
   id: string;
 }) => Promise<{
   id: string;
-  name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
+  name: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  description: string | null;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -66,12 +66,12 @@ 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;
+  name: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  description: string | null;
   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;
+  createdAt: string;
+  updatedAt: string;
+  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;
+  createdAt: string;
+  updatedAt: string;
+  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;
+  createdAt: string;
+  updatedAt: string;
+  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;
+  createdAt: string;
+  updatedAt: string;
+  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

@@ -54,13 +54,13 @@ declare const createFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
-  name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
+  name: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
+  description: string | null;
   functionId: string;
 }>;
 /**
@@ -96,13 +96,13 @@ declare const upsertFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
-  name: string;
-  description: string | null;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
+  name: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
+  description: string | null;
   functionId: string;
 }>;
 declare const getFunctionToolsForSubAgent: (db: AgentsManageDatabaseClient) => (params: {
@@ -158,11 +158,11 @@ 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;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
@@ -223,11 +223,11 @@ 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;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;

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/skills.d.ts

@@ -9,12 +9,12 @@ declare const getSkillById: (db: AgentsManageDatabaseClient) => (params: {
   skillId: string;
 }) => Promise<{
   id: string;
-  name: string;
-  description: string;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
+  name: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  description: string;
   metadata: Record<string, string> | null;
   content: string;
 } | null>;
@@ -42,23 +42,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;
+  name: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  description: string;
   metadata: Record<string, string> | null;
   content: string;
 }>;
 declare const upsertSkill: (db: AgentsManageDatabaseClient) => (data: SkillInsert) => Promise<{
   id: string;
-  name: string;
-  description: string;
-  tenantId: string;
-  projectId: string;
   createdAt: string;
+  name: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  description: string;
   metadata: Record<string, string> | null;
   content: string;
 }>;
@@ -92,11 +92,11 @@ 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;
   index: number;
   alwaysLoaded: boolean;
   subAgentId: string;

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,