@inkeep/agents-core 0.58.14 → 0.58.16

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

@@ -3,6 +3,7 @@ import { getLogger } from "../../utils/logger.js";
 import { createAgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
 import { generateId } from "../../utils/conversations.js";
 import { getActiveBranch } from "../../dolt/schema-sync.js";
+import { agentScopedWhere, projectScopedWhere, subAgentScopedWhere, tenantScopedWhere } from "./scope-helpers.js";
 import { getProjectMainBranchName } from "./projectLifecycle.js";
 import { cascadeDeleteByAgent } from "../runtime/cascade-delete.js";
 import { getContextConfigById } from "./contextConfigs.js";
@@ -21,22 +22,22 @@ import { and, count, desc, eq, inArray, sql } from "drizzle-orm";
 
 //#region src/data-access/manage/agents.ts
 const getAgentById = (db) => async (params) => {
-	return await db.query.agents.findFirst({ where: and(eq(agents.tenantId, params.scopes.tenantId), eq(agents.projectId, params.scopes.projectId), eq(agents.id, params.scopes.agentId)) }) ?? null;
+	return await db.query.agents.findFirst({ where: and(projectScopedWhere(agents, params.scopes), eq(agents.id, params.scopes.agentId)) }) ?? null;
 };
 const getAgentWithDefaultSubAgent = (db) => async (params) => {
 	return await db.query.agents.findFirst({
-		where: and(eq(agents.tenantId, params.scopes.tenantId), eq(agents.projectId, params.scopes.projectId), eq(agents.id, params.scopes.agentId)),
+		where: and(projectScopedWhere(agents, params.scopes), eq(agents.id, params.scopes.agentId)),
 		with: { defaultSubAgent: true }
 	}) ?? null;
 };
 const listAgents = (db) => async (params) => {
-	return await db.query.agents.findMany({ where: and(eq(agents.tenantId, params.scopes.tenantId), eq(agents.projectId, params.scopes.projectId)) });
+	return await db.query.agents.findMany({ where: projectScopedWhere(agents, params.scopes) });
 };
 const listAgentsPaginated = (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(agents.tenantId, params.scopes.tenantId), eq(agents.projectId, params.scopes.projectId));
+	const whereClause = projectScopedWhere(agents, params.scopes);
 	const query = db.select().from(agents).where(whereClause).limit(limit).offset(offset).orderBy(desc(agents.createdAt));
 	const [data, totalResult] = await Promise.all([query, db.select({ count: count() }).from(agents).where(whereClause)]);
 	const total = totalResult[0]?.count || 0;
@@ -109,13 +110,13 @@ const updateAgent = (db) => async (params) => {
 	if (data.contextConfigId !== void 0 && !data.contextConfigId) updateData.contextConfigId = null;
 	if (data.prompt !== void 0 && !data.prompt) updateData.prompt = null;
 	if (data.stopWhen !== void 0 && !data.stopWhen) updateData.stopWhen = null;
-	return (await db.update(agents).set(updateData).where(and(eq(agents.tenantId, params.scopes.tenantId), eq(agents.projectId, params.scopes.projectId), eq(agents.id, params.scopes.agentId))).returning())[0] ?? null;
+	return (await db.update(agents).set(updateData).where(and(projectScopedWhere(agents, params.scopes), eq(agents.id, params.scopes.agentId))).returning())[0] ?? null;
 };
 const deleteAgent = (db) => async (params) => {
-	const { tenantId, projectId, agentId } = params.scopes;
+	const { agentId } = params.scopes;
 	try {
 		const currentBranch = await getActiveBranch(db)();
-		const subAgentIds = (await db.query.subAgents.findMany({ where: and(eq(subAgents.tenantId, tenantId), eq(subAgents.projectId, projectId), eq(subAgents.agentId, agentId)) })).map((sa) => sa.id);
+		const subAgentIds = (await db.query.subAgents.findMany({ where: agentScopedWhere(subAgents, params.scopes) })).map((sa) => sa.id);
 		await cascadeDeleteByAgent(createAgentsRunDatabaseClient())({
 			scopes: params.scopes,
 			fullBranchName: currentBranch,
@@ -127,7 +128,7 @@ const deleteAgent = (db) => async (params) => {
 			agentId
 		}, "Skipping runtime cascade delete - active_branch() not available");
 	}
-	return (await db.delete(agents).where(and(eq(agents.tenantId, tenantId), eq(agents.projectId, projectId), eq(agents.id, agentId))).returning()).length > 0;
+	return (await db.delete(agents).where(and(projectScopedWhere(agents, params.scopes), eq(agents.id, params.scopes.agentId))).returning()).length > 0;
 };
 /**
 * Helper function to fetch component relationships using efficient joins
@@ -135,7 +136,7 @@ const deleteAgent = (db) => async (params) => {
 const fetchComponentRelationships = (db) => async (scopes, subAgentIds, config) => {
 	const componentsObject = {};
 	if (subAgentIds.length > 0) {
-		const results = await db.select(config.selectFields).from(config.relationTable).innerJoin(config.componentTable, eq(config.relationIdField, config.componentIdField)).where(and(eq(config.relationTable.tenantId, scopes.tenantId), eq(config.relationTable.projectId, scopes.projectId), eq(config.relationTable.agentId, scopes.agentId), inArray(config.subAgentIdField, subAgentIds)));
+		const results = await db.select(config.selectFields).from(config.relationTable).innerJoin(config.componentTable, eq(config.relationIdField, config.componentIdField)).where(and(agentScopedWhere(config.relationTable, scopes), inArray(config.subAgentIdField, subAgentIds)));
 		for (const component of results) componentsObject[component.id] = component;
 	}
 	return componentsObject;
@@ -170,18 +171,15 @@ const getAgentSubAgentInfos = (db) => async ({ scopes: { tenantId, projectId },
 	}))).filter((agent) => agent !== null);
 };
 const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, projectId, agentId }, includeRelationIds = false }) => {
-	const agent = await getAgentById(db)({ scopes: {
+	const agentScope = {
 		tenantId,
 		projectId,
 		agentId
-	} });
+	};
+	const agent = await getAgentById(db)({ scopes: agentScope });
 	if (!agent) return null;
-	const agentRelations = await getAgentRelationsByAgent(db)({ scopes: {
-		tenantId,
-		projectId,
-		agentId
-	} });
-	const agentSubAgents = await db.query.subAgents.findMany({ where: and(eq(subAgents.tenantId, tenantId), eq(subAgents.projectId, projectId), eq(subAgents.agentId, agentId)) });
+	const agentRelations = await getAgentRelationsByAgent(db)({ scopes: agentScope });
+	const agentSubAgents = await db.query.subAgents.findMany({ where: agentScopedWhere(subAgents, agentScope) });
 	const subAgentIds = agentSubAgents.map((subAgent) => subAgent.id);
 	const externalAgentRelations = await getSubAgentExternalAgentRelationsByAgent(db)({ scopes: {
 		tenantId,
@@ -224,6 +222,12 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 	}
 	const processedSubAgents = await Promise.all(agentSubAgents.map(async (agent$1) => {
 		if (!agent$1) return null;
+		const subAgentScope = {
+			tenantId,
+			projectId,
+			agentId,
+			subAgentId: agent$1.id
+		};
 		const subAgentRelationsList = agentRelations.filter((relation) => relation.sourceSubAgentId === agent$1.id);
 		const canTransferTo = includeRelationIds ? subAgentRelationsList.filter((rel) => (rel.relationType === "transfer" || rel.relationType === "transfer_to") && rel.targetSubAgentId !== null).map((rel) => ({
 			subAgentId: rel.targetSubAgentId,
@@ -264,7 +268,7 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 			headers: subAgentToolRelations.headers,
 			toolPolicies: subAgentToolRelations.toolPolicies,
 			agentToolRelationId: subAgentToolRelations.id
-		}).from(subAgentToolRelations).innerJoin(tools, and(eq(subAgentToolRelations.toolId, tools.id), eq(subAgentToolRelations.tenantId, tools.tenantId), eq(subAgentToolRelations.projectId, tools.projectId))).where(and(eq(subAgentToolRelations.tenantId, tenantId), eq(subAgentToolRelations.projectId, projectId), eq(subAgentToolRelations.agentId, agentId), eq(subAgentToolRelations.subAgentId, agent$1.id)));
+		}).from(subAgentToolRelations).innerJoin(tools, and(eq(subAgentToolRelations.toolId, tools.id), eq(subAgentToolRelations.tenantId, tools.tenantId), eq(subAgentToolRelations.projectId, tools.projectId))).where(subAgentScopedWhere(subAgentToolRelations, subAgentScope));
 		const agentFunctionTools = await db.select({
 			id: functionTools.id,
 			name: functionTools.name,
@@ -277,9 +281,9 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 			agentId: functionTools.agentId,
 			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.projectId, projectId), eq(subAgentDataComponents.agentId, agentId), 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.projectId, projectId), eq(subAgentArtifactComponents.agentId, agentId), eq(subAgentArtifactComponents.subAgentId, agent$1.id)) })).map((rel) => rel.artifactComponentId);
+		}).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(subAgentScopedWhere(subAgentFunctionToolRelations, subAgentScope));
+		const agentDataComponentIds = (await db.query.subAgentDataComponents.findMany({ where: subAgentScopedWhere(subAgentDataComponents, subAgentScope) })).map((rel) => rel.dataComponentId);
+		const agentArtifactComponentIds = (await db.query.subAgentArtifactComponents.findMany({ where: subAgentScopedWhere(subAgentArtifactComponents, subAgentScope) })).map((rel) => rel.artifactComponentId);
 		const mcpToolCanUse = subAgentTools.map((tool) => ({
 			agentToolRelationId: tool.agentToolRelationId,
 			toolId: tool.id,
@@ -371,11 +375,7 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 		}, "Failed to retrieve contextConfig");
 	}
 	try {
-		await fetchComponentRelationships(db)({
-			tenantId,
-			projectId,
-			agentId
-		}, subAgentIds, {
+		await fetchComponentRelationships(db)(agentScope, subAgentIds, {
 			relationTable: subAgentDataComponents,
 			componentTable: dataComponents,
 			relationIdField: subAgentDataComponents.dataComponentId,
@@ -392,11 +392,7 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 		agentsLogger.warn({ error }, "Failed to retrieve dataComponents");
 	}
 	try {
-		await fetchComponentRelationships(db)({
-			tenantId,
-			projectId,
-			agentId
-		}, subAgentIds, {
+		await fetchComponentRelationships(db)(agentScope, subAgentIds, {
 			relationTable: subAgentArtifactComponents,
 			componentTable: artifactComponents,
 			relationIdField: subAgentArtifactComponents.artifactComponentId,
@@ -437,7 +433,7 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 	}
 	try {
 		if (!db.query?.projects?.findFirst) return result;
-		const project = await db.query.projects.findFirst({ where: and(eq(projects.tenantId, tenantId), eq(projects.id, projectId)) });
+		const project = await db.query.projects.findFirst({ where: and(tenantScopedWhere(projects, { tenantId }), eq(projects.id, projectId)) });
 		if (project?.stopWhen) {
 			const projectStopWhen = project.stopWhen;
 			if (projectStopWhen.stepCountIs !== void 0) {
@@ -452,7 +448,11 @@ const getFullAgentDefinitionInternal = (db) => async ({ scopes: { tenantId, proj
 								await db.update(subAgents).set({
 									stopWhen: agent$1.stopWhen,
 									updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-								}).where(and(eq(subAgents.tenantId, tenantId), eq(subAgents.projectId, projectId), eq(subAgents.agentId, agentId), eq(subAgents.id, subAgentId)));
+								}).where(and(agentScopedWhere(subAgents, {
+									tenantId,
+									projectId,
+									agentId
+								}), eq(subAgents.id, subAgentId)));
 								result.subAgents[subAgentId] = {
 									...result.subAgents[subAgentId],
 									stopWhen: agent$1.stopWhen

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

@@ -11,9 +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;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -26,8 +28,6 @@ declare const getArtifactComponentById: (db: AgentsManageDatabaseClient) => (par
     component: string;
     mockData: Record<string, unknown>;
   } | null;
-  projectId: string;
-  tenantId: string;
 } | undefined>;
 declare const listArtifactComponents: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -67,9 +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;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -82,8 +84,6 @@ declare const createArtifactComponent: (db: AgentsManageDatabaseClient) => (para
     component: string;
     mockData: Record<string, unknown>;
   } | null;
-  projectId: string;
-  tenantId: string;
 }>;
 declare const updateArtifactComponent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -142,11 +142,11 @@ declare const associateArtifactComponentWithAgent: (db: AgentsManageDatabaseClie
   artifactComponentId: string;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  subAgentId: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
   agentId: string;
+  createdAt: string;
+  subAgentId: string;
   artifactComponentId: string;
 }>;
 declare const removeArtifactComponentFromAgent: (db: AgentsManageDatabaseClient) => (params: {
@@ -185,11 +185,11 @@ declare const upsertAgentArtifactComponentRelation: (db: AgentsManageDatabaseCli
   artifactComponentId: string;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  subAgentId: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
   agentId: string;
+  createdAt: string;
+  subAgentId: string;
   artifactComponentId: string;
 } | null>;
 /**

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

@@ -2,20 +2,21 @@ import { artifactComponents, subAgentArtifactComponents, subAgentRelations, subA
 import { validatePropsAsJsonSchema } from "../../validation/props-validation.js";
 import { validateRender } from "../../validation/render-validation.js";
 import { generateId } from "../../utils/conversations.js";
+import { agentScopedWhere, projectScopedWhere, subAgentScopedWhere } from "./scope-helpers.js";
 import { and, count, desc, eq } from "drizzle-orm";
 
 //#region src/data-access/manage/artifactComponents.ts
 const getArtifactComponentById = (db) => async (params) => {
-	return await db.query.artifactComponents.findFirst({ where: and(eq(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId), eq(artifactComponents.id, params.id)) });
+	return await db.query.artifactComponents.findFirst({ where: and(projectScopedWhere(artifactComponents, params.scopes), eq(artifactComponents.id, params.id)) });
 };
 const listArtifactComponents = (db) => async (params) => {
-	return await db.select().from(artifactComponents).where(and(eq(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId))).orderBy(desc(artifactComponents.createdAt));
+	return await db.select().from(artifactComponents).where(projectScopedWhere(artifactComponents, params.scopes)).orderBy(desc(artifactComponents.createdAt));
 };
 const listArtifactComponentsPaginated = (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(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId));
+	const whereClause = projectScopedWhere(artifactComponents, params.scopes);
 	const [data, totalResult] = await Promise.all([db.select().from(artifactComponents).where(whereClause).limit(limit).offset(offset).orderBy(desc(artifactComponents.createdAt)), db.select({ count: count() }).from(artifactComponents).where(whereClause)]);
 	const total = totalResult[0]?.count || 0;
 	const totalNumber = typeof total === "string" ? Number.parseInt(total, 10) : total;
@@ -75,12 +76,12 @@ const updateArtifactComponent = (db) => async (params) => {
 	const [updated] = await db.update(artifactComponents).set({
 		...params.data,
 		updatedAt: now
-	}).where(and(eq(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId), eq(artifactComponents.id, params.id))).returning();
+	}).where(and(projectScopedWhere(artifactComponents, params.scopes), eq(artifactComponents.id, params.id))).returning();
 	return updated;
 };
 const deleteArtifactComponent = (db) => async (params) => {
 	try {
-		return (await db.delete(artifactComponents).where(and(eq(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId), eq(artifactComponents.id, params.id))).returning()).length > 0;
+		return (await db.delete(artifactComponents).where(and(projectScopedWhere(artifactComponents, params.scopes), eq(artifactComponents.id, params.id))).returning()).length > 0;
 	} catch (error) {
 		console.error("Error deleting artifact component:", error);
 		return false;
@@ -97,7 +98,7 @@ const getArtifactComponentsForAgent = (db) => async (params) => {
 		render: artifactComponents.render,
 		createdAt: artifactComponents.createdAt,
 		updatedAt: artifactComponents.updatedAt
-	}).from(artifactComponents).innerJoin(subAgentArtifactComponents, and(eq(artifactComponents.id, subAgentArtifactComponents.artifactComponentId), eq(artifactComponents.tenantId, subAgentArtifactComponents.tenantId), eq(artifactComponents.projectId, subAgentArtifactComponents.projectId))).where(and(eq(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId), eq(subAgentArtifactComponents.agentId, params.scopes.agentId), eq(subAgentArtifactComponents.subAgentId, params.scopes.subAgentId))).orderBy(desc(artifactComponents.createdAt));
+	}).from(artifactComponents).innerJoin(subAgentArtifactComponents, and(eq(artifactComponents.id, subAgentArtifactComponents.artifactComponentId), eq(artifactComponents.tenantId, subAgentArtifactComponents.tenantId), eq(artifactComponents.projectId, subAgentArtifactComponents.projectId))).where(and(projectScopedWhere(artifactComponents, params.scopes), eq(subAgentArtifactComponents.agentId, params.scopes.agentId), eq(subAgentArtifactComponents.subAgentId, params.scopes.subAgentId))).orderBy(desc(artifactComponents.createdAt));
 };
 const associateArtifactComponentWithAgent = (db) => async (params) => {
 	const [association] = await db.insert(subAgentArtifactComponents).values({
@@ -113,35 +114,35 @@ const associateArtifactComponentWithAgent = (db) => async (params) => {
 };
 const removeArtifactComponentFromAgent = (db) => async (params) => {
 	try {
-		return (await db.delete(subAgentArtifactComponents).where(and(eq(subAgentArtifactComponents.tenantId, params.scopes.tenantId), eq(subAgentArtifactComponents.projectId, params.scopes.projectId), eq(subAgentArtifactComponents.agentId, params.scopes.agentId), eq(subAgentArtifactComponents.subAgentId, params.scopes.subAgentId), eq(subAgentArtifactComponents.artifactComponentId, params.artifactComponentId))).returning()).length > 0;
+		return (await db.delete(subAgentArtifactComponents).where(and(subAgentScopedWhere(subAgentArtifactComponents, params.scopes), eq(subAgentArtifactComponents.artifactComponentId, params.artifactComponentId))).returning()).length > 0;
 	} catch (error) {
 		console.error("Error removing artifact component from agent:", error);
 		return false;
 	}
 };
 const deleteAgentArtifactComponentRelationByAgent = (db) => async (params) => {
-	return (await db.delete(subAgentArtifactComponents).where(and(eq(subAgentArtifactComponents.tenantId, params.scopes.tenantId), eq(subAgentArtifactComponents.projectId, params.scopes.projectId), eq(subAgentArtifactComponents.agentId, params.scopes.agentId), eq(subAgentArtifactComponents.subAgentId, params.scopes.subAgentId))).returning()).length > 0;
+	return (await db.delete(subAgentArtifactComponents).where(subAgentScopedWhere(subAgentArtifactComponents, params.scopes)).returning()).length > 0;
 };
 const getAgentsUsingArtifactComponent = (db) => async (params) => {
 	return await db.select({
 		agentId: subAgentArtifactComponents.agentId,
 		subAgentId: subAgentArtifactComponents.subAgentId,
 		createdAt: subAgentArtifactComponents.createdAt
-	}).from(subAgentArtifactComponents).where(and(eq(subAgentArtifactComponents.tenantId, params.scopes.tenantId), eq(subAgentArtifactComponents.projectId, params.scopes.projectId), eq(subAgentArtifactComponents.artifactComponentId, params.artifactComponentId))).orderBy(desc(subAgentArtifactComponents.createdAt));
+	}).from(subAgentArtifactComponents).where(and(projectScopedWhere(subAgentArtifactComponents, params.scopes), eq(subAgentArtifactComponents.artifactComponentId, params.artifactComponentId))).orderBy(desc(subAgentArtifactComponents.createdAt));
 };
 const isArtifactComponentAssociatedWithAgent = (db) => async (params) => {
-	return (await db.select({ id: subAgentArtifactComponents.id }).from(subAgentArtifactComponents).where(and(eq(subAgentArtifactComponents.tenantId, params.scopes.tenantId), eq(subAgentArtifactComponents.projectId, params.scopes.projectId), eq(subAgentArtifactComponents.agentId, params.scopes.agentId), eq(subAgentArtifactComponents.subAgentId, params.scopes.subAgentId), eq(subAgentArtifactComponents.artifactComponentId, params.artifactComponentId))).limit(1)).length > 0;
+	return (await db.select({ id: subAgentArtifactComponents.id }).from(subAgentArtifactComponents).where(and(subAgentScopedWhere(subAgentArtifactComponents, params.scopes), eq(subAgentArtifactComponents.artifactComponentId, params.artifactComponentId))).limit(1)).length > 0;
 };
 const agentHasArtifactComponents = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(subAgentArtifactComponents).innerJoin(subAgents, and(eq(subAgentArtifactComponents.subAgentId, subAgents.id), eq(subAgentArtifactComponents.tenantId, subAgents.tenantId), eq(subAgentArtifactComponents.projectId, subAgents.projectId), eq(subAgentArtifactComponents.agentId, subAgents.agentId))).innerJoin(subAgentRelations, and(eq(subAgents.id, subAgentRelations.sourceSubAgentId), eq(subAgents.tenantId, subAgentRelations.tenantId), eq(subAgents.projectId, subAgentRelations.projectId), eq(subAgents.agentId, subAgentRelations.agentId))).where(and(eq(subAgentArtifactComponents.tenantId, params.scopes.tenantId), eq(subAgentArtifactComponents.projectId, params.scopes.projectId), eq(subAgentRelations.agentId, params.scopes.agentId))).limit(1))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(subAgentArtifactComponents).innerJoin(subAgents, and(eq(subAgentArtifactComponents.subAgentId, subAgents.id), eq(subAgentArtifactComponents.tenantId, subAgents.tenantId), eq(subAgentArtifactComponents.projectId, subAgents.projectId), eq(subAgentArtifactComponents.agentId, subAgents.agentId))).innerJoin(subAgentRelations, and(eq(subAgents.id, subAgentRelations.sourceSubAgentId), eq(subAgents.tenantId, subAgentRelations.tenantId), eq(subAgents.projectId, subAgentRelations.projectId), eq(subAgents.agentId, subAgentRelations.agentId))).where(agentScopedWhere(subAgentArtifactComponents, params.scopes)).limit(1))[0]?.count || 0;
 	return (typeof total === "string" ? Number.parseInt(total, 10) : total) > 0;
 };
 const countArtifactComponents = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(artifactComponents).where(and(eq(artifactComponents.tenantId, params.scopes.tenantId), eq(artifactComponents.projectId, params.scopes.projectId))))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(artifactComponents).where(projectScopedWhere(artifactComponents, params.scopes)))[0]?.count || 0;
 	return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 const countArtifactComponentsForAgent = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(subAgentArtifactComponents).where(and(eq(subAgentArtifactComponents.tenantId, params.scopes.tenantId), eq(subAgentArtifactComponents.projectId, params.scopes.projectId), eq(subAgentArtifactComponents.agentId, params.scopes.agentId), eq(subAgentArtifactComponents.subAgentId, params.scopes.subAgentId))))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(subAgentArtifactComponents).where(subAgentScopedWhere(subAgentArtifactComponents, params.scopes)))[0]?.count || 0;
 	return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 /**

package/dist/data-access/manage/audit-queries.js

@@ -1,4 +1,5 @@
 import { agents, contextConfigs, scheduledTriggers, scheduledWorkflows, tools } from "../../db/manage/manage-schema.js";
+import { projectScopedWhere } from "./scope-helpers.js";
 import { and, eq } from "drizzle-orm";
 
 //#region src/data-access/manage/audit-queries.ts
@@ -6,23 +7,23 @@ const listEnabledScheduledTriggers = (db) => async (params) => {
 	return db.select({
 		id: scheduledTriggers.id,
 		name: scheduledTriggers.name
-	}).from(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.enabled, true)));
+	}).from(scheduledTriggers).where(and(projectScopedWhere(scheduledTriggers, params.scopes), eq(scheduledTriggers.enabled, true)));
 };
 const listScheduledWorkflowsByProject = (db) => async (params) => {
 	return db.select({
 		id: scheduledWorkflows.id,
 		workflowRunId: scheduledWorkflows.workflowRunId,
 		scheduledTriggerId: scheduledWorkflows.scheduledTriggerId
-	}).from(scheduledWorkflows).where(and(eq(scheduledWorkflows.tenantId, params.scopes.tenantId), eq(scheduledWorkflows.projectId, params.scopes.projectId)));
+	}).from(scheduledWorkflows).where(projectScopedWhere(scheduledWorkflows, params.scopes));
 };
 const listToolIdsByProject = (db) => async (params) => {
-	return (await db.select({ id: tools.id }).from(tools).where(and(eq(tools.tenantId, params.scopes.tenantId), eq(tools.projectId, params.scopes.projectId)))).map((r) => r.id);
+	return (await db.select({ id: tools.id }).from(tools).where(projectScopedWhere(tools, params.scopes))).map((r) => r.id);
 };
 const listContextConfigIdsByProject = (db) => async (params) => {
-	return (await db.select({ id: contextConfigs.id }).from(contextConfigs).where(and(eq(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId)))).map((r) => r.id);
+	return (await db.select({ id: contextConfigs.id }).from(contextConfigs).where(projectScopedWhere(contextConfigs, params.scopes))).map((r) => r.id);
 };
 const listAgentIdsByProject = (db) => async (params) => {
-	return (await db.select({ id: agents.id }).from(agents).where(and(eq(agents.tenantId, params.scopes.tenantId), eq(agents.projectId, params.scopes.projectId)))).map((r) => r.id);
+	return (await db.select({ id: agents.id }).from(agents).where(projectScopedWhere(agents, params.scopes))).map((r) => r.id);
 };
 
 //#endregion

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

@@ -10,11 +10,11 @@ declare const getContextConfigById: (db: AgentsManageDatabaseClient) => (params:
   id: string;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  updatedAt: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
   agentId: string;
+  createdAt: string;
+  updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 } | undefined>;
@@ -22,11 +22,11 @@ declare const listContextConfigs: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  updatedAt: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
   agentId: string;
+  createdAt: string;
+  updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 }[]>;
@@ -44,11 +44,11 @@ declare const listContextConfigsPaginated: (db: AgentsManageDatabaseClient) => (
 }>;
 declare const createContextConfig: (db: AgentsManageDatabaseClient) => (params: ContextConfigInsert) => Promise<{
   id: string;
-  createdAt: string;
-  updatedAt: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
   agentId: string;
+  createdAt: string;
+  updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 }>;
@@ -84,11 +84,11 @@ declare const upsertContextConfig: (db: AgentsManageDatabaseClient) => (params:
   data: ContextConfigInsert;
 }) => Promise<{
   id: string;
-  createdAt: string;
-  updatedAt: string;
-  projectId: string;
   tenantId: string;
+  projectId: string;
   agentId: string;
+  createdAt: string;
+  updatedAt: string;
   headersSchema: unknown;
   contextVariables: Record<string, ContextFetchDefinition> | null;
 }>;

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

@@ -1,14 +1,15 @@
 import { contextConfigs } from "../../db/manage/manage-schema.js";
 import { generateId } from "../../utils/conversations.js";
+import { agentScopedWhere } from "./scope-helpers.js";
 import { and, count, desc, eq, sql } from "drizzle-orm";
 
 //#region src/data-access/manage/contextConfigs.ts
 const getContextConfigById = (db) => async (params) => {
-	return await db.query.contextConfigs.findFirst({ where: and(eq(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId), eq(contextConfigs.agentId, params.scopes.agentId), eq(contextConfigs.id, params.id)) });
+	return await db.query.contextConfigs.findFirst({ where: and(agentScopedWhere(contextConfigs, params.scopes), eq(contextConfigs.id, params.id)) });
 };
 const listContextConfigs = (db) => async (params) => {
 	return await db.query.contextConfigs.findMany({
-		where: and(eq(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId), eq(contextConfigs.agentId, params.scopes.agentId)),
+		where: agentScopedWhere(contextConfigs, params.scopes),
 		orderBy: [desc(contextConfigs.createdAt)]
 	});
 };
@@ -16,7 +17,7 @@ const listContextConfigsPaginated = (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(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId), eq(contextConfigs.agentId, params.scopes.agentId));
+	const whereClause = agentScopedWhere(contextConfigs, params.scopes);
 	const [contextConfigList, totalResult] = await Promise.all([db.select().from(contextConfigs).where(whereClause).limit(limit).offset(offset).orderBy(desc(contextConfigs.createdAt)), db.select({ count: sql`COUNT(*)` }).from(contextConfigs).where(whereClause)]);
 	const total = Number(totalResult[0]?.count || 0);
 	return {
@@ -55,11 +56,11 @@ const updateContextConfig = (db) => async (params) => {
 	return (await db.update(contextConfigs).set({
 		...processedData,
 		updatedAt: now
-	}).where(and(eq(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId), eq(contextConfigs.agentId, params.scopes.agentId), eq(contextConfigs.id, params.id))).returning())[0];
+	}).where(and(agentScopedWhere(contextConfigs, params.scopes), eq(contextConfigs.id, params.id))).returning())[0];
 };
 const deleteContextConfig = (db) => async (params) => {
 	try {
-		return (await db.delete(contextConfigs).where(and(eq(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId), eq(contextConfigs.agentId, params.scopes.agentId), eq(contextConfigs.id, params.id))).returning()).length > 0;
+		return (await db.delete(contextConfigs).where(and(agentScopedWhere(contextConfigs, params.scopes), eq(contextConfigs.id, params.id))).returning()).length > 0;
 	} catch (error) {
 		console.error("Error deleting context config:", error);
 		return false;
@@ -69,7 +70,7 @@ const hasContextConfig = (db) => async (params) => {
 	return await getContextConfigById(db)(params) !== null;
 };
 const countContextConfigs = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(contextConfigs).where(and(eq(contextConfigs.tenantId, params.scopes.tenantId), eq(contextConfigs.projectId, params.scopes.projectId), eq(contextConfigs.agentId, params.scopes.agentId))))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(contextConfigs).where(agentScopedWhere(contextConfigs, params.scopes)))[0]?.count || 0;
 	return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 /**

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

@@ -1,4 +1,5 @@
 import { credentialReferences, externalAgents, tools } from "../../db/manage/manage-schema.js";
+import { projectScopedWhere } from "./scope-helpers.js";
 import { isUniqueConstraintError } from "../../utils/error.js";
 import { and, count, desc, eq, sql } from "drizzle-orm";
 
@@ -7,22 +8,22 @@ import { and, count, desc, eq, sql } from "drizzle-orm";
 * Get a credential reference by ID
 */
 const getCredentialReference = (db) => async (params) => {
-	return await db.query.credentialReferences.findFirst({ where: and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId), eq(credentialReferences.id, params.id)) });
+	return await db.query.credentialReferences.findFirst({ where: and(projectScopedWhere(credentialReferences, params.scopes), eq(credentialReferences.id, params.id)) });
 };
 /**
 * Get a user-scoped credential reference by toolId and userId
 */
 const getUserScopedCredentialReference = (db) => async (params) => {
-	return await db.query.credentialReferences.findFirst({ where: and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId), eq(credentialReferences.toolId, params.toolId), eq(credentialReferences.userId, params.userId)) });
+	return await db.query.credentialReferences.findFirst({ where: and(projectScopedWhere(credentialReferences, params.scopes), eq(credentialReferences.toolId, params.toolId), eq(credentialReferences.userId, params.userId)) });
 };
 /**
 * Get a credential reference by ID with its related tools
 */
 const getCredentialReferenceWithResources = (db) => async (params) => {
 	const [credential, relatedTools, relatedExternalAgents] = await Promise.all([
-		db.query.credentialReferences.findFirst({ where: and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId), eq(credentialReferences.id, params.id)) }),
-		db.select().from(tools).where(and(eq(tools.tenantId, params.scopes.tenantId), eq(tools.projectId, params.scopes.projectId), eq(tools.credentialReferenceId, params.id))),
-		db.select().from(externalAgents).where(and(eq(externalAgents.tenantId, params.scopes.tenantId), eq(externalAgents.projectId, params.scopes.projectId), eq(externalAgents.credentialReferenceId, params.id)))
+		db.query.credentialReferences.findFirst({ where: and(projectScopedWhere(credentialReferences, params.scopes), eq(credentialReferences.id, params.id)) }),
+		db.select().from(tools).where(and(projectScopedWhere(tools, params.scopes), eq(tools.credentialReferenceId, params.id))),
+		db.select().from(externalAgents).where(and(projectScopedWhere(externalAgents, params.scopes), eq(externalAgents.credentialReferenceId, params.id)))
 	]);
 	if (!credential) return;
 	return {
@@ -36,7 +37,7 @@ const getCredentialReferenceWithResources = (db) => async (params) => {
 */
 const listCredentialReferences = (db) => async (params) => {
 	return await db.query.credentialReferences.findMany({
-		where: and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId)),
+		where: projectScopedWhere(credentialReferences, params.scopes),
 		orderBy: [desc(credentialReferences.createdAt)]
 	});
 };
@@ -47,7 +48,7 @@ const listCredentialReferencesPaginated = (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(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId));
+	const whereClause = projectScopedWhere(credentialReferences, params.scopes);
 	const [data, totalResult] = await Promise.all([db.select().from(credentialReferences).where(whereClause).limit(limit).offset(offset).orderBy(desc(credentialReferences.createdAt)), db.select({ count: sql`COUNT(*)` }).from(credentialReferences).where(whereClause)]);
 	const total = Number(totalResult[0]?.count || 0);
 	return {
@@ -80,7 +81,7 @@ const updateCredentialReference = (db) => async (params) => {
 	await db.update(credentialReferences).set({
 		...params.data,
 		updatedAt: now
-	}).where(and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId), eq(credentialReferences.id, params.id)));
+	}).where(and(projectScopedWhere(credentialReferences, params.scopes), eq(credentialReferences.id, params.id)));
 	return await getCredentialReferenceWithResources(db)({
 		scopes: params.scopes,
 		id: params.id
@@ -94,7 +95,7 @@ const deleteCredentialReference = (db) => async (params) => {
 		scopes: params.scopes,
 		id: params.id
 	})) return false;
-	await db.delete(credentialReferences).where(and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId), eq(credentialReferences.id, params.id)));
+	await db.delete(credentialReferences).where(and(projectScopedWhere(credentialReferences, params.scopes), eq(credentialReferences.id, params.id)));
 	return await getCredentialReference(db)({
 		scopes: params.scopes,
 		id: params.id
@@ -110,13 +111,13 @@ const hasCredentialReference = (db) => async (params) => {
 * Get credential reference by ID (simple version without tools)
 */
 const getCredentialReferenceById = (db) => async (params) => {
-	return await db.query.credentialReferences.findFirst({ where: and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId), eq(credentialReferences.id, params.id)) }) || null;
+	return await db.query.credentialReferences.findFirst({ where: and(projectScopedWhere(credentialReferences, params.scopes), eq(credentialReferences.id, params.id)) }) || null;
 };
 /**
 * Count credential references for a tenant/project
 */
 const countCredentialReferences = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(credentialReferences).where(and(eq(credentialReferences.tenantId, params.scopes.tenantId), eq(credentialReferences.projectId, params.scopes.projectId))))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(credentialReferences).where(projectScopedWhere(credentialReferences, params.scopes)))[0]?.count || 0;
 	return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 /**

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

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