@inkeep/agents-core 0.0.0-dev-20260409021932 → 0.0.0-dev-20260409192310

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

@@ -2,7 +2,7 @@ import { manage_schema_exports } from "../../db/manage/manage-schema.js";
 import { getLogger } from "../../utils/logger.js";
 import { resolveProjectMainRefs } from "../../dolt/ref-helpers.js";
 import { listProjectsMetadata } from "../runtime/projects.js";
-import { deleteTriggersByRunAsUserId } from "./triggers.js";
+import { deleteTriggersByRunAsUserId, removeUserFromProjectTriggerUsers } from "./triggers.js";
 import { deleteScheduledTriggersByRunAsUserId } from "../runtime/scheduledTriggers.js";
 import { withRef } from "../../dolt/ref-scope.js";
 import { drizzle } from "drizzle-orm/node-postgres";
@@ -42,6 +42,11 @@ async function cleanupUserTriggers(params) {
 			projectId,
 			runAsUserId: userId
 		});
+		await removeUserFromProjectTriggerUsers(db)({
+			tenantId,
+			projectId,
+			userId
+		});
 	}, {
 		commit: true,
 		commitMessage: `Remove triggers for departing user ${userId}`

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

@@ -40,13 +40,13 @@ declare const listTriggersPaginated: (db: AgentsManageDatabaseClient) => (params
       algorithm: "sha256" | "sha512" | "sha384" | "sha1" | "md5";
       encoding: "hex" | "base64";
       signature: {
-        source: "body" | "query" | "header";
+        source: "query" | "body" | "header";
         key: string;
         prefix?: string | undefined;
         regex?: string | undefined;
       };
       signedComponents: {
-        source: "body" | "header" | "literal";
+        source: "literal" | "body" | "header";
         required: boolean;
         key?: string | undefined;
         value?: string | undefined;
@@ -63,6 +63,7 @@ declare const listTriggersPaginated: (db: AgentsManageDatabaseClient) => (params
       } | undefined;
     } | null;
     runAsUserId: string | null;
+    dispatchDelayMs: number | null;
     createdBy: string | null;
     name: string;
     description: string | null;
@@ -82,6 +83,10 @@ declare const listTriggersPaginated: (db: AgentsManageDatabaseClient) => (params
  * Create a new trigger (agent-scoped)
  */
 declare const createTrigger: (db: AgentsManageDatabaseClient) => (params: TriggerInsert) => Promise<TriggerSelect>;
+declare const createTriggerWithUsers: (db: AgentsManageDatabaseClient) => (params: {
+  trigger: TriggerInsert;
+  userIds: string[];
+}) => Promise<TriggerSelect>;
 /**
  * Update a trigger (agent-scoped)
  */
@@ -106,6 +111,60 @@ declare const deleteTriggersByRunAsUserId: (db: AgentsManageDatabaseClient) => (
   projectId: string;
   runAsUserId: string;
 }) => Promise<void>;
+declare const getTriggerUsers: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+}) => Promise<{
+  tenantId: string;
+  projectId: string;
+  agentId: string;
+  triggerId: string;
+  userId: string;
+  createdAt: string;
+}[]>;
+declare const getTriggerUsersBatch: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerIds: string[];
+}) => Promise<Map<string, string[]>>;
+declare const createTriggerUser: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+  userId: string;
+}) => Promise<{
+  createdAt: string;
+  userId: string;
+  tenantId: string;
+  projectId: string;
+  agentId: string;
+  triggerId: string;
+}>;
+declare const deleteTriggerUser: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+  userId: string;
+}) => Promise<void>;
+declare const setTriggerUsers: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+  userIds: string[];
+}) => Promise<void>;
+declare const getTriggerUserCount: (db: AgentsManageDatabaseClient) => (params: {
+  scopes: AgentScopeConfig;
+  triggerId: string;
+}) => Promise<number>;
+declare const getWebhookTriggerIdsWithUser: (db: AgentsManageDatabaseClient) => (params: {
+  tenantId: string;
+  projectId: string;
+  userId: string;
+}) => Promise<{
+  agentId: string;
+  id: string;
+}[]>;
+declare const removeUserFromProjectTriggerUsers: (db: AgentsManageDatabaseClient) => (params: {
+  tenantId: string;
+  projectId: string;
+  userId: string;
+}) => Promise<void>;
 /**
  * Upsert a trigger (create or update based on existence)
  */
@@ -114,4 +173,4 @@ declare const upsertTrigger: (db: AgentsManageDatabaseClient) => (params: {
   data: TriggerInsert;
 }) => Promise<TriggerSelect>;
 //#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/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,11 +8,11 @@ declare const getApiKeyById: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<{
-  name: string | null;
   id: string;
+  name: string | null;
   createdAt: string;
-  expiresAt: string | null;
   updatedAt: string;
+  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
@@ -22,11 +22,11 @@ declare const getApiKeyById: (db: AgentsRunDatabaseClient) => (params: {
   lastUsedAt: string | null;
 } | undefined>;
 declare const getApiKeyByPublicId: (db: AgentsRunDatabaseClient) => (publicId: string) => Promise<{
-  name: string | null;
   id: string;
+  name: string | null;
   createdAt: string;
-  expiresAt: string | null;
   updatedAt: string;
+  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
@@ -39,11 +39,11 @@ declare const listApiKeys: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   agentId?: string;
 }) => Promise<{
-  name: string | null;
   id: string;
+  name: string | null;
   createdAt: string;
-  expiresAt: string | null;
   updatedAt: string;
+  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
@@ -66,11 +66,11 @@ declare const listApiKeysPaginated: (db: AgentsRunDatabaseClient) => (params: {
   };
 }>;
 declare const createApiKey: (db: AgentsRunDatabaseClient) => (params: ApiKeyInsert) => Promise<{
-  name: string | null;
   id: string;
+  name: string | null;
   createdAt: string;
-  expiresAt: string | null;
   updatedAt: string;
+  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;

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

@@ -6,15 +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;
-  name: string;
   id: string;
+  name: string;
   createdAt: string;
   updatedAt: string;
   description: string | null;
-  tenantId: string | null;
   enabled: boolean;
-  prompt: string | null;
+  tenantId: string | null;
   projectId: string | null;
+  prompt: string | null;
   config: {
     type: "web_client";
     webClient: {
@@ -62,15 +62,15 @@ declare const listAppsPaginated: (db: AgentsRunDatabaseClient) => (params: {
 }>;
 declare const createApp: (db: AgentsRunDatabaseClient) => (params: AppInsert) => Promise<{
   type: AppType;
-  name: string;
   id: string;
+  name: string;
   createdAt: string;
   updatedAt: string;
   description: string | null;
-  tenantId: string | null;
   enabled: boolean;
-  prompt: string | null;
+  tenantId: string | null;
   projectId: string | null;
+  prompt: string | null;
   config: {
     type: "web_client";
     webClient: {

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

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

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

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

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

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

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_core604 from "drizzle-orm/pg-core";
+import * as drizzle_orm_pg_core220 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_core604.jsonb>;
+declare function jsonb(name: string): ReturnType<typeof drizzle_orm_pg_core220.jsonb>;
 //#endregion
 export { decodeBackslashes, encodeBackslashes, jsonb };