@reventlessdev/reventless-aws 3.0.0-alpha.239 → 3.0.0-alpha.240

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.240 (2026-07-28)
+
+### Features
+
+* **platform:** provision object stores from the fields that declare them ([b5e2a1e](https://github.com/ReventlessDev/reventless-core/commit/b5e2a1ec88099941c113e4963f9c4b346b96b0d6))
+
+
 # 3.0.0-alpha.239 (2026-07-28)
 
 **Note:** Version bump only for package @reventlessdev/reventless-aws

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-aws",
-  "version": "3.0.0-alpha.239",
+  "version": "3.0.0-alpha.240",
   "description": "AWS adapters for Reventless",
   "license": "Apache-2.0",
   "dependencies": {
@@ -12,16 +12,16 @@
     "sury": "11.0.0-alpha.4",
     "uuid": "^13.0.0",
     "@reventlessdev/rescript-aws-sdk": "2.2.0-alpha.25",
-    "@reventlessdev/rescript-effect": "0.1.0-alpha.31",
     "@reventlessdev/rescript-jest": "1.0.0-alpha.9",
+    "@reventlessdev/rescript-effect": "0.1.0-alpha.31",
     "@reventlessdev/rescript-pulumi-aws": "2.4.0-alpha.61",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.17",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.189",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.107",
-    "@reventlessdev/reventless-interop": "3.0.0-alpha.29",
     "@reventlessdev/rescript-uuid": "1.1.0-alpha.17",
-    "@reventlessdev/reventless-postgres": "3.0.0-alpha.53",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.82"
+    "@reventlessdev/reventless-core": "3.0.0-alpha.190",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.108",
+    "@reventlessdev/reventless-postgres": "3.0.0-alpha.54",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.83",
+    "@reventlessdev/reventless-interop": "3.0.0-alpha.29"
   },
   "devDependencies": {
     "rescript": "12.3.0",

package/src/Platform.res

@@ -1046,7 +1046,11 @@ module MakeWithConfig = (
     platformMergeGate: Pulumi.Output.t<unit>,
   }
 
-  let deployPlatform = (~version, ~hostUiBundle: option<hostUiBundleConfig>=?) => {
+  let deployPlatform = (
+    ~version,
+    ~hostUiBundle: option<hostUiBundleConfig>=?,
+    ~capabilities: array<ReventlessInfra.Platform.capability>=[],
+  ) => {
     log.info(~comp="Platform:deployPlatform", `v${version}`)
     let scheduler = makeScheduler()
     hooks.scheduler := Some(scheduler)
@@ -1452,6 +1456,120 @@ module MakeWithConfig = (
         })
       })
 
+    // ── Declared object stores ────────────────────────────────────────────
+    //
+    // The store a field declares is the store that gets provisioned. Before
+    // this, a `@storageRef("productImages")` annotation and a hand-written
+    // bucket name were two unrelated strings: deleting the annotation left the
+    // bucket, and adding one provisioned nothing.
+    //
+    // Provisioned here, in the platform deploy, rather than in each plugin's
+    // stack. Three things force it: the serving CDN lives here, the presign
+    // services live here, and a shared-layout bucket has several plugins'
+    // stores in it, so no single plugin stack can own it. Ownership is carried
+    // in the tags instead — a per-store bucket is tagged to the plugin whose
+    // field declared it; a shared bucket is platform substrate, because that is
+    // what it is.
+    let stackName = Pulumi.Pulumi.getStackName()
+    let storeLayout = Util_StoreLayout.layoutFor(
+      ~stack=stackName,
+      ~prodStacks=Util_HostUiDomain.resolveProdStacks(),
+    )
+    let storeProtection = Util_StoreLayout.protectionFor(~stack=stackName)
+
+    // Dedup by `(plugin, store)` — that pair is a store's identity, and many
+    // fields legitimately name one store.
+    let declaredStores =
+      capabilities
+      ->Array.filterMap(c =>
+        switch c {
+        | ObjectStore({plugin, store}) => Some((plugin, store))
+        | Geocoding => None
+        }
+      )
+      ->Array.reduce([], (acc, (plugin, store)) =>
+        acc->Array.some(((p, s)) => p == plugin && s == store)
+          ? acc
+          : Array.concat(acc, [(plugin, store)])
+      )
+
+    if declaredStores->Array.length > 0 {
+      // The fail-open in `layoutFor` is only dangerous while it is silent: a
+      // production stack that is not on the prod list gets the shared layout and
+      // nothing errors. Log the choice on every deploy so it surfaces the first
+      // time it happens rather than at an audit.
+      log.info(
+        ~comp="Platform:deployPlatform",
+        `object stores: ${switch storeLayout {
+          | PerStore => "bucket per store"
+          | SharedBucket => "shared bucket, {store}/… prefixes"
+          }}, ${switch storeProtection {
+          | Protected => "protected"
+          | Unprotected => "unprotected (disposable stack)"
+          }} — stack ${stackName}`,
+      )
+    }
+
+    // One bucket per *physical name*, which is one per store under `PerStore`
+    // and one for the whole stack under `SharedBucket`. Grouped rather than
+    // mapped because those cardinalities differ, and a bucket carries only one
+    // policy and one CDN origin however many stores live in it.
+    let storeBuckets: Dict.t<ReventlessInfra.Platform.objectStore> = Dict.make()
+    let storeBucketOrder: array<string> = []
+    let declaredStoreServices = declaredStores->Array.map(((plugin, store)) => {
+      let bucketName = Util_StoreLayout.bucketNameFor(
+        ~layout=storeLayout,
+        ~stack=stackName,
+        ~plugin,
+        ~store,
+      )
+      let keyPrefix = Util_StoreLayout.keyPrefixFor(~store)
+      let bucket = switch storeBuckets->Dict.get(bucketName) {
+      | Some(b) => b
+      | None =>
+        let b = Capability_ObjectStore_S3.make(
+          ~name=bucketName,
+          ~keyPrefix,
+          // A shared bucket belongs to no single plugin; a dedicated one does.
+          ~plugin=?switch storeLayout {
+          | PerStore => Some(plugin)
+          | SharedBucket => None
+          },
+          ~protect=storeProtection == Protected,
+          // A protected bucket blocks `pulumi destroy`, so protecting a
+          // disposable stack would leak exactly the buckets sharing exists to
+          // save. The two settings are opposite faces of one decision.
+          ~forceDestroy=storeProtection == Unprotected,
+        )
+        storeBuckets->Dict.set(bucketName, b)
+        storeBucketOrder->Array.push(bucketName)
+        b
+      }
+      let storeHandle = bucket->Capability_ObjectStore_S3.underPrefix(~keyPrefix)
+      // One presign service per store, scoped to that store's own prefix.
+      let presign = Upload_Presign_S3.make(
+        ~name=`UploadPresign-${plugin}-${store}`,
+        ~bucketName=storeHandle.bucketName,
+        ~servedPrefix=storeHandle.keyPrefix,
+      )
+      (`${plugin}.${store}`, keyPrefix, bucketName, presign.url)
+    })
+
+    // Group the served view by bucket: one origin and one bucket policy per
+    // bucket, carrying every prefix served from it.
+    let declaredServedBuckets = storeBucketOrder->Array.filterMap(bucketName =>
+      storeBuckets
+      ->Dict.get(bucketName)
+      ->Option.map(b => {
+        ReventlessInfra.Platform.id: bucketName,
+        prefixes: declaredStoreServices
+        ->Array.filterMap(((_, prefix, bn, _)) => bn == bucketName ? Some(prefix) : None),
+        bucketId: b.bucketId,
+        bucketArn: b.bucketArn,
+        bucketRegionalDomainName: b.bucketRegionalDomainName,
+      })
+    )
+
     // Host UI shell deployment — opt-in via ~hostUiBundle. The shell SPA is
     // hosted on its own CloudFront distribution; `config.json` is generated
     // at deploy time with the resolved API endpoints, region, and Cognito
@@ -1494,17 +1612,27 @@ module MakeWithConfig = (
       // roots its keys at, read from the service's own constant. This is the
       // whole reason the store arrives as one value: the app no longer restates
       // the prefix, so it cannot restate it wrongly.
-      let servedBuckets = switch cfg.uploadBucket {
-      | Some(store) => [
-          {
-            ReventlessInfra.Platform.prefix: Upload_Presign_S3.defaultServedPrefix,
-            bucketId: store.bucketId,
-            bucketArn: store.bucketArn,
-            bucketRegionalDomainName: store.bucketRegionalDomainName,
-          },
-        ]
-      | None => []
-      }
+      //
+      // The legacy hand-configured store is served alongside the declared ones,
+      // not replaced by them. Refs live in an append-only event log, so the
+      // `/uploads/…` values already written there can never be rewritten;
+      // `uploads` is therefore treated as a store that happens to predate the
+      // declaration, and keeps its prefix permanently.
+      let servedBuckets = Array.concat(
+        switch cfg.uploadBucket {
+        | Some(store) => [
+            {
+              ReventlessInfra.Platform.id: store.keyPrefix,
+              prefixes: [store.keyPrefix],
+              bucketId: store.bucketId,
+              bucketArn: store.bucketArn,
+              bucketRegionalDomainName: store.bucketRegionalDomainName,
+            },
+          ]
+        | None => []
+        },
+        declaredServedBuckets,
+      )
 
       let {distributionUrl, bucketName} = Plugin_Stack.makeUiBundleDistribution(
         ~pluginId="host-ui",
@@ -1569,6 +1697,18 @@ module MakeWithConfig = (
       | None => Pulumi.Output.make(None)
       }
 
+      // Per-store presign endpoints, keyed by the store's qualified name. This
+      // is what lets an upload input bind to the store its field *declares*
+      // rather than inferring one from the field's name — the endpoint exists
+      // per store, so there is something concrete to bind to.
+      //
+      // `uploadEndpoint` (singular) stays as the legacy service's URL: a shell
+      // built before per-store binding reads it and is unaffected.
+      let storeUploadEndpointsOutput: Pulumi.Output.t<array<(string, string)>> =
+        declaredStoreServices
+        ->Array.map(((qualified, _, _, url)) => url->Pulumi.Output.apply(u => (qualified, u)))
+        ->Pulumi.Output.all
+
       let configJsonContent =
         (
           (
@@ -1579,14 +1719,14 @@ module MakeWithConfig = (
           )->Pulumi.Output.all4,
           domainEventsEndpointOutput,
           geocoderEndpointOutput,
-          uploadEndpointOutput,
+          (uploadEndpointOutput, storeUploadEndpointsOutput)->Pulumi.Output.all2,
         )
         ->Pulumi.Output.all4
         ->Pulumi.Output.apply(((
           (domainEp, platformEp, poolId, clientId),
           eventsEpOpt,
           geocoderEpOpt,
-          uploadEpOpt,
+          (uploadEpOpt, storeUploadEps),
         )) => {
           let fields = [
             ("apiEndpoint", JSON.Encode.string(domainEp)),
@@ -1623,7 +1763,25 @@ module MakeWithConfig = (
           | Some(ep) => Array.concat(withGeocoder, [("uploadEndpoint", JSON.Encode.string(ep))])
           | None => withGeocoder
           }
-          withUpload->Dict.fromArray->JSON.Encode.object->JSON.stringify
+          // Omitted entirely when nothing is declared, so a deployment without
+          // declared stores writes a byte-identical config.json.
+          let withStoreUploads = switch storeUploadEps {
+          | [] => withUpload
+          | eps =>
+            Array.concat(
+              withUpload,
+              [
+                (
+                  "uploadEndpoints",
+                  eps
+                  ->Array.map(((qualified, url)) => (qualified, JSON.Encode.string(url)))
+                  ->Dict.fromArray
+                  ->JSON.Encode.object,
+                ),
+              ],
+            )
+          }
+          withStoreUploads->Dict.fromArray->JSON.Encode.object->JSON.stringify
         })
 
       let _ = PulumiAws.S3.BucketObject.make(

package/src/Platform.res.mjs

@@ -36,6 +36,7 @@ import * as PluginBehavior$ReventlessCore from "@reventlessdev/reventless-core/s
 import * as Plugin_Helpers$ReventlessCore from "@reventlessdev/reventless-core/src/plugin/component/Plugin_Helpers.res.mjs";
 import * as PgProjectionFeed$ReventlessAws from "./adapter/Postgres/PgProjectionFeed.res.mjs";
 import * as Util_LocalConfig$ReventlessAws from "./util/Util_LocalConfig.res.mjs";
+import * as Util_StoreLayout$ReventlessAws from "./util/Util_StoreLayout.res.mjs";
 import * as IndexJs from "@pulumi/pulumi/runtime/index.js";
 import * as AppSync_EventsApi$ReventlessAws from "./adapter/Api/AppSync_EventsApi.res.mjs";
 import * as AppSync_MergedApi$ReventlessAws from "./components/Api/AppSync_MergedApi.res.mjs";
@@ -68,6 +69,7 @@ import * as UiFragments_Projection$ReventlessCore from "@reventlessdev/reventles
 import * as Aggregate_Builder_Single$ReventlessAws from "./components/Aggregate_Builder_Single.res.mjs";
 import * as ReadModel_Builder_Single$ReventlessAws from "./components/ReadModel_Builder_Single.res.mjs";
 import * as StateChangeSlice_Builder$ReventlessAws from "./components/StateChangeSlice_Builder.res.mjs";
+import * as Capability_ObjectStore_S3$ReventlessAws from "./capability/Capability_ObjectStore_S3.res.mjs";
 import * as EventCollectorChannel_SQS$ReventlessAws from "./adapter/EventCollector/EventCollectorChannel_SQS.res.mjs";
 import * as PgChangeFeedRelay_Builder$ReventlessAws from "./adapter/Postgres/PgChangeFeedRelay_Builder.res.mjs";
 import * as RuntimeEnvironment_Lambda$ReventlessAws from "./adapter/Runtime/RuntimeEnvironment_Lambda.res.mjs";
@@ -708,7 +710,8 @@ function MakeWithConfig(Config) {
     log.info("Platform", undefined, `v` + version);
     return Pervasives.failwith("makePlatform is not supported on AWS — deploy the platform with deployPlatform and each plugin with deployPlugin (merged-API composition).");
   };
-  let deployPlatform = (version, hostUiBundle) => {
+  let deployPlatform = (version, hostUiBundle, capabilitiesOpt) => {
+    let capabilities = capabilitiesOpt !== undefined ? capabilitiesOpt : [];
     log.info("Platform:deployPlatform", undefined, `v` + version);
     let scheduler = makeScheduler();
     hooks_scheduler.contents = scheduler;
@@ -868,6 +871,76 @@ function MakeWithConfig(Config) {
         adminResources: param[4]
       });
     });
+    let stackName = Pulumi.getStack();
+    let storeLayout = Util_StoreLayout$ReventlessAws.layoutFor(stackName, Util_HostUiDomain$ReventlessAws.resolveProdStacks());
+    let storeProtection = Util_StoreLayout$ReventlessAws.protectionFor(stackName, undefined);
+    let declaredStores = Stdlib_Array.reduce(Stdlib_Array.filterMap(capabilities, c => {
+      if (typeof c !== "object") {
+        return;
+      } else {
+        return [
+          c.plugin,
+          c.store
+        ];
+      }
+    }), [], (acc, param) => {
+      let store = param[1];
+      let plugin = param[0];
+      if (acc.some(param => param[0] === plugin ? param[1] === store : false)) {
+        return acc;
+      } else {
+        return acc.concat([[
+            plugin,
+            store
+          ]]);
+      }
+    });
+    if (declaredStores.length !== 0) {
+      let tmp;
+      tmp = storeLayout === "PerStore" ? "bucket per store" : "shared bucket, {store}/… prefixes";
+      let tmp$1;
+      tmp$1 = storeProtection === "Protected" ? "protected" : "unprotected (disposable stack)";
+      log.info("Platform:deployPlatform", undefined, `object stores: ` + tmp + `, ` + tmp$1 + ` — stack ` + stackName);
+    }
+    let storeBuckets = {};
+    let storeBucketOrder = [];
+    let declaredStoreServices = declaredStores.map(param => {
+      let store = param[1];
+      let plugin = param[0];
+      let bucketName = Util_StoreLayout$ReventlessAws.bucketNameFor(storeLayout, stackName, plugin, store);
+      let keyPrefix = Util_StoreLayout$ReventlessAws.keyPrefixFor(store);
+      let b = storeBuckets[bucketName];
+      let bucket;
+      if (b !== undefined) {
+        bucket = b;
+      } else {
+        let tmp;
+        tmp = storeLayout === "PerStore" ? plugin : undefined;
+        let b$1 = Capability_ObjectStore_S3$ReventlessAws.make(bucketName, keyPrefix, tmp, storeProtection === "Protected", storeProtection === "Unprotected", undefined, undefined);
+        storeBuckets[bucketName] = b$1;
+        storeBucketOrder.push(bucketName);
+        bucket = b$1;
+      }
+      let storeHandle = Capability_ObjectStore_S3$ReventlessAws.underPrefix(bucket, keyPrefix);
+      let presign = Upload_Presign_S3$ReventlessAws.make(storeHandle.bucketName, undefined, storeHandle.keyPrefix, `UploadPresign-` + plugin + `-` + store, undefined);
+      return [
+        plugin + `.` + store,
+        keyPrefix,
+        bucketName,
+        presign.url
+      ];
+    });
+    let declaredServedBuckets = Stdlib_Array.filterMap(storeBucketOrder, bucketName => Stdlib_Option.map(storeBuckets[bucketName], b => ({
+      id: bucketName,
+      prefixes: Stdlib_Array.filterMap(declaredStoreServices, param => {
+        if (param[2] === bucketName) {
+          return param[1];
+        }
+      }),
+      bucketId: b.bucketId,
+      bucketArn: b.bucketArn,
+      bucketRegionalDomainName: b.bucketRegionalDomainName
+    })));
     if (hostUiBundle !== undefined) {
       let match$1 = Util_LocalConfig$ReventlessAws.get("hostUiBaseDomain");
       let match$2 = Util_LocalConfig$ReventlessAws.get("hostUiHostedZoneId");
@@ -885,12 +958,15 @@ function MakeWithConfig(Config) {
         customDomain = undefined;
       }
       let store = hostUiBundle.uploadBucket;
-      let servedBuckets = store !== undefined ? [{
-            prefix: Upload_Presign_S3$ReventlessAws.defaultServedPrefix,
-            bucketId: store.bucketId,
-            bucketArn: store.bucketArn,
-            bucketRegionalDomainName: store.bucketRegionalDomainName
-          }] : [];
+      let servedBuckets = (
+        store !== undefined ? [{
+              id: store.keyPrefix,
+              prefixes: [store.keyPrefix],
+              bucketId: store.bucketId,
+              bucketArn: store.bucketArn,
+              bucketRegionalDomainName: store.bucketRegionalDomainName
+            }] : []
+      ).concat(declaredServedBuckets);
       let match$3 = Plugin_Stack$ReventlessAws.makeUiBundleDistribution("host-ui", Stdlib_Option.getOr(hostUiBundle.bundleVersion, version), Stdlib_Option.getOr(hostUiBundle.assetsDir, Util_Bundle$ReventlessAws.resolvePackageRoot("@reventlessdev/reventless-host-shell") + "/dist"), true, undefined, true, [
         "config.json",
         "ui-hints.json"
@@ -902,7 +978,14 @@ function MakeWithConfig(Config) {
       let index = hostUiBundle.geocoderPlaceIndex;
       let geocoderEndpointOutput = index !== undefined ? Geocoder_AwsLocation$ReventlessAws.make(index.indexName, undefined, undefined).url.apply(u => u) : Pulumi.output(undefined);
       let store$1 = hostUiBundle.uploadBucket;
-      let uploadEndpointOutput = store$1 !== undefined ? Upload_Presign_S3$ReventlessAws.make(store$1.bucketName, undefined, undefined, undefined).url.apply(u => u) : Pulumi.output(undefined);
+      let uploadEndpointOutput = store$1 !== undefined ? Upload_Presign_S3$ReventlessAws.make(store$1.bucketName, undefined, undefined, undefined, undefined).url.apply(u => u) : Pulumi.output(undefined);
+      let storeUploadEndpointsOutput = Pulumi.all(declaredStoreServices.map(param => {
+        let qualified = param[0];
+        return param[3].apply(u => [
+          qualified,
+          u
+        ]);
+      }));
       let configJsonContent = Pulumi.all([
         Pulumi.all([
           resolvedDomainApiEndpoint,
@@ -912,20 +995,25 @@ function MakeWithConfig(Config) {
         ]),
         domainEventsEndpointOutput,
         geocoderEndpointOutput,
-        uploadEndpointOutput
+        Pulumi.all([
+          uploadEndpointOutput,
+          storeUploadEndpointsOutput
+        ])
       ]).apply(param => {
-        let uploadEpOpt = param[3];
+        let match = param[3];
+        let storeUploadEps = match[1];
+        let uploadEpOpt = match[0];
         let geocoderEpOpt = param[2];
         let eventsEpOpt = param[1];
-        let match = param[0];
+        let match$1 = param[0];
         let fields = [
           [
             "apiEndpoint",
-            match[0]
+            match$1[0]
           ],
           [
             "platformApiEndpoint",
-            match[1]
+            match$1[1]
           ],
           [
             "region",
@@ -937,11 +1025,11 @@ function MakeWithConfig(Config) {
           ],
           [
             "cognitoUserPoolId",
-            match[2]
+            match$1[2]
           ],
           [
             "cognitoClientId",
-            match[3]
+            match$1[3]
           ],
           [
             "liveUpdates",
@@ -970,7 +1058,14 @@ function MakeWithConfig(Config) {
               "uploadEndpoint",
               uploadEpOpt
             ]]) : withGeocoder;
-        return JSON.stringify(Object.fromEntries(withUpload));
+        let withStoreUploads = storeUploadEps.length !== 0 ? withUpload.concat([[
+              "uploadEndpoints",
+              Object.fromEntries(storeUploadEps.map(param => [
+                param[0],
+                param[1]
+              ]))
+            ]]) : withUpload;
+        return JSON.stringify(Object.fromEntries(withStoreUploads));
       });
       new (Aws.s3.BucketObject)("host-ui-config-json", {
         bucket: bucketName,
@@ -1724,7 +1819,8 @@ function Make($star) {
     log.info("Platform", undefined, `v` + version);
     return Pervasives.failwith("makePlatform is not supported on AWS — deploy the platform with deployPlatform and each plugin with deployPlugin (merged-API composition).");
   };
-  let deployPlatform = (version, hostUiBundle) => {
+  let deployPlatform = (version, hostUiBundle, capabilitiesOpt) => {
+    let capabilities = capabilitiesOpt !== undefined ? capabilitiesOpt : [];
     log.info("Platform:deployPlatform", undefined, `v` + version);
     let scheduler = makeScheduler();
     hooks_scheduler.contents = scheduler;
@@ -1861,6 +1957,76 @@ function Make($star) {
         adminResources: param[4]
       });
     });
+    let stackName = Pulumi.getStack();
+    let storeLayout = Util_StoreLayout$ReventlessAws.layoutFor(stackName, Util_HostUiDomain$ReventlessAws.resolveProdStacks());
+    let storeProtection = Util_StoreLayout$ReventlessAws.protectionFor(stackName, undefined);
+    let declaredStores = Stdlib_Array.reduce(Stdlib_Array.filterMap(capabilities, c => {
+      if (typeof c !== "object") {
+        return;
+      } else {
+        return [
+          c.plugin,
+          c.store
+        ];
+      }
+    }), [], (acc, param) => {
+      let store = param[1];
+      let plugin = param[0];
+      if (acc.some(param => param[0] === plugin ? param[1] === store : false)) {
+        return acc;
+      } else {
+        return acc.concat([[
+            plugin,
+            store
+          ]]);
+      }
+    });
+    if (declaredStores.length !== 0) {
+      let tmp;
+      tmp = storeLayout === "PerStore" ? "bucket per store" : "shared bucket, {store}/… prefixes";
+      let tmp$1;
+      tmp$1 = storeProtection === "Protected" ? "protected" : "unprotected (disposable stack)";
+      log.info("Platform:deployPlatform", undefined, `object stores: ` + tmp + `, ` + tmp$1 + ` — stack ` + stackName);
+    }
+    let storeBuckets = {};
+    let storeBucketOrder = [];
+    let declaredStoreServices = declaredStores.map(param => {
+      let store = param[1];
+      let plugin = param[0];
+      let bucketName = Util_StoreLayout$ReventlessAws.bucketNameFor(storeLayout, stackName, plugin, store);
+      let keyPrefix = Util_StoreLayout$ReventlessAws.keyPrefixFor(store);
+      let b = storeBuckets[bucketName];
+      let bucket;
+      if (b !== undefined) {
+        bucket = b;
+      } else {
+        let tmp;
+        tmp = storeLayout === "PerStore" ? plugin : undefined;
+        let b$1 = Capability_ObjectStore_S3$ReventlessAws.make(bucketName, keyPrefix, tmp, storeProtection === "Protected", storeProtection === "Unprotected", undefined, undefined);
+        storeBuckets[bucketName] = b$1;
+        storeBucketOrder.push(bucketName);
+        bucket = b$1;
+      }
+      let storeHandle = Capability_ObjectStore_S3$ReventlessAws.underPrefix(bucket, keyPrefix);
+      let presign = Upload_Presign_S3$ReventlessAws.make(storeHandle.bucketName, undefined, storeHandle.keyPrefix, `UploadPresign-` + plugin + `-` + store, undefined);
+      return [
+        plugin + `.` + store,
+        keyPrefix,
+        bucketName,
+        presign.url
+      ];
+    });
+    let declaredServedBuckets = Stdlib_Array.filterMap(storeBucketOrder, bucketName => Stdlib_Option.map(storeBuckets[bucketName], b => ({
+      id: bucketName,
+      prefixes: Stdlib_Array.filterMap(declaredStoreServices, param => {
+        if (param[2] === bucketName) {
+          return param[1];
+        }
+      }),
+      bucketId: b.bucketId,
+      bucketArn: b.bucketArn,
+      bucketRegionalDomainName: b.bucketRegionalDomainName
+    })));
     if (hostUiBundle !== undefined) {
       let match$1 = Util_LocalConfig$ReventlessAws.get("hostUiBaseDomain");
       let match$2 = Util_LocalConfig$ReventlessAws.get("hostUiHostedZoneId");
@@ -1878,12 +2044,15 @@ function Make($star) {
         customDomain = undefined;
       }
       let store = hostUiBundle.uploadBucket;
-      let servedBuckets = store !== undefined ? [{
-            prefix: Upload_Presign_S3$ReventlessAws.defaultServedPrefix,
-            bucketId: store.bucketId,
-            bucketArn: store.bucketArn,
-            bucketRegionalDomainName: store.bucketRegionalDomainName
-          }] : [];
+      let servedBuckets = (
+        store !== undefined ? [{
+              id: store.keyPrefix,
+              prefixes: [store.keyPrefix],
+              bucketId: store.bucketId,
+              bucketArn: store.bucketArn,
+              bucketRegionalDomainName: store.bucketRegionalDomainName
+            }] : []
+      ).concat(declaredServedBuckets);
       let match$3 = Plugin_Stack$ReventlessAws.makeUiBundleDistribution("host-ui", Stdlib_Option.getOr(hostUiBundle.bundleVersion, version), Stdlib_Option.getOr(hostUiBundle.assetsDir, Util_Bundle$ReventlessAws.resolvePackageRoot("@reventlessdev/reventless-host-shell") + "/dist"), true, undefined, true, [
         "config.json",
         "ui-hints.json"
@@ -1895,7 +2064,14 @@ function Make($star) {
       let index = hostUiBundle.geocoderPlaceIndex;
       let geocoderEndpointOutput = index !== undefined ? Geocoder_AwsLocation$ReventlessAws.make(index.indexName, undefined, undefined).url.apply(u => u) : Pulumi.output(undefined);
       let store$1 = hostUiBundle.uploadBucket;
-      let uploadEndpointOutput = store$1 !== undefined ? Upload_Presign_S3$ReventlessAws.make(store$1.bucketName, undefined, undefined, undefined).url.apply(u => u) : Pulumi.output(undefined);
+      let uploadEndpointOutput = store$1 !== undefined ? Upload_Presign_S3$ReventlessAws.make(store$1.bucketName, undefined, undefined, undefined, undefined).url.apply(u => u) : Pulumi.output(undefined);
+      let storeUploadEndpointsOutput = Pulumi.all(declaredStoreServices.map(param => {
+        let qualified = param[0];
+        return param[3].apply(u => [
+          qualified,
+          u
+        ]);
+      }));
       let configJsonContent = Pulumi.all([
         Pulumi.all([
           resolvedDomainApiEndpoint,
@@ -1905,20 +2081,25 @@ function Make($star) {
         ]),
         domainEventsEndpointOutput,
         geocoderEndpointOutput,
-        uploadEndpointOutput
+        Pulumi.all([
+          uploadEndpointOutput,
+          storeUploadEndpointsOutput
+        ])
       ]).apply(param => {
-        let uploadEpOpt = param[3];
+        let match = param[3];
+        let storeUploadEps = match[1];
+        let uploadEpOpt = match[0];
         let geocoderEpOpt = param[2];
         let eventsEpOpt = param[1];
-        let match = param[0];
+        let match$1 = param[0];
         let fields = [
           [
             "apiEndpoint",
-            match[0]
+            match$1[0]
           ],
           [
             "platformApiEndpoint",
-            match[1]
+            match$1[1]
           ],
           [
             "region",
@@ -1930,11 +2111,11 @@ function Make($star) {
           ],
           [
             "cognitoUserPoolId",
-            match[2]
+            match$1[2]
           ],
           [
             "cognitoClientId",
-            match[3]
+            match$1[3]
           ],
           [
             "liveUpdates",
@@ -1963,7 +2144,14 @@ function Make($star) {
               "uploadEndpoint",
               uploadEpOpt
             ]]) : withGeocoder;
-        return JSON.stringify(Object.fromEntries(withUpload));
+        let withStoreUploads = storeUploadEps.length !== 0 ? withUpload.concat([[
+              "uploadEndpoints",
+              Object.fromEntries(storeUploadEps.map(param => [
+                param[0],
+                param[1]
+              ]))
+            ]]) : withUpload;
+        return JSON.stringify(Object.fromEntries(withStoreUploads));
       });
       new (Aws.s3.BucketObject)("host-ui-config-json", {
         bucket: bucketName,