@zlink-systems/framework 0.30.0 → 0.30.2

package/dist/runtime/backend/node/node-raw-mesh-backend.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkNodeRawMeshBackend = void 0;
 exports.requestFailureResult = requestFailureResult;
+const routing_id_1 = require("../../routing-id");
+const durable_service_request_1 = require("../../foundation/durable-service-request");
+const routing_id_2 = require("../../routing-id");
 const stream_wire_1 = require("@zlink-systems/stream-wire");
 const zlink_1 = require("@zlink-systems/zlink");
 const node_crypto_1 = require("node:crypto");
@@ -32,11 +35,13 @@ const DEFAULT_NATIVE_ACTIVE_CAPACITY = 10_000;
 const UNSTARTED_DIAGNOSTIC_ENDPOINT = 'inproc://not-started';
 const MULTIPART_PACKET_NAME = service_wire_constants_generated_1.SERVICE_FRAMEWORK_MULTIPART_PACKET_NAME;
 const MULTIPART_CONTENT_TYPE = service_wire_constants_generated_1.SERVICE_FRAMEWORK_MULTIPART_CONTENT_TYPE;
-const FATAL_UTF8 = new TextDecoder('utf-8', { fatal: true });
 const MAX_DRAIN_RECORDS = 64;
-// Preserve the existing route observation/admission/liveness cadence. Only the binding
-// readable handler admits receive work; this timer never probes the socket.
+// The maintenance timer runs at the nearest management deadline and never
+// sooner than this. Only the binding readable handler admits receive work;
+// this timer never probes the socket.
 const MESH_BACKEND_MAINTENANCE_INTERVAL_MS = 1;
+/** The longest single timer delay Node accepts. */
+const MESH_BACKEND_MAINTENANCE_MAX_DELAY_MS = 2 ** 31 - 1;
 // Spec 08 §4.2 bounds the combined turn. Raw gets one equal share; stateful
 // can use the remaining turn, including time the raw registry did not consume.
 const MESH_BACKEND_RAW_MAINTENANCE_SHARE = 1 / 2;
@@ -70,18 +75,19 @@ class ZLinkNodeRawMeshBackend {
     stateful;
     readyHandler;
     maintenanceTimer;
-    pumping = false;
+    maintenanceDueMs = Number.POSITIVE_INFINITY;
+    pumpTask;
     readable = 0;
     onReadable = (receiveReady, routeReady) => {
         if (receiveReady)
             this.readable |= 1;
         if (routeReady)
             this.readable |= 2;
-        if (!this.closed && !this.pumping)
-            void this.pump();
+        this.pump();
     };
     onMaintenance = () => {
         this.maintenanceTimer = undefined;
+        this.maintenanceDueMs = Number.POSITIVE_INFINITY;
         if (this.closed)
             return;
         const nowMs = performance.now();
@@ -89,7 +95,7 @@ class ZLinkNodeRawMeshBackend {
         this.runtime?.expireOperations(nowMs, nowMs + raw_service_mesh_runtime_1.RAW_MESH_RECEIVE_TIME_BUDGET_MS * MESH_BACKEND_RAW_MAINTENANCE_SHARE);
         this.stateful?.expireOperations(nowMs, turnDeadlineMs);
         this.scheduleMaintenance();
-        void this.pump();
+        this.pump();
     };
     onPendingOperationsChanged = () => this.scheduleMaintenance();
     nextPeerIntent = 1n;
@@ -104,6 +110,8 @@ class ZLinkNodeRawMeshBackend {
     protocolError;
     messageFollowHandler;
     dispatchErrors;
+    sessionOwnerDescriptors;
+    requestSourceAcceptance;
     peerDisconnectedHandlers = new Set();
     constructor(meshName, routingId, bindingPort, applicationJobQueue, applicationJobReceiveFlowFailureSink, peerAdmissionSealed, infrastructureTaskRunner) {
         this.meshName = meshName;
@@ -137,6 +145,10 @@ class ZLinkNodeRawMeshBackend {
         this.dispatchErrors = reporter;
         this.stateful?.setDispatchErrorReporter(reporter, this.meshName);
     }
+    setSessionOwnerDescriptors(source) {
+        this.sessionOwnerDescriptors = source;
+        this.stateful?.setSessionOwnerDescriptors(source);
+    }
     setProtocolErrorHandler(handler) {
         this.protocolError = handler;
     }
@@ -168,11 +180,11 @@ class ZLinkNodeRawMeshBackend {
         const result = await this.requireStateful().sendToMissingInstanceSpotFrame(target, encodeMultipartApplicationFrame(parts), deadlineUnixMs, sourceSpotId, metadata === undefined ? undefined : (0, service_metadata_codec_1.encodeServiceMetadataFrame)(metadata));
         return result;
     }
-    requestToMissingInstanceSpot(target, parts, deadlineUnixMs, sourceSpotId, metadata) {
-        return this.observeStateful(service_runtime_contracts_1.OperationKind.InstanceSpotRequest, this.requireStateful().requestToMissingInstanceSpotFrame(target, encodeMultipartApplicationFrame(parts), deadlineUnixMs, sourceSpotId, metadata === undefined ? undefined : (0, service_metadata_codec_1.encodeServiceMetadataFrame)(metadata)));
+    requestToMissingInstanceSpot(target, parts, deadlineUnixMs, sourceSpotId, metadata, onAdmitted) {
+        return this.observeStateful(service_runtime_contracts_1.OperationKind.InstanceSpotRequest, this.requireStateful().requestToMissingInstanceSpotFrame(target, encodeMultipartApplicationFrame(parts), deadlineUnixMs, sourceSpotId, metadata === undefined ? undefined : (0, service_metadata_codec_1.encodeServiceMetadataFrame)(metadata), onAdmitted));
     }
     setRoutingId(routingId) {
-        if (String(routingId) !== this.routingId) {
+        if (!(0, routing_id_1.routingIdsEqual)((0, routing_id_2.toBackendRoutingId)(routingId), this.routingId)) {
             throw new Error('MeshNode routing id is immutable after construction.');
         }
     }
@@ -221,13 +233,7 @@ class ZLinkNodeRawMeshBackend {
                     }
                 }
             },
-            onPeerDisconnected: (nodeRoutingId, endpoint) => {
-                for (const [intentId, peer] of this.peerIntents) {
-                    if (peer.endpoint === endpoint &&
-                        (peer.nodeRoutingId === undefined || peer.nodeRoutingId === nodeRoutingId)) {
-                        this.peerIntents.delete(intentId);
-                    }
-                }
+            onPeerDisconnected: (_nodeRoutingId, endpoint) => {
                 for (const handler of this.peerDisconnectedHandlers)
                     handler(endpoint);
             }
@@ -237,16 +243,22 @@ class ZLinkNodeRawMeshBackend {
         if (this.dispatchErrors !== undefined) {
             this.stateful.setDispatchErrorReporter(this.dispatchErrors, this.meshName);
         }
+        if (this.sessionOwnerDescriptors !== undefined) {
+            this.stateful.setSessionOwnerDescriptors(this.sessionOwnerDescriptors);
+        }
         if (this.mailboxRecordDropped !== undefined) {
             this.stateful.setMailboxDropHandler(this.mailboxRecordDropped);
         }
         this.stateful.setMessageFollowHandler((record) => this.messageFollowHandler?.(record));
+        if (this.requestSourceAcceptance !== undefined) {
+            this.stateful.setRequestSourceAcceptance(this.requestSourceAcceptance);
+        }
         this.runtime = runtime;
         try {
             runtime.setReadableHandler(this.onReadable);
         }
         catch (error) {
-            this.close();
+            void this.close().catch((failure) => runtime.reportInfrastructureFailure(failure));
             throw error;
         }
         this.scheduleMaintenance();
@@ -257,26 +269,30 @@ class ZLinkNodeRawMeshBackend {
     async sendMessageFollowNotification(targetNodeRid, record) {
         return await this.requireStateful().sendMessageFollowNotification(targetNodeRid, record);
     }
-    shutdown(_timeoutMs) {
-        this.close();
+    async shutdown(_timeoutMs) {
+        await this.close();
         return zlink_1.RequestResult.Ok;
     }
+    cancelPendingOperations(reason) {
+        this.stateful?.cancelPendingOperations(reason);
+        this.runtime?.cancelPendingOperations(reason);
+    }
     async publishDraining() {
         for (const name of this.channels.keys())
             this.channels.set(name, 0);
         await this.requireRuntime().updateLocalDescriptor({ state: 'draining' });
     }
-    close() {
-        if (this.closed)
-            return;
+    async close() {
+        this.closed = true;
         if (this.maintenanceTimer !== undefined)
             clearTimeout(this.maintenanceTimer);
         this.maintenanceTimer = undefined;
+        if (this.pumpTask !== undefined)
+            await this.pumpTask;
         this.stateful?.close();
         this.stateful = undefined;
         this.runtime?.close();
         this.runtime = undefined;
-        this.closed = true;
     }
     addChannelName(name) {
         this.requireNotStarted();
@@ -328,6 +344,10 @@ class ZLinkNodeRawMeshBackend {
         });
         return intent;
     }
+    setRequestSourceAcceptance(acceptance) {
+        this.requestSourceAcceptance = acceptance;
+        this.stateful?.setRequestSourceAcceptance(acceptance);
+    }
     expectPeer(peer) {
         this.requireRuntime().expectPeerByRoutingId(peer.endpoint, peer.nodeRoutingId, peer.securityIdentity, peer.lifecycleGeneration);
     }
@@ -379,13 +399,31 @@ class ZLinkNodeRawMeshBackend {
     isObjectClientNodeDirectTarget(targetRid) {
         return this.requireRuntime().isObjectClientNodeDirectTarget(String(targetRid));
     }
+    waitForPeerRoute(targetRid, lifecycleGeneration, deadlineUnixMs, signal) {
+        return this.requireRuntime().waitForPeerRoute(String(targetRid), lifecycleGeneration, deadlineUnixMs, signal);
+    }
+    observePeerRoute(targetRid) {
+        return this.requireRuntime().observePeerRoute(String(targetRid));
+    }
+    hasPeerRouteOrConnectionIntent(targetRid, endpoint) {
+        const rid = String(targetRid);
+        if (this.requireRuntime().hasSelectedPeerRoute(rid))
+            return true;
+        for (const intent of this.peerIntents.values()) {
+            if (intent.nodeRoutingId === rid ||
+                (intent.nodeRoutingId === undefined && intent.endpoint === endpoint))
+                return true;
+        }
+        return false;
+    }
     isPeerRouteReady(targetRid, lifecycleGeneration) {
         return this.requireRuntime().isPeerRouteReady(String(targetRid), lifecycleGeneration);
     }
-    async sendToNode(targetRid, parts) {
-        return (await this.requireRuntime().sendToNode(String(targetRid), encodeMultipartApplicationFrame(parts)))
-            ? zlink_1.SubmitResult.Ok
-            : zlink_1.SubmitResult.NotConnected;
+    sendToNode(targetRid, parts) {
+        const submitted = this.requireRuntime().sendToNode(String(targetRid), encodeMultipartApplicationFrame(parts));
+        return submitted instanceof Promise
+            ? submitted.then(nodeSendResult)
+            : nodeSendResult(submitted);
     }
     async sendInfrastructureControl(targetRid, record) {
         return (await this.requireRuntime().sendService(String(targetRid), (Array.isArray(record) ? record : [record]).map((value) => Buffer.from(value))))
@@ -398,18 +436,18 @@ class ZLinkNodeRawMeshBackend {
             : zlink_1.SubmitResult.NotConnected;
     }
     async requestInfrastructureControlFrames(targetRid, frames, options) {
-        return await this.requireRuntime().requestService(String(targetRid), frames.map((frame) => Buffer.from(frame)), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS);
+        return (0, durable_service_request_1.requestDurableService)(this.requireRuntime(), String(targetRid), frames, performance.now() + (options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS), 'relocation control', options?.signal, options?.onSubmitted);
     }
     requestToNode(targetRid, parts, options) {
-        const pending = this.requireRuntime().requestToNode(String(targetRid), encodeMultipartApplicationFrame(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS);
-        return this.observeCompletion(pending.id, service_runtime_contracts_1.OperationKind.NodeRequest, pending.promise);
+        const pending = this.requireRuntime().requestToNode(String(targetRid), encodeMultipartApplicationFrame(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, options?.onAdmitted, this.requestObserver, service_runtime_contracts_1.OperationKind.NodeRequest);
+        return this.observedOperation(pending, service_runtime_contracts_1.OperationKind.NodeRequest);
     }
     async sendToChannel(channelName, parts) {
         return this.requireRuntime().sendToChannel(channelName, encodeMultipartApplicationFrame(parts));
     }
     requestToChannel(channelName, parts, options) {
-        const pending = this.requireRuntime().requestToChannel(channelName, encodeMultipartApplicationFrame(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS);
-        return this.observeCompletion(pending.id, service_runtime_contracts_1.OperationKind.ChannelRequest, pending.promise);
+        const pending = this.requireRuntime().requestToChannel(channelName, encodeMultipartApplicationFrame(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, options?.onAdmitted, this.requestObserver, service_runtime_contracts_1.OperationKind.ChannelRequest);
+        return this.observedOperation(pending, service_runtime_contracts_1.OperationKind.ChannelRequest);
     }
     status() {
         const descriptor = this.runtime?.topology.localDescriptor() ?? this.createDescriptor();
@@ -570,7 +608,8 @@ class ZLinkNodeRawMeshBackend {
         return this.requireStateful().instanceSpotApplicationTarget(spotId);
     }
     waitForInstanceApplicationQuiescence(spotId, signal) {
-        return this.requireStateful().waitForInstanceApplicationQuiescence(spotId, signal);
+        // Closing the stateful owner terminalizes its operations and clears these waiters.
+        return this.stateful?.waitForInstanceApplicationQuiescence(spotId, signal) ?? Promise.resolve();
     }
     restoreUserSpotAuthority(spotId, stableType, generation, authorityOwnerGeneration) {
         return new RawServiceSpot(this, this.requireStateful().restoreUserSpotAuthority(spotId, stableType, generation, authorityOwnerGeneration));
@@ -598,7 +637,7 @@ class ZLinkNodeRawMeshBackend {
             nodeRid: String(actor.nodeRid),
             actorId: actor.actorId,
             generation: actor.generation
-        }, String(sessionNodeRid), String(sessionRid), bindingGeneration);
+        }, String(sessionNodeRid), (0, routing_id_2.toBackendRoutingId)(sessionRid), bindingGeneration);
     }
     registerInstanceIntent(instanceType, route, expectedCurrentRoute) {
         this.requireStateful().registerInstanceIntent(instanceType, route, expectedCurrentRoute);
@@ -666,8 +705,8 @@ class ZLinkNodeRawMeshBackend {
         const result = await this.requireStateful().sendToInstanceSpot(route, encodeMultipart(parts), sourceSpotId, metadata === undefined ? undefined : (0, service_metadata_codec_1.encodeServiceMetadataFrame)(metadata), instanceIntent);
         return result;
     }
-    requestInstanceSpot(route, parts, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, sourceSpotId, metadata, instanceIntent = false) {
-        return this.observeStateful(service_runtime_contracts_1.OperationKind.InstanceSpotRequest, this.requireStateful().requestToInstanceSpot(route, encodeMultipart(parts), timeoutMs, sourceSpotId, metadata === undefined ? undefined : (0, service_metadata_codec_1.encodeServiceMetadataFrame)(metadata), instanceIntent));
+    requestInstanceSpot(route, parts, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, sourceSpotId, metadata, instanceIntent = false, onAdmitted) {
+        return this.observeStateful(service_runtime_contracts_1.OperationKind.InstanceSpotRequest, this.requireStateful().requestToInstanceSpot(route, encodeMultipart(parts), timeoutMs, sourceSpotId, metadata === undefined ? undefined : (0, service_metadata_codec_1.encodeServiceMetadataFrame)(metadata), instanceIntent, onAdmitted));
     }
     actorLookup(actorId) {
         const actor = this.requireStateful().actor(actorId);
@@ -703,27 +742,26 @@ class ZLinkNodeRawMeshBackend {
         const target = String(targetNodeRid);
         return this.observeStateful(service_runtime_contracts_1.OperationKind.ActorJoin, this.requireStateful().joinActorEntrySpotCanonical(actor, target, request, actorFence, local, timeoutMs));
     }
-    async sendToActor(actor, parts) {
-        return this.requireStateful().sendToActor(actor, this.peerGeneration(String(actor.nodeRid)), actor.generation, encodeMultipart(parts));
+    async sendToActor(actor, parts, options) {
+        return this.requireStateful().sendToActor(actor, encodeMultipart(parts), undefined, undefined, options?.routeFence);
     }
     requestToActor(actor, parts, options) {
-        return this.observeStateful(service_runtime_contracts_1.OperationKind.ActorRequest, this.requireStateful().requestToActor(actor, this.peerGeneration(String(actor.nodeRid)), actor.generation, encodeMultipart(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS));
+        return this.observeStateful(service_runtime_contracts_1.OperationKind.ActorRequest, this.requireStateful().requestToActor(actor, encodeMultipart(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, undefined, undefined, options?.onAdmitted, options?.routeFence));
+    }
+    acceptRelocatedActorTerminal(operation, replyRouteId, result) {
+        return this.requireStateful().acceptRelocatedActorTerminal(operation, replyRouteId, result);
     }
     async actorSendToActor(source, target, parts) {
-        return (await this.requireStateful().sendToActor(target, this.peerGeneration(String(target.nodeRid)), target.generation, encodeMultipart(parts), source));
+        return (await this.requireStateful().sendToActor(target, encodeMultipart(parts), source));
     }
     actorRequestToActor(source, target, parts, options) {
-        return this.observeStateful(service_runtime_contracts_1.OperationKind.ActorRequest, this.requireStateful().requestToActor(target, this.peerGeneration(String(target.nodeRid)), target.generation, encodeMultipart(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, source));
+        return this.observeStateful(service_runtime_contracts_1.OperationKind.ActorRequest, this.requireStateful().requestToActor(target, encodeMultipart(parts), options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, source, undefined, options?.onAdmitted));
     }
     async sendActorBoundSession(actor, expectedBindingGeneration, parts, _flags) {
         return (await this.requireStateful().sendBoundSession(actor, expectedBindingGeneration, encodeMultipart(parts)));
     }
     closeActorBoundSession(actor, expectedBindingGeneration, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS) {
-        const binding = this.requireStateful().registry.binding(actor);
-        if (binding === undefined) {
-            return this.observeImmediateFailure(service_runtime_contracts_1.OperationKind.StreamUnbind, zlink_1.RequestResult.NotFound);
-        }
-        return this.observeStateful(service_runtime_contracts_1.OperationKind.StreamUnbind, this.requireStateful().unbindSession(binding.sessionRid, actor, expectedBindingGeneration, timeoutMs));
+        return this.observeStateful(service_runtime_contracts_1.OperationKind.StreamUnbind, this.requireStateful().closeBoundSession(actor, expectedBindingGeneration, timeoutMs));
     }
     leaveActor(actor, expectedMembershipEpoch, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS) {
         return this.observeStateful(service_runtime_contracts_1.OperationKind.ActorLeave, this.requireStateful().leaveActor(actor, expectedMembershipEpoch, timeoutMs));
@@ -734,8 +772,8 @@ class ZLinkNodeRawMeshBackend {
     async sendFromSpot(source, target, parts) {
         return (await this.requireStateful().sendToSpot(source.ref.spotId, target, encodeMultipart(parts)));
     }
-    requestFromSpot(source, target, parts, timeoutMs) {
-        return this.observeStateful(service_runtime_contracts_1.OperationKind.SpotRequest, this.requireStateful().requestToSpot(source.ref.spotId, target, encodeMultipart(parts), timeoutMs));
+    requestFromSpot(source, target, parts, timeoutMs, onAdmitted) {
+        return this.observeStateful(service_runtime_contracts_1.OperationKind.SpotRequest, this.requireStateful().requestToSpot(source.ref.spotId, target, encodeMultipart(parts), timeoutMs, onAdmitted));
     }
     closeSpot(state) {
         return this.requireStateful().registry.closeSpot(state.ref);
@@ -744,6 +782,8 @@ class ZLinkNodeRawMeshBackend {
         await this.requireStateful().publishLogicalMulticast(channelName, topic, encodeMultipart(parts), state.ref.spotId);
     }
     setSpotSubscription(state, channelName, topicFilter) {
+        if (!this.channels.has(channelName))
+            throw new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.InvalidOperation, `Spot does not participate in subscription channel '${channelName}'.`);
         this.requireStateful().setSubscription(state, channelName, topicFilter);
     }
     unsetSpotSubscription(state, channelName, topicFilter) {
@@ -784,10 +824,29 @@ class ZLinkNodeRawMeshBackend {
         }
         return result;
     }
+    /**
+     * Arms the one maintenance timer for the nearest management deadline
+     * (spec 08 §4.2): request expiry, liveness, or a pending peer handshake.
+     * An earlier deadline re-arms it; a later one keeps the armed time.
+     */
     scheduleMaintenance() {
         if (this.closed)
             return;
-        this.maintenanceTimer ??= setTimeout(this.onMaintenance, MESH_BACKEND_MAINTENANCE_INTERVAL_MS);
+        const nowMs = performance.now();
+        const dueMs = Math.max(nowMs + MESH_BACKEND_MAINTENANCE_INTERVAL_MS, Math.min(this.runtime?.nextMaintenanceDeadlineMs(nowMs) ?? Number.POSITIVE_INFINITY, this.stateful?.nextMaintenanceDeadlineMs() ?? Number.POSITIVE_INFINITY));
+        if (dueMs === Number.POSITIVE_INFINITY) {
+            if (this.maintenanceTimer !== undefined)
+                clearTimeout(this.maintenanceTimer);
+            this.maintenanceTimer = undefined;
+            this.maintenanceDueMs = dueMs;
+            return;
+        }
+        if (this.maintenanceTimer === undefined || dueMs < this.maintenanceDueMs) {
+            if (this.maintenanceTimer !== undefined)
+                clearTimeout(this.maintenanceTimer);
+            this.maintenanceTimer = setTimeout(this.onMaintenance, Math.min(MESH_BACKEND_MAINTENANCE_MAX_DELAY_MS, Math.ceil(dueMs - nowMs)));
+            this.maintenanceDueMs = dueMs;
+        }
         const pending = (this.runtime?.pendingOperationCount ?? 0) + (this.stateful?.pendingOperationCount ?? 0) > 0;
         if (pending === this.maintenanceTimer.hasRef())
             return;
@@ -798,15 +857,19 @@ class ZLinkNodeRawMeshBackend {
             this.maintenanceTimer.unref();
         }
     }
-    async pump() {
-        if (this.isClosed() || this.pumping)
+    pump() {
+        if (this.closed || this.pumpTask !== undefined)
             return;
-        this.pumping = true;
+        this.pumpTask = this.runPump(this.requireRuntime());
+    }
+    async runPump(runtime) {
+        // Publish pumpTask before any callback can signal readiness or begin close.
+        await Promise.resolve();
         try {
             do {
                 const ready = this.readable;
                 this.readable = 0;
-                const more = await this.requireRuntime().pumpBatch((ready & 1) !== 0, (ready & 2) !== 0);
+                const more = await runtime.pumpBatch((ready & 1) !== 0, (ready & 2) !== 0);
                 if (more) {
                     // Yield only after actual progress, retaining readiness across the
                     // existing batch limits until receive reports no data.
@@ -815,14 +878,14 @@ class ZLinkNodeRawMeshBackend {
                 }
             } while (!this.closed && this.readable !== 0);
         }
+        catch (error) {
+            runtime.reportInfrastructureFailure(error);
+        }
         finally {
-            this.pumping = false;
+            this.pumpTask = undefined;
             this.scheduleMaintenance();
         }
     }
-    isClosed() {
-        return this.closed;
-    }
     notifyReady() {
         const runtime = this.runtime;
         let domains = service_runtime_contracts_1.ReadyDomain.None;
@@ -835,6 +898,19 @@ class ZLinkNodeRawMeshBackend {
         if (domains !== service_runtime_contracts_1.ReadyDomain.None)
             this.readyHandler?.(domains);
     }
+    /**
+     * The raw registry takes a remote request's terminal and hands it here,
+     * where the Framework completion owner receives it in the same turn.
+     */
+    requestObserver = {
+        operationCompleted: (id, result, operationKind) => this.deliverCompletion({ high: 1n, low: id }, operationKind ?? 0, result),
+        operationFailed: (id, error, operationKind) => this.deliverCompletion({ high: 1n, low: id }, operationKind ?? 0, requestFailureResult(error))
+    };
+    observedOperation(pending, operationKind) {
+        return pending.promise === undefined
+            ? { high: 1n, low: pending.id }
+            : this.observeCompletion(pending.id, operationKind, pending.promise);
+    }
     observeCompletion(low, operationKind, promise) {
         const id = { high: 1n, low };
         void promise.then((result) => this.deliverCompletion(id, operationKind, result), (error) => this.deliverCompletion(id, operationKind, requestFailureResult(error)));
@@ -845,10 +921,6 @@ class ZLinkNodeRawMeshBackend {
         void pending.promise.then((result) => this.deliverCompletion(id, operationKind, result), (error) => this.deliverCompletion(id, operationKind, requestFailureResult(error)));
         return id;
     }
-    observeImmediateFailure(operationKind, terminalResult) {
-        const low = this.nextPeerIntent++;
-        return this.observeCompletion(low, operationKind, Promise.resolve({ terminalResult, failureCode: 0 }));
-    }
     deliverCompletion(operationId, operationKind, result) {
         if (this.completionHandler !== undefined) {
             this.completionHandler({ operationId, terminalResult: result.terminalResult }, () => completionRecord(operationId, operationKind, result));
@@ -953,7 +1025,7 @@ class RawServiceSpot {
         const routeFence = requireDirectSpotRouteFence(options?.routeFence, String(targetNodeRid), String(targetSpotId), targetSpotGeneration, options?.entrySpot === true
             ? this.backend.entrySpotRouteFence(String(targetNodeRid), String(targetSpotId))
             : undefined);
-        return this.backend.requestFromSpot(this.state, routeFence, parts, options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS);
+        return this.backend.requestFromSpot(this.state, routeFence, parts, options?.timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, options?.onAdmitted);
     }
     async publish(channelName, topic, parts, options) {
         this.requireOpen();
@@ -992,6 +1064,9 @@ class RawServiceSpot {
             throw new Error(`Spot '${this.routingId}' is closed.`);
     }
 }
+function nodeSendResult(submitted) {
+    return submitted ? zlink_1.SubmitResult.Ok : zlink_1.SubmitResult.NotConnected;
+}
 function requireDirectSpotRouteFence(route, targetNodeRid, targetSpotId, targetSpotGeneration, entryRoute) {
     if (route === undefined && entryRoute !== undefined) {
         return entryRoute;
@@ -1040,7 +1115,7 @@ class RawStreamSessionService {
         return {
             state: this.state,
             lifecycleGeneration: 1n,
-            sessionCount: BigInt(new Set(bindings.map((value) => value.sessionRid)).size),
+            sessionCount: BigInt(new Set(bindings.map((value) => (0, routing_id_2.encodeRoutingIdStorageHex)(value.sessionRid))).size),
             bindingCount: BigInt(bindings.length),
             pendingMessageCount: 0n,
             pendingByteCount: 0n,
@@ -1051,32 +1126,32 @@ class RawStreamSessionService {
         this.requireStarted();
         return this.observe(service_runtime_contracts_1.OperationKind.ActorLookup, this.stateful.lookupRemoteActor(String(targetNodeRid), actorId, timeoutMs));
     }
-    bindActor(sessionRid, actor, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, onBindingReplaced, actorAuthority) {
+    bindActor(sessionRid, actor, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, onBindingReplaced, actorAuthority, close) {
         this.requireStarted();
         const sessionKey = String(sessionRid);
         this.sessionTargets.set(sessionKey, sessionRid);
-        return this.observe(service_runtime_contracts_1.OperationKind.StreamBind, this.stateful.bindSession(sessionKey, actor, timeoutMs, (targetSessionRid, payloadFrame) => this.deliver(targetSessionRid, actor.actorId, payloadFrame), onBindingReplaced, actorAuthority));
+        return this.observe(service_runtime_contracts_1.OperationKind.StreamBind, this.stateful.bindSession(sessionRid, actor, timeoutMs, (_targetSessionRid, payloadFrame) => this.deliver(sessionKey, actor.actorId, payloadFrame), onBindingReplaced, actorAuthority, close));
     }
     unbindActor(sessionRid, actor, expectedBindingGeneration, timeoutMs = Registration_1.DEFAULT_REQUEST_TIMEOUT_MS) {
         this.requireStarted();
-        return this.observe(service_runtime_contracts_1.OperationKind.StreamUnbind, this.stateful.unbindSession(String(sessionRid), actor, expectedBindingGeneration, timeoutMs));
+        return this.observe(service_runtime_contracts_1.OperationKind.StreamUnbind, this.stateful.unbindSession(sessionRid, actor, expectedBindingGeneration, timeoutMs));
     }
     bindings(sessionRid) {
-        return this.stateful.sessionBindings(String(sessionRid));
+        return this.stateful.sessionBindings(sessionRid);
     }
     async sendToActor(sessionRid, actor, parts) {
         this.requireStarted();
-        return (await this.stateful.sendSessionToActor(String(sessionRid), actor, encodeMultipart(parts)));
+        return (await this.stateful.sendSessionToActor(sessionRid, actor, encodeMultipart(parts)));
     }
     async deliver(sessionRid, actorId, payload) {
         const target = this.sessionTargets.get(sessionRid);
         if (target === undefined)
             return false;
         const operation = this.stream.send(target);
-        const parts = decodeMultipartBuffers((0, service_wire_m6a_codec_1.decodeApplicationPayloadView)(payload).payload);
+        const parts = (0, service_wire_m6a_codec_1.decodeMultipartParts)((0, service_wire_m6a_codec_1.decodeApplicationPayloadView)(payload).payload, borrowMultipartPart);
         if (parts.length === 0)
             return false;
-        const actorSlot = await (0, service_session_binding_ingress_port_1.serviceSessionBindingIngressPortIfRegistered)(this)?.actorSlot(actorId, sessionRid);
+        const actorSlot = await (0, service_session_binding_ingress_port_1.serviceSessionBindingIngressPortIfRegistered)(this)?.actorSlot(actorId, target);
         if (actorSlot === undefined)
             return false;
         parts[0] = Buffer.from(streamFrameWithActorSlot(parts[0], actorSlot));
@@ -1097,7 +1172,7 @@ class RawStreamSessionService {
                 case zlink_1.SubmitResult.Terminated:
                     // Let the socket monitor drive the existing STREAM close/unbind
                     // lifecycle instead of maintaining a second session-close state.
-                    (0, node_socket_backend_adapter_1.disconnectStreamPeer)(this.stream, target);
+                    (0, node_socket_backend_adapter_1.disconnectSocketPeer)(this.stream, (0, node_backend_adapter_support_1.toNativeRoutingId)(target));
                     throw new runtime_values_1.ZLinkBackendResultError('submit', error.result, error.nativeErrno, {
                         cause: error
                     });
@@ -1325,7 +1400,7 @@ function decodeMultipartRecord(runtime, record) {
     const header = record.parts[0];
     const command = header[service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET];
     const payloadFrame = record.parts[1];
-    const application = decodeApplicationEnvelope(payloadFrame);
+    const parts = (0, service_wire_m6a_codec_1.decodeMultipartApplicationParts)(payloadFrame, runtime_message_1.ZLinkBufferMessage.fromOwned, closeMultipartMessage);
     const channelName = record.owner.startsWith('channel:')
         ? record.owner.slice('channel:'.length)
         : null;
@@ -1344,7 +1419,7 @@ function decodeMultipartRecord(runtime, record) {
         : kind === service_runtime_contracts_1.ReceiveKind.ChannelRequest
             ? service_runtime_contracts_1.OperationKind.ChannelRequest
             : 0;
-    const ingressLifecycle = receiveIngressLifecycle(record);
+    const applicationJob = record.applicationJob;
     return {
         kind,
         domain: readyDomain(record.domain),
@@ -1357,22 +1432,30 @@ function decodeMultipartRecord(runtime, record) {
         channelName,
         topic: null,
         applicationMetadata: null,
-        packetName: application.packetName,
-        contentType: application.contentType,
+        packetName: service_wire_constants_generated_1.SERVICE_FRAMEWORK_MULTIPART_PACKET_NAME,
+        contentType: service_wire_constants_generated_1.SERVICE_FRAMEWORK_MULTIPART_CONTENT_TYPE,
         kindData: null,
         terminalResult: 0,
         failureErrno: 0,
-        ...ingressLifecycle,
-        parts: decodeMultipart(application.payload),
+        applicationJobPermit: applicationJob,
+        releaseRetainedIngress: applicationJob === undefined ? undefined : releaseRecordApplicationJob,
+        parts,
         reply(parts) {
             if (record.correlation === undefined)
                 return zlink_1.SubmitResult.InvalidState;
             runtime.reply(record, encodeMultipartApplicationFrame(parts));
             return zlink_1.SubmitResult.Ok;
         },
-        replyActorJoin: () => zlink_1.SubmitResult.NotSupported
+        replyActorJoin: replyActorJoinNotSupported
     };
 }
+/** Shared by every ordinary record: the record's own permit lease is its retained ingress. */
+function releaseRecordApplicationJob() {
+    this.applicationJobPermit?.close();
+}
+function replyActorJoinNotSupported() {
+    return zlink_1.SubmitResult.NotSupported;
+}
 function decodeStatefulRecord(record, stateful) {
     const payloadFrame = record.parts.length < 2 ? undefined : record.parts[1];
     const canonicalActorJoin = stateful.kindData?.kind === 'actorControl' &&
@@ -1383,13 +1466,18 @@ function decodeStatefulRecord(record, stateful) {
         ? stateful.canonicalApplicationPayload
         : payloadFrame === undefined
             ? undefined
-            : decodeApplicationEnvelope(payloadFrame);
+            : (0, service_wire_m6a_codec_1.decodeMultipartApplicationPayloadView)(payloadFrame);
     const operationId = record.correlation === undefined
         ? { high: 0n, low: 0n }
         : { high: operation_identity_1.ZLINK_NATIVE_CORRELATION_OPERATION_NAMESPACE, low: record.correlation };
     const ingressLifecycle = receiveIngressLifecycle(record);
     return {
         kind: stateful.receiveKind,
+        get requestSource() {
+            return record.requestSource;
+        },
+        prepareDispatch: record.sourcePreparationOwner === undefined ? undefined : prepareStatefulMailboxDispatch,
+        statefulMailboxRecord: record,
         domain: readyDomain(record.domain),
         sourceNodeRid: record.sourceRoutingId ?? null,
         sourceSpotId: stateful.sourceSpotId ?? null,
@@ -1483,6 +1571,13 @@ function receiveIngressLifecycle(record) {
             releaseRetainedIngress: () => applicationJob.close()
         };
 }
+function prepareStatefulMailboxDispatch(signal) {
+    const mailboxRecord = this.statefulMailboxRecord;
+    const owner = mailboxRecord?.sourcePreparationOwner;
+    return mailboxRecord === undefined || owner === undefined
+        ? true
+        : owner.prepareDispatch(mailboxRecord, signal);
+}
 function readyOwner(owner, nodeRid, stateful, domain) {
     if (owner.startsWith('spot:')) {
         return {
@@ -1592,92 +1687,14 @@ function encodeMultipartApplicationFrame(parts) {
         throw new TypeError('Multipart payload must contain at least one part.');
     return (0, service_wire_m6a_codec_1.encodeMultipartApplicationPayload)(values.map(messageBytesView), MULTIPART_PACKET_NAME, MULTIPART_CONTENT_TYPE);
 }
-function decodeApplicationEnvelope(frame) {
-    const bytes = Buffer.from(frame.buffer, frame.byteOffset, frame.byteLength);
-    if (bytes.length < service_wire_m6a_codec_1.APPLICATION_PAYLOAD_MINIMUM_FIELD_BYTES ||
-        bytes[0] !== service_wire_m6a_codec_1.APPLICATION_PAYLOAD_VERSION) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid application envelope.');
-    }
-    const bodyLength = bytes.readUInt32BE(1);
-    if (bodyLength !== bytes.length - 5) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid application envelope length.');
-    }
-    let offset = 5;
-    const packetLength = bytes[offset++];
-    if (packetLength === 0 || bytes.length - offset < packetLength + 1) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid application envelope packet name.');
-    }
-    let packetName;
-    try {
-        packetName = FATAL_UTF8.decode(bytes.subarray(offset, offset + packetLength));
-    }
-    catch {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid application envelope packet name.');
-    }
-    offset += packetLength;
-    const contentLength = bytes[offset++];
-    if (contentLength === 0 || bytes.length - offset < contentLength + 4) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid application envelope content type.');
-    }
-    let contentType;
-    try {
-        contentType = FATAL_UTF8.decode(bytes.subarray(offset, offset + contentLength));
-    }
-    catch {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid application envelope content type.');
-    }
-    offset += contentLength;
-    const payloadLength = bytes.readUInt32BE(offset);
-    offset += 4;
-    if (packetName !== MULTIPART_PACKET_NAME ||
-        contentType !== MULTIPART_CONTENT_TYPE ||
-        payloadLength !== bytes.length - offset) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Unexpected M6A application payload.');
-    }
-    return { packetName, contentType, payload: bytes.subarray(offset) };
-}
 function decodeMultipart(payload) {
-    const buffers = decodeMultipartBuffers(payload);
-    const parts = new Array(buffers.length);
-    let materialized = 0;
-    try {
-        for (; materialized < buffers.length; materialized += 1) {
-            parts[materialized] = runtime_message_1.ZLinkBufferMessage.fromOwned(buffers[materialized]);
-        }
-        return parts;
-    }
-    catch (error) {
-        for (let index = 0; index < materialized; index += 1)
-            parts[index].close();
-        throw error;
-    }
+    return (0, service_wire_m6a_codec_1.decodeMultipartParts)(payload, runtime_message_1.ZLinkBufferMessage.fromOwned, closeMultipartMessage);
 }
-function decodeMultipartBuffers(payload) {
-    const bytes = Buffer.from(payload.buffer, payload.byteOffset, payload.byteLength);
-    if (bytes.length < 4)
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Truncated multipart payload.');
-    const count = bytes.readUInt32BE(0);
-    if (count === 0 || count > Math.floor((bytes.length - 4) / 4)) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid multipart part count.');
-    }
-    const result = new Array(count);
-    let offset = 4;
-    for (let index = 0; index < count; index++) {
-        if (bytes.length - offset < 4) {
-            throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Truncated multipart part length.');
-        }
-        const length = bytes.readUInt32BE(offset);
-        offset += 4;
-        if (bytes.length - offset < length) {
-            throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Truncated multipart part.');
-        }
-        result[index] = bytes.subarray(offset, offset + length);
-        offset += length;
-    }
-    if (offset !== bytes.length) {
-        throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Multipart payload has trailing bytes.');
-    }
-    return result;
+function closeMultipartMessage(part) {
+    part.close();
+}
+function borrowMultipartPart(part) {
+    return part;
 }
 function messageBytesView(value) {
     if (typeof value === 'object' && 'data' in value) {