@rudderhq/server 0.7.2 → 0.7.4

package/dist/services/messenger.js

@@ -1,4 +1,4 @@
-import { activityLog, agents, approvalComments, approvals, authUsers, chatConversations, heartbeatRuns, issueComments, issueFollows, issues, joinRequests, messengerCustomGroupEntries, messengerCustomGroups, messengerSavedViews, messengerThreadUserStates, projects } from "@rudderhq/db";
+import { activityLog, agentIssueCreationRequests, agents, approvalComments, approvals, authUsers, chatConversations, heartbeatRuns, issueComments, issueFollows, issues, joinRequests, messengerCustomGroupEntries, messengerCustomGroups, messengerSavedViews, messengerThreadUserStates, projects, requests } from "@rudderhq/db";
 import { formatMessengerPreview, formatMessengerTitle, isUuidLike, issueUpdatedChangedKeys, messengerSavedViewIdSchema } from "@rudderhq/shared";
 import { and, asc, desc, eq, gt, inArray, isNull, ne, or, sql } from "drizzle-orm";
 import { badRequest, conflict, notFound } from "../errors.js";
@@ -16,6 +16,7 @@ const ISSUE_ACTIVITY_ACTIONS = [
     "issue.updated",
     "issue.followed",
     "automation.issue_created_notification",
+    "agent.issue_created_notification",
     "issue.approval_linked",
     "issue.work_product_created",
     "issue.work_product_updated",
@@ -48,6 +49,15 @@ function maxDate(...values) {
         return null;
     return dates.sort((a, b) => b.getTime() - a.getTime())[0] ?? null;
 }
+function failedRunSummary(run) {
+    const summary = failedRunUserSummary(run);
+    return run.agentIssueCreationRequestId
+        ? `Agent Issue creation failed. ${summary}`
+        : summary;
+}
+function failedAgentIssueRequestSummary(request) {
+    return `Agent Issue creation failed. ${request.error ?? "Agent run completed without creating an Issue"}`;
+}
 function compareLatestActivity(a, b) {
     const aTime = a.latestActivityAt?.getTime() ?? Number.NEGATIVE_INFINITY;
     const bTime = b.latestActivityAt?.getTime() ?? Number.NEGATIVE_INFINITY;
@@ -228,6 +238,8 @@ function summarizeIssueActivity(activity, issue) {
             return "Followed";
         case "automation.issue_created_notification":
             return "Automation created issue";
+        case "agent.issue_created_notification":
+            return "Agent created issue";
         case "issue.approval_linked":
             return "Approval linked";
         case "issue.work_product_created":
@@ -410,11 +422,11 @@ function approvalSummary(approvalCount, latestActivityAt, unreadCount, lastReadA
     return {
         threadKey: "approvals",
         kind: "approvals",
-        title: "Approvals",
+        title: "Requests",
         subtitle: approvalCount > 0
-            ? `${approvalCount} approval${approvalCount === 1 ? "" : "s"}`
-            : "No approvals yet",
-        preview: approvalCount > 0 ? preview ?? "Review and decide on pending approvals" : "No approvals in this organization",
+            ? `${approvalCount} request${approvalCount === 1 ? "" : "s"}`
+            : "No requests yet",
+        preview: approvalCount > 0 ? preview ?? "Review requests needing your input" : "No requests in this organization",
         latestActivityAt,
         lastReadAt,
         unreadCount,
@@ -522,24 +534,67 @@ function approvalCard(approval, requesterAgent, latestComment, currentUserId, la
             requester: approvalRequesterLabel(approval, currentUserId),
         },
         approval: approval,
+        requestKind: "approval",
         requesterAgent,
     };
 }
-function failedRunCard(run, agentName, origin) {
-    const summary = failedRunUserSummary(run);
+function assistanceRequestCard(request, requesterAgent) {
+    return {
+        id: request.id,
+        threadKey: "approvals",
+        kind: "approvals",
+        requestKind: "assistance",
+        title: request.title,
+        subtitle: request.status === "open" ? "Waiting on you" : request.status.replaceAll("_", " "),
+        body: request.prompt,
+        preview: request.prompt,
+        href: request.issueId ? `/issues/${request.issueId}` : "/messenger/approvals",
+        latestActivityAt: request.updatedAt,
+        actions: request.issueId ? [buildAction("Open issue", `/issues/${request.issueId}`, "GET")] : [],
+        metadata: {
+            requestId: request.id,
+            requestKind: "assistance",
+            subtype: request.subtype,
+            status: request.status,
+            issueId: request.issueId,
+        },
+        assistanceRequest: {
+            ...request,
+            kind: "assistance",
+            subtype: "issue_blocker",
+            status: request.status,
+            resolution: request.resolution,
+            issueId: request.issueId,
+            blockerFingerprint: request.blockerFingerprint,
+        },
+        requesterAgent,
+    };
+}
+function failedRunCard(run, agentName, origin, orgId, userId) {
+    const summary = failedRunSummary(run);
     const sourceAction = messengerFailedRunSourceAction(origin);
+    const agentIssueRequestId = run.agentIssueCreationRequestId;
+    const canRetryAgentIssue = Boolean(agentIssueRequestId
+        && run.agentIssueCreationRequestedByUserId === userId);
+    const retryAction = agentIssueRequestId
+        ? canRetryAgentIssue
+            ? buildAction("Retry Agent Issue", `/orgs/${orgId}/agent-issue-creation-requests/${agentIssueRequestId}/retry`, "POST")
+            : null
+        : buildAction("Retry", `/agent-runs/${run.id}/retry`, "POST");
     return {
         id: run.id,
         threadKey: "failed-runs",
         kind: "failed-runs",
-        title: agentName ? `${agentName} · Failed run` : "Failed run",
-        subtitle: run.status.replaceAll("_", " "),
+        title: agentIssueRequestId
+            ? (agentName ? `${agentName} · Agent Issue creation failed` : "Agent Issue creation failed")
+            : (agentName ? `${agentName} · Failed run` : "Failed run"),
+        subtitle: agentIssueRequestId ? "Agent Issue request failed" : run.status.replaceAll("_", " "),
         body: summary,
         preview: summary,
         href: `/agents/${run.agentId}/runs/${run.id}`,
         latestActivityAt: run.updatedAt ?? run.createdAt,
         actions: [
-            buildAction("Retry", `/agent-runs/${run.id}/retry`, "POST"),
+            ...(retryAction ? [retryAction] : []),
             ...(sourceAction ? [sourceAction] : []),
             buildAction("Open run", `/agents/${run.agentId}/runs/${run.id}`, "GET"),
         ],
@@ -547,10 +602,46 @@ function failedRunCard(run, agentName, origin) {
             runId: run.id,
             agentId: run.agentId,
             status: run.status,
+            ...(agentIssueRequestId
+                ? {
+                    agentIssueCreationRequestId: agentIssueRequestId,
+                    agentIssueCreationRetryable: canRetryAgentIssue,
+                    agentIssueCreationError: run.agentIssueCreationError,
+                }
+                : {}),
         },
         origin,
     };
 }
+function failedAgentIssueRequestCard(request, agentName, orgId) {
+    const summary = failedAgentIssueRequestSummary(request);
+    return {
+        id: request.id,
+        threadKey: "failed-runs",
+        kind: "failed-runs",
+        title: agentName ? `${agentName} · Agent Issue creation failed` : "Agent Issue creation failed",
+        subtitle: "Agent Issue request failed",
+        body: summary,
+        preview: summary,
+        href: request.runId ? `/agents/${request.agentId}/runs/${request.runId}` : null,
+        latestActivityAt: request.updatedAt ?? request.createdAt,
+        actions: [
+            buildAction("Retry Agent Issue", `/orgs/${orgId}/agent-issue-creation-requests/${request.id}/retry`, "POST"),
+            ...(request.runId
+                ? [buildAction("Open run", `/agents/${request.agentId}/runs/${request.runId}`, "GET")]
+                : []),
+        ],
+        metadata: {
+            requestId: request.id,
+            agentId: request.agentId,
+            status: request.status,
+            agentIssueCreationRequestId: request.id,
+            agentIssueCreationRetryable: true,
+            agentIssueCreationError: request.error,
+            ...(request.runId ? { runId: request.runId } : {}),
+        },
+    };
+}
 function budgetCard(incident) {
     return {
         id: incident.id,
@@ -1181,7 +1272,7 @@ export function messengerService(db) {
           and notification_issue.org_id = automation_notification_activity.org_id
         where automation_notification_activity.org_id = ${orgId}
           and automation_notification_activity.entity_type = 'issue'
-          and automation_notification_activity.action = 'automation.issue_created_notification'
+          and automation_notification_activity.action in ('automation.issue_created_notification', 'agent.issue_created_notification')
           and automation_notification_activity.details->>'userId' = ${userId}
           and notification_issue.hidden_at is null
       ),
@@ -1285,7 +1376,7 @@ export function messengerService(db) {
               where automation_notification_visibility.org_id = ${orgId}
                 and automation_notification_visibility.entity_type = 'issue'
                 and automation_notification_visibility.entity_id = issue_row.id::text
-                and automation_notification_visibility.action = 'automation.issue_created_notification'
+                and automation_notification_visibility.action in ('automation.issue_created_notification', 'agent.issue_created_notification')
                 and automation_notification_visibility.details->>'userId' = ${userId}
             )
           )
@@ -1327,6 +1418,10 @@ export function messengerService(db) {
             and activity_row.entity_id = issue_row.id::text
             and activity_row.action in (${issueActionSqlList})
             and not ${lowSignalContentOnlyActivity}
+            and (
+              activity_row.action not in ('automation.issue_created_notification', 'agent.issue_created_notification')
+              or activity_row.details->>'userId' = ${userId}
+            )
           order by activity_row.created_at desc, activity_row.id desc
           limit 1
         ) latest_activity on true
@@ -1346,6 +1441,10 @@ export function messengerService(db) {
             and external_activity_row.action in (${issueActionSqlList})
             and not ${externalLowSignalContentOnlyActivity}
             and (external_activity_row.actor_type <> 'user' or external_activity_row.actor_id <> ${userId})
+            and (
+              external_activity_row.action not in ('automation.issue_created_notification', 'agent.issue_created_notification')
+              or external_activity_row.details->>'userId' = ${userId}
+            )
           order by external_activity_row.created_at desc, external_activity_row.id desc
           limit 1
         ) latest_external_activity on true
@@ -1645,12 +1744,17 @@ export function messengerService(db) {
     }
     async function loadApprovalSummaryData(orgId, userId, threadStates) {
         const lastReadAtPromise = lastReadAtForThread(db, orgId, userId, "approvals", threadStates);
-        const [approvalRows, latestComments] = await Promise.all([
+        const [approvalRows, assistanceRows, latestComments] = await Promise.all([
             db
                 .select()
                 .from(approvals)
                 .where(eq(approvals.orgId, orgId))
                 .orderBy(desc(approvals.updatedAt), desc(approvals.createdAt)),
+            db
+                .select()
+                .from(requests)
+                .where(eq(requests.orgId, orgId))
+                .orderBy(desc(requests.updatedAt), desc(requests.createdAt)),
             db
                 .select({
                 approvalId: approvalComments.approvalId,
@@ -1670,8 +1774,10 @@ export function messengerService(db) {
             }
         }
         const typedApprovalRows = approvalRows;
-        const requesterAgentIds = typedApprovalRows
-            .map((approval) => approvalRequesterAgentId(approval))
+        const requesterAgentIds = [
+            ...typedApprovalRows.map((approval) => approvalRequesterAgentId(approval)),
+            ...assistanceRows.map((request) => request.requestedByAgentId),
+        ]
             .filter((agentId) => Boolean(agentId));
         const requesterAgents = requesterAgentIds.length > 0
             ? await db
@@ -1700,11 +1806,19 @@ export function messengerService(db) {
                 : null;
             return approvalCard(approval, requesterAgent, latestComment, userId, latestActivityAt);
         });
+        for (const request of assistanceRows) {
+            const requesterAgent = request.requestedByAgentId
+                ? requesterAgentById.get(request.requestedByAgentId) ?? null
+                : null;
+            unsortedItems.push(assistanceRequestCard(request, requesterAgent));
+        }
         const latestFirstItems = [...unsortedItems].sort(compareLatestActivity);
         const chronologicalItems = [...unsortedItems].sort(compareChronologicalActivity);
-        const actionable = typedApprovalRows.filter((approval) => ACTIONABLE_APPROVAL_STATUSES.has(approval.status));
-        const unreadCount = actionable.filter((approval) => {
-            const activityAt = normalizeDate(approval.updatedAt);
+        const actionable = unsortedItems.filter((item) => item.requestKind === "approval"
+            ? ACTIONABLE_APPROVAL_STATUSES.has(item.approval.status)
+            : item.assistanceRequest.status === "open");
+        const unreadCount = actionable.filter((item) => {
+            const activityAt = normalizeDate(item.latestActivityAt);
             if (!activityAt)
                 return false;
             if (!lastReadAt)
@@ -1713,12 +1827,12 @@ export function messengerService(db) {
         }).length;
         const latestActivityAt = latestFirstItems[0]?.latestActivityAt ?? null;
         return {
-            summary: approvalSummary(approvalRows.length, latestActivityAt, unreadCount, lastReadAt, latestFirstItems[0]?.preview ?? null),
+            summary: approvalSummary(unsortedItems.length, latestActivityAt, unreadCount, lastReadAt, latestFirstItems[0]?.preview ?? null),
             detail: {
                 threadKey: "approvals",
                 kind: "approvals",
-                title: "Approvals",
-                subtitle: `${approvalRows.length} approval${approvalRows.length === 1 ? "" : "s"}`,
+                title: "Requests",
+                subtitle: `${unsortedItems.length} request${unsortedItems.length === 1 ? "" : "s"}`,
                 preview: latestFirstItems[0]?.preview ?? null,
                 latestActivityAt,
                 lastReadAt,
@@ -1726,7 +1840,7 @@ export function messengerService(db) {
                 needsAttention: unreadCount > 0,
                 isPinned: false,
                 href: "/messenger/approvals",
-                description: "Approvals needing attention",
+                description: "Approvals and assistance needing attention",
                 items: chronologicalItems,
             },
         };
@@ -1812,15 +1926,25 @@ export function messengerService(db) {
             }
         }
         const latestItem = candidateItems.sort(compareLatestActivity)[0] ?? null;
-        const itemCount = Number(summaryRows[0]?.itemCount ?? 0);
+        const openAssistancePredicate = and(eq(requests.orgId, orgId), eq(requests.status, "open"));
+        const [assistanceCountRows, latestAssistanceRows, unreadAssistanceRows] = await Promise.all([
+            db.select({ itemCount: sql `count(*)::int` }).from(requests).where(openAssistancePredicate),
+            db.select().from(requests).where(openAssistancePredicate).orderBy(desc(requests.updatedAt)).limit(1),
+            db.select({ unreadCount: sql `count(*)::int` }).from(requests)
+                .where(lastReadAt ? and(openAssistancePredicate, gt(requests.updatedAt, lastReadAt)) : openAssistancePredicate),
+        ]);
+        const latestAssistance = latestAssistanceRows[0] ?? null;
+        const latestApprovalAt = latestItem ? normalizeDate(latestItem.latestActivityAt) : null;
+        const latestAssistanceAt = latestAssistance ? normalizeDate(latestAssistance.updatedAt) : null;
+        const assistanceIsLatest = Boolean(latestAssistanceAt && (!latestApprovalAt || latestAssistanceAt > latestApprovalAt));
+        const itemCount = Number(summaryRows[0]?.itemCount ?? 0) + Number(assistanceCountRows[0]?.itemCount ?? 0);
         return {
             itemCount,
-            summary: approvalSummary(itemCount, latestItem?.latestActivityAt ?? null, Number(unreadRows[0]?.unreadCount ?? 0), lastReadAt, latestItem?.preview ?? null),
+            summary: approvalSummary(itemCount, assistanceIsLatest ? latestAssistanceAt : latestItem?.latestActivityAt ?? null, Number(unreadRows[0]?.unreadCount ?? 0) + Number(unreadAssistanceRows[0]?.unreadCount ?? 0), lastReadAt, assistanceIsLatest ? latestAssistance?.prompt ?? null : latestItem?.preview ?? null),
         };
     }
-    async function loadFailedRunData(orgId, userId, threadStates) {
-        const lastReadAtPromise = lastReadAtForThread(db, orgId, userId, "failed-runs", threadStates);
-        const [runRows, agentRows] = await Promise.all([
+    async function loadFailedRunRows(orgId, userId) {
+        const [runRows, requestRows, agentRows] = await Promise.all([
             db
                 .select({
                 id: heartbeatRuns.id,
@@ -1835,10 +1959,28 @@ export function messengerService(db) {
                 contextSnapshot: heartbeatRuns.contextSnapshot,
                 createdAt: heartbeatRuns.createdAt,
                 updatedAt: heartbeatRuns.updatedAt,
+                agentIssueCreationRequestId: agentIssueCreationRequests.id,
+                agentIssueCreationRequestedByUserId: agentIssueCreationRequests.requestedByUserId,
+                agentIssueCreationError: agentIssueCreationRequests.error,
             })
                 .from(heartbeatRuns)
+                .leftJoin(agentIssueCreationRequests, and(eq(agentIssueCreationRequests.orgId, heartbeatRuns.orgId), eq(agentIssueCreationRequests.runId, heartbeatRuns.id)))
                 .where(and(eq(heartbeatRuns.orgId, orgId), eq(heartbeatRuns.status, "failed")))
                 .orderBy(desc(heartbeatRuns.updatedAt), desc(heartbeatRuns.createdAt)),
+            db
+                .select({
+                id: agentIssueCreationRequests.id,
+                orgId: agentIssueCreationRequests.orgId,
+                agentId: agentIssueCreationRequests.agentId,
+                runId: agentIssueCreationRequests.runId,
+                status: agentIssueCreationRequests.status,
+                error: agentIssueCreationRequests.error,
+                createdAt: agentIssueCreationRequests.createdAt,
+                updatedAt: agentIssueCreationRequests.updatedAt,
+            })
+                .from(agentIssueCreationRequests)
+                .where(and(eq(agentIssueCreationRequests.orgId, orgId), eq(agentIssueCreationRequests.requestedByUserId, userId), inArray(agentIssueCreationRequests.status, ["failed", "cancelled"]), isNull(agentIssueCreationRequests.createdIssueId)))
+                .orderBy(desc(agentIssueCreationRequests.updatedAt), desc(agentIssueCreationRequests.createdAt)),
             db
                 .select({
                 id: agents.id,
@@ -1847,14 +1989,28 @@ export function messengerService(db) {
                 .from(agents)
                 .where(eq(agents.orgId, orgId)),
         ]);
+        const linkedRequestIds = new Set(runRows
+            .map((run) => run.agentIssueCreationRequestId)
+            .filter((requestId) => Boolean(requestId)));
+        return {
+            runRows,
+            requestRows: requestRows.filter((request) => !linkedRequestIds.has(request.id)),
+            agentRows,
+        };
+    }
+    async function loadFailedRunData(orgId, userId, threadStates) {
+        const lastReadAtPromise = lastReadAtForThread(db, orgId, userId, "failed-runs", threadStates);
+        const { runRows, requestRows, agentRows } = await loadFailedRunRows(orgId, userId);
         const lastReadAt = await lastReadAtPromise;
         const agentNames = new Map(agentRows.map((row) => [row.id, row.name]));
         const origins = await hydrateMessengerFailedRunOrigins(db, orgId, runRows);
-        const items = runRows.map((run) => failedRunCard(run, agentNames.get(run.agentId) ?? null, origins.get(run.id)));
+        const runItems = runRows.map((run) => failedRunCard(run, agentNames.get(run.agentId) ?? null, origins.get(run.id), orgId, userId));
+        const requestItems = requestRows.map((request) => failedAgentIssueRequestCard(request, agentNames.get(request.agentId) ?? null, orgId));
+        const items = [...runItems, ...requestItems];
         const latestFirstItems = [...items].sort(compareLatestActivity);
         const chronologicalItems = [...items].sort(compareChronologicalActivity);
         const latestActivityAt = latestFirstItems[0]?.latestActivityAt ?? null;
-        const unreadCount = systemUnreadCountSince(runRows, lastReadAt);
+        const unreadCount = systemUnreadCountSince([...runRows, ...requestRows], lastReadAt);
         return {
             summary: systemSummary("failed-runs", "Failed runs", runRows.length, latestActivityAt, unreadCount, lastReadAt, "No failed runs yet", latestFirstItems[0]?.preview ?? null),
             detail: {
@@ -1876,43 +2032,23 @@ export function messengerService(db) {
     }
     async function loadFailedRunSummaryData(orgId, userId, threadStates) {
         const lastReadAt = await lastReadAtForThread(db, orgId, userId, "failed-runs", threadStates);
-        const latestActivitySql = sql `max(coalesce(${heartbeatRuns.updatedAt}, ${heartbeatRuns.createdAt}))`;
-        const failedRunPredicate = and(eq(heartbeatRuns.orgId, orgId), eq(heartbeatRuns.status, "failed"));
-        const [summaryRows, latestRows, unreadRows] = await Promise.all([
-            db
-                .select({
-                itemCount: sql `count(*)::int`,
-                latestActivityAt: latestActivitySql,
-            })
-                .from(heartbeatRuns)
-                .where(failedRunPredicate),
-            db
-                .select({
-                error: heartbeatRuns.error,
-                errorCode: heartbeatRuns.errorCode,
-                resultJson: heartbeatRuns.resultJson,
-                stderrExcerpt: heartbeatRuns.stderrExcerpt,
-            })
-                .from(heartbeatRuns)
-                .where(failedRunPredicate)
-                .orderBy(desc(heartbeatRuns.updatedAt), desc(heartbeatRuns.createdAt))
-                .limit(1),
-            lastReadAt
-                ? db
-                    .select({
-                    unreadCount: sql `count(*)::int`,
-                })
-                    .from(heartbeatRuns)
-                    .where(and(failedRunPredicate, gt(heartbeatRuns.updatedAt, lastReadAt)))
-                : Promise.resolve([]),
-        ]);
-        const summaryRow = summaryRows[0];
-        const latestRun = latestRows[0] ?? null;
-        const itemCount = Number(summaryRow?.itemCount ?? 0);
-        const unreadCount = lastReadAt ? Number(unreadRows[0]?.unreadCount ?? 0) : itemCount;
+        const { runRows, requestRows } = await loadFailedRunRows(orgId, userId);
+        const failureRows = [...runRows, ...requestRows];
+        const itemCount = failureRows.length;
+        const latestRow = [...failureRows].sort((a, b) => {
+            const aTime = normalizeDate(a.updatedAt ?? a.createdAt)?.getTime() ?? Number.NEGATIVE_INFINITY;
+            const bTime = normalizeDate(b.updatedAt ?? b.createdAt)?.getTime() ?? Number.NEGATIVE_INFINITY;
+            return bTime - aTime;
+        })[0] ?? null;
+        const unreadCount = systemUnreadCountSince(failureRows, lastReadAt);
+        const latestPreview = latestRow
+            ? "agentIssueCreationRequestId" in latestRow
+                ? failedRunSummary(latestRow)
+                : failedAgentIssueRequestSummary(latestRow)
+            : null;
         return {
             itemCount,
-            summary: systemSummary("failed-runs", "Failed runs", itemCount, normalizeDate(summaryRow?.latestActivityAt ?? null), unreadCount, lastReadAt, "No failed runs yet", latestRun ? failedRunUserSummary(latestRun) : null),
+            summary: systemSummary("failed-runs", "Failed runs", itemCount, normalizeDate(latestRow?.updatedAt ?? latestRow?.createdAt ?? null), unreadCount, lastReadAt, "No failed runs yet", latestPreview),
         };
     }
     async function loadBudgetAlertData(orgId, userId, threadStates) {
@@ -2238,7 +2374,7 @@ export function messengerService(db) {
             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.action in ('automation.issue_created_notification', 'agent.issue_created_notification')
               and automation_notification_activity.details->>'userId' = ${userId}
           )`)))
             .limit(1);