@zlink-systems/framework 0.25.0 → 0.27.0

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

@@ -2,23 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceStatefulRuntime = exports.ServiceInstanceActivationRedirectError = void 0;
 exports.statefulMailboxData = statefulMailboxData;
+const stream_wire_1 = require("@zlink-systems/stream-wire");
 const node_async_hooks_1 = require("node:async_hooks");
+const contracts_1 = require("../../contracts");
+const service_authority_payload_codec_1 = require("./service-authority-payload-codec");
+const ZLinkDispatchOptions_1 = require("../../contracts/Dispatch/ZLinkDispatchOptions");
 const abort_1 = require("../abort");
+const admission_1 = require("../admission");
+const runtime_values_1 = require("../backend/runtime-values");
+const message_flow_1 = require("../diagnostics/message-flow");
 const execution_1 = require("../execution");
 const framework_errors_internal_1 = require("../framework-errors-internal");
-const runtime_values_1 = require("../backend/runtime-values");
-const ZLinkDispatchOptions_1 = require("../../contracts/Dispatch/ZLinkDispatchOptions");
-const service_runtime_contracts_1 = require("./service-runtime-contracts");
+const service_wire_pilot_codec_generated_1 = require("../protocol/service_wire_pilot_codec.generated");
+const actor_join_recovery_codec_1 = require("./actor-join-recovery-codec");
+const operation_registry_1 = require("./operation-registry");
 const message_follow_suppression_registry_1 = require("./message-follow-suppression-registry");
+const operation_identity_1 = require("./operation-identity");
+const service_metadata_codec_1 = require("./service-metadata-codec");
+const service_runtime_contracts_1 = require("./service-runtime-contracts");
 const service_stateful_registry_1 = require("./service-stateful-registry");
 const service_stateful_wire_codec_1 = require("./service-stateful-wire-codec");
-const routing_id_1 = require("../routing-id");
-const service_wire_pilot_codec_generated_1 = require("../protocol/service_wire_pilot_codec.generated");
-const actor_join_recovery_codec_1 = require("./actor-join-recovery-codec");
+const service_wire_binary_primitives_1 = require("./service-wire-binary-primitives");
+const service_wire_constants_generated_1 = require("./service-wire-constants.generated");
 const service_wire_m6a_codec_1 = require("./service-wire-m6a-codec");
-const service_metadata_codec_1 = require("./service-metadata-codec");
-const contracts_1 = require("../../contracts");
-const ACTOR_ROUTE_STALE = 21;
+const STATEFUL_OPERATION_RETRY_TICK_MS = 20;
+const MAX_NODE_TIMER_DELAY_MS = 2_147_483_647;
 const SPOT_MOVING = 34;
 const USER_SPOT_OPERATION_CAPACITY = 65_536;
 const USER_SPOT_OPERATION_REPLAY_RETENTION_MS = 5 * 60_000;
@@ -46,7 +54,7 @@ class ServiceStatefulRuntime {
     //  behaves exactly like a frame arriving from the receive pump.
     static detachedIngressScope = node_async_hooks_1.AsyncLocalStorage.snapshot();
     registry;
-    operations = new service_stateful_registry_1.ServiceTerminalOperationRegistry();
+    operations;
     sessionDeliveries = new Map();
     /**
      * A local Actor owner can replace its own session binding before the
@@ -58,7 +66,6 @@ class ServiceStatefulRuntime {
     subscriptions = new Map();
     instanceIntents = new Map();
     admittedInstanceOperations = new Map();
-    pendingInstanceTerminals = new Map();
     pendingInstanceAuthorityTerminals = new Map();
     instanceApplicationWaiters = new Map();
     canonicalActorJoinHandoffs = new Map();
@@ -87,10 +94,11 @@ class ServiceStatefulRuntime {
     admittedUserSpotOperations = new Map();
     pendingInstanceActivations = new Map();
     closed = false;
-    constructor(raw, nodeRid, nodeGeneration) {
+    constructor(raw, nodeRid, nodeGeneration, onPendingOperationsChanged) {
         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.registry = new service_stateful_registry_1.ServiceStatefulRegistry(nodeRid, nodeGeneration);
         this.registry.createEntrySpot(nodeRid);
         raw.setServiceIngress((record) => this.ingress(record));
@@ -356,6 +364,7 @@ class ServiceStatefulRuntime {
             ...(envelope.replyRouteId === undefined ? {} : { replyRouteId: envelope.replyRouteId })
         };
         const applicationJobOwner = await this.raw.reserveLocalIngress();
+        const terminal = this.activationTerminalCompletion(target, route);
         try {
             const admitted = this.enqueueActivatedInstanceSpot({
                 command: service_stateful_wire_codec_1.M6bServiceWireCommand.instanceSpot,
@@ -365,9 +374,9 @@ class ServiceStatefulRuntime {
                     (0, service_stateful_wire_codec_1.encodeInstanceSpotActivationHeader)(target, envelope.sourceNodeGeneration, envelope.sourceNodeRid, envelope.sourceSpotId, envelope.operationKind, envelope.operation, envelope.deadlineUnixMs, envelope.replyRouteId, envelope.metadataFrame !== undefined)
                 ],
                 applicationJobOwner
-            }, record, Buffer.from(envelope.applicationPayloadFrame), spot, undefined, this.activationTerminalCompletion(target, route), envelope.metadataFrame === undefined
+            }, record, Buffer.from(envelope.applicationPayloadFrame), spot, undefined, terminal.onTerminalCompletion, envelope.metadataFrame === undefined
                 ? undefined
-                : (0, service_metadata_codec_1.validateServiceMetadataFrame)(envelope.metadataFrame), true, this.instanceApplicationTarget(record, route.objectGeneration));
+                : (0, service_metadata_codec_1.validateServiceMetadataFrame)(envelope.metadataFrame), terminal.onHandlerTurnStarted, this.instanceApplicationTarget(record, route.objectGeneration));
             if (admitted !== 'application') {
                 throw new Error('Recovered Instance activation was not admitted to the local queue.');
             }
@@ -436,10 +445,10 @@ class ServiceStatefulRuntime {
         }
         return released;
     }
+    /** Resolves once every first terminal record of an activated Instance message is durable. */
     waitForInstanceApplicationQuiescence(spotId, signal) {
         const key = String(spotId);
-        if ((this.pendingInstanceTerminals.get(key) ?? 0) === 0 &&
-            (this.pendingInstanceAuthorityTerminals.get(key) ?? 0) === 0) {
+        if ((this.pendingInstanceAuthorityTerminals.get(key) ?? 0) === 0) {
             return Promise.resolve();
         }
         if (signal?.aborted === true) {
@@ -653,7 +662,11 @@ class ServiceStatefulRuntime {
                     reporter.report({
                         surface: ZLinkDispatchOptions_1.ZLinkDispatchErrorSurface.SpotRoute,
                         messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
-                        reason: serviceSpotPublishFailureReason(undefined, this.raw.isPeerRouteReady(target.descriptor.nodeRoutingId), this.closed),
+                        reason: this.closed
+                            ? ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.Shutdown
+                            : this.raw.isPeerRouteReady(target.descriptor.nodeRoutingId)
+                                ? ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.Backpressure
+                                : ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.StaleTarget,
                         action: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorAction.Drop,
                         meshName: this.dispatchErrorMeshName,
                         channelName,
@@ -669,20 +682,23 @@ class ServiceStatefulRuntime {
         if (target === undefined) {
             return runtime_values_1.SubmitResult.NotFound;
         }
-        const header = (0, service_stateful_wire_codec_1.encodeSpotHeader)('spotSend', sourceSpotId, target);
+        const header = (0, service_stateful_wire_codec_1.encodeSpotHeader)('spotSend', sourceSpotId, target, undefined, {
+            high: this.nodeGeneration,
+            low: this.nextMessageFollowOperation++
+        });
         return this.submitOneWay(target.targetNodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)]);
     }
     requestToSpot(sourceSpotId, requested, payload, timeoutMs) {
         const pending = this.operations.register(timeoutMs);
         const target = this.acceptSpotAuthority(requested);
         if (target === undefined) {
-            this.operations.reply(pending.id, {
-                terminalResult: runtime_values_1.RequestResult.NotFound,
-                failureCode: ACTOR_ROUTE_STALE
-            });
+            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
             return pending;
         }
-        const header = (0, service_stateful_wire_codec_1.encodeSpotHeader)('spotRequest', sourceSpotId, target, pending.id);
+        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');
         return pending;
     }
@@ -695,17 +711,14 @@ class ServiceStatefulRuntime {
             : {
                 ...boundSession,
                 sequence: this.nextSessionSequence++
-            });
+            }, { high: this.nodeGeneration, low: this.nextMessageFollowOperation++ });
         return this.submitOneWay(target.nodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)]);
     }
     requestToActor(target, _targetNodeGeneration, _authorityOwnerGeneration, payload, timeoutMs, sourceActor, boundSession) {
         const pending = this.operations.register(timeoutMs);
         const route = this.tryActorFence(target);
         if (route === undefined) {
-            this.operations.reply(pending.id, {
-                terminalResult: runtime_values_1.RequestResult.NotFound,
-                failureCode: ACTOR_ROUTE_STALE
-            });
+            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
             return pending;
         }
         const header = (0, service_stateful_wire_codec_1.encodeActorHeader)('actorRequest', route, pending.id, sourceActor, boundSession === undefined
@@ -713,13 +726,13 @@ class ServiceStatefulRuntime {
             : {
                 ...boundSession,
                 sequence: this.nextSessionSequence++
-            });
+            }, { high: this.nodeGeneration, low: this.nextMessageFollowOperation++ });
         this.submitRequest(pending, target.nodeRid, [header, (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)], timeoutMs, 'actorRequest');
         return pending;
     }
-    async sendToInstanceSpot(route, payload, sourceSpotId, metadataFrame) {
+    async sendToInstanceSpot(route, payload, sourceSpotId, metadataFrame, instanceIntent = false) {
         return this.submitOneWay(route.targetNodeRid, instanceOperationParts([
-            (0, service_stateful_wire_codec_1.encodeInstanceSpotHeader)(route, this.nodeGeneration, this.nodeRid, sourceSpotId, 'send', { high: 0n, low: 0n }, undefined, metadataFrame !== undefined),
+            (0, service_stateful_wire_codec_1.encodeInstanceSpotHeader)(route, this.nodeGeneration, this.nodeRid, sourceSpotId, 'send', { high: 0n, low: 0n }, undefined, metadataFrame !== undefined, instanceIntent),
             (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)
         ], metadataFrame));
     }
@@ -733,10 +746,10 @@ class ServiceStatefulRuntime {
             payloadFrame
         ], metadataFrame));
     }
-    requestToInstanceSpot(route, payload, timeoutMs, sourceSpotId, metadataFrame) {
+    requestToInstanceSpot(route, payload, timeoutMs, sourceSpotId, metadataFrame, instanceIntent = false) {
         const pending = 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: 2n, low: pending.id }, pending.id, metadataFrame !== undefined),
+            (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');
         return pending;
@@ -841,7 +854,7 @@ class ServiceStatefulRuntime {
         });
         return pending;
     }
-    bindSession(sessionRid, actor, timeoutMs, deliver, onBindingReplaced, bindingIngress, actorAuthority) {
+    bindSession(sessionRid, actor, timeoutMs, deliver, onBindingReplaced, actorAuthority) {
         const deadlineMs = performance.now() + timeoutMs;
         const pending = this.operations.register(timeoutMs, 'sender');
         const generation = this.nextSessionSequence++;
@@ -858,7 +871,6 @@ class ServiceStatefulRuntime {
         const delivery = {
             binding: localBinding,
             deliver,
-            ...(bindingIngress === undefined ? {} : { bindingIngress }),
             ...(onBindingReplaced === undefined ? {} : { onBindingReplaced })
         };
         const deliveryKey = actorKey(actor);
@@ -966,10 +978,7 @@ class ServiceStatefulRuntime {
         if (delivery === undefined ||
             delivery.binding.sessionRid !== sessionRid ||
             delivery.binding.bindingGeneration !== expectedBindingGeneration) {
-            this.operations.reply(pending.id, {
-                terminalResult: runtime_values_1.RequestResult.NotFound,
-                failureCode: ACTOR_ROUTE_STALE
-            });
+            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
             return pending;
         }
         this.sessionDeliveries.delete(actorKey(actor));
@@ -993,7 +1002,16 @@ class ServiceStatefulRuntime {
     sessionBindings(sessionRid) {
         return [...this.sessionDeliveries.values()]
             .map((value) => value.binding)
-            .filter((binding) => binding.sessionRid === sessionRid);
+            .filter((binding) => binding.sessionRid === sessionRid)
+            .map((binding) => {
+            const owner = requireSessionOwnerIdentity(binding);
+            return {
+                ...binding,
+                sessionOwnerNodeGeneration: owner.nodeGeneration,
+                sessionOwnerId: owner.ownerId,
+                sessionOwnerLeaseGeneration: owner.leaseGeneration
+            };
+        });
     }
     allSessionBindings() {
         return [...this.sessionDeliveries.values()].map((value) => value.binding);
@@ -1008,15 +1026,21 @@ class ServiceStatefulRuntime {
             bindingGeneration: delivery.binding.bindingGeneration
         });
     }
-    async sendBoundSession(actor, expectedBindingGeneration, payload, senderFence) {
+    async sendBoundSession(actor, expectedBindingGeneration, payload) {
+        // Session–Actor binding §3 item 3: the source sends by binding identity to
+        // the registered route. The header's owner lifecycle fields are this node's
+        // current route values, not send conditions; the Session owner alone
+        // decides whether the binding is current.
         let binding;
         try {
             binding = this.registry.validateBoundSession(actor, expectedBindingGeneration);
         }
-        catch {
-            return runtime_values_1.SubmitResult.InvalidState;
+        catch (error) {
+            if (error instanceof service_stateful_registry_1.ServiceStaleGenerationError)
+                return runtime_values_1.SubmitResult.NotFound;
+            throw error;
         }
-        const actorFence = this.tryBoundSessionSendFence(actor, senderFence);
+        const actorFence = this.tryActorFence(actor);
         if (actorFence === undefined)
             return runtime_values_1.SubmitResult.InvalidState;
         const header = (0, service_stateful_wire_codec_1.encodeBoundSessionSendHeader)(actorFence, expectedBindingGeneration);
@@ -1025,26 +1049,21 @@ class ServiceStatefulRuntime {
             (0, service_wire_m6a_codec_1.encodeApplicationPayload)(payload)
         ]);
     }
+    expireOperations(nowMs, turnDeadlineMs) {
+        return this.operations.expire(nowMs, turnDeadlineMs);
+    }
+    get pendingOperationCount() {
+        return this.operations.size;
+    }
     close() {
         if (this.closed)
             return;
         this.closed = true;
         this.operations.close();
-        const clearedActors = new Set();
-        for (const deliveries of [this.sessionDeliveries, this.retiredSessionDeliveries]) {
-            for (const delivery of deliveries.values()) {
-                const actorId = delivery.binding.actor.actorId;
-                if (clearedActors.has(actorId))
-                    continue;
-                clearedActors.add(actorId);
-                delivery.bindingIngress?.clearOutbound(actorId, new Error(`Actor '${actorId}' Session service closed with retained outbound delivery.`));
-            }
-        }
         this.sessionDeliveries.clear();
         this.retiredSessionDeliveries.clear();
         this.appliedReplacementNotices.clear();
         this.instanceIntents.clear();
-        this.pendingInstanceTerminals.clear();
         this.pendingInstanceAuthorityTerminals.clear();
         for (const waiters of this.instanceApplicationWaiters.values()) {
             for (const waiter of waiters)
@@ -1094,7 +1113,8 @@ class ServiceStatefulRuntime {
                 decoded = statefulActorJoinFromCanonical(canonicalActorJoin);
             }
             else {
-                decoded = (0, service_stateful_wire_codec_1.decodeStatefulHeader)(record.parts[0]);
+                const metadata = (record.flags & service_stateful_wire_codec_1.M6bServiceWireFlag.metadata) !== 0;
+                decoded = (0, service_stateful_wire_codec_1.decodeStatefulHeader)(record.parts[0], record.parts[metadata ? 2 : 1], metadata ? record.parts[1] : undefined);
             }
             const hasPayload = [
                 'spotSend',
@@ -1106,19 +1126,26 @@ class ServiceStatefulRuntime {
                 'boundSessionSend'
             ].includes(decoded.kind);
             const instanceMetadata = decoded.kind === 'instanceSpot' && (record.flags & service_stateful_wire_codec_1.M6bServiceWireFlag.metadata) !== 0;
+            const statefulMetadata = (decoded.kind === 'spotSend' ||
+                decoded.kind === 'spotRequest' ||
+                decoded.kind === 'actorSend' ||
+                decoded.kind === 'actorRequest') &&
+                (record.flags & service_stateful_wire_codec_1.M6bServiceWireFlag.metadata) !== 0;
             const userSpotInfrastructure = decoded.kind === 'userSpotCreate' ||
                 decoded.kind === 'userSpotClose' ||
                 decoded.kind === 'actorCreate' ||
                 decoded.kind === 'messageFollow' ||
                 decoded.kind === 'boundSessionReplaced';
             if (record.parts.length < 1 ||
-                record.parts.length > (instanceMetadata ? 3 : 2) ||
-                (hasPayload && decoded.kind !== 'actorJoin' && record.parts.length !== 2) ||
+                record.parts.length > (instanceMetadata || statefulMetadata ? 3 : 2) ||
+                (hasPayload &&
+                    decoded.kind !== 'actorJoin' &&
+                    record.parts.length !== ((record.flags & service_stateful_wire_codec_1.M6bServiceWireFlag.metadata) !== 0 ? 3 : 2)) ||
                 (decoded.kind === 'instanceSpot' && record.parts.length !== (instanceMetadata ? 3 : 2)) ||
                 (userSpotInfrastructure && record.parts.length !== 1)) {
                 return 'protocolError';
             }
-            const metadataFrame = instanceMetadata
+            const metadataFrame = instanceMetadata || statefulMetadata
                 ? (0, service_metadata_codec_1.validateServiceMetadataFrame)(record.parts[1])
                 : undefined;
             const canonicalPayload = canonicalActorJoin?.payload === undefined
@@ -1150,6 +1177,21 @@ class ServiceStatefulRuntime {
                     if (kind === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestTargetNotFound ||
                         kind === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotMoving ||
                         kind === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotGenerationStale) {
+                        const reporter = this.dispatchErrors;
+                        if (decoded.kind === 'instanceSpot' && reporter?.captureEnabled() === true) {
+                            reporter.report({
+                                surface: ZLinkDispatchOptions_1.ZLinkDispatchErrorSurface.InstanceSpot,
+                                messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
+                                reason: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.StaleTarget,
+                                action: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorAction.Drop,
+                                meshName: this.dispatchErrorMeshName,
+                                sourceRid: decoded.sourceNodeRid,
+                                spotId: decoded.activation === 'ready'
+                                    ? decoded.route.targetSpotId
+                                    : decoded.target.targetSpotId,
+                                error
+                            });
+                        }
                         return 'protocolError';
                     }
                 }
@@ -1319,15 +1361,9 @@ class ServiceStatefulRuntime {
             targetSpotId: record.route.targetSpotId,
             stableType: intent.instanceType
         };
-        // A close seals execution only after the current application count reaches
-        // zero. A new Instance message must wait for that close even while the old
-        // activation is still materialized; otherwise it can be admitted after
-        // the close quiescence check and be removed with the old activation.
-        if (lifecycle.isClosing?.(applicationTarget) === true)
-            return true;
         return !lifecycle.isMaterialized(applicationTarget);
     }
-    enqueueActivatedInstanceSpot(ingress, record, payloadFrame, spot, localReply, onTerminalCompletion, metadataFrame, activationTerminal = false, applicationTargetOverride) {
+    enqueueActivatedInstanceSpot(ingress, record, payloadFrame, spot, localReply, onTerminalCompletion, metadataFrame, onHandlerTurnStarted, applicationTargetOverride) {
         let operationKey;
         if (record.activation === 'missing') {
             const now = BigInt(Date.now());
@@ -1354,10 +1390,6 @@ class ServiceStatefulRuntime {
         const terminalCompletion = onTerminalCompletion === undefined
             ? undefined
             : async () => {
-                // The application turn has returned before authority cleanup starts.
-                // Mark it quiescent first so a close requested by that turn can finish
-                // its local cleanup and release the exact authority fence below.
-                this.completeInstanceApplicationOperation(applicationTarget.targetSpotId);
                 try {
                     await onTerminalCompletion();
                 }
@@ -1373,8 +1405,11 @@ class ServiceStatefulRuntime {
             ...(record.operationKind === 'request' ? { correlation: record.replyRouteId } : {}),
             ...(record.sourceSpotId === undefined ? {} : { sourceSpotId: record.sourceSpotId }),
             targetSpot: spot.ref,
+            activationRecord: record,
+            ...(record.activation === 'missing' ? { deadlineUnixMs: record.deadlineUnixMs } : {}),
             ...(metadataFrame === undefined ? {} : { applicationMetadata: metadataFrame }),
             ...(terminalCompletion === undefined ? {} : { onTerminalCompletion: terminalCompletion }),
+            ...(onHandlerTurnStarted === undefined ? {} : { onHandlerTurnStarted }),
             ...(record.operationKind === 'request'
                 ? {
                     reply: onTerminalCompletion === undefined
@@ -1390,10 +1425,6 @@ class ServiceStatefulRuntime {
             this.admittedInstanceOperations.set(operationKey, record.deadlineUnixMs);
         }
         if (onTerminalCompletion !== undefined && result === 'application') {
-            this.beginInstanceApplicationOperation(applicationTarget.targetSpotId);
-            if (activationTerminal) {
-                this.beginInstanceAuthorityOperation(applicationTarget.targetSpotId);
-            }
             this.instanceApplicationLifecycle?.beginTerminal(applicationTarget);
         }
         return result;
@@ -1404,7 +1435,8 @@ class ServiceStatefulRuntime {
             const activation = await this.activateMissingInstanceAsync(record, payloadFrame, metadataFrame);
             if (this.closed)
                 return;
-            const admitted = this.enqueueActivatedInstanceSpot(ingress, record, payloadFrame, activation.spot, localReply, this.activationTerminalCompletion(record.target, activation.route), metadataFrame, true, this.instanceApplicationTarget(record, activation.route.objectGeneration));
+            const terminal = this.activationTerminalCompletion(record.target, activation.route);
+            const admitted = this.enqueueActivatedInstanceSpot(ingress, record, payloadFrame, activation.spot, localReply, terminal.onTerminalCompletion, metadataFrame, terminal.onHandlerTurnStarted, this.instanceApplicationTarget(record, activation.route.objectGeneration));
             if (admitted !== 'application') {
                 throw new Error('Activated Instance message was not admitted to the local queue.');
             }
@@ -1454,7 +1486,7 @@ class ServiceStatefulRuntime {
                 ? { ...record, route: latestRoute }
                 : record;
             const spot = this.requireInstanceActivation(ingress, refreshedRecord);
-            const admitted = this.enqueueActivatedInstanceSpot(ingress, refreshedRecord, payloadFrame, spot, undefined, this.instanceApplicationTerminalCompletion(this.instanceApplicationTarget(refreshedRecord)), metadataFrame);
+            const admitted = this.enqueueActivatedInstanceSpot(ingress, record, payloadFrame, spot, undefined, this.instanceApplicationTerminalCompletion(this.instanceApplicationTarget(refreshedRecord)), metadataFrame, undefined, this.instanceApplicationTarget(refreshedRecord));
             if (admitted !== 'application') {
                 throw new Error('Rematerialized Instance message was not admitted to the local queue.');
             }
@@ -1466,19 +1498,33 @@ class ServiceStatefulRuntime {
             this.replyWire(ingress, record.replyRouteId, result.terminalResult, result.failureCode);
         }
     }
+    /**
+     * Spot messaging §4 step 12 with §7 step 1: a Close waits for the first terminal
+     * record only of a message whose handler turn started before it; a message queued
+     * behind that Close is not counted, so it cannot hold the Close it follows.
+     */
     activationTerminalCompletion(target, route) {
         let completion;
+        let started = false;
         const applicationTarget = {
             targetSpotId: target.targetSpotId,
             stableType: target.stableType,
             objectGeneration: route.objectGeneration
         };
-        return () => (completion ??= (async () => {
-            let authorityCompletionSignaled = false;
+        const onHandlerTurnStarted = () => {
+            if (started || completion !== undefined)
+                return;
+            started = true;
+            this.beginInstanceAuthorityOperation(target.targetSpotId);
+        };
+        const onTerminalCompletion = () => (completion ??= (async () => {
+            let authorityCompletionSignaled = !started;
             try {
                 const released = await this.asyncInstanceAuthority?.complete(target, route);
-                this.completeInstanceAuthorityOperation(target.targetSpotId);
-                authorityCompletionSignaled = true;
+                if (!authorityCompletionSignaled) {
+                    this.completeInstanceAuthorityOperation(target.targetSpotId);
+                    authorityCompletionSignaled = true;
+                }
                 if (released !== undefined) {
                     const authorityReleased = (await this.instanceApplicationLifecycle?.completeTerminal(applicationTarget)) ??
                         false;
@@ -1496,6 +1542,7 @@ class ServiceStatefulRuntime {
                 }
             }
         })());
+        return { onTerminalCompletion, onHandlerTurnStarted };
     }
     instanceApplicationTerminalCompletion(target) {
         return async () => {
@@ -1530,24 +1577,10 @@ class ServiceStatefulRuntime {
             objectGeneration: record.route.objectGeneration
         };
     }
-    beginInstanceApplicationOperation(spotId) {
-        const key = String(spotId);
-        this.pendingInstanceTerminals.set(key, (this.pendingInstanceTerminals.get(key) ?? 0) + 1);
-    }
     beginInstanceAuthorityOperation(spotId) {
         const key = String(spotId);
         this.pendingInstanceAuthorityTerminals.set(key, (this.pendingInstanceAuthorityTerminals.get(key) ?? 0) + 1);
     }
-    completeInstanceApplicationOperation(spotId) {
-        const key = String(spotId);
-        const pending = this.pendingInstanceTerminals.get(key);
-        if (pending === undefined || pending <= 1) {
-            this.pendingInstanceTerminals.delete(key);
-            this.completeInstanceApplicationWaitersIfQuiescent(key);
-            return;
-        }
-        this.pendingInstanceTerminals.set(key, pending - 1);
-    }
     completeInstanceAuthorityOperation(spotId) {
         const key = String(spotId);
         const pending = this.pendingInstanceAuthorityTerminals.get(key);
@@ -1559,8 +1592,7 @@ class ServiceStatefulRuntime {
         this.pendingInstanceAuthorityTerminals.set(key, pending - 1);
     }
     completeInstanceApplicationWaitersIfQuiescent(key) {
-        if ((this.pendingInstanceTerminals.get(key) ?? 0) !== 0 ||
-            (this.pendingInstanceAuthorityTerminals.get(key) ?? 0) !== 0)
+        if ((this.pendingInstanceAuthorityTerminals.get(key) ?? 0) !== 0)
             return;
         const waiters = this.instanceApplicationWaiters.get(key);
         if (waiters === undefined)
@@ -1637,8 +1669,8 @@ class ServiceStatefulRuntime {
             // activation continuation can publish its in-memory intent. If the
             // local ready projection already carries the exact object and owner
             // fence from the received route, publish that validated projection
-            // instead of exposing a transient NotFound result to a following
-            // request. A mismatched or absent local projection remains NotFound.
+            // instead of rejecting a following request while publication finishes.
+            // An absent Ready projection cannot validate the received owner fence.
             const local = this.registry.spot(record.route.targetSpotId);
             if (local?.kind === 'instance' &&
                 local.state === 'ready' &&
@@ -1648,7 +1680,7 @@ class ServiceStatefulRuntime {
             }
         }
         if (intent === undefined) {
-            throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestTargetNotFound, `Instance Spot '${record.route.targetSpotId}' has no current Ready authority.`);
+            throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotMoving, `Instance Spot '${record.route.targetSpotId}' has no current Ready authority.`);
         }
         const current = intent.route;
         if (current.objectGeneration < record.route.objectGeneration) {
@@ -1754,6 +1786,40 @@ class ServiceStatefulRuntime {
         }
         const local = this.registry.spot(target.targetSpotId);
         const current = await authority.read(target);
+        if (current.kind === 'creating' &&
+            current.authority?.allocation.state === 'active' &&
+            this.instanceApplicationLifecycle?.isMaterializing?.(target) === true) {
+            return {
+                spot: { ref: { spotId: target.targetSpotId, generation: current.objectGeneration } },
+                route: {
+                    targetSpotId: target.targetSpotId,
+                    targetNodeRid: this.nodeRid,
+                    targetNodeGeneration: this.nodeGeneration,
+                    objectGeneration: current.objectGeneration,
+                    authorityOwnerGeneration: current.authorityOwnerGeneration,
+                    ownerId: current.authority.ownerId,
+                    leaseGeneration: current.authority.ownerLeaseGeneration,
+                    storeVersion: current.authority.storeVersion.value
+                }
+            };
+        }
+        if (current.kind === 'ready' &&
+            current.authority !== undefined &&
+            (0, service_authority_payload_codec_1.decodeServiceClosingSpotAuthority)(current.authority.payload) !== undefined) {
+            if (current.route.targetNodeRid !== this.nodeRid) {
+                throw new ServiceInstanceActivationRedirectError(current.route);
+            }
+            if (current.route.targetNodeGeneration !== this.nodeGeneration ||
+                (local !== undefined &&
+                    !routeMatchesLocal(current.route, local, this.nodeRid, this.nodeGeneration)) ||
+                (local === undefined && this.instanceApplicationLifecycle?.isMaterialized(target) !== true)) {
+                throw new service_stateful_registry_1.ServiceStaleGenerationError('spot', target.targetSpotId);
+            }
+            return {
+                spot: { ref: { spotId: target.targetSpotId, generation: current.route.objectGeneration } },
+                route: current.route
+            };
+        }
         if (!this.acceptsLocalMissingInstancePlacement()) {
             if (current.kind === 'ready' && current.route.targetNodeRid !== this.nodeRid) {
                 throw new ServiceInstanceActivationRedirectError(current.route);
@@ -1781,7 +1847,6 @@ class ServiceStatefulRuntime {
         }
         if (local !== undefined) {
             const lifecycle = this.instanceApplicationLifecycle;
-            const closing = lifecycle?.isClosing?.(target) === true;
             let materialized = lifecycle === undefined ? undefined : lifecycle.isMaterialized(target);
             const materializing = lifecycle?.isMaterializing?.(target) === true;
             if (local.kind !== 'instance' || local.stableType !== target.stableType) {
@@ -1790,9 +1855,7 @@ class ServiceStatefulRuntime {
             const joinsCreating = current.kind === 'creating' &&
                 local.ref.generation === current.objectGeneration &&
                 local.authorityOwnerGeneration === current.authorityOwnerGeneration;
-            const replacesClosingProjection = current.kind === 'creating' && closing;
             if (current.kind === 'missing' &&
-                !closing &&
                 !materializing &&
                 materialized === true &&
                 lifecycle !== undefined) {
@@ -1814,23 +1877,30 @@ class ServiceStatefulRuntime {
             // failure.
             // If disposal did not remove an orphaned materialization, keep fencing
             // it instead of admitting work into two application generations.
-            if ((!joinsCreating && !replacesClosingProjection && current.kind !== 'missing') ||
-                (!joinsCreating && !closing && materialized !== false && !materializing)) {
+            if ((!joinsCreating && current.kind !== 'missing') ||
+                (!joinsCreating && materialized !== false && !materializing)) {
                 throw new service_stateful_registry_1.ServiceStaleGenerationError('spot', target.targetSpotId);
             }
         }
-        const reserved = await authority.reserve({
-            target,
-            sourceNodeRid: record.sourceNodeRid,
-            sourceNodeGeneration: record.sourceNodeGeneration,
-            ...(record.sourceSpotId === undefined ? {} : { sourceSpotId: record.sourceSpotId }),
-            operationKind: record.operationKind,
-            operation: record.operation,
-            ...(record.replyRouteId === undefined ? {} : { replyRouteId: record.replyRouteId }),
-            deadlineUnixMs: record.deadlineUnixMs,
-            ...(metadataFrame === undefined ? {} : { metadataFrame }),
-            applicationPayloadFrame: payloadFrame
-        });
+        const deadline = operationDeadline(record.deadlineUnixMs);
+        let reserved;
+        try {
+            reserved = await authority.reserve({
+                target,
+                sourceNodeRid: record.sourceNodeRid,
+                sourceNodeGeneration: record.sourceNodeGeneration,
+                ...(record.sourceSpotId === undefined ? {} : { sourceSpotId: record.sourceSpotId }),
+                operationKind: record.operationKind,
+                operation: record.operation,
+                ...(record.replyRouteId === undefined ? {} : { replyRouteId: record.replyRouteId }),
+                deadlineUnixMs: record.deadlineUnixMs,
+                ...(metadataFrame === undefined ? {} : { metadataFrame }),
+                applicationPayloadFrame: payloadFrame
+            }, deadline.signal);
+        }
+        finally {
+            deadline.close();
+        }
         if (reserved.kind === 'ready') {
             throw new ServiceInstanceActivationRedirectError(reserved.route);
         }
@@ -1850,7 +1920,7 @@ class ServiceStatefulRuntime {
         }
         let committed;
         try {
-            committed = await authority.commit(target, reserved.reservation, activation.spot);
+            committed = await authority.commit(target, reserved.reservation, activation.spot, record.deadlineUnixMs);
         }
         catch (error) {
             if (activation.created)
@@ -2203,7 +2273,15 @@ class ServiceStatefulRuntime {
         const accepted = this.raw.mailbox.tryEnqueue({
             owner: `actor:${actor.actorId}\0${actor.generation}`,
             domain: 'infrastructure',
-            parts: [Buffer.from([0x5a, 0x4d, 1, service_stateful_wire_codec_1.M6bServiceWireCommand.boundSessionBind, 0])],
+            parts: [
+                Buffer.from([
+                    service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[0],
+                    service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[1],
+                    service_wire_constants_generated_1.SERVICE_WIRE_MAJOR,
+                    service_stateful_wire_codec_1.M6bServiceWireCommand.boundSessionBind,
+                    0
+                ])
+            ],
             sourceRoutingId: binding.sessionOwnerNodeRid,
             stateful: {
                 receiveKind: service_runtime_contracts_1.ReceiveKind.ActorBinding,
@@ -2232,63 +2310,26 @@ class ServiceStatefulRuntime {
         return accepted;
     }
     async deliverBoundSession(ingress, record, payloadFrame) {
+        // Session–Actor binding §3 item 3, §8.1: this Session owner's binding
+        // record alone decides whether command 36 names the current binding
+        // (ActorId, ObjectGeneration, binding generation; SessionRid is the
+        // record's own). The transport boundary has already authenticated the
+        // source peer, and the header's route fields are not compared here.
+        if (payloadFrame === undefined)
+            return 'protocolError';
         const delivery = this.sessionDeliveries.get(actorKey(record.actor.actor));
         if (delivery === undefined ||
-            delivery.binding.bindingGeneration !== record.expectedBindingGeneration ||
-            payloadFrame === undefined ||
-            ingress.sourceNodeGeneration === undefined ||
-            !(0, routing_id_1.routingIdsEqual)(ingress.sourceRoutingId, record.actor.actor.nodeRid) ||
-            ingress.sourceNodeGeneration !== record.actor.targetNodeGeneration) {
+            delivery.binding.bindingGeneration !== record.expectedBindingGeneration) {
+            this.traceRejectedBoundSessionSend(ingress, record, payloadFrame);
             return 'protocolError';
         }
         const sessionRid = delivery.binding.sessionRid;
-        let retainedPayload = payloadFrame;
-        let settled = false;
-        const settle = () => {
-            if (settled)
-                return false;
-            settled = true;
-            retainedPayload = undefined;
-            return true;
-        };
-        const operation = {
-            deliver: async () => {
-                if (settled || retainedPayload === undefined)
-                    return false;
-                const delivered = await delivery.deliver(sessionRid, retainedPayload);
-                if (delivered)
-                    settle();
-                return delivered;
-            },
-            fail: (_error) => {
-                settle();
-            }
-        };
-        const decision = await delivery.bindingIngress?.retainOutbound({
-            actorId: record.actor.actor.actorId,
-            objectGeneration: record.actor.actor.generation,
-            actorNodeRid: record.actor.actor.nodeRid,
-            actorNodeGeneration: record.actor.targetNodeGeneration,
-            authorityOwnerGeneration: record.actor.authorityOwnerGeneration,
-            ownerLeaseGeneration: record.actor.ownerLeaseGeneration,
-            producerNodeRid: ingress.sourceRoutingId,
-            producerNodeGeneration: ingress.sourceNodeGeneration,
-            sessionIdentity: sessionRid,
-            bindingGeneration: record.expectedBindingGeneration
-        }, operation);
-        if (decision === 'retained')
-            return 'application';
-        if (decision === 'rejected') {
-            return 'protocolError';
-        }
         try {
-            const delivered = await delivery.deliver(sessionRid, retainedPayload);
-            settle();
+            const delivered = await delivery.deliver(sessionRid, payloadFrame);
             if (!delivered)
                 return 'protocolError';
         }
         catch (error) {
-            operation.fail(error);
             // Remote command 36 is one-way: its source transport admission has
             // already completed, so a later client delivery terminal is local to
             // this session owner. Local fast paths still preserve the typed result.
@@ -2301,6 +2342,35 @@ class ServiceStatefulRuntime {
         }
         return 'application';
     }
+    //  Session–Actor binding §3 item 4: a push refused as not current is
+    //  recorded with the closed flow vocabulary (dropped, stream_session, send,
+    //  stale_target) instead of disappearing. Nothing is built while tracing is
+    //  off.
+    traceRejectedBoundSessionSend(ingress, record, payloadFrame) {
+        const tracePoint = (0, message_flow_1.flowIfEnabled)(this.dispatchErrors?.flow, ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Dropped);
+        if (tracePoint === undefined)
+            return;
+        let packetName;
+        try {
+            packetName = (0, service_wire_m6a_codec_1.decodeApplicationPayloadView)(payloadFrame).packetName;
+        }
+        catch (error) {
+            // A malformed payload is still a refused push; it is traced without a
+            // packet name.
+            if (!(error instanceof service_wire_m6a_codec_1.ServiceWireProtocolError))
+                throw error;
+        }
+        tracePoint.trace({
+            outcome: ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Dropped,
+            surface: ZLinkDispatchOptions_1.ZLinkDispatchErrorSurface.StreamSession,
+            messageKind: ZLinkDispatchOptions_1.ZLinkDispatchMessageKind.Send,
+            ...(packetName === undefined ? {} : { packetName }),
+            ...(this.dispatchErrorMeshName === undefined ? {} : { meshName: this.dispatchErrorMeshName }),
+            sourceRid: ingress.sourceRoutingId,
+            actorId: record.actor.actor.actorId,
+            errorReason: ZLinkDispatchOptions_1.ZLinkRuntimeDispatchErrorReason.StaleTarget
+        });
+    }
     enqueueApplicationFrame(ingress, owner, payloadFrame, stateful) {
         return this.enqueueFrame('application', ingress, owner, payloadFrame, stateful);
     }
@@ -2378,7 +2448,13 @@ class ServiceStatefulRuntime {
         }
     }
     enqueueActorControl(spotId, control, onTerminalCompletion) {
-        const header = Buffer.from([0x5a, 0x4d, 1, service_stateful_wire_codec_1.M6bServiceWireCommand.actorJoined, 0]);
+        const header = Buffer.from([
+            service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[0],
+            service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[1],
+            service_wire_constants_generated_1.SERVICE_WIRE_MAJOR,
+            service_stateful_wire_codec_1.M6bServiceWireCommand.actorJoined,
+            0
+        ]);
         let terminalAttempted = false;
         void (async () => {
             const applicationJobOwner = await this.raw.reserveLocalIngress();
@@ -2421,7 +2497,13 @@ class ServiceStatefulRuntime {
     enqueueActorBindingControl(ingress, binding, actorAuthority, reply) {
         const actor = binding.actor;
         const sessionOwner = requireSessionOwnerIdentity(binding);
-        const header = Buffer.from([0x5a, 0x4d, 1, service_stateful_wire_codec_1.M6bServiceWireCommand.boundSessionBind, 0]);
+        const header = Buffer.from([
+            service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[0],
+            service_wire_constants_generated_1.SERVICE_WIRE_MAGIC[1],
+            service_wire_constants_generated_1.SERVICE_WIRE_MAJOR,
+            service_stateful_wire_codec_1.M6bServiceWireCommand.boundSessionBind,
+            0
+        ]);
         const applicationJob = requireApplicationJobOwner(ingress).takeInitial('infrastructure');
         const accepted = this.raw.mailbox.tryEnqueue({
             owner: `actor:${actor.actorId}\0${actor.generation}`,
@@ -2561,7 +2643,7 @@ class ServiceStatefulRuntime {
         }
     }
     async executeUserSpotOperation(handler, record) {
-        const deadline = userSpotDeadline(record.deadlineUnixMs);
+        const deadline = operationDeadline(record.deadlineUnixMs);
         try {
             const result = record.kind === 'userSpotCreate'
                 ? await handler.create(record, deadline.signal)
@@ -2640,7 +2722,7 @@ class ServiceStatefulRuntime {
                         throw error;
                     if (durableRequestWasAdmitted(error))
                         wasAdmitted = true;
-                    const retryDelayMs = Math.min(20, deadlineMs - performance.now());
+                    const retryDelayMs = Math.min(STATEFUL_OPERATION_RETRY_TICK_MS, deadlineMs - performance.now());
                     if (retryDelayMs <= 0) {
                         throw durableOperationExhausted(operationKind, wasAdmitted, error);
                     }
@@ -2689,8 +2771,8 @@ class ServiceStatefulRuntime {
                 const applicationJobOwner = await this.raw.reserveLocalIngress();
                 try {
                     const result = await this.ingress({
-                        command: header[3],
-                        flags: header[4],
+                        command: header[service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET],
+                        flags: header[service_wire_binary_primitives_1.SERVICE_WIRE_FLAGS_OFFSET],
                         sourceRoutingId: this.nodeRid,
                         requestSequence,
                         reply: finish,
@@ -2723,8 +2805,8 @@ class ServiceStatefulRuntime {
                 void ServiceStatefulRuntime.detachedIngressScope(async () => {
                     try {
                         await this.ingress({
-                            command: parts[0][3],
-                            flags: parts[0][4],
+                            command: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET],
+                            flags: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_FLAGS_OFFSET],
                             sourceRoutingId: this.nodeRid,
                             sourceNodeGeneration: this.nodeGeneration,
                             parts,
@@ -2744,8 +2826,8 @@ class ServiceStatefulRuntime {
             }
             try {
                 const result = await this.ingress({
-                    command: parts[0][3],
-                    flags: parts[0][4],
+                    command: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET],
+                    flags: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_FLAGS_OFFSET],
                     sourceRoutingId: this.nodeRid,
                     sourceNodeGeneration: this.nodeGeneration,
                     parts,
@@ -2772,18 +2854,22 @@ class ServiceStatefulRuntime {
     submitRequest(pending, targetNodeRid, parts, timeoutMs, operationKind, actor) {
         if (targetNodeRid === this.nodeRid) {
             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();
-                const localIngress = {
-                    command: parts[0][3],
-                    flags: parts[0][4],
-                    sourceRoutingId: this.nodeRid,
-                    requestSequence: pending.id,
-                    parts,
-                    applicationJobOwner
-                };
+                const applicationJobOwner = await this.raw.reserveLocalIngress(capacityStop.signal);
                 try {
-                    this.submitLocalRequest(localIngress, pending, operationKind, actor, deadlineUnixMs);
+                    if (!this.operations.isPending(pending.id))
+                        return;
+                    const localIngress = {
+                        command: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_COMMAND_OFFSET],
+                        flags: parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_FLAGS_OFFSET],
+                        sourceRoutingId: this.nodeRid,
+                        requestSequence: pending.id,
+                        parts,
+                        applicationJobOwner
+                    };
+                    await this.submitLocalRequest(localIngress, pending, operationKind, actor, deadlineUnixMs);
                 }
                 catch (error) {
                     this.operations.reply(pending.id, failure(error));
@@ -2801,10 +2887,7 @@ class ServiceStatefulRuntime {
             ? this.tryActorFence(actor)
             : this.acceptCanonicalActorFence(actor, canonical.actorFence);
         if (target === undefined || actorRoute === undefined) {
-            this.operations.reply(pending.id, {
-                terminalResult: runtime_values_1.RequestResult.NotFound,
-                failureCode: ACTOR_ROUTE_STALE
-            });
+            this.operations.reply(pending.id, (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale));
             return;
         }
         if (canonical !== undefined) {
@@ -2854,7 +2937,7 @@ class ServiceStatefulRuntime {
             this.operations.fail(pending.id, error);
         });
     }
-    submitLocalRequest(ingress, pending, operationKind, actor, deadlineUnixMs) {
+    async submitLocalRequest(ingress, pending, operationKind, actor, deadlineUnixMs) {
         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])
@@ -2911,7 +2994,9 @@ class ServiceStatefulRuntime {
                 operationKind: service_runtime_contracts_1.OperationKind.ActorRequest,
                 correlation: decoded.correlation,
                 targetActor: current.ref,
-                ...(decoded.sourceActor === undefined ? {} : { sourceActor: decoded.sourceActor }),
+                ...(decoded.sourceActor === undefined
+                    ? {}
+                    : { sourceActor: { ...decoded.sourceActor, nodeRid: ingress.sourceRoutingId } }),
                 ...(decoded.boundSession === undefined
                     ? {}
                     : { sourceBindingGeneration: decoded.boundSession.bindingGeneration }),
@@ -3147,6 +3232,10 @@ class ServiceStatefulRuntime {
         return spot;
     }
     validateDirectSpotFence(fence) {
+        if (fence.targetNodeRid !== this.nodeRid ||
+            fence.targetNodeGeneration !== this.nodeGeneration) {
+            throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotMoving, `Spot '${fence.spot.spotId}' targets an unavailable owner route.`);
+        }
         const spot = this.registry.spot(fence.spot.spotId);
         if (spot === undefined) {
             throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestTargetNotFound, `Spot '${fence.spot.spotId}' has no current Ready authority.`);
@@ -3154,10 +3243,6 @@ class ServiceStatefulRuntime {
         if (spot.state !== 'ready') {
             throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotMoving, `Spot '${fence.spot.spotId}' is not Ready.`);
         }
-        if (fence.targetNodeRid !== this.nodeRid ||
-            fence.targetNodeGeneration !== this.nodeGeneration) {
-            throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotMoving, `Spot '${fence.spot.spotId}' targets an unavailable owner route.`);
-        }
         if (spot.kind === 'entry') {
             if (!isEntrySpotFence(fence)) {
                 throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.SpotMoving, `Entry Spot '${fence.spot.spotId}' has an invalid owner fence.`);
@@ -3179,7 +3264,7 @@ class ServiceStatefulRuntime {
     }
     holdOrRelaySpotMessage(ingress, wire) {
         const state = this.spotMessageFollow.get(spotKey(wire.target.spot));
-        if (state === undefined || !sameDirectSpotRoute(state.source, wire.target)) {
+        if (state === undefined || !sameDirectSpotRouteIdentity(state.source, wire.target)) {
             return undefined;
         }
         if (state.expiresAtMs !== undefined && state.expiresAtMs <= performance.now()) {
@@ -3224,9 +3309,13 @@ class ServiceStatefulRuntime {
                 }
                 const current = this.peekSpotMessageFollow(state);
                 try {
+                    const metadata = (current.ingress.parts[0][service_wire_binary_primitives_1.SERVICE_WIRE_FLAGS_OFFSET] &
+                        service_stateful_wire_codec_1.M6bServiceWireFlag.metadata) !==
+                        0;
                     const parts = [
-                        (0, service_stateful_wire_codec_1.encodeSpotHeader)(current.wire.kind, current.wire.sourceSpotId, state.target, current.wire.correlation),
-                        current.ingress.parts[1]
+                        (0, service_stateful_wire_codec_1.encodeSpotHeader)(current.wire.kind, current.wire.sourceSpotId, state.target, current.wire.correlation, current.wire.operation, current.wire.messageFollowHopCount + 1, metadata ? current.ingress.parts[1] : undefined),
+                        ...(metadata ? [current.ingress.parts[1]] : []),
+                        current.ingress.parts[metadata ? 2 : 1]
                     ];
                     if (current.wire.kind === 'spotSend') {
                         if (!(await this.raw.sendService(state.target.targetNodeRid, parts)))
@@ -3330,7 +3419,7 @@ class ServiceStatefulRuntime {
             state.queued.length = 0;
             state.queuedHead = 0;
         }
-        else if (state.queuedHead >= 1024 && state.queuedHead * 2 >= state.queued.length) {
+        else if ((0, admission_1.shouldCompactBackingArray)(state.queuedHead, state.queued.length)) {
             state.queued.splice(0, state.queuedHead);
             state.queuedHead = 0;
         }
@@ -3341,26 +3430,6 @@ class ServiceStatefulRuntime {
             throw new service_stateful_registry_1.ServiceStaleGenerationError('actor', actor.actorId);
         return route;
     }
-    tryBoundSessionSendFence(actor, senderFence) {
-        if (senderFence === undefined ||
-            senderFence.targetNodeGeneration !== this.nodeGeneration ||
-            senderFence.authorityOwnerGeneration <= 0n ||
-            senderFence.ownerLeaseGeneration <= 0n) {
-            return undefined;
-        }
-        const local = actor.nodeRid === this.nodeRid ? this.registry.actor(actor.actorId) : undefined;
-        if (local === undefined ||
-            !sameActorRef(local.ref, actor) ||
-            local.authorityOwnerGeneration !== senderFence.authorityOwnerGeneration) {
-            return undefined;
-        }
-        return {
-            actor,
-            targetNodeGeneration: senderFence.targetNodeGeneration,
-            authorityOwnerGeneration: senderFence.authorityOwnerGeneration,
-            ownerLeaseGeneration: senderFence.ownerLeaseGeneration
-        };
-    }
     tryActorFence(actor) {
         const local = actor.nodeRid === this.nodeRid ? this.registry.actor(actor.actorId) : undefined;
         if (local !== undefined && sameActorRef(local.ref, actor)) {
@@ -3536,35 +3605,19 @@ class ServiceStatefulRuntime {
     }
 }
 exports.ServiceStatefulRuntime = ServiceStatefulRuntime;
-function serviceSpotPublishFailureReason(result, routeReady, closed) {
-    if (closed || result === runtime_values_1.SubmitResult.Terminated)
-        return 'shutdown';
-    switch (result) {
-        case runtime_values_1.SubmitResult.Backpressured:
-            return 'backpressure';
-        case runtime_values_1.SubmitResult.NotAdmitted:
-        case runtime_values_1.SubmitResult.NotConnected:
-        case runtime_values_1.SubmitResult.NotFound:
-        case runtime_values_1.SubmitResult.InvalidHandle:
-            return 'stale_target';
-        default:
-            // RawServiceMeshRuntime exposes failed Core submissions as false. A
-            // ready route therefore identifies queue admission failure; a route
-            // that became unready after selection is a stale target.
-            return routeReady ? 'backpressure' : 'stale_target';
-    }
-}
 function isEntrySpotFence(fence) {
     return (fence.spot.spotId === fence.targetNodeRid &&
         fence.spot.generation === fence.targetNodeGeneration &&
         fence.authorityOwnerGeneration === fence.targetNodeGeneration &&
-        fence.ownerLeaseGeneration === fence.targetNodeGeneration &&
-        fence.storeVersion === `entry:${fence.targetNodeGeneration}`);
+        fence.ownerLeaseGeneration === fence.targetNodeGeneration);
 }
-function userSpotDeadline(deadlineUnixMs) {
+function operationDeadline(deadlineUnixMs) {
     const controller = new AbortController();
     const delay = Number(deadlineUnixMs - BigInt(Date.now()));
-    const timeout = setTimeout(() => controller.abort(new Error('User Spot operation deadline exceeded.')), Math.max(0, Math.min(delay, 0x7fff_ffff)));
+    const expire = () => controller.abort((0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.DeadlineExceeded, 'Operation deadline exceeded.'));
+    const timeout = delay <= 0
+        ? (expire(), undefined)
+        : setTimeout(expire, Math.min(delay, MAX_NODE_TIMER_DELAY_MS));
     return {
         signal: controller.signal,
         close: () => clearTimeout(timeout)
@@ -3620,12 +3673,12 @@ function actorLocation(actor) {
 }
 function failure(error) {
     if (error instanceof service_stateful_registry_1.ServiceStaleGenerationError) {
-        return { terminalResult: runtime_values_1.RequestResult.NotFound, failureCode: ACTOR_ROUTE_STALE };
+        return (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorLocationStale);
     }
     if (error instanceof contracts_1.ZLinkFrameworkException) {
         return (0, framework_errors_internal_1.internalFrameworkWireReply)(error);
     }
-    return { terminalResult: runtime_values_1.RequestResult.InternalError, failureCode: 17 };
+    return (0, framework_errors_internal_1.internalFrameworkWireReply)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestFailed);
 }
 function actorKey(actor) {
     return `${actor.actorId}\0${actor.generation}`;
@@ -3870,7 +3923,7 @@ function topicMatches(filter, topic) {
 function emptyPayload() {
     return {
         packetName: 'ZLinkFrameworkEmpty',
-        contentType: 'application/octet-stream',
+        contentType: stream_wire_1.ZlinkStreamContentType.Raw,
         payload: Buffer.alloc(0)
     };
 }