@rudderhq/server 0.6.6-canary.2 → 0.6.6-canary.21

package/dist/services/app-builder.js

@@ -0,0 +1,241 @@
+import { appBuilderApps, chatConversations, heartbeatRuns, projects, } from "@rudderhq/db";
+import { and, desc, eq } from "drizzle-orm";
+import { conflict, notFound, unprocessable } from "../errors.js";
+function toAppBuilderApp(row) {
+    return {
+        id: row.id,
+        orgId: row.orgId,
+        projectId: row.projectId ?? null,
+        conversationId: row.conversationId ?? null,
+        name: row.name,
+        sourceRoot: row.sourceRoot,
+        scaffoldVersion: row.scaffoldVersion,
+        buildStatus: row.buildStatus,
+        latestBuildRunId: row.latestBuildRunId ?? null,
+        latestVerificationRunId: row.latestVerificationRunId ?? null,
+        desktopInstallationId: row.desktopInstallationId ?? null,
+        appPublicId: row.appPublicId ?? null,
+        localBindingId: row.localBindingId ?? null,
+        createdAt: row.createdAt,
+        updatedAt: row.updatedAt,
+    };
+}
+function postgresErrorCode(error) {
+    let current = error;
+    for (let depth = 0; depth < 4 && current && typeof current === "object"; depth += 1) {
+        const candidate = current;
+        if (typeof candidate.code === "string")
+            return candidate.code;
+        current = candidate.cause;
+    }
+    return null;
+}
+function isUniqueViolation(error) {
+    return postgresErrorCode(error) === "23505";
+}
+function readContextProjectId(contextSnapshot) {
+    const projectId = contextSnapshot?.projectId;
+    return typeof projectId === "string" && projectId.length > 0 ? projectId : null;
+}
+export function appBuilderService(db) {
+    async function assertProjectInOrganization(orgId, projectId) {
+        const [project] = await db
+            .select({ id: projects.id })
+            .from(projects)
+            .where(and(eq(projects.id, projectId), eq(projects.orgId, orgId)))
+            .limit(1);
+        if (!project)
+            throw notFound("Project not found");
+    }
+    async function assertConversationInOrganization(orgId, conversationId) {
+        const [conversation] = await db
+            .select({ id: chatConversations.id })
+            .from(chatConversations)
+            .where(and(eq(chatConversations.id, conversationId), eq(chatConversations.orgId, orgId)))
+            .limit(1);
+        if (!conversation) {
+            throw unprocessable("App Builder conversation must belong to the Project organization");
+        }
+    }
+    async function getRowById(orgId, appId) {
+        const [row] = await db
+            .select()
+            .from(appBuilderApps)
+            .where(and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.id, appId)))
+            .limit(1);
+        return row ?? null;
+    }
+    async function requireRowById(orgId, appId) {
+        const row = await getRowById(orgId, appId);
+        if (!row)
+            throw notFound("App Builder app not found");
+        return row;
+    }
+    async function getRowForProject(orgId, projectId) {
+        const [row] = await db
+            .select()
+            .from(appBuilderApps)
+            .where(and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.projectId, projectId)))
+            .limit(1);
+        return row ?? null;
+    }
+    async function assertRunScope(app, runId, runKind) {
+        const [run] = await db
+            .select({
+            id: heartbeatRuns.id,
+            chatConversationId: heartbeatRuns.chatConversationId,
+            contextSnapshot: heartbeatRuns.contextSnapshot,
+        })
+            .from(heartbeatRuns)
+            .where(and(eq(heartbeatRuns.id, runId), eq(heartbeatRuns.orgId, app.orgId)))
+            .limit(1);
+        if (!run) {
+            throw unprocessable(`The ${runKind} run must belong to the App Builder organization`);
+        }
+        if (app.projectId
+            && readContextProjectId(run.contextSnapshot) !== app.projectId) {
+            throw unprocessable(`The ${runKind} run must belong to the App Builder Project`);
+        }
+        if (app.conversationId && run.chatConversationId !== app.conversationId) {
+            throw unprocessable(`The ${runKind} run must belong to the App Builder conversation`);
+        }
+    }
+    return {
+        async listForOrganization(orgId) {
+            const rows = await db
+                .select()
+                .from(appBuilderApps)
+                .where(eq(appBuilderApps.orgId, orgId))
+                .orderBy(desc(appBuilderApps.updatedAt));
+            return rows.map(toAppBuilderApp);
+        },
+        async getForProject(orgId, projectId) {
+            const row = await getRowForProject(orgId, projectId);
+            return row ? toAppBuilderApp(row) : null;
+        },
+        async getById(orgId, appId) {
+            const row = await getRowById(orgId, appId);
+            return row ? toAppBuilderApp(row) : null;
+        },
+        async create(orgId, input) {
+            if (input.projectId) {
+                await assertProjectInOrganization(orgId, input.projectId);
+            }
+            if (input.conversationId) {
+                await assertConversationInOrganization(orgId, input.conversationId);
+            }
+            if (input.projectId) {
+                const existing = await getRowForProject(orgId, input.projectId);
+                if (existing) {
+                    throw conflict("This Project already has an App Builder app");
+                }
+            }
+            const [sourceRootOwner] = await db
+                .select({ id: appBuilderApps.id })
+                .from(appBuilderApps)
+                .where(and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.sourceRoot, input.sourceRoot)))
+                .limit(1);
+            if (sourceRootOwner) {
+                throw conflict("This App Builder source root is already in use");
+            }
+            try {
+                const [created] = await db
+                    .insert(appBuilderApps)
+                    .values({
+                    orgId,
+                    projectId: input.projectId ?? null,
+                    conversationId: input.conversationId ?? null,
+                    name: input.name,
+                    sourceRoot: input.sourceRoot,
+                    scaffoldVersion: input.scaffoldVersion,
+                    buildStatus: "preparing",
+                })
+                    .returning();
+                return toAppBuilderApp(created);
+            }
+            catch (error) {
+                if (isUniqueViolation(error)) {
+                    throw conflict("The Project or source root already has an App Builder app");
+                }
+                throw error;
+            }
+        },
+        async updateBuild(orgId, appId, input) {
+            const existing = await requireRowById(orgId, appId);
+            if (input.runId) {
+                await assertRunScope(existing, input.runId, input.runKind);
+            }
+            const runUpdate = "runId" in input
+                ? input.runKind === "verification"
+                    ? { latestVerificationRunId: input.runId ?? null }
+                    : { latestBuildRunId: input.runId ?? null }
+                : {};
+            const updateScope = input.expectedStatus
+                ? and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.id, appId), eq(appBuilderApps.buildStatus, input.expectedStatus))
+                : and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.id, appId));
+            const [updated] = await db
+                .update(appBuilderApps)
+                .set({
+                buildStatus: input.status,
+                ...runUpdate,
+                updatedAt: new Date(),
+            })
+                .where(updateScope)
+                .returning();
+            if (!updated) {
+                throw conflict("The App build state changed in another window");
+            }
+            return toAppBuilderApp(updated);
+        },
+        async attachConversation(orgId, appId, input) {
+            await requireRowById(orgId, appId);
+            await assertConversationInOrganization(orgId, input.conversationId);
+            const [updated] = await db
+                .update(appBuilderApps)
+                .set({
+                conversationId: input.conversationId,
+                updatedAt: new Date(),
+            })
+                .where(and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.id, appId)))
+                .returning();
+            return toAppBuilderApp(updated);
+        },
+        async bindLocalRuntime(orgId, appId, binding) {
+            await requireRowById(orgId, appId);
+            try {
+                const [updated] = await db
+                    .update(appBuilderApps)
+                    .set({
+                    desktopInstallationId: binding.desktopInstallationId,
+                    appPublicId: binding.appPublicId,
+                    localBindingId: binding.localBindingId,
+                    updatedAt: new Date(),
+                })
+                    .where(and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.id, appId)))
+                    .returning();
+                return toAppBuilderApp(updated);
+            }
+            catch (error) {
+                if (isUniqueViolation(error)) {
+                    throw conflict("This local App Builder binding is already in use");
+                }
+                throw error;
+            }
+        },
+        async clearLocalBinding(orgId, appId) {
+            await requireRowById(orgId, appId);
+            const [updated] = await db
+                .update(appBuilderApps)
+                .set({
+                desktopInstallationId: null,
+                appPublicId: null,
+                localBindingId: null,
+                updatedAt: new Date(),
+            })
+                .where(and(eq(appBuilderApps.orgId, orgId), eq(appBuilderApps.id, appId)))
+                .returning();
+            return toAppBuilderApp(updated);
+        },
+    };
+}
+//# sourceMappingURL=app-builder.js.map

package/dist/services/app-builder.js.map

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

package/dist/services/approvals.d.ts

@@ -455,9 +455,9 @@ export declare function approvalService(db: Db): {
         status: string;
         id: string;
         updatedAt: Date;
+        type: string;
         orgId: string;
         createdAt: Date;
-        type: string;
         payload: Record<string, unknown>;
         decisionNote: string | null;
         requestedByAgentId: string | null;
@@ -470,9 +470,9 @@ export declare function approvalService(db: Db): {
             status: string;
             id: string;
             updatedAt: Date;
+            type: string;
             orgId: string;
             createdAt: Date;
-            type: string;
             payload: Record<string, unknown>;
             decisionNote: string | null;
             requestedByAgentId: string | null;
@@ -487,9 +487,9 @@ export declare function approvalService(db: Db): {
             status: string;
             id: string;
             updatedAt: Date;
+            type: string;
             orgId: string;
             createdAt: Date;
-            type: string;
             payload: Record<string, unknown>;
             decisionNote: string | null;
             requestedByAgentId: string | null;

package/dist/services/budgets.d.ts

@@ -26,7 +26,7 @@ export declare function budgetService(db: Db, hooks?: BudgetServiceHooks): {
     }>;
     overview: (orgId: string) => Promise<BudgetOverview>;
     evaluateCostEvent: (event: typeof costEvents.$inferSelect) => Promise<void>;
-    getInvocationBlock: (orgId: string, agentId: string, context?: {
+    getInvocationBlock: (orgId: string, agentId: string, _context?: {
         issueId?: string | null;
         projectId?: string | null;
     }) => Promise<{
@@ -39,11 +39,6 @@ export declare function budgetService(db: Db, hooks?: BudgetServiceHooks): {
         scopeId: string;
         scopeName: string;
         reason: string;
-    } | {
-        scopeType: "project";
-        scopeId: string;
-        scopeName: string;
-        reason: string;
     } | null>;
     resolveIncident: (orgId: string, incidentId: string, input: BudgetIncidentResolutionInput, actorUserId: string) => Promise<BudgetIncident>;
 };

package/dist/services/budgets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"budgets.d.ts","sourceRoot":"","sources":["../../src/services/budgets.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAKL,UAAU,EAGX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAE7B,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAe1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE,CAAC;AAuKF,wBAAgB,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,GAAE,kBAAuB;0BA+RpC,MAAM,KAAG,OAAO,CAAC,YAAY,EAAE,CAAC;0BAWnD,MAAM,SACN,uBAAuB,eACjB,MAAM,GAAG,IAAI,KACzB,OAAO,CAAC,mBAAmB,CAAC;0BAuHtB,MAAM,YACH,MAAM,eACH,MAAM,GAAG,IAAI,KACzB,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;sBAuElB,MAAM,KAAG,OAAO,CAAC,cAAc,CAAC;+BAoBvB,OAAO,UAAU,CAAC,YAAY;gCAsEtD,MAAM,WACJ,MAAM,YACL;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;;;;;;;;;;;;;;;;6BAkJzD,MAAM,cACD,MAAM,SACX,6BAA6B,eACvB,MAAM,KAClB,OAAO,CAAC,cAAc,CAAC;EAyF7B"}
+{"version":3,"file":"budgets.d.ts","sourceRoot":"","sources":["../../src/services/budgets.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAKL,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,cAAc,EACd,6BAA6B,EAE7B,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,EAGhB,MAAM,kBAAkB,CAAC;AAe1B,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvE,CAAC;AAkJF,wBAAgB,aAAa,CAAC,EAAE,EAAE,EAAE,EAAE,KAAK,GAAE,kBAAuB;0BAuQpC,MAAM,KAAG,OAAO,CAAC,YAAY,EAAE,CAAC;0BAanD,MAAM,SACN,uBAAuB,eACjB,MAAM,GAAG,IAAI,KACzB,OAAO,CAAC,mBAAmB,CAAC;0BAuHtB,MAAM,YACH,MAAM,eACH,MAAM,GAAG,IAAI,KACzB,OAAO,CAAC;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;sBA2ElB,MAAM,KAAG,OAAO,CAAC,cAAc,CAAC;+BAyBvB,OAAO,UAAU,CAAC,YAAY;gCAqEtD,MAAM,WACJ,MAAM,aACJ;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;;;;;;;;;;;6BAmG1D,MAAM,cACD,MAAM,SACX,6BAA6B,eACvB,MAAM,KAClB,OAAO,CAAC,cAAc,CAAC;EAoG7B"}

package/dist/services/budgets.js

@@ -1,4 +1,4 @@
-import { agents, approvals, budgetIncidents, budgetPolicies, costEvents, organizations, projects, } from "@rudderhq/db";
+import { agents, approvals, budgetIncidents, budgetPolicies, costEvents, organizations, } from "@rudderhq/db";
 import { and, desc, eq, gte, inArray, lt, ne, sql } from "drizzle-orm";
 import { notFound, unprocessable } from "../errors.js";
 import { logActivity } from "./activity-log.js";
@@ -54,42 +54,22 @@ async function resolveScopeRecord(db, scopeType, scopeId) {
             pauseReason: row.pauseReason ?? null,
         };
     }
-    if (scopeType === "agent") {
-        const row = await db
-            .select({
-            orgId: agents.orgId,
-            name: agents.name,
-            status: agents.status,
-            pauseReason: agents.pauseReason,
-        })
-            .from(agents)
-            .where(eq(agents.id, scopeId))
-            .then((rows) => rows[0] ?? null);
-        if (!row)
-            throw notFound("Agent not found");
-        return {
-            orgId: row.orgId,
-            name: row.name,
-            paused: row.status === "paused",
-            pauseReason: row.pauseReason ?? null,
-        };
-    }
     const row = await db
         .select({
-        orgId: projects.orgId,
-        name: projects.name,
-        pauseReason: projects.pauseReason,
-        pausedAt: projects.pausedAt,
+        orgId: agents.orgId,
+        name: agents.name,
+        status: agents.status,
+        pauseReason: agents.pauseReason,
     })
-        .from(projects)
-        .where(eq(projects.id, scopeId))
+        .from(agents)
+        .where(eq(agents.id, scopeId))
         .then((rows) => rows[0] ?? null);
     if (!row)
-        throw notFound("Project not found");
+        throw notFound("Agent not found");
     return {
         orgId: row.orgId,
         name: row.name,
-        paused: Boolean(row.pausedAt),
+        paused: row.status === "paused",
         pauseReason: row.pauseReason ?? null,
     };
 }
@@ -99,8 +79,6 @@ async function computeObservedAmount(db, policy) {
     const conditions = [eq(costEvents.orgId, policy.orgId)];
     if (policy.scopeType === "agent")
         conditions.push(eq(costEvents.agentId, policy.scopeId));
-    if (policy.scopeType === "project")
-        conditions.push(eq(costEvents.projectId, policy.scopeId));
     const { start, end } = resolveWindow(policy.windowKind);
     if (policy.windowKind === "calendar_month_utc") {
         conditions.push(gte(costEvents.occurredAt, start));
@@ -160,17 +138,6 @@ export function budgetService(db, hooks = {}) {
                 .where(and(eq(agents.id, policy.scopeId), inArray(agents.status, ["active", "idle", "running", "error"])));
             return;
         }
-        if (policy.scopeType === "project") {
-            await db
-                .update(projects)
-                .set({
-                pauseReason: "budget",
-                pausedAt: now,
-                updatedAt: now,
-            })
-                .where(eq(projects.id, policy.scopeId));
-            return;
-        }
         await db
             .update(organizations)
             .set({
@@ -203,17 +170,6 @@ export function budgetService(db, hooks = {}) {
                 .where(and(eq(agents.id, policy.scopeId), eq(agents.pauseReason, "budget")));
             return;
         }
-        if (policy.scopeType === "project") {
-            await database
-                .update(projects)
-                .set({
-                pauseReason: null,
-                pausedAt: null,
-                updatedAt: now,
-            })
-                .where(and(eq(projects.id, policy.scopeId), eq(projects.pauseReason, "budget")));
-            return;
-        }
         await database
             .update(organizations)
             .set({
@@ -392,7 +348,9 @@ export function budgetService(db, hooks = {}) {
     return {
         listPolicies: async (orgId) => {
             const rows = await listPolicyRows(orgId);
-            return rows.map((row) => ({
+            return rows
+                .filter((row) => row.scopeType === "organization" || row.scopeType === "agent")
+                .map((row) => ({
                 ...row,
                 scopeType: row.scopeType,
                 metric: row.metric,
@@ -405,7 +363,7 @@ export function budgetService(db, hooks = {}) {
                 throw unprocessable("Budget scope does not belong to organization");
             }
             const metric = input.metric ?? "billed_cents";
-            const windowKind = input.windowKind ?? (input.scopeType === "project" ? "lifetime" : "calendar_month_utc");
+            const windowKind = input.windowKind ?? "calendar_month_utc";
             const amount = Math.max(0, Math.floor(input.amount));
             const nextIsActive = amount > 0 && (input.isActive ?? true);
             const existing = await db
@@ -507,7 +465,9 @@ export function budgetService(db, hooks = {}) {
             return db.transaction(async (tx) => {
                 const txDb = tx;
                 const policy = await getPolicyRow(policyId, txDb);
-                if (policy.orgId !== orgId || !policy.isActive) {
+                if (policy.orgId !== orgId
+                    || !policy.isActive
+                    || (policy.scopeType !== "organization" && policy.scopeType !== "agent")) {
                     throw notFound("Budget policy not found");
                 }
                 const now = new Date();
@@ -564,12 +524,12 @@ export function budgetService(db, hooks = {}) {
         },
         overview: async (orgId) => {
             const rows = await listPolicyRows(orgId);
-            const activeRows = rows.filter((row) => row.isActive);
+            const activeRows = rows.filter((row) => row.isActive && (row.scopeType === "organization" || row.scopeType === "agent"));
             const policies = await Promise.all(activeRows.map((row) => buildPolicySummary(row)));
             const activeIncidentRows = await db
                 .select()
                 .from(budgetIncidents)
-                .where(and(eq(budgetIncidents.orgId, orgId), eq(budgetIncidents.status, "open")))
+                .where(and(eq(budgetIncidents.orgId, orgId), eq(budgetIncidents.status, "open"), inArray(budgetIncidents.scopeType, ["organization", "agent"])))
                 .orderBy(desc(budgetIncidents.createdAt));
             const activeIncidents = await hydrateIncidentRows(activeIncidentRows);
             return {
@@ -577,7 +537,6 @@ export function budgetService(db, hooks = {}) {
                 policies,
                 activeIncidents,
                 pausedAgentCount: policies.filter((policy) => policy.scopeType === "agent" && policy.paused).length,
-                pausedProjectCount: policies.filter((policy) => policy.scopeType === "project" && policy.paused).length,
                 pendingApprovalCount: activeIncidents.filter((incident) => incident.approvalStatus === "pending").length,
             };
         },
@@ -585,14 +544,12 @@ export function budgetService(db, hooks = {}) {
             const candidatePolicies = await db
                 .select()
                 .from(budgetPolicies)
-                .where(and(eq(budgetPolicies.orgId, event.orgId), eq(budgetPolicies.isActive, true), inArray(budgetPolicies.scopeType, ["organization", "agent", "project"])));
+                .where(and(eq(budgetPolicies.orgId, event.orgId), eq(budgetPolicies.isActive, true), inArray(budgetPolicies.scopeType, ["organization", "agent"])));
             const relevantPolicies = candidatePolicies.filter((policy) => {
                 if (policy.scopeType === "organization")
                     return policy.scopeId === event.orgId;
                 if (policy.scopeType === "agent")
                     return policy.scopeId === event.agentId;
-                if (policy.scopeType === "project")
-                    return Boolean(event.projectId) && policy.scopeId === event.projectId;
                 return false;
             });
             for (const policy of relevantPolicies) {
@@ -643,7 +600,7 @@ export function budgetService(db, hooks = {}) {
                 }
             }
         },
-        getInvocationBlock: async (orgId, agentId, context) => {
+        getInvocationBlock: async (orgId, agentId, _context) => {
             const agent = await db
                 .select({
                 status: agents.status,
@@ -717,46 +674,7 @@ export function budgetService(db, hooks = {}) {
                     };
                 }
             }
-            const candidateProjectId = context?.projectId ?? null;
-            if (!candidateProjectId)
-                return null;
-            const project = await db
-                .select({
-                id: projects.id,
-                name: projects.name,
-                orgId: projects.orgId,
-                pauseReason: projects.pauseReason,
-                pausedAt: projects.pausedAt,
-            })
-                .from(projects)
-                .where(eq(projects.id, candidateProjectId))
-                .then((rows) => rows[0] ?? null);
-            if (!project || project.orgId !== orgId)
-                return null;
-            const projectPolicy = await db
-                .select()
-                .from(budgetPolicies)
-                .where(and(eq(budgetPolicies.orgId, orgId), eq(budgetPolicies.scopeType, "project"), eq(budgetPolicies.scopeId, project.id), eq(budgetPolicies.isActive, true), eq(budgetPolicies.metric, "billed_cents")))
-                .then((rows) => rows[0] ?? null);
-            if (projectPolicy && projectPolicy.hardStopEnabled && projectPolicy.amount > 0) {
-                const observed = await computeObservedAmount(db, projectPolicy);
-                if (observed >= projectPolicy.amount) {
-                    return {
-                        scopeType: "project",
-                        scopeId: project.id,
-                        scopeName: project.name,
-                        reason: "Project cannot start work because its budget hard-stop is still exceeded.",
-                    };
-                }
-            }
-            if (!project.pausedAt || project.pauseReason !== "budget")
-                return null;
-            return {
-                scopeType: "project",
-                scopeId: project.id,
-                scopeName: project.name,
-                reason: "Project is paused because its budget hard-stop was reached.",
-            };
+            return null;
         },
         resolveIncident: async (orgId, incidentId, input, actorUserId) => {
             const incident = await db
@@ -768,7 +686,16 @@ export function budgetService(db, hooks = {}) {
                 throw notFound("Budget incident not found");
             if (incident.orgId !== orgId)
                 throw notFound("Budget incident not found");
+            if (incident.scopeType !== "organization" && incident.scopeType !== "agent") {
+                throw notFound("Budget incident not found");
+            }
             const policy = await getPolicyRow(incident.policyId);
+            if (policy.orgId !== orgId
+                || policy.scopeType !== incident.scopeType
+                || policy.scopeId !== incident.scopeId
+                || (policy.scopeType !== "organization" && policy.scopeType !== "agent")) {
+                throw notFound("Budget incident not found");
+            }
             if (input.action === "raise_budget_and_resume") {
                 const nextAmount = Math.max(0, Math.floor(input.amount ?? 0));
                 const currentObserved = await computeObservedAmount(db, policy);