@inkeep/agents-core 0.55.2 → 0.56.0

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

@@ -0,0 +1,51 @@
+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 { deleteScheduledTriggersByRunAsUserId } from "./scheduledTriggers.js";
+import { deleteTriggersByRunAsUserId } from "./triggers.js";
+import { withRef } from "../../dolt/ref-scope.js";
+import { drizzle } from "drizzle-orm/node-postgres";
+
+//#region src/data-access/manage/triggerCleanup.ts
+const logger = getLogger("auth-cleanup");
+async function cleanupUserTriggers(params) {
+	const { tenantId, userId, runDb, manageDbPool } = params;
+	const projects = await listProjectsMetadata(runDb)({ tenantId });
+	if (projects.length === 0) return;
+	const connection = await manageDbPool.connect();
+	let resolvedRefs;
+	try {
+		resolvedRefs = await resolveProjectMainRefs(drizzle(connection, { schema: manage_schema_exports }))(tenantId, projects.map((p) => p.id));
+	} finally {
+		connection.release();
+	}
+	const results = await Promise.allSettled(resolvedRefs.map(({ projectId, ref }) => withRef(manageDbPool, ref, async (db) => {
+		await deleteScheduledTriggersByRunAsUserId(db)({
+			tenantId,
+			projectId,
+			runAsUserId: userId
+		});
+		await deleteTriggersByRunAsUserId(db)({
+			tenantId,
+			projectId,
+			runAsUserId: userId
+		});
+	}, {
+		commit: true,
+		commitMessage: `Remove triggers for departing user ${userId}`
+	})));
+	for (let i = 0; i < results.length; i++) {
+		const result = results[i];
+		const { projectId } = resolvedRefs[i];
+		if (result.status === "rejected") logger.error({
+			tenantId,
+			projectId,
+			userId,
+			error: result.reason
+		}, "Failed to clean up scheduled triggers for project");
+	}
+}
+
+//#endregion
+export { cleanupUserTriggers };

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: "query" | "body" | "header";
+        source: "query" | "header" | "body";
         key: string;
         prefix?: string | undefined;
         regex?: string | undefined;
       };
       signedComponents: {
-        source: "literal" | "body" | "header";
+        source: "literal" | "header" | "body";
         required: boolean;
         key?: string | undefined;
         value?: string | undefined;
@@ -62,6 +62,8 @@ declare const listTriggersPaginated: (db: AgentsManageDatabaseClient) => (params
         normalizeUnicode: boolean;
       } | undefined;
     } | null;
+    runAsUserId: string | null;
+    createdBy: string | null;
     name: string;
     description: string | null;
     agentId: string;
@@ -95,6 +97,15 @@ declare const deleteTrigger: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
   triggerId: string;
 }) => Promise<void>;
+/**
+ * Delete all webhook triggers for a given runAsUserId within a tenant+project scope.
+ * Operates across all agents in the project (not agent-scoped).
+ */
+declare const deleteTriggersByRunAsUserId: (db: AgentsManageDatabaseClient) => (params: {
+  tenantId: string;
+  projectId: string;
+  runAsUserId: string;
+}) => Promise<void>;
 /**
  * Upsert a trigger (create or update based on existence)
  */
@@ -103,4 +114,4 @@ declare const upsertTrigger: (db: AgentsManageDatabaseClient) => (params: {
   data: TriggerInsert;
 }) => Promise<TriggerSelect>;
 //#endregion
-export { createTrigger, deleteTrigger, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };
+export { createTrigger, deleteTrigger, deleteTriggersByRunAsUserId, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };

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

@@ -58,6 +58,13 @@ const deleteTrigger = (db) => async (params) => {
 	await db.delete(triggers).where(and(eq(triggers.tenantId, params.scopes.tenantId), eq(triggers.projectId, params.scopes.projectId), eq(triggers.agentId, params.scopes.agentId), eq(triggers.id, params.triggerId)));
 };
 /**
+* Delete all webhook triggers for a given runAsUserId within a tenant+project scope.
+* Operates across all agents in the project (not agent-scoped).
+*/
+const deleteTriggersByRunAsUserId = (db) => async (params) => {
+	await db.delete(triggers).where(and(eq(triggers.tenantId, params.tenantId), eq(triggers.projectId, params.projectId), eq(triggers.runAsUserId, params.runAsUserId)));
+};
+/**
 * Upsert a trigger (create or update based on existence)
 */
 const upsertTrigger = (db) => async (params) => {
@@ -78,4 +85,4 @@ const upsertTrigger = (db) => async (params) => {
 };
 
 //#endregion
-export { createTrigger, deleteTrigger, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };
+export { createTrigger, deleteTrigger, deleteTriggersByRunAsUserId, getTriggerById, listTriggers, listTriggersPaginated, updateTrigger, upsertTrigger };

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

@@ -12,10 +12,10 @@ declare const getApiKeyById: (db: AgentsRunDatabaseClient) => (params: {
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
@@ -26,10 +26,10 @@ declare const getApiKeyByPublicId: (db: AgentsRunDatabaseClient) => (publicId: s
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
@@ -43,10 +43,10 @@ declare const listApiKeys: (db: AgentsRunDatabaseClient) => (params: {
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;
@@ -70,10 +70,10 @@ declare const createApiKey: (db: AgentsRunDatabaseClient) => (params: ApiKeyInse
   name: string | null;
   createdAt: string;
   updatedAt: string;
-  expiresAt: string | null;
   tenantId: string;
   projectId: string;
   agentId: string;
+  expiresAt: string | null;
   publicId: string;
   keyHash: string;
   keyPrefix: string;

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

@@ -17,20 +17,20 @@ declare const listConversations: (db: AgentsRunDatabaseClient) => (params: {
 }>;
 declare const createConversation: (db: AgentsRunDatabaseClient) => (params: ConversationInsert) => Promise<{
   id: string;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
+  tenantId: string;
+  projectId: string;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
+  userId: string | null;
+  activeSubAgentId: string;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  metadata: ConversationMetadata | null;
-  tenantId: string;
-  projectId: string;
-  title: string | null;
-  agentId: string | null;
-  activeSubAgentId: string;
   lastContextResolution: string | null;
 }>;
 declare const updateConversation: (db: AgentsRunDatabaseClient) => (params: {
@@ -86,20 +86,20 @@ declare const getConversation: (db: AgentsRunDatabaseClient) => (params: {
   conversationId: string;
 }) => Promise<{
   id: string;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
+  tenantId: string;
+  projectId: string;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
+  userId: string | null;
+  activeSubAgentId: string;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  metadata: ConversationMetadata | null;
-  tenantId: string;
-  projectId: string;
-  title: string | null;
-  agentId: string | null;
-  activeSubAgentId: string;
   lastContextResolution: string | null;
 } | undefined>;
 declare const createOrGetConversation: (db: AgentsRunDatabaseClient) => (input: ConversationInsert) => Promise<{
@@ -122,20 +122,20 @@ declare const createOrGetConversation: (db: AgentsRunDatabaseClient) => (input:
   contextConfigId?: string | undefined;
 } | {
   id: string;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
+  tenantId: string;
+  projectId: string;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
+  userId: string | null;
+  activeSubAgentId: string;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  metadata: ConversationMetadata | null;
-  tenantId: string;
-  projectId: string;
-  title: string | null;
-  agentId: string | null;
-  activeSubAgentId: string;
   lastContextResolution: string | null;
 }>;
 /**
@@ -154,20 +154,20 @@ declare const getActiveAgentForConversation: (db: AgentsRunDatabaseClient) => (p
   conversationId: string;
 }) => Promise<{
   id: string;
+  title: string | null;
   createdAt: string;
   updatedAt: string;
+  tenantId: string;
+  projectId: string;
+  metadata: ConversationMetadata | null;
+  agentId: string | null;
+  userId: string | null;
+  activeSubAgentId: string;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  userId: string | null;
-  metadata: ConversationMetadata | null;
-  tenantId: string;
-  projectId: string;
-  title: string | null;
-  agentId: string | null;
-  activeSubAgentId: string;
   lastContextResolution: string | null;
 } | undefined>;
 /**

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

@@ -13,23 +13,23 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
   id: string;
   createdAt: string;
   updatedAt: string;
-  metadata: MessageMetadata | null;
-  role: string;
   tenantId: string;
   projectId: string;
+  metadata: MessageMetadata | null;
   content: MessageContent;
+  conversationId: string;
+  role: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  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: {
@@ -144,23 +144,23 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: MessageIn
   id: string;
   createdAt: string;
   updatedAt: string;
-  metadata: MessageMetadata | null;
-  role: string;
   tenantId: string;
   projectId: string;
+  metadata: MessageMetadata | null;
   content: MessageContent;
+  conversationId: string;
+  role: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  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: {
@@ -197,23 +197,23 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   id: string;
   createdAt: string;
   updatedAt: string;
-  metadata: MessageMetadata | null;
-  role: string;
   tenantId: string;
   projectId: string;
+  metadata: MessageMetadata | null;
   content: MessageContent;
+  conversationId: string;
+  role: string;
   fromSubAgentId: string | null;
   toSubAgentId: string | null;
   fromExternalAgentId: string | null;
   toExternalAgentId: string | null;
-  taskId: string | null;
-  a2aTaskId: string | null;
-  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: {

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

@@ -34,7 +34,7 @@ declare const listScheduledTriggerInvocationsPaginated: (db: AgentsRunDatabaseCl
 }) => Promise<{
   data: {
     scheduledTriggerId: string;
-    status: "pending" | "failed" | "running" | "completed" | "cancelled";
+    status: "pending" | "running" | "completed" | "failed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -174,7 +174,7 @@ declare const listUpcomingInvocationsForAgentPaginated: (db: AgentsRunDatabaseCl
 }) => Promise<{
   data: {
     scheduledTriggerId: string;
-    status: "pending" | "failed" | "running" | "completed" | "cancelled";
+    status: "pending" | "running" | "completed" | "failed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;
@@ -208,7 +208,7 @@ declare const listProjectScheduledTriggerInvocationsPaginated: (db: AgentsRunDat
 }) => Promise<{
   data: {
     scheduledTriggerId: string;
-    status: "pending" | "failed" | "running" | "completed" | "cancelled";
+    status: "pending" | "running" | "completed" | "failed" | "cancelled";
     scheduledFor: string;
     startedAt: string | null;
     completedAt: string | null;

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

@@ -9,17 +9,17 @@ declare const createTask: (db: AgentsRunDatabaseClient) => (params: TaskInsert)
   id: string;
   createdAt: string;
   updatedAt: string;
+  tenantId: string;
+  projectId: string;
+  metadata: TaskMetadataConfig | null;
+  agentId: string;
+  subAgentId: string;
+  status: string;
   ref: {
     type: "commit" | "tag" | "branch";
     name: string;
     hash: string;
   } | null;
-  metadata: TaskMetadataConfig | null;
-  status: string;
-  tenantId: string;
-  projectId: string;
-  agentId: string;
-  subAgentId: string;
   contextId: string;
 }>;
 declare const getTask: (db: AgentsRunDatabaseClient) => (params: {

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

@@ -19,9 +19,13 @@ declare const getUserByEmail: (db: AgentsRunDatabaseClient) => (email: string) =
  * Get organization member by email
  * Returns the user if they are a member of the specified organization
  */
+declare const getOrganizationMemberByUserId: (db: AgentsRunDatabaseClient) => (organizationId: string, userId: string) => Promise<(User & {
+  role: string;
+  memberId: string;
+}) | null>;
 declare const getOrganizationMemberByEmail: (db: AgentsRunDatabaseClient) => (organizationId: string, email: string) => Promise<(User & {
   role: string;
   memberId: string;
 }) | null>;
 //#endregion
-export { getOrganizationMemberByEmail, getUserByEmail, getUserById };
+export { getOrganizationMemberByEmail, getOrganizationMemberByUserId, getUserByEmail, getUserById };

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

@@ -22,6 +22,19 @@ const getUserByEmail = (db) => async (email) => {
 * Get organization member by email
 * Returns the user if they are a member of the specified organization
 */
+const getOrganizationMemberByUserId = (db) => async (organizationId, userId) => {
+	return (await db.select({
+		id: user.id,
+		name: user.name,
+		email: user.email,
+		emailVerified: user.emailVerified,
+		image: user.image,
+		createdAt: user.createdAt,
+		updatedAt: user.updatedAt,
+		role: member.role,
+		memberId: member.id
+	}).from(member).innerJoin(user, eq(member.userId, user.id)).where(and(eq(member.organizationId, organizationId), eq(user.id, userId))).limit(1))[0] || null;
+};
 const getOrganizationMemberByEmail = (db) => async (organizationId, email) => {
 	return (await db.select({
 		id: user.id,
@@ -37,4 +50,4 @@ const getOrganizationMemberByEmail = (db) => async (organizationId, email) => {
 };
 
 //#endregion
-export { getOrganizationMemberByEmail, getUserByEmail, getUserById };
+export { getOrganizationMemberByEmail, getOrganizationMemberByUserId, getUserByEmail, getUserById };