@moltzap/client 2026.519.0 → 2026.519.2

package/dist/runtime/subscribers.d.ts

@@ -1,166 +1,104 @@
 /**
  * Per-subscription notification registry for `MoltZapWsClient`.
  *
- * Responsibility: own the list of live `subscribe()` handles and fan each
- * inbound JSON-RPC notification out to every subscription whose filter matches.
- * Implements spec #222 §5.3 (C4 + the `RealClientEventSubscriber.subscribe`
- * filter stub). Lives as an internal collaborator of `MoltZapWsClient`;
- * the public types (`SubscriptionFilter`, `NotificationSubscription`,
- * `SubscriptionId`) re-export from the package barrel.
+ * Responsibility: own the list of live subscriptions and fan each inbound
+ * JSON-RPC notification out to every subscription whose definition (and
+ * optional typed refinement predicate) matches. Implements spec #596
+ * (notification consumption consolidation) via the AD1 path-(a) Stream.async
+ * design (architect plan §3, §5.5).
  *
- * Dispatch ordering (Invariant 6 — notifications delivered in arrival order):
- *   1. Inbound frames are handed to the registry in arrival order.
- *   2. Within a single frame, subscriptions are notified in registration
- *      order.
- *   3. There is no separate legacy `onNotification` fanout — spec #222 OQ-4 is
- *      resolved by DELETING `MoltZapWsClientOptions.onNotification`. Callers
- *      that want every notification register `subscribe({}, handler)` after
- *      construction and before `connect()`.
+ * Storage shape (post-Spec B):
+ *   - Subscriptions are records of typed `{onFrame, onClose}` callbacks
+ *     (NOT queues / Take items / Stream.fromQueue). `notification/stream.ts`
+ *     owns Stream construction via `Stream.async`; this module owns the
+ *     register/dispatch/closeAll lifecycle.
+ *   - The dispatch path snapshots `subsRef` at iteration start (AD1
+ *     snapshot-semantic contract from spec #222 §5.3 OQ-3 / spec #596
+ *     "Stream lifecycle contract" row).
+ *   - `closeAll` invokes each live sub's `onClose(new NotConnectedError(...))`
+ *     before clearing `subsRef` — deterministic typed-failure delivery
+ *     replaces the deleted `failAllNotificationWaiters` semantic.
  *
- * Unsubscribe semantics (OQ-3 A): `unsubscribe` takes effect on the next
- * frame. The registry snapshots its live-subscription list at the start
- * of each `dispatch` call; in-flight dispatch of frame N is not
- * interrupted by an unsubscribe during frame N. Frame N+1 observes the
- * unsubscribed state.
- *
- * Error channel: handlers are invoked inside a defect-catcher; a throw is
- * logged through Effect logging and swallowed (matching the prior
- * `onNotification` contract at `ws-client.ts:650-655` pre-deletion). The
- * registry itself has no typed error surface — `register`, `dispatch`, and
- * `closeAll` are `Effect<T, never>`.
+ * Filter grammar (post-Spec B):
+ *   - Subscription matches a frame iff `sub.definition === frame.definition`.
+ *   - Optional `refinement` is a typed predicate over the frame's params
+ *     (erased to the union type `ErasedNotificationRefinement` at the
+ *     storage boundary; consumers receive the typed-narrowed shape via
+ *     `Stream.async`'s typed `emit.single` callback inside
+ *     `notification/stream.ts`).
+ *   - The three-field `SubscriptionFilter` grammar is deleted (spec #596
+ *     Goal #3 + §"Acceptance criteria" delete sweep). Multi-definition
+ *     fan-out becomes `Stream.mergeAll([subscribe(d1), subscribe(d2)])`.
  */
 import { Brand, Effect } from "effect";
-import type { AnyNotificationDefinition, DecodedNotification } from "@moltzap/protocol";
-interface FilterableNotificationFrame {
-    readonly method: string;
-    readonly params?: unknown;
-}
+import { NotConnectedError, type AnyNotificationDefinition, type DecodedNotification, type NotificationParamsOf } from "@moltzap/protocol";
 /** Branded identifier for a subscription handle. Minted by `register`. */
-export type SubscriptionId = string & Brand.Brand<"SubscriptionId">;
+type SubscriptionId = string & Brand.Brand<"SubscriptionId">;
 /**
- * Filter grammar for `subscribe`. A notification is delivered to a subscription
- * iff it matches **every** field that is set on the filter. Unset fields
- * are wildcards; the empty filter `{}` matches every notification.
- *
- * OQ-2 resolution (A): exactly these three fields, no free-form
- * predicate, no schema-derived matcher. Matches the existing
- * `RealClientEventFilter` contract at
- * `packages/protocol/src/testing/conformance/client/runner.ts:104-116`
- * one-for-one.
- *
- *   - `emissionTag` — exact match against the canonical payload key
- *     `frame.params.__emissionTag`. (The adapter reads the same key at
- *     `packages/client/src/test-utils/conformance-adapter.ts:77-79`;
- *     `emitTaggedEventDefault` writes it at `runner.ts:343-357`. The
- *     `__emissionId` string in the `runner.ts:108` doc comment is a
- *     known doc-bug — architect files a follow-up issue against
- *     protocol to correct the comment; it is not the canonical name.)
- *   - `conversationId` — exact match against `frame.params.conversationId`
- *     when set on the notification payload.
- *   - `notificationNamePrefix` — `frame.method.startsWith(prefix)`.
+ * Per-subscription callback delivered each matching frame. Implemented in
+ * `notification/stream.ts` as `(frame) => Effect.sync(() => emit.single(frame))`.
+ * Returning `Effect<void, never>` keeps the dispatch path total — the
+ * Stream-side `emit.single` cannot fail synchronously.
  */
-export interface SubscriptionFilter {
-    readonly emissionTag?: string;
-    readonly conversationId?: string;
-    readonly notificationNamePrefix?: string;
-}
+type SubscriberFrameCallback = (frame: DecodedNotification<AnyNotificationDefinition>) => Effect.Effect<void, never>;
 /**
- * Handle returned by `register` / `MoltZapWsClient.subscribe`. Caller
- * holds the handle for its subscription's lifetime and runs
- * `unsubscribe` to stop delivery.
- *
- * `unsubscribe` is `Effect&lt;void, never>`: it is idempotent and total.
- * Calling `unsubscribe` a second time, or after `closeAll`, is a no-op.
+ * Per-subscription callback invoked exactly once when the client transitions
+ * to its terminal closed state. Implemented in `notification/stream.ts` as
+ * `(cause) => Effect.sync(() => emit.fail(cause))`.
  */
-export interface NotificationSubscription {
-    readonly id: SubscriptionId;
-    readonly unsubscribe: Effect.Effect<void, never>;
-}
+type SubscriberCloseCallback = (cause: NotConnectedError) => Effect.Effect<void, never>;
 /**
- * Per-subscription handler signature. Runs inside the registry's
- * dispatch fiber. Must not throw — throws are caught by the registry, logged,
- * and swallowed.
- *
- * The frame is a known-descriptor `DecodedNotification` (post-S9
- * fail-close: malformed / unknown-method frames are rejected before
- * dispatch). Handlers receive validated `params` typed as
- * `NotificationParamsOf&lt;D>` for the matching definition.
- *
- * Returning an `Effect` (not a plain `void`) lets handlers compose with
- * Effect-native downstream code without an extra runSync shim. The
- * registry awaits each handler's effect before moving to the next
- * subscription for this frame — fairness over throughput, so a slow
- * handler on subscription A does not reorder frames seen by
- * subscription B across frames.
+ * Handle returned by `register`. `unregister` is `Effect<void, never>`: it
+ * is idempotent and total. Calling `unregister` a second time, or after
+ * `closeAll`, is a no-op.
  */
-export type SubscriberHandler = (frame: DecodedNotification<AnyNotificationDefinition>) => Effect.Effect<void, never>;
+interface SubscriptionHandle {
+    readonly id: SubscriptionId;
+    readonly unregister: Effect.Effect<void, never>;
+}
 /**
  * Subscriber registry. One instance per `MoltZapWsClient`, created at
- * construction time and owned by the client. Not exported from the
- * package barrel — consumers reach the registry only through
- * `MoltZapWsClient.subscribe`.
+ * construction time and owned by the client.
+ *
+ * `register<D>` accepts typed `onFrame` / `onClose` callbacks for the
+ * specific definition `D`; internally the registry erases them to the
+ * `Subscriber{Frame,Close}Callback` union shape so a single iteration
+ * can dispatch over heterogeneous subscriptions without per-`D`
+ * dispatch tables.
  */
 export interface SubscriberRegistry {
+    readonly register: <D extends AnyNotificationDefinition>(definition: D, refinement: ((params: NotificationParamsOf<D>) => boolean) | undefined, callbacks: {
+        readonly onFrame: (frame: DecodedNotification<D>) => Effect.Effect<void, never>;
+        readonly onClose: SubscriberCloseCallback;
+    }) => Effect.Effect<SubscriptionHandle, never>;
     /**
-     * Add a subscription. Returns the handle immediately; delivery starts
-     * with the next frame passed to `dispatch`. Does not await any
-     * connection state — subscribe is legal pre-connect (spec §5.3 +
-     * Assumption 1 deletion: post-delete of `onNotification`, subscribe is the
-     * only pre-connect notification hook).
+     * `subscribeAll` surface (spec #596 Goal #2). Registers a broad-union
+     * subscription that fires for every inbound frame regardless of
+     * definition. The optional `refinement` predicate runs against the
+     * full `DecodedNotification<AnyNotificationDefinition>` shape.
+     *
+     * Stored in a sibling `subsAllRef` list — kept off `subsRef` so the
+     * per-definition dispatch loop in `dispatch` stays a simple
+     * `definition ===` check without a per-sub broad-union escape branch.
      */
-    readonly register: (filter: SubscriptionFilter, handler: SubscriberHandler) => Effect.Effect<NotificationSubscription, never>;
+    readonly registerAll: (refinement: ((notification: DecodedNotification<AnyNotificationDefinition>) => boolean) | undefined, callbacks: {
+        readonly onFrame: SubscriberFrameCallback;
+        readonly onClose: SubscriberCloseCallback;
+    }) => Effect.Effect<SubscriptionHandle, never>;
     /**
-     * Fan an inbound notification out to every matching subscription. Called by
-     * `MoltZapWsClient.handleIncoming` at the existing notification-dispatch
-     * point (`ws-client.ts:649-685`). Implementation snapshots the
-     * live-subscription list at the start of dispatch so
-     * unsubscribe-during-dispatch observes next-frame semantics (OQ-3 A).
-     *
-     * Frames are pre-validation (`DecodedNotification&lt;AnyNotificationDefinition>` union) — the
-     * type-system contract that subscribers see RAW frames, not the lifted
-     * `DecodedNotification&lt;D>` shape that typed handlers see.
-     *
-     * Dispatch order: registration order, iterated sequentially; slow
-     * handlers block later subscriptions for this frame but never
-     * reorder frame N relative to frame N+1.
+     * Fan an inbound notification out to every matching subscription. Called
+     * from `MoltZapWsClient.handleDecodedNotification`. Snapshot semantic:
+     * unsubscribes that commit mid-dispatch observe NEXT-frame semantics
+     * (AD1 path-(a) contract).
      */
     readonly dispatch: (frame: DecodedNotification<AnyNotificationDefinition>) => Effect.Effect<void, never>;
     /**
-     * Drop every live subscription. Called from `MoltZapWsClient.close`
-     * so handlers stop firing once the client is torn down. Idempotent.
+     * Terminal close. Invokes every live sub's `onClose` callback (which
+     * `emit.fail(cause)`s the corresponding consumer Stream), then clears
+     * both `subsRef` and `subsAllRef`. Idempotent.
      */
     readonly closeAll: Effect.Effect<void, never>;
 }
-/**
- * Construct an empty registry. Called once from the `MoltZapWsClient`
- * constructor.
- *
- * Implementation notes:
- *   - Live subscriptions are stored in a `Ref&lt;ReadonlyArray&lt;…>>` keyed
- *     by registration order. Append-on-register, filter-on-unsubscribe
- *     keeps the dispatch path O(N) with N = live subscription count.
- *     Bigger structures aren't justified at the expected sub count
- *     (≤ ~10 per fixture).
- *   - `dispatch` snapshots the array at start (OQ-3 A). An
- *     `unsubscribe` mid-dispatch mutates the Ref but the in-flight
- *     iteration walks the snapshot.
- *   - Handler exceptions are caught with `Effect.catchAllDefect` after
- *     the handler Effect. Sync `throw` from a `(frame) => …` body
- *     surfaces as a defect; we log + swallow to match the pre-deletion
- *     `onNotification` contract.
- */
 export declare function makeSubscriberRegistry(): Effect.Effect<SubscriberRegistry, never>;
-/**
- * Pure filter-match predicate. Exposed for unit testing so executable
- * client-side divergence proofs can force known-bad subscription
- * behavior without bypassing the production dispatch path.
- *
- * Returns `true` iff `frame` matches every set field on `filter`:
- *   - `filter.emissionTag === frame.params.__emissionTag` (strict ===)
- *   - `filter.conversationId === frame.params.conversationId` (strict ===)
- *   - `frame.method.startsWith(filter.notificationNamePrefix)`
- * Unset filter fields are wildcards.
- */
-export declare function matchesFilter(filter: SubscriptionFilter, frame: FilterableNotificationFrame): boolean;
 export {};
 //# sourceMappingURL=subscribers.d.ts.map

package/dist/runtime/subscribers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribers.d.ts","sourceRoot":"","sources":["../../src/runtime/subscribers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AAE3B,UAAU,2BAA2B;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,0EAA0E;AAC1E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAGpE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CAClD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAC9B,KAAK,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEhC;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,CACjB,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE,iBAAiB,KACvB,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAEpD;;;;;;;;;;;;;;OAcG;IACH,QAAQ,CAAC,QAAQ,EAAE,CACjB,KAAK,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CAC/C;AAiDD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,CACrD,kBAAkB,EAClB,KAAK,CACN,CAoCA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,kBAAkB,EAC1B,KAAK,EAAE,2BAA2B,GACjC,OAAO,CAiBT"}
+{"version":3,"file":"subscribers.d.ts","sourceRoot":"","sources":["../../src/runtime/subscribers.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,OAAO,EAAE,KAAK,EAAE,MAAM,EAAO,MAAM,QAAQ,CAAC;AAC5C,OAAO,EACL,iBAAiB,EACjB,KAAK,yBAAyB,EAC9B,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAC1B,MAAM,mBAAmB,CAAC;AAE3B,0EAA0E;AAC1E,KAAK,cAAc,GAAG,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAc7D;;;;;GAKG;AACH,KAAK,uBAAuB,GAAG,CAC7B,KAAK,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEhC;;;;GAIG;AACH,KAAK,uBAAuB,GAAG,CAC7B,KAAK,EAAE,iBAAiB,KACrB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAehC;;;;GAIG;AACH,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CACjD;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,yBAAyB,EACrD,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,GAAG,SAAS,EACtE,SAAS,EAAE;QACT,QAAQ,CAAC,OAAO,EAAE,CAChB,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,KAC1B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAChC,QAAQ,CAAC,OAAO,EAAE,uBAAuB,CAAC;KAC3C,KACE,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;IAE9C;;;;;;;;;OASG;IACH,QAAQ,CAAC,WAAW,EAAE,CACpB,UAAU,EACN,CAAC,CACC,YAAY,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,KACzD,OAAO,CAAC,GACb,SAAS,EACb,SAAS,EAAE;QACT,QAAQ,CAAC,OAAO,EAAE,uBAAuB,CAAC;QAC1C,QAAQ,CAAC,OAAO,EAAE,uBAAuB,CAAC;KAC3C,KACE,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;IAE9C;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,EAAE,CACjB,KAAK,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,KAClD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEhC;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;CAC/C;AA8RD,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,MAAM,CACrD,kBAAkB,EAClB,KAAK,CACN,CAcA"}

package/dist/runtime/subscribers.js

@@ -1,35 +1,38 @@
+/* eslint-disable jsdoc/text-escaping -- JSDoc references to generic types like `NotificationParamsOf<D>` use the natural angle-bracket form (TS source style) inside backtick-fenced code spans; the lint rule's pre-render check fires false positives on these multi-line spans. Matches the precedent in filter-equivalence.test.ts. */
 /**
  * Per-subscription notification registry for `MoltZapWsClient`.
  *
- * Responsibility: own the list of live `subscribe()` handles and fan each
- * inbound JSON-RPC notification out to every subscription whose filter matches.
- * Implements spec #222 §5.3 (C4 + the `RealClientEventSubscriber.subscribe`
- * filter stub). Lives as an internal collaborator of `MoltZapWsClient`;
- * the public types (`SubscriptionFilter`, `NotificationSubscription`,
- * `SubscriptionId`) re-export from the package barrel.
+ * Responsibility: own the list of live subscriptions and fan each inbound
+ * JSON-RPC notification out to every subscription whose definition (and
+ * optional typed refinement predicate) matches. Implements spec #596
+ * (notification consumption consolidation) via the AD1 path-(a) Stream.async
+ * design (architect plan §3, §5.5).
  *
- * Dispatch ordering (Invariant 6 — notifications delivered in arrival order):
- *   1. Inbound frames are handed to the registry in arrival order.
- *   2. Within a single frame, subscriptions are notified in registration
- *      order.
- *   3. There is no separate legacy `onNotification` fanout — spec #222 OQ-4 is
- *      resolved by DELETING `MoltZapWsClientOptions.onNotification`. Callers
- *      that want every notification register `subscribe({}, handler)` after
- *      construction and before `connect()`.
+ * Storage shape (post-Spec B):
+ *   - Subscriptions are records of typed `{onFrame, onClose}` callbacks
+ *     (NOT queues / Take items / Stream.fromQueue). `notification/stream.ts`
+ *     owns Stream construction via `Stream.async`; this module owns the
+ *     register/dispatch/closeAll lifecycle.
+ *   - The dispatch path snapshots `subsRef` at iteration start (AD1
+ *     snapshot-semantic contract from spec #222 §5.3 OQ-3 / spec #596
+ *     "Stream lifecycle contract" row).
+ *   - `closeAll` invokes each live sub's `onClose(new NotConnectedError(...))`
+ *     before clearing `subsRef` — deterministic typed-failure delivery
+ *     replaces the deleted `failAllNotificationWaiters` semantic.
  *
- * Unsubscribe semantics (OQ-3 A): `unsubscribe` takes effect on the next
- * frame. The registry snapshots its live-subscription list at the start
- * of each `dispatch` call; in-flight dispatch of frame N is not
- * interrupted by an unsubscribe during frame N. Frame N+1 observes the
- * unsubscribed state.
- *
- * Error channel: handlers are invoked inside a defect-catcher; a throw is
- * logged through Effect logging and swallowed (matching the prior
- * `onNotification` contract at `ws-client.ts:650-655` pre-deletion). The
- * registry itself has no typed error surface — `register`, `dispatch`, and
- * `closeAll` are `Effect&lt;T, never>`.
+ * Filter grammar (post-Spec B):
+ *   - Subscription matches a frame iff `sub.definition === frame.definition`.
+ *   - Optional `refinement` is a typed predicate over the frame's params
+ *     (erased to the union type `ErasedNotificationRefinement` at the
+ *     storage boundary; consumers receive the typed-narrowed shape via
+ *     `Stream.async`'s typed `emit.single` callback inside
+ *     `notification/stream.ts`).
+ *   - The three-field `SubscriptionFilter` grammar is deleted (spec #596
+ *     Goal #3 + §"Acceptance criteria" delete sweep). Multi-definition
+ *     fan-out becomes `Stream.mergeAll([subscribe(d1), subscribe(d2)])`.
  */
 import { Brand, Effect, Ref } from "effect";
+import { NotConnectedError, } from "@moltzap/protocol";
 const SubscriptionIdBrand = Brand.nominal();
 function nextSubscriptionId(counterRef) {
     return Ref.updateAndGet(counterRef, (count) => count + 1).pipe(Effect.map((count) => SubscriptionIdBrand(`sub-${count}`)));
@@ -41,88 +44,179 @@ function removeSubscription(subsRef, id) {
     return Ref.update(subsRef, (subscriptions) => subscriptions.filter((subscription) => subscription.id !== id));
 }
 function dispatchToSubscriber(sub, frame) {
-    return Effect.suspend(() => sub.handler(frame)).pipe(Effect.catchAllDefect((err) => Effect.logWarning("subscriber handler threw", err)));
+    return Effect.suspend(() => sub.onFrame(frame)).pipe(Effect.catchAllDefect((err) => Effect.logWarning("subscriber onFrame callback threw", err)));
 }
-function isNotificationParamsRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
+function closeSubscriber(sub, cause) {
+    return Effect.suspend(() => sub.onClose(cause)).pipe(Effect.catchAllDefect((err) => Effect.logWarning("subscriber onClose callback threw", err)));
 }
 /**
  * Construct an empty registry. Called once from the `MoltZapWsClient`
  * constructor.
  *
  * Implementation notes:
- *   - Live subscriptions are stored in a `Ref&lt;ReadonlyArray&lt;…>>` keyed
- *     by registration order. Append-on-register, filter-on-unsubscribe
- *     keeps the dispatch path O(N) with N = live subscription count.
- *     Bigger structures aren't justified at the expected sub count
- *     (≤ ~10 per fixture).
- *   - `dispatch` snapshots the array at start (OQ-3 A). An
- *     `unsubscribe` mid-dispatch mutates the Ref but the in-flight
- *     iteration walks the snapshot.
- *   - Handler exceptions are caught with `Effect.catchAllDefect` after
- *     the handler Effect. Sync `throw` from a `(frame) => …` body
- *     surfaces as a defect; we log + swallow to match the pre-deletion
- *     `onNotification` contract.
+ *   - `subsRef: Ref<ReadonlyArray<LiveSubscription>>` keyed by registration
+ *     order. Append-on-register, filter-on-unregister keeps the dispatch
+ *     path O(N) with N = live subscription count.
+ *   - `dispatch` snapshots `subsRef` at iteration start. An unregister
+ *     mid-dispatch mutates the Ref but the in-flight iteration walks the
+ *     snapshot (AD1 path-(a) snapshot semantic).
+ *   - `closeAll` invokes each live sub's `onClose` in iteration order
+ *     before clearing the ref. `Stream.async`'s `emit.fail` is the
+ *     deterministic in-Effect mechanism that propagates the typed
+ *     failure to each consumer.
  */
-export function makeSubscriberRegistry() {
-    return Effect.gen(function* () {
-        const subsRef = yield* Ref.make([]);
-        const counterRef = yield* Ref.make(0);
-        const register = (filter, handler) => Effect.gen(function* () {
-            const id = yield* nextSubscriptionId(counterRef);
-            const live = { id, filter, handler };
-            yield* appendSubscription(subsRef, live);
-            const unsubscribe = removeSubscription(subsRef, id);
-            return { id, unsubscribe };
-        });
-        const dispatch = (frame) => Effect.gen(function* () {
-            // Snapshot at dispatch-start: OQ-3 A. Unsubscribes during this
-            // frame mutate `subsRef` but our iteration walks `snapshot`.
-            const snapshot = yield* Ref.get(subsRef);
-            // Short-circuit the common pre-subscribe path (every inbound
-            // frame before any `subscribe()` call) so hot-path dispatch
-            // avoids even the `for…of` allocation.
-            if (snapshot.length === 0)
-                return;
-            for (const sub of snapshot) {
-                if (!matchesFilter(sub.filter, frame))
-                    continue;
-                // Handlers must not throw; we catch defects defensively so
-                // one buggy subscriber can't kill the dispatch loop or break
-                // the reader fiber.
-                yield* dispatchToSubscriber(sub, frame);
-            }
-        });
-        const closeAll = Ref.set(subsRef, []);
-        return { register, dispatch, closeAll };
-    }).pipe(Effect.withSpan("makeSubscriberRegistry"));
+function appendBroadSubscription(subsAllRef, live) {
+    return Ref.update(subsAllRef, (subscriptions) => [...subscriptions, live]);
+}
+function removeBroadSubscription(subsAllRef, id) {
+    return Ref.update(subsAllRef, (subscriptions) => subscriptions.filter((subscription) => subscription.id !== id));
+}
+function dispatchToBroadSubscriber(sub, frame) {
+    return Effect.suspend(() => sub.onFrame(frame)).pipe(Effect.catchAllDefect((err) => Effect.logWarning("subscribeAll onFrame callback threw", err)));
+}
+function closeBroadSubscriber(sub, cause) {
+    return Effect.suspend(() => sub.onClose(cause)).pipe(Effect.catchAllDefect((err) => Effect.logWarning("subscribeAll onClose callback threw", err)));
+}
+/**
+ * Single named typed→erased adapter for the refinement predicate. The
+ * `Stream.async` callback inside `notification/stream.ts` keeps the typed
+ * shape for the consumer's typed payload; storage in `LiveSubscription`
+ * uses the broad-union erased form. This is the only place the typed →
+ * erased boundary crosses, so the cast is acknowledged with an explicit
+ * lint suppression.
+ */
+function eraseRefinement(refinement) {
+    if (refinement === undefined)
+        return undefined;
+    // The typed→erased boundary is by construction safe: the registry's
+    // `dispatch` loop only invokes the refinement with frames whose
+    // `definition === sub.definition`, so `frame.params` always satisfies
+    // `NotificationParamsOf<D>`.
+    // eslint-disable-next-line agent-code-guard/as-unknown-as -- documented typed→erased boundary, see comment above
+    return refinement; // #ignore-sloppy-code[as-unknown-as]: typed→erased boundary for heterogeneous registry storage; dispatch loop enforces definition identity before invocation
+}
+function buildRegister(subsRef, counterRef) {
+    return (definition, refinement, callbacks) => Effect.gen(function* () {
+        const id = yield* nextSubscriptionId(counterRef);
+        const erasedRefinement = eraseRefinement(refinement);
+        const live = {
+            id,
+            definition,
+            ...(erasedRefinement !== undefined
+                ? { refinement: erasedRefinement }
+                : {}),
+            onFrame: callbacks.onFrame,
+            onClose: callbacks.onClose,
+        };
+        yield* appendSubscription(subsRef, live);
+        const unregister = removeSubscription(subsRef, id);
+        return { id, unregister };
+    });
+}
+function buildRegisterAll(subsAllRef, counterRef) {
+    return (refinement, callbacks) => Effect.gen(function* () {
+        const id = yield* nextSubscriptionId(counterRef);
+        const live = {
+            id,
+            ...(refinement !== undefined ? { refinement } : {}),
+            onFrame: callbacks.onFrame,
+            onClose: callbacks.onClose,
+        };
+        yield* appendBroadSubscription(subsAllRef, live);
+        const unregister = removeBroadSubscription(subsAllRef, id);
+        return { id, unregister };
+    });
 }
 /**
- * Pure filter-match predicate. Exposed for unit testing so executable
- * client-side divergence proofs can force known-bad subscription
- * behavior without bypassing the production dispatch path.
+ * Run a user-supplied refinement predicate with throw isolation. A throw
+ * inside the predicate must NOT defect the dispatch Effect (which would
+ * starve sibling subscribers of the in-flight frame, AD1 path-(a) snapshot
+ * contract). Treat any throw as "predicate said false" — the frame is
+ * filtered out for this subscriber, the throw is logged, dispatch
+ * continues with the next subscription in the snapshot.
  *
- * Returns `true` iff `frame` matches every set field on `filter`:
- *   - `filter.emissionTag === frame.params.__emissionTag` (strict ===)
- *   - `filter.conversationId === frame.params.conversationId` (strict ===)
- *   - `frame.method.startsWith(filter.notificationNamePrefix)`
- * Unset filter fields are wildcards.
+ * The warning is emitted via `Effect.runFork(Effect.logWarning(…))`
+ * (detached from the dispatch fiber's span/annotations) so the
+ * synchronous filter returned by `subAcceptsFrame` / `broadAcceptsFrame`
+ * stays synchronous — pulling logging into the surrounding `Effect.gen`
+ * would either (a) require the predicate to become an Effect (forcing
+ * every caller to `yield*`) or (b) accumulate warnings in a Ref and
+ * re-emit post-dispatch (extra state for a non-load-bearing log). The
+ * detached log is acceptable for predicate misuse — a noisy warning
+ * that names the call site (`subscribe` vs `subscribeAll`) is sufficient
+ * signal for the application author to find the throw in their
+ * refinement. Codex r2 P3-1 documented this trade-off rather than
+ * restructuring.
+ */
+function safePredicate(predicate, params, context) {
+    try {
+        return predicate(params);
+    }
+    catch (err) {
+        Effect.runFork(Effect.logWarning(`${context} refinement predicate threw`, err));
+        return false;
+    }
+}
+/**
+ * Cognitive-complexity helper: decides whether a per-definition sub
+ * accepts a given frame. Predicate throws are caught (P2-1, codex r1):
+ * a throwing refinement returns `false` rather than defecting the
+ * dispatch Effect.
  */
-export function matchesFilter(filter, frame) {
-    const methodPrefix = filter.notificationNamePrefix;
-    if (methodPrefix !== undefined &&
-        !matchesMethodPrefix(methodPrefix, frame.method))
+function subAcceptsFrame(sub, frame) {
+    if (sub.definition !== frame.definition)
+        return false;
+    if (sub.refinement !== undefined &&
+        !safePredicate(sub.refinement, frame.params, "subscribe"))
         return false;
-    const params = isNotificationParamsRecord(frame.params)
-        ? frame.params
-        : null;
-    return (matchesPayloadValue(params, "__emissionTag", filter.emissionTag) &&
-        matchesPayloadValue(params, "conversationId", filter.conversationId));
+    return true;
 }
-function matchesMethodPrefix(prefix, method) {
-    return method.startsWith(prefix);
+/** Same as `subAcceptsFrame`, but for broad-union subscriptions. */
+function broadAcceptsFrame(sub, frame) {
+    return (sub.refinement === undefined ||
+        safePredicate(sub.refinement, frame, "subscribeAll"));
 }
-function matchesPayloadValue(params, key, expected) {
-    return expected === undefined || params?.[key] === expected;
+function buildDispatch(subsRef, subsAllRef) {
+    return (frame) => Effect.gen(function* () {
+        // Snapshot both lists at iteration start (AD1 path-(a) semantic).
+        const snapshot = yield* Ref.get(subsRef);
+        const broadSnapshot = yield* Ref.get(subsAllRef);
+        const matching = snapshot.filter((sub) => subAcceptsFrame(sub, frame));
+        for (const sub of matching) {
+            yield* dispatchToSubscriber(sub, frame);
+        }
+        const matchingBroad = broadSnapshot.filter((sub) => broadAcceptsFrame(sub, frame));
+        for (const sub of matchingBroad) {
+            yield* dispatchToBroadSubscriber(sub, frame);
+        }
+    });
+}
+function buildCloseAll(subsRef, subsAllRef) {
+    return Effect.gen(function* () {
+        const snapshot = yield* Ref.getAndSet(subsRef, []);
+        const broadSnapshot = yield* Ref.getAndSet(subsAllRef, []);
+        const cause = new NotConnectedError({
+            message: "WebSocket not connected",
+        });
+        for (const sub of snapshot) {
+            yield* closeSubscriber(sub, cause);
+        }
+        for (const sub of broadSnapshot) {
+            yield* closeBroadSubscriber(sub, cause);
+        }
+    });
+}
+export function makeSubscriberRegistry() {
+    return Effect.gen(function* () {
+        const subsRef = yield* Ref.make([]);
+        const subsAllRef = yield* Ref.make([]);
+        const counterRef = yield* Ref.make(0);
+        return {
+            register: buildRegister(subsRef, counterRef),
+            registerAll: buildRegisterAll(subsAllRef, counterRef),
+            dispatch: buildDispatch(subsRef, subsAllRef),
+            closeAll: buildCloseAll(subsRef, subsAllRef),
+        };
+    }).pipe(Effect.withSpan("makeSubscriberRegistry"));
 }
 //# sourceMappingURL=subscribers.js.map

package/dist/runtime/subscribers.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribers.js","sourceRoot":"","sources":["../../src/runtime/subscribers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subscribers.js","sourceRoot":"","sources":["../../src/runtime/subscribers.ts"],"names":[],"mappings":"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"}