npm - @rudderhq/server - Versions diffs - 0.2.0-canary.9 → 0.2.1 - Mend

@rudderhq/server 0.2.0-canary.9 → 0.2.1

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.

Files changed (196) hide show

package/dist/services/costs.d.ts CHANGED Viewed

@@ -5,6 +5,10 @@ export interface CostDateRange {
     from?: Date;
     to?: Date;
 }
+export interface CostTrendFilter {
+    agentId?: string;
+    projectId?: string;
+}
 export declare function costService(db: Db, budgetHooks?: BudgetServiceHooks): {
     createEvent: (orgId: string, data: Omit<typeof costEvents.$inferInsert, "orgId">) => Promise<{
         id: string;
@@ -31,10 +35,27 @@ export declare function costService(db: Db, budgetHooks?: BudgetServiceHooks): {
         spendCents: number;
         budgetCents: number;
         utilizationPercent: number;
+        inputTokens: number;
+        cachedInputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        eventCount: number;
+        tokenEventCount: number;
     }>;
+    trend: (orgId: string, range?: CostDateRange, filter?: CostTrendFilter) => Promise<{
+        date: string;
+        costCents: number;
+        inputTokens: number;
+        cachedInputTokens: number;
+        outputTokens: number;
+        totalTokens: number;
+        eventCount: number;
+    }[]>;
     byAgent: (orgId: string, range?: CostDateRange) => Promise<{
         agentId: string;
         agentName: string | null;
+        agentIcon: string | null;
+        agentRole: string | null;
         agentStatus: string | null;
         costCents: number;
         inputTokens: number;

package/dist/services/costs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"costs.d.ts","sourceRoot":"","sources":["../../src/services/costs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAsC,UAAU,EAAoB,MAAM,cAAc,CAAC;AAGhG,OAAO,EAAiB,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,EAAE,CAAC,EAAE,IAAI,CAAC;CACX;~~AAoCD~~,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,GAAE,kBAAuB;yBAGzC,MAAM,QAAQ,IAAI,CAAC,OAAO,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;qBAqF/D,MAAM,UAAU,aAAa~~;;;;;;qBAkC7B~~,MAAM,UAAU,aAAa~~;;;;;;;;;;;;;;wBAgC1B~~,MAAM,UAAU,aAAa;;;;;;;;;;;;;;;sBAgC/B,MAAM,UAAU,aAAa;;;;;;;;;;;;;;IA+BrD;;;;OAIG;yBACwB,MAAM;;;gBAgCR,MAAM;;;;;;;0BAaH,MAAM,UAAU,aAAa;;;;;;;;;;;;uBAoChC,MAAM,UAAU,aAAa;;;;;;;;EAkDzD"}
1	+ {"version":3,"file":"costs.d.ts","sourceRoot":"","sources":["../../src/services/costs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAsC,UAAU,EAAoB,MAAM,cAAc,CAAC;AAGhG,OAAO,EAAiB,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,EAAE,CAAC,EAAE,IAAI,CAAC;CACX;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAgED,wBAAgB,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,WAAW,GAAE,kBAAuB;yBAGzC,MAAM,QAAQ,IAAI,CAAC,OAAO,UAAU,CAAC,YAAY,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;;;;;;qBAqF/D,MAAM,UAAU,aAAa;;;;;;;;;;;;mBAwD/B,MAAM,UAAU,aAAa,WAAU,eAAe;;;;;;;;;qBA0EpD,MAAM,UAAU,aAAa;;;;;;;;;;;;;;;;wBAkC1B,MAAM,UAAU,aAAa;;;;;;;;;;;;;;;sBAgC/B,MAAM,UAAU,aAAa;;;;;;;;;;;;;;IA+BrD;;;;OAIG;yBACwB,MAAM;;;gBAgCR,MAAM;;;;;;;0BAaH,MAAM,UAAU,aAAa;;;;;;;;;;;;uBAoChC,MAAM,UAAU,aAAa;;;;;;;;EAkDzD"}

package/dist/services/costs.js CHANGED Viewed

@@ -5,6 +5,32 @@ import { observeExecutionEvent } from "../langfuse.js";
 import { budgetService } from "./budgets.js";
 const METERED_BILLING_TYPE = "metered_api";
 const SUBSCRIPTION_BILLING_TYPES = ["subscription_included", "subscription_overage"];
+function totalTokenCountSql() {
+    return sql `
+    coalesce(sum(
+      case
+        when ${costEvents.cachedInputTokens} > ${costEvents.inputTokens}
+          then ${costEvents.inputTokens} + ${costEvents.cachedInputTokens} + ${costEvents.outputTokens}
+        else ${costEvents.inputTokens} + ${costEvents.outputTokens}
+      end
+    ), 0)::int
+  `;
+}
+function tokenEventCountSql() {
+    return sql `
+    coalesce(sum(
+      case
+        when (
+          case
+            when ${costEvents.cachedInputTokens} > ${costEvents.inputTokens}
+              then ${costEvents.inputTokens} + ${costEvents.cachedInputTokens} + ${costEvents.outputTokens}
+            else ${costEvents.inputTokens} + ${costEvents.outputTokens}
+          end
+        ) > 0 then 1 else 0
+      end
+    ), 0)::int
+  `;
+}
 function currentUtcMonthWindow(now = new Date()) {
     const year = now.getUTCFullYear();
     const month = now.getUTCMonth();
@@ -121,12 +147,19 @@ export function costService(db, budgetHooks = {}) {
                 conditions.push(gte(costEvents.occurredAt, range.from));
             if (range?.to)
                 conditions.push(lte(costEvents.occurredAt, range.to));
-            const [{ total }] = await db
+            const [summaryRow] = await db
                 .select({
                 total: sql `coalesce(sum(${costEvents.costCents}), 0)::int`,
+                inputTokens: sql `coalesce(sum(${costEvents.inputTokens}), 0)::int`,
+                cachedInputTokens: sql `coalesce(sum(${costEvents.cachedInputTokens}), 0)::int`,
+                outputTokens: sql `coalesce(sum(${costEvents.outputTokens}), 0)::int`,
+                totalTokens: totalTokenCountSql(),
+                eventCount: sql `count(*)::int`,
+                tokenEventCount: tokenEventCountSql(),
             })
                 .from(costEvents)
                 .where(and(...conditions));
+            const { total, inputTokens, cachedInputTokens, outputTokens, totalTokens, eventCount, tokenEventCount, } = summaryRow;
             const spendCents = Number(total);
             const utilization = organization.budgetMonthlyCents > 0
                 ? (spendCents / organization.budgetMonthlyCents) * 100
@@ -136,8 +169,73 @@ export function costService(db, budgetHooks = {}) {
                 spendCents,
                 budgetCents: organization.budgetMonthlyCents,
                 utilizationPercent: Number(utilization.toFixed(2)),
+                inputTokens: Number(inputTokens),
+                cachedInputTokens: Number(cachedInputTokens),
+                outputTokens: Number(outputTokens),
+                totalTokens: Number(totalTokens),
+                eventCount: Number(eventCount),
+                tokenEventCount: Number(tokenEventCount),
             };
         },
+        trend: async (orgId, range, filter = {}) => {
+            const conditions = [eq(costEvents.orgId, orgId)];
+            if (range?.from)
+                conditions.push(gte(costEvents.occurredAt, range.from));
+            if (range?.to)
+                conditions.push(lte(costEvents.occurredAt, range.to));
+            if (filter.agentId)
+                conditions.push(eq(costEvents.agentId, filter.agentId));
+            const dateBucket = sql `to_char(date_trunc('day', ${costEvents.occurredAt} at time zone 'UTC'), 'YYYY-MM-DD')`;
+            const costCentsExpr = sql `coalesce(sum(${costEvents.costCents}), 0)::int`;
+            const inputTokensExpr = sql `coalesce(sum(${costEvents.inputTokens}), 0)::int`;
+            const cachedInputTokensExpr = sql `coalesce(sum(${costEvents.cachedInputTokens}), 0)::int`;
+            const outputTokensExpr = sql `coalesce(sum(${costEvents.outputTokens}), 0)::int`;
+            const totalTokensExpr = totalTokenCountSql();
+            if (filter.projectId) {
+                const issueIdAsText = sql `${issues.id}::text`;
+                const runProjectLinks = db
+                    .selectDistinctOn([activityLog.runId, issues.projectId], {
+                    runId: activityLog.runId,
+                    projectId: issues.projectId,
+                })
+                    .from(activityLog)
+                    .innerJoin(issues, and(eq(activityLog.entityType, "issue"), eq(activityLog.entityId, issueIdAsText)))
+                    .where(and(eq(activityLog.orgId, orgId), eq(issues.orgId, orgId), isNotNull(activityLog.runId), isNotNull(issues.projectId)))
+                    .orderBy(activityLog.runId, issues.projectId, desc(activityLog.createdAt))
+                    .as("run_project_links");
+                const effectiveProjectId = sql `coalesce(${costEvents.projectId}, ${runProjectLinks.projectId})`;
+                conditions.push(sql `${effectiveProjectId} = ${filter.projectId}`);
+                return db
+                    .select({
+                    date: dateBucket,
+                    costCents: costCentsExpr,
+                    inputTokens: inputTokensExpr,
+                    cachedInputTokens: cachedInputTokensExpr,
+                    outputTokens: outputTokensExpr,
+                    totalTokens: totalTokensExpr,
+                    eventCount: sql `count(*)::int`,
+                })
+                    .from(costEvents)
+                    .leftJoin(runProjectLinks, eq(costEvents.heartbeatRunId, runProjectLinks.runId))
+                    .where(and(...conditions))
+                    .groupBy(dateBucket)
+                    .orderBy(dateBucket);
+            }
+            return db
+                .select({
+                date: dateBucket,
+                costCents: costCentsExpr,
+                inputTokens: inputTokensExpr,
+                cachedInputTokens: cachedInputTokensExpr,
+                outputTokens: outputTokensExpr,
+                totalTokens: totalTokensExpr,
+                eventCount: sql `count(*)::int`,
+            })
+                .from(costEvents)
+                .where(and(...conditions))
+                .groupBy(dateBucket)
+                .orderBy(dateBucket);
+        },
         byAgent: async (orgId, range) => {
             const conditions = [eq(costEvents.orgId, orgId)];
             if (range?.from)
@@ -148,6 +246,8 @@ export function costService(db, budgetHooks = {}) {
                 .select({
                 agentId: costEvents.agentId,
                 agentName: agents.name,
+                agentIcon: agents.icon,
+                agentRole: agents.role,
                 agentStatus: agents.status,
                 costCents: sql `coalesce(sum(${costEvents.costCents}), 0)::int`,
                 inputTokens: sql `coalesce(sum(${costEvents.inputTokens}), 0)::int`,
@@ -162,7 +262,7 @@ export function costService(db, budgetHooks = {}) {
                 .from(costEvents)
                 .leftJoin(agents, eq(costEvents.agentId, agents.id))
                 .where(and(...conditions))
-                .groupBy(costEvents.agentId, agents.name, agents.status)
+                .groupBy(costEvents.agentId, agents.name, agents.icon, agents.role, agents.status)
                 .orderBy(desc(sql `coalesce(sum(${costEvents.costCents}), 0)::int`));
         },
         byProvider: async (orgId, range) => {

package/dist/services/costs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"costs.js","sourceRoot":"","sources":["../../src/services/costs.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"costs.js","sourceRoot":"","sources":["../../src/services/costs.ts"],"names":[],"mappings":"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"}

package/dist/services/finance.d.ts CHANGED Viewed

@@ -6,11 +6,11 @@ export interface FinanceDateRange {
 }
 export declare function financeService(db: Db): {
     createEvent: (orgId: string, data: Omit<typeof financeEvents.$inferInsert, "orgId">) => Promise<{
+        description: string | null;
         id: string;
         orgId: string;
         projectId: string | null;
         goalId: string | null;
-        description: string | null;
         billingCode: string | null;
         createdAt: Date;
         provider: string | null;
@@ -61,11 +61,11 @@ export declare function financeService(db: Db): {
         netCents: number;
     }[]>;
     list: (orgId: string, range?: FinanceDateRange, limit?: number) => Promise<{
+        description: string | null;
         id: string;
         orgId: string;
         projectId: string | null;
         goalId: string | null;
-        description: string | null;
         billingCode: string | null;
         createdAt: Date;
         provider: string | null;

package/dist/services/goals.d.ts CHANGED Viewed

@@ -6,13 +6,13 @@ type GoalRow = typeof goals.$inferSelect;
 type GoalInput = Omit<typeof goals.$inferInsert, "orgId">;
 type GoalPatch = Partial<typeof goals.$inferInsert>;
 export declare function getDefaultCompanyGoal(db: GoalReader, orgId: string): Promise<{
-    id: string;
     title: string;
+    description: string | null;
+    id: string;
     status: string;
     updatedAt: Date;
     orgId: string;
     parentId: string | null;
-    description: string | null;
     createdAt: Date;
     ownerAgentId: string | null;
     level: string;
@@ -191,13 +191,13 @@ export declare function goalService(db: Db): {
             generated: undefined;
         }, {}, {}>;
     }, "single", Record<"goals", "not-null">, false, "where", {
-        id: string;
         title: string;
+        description: string | null;
+        id: string;
         status: string;
         updatedAt: Date;
         orgId: string;
         parentId: string | null;
-        description: string | null;
         createdAt: Date;
         ownerAgentId: string | null;
         level: string;
@@ -374,38 +374,38 @@ export declare function goalService(db: Db): {
         }, {}, {}>;
     }>, "where">;
     getById: (id: string) => Promise<{
-        id: string;
         title: string;
+        description: string | null;
+        id: string;
         status: string;
         updatedAt: Date;
         orgId: string;
         parentId: string | null;
-        description: string | null;
         createdAt: Date;
         ownerAgentId: string | null;
         level: string;
     }>;
     getDefaultCompanyGoal: (orgId: string) => Promise<{
-        id: string;
         title: string;
+        description: string | null;
+        id: string;
         status: string;
         updatedAt: Date;
         orgId: string;
         parentId: string | null;
-        description: string | null;
         createdAt: Date;
         ownerAgentId: string | null;
         level: string;
     }>;
     dependencies: (goal: GoalRow) => Promise<GoalDependencies>;
     create: (orgId: string, data: GoalInput) => Promise<{
-        id: string;
         title: string;
+        description: string | null;
+        id: string;
         status: string;
         updatedAt: Date;
         orgId: string;
         parentId: string | null;
-        description: string | null;
         createdAt: Date;
         ownerAgentId: string | null;
         level: string;
@@ -423,13 +423,13 @@ export declare function goalService(db: Db): {
         updatedAt: Date;
     } | null>;
     remove: (id: string) => Promise<{
-        id: string;
         title: string;
+        description: string | null;
+        id: string;
         status: string;
         updatedAt: Date;
         orgId: string;
         parentId: string | null;
-        description: string | null;
         createdAt: Date;
         ownerAgentId: string | null;
         level: string;

package/dist/services/instance-settings.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"instance-settings.d.ts","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,cAAc,EAEnB,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EACjC,KAAK,iCAAiC,EACtC,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;~~AAmB1B~~,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAEpE;AAgCD,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,EAAE;~~eA+B3B~~,OAAO,CAAC,gBAAgB,CAAC;sBAElB,OAAO,CAAC,uBAAuB,CAAC;4BAK1B,OAAO,CAAC,4BAA4B,CAAC;2BAKpC,4BAA4B,KAAG,OAAO,CAAC,gBAAgB,CAAC;~~iCAkBlD~~,iCAAiC,KAAG,OAAO,CAAC,gBAAgB,CAAC;0BA6BtE,OAAO,CAAC,MAAM,EAAE,CAAC;EAM9C"}
1	+ {"version":3,"file":"instance-settings.d.ts","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,cAAc,EAEnB,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EACjC,KAAK,iCAAiC,EACtC,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AA2B1B,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAEpE;AAgCD,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,EAAE;eAiD3B,OAAO,CAAC,gBAAgB,CAAC;sBAElB,OAAO,CAAC,uBAAuB,CAAC;4BAK1B,OAAO,CAAC,4BAA4B,CAAC;2BAKpC,4BAA4B,KAAG,OAAO,CAAC,gBAAgB,CAAC;iCAIlD,iCAAiC,KAAG,OAAO,CAAC,gBAAgB,CAAC;0BA6BtE,OAAO,CAAC,MAAM,EAAE,CAAC;EAM9C"}

package/dist/services/instance-settings.js CHANGED Viewed

@@ -2,16 +2,24 @@ import { organizations, instanceSettings } from "@rudderhq/db";
 import { instanceGeneralSettingsSchema, instanceNotificationSettingsSchema, } from "@rudderhq/shared";
 import { eq } from "drizzle-orm";
 const DEFAULT_SINGLETON_KEY = "default";
+function stripLegacyGitIdentity(raw) {
+    if (!raw || typeof raw !== "object" || Array.isArray(raw))
+        return raw;
+    const { gitIdentity: _gitIdentity, ...rest } = raw;
+    return rest;
+}
 function normalizeGeneralSettings(raw) {
-    const parsed = instanceGeneralSettingsSchema.safeParse(raw ?? {});
+    const parsed = instanceGeneralSettingsSchema.safeParse(stripLegacyGitIdentity(raw) ?? {});
     if (parsed.success) {
         return {
             censorUsernameInLogs: parsed.data.censorUsernameInLogs ?? false,
+            showDeveloperDiagnostics: parsed.data.showDeveloperDiagnostics ?? false,
             locale: parsed.data.locale ?? "en",
         };
     }
     return {
         censorUsernameInLogs: false,
+        showDeveloperDiagnostics: false,
         locale: "en",
     };
 }
@@ -73,6 +81,23 @@ export function instanceSettingsService(db) {
             .returning();
         return created;
     }
+    async function updateGeneralJson(patch) {
+        const current = await getOrCreateRow();
+        const nextGeneral = normalizeGeneralSettings({
+            ...normalizeGeneralSettings(current.general),
+            ...patch,
+        });
+        const now = new Date();
+        const [updated] = await db
+            .update(instanceSettings)
+            .set({
+            general: { ...nextGeneral },
+            updatedAt: now,
+        })
+            .where(eq(instanceSettings.id, current.id))
+            .returning();
+        return toInstanceSettings(updated ?? current);
+    }
     return {
         get: async () => toInstanceSettings(await getOrCreateRow()),
         getGeneral: async () => {
@@ -84,21 +109,7 @@ export function instanceSettingsService(db) {
             return normalizeNotificationSettings(row.notifications);
         },
         updateGeneral: async (patch) => {
-            const current = await getOrCreateRow();
-            const nextGeneral = normalizeGeneralSettings({
-                ...normalizeGeneralSettings(current.general),
-                ...patch,
-            });
-            const now = new Date();
-            const [updated] = await db
-                .update(instanceSettings)
-                .set({
-                general: { ...nextGeneral },
-                updatedAt: now,
-            })
-                .where(eq(instanceSettings.id, current.id))
-                .returning();
-            return toInstanceSettings(updated ?? current);
+            return updateGeneralJson(patch);
         },
         updateNotifications: async (patch) => {
             const current = await getOrCreateRow();

package/dist/services/instance-settings.js.map CHANGED Viewed

	@@ -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;~~IAClE~~,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO;YACL,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,oBAAoB,IAAI,KAAK;YAC/D,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI;SACnC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,oBAAoB,EAAE,KAAK;QAC3B,MAAM,EAAE,IAAI;KACb,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAY;IAClD,OAAO,wBAAwB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;AAC1D,CAAC;AAED,SAAS,6BAA6B,CAAC,GAAY;IACjD,MAAM,MAAM,GAAG,kCAAkC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACvE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,yBAAyB,GAC7B,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC;QACzF,OAAO;YACL,yBAAyB,EAAE,yBAAyB;YACpD,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,IAAI,IAAI;YACtD,yBAAyB;YACzB,wBAAwB,EAAE,MAAM,CAAC,IAAI,CAAC,wBAAwB,IAAI,IAAI;SACvE,CAAC;IACJ,CAAC;IACD,OAAO;QACL,yBAAyB,EAAE,IAAI;QAC/B,gBAAgB,EAAE,IAAI;QACtB,yBAAyB,EAAE,IAAI;QAC/B,wBAAwB,EAAE,IAAI;KAC/B,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAyC;IACnE,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,OAAO,EAAE,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC;QAC9C,aAAa,EAAE,6BAA6B,CAAC,GAAG,CAAC,aAAa,CAAC;QAC/D,SAAS,EAAE,GAAG,CAAC,SAAS;QACxB,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,EAAM;IAC5C,KAAK,UAAU,cAAc;QAC3B,MAAM,QAAQ,GAAG,MAAM,EAAE;aACtB,MAAM,EAAE;aACR,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;aAC/D,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;QACnC,IAAI,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAE9B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE;aACvB,MAAM,CAAC,gBAAgB,CAAC;aACxB,MAAM,CAAC;YACN,YAAY,EAAE,qBAAqB;YACnC,OAAO,EAAE,EAAE;YACX,aAAa,EAAE,EAAE;YACjB,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;SACf,CAAC;aACD,kBAAkB,CAAC;YAClB,MAAM,EAAE,CAAC,gBAAgB,CAAC,YAAY,CAAC;YACvC,GAAG,EAAE;gBACH,SAAS,EAAE,GAAG;aACf;SACF,CAAC;aACD,SAAS,EAAE,CAAC;QAEf,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,~~OAAO~~;~~QACL~~,GAAG,EAAE,~~KAAK~~,~~IAA+B~~,~~EAAE~~,CAAC,~~kBAAkB~~,CAAC,~~MAAM~~,~~cAAc~~,~~EAAE~~,CAAC;~~QAEtF~~,~~UAAU~~,~~EAAE,~~KAAK,~~IAAsC~~,~~EAAE~~;~~YACvD~~,MAAM,GAAG,GAAG,~~MAAM~~,~~cAAc~~,EAAE,CAAC;~~YACnC~~,OAAO,~~wBAAwB,~~CAAC,GAAG,~~CAAC~~,~~OAAO~~,CAAC,CAAC;~~QAC/C~~,CAAC;~~QAED~~,~~gBAAgB~~,EAAE,~~KAAK~~,~~IAA2C~~,EAAE;~~YAClE~~,~~MAAM~~,~~GAAG~~,GAAG,~~MAAM~~,~~cAAc~~,EAAE,CAAC~~;YACnC~~,~~OAAO~~,~~6BAA6B,~~CAAC,~~GAAG~~,~~CAAC~~,~~aAAa~~,CAAC,CAAC~~;QAC1D~~,CAAC;~~QAED~~,~~aAAa~~,EAAE,~~KAAK~~,~~EAAE~~,~~KAAmC~~,~~EAA6B~~,~~EAAE;YACtF~~,~~MAAM~~,OAAO,~~GAAG~~,~~MAAM~~,~~cAAc,EAAE,~~CAAC;~~YACvC~~,~~MAAM~~,~~WAAW,~~GAAG,~~wBAAwB~~,~~CAAC;gBAC3C~~,~~GAAG~~,~~wBAAwB~~,CAAC,~~OAAO~~,CAAC,~~OAAO~~,CAAC;~~gBAC5C~~,~~GAAG~~,KAAK~~;aACT~~,~~CAAC~~,~~CAAC~~;~~YACH~~,MAAM,GAAG,GAAG,~~IAAI~~,~~IAAI~~,EAAE,CAAC;~~YACvB~~,~~MAAM~~,~~CAAC~~,~~OAAO,~~CAAC,GAAG,~~MAAM~~,~~EAAE;iBACvB~~,~~MAAM,~~CAAC,~~gBAAgB,~~CAAC;~~iBACxB~~,~~GAAG,~~CAAC;~~gBACH~~,~~OAAO~~,EAAE,EAAE,GAAG,~~WAAW~~,~~EAAE;gBAC3B~~,~~SAAS~~,EAAE,~~GAAG~~;~~aACf~~,CAAC~~;iBACD~~,~~KAAK~~,CAAC,~~EAAE~~,CAAC,~~gBAAgB~~,CAAC,~~EAAE~~,EAAE,~~OAAO~~,~~CAAC,~~EAAE,~~CAAC~~,~~CAAC;iBAC1C~~,~~SAAS,~~EAAE~~,CAAC~~;~~YACf~~,OAAO,~~kBAAkB~~,CAAC,~~OAAO~~,~~IAAI,OAAO,~~CAAC,CAAC;~~QAChD~~,CAAC;QAED,mBAAmB,EAAE,KAAK,EAAE,KAAwC,EAA6B,EAAE;YACjG,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAC;YACvC,MAAM,iBAAiB,GAAG,6BAA6B,CAAC;gBACtD,GAAG,6BAA6B,CAAC,OAAO,CAAC,aAAa,CAAC;gBACvD,GAAG,KAAK;aACT,CAAC,CAAC;YACH,IAAI,KAAK,CAAC,yBAAyB,IAAI,IAAI,EAAE,CAAC;gBAC5C,iBAAiB,CAAC,yBAAyB,GAAG,iBAAiB,CAAC,yBAAyB,CAAC;YAC5F,CAAC;iBAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,IAAI,EAAE,CAAC;gBACnD,iBAAiB,CAAC,yBAAyB,GAAG,iBAAiB,CAAC,yBAAyB,CAAC;YAC5F,CAAC;YACD,IACE,CAAC,KAAK,CAAC,yBAAyB,KAAK,IAAI,IAAI,KAAK,CAAC,yBAAyB,KAAK,IAAI,CAAC;mBACnF,KAAK,CAAC,gBAAgB,IAAI,IAAI,EACjC,CAAC;gBACD,iBAAiB,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC5C,CAAC;YACD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,EAAE;iBACvB,MAAM,CAAC,gBAAgB,CAAC;iBACxB,GAAG,CAAC;gBACH,aAAa,EAAE,EAAE,GAAG,iBAAiB,EAAE;gBACvC,SAAS,EAAE,GAAG;aACf,CAAC;iBACD,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;iBAC1C,SAAS,EAAE,CAAC;YACf,OAAO,kBAAkB,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC;QAChD,CAAC;QAED,cAAc,EAAE,KAAK,IAAuB,EAAE,CAC5C,EAAE;aACC,MAAM,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE,CAAC;aAChC,IAAI,CAAC,aAAa,CAAC;aACnB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAC/C,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"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"}

package/dist/services/issue-approvals.d.ts CHANGED Viewed

@@ -5,18 +5,25 @@ interface LinkActor {
 }
 export declare function issueApprovalService(db: Db): {
     listApprovalsForIssue: (issueId: string) => Promise<{
-        payload: Record<string, unknown>;
         id: string;
         orgId: string;
         type: string;
         requestedByAgentId: string | null;
         requestedByUserId: string | null;
         status: string;
+        payload: Record<string, unknown>;
         decisionNote: string | null;
         decidedByUserId: string | null;
         decidedAt: Date | null;
         createdAt: Date;
         updatedAt: Date;
+        link: {
+            issueId: string;
+            approvalId: string;
+            linkedByAgentId: string | null;
+            linkedByUserId: string | null;
+            createdAt: Date;
+        };
     }[]>;
     listIssuesForApproval: (approvalId: string) => Promise<{
         id: string;
@@ -50,7 +57,14 @@ export declare function issueApprovalService(db: Db): {
         linkedByUserId: string | null;
     }>;
     unlink: (issueId: string, approvalId: string) => Promise<void>;
-    linkManyForApproval: (approvalId: string, issueIds: string[], actor?: LinkActor) => Promise<void>;
+    linkManyForApproval: (approvalId: string, issueIds: string[], actor?: LinkActor) => Promise<{
+        orgId: string;
+        createdAt: Date;
+        issueId: string;
+        approvalId: string;
+        linkedByAgentId: string | null;
+        linkedByUserId: string | null;
+    }[]>;
 };
 export {};
 //# sourceMappingURL=issue-approvals.d.ts.map

package/dist/services/issue-approvals.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"issue-approvals.d.ts","sourceRoot":"","sources":["../../src/services/issue-approvals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAKvC,UAAU,SAAS;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE;qCAgCA,MAAM~~;;;;;;;;;;;;;;wCA6BH~~,MAAM;;;;;;;;;;;;;;;;;;;;;;;oBAkC1B,MAAM,cAAc,MAAM,UAAU,SAAS;;;;;;;;sBAqB3C,MAAM,cAAc,MAAM;sCAOV,MAAM,YAAY,MAAM,EAAE,UAAU,SAAS~~;EAuCxF~~"}
1	+ {"version":3,"file":"issue-approvals.d.ts","sourceRoot":"","sources":["../../src/services/issue-approvals.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAKvC,UAAU,SAAS;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,EAAE;qCAgCA,MAAM;;;;;;;;;;;;;;;;;;;;;wCAmDH,MAAM;;;;;;;;;;;;;;;;;;;;;;;oBAkC1B,MAAM,cAAc,MAAM,UAAU,SAAS;;;;;;;;sBAqB3C,MAAM,cAAc,MAAM;sCAOV,MAAM,YAAY,MAAM,EAAE,UAAU,SAAS;;;;;;;;EAwCxF"}

package/dist/services/issue-approvals.js CHANGED Viewed

@@ -48,14 +48,36 @@ export function issueApprovalService(db) {
                 decidedAt: approvals.decidedAt,
                 createdAt: approvals.createdAt,
                 updatedAt: approvals.updatedAt,
+                linkIssueId: issueApprovals.issueId,
+                linkApprovalId: issueApprovals.approvalId,
+                linkLinkedByAgentId: issueApprovals.linkedByAgentId,
+                linkLinkedByUserId: issueApprovals.linkedByUserId,
+                linkCreatedAt: issueApprovals.createdAt,
             })
                 .from(issueApprovals)
                 .innerJoin(approvals, eq(issueApprovals.approvalId, approvals.id))
                 .where(eq(issueApprovals.issueId, issueId))
                 .orderBy(desc(issueApprovals.createdAt));
             return result.map((approval) => ({
-                ...approval,
+                id: approval.id,
+                orgId: approval.orgId,
+                type: approval.type,
+                requestedByAgentId: approval.requestedByAgentId,
+                requestedByUserId: approval.requestedByUserId,
+                status: approval.status,
                 payload: redactEventPayload(approval.payload) ?? {},
+                decisionNote: approval.decisionNote,
+                decidedByUserId: approval.decidedByUserId,
+                decidedAt: approval.decidedAt,
+                createdAt: approval.createdAt,
+                updatedAt: approval.updatedAt,
+                link: {
+                    issueId: approval.linkIssueId,
+                    approvalId: approval.linkApprovalId,
+                    linkedByAgentId: approval.linkLinkedByAgentId,
+                    linkedByUserId: approval.linkLinkedByUserId,
+                    createdAt: approval.linkCreatedAt,
+                },
             }));
         },
         listIssuesForApproval: async (approvalId) => {
@@ -117,7 +139,7 @@ export function issueApprovalService(db) {
         },
         linkManyForApproval: async (approvalId, issueIds, actor) => {
             if (issueIds.length === 0)
-                return;
+                return [];
             const approval = await getApproval(approvalId);
             if (!approval)
                 throw notFound("Approval not found");
@@ -137,7 +159,7 @@ export function issueApprovalService(db) {
                     throw unprocessable("Issue and approval must belong to the same organization");
                 }
             }
-            await db
+            return db
                 .insert(issueApprovals)
                 .values(uniqueIssueIds.map((issueId) => ({
                 orgId: approval.orgId,
@@ -146,7 +168,8 @@ export function issueApprovalService(db) {
                 linkedByAgentId: actor?.agentId ?? null,
                 linkedByUserId: actor?.userId ?? null,
             })))
-                .onConflictDoNothing();
+                .onConflictDoNothing()
+                .returning();
         },
     };
 }

package/dist/services/issue-approvals.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"issue-approvals.js","sourceRoot":"","sources":["../../src/services/issue-approvals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAOrD,MAAM,UAAU,oBAAoB,CAAC,EAAM;IACzC,KAAK,UAAU,QAAQ,CAAC,OAAe;QACrC,OAAO,EAAE;aACN,MAAM,EAAE;aACR,IAAI,CAAC,MAAM,CAAC;aACZ,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;aAC7B,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,UAAU,WAAW,CAAC,UAAkB;QAC3C,OAAO,EAAE;aACN,MAAM,EAAE;aACR,IAAI,CAAC,SAAS,CAAC;aACf,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;aACnC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,UAAU,iCAAiC,CAAC,OAAe,EAAE,UAAkB;QAClF,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK;YAAE,MAAM,QAAQ,CAAC,iBAAiB,CAAC,CAAC;QAE9C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ;YAAE,MAAM,QAAQ,CAAC,oBAAoB,CAAC,CAAC;QAEpD,IAAI,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;YACnC,MAAM,aAAa,CAAC,yDAAyD,CAAC,CAAC;QACjF,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,KAAK,EAAE,OAAe,EAAE,EAAE;YAC/C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,CAAC;YACtC,IAAI,CAAC,KAAK;gBAAE,MAAM,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAE9C,MAAM,MAAM,GAAG,MAAM,EAAE;iBACpB,MAAM,CAAC;gBACN,EAAE,EAAE,SAAS,CAAC,EAAE;gBAChB,KAAK,EAAE,SAAS,CAAC,KAAK;gBACtB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;gBAChD,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;gBAC9C,MAAM,EAAE,SAAS,CAAC,MAAM;gBACxB,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,YAAY,EAAE,SAAS,CAAC,YAAY;gBACpC,eAAe,EAAE,SAAS,CAAC,eAAe;gBAC1C,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,SAAS,EAAE,SAAS,CAAC,SAAS;~~aAC/B~~,CAAC;iBACD,IAAI,CAAC,cAAc,CAAC;iBACpB,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;iBACjE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;iBAC1C,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC;YAC3C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;gBAC/B,~~GAAG~~,QAAQ;~~gBACX~~,OAAO,EAAE,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE;~~aACpD~~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~~YAElC~~,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,CAAC;YAC/C,IAAI,CAAC,QAAQ;gBAAE,MAAM,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YAEpD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,EAAE;iBAClB,MAAM,CAAC;gBACN,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,KAAK,EAAE,MAAM,CAAC,KAAK;aACpB,CAAC;iBACD,IAAI,CAAC,MAAM,CAAC;iBACZ,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC,CAAC;YAE7C,IAAI,IAAI,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC1C,MAAM,QAAQ,CAAC,8BAA8B,CAAC,CAAC;YACjD,CAAC;YAED,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,GAAG,CAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACjC,MAAM,aAAa,CAAC,yDAAyD,CAAC,CAAC;gBACjF,CAAC;YACH,CAAC;YAED,~~MAAM~~,EAAE;~~iBACL~~,MAAM,CAAC,cAAc,CAAC;iBACtB,MAAM,CACL,cAAc,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC/B,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,OAAO;gBACP,UAAU;gBACV,eAAe,EAAE,KAAK,EAAE,OAAO,IAAI,IAAI;gBACvC,cAAc,EAAE,KAAK,EAAE,MAAM,IAAI,IAAI;aACtC,CAAC,CAAC,CACJ;iBACA,mBAAmB,EAAE,CAAC;~~QAC3B~~,CAAC;KACF,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"issue-approvals.js","sourceRoot":"","sources":["../../src/services/issue-approvals.ts"],"names":[],"mappings":"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"}