@rudderhq/server 0.7.19 → 0.7.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/home-paths.d.ts.map +1 -1
- package/dist/home-paths.js +2 -4
- package/dist/home-paths.js.map +1 -1
- package/dist/index.js +11 -15
- package/dist/index.js.map +1 -1
- package/dist/organization-workspace-folder-name.d.ts +2 -0
- package/dist/organization-workspace-folder-name.d.ts.map +1 -0
- package/dist/organization-workspace-folder-name.js +15 -0
- package/dist/organization-workspace-folder-name.js.map +1 -0
- package/dist/routes/rudder-plugins.test.js.map +1 -1
- package/dist/services/messenger-failed-run-summary.d.ts +14 -0
- package/dist/services/messenger-failed-run-summary.d.ts.map +1 -0
- package/dist/services/messenger-failed-run-summary.js +120 -0
- package/dist/services/messenger-failed-run-summary.js.map +1 -0
- package/dist/services/messenger.d.ts.map +1 -1
- package/dist/services/messenger.js +4 -24
- package/dist/services/messenger.js.map +1 -1
- package/package.json +14 -14
- package/ui-dist/assets/{LibraryLiveSurface-D-6Puw4N.js → LibraryLiveSurface-BiQQj5Hb.js} +1 -1
- package/ui-dist/assets/{abnfDiagram-VRR7QNED-DjgQ9iD_.js → abnfDiagram-VRR7QNED--khQJc5a.js} +1 -1
- package/ui-dist/assets/{addon-fit-OOCvZY14.js → addon-fit-CVKsoA6X.js} +1 -1
- package/ui-dist/assets/{arc-D6yqUjH4.js → arc-y9rNydY4.js} +1 -1
- package/ui-dist/assets/{architectureDiagram-ZJ3FMSHR-eF-Es2a-.js → architectureDiagram-ZJ3FMSHR-CTTEn0SH.js} +1 -1
- package/ui-dist/assets/{blockDiagram-677ZJIJ3-B7G2uxR7.js → blockDiagram-677ZJIJ3-U2j9QH1u.js} +1 -1
- package/ui-dist/assets/{c4Diagram-LMCZKHZV-YhY4bz85.js → c4Diagram-LMCZKHZV-ByOtcnv-.js} +1 -1
- package/ui-dist/assets/channel-DyVqN2Rg.js +1 -0
- package/ui-dist/assets/{chunk-2Q5K7J3B-D7QxbIUK.js → chunk-2Q5K7J3B-C_F73aLm.js} +1 -1
- package/ui-dist/assets/{chunk-32BRIVSS-CArPDsLy.js → chunk-32BRIVSS-B-_hFTRm.js} +1 -1
- package/ui-dist/assets/{chunk-5VM5RSS4-ByyAjdOI.js → chunk-5VM5RSS4-kDtmO9rY.js} +1 -1
- package/ui-dist/assets/{chunk-EX3LRPZG-B6Z9cEKa.js → chunk-EX3LRPZG-BH53QEjn.js} +1 -1
- package/ui-dist/assets/{chunk-JWPE2WC7-L5jYy4CI.js → chunk-JWPE2WC7-vi_fmyul.js} +1 -1
- package/ui-dist/assets/{chunk-MOJQB5TN-BBTZZsOQ.js → chunk-MOJQB5TN-BTooeKeT.js} +1 -1
- package/ui-dist/assets/{chunk-RYQCIY6F-DyV9CaPT.js → chunk-RYQCIY6F-BQrn9i9W.js} +1 -1
- package/ui-dist/assets/{chunk-V7JOEXUC-CNztgBrF.js → chunk-V7JOEXUC-ovQThHH_.js} +1 -1
- package/ui-dist/assets/{chunk-VR4S4FIN-Bv62Xmto.js → chunk-VR4S4FIN-B-MZGW1V.js} +1 -1
- package/ui-dist/assets/{chunk-XXDRQBXY-B5AzJDaz.js → chunk-XXDRQBXY-C61eFp4w.js} +1 -1
- package/ui-dist/assets/classDiagram-OUVF2IWQ-BnvaEHDR.js +1 -0
- package/ui-dist/assets/classDiagram-v2-EOCWNBFH-BnvaEHDR.js +1 -0
- package/ui-dist/assets/{cose-bilkent-JH36ORCC-DrzyjyO_.js → cose-bilkent-JH36ORCC-ULuzRVuW.js} +1 -1
- package/ui-dist/assets/{cynefin-VYW2F7L2-ChoChVKW.js → cynefin-VYW2F7L2-BDGVZRa9.js} +1 -1
- package/ui-dist/assets/{cynefinDiagram-TSTJHNR4-Fv4ecj_f.js → cynefinDiagram-TSTJHNR4-BpwEbKkX.js} +1 -1
- package/ui-dist/assets/{dagre-VKFMJZFB-Zd466k0O.js → dagre-VKFMJZFB-BrcLl5Bi.js} +1 -1
- package/ui-dist/assets/{diagram-FQU43EPY-BgL3Uu7z.js → diagram-FQU43EPY-Chw0ZA8R.js} +1 -1
- package/ui-dist/assets/{diagram-G47NLZAW-Bcbg2TZF.js → diagram-G47NLZAW-Bnq9d0Yj.js} +1 -1
- package/ui-dist/assets/{diagram-NH7WQ7WH-YS4gl6dx.js → diagram-NH7WQ7WH-elRd9KQl.js} +1 -1
- package/ui-dist/assets/{diagram-OA4YK3LP-C-A8A6Xi.js → diagram-OA4YK3LP-CFjNInKN.js} +1 -1
- package/ui-dist/assets/{diagram-WEI45ONY-mqkaxwes.js → diagram-WEI45ONY-CTwTIF_a.js} +1 -1
- package/ui-dist/assets/{ebnfDiagram-CCIWWBDH-CvH1cI4K.js → ebnfDiagram-CCIWWBDH-DF8gLV0g.js} +1 -1
- package/ui-dist/assets/{erDiagram-Q63AITRT-Duhw1MUB.js → erDiagram-Q63AITRT-BuEsd1Ky.js} +1 -1
- package/ui-dist/assets/{flowDiagram-23GEKE2U-DUkAECUs.js → flowDiagram-23GEKE2U-CtBUceZn.js} +1 -1
- package/ui-dist/assets/{ganttDiagram-NO4QXBWP-B3cINaqn.js → ganttDiagram-NO4QXBWP-DKppRPjk.js} +1 -1
- package/ui-dist/assets/{gitGraphDiagram-IHSO6WYX-BMEHvYy5.js → gitGraphDiagram-IHSO6WYX-BhU-PmC8.js} +1 -1
- package/ui-dist/assets/{graph-B1-dUGRC.js → graph-DKHhYWz-.js} +1 -1
- package/ui-dist/assets/{index-CaveK_TY.js → index-5jvoEF8N.js} +1 -1
- package/ui-dist/assets/{index-Blix7pGb.js → index-BDy0L6oz.js} +1 -1
- package/ui-dist/assets/{index-DgNZ8Oto.js → index-BMndNV-h.js} +1 -1
- package/ui-dist/assets/{index-Drmy6GaQ.js → index-Ba4T7q2w.js} +1 -1
- package/ui-dist/assets/{index-CUW-AUBO.css → index-Bc_lqgaW.css} +1 -1
- package/ui-dist/assets/{index-BGAEBJze.js → index-Bmz96tVk.js} +1 -1
- package/ui-dist/assets/{index-CBrXXiQ_.js → index-C3qfqMoh.js} +1 -1
- package/ui-dist/assets/{index-CSMCUMYP.js → index-CzGrB4Wy.js} +1 -1
- package/ui-dist/assets/{index-BFmYzGL9.js → index-D6ddGuay.js} +1 -1
- package/ui-dist/assets/{index-DSz4Tjbh.js → index-DUNFITh_.js} +1 -1
- package/ui-dist/assets/{index-BglV2AAc.js → index-Dhj4jM1R.js} +1 -1
- package/ui-dist/assets/{index-IJhIHwGp.js → index-Dmb5j1Fp.js} +224 -224
- package/ui-dist/assets/{index-DxHCQu-4.js → index-MT--jY1n.js} +1 -1
- package/ui-dist/assets/{index-BMfPEMCH.js → index-O7us9hIV.js} +1 -1
- package/ui-dist/assets/{index-DHcvu8nk.js → index-b0vxLiyZ.js} +1 -1
- package/ui-dist/assets/{index-DvrowL98.js → index-oxndzUNp.js} +1 -1
- package/ui-dist/assets/{infoDiagram-FWYZ7A6U-BJ7smuOx.js → infoDiagram-FWYZ7A6U-DygYyhIo.js} +1 -1
- package/ui-dist/assets/{ishikawaDiagram-FXEZZL3T-Bn7jPYRy.js → ishikawaDiagram-FXEZZL3T-Ccs65V6v.js} +1 -1
- package/ui-dist/assets/{journeyDiagram-5HDEW3XC-D5NYECBN.js → journeyDiagram-5HDEW3XC-FSymf-td.js} +1 -1
- package/ui-dist/assets/{kanban-definition-HUTT4EX6-CcrYvDYt.js → kanban-definition-HUTT4EX6-Cv7up1fK.js} +1 -1
- package/ui-dist/assets/{layout-32M7EWAw.js → layout-BVu8CYMb.js} +1 -1
- package/ui-dist/assets/{linear-DT9kJUfH.js → linear-sv7GMpXV.js} +1 -1
- package/ui-dist/assets/{map-C2crE4Bv.js → map-D8_4cyHA.js} +1 -1
- package/ui-dist/assets/{mermaid.core-B9y8ebhy.js → mermaid.core-DELkNXiT.js} +4 -4
- package/ui-dist/assets/{mindmap-definition-LN4V7U3C-CaFsY4LT.js → mindmap-definition-LN4V7U3C-BF63-JUL.js} +1 -1
- package/ui-dist/assets/{pegDiagram-2B236MQR-BMTtqHzV.js → pegDiagram-2B236MQR-Bh0HC2Na.js} +1 -1
- package/ui-dist/assets/{pieDiagram-ENE6RG2P-DRl32AMI.js → pieDiagram-ENE6RG2P-lBLdGBKK.js} +1 -1
- package/ui-dist/assets/{quadrantDiagram-ABIIQ3AL-pXeC4qE5.js → quadrantDiagram-ABIIQ3AL-D_l5wSF6.js} +1 -1
- package/ui-dist/assets/{railroadDiagram-RFXS5EU6-tGzWZNPI.js → railroadDiagram-RFXS5EU6-kQpTkPp7.js} +1 -1
- package/ui-dist/assets/{requirementDiagram-TGXJPOKE-DEqEN1a0.js → requirementDiagram-TGXJPOKE-D04lqFVv.js} +1 -1
- package/ui-dist/assets/{sankeyDiagram-HTMAVEWB-DjVDCNO4.js → sankeyDiagram-HTMAVEWB-BrS6ULAc.js} +1 -1
- package/ui-dist/assets/{sequenceDiagram-DBY2YBRQ-CRKMhKhd.js → sequenceDiagram-DBY2YBRQ-BvDUf8XG.js} +1 -1
- package/ui-dist/assets/{sizeCapture-X5ZJPWSS-CWl0gYed.js → sizeCapture-X5ZJPWSS-CaOi4z6b.js} +1 -1
- package/ui-dist/assets/{stateDiagram-2N3HPSRC-BH6FVEBD.js → stateDiagram-2N3HPSRC-tkllD-n0.js} +1 -1
- package/ui-dist/assets/stateDiagram-v2-6OUMAXLB-Bxk0h_dS.js +1 -0
- package/ui-dist/assets/{swimlanes-5IMT3BWC-BZdn1cQ5.js → swimlanes-5IMT3BWC-D7iseGD6.js} +2 -2
- package/ui-dist/assets/swimlanesDiagram-G3AALYLV-BN3uzPs1.js +8 -0
- package/ui-dist/assets/{timeline-definition-FHXFAJF6-CMofE9DN.js → timeline-definition-FHXFAJF6-B3Y8CbUX.js} +1 -1
- package/ui-dist/assets/{vennDiagram-L72KCM5P-CszussGd.js → vennDiagram-L72KCM5P-DwB-uCHa.js} +1 -1
- package/ui-dist/assets/{wardleyDiagram-EHGQE667-C1Op8a5q.js → wardleyDiagram-EHGQE667-CJUNR115.js} +1 -1
- package/ui-dist/assets/{xterm-BM41mI-I.js → xterm-D1iOyMXp.js} +1 -1
- package/ui-dist/assets/{xychartDiagram-FW5EYKEG-zi-IHNrX.js → xychartDiagram-FW5EYKEG-DzFFcyyu.js} +1 -1
- package/ui-dist/index.html +2 -2
- package/ui-dist/assets/channel-DISxdJMI.js +0 -1
- package/ui-dist/assets/classDiagram-OUVF2IWQ-BssC8UiF.js +0 -1
- package/ui-dist/assets/classDiagram-v2-EOCWNBFH-BssC8UiF.js +0 -1
- package/ui-dist/assets/stateDiagram-v2-6OUMAXLB-DFWkP3y3.js +0 -1
- package/ui-dist/assets/swimlanesDiagram-G3AALYLV-BwA91U1K.js +0 -8
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { Db } from "@rudderhq/db";
|
|
2
|
+
import type { MessengerThreadSummary } from "@rudderhq/shared";
|
|
3
|
+
type ThreadStateSource = Map<string, {
|
|
4
|
+
lastReadAt: Date;
|
|
5
|
+
}> | Promise<Map<string, {
|
|
6
|
+
lastReadAt: Date;
|
|
7
|
+
}>>;
|
|
8
|
+
type FailedRunSummaryData = {
|
|
9
|
+
summary: MessengerThreadSummary;
|
|
10
|
+
itemCount: number;
|
|
11
|
+
};
|
|
12
|
+
export declare function loadFailedRunSummaryData(db: Db, orgId: string, userId: string, threadStates?: ThreadStateSource): Promise<FailedRunSummaryData>;
|
|
13
|
+
export {};
|
|
14
|
+
//# sourceMappingURL=messenger-failed-run-summary.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messenger-failed-run-summary.d.ts","sourceRoot":"","sources":["../../src/services/messenger-failed-run-summary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAMvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAI/D,KAAK,iBAAiB,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,CAAC;AAqBxG,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,sBAAsB,CAAC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAiIF,wBAAsB,wBAAwB,CAC5C,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,iBAAiB,GAC/B,OAAO,CAAC,oBAAoB,CAAC,CA6B/B"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { agentIssueCreationRequests, heartbeatRuns, messengerThreadUserStates, } from "@rudderhq/db";
|
|
2
|
+
import { and, desc, eq, inArray, isNull, sql } from "drizzle-orm";
|
|
3
|
+
import { failedRunUserSummary } from "./messenger-run-summary.js";
|
|
4
|
+
function normalizeDate(value) {
|
|
5
|
+
if (!value)
|
|
6
|
+
return null;
|
|
7
|
+
if (value instanceof Date)
|
|
8
|
+
return Number.isNaN(value.getTime()) ? null : value;
|
|
9
|
+
const parsed = new Date(value);
|
|
10
|
+
return Number.isNaN(parsed.getTime()) ? null : parsed;
|
|
11
|
+
}
|
|
12
|
+
function systemUnreadCountSince(rows, lastReadAt) {
|
|
13
|
+
if (!lastReadAt)
|
|
14
|
+
return rows.length;
|
|
15
|
+
return rows.filter((row) => {
|
|
16
|
+
const activityAt = normalizeDate(row.updatedAt ?? row.createdAt ?? null);
|
|
17
|
+
return Boolean(activityAt && activityAt.getTime() > lastReadAt.getTime());
|
|
18
|
+
}).length;
|
|
19
|
+
}
|
|
20
|
+
function failedRunSummary(run) {
|
|
21
|
+
const summary = failedRunUserSummary(run);
|
|
22
|
+
return run.agentIssueCreationRequestId
|
|
23
|
+
? `Agent Issue creation failed. ${summary}`
|
|
24
|
+
: summary;
|
|
25
|
+
}
|
|
26
|
+
function failedAgentIssueRequestSummary(request) {
|
|
27
|
+
return `Agent Issue creation failed. ${request.error ?? "Agent run completed without creating an Issue"}`;
|
|
28
|
+
}
|
|
29
|
+
function systemSummary(itemCount, latestActivityAt, unreadCount, lastReadAt, preview) {
|
|
30
|
+
return {
|
|
31
|
+
threadKey: "failed-runs",
|
|
32
|
+
kind: "failed-runs",
|
|
33
|
+
title: "Failed runs",
|
|
34
|
+
subtitle: itemCount > 0 ? `${itemCount} item${itemCount === 1 ? "" : "s"}` : "No failed runs yet",
|
|
35
|
+
preview: itemCount > 0 ? preview ?? "Aggregate operational updates" : "No failed runs yet",
|
|
36
|
+
latestActivityAt,
|
|
37
|
+
lastReadAt,
|
|
38
|
+
unreadCount,
|
|
39
|
+
needsAttention: unreadCount > 0,
|
|
40
|
+
isPinned: false,
|
|
41
|
+
href: "/messenger/system/failed-runs",
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
async function loadThreadStates(db, orgId, userId) {
|
|
45
|
+
const rows = await db
|
|
46
|
+
.select()
|
|
47
|
+
.from(messengerThreadUserStates)
|
|
48
|
+
.where(and(eq(messengerThreadUserStates.orgId, orgId), eq(messengerThreadUserStates.userId, userId), eq(messengerThreadUserStates.threadKey, "failed-runs")));
|
|
49
|
+
return new Map(rows.map((row) => [row.threadKey, { lastReadAt: row.lastReadAt }]));
|
|
50
|
+
}
|
|
51
|
+
async function lastReadAtForThread(db, orgId, userId, threadStates) {
|
|
52
|
+
const states = threadStates ?? loadThreadStates(db, orgId, userId);
|
|
53
|
+
return (await states).get("failed-runs")?.lastReadAt ?? null;
|
|
54
|
+
}
|
|
55
|
+
async function loadFailedRunSummaryRows(db, orgId, userId) {
|
|
56
|
+
const [runRows, requestRows] = await Promise.all([
|
|
57
|
+
db
|
|
58
|
+
.select({
|
|
59
|
+
id: heartbeatRuns.id,
|
|
60
|
+
agentIssueCreationRequestId: agentIssueCreationRequests.id,
|
|
61
|
+
userMessage: sql `case
|
|
62
|
+
when jsonb_typeof(${heartbeatRuns.resultJson}->'userMessage') = 'string'
|
|
63
|
+
then ${heartbeatRuns.resultJson}->>'userMessage'
|
|
64
|
+
else null
|
|
65
|
+
end`,
|
|
66
|
+
createdAt: heartbeatRuns.createdAt,
|
|
67
|
+
updatedAt: heartbeatRuns.updatedAt,
|
|
68
|
+
})
|
|
69
|
+
.from(heartbeatRuns)
|
|
70
|
+
.leftJoin(agentIssueCreationRequests, and(eq(agentIssueCreationRequests.orgId, heartbeatRuns.orgId), eq(agentIssueCreationRequests.runId, heartbeatRuns.id)))
|
|
71
|
+
.where(and(eq(heartbeatRuns.orgId, orgId), eq(heartbeatRuns.status, "failed")))
|
|
72
|
+
.orderBy(desc(heartbeatRuns.updatedAt), desc(heartbeatRuns.createdAt)),
|
|
73
|
+
db
|
|
74
|
+
.select({
|
|
75
|
+
id: agentIssueCreationRequests.id,
|
|
76
|
+
orgId: agentIssueCreationRequests.orgId,
|
|
77
|
+
agentId: agentIssueCreationRequests.agentId,
|
|
78
|
+
runId: agentIssueCreationRequests.runId,
|
|
79
|
+
status: agentIssueCreationRequests.status,
|
|
80
|
+
error: agentIssueCreationRequests.error,
|
|
81
|
+
createdAt: agentIssueCreationRequests.createdAt,
|
|
82
|
+
updatedAt: agentIssueCreationRequests.updatedAt,
|
|
83
|
+
})
|
|
84
|
+
.from(agentIssueCreationRequests)
|
|
85
|
+
.where(and(eq(agentIssueCreationRequests.orgId, orgId), eq(agentIssueCreationRequests.requestedByUserId, userId), inArray(agentIssueCreationRequests.status, ["failed", "cancelled"]), isNull(agentIssueCreationRequests.createdIssueId)))
|
|
86
|
+
.orderBy(desc(agentIssueCreationRequests.updatedAt), desc(agentIssueCreationRequests.createdAt)),
|
|
87
|
+
]);
|
|
88
|
+
const linkedRequestIds = new Set(runRows
|
|
89
|
+
.map((run) => run.agentIssueCreationRequestId)
|
|
90
|
+
.filter((requestId) => Boolean(requestId)));
|
|
91
|
+
return {
|
|
92
|
+
runRows: runRows,
|
|
93
|
+
requestRows: requestRows.filter((request) => !linkedRequestIds.has(request.id)),
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
export async function loadFailedRunSummaryData(db, orgId, userId, threadStates) {
|
|
97
|
+
const lastReadAt = await lastReadAtForThread(db, orgId, userId, threadStates);
|
|
98
|
+
const { runRows, requestRows } = await loadFailedRunSummaryRows(db, orgId, userId);
|
|
99
|
+
const failureRows = [...runRows, ...requestRows];
|
|
100
|
+
const itemCount = failureRows.length;
|
|
101
|
+
const latestRow = [...failureRows].sort((a, b) => {
|
|
102
|
+
const aTime = normalizeDate(a.updatedAt ?? a.createdAt)?.getTime() ?? Number.NEGATIVE_INFINITY;
|
|
103
|
+
const bTime = normalizeDate(b.updatedAt ?? b.createdAt)?.getTime() ?? Number.NEGATIVE_INFINITY;
|
|
104
|
+
return bTime - aTime;
|
|
105
|
+
})[0] ?? null;
|
|
106
|
+
const unreadCount = systemUnreadCountSince(failureRows, lastReadAt);
|
|
107
|
+
const latestPreview = latestRow
|
|
108
|
+
? "agentIssueCreationRequestId" in latestRow
|
|
109
|
+
? failedRunSummary({
|
|
110
|
+
agentIssueCreationRequestId: latestRow.agentIssueCreationRequestId,
|
|
111
|
+
resultJson: latestRow.userMessage ? { userMessage: latestRow.userMessage } : null,
|
|
112
|
+
})
|
|
113
|
+
: failedAgentIssueRequestSummary(latestRow)
|
|
114
|
+
: null;
|
|
115
|
+
return {
|
|
116
|
+
itemCount,
|
|
117
|
+
summary: systemSummary(itemCount, normalizeDate(latestRow?.updatedAt ?? latestRow?.createdAt ?? null), unreadCount, lastReadAt, latestPreview),
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=messenger-failed-run-summary.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"messenger-failed-run-summary.js","sourceRoot":"","sources":["../../src/services/messenger-failed-run-summary.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../src/services/messenger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAqBvC,OAAO,EAYL,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,EAGlC,KAAK,wBAAwB,EAC7B,KAAK,8BAA8B,EACnC,KAAK,0BAA0B,EAE/B,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAE9B,KAAK,qBAAqB,EAE1B,KAAK,sBAAsB,EAC3B,KAAK,0BAA0B,EAChC,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../src/services/messenger.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { budgetService } from "./budgets.js";
|
|
|
8
8
|
import { chatService } from "./chats.js";
|
|
9
9
|
import { issueLowSignalContentOnlyActivitySql } from "./issue-activity-filters.js";
|
|
10
10
|
import { listMessengerCustomGroups } from "./messenger-custom-groups.js";
|
|
11
|
+
import { loadFailedRunSummaryData } from "./messenger-failed-run-summary.js";
|
|
11
12
|
import { hydrateMessengerFailedRunOrigins, messengerFailedRunSourceAction, } from "./messenger-run-origin.js";
|
|
12
13
|
import { failedRunUserSummary } from "./messenger-run-summary.js";
|
|
13
14
|
import { deleteEmptyMessengerCustomGroup, lockMessengerCustomGroupPlacement, lockMessengerOwnerPlacement, lockMessengerSavedViewPlacement, } from "./messenger-saved-views.js";
|
|
@@ -807,7 +808,7 @@ export function messengerService(db) {
|
|
|
807
808
|
return data.itemCount > 0 ? data.summary : null;
|
|
808
809
|
}
|
|
809
810
|
case "failed-runs": {
|
|
810
|
-
const data = await loadFailedRunSummaryData(orgId, userId, syntheticThreadStates);
|
|
811
|
+
const data = await loadFailedRunSummaryData(db, orgId, userId, syntheticThreadStates);
|
|
811
812
|
return data.itemCount > 0 ? data.summary : null;
|
|
812
813
|
}
|
|
813
814
|
case "budget-alerts": {
|
|
@@ -2053,27 +2054,6 @@ export function messengerService(db) {
|
|
|
2053
2054
|
},
|
|
2054
2055
|
};
|
|
2055
2056
|
}
|
|
2056
|
-
async function loadFailedRunSummaryData(orgId, userId, threadStates) {
|
|
2057
|
-
const lastReadAt = await lastReadAtForThread(db, orgId, userId, "failed-runs", threadStates);
|
|
2058
|
-
const { runRows, requestRows } = await loadFailedRunRows(orgId, userId);
|
|
2059
|
-
const failureRows = [...runRows, ...requestRows];
|
|
2060
|
-
const itemCount = failureRows.length;
|
|
2061
|
-
const latestRow = [...failureRows].sort((a, b) => {
|
|
2062
|
-
const aTime = normalizeDate(a.updatedAt ?? a.createdAt)?.getTime() ?? Number.NEGATIVE_INFINITY;
|
|
2063
|
-
const bTime = normalizeDate(b.updatedAt ?? b.createdAt)?.getTime() ?? Number.NEGATIVE_INFINITY;
|
|
2064
|
-
return bTime - aTime;
|
|
2065
|
-
})[0] ?? null;
|
|
2066
|
-
const unreadCount = systemUnreadCountSince(failureRows, lastReadAt);
|
|
2067
|
-
const latestPreview = latestRow
|
|
2068
|
-
? "agentIssueCreationRequestId" in latestRow
|
|
2069
|
-
? failedRunSummary(latestRow)
|
|
2070
|
-
: failedAgentIssueRequestSummary(latestRow)
|
|
2071
|
-
: null;
|
|
2072
|
-
return {
|
|
2073
|
-
itemCount,
|
|
2074
|
-
summary: systemSummary("failed-runs", "Failed runs", itemCount, normalizeDate(latestRow?.updatedAt ?? latestRow?.createdAt ?? null), unreadCount, lastReadAt, "No failed runs yet", latestPreview),
|
|
2075
|
-
};
|
|
2076
|
-
}
|
|
2077
2057
|
async function loadBudgetAlertData(orgId, userId, threadStates) {
|
|
2078
2058
|
const lastReadAtPromise = lastReadAtForThread(db, orgId, userId, "budget-alerts", threadStates);
|
|
2079
2059
|
const incidents = ((await budgetsSvc.overview(orgId)).activeIncidents ?? []);
|
|
@@ -2184,7 +2164,7 @@ export function messengerService(db) {
|
|
|
2184
2164
|
? loadSplitIssueSummaries(orgId, userId, syntheticThreadStates, MAX_THREAD_SUMMARY_LIMIT)
|
|
2185
2165
|
: Promise.resolve([]),
|
|
2186
2166
|
loadApprovalThreadSummaryData(orgId, userId, syntheticThreadStates),
|
|
2187
|
-
loadFailedRunSummaryData(orgId, userId, syntheticThreadStates),
|
|
2167
|
+
loadFailedRunSummaryData(db, orgId, userId, syntheticThreadStates),
|
|
2188
2168
|
loadBudgetAlertData(orgId, userId, syntheticThreadStates),
|
|
2189
2169
|
loadJoinRequestSummaryData(orgId, userId, syntheticThreadStates),
|
|
2190
2170
|
]);
|
|
@@ -2223,7 +2203,7 @@ export function messengerService(db) {
|
|
|
2223
2203
|
? loadSplitIssueSummaries(orgId, userId, syntheticThreadStates, MAX_THREAD_SUMMARY_LIMIT)
|
|
2224
2204
|
: Promise.resolve([]),
|
|
2225
2205
|
loadApprovalThreadSummaryData(orgId, userId, syntheticThreadStates),
|
|
2226
|
-
loadFailedRunSummaryData(orgId, userId, syntheticThreadStates),
|
|
2206
|
+
loadFailedRunSummaryData(db, orgId, userId, syntheticThreadStates),
|
|
2227
2207
|
loadBudgetAlertData(orgId, userId, syntheticThreadStates),
|
|
2228
2208
|
loadJoinRequestSummaryData(orgId, userId, syntheticThreadStates),
|
|
2229
2209
|
]);
|