@zlink-systems/framework 0.30.0 → 0.30.1

package/src/runtime/host/service-relocation-host-runtime.ts

@@ -1,3 +1,4 @@
+import { durableRequestCanReplay } from '../foundation/durable-service-request';
 import { UINT64_MAX, ZlinkStreamContentType } from '@zlink-systems/stream-wire';
 import { randomBytes } from 'node:crypto';
 import {
@@ -44,7 +45,7 @@ import {
   type ZLinkRemoteBoundSessionTarget
 } from '../actors/actor-runtime-state';
 import type { ZLinkBackendMeshNode, ZLinkMeshCompletionTable } from '../backend';
-import { RequestResult, SubmitResult } from '../backend/runtime-values';
+import { RequestResult, SubmitResult, ZLinkBackendResultError } from '../backend/runtime-values';
 import type { ZLinkFrameworkRegistration } from '../configuration';
 import {
   type ZLinkRuntimeEventPublisher,
@@ -184,13 +185,13 @@ import {
 } from './relocation-state-adapter';
 import {
   decodeServiceRelocationControlRequest,
+  serviceRelocationControlCommand,
   decodeServiceRelocationControlResponse,
   encodeServiceRelocationControlRequest,
   encodeServiceRelocationControlResponse,
   type ZLinkServiceRelocationControlRequest,
   type ZLinkServiceRelocationControlResponse
 } from './service-relocation-control';
-const RELOCATION_ATTEMPT_TIMEOUT_MS = 250;
 
 const RELOCATION_AUTHORITY_RETRY_DELAY_MS = 25;
 
@@ -215,6 +216,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;
 
 interface ZLinkHostRelocationOptions {
   readonly registration: ZLinkFrameworkRegistration;
@@ -222,6 +224,7 @@ interface ZLinkHostRelocationOptions {
   readonly locationStore: () => ZLinkLocationStore | undefined;
   readonly currentOwner: () => ZLinkLocationOwnerToken | undefined;
   readonly targetAdmissionSealed?: () => boolean;
+  readonly sourceQuiescenceChanged?: () => void;
   readonly liveDescriptors: (
     meshName: string,
     signal?: AbortSignal
@@ -280,6 +283,7 @@ interface LocalStage {
   finalize?: Promise<void>;
   /** The Restore's activation admission (MeshNode §5.1); held until target commit or abort. */
   readonly releaseActivation: () => void;
+  readonly releaseJoinAdmission: () => void;
 }
 
 interface TargetPayloadAssembly {
@@ -294,8 +298,8 @@ interface SourceCutoverWindow {
   readonly targetNodeRid: RoutingId;
   /** Boundary batch frames plus the cutover frame, retained until authority settlement. */
   frames?: readonly Buffer[];
-  /** A failed submit or a lost target connection requires the whole batch again. */
-  resendPending: boolean;
+  /** The ready route used to submit the retained batch. */
+  submittedRouteGeneration?: bigint;
   readonly cutoverSubmittedAtMs: number;
   followTimer?: ReturnType<typeof setTimeout>;
   windowClosed: boolean;
@@ -500,7 +504,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         },
         input.relocationId,
         true,
-        input.advertisedReceiveChunkLimitBytes
+        input.advertisedReceiveChunkLimitBytes,
+        input.deadlineAtMs
       );
       resolveReady();
     } catch (error) {
@@ -542,7 +547,9 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     for (const window of this.sourceCutoverWindows.values()) {
       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();
@@ -806,14 +813,32 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     throw failure;
   }
 
-  async tryHandleControl(
+  tryHandleControl(
     meshName: string,
     record: ReceiveRecord,
     signal?: AbortSignal
-  ): Promise<boolean> {
+  ): boolean | Promise<boolean> {
     if (record.parts.length === 0) return false;
     const payload = record.parts[0]!.data();
-    if (isServiceWireCommand(payload, M6bServiceWireCommand.replyRelay)) {
+    const command = serviceRelocationControlCommand(payload);
+    if (command === undefined) {
+      if (record.kind !== ReceiveKind.NodeSend) return false;
+      const sourceLeave = 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);
+  }
+
+  private async handleControl(
+    meshName: string,
+    record: ReceiveRecord,
+    payload: Buffer,
+    command: number,
+    signal?: AbortSignal
+  ): Promise<boolean> {
+    if (command === M6bServiceWireCommand.replyRelay) {
       await this.handleReplyRelay(
         meshName,
         decodeMaintenanceReplyRelay(record.parts.map((part) => part.data())),
@@ -822,25 +847,21 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       );
       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) return false;
+    if (record.parts.length !== 1) return false;
     if (record.kind === ReceiveKind.NodeSend) {
       const sourceLeave = decodeRemoteActorSourceLeaveTerminal(payload);
       if (sourceLeave !== undefined) {
         return this.acceptActorJoinSourceLeave(sourceLeave);
       }
     }
-    if (isServiceWireCommand(payload, M6bServiceWireCommand.sessionRelocationSealed)) {
+    if (command === M6bServiceWireCommand.sessionRelocationSealed) {
       this.acceptSessionRelocationResponse(
         decodeSessionRelocationSealed(payload),
         record.sourceNodeRid
       );
       return true;
     }
-    if (isServiceWireCommand(payload, M6bServiceWireCommand.sessionRelocationSeal)) {
+    if (command === M6bServiceWireCommand.sessionRelocationSeal) {
       const request = decodeSessionRelocationSeal(payload);
       const response = await this.handleSessionRelocationSeal(
         meshName,
@@ -855,12 +876,12 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       );
       return true;
     }
-    if (isServiceWireCommand(payload, M6bServiceWireCommand.sessionRelocationRoute)) {
+    if (command === M6bServiceWireCommand.sessionRelocationRoute) {
       const request = decodeSessionRelocationRoute(payload);
       await this.handleSessionRelocationRoute(meshName, request, record.sourceNodeRid, signal);
       return true;
     }
-    if (isServiceWireCommand(payload, M6bServiceWireCommand.replyRelayAck)) {
+    if (command === M6bServiceWireCommand.replyRelayAck) {
       await this.acceptReplyRelayAck(
         meshName,
         decodeMaintenanceReplyRelayAck(payload),
@@ -871,10 +892,6 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     }
     let request = 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') return false;
@@ -1473,7 +1490,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     const status = this.requireMeshNode(meshName).status();
     const owner = this.options.currentOwner();
     if (
-      String(status.routingId) !== session.sessionOwnerNodeRid ||
+      !routingIdsEqual(status.routingId, session.sessionOwnerNodeRid) ||
       status.lifecycleGeneration !== session.sessionOwnerNodeGeneration ||
       owner?.ownerId !== session.sessionOwnerId ||
       owner.leaseGeneration !== session.sessionOwnerLeaseGeneration
@@ -1833,7 +1850,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     aggregateIdOverride?: string,
     retainSourceForActorJoin = false,
     /** Target's advertised relocation state chunk cap (Actor Join only; spec 15 §4.2). */
-    advertisedReceiveChunkLimitBytes?: number
+    advertisedReceiveChunkLimitBytes?: number,
+    deadlineAtMs?: number
   ): Promise<void> {
     if (isRelocationDebugEnabled()) {
       relocationDebug('standalone_actor.begin', { actorId: state.actorId });
@@ -1922,7 +1940,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         new Map([[measuredUnit.authorityKey, authority]]),
         signal,
         sessions,
-        advertisedReceiveChunkLimitBytes
+        advertisedReceiveChunkLimitBytes,
+        deadlineAtMs
       );
     } catch (error) {
       outcome = 'failed';
@@ -2128,14 +2147,37 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         }
         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(
+                    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(
+                    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 () => {
@@ -2229,7 +2271,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     signal?: AbortSignal,
     sessions: readonly SourceActorSession[] = [],
     /** Target's advertised relocation state chunk cap (Actor Join only; spec 15 §4.2). */
-    advertisedReceiveChunkLimitBytes?: number
+    advertisedReceiveChunkLimitBytes?: number,
+    controlDeadlineAtMs = performance.now() + RELOCATION_OPERATION_TIMEOUT_MS
   ): Promise<void> {
     if (isRelocationDebugEnabled()) {
       relocationDebug('coordinator.begin', {
@@ -2238,10 +2281,6 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       });
     }
     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,
@@ -2326,29 +2365,31 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       // 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(
+      const ready = await this.sendControl(
         meshName,
         target.rid,
         prepare,
         signal,
         controlDeadlineAtMs,
-        encodePrepareSideband(captured.envelope)
-      );
-      try {
-        if (isRelocationDebugEnabled()) {
-          relocationDebug('coordinator.state_transfer_begin', {
-            aggregateId: captured.envelope.aggregateId
-          });
+        async (attemptSignal) => {
+          if (isRelocationDebugEnabled())
+            relocationDebug('coordinator.state_transfer_begin', {
+              aggregateId: captured.envelope.aggregateId
+            });
+          await this.sendRelocationStateChunks(
+            meshName,
+            target,
+            prepare,
+            encoded,
+            plan,
+            attemptSignal
+          );
+          if (isRelocationDebugEnabled())
+            relocationDebug('coordinator.await_ready', {
+              aggregateId: captured.envelope.aggregateId
+            });
         }
-        await this.sendRelocationStateChunks(meshName, target, prepare, encoded, plan, signal);
-      } catch (chunkError) {
-        readyOperation.catch(() => undefined);
-        throw chunkError;
-      }
-      if (isRelocationDebugEnabled()) {
-        relocationDebug('coordinator.await_ready', { aggregateId: captured.envelope.aggregateId });
-      }
-      const ready = await readyOperation;
+      );
       if (isRelocationDebugEnabled()) {
         relocationDebug('coordinator.ready_received', {
           aggregateId: captured.envelope.aggregateId
@@ -2413,14 +2454,16 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       // 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: unknown;
+      const submittedRouteGeneration = this.requireMeshNode(meshName).observePeerRoute?.(
+        target.rid
+      ).generation;
       try {
         for (const record of boundaryBatch) {
           await this.submitControlFrame(meshName, target.rid, record.frame, 'relay');
         }
         await this.submitControlFrame(meshName, target.rid, cutoverFrame, 'cutover');
       } catch (error) {
-        submitFailure = error;
+        if (!durableRequestCanReplay(error)) throw error;
         console.warn('[zlink.runtime.relocation.cutover_submit_failed]', relayAuthorityId, error);
       }
       const window = this.beginSourceCutoverWindow(
@@ -2428,7 +2471,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         target.rid,
         relayAuthorityId,
         [...boundaryBatch.map((value) => value.frame), cutoverFrame],
-        submitFailure !== undefined,
+        submittedRouteGeneration,
         limits
       );
       try {
@@ -2461,7 +2504,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         // pending request without a terminal gets one Unavailable.
         const unavailable = createInternalFrameworkException(
           ZLinkFrameworkInternalErrorKind.RouteNotConnected,
-          `Relocation '${relayAuthorityId}' source owner lease ended before its authority settled.`,
+          `Relocation '${relayAuthorityId}' source authority ended (source owner lease expired, authority Missing, or owner changed).`,
           true
         );
         await captured.discardSource(unavailable);
@@ -2518,6 +2561,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         signal
       );
       try {
+        signal?.throwIfAborted();
         await this.sendControlOneWay(meshName, target.rid, {
           kind: 'state',
           relocation: identity.relocation,
@@ -2597,7 +2641,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     targetNodeRid: RoutingId,
     relocationKey: string,
     frames: readonly Buffer[],
-    initialSubmitFailed: boolean,
+    submittedRouteGeneration: bigint | undefined,
     limits: ReturnType<ZLinkHostServiceRelocationRuntime['relocationLimits']>
   ): SourceCutoverWindow {
     const submittedAt = performance.now();
@@ -2605,12 +2649,14 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       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
@@ -2640,27 +2686,17 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       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. */
   private async resendSourceCutover(window: SourceCutoverWindow): Promise<void> {
     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 !== MeshPeerRuntimeState.Serving) {
-      window.resendPending = true;
-      return;
-    }
-    if (!window.resendPending) return;
+    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(
@@ -2670,9 +2706,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
           'cutover retransmission'
         );
       }
-      window.resendPending = false;
-    } catch {
-      // The next settlement round retries the whole batch.
+    } catch (error) {
+      if (!durableRequestCanReplay(error)) throw error;
     }
   }
 
@@ -2684,8 +2719,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
    * 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.
    */
   private async settleSourceAuthority(
     envelope: ServiceRelocationEnvelope,
@@ -2871,17 +2906,24 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       throw new ServiceRelocationDataLostError(String(message));
     }
     const envelope = 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:
       (Pick<LocalStage, 'owner' | 'staging'> & { readonly target: LocalTargetPort }) | undefined;
     let reservation: TargetRelocationReservation | undefined;
+    let releaseActivation: () => void = () => 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
@@ -2908,10 +2950,12 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         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);
@@ -3134,6 +3178,8 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         throw new ServiceRelocationPostCommitError(authority, stage.staging, error);
       }
       throw error;
+    } finally {
+      stage.releaseJoinAdmission();
     }
   }
 
@@ -3154,7 +3200,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       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.');
@@ -3293,7 +3339,9 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
   ): Promise<void> {
     const submitted = await this.sendInfrastructureControl(meshName, targetNodeRid, frame);
     if (submitted !== SubmitResult.Ok) {
-      throw new Error(`Relocation ${kind} was not accepted by RouteMesh.`);
+      throw new ZLinkBackendResultError('submit', submitted, undefined, {
+        cause: new Error(`Relocation ${kind} was not accepted by RouteMesh.`)
+      });
     }
   }
 
@@ -3611,70 +3659,39 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     request: ZLinkServiceRelocationControlRequest,
     signal?: AbortSignal,
     deadlineAtMs: number = performance.now() + RELOCATION_OPERATION_TIMEOUT_MS,
-    sideband: readonly Uint8Array[] = []
+    onSubmitted?: (signal: AbortSignal) => Promise<void>
   ): Promise<ReturnType<typeof decodeServiceRelocationControlResponse>> {
     const key = controlAckKey(request);
-    const frames =
-      sideband.length === 0
-        ? [encodeServiceRelocationControlRequest(request)]
-        : [encodeServiceRelocationControlRequest(request), ...sideband];
-    let lastRequestError: unknown;
-    for (;;) {
-      signal?.throwIfAborted();
-      const remainingMs = deadlineAtMs - performance.now();
-      if (remainingMs <= 0) {
-        throw createInternalFrameworkException(
-          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 frames = [encodeServiceRelocationControlRequest(request)];
+    signal?.throwIfAborted();
+    const remainingMs = Math.ceil(deadlineAtMs - performance.now());
+    if (remainingMs <= 0) {
+      throw createInternalFrameworkException(
+        ZLinkFrameworkInternalErrorKind.DeadlineExceeded,
+        `Relocation control ACK '${key}' timed out.`,
+        true
       );
-      const startedAtMs = performance.now();
-      try {
-        const replyFrames = await this.requestInfrastructureControl(
-          meshName,
-          targetNodeRid,
-          frames,
-          attemptTimeoutMs
-        );
-        if (replyFrames.length !== 1) {
-          throw new ServiceWireProtocolError(
-            `Relocation control '${key}' reply must contain exactly one frame.`
-          );
-        }
-        const response = 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 ServiceWireProtocolError || error instanceof ZLinkFrameworkException) {
-          throw error;
-        }
-        lastRequestError = error;
-        if (isRelocationDebugEnabled()) {
-          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 replyFrames = await this.requestInfrastructureControl(
+      meshName,
+      targetNodeRid,
+      frames,
+      remainingMs,
+      signal,
+      onSubmitted
+    );
+    if (replyFrames.length !== 1) {
+      throw new ServiceWireProtocolError(
+        `Relocation control '${key}' reply must contain exactly one frame.`
+      );
+    }
+    const response = decodeServiceRelocationControlResponse(Buffer.from(replyFrames[0]!));
+    if (response.kind === 'failed') {
+      validateControlFailureResponse(request, response);
+      throw relocationFailureException(response);
+    }
+    validateControlResponse(request, response);
+    return response;
   }
 
   private async selectTarget(
@@ -3761,7 +3778,10 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     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)
@@ -3788,18 +3808,14 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
           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: ZLinkSpotKind.Entry as const
                 }
-              : {}
-            : {
-                ...membership,
-                actorSpotKind: ZLinkSpotKind.User as const
-              })
+              : {}))
         }),
         membershipMutation: encodeMembershipMutation(envelope.memberships, participant.key)
       };
@@ -3934,6 +3950,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
       failures.push(error);
     }
     stage.phase = 'failed';
+    stage.releaseJoinAdmission();
     if (failures.length === 1) throw failures[0];
     if (failures.length > 1) {
       throw new AggregateError(failures, 'Relocation target rollback was incomplete.');
@@ -4098,6 +4115,7 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
 
   /** Maps schema ordinals to the authoritative Location Store inventory. */
   private async resolveTargetParticipantInventory(
+    meshName: string,
     request: ServiceMaintenanceRelocationPrepare,
     envelope: ServiceRelocationEnvelope,
     signal?: AbortSignal
@@ -4136,7 +4154,10 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
             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);
           }
         }
@@ -4184,21 +4205,23 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
         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,
@@ -4482,14 +4505,16 @@ export class ZLinkHostServiceRelocationRuntime implements ZLinkActorJoinRelocati
     meshName: string,
     targetNodeRid: RoutingId,
     frames: readonly Uint8Array[],
-    timeoutMs: number
+    timeoutMs: number,
+    signal?: AbortSignal,
+    onSubmitted?: (signal: AbortSignal) => Promise<void>
   ): Promise<readonly Uint8Array[]> {
     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 });
   }
 }
 
@@ -4514,13 +4539,28 @@ function actorJoinAdmissionIdentity(envelope: ServiceRelocationEnvelope): string
   );
 }
 
-function actorJoinTargetMembership(
+function actorRootTargetMembership(
   manager: DefaultZLinkSpotManager | undefined,
   relocationId: string,
-  participants: readonly ServiceRelocationParticipant[]
+  participants: readonly ServiceRelocationParticipant[],
+  localDescriptor: ZLinkMeshNodeDescriptor | undefined
 ): readonly ServiceRelocationMembership[] {
   const recovery = canonicalActorJoinRecovery(participants);
-  const admissionId = recovery?.request.handoffId ?? relocationId;
+  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: encodeAuthorityKey('user_spot', localDescriptor.entrySpotId).value,
+        spotObjectGeneration: localDescriptor.lifecycleGeneration,
+        membershipEpoch: INITIAL_MEMBERSHIP_EPOCH
+      }
+    ];
+  }
+  const admissionId = recovery.request.handoffId;
   const admission = (
     manager as unknown as
       | {
@@ -4538,7 +4578,6 @@ function actorJoinTargetMembership(
         }
       | undefined
   )?.formalRemoteActorAdmissions?.get(admissionId);
-  const actor = participants.find((value) => value.objectKind === 'actor');
   if (admission === undefined || actor === undefined) {
     throw new Error(`Actor relocation '${relocationId}' has no accepted target membership.`);
   }
@@ -4570,18 +4609,19 @@ class LocalTargetPort implements ServiceRelocationTargetObjectPort<LocalHidden>
       );
       if (membership === undefined)
         throw new Error(`Actor '${identity}' relocation membership is missing.`);
-      const spotIdentity = decodeAuthorityKey({
-        value: membership.spotKey
-      } as ZLinkAuthorityKey).globalId;
-      const localDescriptor = this.options.localDescriptor?.(this.meshName);
-      const nativeEntrySpot = localDescriptor?.entrySpotId === spotIdentity;
+      const targetMembership = actorMembershipTarget(
+        membership,
+        this.options.localDescriptor?.(this.meshName)
+      )!;
       const actor = await this.requireActorManager().prepareRelocationActor(
         identity,
         participant.stableType,
         participant.objectGeneration,
-        participant.authorityOwnerGeneration + 1n,
-        nativeEntrySpot ? undefined : (spotIdentity as RoutingId),
-        membership.spotObjectGeneration,
+        participant.authorityOwnerGeneration,
+        targetMembership.actorSpotKind === ZLinkSpotKind.Entry
+          ? undefined
+          : (targetMembership.actorSpotId as RoutingId),
+        targetMembership.actorSpotGeneration,
         membership.membershipEpoch,
         signal
       );
@@ -4603,7 +4643,7 @@ class LocalTargetPort implements ServiceRelocationTargetObjectPort<LocalHidden>
       registration.implementation as Type<ZLinkSpot | ZLinkInstanceSpot>,
       identity as RoutingId,
       participant.objectGeneration,
-      participant.authorityOwnerGeneration + 1n,
+      participant.authorityOwnerGeneration,
       signal
     );
     return {
@@ -4654,9 +4694,11 @@ class LocalTargetPort implements ServiceRelocationTargetObjectPort<LocalHidden>
   ): Promise<void> {
     for (const membership of memberships) {
       const actor = hidden.get(membership.actorKey)?.actor;
-      const spotIdentity = decodeAuthorityKey({
-        value: membership.spotKey
-      } as ZLinkAuthorityKey).globalId;
+      const targetMembership = actorMembershipTarget(
+        membership,
+        this.options.localDescriptor?.(this.meshName)
+      )!;
+      const spotIdentity = targetMembership.actorSpotId;
       const spot =
         hidden.get(membership.spotKey)?.activation ??
         this.requireSpotManager().resolveRelocationActivation(
@@ -4665,9 +4707,7 @@ class LocalTargetPort implements ServiceRelocationTargetObjectPort<LocalHidden>
         );
       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 === 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
@@ -4675,7 +4715,12 @@ class LocalTargetPort implements ServiceRelocationTargetObjectPort<LocalHidden>
         // local Entry Spot path after the target commit.
         state.clearJoinedSpot();
       } else {
-        state.setJoinedSpot(spotIdentity as RoutingId, spot?.spot, membership.membershipEpoch);
+        state.setJoinedSpot(
+          spotIdentity as RoutingId,
+          spot?.spot,
+          membership.membershipEpoch,
+          membership.spotObjectGeneration
+        );
       }
       spot?.commitActorJoin(actor);
     }
@@ -4944,14 +4989,22 @@ function rewriteAuthorityApplicationRoute(
 }
 
 function actorMembershipTarget(
-  envelope: ServiceRelocationEnvelope,
-  actorKey: string
-): { readonly actorSpotId: string; readonly actorSpotGeneration: bigint } | undefined {
-  const membership = envelope.memberships.find((value) => value.actorKey === actorKey);
+  membership: ServiceRelocationMembership | undefined,
+  localDescriptor: ZLinkMeshNodeDescriptor | undefined
+):
+  | {
+      readonly actorSpotId: string;
+      readonly actorSpotGeneration: bigint;
+      readonly actorSpotKind: ZLinkSpotKind.Entry | ZLinkSpotKind.User;
+    }
+  | undefined {
   if (membership === undefined) return undefined;
+  const spotId = decodeAuthorityKey({ value: membership.spotKey } as ZLinkAuthorityKey).globalId;
   return {
-    actorSpotId: decodeAuthorityKey({ value: membership.spotKey } as ZLinkAuthorityKey).globalId,
-    actorSpotGeneration: membership.spotObjectGeneration
+    actorSpotId: spotId,
+    actorSpotGeneration: membership.spotObjectGeneration,
+    actorSpotKind:
+      spotId === localDescriptor?.entrySpotId ? ZLinkSpotKind.Entry : ZLinkSpotKind.User
   };
 }
 
@@ -5705,7 +5758,7 @@ function canonicalQueuedFrozenRecord(
       objectGeneration: participant.objectGeneration,
       nodeRid: target.nodeRid,
       nodeGeneration: target.nodeGeneration,
-      authorityOwnerGeneration: participant.authorityOwnerGeneration + 1n,
+      authorityOwnerGeneration: participant.authorityOwnerGeneration,
       ownerLeaseGeneration: target.ownerLeaseGeneration
     },
     operationId,
@@ -5904,16 +5957,6 @@ function replyRelayPendingKey(
   return JSON.stringify([ackTargetNodeRid, replyRelayIdentityKey(value)]);
 }
 
-function isServiceWireCommand(payload: Uint8Array, command: number): boolean {
-  return (
-    payload.byteLength >= 5 &&
-    payload[0] === 0x5a &&
-    payload[1] === 0x4d &&
-    payload[2] === 1 &&
-    payload[3] === command
-  );
-}
-
 export function encodeHandoffQueuedMessages(
   backlog: readonly ZLinkActorHandoffPacket[]
 ): readonly ServiceRelocationQueuedMessage[] {
@@ -6000,97 +6043,58 @@ function toServiceTimer(
   };
 }
 
-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: ServiceRelocationEnvelope): readonly Buffer[] {
-  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: readonly Uint8Array[]):
-  | readonly {
-      readonly participantKey: string;
-      readonly payload: Buffer;
-    }[]
-  | undefined {
-  const result: Array<{ readonly participantKey: string; readonly payload: Buffer }> = [];
-  const keys = new Set<string>();
-  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(
+function attachCanonicalBoundSessions(
   envelope: ServiceRelocationEnvelope,
-  sideband: ServiceMaintenanceRelocationPrepare['nodeInternalBoundSessions']
+  request: ServiceMaintenanceRelocationPrepare,
+  meshName: string
 ): ServiceRelocationEnvelope {
-  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 };
+  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 = decodeRoutingId(
+        '',
+        Buffer.from(binding.sessionOwnerNodeRid).toString('hex')
+      );
+      const sessionRid = decodeRoutingId('', Buffer.from(binding.sessionRid).toString('hex'));
+      const session = {
+        sessionOwnerNodeRid: sessionNodeRid as string,
+        sessionOwnerNodeGeneration: binding.sessionOwnerNodeGeneration,
+        sessionOwnerId: binding.sessionOwnerId,
+        sessionOwnerLeaseGeneration: binding.sessionOwnerLeaseGeneration,
+        sessionRid: sessionRid as string,
+        bindingGeneration: binding.bindingGeneration
+      };
+      const target: ZLinkRemoteBoundSessionTarget = {
+        routerChannelId: meshName,
+        targetNodeRid: sessionNodeRid,
+        spotId:
+          request.object.kind === 'actor'
+            ? ((participant.rootSpotId ?? '') as RoutingId)
+            : (request.object.spotId as RoutingId),
+        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: ZLinkRemoteBoundSessionTarget | undefined): Buffer {
@@ -6103,7 +6107,13 @@ function encodeActorSession(target: ZLinkRemoteBoundSessionTarget | undefined):
       spotId: String(target.spotId),
       sessionNodeRid:
         target.sessionNodeRid === undefined ? undefined : String(target.sessionNodeRid),
+      sessionNodeRidHex:
+        target.sessionNodeRid === undefined
+          ? undefined
+          : encodeRoutingIdStorageHex(target.sessionNodeRid),
       sessionRid: target.sessionRid === undefined ? undefined : String(target.sessionRid),
+      sessionRidHex:
+        target.sessionRid === undefined ? undefined : encodeRoutingIdStorageHex(target.sessionRid),
       sessionOwnerNodeGeneration: target.sessionOwnerNodeGeneration?.toString(),
       sessionOwnerId: target.sessionOwnerId,
       sessionOwnerLeaseGeneration: target.sessionOwnerLeaseGeneration?.toString(),
@@ -6126,12 +6136,18 @@ function encodeActorSession(target: ZLinkRemoteBoundSessionTarget | undefined):
               expectedAuthorityStoreVersion:
                 target.serviceWireRelocation.coordinator.expectedAuthorityStoreVersion,
               sessionOwnerNodeRid: target.serviceWireRelocation.session.sessionOwnerNodeRid,
+              sessionOwnerNodeRidHex: encodeRoutingIdStorageHex(
+                target.serviceWireRelocation.session.sessionOwnerNodeRid as RoutingId
+              ),
               sessionOwnerNodeGeneration:
                 target.serviceWireRelocation.session.sessionOwnerNodeGeneration.toString(),
               sessionOwnerId: target.serviceWireRelocation.session.sessionOwnerId,
               sessionOwnerLeaseGeneration:
                 target.serviceWireRelocation.session.sessionOwnerLeaseGeneration.toString(),
               sessionRid: target.serviceWireRelocation.session.sessionRid,
+              sessionRidHex: encodeRoutingIdStorageHex(
+                target.serviceWireRelocation.session.sessionRid as RoutingId
+              ),
               bindingGeneration: target.serviceWireRelocation.session.bindingGeneration.toString()
             }
     }),
@@ -6158,9 +6174,11 @@ function decodeActorSession(payload: Uint8Array): ZLinkRemoteBoundSessionTarget
     targetNodeRid: value.targetNodeRid as RoutingId,
     spotId: value.spotId as RoutingId,
     ...(typeof value.sessionNodeRid === 'string'
-      ? { sessionNodeRid: value.sessionNodeRid as RoutingId }
+      ? { sessionNodeRid: decodeRoutingId(value.sessionNodeRid, value.sessionNodeRidHex) }
+      : {}),
+    ...(typeof value.sessionRid === 'string'
+      ? { sessionRid: decodeRoutingId(value.sessionRid, value.sessionRidHex) }
       : {}),
-    ...(typeof value.sessionRid === 'string' ? { sessionRid: value.sessionRid as RoutingId } : {}),
     ...(optionalBigInt('sessionOwnerNodeGeneration') === undefined
       ? {}
       : { sessionOwnerNodeGeneration: optionalBigInt('sessionOwnerNodeGeneration') }),
@@ -6229,11 +6247,17 @@ function decodeActorSessionServiceWireFence(
       expectedAuthorityStoreVersion: text('expectedAuthorityStoreVersion')
     },
     session: {
-      sessionOwnerNodeRid: text('sessionOwnerNodeRid'),
+      sessionOwnerNodeRid: decodeRoutingId(
+        typeof value.sessionOwnerNodeRid === 'string' ? value.sessionOwnerNodeRid : '',
+        value.sessionOwnerNodeRidHex
+      ) as string,
       sessionOwnerNodeGeneration: positive('sessionOwnerNodeGeneration'),
       sessionOwnerId: text('sessionOwnerId'),
       sessionOwnerLeaseGeneration: positive('sessionOwnerLeaseGeneration'),
-      sessionRid: text('sessionRid'),
+      sessionRid: decodeRoutingId(
+        typeof value.sessionRid === 'string' ? value.sessionRid : '',
+        value.sessionRidHex
+      ) as string,
       bindingGeneration: positive('bindingGeneration')
     }
   };