@betterportal/config-manager 10.6.24 → 10.6.26

package/lib/plugins/service-betterportal-config-manager/storage/entities.d.ts

@@ -0,0 +1,20 @@
+import type { BetterPortalConfig } from "@betterportal/framework";
+/** Each entry is an independently persisted/revisioned configuration aggregate. */
+export interface ConfigEntity {
+    kind: string;
+    id: string;
+    value: Record<string, any>;
+}
+export interface ConfigEntityRow extends ConfigEntity {
+    revision: string | number;
+}
+export declare const entityKey: (kind: string, id: string) => string;
+export declare const keyOf: (entity: ConfigEntity) => string;
+export declare function splitConfig(config: BetterPortalConfig): Map<string, ConfigEntity>;
+export declare function assembleConfig(entities: Iterable<ConfigEntity>): unknown;
+export declare function changedEntityKeys(before: Map<string, ConfigEntity>, after: Map<string, ConfigEntity>): string[];
+/** References are both DB foreign keys and shared locks during dependent writes. */
+export declare function entityReferences(entity: ConfigEntity, entities: Map<string, ConfigEntity>): string[];
+/** Uniqueness claims must also serialize concurrent inserts with different IDs. */
+export declare function entityClaims(entity: ConfigEntity): string[];
+//# sourceMappingURL=entities.d.ts.map

package/lib/plugins/service-betterportal-config-manager/storage/entities.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"entities.d.ts","sourceRoot":"","sources":["../../../../src/plugins/service-betterportal-config-manager/storage/entities.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAElE,mFAAmF;AACnF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AACD,MAAM,WAAW,eAAgB,SAAQ,YAAY;IAAG,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE;AACnF,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,EAAE,IAAI,MAAM,KAAG,MAAoC,CAAC;AAC1F,eAAO,MAAM,KAAK,GAAI,QAAQ,YAAY,KAAG,MAA2C,CAAC;AAEzF,wBAAgB,WAAW,CAAC,MAAM,EAAE,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAiCjF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,YAAY,CAAC,GAAG,OAAO,CA4BxE;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,EAAE,CAI/G;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,MAAM,EAAE,CAkCpG;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,EAAE,CAO3D"}

package/lib/plugins/service-betterportal-config-manager/storage/entities.js

@@ -0,0 +1,162 @@
+import { isDeepStrictEqual } from "node:util";
+export const entityKey = (kind, id) => JSON.stringify([kind, id]);
+export const keyOf = (entity) => entityKey(entity.kind, entity.id);
+export function splitConfig(config) {
+    const entities = new Map();
+    const add = (kind, id, value) => {
+        const entity = { kind, id, value: structuredClone(value) };
+        if (entities.has(keyOf(entity)))
+            throw new Error(`Duplicate config entity ${kind}/${id}`);
+        entities.set(keyOf(entity), entity);
+    };
+    add("settings", "platform", config.configManagement);
+    for (const kind of ["tenants", "apps", "platformServices", "sharedServiceCatalog", "sharedServiceActivations", "previewEnvironmentGroups", "previewEnvironmentDeployments"]) {
+        for (const value of config[kind]) {
+            // Presence is stored separately; polling must never dirty a tenant record.
+            const entry = structuredClone(value);
+            if (kind === "tenants") {
+                const tenant = entry;
+                for (const service of tenant.services) {
+                    delete service.lastSeenAt;
+                    delete service.lastSyncAt;
+                    add("tenantServices", service.id, { ...service, tenantId: tenant.id });
+                }
+                tenant.services = [];
+            }
+            if (kind === "previewEnvironmentDeployments") {
+                const deployment = entry;
+                if (deployment.effectiveConfig)
+                    add("previewConfigs", deployment.id, { id: deployment.id, ...deployment.effectiveConfig });
+                delete deployment.effectiveConfig;
+            }
+            add(kind, value.id, entry);
+        }
+    }
+    for (const value of config.manifestCache)
+        add("manifestCache", value.serviceId, value);
+    for (const kind of ["bindings", "grants"])
+        for (const value of config.m2m[kind])
+            add(kind, value.id, value);
+    for (const value of config.webhooks.targets)
+        add("webhookTargets", value.id, value);
+    return entities;
+}
+export function assembleConfig(entities) {
+    const result = {
+        tenants: [], apps: [], platformServices: [], sharedServiceCatalog: [], sharedServiceActivations: [],
+        manifestCache: [], previewEnvironmentGroups: [], previewEnvironmentDeployments: [],
+        m2m: { bindings: [], grants: [] }, webhooks: { targets: [] }
+    };
+    const services = [];
+    const previews = [];
+    for (const { kind, value } of entities) {
+        if (kind === "previewConfigs") {
+            previews.push(value);
+            continue;
+        }
+        if (kind === "tenantServices") {
+            services.push(value);
+            continue;
+        }
+        if (kind === "settings")
+            result.configManagement = structuredClone(value);
+        else if (kind === "bindings" || kind === "grants")
+            result.m2m[kind].push(structuredClone(value));
+        else if (kind === "webhookTargets")
+            result.webhooks.targets.push(structuredClone(value));
+        else if (Array.isArray(result[kind]))
+            result[kind].push(structuredClone(value));
+        else
+            throw new Error(`Unknown config entity kind: ${kind}`);
+    }
+    for (const { tenantId, ...service } of services) {
+        const tenant = result.tenants.find((candidate) => candidate.id === tenantId);
+        if (!tenant)
+            throw new Error(`Service ${service.id} references missing tenant ${tenantId}`);
+        tenant.services.push(structuredClone(service));
+    }
+    for (const { id, ...effectiveConfig } of previews) {
+        const deployment = result.previewEnvironmentDeployments.find((candidate) => candidate.id === id);
+        if (!deployment)
+            throw new Error(`Preview config ${id} references missing deployment`);
+        deployment.effectiveConfig = structuredClone(effectiveConfig);
+    }
+    return result;
+}
+export function changedEntityKeys(before, after) {
+    return [...new Set([...before.keys(), ...after.keys()])].filter(key => !isDeepStrictEqual(before.get(key)?.value, after.get(key)?.value)).sort();
+}
+/** References are both DB foreign keys and shared locks during dependent writes. */
+export function entityReferences(entity, entities) {
+    const refs = new Set();
+    const add = (kind, id) => { if (typeof id === "string" && id)
+        refs.add(entityKey(kind, id)); };
+    const service = (id) => {
+        for (const kind of ["tenantServices", "platformServices", "sharedServiceCatalog", "sharedServiceActivations"]) {
+            if (entities.has(entityKey(kind, id))) {
+                add(kind, id);
+                return;
+            }
+        }
+    };
+    const { kind, value } = entity;
+    if (kind === "previewConfigs")
+        add("previewEnvironmentDeployments", entity.id);
+    if (kind === "settings") {
+        add("tenants", value.adminTenantId);
+        add("apps", value.managementAppId);
+    }
+    if (kind === "tenants")
+        for (const id of value.activatedPlatformServices)
+            add("platformServices", id);
+    if (["tenantServices", "apps", "sharedServiceActivations", "bindings", "grants", "webhookTargets", "previewEnvironmentDeployments"].includes(kind)) {
+        add("tenants", value.tenantId);
+        add("apps", value.appId);
+    }
+    if (kind === "sharedServiceActivations")
+        add("sharedServiceCatalog", value.sharedServiceId);
+    if (kind === "webhookTargets" || kind === "manifestCache")
+        service(value.serviceId);
+    if (kind === "bindings") {
+        service(value.sourceServiceId);
+        service(value.targetServiceId);
+    }
+    if (kind === "grants")
+        add("bindings", value.bindingId);
+    if (kind === "previewEnvironmentGroups") {
+        add("tenants", value.sourceTenantId);
+        add("apps", value.sourceAppId);
+    }
+    if (kind === "previewEnvironmentDeployments")
+        add("previewEnvironmentGroups", value.groupId);
+    if (kind === "apps") {
+        // Walk nested route, auth, shell, fragment and permission service references.
+        const walk = (input) => {
+            if (!input || typeof input !== "object")
+                return;
+            for (const [name, child] of Object.entries(input)) {
+                if (name === "serviceId" && typeof child === "string")
+                    service(child);
+                else
+                    walk(child);
+            }
+        };
+        walk(value);
+    }
+    refs.delete(keyOf(entity));
+    return [...refs].sort();
+}
+/** Uniqueness claims must also serialize concurrent inserts with different IDs. */
+export function entityClaims(entity) {
+    const { kind, value } = entity;
+    if (kind === "apps")
+        return [...new Set(value.hostnames.map((hostname) => `hostname:${hostname.toLowerCase()}`))];
+    if (kind === "previewEnvironmentDeployments")
+        return [`preview:${value.groupId}:${value.key}`];
+    if (kind === "bindings" && value.enabled)
+        return [`binding:${JSON.stringify([value.tenantId, value.appId, value.sourceServiceId, value.requestId, value.mode])}`];
+    if (kind === "grants" && value.enabled)
+        return [`grant:${value.bindingId}`];
+    return [];
+}
+//# sourceMappingURL=entities.js.map

package/lib/plugins/service-betterportal-config-manager/storage/entities.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"entities.js","sourceRoot":"","sources":["../../../../src/plugins/service-betterportal-config-manager/storage/entities.ts"],"names":[],"mappings":"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"}

package/lib/plugins/service-betterportal-config-manager/storage/postgres.d.ts

@@ -64,6 +64,9 @@ export declare class PostgresStorage extends BaseStorage {
     private readonly deliveriesTable;
     private readonly outboxTable;
     private readonly activityTable;
+    private readonly entitiesTable;
+    private readonly referencesTable;
+    private readonly revisionSequence;
     private activityLoad?;
     private activityLoadedAt;
     private pool;
@@ -81,10 +84,13 @@ export declare class PostgresStorage extends BaseStorage {
         notify?: boolean;
         completeAction?: PendingActionCompletion;
     }): Promise<void>;
+    private writeReferences;
     invalidate(): void;
     validateApiKey(apiKey: string): ReturnType<BaseStorage["validateApiKey"]>;
+    private readSnapshot;
     private readConfig;
     private cloneSnapshot;
+    close(): Promise<void>;
     touchServiceActivity(serviceId: string, field: "lastSeenAt" | "lastSyncAt"): Promise<void>;
     private loadServiceActivity;
     loadOrCreateIdentity<T extends object>(create: () => T): Promise<T>;
@@ -120,6 +126,7 @@ export declare class PostgresStorage extends BaseStorage {
     private getPool;
     private ensureSchema;
     private migrate;
+    private migrateEntities;
     private importLegacyFiles;
     private insertWebhookDelivery;
     private insertOutbox;

package/lib/plugins/service-betterportal-config-manager/storage/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../src/plugins/service-betterportal-config-manager/storage/postgres.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../../../../src/plugins/service-betterportal-config-manager/storage/postgres.ts"],"names":[],"mappings":"AAKA,OAAO,EAA4B,KAAK,kBAAkB,EAAE,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC5G,OAAO,EACL,WAAW,EAMX,KAAK,sBAAsB,EAC5B,MAAM,WAAW,CAAC;AAenB,OAAO,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,OAAO,GAAG,iBAAiB,CAAC;AAC1E,0FAA0F;AAC1F,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,iBAAiB,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,6EAA6E;IAC7E,KAAK,EAAE,MAAM,CAAC;IACd,6EAA6E;IAC7E,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;IACxD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3C;AAED,MAAM,MAAM,kBAAkB,GAC1B;IAAE,KAAK,EAAE,SAAS,GAAG,WAAW,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,GAC/D;IAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;CAAE,CAAC;AAE9C,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,SAAS,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC;IACzC,QAAQ,CAAC,SAAS,EAAE,yBAAyB,GAAG,4BAA4B,CAAC;IAC7E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC3C;AAED,UAAU,WAAW;IACnB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;CACvC;AAID,qBAAa,eAAgB,SAAQ,WAAW;IAC9C,QAAQ,CAAC,OAAO,EAAG,UAAU,CAAU;IACvC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,YAAY,CAAC,CAAqE;IAC1F,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,IAAI,CAAqB;IACjC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,WAAW,CAAmB;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqD;IAC/E,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,UAAU,CAAiE;IACnF,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,eAAe,CAAC,CAAwH;gBAEpI,OAAO,EAAE,sBAAsB;IAiBrC,UAAU,CAAC,KAAK,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKlD,UAAU,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAkBzC,UAAU,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,uBAAuB,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAsHvH,eAAe;IAQpB,UAAU,IAAI,IAAI;IAOZ,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YAkB1E,YAAY;YAcZ,UAAU;YAIV,aAAa;IAUrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAEtB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhG,OAAO,CAAC,mBAAmB;IAYrB,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAkBnE,mBAAmB,CAAC,KAAK,EAAE;QAC/B,IAAI,EAAE,iBAAiB,CAAC;QACxB,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,OAAO,CAAC,OAAO,CAAC;IAcd,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUhF,kBAAkB,CAAC,KAAK,EAAE;QAC9B,IAAI,EAAE,iBAAiB,CAAC;QACxB,GAAG,EAAE,MAAM,CAAC;QACZ,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA6DzB,qBAAqB,CAAC,KAAK,EAAE,uBAAuB,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;YAOzF,YAAY;IAWpB,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASxF,wBAAwB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBzE,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,SAAK,EAAE,OAAO,SAAS,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAoCrG,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlF,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IASzC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBzE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,SAAK,EAAE,OAAO,SAAS,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAoBjF,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,SAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAUxE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAO9B,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,YAAY;YAKN,OAAO;YA0DP,eAAe;YAwDf,iBAAiB;YAqCjB,qBAAqB;YAarB,YAAY;CAY3B"}

package/lib/plugins/service-betterportal-config-manager/storage/postgres.js

@@ -5,13 +5,14 @@ import { Pool } from "pg";
 import * as yaml from "yaml";
 import { BetterPortalConfigSchema } from "@betterportal/framework";
 import { BaseStorage, ConfigRevisionConflictError, hashApiKey, migrateOfficialPluginIds, migrateRouteOperations, migrateRouteParamSyntax } from "./core.js";
+import { assembleConfig, changedEntityKeys, entityClaims, entityReferences, keyOf, splitConfig } from "./entities.js";
 function quotePgIdent(identifier) {
     if (!/^[a-z_][a-z0-9_]*$/i.test(identifier))
         throw new Error(`Invalid PostgreSQL identifier: ${identifier}`);
     return `"${identifier.replace(/"/g, "\"\"")}"`;
 }
 export { ConfigRevisionConflictError } from "./core.js";
-const SCHEMA_VERSION = 1;
+const SCHEMA_VERSION = 2;
 export class PostgresStorage extends BaseStorage {
     backend = "postgres";
     connectionString;
@@ -24,6 +25,9 @@ export class PostgresStorage extends BaseStorage {
     deliveriesTable;
     outboxTable;
     activityTable;
+    entitiesTable;
+    referencesTable;
+    revisionSequence;
     activityLoad;
     activityLoadedAt = 0;
     pool = null;
@@ -46,6 +50,9 @@ export class PostgresStorage extends BaseStorage {
         this.deliveriesTable = quotePgIdent(`${this.tableName}_webhook_deliveries`);
         this.outboxTable = quotePgIdent(`${this.tableName}_outbox`);
         this.activityTable = quotePgIdent(`${this.tableName}_activity`);
+        this.entitiesTable = quotePgIdent(`${this.tableName}_entities`);
+        this.referencesTable = quotePgIdent(`${this.tableName}_references`);
+        this.revisionSequence = quotePgIdent(`${this.tableName}_entity_revision`);
     }
     async initialize(paths = {}) {
         this.legacyPaths = paths;
@@ -63,7 +70,7 @@ export class PostgresStorage extends BaseStorage {
                     this.configLoad = null;
                 return this.loadConfig();
             }
-            this.cachedConfig = { config: loaded.config, revision: loaded.revision };
+            this.cachedConfig = loaded;
             return this.cloneSnapshot(this.cachedConfig);
         }
         finally {
@@ -73,63 +80,125 @@ export class PostgresStorage extends BaseStorage {
     }
     async saveConfig(config, options) {
         await this.ensureSchema();
-        const validated = this.parseConfig(config);
-        this.validateConfigReferences(validated);
-        const expectedRevision = this.snapshots.get(config);
+        const baseline = this.snapshots.get(config);
+        if (!baseline)
+            throw new Error("Config must be loaded from this store before saving; detached whole-platform replacements are not supported");
+        const proposed = splitConfig(this.parseConfig(config));
+        // Cached manifests belong to their concrete service registration. Deleting
+        // a registration also deletes its known cache, whichever API initiated it.
+        for (const [key, entity] of proposed)
+            if (entity.kind === "manifestCache") {
+                if (entityReferences(entity, baseline.entities).some(ref => !proposed.has(ref)))
+                    proposed.delete(key);
+            }
+        const changed = changedEntityKeys(baseline.entities, proposed);
         const client = await this.getPool().connect();
         try {
             await client.query("begin");
             if (options?.completeAction)
                 await this.finishAction(client, options.completeAction);
-            const current = await client.query(`select config, revision from ${this.quotedTableName} where id = $1 for update`, [this.rowId]);
-            if (!current.rows[0])
-                throw new Error(`Platform config row ${this.rowId} was not initialized`);
-            const currentRevision = Number(current.rows[0].revision);
-            if (expectedRevision !== undefined && expectedRevision !== currentRevision) {
-                this.invalidate();
-                throw new ConfigRevisionConflictError(expectedRevision, currentRevision);
+            // Shared dependency locks allow two apps in a tenant to save concurrently.
+            // Exclusive locks cover only changed entities and their uniqueness claims.
+            const locks = new Map();
+            const dependencies = new Set();
+            for (const key of changed) {
+                locks.set(key, true);
+                for (const entities of [baseline.entities, proposed]) {
+                    const entity = entities.get(key);
+                    if (!entity)
+                        continue;
+                    for (const claim of entityClaims(entity))
+                        locks.set(claim, true);
+                    for (const ref of entityReferences(entity, entities)) {
+                        dependencies.add(ref);
+                        if (!locks.has(ref))
+                            locks.set(ref, false);
+                    }
+                }
             }
-            // Presence belongs to an installed identity, not merely its reusable service ID.
-            const services = new Map(validated.tenants.flatMap(tenant => tenant.services.map(service => [service.id, service])));
+            for (const [key, exclusive] of [...locks].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0)) {
+                await client.query(`select ${exclusive ? "pg_advisory_xact_lock" : "pg_advisory_xact_lock_shared"}(hashtextextended($1, 0))`, [JSON.stringify([this.tableName, this.rowId, key])]);
+            }
+            const current = await this.readSnapshot(client);
+            for (const key of new Set([...changed, ...dependencies])) {
+                const expected = baseline.revisions.get(key) ?? 0;
+                const actual = current.revisions.get(key) ?? 0;
+                if (expected !== actual) {
+                    this.invalidate();
+                    throw new ConfigRevisionConflictError(expected, actual, key);
+                }
+            }
+            const merged = new Map(current.entities);
+            for (const key of changed) {
+                const entity = proposed.get(key);
+                if (entity)
+                    merged.set(key, entity);
+                else
+                    merged.delete(key);
+            }
+            // A sync may have created a cache after the deletion snapshot was loaded.
+            // Reject that stale deletion before reaching the FK; a fresh retry includes
+            // the cache in its deletion set and locks both records in canonical order.
+            for (const entity of merged.values())
+                if (entity.kind === "manifestCache") {
+                    const removed = entityReferences(entity, current.entities).find(ref => !merged.has(ref));
+                    if (removed) {
+                        this.invalidate();
+                        throw new ConfigRevisionConflictError(baseline.revisions.get(keyOf(entity)) ?? 0, current.revisions.get(keyOf(entity)) ?? 0, keyOf(entity));
+                    }
+                }
+            const validated = this.parseConfig(assembleConfig(merged.values()));
+            this.validateConfigReferences(validated);
+            // Validate uniqueness against the current committed state, under claim locks.
+            const claims = new Set();
+            for (const entity of merged.values())
+                for (const claim of entityClaims(entity)) {
+                    if (claims.has(claim))
+                        throw new Error(`Configuration uniqueness conflict: ${claim}`);
+                    claims.add(claim);
+                }
             const resetActivity = [];
-            for (const previous of current.rows[0].config.tenants.flatMap(tenant => tenant.services)) {
+            const services = new Map(validated.tenants.flatMap(tenant => tenant.services.map(service => [service.id, service])));
+            for (const previous of current.config.tenants.flatMap(tenant => tenant.services)) {
                 const next = services.get(previous.id);
-                if (!next || previous.apiKeyHash !== next.apiKeyHash || previous.hostname !== next.hostname
-                    || (previous.lastSeenAt && !next.lastSeenAt) || (previous.lastSyncAt && !next.lastSyncAt)) {
+                if (!next || previous.apiKeyHash !== next.apiKeyHash || previous.hostname !== next.hostname)
                     resetActivity.push(previous.id);
-                    if (next) {
-                        delete next.lastSeenAt;
-                        delete next.lastSyncAt;
-                    }
-                }
             }
             if (resetActivity.length)
                 await client.query(`delete from ${this.activityTable} where scope_id = $1 and service_id = any($2::text[])`, [this.rowId, resetActivity]);
-            const previousManifests = new Map(current.rows[0].config.manifestCache.map(entry => [entry.serviceId, entry.fetchedAt]));
-            const refreshedManifests = validated.manifestCache.filter(entry => entry.fetchedAt !== previousManifests.get(entry.serviceId));
-            if (refreshedManifests.length) {
-                // Readiness compares manifest acceptance with delivery; both must use the DB clock.
+            const refreshed = changed.map(key => merged.get(key)).filter(entity => entity?.kind === "manifestCache");
+            if (refreshed.length) {
                 const clock = await client.query("select clock_timestamp() as now");
-                const fetchedAt = clock.rows[0].now.toISOString();
-                for (const entry of refreshedManifests)
-                    entry.fetchedAt = fetchedAt;
+                for (const entity of refreshed)
+                    entity.value.fetchedAt = clock.rows[0].now.toISOString();
             }
-            const revision = currentRevision + 1;
-            await client.query(`update ${this.quotedTableName} set config = $2::jsonb, revision = $3, updated_at = now() where id = $1`, [this.rowId, JSON.stringify(validated), revision]);
-            // Every persisted revision invalidates replica snapshots. Presence has its own table.
-            await this.insertOutbox(client, "broadcast", "platform-config.changed", { revision });
-            await client.query("commit");
-            for (const entry of refreshedManifests) {
-                const submitted = config.manifestCache.find(candidate => candidate.serviceId === entry.serviceId);
-                if (submitted)
-                    submitted.fetchedAt = entry.fetchedAt;
+            for (const key of changed) {
+                const entity = merged.get(key) ?? baseline.entities.get(key);
+                await client.query(`delete from ${this.referencesTable} where scope_id = $1 and kind = $2 and entity_id = $3`, [this.rowId, entity.kind, entity.id]);
+                if (merged.has(key)) {
+                    await client.query(`insert into ${this.entitiesTable} (scope_id, kind, entity_id, value, revision)
+            values ($1, $2, $3, $4::jsonb, nextval('${this.revisionSequence}'))
+            on conflict (scope_id, kind, entity_id) do update set value = excluded.value, revision = excluded.revision`, [this.rowId, entity.kind, entity.id, JSON.stringify(entity.value)]);
+                }
+                else
+                    await client.query(`delete from ${this.entitiesTable} where scope_id = $1 and kind = $2 and entity_id = $3`, [this.rowId, entity.kind, entity.id]);
+            }
+            for (const key of changed) {
+                const entity = merged.get(key);
+                if (entity)
+                    await this.writeReferences(client, entity, merged);
             }
-            this.activityLoad = undefined;
-            this.snapshots.set(config, revision);
-            this.snapshots.set(validated, revision);
-            this.configGeneration++;
-            this.cachedConfig = { config: structuredClone(validated), revision };
-            super.invalidate();
+            if (changed.length) {
+                const result = await client.query(`select nextval('${this.revisionSequence}') as revision`);
+                await this.insertOutbox(client, "broadcast", "platform-config.changed", { revision: Number(result.rows[0].revision) });
+            }
+            const committed = await this.readSnapshot(client);
+            await client.query("commit");
+            // Update the caller's baseline as well as its value: subsequent saves must
+            // not mistake concurrent edits included in this commit for user deletions.
+            Object.assign(config, structuredClone(committed.config));
+            this.snapshots.set(config, committed);
+            this.invalidate();
         }
         catch (error) {
             await client.query("rollback").catch(() => undefined);
@@ -139,6 +208,13 @@ export class PostgresStorage extends BaseStorage {
             client.release();
         }
     }
+    async writeReferences(client, entity, entities) {
+        for (const ref of entityReferences(entity, entities)) {
+            const [kind, id] = JSON.parse(ref);
+            await client.query(`insert into ${this.referencesTable} (scope_id, kind, entity_id, target_kind, target_id)
+        values ($1, $2, $3, $4, $5)`, [this.rowId, entity.kind, entity.id, kind, id]);
+        }
+    }
     invalidate() {
         this.configGeneration++;
         this.cachedConfig = null;
@@ -167,19 +243,25 @@ export class PostgresStorage extends BaseStorage {
         }
         return structuredClone(this.credentialIndex.entries.get(hashApiKey(apiKey)) ?? null);
     }
+    async readSnapshot(connection) {
+        const result = await connection.query(`select kind, entity_id, value, revision from ${this.entitiesTable} where scope_id = $1 order by ordinal`, [this.rowId]);
+        if (!result.rows.some(row => row.kind === "settings"))
+            throw new Error(`Config scope ${this.rowId} was not initialized`);
+        const rows = result.rows.map(row => ({ ...row, id: row.entity_id }));
+        const previewConfigs = new Set(rows.filter(row => row.kind === "previewConfigs").map(row => row.id));
+        for (const row of rows)
+            if (row.kind === "previewEnvironmentDeployments" && !previewConfigs.has(row.id)) {
+                throw new Error(`Persisted preview ${row.id} is missing its effective configuration`);
+            }
+        const config = this.parseConfig(assembleConfig(rows));
+        return { config, entities: splitConfig(config), revisions: new Map(rows.map(row => [keyOf(row), Number(row.revision)])) };
+    }
     async readConfig(generation) {
-        const result = await this.getPool().query(`select config, revision from ${this.quotedTableName} where id = $1`, [this.rowId]);
-        if (!result.rows[0])
-            throw new Error(`Platform config row ${this.rowId} was not initialized`);
-        return {
-            config: this.parseConfig(result.rows[0].config),
-            revision: Number(result.rows[0].revision),
-            generation
-        };
+        return { ...await this.readSnapshot(this.getPool()), generation };
     }
     async cloneSnapshot(snapshot) {
         const config = structuredClone(snapshot.config);
-        this.snapshots.set(config, snapshot.revision);
+        this.snapshots.set(config, snapshot);
         const activity = await this.loadServiceActivity();
         for (const tenant of config.tenants)
             for (const service of tenant.services) {
@@ -187,6 +269,7 @@ export class PostgresStorage extends BaseStorage {
             }
         return config;
     }
+    async close() { await this.pool?.end(); }
     async touchServiceActivity(serviceId, field) {
         await this.ensureSchema();
         const column = field === "lastSeenAt" ? "last_seen_at" : "last_sync_at";
@@ -430,7 +513,7 @@ export class PostgresStorage extends BaseStorage {
     }
     async migrate() {
         const client = await this.getPool().connect();
-        const lockName = `${this.tableName}:${this.rowId}:migrations`;
+        const lockName = `${this.tableName}:migrations`;
         try {
             await client.query("select pg_advisory_lock(hashtext($1))", [lockName]);
             await client.query("begin");
@@ -464,11 +547,12 @@ export class PostgresStorage extends BaseStorage {
         payload jsonb not null, attempts integer not null default 0, available_at timestamptz not null default now(),
         lease_owner text, lease_until timestamptz, created_at timestamptz not null default now(),
         primary key (scope_id, id))`);
-            const applied = await client.query(`select 1 from ${this.migrationsTable} where scope_id = $1 and version = $2`, [this.rowId, SCHEMA_VERSION]);
+            const applied = await client.query(`select 1 from ${this.migrationsTable} where scope_id = $1 and version = $2`, [this.rowId, 1]);
             if (applied.rows.length === 0) {
                 await this.importLegacyFiles(client);
-                await client.query(`insert into ${this.migrationsTable} (scope_id, version) values ($1, $2)`, [this.rowId, SCHEMA_VERSION]);
+                await client.query(`insert into ${this.migrationsTable} (scope_id, version) values ($1, $2)`, [this.rowId, 1]);
             }
+            await this.migrateEntities(client);
             await client.query("commit");
         }
         catch (error) {
@@ -480,6 +564,67 @@ export class PostgresStorage extends BaseStorage {
             client.release();
         }
     }
+    async migrateEntities(client) {
+        await client.query(`create sequence if not exists ${this.revisionSequence}`);
+        await client.query(`create table if not exists ${this.entitiesTable} (
+      scope_id text not null, kind text not null, entity_id text not null, value jsonb not null,
+      revision bigint not null, ordinal bigint generated always as identity,
+      primary key (scope_id, kind, entity_id), check (jsonb_typeof(value) = 'object'))`);
+        await client.query(`create table if not exists ${this.referencesTable} (
+      scope_id text not null, kind text not null, entity_id text not null, target_kind text not null, target_id text not null,
+      primary key (scope_id, kind, entity_id, target_kind, target_id),
+      foreign key (scope_id, kind, entity_id) references ${this.entitiesTable} (scope_id, kind, entity_id) deferrable initially deferred,
+      foreign key (scope_id, target_kind, target_id) references ${this.entitiesTable} (scope_id, kind, entity_id) deferrable initially deferred)`);
+        await client.query(`create index if not exists ${quotePgIdent(`${this.tableName}_ref_target_idx`)}
+      on ${this.referencesTable} (scope_id, target_kind, target_id)`);
+        const applied = await client.query(`select 1 from ${this.migrationsTable} where scope_id = $1 and version = $2`, [this.rowId, SCHEMA_VERSION]);
+        if (applied.rows.length)
+            return;
+        // Row lock waits for in-flight legacy saves. The trigger below fences later
+        // old-binary writes; the frozen row is retained as a migration backup.
+        const source = await client.query(`select config from ${this.quotedTableName} where id = $1 for update`, [this.rowId]);
+        if (!source.rows[0])
+            throw new Error("Legacy configuration is missing");
+        const config = this.parseConfig(source.rows[0].config);
+        this.validateConfigReferences(config);
+        const entities = splitConfig(config);
+        const claims = new Set();
+        for (const entity of entities.values())
+            for (const claim of entityClaims(entity)) {
+                if (claims.has(claim))
+                    throw new Error(`Cannot migrate duplicate configuration claim: ${claim}`);
+                claims.add(claim);
+            }
+        for (const tenant of config.tenants)
+            for (const service of tenant.services) {
+                if (!service.lastSeenAt && !service.lastSyncAt)
+                    continue;
+                await client.query(`insert into ${this.activityTable} (scope_id, service_id, last_seen_at, last_sync_at)
+        values ($1, $2, $3, $4) on conflict (scope_id, service_id) do update set
+        last_seen_at = greatest(${this.activityTable}.last_seen_at, excluded.last_seen_at),
+        last_sync_at = greatest(${this.activityTable}.last_sync_at, excluded.last_sync_at)`, [this.rowId, service.id, service.lastSeenAt ?? null, service.lastSyncAt ?? null]);
+            }
+        for (const entity of entities.values())
+            await client.query(`insert into ${this.entitiesTable} (scope_id, kind, entity_id, value, revision) values ($1, $2, $3, $4::jsonb, nextval('${this.revisionSequence}'))`, [this.rowId, entity.kind, entity.id, JSON.stringify(entity.value)]);
+        for (const entity of entities.values())
+            await this.writeReferences(client, entity, entities);
+        const restored = await this.readSnapshot(client);
+        if (changedEntityKeys(entities, restored.entities).length)
+            throw new Error("Config entity migration verification failed");
+        const fence = quotePgIdent(`${this.tableName}_legacy_write_fence`);
+        await client.query(`create or replace function ${fence}() returns trigger language plpgsql as $body$
+      begin
+        if exists (select 1 from ${this.migrationsTable} where scope_id = OLD.id and version = 2) then
+          raise exception 'Config storage migrated to independent entities; upgrade all config-manager replicas';
+        end if;
+        if TG_OP = 'DELETE' then return OLD; end if;
+        return NEW;
+      end $body$`);
+        await client.query(`drop trigger if exists legacy_write_fence on ${this.quotedTableName}`);
+        await client.query(`create trigger legacy_write_fence before update or delete on ${this.quotedTableName}
+      for each row execute function ${fence}()`);
+        await client.query(`insert into ${this.migrationsTable} (scope_id, version) values ($1, $2)`, [this.rowId, SCHEMA_VERSION]);
+    }
     async importLegacyFiles(client) {
         const existingConfig = await client.query(`select 1 from ${this.quotedTableName} where id = $1`, [this.rowId]);
         if (existingConfig.rows.length === 0) {