@zlink-systems/framework 0.30.1 → 0.30.2

package/dist/runtime/channels/channel-envelope.js

@@ -6,6 +6,7 @@ exports.encodeChannelEnvelopeParts = encodeChannelEnvelopeParts;
 exports.encodeChannelEnvelopePartsAtDeadline = encodeChannelEnvelopePartsAtDeadline;
 exports.encodeChannelPublishEnvelopeParts = encodeChannelPublishEnvelopeParts;
 exports.encodeChannelReplyParts = encodeChannelReplyParts;
+exports.channelErrorKindFromCode = channelErrorKindFromCode;
 exports.channelErrorCodeName = channelErrorCodeName;
 exports.encodeChannelErrorReplyParts = encodeChannelErrorReplyParts;
 exports.decodeChannelReply = decodeChannelReply;
@@ -43,8 +44,20 @@ const CHANNEL_CORRELATION_TEXT_LENGTH = 32;
 const PREPARED_CHANNEL_CORRELATION = '0'.repeat(CHANNEL_CORRELATION_TEXT_LENGTH);
 const PREPARED_CHANNEL_DEADLINE = '2000-01-01T00:00:00.000Z';
 const CHANNEL_CORRELATION_TEXT = /^[0-9a-f]{32}$/;
+const CHANNEL_FLOW_FIELD = ',"flowId":';
+// A flow id is a lowercase UUIDv7 (spec 27 §3): fixed 36 JSON-safe ASCII bytes.
+const PREPARED_CHANNEL_FLOW = '00000000-0000-7000-8000-000000000000';
+const CHANNEL_FLOW_TEXT = /^[0-9a-f-]{36}$/;
+// A per-process random 64-bit prefix followed by a per-process counter, both
+// as lowercase hex: unique among the runtime's pending requests (spec 06-obs/04
+// §3) without drawing random bytes for every request — the shape Java
+// ZLinkServiceOperationIds uses.
+const CHANNEL_CORRELATION_PREFIX = (0, node_crypto_1.randomBytes)(CHANNEL_CORRELATION_TEXT_LENGTH / 4).toString('hex');
+let channelCorrelationCounter = 0;
 function newChannelCorrelationId() {
-    return (0, node_crypto_1.randomUUID)().replaceAll('-', '');
+    channelCorrelationCounter += 1;
+    return (CHANNEL_CORRELATION_PREFIX +
+        channelCorrelationCounter.toString(16).padStart(CHANNEL_CORRELATION_TEXT_LENGTH / 2, '0'));
 }
 function encodeChannelEnvelopeParts(kind, channelName, packetName, payload, timeoutMs, topic, codecs, correlationId, createFlow = true, metadata = EMPTY_OUTBOUND_METADATA) {
     return encodeChannelEnvelopePartsAtDeadline(kind, channelName, packetName, payload, timeoutMs === undefined ? undefined : Date.now() + timeoutMs, topic, codecs, correlationId, createFlow, metadata);
@@ -114,6 +127,9 @@ const ERROR_KIND_WIRE_NAMES = [
     'internal_failure' // 11
 ];
 const ERROR_KIND_BY_WIRE_NAME = new Map(ERROR_KIND_WIRE_NAMES.map((name, kind) => [name, kind]));
+function channelErrorKindFromCode(code) {
+    return ERROR_KIND_BY_WIRE_NAME.get(code);
+}
 function channelErrorCodeName(kind) {
     return ERROR_KIND_WIRE_NAMES[kind] ?? 'internal_failure';
 }
@@ -149,7 +165,7 @@ function decodeChannelReply(parts, codecs) {
         return runtime_message_1.ZLinkBufferMessage.retainPayload(parts[1]);
     }
     if (serializer !== undefined) {
-        return serializer.deserialize(contracts_1.ZLinkEncodedPayload.from(parts[1].data()), Object);
+        return serializer.deserialize((0, payload_codec_1.encodedPayloadFromOwned)(parts[1].data()), Object);
     }
     return parseWireJson(parts[1].data().toString(), (0, Attributes_1.readZLinkPacketJsonContract)(header.messageName)?.reply);
 }
@@ -164,7 +180,7 @@ function decodeChannelError(header) {
         //  Cross-language contract: errorCode carries the snake_case wire name.
         //  An unknown name degrades to InternalFailure, matching the C++
         //  request_failure_mapper fallback for unrecognized codes.
-        const publicKind = ERROR_KIND_BY_WIRE_NAME.get(code) ?? contracts_1.ZLinkFrameworkErrorKind.InternalFailure;
+        const publicKind = channelErrorKindFromCode(code) ?? contracts_1.ZLinkFrameworkErrorKind.InternalFailure;
         failure = new contracts_1.ZLinkFrameworkException(publicKind, message);
     }
     //  Cross-language contract (.NET ZLinkErrorOriginWire.RemoteReplyOrigin /
@@ -206,7 +222,7 @@ function decodeChannelPayload(envelope, codecs) {
         }
         const serializer = codecs?.serializers.get(envelope.header.contentType);
         if (serializer !== undefined) {
-            return serializer.deserialize(contracts_1.ZLinkEncodedPayload.from(envelope.payload), Object);
+            return serializer.deserialize((0, payload_codec_1.encodedPayloadFromOwned)(envelope.payload), Object);
         }
         if (envelope.header.contentType === exports.BINARY_CONTENT_TYPE) {
             // The receive loop owns the Message for the duration of dispatch, so
@@ -282,8 +298,9 @@ function encodeJsonBytes(value, schema) {
 function encodeChannelHeader(kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin, codecs) {
     if (codecs !== undefined &&
         metadata === EMPTY_APPLICATION_METADATA &&
-        flowId === undefined &&
-        flowOrigin === undefined &&
+        (flowId === undefined
+            ? flowOrigin === undefined
+            : flowOrigin !== undefined && CHANNEL_FLOW_TEXT.test(flowId)) &&
         topic === null &&
         source === undefined &&
         ((kind === 3 /* ZLinkChannelMessageKind.Command */ &&
@@ -304,7 +321,7 @@ function encodeChannelHeader(kind, channelName, messageName, contentType, correl
                 deadline === null &&
                 errorCode === undefined &&
                 errorMessage === undefined))) {
-        return preparedChannelHeader(codecs, kind, channelName, messageName, contentType, correlationId, deadline, errorCode, errorMessage);
+        return preparedChannelHeader(codecs, kind, channelName, messageName, contentType, correlationId, deadline, errorCode, errorMessage, flowId, flowOrigin);
     }
     // The wire has a fixed field order. Measure escaped UTF-8 first, then write
     // each field once into the only header Buffer: no header object, whole JSON
@@ -316,7 +333,7 @@ function encodeChannelHeader(kind, channelName, messageName, contentType, correl
     writeChannelHeader(writer, kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin);
     return result;
 }
-function preparedChannelHeader(codecs, kind, channelName, messageName, contentType, correlationId, deadline, errorCode, errorMessage) {
+function preparedChannelHeader(codecs, kind, channelName, messageName, contentType, correlationId, deadline, errorCode, errorMessage, flowId, flowOrigin) {
     let channels = preparedChannelHeaders.get(codecs.serializers);
     if (channels === undefined)
         preparedChannelHeaders.set(codecs.serializers, (channels = new Map()));
@@ -333,23 +350,30 @@ function preparedChannelHeader(codecs, kind, channelName, messageName, contentTy
     if (deadlines === undefined)
         kinds.set(kind, (deadlines = new Map()));
     const hasDeadline = deadline !== null;
-    let prepared = deadlines.get(hasDeadline);
+    let flows = deadlines.get(hasDeadline);
+    if (flows === undefined)
+        deadlines.set(hasDeadline, (flows = new Map()));
+    let prepared = flows.get(flowOrigin);
     if (prepared === undefined) {
-        const bytes = encodeChannelHeader(kind, channelName, messageName, contentType, correlationId === null ? null : PREPARED_CHANNEL_CORRELATION, hasDeadline ? PREPARED_CHANNEL_DEADLINE : null, null, errorCode, errorMessage, undefined, EMPTY_APPLICATION_METADATA, undefined, undefined);
+        const bytes = encodeChannelHeader(kind, channelName, messageName, contentType, correlationId === null ? null : PREPARED_CHANNEL_CORRELATION, hasDeadline ? PREPARED_CHANNEL_DEADLINE : null, null, errorCode, errorMessage, undefined, EMPTY_APPLICATION_METADATA, flowOrigin === undefined ? undefined : PREPARED_CHANNEL_FLOW, flowOrigin);
         prepared = {
             bytes,
             correlationOffset: bytes.indexOf(CHANNEL_CORRELATION_FIELD) + CHANNEL_CORRELATION_FIELD.length + 1,
-            deadlineOffset: bytes.indexOf(CHANNEL_DEADLINE_FIELD) + CHANNEL_DEADLINE_FIELD.length + 1
+            deadlineOffset: bytes.indexOf(CHANNEL_DEADLINE_FIELD) + CHANNEL_DEADLINE_FIELD.length + 1,
+            flowOffset: bytes.indexOf(CHANNEL_FLOW_FIELD) + CHANNEL_FLOW_FIELD.length + 1
         };
-        deadlines.set(hasDeadline, prepared);
+        flows.set(flowOrigin, prepared);
     }
-    if (correlationId === null)
+    if (correlationId === null && flowId === undefined)
         return prepared.bytes;
-    const bytes = Buffer.alloc(prepared.bytes.byteLength);
+    const bytes = Buffer.allocUnsafe(prepared.bytes.byteLength);
     prepared.bytes.copy(bytes);
-    bytes.write(correlationId, prepared.correlationOffset, CHANNEL_CORRELATION_TEXT_LENGTH, 'ascii');
+    if (correlationId !== null)
+        bytes.write(correlationId, prepared.correlationOffset, CHANNEL_CORRELATION_TEXT_LENGTH, 'ascii');
     if (deadline !== null)
         bytes.write(deadline, prepared.deadlineOffset, PREPARED_CHANNEL_DEADLINE.length, 'ascii');
+    if (flowId !== undefined)
+        bytes.write(flowId, prepared.flowOffset, PREPARED_CHANNEL_FLOW.length, 'ascii');
     return bytes;
 }
 function writeChannelHeader(writer, kind, channelName, messageName, contentType, correlationId, deadline, topic, errorCode, errorMessage, source, metadata, flowId, flowOrigin) {
@@ -509,10 +533,16 @@ function parseWireJson(payload, schema) {
     }, schema);
 }
 function parseChannelHeaderBytes(payload) {
+    const reader = new CanonicalChannelHeaderReader(payload);
+    const canonical = tryParseCanonicalChannelHeader(reader);
+    // An all-ASCII canonical header is valid UTF-8 by construction; any other
+    // header is checked before it is decoded.
+    if (canonical !== undefined && !reader.sawNonAscii)
+        return canonical;
     if (!(0, node_buffer_1.isUtf8)(payload)) {
         throw new contracts_1.ZLinkFrameworkException(contracts_1.ZLinkFrameworkErrorKind.ProtocolError, 'Channel envelope header must contain valid UTF-8.');
     }
-    return tryParseCanonicalChannelHeader(payload) ?? (0, framework_json_v1_1.parseFrameworkJsonV1)(payload.toString());
+    return canonical ?? (0, framework_json_v1_1.parseFrameworkJsonV1)(payload.toString());
 }
 /**
  * Accept the byte layout emitted by writeChannelHeader without materializing
@@ -520,8 +550,7 @@ function parseChannelHeaderBytes(payload) {
  * framework-json-v1 parser, which remains the sole authority for JSON
  * failures and unknown properties. Header metadata accepts every valid string key.
  */
-function tryParseCanonicalChannelHeader(payload) {
-    const reader = new CanonicalChannelHeaderReader(payload);
+function tryParseCanonicalChannelHeader(reader) {
     if (!reader.consume('{"formatMarker":242,"kind":'))
         return undefined;
     const kind = reader.readSingleDigit();
@@ -555,25 +584,32 @@ function tryParseCanonicalChannelHeader(payload) {
         deadline: deadline === NULL_JSON_STRING ? null : deadline,
         topic: topic === NULL_JSON_STRING ? null : topic
     };
-    if (!reader.readOptionalNullableString('errorCode', header))
+    if (!reader.readOptionalNullableString(CANONICAL_ERROR_CODE, 'errorCode', header))
         return undefined;
-    if (!reader.readOptionalNullableString('errorMessage', header))
+    if (!reader.readOptionalNullableString(CANONICAL_ERROR_MESSAGE, 'errorMessage', header))
         return undefined;
-    if (!reader.readOptionalNullableString('source', header))
+    if (!reader.readOptionalNullableString(CANONICAL_SOURCE, 'source', header))
         return undefined;
+    // Empty metadata validates to the shared empty record.
     if (!reader.consume(',"metadata":{}'))
         return undefined;
-    header.metadata = {};
-    if (!reader.readOptionalString('flowId', header))
+    if (!reader.readOptionalString(CANONICAL_FLOW_ID, 'flowId', header))
         return undefined;
-    if (!reader.readOptionalSingleDigit('flowOrigin', header))
+    if (!reader.readOptionalSingleDigit(CANONICAL_FLOW_ORIGIN, 'flowOrigin', header))
         return undefined;
     return reader.consume('}') && reader.atEnd() ? header : undefined;
 }
+const CANONICAL_ERROR_CODE = ',"errorCode":';
+const CANONICAL_ERROR_MESSAGE = ',"errorMessage":';
+const CANONICAL_SOURCE = ',"source":';
+const CANONICAL_FLOW_ID = ',"flowId":';
+const CANONICAL_FLOW_ORIGIN = ',"flowOrigin":';
 const NULL_JSON_STRING = Symbol('null JSON string');
 class CanonicalChannelHeaderReader {
     bytes;
     index = 0;
+    /** A string held a byte outside ASCII, so the caller must still check UTF-8. */
+    sawNonAscii = false;
     constructor(bytes) {
         this.bytes = bytes;
     }
@@ -604,15 +640,22 @@ class CanonicalChannelHeaderReader {
             return undefined;
         const start = this.index;
         this.index += 1;
+        let hasEscape = false;
         while (this.index < this.bytes.length) {
             const value = this.bytes[this.index++];
             if (value === 0x22) {
-                return JSON.parse(this.bytes.toString('utf8', start, this.index));
+                // Without escapes the JSON string is its own bytes; decode them once.
+                return hasEscape
+                    ? JSON.parse(this.bytes.toString('utf8', start, this.index))
+                    : this.bytes.toString(this.sawNonAscii ? 'utf8' : 'latin1', start + 1, this.index - 1);
             }
             if (value < 0x20)
                 return undefined;
+            if (value >= 0x80)
+                this.sawNonAscii = true;
             if (value !== 0x5c)
                 continue;
+            hasEscape = true;
             if (this.index === this.bytes.length)
                 return undefined;
             const escaped = this.bytes[this.index++];
@@ -643,8 +686,8 @@ class CanonicalChannelHeaderReader {
             return NULL_JSON_STRING;
         return this.readString();
     }
-    readOptionalNullableString(name, target) {
-        if (!this.consume(`,\"${name}\":`))
+    readOptionalNullableString(token, name, target) {
+        if (!this.consume(token))
             return true;
         const value = this.readNullableString();
         if (value === undefined)
@@ -652,8 +695,8 @@ class CanonicalChannelHeaderReader {
         target[name] = value === NULL_JSON_STRING ? null : value;
         return true;
     }
-    readOptionalString(name, target) {
-        if (!this.consume(`,\"${name}\":`))
+    readOptionalString(token, name, target) {
+        if (!this.consume(token))
             return true;
         const value = this.readString();
         if (value === undefined)
@@ -661,8 +704,8 @@ class CanonicalChannelHeaderReader {
         target[name] = value;
         return true;
     }
-    readOptionalSingleDigit(name, target) {
-        if (!this.consume(`,\"${name}\":`))
+    readOptionalSingleDigit(token, name, target) {
+        if (!this.consume(token))
             return true;
         const value = this.readSingleDigit();
         if (value === undefined)

package/dist/runtime/channels/channel-runtime-lifecycle.d.ts

@@ -1,3 +1,4 @@
+import type { ZLinkMeshDispatchAdmission } from '../admission';
 import type { ZLinkLocationOptionOverrides } from '../../contracts/Locations/Options';
 import type { ZLinkFrameworkRegistration } from '../configuration';
 import type { ZLinkBackendSpotRouteBridge, ZLinkChannelBackendAdapter } from '../backend/contracts';
@@ -49,7 +50,7 @@ export declare class ZLinkChannelRuntimeLifecycle {
         lifecycleGeneration: bigint;
         descriptorRevision: bigint;
         advertisedEndpoint: string;
-        state: "error" | "preparing" | "serving" | "retiring" | "stopped";
+        state: "error" | "preparing" | "serving" | "stopped" | "retiring";
     }[] | undefined;
     configureLocationAutoConnect(runtime: ZLinkLocationRuntime, stores: ZLinkLocationRuntimeStores, options: ZLinkLocationOptionOverrides, events?: ZLinkLocationEventSink): void;
     private beginLocationAutoConnectCore;
@@ -60,8 +61,8 @@ export declare class ZLinkChannelRuntimeLifecycle {
     bindRouteMeshRouters(): void;
     start(taskRunner?: ZLinkRuntimeTaskRunner): Promise<void>[];
     prepareMeshDispatch(taskRunner?: ZLinkRuntimeTaskRunner): void;
-    dispatchMeshChannel(meshName: string, record: ReceiveRecord, signal?: AbortSignal): Promise<void>;
-    dispatchMeshRoute(meshName: string, record: ReceiveRecord, signal?: AbortSignal): Promise<void>;
+    dispatchMeshChannel(meshName: string, record: ReceiveRecord, signal?: AbortSignal, admit?: ZLinkMeshDispatchAdmission): void | Promise<void>;
+    dispatchMeshRoute(meshName: string, record: ReceiveRecord, signal?: AbortSignal, admit?: ZLinkMeshDispatchAdmission): void | Promise<void>;
     dispatchLocalMeshRoute(meshName: string, sourceNodeRid: RoutingId, parts: readonly Message[], signal?: AbortSignal): Promise<void>;
     canDispatchLocalMeshRoute(meshName: string): boolean;
     dispose(signal?: AbortSignal): Promise<void>;

package/dist/runtime/channels/channel-runtime-lifecycle.js

@@ -10,9 +10,7 @@ const channel_receive_loops_1 = require("./channel-receive-loops");
 const client_server_location_runtime_1 = require("./client-server-location-runtime");
 const fanout_location_runtime_1 = require("./fanout-location-runtime");
 const RuntimeEndpointConnections_1 = require("../../contracts/Configuration/RuntimeEndpointConnections");
-const node_async_hooks_1 = require("node:async_hooks");
 const state_lane_1 = require("../execution/state-lane");
-const detachedStateLaneResource = new node_async_hooks_1.AsyncResource('zlink:channel-runtime-lifecycle');
 class ZLinkChannelRuntimeLifecycle {
     options;
     lane = new state_lane_1.ZLinkStateLane();
@@ -74,12 +72,12 @@ class ZLinkChannelRuntimeLifecycle {
             return;
         let fanoutLocation;
         try {
-            await startOutsideStateLane(() => start.clientServerLocation?.start(signal) ?? Promise.resolve());
+            await (0, state_lane_1.startOutsideStateLane)(() => start.clientServerLocation?.start(signal) ?? Promise.resolve());
             fanoutLocation = await this.lane.run(() => this.beginFanoutLocationAutoConnectCore(start));
-            await startOutsideStateLane(() => fanoutLocation?.start(signal) ?? Promise.resolve());
+            await (0, state_lane_1.startOutsideStateLane)(() => fanoutLocation?.start(signal) ?? Promise.resolve());
         }
         catch (error) {
-            await startOutsideStateLane(() => Promise.all([
+            await (0, state_lane_1.startOutsideStateLane)(() => Promise.all([
                 start.clientServerLocation?.stop(signal).catch(() => undefined),
                 fanoutLocation?.stop(signal).catch(() => undefined)
             ]));
@@ -89,9 +87,9 @@ class ZLinkChannelRuntimeLifecycle {
     }
     async reclaimLocationOwnerRows(signal) {
         const clientServerLocation = await this.lane.run(() => this.clientServerLocation);
-        await startOutsideStateLane(() => clientServerLocation?.reclaimOwnerRows(signal) ?? Promise.resolve());
+        await (0, state_lane_1.startOutsideStateLane)(() => clientServerLocation?.reclaimOwnerRows(signal) ?? Promise.resolve());
         const fanoutLocation = await this.lane.run(() => this.fanoutLocation);
-        await startOutsideStateLane(() => fanoutLocation?.reclaimOwnerRows(signal) ?? Promise.resolve());
+        await (0, state_lane_1.startOutsideStateLane)(() => fanoutLocation?.reclaimOwnerRows(signal) ?? Promise.resolve());
     }
     bindRouteMeshRouters() {
         for (const routeChannel of this.options.registration.routeChannelOptions.values()) {
@@ -178,7 +176,7 @@ class ZLinkChannelRuntimeLifecycle {
             }
         }
     }
-    dispatchMeshChannel(meshName, record, signal) {
+    dispatchMeshChannel(meshName, record, signal, admit) {
         const channelName = record.channelName;
         if (channelName === null) {
             throw new configuration_1.ZLinkConfigurationException('MeshNode channel record is missing channelName.');
@@ -187,14 +185,14 @@ class ZLinkChannelRuntimeLifecycle {
         if (dispatcher === undefined) {
             throw new configuration_1.ZLinkConfigurationException(`RouteMesh '${meshName}' channel '${channelName}' has no registered handlers.`);
         }
-        return dispatcher.dispatchMesh(record, signal);
+        return dispatcher.dispatchMesh(record, signal, admit);
     }
-    dispatchMeshRoute(meshName, record, signal) {
+    dispatchMeshRoute(meshName, record, signal, admit) {
         const dispatcher = this.meshRouteDispatchers.get(meshName);
         if (dispatcher === undefined) {
             throw new configuration_1.ZLinkConfigurationException(`RouteMesh '${meshName}' has no registered node-direct handlers.`);
         }
-        return dispatcher.dispatchMesh(record, signal);
+        return dispatcher.dispatchMesh(record, signal, admit);
     }
     dispatchLocalMeshRoute(meshName, sourceNodeRid, parts, signal) {
         const dispatcher = this.meshRouteDispatchers.get(meshName);
@@ -211,20 +209,20 @@ class ZLinkChannelRuntimeLifecycle {
     }
     async disposeCore(signal) {
         const work = await this.lane.run(() => this.beginDisposeCore());
-        const transportStopped = await startOutsideStateLane(() => Promise.allSettled([
+        const transportStopped = await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled([
             ...work.channelLoops.map((loop) => loop.stop()),
             ...work.subscriberLoops.map((loop) => loop.stop()),
             ...work.routeLoops.map((loop) => loop.stop()),
             ...work.manualTransitions
         ]));
-        const applicationStopped = await startOutsideStateLane(() => Promise.allSettled(work.applicationDispatchQueues.map((queue) => queue.close())));
+        const applicationStopped = await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled(work.applicationDispatchQueues.map((queue) => queue.close())));
         const descriptorStopped = work.clientServerLocation === undefined
             ? []
-            : await startOutsideStateLane(() => Promise.allSettled([work.clientServerLocation?.stop(signal)]));
+            : await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled([work.clientServerLocation?.stop(signal)]));
         const fanoutDescriptorStopped = work.fanoutLocation === undefined
             ? []
-            : await startOutsideStateLane(() => Promise.allSettled([work.fanoutLocation?.stop(signal)]));
-        const cleanup = await startOutsideStateLane(() => Promise.allSettled([
+            : await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled([work.fanoutLocation?.stop(signal)]));
+        const cleanup = await (0, state_lane_1.startOutsideStateLane)(() => Promise.allSettled([
             ...work.spotRouteBridges.map((bridge) => bridge.dispose()),
             this.options.sockets.dispose()
         ]));
@@ -421,7 +419,7 @@ class ZLinkChannelRuntimeLifecycle {
     }
     enqueueManualFanoutTransition(state, transition) {
         state.transition = state.transition
-            .then(() => startOutsideStateLane(transition), () => startOutsideStateLane(transition))
+            .then(() => (0, state_lane_1.startOutsideStateLane)(transition), () => (0, state_lane_1.startOutsideStateLane)(transition))
             .catch((error) => state.taskRunner.errorSink.reportRuntimeTaskException(`subscriber:${state.channelName}:manual:${state.index}:lifecycle`, error));
     }
     openManualFanoutSubscriber(state) {
@@ -489,13 +487,13 @@ class ZLinkChannelRuntimeLifecycle {
             return;
         const errors = [];
         try {
-            await startOutsideStateLane(() => active.loop.stop());
+            await (0, state_lane_1.startOutsideStateLane)(() => active.loop.stop());
         }
         catch (error) {
             errors.push(error);
         }
         try {
-            await startOutsideStateLane(() => this.options.sockets.closeFanoutSubscriberConnection(state.connectionId));
+            await (0, state_lane_1.startOutsideStateLane)(() => this.options.sockets.closeFanoutSubscriberConnection(state.connectionId));
         }
         catch (error) {
             errors.push(error);
@@ -524,7 +522,7 @@ class ZLinkChannelRuntimeLifecycle {
         state.stopping = undefined;
     }
     drainManualFanoutSubscriberCore(state) {
-        state.transition = state.transition.then(() => startOutsideStateLane(() => this.closeManualFanoutSubscriber(state)), () => startOutsideStateLane(() => this.closeManualFanoutSubscriber(state)));
+        state.transition = state.transition.then(() => (0, state_lane_1.startOutsideStateLane)(() => this.closeManualFanoutSubscriber(state)), () => (0, state_lane_1.startOutsideStateLane)(() => this.closeManualFanoutSubscriber(state)));
         return state.transition;
     }
     startFanoutSubscriberLoop(channelName, connectionId, subscriber) {
@@ -546,7 +544,7 @@ class ZLinkChannelRuntimeLifecycle {
         this.subscriberReceiveLoops.push(loop);
         void taskRunner.run(`subscriber:${channelName}:automatic:${connectionId}`, (signal) => loop.run(signal));
         return async () => {
-            await startOutsideStateLane(() => loop.stop());
+            await (0, state_lane_1.startOutsideStateLane)(() => loop.stop());
             await this.lane.run(() => this.removeSubscriberReceiveLoopCore(loop));
         };
     }
@@ -651,6 +649,3 @@ function hasFanoutLocationTopology(registration) {
     }
     return false;
 }
-function startOutsideStateLane(work) {
-    return detachedStateLaneResource.runInAsyncScope(work);
-}

package/dist/runtime/channels/channel-runtime-manager.d.ts

@@ -1,3 +1,4 @@
+import type { ZLinkMeshDispatchAdmission } from '../admission';
 import type { ZLinkListenerRecords } from '../foundation/listener-records';
 import type { ZLinkLocationOptionOverrides } from '../../contracts/Locations/Options';
 import type { RoutingId } from '../../contracts';
@@ -40,8 +41,8 @@ export declare class ZLinkChannelRuntimeManager {
     openMonitoringSource(sourceName: string, adapter: ZLinkMonitoringBackendAdapter): ZLinkBackendSocketMonitor;
     start(taskRunner?: ZLinkRuntimeTaskRunner): Promise<void>[];
     prepareMeshDispatch(taskRunner?: ZLinkRuntimeTaskRunner): void;
-    dispatchMeshChannel(meshName: string, record: ReceiveRecord, signal?: AbortSignal): Promise<void>;
-    dispatchMeshRoute(meshName: string, record: ReceiveRecord, signal?: AbortSignal): Promise<void>;
+    dispatchMeshChannel(meshName: string, record: ReceiveRecord, signal?: AbortSignal, admit?: ZLinkMeshDispatchAdmission): void | Promise<void>;
+    dispatchMeshRoute(meshName: string, record: ReceiveRecord, signal?: AbortSignal, admit?: ZLinkMeshDispatchAdmission): void | Promise<void>;
     dispatchLocalMeshRoute(meshName: string, sourceNodeRid: RoutingId, parts: readonly Message[], signal?: AbortSignal): Promise<void>;
     canDispatchLocalMeshRoute(meshName: string): boolean;
     send(channelName: string, packetName: string | undefined, message: unknown, metadata?: ReadonlyMap<string, string>): Promise<ZLinkSubmitResult>;

package/dist/runtime/channels/channel-runtime-manager.js

@@ -126,11 +126,11 @@ class ZLinkChannelRuntimeManager {
     prepareMeshDispatch(taskRunner) {
         this.lifecycle.prepareMeshDispatch(taskRunner);
     }
-    dispatchMeshChannel(meshName, record, signal) {
-        return this.lifecycle.dispatchMeshChannel(meshName, record, signal);
+    dispatchMeshChannel(meshName, record, signal, admit) {
+        return this.lifecycle.dispatchMeshChannel(meshName, record, signal, admit);
     }
-    dispatchMeshRoute(meshName, record, signal) {
-        return this.lifecycle.dispatchMeshRoute(meshName, record, signal);
+    dispatchMeshRoute(meshName, record, signal, admit) {
+        return this.lifecycle.dispatchMeshRoute(meshName, record, signal, admit);
     }
     dispatchLocalMeshRoute(meshName, sourceNodeRid, parts, signal) {
         return this.lifecycle.dispatchLocalMeshRoute(meshName, sourceNodeRid, parts, signal);

package/dist/runtime/channels/channel-transports.d.ts

@@ -79,7 +79,6 @@ export declare class ZLinkRuntimeRouteTransport implements ZLinkRouteClientTrans
     private submitToChannelScoped;
     requestToChannel<TReply>(meshName: string, channelName: string, packetName: string | undefined, request: unknown, timeoutMs: number | undefined, signal?: AbortSignal, metadata?: ReadonlyMap<string, string>, onAdmitted?: () => void): Promise<TReply>;
     private requestToChannelScoped;
-    private submitRequestOperation;
     sendToSpot(spotRouteTarget: ZLinkSpotRouteTarget, message: unknown, options: ZLinkSpotRoutedSendOptions): Promise<ZLinkSubmitResult>;
     private sendToSpotScoped;
     sendFromSpotToSpot(sourceSpot: ZLinkBackendSpot, spotRouteTarget: ZLinkSpotRouteTarget, message: unknown, options: {

package/dist/runtime/channels/channel-transports.js

@@ -112,15 +112,18 @@ class ZLinkRuntimeRouteTransport {
                 throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestTargetNotFound, `MeshNode '${meshName}' target '${targetNodeRid}' is an Object Client.`);
             }
             const parts = this.encodeMessage(1 /* ZLinkChannelMessageKind.Request */, meshName, packetName, request, timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, metadata, correlationId);
-            const completion = await this.submitRequestOperation(meshName, timeoutMs, signal, `MeshNode '${meshName}' request to node '${targetNodeRid}'`, (remainingTimeoutMs) => {
-                const operationId = node.requestToNode((0, routing_id_1.toBackendRoutingId)(targetNodeRid), parts, {
-                    flags: 1,
-                    onAdmitted,
-                    timeoutMs: remainingTimeoutMs
-                });
-                this.traceNodeRequest(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Sent, undefined, meshName, targetNodeRid, packetName, correlationId);
-                return operationId;
-            });
+            const requestOptions = { flags: 1, onAdmitted, timeoutMs: requestTimeoutBudget(timeoutMs) };
+            let completion;
+            try {
+                completion = await this.completionTable(meshName).submit(() => {
+                    const operationId = node.requestToNode((0, routing_id_1.toBackendRoutingId)(targetNodeRid), parts, requestOptions);
+                    this.traceNodeRequest(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.Sent, undefined, meshName, targetNodeRid, packetName, correlationId);
+                    return operationId;
+                }, signal);
+            }
+            catch (error) {
+                throw mapMeshSubmissionError(error, `MeshNode '${meshName}' request to node '${targetNodeRid}'`);
+            }
             const reply = this.decodeMeshReply(meshName, completion);
             this.traceNodeRequest(ZLinkDispatchOptions_1.ZLinkRuntimeMessageFlowOutcome.ReplyReceived, 'succeeded', meshName, targetNodeRid, packetName, correlationId);
             return reply;
@@ -176,37 +179,27 @@ class ZLinkRuntimeRouteTransport {
         const parts = this.encodeMessage(1 /* ZLinkChannelMessageKind.Request */, channelName, packetName, request, timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS, metadata);
         const metric = this.metrics?.startRequest(meshName, 'channel');
         try {
-            const completion = await this.submitRequestOperation(meshName, timeoutMs, signal, `MeshNode '${meshName}' request to channel '${channelName}'`, (remainingTimeoutMs) => node.requestToChannel(channelName, parts, {
-                flags: 1,
-                timeoutMs: remainingTimeoutMs,
-                onAdmitted
-            }));
+            const requestOptions = { flags: 1, timeoutMs: requestTimeoutBudget(timeoutMs), onAdmitted };
+            let completion;
+            try {
+                completion = await this.completionTable(meshName).submit(() => node.requestToChannel(channelName, parts, requestOptions), signal);
+            }
+            catch (error) {
+                throw mapMeshSubmissionError(error, `MeshNode '${meshName}' request to channel '${channelName}'`);
+            }
             const reply = this.decodeMeshReply(meshName, completion);
             metric?.complete('completed');
             return reply;
         }
         catch (error) {
-            metric?.complete(requestMetricOutcome(error));
-            if (requestMetricOutcome(error) === 'target_not_found') {
+            metric?.complete(requestMetricOutcome(error, signal));
+            if (error instanceof contracts_1.ZLinkFrameworkException &&
+                (0, framework_errors_internal_1.internalFrameworkErrorKind)(error) === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestTargetNotFound) {
                 this.metrics?.recordChannelSelectionFailure(meshName, channelName, 'no_ready_target');
             }
             throw error;
         }
     }
-    async submitRequestOperation(meshName, timeoutMs, signal, operation, attempt) {
-        const effectiveTimeoutMs = Math.max(1, timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS);
-        const deadlineMs = performance.now() + effectiveTimeoutMs;
-        const remainingTimeoutMs = deadlineMs - performance.now();
-        if (remainingTimeoutMs <= 0) {
-            throw (0, framework_errors_internal_1.createInternalFrameworkException)(framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.DeadlineExceeded, `${operation} timed out before submission.`);
-        }
-        try {
-            return await this.completionTable(meshName).submit(() => attempt(Math.max(1, Math.ceil(remainingTimeoutMs))), signal);
-        }
-        catch (error) {
-            throw mapMeshSubmissionError(error, operation);
-        }
-    }
     sendToSpot(spotRouteTarget, message, options) {
         return (0, flow_context_1.runWithOutboundFlow)(this.flowCreationEnabled(), () => this.sendToSpotScoped(spotRouteTarget, message, options));
     }
@@ -428,6 +421,13 @@ function instanceSpotRouteFence(target) {
         storeVersion: target.authorityStoreVersion
     };
 }
+/**
+ * The binding request timeout for one submission. The binding owns the
+ * deadline after submit; the completion table slot only waits for it.
+ */
+function requestTimeoutBudget(timeoutMs) {
+    return Math.max(1, Math.ceil(timeoutMs ?? Registration_1.DEFAULT_REQUEST_TIMEOUT_MS));
+}
 function mapMeshSubmitResult(result) {
     return (0, submission_result_1.classifySubmitResult)(result, 'Mesh submission');
 }
@@ -486,14 +486,16 @@ function meshRequestFailure(meshName, result, nativeErrno) {
     });
     return error;
 }
-function requestMetricOutcome(error) {
+function requestMetricOutcome(error, signal) {
     if (error instanceof contracts_1.ZLinkFrameworkException) {
-        if ((0, framework_errors_internal_1.internalFrameworkErrorKind)(error) === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RequestTargetNotFound)
-            return 'target_not_found';
         if ((0, framework_errors_internal_1.internalFrameworkErrorKind)(error) === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.DeadlineExceeded)
             return 'timed_out';
         if ((0, framework_errors_internal_1.internalFrameworkErrorKind)(error) === framework_errors_internal_1.ZLinkFrameworkInternalErrorKind.RuntimeShutdown)
             return 'shutdown';
     }
+    if (signal?.aborted === true &&
+        (error === signal.reason ||
+            (error instanceof Error && (error.cause === signal.reason || error.name === 'AbortError'))))
+        return 'cancelled';
     return 'failed';
 }

package/dist/runtime/channels/client-server-location-runtime.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZLinkClientServerLocationRuntime = void 0;
+const routing_id_1 = require("../routing-id");
 const RegistrationBuilderPolicy_1 = require("../../contracts/Configuration/RegistrationBuilderPolicy");
 const Locations_1 = require("../../contracts/Locations");
 const Options_1 = require("../../contracts/Locations/Options");
@@ -91,7 +92,7 @@ class ZLinkClientServerLocationRuntime {
                 ownerId: owner.ownerId,
                 leaseGeneration: owner.leaseGeneration
             };
-            const result = await this.store.updateClientServer(candidate, Locations_1.ZLinkLocationWriteIntent.Takeover, signal);
+            const result = await this.locationRuntime.writeDescriptor((writeSignal) => this.store.updateClientServer(candidate, Locations_1.ZLinkLocationWriteIntent.Takeover, writeSignal), signal);
             if (result.status !== Locations_1.ZLinkLocationWriteStatus.Stored) {
                 throw new configuration_1.ZLinkConfigurationException(`ClientServer server '${channelName}' descriptor recovery was fenced.`);
             }
@@ -115,7 +116,7 @@ class ZLinkClientServerLocationRuntime {
                         descriptorRevision: current.descriptorRevision + 1n,
                         weight: runtimeWeight
                     };
-                const result = await this.store.updateClientServer(candidate, Locations_1.ZLinkLocationWriteIntent.Renew, signal);
+                const result = await this.locationRuntime.writeDescriptor((writeSignal) => this.store.updateClientServer(candidate, Locations_1.ZLinkLocationWriteIntent.Renew, writeSignal), signal);
                 if (result.status !== Locations_1.ZLinkLocationWriteStatus.Stored) {
                     throw new configuration_1.ZLinkConfigurationException(`ClientServer server '${channelName}' descriptor renewal was fenced.`);
                 }
@@ -138,7 +139,7 @@ class ZLinkClientServerLocationRuntime {
                 leaseGeneration: owner.leaseGeneration,
                 updatedAt: new Date(0)
             };
-            const result = await this.store.updateClientServer(descriptor, Locations_1.ZLinkLocationWriteIntent.NewClaim, signal);
+            const result = await this.locationRuntime.writeDescriptor((writeSignal) => this.store.updateClientServer(descriptor, Locations_1.ZLinkLocationWriteIntent.NewClaim, writeSignal), signal);
             if (result.status !== Locations_1.ZLinkLocationWriteStatus.Stored) {
                 throw new configuration_1.ZLinkConfigurationException(`ClientServer server '${channelName}' descriptor claim failed with '${result.status}'.`);
             }
@@ -452,7 +453,7 @@ function requestAdmission(dealer, descriptor, timeoutMs) {
 }
 function requireMatchingAdmission(expected, actual) {
     if (actual.channelName !== expected.channelName ||
-        actual.serverRid !== String(expected.serverRid) ||
+        !(0, routing_id_1.routingIdsEqual)(actual.serverRid, expected.serverRid) ||
         actual.lifecycleGeneration !== expected.lifecycleGeneration ||
         actual.descriptorRevision !== expected.descriptorRevision ||
         actual.weight !== expected.weight ||

package/dist/runtime/channels/dispatch-error-reporter.d.ts

@@ -4,9 +4,10 @@ import type { ZLinkDispatchErrorSink } from '../diagnostics/dispatch-error-port'
 export type { ZLinkDispatchErrorSink } from '../diagnostics/dispatch-error-port';
 type ZLinkRuntimeDispatchFailure = ZLinkDispatchFailure & {
     readonly error?: unknown;
+    readonly severity?: 'warning';
 };
 export declare class ZLinkDispatchErrorReporter {
-    private readonly metrics?;
+    readonly metrics?: ZLinkRuntimeMetrics | undefined;
     private reportedEvents;
     /**
      * Success-path tracer companion: every surface already receives a reporter, so

package/dist/runtime/channels/dispatch-error-reporter.js

@@ -63,7 +63,8 @@ class ZLinkDispatchErrorReporter {
             errorType: errorInfo.errorType,
             errorMessage: errorInfo.errorMessage,
             errorCauseType: errorInfo.errorCauseType,
-            errorCauseMessage: errorInfo.errorCauseMessage
+            errorCauseMessage: errorInfo.errorCauseMessage,
+            severity: normalized.severity
         });
     }
     captureEnabled() {