@moltzap/client 2026.505.2 → 2026.507.0

package/dist/test-utils/conformance-adapter.js

@@ -15,11 +15,11 @@
  * `onDisconnect`): no private reads, no monkey-patching
  * (Invariant I9 from spec #200).
  *
- * Spec #222 atomic migration:
- *   - `outboundIdsRef` is populated from `sendRpcTracked.id` — the real
- *     `rpc-N` identity, not a `local-${random}` mirror (B4).
- *   - `responseFrame(...)` constructs the JSON-RPC response envelope
- *     instead of hand-writing wire fields.
+ * Phase 12 encapsulation: request ids are wire metadata, not part of the
+ * test-protocol surface. The adapter calls `ws.sendRpc(...)` (no id leak)
+ * and synthesizes a wire-shaped `ResponseFrame` with `id: null` for the
+ * conformance contract. Tests that need to verify id-correlation (B4)
+ * discriminate via `result` payload content instead of reading ids back.
  *   - `closeRef` is populated from `CloseInfo.{code, reason}` passed
  *     into `onDisconnect`, not the hardcoded `{1000, "disconnect"}`
  *     (V7).
@@ -27,7 +27,7 @@
  *     no-op stub is gone (C4 + subscribe-stub).
  */
 import { Data, Effect, Either, Ref, Scope } from "effect";
-import { jsonRpcStringId, rpcMethods, responseFrame, } from "@moltzap/protocol";
+import { rpcMethods, } from "@moltzap/protocol";
 import { MoltZapWsClient } from "../ws-client.js";
 import { NotConnectedError, RpcServerError, RpcTimeoutError, } from "@moltzap/protocol";
 const CONNECT_READY_TIMEOUT_MS = 30_000;
@@ -96,7 +96,6 @@ function filterFromRealClient(filter) {
 export function createMoltZapRealClientFactory(opts) {
     return (args) => Effect.gen(function* () {
         const notificationsRef = yield* Ref.make([]);
-        const outboundIdsRef = yield* Ref.make([]);
         const closeRef = yield* Ref.make(null);
         const ws = new MoltZapWsClient({
             serverUrl: args.testServerUrl,
@@ -124,14 +123,19 @@ export function createMoltZapRealClientFactory(opts) {
         // replacement. Pre-`connect()` registration is supported.
         const captureAll = yield* ws
             .subscribe({}, (frame) => Effect.sync(() => {
-            const encoded = new TextEncoder().encode(JSON.stringify(frame));
-            const params = frame.params;
-            const tag = typeof params?.__emissionTag === "string"
-                ? params.__emissionTag
-                : null;
+            // Strip `definition` (added by `decodeNotification` post-Phase-12)
+            // before re-encoding so `rawBytes` matches the wire form the
+            // TestServer originally emitted. Conformance correlation in
+            // `lookupTagForRawBytes` keys on the wire form.
+            const wireFrame = {
+                jsonrpc: frame.jsonrpc,
+                method: frame.method,
+                ...(frame.params !== undefined ? { params: frame.params } : {}),
+            };
+            const encoded = new TextEncoder().encode(JSON.stringify(wireFrame));
             const obs = {
-                emissionTag: tag,
-                decoded: frame,
+                emissionTag: null,
+                decoded: wireFrame,
                 rawBytes: encoded,
                 observedAtMs: Date.now(),
             };
@@ -182,7 +186,10 @@ export function createMoltZapRealClientFactory(opts) {
             snapshot,
         };
         const call = (method, params) => Effect.gen(function* () {
-            const definition = rpcMethods.find((def) => def.name === method);
+            // The conformance suite passes string method names; resolve to
+            // the protocol descriptor by name. Per-def `validateParams` is
+            // checked inside `ws.sendRpc` via wire validation.
+            const definition = rpcMethods.find((d) => d.name === method);
             if (definition === undefined || !definition.validateParams(params)) {
                 return yield* Effect.fail(new RealClientRpcFailure({
                     cause: { method, params },
@@ -191,22 +198,12 @@ export function createMoltZapRealClientFactory(opts) {
                     method,
                 }));
             }
-            // B4: `sendRpcTracked` returns the real outbound id. The adapter
-            // records it and builds the JSON-RPC response through the shared
-            // helper — no mirror id, no hand-written frame.
-            const tracked = yield* ws
-                .sendRpcTracked(definition, params)
+            const result = yield* ws
+                .sendRpc(definition, params)
                 .pipe(Effect.mapError((cause) => rpcError(cause, method)));
-            // Record the real id (Invariant 3 from spec #222: same id
-            // minted at the `rpc-${++counter}` site, surfaced as-is).
-            yield* Ref.update(outboundIdsRef, (xs) => [...xs, tracked.id]);
-            const frame = responseFrame(jsonRpcStringId(tracked.id), { result: tracked.result });
-            return frame;
+            return definition.encodeResponse(null, result);
         });
-        const rpcCaller = {
-            call,
-            outboundIdFeed: Ref.get(outboundIdsRef),
-        };
+        const rpcCaller = { call };
         const closeSignal = Effect.gen(function* () {
             while (true) {
                 const cur = yield* Ref.get(closeRef);

package/dist/test-utils/conformance-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"conformance-adapter.js","sourceRoot":"","sources":["../../src/test-utils/conformance-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EACL,eAAe,EACf,UAAU,EACV,aAAa,GAGd,MAAM,mBAAmB,CAAC;AAY3B,OAAO,EAAE,eAAe,EAAkB,MAAM,iBAAiB,CAAC;AAElE,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAaxC,MAAM,0BAA2B,SAAQ,IAAI,CAAC,WAAW,CACvD,0BAA0B,CAG1B;CAAG;AAEL,MAAM,oBAAqB,SAAQ,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAKtE;CAAG;AAEL,SAAS,cAAc,CAAC,KAAc;IACpC,yEAAyE;IACzE,sEAAsE;IACtE,yEAAyE;IACzE,0EAA0E;IAC1E,iEAAiE;IACjE,OAAO,IAAI,0BAA0B,CAAC,EAAE,KAAK,EAAE,CAA6B,CAAC;AAC/E,CAAC;AAED,SAAS,QAAQ,CACf,KAA2D,EAC3D,MAAc;IAEd,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;QACrC,OAAO,IAAI,oBAAoB,CAAC;YAC9B,KAAK;YACL,kBAAkB,EAAE,iBAAiB;YACrC,IAAI,EAAE,SAAS;YACf,MAAM;SACP,CAAuB,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;QACpC,OAAO,IAAI,oBAAoB,CAAC;YAC9B,KAAK;YACL,kBAAkB,EAAE,gBAAgB;YACpC,IAAI,EAAE,cAAc;YACpB,MAAM;SACP,CAAuB,CAAC;IAC3B,CAAC;IACD,IAAI,KAAK,YAAY,iBAAiB,EAAE,CAAC;QACvC,OAAO,IAAI,oBAAoB,CAAC;YAC9B,KAAK;YACL,kBAAkB,EAAE,mBAAmB;YACvC,IAAI,EAAE,cAAc;YACpB,MAAM;SACP,CAAuB,CAAC;IAC3B,CAAC;IACD,OAAO,IAAI,oBAAoB,CAAC;QAC9B,KAAK;QACL,kBAAkB,EAAE,IAAI;QACxB,IAAI,EAAE,oBAAoB;QAC1B,MAAM;KACP,CAAuB,CAAC;AAC3B,CAAC;AAED;;;;GAIG;AACH,SAAS,oBAAoB,CAC3B,MAAoC;IAEpC,OAAO;QACL,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;KACtD,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAC5C,IAA8B;IAI9B,OAAO,CAAC,IAAI,EAAE,EAAE,CACd,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAEtC,EAAE,CAAC,CAAC;QACN,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAwB,EAAE,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAA8B,IAAI,CAAC,CAAC;QAEpE,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC;YAC7B,SAAS,EAAE,IAAI,CAAC,aAAa;YAC7B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,+DAA+D;YAC/D,2DAA2D;YAC3D,gEAAgE;YAChE,sDAAsD;YACtD,YAAY,EAAE,CAAC,KAAgB,EAAE,EAAE;gBACjC,IAAI,CAAC;oBACH,MAAM,CAAC,OAAO,CACZ,GAAG,CAAC,MAAM,CACR,QAAQ,EACR,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,IAAI;wBACL,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;qBACzB,CACJ,CACF,CAAC;gBACJ,CAAC;gBAAC,OAAO,QAAQ,EAAE,CAAC;oBAClB,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,QAAQ,CAAC,CAAC;gBACrE,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QAEH,gEAAgE;QAChE,uEAAuE;QACvE,iEAAiE;QACjE,0DAA0D;QAC1D,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,EAAE;aACzB,SAAS,CAAC,EAAE,EAAE,CAAC,KAAwB,EAAE,EAAE,CAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;YAChE,MAAM,MAAM,GAAG,KAAK,CAAC,MAER,CAAC;YACd,MAAM,GAAG,GACP,OAAO,MAAM,EAAE,aAAa,KAAK,QAAQ;gBACvC,CAAC,CAAC,MAAM,CAAC,aAAa;gBACtB,CAAC,CAAC,IAAI,CAAC;YACX,MAAM,GAAG,GAAyB;gBAChC,WAAW,EAAE,GAAG;gBAChB,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE,OAAO;gBACjB,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;aACzB,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,CAAC,OAAO,CACZ,GAAG,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CACnD,CAAC;YACJ,CAAC;YAAC,OAAO,SAAS,EAAE,CAAC;gBACnB,OAAO,CAAC,IAAI,CACV,0CAA0C,EAC1C,SAAS,CACV,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CACH;aACA,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3D,6DAA6D;QAC7D,gEAAgE;QAChE,6DAA6D;QAC7D,sCAAsC;QACtC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAC9B,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CACzD,CAAC;QAEF,8DAA8D;QAC9D,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAEnC,SAAS,CAAC,CAAC;QACb,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CACtB,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,CACf,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,KAAK,CAAC;YACX,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC;YACpD,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC;SAClD,CAAC,CACH,CACF,CACF,CAAC;QAEF,MAAM,KAAK,GAAkD,MAAM,CAAC,GAAG,CACrE,QAAQ,CAAC;YACP,oDAAoD;YACpD,4DAA4D;YAC5D,+DAA+D;YAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,wBAAwB,CAAC;YACvD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;gBAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAC5C,IAAI,KAAK,KAAK,UAAU;oBAAE,OAAO;gBACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBACzD,CAAC;gBACD,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACnC,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC/D,CAAC,CACF,CAAC;QAEF,MAAM,SAAS,GAAkD,CAC/D,MAAM,EAC2D,EAAE,CACnE,EAAE;aACC,SAAS,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;aAC1D,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACtB,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC,CAAC,EACH,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAClD,CAAC;QAEN,MAAM,QAAQ,GACZ,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAE5B,MAAM,aAAa,GAAqC;YACtD,SAAS;YACT,QAAQ;SACT,CAAC;QAEF,MAAM,IAAI,GAAgC,CACxC,MAAc,EACd,MAAe,EACf,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;YACjE,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnE,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,oBAAoB,CAAC;oBACvB,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBACzB,kBAAkB,EAAE,IAAI;oBACxB,IAAI,EAAE,oBAAoB;oBAC1B,MAAM;iBACP,CAAuB,CACzB,CAAC;YACJ,CAAC;YACD,iEAAiE;YACjE,iEAAiE;YACjE,gDAAgD;YAChD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,EAAE;iBACtB,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC;iBAClC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;YAC7D,0DAA0D;YAC1D,0DAA0D;YAC1D,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/D,MAAM,KAAK,GAAkB,aAAa,CACxC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,EAC3B,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAC3B,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QAEL,MAAM,SAAS,GAAwB;YACrC,IAAI;YACJ,cAAc,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;SACxC,CAAC;QAEF,MAAM,WAAW,GAAwC,MAAM,CAAC,GAAG,CACjE,QAAQ,CAAC;YACP,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAI,GAAG,KAAK,IAAI;oBAAE,OAAO,GAAG,CAAC;gBAC7B,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,CACF,CAAC;QAEF,MAAM,KAAK,GAAkD,EAAE,CAAC,KAAK,EAAE,CAAC;QAExE,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,KAAK;YACL,aAAa;YACb,IAAI,EAAE,SAAS;YACf,WAAW;YACX,KAAK;SACqB,CAAC;IAC/B,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"conformance-adapter.js","sourceRoot":"","sources":["../../src/test-utils/conformance-adapter.ts"],"names":[],"mappings":"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"}

package/dist/test-utils/fake-service.d.ts

@@ -15,7 +15,7 @@
  * Canned responses are validated through the descriptor's result schema before
  * they are returned, matching the real transport boundary.
  */
-import type { DecodedNotification, AnyNotificationDefinition, NotificationFrame, Message, ParamsOf, ResultOf, RpcDefinition, TSchema } from "@moltzap/protocol";
+import type { DecodedNotification, AnyNotificationDefinition, NotificationFrame, Message, ParamsOf, ResultOf, RpcDefinition } from "@moltzap/protocol";
 import { Effect } from "effect";
 import { MoltZapService, type ServiceRpcError } from "../service.js";
 import type { RpcCallOptions } from "../ws-client.js";
@@ -35,12 +35,12 @@ export declare class FakeMoltZapService extends MoltZapService {
     /**
      * Register a canned response, typed against the real RPC descriptor.
      */
-    setResponse<D extends RpcDefinition<string, TSchema, TSchema>>(definition: D, result: ResultOf<D>): void;
+    setResponse<D extends RpcDefinition<string, any, any>>(definition: D, result: ResultOf<D>): void;
     /**
      * Remove a previously-registered response.
      */
-    deleteResponse<D extends RpcDefinition<string, TSchema, TSchema>>(definition: D): void;
-    sendRpc<D extends RpcDefinition<string, TSchema, TSchema>>(definition: D, params: ParamsOf<D>, opts?: RpcCallOptions): Effect.Effect<ResultOf<D>, ServiceRpcError>;
+    deleteResponse<D extends RpcDefinition<string, any, any>>(definition: D): void;
+    sendRpc<D extends RpcDefinition<string, any, any>>(definition: D, params: ParamsOf<D>, opts?: RpcCallOptions): Effect.Effect<ResultOf<D>, ServiceRpcError>;
     /**
      * Insert a message into the service's internal buffer without going
      * through the WebSocket path — used to stage state for context-building

package/dist/test-utils/fake-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fake-service.d.ts","sourceRoot":"","sources":["../../src/test-utils/fake-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,OAAO,EACR,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,EAAE,MAAM,EAAwB,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,sCAAsC;AACtC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,KAAK,EAAE,YAAY,EAAE,CAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;gBAGF,IAAI,GAAE;QACJ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACd;IAQR;;OAEG;IACH,WAAW,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAC3D,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAClB,IAAI;IAIP;;OAEG;IACH,cAAc,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAC9D,UAAU,EAAE,CAAC,GACZ,IAAI;IAIE,OAAO,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAChE,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EACnB,IAAI,CAAC,EAAE,cAAc,GACpB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC;IAkC9C;;;;OAIG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI;IAY9C,wEAAwE;IACxE,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAgBzC,gBAAgB,CACd,YAAY,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,GAC3D,IAAI;IAIP,yEAAyE;IACzE,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAQlD;;;;OAIG;IACH,OAAO,KAAK,iBAAiB,GAE5B;IAED,OAAO,KAAK,mBAAmB,GAK9B;CACF"}
+{"version":3,"file":"fake-service.d.ts","sourceRoot":"","sources":["../../src/test-utils/fake-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,EACjB,OAAO,EACP,QAAQ,EACR,QAAQ,EACR,aAAa,EACd,MAAM,mBAAmB,CAAC;AAM3B,OAAO,EAAE,MAAM,EAAwB,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGtD,sCAAsC;AACtC,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB;AAED,qBAAa,kBAAmB,SAAQ,cAAc;IACpD,KAAK,EAAE,YAAY,EAAE,CAAM;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGtB;gBAGF,IAAI,GAAE;QACJ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACd;IAQR;;OAEG;IACH,WAAW,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EACnD,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAClB,IAAI;IAIP;;OAEG;IACH,cAAc,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EACtD,UAAU,EAAE,CAAC,GACZ,IAAI;IAIE,OAAO,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EACxD,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EACnB,IAAI,CAAC,EAAE,cAAc,GACpB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC;IAiC9C;;;;OAIG;IACH,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI;IAY9C,wEAAwE;IACxE,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAuBzC,gBAAgB,CACd,YAAY,EAAE,mBAAmB,CAAC,yBAAyB,CAAC,GAC3D,IAAI;IAIP,yEAAyE;IACzE,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAQlD;;;;OAIG;IACH,OAAO,KAAK,iBAAiB,GAE5B;IAED,OAAO,KAAK,mBAAmB,GAK9B;CACF"}

package/dist/test-utils/fake-service.js

@@ -15,7 +15,7 @@
  * Canned responses are validated through the descriptor's result schema before
  * they are returned, matching the real transport boundary.
  */
-import { decodeRpcResult, decodeNotification, ErrorCodes, notificationGroup, RpcServerError, } from "@moltzap/protocol";
+import { decodeServerInbound, JSON_RPC_RESERVED_CODES, RpcServerError, } from "@moltzap/protocol";
 import { Effect, HashMap, Option, Ref } from "effect";
 import { MoltZapService } from "../service.js";
 import { testAgentId } from "./ids.js";
@@ -46,14 +46,16 @@ export class FakeMoltZapService extends MoltZapService {
             this.calls.push(opts === undefined ? { method, params } : { method, params, opts });
             const responder = this.responses.get(method);
             if (responder !== undefined) {
-                return responder(params).pipe(Effect.flatMap((result) => decodeRpcResult(definition, result).pipe(Effect.mapError(() => new RpcServerError({
-                    code: ErrorCodes.InternalError,
-                    message: `FakeMoltZapService: invalid result for ${method}`,
-                    data: result,
-                })))));
+                return responder(params).pipe(Effect.flatMap((result) => definition.validateResult(result)
+                    ? Effect.succeed(result)
+                    : Effect.fail(new RpcServerError({
+                        code: JSON_RPC_RESERVED_CODES.InternalError,
+                        message: `FakeMoltZapService: invalid result for ${method}`,
+                        data: result,
+                    }))));
             }
             return Effect.fail(new RpcServerError({
-                code: ErrorCodes.MethodNotFound,
+                code: JSON_RPC_RESERVED_CODES.MethodNotFound,
                 message: `FakeMoltZapService: no canned response for ${method}`,
             }));
         });
@@ -72,12 +74,19 @@ export class FakeMoltZapService extends MoltZapService {
     }
     /** Deliver a protocol notification through the real service handler. */
     emitEvent(event) {
-        const notification = Effect.runSync(decodeNotification(notificationGroup, event).pipe(Effect.mapError(() => new RpcServerError({
-            code: ErrorCodes.InvalidParams,
+        const decoded = Effect.runSync(decodeServerInbound(event).pipe(Effect.mapError(() => new RpcServerError({
+            code: JSON_RPC_RESERVED_CODES.InvalidParams,
             message: `FakeMoltZapService: invalid notification ${event.method}`,
             data: event.params,
         }))));
-        this.emitNotification(notification);
+        if (decoded._tag !== "Notification") {
+            throw new RpcServerError({
+                code: JSON_RPC_RESERVED_CODES.InvalidParams,
+                message: `FakeMoltZapService: emitEvent expects a notification frame, got ${decoded._tag}`,
+                data: event,
+            });
+        }
+        this.emitNotification(decoded);
     }
     emitNotification(notification) {
         this.handleNotification(notification);

package/dist/test-utils/fake-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"fake-service.js","sourceRoot":"","sources":["../../src/test-utils/fake-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAYH,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,UAAU,EACV,iBAAiB,EACjB,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,cAAc,EAAwB,MAAM,eAAe,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AASvC,MAAM,OAAO,kBAAmB,SAAQ,cAAc;IACpD,KAAK,GAAmB,EAAE,CAAC;IACV,SAAS,GAAG,IAAI,GAAG,EAGjC,CAAC;IAEJ,YACE,OAGI,EAAE;QAEN,KAAK,CAAC;YACJ,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,mBAAmB;YAChD,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,UAAU;SACtC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,WAAW,CACT,UAAa,EACb,MAAmB;QAEnB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACH,cAAc,CACZ,UAAa;QAEb,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAEQ,OAAO,CACd,UAAa,EACb,MAAmB,EACnB,IAAqB;QAErB,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;YACzB,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,CACnE,CAAC;YACF,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACxB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,IAAI,CACtC,MAAM,CAAC,QAAQ,CACb,GAAG,EAAE,CACH,IAAI,cAAc,CAAC;oBACjB,IAAI,EAAE,UAAU,CAAC,aAAa;oBAC9B,OAAO,EAAE,0CAA0C,MAAM,EAAE;oBAC3D,IAAI,EAAE,MAAM;iBACb,CAAC,CACL,CACF,CACF,CACF,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC,IAAI,CAChB,IAAI,cAAc,CAAC;gBACjB,IAAI,EAAE,UAAU,CAAC,cAAc;gBAC/B,OAAO,EAAE,8CAA8C,MAAM,EAAE;aAChE,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iDAAiD;IAEjD;;;;OAIG;IACH,UAAU,CAAC,MAAc,EAAE,GAAY;QACrC,MAAM,CAAC,OAAO,CACZ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAC/B,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,EACtB,GAAG,EAAE,CAAC,EAA4B,CACnC,CAAC;YACF,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,wEAAwE;IACxE,SAAS,CAAC,KAAwB;QAChC,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CACjC,kBAAkB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,IAAI,CAC/C,MAAM,CAAC,QAAQ,CACb,GAAG,EAAE,CACH,IAAI,cAAc,CAAC;YACjB,IAAI,EAAE,UAAU,CAAC,aAAa;YAC9B,OAAO,EAAE,4CAA4C,KAAK,CAAC,MAAM,EAAE;YACnE,IAAI,EAAE,KAAK,CAAC,MAAM;SACnB,CAAC,CACL,CACF,CACF,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACtC,CAAC;IAED,gBAAgB,CACd,YAA4D;QAE5D,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED,yEAAyE;IACzE,kBAAkB,CAAC,EAAU,EAAE,IAAY;QACzC,MAAM,CAAC,OAAO,CACZ,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,CACzC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CACtC,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,IAAY,iBAAiB;QAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAmC,CAAC;IAC5E,CAAC;IAED,IAAY,mBAAmB;QAC7B,OAAO,OAAO,CAAC,GAAG,CAChB,IAAI,EACJ,eAAe,CACoB,CAAC;IACxC,CAAC;CACF"}
+{"version":3,"file":"fake-service.js","sourceRoot":"","sources":["../../src/test-utils/fake-service.ts"],"names":[],"mappings":"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"}

package/dist/test-utils/ids.d.ts

@@ -1,10 +1,6 @@
-import { type Static } from "@moltzap/protocol";
-import { AgentId as AgentIdSchema, ConversationId as ConversationIdSchema, MessageId as MessageIdSchema } from "@moltzap/protocol/schemas/primitives";
-type AgentId = Static<typeof AgentIdSchema>;
-type ConversationId = Static<typeof ConversationIdSchema>;
-type MessageId = Static<typeof MessageIdSchema>;
+import type { AgentId } from "@moltzap/protocol/identity";
+import type { ConversationId, MessageId } from "@moltzap/protocol/task";
 export declare const testAgentId: (label: string) => AgentId;
 export declare const testConversationId: (label: string) => ConversationId;
 export declare const testMessageId: (label: string) => MessageId;
-export {};
 //# sourceMappingURL=ids.d.ts.map

package/dist/test-utils/ids.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ids.d.ts","sourceRoot":"","sources":["../../src/test-utils/ids.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,OAAO,IAAI,aAAa,EACxB,cAAc,IAAI,oBAAoB,EACtC,SAAS,IAAI,eAAe,EAC7B,MAAM,sCAAsC,CAAC;AAE9C,KAAK,OAAO,GAAG,MAAM,CAAC,OAAO,aAAa,CAAC,CAAC;AAC5C,KAAK,cAAc,GAAG,MAAM,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAC1D,KAAK,SAAS,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAoDhD,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,OACV,CAAC;AAEnC,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,cACH,CAAC;AAEjD,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,SACR,CAAC"}
+{"version":3,"file":"ids.d.ts","sourceRoot":"","sources":["../../src/test-utils/ids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAqDxE,eAAO,MAAM,WAAW,GAAI,OAAO,MAAM,KAAG,OACV,CAAC;AAEnC,eAAO,MAAM,kBAAkB,GAAI,OAAO,MAAM,KAAG,cACH,CAAC;AAEjD,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,SACR,CAAC"}

package/dist/test-utils/ids.js

@@ -1,5 +1,4 @@
-import { agentId, conversationId, messageId, } from "@moltzap/protocol";
-import { AgentId as AgentIdSchema, ConversationId as ConversationIdSchema, MessageId as MessageIdSchema, } from "@moltzap/protocol/schemas/primitives";
+import { agentId, conversationId, messageId } from "@moltzap/protocol/testing";
 const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 const HEX_ALPHABET = "0123456789abcdef";
 const HEX_WORD = "00000000";

package/dist/test-utils/ids.js.map

@@ -1 +1 @@
-{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../src/test-utils/ids.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,cAAc,EACd,SAAS,GAEV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,OAAO,IAAI,aAAa,EACxB,cAAc,IAAI,oBAAoB,EACtC,SAAS,IAAI,eAAe,GAC7B,MAAM,sCAAsC,CAAC;AAM9C,MAAM,OAAO,GACX,4EAA4E,CAAC;AAC/E,MAAM,YAAY,GAAG,kBAAkB,CAAC;AACxC,MAAM,QAAQ,GAAG,UAAU,CAAC;AAC5B,MAAM,UAAU,GAAG,MAAM,CAAC;AAC1B,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAC9C,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACvC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC;AACtC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;AACvC,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;AACvC,MAAM,eAAe,GAAG,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC;AAC3D,MAAM,uBAAuB,GAAG,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC;AAC7D,MAAM,gBAAgB,GAAG,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC;AAC7D,MAAM,uBAAuB,GAAG,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC;AAC9D,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC;AAC9D,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;AAE1D,SAAS,KAAK,CAAC,KAAa;IAC1B,IAAI,EAAE,GAAG,gBAAgB,CAAC;IAC1B,IAAI,EAAE,GAAG,SAAS,CAAC;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9B,EAAE,IAAI,CAAC,CAAC;QACR,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC9B,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,gBAAgB,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,KAAK,GAAG;QACZ,EAAE;QACF,EAAE;QACF,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,SAAS,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,gBAAgB,CAAC;KACrC,CAAC;IACF,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;SACvE,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC;AAED,SAAS,OAAO,CAAC,SAAiB,EAAE,KAAa;IAC/C,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACtC,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC,CAAC;IACzC,OAAO;QACL,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;QAC1B,CAAC,CAAC,KAAK,CAAC,cAAc,EAAE,eAAe,CAAC;QACxC,IAAI,CAAC,CAAC,KAAK,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,EAAE;QACxD,IAAI,CAAC,CAAC,KAAK,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,EAAE;QACxD,CAAC,CAAC,KAAK,CAAC,gBAAgB,EAAE,aAAa,CAAC;KACzC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAa,EAAW,EAAE,CACpD,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAa,EAAkB,EAAE,CAClE,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC;AAEjD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAa,EAAa,EAAE,CACxD,SAAS,CAAC,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../src/test-utils/ids.ts"],"names":[],"mappings":"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"}

package/dist/ws-client.d.ts

@@ -1,7 +1,7 @@
 import { Effect } from "effect";
-import { Connect, NotConnectedError, RpcServerError, RpcTimeoutError, type AnyAppCallbackRpcDefinition, type AnyNotificationDefinition, type JsonRpcStringId, type ParamsOf, type ResultOf, type RpcDefinition, type TSchema, type Static } from "@moltzap/protocol";
+import { Connect, NotConnectedError, RpcServerError, RpcTimeoutError, type AnyTaskCallbackRpcDefinition, type AnyNotificationDefinition, type JsonRpcId, type ParamsOf, type ResultOf, type RpcDefinition } from "@moltzap/protocol";
 import { DuplicateServerRpcHandlerError } from "./runtime/errors.js";
-import { type DecodedNotification, type RawDecodedNotification } from "./runtime/frame.js";
+import { type DecodedNotification } from "./runtime/frame.js";
 import { type NotificationSubscription, type SubscriberHandler, type SubscriptionFilter } from "./runtime/subscribers.js";
 import { type CloseInfo } from "./runtime/close-info.js";
 import { type PartitionedDispatcherConfig } from "./internal/app-callback-partitioned-dispatcher.js";
@@ -14,7 +14,7 @@ export declare const RPC_TIMEOUT_MS = 30000;
 export interface RpcCallOptions {
     readonly timeoutMs?: number;
 }
-type ConnectResult = Static<typeof Connect.resultSchema>;
+type ConnectResult = ResultOf<typeof Connect>;
 /**
  * appCallback dispatcher knobs exposed on `MoltZapWsClientOptions`. All optional;
  * defaults from `DEFAULT_PARTITIONED_DISPATCHER_CONFIG`.
@@ -33,58 +33,20 @@ export type AppCallbackDispatcherConfig = Partial<PartitionedDispatcherConfig>;
  * `error`. Defects (handler crashes, non-tagged exceptions) collapse to a
  * generic InternalError reply.
  *
- * The `unknown`/`unknown` parameter and result types are transitional —
- * once Phase 1.1 (B.2) registers admission verbs in `appCallbackRpcMethods`, this
- * narrows generically against `AppCallbackRpcMap[M]`.
+ * The `unknown`/`unknown` parameter and result types narrow generically
+ * against `taskCallbackMethods` at each `handleServerRpc(definition,
+ * handler)` call site via the `AnyTaskCallbackRpcDefinition` union. Phase
+ * 9b consumer-migration retired the legacy `AppCallbackRpcMap` indirection
+ * alongside the appCallback group collapse to a single member.
  */
 export interface ServerRpcContext {
-    readonly requestId: JsonRpcStringId;
-    readonly definition: AnyAppCallbackRpcDefinition;
+    readonly requestId: JsonRpcId;
+    readonly definition: AnyTaskCallbackRpcDefinition;
     readonly traceparent?: string;
 }
-export type ServerRpcHandler<D extends AnyAppCallbackRpcDefinition = AnyAppCallbackRpcDefinition> = (params: Static<D["paramsSchema"]>, ctx: ServerRpcContext & {
+export type ServerRpcHandler<D extends AnyTaskCallbackRpcDefinition = AnyTaskCallbackRpcDefinition> = (params: ParamsOf<D>, ctx: ServerRpcContext & {
     readonly definition: D;
-}) => Effect.Effect<Static<D["resultSchema"]>, RpcServerError>;
-/**
- * Pre-validation alias used internally by buffer/waiter machinery —
- * the decoder is payload-opaque so frames carry `params: unknown`
- * until a typed bridge runs `validateNotificationParams`.
- */
-type AnyRawDecodedNotification = RawDecodedNotification<AnyNotificationDefinition>;
-/**
- * Validate `notification.params` against the schema attached by the
- * decoder. Type predicate: a `true` result lifts the input from the
- * raw (`params: unknown`) shape to the validated
- * `DecodedNotification<…>` shape — the compiler-enforced lift the
- * inbound bridges rely on. Logs a structured drift warning and
- * returns `false` on failure. Every typed dispatcher MUST route
- * through this guard before invoking handlers, because the wire
- * decoder is payload-opaque (required for the
- * `delivery/payload-opacity-client` and
- * `boundary/schema-exhaustive-fuzz-client` conformance properties).
- *
- * The signature is non-generic over a single descriptor: the input
- * accepts the broad `AnyRawDecodedNotification` union (distributed
- * over all known descriptors), and the predicate narrows to the
- * matching distributed validated union. Per-descriptor narrowing is
- * the job of the caller's enclosing `is`-predicate
- * (e.g. `acceptTypedNotification<D>`); this helper just gates "params
- * conform to the attached schema." Current call sites:
- * `acceptTypedNotification` below (typed-promise resolver) and
- * `service.ts:handleNotification` (subscriber-fanout dispatch into
- * the typed handler bucket).
- */
-export declare function validateNotificationParams(notification: AnyRawDecodedNotification, logger: WsClientLogger | undefined): notification is DecodedNotification<AnyNotificationDefinition>;
-/**
- * Typed bridge for `waitForNotification`: matches the notification's
- * descriptor against `definition` and then validates its params via
- * `validateNotificationParams`. A frame whose method matches `definition`
- * but whose params fail validation is logged and skipped — the typed
- * promise never resolves with a malformed payload typed as if it were
- * valid. "Skip on non-match" semantics for the bucketed waiter map are
- * preserved; the validation guard is the lift from raw to validated.
- */
-export declare function acceptTypedNotification<D extends AnyNotificationDefinition>(definition: D, notification: AnyRawDecodedNotification, logger: WsClientLogger | undefined): notification is DecodedNotification<D>;
+}) => Effect.Effect<ResultOf<D>, RpcServerError>;
 export interface WsClientLogger {
     info: (...args: unknown[]) => void;
     warn: (...args: unknown[]) => void;
@@ -116,16 +78,7 @@ export interface MoltZapWsClientOptions {
     appCallbackDispatcher?: AppCallbackDispatcherConfig;
 }
 /**
- * Return shape of `MoltZapWsClient.sendRpcTracked`. Surfaces the outbound
- * request `id` alongside the typed result without leaking the JSON-RPC wire
- * object onto the caller surface.
- */
-export interface TrackedRpcResponse<R> {
-    readonly id: JsonRpcStringId;
-    readonly result: R;
-}
-/**
- * WebSocket lifecycle: open → auth/connect → active. On disconnect,
+ * WebSocket lifecycle: open → network/connect → active. On disconnect,
  * exponential backoff (1s base, 30s cap, jittered) retries the handshake via
  * `Effect.sleep` + `Schedule` so TestClock can drive it. Public API is
  * Effect-based — consumers run the returned Effects themselves (typically at
@@ -180,9 +133,9 @@ export declare class MoltZapWsClient {
      * visible to the very first inbound appCallback request, and a registration
      * made AFTER `connect()` takes effect on the next inbound frame.
      */
-    handleServerRpc<D extends AnyAppCallbackRpcDefinition>(definition: D, handler: ServerRpcHandler<D>): Effect.Effect<void, DuplicateServerRpcHandlerError>;
+    handleServerRpc<D extends AnyTaskCallbackRpcDefinition>(definition: D, handler: ServerRpcHandler<D>): Effect.Effect<void, DuplicateServerRpcHandlerError>;
     get helloOk(): ConnectResult | null;
-    /** Open the socket, perform auth/connect, resolve with HelloOk. Fails
+    /** Open the socket, perform network/connect, resolve with HelloOk. Fails
      * immediately on pre-open close or error. */
     connect(): Effect.Effect<ConnectResult, NotConnectedError | RpcTimeoutError | RpcServerError>;
     /**
@@ -194,19 +147,7 @@ export declare class MoltZapWsClient {
      * Descriptor-backed RPC call. Callers pass the protocol descriptor, and the
      * client extracts the wire method only inside the encoder path.
      */
-    sendRpc<D extends RpcDefinition<string, TSchema, TSchema>>(definition: D, params: ParamsOf<D>, opts?: RpcCallOptions): Effect.Effect<ResultOf<D>, NotConnectedError | RpcTimeoutError | RpcServerError>;
-    /**
-     * Send an RPC and surface the outbound request id alongside the
-     * response envelope `type` and `result`. Spec #222 §5.1–5.2:
-     * un-vacuates B4 (request-id tracking) and V5 (response-type
-     * exposure). Mirrors `sendRpc`'s descriptor-backed call shape.
-     *
-     * Invariant 3 (spec #222 §4): the returned `id` is the same identity
-     * minted inside the existing `rpc-${++counter}` site — no parallel
-     * counter, no mirror. The single-id pre-condition is what makes B4 a
-     * real check rather than a tautology.
-     */
-    sendRpcTracked<D extends RpcDefinition<string, TSchema, TSchema>>(definition: D, params: ParamsOf<D>): Effect.Effect<TrackedRpcResponse<ResultOf<D>>, NotConnectedError | RpcTimeoutError | RpcServerError>;
+    sendRpc<D extends RpcDefinition<string, any, any>>(definition: D, params: ParamsOf<D>, opts?: RpcCallOptions): Effect.Effect<ResultOf<D>, NotConnectedError | RpcTimeoutError | RpcServerError>;
     /**
      * Register a per-subscription notification handler. Spec #222 §5.3 + OQ-2
      * (A): filter grammar is the three-field `SubscriptionFilter`
@@ -234,28 +175,11 @@ export declare class MoltZapWsClient {
     /** Return all buffered notifications and clear the buffer. Synchronous.
      * Frames are pre-validation (`params: unknown`) — buffer holds the
      * raw shape produced by the wire decoder. */
-    drainNotifications(): AnyRawDecodedNotification[];
+    drainNotifications(): DecodedNotification<AnyNotificationDefinition>[];
     /** Close the socket without marking as permanently closed, triggering reconnection. */
     disconnect(): Effect.Effect<void, never>;
     private disconnectSync;
     private connectEffect;
-    /**
-     * Tracked variant of `sendRpcEffect`. Reuses the same Deferred /
-     * pendingRef plumbing — the only difference is the resolved value:
-     * `{id, result}` instead of bare `result`. This
-     * keeps Invariant 3 (single id source) trivially: we mint `id` once
-     * inside this body, register the Deferred under that id, and return
-     * the same id to the caller alongside the result.
-     */
-    private sendRpcTrackedEffect;
-    /**
-     * Bare-result RPC — projects the tracked RPC envelope onto its
-     * `result` field, discarding the `{id, type}` observability surface.
-     * The write / race / timeout plumbing lives in `sendRpcTrackedEffect`
-     * so there is one shared site for Invariant 3 (single id source),
-     * Invariant 5 (typed error channel), and the `socket.writer` latch
-     * race described below.
-     */
     private sendRpcEffect;
     /**
      * Translate a typed `OfferRejected` failure from the partitioned

package/dist/ws-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-client.d.ts","sourceRoot":"","sources":["../src/ws-client.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,MAAM,EASP,MAAM,QAAQ,CAAC;AAChB,OAAO,EAEL,OAAO,EAGP,iBAAiB,EAGjB,cAAc,EACd,eAAe,EACf,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EACpB,KAAK,QAAQ,EAGb,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,sBAAsB,EAC5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAEL,KAAK,wBAAwB,EAC7B,KAAK,iBAAiB,EAEtB,KAAK,kBAAkB,EACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAoB,KAAK,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAGL,KAAK,2BAA2B,EACjC,MAAM,mDAAmD,CAAC;AAW3D,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAS,CAAC;AAErC,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAiCD,KAAK,aAAa,GAAG,MAAM,CAAC,OAAO,OAAO,CAAC,YAAY,CAAC,CAAC;AA4DzD;;;;;;;;;GASG;AACH,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;AAE/E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,2BAA2B,CAAC;IACjD,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,MAAM,gBAAgB,CAC1B,CAAC,SAAS,2BAA2B,GAAG,2BAA2B,IACjE,CACF,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,EACjC,GAAG,EAAE,gBAAgB,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;CAAE,KAC/C,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;AAe9D;;;;GAIG;AACH,KAAK,yBAAyB,GAC5B,sBAAsB,CAAC,yBAAyB,CAAC,CAAC;AASpD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,yBAAyB,EACvC,MAAM,EAAE,cAAc,GAAG,SAAS,GACjC,YAAY,IAAI,mBAAmB,CAAC,yBAAyB,CAAC,CAOhE;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,SAAS,yBAAyB,EACzE,UAAU,EAAE,CAAC,EACb,YAAY,EAAE,yBAAyB,EACvC,MAAM,EAAE,cAAc,GAAG,SAAS,GACjC,YAAY,IAAI,mBAAmB,CAAC,CAAC,CAAC,CAGxC;AAsBD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACnC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACnC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;;;;;;;;OAYG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IAC/C,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB;;;OAGG;IACH,qBAAqB,CAAC,EAAE,2BAA2B,CAAC;CACrD;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB,CAAC,CAAC;IACnC,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;CACpB;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,eAAe;IA8Cd,OAAO,CAAC,QAAQ,CAAC,OAAO;IA7CpC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEzB;IACF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoC;IAC7D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAErC;IACF;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAKrC;IACF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAGtB;IACF;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IAEjD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAErC;IAEF,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAAgD;IACtE,OAAO,CAAC,QAAQ,CAA8B;gBAEjB,OAAO,EAAE,sBAAsB;IAwC5D;;;;;;;;;;;;OAYG;IACH,eAAe,CAAC,CAAC,SAAS,2BAA2B,EACnD,UAAU,EAAE,CAAC,EACb,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAC3B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,8BAA8B,CAAC;IAiBtD,IAAI,OAAO,IAAI,aAAa,GAAG,IAAI,CAElC;IAED;iDAC6C;IAC7C,OAAO,IAAI,MAAM,CAAC,MAAM,CACtB,aAAa,EACb,iBAAiB,GAAG,eAAe,GAAG,cAAc,CACrD;IAcD;;;;;;;;OAQG;IACH,OAAO,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EACvD,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,EACnB,IAAI,CAAC,EAAE,cAAc,GACpB,MAAM,CAAC,MAAM,CACd,QAAQ,CAAC,CAAC,CAAC,EACX,iBAAiB,GAAG,eAAe,GAAG,cAAc,CACrD;IAgBD;;;;;;;;;;OAUG;IACH,cAAc,CAAC,CAAC,SAAS,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,EAC9D,UAAU,EAAE,CAAC,EACb,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,GAClB,MAAM,CAAC,MAAM,CACd,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC/B,iBAAiB,GAAG,eAAe,GAAG,cAAc,CACrD;IAgBD;;;;;;;;;;;OAWG;IACH,SAAS,CACP,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,MAAM,CAAC,MAAM,CAAC,wBAAwB,EAAE,iBAAiB,CAAC;IAS7D;;;;;OAKG;IACH,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC;IA8CnC;;kCAE8B;IAC9B,mBAAmB,CAAC,CAAC,SAAS,yBAAyB,EACrD,UAAU,EAAE,CAAC,EACb,SAAS,SAAwB,GAChC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;IAoD/C;;iDAE6C;IAC7C,kBAAkB,IAAI,yBAAyB,EAAE;IAMjD,uFAAuF;IACvF,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC;IAIxC,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,aAAa;IA8KrB;;;;;;;OAOG;IACH,OAAO,CAAC,oBAAoB;IAkF5B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IAarB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;IAkB3B,OAAO,CAAC,qBAAqB;IAwB7B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,4BAA4B;IA4DpC;oEACgE;IAChE,OAAO,CAAC,cAAc;IA+HtB,mFAAmF;IACnF,OAAO,CAAC,0BAA0B;IAiBlC,OAAO,CAAC,cAAc;IAiBtB;6EACyE;IACzE,OAAO,CAAC,iBAAiB;CA4C1B"}
+{"version":3,"file":"ws-client.d.ts","sourceRoot":"","sources":["../src/ws-client.ts"],"names":[],"mappings":"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"}