@zlink-systems/framework 0.30.3 → 0.32.0

package/dist/runtime/foundation/service-stateful-runtime.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceStatefulRuntime = void 0;
 exports.sessionOwnerFenceMatches = sessionOwnerFenceMatches;
 exports.statefulMailboxData = statefulMailboxData;
+const request_deadline_1 = require("../messaging/request-deadline");
+const internal_observation_1 = require("../internal-observation");
 const abort_1 = require("../abort");
 const channel_envelope_1 = require("../channels/channel-envelope");
 const runtime_message_1 = require("../backend/runtime-message");
@@ -31,6 +33,7 @@ const service_stateful_registry_1 = require("./service-stateful-registry");
 const service_stateful_wire_codec_1 = require("./service-stateful-wire-codec");
 const service_wire_binary_primitives_1 = require("./service-wire-binary-primitives");
 const service_wire_constants_generated_1 = require("./service-wire-constants.generated");
+const payload_slab_1 = require("../../contracts/Common/payload-slab");
 const service_wire_m6a_codec_1 = require("./service-wire-m6a-codec");
 const MAX_NODE_TIMER_DELAY_MS = 2_147_483_647;
 const SPOT_MOVING = 34;
@@ -55,6 +58,24 @@ class ServiceStatefulRuntime {
     raw;
     nodeRid;
     nodeGeneration;
+    requests;
+    [internal_observation_1.inspectRuntime]() {
+        return Object.freeze({
+            canonicalActorJoinHandoffs: this.canonicalActorJoinHandoffs.size,
+            spotRoutes: this.spotRoutes.size,
+            instanceRoute: (spotId) => {
+                const route = this.instanceIntents.get(spotId)?.route;
+                return route === undefined ? undefined : Object.freeze({ ...route });
+            },
+            directSpotRoute: (spotId) => {
+                const route = this.directSpotRoutes.get(directSpotKey(spotId));
+                return route === undefined
+                    ? undefined
+                    : Object.freeze({ ...route, spot: Object.freeze({ ...route.spot }) });
+            },
+            spotMessageFollow: Object.freeze([...this.spotMessageFollow.values()].map((state) => Object.freeze({ queuedCount: state.queuedCount, queuedBytes: state.queuedBytes })))
+        });
+    }
     //  Captured at module load, before any application turn exists: running a
     //  callback through this snapshot detaches every AsyncLocalStorage context
     //  (Spot serial turn, execution area, flow) so local loopback ingress
@@ -103,11 +124,13 @@ class ServiceStatefulRuntime {
     admittedUserSpotOperations = new Map();
     pendingInstanceActivations = new Map();
     closed = false;
-    constructor(raw, nodeRid, nodeGeneration, onPendingOperationsChanged) {
+    constructor(raw, nodeRid, nodeGeneration, onPendingOperationsChanged, requests) {
         this.raw = raw;
         this.nodeRid = nodeRid;
         this.nodeGeneration = nodeGeneration;
-        this.operations = new service_stateful_registry_1.ServiceTerminalOperationRegistry(new operation_registry_1.OperationRegistry(undefined, onPendingOperationsChanged));
+        this.requests = requests;
+        this.operations = new service_stateful_registry_1.ServiceTerminalOperationRegistry(requests?.operations() ??
+            new operation_registry_1.OperationRegistry(undefined, onPendingOperationsChanged, (reason) => (0, request_deadline_1.requestTerminalError)('Request', reason)), requests === undefined ? undefined : () => { });
         this.registry = new service_stateful_registry_1.ServiceStatefulRegistry(nodeRid, nodeGeneration);
         this.registry.createEntrySpot(nodeRid);
         raw.setServiceIngress((record) => this.ingress(record), acceptsStatefulIngress);
@@ -788,18 +811,23 @@ class ServiceStatefulRuntime {
         });
         return this.submitOneWay(target.targetNodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)]);
     }
-    requestToSpot(sourceSpotId, requested, payload, timeoutMs, onAdmitted) {
-        const pending = this.operations.register(timeoutMs);
+    requestToSpot(sourceSpotId, requested, payload, timeoutMs, onAdmitted, requestOperation, receiver) {
+        const pending = requestOperation ??
+            this.operations.register(timeoutMs);
         const target = this.acceptSpotAuthority(requested);
         if (target === undefined) {
-            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
+            const result = (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale);
+            if (receiver === undefined)
+                pending.reply(result);
+            else
+                receiver.operationCompleted(pending.id, result, undefined);
             return pending;
         }
         const header = (0, service_stateful_wire_codec_1.encodeSpotHeader)('spotRequest', sourceSpotId, target, pending.id, {
             high: this.nodeGeneration,
             low: this.nextMessageFollowOperation++
         });
-        this.submitRequest(pending, target.targetNodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)], timeoutMs, 'spotRequest', undefined, onAdmitted);
+        this.submitRequest(pending, target.targetNodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)], timeoutMs, 'spotRequest', undefined, onAdmitted, receiver);
         return pending;
     }
     async sendToActor(target, payload, sourceActor, boundSession, routeFence) {
@@ -814,12 +842,18 @@ class ServiceStatefulRuntime {
             }, { high: this.nodeGeneration, low: this.nextMessageFollowOperation++ });
         return this.submitOneWay(target.nodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)]);
     }
-    requestToActor(target, payload, timeoutMs, sourceActor, boundSession, onAdmitted, routeFence) {
+    requestToActor(target, payload, timeoutMs, sourceActor, boundSession, onAdmitted, routeFence, requestOperation, receiver) {
         const operationLow = this.nextMessageFollowOperation++;
-        const pending = this.operations.register(timeoutMs, 'registry', operationLow);
+        const pending = requestOperation ??
+            this.operations.register(timeoutMs, 'registry', operationLow);
+        this.operations.setContext(pending.id, operationLow);
         const route = routeFence ?? this.tryActorFence(target);
         if (route === undefined) {
-            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
+            const result = (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale);
+            if (receiver !== undefined)
+                receiver.operationCompleted(pending.id, result, undefined);
+            else
+                pending.reply(result);
             return pending;
         }
         const header = (0, service_stateful_wire_codec_1.encodeActorHeader)('actorRequest', route, pending.id, sourceActor, boundSession === undefined
@@ -828,7 +862,7 @@ class ServiceStatefulRuntime {
                 ...boundSession,
                 sequence: this.nextSessionSequence++
             }, { high: this.nodeGeneration, low: operationLow });
-        this.submitRequest(pending, target.nodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)], timeoutMs, 'actorRequest', undefined, onAdmitted);
+        this.submitRequest(pending, target.nodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)], timeoutMs, 'actorRequest', undefined, onAdmitted, receiver);
         return pending;
     }
     acceptRelocatedActorTerminal(operation, replyRouteId, result) {
@@ -855,22 +889,24 @@ class ServiceStatefulRuntime {
             payloadFrame
         ], metadataFrame));
     }
-    requestToInstanceSpot(route, payload, timeoutMs, sourceSpotId, metadataFrame, instanceIntent = false, onAdmitted) {
-        const pending = this.operations.register(timeoutMs);
+    requestToInstanceSpot(route, payload, timeoutMs, sourceSpotId, metadataFrame, instanceIntent = false, onAdmitted, requestOperation, receiver) {
+        const pending = requestOperation ??
+            this.operations.register(timeoutMs);
         this.submitRequest(pending, route.targetNodeRid, instanceOperationParts([
             (0, service_stateful_wire_codec_1.encodeInstanceSpotHeader)(route, this.nodeGeneration, this.nodeRid, sourceSpotId, 'request', { high: operation_identity_1.ZLINK_NATIVE_CORRELATION_OPERATION_NAMESPACE, low: pending.id }, pending.id, metadataFrame !== undefined, instanceIntent),
             (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)
-        ], metadataFrame), timeoutMs, 'instanceSpotRequest', undefined, onAdmitted);
+        ], metadataFrame), timeoutMs, 'instanceSpotRequest', undefined, onAdmitted, receiver);
         return pending;
     }
-    requestToMissingInstanceSpot(target, payload, timeoutMs, sourceSpotId, metadataFrame) {
+    requestToMissingInstanceSpot(target, payload, timeoutMs, sourceSpotId, metadataFrame, requestOperation) {
         const deadlineUnixMs = BigInt(Date.now() + timeoutMs);
         const payloadFrame = (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload);
-        return this.requestToMissingInstanceSpotFrame(target, payloadFrame, deadlineUnixMs, sourceSpotId, metadataFrame);
+        return this.requestToMissingInstanceSpotFrame(target, payloadFrame, deadlineUnixMs, sourceSpotId, metadataFrame, undefined, requestOperation);
     }
-    requestToMissingInstanceSpotFrame(target, payloadFrame, deadlineUnixMs, sourceSpotId, metadataFrame, onAdmitted) {
+    requestToMissingInstanceSpotFrame(target, payloadFrame, deadlineUnixMs, sourceSpotId, metadataFrame, onAdmitted, requestOperation) {
         const timeoutMs = remainingDeadlineMs(deadlineUnixMs);
-        const pending = this.operations.register(timeoutMs);
+        const pending = requestOperation ??
+            this.operations.register(timeoutMs);
         this.submitRequest(pending, target.targetNodeRid, instanceOperationParts([
             (0, service_stateful_wire_codec_1.encodeInstanceSpotActivationHeader)(target, this.nodeGeneration, this.nodeRid, sourceSpotId, 'request', { high: operation_identity_1.ZLINK_NATIVE_CORRELATION_OPERATION_NAMESPACE, low: pending.id }, deadlineUnixMs, pending.id, metadataFrame !== undefined),
             payloadFrame
@@ -889,10 +925,10 @@ class ServiceStatefulRuntime {
             queueMicrotask(() => {
                 try {
                     this.registry.destroyActor(actor);
-                    this.operations.reply(pending.id, { terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
+                    pending.reply({ terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
                 }
                 catch (error) {
-                    this.operations.reply(pending.id, failure(error));
+                    pending.reply(failure(error));
                 }
             });
             return pending;
@@ -903,7 +939,7 @@ class ServiceStatefulRuntime {
     }
     joinActor(actor, targetNodeRid, targetSpot, targetSpotGeneration, payload, timeoutMs) {
         const deadlineMs = performance.now() + timeoutMs;
-        const pending = this.operations.register(timeoutMs, targetNodeRid === this.nodeRid ? 'registry' : 'sender');
+        const pending = this.operations.register(timeoutMs, 'registry', undefined, deadlineMs);
         const target = this.trySpotFence(targetNodeRid, {
             ...targetSpot,
             generation: targetSpotGeneration
@@ -913,7 +949,7 @@ class ServiceStatefulRuntime {
     }
     joinActorCanonical(actor, targetNodeRid, targetSpot, targetSpotGeneration, request, actorFence, local, timeoutMs) {
         const deadlineMs = performance.now() + timeoutMs;
-        const pending = this.operations.register(timeoutMs, targetNodeRid === this.nodeRid ? 'registry' : 'sender');
+        const pending = this.operations.register(timeoutMs, 'registry', undefined, deadlineMs);
         const target = this.trySpotFence(targetNodeRid, {
             ...targetSpot,
             generation: targetSpotGeneration
@@ -927,13 +963,13 @@ class ServiceStatefulRuntime {
     }
     joinActorEntrySpot(actor, targetNodeRid, payload, timeoutMs) {
         const deadlineMs = performance.now() + timeoutMs;
-        const pending = this.operations.register(timeoutMs, targetNodeRid === this.nodeRid ? 'registry' : 'sender');
+        const pending = this.operations.register(timeoutMs, 'registry', undefined, deadlineMs);
         this.submitActorJoin(pending, actor, targetNodeRid, this.tryEntrySpotFence(targetNodeRid), payload, deadlineMs);
         return pending;
     }
     joinActorEntrySpotCanonical(actor, targetNodeRid, request, actorFence, local, timeoutMs) {
         const deadlineMs = performance.now() + timeoutMs;
-        const pending = this.operations.register(timeoutMs, targetNodeRid === this.nodeRid ? 'registry' : 'sender');
+        const pending = this.operations.register(timeoutMs, 'registry', undefined, deadlineMs);
         this.submitActorJoin(pending, actor, targetNodeRid, this.tryEntrySpotFence(targetNodeRid), request, deadlineMs, { request, actorFence, local });
         return pending;
     }
@@ -955,20 +991,20 @@ class ServiceStatefulRuntime {
                     currentMembershipEpoch: transition.currentMembershipEpoch,
                     resultCode: 0
                 });
-                this.operations.reply(pending.id, { terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
+                pending.reply({ terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
             }
             catch (error) {
-                this.operations.reply(pending.id, failure(error));
+                pending.reply(failure(error));
             }
         });
         return pending;
     }
     bindSession(sessionRid, actor, timeoutMs, deliver, onBindingReplaced, actorAuthority, close) {
         const deadlineMs = performance.now() + timeoutMs;
-        const pending = this.operations.register(timeoutMs, 'sender');
+        const pending = this.operations.register(timeoutMs, 'registry', undefined, deadlineMs);
         const sessionOwner = this.localSessionOwner();
         if (sessionOwner === undefined) {
-            this.operations.reply(pending.id, failure((0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Session owner '${this.nodeRid}' has no live MeshNode descriptor.`)));
+            pending.reply(failure((0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Session owner '${this.nodeRid}' has no live MeshNode descriptor.`)));
             return pending;
         }
         const deliveryKey = actorKey(actor);
@@ -1013,7 +1049,7 @@ class ServiceStatefulRuntime {
                     else {
                         this.sessionDeliveries.set(deliveryKey, { ...delivery, binding: previous });
                     }
-                    this.operations.reply(pending.id, {
+                    pending.reply({
                         terminalResult: runtime_values_1.RequestResult.Ok,
                         failureCode: 0
                     });
@@ -1022,7 +1058,7 @@ class ServiceStatefulRuntime {
                 const binding = this.registry.installSessionBinding(localBinding);
                 installedDelivery = { ...delivery, binding };
                 this.sessionDeliveries.set(deliveryKey, installedDelivery);
-                this.operations.reply(pending.id, {
+                pending.reply({
                     terminalResult: runtime_values_1.RequestResult.Ok,
                     failureCode: 0,
                     kindData: undefined
@@ -1044,7 +1080,7 @@ class ServiceStatefulRuntime {
                     this.sessionDeliveries.get(deliveryKey) === installedDelivery) {
                     this.sessionDeliveries.delete(deliveryKey);
                 }
-                this.operations.reply(pending.id, failure(error));
+                pending.reply(failure(error));
             }
             return pending;
         }
@@ -1059,12 +1095,11 @@ class ServiceStatefulRuntime {
             });
         }
         catch (error) {
-            this.operations.fail(pending.id, error);
+            pending.replyFailure(error);
             return pending;
         }
-        void this.requestDurableOperation(actor.nodeRid, [header], pending.id, 'streamBind', deadlineMs).then((reply) => this.completeRemoteReply(pending, actor.nodeRid, 'streamBind', undefined, reply), (error) => this.operations.fail(pending.id, error));
-        return {
-            id: pending.id,
+        void this.requestDurableOperation(actor.nodeRid, [header], pending.id, 'streamBind', pending).then((reply) => this.completeRemoteReply(pending, actor.nodeRid, 'streamBind', undefined, reply), (error) => pending.replyFailure(error));
+        return Object.assign(Object.create(pending), {
             promise: pending.promise.then((result) => {
                 if (result.terminalResult === runtime_values_1.RequestResult.Ok && result.streamBinding !== undefined) {
                     const committed = {
@@ -1094,13 +1129,13 @@ class ServiceStatefulRuntime {
                 }
                 return result;
             })
-        };
+        });
     }
     closeBoundSession(actor, expectedBindingGeneration, timeoutMs) {
         const pending = this.operations.register(timeoutMs);
         const binding = this.registry.binding(actor);
         if (binding === undefined) {
-            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorSessionNotBound));
+            pending.reply((0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorSessionNotBound));
             return pending;
         }
         const header = Buffer.from((0, service_wire_codec_generated_1.encodeBoundSessionCloseCommand)({
@@ -1118,9 +1153,9 @@ class ServiceStatefulRuntime {
             }
         }, {})[0]);
         const reply = (0, routing_id_1.routingIdsEqual)(binding.sessionOwnerNodeRid, this.nodeRid)
-            ? this.requestLocalInfrastructure(header, pending.id, timeoutMs)
-            : this.raw.requestService(binding.sessionOwnerNodeRid, [header], timeoutMs);
-        void reply.then((parts) => this.completeRemoteReply(pending, binding.sessionOwnerNodeRid, 'boundSessionClose', undefined, parts), (error) => this.operations.fail(pending.id, error));
+            ? this.requestLocalInfrastructure(header, pending.id, pending)
+            : (0, durable_service_request_1.requestDurableService)(this.raw, binding.sessionOwnerNodeRid, [header], pending, 'boundSessionClose');
+        void reply.then((parts) => this.completeRemoteReply(pending, binding.sessionOwnerNodeRid, 'boundSessionClose', undefined, parts), (error) => pending.replyFailure(error));
         return pending;
     }
     unbindSession(sessionRid, actor, expectedBindingGeneration, timeoutMs) {
@@ -1129,17 +1164,17 @@ class ServiceStatefulRuntime {
         if (delivery === undefined ||
             !(0, routing_id_1.routingIdsEqual)(delivery.binding.sessionRid, sessionRid) ||
             delivery.binding.bindingGeneration !== expectedBindingGeneration) {
-            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
+            pending.reply((0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
             return pending;
         }
         this.sessionDeliveries.delete(actorKey(actor));
         if (actor.nodeRid === this.nodeRid) {
             try {
                 this.registry.unbindSession(actor, expectedBindingGeneration);
-                this.operations.reply(pending.id, { terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
+                pending.reply({ terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
             }
             catch (error) {
-                this.operations.reply(pending.id, failure(error));
+                pending.reply(failure(error));
             }
             return pending;
         }
@@ -1201,14 +1236,16 @@ class ServiceStatefulRuntime {
         ]);
     }
     expireOperations(nowMs, turnDeadlineMs) {
-        return this.operations.expire(nowMs, turnDeadlineMs);
+        return this.requests === undefined && nowMs >= this.operations.nextDeadlineMs()
+            ? this.operations.expire(nowMs, turnDeadlineMs)
+            : 0;
     }
     get pendingOperationCount() {
         return this.operations.size;
     }
     /** The next stateful request expiry, as a lower bound. */
     nextMaintenanceDeadlineMs() {
-        return this.operations.nextDeadlineMs();
+        return this.requests === undefined ? this.operations.nextDeadlineMs() : Infinity;
     }
     close() {
         if (this.closed)
@@ -1303,7 +1340,7 @@ class ServiceStatefulRuntime {
                 ? record.parts.length >= 2
                     ? record.parts[record.parts.length - 1]
                     : undefined
-                : (0, service_wire_m6a_codec_1.encodeApplicationPayload)(canonicalPayload);
+                : (0, service_wire_m6a_codec_1.encodeOwnedApplicationPayload)(canonicalPayload);
             try {
                 return await this.handleIngress(record, decoded, payloadFrame, metadataFrame, canonicalActorJoin, canonicalPayload);
             }
@@ -1419,6 +1456,48 @@ class ServiceStatefulRuntime {
                         binding.sessionOwnerNodeRid !== ingress.sourceRoutingId) {
                         throw new service_stateful_registry_1.ServiceStaleGenerationError('binding', record.target.actor.actorId);
                     }
+                    if (!this.registry.acceptBoundSessionSequence(record.target.actor, record.boundSession.bindingGeneration, record.boundSession.sequence)) {
+                        const error = new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.InvalidOperation, 'Bound Session relay sequence does not increase.');
+                        const reporter = this.dispatchErrors;
+                        if (record.kind === 'actorRequest') {
+                            if (reporter?.captureEnabled() === true) {
+                                reporter.report({
+                                    surface: ZLinkDispatchOptions_1.ZLinkDispatchErrorSurface.StreamSession,
+                                    messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Request,
+                                    reason: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.StaleTarget,
+                                    action: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorAction.ReplyError,
+                                    meshName: this.dispatchErrorMeshName,
+                                    sourceRid: ingress.sourceRoutingId,
+                                    actorId: record.target.actor.actorId,
+                                    correlationId: record.correlation?.toString(),
+                                    error
+                                });
+                            }
+                            const result = failure(error);
+                            this.replyWire(ingress, record.correlation, result.terminalResult, result.failureCode);
+                            return 'infrastructure';
+                        }
+                        const tracePoint = (0, message_flow_1.flowIfEnabled)(reporter?.flow, ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Dropped);
+                        if (tracePoint !== undefined) {
+                            tracePoint.trace({
+                                outcome: ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Dropped,
+                                surface: ZLinkDispatchOptions_1.ZLinkDispatchErrorSurface.StreamSession,
+                                messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
+                                packetName: (0, service_wire_m6a_codec_1.decodeApplicationPayloadView)(payloadFrame).packetName,
+                                ...(this.dispatchErrorMeshName === undefined
+                                    ? {}
+                                    : { meshName: this.dispatchErrorMeshName }),
+                                ...(record.correlation === undefined
+                                    ? {}
+                                    : { correlationId: record.correlation.toString() }),
+                                sourceRid: ingress.sourceRoutingId,
+                                actorId: record.target.actor.actorId,
+                                streamSessionId: record.boundSession.sessionRid,
+                                errorReason: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.StaleTarget
+                            });
+                        }
+                        return 'application';
+                    }
                 }
                 return this.enqueueApplicationFrame(ingress, `actor:${actor.ref.actorId}\0${actor.ref.generation}`, payloadFrame, {
                     receiveKind: record.kind === 'actorSend' ? service_runtime_contracts_1.ReceiveKind.ActorSend : service_runtime_contracts_1.ReceiveKind.ActorRequest,
@@ -2237,7 +2316,7 @@ class ServiceStatefulRuntime {
                     }
                 })
         };
-        const applicationFrame = payloadFrame ?? (0, service_wire_m6a_codec_1.encodeApplicationPayload)(emptyPayload());
+        const applicationFrame = payloadFrame ?? (0, service_wire_m6a_codec_1.encodeOwnedApplicationPayload)(emptyPayload());
         return this.enqueueLifecycleFrame(ingress, `spot:${record.target.spot.spotId}`, applicationFrame, {
             receiveKind: service_runtime_contracts_1.ReceiveKind.SpotControl,
             operationKind: service_runtime_contracts_1.OperationKind.ActorJoin,
@@ -2658,7 +2737,7 @@ class ServiceStatefulRuntime {
     async enqueueLogicalMulticast(channelName, topic, sourceSpotId, payload, sourceNodeRid = this.nodeRid) {
         const applicationJobOwner = await this.raw.reserveLocalIngress();
         try {
-            await this.enqueueLogicalMulticastFrame(channelName, topic, sourceSpotId, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload), sourceNodeRid, applicationJobOwner);
+            await this.enqueueLogicalMulticastFrame(channelName, topic, sourceSpotId, (0, service_wire_m6a_codec_1.encodeOwnedApplicationPayload)(payload), sourceNodeRid, applicationJobOwner);
         }
         finally {
             applicationJobOwner.close();
@@ -2937,60 +3016,57 @@ class ServiceStatefulRuntime {
         }
     }
     async requestUserSpotOperation(targetNodeRid, header, correlation, operationKind, timeoutMs) {
-        const parts = await this.requestDurableOperation(targetNodeRid, [header], correlation, operationKind, performance.now() + Math.max(1, timeoutMs));
-        // A received envelope, including a decode failure, ends sender replay.
-        try {
-            if (parts.length < 1 || parts.length > 2) {
-                throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid creation operation reply parts.');
-            }
-            const decoded = (0, service_stateful_wire_codec_1.decodeStatefulReply)(parts[0], correlation, operationKind, parts.length >= 2);
-            if (decoded.terminalResult !== runtime_values_1.RequestResult.Ok && parts.length !== 1) {
-                throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Failed creation operation reply carries a payload.');
+        const deadlineMs = performance.now() + Math.max(1, timeoutMs);
+        const pending = this.operations.register(Math.max(1, timeoutMs), 'registry', undefined, deadlineMs);
+        const completed = (parts) => {
+            try {
+                if (parts.length < 1 || parts.length > 2) {
+                    throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid creation operation reply parts.');
+                }
+                const decoded = (0, service_stateful_wire_codec_1.decodeStatefulReply)(parts[0], correlation, operationKind, parts.length >= 2);
+                if (decoded.terminalResult !== runtime_values_1.RequestResult.Ok && parts.length !== 1) {
+                    throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Failed creation operation reply carries a payload.');
+                }
+                if (operationKind === 'userSpotClose' && parts.length !== 1) {
+                    throw new service_wire_m6a_codec_1.ServiceWireProtocolError('User Spot close reply carries a payload.');
+                }
+                const value = {
+                    terminalResult: decoded.terminalResult,
+                    failureCode: decoded.failureCode,
+                    ...(decoded.tail === undefined ? {} : { tail: decoded.tail }),
+                    ...(parts.length === 2 ? { payload: (0, service_wire_m6a_codec_1.decodeApplicationPayload)(parts[1]) } : {})
+                };
+                pending.complete(value);
             }
-            if (operationKind === 'userSpotClose' && parts.length !== 1) {
-                throw new service_wire_m6a_codec_1.ServiceWireProtocolError('User Spot close reply carries a payload.');
+            catch (error) {
+                pending.fail((0, framework_errors_internal_1.translateWireReplyDecodeError)(error));
             }
-            return {
-                terminalResult: decoded.terminalResult,
-                failureCode: decoded.failureCode,
-                ...(decoded.tail === undefined ? {} : { tail: decoded.tail }),
-                ...(parts.length === 2 ? { payload: (0, service_wire_m6a_codec_1.decodeApplicationPayload)(parts[1]) } : {})
-            };
-        }
-        catch (error) {
-            throw (0, framework_errors_internal_1.translateWireReplyDecodeError)(error);
-        }
+        };
+        const failed = (error) => {
+            pending.fail(error);
+        };
+        void this.requestDurableOperation(targetNodeRid, [header], correlation, operationKind, pending).then(completed, failed);
+        return pending.promise;
     }
-    async requestDurableOperation(targetNodeRid, parts, correlation, operationKind, deadlineMs) {
+    async requestDurableOperation(targetNodeRid, parts, correlation, operationKind, pending) {
         this.requireOpen();
         if (targetNodeRid === this.nodeRid) {
-            return this.requestLocalInfrastructure(parts[0], correlation, Math.ceil(deadlineMs - performance.now()));
+            return this.requestLocalInfrastructure(parts[0], correlation, pending);
         }
-        return (0, durable_service_request_1.requestDurableService)(this.raw, targetNodeRid, parts, deadlineMs, operationKind);
+        return (0, durable_service_request_1.requestDurableService)(this.raw, targetNodeRid, parts, pending, operationKind);
     }
-    requestLocalInfrastructure(header, requestSequence, timeoutMs) {
+    requestLocalInfrastructure(header, requestSequence, pending) {
         return new Promise((resolve, reject) => {
-            let settled = false;
-            const fail = (error) => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(timer);
-                reject(error);
-            };
-            const timer = setTimeout(() => {
-                fail(new Error('Local infrastructure request timed out.'));
-            }, timeoutMs);
             const finish = (parts) => {
-                if (settled)
-                    return;
-                settled = true;
-                clearTimeout(timer);
                 resolve(parts.map((part) => Buffer.from(part)));
             };
             void (async () => {
                 const applicationJobOwner = await this.raw.reserveLocalIngress();
                 try {
+                    if (!pending.isPending()) {
+                        await pending.promise;
+                        throw new operation_registry_1.OperationCancelledError(pending.id, 'Request is already terminal.');
+                    }
                     const result = await this.ingress({
                         command: header[service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET],
                         flags: header[service_wire_binary_primitives_1.SERVICE_WIRE_FLAGS_OFFSET],
@@ -3001,18 +3077,19 @@ class ServiceStatefulRuntime {
                         applicationJobOwner
                     });
                     if (result !== 'infrastructure') {
-                        fail(new service_wire_m6a_codec_1.ServiceWireProtocolError(`Local infrastructure request was rejected as '${result ?? 'unsupported'}'.`));
+                        throw new service_wire_m6a_codec_1.ServiceWireProtocolError(`Local infrastructure request was rejected as '${result ?? 'unsupported'}'.`);
                     }
                 }
                 finally {
                     applicationJobOwner.close();
                 }
-            })().catch(fail);
+            })().catch(reject);
         });
     }
     async submitOneWay(targetNodeRid, parts) {
         this.requireOpen();
         if (targetNodeRid === this.nodeRid) {
+            parts = copyRetainedServiceFrames(parts);
             const applicationJobOwner = await this.raw.reserveLocalIngress();
             if ((0, execution_1.captureZLinkExecutionTurn)() !== undefined) {
                 //  The sender is inside a Spot serial turn. Running ingress inline
@@ -3072,15 +3149,16 @@ class ServiceStatefulRuntime {
             ? runtime_values_1.SubmitResult.Ok
             : runtime_values_1.SubmitResult.NotConnected;
     }
-    submitRequest(pending, targetNodeRid, parts, timeoutMs, operationKind, actor, onAdmitted) {
+    submitRequest(pending, targetNodeRid, parts, timeoutMs, operationKind, actor, onAdmitted, receiver) {
         if (targetNodeRid === this.nodeRid) {
+            parts = copyRetainedServiceFrames(parts);
             const deadlineUnixMs = BigInt(Date.now() + Math.max(0, timeoutMs));
             const capacityStop = new AbortController();
             void pending.promise.then(() => capacityStop.abort(), () => capacityStop.abort());
             void (async () => {
                 const applicationJobOwner = await this.raw.reserveLocalIngress(capacityStop.signal);
                 try {
-                    if (!this.operations.isPending(pending.id))
+                    if (!pending.isPending())
                         return;
                     const localIngress = {
                         command: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET],
@@ -3091,25 +3169,55 @@ class ServiceStatefulRuntime {
                         parts,
                         applicationJobOwner
                     };
-                    await this.submitLocalRequest(localIngress, pending, operationKind, actor, deadlineUnixMs);
+                    await this.submitLocalRequest(localIngress, pending, operationKind, actor, deadlineUnixMs, receiver);
                 }
                 catch (error) {
-                    this.operations.reply(pending.id, failure(error));
+                    receiver === undefined
+                        ? pending.reply(failure(error))
+                        : receiver.operationFailed(pending.id, error, undefined);
                 }
                 finally {
                     applicationJobOwner.close();
                 }
-            })().catch((error) => this.operations.reply(pending.id, failure(error)));
+            })().catch((error) => receiver === undefined
+                ? pending.reply(failure(error))
+                : receiver.operationFailed(pending.id, error, undefined));
+            return;
+        }
+        if (receiver !== undefined) {
+            const completion = {
+                operationCompleted: (_id, reply) => this.completeRemoteReply(pending, targetNodeRid, operationKind, actor, reply, receiver),
+                operationFailed: (_id, error) => receiver.operationFailed(pending.id, error, undefined)
+            };
+            if (this.raw.isPeerRouteReady(targetNodeRid) === true) {
+                this.raw.requestService(targetNodeRid, parts, timeoutMs, onAdmitted, pending, completion);
+                return;
+            }
+            (0, durable_service_request_1.admitServiceRequest)(this.raw, targetNodeRid, pending, (remaining, finished) => {
+                this.raw.requestService(targetNodeRid, parts, remaining, onAdmitted, pending, {
+                    operationCompleted: (id, reply) => {
+                        finished();
+                        completion.operationCompleted(id, reply);
+                    },
+                    operationFailed: (id, error) => {
+                        finished();
+                        completion.operationFailed(id, error);
+                    }
+                });
+            }, (error) => completion.operationFailed(pending.id, error), operationKind);
             return;
         }
-        void this.raw.requestService(targetNodeRid, parts, timeoutMs, onAdmitted).then((reply) => this.completeRemoteReply(pending, targetNodeRid, operationKind, actor, reply), (error) => this.operations.fail(pending.id, error));
+        const reply = this.raw.isPeerRouteReady(targetNodeRid) === true
+            ? this.raw.requestService(targetNodeRid, parts, timeoutMs, onAdmitted, pending)
+            : (0, durable_service_request_1.requestDurableService)(this.raw, targetNodeRid, parts, pending, operationKind, undefined, undefined, onAdmitted);
+        void reply.then((reply) => this.completeRemoteReply(pending, targetNodeRid, operationKind, actor, reply), (error) => pending.replyFailure(error));
     }
     submitActorJoin(pending, actor, targetNodeRid, target, payload, deadlineMs, canonical) {
         const actorRoute = canonical === undefined
             ? this.tryActorFence(actor)
             : this.acceptCanonicalActorFence(actor, canonical.actorFence);
         if (target === undefined || actorRoute === undefined) {
-            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
+            pending.reply((0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
             return;
         }
         if (canonical !== undefined) {
@@ -3147,19 +3255,19 @@ class ServiceStatefulRuntime {
         }
         catch (error) {
             this.canonicalActorJoinHandoffs.delete(pending.id);
-            this.operations.fail(pending.id, error);
+            pending.replyFailure(error);
             return;
         }
         if (targetNodeRid === this.nodeRid) {
             this.submitRequest(pending, targetNodeRid, parts, Math.max(0, Math.ceil(deadlineMs - performance.now())), 'actorJoin', actor);
             return;
         }
-        void this.requestDurableOperation(targetNodeRid, parts, pending.id, 'actorJoin', deadlineMs).then((reply) => this.completeRemoteReply(pending, targetNodeRid, 'actorJoin', actor, reply), (error) => {
+        void this.requestDurableOperation(targetNodeRid, parts, pending.id, 'actorJoin', pending).then((reply) => this.completeRemoteReply(pending, targetNodeRid, 'actorJoin', actor, reply), (error) => {
             this.canonicalActorJoinHandoffs.delete(pending.id);
-            this.operations.fail(pending.id, error);
+            pending.replyFailure(error);
         });
     }
-    async submitLocalRequest(ingress, pending, operationKind, actor, deadlineUnixMs) {
+    async submitLocalRequest(ingress, pending, operationKind, actor, deadlineUnixMs, receiver) {
         const canonicalActorJoin = operationKind === 'actorJoin' ? (0, service_wire_pilot_codec_generated_1.decodeActorJoin28)(ingress.parts) : undefined;
         const decoded = canonicalActorJoin === undefined
             ? (0, service_stateful_wire_codec_1.decodeStatefulHeader)(ingress.parts[0])
@@ -3168,14 +3276,14 @@ class ServiceStatefulRuntime {
             ? ingress.parts.length < 2
                 ? undefined
                 : ingress.parts[1]
-            : (0, service_wire_m6a_codec_1.encodeApplicationPayload)({
+            : (0, service_wire_m6a_codec_1.encodeOwnedApplicationPayload)({
                 packetName: canonicalActorJoin.payload.packetName,
                 contentType: canonicalActorJoin.payload.contentType,
                 payload: Buffer.from(canonicalActorJoin.payload.payload)
             });
         if (decoded.kind === 'actorLookup') {
             const found = this.registry.actor(decoded.actorId);
-            this.operations.reply(pending.id, found === undefined
+            pending.reply(found === undefined
                 ? { terminalResult: runtime_values_1.RequestResult.NotFound, failureCode: ACTOR_ROUTE_NOT_FOUND }
                 : {
                     terminalResult: runtime_values_1.RequestResult.Ok,
@@ -3187,14 +3295,20 @@ class ServiceStatefulRuntime {
         if (decoded.kind === 'actorDestroy') {
             try {
                 this.registry.destroyActor(decoded.actor.actor);
-                this.operations.reply(pending.id, { terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
+                pending.reply({ terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
             }
             catch (error) {
-                this.operations.reply(pending.id, failure(error));
+                pending.reply(failure(error));
             }
             return;
         }
-        const localReply = (terminalResult, failureCode, replyPayload, tail) => this.operations.reply(pending.id, this.resultFromReply(terminalResult, failureCode, replyPayload, tail, this.nodeRid, actor));
+        const localReply = (terminalResult, failureCode, replyPayload, tail) => {
+            const result = this.resultFromReply(terminalResult, failureCode, replyPayload, tail, this.nodeRid, actor);
+            if (receiver === undefined)
+                return pending.reply(result);
+            receiver.operationCompleted(pending.id, result, undefined);
+            return true;
+        };
         if (decoded.kind === 'spotRequest') {
             this.validateDirectSpotFence(decoded.target);
             this.enqueueApplicationFrame(ingress, `spot:${decoded.target.spot.spotId}`, payloadFrame, {
@@ -3254,7 +3368,7 @@ class ServiceStatefulRuntime {
                 currentMembershipEpoch: (previous?.membershipEpoch ?? 0n) + 1n,
                 resultCode: 0
             };
-            this.enqueueLifecycleFrame(ingress, `spot:${decoded.target.spot.spotId}`, payloadFrame ?? (0, service_wire_m6a_codec_1.encodeApplicationPayload)(emptyPayload()), {
+            this.enqueueLifecycleFrame(ingress, `spot:${decoded.target.spot.spotId}`, payloadFrame ?? (0, service_wire_m6a_codec_1.encodeOwnedApplicationPayload)(emptyPayload()), {
                 receiveKind: service_runtime_contracts_1.ReceiveKind.SpotControl,
                 operationKind: service_runtime_contracts_1.OperationKind.ActorJoin,
                 correlation: decoded.correlation,
@@ -3270,7 +3384,7 @@ class ServiceStatefulRuntime {
                             payload: Buffer.from(canonicalActorJoin.payload.payload)
                         }
                     }),
-                isPending: () => this.operations.isPending(pending.id),
+                isPending: () => pending.isPending(),
                 ...(deadlineUnixMs === undefined ? {} : { deadlineUnixMs }),
                 onTerminalCompletion: () => completeOnJoinDispatchTerminal?.(),
                 reply: (terminalResult, failureCode, replyPayload, tail) => {
@@ -3279,7 +3393,7 @@ class ServiceStatefulRuntime {
                     const acceptedJoin = terminalResult === runtime_values_1.RequestResult.Ok &&
                         tail?.kind === 'actorJoin' &&
                         tail.joinResult === 0;
-                    if (acceptedJoin && this.operations.isPending(pending.id)) {
+                    if (acceptedJoin && pending.isPending()) {
                         // Commit membership now, but keep the source operation behind
                         // target OnJoinedActor. Entry finishes on this record; User
                         // Spot lifecycle finishes on the Joined control below.
@@ -3318,10 +3432,10 @@ class ServiceStatefulRuntime {
                 else {
                     this.registry.unbindSession(current.ref, decoded.binding.retiredGeneration, decoded.sessionRid, this.nodeRid);
                 }
-                this.operations.reply(pending.id, { terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
+                pending.reply({ terminalResult: runtime_values_1.RequestResult.Ok, failureCode: 0 });
             }
             catch (error) {
-                this.operations.reply(pending.id, failure(error));
+                pending.reply(failure(error));
             }
             return;
         }
@@ -3333,26 +3447,33 @@ class ServiceStatefulRuntime {
             this.enqueueInstanceSpot(ingress, decoded, ingress.parts[hasMetadata ? 2 : 1], metadataFrame, localReply);
             return;
         }
-        this.operations.reply(pending.id, {
+        pending.reply({
             terminalResult: runtime_values_1.RequestResult.ProtocolError,
             failureCode: 0
         });
         void operationKind;
     }
-    completeRemoteReply(pending, targetNodeRid, operationKind, actor, reply) {
+    completeRemoteReply(pending, targetNodeRid, operationKind, actor, reply, receiver) {
         const canonicalActorJoinHandoffId = operationKind === 'actorJoin' ? this.canonicalActorJoinHandoffs.get(pending.id) : undefined;
         try {
             if (reply.length < 1 || reply.length > 2)
                 throw new service_wire_m6a_codec_1.ServiceWireProtocolError('Invalid M6B reply parts.');
             const decoded = (0, service_stateful_wire_codec_1.decodeStatefulReply)(reply[0], pending.id, operationKind, reply.length >= 2);
             const payload = reply.length < 2 ? undefined : (0, service_wire_m6a_codec_1.decodeApplicationPayload)(reply[1]);
-            this.operations.reply(pending.id, this.resultFromReply(decoded.terminalResult, decoded.failureCode, payload, decoded.tail, targetNodeRid, actor, canonicalActorJoinHandoffId));
+            const result = this.resultFromReply(decoded.terminalResult, decoded.failureCode, payload, decoded.tail, targetNodeRid, actor, canonicalActorJoinHandoffId);
+            if (receiver === undefined)
+                pending.reply(result);
+            else
+                receiver.operationCompleted(pending.id, result, undefined);
         }
         catch (error) {
             //  Spec 32-framework-error-model:58-60, 91-92 — an unprocessable remote
             //  reply (decode/shape failure) fails the awaiting operation with a
             //  Framework ProtocolError instead of leaking the codec's plain Error.
-            this.operations.fail(pending.id, (0, framework_errors_internal_1.translateWireReplyDecodeError)(error));
+            if (receiver === undefined)
+                pending.replyFailure((0, framework_errors_internal_1.translateWireReplyDecodeError)(error));
+            else
+                receiver.operationFailed(pending.id, (0, framework_errors_internal_1.translateWireReplyDecodeError)(error), undefined);
         }
         finally {
             if (operationKind === 'actorJoin') {
@@ -3405,6 +3526,7 @@ class ServiceStatefulRuntime {
         return {
             terminalResult,
             failureCode,
+            ...(tail?.kind === 'streamBindRejected' ? { failureMessage: tail.rejectionMessage } : {}),
             ...(payload === undefined ? {} : { payload }),
             ...(tail?.kind === 'streamBind'
                 ? {
@@ -3541,7 +3663,9 @@ class ServiceStatefulRuntime {
                     else {
                         try {
                             const remainingMs = Math.max(1, Math.min(30_000, Math.ceil(state.expiresAtMs - performance.now())));
-                            const reply = await this.raw.requestService(state.target.targetNodeRid, parts, remainingMs);
+                            const pending = this.raw.beginInfrastructureRequest(remainingMs);
+                            const reply = await (0, durable_service_request_1.requestDurableService)(this.raw, state.target.targetNodeRid, parts, pending, 'spot message follow');
+                            pending.complete(reply);
                             this.raw.replyService(current.ingress, reply);
                         }
                         catch (error) {
@@ -3700,9 +3824,7 @@ class ServiceStatefulRuntime {
             : undefined;
     }
     tryEntrySpotFence(targetNodeRid) {
-        const targetNodeGeneration = targetNodeRid === this.nodeRid
-            ? this.nodeGeneration
-            : this.raw.topology.peer(targetNodeRid)?.descriptor.lifecycleGeneration;
+        const targetNodeGeneration = this.raw.peerLifecycleGeneration(targetNodeRid) ?? this.tryPeerGeneration(targetNodeRid);
         if (targetNodeGeneration === undefined)
             return undefined;
         return {
@@ -3741,8 +3863,8 @@ class ServiceStatefulRuntime {
                 ? current
                 : undefined;
         }
-        const peer = this.raw.topology.peer(targetNodeRid);
-        if (peer?.descriptor.lifecycleGeneration !== targetNodeGeneration) {
+        if ((this.raw.peerLifecycleGeneration(targetNodeRid) ?? this.tryPeerGeneration(targetNodeRid)) !==
+            targetNodeGeneration) {
             return undefined;
         }
         this.rememberSpotRoute(requested);
@@ -4143,6 +4265,9 @@ function emptyPayload() {
         payload: Buffer.alloc(0)
     };
 }
+function copyRetainedServiceFrames(parts) {
+    return parts.map((part) => (0, payload_slab_1.copyPayloadBytes)(part));
+}
 /**
  * The generated command-28 decoder is the canonical wire authority.  Keep
  * the stateful mailbox's internal record shape as an adapter only; it must