@reventlessdev/reventless-postgres 3.0.0-alpha.100 → 3.0.0-alpha.102

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 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.102 (2026-08-16)
+
+**Note:** Version bump only for package @reventlessdev/reventless-postgres
+
+
+
+
+
+# 3.0.0-alpha.101 (2026-08-16)
+
+### Features
+
+* **core:** exclude retired rows from reads a caller may not widen ([662f31a](https://github.com/ReventlessDev/reventless-core/commit/662f31abb717bda5154199d349da6dcf8e2d3e78))
+* **core:** let [@retired](https://github.com/retired) name a lifecycle state, not only a boolean ([6bb346b](https://github.com/ReventlessDev/reventless-core/commit/6bb346b4f6a5f33826fc24537953482a76067177))
+* **core:** mark the state that retires a row, and allow more than one ([cb1461f](https://github.com/ReventlessDev/reventless-core/commit/cb1461f024d3ca3b53fd9c8b010a054e3fcc4555))
+
+
 # 3.0.0-alpha.100 (2026-08-15)
 
 **Note:** Version bump only for package @reventlessdev/reventless-postgres

package/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1786782398524)
-#Done(1786782404708)
+#Start(1786902407421)
+#Done(1786902412808)

package/lib/bs/compiler-info.json

@@ -4,5 +4,5 @@
   "bsc_hash": "75e3a59c95cc953608fd3dd6ea6ed68141bba4414a20a52f114261b8a48385fa",
   "rescript_config_hash": "af2af60a0fa33b8249a96ff2758f36482843126dc4e07b9302842d011e0ad8c6",
   "runtime_path": "/home/runner/work/reventless-core/reventless-core/node_modules/@rescript/runtime",
-  "generated_at": "1786782404713"
+  "generated_at": "1786902412813"
 }

package/lib/bs/src/DcbEventLogStorage_Postgres.res

@@ -8,7 +8,7 @@
 // existing `DcbEventLogStorage_Postgres.*` reference keeps working) and adds only
 // the deploy-time `DcbEventLog_Adapter` shape, keeping the historic `makeStorage`
 // 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include DcbEventLogStorage_Postgres_Ops

package/lib/bs/src/DcbEventLogStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // would leak into the Lambda import graph and fail resolution on real Lambda. The
 // thin `DcbEventLogStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped adapter for local/deploy consumers.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless

package/lib/bs/src/EventLogStorage_Postgres.res

@@ -7,7 +7,7 @@
 // real Lambda). This module `include`s that pure module and adds only the
 // deploy-time `EventLog_Adapter` shape (`operations` wrapped in `Pulumi.Output`),
 // keeping the historic `makeStorage` 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include EventLogStorage_Postgres_Ops

package/lib/bs/src/EventLogStorage_Postgres_Ops.res

@@ -7,7 +7,7 @@
 // in no Lambda — not the layer, not `/var/runtime`). The thin
 // `EventLogStorage_Postgres` wrapper adds the deploy-time `Pulumi.Output`-shaped
 // adapter on top for local/deploy consumers; the runtime imports `makeOps` here.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 

package/lib/bs/src/QueryDbStorage_Postgres.res

@@ -6,7 +6,7 @@
 // that pure module (so every existing `QueryDbStorage_Postgres.*` reference keeps
 // working) and adds only the deploy-time `Pulumi.Output`-shaped `storage` record
 // and the `Make` provider functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/lib/bs/src/QueryDbStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // a deploy-time dep into its ESM import graph (which fails resolution on real
 // Lambda). The thin `QueryDbStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped `storage` record + the `Make` functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/lib/bs/src/QueryEnginePostgres.res

@@ -168,6 +168,39 @@ module Make = (P: {let pool: PgDriver.pool}) => {
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`
   let jsonTextC = (field: string): string => `${col(field)} COLLATE "C"`
 
+  // "not retired", as jsonb rather than text. `->` keeps the value typed, so a
+  // JSON boolean true is distinguishable from the JSON string "true"; `->>`
+  // would render both as 'true' and hide a row the shared spec keeps, since that
+  // spec decodes strictly and reads a non-boolean as "no flag". `IS DISTINCT
+  // FROM` rather than `<>` so an absent key — NULL — keeps the row instead of
+  // making the whole predicate NULL and dropping it.
+  //
+  // The state form compares against JSON strings instead of `true`, one
+  // `IS DISTINCT FROM` per state, ANDed. Not `NOT IN`: that is ordinary
+  // equality, so an absent key makes the predicate NULL and drops a row this
+  // spec keeps. Same shape and same index behaviour as the single-state form —
+  // a handful of equality predicates over an enum-valued attribute cost what one
+  // over a boolean does — so the `@index` guidance carries over unchanged.
+  //
+  // A set naming no states withdraws nothing, so the predicate is vacuously
+  // true, matching what `isRetiredValue` answers for it.
+  let notRetiredC = (scope: Reventless.OwnerScope.retiredScope): string => {
+    let key = scope.field->String.replaceAll("'", "''")
+    let distinctFrom = lit => `(item->'${key}') IS DISTINCT FROM ${lit}`
+    switch scope.values {
+    | None => distinctFrom("'true'::jsonb")
+    | Some([]) => "TRUE"
+    | Some(states) =>
+      // Parenthesised though every caller ANDs these together already: a clause
+      // that is safe only because of where it is spliced is a clause that breaks
+      // the first time it is spliced somewhere else.
+      "(" ++
+      states
+      ->Array.map(state => distinctFrom(`'"${state->String.replaceAll("'", "''")}"'::jsonb`))
+      ->Array.join(" AND ") ++ ")"
+    }
+  }
+
   // Connection-list push-down. Builds `item->>'field'` predicates + keyset
   // WHERE + `ORDER BY … LIMIT pageSize+1` so a page reads only what it returns
   // rather than the whole read model. Reproduces `QueryDbListQuery` semantics
@@ -184,6 +217,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~capability: GraphQL_FragmentGenerator.serverCapability,
     ~labelField as _,
     ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): option<JSON.t> => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
@@ -220,6 +254,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
         whereParts->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
       | None => ()
       }
+      switch retiredScope {
+      | Some(scope) => whereParts->Array.push(notRetiredC(scope))
+      | None => ()
+      }
       let valString = v =>
         switch v->JSON.Decode.string {
         | Some(s) => Some(s)
@@ -320,6 +358,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~id: string,
     ~argsDict: dict<JSON.t>,
     ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): JSON.t => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
@@ -341,6 +380,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       where->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
     | None => ()
     }
+    switch retiredScope {
+    | Some(scope) => where->Array.push(notRetiredC(scope))
+    | None => ()
+    }
     fstr("prefix")->Option.forEach(p =>
       where->Array.push(`starts_with(sub_key, ${b->param(JSON.Encode.string(p))})`)
     )

package/lib/bs/src/QueryEnginePostgres.res.mjs

@@ -169,7 +169,23 @@ function Make(P) {
   };
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`;
   let jsonTextC = field => col(field) + ` COLLATE "C"`;
-  let listPage = async (readModelName, argsDict, capability, param$1, ownerScope) => {
+  let notRetiredC = scope => {
+    let key = scope.field.replaceAll("'", "''");
+    let states = scope.values;
+    if (states !== undefined) {
+      if (states.length !== 0) {
+        return "(" + states.map(state => {
+          let lit = `'"` + state.replaceAll("'", "''") + `"'::jsonb`;
+          return `(item->'` + key + `') IS DISTINCT FROM ` + lit;
+        }).join(" AND ") + ")";
+      } else {
+        return "TRUE";
+      }
+    } else {
+      return `(item->'` + key + `') IS DISTINCT FROM ` + "'true'::jsonb";
+    }
+  };
+  let listPage = async (readModelName, argsDict, capability, param$1, ownerScope, retiredScope) => {
     let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let filterDict = Stdlib_Option.getOr(Stdlib_Option.flatMap(argsDict["filter"], Stdlib_JSON.Decode.object), {});
     let strNonEmpty = k => Stdlib_Option.mapOr(Stdlib_Option.flatMap(filterDict[k], Stdlib_JSON.Decode.string), false, s => s.length > 0);
@@ -186,6 +202,9 @@ function Make(P) {
     if (ownerScope !== undefined) {
       whereParts.push(jsonTextC(ownerScope[0]) + ` = ` + param(b, ownerScope[1]));
     }
+    if (retiredScope !== undefined) {
+      whereParts.push(notRetiredC(retiredScope));
+    }
     let valString = v => {
       let s = Stdlib_JSON.Decode.string(v);
       if (s !== undefined) {
@@ -234,7 +253,7 @@ function Make(P) {
     let cursorValueOf = item => Stdlib_Option.getOr(QueryDbListQuery$ReventlessCore.getFieldString(item, cursorField), QueryDbListQuery$ReventlessCore.getId(item));
     return QueryDbListQuery$ReventlessCore.buildConnection(pageItems, hasMore, false, cursorValueOf);
   };
-  let itemsPage = async (readModelName, param$1, id, argsDict, ownerScope) => {
+  let itemsPage = async (readModelName, param$1, id, argsDict, ownerScope, retiredScope) => {
     let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let filterDict = Stdlib_Option.getOr(Stdlib_Option.flatMap(argsDict["filter"], Stdlib_JSON.Decode.object), {});
     let fstr = k => Stdlib_Option.flatMap(filterDict[k], Stdlib_JSON.Decode.string);
@@ -255,6 +274,9 @@ function Make(P) {
     if (ownerScope !== undefined) {
       where.push(jsonTextC(ownerScope[0]) + ` = ` + param(b, ownerScope[1]));
     }
+    if (retiredScope !== undefined) {
+      where.push(notRetiredC(retiredScope));
+    }
     Stdlib_Option.forEach(fstr("prefix"), p => {
       where.push(`starts_with(sub_key, ` + param(b, p) + `)`);
     });
@@ -316,6 +338,7 @@ function Make(P) {
     byIds: byIds,
     idExprC: idExprC,
     jsonTextC: jsonTextC,
+    notRetiredC: notRetiredC,
     listPage: listPage,
     itemsPage: itemsPage
   };

package/lib/bs/tests/QueryEnginePostgresListPageTest.res.mjs

@@ -122,7 +122,7 @@ function orderBy(f, dir) {
 }
 
 function expectedFor(argsDict) {
-  return norm(QueryDbListQuery$ReventlessCore.run(seededItems, argsDict, capability, "name", param => {}, undefined));
+  return norm(QueryDbListQuery$ReventlessCore.run(seededItems, argsDict, capability, "name", param => {}, undefined, undefined));
 }
 
 let url = process.env["PG_URL"];
@@ -148,7 +148,7 @@ if (url !== undefined) {
   });
   let checkPushed = async (label, args) => {
     let argsDict = Object.fromEntries(args);
-    let actual = await Eng.listPage(name, argsDict, capability, "name", undefined);
+    let actual = await Eng.listPage(name, argsDict, capability, "name", undefined, undefined);
     if (actual !== undefined) {
       globalThis.expect(norm(actual)).toEqual(expectedFor(argsDict));
     } else {
@@ -156,7 +156,7 @@ if (url !== undefined) {
     }
   };
   let checkFallback = async args => {
-    let r = await Eng.listPage(name, Object.fromEntries(args), capability, "name", undefined);
+    let r = await Eng.listPage(name, Object.fromEntries(args), capability, "name", undefined, undefined);
     globalThis.expect(Stdlib_Option.isSome(r)).toBe(false);
   };
   globalThis.describe("QueryDb list push-down parity (Postgres ≡ QueryDbListQuery spec)", () => {
@@ -322,7 +322,7 @@ if (url !== undefined) {
   });
   let itemSeqs = conn => Stdlib_Array.filterMap(Stdlib_Option.getOr(Stdlib_Option.flatMap(field(conn, "edges"), Stdlib_JSON.Decode.array), []), e => Stdlib_Option.flatMap(field(e, "node"), n => str(n, "seq")));
   let pageInfoBool = (conn, key) => Stdlib_Option.getOr(Stdlib_Option.flatMap(field(Stdlib_Option.getOr(field(conn, "pageInfo"), null), key), Stdlib_JSON.Decode.bool), false);
-  let itemsPage = args => Eng.itemsPage(itemsName, "seq", "order-1", Object.fromEntries(args), undefined);
+  let itemsPage = args => Eng.itemsPage(itemsName, "seq", "order-1", Object.fromEntries(args), undefined, undefined);
   globalThis.describe("QueryEnginePostgres itemsPage (sub-id keyset)", () => {
     globalThis.test("bare → all lines ASC, no next page", async () => {
       let r = await itemsPage([]);

package/lib/ocaml/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1786782398524)
-#Done(1786782404708)
+#Start(1786902407421)
+#Done(1786902412808)

package/lib/ocaml/DcbEventLogStorage_Postgres.res

@@ -8,7 +8,7 @@
 // existing `DcbEventLogStorage_Postgres.*` reference keeps working) and adds only
 // the deploy-time `DcbEventLog_Adapter` shape, keeping the historic `makeStorage`
 // 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include DcbEventLogStorage_Postgres_Ops

package/lib/ocaml/DcbEventLogStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // would leak into the Lambda import graph and fail resolution on real Lambda. The
 // thin `DcbEventLogStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped adapter for local/deploy consumers.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless

package/lib/ocaml/EventLogStorage_Postgres.res

@@ -7,7 +7,7 @@
 // real Lambda). This module `include`s that pure module and adds only the
 // deploy-time `EventLog_Adapter` shape (`operations` wrapped in `Pulumi.Output`),
 // keeping the historic `makeStorage` 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include EventLogStorage_Postgres_Ops

package/lib/ocaml/EventLogStorage_Postgres_Ops.res

@@ -7,7 +7,7 @@
 // in no Lambda — not the layer, not `/var/runtime`). The thin
 // `EventLogStorage_Postgres` wrapper adds the deploy-time `Pulumi.Output`-shaped
 // adapter on top for local/deploy consumers; the runtime imports `makeOps` here.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 

package/lib/ocaml/QueryDbStorage_Postgres.res

@@ -6,7 +6,7 @@
 // that pure module (so every existing `QueryDbStorage_Postgres.*` reference keeps
 // working) and adds only the deploy-time `Pulumi.Output`-shaped `storage` record
 // and the `Make` provider functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/lib/ocaml/QueryDbStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // a deploy-time dep into its ESM import graph (which fails resolution on real
 // Lambda). The thin `QueryDbStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped `storage` record + the `Make` functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/lib/ocaml/QueryEnginePostgres.res

@@ -168,6 +168,39 @@ module Make = (P: {let pool: PgDriver.pool}) => {
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`
   let jsonTextC = (field: string): string => `${col(field)} COLLATE "C"`
 
+  // "not retired", as jsonb rather than text. `->` keeps the value typed, so a
+  // JSON boolean true is distinguishable from the JSON string "true"; `->>`
+  // would render both as 'true' and hide a row the shared spec keeps, since that
+  // spec decodes strictly and reads a non-boolean as "no flag". `IS DISTINCT
+  // FROM` rather than `<>` so an absent key — NULL — keeps the row instead of
+  // making the whole predicate NULL and dropping it.
+  //
+  // The state form compares against JSON strings instead of `true`, one
+  // `IS DISTINCT FROM` per state, ANDed. Not `NOT IN`: that is ordinary
+  // equality, so an absent key makes the predicate NULL and drops a row this
+  // spec keeps. Same shape and same index behaviour as the single-state form —
+  // a handful of equality predicates over an enum-valued attribute cost what one
+  // over a boolean does — so the `@index` guidance carries over unchanged.
+  //
+  // A set naming no states withdraws nothing, so the predicate is vacuously
+  // true, matching what `isRetiredValue` answers for it.
+  let notRetiredC = (scope: Reventless.OwnerScope.retiredScope): string => {
+    let key = scope.field->String.replaceAll("'", "''")
+    let distinctFrom = lit => `(item->'${key}') IS DISTINCT FROM ${lit}`
+    switch scope.values {
+    | None => distinctFrom("'true'::jsonb")
+    | Some([]) => "TRUE"
+    | Some(states) =>
+      // Parenthesised though every caller ANDs these together already: a clause
+      // that is safe only because of where it is spliced is a clause that breaks
+      // the first time it is spliced somewhere else.
+      "(" ++
+      states
+      ->Array.map(state => distinctFrom(`'"${state->String.replaceAll("'", "''")}"'::jsonb`))
+      ->Array.join(" AND ") ++ ")"
+    }
+  }
+
   // Connection-list push-down. Builds `item->>'field'` predicates + keyset
   // WHERE + `ORDER BY … LIMIT pageSize+1` so a page reads only what it returns
   // rather than the whole read model. Reproduces `QueryDbListQuery` semantics
@@ -184,6 +217,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~capability: GraphQL_FragmentGenerator.serverCapability,
     ~labelField as _,
     ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): option<JSON.t> => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
@@ -220,6 +254,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
         whereParts->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
       | None => ()
       }
+      switch retiredScope {
+      | Some(scope) => whereParts->Array.push(notRetiredC(scope))
+      | None => ()
+      }
       let valString = v =>
         switch v->JSON.Decode.string {
         | Some(s) => Some(s)
@@ -320,6 +358,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~id: string,
     ~argsDict: dict<JSON.t>,
     ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): JSON.t => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
@@ -341,6 +380,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       where->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
     | None => ()
     }
+    switch retiredScope {
+    | Some(scope) => where->Array.push(notRetiredC(scope))
+    | None => ()
+    }
     fstr("prefix")->Option.forEach(p =>
       where->Array.push(`starts_with(sub_key, ${b->param(JSON.Encode.string(p))})`)
     )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-postgres",
-  "version": "3.0.0-alpha.100",
+  "version": "3.0.0-alpha.102",
   "description": "Postgres storage backend for Reventless (classic + DCB event logs, query DB, change feed). Connection-string only — RDS/Aurora, any managed provider, or a local container.",
   "license": "Apache-2.0",
   "jest": {
@@ -22,18 +22,18 @@
   "dependencies": {
     "pg": "^8.13.1",
     "sury": "11.0.0-alpha.4",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.236",
     "@reventlessdev/rescript-effect": "0.1.0-alpha.32",
-    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.19",
     "@reventlessdev/rescript-jest": "1.0.0-alpha.10",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.142",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.114"
+    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.19",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.144",
+    "@reventlessdev/reventless-core": "3.0.0-alpha.238",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.116"
   },
   "devDependencies": {
     "@types/pg": "^8.11.10",
     "rescript": "12.3.0",
     "sury-ppx": "11.0.0-alpha.2",
-    "@reventlessdev/reventless-ppx": "1.0.0-alpha.66"
+    "@reventlessdev/reventless-ppx": "1.0.0-alpha.68"
   },
   "peerDependencies": {
     "rescript": "12.3.0"

package/src/DcbEventLogStorage_Postgres.res

@@ -8,7 +8,7 @@
 // existing `DcbEventLogStorage_Postgres.*` reference keeps working) and adds only
 // the deploy-time `DcbEventLog_Adapter` shape, keeping the historic `makeStorage`
 // 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include DcbEventLogStorage_Postgres_Ops

package/src/DcbEventLogStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // would leak into the Lambda import graph and fail resolution on real Lambda. The
 // thin `DcbEventLogStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped adapter for local/deploy consumers.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless

package/src/EventLogStorage_Postgres.res

@@ -7,7 +7,7 @@
 // real Lambda). This module `include`s that pure module and adds only the
 // deploy-time `EventLog_Adapter` shape (`operations` wrapped in `Pulumi.Output`),
 // keeping the historic `makeStorage` 3-tuple `(name, ops, adapter)` API unchanged.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 include EventLogStorage_Postgres_Ops

package/src/EventLogStorage_Postgres_Ops.res

@@ -7,7 +7,7 @@
 // in no Lambda — not the layer, not `/var/runtime`). The thin
 // `EventLogStorage_Postgres` wrapper adds the deploy-time `Pulumi.Output`-shaped
 // adapter on top for local/deploy consumers; the runtime imports `makeOps` here.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 

package/src/QueryDbStorage_Postgres.res

@@ -6,7 +6,7 @@
 // that pure module (so every existing `QueryDbStorage_Postgres.*` reference keeps
 // working) and adds only the deploy-time `Pulumi.Output`-shaped `storage` record
 // and the `Make` provider functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/src/QueryDbStorage_Postgres_Ops.res

@@ -6,7 +6,7 @@
 // a deploy-time dep into its ESM import graph (which fails resolution on real
 // Lambda). The thin `QueryDbStorage_Postgres` wrapper `include`s this and adds the
 // deploy-time `Pulumi.Output`-shaped `storage` record + the `Make` functor.
-// See docs/plans/deployed-lambda-esm-self-containment.md (Rung-3 finding).
+// See docs/plans/done/deployed-lambda-esm-self-containment.md (Rung-3 finding).
 
 open ReventlessCore
 open Reventless.ReadModel

package/src/QueryEnginePostgres.res

@@ -168,6 +168,39 @@ module Make = (P: {let pool: PgDriver.pool}) => {
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`
   let jsonTextC = (field: string): string => `${col(field)} COLLATE "C"`
 
+  // "not retired", as jsonb rather than text. `->` keeps the value typed, so a
+  // JSON boolean true is distinguishable from the JSON string "true"; `->>`
+  // would render both as 'true' and hide a row the shared spec keeps, since that
+  // spec decodes strictly and reads a non-boolean as "no flag". `IS DISTINCT
+  // FROM` rather than `<>` so an absent key — NULL — keeps the row instead of
+  // making the whole predicate NULL and dropping it.
+  //
+  // The state form compares against JSON strings instead of `true`, one
+  // `IS DISTINCT FROM` per state, ANDed. Not `NOT IN`: that is ordinary
+  // equality, so an absent key makes the predicate NULL and drops a row this
+  // spec keeps. Same shape and same index behaviour as the single-state form —
+  // a handful of equality predicates over an enum-valued attribute cost what one
+  // over a boolean does — so the `@index` guidance carries over unchanged.
+  //
+  // A set naming no states withdraws nothing, so the predicate is vacuously
+  // true, matching what `isRetiredValue` answers for it.
+  let notRetiredC = (scope: Reventless.OwnerScope.retiredScope): string => {
+    let key = scope.field->String.replaceAll("'", "''")
+    let distinctFrom = lit => `(item->'${key}') IS DISTINCT FROM ${lit}`
+    switch scope.values {
+    | None => distinctFrom("'true'::jsonb")
+    | Some([]) => "TRUE"
+    | Some(states) =>
+      // Parenthesised though every caller ANDs these together already: a clause
+      // that is safe only because of where it is spliced is a clause that breaks
+      // the first time it is spliced somewhere else.
+      "(" ++
+      states
+      ->Array.map(state => distinctFrom(`'"${state->String.replaceAll("'", "''")}"'::jsonb`))
+      ->Array.join(" AND ") ++ ")"
+    }
+  }
+
   // Connection-list push-down. Builds `item->>'field'` predicates + keyset
   // WHERE + `ORDER BY … LIMIT pageSize+1` so a page reads only what it returns
   // rather than the whole read model. Reproduces `QueryDbListQuery` semantics
@@ -184,6 +217,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~capability: GraphQL_FragmentGenerator.serverCapability,
     ~labelField as _,
     ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): option<JSON.t> => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
@@ -220,6 +254,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
         whereParts->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
       | None => ()
       }
+      switch retiredScope {
+      | Some(scope) => whereParts->Array.push(notRetiredC(scope))
+      | None => ()
+      }
       let valString = v =>
         switch v->JSON.Decode.string {
         | Some(s) => Some(s)
@@ -320,6 +358,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
     ~id: string,
     ~argsDict: dict<JSON.t>,
     ~ownerScope: option<(string, string)>=?,
+    ~retiredScope: option<Reventless.OwnerScope.retiredScope>=?,
   ): JSON.t => {
     let table = QueryDbStorage_Postgres_Ops.tableName(readModelName)
     let filterDict =
@@ -341,6 +380,10 @@ module Make = (P: {let pool: PgDriver.pool}) => {
       where->Array.push(`${jsonTextC(field)} = ${b->param(JSON.Encode.string(required))}`)
     | None => ()
     }
+    switch retiredScope {
+    | Some(scope) => where->Array.push(notRetiredC(scope))
+    | None => ()
+    }
     fstr("prefix")->Option.forEach(p =>
       where->Array.push(`starts_with(sub_key, ${b->param(JSON.Encode.string(p))})`)
     )

package/src/QueryEnginePostgres.res.mjs

@@ -169,7 +169,23 @@ function Make(P) {
   };
   let idExprC = `COALESCE(item->>'id', partition_key) COLLATE "C"`;
   let jsonTextC = field => col(field) + ` COLLATE "C"`;
-  let listPage = async (readModelName, argsDict, capability, param$1, ownerScope) => {
+  let notRetiredC = scope => {
+    let key = scope.field.replaceAll("'", "''");
+    let states = scope.values;
+    if (states !== undefined) {
+      if (states.length !== 0) {
+        return "(" + states.map(state => {
+          let lit = `'"` + state.replaceAll("'", "''") + `"'::jsonb`;
+          return `(item->'` + key + `') IS DISTINCT FROM ` + lit;
+        }).join(" AND ") + ")";
+      } else {
+        return "TRUE";
+      }
+    } else {
+      return `(item->'` + key + `') IS DISTINCT FROM ` + "'true'::jsonb";
+    }
+  };
+  let listPage = async (readModelName, argsDict, capability, param$1, ownerScope, retiredScope) => {
     let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let filterDict = Stdlib_Option.getOr(Stdlib_Option.flatMap(argsDict["filter"], Stdlib_JSON.Decode.object), {});
     let strNonEmpty = k => Stdlib_Option.mapOr(Stdlib_Option.flatMap(filterDict[k], Stdlib_JSON.Decode.string), false, s => s.length > 0);
@@ -186,6 +202,9 @@ function Make(P) {
     if (ownerScope !== undefined) {
       whereParts.push(jsonTextC(ownerScope[0]) + ` = ` + param(b, ownerScope[1]));
     }
+    if (retiredScope !== undefined) {
+      whereParts.push(notRetiredC(retiredScope));
+    }
     let valString = v => {
       let s = Stdlib_JSON.Decode.string(v);
       if (s !== undefined) {
@@ -234,7 +253,7 @@ function Make(P) {
     let cursorValueOf = item => Stdlib_Option.getOr(QueryDbListQuery$ReventlessCore.getFieldString(item, cursorField), QueryDbListQuery$ReventlessCore.getId(item));
     return QueryDbListQuery$ReventlessCore.buildConnection(pageItems, hasMore, false, cursorValueOf);
   };
-  let itemsPage = async (readModelName, param$1, id, argsDict, ownerScope) => {
+  let itemsPage = async (readModelName, param$1, id, argsDict, ownerScope, retiredScope) => {
     let table = QueryDbStorage_Postgres_Ops$ReventlessPostgres.tableName(readModelName);
     let filterDict = Stdlib_Option.getOr(Stdlib_Option.flatMap(argsDict["filter"], Stdlib_JSON.Decode.object), {});
     let fstr = k => Stdlib_Option.flatMap(filterDict[k], Stdlib_JSON.Decode.string);
@@ -255,6 +274,9 @@ function Make(P) {
     if (ownerScope !== undefined) {
       where.push(jsonTextC(ownerScope[0]) + ` = ` + param(b, ownerScope[1]));
     }
+    if (retiredScope !== undefined) {
+      where.push(notRetiredC(retiredScope));
+    }
     Stdlib_Option.forEach(fstr("prefix"), p => {
       where.push(`starts_with(sub_key, ` + param(b, p) + `)`);
     });
@@ -316,6 +338,7 @@ function Make(P) {
     byIds: byIds,
     idExprC: idExprC,
     jsonTextC: jsonTextC,
+    notRetiredC: notRetiredC,
     listPage: listPage,
     itemsPage: itemsPage
   };