@moltzap/client 2026.503.4 → 2026.504.1

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

@@ -4,34 +4,23 @@
  *
  * Strategy: extend the real `MoltZapService`, keeping all stateful logic
  * intact, and override only `sendRpc` so every RPC is answered from a
- * canned-response map. The typed `setResponse` helper indexes by
- * `RpcMethodName` so a typo in the wire name is a compile error — unknown
- * methods fail *at compile time*, not at runtime.
+ * canned-response map. `setResponse` indexes by protocol descriptor so a
+ * typo in the wire name cannot compile.
  *
  * Motivation: the `sendToAgent` contract drift bug (A7) happened because a
  * hand-maintained mock drifted from the real wire shape. Typed method names
  * surface renames and additions to the RPC surface as compile errors across
  * every test that uses the fake.
  *
- * Two APIs:
- *   (1) `setResponse(method, result)` — strict. `method` must be a
- *       `RpcMethodName`; `result` must match `RpcMap[M]["result"]`.
- *   (2) `responses` — the underlying `Map<string, unknown>`. Permissive,
- *       preserved so existing callers that set unstyped shapes
- *       (e.g. `{}` for a method whose real result has required fields)
- *       keep working. Prefer `setResponse` in new code.
+ * 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 { Effect, HashMap, Option, Ref } from "effect";
 import { MoltZapService } from "../service.js";
-import { RpcServerError } from "../runtime/errors.js";
+import { testAgentId } from "./ids.js";
 export class FakeMoltZapService extends MoltZapService {
     calls = [];
-    /**
-     * Permissive response map. Prefer {@link setResponse} for typed
-     * registration. Keep this as `Map<string, unknown>` so tests that pass
-     * partial or loosely-shaped canned values — and tests that assert on
-     * unknown-method rejection — keep working.
-     */
     responses = new Map();
     constructor(opts = {}) {
         super({
@@ -40,34 +29,31 @@ export class FakeMoltZapService extends MoltZapService {
         });
     }
     /**
-     * Register a canned response, typed against the real RPC map. Unknown
-     * method names are a compile error (`RpcMethodName` is a union literal),
-     * and values must match `RpcMap[M]["result"]` — a schema change in the
-     * protocol flows through to every test that sets a response for that
-     * method.
+     * Register a canned response, typed against the real RPC descriptor.
      */
-    setResponse(method, result) {
-        this.responses.set(method, result);
+    setResponse(definition, result) {
+        this.responses.set(definition.name, () => Effect.succeed(result));
     }
     /**
-     * Remove a previously-registered response. Typed against `RpcMethodName`
-     * so `deleteResponse("agents/lookpByName")` (typo) is a compile error.
+     * Remove a previously-registered response.
      */
-    deleteResponse(method) {
-        this.responses.delete(method);
+    deleteResponse(definition) {
+        this.responses.delete(definition.name);
     }
-    sendRpc(method, params, opts) {
+    sendRpc(definition, params, opts) {
         return Effect.suspend(() => {
+            const method = definition.name;
             this.calls.push(opts === undefined ? { method, params } : { method, params, opts });
-            if (this.responses.has(method)) {
-                const entry = this.responses.get(method);
-                if (typeof entry === "function") {
-                    return Effect.sync(() => entry(params));
-                }
-                return Effect.succeed(entry);
+            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 Effect.fail(new RpcServerError({
-                code: -32601,
+                code: ErrorCodes.MethodNotFound,
                 message: `FakeMoltZapService: no canned response for ${method}`,
             }));
         });
@@ -84,13 +70,21 @@ export class FakeMoltZapService extends MoltZapService {
             return HashMap.set(m, convId, [...existing, msg]);
         }));
     }
-    /** Deliver a protocol event through the real service event handler. */
+    /** Deliver a protocol notification through the real service handler. */
     emitEvent(event) {
-        Reflect.get(this, "handleEvent").call(this, event);
+        const notification = Effect.runSync(decodeNotification(notificationGroup, event).pipe(Effect.mapError(() => new RpcServerError({
+            code: ErrorCodes.InvalidParams,
+            message: `FakeMoltZapService: invalid notification ${event.method}`,
+            data: event.params,
+        }))));
+        this.emitNotification(notification);
+    }
+    emitNotification(notification) {
+        this.handleNotification(notification);
     }
     /** Pin an agent name in the internal cache without an RPC round-trip. */
     setAgentNameDirect(id, name) {
-        Effect.runSync(Ref.update(this.parentAgentNamesRef, (m) => HashMap.set(m, id, name)));
+        Effect.runSync(Ref.update(this.parentAgentNamesRef, (m) => HashMap.set(m, testAgentId(id), name)));
     }
     /**
      * Typed views of the parent class's private Refs, exposed only to this

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":"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"}
+{"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

@@ -0,0 +1,9 @@
+import { AgentId as AgentIdSchema, ConversationId as ConversationIdSchema, MessageId as MessageIdSchema, type Static } from "@moltzap/protocol";
+type AgentId = Static<typeof AgentIdSchema>;
+type ConversationId = Static<typeof ConversationIdSchema>;
+type MessageId = Static<typeof MessageIdSchema>;
+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

@@ -0,0 +1 @@
+{"version":3,"file":"ids.d.ts","sourceRoot":"","sources":["../../src/test-utils/ids.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,aAAa,EACxB,cAAc,IAAI,oBAAoB,EACtC,SAAS,IAAI,eAAe,EAI5B,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,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"}

package/dist/test-utils/ids.js

@@ -0,0 +1,52 @@
+import { AgentId as AgentIdSchema, ConversationId as ConversationIdSchema, MessageId as MessageIdSchema, agentId, conversationId, messageId, } from "@moltzap/protocol";
+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";
+const UUID_GROUP = "0000";
+const FNV_OFFSET_BASIS = Number("0x811c9dc5");
+const FNV_PRIME = Number("0x01000193");
+const HEX_RADIX = HEX_ALPHABET.length;
+const HEX_WORD_WIDTH = HEX_WORD.length;
+const UUID_FIRST_END = HEX_WORD.length;
+const UUID_SECOND_END = UUID_FIRST_END + UUID_GROUP.length;
+const UUID_VERSION_TAIL_START = UUID_SECOND_END + "0".length;
+const UUID_VERSION_END = UUID_SECOND_END + UUID_GROUP.length;
+const UUID_VARIANT_TAIL_START = UUID_VERSION_END + "0".length;
+const UUID_VARIANT_END = UUID_VERSION_END + UUID_GROUP.length;
+const UUID_TAIL_END = HEX_WORD.length * UUID_GROUP.length;
+function hex32(input) {
+    let h1 = FNV_OFFSET_BASIS;
+    let h2 = FNV_PRIME;
+    for (let i = 0; i < input.length; i++) {
+        const c = input.charCodeAt(i);
+        h1 ^= c;
+        h1 = Math.imul(h1, FNV_PRIME);
+        h2 ^= c + i;
+        h2 = Math.imul(h2, FNV_OFFSET_BASIS);
+    }
+    const parts = [
+        h1,
+        h2,
+        Math.imul(h1 ^ h2, FNV_PRIME),
+        Math.imul(h1 + h2, FNV_OFFSET_BASIS),
+    ];
+    return parts
+        .map((p) => (p >>> 0).toString(HEX_RADIX).padStart(HEX_WORD_WIDTH, "0"))
+        .join("");
+}
+function uuidFor(namespace, label) {
+    if (UUID_RE.test(label))
+        return label;
+    const h = hex32(`${namespace}:${label}`);
+    return [
+        h.slice(0, UUID_FIRST_END),
+        h.slice(UUID_FIRST_END, UUID_SECOND_END),
+        `4${h.slice(UUID_VERSION_TAIL_START, UUID_VERSION_END)}`,
+        `8${h.slice(UUID_VARIANT_TAIL_START, UUID_VARIANT_END)}`,
+        h.slice(UUID_VARIANT_END, UUID_TAIL_END),
+    ].join("-");
+}
+export const testAgentId = (label) => agentId(uuidFor("agent", label));
+export const testConversationId = (label) => conversationId(uuidFor("conversation", label));
+export const testMessageId = (label) => messageId(uuidFor("message", label));
+//# sourceMappingURL=ids.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ids.js","sourceRoot":"","sources":["../../src/test-utils/ids.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,aAAa,EACxB,cAAc,IAAI,oBAAoB,EACtC,SAAS,IAAI,eAAe,EAC5B,OAAO,EACP,cAAc,EACd,SAAS,GAEV,MAAM,mBAAmB,CAAC;AAM3B,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"}

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

@@ -1,7 +1,15 @@
 export { createFakeChannelService, type ChannelServiceEmit, type ChannelServiceState, type CreateFakeChannelServiceOptions, type FakeChannelService, } from "./channel-service-fixture.js";
-export { FakeMoltZapService, type CannedResponses, type RecordedCall, } from "./fake-service.js";
+export { FakeMoltZapService, type RecordedCall } from "./fake-service.js";
 export { createMoltZapRealClientFactory, type RealClientFactoryOptions, } from "./conformance-adapter.js";
 import type { Message } from "@moltzap/protocol";
-export declare function buildMessage(overrides?: Partial<Message>): Message;
+export { testAgentId, testConversationId, testMessageId } from "./ids.js";
+type MessageFixtureOverrides = Omit<Partial<Message>, "id" | "conversationId" | "senderId" | "replyToId" | "taggedEntities"> & {
+    readonly id?: string;
+    readonly conversationId?: string;
+    readonly senderId?: string;
+    readonly replyToId?: string;
+    readonly taggedEntities?: ReadonlyArray<string>;
+};
+export declare function buildMessage(overrides?: MessageFixtureOverrides): Message;
 export declare function flushDispatchChain(): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,+BAA+B,EACpC,KAAK,kBAAkB,GACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,YAAY,GAClB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,8BAA8B,EAC9B,KAAK,wBAAwB,GAC9B,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAWjD,wBAAgB,YAAY,CAAC,SAAS,GAAE,OAAO,CAAC,OAAO,CAAM,GAAG,OAAO,CAStE;AAED,wBAAgB,kBAAkB,kBAWjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EACxB,KAAK,+BAA+B,EACpC,KAAK,kBAAkB,GACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,kBAAkB,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EACL,8BAA8B,EAC9B,KAAK,wBAAwB,GAC9B,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAU1E,KAAK,uBAAuB,GAAG,IAAI,CACjC,OAAO,CAAC,OAAO,CAAC,EAChB,IAAI,GAAG,gBAAgB,GAAG,UAAU,GAAG,WAAW,GAAG,gBAAgB,CACtE,GAAG;IACF,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACjD,CAAC;AAEF,wBAAgB,YAAY,CAAC,SAAS,GAAE,uBAA4B,GAAG,OAAO,CAe7E;AAED,wBAAgB,kBAAkB,kBAWjC"}

package/dist/test-utils/index.js

@@ -1,18 +1,25 @@
 export { createFakeChannelService, } from "./channel-service-fixture.js";
-export { FakeMoltZapService, } from "./fake-service.js";
+export { FakeMoltZapService } from "./fake-service.js";
 export { createMoltZapRealClientFactory, } from "./conformance-adapter.js";
 import { Data, Effect } from "effect";
+import { testAgentId, testConversationId, testMessageId } from "./ids.js";
+export { testAgentId, testConversationId, testMessageId } from "./ids.js";
 const FLUSH_DISPATCH_TURNS = 20;
 class FlushDispatchChainError extends Data.TaggedError("FlushDispatchChainError") {
 }
 export function buildMessage(overrides = {}) {
+    const { id, conversationId, senderId, replyToId, taggedEntities, ...rest } = overrides;
     return {
-        id: "msg-1",
-        conversationId: "conv-1",
-        senderId: "agent-alice",
+        id: testMessageId(id ?? "msg-1"),
+        conversationId: testConversationId(conversationId ?? "conv-1"),
+        senderId: testAgentId(senderId ?? "agent-alice"),
         parts: [{ type: "text", text: "hello" }],
         createdAt: "2026-04-10T12:00:00.000Z",
-        ...overrides,
+        ...(replyToId !== undefined ? { replyToId: testMessageId(replyToId) } : {}),
+        ...(taggedEntities !== undefined
+            ? { taggedEntities: taggedEntities.map(testAgentId) }
+            : {}),
+        ...rest,
     };
 }
 export function flushDispatchChain() {

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,GAKzB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EACL,kBAAkB,GAGnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,8BAA8B,GAE/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEhC,MAAM,uBAAwB,SAAQ,IAAI,CAAC,WAAW,CACpD,yBAAyB,CAGzB;CAAG;AAEL,MAAM,UAAU,YAAY,CAAC,YAA8B,EAAE;IAC3D,OAAO;QACL,EAAE,EAAE,OAAO;QACX,cAAc,EAAE,QAAQ;QACxB,QAAQ,EAAE,aAAa;QACvB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACxC,SAAS,EAAE,0BAA0B;QACrC,GAAG,SAAS;KACF,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,MAAM,CAAC,UAAU,CACtB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;gBACvB,GAAG,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;gBAC5B,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,CAAC;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/test-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,GAKzB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,kBAAkB,EAAqB,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EACL,8BAA8B,GAE/B,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE1E,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEhC,MAAM,uBAAwB,SAAQ,IAAI,CAAC,WAAW,CACpD,yBAAyB,CAGzB;CAAG;AAaL,MAAM,UAAU,YAAY,CAAC,YAAqC,EAAE;IAClE,MAAM,EAAE,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GACxE,SAAS,CAAC;IACZ,OAAO;QACL,EAAE,EAAE,aAAa,CAAC,EAAE,IAAI,OAAO,CAAC;QAChC,cAAc,EAAE,kBAAkB,CAAC,cAAc,IAAI,QAAQ,CAAC;QAC9D,QAAQ,EAAE,WAAW,CAAC,QAAQ,IAAI,aAAa,CAAC;QAChD,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QACxC,SAAS,EAAE,0BAA0B;QACrC,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,GAAG,CAAC,cAAc,KAAK,SAAS;YAC9B,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACrD,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,IAAI;KACR,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,MAAM,CAAC,UAAU,CACtB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9C,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;gBACvB,GAAG,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;gBAC5B,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,uBAAuB,CAAC,EAAE,KAAK,EAAE,CAAC;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}

package/dist/ws-client.d.ts

@@ -1,9 +1,10 @@
 import { Effect } from "effect";
-import { type EventFrame, type RpcDefinition, type TSchema, type Static } from "@moltzap/protocol";
-import { DuplicateServerRpcHandlerError, NotConnectedError, RpcServerError, RpcTimeoutError } from "./runtime/errors.js";
-import { type EventSubscription, type SubscriberHandler, type SubscriptionFilter } from "./runtime/subscribers.js";
+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 { DuplicateServerRpcHandlerError } from "./runtime/errors.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/s2c-partitioned-dispatcher.js";
+import { type PartitionedDispatcherConfig } from "./internal/app-callback-partitioned-dispatcher.js";
 export type { CloseInfo };
 /**
  * Default per-RPC timeout. Exported so tests driving `TestClock` can match
@@ -13,8 +14,9 @@ export declare const RPC_TIMEOUT_MS = 30000;
 export interface RpcCallOptions {
     readonly timeoutMs?: number;
 }
+type ConnectResult = Static<typeof Connect.resultSchema>;
 /**
- * s2c dispatcher knobs exposed on `MoltZapWsClientOptions`. All optional;
+ * appCallback dispatcher knobs exposed on `MoltZapWsClientOptions`. All optional;
  * defaults from `DEFAULT_PARTITIONED_DISPATCHER_CONFIG`.
  *
  * Spec #356 OQ-3 (`idlePartitionTtlMs`) ships at the architect's
@@ -23,7 +25,7 @@ export interface RpcCallOptions {
  * at peak), so the cap doubles as a per-tenant DoS guard, not a
  * cardinality lever.
  */
-export type S2cDispatcherConfig = Partial<PartitionedDispatcherConfig>;
+export type AppCallbackDispatcherConfig = Partial<PartitionedDispatcherConfig>;
 /**
  * Handler signature for `handleServerRpc`. The handler returns an
  * `Effect<unknown, RpcServerError>` — success values are encoded as the
@@ -32,15 +34,21 @@ export type S2cDispatcherConfig = Partial<PartitionedDispatcherConfig>;
  * generic InternalError reply.
  *
  * The `unknown`/`unknown` parameter and result types are transitional —
- * once Phase 1.1 (B.2) registers admission verbs in `s2cRpcMethods`, this
- * narrows generically against `S2cRpcMap[M]`.
+ * once Phase 1.1 (B.2) registers admission verbs in `appCallbackRpcMethods`, this
+ * narrows generically against `AppCallbackRpcMap[M]`.
  */
 export interface ServerRpcContext {
-    readonly requestId: string;
-    readonly method: string;
+    readonly requestId: JsonRpcStringId;
+    readonly definition: AnyAppCallbackRpcDefinition;
     readonly traceparent?: string;
 }
-export type ServerRpcHandler = (params: unknown, ctx: ServerRpcContext) => Effect.Effect<unknown, RpcServerError>;
+export type ServerRpcHandler<D extends AnyAppCallbackRpcDefinition = AnyAppCallbackRpcDefinition> = (params: Static<D["paramsSchema"]>, ctx: ServerRpcContext & {
+    readonly definition: D;
+}) => Effect.Effect<Static<D["resultSchema"]>, RpcServerError>;
+type AnyDecodedNotification = DecodedNotification<AnyNotificationDefinition>;
+type DecodedNotificationFor<D extends AnyNotificationDefinition> = Extract<AnyDecodedNotification, {
+    readonly definition: D;
+}>;
 export interface WsClientLogger {
     info: (...args: unknown[]) => void;
     warn: (...args: unknown[]) => void;
@@ -56,38 +64,28 @@ export interface MoltZapWsClientOptions {
      * arg (OQ-6 rewrite): zero-arg `() => void` callers must migrate to
      * accept (and may ignore) the arg.
      *
-     * Migration note (spec #222 OQ-4 rewrite): the previous `onEvent`
+     * Migration note (spec #222 OQ-4 rewrite): the previous `onNotification`
      * callback was deleted in this rewrite. Callers that want to observe
-     * every inbound event register `client.subscribe({}, handler)` after
-     * construction; events flow through the per-subscription registry,
+     * every inbound notification register `client.subscribe({}, handler)` after
+     * construction; notifications flow through the per-subscription registry,
      * not through a top-level option.
      */
     onDisconnect?: (close: CloseInfo) => void;
-    onReconnect?: (helloOk: unknown) => void;
+    onReconnect?: (helloOk: ConnectResult) => void;
     logger?: WsClientLogger;
     /**
-     * Spec #356 — partitioned s2c dispatcher knobs. Optional; omitted
+     * Spec #356 — partitioned appCallback dispatcher knobs. Optional; omitted
      * fields fall back to `DEFAULT_PARTITIONED_DISPATCHER_CONFIG`.
      */
-    s2cDispatcher?: S2cDispatcherConfig;
+    appCallbackDispatcher?: AppCallbackDispatcherConfig;
 }
 /**
- * Return shape of `MoltZapWsClient.sendRpcTracked`. Spec #222 OQ-1
- * resolution (B): surface the outbound request `id` (un-vacuates B4 at
- * `packages/protocol/src/testing/conformance/client/rpc-semantics.ts:205-216`)
- * and the response envelope `type` (un-vacuates V5 at
- * `rpc-semantics.ts:103-110`), without leaking `jsonrpc` onto the
- * caller surface.
- *
- * `type` is the literal `"response"` — the only response-frame kind
- * `packages/protocol/src/schema/frames.ts:18` defines — but it is
- * surfaced as an observable value (not a synthesized adapter constant)
- * so the V5 predicate can flip under a mutation that forges a
- * non-response shape.
+ * 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: string;
-    readonly type: "response";
+    readonly id: JsonRpcStringId;
     readonly result: R;
 }
 /**
@@ -107,17 +105,15 @@ export declare class MoltZapWsClient {
     private readonly pendingRef;
     private readonly stateRef;
     private readonly malformedRef;
-    private readonly eventsBufferRef;
+    private readonly notificationsBufferRef;
     /**
-     * Waiters keyed by event name. Each bucket is a FIFO stack: delivery
-     * pops the most recently registered waiter (the tail). Keying by event
-     * name keeps dispatch O(1) per inbound frame regardless of total
-     * outstanding waiters.
+     * Waiters keyed by notification descriptor identity. Each bucket is a FIFO
+     * stack: delivery pops the most recently registered waiter (the tail).
      */
-    private readonly eventWaitersRef;
+    private readonly notificationWaitersRef;
     private readonly runtime;
     /**
-     * Per-subscription event registry. Spec #222 §5.3 (C4 + the
+     * Per-subscription notification registry. Spec #222 §5.3 (C4 + the
      * `RealClientEventSubscriber.subscribe` filter stub). Constructed
      * synchronously alongside the other Refs; `MoltZapWsClient.subscribe`
      * delegates to it directly.
@@ -127,9 +123,9 @@ export declare class MoltZapWsClient {
      * Per-method handler registry for server-initiated RPCs. Survives
      * reconnects so apps register once and re-attach automatically when the
      * socket comes back. Each entry is invoked by the per-connection
-     * dispatcher fiber when an s2c request frame arrives.
+     * dispatcher fiber when an appCallback request frame arrives.
      */
-    private readonly s2cHandlersRef;
+    private readonly appCallbackHandlersRef;
     private requestCounter;
     private closed;
     private reconnectFiber;
@@ -145,42 +141,40 @@ export declare class MoltZapWsClient {
      *
      * The dispatcher fiber forked at `connect()` time picks up handlers via
      * `Ref.get` per-frame, so a registration made BEFORE `connect()` is
-     * visible to the very first inbound s2c request, and a registration
+     * visible to the very first inbound appCallback request, and a registration
      * made AFTER `connect()` takes effect on the next inbound frame.
      */
-    handleServerRpc(method: string, handler: ServerRpcHandler): Effect.Effect<void, DuplicateServerRpcHandlerError>;
-    get helloOk(): unknown;
+    handleServerRpc<D extends AnyAppCallbackRpcDefinition>(definition: D, handler: ServerRpcHandler<D>): Effect.Effect<void, DuplicateServerRpcHandlerError>;
+    get helloOk(): ConnectResult | null;
     /** Open the socket, perform auth/connect, resolve with HelloOk. Fails
      * immediately on pre-open close or error. */
-    connect(): Effect.Effect<unknown, NotConnectedError | RpcTimeoutError | RpcServerError>;
+    connect(): Effect.Effect<ConnectResult, NotConnectedError | RpcTimeoutError | RpcServerError>;
     /**
      * Send an RPC. Fails with a typed error:
      *   - `NotConnectedError` if the socket isn't OPEN or closes mid-RPC
      *   - `RpcTimeoutError` after `RPC_TIMEOUT_MS` — no automatic retry
      *   - `RpcServerError` on a typed server-error frame
      *
-     * Overloads: pass an `RpcDefinition` for compile-time param/result typing,
-     * or a raw method string for untyped legacy call sites.
+     * 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>>(method: D, params: Static<D["paramsSchema"]>, opts?: RpcCallOptions): Effect.Effect<Static<D["resultSchema"]>, NotConnectedError | RpcTimeoutError | RpcServerError>;
-    sendRpc(method: string, params?: unknown, opts?: RpcCallOptions): Effect.Effect<unknown, NotConnectedError | RpcTimeoutError | RpcServerError>;
+    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 typed/raw overloads.
+     * 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>>(method: D, params: Static<D["paramsSchema"]>): Effect.Effect<TrackedRpcResponse<Static<D["resultSchema"]>>, NotConnectedError | RpcTimeoutError | RpcServerError>;
-    sendRpcTracked(method: string, params?: unknown): Effect.Effect<TrackedRpcResponse<unknown>, NotConnectedError | RpcTimeoutError | RpcServerError>;
+    sendRpcTracked<D extends RpcDefinition<string, TSchema, TSchema>>(definition: D, params: ParamsOf<D>): Effect.Effect<TrackedRpcResponse<ResultOf<D>>, NotConnectedError | RpcTimeoutError | RpcServerError>;
     /**
-     * Register a per-subscription event handler. Spec #222 §5.3 + OQ-2
+     * Register a per-subscription notification handler. Spec #222 §5.3 + OQ-2
      * (A): filter grammar is the three-field `SubscriptionFilter`
-     * (`emissionTag` / `conversationId` / `eventNamePrefix`). Returns a
+     * (`emissionTag` / `conversationId` / `notificationNamePrefix`). Returns a
      * handle whose `unsubscribe` Effect drops delivery starting with the
      * next inbound frame (OQ-3 A snapshot semantics).
      *
@@ -189,7 +183,7 @@ export declare class MoltZapWsClient {
      * producing frames. Fails with `NotConnectedError` only if the client
      * has been permanently torn down via `close()`.
      */
-    subscribe(filter: SubscriptionFilter, handler: SubscriberHandler): Effect.Effect<EventSubscription, NotConnectedError>;
+    subscribe(filter: SubscriptionFilter, handler: SubscriberHandler): Effect.Effect<NotificationSubscription, NotConnectedError>;
     /**
      * Close the socket permanently (no reconnection). Writes a clean WebSocket
      * close frame (code 1000) before tearing down the scope so the server
@@ -197,12 +191,12 @@ export declare class MoltZapWsClient {
      * lingering CLOSE_WAIT sockets on the server side.
      */
     close(): Effect.Effect<void, never>;
-    /** Wait for the next inbound event whose `event` field equals `eventName`.
+    /** Wait for the next inbound notification matching `definition`.
      * Consumes a buffered match if present; otherwise awaits the next match
      * with a per-call timeout. */
-    waitForEvent(eventName: string, timeoutMs?: number): Effect.Effect<EventFrame, Error>;
-    /** Return all buffered events and clear the buffer. Synchronous. */
-    drainEvents(): EventFrame[];
+    waitForNotification<D extends AnyNotificationDefinition>(definition: D, timeoutMs?: number): Effect.Effect<DecodedNotificationFor<D>, Error>;
+    /** Return all buffered notifications and clear the buffer. Synchronous. */
+    drainNotifications(): DecodedNotification[];
     /** Close the socket without marking as permanently closed, triggering reconnection. */
     disconnect(): Effect.Effect<void, never>;
     private disconnectSync;
@@ -210,7 +204,7 @@ export declare class MoltZapWsClient {
     /**
      * Tracked variant of `sendRpcEffect`. Reuses the same Deferred /
      * pendingRef plumbing — the only difference is the resolved value:
-     * `{id, type: "response", result}` instead of bare `result`. This
+     * `{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.
@@ -237,7 +231,7 @@ export declare class MoltZapWsClient {
     private writeOfferRejection;
     private offerRejectedResponse;
     /**
-     * Dispatch one inbound s2c request to the registered handler, encode
+     * Dispatch one inbound appCallback request to the registered handler, encode
      * the response, and write it back to the server. Errors are projected
      * onto an error response so the server's `Deferred.await` always
      * settles deterministically — never hangs on a missing or crashing
@@ -252,11 +246,11 @@ export declare class MoltZapWsClient {
      *   - No handler registered → encode MethodNotFound error response.
      */
     private dispatchInboundServerRequest;
-    /** Route an inbound frame. Malformed frames are logged + dropped; event
-     * frames dispatch to `onEvent` after the shape check. */
+    /** Route an inbound frame. Malformed frames are logged + dropped; notification
+     * frames dispatch to `onNotification` after the shape check. */
     private handleIncoming;
-    /** Fail every outstanding event waiter with `message` and clear the map. */
-    private failAllEventWaiters;
+    /** Fail every outstanding notification waiter with `message` and clear the map. */
+    private failAllNotificationWaiters;
     private failAllPending;
     /** Schedule a reconnect attempt. Jittered exponential backoff (1s base,
      * 30s cap) routed through `Effect.sleep` so `TestClock` can drive it. */

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

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