@inkeep/agents-core 0.50.1 → 0.50.3

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

@@ -10,11 +10,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";
@@ -66,11 +66,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";
@@ -141,10 +141,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;
 }>;
@@ -184,10 +184,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

@@ -9,11 +9,11 @@ declare const getContextConfigById: (db: AgentsManageDatabaseClient) => (params:
   id: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 } | undefined>;
@@ -21,11 +21,11 @@ declare const listContextConfigs: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 }[]>;
@@ -43,11 +43,11 @@ 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;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 }>;
@@ -83,11 +83,11 @@ declare const upsertContextConfig: (db: AgentsManageDatabaseClient) => (params:
   data: ContextConfigInsert;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 }>;

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

@@ -65,10 +65,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;
 }>;
@@ -107,10 +107,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: {
@@ -162,16 +162,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
@@ -227,16 +227,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/scope-helpers.d.ts

@@ -0,0 +1,25 @@
+import { AgentScopeConfig, ProjectScopeConfig, SubAgentScopeConfig } from "../../types/utility.js";
+import * as drizzle_orm20 from "drizzle-orm";
+
+//#region src/data-access/manage/scope-helpers.d.ts
+type TenantScopeConfig = {
+  tenantId: string;
+};
+type TenantScopedColumns = {
+  tenantId: any;
+};
+type ProjectScopedColumns = TenantScopedColumns & {
+  projectId: any;
+};
+type AgentScopedColumns = ProjectScopedColumns & {
+  agentId: any;
+};
+type SubAgentScopedColumns = AgentScopedColumns & {
+  subAgentId: any;
+};
+declare function tenantScopedWhere<T extends TenantScopedColumns>(table: T, scopes: TenantScopeConfig): drizzle_orm20.SQL<unknown>;
+declare function projectScopedWhere<T extends ProjectScopedColumns>(table: T, scopes: ProjectScopeConfig): drizzle_orm20.SQL<unknown> | undefined;
+declare function agentScopedWhere<T extends AgentScopedColumns>(table: T, scopes: AgentScopeConfig): drizzle_orm20.SQL<unknown> | undefined;
+declare function subAgentScopedWhere<T extends SubAgentScopedColumns>(table: T, scopes: SubAgentScopeConfig): drizzle_orm20.SQL<unknown> | undefined;
+//#endregion
+export { agentScopedWhere, projectScopedWhere, subAgentScopedWhere, tenantScopedWhere };

package/dist/data-access/manage/scope-helpers.js

@@ -0,0 +1,18 @@
+import { and, eq } from "drizzle-orm";
+
+//#region src/data-access/manage/scope-helpers.ts
+function tenantScopedWhere(table, scopes) {
+	return eq(table.tenantId, scopes.tenantId);
+}
+function projectScopedWhere(table, scopes) {
+	return and(eq(table.tenantId, scopes.tenantId), eq(table.projectId, scopes.projectId));
+}
+function agentScopedWhere(table, scopes) {
+	return and(eq(table.tenantId, scopes.tenantId), eq(table.projectId, scopes.projectId), eq(table.agentId, scopes.agentId));
+}
+function subAgentScopedWhere(table, scopes) {
+	return and(eq(table.tenantId, scopes.tenantId), eq(table.projectId, scopes.projectId), eq(table.agentId, scopes.agentId), eq(table.subAgentId, scopes.subAgentId));
+}
+
+//#endregion
+export { agentScopedWhere, projectScopedWhere, subAgentScopedWhere, tenantScopedWhere };

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

@@ -9,12 +9,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: {
@@ -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;
   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: {
@@ -91,15 +91,15 @@ declare const upsertSubAgentSkill: (db: AgentsManageDatabaseClient) => (params:
   alwaysLoaded?: boolean;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
-  index: number;
-  alwaysLoaded: boolean;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   subAgentId: string;
   skillId: string;
+  index: number;
+  alwaysLoaded: boolean;
 }>;
 declare const deleteSubAgentSkill: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;

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

@@ -9,14 +9,14 @@ declare const getSubAgentExternalAgentRelationById: (db: AgentsManageDatabaseCli
   relationId: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headers: Record<string, string> | null;
-  externalAgentId: string;
   subAgentId: string;
+  externalAgentId: string;
 } | undefined>;
 declare const listSubAgentExternalAgentRelations: (db: AgentsManageDatabaseClient) => (params: {
   scopes: SubAgentScopeConfig;
@@ -44,27 +44,27 @@ declare const getSubAgentExternalAgentRelations: (db: AgentsManageDatabaseClient
   scopes: SubAgentScopeConfig;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headers: Record<string, string> | null;
-  externalAgentId: string;
   subAgentId: string;
+  externalAgentId: string;
 }[]>;
 declare const getSubAgentExternalAgentRelationsByAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headers: Record<string, string> | null;
-  externalAgentId: string;
   subAgentId: string;
+  externalAgentId: string;
 }[]>;
 declare const getSubAgentExternalAgentRelationsByExternalAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -180,14 +180,14 @@ declare const createSubAgentExternalAgentRelation: (db: AgentsManageDatabaseClie
   };
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headers: Record<string, string> | null;
-  externalAgentId: string;
   subAgentId: string;
+  externalAgentId: string;
 }>;
 /**
  * Check if sub-agent external agent relation exists by params
@@ -197,14 +197,14 @@ declare const getSubAgentExternalAgentRelationByParams: (db: AgentsManageDatabas
   externalAgentId: string;
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headers: Record<string, string> | null;
-  externalAgentId: string;
   subAgentId: string;
+  externalAgentId: string;
 } | undefined>;
 /**
  * Upsert sub-agent external agent relation (create if it doesn't exist, update if it does)
@@ -218,14 +218,14 @@ declare const upsertSubAgentExternalAgentRelation: (db: AgentsManageDatabaseClie
   };
 }) => Promise<{
   id: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   createdAt: string;
   updatedAt: string;
+  agentId: string;
+  projectId: string;
+  tenantId: string;
   headers: Record<string, string> | null;
-  externalAgentId: string;
   subAgentId: string;
+  externalAgentId: string;
 }>;
 declare const updateSubAgentExternalAgentRelation: (db: AgentsManageDatabaseClient) => (params: {
   scopes: SubAgentScopeConfig;

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

@@ -1,16 +1,17 @@
 import { externalAgents, subAgentExternalAgentRelations, subAgents } from "../../db/manage/manage-schema.js";
+import { agentScopedWhere, subAgentScopedWhere } from "./scope-helpers.js";
 import { and, count, desc, eq } from "drizzle-orm";
 import { nanoid } from "nanoid";
 
 //#region src/data-access/manage/subAgentExternalAgentRelations.ts
 const getSubAgentExternalAgentRelationById = (db) => async (params) => {
-	return db.query.subAgentExternalAgentRelations.findFirst({ where: and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId), eq(subAgentExternalAgentRelations.id, params.relationId)) });
+	return db.query.subAgentExternalAgentRelations.findFirst({ where: and(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.id, params.relationId)) });
 };
 const listSubAgentExternalAgentRelations = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	const whereClause = and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId));
+	const whereClause = subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes);
 	const [data, totalResult] = await Promise.all([db.select().from(subAgentExternalAgentRelations).where(whereClause).limit(limit).offset(offset).orderBy(desc(subAgentExternalAgentRelations.createdAt)), db.select({ count: count() }).from(subAgentExternalAgentRelations).where(whereClause)]);
 	const total = totalResult[0]?.count || 0;
 	return {
@@ -24,16 +25,16 @@ const listSubAgentExternalAgentRelations = (db) => async (params) => {
 	};
 };
 const getSubAgentExternalAgentRelations = (db) => async (params) => {
-	return await db.query.subAgentExternalAgentRelations.findMany({ where: and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)) });
+	return await db.query.subAgentExternalAgentRelations.findMany({ where: subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes) });
 };
 const getSubAgentExternalAgentRelationsByAgent = (db) => async (params) => {
-	return await db.query.subAgentExternalAgentRelations.findMany({ where: and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId)) });
+	return await db.query.subAgentExternalAgentRelations.findMany({ where: agentScopedWhere(subAgentExternalAgentRelations, params.scopes) });
 };
 const getSubAgentExternalAgentRelationsByExternalAgent = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	const whereClause = and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId));
+	const whereClause = and(agentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId));
 	const [data, totalResult] = await Promise.all([db.select().from(subAgentExternalAgentRelations).where(whereClause).limit(limit).offset(offset).orderBy(desc(subAgentExternalAgentRelations.createdAt)), db.select({ count: count() }).from(subAgentExternalAgentRelations).where(whereClause)]);
 	const total = totalResult[0]?.count || 0;
 	return {
@@ -71,7 +72,7 @@ const getExternalAgentsForSubAgent = (db) => async (params) => {
 			createdAt: externalAgents.createdAt,
 			updatedAt: externalAgents.updatedAt
 		}
-	}).from(subAgentExternalAgentRelations).innerJoin(externalAgents, and(eq(subAgentExternalAgentRelations.tenantId, externalAgents.tenantId), eq(subAgentExternalAgentRelations.projectId, externalAgents.projectId), eq(subAgentExternalAgentRelations.externalAgentId, externalAgents.id))).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId))).limit(limit).offset(offset).orderBy(desc(subAgentExternalAgentRelations.createdAt)), db.select({ count: count() }).from(subAgentExternalAgentRelations).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId)))]);
+	}).from(subAgentExternalAgentRelations).innerJoin(externalAgents, and(eq(subAgentExternalAgentRelations.tenantId, externalAgents.tenantId), eq(subAgentExternalAgentRelations.projectId, externalAgents.projectId), eq(subAgentExternalAgentRelations.externalAgentId, externalAgents.id))).where(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes)).limit(limit).offset(offset).orderBy(desc(subAgentExternalAgentRelations.createdAt)), db.select({ count: count() }).from(subAgentExternalAgentRelations).where(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes))]);
 	const total = totalResult[0]?.count || 0;
 	return {
 		data,
@@ -108,7 +109,7 @@ const getSubAgentsForExternalAgent = (db) => async (params) => {
 			createdAt: subAgents.createdAt,
 			updatedAt: subAgents.updatedAt
 		}
-	}).from(subAgentExternalAgentRelations).innerJoin(subAgents, and(eq(subAgentExternalAgentRelations.subAgentId, subAgents.id), eq(subAgentExternalAgentRelations.tenantId, subAgents.tenantId), eq(subAgentExternalAgentRelations.projectId, subAgents.projectId), eq(subAgentExternalAgentRelations.agentId, subAgents.agentId))).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId))).limit(limit).offset(offset).orderBy(desc(subAgentExternalAgentRelations.createdAt)), db.select({ count: count() }).from(subAgentExternalAgentRelations).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)))]);
+	}).from(subAgentExternalAgentRelations).innerJoin(subAgents, and(eq(subAgentExternalAgentRelations.subAgentId, subAgents.id), eq(subAgentExternalAgentRelations.tenantId, subAgents.tenantId), eq(subAgentExternalAgentRelations.projectId, subAgents.projectId), eq(subAgentExternalAgentRelations.agentId, subAgents.agentId))).where(and(agentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId))).limit(limit).offset(offset).orderBy(desc(subAgentExternalAgentRelations.createdAt)), db.select({ count: count() }).from(subAgentExternalAgentRelations).where(and(agentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)))]);
 	const total = totalResult[0]?.count || 0;
 	return {
 		data,
@@ -136,7 +137,7 @@ const createSubAgentExternalAgentRelation = (db) => async (params) => {
 * Check if sub-agent external agent relation exists by params
 */
 const getSubAgentExternalAgentRelationByParams = (db) => async (params) => {
-	return db.query.subAgentExternalAgentRelations.findFirst({ where: and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)) });
+	return db.query.subAgentExternalAgentRelations.findFirst({ where: and(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.externalAgentId, params.externalAgentId)) });
 };
 /**
 * Upsert sub-agent external agent relation (create if it doesn't exist, update if it does)
@@ -163,16 +164,16 @@ const updateSubAgentExternalAgentRelation = (db) => async (params) => {
 		...params.data,
 		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
 	};
-	return (await db.update(subAgentExternalAgentRelations).set(updateData).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId), eq(subAgentExternalAgentRelations.id, params.relationId))).returning())[0];
+	return (await db.update(subAgentExternalAgentRelations).set(updateData).where(and(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.id, params.relationId))).returning())[0];
 };
 const deleteSubAgentExternalAgentRelation = (db) => async (params) => {
-	return (await db.delete(subAgentExternalAgentRelations).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId), eq(subAgentExternalAgentRelations.id, params.relationId))).returning()).length > 0;
+	return (await db.delete(subAgentExternalAgentRelations).where(and(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes), eq(subAgentExternalAgentRelations.id, params.relationId))).returning()).length > 0;
 };
 const deleteSubAgentExternalAgentRelationsBySubAgent = (db) => async (params) => {
-	return (await db.delete(subAgentExternalAgentRelations).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId), eq(subAgentExternalAgentRelations.subAgentId, params.scopes.subAgentId))).returning()).length > 0;
+	return (await db.delete(subAgentExternalAgentRelations).where(subAgentScopedWhere(subAgentExternalAgentRelations, params.scopes)).returning()).length > 0;
 };
 const deleteSubAgentExternalAgentRelationsByAgent = (db) => async (params) => {
-	return (await db.delete(subAgentExternalAgentRelations).where(and(eq(subAgentExternalAgentRelations.tenantId, params.scopes.tenantId), eq(subAgentExternalAgentRelations.projectId, params.scopes.projectId), eq(subAgentExternalAgentRelations.agentId, params.scopes.agentId))).returning()).length > 0;
+	return (await db.delete(subAgentExternalAgentRelations).where(agentScopedWhere(subAgentExternalAgentRelations, params.scopes)).returning()).length > 0;
 };
 
 //#endregion

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

@@ -11,9 +11,9 @@ declare const getAgentRelationById: (db: AgentsManageDatabaseClient) => (params:
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -46,9 +46,9 @@ declare const getAgentRelations: (db: AgentsManageDatabaseClient) => (params: {
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -59,9 +59,9 @@ declare const getAgentRelationsByAgent: (db: AgentsManageDatabaseClient) => (par
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -128,9 +128,9 @@ declare const createSubAgentRelation: (db: AgentsManageDatabaseClient) => (param
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -147,9 +147,9 @@ declare const getAgentRelationByParams: (db: AgentsManageDatabaseClient) => (par
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -161,9 +161,9 @@ declare const upsertSubAgentRelation: (db: AgentsManageDatabaseClient) => (param
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
   sourceSubAgentId: string;
   targetSubAgentId: string | null;
   relationType: string | null;
@@ -206,16 +206,16 @@ declare const createAgentToolRelation: (db: AgentsManageDatabaseClient) => (para
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
+  headers: Record<string, string> | null;
   toolId: string;
   subAgentId: string;
-  headers: Record<string, string> | null;
-  selectedTools: string[] | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  selectedTools: string[] | null;
 }>;
 declare const updateAgentToolRelation: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -250,16 +250,16 @@ declare const getAgentToolRelationById: (db: AgentsManageDatabaseClient) => (par
   id: string;
   createdAt: string;
   updatedAt: string;
-  tenantId: string;
-  projectId: string;
   agentId: string;
+  projectId: string;
+  tenantId: string;
+  headers: Record<string, string> | null;
   toolId: string;
   subAgentId: string;
-  headers: Record<string, string> | null;
-  selectedTools: string[] | null;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
+  selectedTools: string[] | null;
 } | undefined>;
 declare const getAgentToolRelationByAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: SubAgentScopeConfig;