@zlink-systems/framework 0.29.1 → 0.30.1

package/dist/runtime/host/service-relocation-host-runtime.js

@@ -5,6 +5,7 @@ exports.decodeQueuedHandoffPacket = decodeQueuedHandoffPacket;
 exports.createServiceRelocationId = createServiceRelocationId;
 exports.relocationFailedFailureCode = relocationFailedFailureCode;
 exports.encodeHandoffQueuedMessages = encodeHandoffQueuedMessages;
+const durable_service_request_1 = require("../foundation/durable-service-request");
 const stream_wire_1 = require("@zlink-systems/stream-wire");
 const node_crypto_1 = require("node:crypto");
 const contracts_1 = require("../../contracts");
@@ -42,7 +43,6 @@ const relocation_direct_transfer_1 = require("./relocation-direct-transfer");
 const relocation_integrity_fault_gate_1 = require("./relocation-integrity-fault-gate");
 const relocation_state_adapter_1 = require("./relocation-state-adapter");
 const service_relocation_control_1 = require("./service-relocation-control");
-const RELOCATION_ATTEMPT_TIMEOUT_MS = 250;
 const RELOCATION_AUTHORITY_RETRY_DELAY_MS = 25;
 const RELOCATION_MAX_SEND_ATTEMPTS = 120;
 const RELOCATION_AUTHORITY_POLL_INTERVAL_MS = 10;
@@ -60,6 +60,7 @@ const RELOCATION_PARTICIPANT_STATE_LIMIT_BYTES = 64 * 1024 * 1024;
 const RELOCATION_TARGET_TOMBSTONE_LIMIT = 1024;
 const RELOCATION_OPERATION_RETENTION_MS = 5 * 60_000;
 const SERVICE_CONTROL_TERMINAL_CAPACITY = 4096;
+const INITIAL_MEMBERSHIP_EPOCH = 1n;
 /** Production host bridge from Retire inventory to remote RouteMesh owners. */
 class ZLinkHostServiceRelocationRuntime {
     options;
@@ -155,7 +156,7 @@ class ZLinkHostServiceRelocationRuntime {
                     ? contracts_1.ZLinkSpotKind.Entry
                     : contracts_1.ZLinkSpotKind.User,
                 spotObjectGeneration: spotGeneration
-            }, input.relocationId, true, input.advertisedReceiveChunkLimitBytes);
+            }, input.relocationId, true, input.advertisedReceiveChunkLimitBytes, input.deadlineAtMs);
             resolveReady();
         }
         catch (error) {
@@ -199,7 +200,10 @@ class ZLinkHostServiceRelocationRuntime {
             if (window.followTimer !== undefined)
                 clearTimeout(window.followTimer);
         }
+        const hadSourceWindows = this.sourceCutoverWindows.size !== 0;
         this.sourceCutoverWindows.clear();
+        if (hadSourceWindows)
+            this.options.sourceQuiescenceChanged?.();
         const stopped = new Error('Relocation runtime stopped.');
         stopped.name = 'AbortError';
         this.targetPrepareOperations.clear();
@@ -402,18 +406,29 @@ class ZLinkHostServiceRelocationRuntime {
         }
         throw failure;
     }
-    async tryHandleControl(meshName, record, signal) {
+    tryHandleControl(meshName, record, signal) {
         if (record.parts.length === 0)
             return false;
         const payload = record.parts[0].data();
-        if (isServiceWireCommand(payload, service_stateful_wire_codec_1.M6bServiceWireCommand.replyRelay)) {
+        const command = (0, service_relocation_control_1.serviceRelocationControlCommand)(payload);
+        if (command === undefined) {
+            if (record.kind !== service_runtime_contracts_1.ReceiveKind.NodeSend)
+                return false;
+            const sourceLeave = (0, actor_remote_wire_1.decodeRemoteActorSourceLeaveTerminal)(payload);
+            if (sourceLeave === undefined)
+                return false;
+            if (record.parts.length !== 1)
+                return false;
+            return this.acceptActorJoinSourceLeave(sourceLeave);
+        }
+        return this.handleControl(meshName, record, payload, command, signal);
+    }
+    async handleControl(meshName, record, payload, command, signal) {
+        if (command === service_stateful_wire_codec_1.M6bServiceWireCommand.replyRelay) {
             await this.handleReplyRelay(meshName, (0, service_stateful_wire_codec_1.decodeMaintenanceReplyRelay)(record.parts.map((part) => part.data())), record.sourceNodeRid, signal);
             return true;
         }
-        const sideband = record.parts.length === 1
-            ? undefined
-            : decodePrepareSideband(record.parts.slice(1).map((part) => part.data()));
-        if (record.parts.length > 1 && sideband === undefined)
+        if (record.parts.length !== 1)
             return false;
         if (record.kind === service_runtime_contracts_1.ReceiveKind.NodeSend) {
             const sourceLeave = (0, actor_remote_wire_1.decodeRemoteActorSourceLeaveTerminal)(payload);
@@ -421,33 +436,28 @@ class ZLinkHostServiceRelocationRuntime {
                 return this.acceptActorJoinSourceLeave(sourceLeave);
             }
         }
-        if (isServiceWireCommand(payload, service_stateful_wire_codec_1.M6bServiceWireCommand.sessionRelocationSealed)) {
+        if (command === service_stateful_wire_codec_1.M6bServiceWireCommand.sessionRelocationSealed) {
             this.acceptSessionRelocationResponse((0, service_stateful_wire_codec_1.decodeSessionRelocationSealed)(payload), record.sourceNodeRid);
             return true;
         }
-        if (isServiceWireCommand(payload, service_stateful_wire_codec_1.M6bServiceWireCommand.sessionRelocationSeal)) {
+        if (command === service_stateful_wire_codec_1.M6bServiceWireCommand.sessionRelocationSeal) {
             const request = (0, service_stateful_wire_codec_1.decodeSessionRelocationSeal)(payload);
             const response = await this.handleSessionRelocationSeal(meshName, request, record.sourceNodeRid, signal);
             await this.sendSessionRelocationResponse(meshName, record.sourceNodeRid, (0, service_stateful_wire_codec_1.encodeSessionRelocationSealed)(response));
             return true;
         }
-        if (isServiceWireCommand(payload, service_stateful_wire_codec_1.M6bServiceWireCommand.sessionRelocationRoute)) {
+        if (command === service_stateful_wire_codec_1.M6bServiceWireCommand.sessionRelocationRoute) {
             const request = (0, service_stateful_wire_codec_1.decodeSessionRelocationRoute)(payload);
             await this.handleSessionRelocationRoute(meshName, request, record.sourceNodeRid, signal);
             return true;
         }
-        if (isServiceWireCommand(payload, service_stateful_wire_codec_1.M6bServiceWireCommand.replyRelayAck)) {
+        if (command === service_stateful_wire_codec_1.M6bServiceWireCommand.replyRelayAck) {
             await this.acceptReplyRelayAck(meshName, (0, service_stateful_wire_codec_1.decodeMaintenanceReplyRelayAck)(payload), record.sourceNodeRid, signal);
             return true;
         }
         let request = (0, service_relocation_control_1.decodeServiceRelocationControlRequest)(payload);
         if (request === undefined)
             return false;
-        if (sideband !== undefined) {
-            if (request.kind !== 'prepare')
-                return false;
-            request = { ...request, nodeInternalBoundSessions: sideband };
-        }
         // Ready(30) and Failed(53) are replies to Prepare(40), never independent
         // inbound controls. The source consumes them on Core's request reply leg.
         if (request.kind === 'ready' || request.kind === 'failed')
@@ -894,7 +904,7 @@ class ZLinkHostServiceRelocationRuntime {
     validateSessionOwnerFence(meshName, session) {
         const status = this.requireMeshNode(meshName).status();
         const owner = this.options.currentOwner();
-        if (String(status.routingId) !== session.sessionOwnerNodeRid ||
+        if (!(0, routing_id_1.routingIdsEqual)(status.routingId, session.sessionOwnerNodeRid) ||
             status.lifecycleGeneration !== session.sessionOwnerNodeGeneration ||
             owner?.ownerId !== session.sessionOwnerId ||
             owner.leaseGeneration !== session.sessionOwnerLeaseGeneration) {
@@ -1121,7 +1131,7 @@ class ZLinkHostServiceRelocationRuntime {
     }
     async relocateStandaloneActor(meshName, state, target, targetApplicationVersion, signal, targetMembership, aggregateIdOverride, retainSourceForActorJoin = false, 
     /** Target's advertised relocation state chunk cap (Actor Join only; spec 15 §4.2). */
-    advertisedReceiveChunkLimitBytes) {
+    advertisedReceiveChunkLimitBytes, deadlineAtMs) {
         if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
             (0, diagnostics_1.relocationDebug)('standalone_actor.begin', { actorId: state.actorId });
         }
@@ -1171,7 +1181,7 @@ class ZLinkHostServiceRelocationRuntime {
             if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
                 (0, diagnostics_1.relocationDebug)('standalone_actor.capture_complete', { actorId: state.actorId });
             }
-            await this.runCoordinator(meshName, target, authority, captured, new Map([[measuredUnit.authorityKey, authority]]), signal, sessions, advertisedReceiveChunkLimitBytes);
+            await this.runCoordinator(meshName, target, authority, captured, new Map([[measuredUnit.authorityKey, authority]]), signal, sessions, advertisedReceiveChunkLimitBytes, deadlineAtMs);
         }
         catch (error) {
             outcome = 'failed';
@@ -1287,14 +1297,27 @@ class ZLinkHostServiceRelocationRuntime {
                 }
                 const prepared = standalone ? ownSession : sessions.find((value) => value.state === state);
                 return {
-                    boundSessionState: encodeActorSession(prepared?.prepared.target),
+                    boundSessionState: Buffer.alloc(0),
+                    ...(prepared?.prepared.target?.serviceWireRelocation === undefined
+                        ? {}
+                        : {
+                            sessionBinding: {
+                                participantId: 1n,
+                                sessionOwnerNodeRid: Buffer.from((0, routing_id_1.encodeRoutingIdStorageHex)(prepared.prepared.target.sessionNodeRid), 'hex'),
+                                sessionOwnerNodeGeneration: prepared.prepared.target.serviceWireRelocation.session
+                                    .sessionOwnerNodeGeneration,
+                                sessionOwnerId: prepared.prepared.target.serviceWireRelocation.session.sessionOwnerId,
+                                sessionOwnerLeaseGeneration: prepared.prepared.target.serviceWireRelocation.session
+                                    .sessionOwnerLeaseGeneration,
+                                sessionRid: Buffer.from((0, routing_id_1.encodeRoutingIdStorageHex)(prepared.prepared.target.sessionRid), 'hex'),
+                                bindingGeneration: prepared.prepared.target.serviceWireRelocation.session.bindingGeneration
+                            }
+                        }),
                     queuedMessages: encodeHandoffQueuedMessages(prepared?.prepared.handoffBacklog ?? []),
                     timers: []
                 };
             },
-            // The canonical participant body (discriminator 1) is raw application
-            // state. The sealed bound-session target remains in sealed work and is
-            // transported only by Prepare's NODE-INTERNAL sideband frames.
+            // The sealed Session identity is part of the canonical participant vector.
             captureApplicationState: (signal) => this.captureApplication(registration.relocation, state.actor, signal),
             commitSeal: async () => {
                 if (!standalone ||
@@ -1367,7 +1390,7 @@ class ZLinkHostServiceRelocationRuntime {
     }
     async runCoordinator(meshName, target, primary, captured, _authorities, signal, sessions = [], 
     /** Target's advertised relocation state chunk cap (Actor Join only; spec 15 §4.2). */
-    advertisedReceiveChunkLimitBytes) {
+    advertisedReceiveChunkLimitBytes, controlDeadlineAtMs = performance.now() + RELOCATION_OPERATION_TIMEOUT_MS) {
         if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
             (0, diagnostics_1.relocationDebug)('coordinator.begin', {
                 aggregateId: captured.envelope.aggregateId,
@@ -1375,9 +1398,6 @@ class ZLinkHostServiceRelocationRuntime {
             });
         }
         const localStatus = this.requireMeshNode(meshName).status();
-        const controlDeadlineAtMs = signal === undefined
-            ? performance.now() + RELOCATION_OPERATION_TIMEOUT_MS
-            : Number.MAX_SAFE_INTEGER;
         const coordinator = {
             ownerId: primary.ownerId,
             leaseGeneration: primary.ownerLeaseGeneration,
@@ -1446,23 +1466,17 @@ class ZLinkHostServiceRelocationRuntime {
             // queue and the assembly on the target), then stream the payload chunks
             // on the same ordered connection. The Ready reply arrives only after
             // the target assembled, verified, and restored the payload.
-            const readyOperation = this.sendControl(meshName, target.rid, prepare, signal, controlDeadlineAtMs, encodePrepareSideband(captured.envelope));
-            try {
-                if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
+            const ready = await this.sendControl(meshName, target.rid, prepare, signal, controlDeadlineAtMs, async (attemptSignal) => {
+                if ((0, diagnostics_1.isRelocationDebugEnabled)())
                     (0, diagnostics_1.relocationDebug)('coordinator.state_transfer_begin', {
                         aggregateId: captured.envelope.aggregateId
                     });
-                }
-                await this.sendRelocationStateChunks(meshName, target, prepare, encoded, plan, signal);
-            }
-            catch (chunkError) {
-                readyOperation.catch(() => undefined);
-                throw chunkError;
-            }
-            if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
-                (0, diagnostics_1.relocationDebug)('coordinator.await_ready', { aggregateId: captured.envelope.aggregateId });
-            }
-            const ready = await readyOperation;
+                await this.sendRelocationStateChunks(meshName, target, prepare, encoded, plan, attemptSignal);
+                if ((0, diagnostics_1.isRelocationDebugEnabled)())
+                    (0, diagnostics_1.relocationDebug)('coordinator.await_ready', {
+                        aggregateId: captured.envelope.aggregateId
+                    });
+            });
             if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
                 (0, diagnostics_1.relocationDebug)('coordinator.ready_received', {
                     aggregateId: captured.envelope.aggregateId
@@ -1511,7 +1525,7 @@ class ZLinkHostServiceRelocationRuntime {
             // The cutover submit result is not the authority result. The memory
             // copy of the boundary batch and cutover stays until the authority
             // settlement below (spec 28 §4.4).
-            let submitFailure;
+            const submittedRouteGeneration = this.requireMeshNode(meshName).observePeerRoute?.(target.rid).generation;
             try {
                 for (const record of boundaryBatch) {
                     await this.submitControlFrame(meshName, target.rid, record.frame, 'relay');
@@ -1519,10 +1533,11 @@ class ZLinkHostServiceRelocationRuntime {
                 await this.submitControlFrame(meshName, target.rid, cutoverFrame, 'cutover');
             }
             catch (error) {
-                submitFailure = error;
+                if (!(0, durable_service_request_1.durableRequestCanReplay)(error))
+                    throw error;
                 console.warn('[zlink.runtime.relocation.cutover_submit_failed]', relayAuthorityId, error);
             }
-            const window = this.beginSourceCutoverWindow(meshName, target.rid, relayAuthorityId, [...boundaryBatch.map((value) => value.frame), cutoverFrame], submitFailure !== undefined, limits);
+            const window = this.beginSourceCutoverWindow(meshName, target.rid, relayAuthorityId, [...boundaryBatch.map((value) => value.frame), cutoverFrame], submittedRouteGeneration, limits);
             try {
                 settlement = await this.settleSourceAuthority(captured.envelope, primary, targetFence, restoreDeadlineReached, window);
             }
@@ -1544,7 +1559,7 @@ class ZLinkHostServiceRelocationRuntime {
             if (settlement === 'lost') {
                 // Expired owner: dispatch and Store changes stop for good and every
                 // pending request without a terminal gets one Unavailable.
-                const unavailable = (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Relocation '${relayAuthorityId}' source owner lease ended before its authority settled.`, true);
+                const unavailable = (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Relocation '${relayAuthorityId}' source authority ended (source owner lease expired, authority Missing, or owner changed).`, true);
                 await captured.discardSource(unavailable);
                 throw new service_relocation_coordinator_1.ServiceRelocationAuthorityError(unavailable.message, { cause: unavailable });
             }
@@ -1578,6 +1593,7 @@ class ZLinkHostServiceRelocationRuntime {
             const chunkData = (0, relocation_direct_transfer_1.relocationChunkAt)(encoded, plan, ordinal);
             const releases = await this.acquireRelocationBudget(String(target.rid), chunkData.byteLength, signal);
             try {
+                signal?.throwIfAborted();
                 await this.sendControlOneWay(meshName, target.rid, {
                     kind: 'state',
                     relocation: identity.relocation,
@@ -1638,18 +1654,21 @@ class ZLinkHostServiceRelocationRuntime {
      * window. S4 — the Message Follow route removal point — closes the unit for
      * SafeToShutdown.
      */
-    beginSourceCutoverWindow(meshName, targetNodeRid, relocationKey, frames, initialSubmitFailed, limits) {
+    beginSourceCutoverWindow(meshName, targetNodeRid, relocationKey, frames, submittedRouteGeneration, limits) {
         const submittedAt = performance.now();
         const window = {
             meshName,
             targetNodeRid,
             frames,
-            resendPending: initialSubmitFailed,
+            submittedRouteGeneration,
             cutoverSubmittedAtMs: submittedAt,
             windowClosed: false,
             followExpired: false
         };
+        const wasQuiescent = this.isSafeToShutdown();
         this.sourceCutoverWindows.set(relocationKey, window);
+        if (wasQuiescent)
+            this.options.sourceQuiescenceChanged?.();
         window.followTimer = setTimeout(() => {
             window.followExpired = true;
             // S1→S4 route convergence: the span the source must keep its Message
@@ -1671,33 +1690,27 @@ class ZLinkHostServiceRelocationRuntime {
             window.followExpired &&
             this.sourceCutoverWindows.get(relocationKey) === window) {
             this.sourceCutoverWindows.delete(relocationKey);
+            if (this.isSafeToShutdown())
+                this.options.sourceQuiescenceChanged?.();
         }
     }
-    /**
-     * Sends the whole boundary batch and cutover again after a failed submit
-     * or an observed loss of the target connection (spec 28 §4.4). The target
-     * replaces its partial span with the whole batch.
-     */
+    /** Relocation flow §4.4: replay the whole batch on a different ready route. */
     async resendSourceCutover(window) {
         const frames = window.frames;
         if (frames === undefined)
             return;
-        const peers = this.requireMeshNode(window.meshName).peers();
-        const peer = peers.find((value) => value.routingId !== null && String(value.routingId) === String(window.targetNodeRid));
-        if (peer !== undefined && peer.state !== service_runtime_contracts_1.MeshPeerRuntimeState.Serving) {
-            window.resendPending = true;
-            return;
-        }
-        if (!window.resendPending)
+        const route = this.requireMeshNode(window.meshName).observePeerRoute?.(window.targetNodeRid);
+        if (route?.ready !== true || route.generation === window.submittedRouteGeneration)
             return;
+        window.submittedRouteGeneration = route.generation;
         try {
             for (const frame of frames) {
                 await this.submitControlFrame(window.meshName, window.targetNodeRid, frame, 'cutover retransmission');
             }
-            window.resendPending = false;
         }
-        catch {
-            // The next settlement round retries the whole batch.
+        catch (error) {
+            if (!(0, durable_service_request_1.durableRequestCanReplay)(error))
+                throw error;
         }
     }
     /**
@@ -1708,8 +1721,8 @@ class ZLinkHostServiceRelocationRuntime {
      * excludes a late target commit. `target`: the
      * target committed. `source`: Preserve fenced the target out while the
      * source owner lease was valid. `lost`: the source owner lease ended first
-     * or another authority owns the object. An uncertain Store or lease result
-     * keeps the work retained and repeats the same decision.
+     * or authority is Missing or another authority owns the object. An uncertain
+     * Store or lease result keeps the work retained and repeats the same decision.
      */
     async settleSourceAuthority(envelope, primary, target, restoreDeadlineReached, window) {
         const owner = { ownerId: primary.ownerId, leaseGeneration: primary.ownerLeaseGeneration };
@@ -1860,12 +1873,18 @@ class ZLinkHostServiceRelocationRuntime {
             throw new ServiceRelocationDataLostError(String(message));
         }
         const envelope = (0, service_relocation_runtime_1.decodeServiceRelocationEnvelope)(payload, request.targetAttemptGeneration);
-        const inventoryEnvelope = attachPrepareBoundSessions(await this.resolveTargetParticipantInventory(request, envelope, signal), request.nodeInternalBoundSessions);
-        validatePrepareEnvelope(request, inventoryEnvelope);
-        const releaseActivation = (await this.options.activationAdmission?.acquire(meshName, signal)) ?? (() => undefined);
+        const recovery = canonicalActorJoinRecovery(envelope.participants);
+        const releaseJoinAdmission = recovery === undefined
+            ? () => undefined
+            : this.options.spotManager().beginActorJoinRelocation(recovery.request.handoffId);
         let materialized;
         let reservation;
+        let releaseActivation = () => undefined;
         try {
+            const inventoryEnvelope = attachCanonicalBoundSessions(await this.resolveTargetParticipantInventory(meshName, request, envelope, signal), request, meshName);
+            validatePrepareEnvelope(request, inventoryEnvelope);
+            releaseActivation =
+                (await this.options.activationAdmission?.acquire(meshName, signal)) ?? (() => undefined);
             // Deferred Join completion publishes into the source authority's
             // canonical relocation slot. Do that while the row is still CAS-able;
             // the aggregate marker installed by reserveTargetForPrepare deliberately
@@ -1887,11 +1906,13 @@ class ZLinkHostServiceRelocationRuntime {
                 lane: Promise.resolve(),
                 cutoverReceived: false,
                 boundaryRelay: [],
-                releaseActivation
+                releaseActivation,
+                releaseJoinAdmission
             };
             this.targetStages.set(stagingId, stage);
         }
         catch (error) {
+            releaseJoinAdmission();
             releaseActivation();
             if (reservation !== undefined) {
                 await this.abortTargetReservation(reservation, signal).catch(() => undefined);
@@ -2082,6 +2103,9 @@ class ZLinkHostServiceRelocationRuntime {
             }
             throw error;
         }
+        finally {
+            stage.releaseJoinAdmission();
+        }
     }
     validateRelocationData(stage, request) {
         const frozen = request.frozenRecord;
@@ -2096,7 +2120,7 @@ class ZLinkHostServiceRelocationRuntime {
             target.generation !== request.object.objectGeneration ||
             target.targetNodeRid !== preparedTarget.nodeRid ||
             target.targetNodeGeneration !== preparedTarget.nodeGeneration ||
-            target.authorityOwnerGeneration !== request.object.expectedAuthorityOwnerGeneration + 1n ||
+            target.authorityOwnerGeneration !== request.object.expectedAuthorityOwnerGeneration ||
             target.ownerLeaseGeneration !== preparedTarget.ownerLeaseGeneration) {
             throw new Error('Relocation data does not target the exact temporary Actor queue.');
         }
@@ -2169,7 +2193,9 @@ class ZLinkHostServiceRelocationRuntime {
     async submitControlFrame(meshName, targetNodeRid, frame, kind) {
         const submitted = await this.sendInfrastructureControl(meshName, targetNodeRid, frame);
         if (submitted !== runtime_values_1.SubmitResult.Ok) {
-            throw new Error(`Relocation ${kind} was not accepted by RouteMesh.`);
+            throw new runtime_values_1.ZLinkBackendResultError('submit', submitted, undefined, {
+                cause: new Error(`Relocation ${kind} was not accepted by RouteMesh.`)
+            });
         }
     }
     async clearTargetRelocationPublication(stage, primary, signal) {
@@ -2378,51 +2404,25 @@ class ZLinkHostServiceRelocationRuntime {
             await this.options.actorTransfer.publishRoutedActorOwnership(hidden.actor, carried === undefined ? undefined : decodeActorSession(carried.boundSessionState));
         }
     }
-    async sendControl(meshName, targetNodeRid, request, signal, deadlineAtMs = performance.now() + RELOCATION_OPERATION_TIMEOUT_MS, sideband = []) {
+    async sendControl(meshName, targetNodeRid, request, signal, deadlineAtMs = performance.now() + RELOCATION_OPERATION_TIMEOUT_MS, onSubmitted) {
         const key = controlAckKey(request);
-        const frames = sideband.length === 0
-            ? [(0, service_relocation_control_1.encodeServiceRelocationControlRequest)(request)]
-            : [(0, service_relocation_control_1.encodeServiceRelocationControlRequest)(request), ...sideband];
-        let lastRequestError;
-        for (;;) {
-            signal?.throwIfAborted();
-            const remainingMs = deadlineAtMs - performance.now();
-            if (remainingMs <= 0) {
-                throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.DeadlineExceeded, `Relocation control ACK '${key}' timed out.`, true, lastRequestError);
-            }
-            const attemptTimeoutMs = Math.max(1, Math.min(RELOCATION_ATTEMPT_TIMEOUT_MS, Math.ceil(remainingMs)));
-            const startedAtMs = performance.now();
-            try {
-                const replyFrames = await this.requestInfrastructureControl(meshName, targetNodeRid, frames, attemptTimeoutMs);
-                if (replyFrames.length !== 1) {
-                    throw new service_wire_m6a_codec_1.ServiceWireProtocolError(`Relocation control '${key}' reply must contain exactly one frame.`);
-                }
-                const response = (0, service_relocation_control_1.decodeServiceRelocationControlResponse)(Buffer.from(replyFrames[0]));
-                if (response.kind === 'failed') {
-                    validateControlFailureResponse(request, response);
-                    throw relocationFailureException(response);
-                }
-                validateControlResponse(request, response);
-                return response;
-            }
-            catch (error) {
-                if (error instanceof service_wire_m6a_codec_1.ServiceWireProtocolError || error instanceof contracts_1.ZLinkFrameworkException) {
-                    throw error;
-                }
-                lastRequestError = error;
-                if ((0, diagnostics_1.isRelocationDebugEnabled)()) {
-                    (0, diagnostics_1.relocationDebug)('control.request_retry', {
-                        key,
-                        kind: request.kind,
-                        targetRid: String(targetNodeRid)
-                    });
-                }
-                const retryDelayMs = Math.min(Math.max(0, attemptTimeoutMs - (performance.now() - startedAtMs)), Math.max(0, deadlineAtMs - performance.now()));
-                if (retryDelayMs > 0) {
-                    await waitForRelocationRetry(retryDelayMs, signal);
-                }
-            }
+        const frames = [(0, service_relocation_control_1.encodeServiceRelocationControlRequest)(request)];
+        signal?.throwIfAborted();
+        const remainingMs = Math.ceil(deadlineAtMs - performance.now());
+        if (remainingMs <= 0) {
+            throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.DeadlineExceeded, `Relocation control ACK '${key}' timed out.`, true);
         }
+        const replyFrames = await this.requestInfrastructureControl(meshName, targetNodeRid, frames, remainingMs, signal, onSubmitted);
+        if (replyFrames.length !== 1) {
+            throw new service_wire_m6a_codec_1.ServiceWireProtocolError(`Relocation control '${key}' reply must contain exactly one frame.`);
+        }
+        const response = (0, service_relocation_control_1.decodeServiceRelocationControlResponse)(Buffer.from(replyFrames[0]));
+        if (response.kind === 'failed') {
+            validateControlFailureResponse(request, response);
+            throw relocationFailureException(response);
+        }
+        validateControlResponse(request, response);
+        return response;
     }
     async selectTarget(meshName, localRid, targetApplicationVersion, requirements = [], signal) {
         const descriptors = await this.options.liveDescriptors(meshName, signal);
@@ -2473,7 +2473,7 @@ class ZLinkHostServiceRelocationRuntime {
         const publication = relocationPublication(prepare, envelope);
         const participants = envelope.participants.map((participant) => {
             const expected = authorities.get(participant.key);
-            const membership = actorMembershipTarget(envelope, participant.key);
+            const membership = actorMembershipTarget(envelope.memberships.find((value) => value.actorKey === participant.key), this.options.localDescriptor?.(meshName));
             const entrySpotId = expected.allocation.objectKind === 'actor' && membership === undefined
                 ? this.options.spotManager()?.entrySpotIdForMesh(meshName)
                 : undefined;
@@ -2497,18 +2497,14 @@ class ZLinkHostServiceRelocationRuntime {
                     objectGeneration: expected.objectGeneration,
                     targetAttemptGeneration: prepare.targetAttemptGeneration,
                     coordinatorExpectedStoreVersion: expected.storeVersion.value,
-                    ...(membership === undefined
-                        ? expected.allocation.objectKind === 'actor'
+                    ...(membership ??
+                        (expected.allocation.objectKind === 'actor'
                             ? {
                                 actorSpotId: entrySpotId,
                                 actorSpotGeneration: prepare.target.nodeGeneration,
                                 actorSpotKind: contracts_1.ZLinkSpotKind.Entry
                             }
-                            : {}
-                        : {
-                            ...membership,
-                            actorSpotKind: contracts_1.ZLinkSpotKind.User
-                        })
+                            : {}))
                 }),
                 membershipMutation: encodeMembershipMutation(envelope.memberships, participant.key)
             };
@@ -2599,6 +2595,7 @@ class ZLinkHostServiceRelocationRuntime {
             failures.push(error);
         }
         stage.phase = 'failed';
+        stage.releaseJoinAdmission();
         if (failures.length === 1)
             throw failures[0];
         if (failures.length > 1) {
@@ -2729,7 +2726,7 @@ class ZLinkHostServiceRelocationRuntime {
         return { owner, staging, target };
     }
     /** Maps schema ordinals to the authoritative Location Store inventory. */
-    async resolveTargetParticipantInventory(request, envelope, signal) {
+    async resolveTargetParticipantInventory(meshName, request, envelope, signal) {
         if (!envelope.participants.some((value) => value.rootSpotId !== undefined)) {
             return envelope;
         }
@@ -2752,7 +2749,8 @@ class ZLinkHostServiceRelocationRuntime {
                         (0, authority_key_codec_1.decodeAuthorityKey)(candidate.key).kind !== 'actor')
                         continue;
                     const actor = (0, actor_authority_publication_1.decodeRelocatingActorAuthorityIdentity)(candidate.snapshot.payload, candidate.snapshot.objectGeneration);
-                    if (actor?.spotId === request.object.spotId) {
+                    if (actor?.spotId === request.object.spotId &&
+                        actor.spotGeneration === request.object.objectGeneration) {
                         entries.push(candidate);
                     }
                 }
@@ -2794,20 +2792,17 @@ class ZLinkHostServiceRelocationRuntime {
                 authorityOwnerGeneration: snapshot.authorityOwnerGeneration
             };
         });
-        // Actor-root saved work is admitted against the destination membership.
-        // The canonical root intentionally omits a membership vector; meanwhile
-        // Location Store still names the source Spot until target cutover. Rebuild
-        // the Actor lane from the already accepted ActorJoin admission, preserving
-        // the target queue boundary for decoded saved-work.
+        // Join recovery uses its accepted target membership. Maintenance Actor
+        // roots restore into the target's startup Entry incarnation (§10.1).
         const memberships = request.object.kind === 'actor'
-            ? actorJoinTargetMembership(manager, envelope.aggregateId, participants)
+            ? actorRootTargetMembership(manager, envelope.aggregateId, participants, this.options.localDescriptor?.(meshName))
             : entries
                 .filter((entry) => entry.snapshot.allocation.objectKind === 'actor')
                 .map((entry) => ({
                 actorKey: entry.key.value,
                 spotKey: primaryKey.value,
                 spotObjectGeneration: primary.objectGeneration,
-                membershipEpoch: 1n
+                membershipEpoch: INITIAL_MEMBERSHIP_EPOCH
             }));
         return {
             ...envelope,
@@ -3002,13 +2997,13 @@ class ZLinkHostServiceRelocationRuntime {
         }
         return await send.call(node, targetNodeRid, record);
     }
-    async requestInfrastructureControl(meshName, targetNodeRid, frames, timeoutMs) {
+    async requestInfrastructureControl(meshName, targetNodeRid, frames, timeoutMs, signal, onSubmitted) {
         const node = this.requireMeshNode(meshName);
         const request = node.requestInfrastructureControlFrames;
         if (request === undefined) {
             throw new Error('RouteMesh backend cannot submit bare infrastructure requests.');
         }
-        return await request.call(node, targetNodeRid, frames, { timeoutMs });
+        return await request.call(node, targetNodeRid, frames, { timeoutMs, signal, onSubmitted });
     }
 }
 exports.ZLinkHostServiceRelocationRuntime = ZLinkHostServiceRelocationRuntime;
@@ -3025,11 +3020,24 @@ function canonicalActorJoinRecovery(participants) {
 function actorJoinAdmissionIdentity(envelope) {
     return (canonicalActorJoinRecovery(envelope.participants)?.request.handoffId ?? envelope.aggregateId);
 }
-function actorJoinTargetMembership(manager, relocationId, participants) {
+function actorRootTargetMembership(manager, relocationId, participants, localDescriptor) {
     const recovery = canonicalActorJoinRecovery(participants);
-    const admissionId = recovery?.request.handoffId ?? relocationId;
-    const admission = manager?.formalRemoteActorAdmissions?.get(admissionId);
     const actor = participants.find((value) => value.objectKind === 'actor');
+    if (recovery === undefined) {
+        if (actor === undefined || localDescriptor?.entrySpotId === undefined) {
+            throw new Error(`Actor relocation '${relocationId}' has no target Entry membership.`);
+        }
+        return [
+            {
+                actorKey: actor.key,
+                spotKey: (0, authority_key_codec_1.encodeAuthorityKey)('user_spot', localDescriptor.entrySpotId).value,
+                spotObjectGeneration: localDescriptor.lifecycleGeneration,
+                membershipEpoch: INITIAL_MEMBERSHIP_EPOCH
+            }
+        ];
+    }
+    const admissionId = recovery.request.handoffId;
+    const admission = manager?.formalRemoteActorAdmissions?.get(admissionId);
     if (admission === undefined || actor === undefined) {
         throw new Error(`Actor relocation '${relocationId}' has no accepted target membership.`);
     }
@@ -3057,12 +3065,10 @@ class LocalTargetPort {
             const membership = this.envelope.memberships.find((value) => value.actorKey === participant.key);
             if (membership === undefined)
                 throw new Error(`Actor '${identity}' relocation membership is missing.`);
-            const spotIdentity = (0, authority_key_codec_1.decodeAuthorityKey)({
-                value: membership.spotKey
-            }).globalId;
-            const localDescriptor = this.options.localDescriptor?.(this.meshName);
-            const nativeEntrySpot = localDescriptor?.entrySpotId === spotIdentity;
-            const actor = await this.requireActorManager().prepareRelocationActor(identity, participant.stableType, participant.objectGeneration, participant.authorityOwnerGeneration + 1n, nativeEntrySpot ? undefined : spotIdentity, membership.spotObjectGeneration, membership.membershipEpoch, signal);
+            const targetMembership = actorMembershipTarget(membership, this.options.localDescriptor?.(this.meshName));
+            const actor = await this.requireActorManager().prepareRelocationActor(identity, participant.stableType, participant.objectGeneration, participant.authorityOwnerGeneration, targetMembership.actorSpotKind === contracts_1.ZLinkSpotKind.Entry
+                ? undefined
+                : targetMembership.actorSpotId, targetMembership.actorSpotGeneration, membership.membershipEpoch, signal);
             return {
                 authorityKey: participant.key,
                 participant,
@@ -3074,7 +3080,7 @@ class LocalTargetPort {
             };
         }
         const registration = this.registration(participant.objectKind, participant.stableType);
-        const activation = await this.requireSpotManager().prepareRelocationSpot(this.meshName, participant.objectKind, participant.stableType, registration.implementation, identity, participant.objectGeneration, participant.authorityOwnerGeneration + 1n, signal);
+        const activation = await this.requireSpotManager().prepareRelocationSpot(this.meshName, participant.objectKind, participant.stableType, registration.implementation, identity, participant.objectGeneration, participant.authorityOwnerGeneration, signal);
         return {
             authorityKey: participant.key,
             participant,
@@ -3102,17 +3108,14 @@ class LocalTargetPort {
     async restoreMemberships(hidden, memberships) {
         for (const membership of memberships) {
             const actor = hidden.get(membership.actorKey)?.actor;
-            const spotIdentity = (0, authority_key_codec_1.decodeAuthorityKey)({
-                value: membership.spotKey
-            }).globalId;
+            const targetMembership = actorMembershipTarget(membership, this.options.localDescriptor?.(this.meshName));
+            const spotIdentity = targetMembership.actorSpotId;
             const spot = hidden.get(membership.spotKey)?.activation ??
                 this.requireSpotManager().resolveRelocationActivation(this.meshName, spotIdentity);
             if (actor === undefined)
                 throw new Error('Relocation membership Actor staging is missing.');
             const state = this.requireActorManager().getState(actor.context.actorId);
-            const localDescriptor = this.options.localDescriptor?.(this.meshName);
-            const isEntryMembership = localDescriptor?.entrySpotId === spotIdentity;
-            if (isEntryMembership) {
+            if (targetMembership.actorSpotKind === contracts_1.ZLinkSpotKind.Entry) {
                 // Entry Spot identity is published as a Location membership key, but
                 // it is not a User Spot activation in the Actor runtime. The native
                 // restore already received the target MeshNode RID as its Entry
@@ -3121,7 +3124,7 @@ class LocalTargetPort {
                 state.clearJoinedSpot();
             }
             else {
-                state.setJoinedSpot(spotIdentity, spot?.spot, membership.membershipEpoch);
+                state.setJoinedSpot(spotIdentity, spot?.spot, membership.membershipEpoch, membership.spotObjectGeneration);
             }
             spot?.commitActorJoin(actor);
         }
@@ -3227,9 +3230,9 @@ class LocalTargetPort {
                 if (runtime === undefined) {
                     throw new Error('Relocated Entry Spot Actor dispatch is unavailable.');
                 }
-                return runtime.dispatchEntryActorPacket(hidden.actor.context.actorId, parts, returnResponse, remoteBoundSessionTarget, fallbackActorRef);
+                return runtime.dispatchEntryActorPacket('remote', hidden.actor.context.actorId, parts, returnResponse, remoteBoundSessionTarget, fallbackActorRef);
             }
-            return this.requireSpotManager().dispatchRoutedActorPacket(state.spotId, hidden.actor.context.actorId, parts, returnResponse, remoteBoundSessionTarget, fallbackActorRef);
+            return this.requireSpotManager().dispatchRoutedActorPacket('remote', state.spotId, hidden.actor.context.actorId, parts, returnResponse, remoteBoundSessionTarget, fallbackActorRef);
         });
         hidden.replayResults.push(...results);
     }
@@ -3311,13 +3314,14 @@ function rewriteAuthorityApplicationRoute(payload, target) {
     }
     return ((0, service_authority_payload_codec_1.rewriteServiceAuthorityRoute)(applicationPayload, target.owner, target) ?? applicationPayload);
 }
-function actorMembershipTarget(envelope, actorKey) {
-    const membership = envelope.memberships.find((value) => value.actorKey === actorKey);
+function actorMembershipTarget(membership, localDescriptor) {
     if (membership === undefined)
         return undefined;
+    const spotId = (0, authority_key_codec_1.decodeAuthorityKey)({ value: membership.spotKey }).globalId;
     return {
-        actorSpotId: (0, authority_key_codec_1.decodeAuthorityKey)({ value: membership.spotKey }).globalId,
-        actorSpotGeneration: membership.spotObjectGeneration
+        actorSpotId: spotId,
+        actorSpotGeneration: membership.spotObjectGeneration,
+        actorSpotKind: spotId === localDescriptor?.entrySpotId ? contracts_1.ZLinkSpotKind.Entry : contracts_1.ZLinkSpotKind.User
     };
 }
 function primaryKey(envelope) {
@@ -3884,7 +3888,7 @@ function canonicalQueuedFrozenRecord(participant, message, coordinator, target)
             objectGeneration: participant.objectGeneration,
             nodeRid: target.nodeRid,
             nodeGeneration: target.nodeGeneration,
-            authorityOwnerGeneration: participant.authorityOwnerGeneration + 1n,
+            authorityOwnerGeneration: participant.authorityOwnerGeneration,
             ownerLeaseGeneration: target.ownerLeaseGeneration
         },
         operationId,
@@ -4023,13 +4027,6 @@ function replyRelayIdentityKey(value) {
 function replyRelayPendingKey(ackTargetNodeRid, value) {
     return JSON.stringify([ackTargetNodeRid, replyRelayIdentityKey(value)]);
 }
-function isServiceWireCommand(payload, command) {
-    return (payload.byteLength >= 5 &&
-        payload[0] === 0x5a &&
-        payload[1] === 0x4d &&
-        payload[2] === 1 &&
-        payload[3] === command);
-}
 function encodeHandoffQueuedMessages(backlog) {
     return backlog.map((packet) => ({
         sequence: BigInt(packet.index) + 1n,
@@ -4102,83 +4099,50 @@ function toServiceTimer(value) {
         pendingTicks: value.pendingTicks
     };
 }
-const PREPARE_SIDEBAND_MAGIC = 'ZLNI';
-const PREPARE_SIDEBAND_VERSION = 1;
-const PREPARE_SIDEBAND_HEADER_BYTES = 11;
-const PREPARE_SIDEBAND_VERSION_OFFSET = 4;
-const PREPARE_SIDEBAND_KEY_LENGTH_OFFSET = 5;
-const PREPARE_SIDEBAND_PAYLOAD_LENGTH_OFFSET = 7;
 const ACTOR_SESSION_JOURNAL_VERSION = 1;
 const SERVICE_RELOCATION_REPLY_PACKET_NAME = 'zlink.relocation.reply';
-/**
- * NODE-INTERNAL Prepare sideband. Frame zero remains the exact canonical
- * command-40 schema record; each following ZLNI frame carries one sealed
- * actor-session journal keyed by its canonical participant authority key.
- * Sessionless relocation remains a single-frame, wire-identical Prepare.
- */
-function encodePrepareSideband(envelope) {
-    return envelope.participants
-        .filter((participant) => participant.boundSessionState.byteLength !== 0)
-        .map((participant) => {
-        const key = Buffer.from(participant.key, 'utf8');
-        const payload = Buffer.from(participant.boundSessionState);
-        if (key.byteLength === 0 || key.byteLength > 0xffff || payload.byteLength > 0xffff_ffff) {
-            throw new TypeError('Bound-session relocation sideband is out of bounds.');
-        }
-        const header = Buffer.allocUnsafe(PREPARE_SIDEBAND_HEADER_BYTES);
-        header.write(PREPARE_SIDEBAND_MAGIC, 0, 'ascii');
-        header[PREPARE_SIDEBAND_VERSION_OFFSET] = PREPARE_SIDEBAND_VERSION;
-        header.writeUInt16BE(key.byteLength, PREPARE_SIDEBAND_KEY_LENGTH_OFFSET);
-        header.writeUInt32BE(payload.byteLength, PREPARE_SIDEBAND_PAYLOAD_LENGTH_OFFSET);
-        return Buffer.concat([header, key, payload]);
-    });
-}
-function decodePrepareSideband(frames) {
-    const result = [];
-    const keys = new Set();
-    for (const frame of frames) {
-        const bytes = Buffer.from(frame);
-        if (bytes.byteLength < PREPARE_SIDEBAND_HEADER_BYTES ||
-            bytes.subarray(0, PREPARE_SIDEBAND_VERSION_OFFSET).toString('ascii') !==
-                PREPARE_SIDEBAND_MAGIC ||
-            bytes[PREPARE_SIDEBAND_VERSION_OFFSET] !== PREPARE_SIDEBAND_VERSION) {
-            return undefined;
-        }
-        const keyLength = bytes.readUInt16BE(PREPARE_SIDEBAND_KEY_LENGTH_OFFSET);
-        const payloadLength = bytes.readUInt32BE(PREPARE_SIDEBAND_PAYLOAD_LENGTH_OFFSET);
-        if (PREPARE_SIDEBAND_HEADER_BYTES + keyLength + payloadLength !== bytes.byteLength ||
-            keyLength === 0)
-            return undefined;
-        const participantKey = bytes
-            .subarray(PREPARE_SIDEBAND_HEADER_BYTES, PREPARE_SIDEBAND_HEADER_BYTES + keyLength)
-            .toString('utf8');
-        if (keys.has(participantKey))
-            return undefined;
-        keys.add(participantKey);
-        result.push({
-            participantKey,
-            payload: Buffer.from(bytes.subarray(PREPARE_SIDEBAND_HEADER_BYTES + keyLength))
-        });
-    }
-    return result;
-}
-function attachPrepareBoundSessions(envelope, sideband) {
-    if (sideband === undefined || sideband.length === 0)
-        return envelope;
-    const byKey = new Map(sideband.map((value) => [value.participantKey, Buffer.from(value.payload)]));
-    const participants = envelope.participants.map((participant) => {
-        const payload = byKey.get(participant.key);
-        if (payload === undefined)
-            return participant;
-        if (participant.objectKind !== 'actor') {
-            throw new TypeError('Bound-session relocation sideband names a non-Actor participant.');
-        }
-        byKey.delete(participant.key);
-        return { ...participant, boundSessionState: payload };
-    });
-    if (byKey.size !== 0)
-        throw new TypeError('Bound-session relocation sideband names an unknown participant.');
-    return { ...envelope, participants };
+function attachCanonicalBoundSessions(envelope, request, meshName) {
+    return {
+        ...envelope,
+        participants: envelope.participants.map((participant) => {
+            const binding = participant.sessionBinding;
+            if (binding === undefined)
+                return participant;
+            if (participant.objectKind !== 'actor')
+                throw new TypeError('Session binding names a non-Actor participant.');
+            const sessionNodeRid = (0, routing_id_1.decodeRoutingId)('', Buffer.from(binding.sessionOwnerNodeRid).toString('hex'));
+            const sessionRid = (0, routing_id_1.decodeRoutingId)('', Buffer.from(binding.sessionRid).toString('hex'));
+            const session = {
+                sessionOwnerNodeRid: sessionNodeRid,
+                sessionOwnerNodeGeneration: binding.sessionOwnerNodeGeneration,
+                sessionOwnerId: binding.sessionOwnerId,
+                sessionOwnerLeaseGeneration: binding.sessionOwnerLeaseGeneration,
+                sessionRid: sessionRid,
+                bindingGeneration: binding.bindingGeneration
+            };
+            const target = {
+                routerChannelId: meshName,
+                targetNodeRid: sessionNodeRid,
+                spotId: request.object.kind === 'actor'
+                    ? (participant.rootSpotId ?? '')
+                    : request.object.spotId,
+                sessionNodeRid,
+                sessionRid,
+                sessionOwnerNodeGeneration: binding.sessionOwnerNodeGeneration,
+                sessionOwnerId: binding.sessionOwnerId,
+                sessionOwnerLeaseGeneration: binding.sessionOwnerLeaseGeneration,
+                bindingGeneration: binding.bindingGeneration,
+                previousAuthorityOwnerGeneration: participant.authorityOwnerGeneration,
+                relocationSealId: envelope.aggregateId,
+                serviceWireRelocation: {
+                    relocation: request.relocation,
+                    coordinator: request.coordinator,
+                    session
+                }
+            };
+            return { ...participant, boundSessionState: encodeActorSession(target) };
+        })
+    };
 }
 function encodeActorSession(target) {
     if (target === undefined)
@@ -4189,7 +4153,11 @@ function encodeActorSession(target) {
         targetNodeRid: String(target.targetNodeRid),
         spotId: String(target.spotId),
         sessionNodeRid: target.sessionNodeRid === undefined ? undefined : String(target.sessionNodeRid),
+        sessionNodeRidHex: target.sessionNodeRid === undefined
+            ? undefined
+            : (0, routing_id_1.encodeRoutingIdStorageHex)(target.sessionNodeRid),
         sessionRid: target.sessionRid === undefined ? undefined : String(target.sessionRid),
+        sessionRidHex: target.sessionRid === undefined ? undefined : (0, routing_id_1.encodeRoutingIdStorageHex)(target.sessionRid),
         sessionOwnerNodeGeneration: target.sessionOwnerNodeGeneration?.toString(),
         sessionOwnerId: target.sessionOwnerId,
         sessionOwnerLeaseGeneration: target.sessionOwnerLeaseGeneration?.toString(),
@@ -4208,10 +4176,12 @@ function encodeActorSession(target) {
                 coordinatorNodeGeneration: target.serviceWireRelocation.coordinator.nodeGeneration.toString(),
                 expectedAuthorityStoreVersion: target.serviceWireRelocation.coordinator.expectedAuthorityStoreVersion,
                 sessionOwnerNodeRid: target.serviceWireRelocation.session.sessionOwnerNodeRid,
+                sessionOwnerNodeRidHex: (0, routing_id_1.encodeRoutingIdStorageHex)(target.serviceWireRelocation.session.sessionOwnerNodeRid),
                 sessionOwnerNodeGeneration: target.serviceWireRelocation.session.sessionOwnerNodeGeneration.toString(),
                 sessionOwnerId: target.serviceWireRelocation.session.sessionOwnerId,
                 sessionOwnerLeaseGeneration: target.serviceWireRelocation.session.sessionOwnerLeaseGeneration.toString(),
                 sessionRid: target.serviceWireRelocation.session.sessionRid,
+                sessionRidHex: (0, routing_id_1.encodeRoutingIdStorageHex)(target.serviceWireRelocation.session.sessionRid),
                 bindingGeneration: target.serviceWireRelocation.session.bindingGeneration.toString()
             }
     }), 'utf8');
@@ -4233,9 +4203,11 @@ function decodeActorSession(payload) {
         targetNodeRid: value.targetNodeRid,
         spotId: value.spotId,
         ...(typeof value.sessionNodeRid === 'string'
-            ? { sessionNodeRid: value.sessionNodeRid }
+            ? { sessionNodeRid: (0, routing_id_1.decodeRoutingId)(value.sessionNodeRid, value.sessionNodeRidHex) }
+            : {}),
+        ...(typeof value.sessionRid === 'string'
+            ? { sessionRid: (0, routing_id_1.decodeRoutingId)(value.sessionRid, value.sessionRidHex) }
             : {}),
-        ...(typeof value.sessionRid === 'string' ? { sessionRid: value.sessionRid } : {}),
         ...(optionalBigInt('sessionOwnerNodeGeneration') === undefined
             ? {}
             : { sessionOwnerNodeGeneration: optionalBigInt('sessionOwnerNodeGeneration') }),
@@ -4302,11 +4274,11 @@ function decodeActorSessionServiceWireFence(input) {
             expectedAuthorityStoreVersion: text('expectedAuthorityStoreVersion')
         },
         session: {
-            sessionOwnerNodeRid: text('sessionOwnerNodeRid'),
+            sessionOwnerNodeRid: (0, routing_id_1.decodeRoutingId)(typeof value.sessionOwnerNodeRid === 'string' ? value.sessionOwnerNodeRid : '', value.sessionOwnerNodeRidHex),
             sessionOwnerNodeGeneration: positive('sessionOwnerNodeGeneration'),
             sessionOwnerId: text('sessionOwnerId'),
             sessionOwnerLeaseGeneration: positive('sessionOwnerLeaseGeneration'),
-            sessionRid: text('sessionRid'),
+            sessionRid: (0, routing_id_1.decodeRoutingId)(typeof value.sessionRid === 'string' ? value.sessionRid : '', value.sessionRidHex),
             bindingGeneration: positive('bindingGeneration')
         }
     };