@rudderhq/server 0.2.0-canary.8 → 0.2.0
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/bootstrap/register-api-routes.d.ts.map +1 -1
- package/dist/bootstrap/register-api-routes.js +2 -0
- package/dist/bootstrap/register-api-routes.js.map +1 -1
- package/dist/bundled-plugins/plugin-linear/dist/ui/index.js +8 -1
- package/dist/bundled-plugins/plugin-linear/dist/ui/index.js.map +2 -2
- package/dist/bundled-plugins/plugin-linear/dist/worker.js +124 -117
- package/dist/bundled-plugins/plugin-linear/dist/worker.js.map +3 -3
- package/dist/home-paths.d.ts +2 -0
- package/dist/home-paths.d.ts.map +1 -1
- package/dist/home-paths.js +6 -1
- package/dist/home-paths.js.map +1 -1
- package/dist/index.d.ts +11 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +55 -2
- package/dist/index.js.map +1 -1
- package/dist/langfuse-transcript.d.ts.map +1 -1
- package/dist/langfuse-transcript.js +16 -2
- package/dist/langfuse-transcript.js.map +1 -1
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +54 -1
- package/dist/middleware/auth.js.map +1 -1
- package/dist/onboarding-assets/ceo/HEARTBEAT.md +8 -4
- package/dist/onboarding-assets/default/HEARTBEAT.md +7 -4
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +62 -3
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/approvals.d.ts.map +1 -1
- package/dist/routes/approvals.js +30 -1
- package/dist/routes/approvals.js.map +1 -1
- package/dist/routes/chats.d.ts.map +1 -1
- package/dist/routes/chats.js +343 -53
- package/dist/routes/chats.js.map +1 -1
- package/dist/routes/costs.d.ts.map +1 -1
- package/dist/routes/costs.js +20 -0
- package/dist/routes/costs.js.map +1 -1
- package/dist/routes/issues.d.ts.map +1 -1
- package/dist/routes/issues.js +229 -19
- package/dist/routes/issues.js.map +1 -1
- package/dist/routes/onboarding.d.ts +3 -0
- package/dist/routes/onboarding.d.ts.map +1 -0
- package/dist/routes/onboarding.js +545 -0
- package/dist/routes/onboarding.js.map +1 -0
- package/dist/routes/orgs.d.ts.map +1 -1
- package/dist/routes/orgs.js +22 -0
- package/dist/routes/orgs.js.map +1 -1
- package/dist/services/activity.d.ts.map +1 -1
- package/dist/services/activity.js +32 -1
- package/dist/services/activity.js.map +1 -1
- package/dist/services/agent-run-context.d.ts +1 -32
- package/dist/services/agent-run-context.d.ts.map +1 -1
- package/dist/services/agent-run-context.js +26 -128
- package/dist/services/agent-run-context.js.map +1 -1
- package/dist/services/agents.d.ts +26 -26
- package/dist/services/agents.d.ts.map +1 -1
- package/dist/services/agents.js +1 -42
- package/dist/services/agents.js.map +1 -1
- package/dist/services/assets.d.ts +2 -2
- package/dist/services/automations.d.ts +2 -2
- package/dist/services/calendar.d.ts +4 -4
- package/dist/services/chat-assistant.d.ts +12 -3
- package/dist/services/chat-assistant.d.ts.map +1 -1
- package/dist/services/chat-assistant.js +126 -99
- package/dist/services/chat-assistant.js.map +1 -1
- package/dist/services/chats.d.ts +88 -15
- package/dist/services/chats.d.ts.map +1 -1
- package/dist/services/chats.js +217 -14
- package/dist/services/chats.js.map +1 -1
- package/dist/services/costs.d.ts +21 -0
- package/dist/services/costs.d.ts.map +1 -1
- package/dist/services/costs.js +76 -2
- package/dist/services/costs.js.map +1 -1
- package/dist/services/finance.d.ts +2 -2
- package/dist/services/goals.d.ts +12 -12
- package/dist/services/instance-settings.d.ts.map +1 -1
- package/dist/services/instance-settings.js +25 -16
- package/dist/services/instance-settings.js.map +1 -1
- package/dist/services/issue-review-wakeup.d.ts +49 -1
- package/dist/services/issue-review-wakeup.d.ts.map +1 -1
- package/dist/services/issue-review-wakeup.js +39 -2
- package/dist/services/issue-review-wakeup.js.map +1 -1
- package/dist/services/issues.d.ts +2 -1
- package/dist/services/issues.d.ts.map +1 -1
- package/dist/services/issues.js +126 -5
- package/dist/services/issues.js.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.d.ts +1 -0
- package/dist/services/knowledge-portability/organization-skills.d.ts.map +1 -1
- package/dist/services/knowledge-portability/organization-skills.js +3 -2
- package/dist/services/knowledge-portability/organization-skills.js.map +1 -1
- package/dist/services/messenger.d.ts +5 -0
- package/dist/services/messenger.d.ts.map +1 -1
- package/dist/services/messenger.js +165 -11
- package/dist/services/messenger.js.map +1 -1
- package/dist/services/organization-workspace-browser.d.ts.map +1 -1
- package/dist/services/organization-workspace-browser.js +64 -9
- package/dist/services/organization-workspace-browser.js.map +1 -1
- package/dist/services/orgs.d.ts +1 -13
- package/dist/services/orgs.d.ts.map +1 -1
- package/dist/services/orgs.js +0 -2
- package/dist/services/orgs.js.map +1 -1
- package/dist/services/plugin-registry.d.ts +4 -4
- package/dist/services/projects.d.ts +1 -1
- package/dist/services/runtime-kernel/heartbeat.d.ts.map +1 -1
- package/dist/services/runtime-kernel/heartbeat.js +567 -29
- package/dist/services/runtime-kernel/heartbeat.js.map +1 -1
- package/dist/services/secrets.d.ts +5 -5
- package/dist/services/workspace-backups.d.ts.map +1 -1
- package/dist/services/workspace-backups.js +6 -0
- package/dist/services/workspace-backups.js.map +1 -1
- package/dist/services/workspace-runtime.d.ts.map +1 -1
- package/dist/services/workspace-runtime.js +2 -0
- package/dist/services/workspace-runtime.js.map +1 -1
- package/package.json +13 -13
- package/resources/bundled-skills/rudder/SKILL.md +72 -7
- package/resources/bundled-skills/rudder/references/cli-reference.md +34 -9
- package/resources/bundled-skills/rudder/references/organization-skills.md +12 -7
- package/resources/bundled-skills/rudder-create-agent/references/cli-reference.md +1 -0
- package/skills/rudder/SKILL.md +72 -7
- package/skills/rudder/references/cli-reference.md +34 -9
- package/skills/rudder/references/organization-skills.md +12 -7
- package/skills/rudder-create-agent/references/cli-reference.md +1 -0
- package/ui-dist/assets/{_basePickBy-DfISC403.js → _basePickBy-3Hg7N37c.js} +1 -1
- package/ui-dist/assets/{_baseUniq-s98gUpgR.js → _baseUniq-Bvy8WJh0.js} +1 -1
- package/ui-dist/assets/{arc-CR17323Q.js → arc-DrmvGX4U.js} +1 -1
- package/ui-dist/assets/{architectureDiagram-2XIMDMQ5-BzXAflU_.js → architectureDiagram-2XIMDMQ5-vbevcV-8.js} +1 -1
- package/ui-dist/assets/{blockDiagram-WCTKOSBZ-8TtjJ3eI.js → blockDiagram-WCTKOSBZ-DvupMRN9.js} +1 -1
- package/ui-dist/assets/{c4Diagram-IC4MRINW-CpDAvPEk.js → c4Diagram-IC4MRINW-CbsNVA8e.js} +1 -1
- package/ui-dist/assets/channel-DhW0A-FV.js +1 -0
- package/ui-dist/assets/{chunk-4BX2VUAB-DH5y5IcG.js → chunk-4BX2VUAB-BL4OUqNV.js} +1 -1
- package/ui-dist/assets/{chunk-55IACEB6-HUQ0oHmD.js → chunk-55IACEB6-DFwq2ebc.js} +1 -1
- package/ui-dist/assets/{chunk-FMBD7UC4-B_Tmn_aT.js → chunk-FMBD7UC4-Cyl6kF9G.js} +1 -1
- package/ui-dist/assets/{chunk-JSJVCQXG-COsiBBS-.js → chunk-JSJVCQXG-v4mfLtsY.js} +1 -1
- package/ui-dist/assets/{chunk-KX2RTZJC-Cvg_71ig.js → chunk-KX2RTZJC-Bfg48g5k.js} +1 -1
- package/ui-dist/assets/{chunk-NQ4KR5QH-BEW2kuUb.js → chunk-NQ4KR5QH-BcSdbequ.js} +1 -1
- package/ui-dist/assets/{chunk-QZHKN3VN-Bna2V6NY.js → chunk-QZHKN3VN-BT8QI712.js} +1 -1
- package/ui-dist/assets/{chunk-WL4C6EOR-DZ8gtX-v.js → chunk-WL4C6EOR-CqH2or9g.js} +1 -1
- package/ui-dist/assets/classDiagram-VBA2DB6C-Bw6kzUsz.js +1 -0
- package/ui-dist/assets/classDiagram-v2-RAHNMMFH-Bw6kzUsz.js +1 -0
- package/ui-dist/assets/clone-Luak8Fsn.js +1 -0
- package/ui-dist/assets/{cose-bilkent-S5V4N54A-kr92BRef.js → cose-bilkent-S5V4N54A-CLH06Lnz.js} +1 -1
- package/ui-dist/assets/{dagre-KLK3FWXG-D_g61aoF.js → dagre-KLK3FWXG-DxNQPDBj.js} +1 -1
- package/ui-dist/assets/{diagram-E7M64L7V-1LfSj6n8.js → diagram-E7M64L7V-BOcSeWh0.js} +1 -1
- package/ui-dist/assets/{diagram-IFDJBPK2-DK364c5M.js → diagram-IFDJBPK2-DXyaFKVr.js} +1 -1
- package/ui-dist/assets/{diagram-P4PSJMXO-CIq22L7l.js → diagram-P4PSJMXO-DhY_ls3C.js} +1 -1
- package/ui-dist/assets/{erDiagram-INFDFZHY-C2QX1WzN.js → erDiagram-INFDFZHY-QtL5Yt_b.js} +1 -1
- package/ui-dist/assets/{flowDiagram-PKNHOUZH-BXk0KTTB.js → flowDiagram-PKNHOUZH-BYqyaowc.js} +1 -1
- package/ui-dist/assets/{ganttDiagram-A5KZAMGK-D75CuaPG.js → ganttDiagram-A5KZAMGK-D4xd7J_z.js} +1 -1
- package/ui-dist/assets/{gitGraphDiagram-K3NZZRJ6-C_SvdzO5.js → gitGraphDiagram-K3NZZRJ6-Co9xqKNH.js} +1 -1
- package/ui-dist/assets/{graph-DTC5egc-.js → graph-DEC7S98H.js} +1 -1
- package/ui-dist/assets/{index-CEKv8ksn.js → index-4_gJOU3u.js} +1 -1
- package/ui-dist/assets/{index-CSzr8t_E.js → index-B8QjK4Xd.js} +1 -1
- package/ui-dist/assets/index-BLDnKx7N.js +1478 -0
- package/ui-dist/assets/{index-CqKwXFnI.js → index-BX6QyxsL.js} +1 -1
- package/ui-dist/assets/{index-DmSssfNa.js → index-BZGiyL9p.js} +1 -1
- package/ui-dist/assets/{index-BLvouPW7.js → index-BelfAyHh.js} +1 -1
- package/ui-dist/assets/index-BisI78wU.css +1 -0
- package/ui-dist/assets/{index-BUyOio4T.js → index-Bm86s0IY.js} +1 -1
- package/ui-dist/assets/{index-DLL28Pwh.js → index-Bz0jEwWG.js} +1 -1
- package/ui-dist/assets/{index--j9y8Fm1.js → index-CFANc8oH.js} +1 -1
- package/ui-dist/assets/{index-CjmpD1gl.js → index-CIAMqUzr.js} +1 -1
- package/ui-dist/assets/{index-lXemkB72.js → index-ClrueuiI.js} +1 -1
- package/ui-dist/assets/{index-D9UMKH7j.js → index-CpxwEuIg.js} +1 -1
- package/ui-dist/assets/{index-BI5DxFdZ.js → index-D1ZkASZY.js} +1 -1
- package/ui-dist/assets/{index-BkXN5tcA.js → index-DUP0i_Iv.js} +1 -1
- package/ui-dist/assets/{index-Be2KDBoW.js → index-DawkXomB.js} +1 -1
- package/ui-dist/assets/{index-CO0DiQaO.js → index-DxchV0Z7.js} +1 -1
- package/ui-dist/assets/{index-Bk9vEAxA.js → index-Dzd88G_H.js} +1 -1
- package/ui-dist/assets/{index-CyIEQyck.js → index-SklGX83C.js} +1 -1
- package/ui-dist/assets/{index-DL9Ygef7.js → index-_xX3B4n0.js} +1 -1
- package/ui-dist/assets/{index-8HHVhW-a.js → index-bVqVfFu5.js} +1 -1
- package/ui-dist/assets/{index-Dl-MnVEo.js → index-eIjkqSkc.js} +1 -1
- package/ui-dist/assets/{index-CNkqdDmO.js → index-mIrYeZR2.js} +1 -1
- package/ui-dist/assets/{index-CXBstvbt.js → index-xg2FQeSA.js} +1 -1
- package/ui-dist/assets/{infoDiagram-LFFYTUFH-DN2iczkC.js → infoDiagram-LFFYTUFH-BQ0qsBJ6.js} +1 -1
- package/ui-dist/assets/{ishikawaDiagram-PHBUUO56--Ku5ltXY.js → ishikawaDiagram-PHBUUO56-B1u2RAnY.js} +1 -1
- package/ui-dist/assets/{journeyDiagram-4ABVD52K-9wOJKEaq.js → journeyDiagram-4ABVD52K-Dv5wJGwT.js} +1 -1
- package/ui-dist/assets/{kanban-definition-K7BYSVSG-joaPa9x3.js → kanban-definition-K7BYSVSG-CJOykCsT.js} +1 -1
- package/ui-dist/assets/{layout-bH9QuYBa.js → layout-BDcM6t-f.js} +1 -1
- package/ui-dist/assets/{linear-CnfJ09Re.js → linear-B9Sm5Y96.js} +1 -1
- package/ui-dist/assets/{mermaid.core-CYkJAFnD.js → mermaid.core-lZPaf_Ix.js} +4 -4
- package/ui-dist/assets/{mindmap-definition-YRQLILUH-BQyC_8UY.js → mindmap-definition-YRQLILUH-Cu4HfP8K.js} +1 -1
- package/ui-dist/assets/{pieDiagram-SKSYHLDU-ev5uLtwW.js → pieDiagram-SKSYHLDU-B_v-Vluc.js} +1 -1
- package/ui-dist/assets/{quadrantDiagram-337W2JSQ-CQoe3akb.js → quadrantDiagram-337W2JSQ-BU1ZwGcS.js} +1 -1
- package/ui-dist/assets/{requirementDiagram-Z7DCOOCP-C9fd5-6o.js → requirementDiagram-Z7DCOOCP-DBOqB50G.js} +1 -1
- package/ui-dist/assets/{sankeyDiagram-WA2Y5GQK-Dznsr9L_.js → sankeyDiagram-WA2Y5GQK-CsXDIOlq.js} +1 -1
- package/ui-dist/assets/{sequenceDiagram-2WXFIKYE-jL7GufkU.js → sequenceDiagram-2WXFIKYE-Cmgr7vKy.js} +1 -1
- package/ui-dist/assets/{stateDiagram-RAJIS63D-C_4YyDYV.js → stateDiagram-RAJIS63D-Bd0uRbWd.js} +1 -1
- package/ui-dist/assets/stateDiagram-v2-FVOUBMTO-qGaY7iN1.js +1 -0
- package/ui-dist/assets/{timeline-definition-YZTLITO2-D8jKeAEo.js → timeline-definition-YZTLITO2-B9OfCgYQ.js} +1 -1
- package/ui-dist/assets/{treemap-KZPCXAKY-CV4vBepp.js → treemap-KZPCXAKY-FWWMNo03.js} +1 -1
- package/ui-dist/assets/{vennDiagram-LZ73GAT5-DAk_ThVs.js → vennDiagram-LZ73GAT5-CGs3T7cn.js} +1 -1
- package/ui-dist/assets/{xychartDiagram-JWTSCODW-D8wg1dlm.js → xychartDiagram-JWTSCODW-BJ6DrP1k.js} +1 -1
- package/ui-dist/index.html +2 -2
- package/ui-dist/assets/channel-BDMh8XFu.js +0 -1
- package/ui-dist/assets/classDiagram-VBA2DB6C-B6kvnvP_.js +0 -1
- package/ui-dist/assets/classDiagram-v2-RAHNMMFH-B6kvnvP_.js +0 -1
- package/ui-dist/assets/clone-B5CU-MlO.js +0 -1
- package/ui-dist/assets/index-CLXVCM5X.js +0 -1434
- package/ui-dist/assets/index-DoUUx1qN.css +0 -1
- package/ui-dist/assets/stateDiagram-v2-FVOUBMTO-BAU1MhTJ.js +0 -1
|
@@ -2,8 +2,14 @@ import { organizations, instanceSettings } from "@rudderhq/db";
|
|
|
2
2
|
import { instanceGeneralSettingsSchema, instanceNotificationSettingsSchema, } from "@rudderhq/shared";
|
|
3
3
|
import { eq } from "drizzle-orm";
|
|
4
4
|
const DEFAULT_SINGLETON_KEY = "default";
|
|
5
|
+
function stripLegacyGitIdentity(raw) {
|
|
6
|
+
if (!raw || typeof raw !== "object" || Array.isArray(raw))
|
|
7
|
+
return raw;
|
|
8
|
+
const { gitIdentity: _gitIdentity, ...rest } = raw;
|
|
9
|
+
return rest;
|
|
10
|
+
}
|
|
5
11
|
function normalizeGeneralSettings(raw) {
|
|
6
|
-
const parsed = instanceGeneralSettingsSchema.safeParse(raw ?? {});
|
|
12
|
+
const parsed = instanceGeneralSettingsSchema.safeParse(stripLegacyGitIdentity(raw) ?? {});
|
|
7
13
|
if (parsed.success) {
|
|
8
14
|
return {
|
|
9
15
|
censorUsernameInLogs: parsed.data.censorUsernameInLogs ?? false,
|
|
@@ -73,6 +79,23 @@ export function instanceSettingsService(db) {
|
|
|
73
79
|
.returning();
|
|
74
80
|
return created;
|
|
75
81
|
}
|
|
82
|
+
async function updateGeneralJson(patch) {
|
|
83
|
+
const current = await getOrCreateRow();
|
|
84
|
+
const nextGeneral = normalizeGeneralSettings({
|
|
85
|
+
...normalizeGeneralSettings(current.general),
|
|
86
|
+
...patch,
|
|
87
|
+
});
|
|
88
|
+
const now = new Date();
|
|
89
|
+
const [updated] = await db
|
|
90
|
+
.update(instanceSettings)
|
|
91
|
+
.set({
|
|
92
|
+
general: { ...nextGeneral },
|
|
93
|
+
updatedAt: now,
|
|
94
|
+
})
|
|
95
|
+
.where(eq(instanceSettings.id, current.id))
|
|
96
|
+
.returning();
|
|
97
|
+
return toInstanceSettings(updated ?? current);
|
|
98
|
+
}
|
|
76
99
|
return {
|
|
77
100
|
get: async () => toInstanceSettings(await getOrCreateRow()),
|
|
78
101
|
getGeneral: async () => {
|
|
@@ -84,21 +107,7 @@ export function instanceSettingsService(db) {
|
|
|
84
107
|
return normalizeNotificationSettings(row.notifications);
|
|
85
108
|
},
|
|
86
109
|
updateGeneral: async (patch) => {
|
|
87
|
-
|
|
88
|
-
const nextGeneral = normalizeGeneralSettings({
|
|
89
|
-
...normalizeGeneralSettings(current.general),
|
|
90
|
-
...patch,
|
|
91
|
-
});
|
|
92
|
-
const now = new Date();
|
|
93
|
-
const [updated] = await db
|
|
94
|
-
.update(instanceSettings)
|
|
95
|
-
.set({
|
|
96
|
-
general: { ...nextGeneral },
|
|
97
|
-
updatedAt: now,
|
|
98
|
-
})
|
|
99
|
-
.where(eq(instanceSettings.id, current.id))
|
|
100
|
-
.returning();
|
|
101
|
-
return toInstanceSettings(updated ?? current);
|
|
110
|
+
return updateGeneralJson(patch);
|
|
102
111
|
},
|
|
103
112
|
updateNotifications: async (patch) => {
|
|
104
113
|
const current = await getOrCreateRow();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EACL,6BAA6B,EAG7B,kCAAkC,GAKnC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAEjC,MAAM,qBAAqB,GAAG,SAAS,CAAC;AAExC,SAAS,wBAAwB,CAAC,GAAY;IAC5C,MAAM,MAAM,GAAG,6BAA6B,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,9 @@ export interface IssueReviewWakeupDeps {
|
|
|
11
11
|
contextSnapshot?: Record<string, unknown>;
|
|
12
12
|
}) => Promise<unknown>;
|
|
13
13
|
}
|
|
14
|
-
export type IssueReviewWakeupMutation = "status_to_in_review" | "reviewer_changed_in_review" | "create_in_review";
|
|
14
|
+
export type IssueReviewWakeupMutation = "status_to_in_review" | "status_to_blocked" | "reviewer_changed_in_review" | "reviewer_changed_blocked" | "create_in_review";
|
|
15
15
|
export type IssueConvergenceReviewWakeupMutation = "convergence_escalation";
|
|
16
|
+
export type IssueReviewCloseoutWakeupMutation = "review_outcome_missing";
|
|
16
17
|
type IssueReviewWakeupIssue = {
|
|
17
18
|
id: string;
|
|
18
19
|
identifier?: string | null;
|
|
@@ -101,6 +102,53 @@ export declare function buildIssueConvergenceReviewWakeupOptions(input: {
|
|
|
101
102
|
reviewInstructions: string;
|
|
102
103
|
};
|
|
103
104
|
};
|
|
105
|
+
export declare function buildIssueReviewCloseoutWakeupOptions(input: {
|
|
106
|
+
issue: IssueReviewWakeupIssue;
|
|
107
|
+
mutation?: IssueReviewCloseoutWakeupMutation;
|
|
108
|
+
contextSource: string;
|
|
109
|
+
originRunId: string;
|
|
110
|
+
previousRunId: string;
|
|
111
|
+
attempts: number;
|
|
112
|
+
maxAttempts: number;
|
|
113
|
+
requestedByActorType?: "user" | "agent" | "system";
|
|
114
|
+
requestedByActorId?: string | null;
|
|
115
|
+
}): {
|
|
116
|
+
source: "review";
|
|
117
|
+
triggerDetail: "system";
|
|
118
|
+
reason: string;
|
|
119
|
+
payload: {
|
|
120
|
+
issueId: string;
|
|
121
|
+
mutation: "review_outcome_missing";
|
|
122
|
+
originRunId: string;
|
|
123
|
+
previousRunId: string;
|
|
124
|
+
attempts: number;
|
|
125
|
+
maxAttempts: number;
|
|
126
|
+
};
|
|
127
|
+
requestedByActorType: "system" | "user" | "agent" | undefined;
|
|
128
|
+
requestedByActorId: string | null;
|
|
129
|
+
contextSnapshot: {
|
|
130
|
+
issueId: string;
|
|
131
|
+
source: string;
|
|
132
|
+
wakeSource: string;
|
|
133
|
+
wakeReason: string;
|
|
134
|
+
role: string;
|
|
135
|
+
issue: {
|
|
136
|
+
id: string;
|
|
137
|
+
identifier: string | null;
|
|
138
|
+
title: string;
|
|
139
|
+
description: string | null | undefined;
|
|
140
|
+
status: string;
|
|
141
|
+
priority: string | null | undefined;
|
|
142
|
+
};
|
|
143
|
+
reviewCloseout: {
|
|
144
|
+
originRunId: string;
|
|
145
|
+
previousRunId: string;
|
|
146
|
+
attempt: number;
|
|
147
|
+
maxAttempts: number;
|
|
148
|
+
};
|
|
149
|
+
reviewInstructions: string;
|
|
150
|
+
};
|
|
151
|
+
};
|
|
104
152
|
export declare function queueIssueReviewWakeup(input: {
|
|
105
153
|
heartbeat: IssueReviewWakeupDeps;
|
|
106
154
|
issue: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-review-wakeup.d.ts","sourceRoot":"","sources":["../../src/services/issue-review-wakeup.ts"],"names":[],"mappings":"AAEA,KAAK,mBAAmB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC;AACrE,KAAK,YAAY,GAAG,OAAO,GAAG,YAAY,GAAG,QAAQ,GAAG,WAAW,GAAG,YAAY,CAAC;AAEnF,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,CACN,OAAO,EAAE,MAAM,EACf,IAAI,EAAE;QACJ,MAAM,CAAC,EAAE,YAAY,CAAC;QACtB,aAAa,CAAC,EAAE,mBAAmB,CAAC;QACpC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;QACzC,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,CAAC;QACnD,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACnC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC3C,KACE,OAAO,CAAC,OAAO,CAAC,CAAC;CACvB;AAED,MAAM,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"issue-review-wakeup.d.ts","sourceRoot":"","sources":["../../src/services/issue-review-wakeup.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,9 @@ function buildIssueSnapshot(issue) {
|
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
12
|
export function buildIssueReviewWakeupOptions(input) {
|
|
13
|
+
const blockedInstructions = input.issue.status === "blocked"
|
|
14
|
+
? "The issue is blocked and has been routed to you as reviewer. Decide whether to confirm this as a human/external blocker, request changes, approve, or keep a specific follow-up open. If you confirm the blocker with `blocked`, write the next human action clearly; Rudder will record a human handoff and remove it from repeated reviewer pickup until the board changes the issue."
|
|
15
|
+
: "The issue is ready for review.";
|
|
13
16
|
return {
|
|
14
17
|
source: "review",
|
|
15
18
|
triggerDetail: "system",
|
|
@@ -24,7 +27,8 @@ export function buildIssueReviewWakeupOptions(input) {
|
|
|
24
27
|
wakeReason: "issue_review_requested",
|
|
25
28
|
role: "reviewer",
|
|
26
29
|
issue: buildIssueSnapshot(input.issue),
|
|
27
|
-
reviewInstructions:
|
|
30
|
+
reviewInstructions: `${blockedInstructions} Record one structured reviewer decision before exiting: approve, request_changes, needs_followup, or blocked. Use ` +
|
|
31
|
+
"`rudder issue review`; do not rely on a free-form comment as the durable outcome. Do not take over implementation unless explicitly asked.",
|
|
28
32
|
},
|
|
29
33
|
};
|
|
30
34
|
}
|
|
@@ -61,8 +65,41 @@ export function buildIssueConvergenceReviewWakeupOptions(input) {
|
|
|
61
65
|
},
|
|
62
66
|
};
|
|
63
67
|
}
|
|
68
|
+
export function buildIssueReviewCloseoutWakeupOptions(input) {
|
|
69
|
+
const mutation = input.mutation ?? "review_outcome_missing";
|
|
70
|
+
return {
|
|
71
|
+
source: "review",
|
|
72
|
+
triggerDetail: "system",
|
|
73
|
+
reason: "issue_review_closeout_missing",
|
|
74
|
+
payload: {
|
|
75
|
+
issueId: input.issue.id,
|
|
76
|
+
mutation,
|
|
77
|
+
originRunId: input.originRunId,
|
|
78
|
+
previousRunId: input.previousRunId,
|
|
79
|
+
attempts: input.attempts,
|
|
80
|
+
maxAttempts: input.maxAttempts,
|
|
81
|
+
},
|
|
82
|
+
requestedByActorType: input.requestedByActorType,
|
|
83
|
+
requestedByActorId: input.requestedByActorId ?? null,
|
|
84
|
+
contextSnapshot: {
|
|
85
|
+
issueId: input.issue.id,
|
|
86
|
+
source: input.contextSource,
|
|
87
|
+
wakeSource: "review",
|
|
88
|
+
wakeReason: "issue_review_closeout_missing",
|
|
89
|
+
role: "reviewer",
|
|
90
|
+
issue: buildIssueSnapshot(input.issue),
|
|
91
|
+
reviewCloseout: {
|
|
92
|
+
originRunId: input.originRunId,
|
|
93
|
+
previousRunId: input.previousRunId,
|
|
94
|
+
attempt: input.attempts,
|
|
95
|
+
maxAttempts: input.maxAttempts,
|
|
96
|
+
},
|
|
97
|
+
reviewInstructions: "Your previous reviewer run ended without a structured decision. Inspect the current issue state and record exactly one outcome with `rudder issue review --decision approve|request_changes|needs_followup|blocked --comment ...`.",
|
|
98
|
+
},
|
|
99
|
+
};
|
|
100
|
+
}
|
|
64
101
|
export function queueIssueReviewWakeup(input) {
|
|
65
|
-
if (!input.issue.reviewerAgentId || input.issue.status !== "in_review")
|
|
102
|
+
if (!input.issue.reviewerAgentId || (input.issue.status !== "in_review" && input.issue.status !== "blocked"))
|
|
66
103
|
return;
|
|
67
104
|
if (input.actorAgentId && input.issue.reviewerAgentId === input.actorAgentId)
|
|
68
105
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-review-wakeup.js","sourceRoot":"","sources":["../../src/services/issue-review-wakeup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"issue-review-wakeup.js","sourceRoot":"","sources":["../../src/services/issue-review-wakeup.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export interface IssueFilters {
|
|
|
8
8
|
assigneeUserId?: string;
|
|
9
9
|
reviewerAgentId?: string;
|
|
10
10
|
reviewerUserId?: string;
|
|
11
|
+
excludeReviewerConfirmedBlockedHandoff?: boolean;
|
|
11
12
|
touchedByUserId?: string;
|
|
12
13
|
unreadForUserId?: string;
|
|
13
14
|
projectId?: string;
|
|
@@ -61,9 +62,9 @@ export declare function issueService(db: Db): {
|
|
|
61
62
|
userId: string;
|
|
62
63
|
createdAt: Date;
|
|
63
64
|
issue: {
|
|
64
|
-
id: string;
|
|
65
65
|
identifier: string | null;
|
|
66
66
|
title: string;
|
|
67
|
+
id: string;
|
|
67
68
|
status: string;
|
|
68
69
|
priority: string;
|
|
69
70
|
assigneeAgentId: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issues.d.ts","sourceRoot":"","sources":["../../src/services/issues.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAgBL,MAAM,EACN,MAAM,EAGP,MAAM,cAAc,CAAC;AACtB,OAAO,
|
|
1
|
+
{"version":3,"file":"issues.d.ts","sourceRoot":"","sources":["../../src/services/issues.ts"],"names":[],"mappings":"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"}
|
package/dist/services/issues.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { and, asc, desc, eq, inArray, isNull, ne, or, sql } from "drizzle-orm";
|
|
2
2
|
import { activityLog, agents, assets, organizations, organizationMemberships, documents, goals, heartbeatRuns, executionWorkspaces, issueAttachments, issueFollows, issueLabels, issueComments, issueDocuments, issueReadStates, issues, labels, projectWorkspaces, projects, } from "@rudderhq/db";
|
|
3
|
-
import { extractAgentMentionIds, extractProjectMentionIds } from "@rudderhq/shared";
|
|
3
|
+
import { extractAgentMentionIds, extractProjectMentionIds, } from "@rudderhq/shared";
|
|
4
4
|
import { conflict, notFound, unprocessable } from "../errors.js";
|
|
5
5
|
import { defaultIssueExecutionWorkspaceSettingsForProject, parseProjectExecutionWorkspacePolicy, } from "./execution-workspace-policy.js";
|
|
6
6
|
import { instanceSettingsService } from "./instance-settings.js";
|
|
@@ -48,6 +48,35 @@ const TERMINAL_HEARTBEAT_RUN_STATUSES = new Set(["succeeded", "failed", "cancell
|
|
|
48
48
|
function escapeLikePattern(value) {
|
|
49
49
|
return value.replace(/[\\%_]/g, "\\$&");
|
|
50
50
|
}
|
|
51
|
+
function textContains(value, query) {
|
|
52
|
+
return Boolean(value && value.toLowerCase().includes(query.toLowerCase()));
|
|
53
|
+
}
|
|
54
|
+
function buildSearchSnippet(value, query, maxLength = 160) {
|
|
55
|
+
const compact = value.replace(/\s+/g, " ").trim();
|
|
56
|
+
if (compact.length <= maxLength)
|
|
57
|
+
return compact;
|
|
58
|
+
const index = compact.toLowerCase().indexOf(query.toLowerCase());
|
|
59
|
+
if (index < 0)
|
|
60
|
+
return `${compact.slice(0, maxLength - 1).trimEnd()}…`;
|
|
61
|
+
const context = Math.max(20, Math.floor((maxLength - query.length) / 2));
|
|
62
|
+
const start = Math.max(0, index - context);
|
|
63
|
+
const end = Math.min(compact.length, start + maxLength);
|
|
64
|
+
const prefix = start > 0 ? "…" : "";
|
|
65
|
+
const suffix = end < compact.length ? "…" : "";
|
|
66
|
+
return `${prefix}${compact.slice(start, end).trim()}${suffix}`;
|
|
67
|
+
}
|
|
68
|
+
function fieldSearchMatch(row, query) {
|
|
69
|
+
if (textContains(row.identifier, query)) {
|
|
70
|
+
return { field: "identifier", snippet: buildSearchSnippet(row.identifier, query) };
|
|
71
|
+
}
|
|
72
|
+
if (textContains(row.title, query)) {
|
|
73
|
+
return { field: "title", snippet: buildSearchSnippet(row.title, query) };
|
|
74
|
+
}
|
|
75
|
+
if (textContains(row.description, query)) {
|
|
76
|
+
return { field: "description", snippet: buildSearchSnippet(row.description, query) };
|
|
77
|
+
}
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
51
80
|
function touchedByUserCondition(orgId, userId) {
|
|
52
81
|
return sql `
|
|
53
82
|
(
|
|
@@ -389,6 +418,43 @@ export function issueService(db) {
|
|
|
389
418
|
.then((rows) => rows[0] ?? null);
|
|
390
419
|
return adopted;
|
|
391
420
|
}
|
|
421
|
+
async function attachSearchMatches(orgId, rows, query, containsPattern) {
|
|
422
|
+
if (rows.length === 0)
|
|
423
|
+
return [];
|
|
424
|
+
const matchesByIssueId = new Map();
|
|
425
|
+
for (const row of rows) {
|
|
426
|
+
const match = fieldSearchMatch(row, query);
|
|
427
|
+
if (match)
|
|
428
|
+
matchesByIssueId.set(row.id, match);
|
|
429
|
+
}
|
|
430
|
+
const commentMatchedIssueIds = rows
|
|
431
|
+
.map((row) => row.id)
|
|
432
|
+
.filter((id) => !matchesByIssueId.has(id));
|
|
433
|
+
if (commentMatchedIssueIds.length > 0) {
|
|
434
|
+
const commentRows = await db
|
|
435
|
+
.select({
|
|
436
|
+
id: issueComments.id,
|
|
437
|
+
issueId: issueComments.issueId,
|
|
438
|
+
body: issueComments.body,
|
|
439
|
+
})
|
|
440
|
+
.from(issueComments)
|
|
441
|
+
.where(and(eq(issueComments.orgId, orgId), inArray(issueComments.issueId, commentMatchedIssueIds), sql `${issueComments.body} ILIKE ${containsPattern} ESCAPE '\\'`))
|
|
442
|
+
.orderBy(asc(issueComments.createdAt));
|
|
443
|
+
for (const comment of commentRows) {
|
|
444
|
+
if (matchesByIssueId.has(comment.issueId))
|
|
445
|
+
continue;
|
|
446
|
+
matchesByIssueId.set(comment.issueId, {
|
|
447
|
+
field: "comment",
|
|
448
|
+
snippet: buildSearchSnippet(comment.body, query),
|
|
449
|
+
commentId: comment.id,
|
|
450
|
+
});
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
return rows.map((row) => ({
|
|
454
|
+
...row,
|
|
455
|
+
searchMatch: matchesByIssueId.get(row.id) ?? null,
|
|
456
|
+
}));
|
|
457
|
+
}
|
|
392
458
|
return {
|
|
393
459
|
listFollows: async (orgId, userId) => {
|
|
394
460
|
const rows = await db
|
|
@@ -496,6 +562,58 @@ export function issueService(db) {
|
|
|
496
562
|
if (filters?.reviewerAgentId) {
|
|
497
563
|
conditions.push(eq(issues.reviewerAgentId, filters.reviewerAgentId));
|
|
498
564
|
}
|
|
565
|
+
if (filters?.excludeReviewerConfirmedBlockedHandoff && filters?.reviewerAgentId) {
|
|
566
|
+
conditions.push(sql `
|
|
567
|
+
NOT (
|
|
568
|
+
${issues.status} = 'blocked'
|
|
569
|
+
AND EXISTS (
|
|
570
|
+
SELECT 1
|
|
571
|
+
FROM activity_log confirmed_blocked_review
|
|
572
|
+
WHERE confirmed_blocked_review.org_id = ${orgId}
|
|
573
|
+
AND confirmed_blocked_review.entity_type = 'issue'
|
|
574
|
+
AND confirmed_blocked_review.entity_id = ${issues.id}::text
|
|
575
|
+
AND confirmed_blocked_review.action = 'issue.review_decision_recorded'
|
|
576
|
+
AND confirmed_blocked_review.actor_type = 'agent'
|
|
577
|
+
AND confirmed_blocked_review.actor_id = ${filters.reviewerAgentId}::text
|
|
578
|
+
AND confirmed_blocked_review.details ->> 'decision' = 'blocked'
|
|
579
|
+
AND confirmed_blocked_review.created_at >= COALESCE((
|
|
580
|
+
SELECT MAX(material_activity.created_at)
|
|
581
|
+
FROM activity_log material_activity
|
|
582
|
+
WHERE material_activity.org_id = ${orgId}
|
|
583
|
+
AND material_activity.entity_type = 'issue'
|
|
584
|
+
AND material_activity.entity_id = ${issues.id}::text
|
|
585
|
+
AND (
|
|
586
|
+
(
|
|
587
|
+
material_activity.action = 'issue.updated'
|
|
588
|
+
AND jsonb_typeof(material_activity.details) = 'object'
|
|
589
|
+
AND EXISTS (
|
|
590
|
+
SELECT 1
|
|
591
|
+
FROM jsonb_object_keys(material_activity.details) AS detail_key(key)
|
|
592
|
+
WHERE detail_key.key NOT IN (
|
|
593
|
+
'identifier',
|
|
594
|
+
'issueIdentifier',
|
|
595
|
+
'_previous',
|
|
596
|
+
'source',
|
|
597
|
+
'reopened',
|
|
598
|
+
'reopenedFrom',
|
|
599
|
+
'normalizedFromStatus',
|
|
600
|
+
'normalizedReason'
|
|
601
|
+
)
|
|
602
|
+
)
|
|
603
|
+
)
|
|
604
|
+
OR (
|
|
605
|
+
material_activity.action = 'issue.comment_added'
|
|
606
|
+
AND NOT (
|
|
607
|
+
material_activity.actor_type = 'agent'
|
|
608
|
+
AND material_activity.actor_id = ${filters.reviewerAgentId}::text
|
|
609
|
+
)
|
|
610
|
+
)
|
|
611
|
+
)
|
|
612
|
+
), to_timestamp(0))
|
|
613
|
+
)
|
|
614
|
+
)
|
|
615
|
+
`);
|
|
616
|
+
}
|
|
499
617
|
if (filters?.reviewerUserId) {
|
|
500
618
|
conditions.push(eq(issues.reviewerUserId, filters.reviewerUserId));
|
|
501
619
|
}
|
|
@@ -549,10 +667,13 @@ export function issueService(db) {
|
|
|
549
667
|
const withLabels = await withIssueLabels(db, rows);
|
|
550
668
|
const runMap = await activeRunMapForIssues(db, withLabels);
|
|
551
669
|
const withRuns = withActiveRuns(withLabels, runMap);
|
|
552
|
-
|
|
553
|
-
|
|
670
|
+
const withSearchMatches = hasSearch
|
|
671
|
+
? await attachSearchMatches(orgId, withRuns, rawSearch, containsPattern)
|
|
672
|
+
: withRuns;
|
|
673
|
+
if (!contextUserId || withSearchMatches.length === 0) {
|
|
674
|
+
return withSearchMatches;
|
|
554
675
|
}
|
|
555
|
-
const issueIds =
|
|
676
|
+
const issueIds = withSearchMatches.map((row) => row.id);
|
|
556
677
|
const statsRows = await db
|
|
557
678
|
.select({
|
|
558
679
|
issueId: issueComments.issueId,
|
|
@@ -580,7 +701,7 @@ export function issueService(db) {
|
|
|
580
701
|
.where(and(eq(issueReadStates.orgId, orgId), eq(issueReadStates.userId, contextUserId), inArray(issueReadStates.issueId, issueIds)));
|
|
581
702
|
const statsByIssueId = new Map(statsRows.map((row) => [row.issueId, row]));
|
|
582
703
|
const readByIssueId = new Map(readRows.map((row) => [row.issueId, row.myLastReadAt]));
|
|
583
|
-
return
|
|
704
|
+
return withSearchMatches.map((row) => ({
|
|
584
705
|
...row,
|
|
585
706
|
...deriveIssueUserContext(row, contextUserId, {
|
|
586
707
|
myLastCommentAt: statsByIssueId.get(row.id)?.myLastCommentAt ?? null,
|