@inkeep/agents-core 0.58.14 → 0.58.16

package/dist/data-access/runtime/messages.d.ts

@@ -11,25 +11,25 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
   messageId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: MessageMetadata | null;
+  content: MessageContent;
   role: string;
+  conversationId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  projectId: string;
-  tenantId: string;
-  content: MessageContent;
-  conversationId: string;
   fromTeamAgentId: string | null;
   toTeamAgentId: string | null;
   visibility: string;
   messageType: string;
+  taskId: string | null;
   parentMessageId: string | null;
+  a2aTaskId: string | null;
   a2aSessionId: string | null;
 } | undefined>;
 declare const listMessages: (db: AgentsRunDatabaseClient) => (params: {
@@ -142,25 +142,25 @@ declare const getVisibleMessages: (db: AgentsRunDatabaseClient) => (params: {
 }[]>;
 declare const createMessage: (db: AgentsRunDatabaseClient) => (params: MessageInsert) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: MessageMetadata | null;
+  content: MessageContent;
   role: string;
+  conversationId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  projectId: string;
-  tenantId: string;
-  content: MessageContent;
-  conversationId: string;
   fromTeamAgentId: string | null;
   toTeamAgentId: string | null;
   visibility: string;
   messageType: string;
+  taskId: string | null;
   parentMessageId: string | null;
+  a2aTaskId: string | null;
   a2aSessionId: string | null;
 }>;
 declare const updateMessage: (db: AgentsRunDatabaseClient) => (params: {
@@ -195,30 +195,35 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   messageId: string;
 }) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
   createdAt: string;
   updatedAt: string;
   metadata: MessageMetadata | null;
+  content: MessageContent;
   role: string;
+  conversationId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  projectId: string;
-  tenantId: string;
-  content: MessageContent;
-  conversationId: string;
   fromTeamAgentId: string | null;
   toTeamAgentId: string | null;
   visibility: string;
   messageType: string;
+  taskId: string | null;
   parentMessageId: string | null;
+  a2aTaskId: string | null;
   a2aSessionId: string | null;
 }>;
 declare const countMessagesByConversation: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   conversationId: string;
 }) => Promise<number>;
+declare const countVisibleMessages: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  conversationId: string;
+  visibility?: MessageVisibility[];
+}) => Promise<number>;
 //#endregion
-export { countMessagesByConversation, createMessage, deleteMessage, getMessageById, getMessagesByConversation, getMessagesByTask, getVisibleMessages, listMessages, updateMessage };
+export { countMessagesByConversation, countVisibleMessages, createMessage, deleteMessage, getMessageById, getMessagesByConversation, getMessagesByTask, getVisibleMessages, listMessages, updateMessage };

package/dist/data-access/runtime/messages.js

@@ -1,34 +1,35 @@
 import { messages } from "../../db/runtime/runtime-schema.js";
+import { projectScopedWhere } from "../manage/scope-helpers.js";
 import { and, asc, count, desc, eq, inArray } from "drizzle-orm";
 
 //#region src/data-access/runtime/messages.ts
 const getMessageById = (db) => async (params) => {
-	return db.query.messages.findFirst({ where: and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.id, params.messageId)) });
+	return db.query.messages.findFirst({ where: and(projectScopedWhere(messages, params.scopes), eq(messages.id, params.messageId)) });
 };
 const listMessages = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	return await db.select().from(messages).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId))).limit(limit).offset(offset).orderBy(desc(messages.createdAt));
+	return await db.select().from(messages).where(projectScopedWhere(messages, params.scopes)).limit(limit).offset(offset).orderBy(desc(messages.createdAt));
 };
 const getMessagesByConversation = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	return await db.select().from(messages).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.conversationId, params.conversationId))).limit(limit).offset(offset).orderBy(desc(messages.createdAt));
+	return await db.select().from(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.conversationId, params.conversationId))).limit(limit).offset(offset).orderBy(desc(messages.createdAt));
 };
 const getMessagesByTask = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	return await db.select().from(messages).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.taskId, params.taskId))).limit(limit).offset(offset).orderBy(asc(messages.createdAt));
+	return await db.select().from(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.taskId, params.taskId))).limit(limit).offset(offset).orderBy(asc(messages.createdAt));
 };
 const getVisibleMessages = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
 	const visibilityFilter = params.visibility || ["user-facing"];
-	return await db.select().from(messages).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.conversationId, params.conversationId), inArray(messages.visibility, visibilityFilter))).limit(limit).offset(offset).orderBy(asc(messages.createdAt));
+	return await db.select().from(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.conversationId, params.conversationId), inArray(messages.visibility, visibilityFilter))).limit(limit).offset(offset).orderBy(asc(messages.createdAt));
 };
 const createMessage = (db) => async (params) => {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -44,17 +45,22 @@ const updateMessage = (db) => async (params) => {
 	const [updated] = await db.update(messages).set({
 		...params.data,
 		updatedAt: now
-	}).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.id, params.messageId))).returning();
+	}).where(and(projectScopedWhere(messages, params.scopes), eq(messages.id, params.messageId))).returning();
 	return updated;
 };
 const deleteMessage = (db) => async (params) => {
-	const [deleted] = await db.delete(messages).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.id, params.messageId))).returning();
+	const [deleted] = await db.delete(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.id, params.messageId))).returning();
 	return deleted;
 };
 const countMessagesByConversation = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(messages).where(and(eq(messages.tenantId, params.scopes.tenantId), eq(messages.projectId, params.scopes.projectId), eq(messages.conversationId, params.conversationId))))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.conversationId, params.conversationId))))[0]?.count || 0;
+	return typeof total === "string" ? Number.parseInt(total, 10) : total;
+};
+const countVisibleMessages = (db) => async (params) => {
+	const visibilityFilter = params.visibility || ["user-facing"];
+	const total = (await db.select({ count: count() }).from(messages).where(and(projectScopedWhere(messages, params.scopes), eq(messages.conversationId, params.conversationId), inArray(messages.visibility, visibilityFilter))))[0]?.count || 0;
 	return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 
 //#endregion
-export { countMessagesByConversation, createMessage, deleteMessage, getMessageById, getMessagesByConversation, getMessagesByTask, getVisibleMessages, listMessages, updateMessage };
+export { countMessagesByConversation, countVisibleMessages, createMessage, deleteMessage, getMessageById, getMessagesByConversation, getMessagesByTask, getVisibleMessages, listMessages, updateMessage };

package/dist/data-access/runtime/projects.js

@@ -1,4 +1,5 @@
 import { projectMetadata } from "../../db/runtime/runtime-schema.js";
+import { tenantScopedWhere } from "../manage/scope-helpers.js";
 import { and, count, desc, eq, inArray } from "drizzle-orm";
 
 //#region src/data-access/runtime/projects.ts
@@ -6,14 +7,14 @@ import { and, count, desc, eq, inArray } from "drizzle-orm";
 * Get a project from the runtime DB by ID
 */
 const getProjectMetadata = (db) => async (params) => {
-	return await db.query.projectMetadata.findFirst({ where: and(eq(projectMetadata.tenantId, params.tenantId), eq(projectMetadata.id, params.projectId)) }) ?? null;
+	return await db.query.projectMetadata.findFirst({ where: and(tenantScopedWhere(projectMetadata, { tenantId: params.tenantId }), eq(projectMetadata.id, params.projectId)) }) ?? null;
 };
 /**
 * List all runtimeProjects for a tenant from the runtime DB
 */
 const listProjectsMetadata = (db) => async (params) => {
 	return await db.query.projectMetadata.findMany({
-		where: eq(projectMetadata.tenantId, params.tenantId),
+		where: tenantScopedWhere(projectMetadata, { tenantId: params.tenantId }),
 		orderBy: [desc(projectMetadata.createdAt)]
 	});
 };
@@ -25,7 +26,7 @@ const listProjectsMetadataPaginated = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	const conditions = [eq(projectMetadata.tenantId, params.tenantId)];
+	const conditions = [tenantScopedWhere(projectMetadata, { tenantId: params.tenantId })];
 	if (params.projectIds !== void 0) {
 		if (params.projectIds.length === 0) return {
 			data: [],
@@ -70,7 +71,7 @@ const createProjectMetadata = (db) => async (params) => {
 * Delete a project from the runtime DB
 */
 const deleteProjectMetadata = (db) => async (params) => {
-	return (await db.delete(projectMetadata).where(and(eq(projectMetadata.tenantId, params.tenantId), eq(projectMetadata.id, params.projectId))).returning()).length > 0;
+	return (await db.delete(projectMetadata).where(and(tenantScopedWhere(projectMetadata, { tenantId: params.tenantId }), eq(projectMetadata.id, params.projectId))).returning()).length > 0;
 };
 /**
 * Check if a project exists in the runtime DB
@@ -82,7 +83,7 @@ const projectsMetadataExists = (db) => async (params) => {
 * Count runtimeProjects for a tenant
 */
 const countProjectsInRuntime = (db) => async (params) => {
-	const total = (await db.select({ count: count() }).from(projectMetadata).where(eq(projectMetadata.tenantId, params.tenantId)))[0]?.count || 0;
+	const total = (await db.select({ count: count() }).from(projectMetadata).where(tenantScopedWhere(projectMetadata, { tenantId: params.tenantId })))[0]?.count || 0;
 	return typeof total === "string" ? Number.parseInt(total, 10) : total;
 };
 

package/dist/data-access/runtime/scheduledTriggerInvocations.js

@@ -1,4 +1,5 @@
 import { scheduledTriggerInvocations } from "../../db/runtime/runtime-schema.js";
+import { agentScopedWhere, projectScopedWhere } from "../manage/scope-helpers.js";
 import { and, asc, count, desc, eq, gte, inArray, lte, ne, sql } from "drizzle-orm";
 
 //#region src/data-access/runtime/scheduledTriggerInvocations.ts
@@ -6,7 +7,7 @@ import { and, asc, count, desc, eq, gte, inArray, lte, ne, sql } from "drizzle-o
 * Get a scheduled trigger invocation by ID (agent-scoped)
 */
 const getScheduledTriggerInvocationById = (db) => async (params) => {
-	return await db.query.scheduledTriggerInvocations.findFirst({ where: and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId)) });
+	return await db.query.scheduledTriggerInvocations.findFirst({ where: and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId)) });
 };
 /**
 * Get a scheduled trigger invocation by idempotency key
@@ -22,12 +23,7 @@ const listScheduledTriggerInvocationsPaginated = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	const conditions = [
-		eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId),
-		eq(scheduledTriggerInvocations.projectId, params.scopes.projectId),
-		eq(scheduledTriggerInvocations.agentId, params.scopes.agentId),
-		eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId)
-	];
+	const conditions = [agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId)];
 	if (params.filters?.status) conditions.push(eq(scheduledTriggerInvocations.status, params.filters.status));
 	if (params.filters?.from) conditions.push(gte(scheduledTriggerInvocations.scheduledFor, params.filters.from));
 	if (params.filters?.to) conditions.push(lte(scheduledTriggerInvocations.scheduledFor, params.filters.to));
@@ -50,14 +46,14 @@ const listScheduledTriggerInvocationsPaginated = (db) => async (params) => {
 */
 const listPendingScheduledTriggerInvocations = (db) => async (params) => {
 	const maxLimit = Math.min(params.limit || 10, 100);
-	return await db.select().from(scheduledTriggerInvocations).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.status, "pending"))).orderBy(asc(scheduledTriggerInvocations.scheduledFor)).limit(maxLimit);
+	return await db.select().from(scheduledTriggerInvocations).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.status, "pending"))).orderBy(asc(scheduledTriggerInvocations.scheduledFor)).limit(maxLimit);
 };
 /**
 * Delete all pending invocations for a trigger
 * Used when cron expression changes or trigger is disabled
 */
 const deletePendingInvocationsForTrigger = (db) => async (params) => {
-	return (await db.delete(scheduledTriggerInvocations).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.status, "pending"))).returning()).length;
+	return (await db.delete(scheduledTriggerInvocations).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.status, "pending"))).returning()).length;
 };
 /**
 * Create a new scheduled trigger invocation (agent-scoped)
@@ -69,7 +65,7 @@ const createScheduledTriggerInvocation = (db) => async (params) => {
 * Update scheduled trigger invocation status (agent-scoped)
 */
 const updateScheduledTriggerInvocationStatus = (db) => async (params) => {
-	return (await db.update(scheduledTriggerInvocations).set(params.data).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
+	return (await db.update(scheduledTriggerInvocations).set(params.data).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
 };
 /**
 * Mark invocation as running
@@ -79,7 +75,7 @@ const markScheduledTriggerInvocationRunning = (db) => async (params) => {
 	return (await db.update(scheduledTriggerInvocations).set({
 		status: "running",
 		startedAt: sql`COALESCE(${scheduledTriggerInvocations.startedAt}, ${now})`
-	}).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
+	}).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
 };
 /**
 * Mark invocation as completed
@@ -89,7 +85,7 @@ const markScheduledTriggerInvocationCompleted = (db) => async (params) => {
 	return (await db.update(scheduledTriggerInvocations).set({
 		status: "completed",
 		completedAt: (/* @__PURE__ */ new Date()).toISOString()
-	}).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId), ne(scheduledTriggerInvocations.status, "cancelled"))).returning())[0];
+	}).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId), ne(scheduledTriggerInvocations.status, "cancelled"))).returning())[0];
 };
 /**
 * Mark invocation as failed
@@ -99,14 +95,14 @@ const markScheduledTriggerInvocationFailed = (db) => async (params) => {
 	return (await db.update(scheduledTriggerInvocations).set({
 		status: "failed",
 		completedAt: (/* @__PURE__ */ new Date()).toISOString()
-	}).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId), ne(scheduledTriggerInvocations.status, "cancelled"))).returning())[0];
+	}).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId), ne(scheduledTriggerInvocations.status, "cancelled"))).returning())[0];
 };
 /**
 * Add a conversation ID to the invocation's conversationIds array
 * Used to track all conversations created during retries
 */
 const addConversationIdToInvocation = (db) => async (params) => {
-	return (await db.update(scheduledTriggerInvocations).set({ conversationIds: sql`${scheduledTriggerInvocations.conversationIds} || ${JSON.stringify([params.conversationId])}::jsonb` }).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
+	return (await db.update(scheduledTriggerInvocations).set({ conversationIds: sql`${scheduledTriggerInvocations.conversationIds} || ${JSON.stringify([params.conversationId])}::jsonb` }).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
 };
 /**
 * Mark invocation as cancelled
@@ -115,7 +111,7 @@ const markScheduledTriggerInvocationCancelled = (db) => async (params) => {
 	return (await db.update(scheduledTriggerInvocations).set({
 		status: "cancelled",
 		completedAt: (/* @__PURE__ */ new Date()).toISOString()
-	}).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
+	}).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), eq(scheduledTriggerInvocations.id, params.invocationId))).returning())[0];
 };
 /**
 * Cancel all pending invocations for a trigger
@@ -125,7 +121,7 @@ const cancelPendingInvocationsForTrigger = (db) => async (params) => {
 	return (await db.update(scheduledTriggerInvocations).set({
 		status: "cancelled",
 		completedAt: (/* @__PURE__ */ new Date()).toISOString()
-	}).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), inArray(scheduledTriggerInvocations.status, ["pending", "running"]))).returning()).length;
+	}).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), inArray(scheduledTriggerInvocations.status, ["pending", "running"]))).returning()).length;
 };
 /**
 * Cancel only PAST pending invocations for a trigger (scheduledFor <= now)
@@ -136,7 +132,7 @@ const cancelPastPendingInvocationsForTrigger = (db) => async (params) => {
 	return (await db.update(scheduledTriggerInvocations).set({
 		status: "cancelled",
 		completedAt: now
-	}).where(and(eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId), eq(scheduledTriggerInvocations.agentId, params.scopes.agentId), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), inArray(scheduledTriggerInvocations.status, ["pending", "running"]), lte(scheduledTriggerInvocations.scheduledFor, now))).returning()).length;
+	}).where(and(agentScopedWhere(scheduledTriggerInvocations, params.scopes), eq(scheduledTriggerInvocations.scheduledTriggerId, params.scheduledTriggerId), inArray(scheduledTriggerInvocations.status, ["pending", "running"]), lte(scheduledTriggerInvocations.scheduledFor, now))).returning()).length;
 };
 /**
 * Get run info for multiple scheduled triggers in a single query
@@ -144,14 +140,13 @@ const cancelPastPendingInvocationsForTrigger = (db) => async (params) => {
 */
 const getScheduledTriggerRunInfoBatch = (db) => async (params) => {
 	if (params.triggerIds.length === 0) return /* @__PURE__ */ new Map();
-	const { tenantId, projectId } = params.scopes;
 	const allInvocations = await db.select({
 		scheduledTriggerId: scheduledTriggerInvocations.scheduledTriggerId,
 		status: scheduledTriggerInvocations.status,
 		scheduledFor: scheduledTriggerInvocations.scheduledFor,
 		completedAt: scheduledTriggerInvocations.completedAt,
 		conversationIds: scheduledTriggerInvocations.conversationIds
-	}).from(scheduledTriggerInvocations).where(and(eq(scheduledTriggerInvocations.tenantId, tenantId), eq(scheduledTriggerInvocations.projectId, projectId), inArray(scheduledTriggerInvocations.scheduledTriggerId, params.triggerIds.map((t) => t.triggerId)))).orderBy(desc(scheduledTriggerInvocations.completedAt));
+	}).from(scheduledTriggerInvocations).where(and(projectScopedWhere(scheduledTriggerInvocations, params.scopes), inArray(scheduledTriggerInvocations.scheduledTriggerId, params.triggerIds.map((t) => t.triggerId)))).orderBy(desc(scheduledTriggerInvocations.completedAt));
 	const result = /* @__PURE__ */ new Map();
 	for (const trigger of params.triggerIds) result.set(trigger.triggerId, {
 		lastRunAt: null,
@@ -180,12 +175,7 @@ const listUpcomingInvocationsForAgentPaginated = (db) => async (params) => {
 	const limit = Math.min(params.pagination?.limit || 20, 100);
 	const offset = (page - 1) * limit;
 	const statusCondition = params.includeRunning ? inArray(scheduledTriggerInvocations.status, ["pending", "running"]) : eq(scheduledTriggerInvocations.status, "pending");
-	const whereClause = and(...[
-		eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId),
-		eq(scheduledTriggerInvocations.projectId, params.scopes.projectId),
-		eq(scheduledTriggerInvocations.agentId, params.scopes.agentId),
-		statusCondition
-	]);
+	const whereClause = and(...[agentScopedWhere(scheduledTriggerInvocations, params.scopes), statusCondition]);
 	const [data, totalResult] = await Promise.all([db.select().from(scheduledTriggerInvocations).where(whereClause).limit(limit).offset(offset).orderBy(asc(scheduledTriggerInvocations.scheduledFor)), db.select({ count: count() }).from(scheduledTriggerInvocations).where(whereClause)]);
 	const total = totalResult[0]?.count || 0;
 	return {
@@ -206,7 +196,7 @@ const listProjectScheduledTriggerInvocationsPaginated = (db) => async (params) =
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 20, 100);
 	const offset = (page - 1) * limit;
-	const conditions = [eq(scheduledTriggerInvocations.tenantId, params.scopes.tenantId), eq(scheduledTriggerInvocations.projectId, params.scopes.projectId)];
+	const conditions = [projectScopedWhere(scheduledTriggerInvocations, params.scopes)];
 	if (params.filters?.status) conditions.push(eq(scheduledTriggerInvocations.status, params.filters.status));
 	const whereClause = and(...conditions);
 	const [data, totalResult] = await Promise.all([db.select().from(scheduledTriggerInvocations).where(whereClause).limit(limit).offset(offset).orderBy(desc(scheduledTriggerInvocations.createdAt)), db.select({ count: count() }).from(scheduledTriggerInvocations).where(whereClause)]);

package/dist/data-access/runtime/slack-work-app-mcp.js

@@ -1,5 +1,6 @@
 import { workAppSlackMcpToolAccessConfig, workAppSlackUserMappings } from "../../db/runtime/runtime-schema.js";
-import { and, eq } from "drizzle-orm";
+import { tenantScopedWhere, toolScopedWhere } from "../manage/scope-helpers.js";
+import { eq } from "drizzle-orm";
 
 //#region src/data-access/runtime/slack-work-app-mcp.ts
 const getSlackMcpToolAccessConfig = (db) => async (scope) => {
@@ -7,7 +8,7 @@ const getSlackMcpToolAccessConfig = (db) => async (scope) => {
 		channelAccessMode: workAppSlackMcpToolAccessConfig.channelAccessMode,
 		dmEnabled: workAppSlackMcpToolAccessConfig.dmEnabled,
 		channelIds: workAppSlackMcpToolAccessConfig.channelIds
-	}).from(workAppSlackMcpToolAccessConfig).where(and(eq(workAppSlackMcpToolAccessConfig.tenantId, scope.tenantId), eq(workAppSlackMcpToolAccessConfig.projectId, scope.projectId), eq(workAppSlackMcpToolAccessConfig.toolId, scope.toolId))).limit(1))[0] ?? {
+	}).from(workAppSlackMcpToolAccessConfig).where(toolScopedWhere(workAppSlackMcpToolAccessConfig, scope)).limit(1))[0] ?? {
 		channelAccessMode: "selected",
 		dmEnabled: false,
 		channelIds: []
@@ -42,13 +43,13 @@ const updateSlackMcpToolAccessChannelIds = (db) => async (scope, channelIds) =>
 	await db.update(workAppSlackMcpToolAccessConfig).set({
 		channelIds,
 		updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-	}).where(and(eq(workAppSlackMcpToolAccessConfig.tenantId, scope.tenantId), eq(workAppSlackMcpToolAccessConfig.projectId, scope.projectId), eq(workAppSlackMcpToolAccessConfig.toolId, scope.toolId)));
+	}).where(toolScopedWhere(workAppSlackMcpToolAccessConfig, scope));
 };
 const deleteSlackMcpToolAccessConfig = (db) => async (scope) => {
-	return (await db.delete(workAppSlackMcpToolAccessConfig).where(and(eq(workAppSlackMcpToolAccessConfig.tenantId, scope.tenantId), eq(workAppSlackMcpToolAccessConfig.projectId, scope.projectId), eq(workAppSlackMcpToolAccessConfig.toolId, scope.toolId))).returning()).length > 0;
+	return (await db.delete(workAppSlackMcpToolAccessConfig).where(toolScopedWhere(workAppSlackMcpToolAccessConfig, scope)).returning()).length > 0;
 };
 const deleteAllSlackMcpToolAccessConfigsByTenant = (db) => async (tenantId) => {
-	return (await db.delete(workAppSlackMcpToolAccessConfig).where(eq(workAppSlackMcpToolAccessConfig.tenantId, tenantId)).returning()).length;
+	return (await db.delete(workAppSlackMcpToolAccessConfig).where(tenantScopedWhere(workAppSlackMcpToolAccessConfig, { tenantId })).returning()).length;
 };
 const isSlackWorkAppTool = (tool) => {
 	return tool.isWorkApp && tool.config.mcp.server.url.includes("/slack/mcp");

package/dist/data-access/runtime/tasks.d.ts

@@ -1,3 +1,4 @@
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
 import { TaskMetadataConfig } from "../../types/utility.js";
 import "../../types/index.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
@@ -7,26 +8,28 @@ import { TaskInsert, TaskSelect } from "../../types/entities.js";
 //#region src/data-access/runtime/tasks.d.ts
 declare const createTask: (db: AgentsRunDatabaseClient) => (params: TaskInsert) => Promise<{
   id: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
   createdAt: string;
   updatedAt: string;
+  metadata: TaskMetadataConfig | null;
   ref: {
-    type: "tag" | "commit" | "branch";
+    type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  metadata: TaskMetadataConfig | null;
   status: string;
   subAgentId: string;
-  projectId: string;
-  tenantId: string;
-  agentId: string;
   contextId: string;
 }>;
 declare const getTask: (db: AgentsRunDatabaseClient) => (params: {
   id: string;
+  scopes: ProjectScopeConfig;
 }) => Promise<TaskSelect | null>;
 declare const updateTask: (db: AgentsRunDatabaseClient) => (params: {
   taskId: string;
+  scopes: ProjectScopeConfig;
   data: {
     status?: string;
     metadata?: any;
@@ -36,7 +39,7 @@ declare const updateTask: (db: AgentsRunDatabaseClient) => (params: {
   updatedAt: string;
   contextId: string;
   ref: {
-    type: "tag" | "commit" | "branch";
+    type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
@@ -50,6 +53,7 @@ declare const updateTask: (db: AgentsRunDatabaseClient) => (params: {
 }>;
 declare const listTaskIdsByContextId: (db: AgentsRunDatabaseClient) => (params: {
   contextId: string;
+  scopes: ProjectScopeConfig;
 }) => Promise<string[]>;
 //#endregion
 export { createTask, getTask, listTaskIdsByContextId, updateTask };

package/dist/data-access/runtime/tasks.js

@@ -1,4 +1,5 @@
 import { tasks } from "../../db/runtime/runtime-schema.js";
+import { projectScopedWhere } from "../manage/scope-helpers.js";
 import { and, eq } from "drizzle-orm";
 
 //#region src/data-access/runtime/tasks.ts
@@ -12,20 +13,18 @@ const createTask = (db) => async (params) => {
 	return created;
 };
 const getTask = (db) => async (params) => {
-	const { id } = params;
-	return (await db.select().from(tasks).where(eq(tasks.id, id)).limit(1))[0];
+	return (await db.select().from(tasks).where(and(projectScopedWhere(tasks, params.scopes), eq(tasks.id, params.id))).limit(1))[0] ?? null;
 };
 const updateTask = (db) => async (params) => {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
 	const [updated] = await db.update(tasks).set({
 		...params.data,
 		updatedAt: now
-	}).where(and(eq(tasks.id, params.taskId))).returning();
+	}).where(and(projectScopedWhere(tasks, params.scopes), eq(tasks.id, params.taskId))).returning();
 	return updated;
 };
 const listTaskIdsByContextId = (db) => async (params) => {
-	const { contextId } = params;
-	return (await db.select({ id: tasks.id }).from(tasks).where(eq(tasks.contextId, contextId))).map((r) => r.id);
+	return (await db.select({ id: tasks.id }).from(tasks).where(and(projectScopedWhere(tasks, params.scopes), eq(tasks.contextId, params.contextId)))).map((r) => r.id);
 };
 
 //#endregion

package/dist/data-access/runtime/triggerInvocations.js

@@ -1,4 +1,5 @@
 import { triggerInvocations } from "../../db/runtime/runtime-schema.js";
+import { agentScopedWhere } from "../manage/scope-helpers.js";
 import { and, count, desc, eq, gte, lte } from "drizzle-orm";
 
 //#region src/data-access/runtime/triggerInvocations.ts
@@ -6,7 +7,7 @@ import { and, count, desc, eq, gte, lte } from "drizzle-orm";
 * Get a trigger invocation by ID (agent-scoped)
 */
 const getTriggerInvocationById = (db) => async (params) => {
-	return await db.query.triggerInvocations.findFirst({ where: and(eq(triggerInvocations.tenantId, params.scopes.tenantId), eq(triggerInvocations.projectId, params.scopes.projectId), eq(triggerInvocations.agentId, params.scopes.agentId), eq(triggerInvocations.triggerId, params.triggerId), eq(triggerInvocations.id, params.invocationId)) });
+	return await db.query.triggerInvocations.findFirst({ where: and(agentScopedWhere(triggerInvocations, params.scopes), eq(triggerInvocations.triggerId, params.triggerId), eq(triggerInvocations.id, params.invocationId)) });
 };
 /**
 * List trigger invocations with optional filtering (agent-scoped)
@@ -15,12 +16,7 @@ const listTriggerInvocationsPaginated = (db) => async (params) => {
 	const page = params.pagination?.page || 1;
 	const limit = Math.min(params.pagination?.limit || 10, 100);
 	const offset = (page - 1) * limit;
-	const conditions = [
-		eq(triggerInvocations.tenantId, params.scopes.tenantId),
-		eq(triggerInvocations.projectId, params.scopes.projectId),
-		eq(triggerInvocations.agentId, params.scopes.agentId),
-		eq(triggerInvocations.triggerId, params.triggerId)
-	];
+	const conditions = [agentScopedWhere(triggerInvocations, params.scopes), eq(triggerInvocations.triggerId, params.triggerId)];
 	if (params.filters?.status) conditions.push(eq(triggerInvocations.status, params.filters.status));
 	if (params.filters?.from) conditions.push(gte(triggerInvocations.createdAt, params.filters.from));
 	if (params.filters?.to) conditions.push(lte(triggerInvocations.createdAt, params.filters.to));
@@ -47,7 +43,7 @@ const createTriggerInvocation = (db) => async (params) => {
 * Update trigger invocation status (agent-scoped)
 */
 const updateTriggerInvocationStatus = (db) => async (params) => {
-	return (await db.update(triggerInvocations).set(params.data).where(and(eq(triggerInvocations.tenantId, params.scopes.tenantId), eq(triggerInvocations.projectId, params.scopes.projectId), eq(triggerInvocations.agentId, params.scopes.agentId), eq(triggerInvocations.triggerId, params.triggerId), eq(triggerInvocations.id, params.invocationId))).returning())[0];
+	return (await db.update(triggerInvocations).set(params.data).where(and(agentScopedWhere(triggerInvocations, params.scopes), eq(triggerInvocations.triggerId, params.triggerId), eq(triggerInvocations.id, params.invocationId))).returning())[0];
 };
 
 //#endregion