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

package/dist/services/organization-mutation-outbox.js

@@ -0,0 +1,125 @@
+import { LIVE_EVENT_TYPES } from "@rudderhq/shared";
+import { sql } from "drizzle-orm";
+import { logger } from "../middleware/logger.js";
+import { publishLiveEvent } from "./live-events.js";
+const DEFAULT_INTERVAL_MS = 1_000;
+const DEFAULT_BATCH_SIZE = 50;
+const MAX_ERROR_LENGTH = 2_000;
+function errorText(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.slice(0, MAX_ERROR_LENGTH);
+}
+function isLiveEventType(value) {
+    return LIVE_EVENT_TYPES.includes(value);
+}
+async function claimBatch(db, batchSize) {
+    const result = await db.execute(sql `
+    WITH claim AS (
+      SELECT id
+      FROM organization_mutation_outbox
+      WHERE state = 'pending'
+        AND next_attempt_at <= now()
+      ORDER BY next_attempt_at ASC, created_at ASC, id ASC
+      FOR UPDATE SKIP LOCKED
+      LIMIT ${batchSize}
+    )
+    UPDATE organization_mutation_outbox AS outbox
+    SET attempts = outbox.attempts + 1,
+        next_attempt_at = now() + interval '1 second'
+    FROM claim
+    WHERE outbox.id = claim.id
+    RETURNING outbox.id::text,
+      outbox.org_id::text,
+      outbox.event_type,
+      outbox.payload,
+      outbox.attempts
+  `);
+    const postgresResult = result;
+    return Array.isArray(postgresResult)
+        ? postgresResult
+        : (postgresResult.rows ?? []);
+}
+async function markPublished(db, row) {
+    await db.execute(sql `
+    UPDATE organization_mutation_outbox
+    SET state = 'published', published_at = now(), last_error = NULL
+    WHERE id = ${row.id}::uuid
+      AND state = 'pending'
+      AND attempts = ${row.attempts}
+  `);
+}
+async function markFailed(db, row, error) {
+    await db.execute(sql `
+    UPDATE organization_mutation_outbox
+    SET last_error = ${errorText(error)},
+        next_attempt_at = now() + make_interval(
+          secs => LEAST(60::double precision, GREATEST(1::double precision,
+            power(2::double precision, LEAST(attempts, 6)::double precision)))
+        )
+    WHERE id = ${row.id}::uuid
+      AND state = 'pending'
+      AND attempts = ${row.attempts}
+  `);
+}
+/**
+ * Deliver Rust activity events through the transitional Node event bus.
+ *
+ * Reasoning:
+ * - claim leases are persisted before publication, so a process crash leaves
+ *   the row eligible for retry instead of losing the event;
+ * - publication is completed before the row becomes published, so the Rust
+ *   business transaction never relies on an in-process Node side effect;
+ * - the service is intentionally scoped to the current outbox table and can
+ *   be removed when the Rust websocket/event transport owns delivery.
+ */
+export function startOrganizationMutationOutboxPublisher(db, options = {}) {
+    const intervalMs = Math.max(100, options.intervalMs ?? DEFAULT_INTERVAL_MS);
+    const batchSize = Math.max(1, Math.min(500, options.batchSize ?? DEFAULT_BATCH_SIZE));
+    let closed = false;
+    let drainInFlight = null;
+    const drain = async () => {
+        if (closed || drainInFlight)
+            return drainInFlight;
+        drainInFlight = (async () => {
+            const rows = await claimBatch(db, batchSize);
+            for (const row of rows) {
+                try {
+                    if (!isLiveEventType(row.event_type)) {
+                        throw new Error(`Unsupported organization mutation outbox event type: ${row.event_type}`);
+                    }
+                    publishLiveEvent({
+                        orgId: row.org_id,
+                        type: row.event_type,
+                        payload: row.payload,
+                        dedupeKey: `organization-mutation-outbox:${row.id}`,
+                    });
+                    await markPublished(db, row);
+                }
+                catch (error) {
+                    await markFailed(db, row, error);
+                    logger.warn({ err: error, outboxId: row.id, orgId: row.org_id }, "organization mutation outbox delivery failed");
+                }
+            }
+        })().finally(() => {
+            drainInFlight = null;
+        });
+        return drainInFlight;
+    };
+    const timer = setInterval(() => {
+        void drain().catch((error) => {
+            logger.warn({ err: error }, "organization mutation outbox claim failed");
+        });
+    }, intervalMs);
+    void drain().catch((error) => {
+        logger.warn({ err: error }, "organization mutation outbox startup drain failed");
+    });
+    return {
+        drain,
+        async close() {
+            closed = true;
+            clearInterval(timer);
+            await drainInFlight;
+        },
+    };
+}
+//# sourceMappingURL=organization-mutation-outbox.js.map

package/dist/services/organization-mutation-outbox.js.map

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

package/dist/services/organization-mutation-outbox.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=organization-mutation-outbox.test.d.ts.map

package/dist/services/organization-mutation-outbox.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization-mutation-outbox.test.d.ts","sourceRoot":"","sources":["../../src/services/organization-mutation-outbox.test.ts"],"names":[],"mappings":""}

package/dist/services/organization-mutation-outbox.test.js

@@ -0,0 +1,80 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+const publishLiveEvent = vi.hoisted(() => vi.fn());
+vi.mock("./live-events.js", () => ({
+    publishLiveEvent,
+}));
+import { startOrganizationMutationOutboxPublisher } from "./organization-mutation-outbox.js";
+const ROW = {
+    id: "00000000-0000-4000-8000-000000000001",
+    org_id: "00000000-0000-4000-8000-000000000002",
+    event_type: "activity.logged",
+    payload: { action: "organization.branding_updated" },
+    attempts: 1,
+};
+function createDb(rows, resultShape = "rows") {
+    const execute = vi.fn()
+        .mockResolvedValueOnce(resultShape === "rows" ? { rows } : rows)
+        .mockResolvedValue({ rows: [] });
+    return {
+        db: { execute },
+        execute,
+    };
+}
+describe("organization mutation outbox publisher", () => {
+    beforeEach(() => {
+        publishLiveEvent.mockReset();
+    });
+    it("publishes a claimed activity and acknowledges it", async () => {
+        const { db, execute } = createDb([ROW]);
+        const publisher = startOrganizationMutationOutboxPublisher(db, { intervalMs: 60_000 });
+        await publisher.drain();
+        await publisher.close();
+        expect(publishLiveEvent).toHaveBeenCalledWith({
+            orgId: ROW.org_id,
+            type: ROW.event_type,
+            payload: ROW.payload,
+            dedupeKey: `organization-mutation-outbox:${ROW.id}`,
+        });
+        expect(execute).toHaveBeenCalledTimes(2);
+    });
+    it("accepts the array result returned by the postgres-js Drizzle driver", async () => {
+        const { db, execute } = createDb([ROW], "array");
+        const publisher = startOrganizationMutationOutboxPublisher(db, { intervalMs: 60_000 });
+        await publisher.drain();
+        await publisher.close();
+        expect(publishLiveEvent).toHaveBeenCalledWith({
+            orgId: ROW.org_id,
+            type: ROW.event_type,
+            payload: ROW.payload,
+            dedupeKey: `organization-mutation-outbox:${ROW.id}`,
+        });
+        expect(execute).toHaveBeenCalledTimes(2);
+    });
+    it("keeps a failed or unknown event retryable and records the failure", async () => {
+        const { db, execute } = createDb([
+            { ...ROW, event_type: "unsupported.event" },
+        ]);
+        const publisher = startOrganizationMutationOutboxPublisher(db, { intervalMs: 60_000 });
+        await publisher.drain();
+        await publisher.close();
+        expect(publishLiveEvent).not.toHaveBeenCalled();
+        expect(execute).toHaveBeenCalledTimes(2);
+        const retryQuery = JSON.stringify(execute.mock.calls[1]?.[0]);
+        expect(retryQuery).toContain("power");
+        expect(retryQuery).toContain("last_error");
+    });
+    it("records a publication exception without acknowledging the row", async () => {
+        const { db, execute } = createDb([ROW]);
+        publishLiveEvent.mockImplementationOnce(() => {
+            throw new Error("websocket unavailable");
+        });
+        const publisher = startOrganizationMutationOutboxPublisher(db, { intervalMs: 60_000 });
+        await publisher.drain();
+        await publisher.close();
+        expect(execute).toHaveBeenCalledTimes(2);
+        const retryQuery = JSON.stringify(execute.mock.calls[1]?.[0]);
+        expect(retryQuery).toContain("last_error");
+        expect(retryQuery).not.toContain("published_at");
+    });
+});
+//# sourceMappingURL=organization-mutation-outbox.test.js.map

package/dist/services/organization-mutation-outbox.test.js.map

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

package/dist/services/organization-resource-mutation-fence.d.ts

@@ -0,0 +1,29 @@
+type TransactionClient = {
+    execute(query: unknown): Promise<unknown>;
+};
+type OrganizationResourceMutationStateRow = {
+    resource_id: string;
+    org_id: string;
+    owner: string;
+    mutation_version: string | number | bigint;
+    fence_epoch: string | number | bigint;
+    fence_token: string;
+};
+/**
+ * Lock resource authority after the caller has locked the organization row.
+ *
+ * Reasoning:
+ * - Existing canonical rows predate this fence, so provision only a missing
+ *   row whose canonical organization matches the caller's organization.
+ * - When a canonical row was already scoped to this organization, read the
+ *   component row by resource ID to detect a corrupt org boundary. Tombstone
+ *   lookups stay org-scoped so a foreign ID remains indistinguishable from a
+ *   missing resource.
+ * - No resource foreign key is used: deletion leaves this row as a replay
+ *   tombstone.
+ */
+export declare function lockNodeOrganizationResourceMutationAuthority(tx: TransactionClient, organizationId: string, resourceId: string, options?: {
+    initializeFromCanonical?: boolean;
+}): Promise<OrganizationResourceMutationStateRow | null>;
+export {};
+//# sourceMappingURL=organization-resource-mutation-fence.d.ts.map

package/dist/services/organization-resource-mutation-fence.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization-resource-mutation-fence.d.ts","sourceRoot":"","sources":["../../src/services/organization-resource-mutation-fence.ts"],"names":[],"mappings":"AAGA,KAAK,iBAAiB,GAAG;IACvB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3C,CAAC;AAEF,KAAK,oCAAoC,GAAG;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IAC3C,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AASF;;;;;;;;;;;;GAYG;AACH,wBAAsB,6CAA6C,CACjE,EAAE,EAAE,iBAAiB,EACrB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;IAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;CAAO,GAClD,OAAO,CAAC,oCAAoC,GAAG,IAAI,CAAC,CAsDtD"}

package/dist/services/organization-resource-mutation-fence.js

@@ -0,0 +1,75 @@
+import { sql } from "drizzle-orm";
+import { conflict } from "../errors.js";
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function firstRow(result) {
+    if (Array.isArray(result))
+        return result[0];
+    return result.rows?.[0];
+}
+/**
+ * Lock resource authority after the caller has locked the organization row.
+ *
+ * Reasoning:
+ * - Existing canonical rows predate this fence, so provision only a missing
+ *   row whose canonical organization matches the caller's organization.
+ * - When a canonical row was already scoped to this organization, read the
+ *   component row by resource ID to detect a corrupt org boundary. Tombstone
+ *   lookups stay org-scoped so a foreign ID remains indistinguishable from a
+ *   missing resource.
+ * - No resource foreign key is used: deletion leaves this row as a replay
+ *   tombstone.
+ */
+export async function lockNodeOrganizationResourceMutationAuthority(tx, organizationId, resourceId, options = {}) {
+    const initializeFromCanonical = options.initializeFromCanonical ?? false;
+    const readLockedState = async () => firstRow(await tx.execute(sql `
+    SELECT resource_id::text AS resource_id,
+      org_id::text AS org_id,
+      owner,
+      mutation_version,
+      fence_epoch,
+      fence_token::text AS fence_token
+    FROM organization_resource_mutation_state
+    WHERE resource_id = ${resourceId}::uuid
+      ${initializeFromCanonical ? sql `` : sql `AND org_id = ${organizationId}::uuid`}
+    FOR UPDATE
+  `));
+    // Reject an existing Rust owner (including a tombstone) without issuing DML.
+    // The caller holds the organization lock throughout lookup/provisioning.
+    let row = await readLockedState();
+    if (!row && initializeFromCanonical) {
+        await tx.execute(sql `
+      INSERT INTO organization_resource_mutation_state (resource_id, org_id)
+      SELECT id, org_id
+      FROM organization_resources
+      WHERE id = ${resourceId}::uuid AND org_id = ${organizationId}::uuid
+      ON CONFLICT (resource_id) DO NOTHING
+    `);
+        row = await readLockedState();
+    }
+    if (!row) {
+        if (initializeFromCanonical) {
+            throw conflict("Organization resource mutation authority is not provisioned");
+        }
+        return null;
+    }
+    if (row.resource_id.toLowerCase() !== resourceId.toLowerCase()
+        || row.org_id.toLowerCase() !== organizationId.toLowerCase()) {
+        throw conflict("Organization resource mutation authority has an invalid scope");
+    }
+    try {
+        if (BigInt(row.mutation_version) < 0n || BigInt(row.fence_epoch) < 0n) {
+            throw new Error("negative resource mutation fence counter");
+        }
+    }
+    catch {
+        throw conflict("Organization resource mutation fence counters are invalid");
+    }
+    if (!UUID_PATTERN.test(row.fence_token)) {
+        throw conflict("Organization resource mutation fencing token is invalid");
+    }
+    if (row.owner !== "node") {
+        throw conflict("Organization resource mutation authority is owned by Rust");
+    }
+    return row;
+}
+//# sourceMappingURL=organization-resource-mutation-fence.js.map

package/dist/services/organization-resource-mutation-fence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization-resource-mutation-fence.js","sourceRoot":"","sources":["../../src/services/organization-resource-mutation-fence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAexC,MAAM,YAAY,GAAG,4EAA4E,CAAC;AAElG,SAAS,QAAQ,CAAC,MAAe;IAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAC,CAAC,CAAqD,CAAC;IAChG,OAAQ,MAA4D,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACjF,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,6CAA6C,CACjE,EAAqB,EACrB,cAAsB,EACtB,UAAkB,EAClB,UAAiD,EAAE;IAEnD,MAAM,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,IAAI,KAAK,CAAC;IACzE,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;;;;;;;0BAQzC,UAAU;QAC5B,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAA,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA,gBAAgB,cAAc,QAAQ;;GAEhF,CAAC,CAAC,CAAC;IACJ,6EAA6E;IAC7E,yEAAyE;IACzE,IAAI,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IAClC,IAAI,CAAC,GAAG,IAAI,uBAAuB,EAAE,CAAC;QACpC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;;;mBAIL,UAAU,uBAAuB,cAAc;;KAE7D,CAAC,CAAC;QACH,GAAG,GAAG,MAAM,eAAe,EAAE,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,IAAI,uBAAuB,EAAE,CAAC;YAC5B,MAAM,QAAQ,CAAC,6DAA6D,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE;WACvD,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,WAAW,EAAE,EAC5D,CAAC;QACD,MAAM,QAAQ,CAAC,+DAA+D,CAAC,CAAC;IAClF,CAAC;IACD,IAAI,CAAC;QACH,IAAI,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,GAAG,EAAE,IAAI,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,QAAQ,CAAC,2DAA2D,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;QACxC,MAAM,QAAQ,CAAC,yDAAyD,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,KAAK,MAAM,EAAE,CAAC;QACzB,MAAM,QAAQ,CAAC,2DAA2D,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/services/organization-resource-rust-authority.d.ts

@@ -0,0 +1,7 @@
+import type { Db } from "@rudderhq/db";
+import type { Request } from "express";
+import type { RustFoundationBridge, RustFoundationResponse } from "./rust-foundation-bridge.js";
+/** Routing is advisory; both writers repeat ownership checks under the shared
+ * organization mutex. A rejected Rust invocation must never select Node. */
+export declare function forwardRustOrganizationResourceMutation(db: Db, bridge: RustFoundationBridge | undefined, req: Request, orgId: string, resourceId: string, operation: "update" | "delete", data: Record<string, unknown>): Promise<RustFoundationResponse | null>;
+//# sourceMappingURL=organization-resource-rust-authority.d.ts.map

package/dist/services/organization-resource-rust-authority.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization-resource-rust-authority.d.ts","sourceRoot":"","sources":["../../src/services/organization-resource-rust-authority.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGvC,OAAO,KAAK,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAEhG;4EAC4E;AAC5E,wBAAsB,uCAAuC,CAC3D,EAAE,EAAE,EAAE,EACN,MAAM,EAAE,oBAAoB,GAAG,SAAS,EACxC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,QAAQ,GAAG,QAAQ,EAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC,CA6BxC"}

package/dist/services/organization-resource-rust-authority.js

@@ -0,0 +1,38 @@
+import { sql } from "drizzle-orm";
+import { randomUUID } from "node:crypto";
+import { HttpError } from "../errors.js";
+/** Routing is advisory; both writers repeat ownership checks under the shared
+ * organization mutex. A rejected Rust invocation must never select Node. */
+export async function forwardRustOrganizationResourceMutation(db, bridge, req, orgId, resourceId, operation, data) {
+    const result = await db.execute(sql `
+    SELECT (
+      EXISTS (
+        SELECT 1 FROM organization_resource_mutation_state
+        WHERE org_id = ${orgId}::uuid AND resource_id = ${resourceId}::uuid AND owner = 'rust'
+      ) OR EXISTS (
+        SELECT 1 FROM project_resource_attachments a
+        JOIN project_goal_mutation_state p ON p.project_id = a.project_id AND p.org_id = a.org_id
+        WHERE a.org_id = ${orgId}::uuid AND a.resource_id = ${resourceId}::uuid AND p.owner = 'rust'
+      )
+    ) AS requires_rust
+  `);
+    const rows = Array.isArray(result) ? result : result.rows ?? [];
+    const row = rows[0];
+    if (row?.requires_rust === false)
+        return null;
+    if (row?.requires_rust !== true) {
+        throw new HttpError(503, "Organization resource authority could not be verified");
+    }
+    if (bridge?.projectGoalSetMode !== "required" || !bridge.organizationResourceMutation) {
+        throw new HttpError(503, "Rust organization resource authority is unavailable");
+    }
+    const key = req.header("x-rudder-idempotency-key")?.trim() || randomUUID();
+    const body = Buffer.from(JSON.stringify({ data, runId: req.actor.runId ?? null }), "utf8");
+    try {
+        return await bridge.organizationResourceMutation(req, orgId, resourceId, operation, body, key);
+    }
+    catch {
+        throw new HttpError(503, "Rust organization resource authority is unavailable");
+    }
+}
+//# sourceMappingURL=organization-resource-rust-authority.js.map

package/dist/services/organization-resource-rust-authority.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization-resource-rust-authority.js","sourceRoot":"","sources":["../../src/services/organization-resource-rust-authority.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC;4EAC4E;AAC5E,MAAM,CAAC,KAAK,UAAU,uCAAuC,CAC3D,EAAM,EACN,MAAwC,EACxC,GAAY,EACZ,KAAa,EACb,UAAkB,EAClB,SAA8B,EAC9B,IAA6B;IAE7B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;;;yBAIZ,KAAK,4BAA4B,UAAU;;;;2BAIzC,KAAK,8BAA8B,UAAU;;;GAGrE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAE,MAA+B,CAAC,IAAI,IAAI,EAAE,CAAC;IAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAA4C,CAAC;IAC/D,IAAI,GAAG,EAAE,aAAa,KAAK,KAAK;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,GAAG,EAAE,aAAa,KAAK,IAAI,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,uDAAuD,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,MAAM,EAAE,kBAAkB,KAAK,UAAU,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE,CAAC;QACtF,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,qDAAqD,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,0BAA0B,CAAC,EAAE,IAAI,EAAE,IAAI,UAAU,EAAE,CAAC;IAC3E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3F,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,4BAA4B,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACjG,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,qDAAqD,CAAC,CAAC;IAClF,CAAC;AACH,CAAC"}

package/dist/services/organization-resource-rust-authority.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=organization-resource-rust-authority.test.d.ts.map

package/dist/services/organization-resource-rust-authority.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"organization-resource-rust-authority.test.d.ts","sourceRoot":"","sources":["../../src/services/organization-resource-rust-authority.test.ts"],"names":[],"mappings":""}

package/dist/services/organization-resource-rust-authority.test.js

@@ -0,0 +1,48 @@
+import { describe, expect, it, vi } from "vitest";
+import { forwardRustOrganizationResourceMutation } from "./organization-resource-rust-authority.js";
+const orgId = "11111111-1111-4111-8111-111111111111";
+const resourceId = "22222222-2222-4222-8222-222222222222";
+const req = {
+    actor: { type: "board", source: "local_implicit", userId: "local-board" },
+    header: (name) => name === "x-rudder-idempotency-key" ? "resource-retry" : undefined,
+};
+function fixture(rows) {
+    const execute = vi.fn().mockResolvedValue(rows);
+    const mutation = vi.fn();
+    const bridge = {
+        projectGoalSetMode: "required",
+        organizationResourceMutation: mutation,
+    };
+    return { db: { execute }, bridge, mutation };
+}
+describe("organization resource authority routing", () => {
+    it("leaves a verified Node-only resource on its existing authority", async () => {
+        const { db, bridge, mutation } = fixture([{ requires_rust: false }]);
+        expect(await forwardRustOrganizationResourceMutation(db, bridge, req, orgId, resourceId, "update", { name: "Shared" })).toBeNull();
+        expect(mutation).not.toHaveBeenCalled();
+    });
+    it("fails closed when resource ownership cannot be established", async () => {
+        const { db, bridge, mutation } = fixture([]);
+        await expect(forwardRustOrganizationResourceMutation(db, bridge, req, orgId, resourceId, "delete", {}))
+            .rejects.toMatchObject({ status: 503 });
+        expect(mutation).not.toHaveBeenCalled();
+    });
+    it("keeps a Rust outage terminal instead of selecting the Node writer", async () => {
+        const { db, bridge, mutation } = fixture([{ requires_rust: true }]);
+        mutation.mockRejectedValue(new Error("connection lost after possible commit"));
+        await expect(forwardRustOrganizationResourceMutation(db, bridge, req, orgId, resourceId, "update", { name: "Retry" }))
+            .rejects.toMatchObject({ status: 503 });
+        expect(mutation).toHaveBeenCalledOnce();
+    });
+    it("preserves the stable key, operation and exact Rust failure response", async () => {
+        const { db, bridge, mutation } = fixture([{ requires_rust: true }]);
+        const response = { status: 409, contentType: "application/json", body: Buffer.from('{"error":"mutation_idempotency_conflict"}') };
+        mutation.mockResolvedValue(response);
+        expect(await forwardRustOrganizationResourceMutation(db, bridge, req, orgId, resourceId, "update", { name: "Changed" })).toBe(response);
+        const args = mutation.mock.calls[0];
+        expect(args.slice(0, 4)).toEqual([req, orgId, resourceId, "update"]);
+        expect(JSON.parse(args[4].toString("utf8"))).toEqual({ data: { name: "Changed" }, runId: null });
+        expect(args[5]).toBe("resource-retry");
+    });
+});
+//# sourceMappingURL=organization-resource-rust-authority.test.js.map

package/dist/services/organization-resource-rust-authority.test.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"orgs.d.ts","sourceRoot":"","sources":["../../src/services/orgs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAwCL,aAAa,EAUd,MAAM,cAAc,CAAC;AAatB,KAAK,wBAAwB,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC/E,KAAK,uBAAuB,GAAG,OAAO,aAAa,CAAC,YAAY,GAAG;IACjE,SAAS,CAAC,EAAE;QACV,YAAY,CAAC,EAAE,wBAAwB,CAAC;QACxC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;kBAwMlB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;mBAaX,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;iBAuDhC,MAAM,QACJ,OAAO,CAAC,OAAO,aAAa,CAAC,YAAY,CAAC,GAAG;QAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;kBAiHtE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;iBAiBP,MAAM;;;;;;;;;;;;;;;;;;;;oBA4E4B,MAAM;oBAAc,MAAM;;EAc5E"}
+{"version":3,"file":"orgs.d.ts","sourceRoot":"","sources":["../../src/services/orgs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EA0CL,aAAa,EAUd,MAAM,cAAc,CAAC;AAmBtB,KAAK,wBAAwB,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AAC/E,KAAK,uBAAuB,GAAG,OAAO,aAAa,CAAC,YAAY,GAAG;IACjE,SAAS,CAAC,EAAE;QACV,YAAY,CAAC,EAAE,wBAAwB,CAAC;QACxC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,eAAe,CAAC,EAAE,OAAO,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;kBAwMlB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;mBAaX,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;iBAgEhC,MAAM,QACJ,OAAO,CAAC,OAAO,aAAa,CAAC,YAAY,CAAC,GAAG;QAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;kBAoHtE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBP,MAAM;;;;;;;;;;;;;;;;;;;;oBA8E4B,MAAM;oBAAc,MAAM;;EAc5E"}

package/dist/services/orgs.js

@@ -1,11 +1,14 @@
-import { activityLog, agentApiKeys, agentConfigRevisions, agentRuntimeState, agents, agentTaskSessions, agentWakeupRequests, approvalComments, approvals, assets, budgetIncidents, budgetPolicies, chatAttachments, chatContextLinks, chatConversations, chatMessages, costEvents, costMonthlySpendRollups, documentRevisions, documents, executionWorkspaces, financeEvents, goals, heartbeatRunEvents, heartbeatRuns, invites, issueApprovals, issueAttachments, issueBlockAuditAttempts, issueComments, issueDocuments, issueReadStates, issues, issueWorkProducts, joinRequests, labels, organizationIssuePrefixAliases, organizationLogos, organizationMemberships, organizations, organizationSecrets, organizationSkills, principalPermissionGrants, projectGoals, projects, projectWorkspaces, requests, workspaceOperations, workspaceRuntimeServices, } from "@rudderhq/db";
+import { activityLog, agentApiKeys, agentConfigRevisions, agentRuntimeState, agents, agentTaskSessions, agentWakeupRequests, approvalComments, approvals, assets, budgetIncidents, budgetPolicies, chatAttachments, chatContextLinks, chatConversations, chatMessages, costEvents, costMonthlySpendRollups, documentRevisions, documents, executionWorkspaces, financeEvents, goals, heartbeatRunEvents, heartbeatRuns, invites, issueApprovals, issueAttachments, issueBlockAuditAttempts, issueComments, issueDocuments, issueReadStates, issues, issueWorkProducts, joinRequests, labels, organizationBrandingMutationState, organizationIssuePrefixAliases, organizationLogos, organizationMemberships, organizationMutationState, organizations, organizationSecrets, organizationSkills, principalPermissionGrants, projectGoals, projects, projectWorkspaces, requests, workspaceOperations, workspaceRuntimeServices, } from "@rudderhq/db";
 import { deriveOrganizationIssueKey, deriveOrganizationUrlKey, normalizeOrganizationIssueKey, } from "@rudderhq/shared";
 import { and, count, eq, gte, inArray, lt, sql } from "drizzle-orm";
 import { conflict, notFound, unprocessable } from "../errors.js";
 import { ensureOrganizationWorkspaceLayout, removeOrganizationStorage } from "../home-paths.js";
 import { logger } from "../middleware/logger.js";
+import { lockNodeOrganizationBrandingAuthority, lockOrganizationBrandingAuthorityForDeletion, } from "./organization-branding-fence.js";
+import { lockNodeMutationAuthority } from "./organization-mutation-fence.js";
 import { isPostgresError } from "./postgres-errors.js";
 import { recordProductAnalyticsEvent } from "./product-analytics.js";
+import { lockProjectGoalMutationAuthoritiesForOrganizationDeletion } from "./project-goal-mutation-fence.js";
 export function organizationService(db) {
     const DEFAULT_ISSUE_LABELS = [
         { name: "Bug", color: "#ef4444" },
@@ -202,6 +205,14 @@ export function organizationService(db) {
             const created = await createCompanyWithUniqueKeys(tx, {
                 ...organizationData,
             });
+            await tx
+                .insert(organizationMutationState)
+                .values({ orgId: created.id })
+                .onConflictDoNothing({ target: organizationMutationState.orgId });
+            await tx
+                .insert(organizationBrandingMutationState)
+                .values({ orgId: created.id })
+                .onConflictDoNothing({ target: organizationBrandingMutationState.orgId });
             await tx.insert(labels).values(DEFAULT_ISSUE_LABELS.map((label) => ({
                 orgId: created.id,
                 name: label.name,
@@ -238,6 +249,10 @@ export function organizationService(db) {
             return enrichCompany(hydrated);
         }),
         update: (id, data) => db.transaction(async (tx) => {
+            const writesBrandColor = Object.prototype.hasOwnProperty.call(data, "brandColor");
+            if (writesBrandColor)
+                await lockNodeOrganizationBrandingAuthority(tx, id);
+            await lockNodeMutationAuthority(tx, id);
             const existing = await getCompanyQuery(tx)
                 .where(eq(organizations.id, id))
                 .then((rows) => rows[0] ?? null);
@@ -334,6 +349,7 @@ export function organizationService(db) {
             return enrichCompany(hydrated, aliases.map((alias) => alias.prefix));
         }),
         archive: (id) => db.transaction(async (tx) => {
+            await lockNodeMutationAuthority(tx, id);
             const updated = await tx
                 .update(organizations)
                 .set({ status: "archived", updatedAt: new Date() })
@@ -351,6 +367,8 @@ export function organizationService(db) {
             return enrichCompany(hydrated);
         }),
         remove: (id) => db.transaction(async (tx) => {
+            await lockOrganizationBrandingAuthorityForDeletion(tx, id);
+            await lockProjectGoalMutationAuthoritiesForOrganizationDeletion(tx, id);
             // Delete from child tables in dependency order
             await tx.delete(issueBlockAuditAttempts).where(eq(issueBlockAuditAttempts.orgId, id));
             await tx.delete(requests).where(eq(requests.orgId, id));
@@ -396,8 +414,8 @@ export function organizationService(db) {
             await tx.delete(organizationIssuePrefixAliases).where(eq(organizationIssuePrefixAliases.orgId, id));
             await tx.delete(assets).where(eq(assets.orgId, id));
             await tx.delete(projectGoals).where(eq(projectGoals.orgId, id));
-            await tx.delete(goals).where(eq(goals.orgId, id));
             await tx.delete(projects).where(eq(projects.orgId, id));
+            await tx.delete(goals).where(eq(goals.orgId, id));
             await tx.delete(agents).where(eq(agents.orgId, id));
             const rows = await tx
                 .delete(organizations)