@rudderhq/server 0.3.6-canary.9 → 0.4.1

package/dist/services/messenger.js

@@ -393,6 +393,7 @@ function chatSummary(conversation) {
             routedAgentId: conversation.routedAgentId,
             runtimeAgentId: conversation.chatRuntime?.runtimeAgentId ?? null,
             latestUserMessagePreview: conversation.latestUserMessagePreview,
+            ...(conversation.sourceMetadata ?? {}),
         },
     };
 }
@@ -555,18 +556,19 @@ function approvalCard(approval, latestComment, currentUserId, latestActivityAt)
     };
 }
 function failedRunCard(run, agentName) {
+    const summary = failedRunUserSummary(run);
     return {
         id: run.id,
         threadKey: "failed-runs",
         kind: "failed-runs",
         title: agentName ? `${agentName} · Failed run` : "Failed run",
         subtitle: run.status.replaceAll("_", " "),
-        body: FAILED_RUN_USER_SUMMARY,
-        preview: FAILED_RUN_USER_SUMMARY,
+        body: summary,
+        preview: summary,
         href: `/agents/${run.agentId}/runs/${run.id}`,
         latestActivityAt: run.updatedAt ?? run.createdAt,
         actions: [
-            buildAction("Retry", `/heartbeat-runs/${run.id}/retry`, "POST"),
+            buildAction("Retry", `/agent-runs/${run.id}/retry`, "POST"),
             buildAction("Open run", `/agents/${run.agentId}/runs/${run.id}`, "GET"),
         ],
         metadata: {
@@ -578,6 +580,12 @@ function failedRunCard(run, agentName) {
         run: run,
     };
 }
+function readNonEmptyString(value) {
+    return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+function failedRunUserSummary(run) {
+    return readNonEmptyString(run.resultJson?.userMessage) ?? FAILED_RUN_USER_SUMMARY;
+}
 function budgetCard(incident) {
     return {
         id: incident.id,
@@ -655,6 +663,16 @@ export function messengerService(db) {
     function chatConversationIdFromThreadKey(threadKey) {
         return threadKey.startsWith("chat:") ? threadKey.slice("chat:".length) : null;
     }
+    function issueIdFromThreadKey(threadKey) {
+        return threadKey.startsWith("issue:") ? threadKey.slice("issue:".length) : null;
+    }
+    function isSyntheticMessengerThreadKey(threadKey) {
+        return threadKey === "issues"
+            || threadKey === "approvals"
+            || threadKey === "failed-runs"
+            || threadKey === "budget-alerts"
+            || threadKey === "join-requests";
+    }
     async function getCustomGroupOrThrow(orgId, userId, groupId) {
         const [group] = await db
             .select()
@@ -665,15 +683,91 @@ export function messengerService(db) {
             throw notFound("Messenger custom group not found");
         return group;
     }
-    async function ensureChatThreadCanBeGrouped(orgId, userId, threadKey) {
+    async function loadIssueThreadSummaryById(orgId, userId, issueId) {
+        const lastReadAtPromise = lastReadAtForThread(db, orgId, userId, "issues");
+        const rows = (await db.execute(issueEntryRowsQuery(orgId, userId, sql `
+        where id = ${issueId}
+        limit 1
+      `)));
+        const entry = rows[0] ? issueThreadEntryFromRow(rows[0], userId) : null;
+        if (!entry)
+            return null;
+        const [card] = await buildIssueCardsForEntries(orgId, userId, [entry], "latest");
+        if (!card)
+            return null;
+        const lastReadAt = await lastReadAtPromise;
+        const issueThreadStates = await loadThreadStates(db, orgId, userId, [`issue:${issueId}`]);
+        return splitIssueSummary(card.entry, card.item, lastReadAt, issueThreadStates.get(`issue:${issueId}`) ?? null);
+    }
+    async function loadSyntheticThreadSummaryByKey(orgId, userId, threadKey) {
+        const syntheticThreadStates = loadThreadStates(db, orgId, userId, [
+            "issues",
+            "approvals",
+            "failed-runs",
+            "budget-alerts",
+            "join-requests",
+        ]);
+        switch (threadKey) {
+            case "issues": {
+                const data = await loadIssueThreadSummaryData(orgId, userId, syntheticThreadStates);
+                return data.itemCount > 0 ? data.summary : null;
+            }
+            case "approvals": {
+                const data = await loadApprovalThreadSummaryData(orgId, userId, syntheticThreadStates);
+                return data.itemCount > 0 ? data.summary : null;
+            }
+            case "failed-runs": {
+                const data = await loadFailedRunSummaryData(orgId, userId, syntheticThreadStates);
+                return data.itemCount > 0 ? data.summary : null;
+            }
+            case "budget-alerts": {
+                const data = await loadBudgetAlertData(orgId, userId, syntheticThreadStates);
+                return data.detail.items.length > 0 ? data.summary : null;
+            }
+            case "join-requests": {
+                const data = await loadJoinRequestSummaryData(orgId, userId, syntheticThreadStates);
+                return data.itemCount > 0 ? data.summary : null;
+            }
+            default:
+                return null;
+        }
+    }
+    async function findMessengerThreadSummary(orgId, userId, threadKey) {
         const conversationId = chatConversationIdFromThreadKey(threadKey);
-        if (!conversationId) {
-            throw badRequest("Only chat threads can be added to custom Messenger groups");
+        if (conversationId) {
+            const conversations = await chatsSvc.listSummariesByIds(orgId, [conversationId], userId);
+            const conversation = conversations[0];
+            return conversation ? chatSummary(conversation) : null;
         }
-        const conversations = await chatsSvc.listSummariesByIds(orgId, [conversationId], userId);
-        if (conversations.length === 0) {
-            throw notFound("Messenger chat thread not found");
+        const issueId = issueIdFromThreadKey(threadKey);
+        if (issueId) {
+            return loadIssueThreadSummaryById(orgId, userId, issueId);
         }
+        return loadSyntheticThreadSummaryByKey(orgId, userId, threadKey);
+    }
+    async function ensureMessengerThreadCanBeGrouped(orgId, userId, threadKey) {
+        const summary = await findMessengerThreadSummary(orgId, userId, threadKey);
+        if (!summary) {
+            throw notFound("Messenger thread not found");
+        }
+    }
+    async function listThreadTitles(orgId, userId, threadKeys) {
+        const titles = [];
+        for (const threadKey of [...new Set(threadKeys)]) {
+            const summary = await findMessengerThreadSummary(orgId, userId, threadKey);
+            if (summary?.title)
+                titles.push(summary.title);
+        }
+        return titles;
+    }
+    async function listCustomGroupThreadTitles(orgId, userId, groupId) {
+        await getCustomGroupOrThrow(orgId, userId, groupId);
+        const entries = await db
+            .select({ threadKey: messengerCustomGroupEntries.threadKey })
+            .from(messengerCustomGroupEntries)
+            .where(and(eq(messengerCustomGroupEntries.orgId, orgId), eq(messengerCustomGroupEntries.userId, userId), eq(messengerCustomGroupEntries.groupId, groupId)))
+            .orderBy(asc(messengerCustomGroupEntries.sortOrder), asc(messengerCustomGroupEntries.createdAt));
+        return listThreadTitles(orgId, userId, entries.map((entry) => entry.threadKey));
     }
     async function listCustomGroups(orgId, userId) {
         const [groups, entries] = await Promise.all([
@@ -681,17 +775,15 @@ export function messengerService(db) {
                 .select()
                 .from(messengerCustomGroups)
                 .where(and(eq(messengerCustomGroups.orgId, orgId), eq(messengerCustomGroups.userId, userId)))
-                .orderBy(asc(messengerCustomGroups.sortOrder), asc(messengerCustomGroups.createdAt)),
+                .orderBy(sql `${messengerCustomGroups.pinnedAt} IS NULL`, asc(messengerCustomGroups.sortOrder), asc(messengerCustomGroups.createdAt)),
             db
                 .select()
                 .from(messengerCustomGroupEntries)
                 .where(and(eq(messengerCustomGroupEntries.orgId, orgId), eq(messengerCustomGroupEntries.userId, userId)))
                 .orderBy(asc(messengerCustomGroupEntries.sortOrder), asc(messengerCustomGroupEntries.createdAt)),
         ]);
-        const chatThreadKeys = entries
+        const conversationIds = entries
             .map((entry) => entry.threadKey)
-            .filter((threadKey) => Boolean(chatConversationIdFromThreadKey(threadKey)));
-        const conversationIds = chatThreadKeys
             .map((threadKey) => chatConversationIdFromThreadKey(threadKey))
             .filter((id) => Boolean(id));
         const conversations = await chatsSvc.listSummariesByIds(orgId, conversationIds, userId);
@@ -699,11 +791,36 @@ export function messengerService(db) {
             const summary = chatSummary(conversation);
             return [summary.threadKey, summary];
         }));
+        const nonChatThreadKeys = [...new Set(entries
+                .map((entry) => entry.threadKey)
+                .filter((threadKey) => !chatConversationIdFromThreadKey(threadKey)))];
+        const issueThreadKeys = nonChatThreadKeys.filter((threadKey) => Boolean(issueIdFromThreadKey(threadKey)));
+        if (nonChatThreadKeys.length > 0) {
+            const syntheticThreadKeys = nonChatThreadKeys.filter((threadKey) => !issueIdFromThreadKey(threadKey));
+            const [issueSummaries, syntheticSummaries] = await Promise.all([
+                Promise.all(issueThreadKeys.map(async (threadKey) => {
+                    const issueId = issueIdFromThreadKey(threadKey);
+                    return issueId ? loadIssueThreadSummaryById(orgId, userId, issueId) : null;
+                })),
+                Promise.all(syntheticThreadKeys.map((threadKey) => loadSyntheticThreadSummaryByKey(orgId, userId, threadKey))),
+            ]);
+            for (const summary of issueSummaries) {
+                if (summary)
+                    summaryByThreadKey.set(summary.threadKey, summary);
+            }
+            for (const summary of syntheticSummaries) {
+                if (summary)
+                    summaryByThreadKey.set(summary.threadKey, summary);
+            }
+        }
         const staleEntryIds = [];
         const entriesByGroupId = new Map();
         for (const entry of entries) {
             const summary = summaryByThreadKey.get(entry.threadKey);
             if (!summary) {
+                if (isSyntheticMessengerThreadKey(entry.threadKey)) {
+                    continue;
+                }
                 staleEntryIds.push(entry.id);
                 continue;
             }
@@ -745,6 +862,7 @@ export function messengerService(db) {
             name,
             icon,
             sortOrder: (lastGroup?.sortOrder ?? -1) + 1,
+            pinnedAt: now,
             updatedAt: now,
         })
             .returning();
@@ -755,10 +873,15 @@ export function messengerService(db) {
     }
     async function updateCustomGroup(orgId, userId, groupId, patch) {
         await getCustomGroupOrThrow(orgId, userId, groupId);
+        const { pinned, ...groupPatch } = patch;
+        const updatePatch = {
+            ...groupPatch,
+            ...(typeof pinned === "boolean" ? { pinnedAt: pinned ? new Date() : null } : {}),
+        };
         const [group] = await db
             .update(messengerCustomGroups)
             .set({
-            ...patch,
+            ...updatePatch,
             updatedAt: new Date(),
         })
             .where(and(eq(messengerCustomGroups.orgId, orgId), eq(messengerCustomGroups.userId, userId), eq(messengerCustomGroups.id, groupId)))
@@ -797,7 +920,7 @@ export function messengerService(db) {
         return listCustomGroups(orgId, userId);
     }
     async function assignThreadToCustomGroupWithClient(client, orgId, userId, groupId, threadKey) {
-        await ensureChatThreadCanBeGrouped(orgId, userId, threadKey);
+        await ensureMessengerThreadCanBeGrouped(orgId, userId, threadKey);
         const [lastEntry] = await client
             .select({ sortOrder: messengerCustomGroupEntries.sortOrder })
             .from(messengerCustomGroupEntries)
@@ -1228,6 +1351,14 @@ export function messengerService(db) {
     `));
         return normalizeDate(rows[0]?.latestActivityAt ?? null);
     }
+    async function loadLatestIssueAttentionAtById(orgId, userId, issueId) {
+        const rows = (await db.execute(sql `
+      select max("attentionActivityAt") as "latestActivityAt"
+      from (${issueEntryRowsQuery(orgId, userId, sql `where id = ${issueId} limit 1`)}) issue_entry_stats
+      where "attentionActivityAt" is not null
+    `));
+        return normalizeDate(rows[0]?.latestActivityAt ?? null);
+    }
     async function loadLatestIssueDisplayEntry(orgId, userId) {
         const rows = (await db.execute(issueEntryRowsQuery(orgId, userId, sql `
         order by "latestActivityAt" desc, id asc
@@ -1423,7 +1554,6 @@ export function messengerService(db) {
     }
     async function loadApprovalThreadSummaryData(orgId, userId, threadStates) {
         const lastReadAt = await lastReadAtForThread(db, orgId, userId, "approvals", threadStates);
-        const approvalPredicate = eq(approvals.orgId, orgId);
         const pendingApprovalPredicate = and(eq(approvals.orgId, orgId), eq(approvals.status, "pending"));
         const [summaryRows, latestApprovalRows, latestCommentRows, unreadRows] = await Promise.all([
             db
@@ -1431,11 +1561,11 @@ export function messengerService(db) {
                 itemCount: sql `count(*)::int`,
             })
                 .from(approvals)
-                .where(approvalPredicate),
+                .where(pendingApprovalPredicate),
             db
                 .select()
                 .from(approvals)
-                .where(approvalPredicate)
+                .where(pendingApprovalPredicate)
                 .orderBy(desc(approvals.updatedAt), desc(approvals.createdAt))
                 .limit(1),
             db
@@ -1457,6 +1587,7 @@ export function messengerService(db) {
             limit 1
           ) latest_comment on true
           where ${approvals.orgId} = ${orgId}
+            and ${approvals.status} = 'pending'
           order by latest_comment.created_at desc
           limit 1
         `),
@@ -1485,7 +1616,7 @@ export function messengerService(db) {
             ? await db
                 .select()
                 .from(approvals)
-                .where(and(eq(approvals.id, latestCommentRow.approvalId), approvalPredicate))
+                .where(and(eq(approvals.id, latestCommentRow.approvalId), pendingApprovalPredicate))
                 .limit(1)
             : [];
         const candidateItems = [];
@@ -1518,6 +1649,8 @@ export function messengerService(db) {
                 agentId: heartbeatRuns.agentId,
                 status: heartbeatRuns.status,
                 error: heartbeatRuns.error,
+                errorCode: heartbeatRuns.errorCode,
+                resultJson: heartbeatRuns.resultJson,
                 stderrExcerpt: heartbeatRuns.stderrExcerpt,
                 stdoutExcerpt: heartbeatRuns.stdoutExcerpt,
                 contextSnapshot: heartbeatRuns.contextSnapshot,
@@ -1556,7 +1689,7 @@ export function messengerService(db) {
                 needsAttention: unreadCount > 0,
                 isPinned: false,
                 href: "/messenger/system/failed-runs",
-                description: "Recent failed heartbeat runs",
+                description: "Recent failed agent runs",
                 items: chronologicalItems,
             },
         };
@@ -1576,6 +1709,8 @@ export function messengerService(db) {
             db
                 .select({
                 error: heartbeatRuns.error,
+                errorCode: heartbeatRuns.errorCode,
+                resultJson: heartbeatRuns.resultJson,
                 stderrExcerpt: heartbeatRuns.stderrExcerpt,
             })
                 .from(heartbeatRuns)
@@ -1597,7 +1732,7 @@ export function messengerService(db) {
         const unreadCount = lastReadAt ? Number(unreadRows[0]?.unreadCount ?? 0) : itemCount;
         return {
             itemCount,
-            summary: systemSummary("failed-runs", "Failed runs", itemCount, normalizeDate(summaryRow?.latestActivityAt ?? null), unreadCount, lastReadAt, "No failed runs yet", latestRun ? FAILED_RUN_USER_SUMMARY : null),
+            summary: systemSummary("failed-runs", "Failed runs", itemCount, normalizeDate(summaryRow?.latestActivityAt ?? null), unreadCount, lastReadAt, "No failed runs yet", latestRun ? failedRunUserSummary(latestRun) : null),
         };
     }
     async function loadBudgetAlertData(orgId, userId, threadStates) {
@@ -1859,15 +1994,17 @@ export function messengerService(db) {
                 return null;
             return { lastReadAt: state.lastReadAt };
         }
+        const now = new Date();
+        let effectiveReadAt = readAt;
         if (threadKey.startsWith("issue:")) {
             const issueId = threadKey.slice("issue:".length);
             if (!await canUseIssueThread(orgId, userId, issueId))
                 return null;
+            effectiveReadAt = maxDate(readAt, await loadLatestIssueAttentionAtById(orgId, userId, issueId)) ?? readAt;
+        }
+        else if (threadKey === "issues") {
+            effectiveReadAt = maxDate(readAt, await loadLatestIssueAttentionAt(orgId, userId)) ?? readAt;
         }
-        const now = new Date();
-        const effectiveReadAt = threadKey === "issues"
-            ? maxDate(readAt, await loadLatestIssueAttentionAt(orgId, userId)) ?? readAt
-            : readAt;
         const [row] = await db
             .insert(messengerThreadUserStates)
             .values({
@@ -1891,6 +2028,20 @@ export function messengerService(db) {
             .returning();
         return row ? { lastReadAt: row.lastReadAt } : null;
     }
+    async function dismissUnreadThreads(orgId, userId) {
+        const summaries = await listThreadSummaries(orgId, userId);
+        const unreadSummaries = summaries.filter((summary) => summary.unreadCount > 0);
+        const dismissedThreadKeys = [];
+        for (const summary of unreadSummaries) {
+            const state = await markThreadRead(orgId, userId, summary.threadKey, normalizeDate(summary.latestActivityAt) ?? new Date());
+            if (state)
+                dismissedThreadKeys.push(summary.threadKey);
+        }
+        return {
+            dismissedCount: dismissedThreadKeys.length,
+            dismissedThreadKeys,
+        };
+    }
     async function canUseIssueThread(orgId, userId, issueId) {
         const [row] = await db
             .select({ id: issues.id })
@@ -1901,6 +2052,14 @@ export function messengerService(db) {
             where follow_row.org_id = ${orgId}
               and follow_row.user_id = ${userId}
               and follow_row.issue_id = ${issues.id}
+          )`, sql `exists (
+            select 1
+            from ${activityLog} automation_notification_activity
+            where automation_notification_activity.org_id = ${orgId}
+              and automation_notification_activity.entity_type = 'issue'
+              and automation_notification_activity.entity_id = ${issues.id}::text
+              and automation_notification_activity.action = 'automation.issue_created_notification'
+              and automation_notification_activity.details->>'userId' = ${userId}
           )`)))
             .limit(1);
         return Boolean(row);
@@ -1947,6 +2106,8 @@ export function messengerService(db) {
     }
     return {
         listCustomGroups,
+        listThreadTitles,
+        listCustomGroupThreadTitles,
         createCustomGroup,
         createCustomGroupWithEntries,
         updateCustomGroup,
@@ -1964,6 +2125,7 @@ export function messengerService(db) {
         getApprovalsThread,
         getSystemThread,
         getThreadState,
+        dismissUnreadThreads,
         markThreadRead,
         setThreadRead: markThreadRead,
         setThreadPinned,