@inkeep/agents-core 0.64.10 → 0.65.1

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

@@ -5,16 +5,16 @@ import { AppInsert, AppSelect, AppUpdate } from "../../types/entities.js";
 
 //#region src/data-access/runtime/apps.d.ts
 declare const getAppById: (db: AgentsRunDatabaseClient) => (id: string) => Promise<{
-  tenantId: string | null;
-  projectId: string | null;
-  id: string;
-  name: string;
-  description: string | null;
   type: AppType;
+  description: string | null;
+  id: string;
+  tenantId: string | null;
   createdAt: string;
+  name: string;
   updatedAt: string;
-  prompt: string | null;
+  projectId: string | null;
   enabled: boolean;
+  prompt: string | null;
   config: {
     type: "web_client";
     webClient: {
@@ -61,16 +61,16 @@ declare const listAppsPaginated: (db: AgentsRunDatabaseClient) => (params: {
   };
 }>;
 declare const createApp: (db: AgentsRunDatabaseClient) => (params: AppInsert) => Promise<{
-  tenantId: string | null;
-  projectId: string | null;
-  id: string;
-  name: string;
-  description: string | null;
   type: AppType;
+  description: string | null;
+  id: string;
+  tenantId: string | null;
   createdAt: string;
+  name: string;
   updatedAt: string;
-  prompt: string | null;
+  projectId: string | null;
   enabled: boolean;
+  prompt: string | null;
   config: {
     type: "web_client";
     webClient: {

package/dist/data-access/runtime/cascade-delete.d.ts

@@ -34,8 +34,8 @@ declare const cascadeDeleteByBranch: (db: AgentsRunDatabaseClient) => (params: {
   ref: string;
 }) => Promise<CascadeDeleteResult>;
 /**
- * Delete all runtime entities for a project on a specific branch.
- * Used when deleting a project from a branch.
+ * Delete all runtime entities for a project across all branches.
+ * Used when deleting a project entirely.
  * PostgreSQL cascades handle: messages, taskRelations, ledgerArtifacts
  *
  * @param db - Runtime database client
@@ -43,7 +43,6 @@ declare const cascadeDeleteByBranch: (db: AgentsRunDatabaseClient) => (params: {
  */
 declare const cascadeDeleteByProject: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
-  fullBranchName: string;
 }) => Promise<CascadeDeleteResult>;
 /**
  * Delete all runtime entities for a specific agent on a specific branch.

package/dist/data-access/runtime/cascade-delete.js

@@ -40,22 +40,22 @@ const cascadeDeleteByBranch = (db) => async (params) => {
 	};
 };
 /**
-* Delete all runtime entities for a project on a specific branch.
-* Used when deleting a project from a branch.
+* Delete all runtime entities for a project across all branches.
+* Used when deleting a project entirely.
 * PostgreSQL cascades handle: messages, taskRelations, ledgerArtifacts
 *
 * @param db - Runtime database client
 * @returns Function that performs the cascade delete
 */
 const cascadeDeleteByProject = (db) => async (params) => {
-	const { scopes, fullBranchName } = params;
-	const contextCacheResult = await db.delete(contextCache).where(and(projectScopedWhere(contextCache, scopes), sql`${contextCache.ref}->>'name' = ${fullBranchName}`)).returning();
-	const conversationsResult = await db.delete(conversations).where(and(projectScopedWhere(conversations, scopes), sql`${conversations.ref}->>'name' = ${fullBranchName}`)).returning();
-	const tasksResult = await db.delete(tasks).where(and(projectScopedWhere(tasks, scopes), sql`${tasks.ref}->>'name' = ${fullBranchName}`)).returning();
-	const triggerInvocationsResult = await db.delete(triggerInvocations).where(and(eq(triggerInvocations.tenantId, scopes.tenantId), eq(triggerInvocations.projectId, scopes.projectId), sql`${triggerInvocations.ref}->>'name' = ${fullBranchName}`)).returning();
-	const scheduledTriggerInvocationsResult = await db.delete(scheduledTriggerInvocations).where(and(eq(scheduledTriggerInvocations.tenantId, scopes.tenantId), eq(scheduledTriggerInvocations.projectId, scopes.projectId), sql`${scheduledTriggerInvocations.ref}->>'name' = ${fullBranchName}`)).returning();
-	const datasetRunsResult = await db.delete(datasetRun).where(and(eq(datasetRun.tenantId, scopes.tenantId), eq(datasetRun.projectId, scopes.projectId), sql`${datasetRun.ref}->>'name' = ${fullBranchName}`)).returning();
-	const evaluationRunsResult = await db.delete(evaluationRun).where(and(eq(evaluationRun.tenantId, scopes.tenantId), eq(evaluationRun.projectId, scopes.projectId), sql`${evaluationRun.ref}->>'name' = ${fullBranchName}`)).returning();
+	const { scopes } = params;
+	const contextCacheResult = await db.delete(contextCache).where(projectScopedWhere(contextCache, scopes)).returning();
+	const conversationsResult = await db.delete(conversations).where(projectScopedWhere(conversations, scopes)).returning();
+	const tasksResult = await db.delete(tasks).where(projectScopedWhere(tasks, scopes)).returning();
+	const triggerInvocationsResult = await db.delete(triggerInvocations).where(and(eq(triggerInvocations.tenantId, scopes.tenantId), eq(triggerInvocations.projectId, scopes.projectId))).returning();
+	const scheduledTriggerInvocationsResult = await db.delete(scheduledTriggerInvocations).where(and(eq(scheduledTriggerInvocations.tenantId, scopes.tenantId), eq(scheduledTriggerInvocations.projectId, scopes.projectId))).returning();
+	const datasetRunsResult = await db.delete(datasetRun).where(and(eq(datasetRun.tenantId, scopes.tenantId), eq(datasetRun.projectId, scopes.projectId))).returning();
+	const evaluationRunsResult = await db.delete(evaluationRun).where(and(eq(evaluationRun.tenantId, scopes.tenantId), eq(evaluationRun.projectId, scopes.projectId))).returning();
 	const apiKeysResult = await db.delete(apiKeys).where(projectScopedWhere(apiKeys, scopes)).returning();
 	await cascadeDeleteGitHubAccessByProject(db)({
 		tenantId: scopes.tenantId,

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

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

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

@@ -0,0 +1,101 @@
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
+import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
+import "../../types/index.js";
+import { FeedbackInsert, FeedbackUpdate } from "../../types/entities.js";
+
+//#region src/data-access/runtime/feedback.d.ts
+declare const getFeedbackById: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  feedbackId: string;
+}) => Promise<{
+  id: string;
+  conversationId: string;
+  messageId: string | null;
+  type: "positive" | "negative";
+  details: string | null;
+  createdAt: string;
+  updatedAt: string;
+}>;
+declare const listFeedbackByConversation: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  conversationId: string;
+  messageId?: string;
+  pagination?: PaginationConfig;
+}) => Promise<{
+  feedback: {
+    id: string;
+    conversationId: string;
+    messageId: string | null;
+    type: "positive" | "negative";
+    details: string | null;
+    createdAt: string;
+    updatedAt: string;
+    agentId: string | null;
+  }[];
+  total: number;
+}>;
+declare const listFeedback: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  conversationId?: string;
+  messageId?: string;
+  agentId?: string;
+  type?: "positive" | "negative";
+  startDate?: string;
+  endDate?: string;
+  pagination?: PaginationConfig;
+}) => Promise<{
+  feedback: {
+    id: string;
+    conversationId: string;
+    messageId: string | null;
+    type: "positive" | "negative";
+    details: string | null;
+    createdAt: string;
+    updatedAt: string;
+    agentId: string | null;
+  }[];
+  total: number;
+}>;
+declare const createFeedback: (db: AgentsRunDatabaseClient) => (params: FeedbackInsert) => Promise<{
+  type: "positive" | "negative";
+  id: string;
+  tenantId: string;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  details: string | null;
+  conversationId: string;
+  messageId: string | null;
+}>;
+declare const updateFeedback: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  feedbackId: string;
+  data: FeedbackUpdate;
+}) => Promise<{
+  createdAt: string;
+  updatedAt: string;
+  conversationId: string;
+  messageId: string | null;
+  type: "positive" | "negative";
+  details: string | null;
+  projectId: string;
+  tenantId: string;
+  id: string;
+}>;
+declare const deleteFeedback: (db: AgentsRunDatabaseClient) => (params: {
+  scopes: ProjectScopeConfig;
+  feedbackId: string;
+}) => Promise<{
+  type: "positive" | "negative";
+  id: string;
+  tenantId: string;
+  createdAt: string;
+  updatedAt: string;
+  projectId: string;
+  details: string | null;
+  conversationId: string;
+  messageId: string | null;
+}>;
+//#endregion
+export { createFeedback, deleteFeedback, getFeedbackById, listFeedback, listFeedbackByConversation, updateFeedback };

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

@@ -0,0 +1,83 @@
+import { conversations, feedback } from "../../db/runtime/runtime-schema.js";
+import { projectScopedWhere } from "../manage/scope-helpers.js";
+import { and, count, desc, eq, gte, lte } from "drizzle-orm";
+
+//#region src/data-access/runtime/feedback.ts
+const getFeedbackById = (db) => async (params) => {
+	const [result] = await db.select({
+		id: feedback.id,
+		conversationId: feedback.conversationId,
+		messageId: feedback.messageId,
+		type: feedback.type,
+		details: feedback.details,
+		createdAt: feedback.createdAt,
+		updatedAt: feedback.updatedAt
+	}).from(feedback).where(and(projectScopedWhere(feedback, params.scopes), eq(feedback.id, params.feedbackId))).limit(1);
+	return result;
+};
+const listFeedbackByConversation = (db) => async (params) => {
+	return listFeedback(db)({
+		scopes: params.scopes,
+		conversationId: params.conversationId,
+		messageId: params.messageId,
+		pagination: params.pagination
+	});
+};
+const listFeedback = (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 = [projectScopedWhere(feedback, params.scopes)];
+	if (params.conversationId) conditions.push(eq(feedback.conversationId, params.conversationId));
+	if (params.messageId) conditions.push(eq(feedback.messageId, params.messageId));
+	if (params.type) conditions.push(eq(feedback.type, params.type));
+	if (params.startDate) conditions.push(gte(feedback.createdAt, `${params.startDate}T00:00:00.000Z`));
+	if (params.endDate) conditions.push(lte(feedback.createdAt, `${params.endDate}T23:59:59.999Z`));
+	if (params.agentId) conditions.push(eq(conversations.agentId, params.agentId));
+	const whereClause = and(...conditions);
+	const conversationsJoin = [
+		eq(feedback.tenantId, conversations.tenantId),
+		eq(feedback.projectId, conversations.projectId),
+		eq(feedback.conversationId, conversations.id)
+	];
+	const countQuery = db.select({ count: count() }).from(feedback);
+	if (params.agentId) countQuery.leftJoin(conversations, and(...conversationsJoin));
+	const [items, total] = await Promise.all([db.select({
+		id: feedback.id,
+		conversationId: feedback.conversationId,
+		messageId: feedback.messageId,
+		type: feedback.type,
+		details: feedback.details,
+		createdAt: feedback.createdAt,
+		updatedAt: feedback.updatedAt,
+		agentId: conversations.agentId
+	}).from(feedback).leftJoin(conversations, and(...conversationsJoin)).where(whereClause).limit(limit).offset(offset).orderBy(desc(feedback.createdAt)), countQuery.where(whereClause)]);
+	return {
+		feedback: items,
+		total: typeof total[0]?.count === "string" ? Number.parseInt(total[0].count, 10) : total[0]?.count ?? 0
+	};
+};
+const createFeedback = (db) => async (params) => {
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const [created] = await db.insert(feedback).values({
+		...params,
+		createdAt: now,
+		updatedAt: now
+	}).returning();
+	return created;
+};
+const updateFeedback = (db) => async (params) => {
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	const [updated] = await db.update(feedback).set({
+		...params.data,
+		updatedAt: now
+	}).where(and(projectScopedWhere(feedback, params.scopes), eq(feedback.id, params.feedbackId))).returning();
+	return updated;
+};
+const deleteFeedback = (db) => async (params) => {
+	const [deleted] = await db.delete(feedback).where(and(projectScopedWhere(feedback, params.scopes), eq(feedback.id, params.feedbackId))).returning();
+	return deleted;
+};
+
+//#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;
+  tenantId: string;
+  createdAt: string;
   metadata: MessageMetadata | null;
   content: MessageContent;
-  createdAt: string;
   updatedAt: string;
-  conversationId: string;
+  projectId: 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,26 +144,26 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   data: Omit<MessageInsert, "tenantId" | "projectId">;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
+  tenantId: string;
+  createdAt: string;
   metadata: MessageMetadata | null;
   content: MessageContent;
-  createdAt: string;
   updatedAt: string;
-  conversationId: string;
+  projectId: 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,26 +197,26 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
   messageId: string;
 }) => Promise<{
-  tenantId: string;
-  projectId: string;
   id: string;
+  tenantId: string;
+  createdAt: string;
   metadata: MessageMetadata | null;
   content: MessageContent;
-  createdAt: string;
   updatedAt: string;
-  conversationId: string;
+  projectId: 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

@@ -2,7 +2,7 @@ import { AgentScopeConfig, ProjectScopeConfig } from "../../db/manage/scope-defi
 import { PaginationConfig } from "../../types/utility.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
 import { ScheduledTriggerInvocationStatus } from "../../validation/schemas.js";
-import { ScheduledTriggerInvocation, ScheduledTriggerInvocationInsert, ScheduledTriggerInvocationUpdate } from "../../types/entities.js";
+import { LastRunSummary, ScheduledTriggerInvocation, ScheduledTriggerInvocationInsert, ScheduledTriggerInvocationUpdate } from "../../types/entities.js";
 
 //#region src/data-access/runtime/scheduledTriggerInvocations.d.ts
 /**
@@ -48,6 +48,7 @@ declare const listScheduledTriggerInvocationsPaginated: (db: AgentsRunDatabaseCl
     conversationIds: string[] | null;
     attemptNumber: number;
     idempotencyKey: string;
+    runAsUserId: string | null;
     createdAt: string;
     agentId: string;
     projectId: string;
@@ -160,9 +161,18 @@ declare const cancelPastPendingInvocationsForTrigger: (db: AgentsRunDatabaseClie
   scopes: AgentScopeConfig;
   scheduledTriggerId: string;
 }) => Promise<number>;
+type ScheduledTriggerRunInfo = {
+  lastRunAt: string | null;
+  lastRunStatus: 'completed' | 'failed' | null;
+  lastRunConversationIds: string[];
+  nextRunAt: string | null;
+  lastRunSummary: LastRunSummary | null;
+};
 /**
- * Get run info for multiple scheduled triggers in a single query
- * Returns last run (completed/failed) and next pending run for each trigger
+ * Get run info for multiple scheduled triggers in a single query.
+ * Groups invocations by (triggerId, scheduledFor) to support multi-user triggers.
+ * Excludes manual runs (manual-run-* and manual-rerun-* idempotency keys).
+ * Returns lastRunSummary with per-status counts for the most recent scheduled tick.
  */
 declare const getScheduledTriggerRunInfoBatch: (db: AgentsRunDatabaseClient) => (params: {
   scopes: Omit<AgentScopeConfig, "agentId">;
@@ -170,12 +180,7 @@ declare const getScheduledTriggerRunInfoBatch: (db: AgentsRunDatabaseClient) =>
     agentId: string;
     triggerId: string;
   }>;
-}) => Promise<Map<string, {
-  lastRunAt: string | null;
-  lastRunStatus: "completed" | "failed" | null;
-  lastRunConversationIds: string[];
-  nextRunAt: string | null;
-}>>;
+}) => Promise<Map<string, ScheduledTriggerRunInfo>>;
 /**
  * List upcoming invocations across ALL triggers for an agent with pagination
  * Used for the upcoming runs dashboard with full pagination support
@@ -202,6 +207,7 @@ declare const listUpcomingInvocationsForAgentPaginated: (db: AgentsRunDatabaseCl
     conversationIds: string[] | null;
     attemptNumber: number;
     idempotencyKey: string;
+    runAsUserId: string | null;
     createdAt: string;
     agentId: string;
     projectId: string;
@@ -241,6 +247,7 @@ declare const listProjectScheduledTriggerInvocationsPaginated: (db: AgentsRunDat
     conversationIds: string[] | null;
     attemptNumber: number;
     idempotencyKey: string;
+    runAsUserId: string | null;
     createdAt: string;
     agentId: string;
     projectId: string;
@@ -293,6 +300,7 @@ declare const listScheduledTriggerInvocationsByTriggerId: (db: AgentsRunDatabase
   conversationIds: string[] | null;
   attemptNumber: number;
   idempotencyKey: string;
+  runAsUserId: string | null;
   createdAt: string;
   agentId: string;
   projectId: string;
@@ -300,4 +308,4 @@ declare const listScheduledTriggerInvocationsByTriggerId: (db: AgentsRunDatabase
   id: string;
 }[]>;
 //#endregion
-export { addConversationIdToInvocation, cancelPastPendingInvocationsForTrigger, cancelPendingInvocationsForTrigger, createScheduledTriggerInvocation, deletePendingInvocationsForTrigger, getScheduledTriggerInvocationById, getScheduledTriggerInvocationByIdempotencyKey, getScheduledTriggerInvocationStatusSummary, getScheduledTriggerRunInfoBatch, listPendingScheduledTriggerInvocations, listProjectScheduledTriggerInvocationsPaginated, listScheduledTriggerInvocationsByTriggerId, listScheduledTriggerInvocationsPaginated, listUpcomingInvocationsForAgentPaginated, markScheduledTriggerInvocationCancelled, markScheduledTriggerInvocationCompleted, markScheduledTriggerInvocationFailed, markScheduledTriggerInvocationRunning, resetCancelledInvocationToPending, updateScheduledTriggerInvocationStatus };
+export { ScheduledTriggerRunInfo, addConversationIdToInvocation, cancelPastPendingInvocationsForTrigger, cancelPendingInvocationsForTrigger, createScheduledTriggerInvocation, deletePendingInvocationsForTrigger, getScheduledTriggerInvocationById, getScheduledTriggerInvocationByIdempotencyKey, getScheduledTriggerInvocationStatusSummary, getScheduledTriggerRunInfoBatch, listPendingScheduledTriggerInvocations, listProjectScheduledTriggerInvocationsPaginated, listScheduledTriggerInvocationsByTriggerId, listScheduledTriggerInvocationsPaginated, listUpcomingInvocationsForAgentPaginated, markScheduledTriggerInvocationCancelled, markScheduledTriggerInvocationCompleted, markScheduledTriggerInvocationFailed, markScheduledTriggerInvocationRunning, resetCancelledInvocationToPending, updateScheduledTriggerInvocationStatus };

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

@@ -147,33 +147,91 @@ const cancelPastPendingInvocationsForTrigger = (db) => async (params) => {
 	}).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
-* Returns last run (completed/failed) and next pending run for each trigger
+* Get run info for multiple scheduled triggers in a single query.
+* Groups invocations by (triggerId, scheduledFor) to support multi-user triggers.
+* Excludes manual runs (manual-run-* and manual-rerun-* idempotency keys).
+* Returns lastRunSummary with per-status counts for the most recent scheduled tick.
 */
 const getScheduledTriggerRunInfoBatch = (db) => async (params) => {
 	if (params.triggerIds.length === 0) return /* @__PURE__ */ new Map();
+	const triggerIdValues = params.triggerIds.map((t) => t.triggerId);
 	const allInvocations = await db.select({
 		scheduledTriggerId: scheduledTriggerInvocations.scheduledTriggerId,
 		status: scheduledTriggerInvocations.status,
 		scheduledFor: scheduledTriggerInvocations.scheduledFor,
 		completedAt: scheduledTriggerInvocations.completedAt,
-		conversationIds: scheduledTriggerInvocations.conversationIds
-	}).from(scheduledTriggerInvocations).where(and(projectScopedWhere(scheduledTriggerInvocations, params.scopes), inArray(scheduledTriggerInvocations.scheduledTriggerId, params.triggerIds.map((t) => t.triggerId)))).orderBy(desc(scheduledTriggerInvocations.completedAt));
+		conversationIds: scheduledTriggerInvocations.conversationIds,
+		idempotencyKey: scheduledTriggerInvocations.idempotencyKey
+	}).from(scheduledTriggerInvocations).where(and(projectScopedWhere(scheduledTriggerInvocations, params.scopes), inArray(scheduledTriggerInvocations.scheduledTriggerId, triggerIdValues))).orderBy(desc(scheduledTriggerInvocations.scheduledFor));
 	const result = /* @__PURE__ */ new Map();
 	for (const trigger of params.triggerIds) result.set(trigger.triggerId, {
 		lastRunAt: null,
 		lastRunStatus: null,
 		lastRunConversationIds: [],
-		nextRunAt: null
+		nextRunAt: null,
+		lastRunSummary: null
 	});
+	const isManualRun = (key) => key.startsWith("manual-run-") || key.startsWith("manual-rerun-");
+	const tickMap = /* @__PURE__ */ new Map();
 	for (const inv of allInvocations) {
 		const triggerInfo = result.get(inv.scheduledTriggerId);
 		if (!triggerInfo) continue;
 		if (inv.status === "pending" && !triggerInfo.nextRunAt) triggerInfo.nextRunAt = inv.scheduledFor;
-		if ((inv.status === "completed" || inv.status === "failed") && !triggerInfo.lastRunAt) {
-			triggerInfo.lastRunAt = inv.completedAt;
-			triggerInfo.lastRunStatus = inv.status;
-			triggerInfo.lastRunConversationIds = inv.conversationIds || [];
+		if (isManualRun(inv.idempotencyKey)) continue;
+		let triggerTicks = tickMap.get(inv.scheduledTriggerId);
+		if (!triggerTicks) {
+			triggerTicks = /* @__PURE__ */ new Map();
+			tickMap.set(inv.scheduledTriggerId, triggerTicks);
+		}
+		let tickInvocations = triggerTicks.get(inv.scheduledFor);
+		if (!tickInvocations) {
+			tickInvocations = [];
+			triggerTicks.set(inv.scheduledFor, tickInvocations);
+		}
+		tickInvocations.push({
+			status: inv.status,
+			completedAt: inv.completedAt,
+			conversationIds: inv.conversationIds
+		});
+	}
+	for (const [triggerId, triggerTicks] of tickMap) {
+		const triggerInfo = result.get(triggerId);
+		if (!triggerInfo) continue;
+		let bestScheduledFor = null;
+		let bestInvocations = null;
+		for (const [scheduledFor, invocations] of triggerTicks) {
+			if (!invocations.some((i) => i.status === "completed" || i.status === "failed")) continue;
+			if (!bestScheduledFor || scheduledFor > bestScheduledFor) {
+				bestScheduledFor = scheduledFor;
+				bestInvocations = invocations;
+			}
+		}
+		if (bestInvocations) {
+			const summary = {
+				total: bestInvocations.length,
+				completed: 0,
+				failed: 0,
+				running: 0,
+				pending: 0
+			};
+			let maxCompletedAt = null;
+			for (const inv of bestInvocations) {
+				if (inv.status === "completed") summary.completed++;
+				else if (inv.status === "failed") summary.failed++;
+				else if (inv.status === "running") summary.running++;
+				else if (inv.status === "pending") summary.pending++;
+				if (inv.completedAt && (!maxCompletedAt || inv.completedAt > maxCompletedAt)) maxCompletedAt = inv.completedAt;
+			}
+			triggerInfo.lastRunAt = maxCompletedAt;
+			triggerInfo.lastRunSummary = summary;
+			if (summary.failed > 0) triggerInfo.lastRunStatus = "failed";
+			else if (summary.completed > 0) triggerInfo.lastRunStatus = "completed";
+			const allConvIds = [];
+			for (const inv of bestInvocations) {
+				const ids = inv.conversationIds;
+				if (ids) for (const id of ids) allConvIds.push(id);
+			}
+			triggerInfo.lastRunConversationIds = allConvIds;
 		}
 	}
 	return result;