@betterportal/config-manager 10.6.7 → 10.6.9

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

@@ -1,4 +1,5 @@
 import type { RsaPublicJwk } from "@betterportal/framework";
+import type { PostgresStorage } from "./storage/postgres.js";
 export interface CpKeyPair {
     privateKeyPem: string;
     publicKeyPem: string;
@@ -19,9 +20,10 @@ export interface CpBootstrapState {
 }
 export declare function cpBootstrap(input: {
     keyStorePath: string;
+    postgres?: PostgresStorage;
     issuer?: string;
     audience: string;
     host: string;
     port: number;
-}): CpBootstrapState;
+}): Promise<CpBootstrapState>;
 //# sourceMappingURL=cpBootstrap.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"cpBootstrap.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/cpBootstrap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,WAAW,SAAS;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,SAAS,CAAC;IACnB,2CAA2C;IAC3C,GAAG,EAAE,YAAY,CAAC;IAClB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;CACjB;AAQD,wBAAgB,WAAW,CAAC,KAAK,EAAE;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,gBAAgB,CAsBnB"}
+{"version":3,"file":"cpBootstrap.d.ts","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/cpBootstrap.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,WAAW,SAAS;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,SAAS,CAAC;IACnB,2CAA2C;IAC3C,GAAG,EAAE,YAAY,CAAC;IAClB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;CACjB;AAQD,wBAAsB,WAAW,CAAC,KAAK,EAAE;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAyB5B"}

package/lib/plugins/service-betterportal-config-manager/cpBootstrap.js

@@ -6,11 +6,14 @@ import { randomBytes, generateKeyPairSync, createPublicKey } from "node:crypto";
  * Returns the same object on subsequent calls within a process.
  */
 let cached = null;
-export function cpBootstrap(input) {
+export async function cpBootstrap(input) {
     if (cached)
         return cached;
     const keyPath = resolve(input.keyStorePath);
-    const keyPair = loadOrGenerateKeyPair(keyPath);
+    const keyPair = input.postgres
+        ? await input.postgres.loadOrCreateIdentity(generateKeyPair)
+        : loadOrGenerateKeyPair(keyPath);
+    assertKeyPair(keyPair, input.postgres ? "PostgreSQL" : keyPath);
     if (!input.issuer) {
         throw new Error("Config manager cpIssuer is required and must be the public control-plane issuer URL.");
     }
@@ -30,21 +33,26 @@ export function cpBootstrap(input) {
 function loadOrGenerateKeyPair(filePath) {
     if (existsSync(filePath)) {
         const parsed = JSON.parse(readFileSync(filePath, "utf8"));
-        if (typeof parsed.privateKeyPem !== "string" || typeof parsed.publicKeyPem !== "string" || typeof parsed.kid !== "string") {
-            throw new Error(`Malformed CP keypair file: ${filePath}`);
-        }
         return parsed;
     }
+    const pair = generateKeyPair();
+    mkdirSync(dirname(filePath), { recursive: true });
+    writeFileSync(filePath, JSON.stringify(pair, null, 2), { mode: 0o600 });
+    return pair;
+}
+function assertKeyPair(value, source) {
+    if (typeof value?.privateKeyPem !== "string" || typeof value?.publicKeyPem !== "string" || typeof value?.kid !== "string") {
+        throw new Error(`Malformed CP keypair in ${source}`);
+    }
+}
+function generateKeyPair() {
     const { privateKey, publicKey } = generateKeyPairSync("rsa", {
         modulusLength: 2048,
         publicKeyEncoding: { type: "spki", format: "pem" },
         privateKeyEncoding: { type: "pkcs8", format: "pem" }
     });
     const kid = randomBytes(16).toString("base64url");
-    const pair = { privateKeyPem: privateKey, publicKeyPem: publicKey, kid };
-    mkdirSync(dirname(filePath), { recursive: true });
-    writeFileSync(filePath, JSON.stringify(pair, null, 2), { mode: 0o600 });
-    return pair;
+    return { privateKeyPem: privateKey, publicKeyPem: publicKey, kid };
 }
 function publicKeyToJwk(publicKeyPem, kid) {
     const keyObject = createPublicKey(publicKeyPem);

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

@@ -1 +1 @@
-{"version":3,"file":"cpBootstrap.js","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/cpBootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAuBhF;;;GAGG;AACH,IAAI,MAAM,GAA4B,IAAI,CAAC;AAE3C,MAAM,UAAU,WAAW,CAAC,KAM3B;IACC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,sFAAsF,CAAC,CAAC;IAC1G,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,MAAM,OAAO,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,wBAAwB,CAAC;IACtE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IAE9C,MAAM,GAAG;QACP,OAAO;QACP,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC;QACtD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QAClC,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,IAAI;QACJ,OAAO;KACR,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAgB;IAC7C,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAc,CAAC;QACvE,IAAI,OAAO,MAAM,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC1H,MAAM,IAAI,KAAK,CAAC,8BAA8B,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC,KAAK,EAAE;QAC3D,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;QAClD,kBAAkB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE;KACrD,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,IAAI,GAAc,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;IACpF,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAClD,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,YAAoB,EAAE,GAAW;IACvD,MAAM,SAAS,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAA0C,CAAC;IACzF,OAAO;QACL,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,KAAK;QACV,GAAG,EAAE,OAAO;QACZ,GAAG;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,CAAC,EAAE,GAAG,CAAC,CAAC;KACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cpBootstrap.js","sourceRoot":"","sources":["../../../src/plugins/service-betterportal-config-manager/cpBootstrap.ts"],"names":[],"mappings":"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"}

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

@@ -25,6 +25,7 @@ declare const Config: import("@bsb/base").BSBPluginConfigClass<av.ObjectSchema<{
         connectionString: av.StringSchema;
         tableName: av.OptionalSchema<av.StringSchema>;
         rowId: av.OptionalSchema<av.StringSchema>;
+        legacyConfigPath: av.OptionalSchema<av.StringSchema>;
     }>]>;
     requestTimeoutMs: av.IntSchema;
     /** Path to RSA keypair JSON used to sign envelope/setup tokens. Auto-generated on first boot. */
@@ -35,15 +36,20 @@ declare const Config: import("@bsb/base").BSBPluginConfigClass<av.ObjectSchema<{
     cpAudience: av.StringSchema;
 }>>;
 declare const EventSchemas: {
-    readonly emitEvents: {};
+    readonly emitEvents: {
+        readonly "webhook.delivery.available": {
+            input: av.ObjectSchema<{}>;
+            description?: string;
+            readonly __brand: "fire-and-forget";
+        };
+    };
     readonly onEvents: {};
     readonly emitReturnableEvents: {};
     readonly onReturnableEvents: {};
     readonly emitBroadcast: {
         readonly "platform-config.changed": {
             input: av.ObjectSchema<{
-                sourceId: av.StringSchema;
-                backend: av.EnumSchema<readonly ["file", "postgres"]>;
+                revision: av.NumberSchema;
             }>;
             description?: string;
             readonly __brand: "broadcast";
@@ -74,6 +80,7 @@ export declare class Plugin extends BPService<InstanceType<typeof Config>, typeo
             connectionString: av.StringSchema;
             tableName: av.OptionalSchema<av.StringSchema>;
             rowId: av.OptionalSchema<av.StringSchema>;
+            legacyConfigPath: av.OptionalSchema<av.StringSchema>;
         }>]>;
         requestTimeoutMs: av.IntSchema;
         /** Path to RSA keypair JSON used to sign envelope/setup tokens. Auto-generated on first boot. */
@@ -84,15 +91,20 @@ export declare class Plugin extends BPService<InstanceType<typeof Config>, typeo
         cpAudience: av.StringSchema;
     }>>;
     static EventSchemas: {
-        readonly emitEvents: {};
+        readonly emitEvents: {
+            readonly "webhook.delivery.available": {
+                input: av.ObjectSchema<{}>;
+                description?: string;
+                readonly __brand: "fire-and-forget";
+            };
+        };
         readonly onEvents: {};
         readonly emitReturnableEvents: {};
         readonly onReturnableEvents: {};
         readonly emitBroadcast: {
             readonly "platform-config.changed": {
                 input: av.ObjectSchema<{
-                    sourceId: av.StringSchema;
-                    backend: av.EnumSchema<readonly ["file", "postgres"]>;
+                    revision: av.NumberSchema;
                 }>;
                 description?: string;
                 readonly __brand: "broadcast";
@@ -104,7 +116,12 @@ export declare class Plugin extends BPService<InstanceType<typeof Config>, typeo
     private storage;
     private webhookRuntime?;
     private previewExpiryTimer?;
-    private readonly changeSourceId;
+    private outboxTimer?;
+    private outboxDrain?;
+    private readonly workerId;
+    private lastConfigRevision;
+    private fileConfigRevision;
+    private postgresStorage?;
     private readonly selfClient;
     /** CP-side signing keypair + issuer/audience info. Built on first init. */
     private cpState;
@@ -158,6 +175,7 @@ export declare class Plugin extends BPService<InstanceType<typeof Config>, typeo
     private removeExpiredPreviews;
     dispose(): Promise<void>;
     private withChangeBroadcasts;
+    private startOutbox;
     private populateConfigAdminContext;
     private populateServicesContext;
     private populateRoutesContext;

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

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

package/lib/plugins/service-betterportal-config-manager/index.js

@@ -1,4 +1,4 @@
-import { createBroadcastEvent, createConfigSchema, createEventSchemas } from "@bsb/base";
+import { createBroadcastEvent, createConfigSchema, createEventSchemas, createFireAndForgetEvent } from "@bsb/base";
 import * as av from "anyvali";
 import { BPService, BetterPortalConfigSchema } from "@betterportal/plugin-bsb";
 import { resolve } from "node:path";
@@ -10,7 +10,7 @@ import { registerAdminApiRoutes } from "./adminApi.js";
 import { registerMenuEditorRoutes } from "./menuEditor.js";
 import { registerFragmentsEditorRoutes } from "./fragmentsEditor.js";
 import { registerWebhookRoutes } from "./webhooks.js";
-import { analyzeOperationDependencies, deriveRolePermissions, getCachedManifestForService, getManifestCache, reconcileServiceRegistry, registerSyncEndpoint } from "./syncApi.js";
+import { analyzeOperationDependencies, deriveRolePermissions, getCachedManifestForService, getManifestCache, hydrateManifestCache, reconcileServiceRegistry, registerSyncEndpoint } from "./syncApi.js";
 import { approveM2MConnections, buildM2MConnectionModel } from "./m2mConnections.js";
 import { registerPreviewDeploymentApi } from "./previewApi.js";
 import { deleteExpiredPreviewDeployments, reconcilePreviewService, visibleAdminConfig } from "./previewEnvironments.js";
@@ -18,7 +18,7 @@ import { setConfigManagerRouteContext } from "./routeContext.js";
 import { isApiRoute } from "./routeMounts.js";
 import { resolveRoleAuthority, resolveRoleSyncUrl } from "./roleAuthority.js";
 import { describeEmbeddedContextResolution, eventHeaders, resolveEmbeddedRequestContext, uuidv7 } from "@betterportal/framework";
-import { createStorageFromConfig, getAvailableServiceInstanceIdsForApp, getServicePluginId, PlatformConfigStorageSchema } from "./storage/index.js";
+import { createStorageFromConfig, getAvailableServiceInstanceIdsForApp, getServicePluginId, PostgresStorage, PlatformConfigStorageSchema } from "./storage/index.js";
 import BetterportalConfigManagerClient from "../../.bsb/clients/service-betterportal-config-manager.js";
 // Parse-only base for relative request URLs. Never emit this origin.
 const RELATIVE_URL_PARSE_BASE = "http://betterportal.invalid";
@@ -27,7 +27,7 @@ function applyWellKnownCors(event) {
     event.res.headers.set("Access-Control-Allow-Origin", origin);
     event.res.headers.set("Vary", "Origin");
     event.res.headers.set("Access-Control-Allow-Methods", "GET,POST,PUT,PATCH,DELETE,OPTIONS");
-    event.res.headers.set("Access-Control-Allow-Headers", "Authorization,Content-Type,Accept,HX-Request,HX-Current-URL,HX-Target,HX-Trigger,HX-Trigger-Name,X-BP-Tenant-Id,X-BP-App-Id,traceparent,tracestate,baggage");
+    event.res.headers.set("Access-Control-Allow-Headers", "Authorization,Content-Type,Accept,Idempotency-Key,HX-Request,HX-Current-URL,HX-Target,HX-Trigger,HX-Trigger-Name,X-BP-Tenant-Id,X-BP-App-Id,traceparent,tracestate,baggage");
     event.res.headers.set("Access-Control-Expose-Headers", "HX-Location,HX-Redirect,HX-Refresh,HX-Push-Url,HX-Replace-Url,BP-SetHeader,BP-RemoveHeader");
     event.res.headers.set("Access-Control-Max-Age", "600");
     if (event.req.method === "OPTIONS") {
@@ -52,7 +52,7 @@ function buildServiceIdAliases(config, tenantId) {
 }
 const PluginConfigSchema = av.object({
     host: av.string().minLength(1).default("0.0.0.0"),
-    port: av.int().min(1).default(3300),
+    port: av.int().min(1).default(80),
     betterportal: BetterPortalConfigSchema,
     storage: PlatformConfigStorageSchema,
     requestTimeoutMs: av.int().min(1).default(2000),
@@ -64,9 +64,9 @@ const PluginConfigSchema = av.object({
     cpAudience: av.string().minLength(1).default("betterportal-control-plane")
 });
 const PlatformConfigChangedEventSchema = av.object({
-    sourceId: av.string().minLength(1),
-    backend: av.enum_(["file", "postgres"])
+    revision: av.number().min(0)
 });
+const WebhookDeliveryAvailableEventSchema = av.object({});
 const Config = createConfigSchema({
     name: "service-betterportal-config-manager",
     description: "BetterPortal config management admin service",
@@ -75,12 +75,14 @@ const Config = createConfigSchema({
     image: "./betterportal-logo.png"
 }, PluginConfigSchema);
 const EventSchemas = createEventSchemas({
-    emitEvents: {},
+    emitEvents: {
+        "webhook.delivery.available": createFireAndForgetEvent(WebhookDeliveryAvailableEventSchema, "Wakes one config-manager instance to process durable webhook deliveries.")
+    },
     onEvents: {},
     emitReturnableEvents: {},
     onReturnableEvents: {},
     emitBroadcast: {
-        "platform-config.changed": createBroadcastEvent(PlatformConfigChangedEventSchema, "Emitted after platform config is saved by this config-manager instance.")
+        "platform-config.changed": createBroadcastEvent(PlatformConfigChangedEventSchema, "Emitted after a platform config revision is committed.")
     },
     onBroadcast: {}
 });
@@ -91,7 +93,12 @@ export class Plugin extends BPService {
     storage;
     webhookRuntime;
     previewExpiryTimer;
-    changeSourceId = uuidv7();
+    outboxTimer;
+    outboxDrain;
+    workerId = uuidv7();
+    lastConfigRevision = -1;
+    fileConfigRevision = 0;
+    postgresStorage;
     selfClient;
     /** CP-side signing keypair + issuer/audience info. Built on first init. */
     cpState;
@@ -243,17 +250,27 @@ export class Plugin extends BPService {
     }
     async onRegistered(registry, _obs) {
         const resolvedStorage = createStorageFromConfig(this.config.storage, this.cwd);
+        const cwd = this.cwd ?? ".";
+        if (resolvedStorage.store instanceof PostgresStorage) {
+            this.postgresStorage = resolvedStorage.store;
+            await this.postgresStorage.initialize({
+                configPath: resolvedStorage.legacyConfigPath,
+                cpKeyPath: resolve(cwd, this.config.cpKeyStorePath ?? "./.bp-cp-state/keys.json"),
+                webhookDeliveryPath: resolve(cwd, "./.bp-webhook-deliveries.json")
+            });
+        }
         this.storage = this.withChangeBroadcasts(resolvedStorage.store, _obs, {
             backend: resolvedStorage.backend
         });
+        hydrateManifestCache(await this.storage.loadConfig());
         // Initialize CP keypair + JWKS (P7).
-        const cwd = this.cwd ?? ".";
-        this.cpState = cpBootstrap({
+        this.cpState = await cpBootstrap({
             keyStorePath: resolve(cwd, this.config.cpKeyStorePath ?? "./.bp-cp-state/keys.json"),
+            postgres: this.postgresStorage,
             issuer: this.config.cpIssuer,
             audience: this.config.cpAudience ?? "betterportal-control-plane",
             host: this.config.host ?? "0.0.0.0",
-            port: this.config.port ?? 3300
+            port: this.config.port ?? 80
         });
         this.registerAsAuthProvider({
             issuer: this.cpState.issuer,
@@ -267,12 +284,17 @@ export class Plugin extends BPService {
             cpId: this.cpState.cpId
         });
         await this.selfClient.onPlatformConfigChanged(_obs, async (eventObs, event) => {
-            if (event.sourceId === this.changeSourceId)
+            if (event.revision <= this.lastConfigRevision)
                 return;
+            this.lastConfigRevision = event.revision;
             this.storage.invalidate();
+            hydrateManifestCache(await this.storage.loadConfig());
             // A config change may carry a freshly-pushed auth JWKS - rebuild verifiers.
             await this.warmAuthCache(eventObs);
         });
+        await this.selfClient.onWebhookDeliveryAvailable(_obs, async () => {
+            await this.webhookRuntime?.drain();
+        });
         setConfigManagerRouteContext({
             storage: this.storage,
             cpState: this.cpState,
@@ -295,7 +317,7 @@ export class Plugin extends BPService {
         registerAdminApiRoutes(this.app, this.storage, this.cpState);
         registerMenuEditorRoutes(this.app, this.storage);
         registerFragmentsEditorRoutes(this.app, this.storage);
-        this.webhookRuntime = registerWebhookRoutes(this.app, this.storage);
+        this.webhookRuntime = registerWebhookRoutes(this.app, this.storage, this.postgresStorage, this.workerId);
         registerPreviewDeploymentApi({
             app: this.app,
             storage: this.storage,
@@ -323,18 +345,27 @@ export class Plugin extends BPService {
             }
         });
         // Setup token mint + redeem endpoints (P4)
-        registerSetupEndpoints({ app: this.app, storage: this.storage, cpState: this.cpState });
+        registerSetupEndpoints({
+            app: this.app,
+            storage: this.storage,
+            cpState: this.cpState,
+            postgres: this.postgresStorage,
+            owner: this.workerId
+        });
         // Bootstrap detection + endpoint (P6) - opens vanilla HTML wizard on empty DB
         await registerBootstrapEndpoint({
             app: this.app,
             storage: this.storage,
             cpState: this.cpState,
-            logger: _obs
+            logger: _obs,
+            postgres: this.postgresStorage,
+            owner: this.workerId
         });
         // Warm auth verifiers from persisted JWKS so the first authenticated request
         // after a restart never races an empty cache (#6).
         await this.warmAuthCache(_obs);
-        this.webhookRuntime.start();
+        this.webhookRuntime?.start();
+        this.startOutbox(_obs);
         await this.removeExpiredPreviews();
         this.previewExpiryTimer = setInterval(() => {
             void this.removeExpiredPreviews().catch((error) => _obs.log.warn("Preview expiry cleanup failed: {msg}", {
@@ -344,13 +375,22 @@ export class Plugin extends BPService {
         this.previewExpiryTimer.unref();
     }
     async removeExpiredPreviews() {
-        const config = await this.storage.loadConfig();
-        if (deleteExpiredPreviewDeployments(config).length > 0)
-            await this.storage.saveConfig(config);
+        const cleanup = async () => {
+            const config = await this.storage.loadConfig();
+            if (deleteExpiredPreviewDeployments(config).length > 0)
+                await this.storage.saveConfig(config);
+            await this.postgresStorage?.cleanupExpiredActions();
+        };
+        if (this.postgresStorage)
+            await this.postgresStorage.tryRunExclusive("maintenance", cleanup);
+        else
+            await cleanup();
     }
     async dispose() {
         if (this.previewExpiryTimer)
             clearInterval(this.previewExpiryTimer);
+        if (this.outboxTimer)
+            clearInterval(this.outboxTimer);
         this.webhookRuntime?.stop();
         await super.dispose();
     }
@@ -358,11 +398,12 @@ export class Plugin extends BPService {
         return {
             loadConfig: () => store.loadConfig(),
             saveConfig: async (config, options) => {
-                await store.saveConfig(config, options);
-                if (options?.notify !== false) {
+                await store.saveConfig(config, metadata.backend === "file" && options?.notify !== false
+                    ? { ...options, notify: false }
+                    : options);
+                if (options?.notify !== false && metadata.backend === "file") {
                     await this.events.emitBroadcast("platform-config.changed", obs, {
-                        sourceId: this.changeSourceId,
-                        backend: metadata.backend
+                        revision: ++this.fileConfigRevision
                     });
                 }
             },
@@ -373,6 +414,38 @@ export class Plugin extends BPService {
             onChange: (listener) => store.onChange(listener)
         };
     }
+    startOutbox(obs) {
+        if (!this.postgresStorage)
+            return;
+        const run = async () => {
+            const records = await this.postgresStorage.claimOutbox(this.workerId);
+            for (const record of records) {
+                try {
+                    if (record.eventName === "platform-config.changed") {
+                        await this.events.emitBroadcast("platform-config.changed", obs, {
+                            revision: Number(record.payload.revision)
+                        });
+                    }
+                    else if (record.eventName === "webhook.delivery.available") {
+                        await this.events.emitEvent("webhook.delivery.available", obs, {});
+                    }
+                    await this.postgresStorage.completeOutbox(record.id, this.workerId);
+                }
+                catch (error) {
+                    await this.postgresStorage.releaseOutbox(record.id, this.workerId);
+                    obs.log.warn("Config-manager outbox delivery failed: {message}", {
+                        message: error instanceof Error ? error.message : String(error)
+                    });
+                }
+            }
+        };
+        const drain = () => this.outboxDrain ??= run().finally(() => { this.outboxDrain = undefined; });
+        void drain().catch((error) => obs.log.warn("Config-manager outbox drain failed: {message}", {
+            message: error instanceof Error ? error.message : String(error)
+        }));
+        this.outboxTimer = setInterval(() => void drain().catch((error) => obs.log.warn("Config-manager outbox drain failed: {message}", { message: error instanceof Error ? error.message : String(error) })), 1_000);
+        this.outboxTimer.unref();
+    }
     async populateConfigAdminContext(event) {
         const portalConfig = visibleAdminConfig(await this.storage.loadConfig());
         const requestContext = resolveEmbeddedRequestContext(portalConfig, eventHeaders(event));