@zlink-systems/framework 0.21.0 → 0.23.0

package/dist/runtime/streams/bound-actor-relay-sender.js

@@ -6,6 +6,7 @@ const payload_codec_1 = require("../messaging/payload-codec");
 const protocol_1 = require("./protocol");
 const abort_1 = require("../abort");
 const execution_1 = require("../execution");
+const actor_session_binding_registry_1 = require("./actor-session-binding-registry");
 const actor_session_lifecycle_coordinator_1 = require("./actor-session-lifecycle-coordinator");
 const managed_stream_1 = require("./managed-stream");
 class ZLinkBoundActorRelaySender {
@@ -23,8 +24,7 @@ class ZLinkBoundActorRelaySender {
         const header = dispatchHeader === undefined
             ? await this.currentHeader(actor)
             : await this.requireDispatchHeader(actor, dispatchHeader);
-        if (header.kind === protocol_1.ZLinkStreamMessageKind.Request
-            && header.requestSeq !== undefined) {
+        if (header.kind === protocol_1.ZLinkStreamMessageKind.Request && header.requestSeq !== undefined) {
             const operation = async () => {
                 const admission = await this.routes.beginAcceptedRequestFrameWhenReady(actor.actorId, actor.bindingToken, signal);
                 try {
@@ -34,13 +34,14 @@ class ZLinkBoundActorRelaySender {
                     await admission.complete();
                 }
             };
-            if (await this.routes.isSealed(actor.actorId) && (0, execution_1.captureZLinkExecutionTurn)() !== undefined) {
+            if ((await this.routes.isSealed(actor.actorId)) &&
+                (0, execution_1.captureZLinkExecutionTurn)() !== undefined) {
                 void operation().catch(() => undefined);
                 return { status: submission_result_1.ZLinkSubmitStatus.Submitted };
             }
             return await operation();
         }
-        if (await this.routes.isSealed(actor.actorId) && (0, execution_1.captureZLinkExecutionTurn)() !== undefined) {
+        if ((await this.routes.isSealed(actor.actorId)) && (0, execution_1.captureZLinkExecutionTurn)() !== undefined) {
             //  Spec 32:62 — a Send completes once the source outbound queue
             //  accepts it; spec 05 — infrastructure send progress must not depend
             //  on the application turn. When the CALLER IS an application turn
@@ -53,17 +54,19 @@ class ZLinkBoundActorRelaySender {
             //  Non-turn callers (stream ingress relays) keep the waiting
             //  semantics so a held frame across a failed rebind still
             //  terminalizes to the caller.
-            void this.routes.runAcceptedFrameWhenReady(actor.actorId, actor.bindingToken, () => this.relayAcceptedFrame(actor, payload, signal), signal).catch(() => undefined);
+            void this.routes
+                .runAcceptedFrameWhenReady(actor.actorId, actor.bindingToken, () => this.relayAcceptedFrame(actor, payload, signal), signal)
+                .catch(() => undefined);
             return { status: submission_result_1.ZLinkSubmitStatus.Submitted };
         }
         return this.routes.runAcceptedFrameWhenReady(actor.actorId, actor.bindingToken, () => this.relayAcceptedFrame(actor, payload, signal), signal);
     }
     async relayAcceptedFrame(actor, payload, signal, header, requestAdmission) {
-        const activeHeader = header ?? await this.currentHeader(actor);
+        const activeHeader = header ?? (await this.currentHeader(actor));
         const started = await this.lifecycle.run(actor.actorId, async () => {
             const completion = this.relayInsideLifecycle(actor, payload, signal, activeHeader, requestAdmission);
-            if (activeHeader.kind === protocol_1.ZLinkStreamMessageKind.Request
-                && activeHeader.requestSeq !== undefined) {
+            if (activeHeader.kind === protocol_1.ZLinkStreamMessageKind.Request &&
+                activeHeader.requestSeq !== undefined) {
                 // A routed REQUEST only needs this lane while its ordered submission
                 // is started. Its admission acknowledgement can depend on relocation
                 // route publication, and command 44 uses the same lane. Keeping the
@@ -94,7 +97,7 @@ class ZLinkBoundActorRelaySender {
         return header;
     }
     async relayInsideLifecycle(actor, payload, signal, currentHeader, requestAdmission) {
-        const header = currentHeader ?? await this.currentHeader(actor);
+        const header = currentHeader ?? (await this.currentHeader(actor));
         const held = requestAdmission?.beginSubmission(signal);
         if (held !== undefined)
             await held;
@@ -135,9 +138,9 @@ class ZLinkBoundActorRelaySender {
             await this.routes.unbind(actor.actorId, route.context, actor.bindingToken);
             return route;
         });
-        if (unbindNative
-            && detached.bindingToken === actor.bindingToken
-            && detached.context.stream instanceof managed_stream_1.ZLinkManagedStream) {
+        if (unbindNative &&
+            detached.bindingToken === actor.bindingToken &&
+            detached.context.stream instanceof managed_stream_1.ZLinkManagedStream) {
             await detached.context.stream.unbindActor(actor.actorId, this.options.actorBindTimeoutMs ?? 2000, signal);
         }
         await this.options.notifyDisconnected?.(actor, signal);
@@ -148,16 +151,16 @@ class ZLinkBoundActorRelaySender {
         await Promise.allSettled(snapshot.map(async (actor) => {
             const detached = await this.lifecycle.run(actor.actorId, async () => {
                 const route = await this.routes.route(actor.actorId);
-                if (route === undefined
-                    || route.context !== context
-                    || route.actor !== actor
-                    || route.bindingToken !== actor.bindingToken) {
+                if (route === undefined ||
+                    route.context !== context ||
+                    route.actor !== actor ||
+                    route.bindingToken !== actor.bindingToken) {
                     return false;
                 }
                 // The transport is already closed, so remove its exact route before
                 // invoking application lifecycle code. A reconnect can then install
                 // a successor while this best-effort notification is in flight.
-                await this.routes.unbind(actor.actorId, context, actor.bindingToken);
+                await this.routes.unbind(actor.actorId, context, actor.bindingToken, actor_session_binding_registry_1.ZLinkActorSessionBindingTermination.PhysicalDisconnect);
                 return true;
             });
             if (!detached)

package/dist/runtime/streams/bound-session-response-target.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultZLinkBoundSessionResponseTarget = void 0;
 exports.boundSessionErrorPayload = boundSessionErrorPayload;
+const contracts_1 = require("../../contracts");
+const channel_envelope_1 = require("../channels/channel-envelope");
+const route_disconnected_error_1 = require("../channels/route-disconnected-error");
 const submission_result_1 = require("../messaging/submission-result");
 const protocol_1 = require("./protocol");
 class DefaultZLinkBoundSessionResponseTarget {
@@ -36,7 +39,11 @@ class DefaultZLinkBoundSessionResponseTarget {
 exports.DefaultZLinkBoundSessionResponseTarget = DefaultZLinkBoundSessionResponseTarget;
 function boundSessionErrorPayload(error) {
     return {
-        code: error instanceof Error ? error.constructor.name : 'RemoteError',
+        code: (0, channel_envelope_1.channelErrorCodeName)(error instanceof contracts_1.ZLinkFrameworkException
+            ? error.kind
+            : error instanceof route_disconnected_error_1.ZLinkRouteDisconnectedError
+                ? contracts_1.ZLinkFrameworkErrorKind.Unavailable
+                : contracts_1.ZLinkFrameworkErrorKind.InternalFailure),
         message: errorMessage(error)
     };
 }

package/dist/runtime/streams/bound-session-service.d.ts

@@ -45,4 +45,5 @@ export declare class ZLinkBoundSessionService {
     private submitNativeBoundSessionPayload;
     private submitNativeBoundSessionFrame;
     private requireTransport;
+    private actorSlot;
 }

package/dist/runtime/streams/bound-session-service.js

@@ -20,7 +20,7 @@ class ZLinkBoundSessionService {
     async sendBoundSession(actorId, message, packetName, metadata, signal) {
         (0, abort_1.throwIfAborted)(signal);
         const route = await this.routes.requireRoute(actorId);
-        const frame = this.frameMessages.createJsonFrameMessage(protocol_1.ZLinkStreamMessageKind.Send, (0, protocol_1.resolvePacketName)(message, packetName), metadata, false, undefined, message);
+        const frame = this.frameMessages.createJsonFrameMessage(protocol_1.ZLinkStreamMessageKind.Send, (0, protocol_1.resolvePacketName)(message, packetName), metadata, false, undefined, message, undefined, this.actorSlot(route));
         try {
             const result = await this.requireTransport().send(actorId, frame, {
                 bindingToken: route.bindingToken,
@@ -40,7 +40,7 @@ class ZLinkBoundSessionService {
         if (route === undefined) {
             return { status: submission_result_1.ZLinkSubmitStatus.TargetNotFound };
         }
-        const frame = this.frameMessages.createJsonFrameMessage(protocol_1.ZLinkStreamMessageKind.Send, (0, protocol_1.resolvePacketName)(message, packetName), metadata, false, undefined, message);
+        const frame = this.frameMessages.createJsonFrameMessage(protocol_1.ZLinkStreamMessageKind.Send, (0, protocol_1.resolvePacketName)(message, packetName), metadata, false, undefined, message, undefined, this.actorSlot(route));
         try {
             (0, abort_1.throwIfAborted)(signal);
             if ((await this.routes.route(actorId))?.bindingToken !== route.bindingToken) {
@@ -114,7 +114,7 @@ class ZLinkBoundSessionService {
         const header = runtime_message_1.ZLinkBufferMessage.fromOwned(Buffer.from(encodedBindHeader.buffer, encodedBindHeader.byteOffset, encodedBindHeader.byteLength));
         const body = runtime_message_1.ZLinkBufferMessage.fromOwned(Buffer.alloc(0));
         try {
-            if (!await stream.sendBoundActor(actorRef.actorId, [header, body], 0)) {
+            if (!(await stream.sendBoundActor(actorRef.actorId, [header, body], 0))) {
                 throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorRouteNotFound, `Actor '${actorRef.actorId}' remote bound session bind relay failed.`);
             }
         }
@@ -124,7 +124,7 @@ class ZLinkBoundSessionService {
         }
     }
     async writeLocalBoundSessionFrame(actorId, route, kind, packetName, metadata, compressPayload, requestSeq, payload, operationName) {
-        const frame = this.frameMessages.createJsonFrameMessage(kind, packetName, metadata, compressPayload, requestSeq, payload);
+        const frame = this.frameMessages.createJsonFrameMessage(kind, packetName, metadata, compressPayload, requestSeq, payload, undefined, this.actorSlot(route));
         try {
             if ((await this.routes.route(actorId))?.bindingToken !== route.bindingToken) {
                 return false;
@@ -165,6 +165,9 @@ class ZLinkBoundSessionService {
         }
         return this.options.transport;
     }
+    actorSlot(route) {
+        return route.actorSlot;
+    }
 }
 exports.ZLinkBoundSessionService = ZLinkBoundSessionService;
 function requireBoundSessionGeneration(actorRef) {
@@ -183,14 +186,13 @@ function toBoundSessionSendActorRef(actor) {
 }
 function boundSessionSendFence(node, backendActor, actor) {
     const internal = actor;
-    const ownerNodeGeneration = internal.ownerNodeGeneration
-        ?? node.actorNodeGeneration?.(backendActor);
-    if (internal.ownershipGeneration === undefined
-        || internal.ownershipGeneration <= 0n
-        || internal.ownerLeaseGeneration === undefined
-        || internal.ownerLeaseGeneration <= 0n
-        || ownerNodeGeneration === undefined
-        || ownerNodeGeneration <= 0n) {
+    const ownerNodeGeneration = internal.ownerNodeGeneration ?? node.actorNodeGeneration?.(backendActor);
+    if (internal.ownershipGeneration === undefined ||
+        internal.ownershipGeneration <= 0n ||
+        internal.ownerLeaseGeneration === undefined ||
+        internal.ownerLeaseGeneration <= 0n ||
+        ownerNodeGeneration === undefined ||
+        ownerNodeGeneration <= 0n) {
         return undefined;
     }
     return Object.freeze({

package/dist/runtime/streams/index.js

@@ -40,8 +40,9 @@ class ZLinkStreamRuntimeManager {
     applicationJobQueue;
     constructor(options) {
         this.options = options;
-        this.applicationJobQueue = options.applicationJobQueue
-            ?? new application_job_queue_1.ApplicationJobQueue((0, application_job_queue_1.resolveApplicationJobQueueConfiguration)());
+        this.applicationJobQueue =
+            options.applicationJobQueue ??
+                new application_job_queue_1.ApplicationJobQueue((0, application_job_queue_1.resolveApplicationJobQueueConfiguration)());
     }
     start() {
         if (this.options.registration.streamNodes.size === 0) {
@@ -75,20 +76,19 @@ class ZLinkStreamRuntimeManager {
             if (actorDispatchEnabled) {
                 for (const [meshName, mesh] of this.options.registration.spotNodes) {
                     const isPrimaryMesh = meshName === applicationMeshName;
-                    if (!isPrimaryMesh
-                        && mesh.objectRole !== 'client'
-                        && mesh.objectRole !== 'server')
+                    if (!isPrimaryMesh && mesh.objectRole !== 'client' && mesh.objectRole !== 'server')
                         continue;
-                    const meshNode = this.options.nativeMeshNodeForName?.(meshName)
-                        ?? (isPrimaryMesh ? nativeMeshNode : undefined);
-                    const completions = this.options.meshCompletionsForName?.(meshName)
-                        ?? (isPrimaryMesh ? meshCompletions : undefined);
+                    const meshNode = this.options.nativeMeshNodeForName?.(meshName) ??
+                        (isPrimaryMesh ? nativeMeshNode : undefined);
+                    const completions = this.options.meshCompletionsForName?.(meshName) ??
+                        (isPrimaryMesh ? meshCompletions : undefined);
                     const createService = meshNode?.createStreamSessionService;
                     if (typeof createService !== 'function' || completions === undefined)
                         continue;
                     const service = createService.call(meshNode, socket.nativeInstance);
                     const bindingOwner = (0, actor_session_binding_runtime_owner_1.actorSessionBindingRuntimeOwner)(this.options.bindingRuntime);
                     (0, service_session_binding_ingress_port_1.registerServiceSessionBindingIngressPort)(service, {
+                        actorSlot: (actorId, sessionRid) => bindingOwner.actorSlot(actorId, sessionRid),
                         retainOutbound: (claim, delivery) => bindingOwner.admitRelocationOutbound(claim, delivery),
                         clearOutbound: (actorId, error) => bindingOwner.clearRelocation(actorId, error)
                     });
@@ -112,7 +112,7 @@ class ZLinkStreamRuntimeManager {
                 applicationJobQueue: this.applicationJobQueue,
                 nativeSessionService,
                 meshCompletions,
-                nativeSessionRouteForMesh: meshName => nativeSessionRoutes.get(meshName),
+                nativeSessionRouteForMesh: (meshName) => nativeSessionRoutes.get(meshName),
                 monitor,
                 bindingRuntime: this.options.bindingRuntime,
                 acceptNewSession: () => this.options.acceptNewSession?.(applicationMeshName) !== false,
@@ -131,7 +131,7 @@ class ZLinkStreamRuntimeManager {
                 socket,
                 monitor,
                 nativeSessionService,
-                nativeSessionServices: [...nativeSessionRoutes.values()].map(route => route.service)
+                nativeSessionServices: [...nativeSessionRoutes.values()].map((route) => route.service)
             });
         }
     }
@@ -140,8 +140,8 @@ class ZLinkStreamRuntimeManager {
         this.nodes.clear();
         for (const node of nodes.reverse()) {
             await node.runtime.dispose();
-            const nativeServices = node.nativeSessionServices
-                ?? (node.nativeSessionService === undefined ? [] : [node.nativeSessionService]);
+            const nativeServices = node.nativeSessionServices ??
+                (node.nativeSessionService === undefined ? [] : [node.nativeSessionService]);
             for (const service of nativeServices) {
                 service.shutdown(1000);
                 service.close();
@@ -167,9 +167,10 @@ class ZLinkStreamSessionRuntime extends stream_session_runtime_1.ZLinkStreamSess
         // Spec 27 §4: a default-constructed binding runtime must still honor the
         // process diagnostics level, so wire its Off gate to the runtime's
         // dispatch-error flow tracer.
-        const bindingRuntime = options.bindingRuntime ?? new ZLinkStreamBindingRuntime({
-            flowCreationEnabled: () => options.dispatchErrors?.flow.flowCreationEnabled() ?? true
-        });
+        const bindingRuntime = options.bindingRuntime ??
+            new ZLinkStreamBindingRuntime({
+                flowCreationEnabled: () => options.dispatchErrors?.flow.flowCreationEnabled() ?? true
+            });
         super({
             ...options,
             bindingRuntime
@@ -183,9 +184,10 @@ class ZLinkStreamSessionNodeRuntime extends stream_session_runtime_1.ZLinkStream
     constructor(options) {
         // Spec 27 §4: keep the default binding runtime's flow creation behind the
         // process diagnostics Off gate (see ZLinkStreamSessionRuntime above).
-        const bindingRuntime = options.bindingRuntime ?? new ZLinkStreamBindingRuntime({
-            flowCreationEnabled: () => options.dispatchErrors?.flow.flowCreationEnabled() ?? true
-        });
+        const bindingRuntime = options.bindingRuntime ??
+            new ZLinkStreamBindingRuntime({
+                flowCreationEnabled: () => options.dispatchErrors?.flow.flowCreationEnabled() ?? true
+            });
         super({
             ...options,
             bindingRuntime
@@ -205,7 +207,7 @@ class ZLinkStreamBindingRuntime {
             ...options,
             actorBindTimeoutMs: options.actorBindTimeoutMs ?? DEFAULT_ACTOR_BIND_TIMEOUT_MS
         };
-        this.routes = new actor_session_binding_registry_1.ZLinkActorSessionBindingRegistry(4096, 4096, runtimeOptions.sessionRelocationSealTimeoutMs ?? 3_000);
+        this.routes = new actor_session_binding_registry_1.ZLinkActorSessionBindingRegistry(4096, 4096, runtimeOptions.sessionRelocationSealTimeoutMs ?? 3_000, runtimeOptions.errorSink);
         this.compressionCodec = (0, stream_frame_factory_1.resolveStreamCompressionCodec)(runtimeOptions.streamCompression);
         this.frameMessages = new stream_frame_factory_1.ZLinkStreamFrameMessageFactory(runtimeOptions);
         this.boundSessions = new bound_session_service_1.ZLinkBoundSessionService(this.routes, this.frameMessages, runtimeOptions);
@@ -213,6 +215,12 @@ class ZLinkStreamBindingRuntime {
         this.sessionActors = new session_actor_coordinator_1.ZLinkSessionActorCoordinator(this.routes, this, runtimeOptions, actorSessionLifecycle);
         this.boundActorRelay = new bound_actor_relay_sender_1.ZLinkBoundActorRelaySender(this.routes, this.frameMessages, runtimeOptions, actorSessionLifecycle);
         (0, actor_session_binding_runtime_owner_1.registerActorSessionBindingRuntimeOwner)(this, {
+            actorSlot: async (actorId, sessionRid) => {
+                const route = await this.routes.route(actorId);
+                return route !== undefined && route.sessionIdentity === sessionRid
+                    ? route.actorSlot
+                    : undefined;
+            },
             sealRelocation: (claim, expected, signal) => this.routes.sealRelocation(claim, expected, signal),
             relocationSnapshot: (actorId, sealId) => this.routes.relocationSnapshot(actorId, sealId),
             retainRelocationOutbound: (actorId, operation, sealId) => this.routes.retainRelocationOutbound(actorId, operation, sealId),

package/dist/runtime/streams/managed-stream.d.ts

@@ -43,6 +43,9 @@ export declare class ZLinkManagedStream implements ZLinkStream {
     bindActor(actor: ActorRef, timeoutMs: number, signal?: AbortSignal, onBindingReplaced?: (actor: ServiceActorRef, retiredSession: ServiceRetiredBoundSessionRouteFence) => void, authorityFence?: ZLinkActorSessionAuthorityFence): Promise<void>;
     private ensureNativeActorRoute;
     unbindActor(actorId: string, timeoutMs: number, signal?: AbortSignal): Promise<void>;
+    enqueueActorBound(actorSlot: number, actorId: string): Promise<void>;
+    enqueueActorUnbound(actorSlot: number): Promise<void>;
+    private submitActorBindingControl;
     sendBoundActor(actorId: string, parts: readonly Message[], flags?: ZLinkBackendSendFlags): Promise<boolean>;
     updateAddresses(localAddr: string | undefined, remoteAddr: string | undefined): void;
     private hasNativeBinding;

package/dist/runtime/streams/managed-stream.js

@@ -84,7 +84,7 @@ class ZLinkManagedStream {
     }
     async submitBoundActor(actorId, parts, signal) {
         (0, abort_1.throwIfAborted)(signal);
-        return await this.sendBoundActor(actorId, parts, ZLINK_SEND_DONT_WAIT)
+        return (await this.sendBoundActor(actorId, parts, ZLINK_SEND_DONT_WAIT))
             ? { status: submission_result_1.ZLinkSubmitStatus.Submitted }
             : { status: submission_result_1.ZLinkSubmitStatus.Backpressured };
     }
@@ -122,12 +122,12 @@ class ZLinkManagedStream {
         if (this.transportClosed) {
             throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Stream session '${this.sessionId}' is disconnected.`);
         }
+        const nativeActor = toNativeActorRef(actor);
         const route = this.nativeRoute(actor.meshName);
         if (route !== undefined) {
             if (route.service.status().state === 1) {
                 route.service.start();
             }
-            const nativeActor = toNativeActorRef(actor);
             await this.ensureNativeActorRoute(route, actor, timeoutMs, signal);
             if (this.isTransportClosed()) {
                 throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Stream session '${this.sessionId}' is disconnected.`);
@@ -137,9 +137,10 @@ class ZLinkManagedStream {
                 : (_actorId, retiredSession, replacedActor) => {
                     onBindingReplaced(replacedActor, retiredSession);
                 }, toStreamSessionActorAuthorityFence(authorityFence)), signal), `Actor '${actor.actorId}' native session bind`);
-            const binding = route.service.bindings(this.backendRoutingId())
-                .find((candidate) => candidate.actor.actorId === nativeActor.actorId
-                && candidate.actor.generation === nativeActor.generation);
+            const binding = route.service
+                .bindings(this.backendRoutingId())
+                .find((candidate) => candidate.actor.actorId === nativeActor.actorId &&
+                candidate.actor.generation === nativeActor.generation);
             if (binding === undefined) {
                 throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, `Actor '${actor.actorId}' native session bind completed without a binding snapshot.`);
             }
@@ -162,6 +163,7 @@ class ZLinkManagedStream {
             return;
         }
         await this.socket.bindActor(this.backendRoutingId(), toBackendActorRef(actor), timeoutMs, signal);
+        this.nativeActorBindings.set(actor.actorId, { actor: nativeActor });
     }
     async ensureNativeActorRoute(route, actor, timeoutMs, signal) {
         const completion = await route.completions.submit(() => route.service.lookupActor(actor.nodeRid, actor.actorId, timeoutMs), signal);
@@ -169,16 +171,16 @@ class ZLinkManagedStream {
             const resolved = completion.kindData?.kind === 'actorLookupCompletion'
                 ? completion.kindData.location.actor
                 : undefined;
-            if (completion.terminalResult !== 0
-                || completion.failureErrno !== 0
-                || resolved === undefined
-                || resolved.actorId !== actor.actorId
-                || resolved.generation !== actor.objectGeneration
-                || String(resolved.nodeRid) !== String(actor.nodeRid)) {
-                throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorRouteNotFound, `Actor '${actor.actorId}' native route fence does not match its ActorRef `
-                    + `(expected ${String(actor.nodeRid)}/${actor.objectGeneration}, `
-                    + `resolved ${resolved === undefined ? 'none' : `${String(resolved.nodeRid)}/${resolved.generation}`}, `
-                    + `terminal=${completion.terminalResult}, failure=${completion.failureErrno}).`);
+            if (completion.terminalResult !== 0 ||
+                completion.failureErrno !== 0 ||
+                resolved === undefined ||
+                resolved.actorId !== actor.actorId ||
+                resolved.generation !== actor.objectGeneration ||
+                String(resolved.nodeRid) !== String(actor.nodeRid)) {
+                throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.ActorRouteNotFound, `Actor '${actor.actorId}' native route fence does not match its ActorRef ` +
+                    `(expected ${String(actor.nodeRid)}/${actor.objectGeneration}, ` +
+                    `resolved ${resolved === undefined ? 'none' : `${String(resolved.nodeRid)}/${resolved.generation}`}, ` +
+                    `terminal=${completion.terminalResult}, failure=${completion.failureErrno}).`);
             }
         }
         finally {
@@ -222,6 +224,24 @@ class ZLinkManagedStream {
             return;
         }
         await this.socket.unbindActor(this.backendRoutingId(), actorId, timeoutMs, signal);
+        if (binding !== undefined && this.nativeActorBindings.get(actorId) === binding) {
+            this.nativeActorBindings.delete(actorId);
+        }
+    }
+    async enqueueActorBound(actorSlot, actorId) {
+        await this.submitActorBindingControl((0, protocol_1.encodeActorBoundFrame)(actorSlot, actorId));
+    }
+    async enqueueActorUnbound(actorSlot) {
+        await this.submitActorBindingControl((0, protocol_1.encodeActorUnboundFrame)(actorSlot));
+    }
+    async submitActorBindingControl(frame) {
+        const message = runtime_message_1.ZLinkBufferMessage.from(frame);
+        try {
+            await this.socket.submit(this.backendRoutingId(), message);
+        }
+        finally {
+            message.close();
+        }
     }
     async sendBoundActor(actorId, parts, flags) {
         if (this.transportClosed) {
@@ -231,7 +251,7 @@ class ZLinkManagedStream {
         if (binding?.route !== undefined) {
             const nativeParts = parts.map((part) => runtime_message_1.ZLinkBufferMessage.from(part.data()));
             try {
-                return await binding.route.service.sendToActor(this.backendRoutingId(), binding.actor, nativeParts, { flags: flags ?? 0 }) === 0;
+                return ((await binding.route.service.sendToActor(this.backendRoutingId(), binding.actor, nativeParts, { flags: flags ?? 0 })) === 0);
             }
             finally {
                 for (const part of nativeParts) {
@@ -251,8 +271,9 @@ class ZLinkManagedStream {
     }
     hasNativeBinding(route, actorId, bindingGeneration) {
         try {
-            return route.service.bindings(this.backendRoutingId()).some(candidate => candidate.actor.actorId === actorId
-                && candidate.bindingGeneration === bindingGeneration);
+            return route.service
+                .bindings(this.backendRoutingId())
+                .some((candidate) => candidate.actor.actorId === actorId && candidate.bindingGeneration === bindingGeneration);
         }
         catch {
             // A closed native service owns the teardown state. Keep the original
@@ -266,8 +287,8 @@ class ZLinkManagedStream {
     async requireSuccessfulCompletion(completionPromise, operationName, acceptedTerminalResults = NO_ACCEPTED_TERMINAL_RESULTS) {
         const completion = await completionPromise;
         try {
-            if (completion.terminalResult !== 0
-                && !acceptedTerminalResults.has(completion.terminalResult)) {
+            if (completion.terminalResult !== 0 &&
+                !acceptedTerminalResults.has(completion.terminalResult)) {
                 throw (0, framework_errors_internal_1.wireReplyFailureException)(completion.terminalResult, completion.failureErrno, `${operationName} failed with result ${completion.terminalResult} (errno ${completion.failureErrno}).`);
             }
         }
@@ -276,13 +297,13 @@ class ZLinkManagedStream {
         }
     }
     nativeRoute(meshName) {
-        return this.nativeSessionRouteForMesh?.(meshName)
-            ?? (this.nativeSessionService !== undefined && this.meshCompletions !== undefined
+        return (this.nativeSessionRouteForMesh?.(meshName) ??
+            (this.nativeSessionService !== undefined && this.meshCompletions !== undefined
                 ? {
                     service: this.nativeSessionService,
                     completions: this.meshCompletions
                 }
-                : undefined);
+                : undefined));
     }
 }
 exports.ZLinkManagedStream = ZLinkManagedStream;
@@ -290,16 +311,16 @@ function streamSessionIdFromRoutingId(routingId) {
     if (typeof routingId === 'string') {
         return routingId;
     }
-    if (typeof routingId === 'object'
-        && routingId !== null
-        && 'toHex' in routingId
-        && typeof routingId.toHex === 'function') {
+    if (typeof routingId === 'object' &&
+        routingId !== null &&
+        'toHex' in routingId &&
+        typeof routingId.toHex === 'function') {
         return routingId.toHex();
     }
-    if (typeof routingId === 'object'
-        && routingId !== null
-        && 'toString' in routingId
-        && typeof routingId.toString === 'function') {
+    if (typeof routingId === 'object' &&
+        routingId !== null &&
+        'toString' in routingId &&
+        typeof routingId.toString === 'function') {
         return routingId.toString();
     }
     throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RouteNotConnected, 'Stream session routing id is invalid.');

package/dist/runtime/streams/native-fallback-bound-session.js

@@ -23,7 +23,9 @@ class ZLinkNativeFallbackBoundSession {
     async disconnect(signal) {
         const remoteTarget = this.options.remoteBoundSessionTargetProvider();
         if (remoteTarget !== undefined) {
-            const spotKind = 'spotKind' in remoteTarget ? remoteTarget.spotKind : undefined;
+            const spotKind = 'spotKind' in remoteTarget
+                ? remoteTarget.spotKind
+                : undefined;
             const payload = (0, actor_packet_relay_wire_1.encodeRemoteActorPacketRelayPayload)({
                 actorId: this.options.actorId,
                 routerChannelId: remoteTarget.routerChannelId,
@@ -36,17 +38,23 @@ class ZLinkNativeFallbackBoundSession {
                 spotId: remoteTarget.spotId,
                 spotKind: spotKind ?? contracts_1.ZLinkSpotKind.Entry
             };
-            if (await (0, actor_routed_json_request_1.tryRequestRoutedJson)(this.options.routedTransport, target, payload, { timeoutMs: this.options.requestTimeoutMs, signal })) {
+            if (await (0, actor_routed_json_request_1.tryRequestRoutedJson)(this.options.routedTransport, target, payload, {
+                timeoutMs: this.options.requestTimeoutMs,
+                signal
+            })) {
                 return;
             }
-            await this.options.routedTransport.sendToSpot(target, payload, { packetName: actors_1.ZLINK_REMOTE_ACTOR_PACKET_RELAY_PACKET, signal });
+            await this.options.routedTransport.sendToSpot(target, payload, {
+                packetName: actors_1.ZLINK_REMOTE_ACTOR_PACKET_RELAY_PACKET,
+                signal
+            });
             return;
         }
         const actorRef = this.options.actorRefProvider();
         const node = this.options.nativeActorNodeProvider();
-        if (actorRef !== undefined
-            && node !== undefined
-            && currentBindingGeneration(actorRef) !== undefined) {
+        if (actorRef !== undefined &&
+            node !== undefined &&
+            currentBindingGeneration(actorRef) !== undefined) {
             await this.options.runtime.disconnectNativeBoundSession(node, actorRef, signal);
             return;
         }
@@ -106,9 +114,7 @@ class ZLinkNativeFallbackBoundSessionSendCall {
             const actorRef = this.options.actorRefProvider();
             const node = this.options.nativeActorNodeProvider();
             const bindingGeneration = currentBindingGeneration(actorRef);
-            if (actorRef !== undefined
-                && node !== undefined
-                && bindingGeneration !== undefined) {
+            if (actorRef !== undefined && node !== undefined && bindingGeneration !== undefined) {
                 nativeAttempted = true;
                 const result = await this.options.runtime.sendNativeBoundSession(node, actorRef, this.message, packetName, this.selectedMetadata, signal);
                 if (result.status !== submission_result_1.ZLinkSubmitStatus.TargetNotFound) {
@@ -122,8 +128,7 @@ class ZLinkNativeFallbackBoundSessionSendCall {
         }
         if (remoteTarget !== undefined) {
             const actorRef = this.options.actorRefProvider();
-            const ownershipGeneration = actorRef
-                ?.ownershipGeneration;
+            const ownershipGeneration = actorRef?.ownershipGeneration;
             const payload = (0, bound_session_wire_1.encodeRemoteBoundSessionSendPayload)({
                 actorId: this.options.actorId,
                 actorMeshName: actorRef?.meshName,
@@ -140,8 +145,7 @@ class ZLinkNativeFallbackBoundSessionSendCall {
                     ? (0, flow_context_1.currentOrCreateFlow)('Application')
                     : undefined)
             });
-            const submit = this.options.routedTransport.submitInfrastructure
-                ?? this.options.routedTransport.submit;
+            const submit = this.options.routedTransport.submitInfrastructure ?? this.options.routedTransport.submit;
             const result = submit === undefined
                 ? await this.options.routedTransport.sendToSpot({
                     routerChannelId: remoteTarget.routerChannelId,
@@ -161,10 +165,10 @@ class ZLinkNativeFallbackBoundSessionSendCall {
         const actorRef = this.options.actorRefProvider();
         const node = this.options.nativeActorNodeProvider();
         const bindingGeneration = currentBindingGeneration(actorRef);
-        if (!nativeAttempted
-            && actorRef !== undefined
-            && node !== undefined
-            && bindingGeneration !== undefined) {
+        if (!nativeAttempted &&
+            actorRef !== undefined &&
+            node !== undefined &&
+            bindingGeneration !== undefined) {
             const result = await this.options.runtime.sendNativeBoundSession(node, actorRef, this.message, packetName, this.selectedMetadata, signal);
             this.traceSubmitted(result, packetName);
             return result;

package/dist/runtime/streams/protocol.d.ts

@@ -22,7 +22,8 @@ export declare enum ZLinkStreamHeaderFlags {
     HasMetadata = 2,
     PayloadCompressed = 4,
     HasCorrelationId = 8,
-    HasFlowId = 16
+    HasFlowId = 16,
+    HasActorSlot = 32
 }
 export declare enum ZLinkStreamCloseReasonCode {
     ClientClose = 1,
@@ -44,6 +45,7 @@ export interface ZLinkStreamFrameHeader {
     readonly correlationId?: string;
     readonly flowId?: string;
     readonly flowOrigin?: ZLinkFlowOrigin;
+    readonly actorSlot?: number;
 }
 export type ZLinkStreamReplyMessageKind = ZLinkStreamMessageKind.Response | ZLinkStreamMessageKind.Error;
 export interface ZLinkStreamFrame {
@@ -54,6 +56,8 @@ export declare function resolvePacketName(message: unknown, explicitPacketName:
 export declare function ensureSingleSubmit(executed: boolean): void;
 export declare function encodeStreamFrame(header: ZLinkStreamFrameHeader, payload: Uint8Array): Uint8Array;
 export declare function encodeStreamControlFrame(name: string): Uint8Array;
+export declare function encodeActorBoundFrame(actorSlot: number, actorId: string): Uint8Array;
+export declare function encodeActorUnboundFrame(actorSlot: number): Uint8Array;
 export declare function encodeSessionClosingFrame(diagnostic?: string, reason?: ZLinkStreamCloseReasonCode): Uint8Array;
 export declare function decodeStreamFrame(frame: Uint8Array): ZLinkStreamFrame;
 export declare function tryDecodeStreamFrame(frame: Uint8Array): ZLinkStreamFrame | undefined;