@reventlessdev/reventless-local 3.0.0-alpha.114 → 3.0.0-alpha.115

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.115 (2026-07-02)
+
+### Bug Fixes
+
+* **core,local:** projection/publisher/bus correctness (plan A5,A7) ([86e27a5](https://github.com/ReventlessDev/reventless-core/commit/86e27a5d68873d7dd9e746f9b4126f4d5bad63c9))
+* **local:** conflict classification, rollback masking, MCP pagination (plan A6) ([b3e6d24](https://github.com/ReventlessDev/reventless-core/commit/b3e6d242ddf2df066ca94b0db2266275f1453fbf))
+* **local:** InMemory QueryDb TTL parity + backend-aware UIFragment store (plan A6) ([c31727f](https://github.com/ReventlessDev/reventless-core/commit/c31727fa3fe98b4f15b55300fdf8b80221fabbee))
+* **local:** QueryDb count returns a running total, not the increment (plan A6) ([4ac3822](https://github.com/ReventlessDev/reventless-core/commit/4ac3822ac310d62bb4b1c4c021a85f45883f4785))
+* **local:** wire standalone DCB log through the backend-aware storage (plan A6) ([40734e9](https://github.com/ReventlessDev/reventless-core/commit/40734e902436dfce623061416e9edeafa822f1d3))
+
+
 # 3.0.0-alpha.114 (2026-06-29)
 
 ### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-local",
-  "version": "3.0.0-alpha.114",
+  "version": "3.0.0-alpha.115",
   "description": "Local platform for Reventless (in-memory or SQLite backend, for development and testing without AWS)",
   "license": "Apache-2.0",
   "jest": {
@@ -31,15 +31,15 @@
     "graphql-yoga": "^5.21.0",
     "sury": "11.0.0-alpha.4",
     "ws": "^8.18.0",
-    "@reventlessdev/rescript-effect": "0.1.0-alpha.23",
+    "@reventlessdev/rescript-effect": "0.1.0-alpha.24",
     "@reventlessdev/rescript-graphql-yoga": "1.0.0-alpha.17",
+    "@reventlessdev/rescript-jest": "1.0.0-alpha.5",
     "@reventlessdev/rescript-mcp-sdk": "1.0.0-alpha.16",
     "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.14",
-    "@reventlessdev/rescript-jest": "1.0.0-alpha.3",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.135",
-    "@reventlessdev/reventless-gwt": "1.0.0-alpha.75",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.82",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.62"
+    "@reventlessdev/reventless-core": "3.0.0-alpha.136",
+    "@reventlessdev/reventless-gwt": "1.0.0-alpha.76",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.83",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.63"
   },
   "devDependencies": {
     "rescript": "^12.3.0",

package/src/Platform.res

@@ -279,10 +279,18 @@ module MakeWithConfig = (
             ])->JSON.Encode.object
 
           let paginate = (events: array<JSON.t>, getPosition: JSON.t => option<string>) => {
+            // Positions are numeric strings; compare them as ints, not lexically
+            // ("10" > "9" is false as strings) — otherwise cursor pages skip or
+            // duplicate events once positions cross a digit boundary.
+            let positionGt = (p, afterPos) =>
+              switch (Int.fromString(p), Int.fromString(afterPos)) {
+              | (Some(pi), Some(ai)) => pi > ai
+              | _ => p > afterPos
+              }
             let filtered = switch after {
             | Some(afterPos) =>
               let idx =
-                events->Array.findIndex(e => getPosition(e)->Option.mapOr(false, p => p > afterPos))
+                events->Array.findIndex(e => getPosition(e)->Option.mapOr(false, p => positionGt(p, afterPos)))
               if idx >= 0 {
                 events->Array.slice(~start=idx, ~end=events->Array.length)
               } else {
@@ -749,60 +757,27 @@ module MakeWithConfig = (
   // UIFragmentRegistry QueryDb store ops — initialized lazily on first seed call.
   let uiFragmentQueryDbOpsRef: ref<option<ReventlessCore.QueryDb_Adapter.operations>> = ref(None)
 
+  // Backend-aware storage for the UIFragment registry — the same functor every
+  // other read model uses. Replaces a hand-rolled memory-only store that ignored
+  // BackendState, so the registry now persists under SQLite too.
+  module UIFragmentStorage = QueryDbStorage_InMemory.Make(Bus)
+
   let ensureUIFragmentRegistryQueryDbStore = () => {
     switch uiFragmentQueryDbOpsRef.contents {
     | Some(ops) => ops
     | None =>
       let name = ReventlessCore.UIFragmentRegistryReadModelSpec.name
-      let store: ref<dict<array<JSON.t>>> = ref(Dict.make())
-      let allItems: ref<array<JSON.t>> = ref([])
-      let syncAll = () => {
-        allItems.contents =
-          store.contents
-          ->Dict.toArray
-          ->Array.flatMap(((id, items)) =>
-            items->Array.map(item => {
-              let obj = item->JSON.Decode.object->Option.getOr(Dict.make())
-              if !(obj->Dict.get("id")->Option.isSome) {
-                let copy = Dict.make()
-                obj->Dict.toArray->Array.forEach(((k, v)) => copy->Dict.set(k, v))
-                copy->Dict.set("id", JSON.Encode.string(id))
-                JSON.Encode.object(copy)
-              } else {
-                item
-              }
-            })
-          )
-      }
-      let ops: ReventlessCore.QueryDb_Adapter.operations = {
-        load: async id => Ok(store.contents->Dict.get(id)->Option.getOr([])),
-        loadStream: id =>
-          store.contents->Dict.get(id)->Option.getOr([])->Stream.fromIterable,
-        save: async (id, state, _, _) => {
-          store.contents->Dict.set(id, [state])
-          syncAll()
-          Ok()
-        },
-        saveBatch: async batch => {
-          batch->Array.forEach(((id, state, _)) => store.contents->Dict.set(id, [state]))
-          syncAll()
-          Ok()
-        },
-        count: async (_, _, inc) => Ok(inc),
-        delete: async (id, _) => {
-          store.contents->Dict.delete(id)
-          syncAll()
-          Ok()
-        },
-        deleteBatch: async ids => {
-          ids->Array.forEach(((id, _)) => store.contents->Dict.delete(id))
-          syncAll()
-          Ok()
-        },
-      }
-      Bus.registerQueryDb(name, ops)
-      Bus.registerQueryDbScan(name, () => allItems.contents)
-      Bus.registerQueryDbStream(name, () => allItems.contents->Stream.fromIterable)
+      // `make` registers the ops (and scan/stream) with the Bus for the active
+      // backend; retrieve them synchronously via getQueryDb rather than resolving
+      // the Pulumi Output.
+      let _ = UIFragmentStorage.make(
+        ~name,
+        ~indexes=[],
+        ~api=(),
+        ~apiRole=(),
+        ~opts=({}: Pulumi.CustomResourceOptions.t),
+      )
+      let ops = Bus.getQueryDb(name)->Option.getOrThrow
       uiFragmentQueryDbOpsRef := Some(ops)
       ops
     }

package/src/Platform.res.mjs

@@ -4,14 +4,12 @@ import * as S from "sury/src/S.res.mjs";
 import * as Stream from "@reventlessdev/rescript-effect/src/Stream.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
 import * as Stdlib_Bool from "@rescript/runtime/lib/es6/Stdlib_Bool.js";
-import * as Stdlib_Dict from "@rescript/runtime/lib/es6/Stdlib_Dict.js";
 import * as Stdlib_JSON from "@rescript/runtime/lib/es6/Stdlib_JSON.js";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Stdlib_String from "@rescript/runtime/lib/es6/Stdlib_String.js";
 import * as Effect from "effect/Effect";
-import * as Stream$1 from "effect/Stream";
 import * as Pulumi from "@pulumi/pulumi";
 import * as Plugin$Reventless from "@reventlessdev/reventless-spec/src/components/Plugin.res.mjs";
 import * as Logger$ReventlessCore from "@reventlessdev/reventless-core/src/util/Logger.res.mjs";
@@ -63,6 +61,7 @@ import * as AutomationSlice_Builder$ReventlessLocal from "./components/Automatio
 import * as LocalRuntimeEnvironment$ReventlessLocal from "./adapter/Runtime/LocalRuntimeEnvironment.res.mjs";
 import * as LocalScheduledPublisher$ReventlessLocal from "./adapter/Scheduler/LocalScheduledPublisher.res.mjs";
 import * as Platform_Admin_Structure$ReventlessCore from "@reventlessdev/reventless-core/src/admin/Platform_Admin_Structure.res.mjs";
+import * as QueryDbStorage_InMemory$ReventlessLocal from "./adapter/QueryDb/QueryDbStorage_InMemory.res.mjs";
 import * as LocalCommandTopicChannel$ReventlessLocal from "./adapter/CommandTopic/LocalCommandTopicChannel.res.mjs";
 import * as LocalEventTopicPublisher$ReventlessLocal from "./adapter/EventTopic/LocalEventTopicPublisher.res.mjs";
 import * as StateChangeSlice_Builder$ReventlessLocal from "./components/StateChangeSlice_Builder.res.mjs";
@@ -268,7 +267,15 @@ function MakeWithConfig(Config) {
       let paginate = (events, getPosition) => {
         let filtered;
         if (after !== undefined) {
-          let idx = events.findIndex(e => Stdlib_Option.mapOr(getPosition(e), false, p => p > after));
+          let idx = events.findIndex(e => Stdlib_Option.mapOr(getPosition(e), false, p => {
+            let match = Stdlib_Int.fromString(p, undefined);
+            let match$1 = Stdlib_Int.fromString(after, undefined);
+            if (match !== undefined && match$1 !== undefined) {
+              return match > match$1;
+            } else {
+              return p > after;
+            }
+          }));
           filtered = idx >= 0 ? events.slice(idx, events.length) : [];
         } else {
           filtered = events;
@@ -704,89 +711,14 @@ function MakeWithConfig(Config) {
   let uiFragmentQueryDbOpsRef = {
     contents: undefined
   };
+  let UIFragmentStorage = QueryDbStorage_InMemory$ReventlessLocal.Make(Bus);
   let ensureUIFragmentRegistryQueryDbStore = () => {
     let ops = uiFragmentQueryDbOpsRef.contents;
     if (ops !== undefined) {
       return ops;
     }
-    let store = {
-      contents: {}
-    };
-    let allItems = {
-      contents: []
-    };
-    let syncAll = () => {
-      allItems.contents = Object.entries(store.contents).flatMap(param => {
-        let id = param[0];
-        return param[1].map(item => {
-          let obj = Stdlib_Option.getOr(Stdlib_JSON.Decode.object(item), {});
-          if (Stdlib_Option.isSome(obj["id"])) {
-            return item;
-          }
-          let copy = {};
-          Object.entries(obj).forEach(param => {
-            copy[param[0]] = param[1];
-          });
-          copy["id"] = id;
-          return copy;
-        });
-      });
-    };
-    let ops_load = async id => ({
-      TAG: "Ok",
-      _0: Stdlib_Option.getOr(store.contents[id], [])
-    });
-    let ops_loadStream = id => Stream$1.fromIterable(Stdlib_Option.getOr(store.contents[id], []));
-    let ops_save = async (id, state, param, param$1) => {
-      store.contents[id] = [state];
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops_saveBatch = async batch => {
-      batch.forEach(param => {
-        store.contents[param[0]] = [param[1]];
-      });
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops_count = async (param, param$1, inc) => ({
-      TAG: "Ok",
-      _0: inc
-    });
-    let ops_delete = async (id, param) => {
-      Stdlib_Dict.$$delete(store.contents, id);
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops_deleteBatch = async ids => {
-      ids.forEach(param => Stdlib_Dict.$$delete(store.contents, param[0]));
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops$1 = {
-      load: ops_load,
-      loadStream: ops_loadStream,
-      save: ops_save,
-      saveBatch: ops_saveBatch,
-      count: ops_count,
-      delete: ops_delete,
-      deleteBatch: ops_deleteBatch
-    };
-    Bus.registerQueryDb(UIFragmentRegistryReadModelSpec$ReventlessCore.name, ops$1);
-    Bus.registerQueryDbScan(UIFragmentRegistryReadModelSpec$ReventlessCore.name, () => allItems.contents);
-    Bus.registerQueryDbStream(UIFragmentRegistryReadModelSpec$ReventlessCore.name, () => Stream$1.fromIterable(allItems.contents));
+    UIFragmentStorage.make(UIFragmentRegistryReadModelSpec$ReventlessCore.name, [], undefined, undefined, undefined, undefined, {});
+    let ops$1 = Stdlib_Option.getOrThrow(Bus.getQueryDb(UIFragmentRegistryReadModelSpec$ReventlessCore.name), undefined);
     uiFragmentQueryDbOpsRef.contents = ops$1;
     return ops$1;
   };
@@ -1921,7 +1853,15 @@ function Make($star) {
       let paginate = (events, getPosition) => {
         let filtered;
         if (after !== undefined) {
-          let idx = events.findIndex(e => Stdlib_Option.mapOr(getPosition(e), false, p => p > after));
+          let idx = events.findIndex(e => Stdlib_Option.mapOr(getPosition(e), false, p => {
+            let match = Stdlib_Int.fromString(p, undefined);
+            let match$1 = Stdlib_Int.fromString(after, undefined);
+            if (match !== undefined && match$1 !== undefined) {
+              return match > match$1;
+            } else {
+              return p > after;
+            }
+          }));
           filtered = idx >= 0 ? events.slice(idx, events.length) : [];
         } else {
           filtered = events;
@@ -2356,89 +2296,14 @@ function Make($star) {
   let uiFragmentQueryDbOpsRef = {
     contents: undefined
   };
+  let UIFragmentStorage = QueryDbStorage_InMemory$ReventlessLocal.Make(Bus);
   let ensureUIFragmentRegistryQueryDbStore = () => {
     let ops = uiFragmentQueryDbOpsRef.contents;
     if (ops !== undefined) {
       return ops;
     }
-    let store = {
-      contents: {}
-    };
-    let allItems = {
-      contents: []
-    };
-    let syncAll = () => {
-      allItems.contents = Object.entries(store.contents).flatMap(param => {
-        let id = param[0];
-        return param[1].map(item => {
-          let obj = Stdlib_Option.getOr(Stdlib_JSON.Decode.object(item), {});
-          if (Stdlib_Option.isSome(obj["id"])) {
-            return item;
-          }
-          let copy = {};
-          Object.entries(obj).forEach(param => {
-            copy[param[0]] = param[1];
-          });
-          copy["id"] = id;
-          return copy;
-        });
-      });
-    };
-    let ops_load = async id => ({
-      TAG: "Ok",
-      _0: Stdlib_Option.getOr(store.contents[id], [])
-    });
-    let ops_loadStream = id => Stream$1.fromIterable(Stdlib_Option.getOr(store.contents[id], []));
-    let ops_save = async (id, state, param, param$1) => {
-      store.contents[id] = [state];
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops_saveBatch = async batch => {
-      batch.forEach(param => {
-        store.contents[param[0]] = [param[1]];
-      });
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops_count = async (param, param$1, inc) => ({
-      TAG: "Ok",
-      _0: inc
-    });
-    let ops_delete = async (id, param) => {
-      Stdlib_Dict.$$delete(store.contents, id);
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops_deleteBatch = async ids => {
-      ids.forEach(param => Stdlib_Dict.$$delete(store.contents, param[0]));
-      syncAll();
-      return {
-        TAG: "Ok",
-        _0: undefined
-      };
-    };
-    let ops$1 = {
-      load: ops_load,
-      loadStream: ops_loadStream,
-      save: ops_save,
-      saveBatch: ops_saveBatch,
-      count: ops_count,
-      delete: ops_delete,
-      deleteBatch: ops_deleteBatch
-    };
-    Bus.registerQueryDb(UIFragmentRegistryReadModelSpec$ReventlessCore.name, ops$1);
-    Bus.registerQueryDbScan(UIFragmentRegistryReadModelSpec$ReventlessCore.name, () => allItems.contents);
-    Bus.registerQueryDbStream(UIFragmentRegistryReadModelSpec$ReventlessCore.name, () => Stream$1.fromIterable(allItems.contents));
+    UIFragmentStorage.make(UIFragmentRegistryReadModelSpec$ReventlessCore.name, [], undefined, undefined, undefined, undefined, {});
+    let ops$1 = Stdlib_Option.getOrThrow(Bus.getQueryDb(UIFragmentRegistryReadModelSpec$ReventlessCore.name), undefined);
     uiFragmentQueryDbOpsRef.contents = ops$1;
     return ops$1;
   };

package/src/adapter/DcbEventLog/DcbEventLogStorage_Sqlite.res

@@ -306,7 +306,16 @@ let makeStorage = (
       result.contents
     } catch {
     | Failure(msg) => Error(msg)
-    | _ => Error("conflict")
+    | exn =>
+      // The deliberate append-condition failure above throws
+      // Failure("conflict: …"); a lost race on the computed position shows up here
+      // as a PRIMARY KEY / UNIQUE violation — also a genuine conflict. Every other
+      // failure (disk full, SQL error, locked db) must surface as a real error,
+      // not the retryable "conflict" sentinel that would be retried forever.
+      let msg = exn->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("")
+      msg->String.includes("constraint failed")
+        ? Error("conflict")
+        : Error(msg == "" ? "storage error" : msg)
     }
   }
 

package/src/adapter/DcbEventLog/DcbEventLogStorage_Sqlite.res.mjs

@@ -2,6 +2,7 @@
 
 import * as S from "sury/src/S.res.mjs";
 import * as Stdlib_Int from "@rescript/runtime/lib/es6/Stdlib_Int.js";
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
@@ -262,11 +263,18 @@ function makeStorage(db, bus, publishToTopic, name, param, param$1, param$2) {
           TAG: "Error",
           _0: msg._1
         };
-      } else {
+      }
+      let msg$1 = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(msg), Stdlib_JsExn.message), "");
+      if (msg$1.includes("constraint failed")) {
         return {
           TAG: "Error",
           _0: "conflict"
         };
+      } else {
+        return {
+          TAG: "Error",
+          _0: msg$1 === "" ? "storage error" : msg$1
+        };
       }
     }
   };

package/src/adapter/EventLog/EventLogStorage_InMemory.res

@@ -17,7 +17,7 @@ let makeMemoryStorage = (~name as _name, ~opts as _) => {
       let existing = events->Dict.get(id)->Option.getOr([])
       let currentCount = existing->Array.length
       if seqNr != currentCount {
-        (Error("conflict"), events)
+        (Error(ReventlessCore.EventLog.Conflict), events)
       } else {
         events->Dict.set(id, existing->Array.concat(jsons))
         (Ok(), events)

package/src/adapter/EventLog/EventLogStorage_InMemory.res.mjs

@@ -20,7 +20,7 @@ function makeMemoryStorage(_name, param) {
       return [
         {
           TAG: "Error",
-          _0: "conflict"
+          _0: "Conflict"
         },
         events
       ];

package/src/adapter/EventLog/EventLogStorage_Sqlite.res

@@ -88,8 +88,19 @@ let makeStorage = (~db: SqliteDriver.t, ~name: string, ~opts as _) => {
       })
       Ok()
     } catch {
-    | Failure(msg) => Error(msg)
-    | _ => Error("conflict")
+    // The deliberate seq_nr check above throws Failure("conflict"); a lost race
+    // shows up as a PRIMARY KEY violation on (log_name, aggregate_id, seq_nr) —
+    // also a genuine OCC conflict. Every OTHER failure (disk full, SQL error,
+    // locked db) is a real StorageFailure, not the retryable Conflict sentinel.
+    | Failure(msg) =>
+      msg == "conflict"
+        ? Error(ReventlessCore.EventLog.Conflict)
+        : Error(ReventlessCore.EventLog.StorageFailure(msg))
+    | exn =>
+      let msg = exn->JsExn.fromException->Option.flatMap(JsExn.message)->Option.getOr("")
+      msg->String.includes("constraint failed")
+        ? Error(ReventlessCore.EventLog.Conflict)
+        : Error(ReventlessCore.EventLog.StorageFailure(msg == "" ? "storage error" : msg))
     }
   }
 
@@ -115,7 +126,9 @@ let makeStorage = (~db: SqliteDriver.t, ~name: string, ~opts as _) => {
         | Ok() =>
           seqNrRef := currentSeq + 1
           Effect.succeed()
-        | Error(msg) => Effect.fail(msg)
+        // appendStream's error channel is a string; map the typed append error.
+        | Error(ReventlessCore.EventLog.Conflict) => Effect.fail("conflict")
+        | Error(StorageFailure(msg)) => Effect.fail(msg)
         }
       )
     })

package/src/adapter/EventLog/EventLogStorage_Sqlite.res.mjs

@@ -1,5 +1,7 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
+import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
+import * as Stdlib_Option from "@rescript/runtime/lib/es6/Stdlib_Option.js";
 import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 import * as Pulumi from "@pulumi/pulumi";
@@ -84,14 +86,35 @@ function makeStorage(db, name, param) {
     } catch (raw_msg) {
       let msg = Primitive_exceptions.internalToException(raw_msg);
       if (msg.RE_EXN_ID === "Failure") {
+        let msg$1 = msg._1;
+        if (msg$1 === "conflict") {
+          return {
+            TAG: "Error",
+            _0: "Conflict"
+          };
+        } else {
+          return {
+            TAG: "Error",
+            _0: {
+              TAG: "StorageFailure",
+              _0: msg$1
+            }
+          };
+        }
+      }
+      let msg$2 = Stdlib_Option.getOr(Stdlib_Option.flatMap(Stdlib_JsExn.fromException(msg), Stdlib_JsExn.message), "");
+      if (msg$2.includes("constraint failed")) {
         return {
           TAG: "Error",
-          _0: msg._1
+          _0: "Conflict"
         };
       } else {
         return {
           TAG: "Error",
-          _0: "conflict"
+          _0: {
+            TAG: "StorageFailure",
+            _0: msg$2 === "" ? "storage error" : msg$2
+          }
         };
       }
     }
@@ -109,11 +132,16 @@ function makeStorage(db, name, param) {
     return Stream.runForEach(stream, json => {
       let currentSeq = seqNrRef.contents;
       return Effect.flatMap(Effect.promise(() => append(currentSeq, id, [json])), result => {
-        if (result.TAG !== "Ok") {
-          return Effect.fail(result._0);
+        if (result.TAG === "Ok") {
+          seqNrRef.contents = currentSeq + 1 | 0;
+          return Effect.succeed();
+        }
+        let msg = result._0;
+        if (typeof msg !== "object") {
+          return Effect.fail("conflict");
+        } else {
+          return Effect.fail(msg._0);
         }
-        seqNrRef.contents = currentSeq + 1 | 0;
-        return Effect.succeed();
       });
     });
   };
@@ -152,4 +180,4 @@ export {
   makeStorage,
   Make,
 }
-/* effect/Effect Not a pure module */
+/* Stdlib_JsExn Not a pure module */

package/src/adapter/LocalBus.res

@@ -265,7 +265,19 @@ module Impl = (C: BusConfig): T => {
     let drainLoop = Effect.scoped(
       PubSub.subscribe(hub)->Effect.flatMap(queue =>
         Stream.fromQueue(queue)->Stream.runForEach(msg =>
-          Effect.promise(() => handler(msg.service, msg.meta, msg.json))->Effect.zipRight(msg.done_)
+          // A throwing/rejecting handler must not (a) leave `done_` uncalled —
+          // the publisher's countdown would never reach zero and every publish
+          // on this topic would hang — nor (b) kill this drain fiber, which
+          // would stop consuming while the subscriber stays counted, hanging all
+          // future publishes too. So: convert a rejection into a typed error
+          // (`tryPromise`), log-and-recover (`catchAll`) so the stream keeps
+          // draining, and run `done_` via `ensuring` so the countdown always
+          // advances regardless of outcome.
+          Effect.tryPromise(~catch=e => e, () => handler(msg.service, msg.meta, msg.json))
+          ->Effect.catchAll(err =>
+            Effect.sync(() => Console.error2("[LocalBus] subscriber handler failed:", err))
+          )
+          ->Effect.ensuring(msg.done_)
         )
       ),
     )
@@ -372,7 +384,11 @@ module Impl = (C: BusConfig): T => {
       let pending = queue.contents
       queue.contents = []
       pending->Array.forEach(json => {
-        let _ = handler(json, ())
+        let _ =
+          handler(json, ())->Promise.catch(e => {
+            Console.error2("[LocalBus] parked command handler failed:", e)
+            Promise.resolve()
+          })
       })
     | None => ()
     }
@@ -414,7 +430,11 @@ module Impl = (C: BusConfig): T => {
   // and done_ is called immediately. This prevents a deadlock where publishEvent on the
   // EP topic would block until the downstream aggregate command chain completes.
   let makeFireAndForgetHandler = handler => (_, _, json) => {
-    let _ = handler(json, ())
+    let _ =
+      handler(json, ())->Promise.catch(e => {
+        Console.error2("[LocalBus] fire-and-forget handler failed:", e)
+        Promise.resolve()
+      })
     Promise.resolve()
   }