@inkeep/agents-core 0.66.1 → 0.67.0

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

@@ -1,6 +1,6 @@
-import { triggers } from "../../db/manage/manage-schema.js";
+import { triggerUsers, triggers } from "../../db/manage/manage-schema.js";
 import { agentScopedWhere, projectScopedWhere } from "./scope-helpers.js";
-import { and, count, desc, eq } from "drizzle-orm";
+import { and, asc, count, desc, eq, inArray } from "drizzle-orm";
 
 //#region src/data-access/manage/triggers.ts
 /**
@@ -42,6 +42,19 @@ const listTriggersPaginated = (db) => async (params) => {
 const createTrigger = (db) => async (params) => {
 	return (await db.insert(triggers).values(params).returning())[0];
 };
+const createTriggerWithUsers = (db) => async (params) => {
+	return db.transaction(async (tx) => {
+		const trigger = await createTrigger(tx)(params.trigger);
+		if (params.userIds.length > 0) await tx.insert(triggerUsers).values(params.userIds.map((userId) => ({
+			tenantId: trigger.tenantId,
+			projectId: trigger.projectId,
+			agentId: trigger.agentId,
+			triggerId: trigger.id,
+			userId
+		})));
+		return trigger;
+	});
+};
 /**
 * Update a trigger (agent-scoped)
 */
@@ -68,6 +81,78 @@ const deleteTriggersByRunAsUserId = (db) => async (params) => {
 		projectId: params.projectId
 	}), eq(triggers.runAsUserId, params.runAsUserId)));
 };
+const getTriggerUsers = (db) => async (params) => {
+	return db.select().from(triggerUsers).where(and(agentScopedWhere(triggerUsers, params.scopes), eq(triggerUsers.triggerId, params.triggerId))).orderBy(asc(triggerUsers.createdAt));
+};
+const getTriggerUsersBatch = (db) => async (params) => {
+	if (params.triggerIds.length === 0) return /* @__PURE__ */ new Map();
+	const rows = await db.select().from(triggerUsers).where(and(agentScopedWhere(triggerUsers, params.scopes), inArray(triggerUsers.triggerId, params.triggerIds))).orderBy(asc(triggerUsers.createdAt));
+	const result = /* @__PURE__ */ new Map();
+	for (const triggerId of params.triggerIds) result.set(triggerId, []);
+	for (const row of rows) {
+		const userIds = result.get(row.triggerId);
+		if (userIds) userIds.push(row.userId);
+	}
+	return result;
+};
+const createTriggerUser = (db) => async (params) => {
+	return (await db.insert(triggerUsers).values({
+		tenantId: params.scopes.tenantId,
+		projectId: params.scopes.projectId,
+		agentId: params.scopes.agentId,
+		triggerId: params.triggerId,
+		userId: params.userId
+	}).onConflictDoNothing().returning())[0];
+};
+const deleteTriggerUser = (db) => async (params) => {
+	await db.delete(triggerUsers).where(and(agentScopedWhere(triggerUsers, params.scopes), eq(triggerUsers.triggerId, params.triggerId), eq(triggerUsers.userId, params.userId)));
+};
+const setTriggerUsers = (db) => async (params) => {
+	await db.delete(triggerUsers).where(and(agentScopedWhere(triggerUsers, params.scopes), eq(triggerUsers.triggerId, params.triggerId)));
+	if (params.userIds.length > 0) await db.insert(triggerUsers).values(params.userIds.map((userId) => ({
+		tenantId: params.scopes.tenantId,
+		projectId: params.scopes.projectId,
+		agentId: params.scopes.agentId,
+		triggerId: params.triggerId,
+		userId
+	})));
+};
+const getTriggerUserCount = (db) => async (params) => {
+	return (await db.select({ count: count() }).from(triggerUsers).where(and(agentScopedWhere(triggerUsers, params.scopes), eq(triggerUsers.triggerId, params.triggerId))))[0]?.count ?? 0;
+};
+const getWebhookTriggerIdsWithUser = (db) => async (params) => {
+	return db.select({
+		agentId: triggers.agentId,
+		id: triggers.id
+	}).from(triggers).innerJoin(triggerUsers, and(eq(triggerUsers.tenantId, triggers.tenantId), eq(triggerUsers.projectId, triggers.projectId), eq(triggerUsers.agentId, triggers.agentId), eq(triggerUsers.triggerId, triggers.id))).where(and(projectScopedWhere(triggers, {
+		tenantId: params.tenantId,
+		projectId: params.projectId
+	}), eq(triggerUsers.userId, params.userId)));
+};
+const removeUserFromProjectTriggerUsers = (db) => async (params) => {
+	await db.transaction(async (tx) => {
+		const triggerRows = await getWebhookTriggerIdsWithUser(tx)(params);
+		if (triggerRows.length === 0) return;
+		const triggerIds = triggerRows.map((row) => row.id);
+		await tx.delete(triggerUsers).where(and(projectScopedWhere(triggerUsers, {
+			tenantId: params.tenantId,
+			projectId: params.projectId
+		}), inArray(triggerUsers.triggerId, triggerIds), eq(triggerUsers.userId, params.userId)));
+		const triggersWithRemainingUsers = await tx.select({ triggerId: triggerUsers.triggerId }).from(triggerUsers).where(and(projectScopedWhere(triggerUsers, {
+			tenantId: params.tenantId,
+			projectId: params.projectId
+		}), inArray(triggerUsers.triggerId, triggerIds))).groupBy(triggerUsers.triggerId);
+		const triggerIdsWithRemainingUsers = new Set(triggersWithRemainingUsers.map((row) => row.triggerId));
+		const emptyTriggerIds = triggerIds.filter((id) => !triggerIdsWithRemainingUsers.has(id));
+		if (emptyTriggerIds.length > 0) await tx.update(triggers).set({
+			enabled: false,
+			updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+		}).where(and(projectScopedWhere(triggers, {
+			tenantId: params.tenantId,
+			projectId: params.projectId
+		}), inArray(triggers.id, emptyTriggerIds), eq(triggers.enabled, true)));
+	});
+};
 /**
 * Upsert a trigger (create or update based on existence)
 */
@@ -89,4 +174,4 @@ const upsertTrigger = (db) => async (params) => {
 };
 
 //#endregion
-export { createTrigger, deleteTrigger, deleteTriggersByRunAsUserId, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };
+export { createTrigger, createTriggerUser, createTriggerWithUsers, deleteTrigger, deleteTriggerUser, deleteTriggersByRunAsUserId, getTriggerById, getTriggerUserCount, getTriggerUsers, getTriggerUsersBatch, getWebhookTriggerIdsWithUser, listTriggers, listTriggersPaginated, removeUserFromProjectTriggerUsers, setTriggerUsers, updateTrigger, upsertTrigger };

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

@@ -8,49 +8,49 @@ declare const getApiKeyById: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   id: string;
-  createdAt: string;
   name: string | null;
+  createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
+  projectId: string;
+  tenantId: string;
+  agentId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
+  expiresAt: string | null;
 } | undefined>;
 declare const getApiKeyByPublicId: (db: AgentsRunDatabaseClient) => (publicId: string) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   id: string;
-  createdAt: string;
   name: string | null;
+  createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
+  projectId: string;
+  tenantId: string;
+  agentId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
+  expiresAt: string | null;
 } | undefined>;
 declare const listApiKeys: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   agentId?: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   id: string;
-  createdAt: string;
   name: string | null;
+  createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
+  projectId: string;
+  tenantId: string;
+  agentId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
+  expiresAt: string | null;
 }[]>;
 declare const listApiKeysPaginated: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -66,18 +66,18 @@ declare const listApiKeysPaginated: (db: AgentsRunDatabaseClient) => (params: {
   };
 }>;
 declare const createApiKey: (db: AgentsRunDatabaseClient) => (params: ApiKeyInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string;
   id: string;
-  createdAt: string;
   name: string | null;
+  createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
+  projectId: string;
+  tenantId: string;
+  agentId: string;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
   lastUsedAt: string | null;
+  expiresAt: string | null;
 }>;
 declare const updateApiKey: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;

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

@@ -6,13 +6,15 @@ import { AppInsert, AppSelect, AppUpdate } from "../../types/entities.js";
 //#region src/data-access/runtime/apps.d.ts
 declare const getAppById: (db: AgentsRunDatabaseClient) => (id: string) => Promise<{
   type: AppType;
-  tenantId: string | null;
-  projectId: string | null;
+  description: string | null;
   id: string;
-  createdAt: string;
   name: string;
+  createdAt: string;
   updatedAt: string;
-  description: string | null;
+  projectId: string | null;
+  tenantId: string | null;
+  prompt: string | null;
+  enabled: boolean;
   config: {
     type: "web_client";
     webClient: {
@@ -30,8 +32,6 @@ declare const getAppById: (db: AgentsRunDatabaseClient) => (id: string) => Promi
     type: "api";
     api: Record<string, never>;
   };
-  enabled: boolean;
-  prompt: string | null;
   lastUsedAt: string | null;
   defaultProjectId: string | null;
   defaultAgentId: string | null;
@@ -62,13 +62,15 @@ declare const listAppsPaginated: (db: AgentsRunDatabaseClient) => (params: {
 }>;
 declare const createApp: (db: AgentsRunDatabaseClient) => (params: AppInsert) => Promise<{
   type: AppType;
-  tenantId: string | null;
-  projectId: string | null;
+  description: string | null;
   id: string;
-  createdAt: string;
   name: string;
+  createdAt: string;
   updatedAt: string;
-  description: string | null;
+  projectId: string | null;
+  tenantId: string | null;
+  prompt: string | null;
+  enabled: boolean;
   config: {
     type: "web_client";
     webClient: {
@@ -86,8 +88,6 @@ declare const createApp: (db: AgentsRunDatabaseClient) => (params: AppInsert) =>
     type: "api";
     api: Record<string, never>;
   };
-  enabled: boolean;
-  prompt: string | null;
   lastUsedAt: string | null;
   defaultProjectId: string | null;
   defaultAgentId: string | null;

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

@@ -15,19 +15,19 @@ declare const listConversations: (db: AgentsRunDatabaseClient) => (params: {
   total: number;
 }>;
 declare const createConversation: (db: AgentsRunDatabaseClient) => (params: ConversationInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string | null;
+  title: string | null;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: ConversationMetadata | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  title: string | null;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  agentId: string | null;
   userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
@@ -84,19 +84,19 @@ declare const getConversation: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   conversationId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string | null;
+  title: string | null;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: ConversationMetadata | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  title: string | null;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  agentId: string | null;
   userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
@@ -120,19 +120,19 @@ declare const createOrGetConversation: (db: AgentsRunDatabaseClient) => (input:
   metadata?: ConversationMetadata | null | undefined;
   contextConfigId?: string | undefined;
 } | {
-  tenantId: string;
-  projectId: string;
-  agentId: string | null;
+  title: string | null;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: ConversationMetadata | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  title: string | null;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  agentId: string | null;
   userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;
@@ -152,19 +152,19 @@ declare const getActiveAgentForConversation: (db: AgentsRunDatabaseClient) => (p
   scopes: ProjectScopeConfig;
   conversationId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string | null;
+  title: string | null;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: ConversationMetadata | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  title: string | null;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  agentId: string | null;
   userId: string | null;
   activeSubAgentId: string;
   lastContextResolution: string | null;

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

@@ -59,14 +59,14 @@ declare const listFeedback: (db: AgentsRunDatabaseClient) => (params: {
 }>;
 declare const createFeedback: (db: AgentsRunDatabaseClient) => (params: FeedbackInsert) => Promise<{
   type: "positive" | "negative";
-  tenantId: string;
-  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  details: string | null;
   conversationId: string;
   messageId: string | null;
-  details: string | null;
 }>;
 declare const updateFeedback: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -88,14 +88,14 @@ declare const deleteFeedback: (db: AgentsRunDatabaseClient) => (params: {
   feedbackId: string;
 }) => Promise<{
   type: "positive" | "negative";
-  tenantId: string;
-  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  details: string | null;
   conversationId: string;
   messageId: string | null;
-  details: string | null;
 }>;
 //#endregion
 export { createFeedback, deleteFeedback, getFeedbackById, listFeedback, listFeedbackByConversation, updateFeedback };

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

@@ -10,26 +10,26 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   messageId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   content: MessageContent;
+  metadata: MessageMetadata | null;
   createdAt: string;
   updatedAt: string;
-  metadata: MessageMetadata | null;
-  role: string;
-  conversationId: string;
+  projectId: string;
+  tenantId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
+  taskId: string | null;
+  a2aTaskId: string | null;
+  conversationId: string;
+  role: 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: {
@@ -144,26 +144,26 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   data: Omit<MessageInsert, "tenantId" | "projectId">;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   content: MessageContent;
+  metadata: MessageMetadata | null;
   createdAt: string;
   updatedAt: string;
-  metadata: MessageMetadata | null;
-  role: string;
-  conversationId: string;
+  projectId: string;
+  tenantId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
+  taskId: string | null;
+  a2aTaskId: string | null;
+  conversationId: string;
+  role: 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: {
@@ -197,26 +197,26 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   messageId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
   content: MessageContent;
+  metadata: MessageMetadata | null;
   createdAt: string;
   updatedAt: string;
-  metadata: MessageMetadata | null;
-  role: string;
-  conversationId: string;
+  projectId: string;
+  tenantId: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
+  taskId: string | null;
+  a2aTaskId: string | null;
+  conversationId: string;
+  role: 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: {

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

@@ -40,7 +40,7 @@ declare const listScheduledTriggerInvocationsPaginated: (db: AgentsRunDatabaseCl
       name: string;
       hash: string;
     } | null;
-    status: "pending" | "running" | "completed" | "failed" | "cancelled";
+    status: "pending" | "failed" | "running" | "completed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -199,7 +199,7 @@ declare const listUpcomingInvocationsForAgentPaginated: (db: AgentsRunDatabaseCl
       name: string;
       hash: string;
     } | null;
-    status: "pending" | "running" | "completed" | "failed" | "cancelled";
+    status: "pending" | "failed" | "running" | "completed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -239,7 +239,7 @@ declare const listProjectScheduledTriggerInvocationsPaginated: (db: AgentsRunDat
       name: string;
       hash: string;
     } | null;
-    status: "pending" | "running" | "completed" | "failed" | "cancelled";
+    status: "pending" | "failed" | "running" | "completed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -292,7 +292,7 @@ declare const listScheduledTriggerInvocationsByTriggerId: (db: AgentsRunDatabase
     name: string;
     hash: string;
   } | null;
-  status: "pending" | "running" | "completed" | "failed" | "cancelled";
+  status: "pending" | "failed" | "running" | "completed" | "cancelled";
   scheduledFor: string;
   startedAt: string | null;
   completedAt: string | null;

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

@@ -15,8 +15,8 @@ declare const createScheduledTriggerUser: (db: AgentsRunDatabaseClient) => (para
   scheduledTriggerId: string;
   userId: string;
 }) => Promise<{
-  tenantId: string;
   createdAt: string;
+  tenantId: string;
   userId: string;
   scheduledTriggerId: string;
 }>;

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

@@ -7,20 +7,20 @@ import { TaskInsert, TaskSelect } from "../../types/entities.js";
 
 //#region src/data-access/runtime/tasks.d.ts
 declare const createTask: (db: AgentsRunDatabaseClient) => (params: TaskInsert) => Promise<{
-  tenantId: string;
-  projectId: string;
-  agentId: string;
-  subAgentId: string;
+  status: string;
   id: string;
-  createdAt: string;
-  updatedAt: string;
   metadata: TaskMetadataConfig | null;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  status: string;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  tenantId: string;
+  agentId: string;
+  subAgentId: string;
   contextId: string;
 }>;
 declare const getTask: (db: AgentsRunDatabaseClient) => (params: {

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

@@ -28,6 +28,8 @@ declare const listTriggerInvocationsPaginated: (db: AgentsRunDatabaseClient) =>
   data: {
     triggerId: string;
     conversationId: string | null;
+    runAsUserId: string | null;
+    batchId: string | null;
     ref: {
       type: "commit" | "tag" | "branch";
       name: string;

package/dist/db/manage/dolt-safe-jsonb.d.ts

@@ -1,4 +1,4 @@
-import * as drizzle_orm_pg_core220 from "drizzle-orm/pg-core";
+import * as drizzle_orm_pg_core1399 from "drizzle-orm/pg-core";
 
 //#region src/db/manage/dolt-safe-jsonb.d.ts
 declare function encodeBackslashes(value: unknown): unknown;
@@ -7,6 +7,6 @@ declare function decodeBackslashes(value: unknown): unknown;
  * Drop-in replacement for drizzle-orm's `jsonb()`.
  * Encodes backslashes on write and decodes on read to work around the Doltgres bug.
  */
-declare function jsonb(name: string): ReturnType<typeof drizzle_orm_pg_core220.jsonb>;
+declare function jsonb(name: string): ReturnType<typeof drizzle_orm_pg_core1399.jsonb>;
 //#endregion
 export { decodeBackslashes, encodeBackslashes, jsonb };