@zlink-systems/framework 0.30.0 → 0.30.2

package/src/runtime/channels/fanout-location-runtime.ts

@@ -155,9 +155,13 @@ export class ZLinkFanoutLocationRuntime {
         ownerId: owner.ownerId,
         leaseGeneration: owner.leaseGeneration
       };
-      const result = await this.store.updateFanoutPublisher(
-        candidate,
-        ZLinkLocationWriteIntent.Takeover,
+      const result = await this.locationRuntime.writeDescriptor(
+        (writeSignal) =>
+          this.store.updateFanoutPublisher(
+            candidate,
+            ZLinkLocationWriteIntent.Takeover,
+            writeSignal
+          ),
         signal
       );
       if (result.status !== ZLinkLocationWriteStatus.Stored) {
@@ -188,9 +192,9 @@ export class ZLinkFanoutLocationRuntime {
       }
       const current = await this.lane.run(() => this.localDescriptors.get(channelName));
       if (current !== undefined) {
-        const result = await this.store.updateFanoutPublisher(
-          current,
-          ZLinkLocationWriteIntent.Renew,
+        const result = await this.locationRuntime.writeDescriptor(
+          (writeSignal) =>
+            this.store.updateFanoutPublisher(current, ZLinkLocationWriteIntent.Renew, writeSignal),
           signal
         );
         if (result.status !== ZLinkLocationWriteStatus.Stored) {
@@ -231,9 +235,13 @@ export class ZLinkFanoutLocationRuntime {
         leaseGeneration: owner.leaseGeneration,
         updatedAt: new Date(0)
       };
-      const result = await this.store.updateFanoutPublisher(
-        descriptor,
-        ZLinkLocationWriteIntent.NewClaim,
+      const result = await this.locationRuntime.writeDescriptor(
+        (writeSignal) =>
+          this.store.updateFanoutPublisher(
+            descriptor,
+            ZLinkLocationWriteIntent.NewClaim,
+            writeSignal
+          ),
         signal
       );
       if (result.status !== ZLinkLocationWriteStatus.Stored) {

package/src/runtime/channels/local-spot-route-transport.ts

@@ -32,7 +32,8 @@ export class ZLinkLocalSpotRouteTransport {
     packetName: string | undefined,
     request: unknown,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     if (this.dispatcher === undefined) {
       throw new ZLinkConfigurationException(
@@ -41,6 +42,7 @@ export class ZLinkLocalSpotRouteTransport {
     }
     const pending = this.dispatcher.request<TReply>(spotId, packetName, request, {
       channelName: routerChannelId,
+      onAdmitted,
       signal
     });
     const effectiveTimeoutMs = timeoutMs ?? this.defaultRequestTimeoutMs;

package/src/runtime/channels/router-socket-spot-route-transport.ts

@@ -31,11 +31,18 @@ export class ZLinkRouterSocketSpotRouteTransport {
     codecs: ZLinkChannelEnvelopeCodecRegistry | undefined,
     flags: ZLinkBackendSendFlags,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     const router = this.sockets.routeRouter(target.routerChannelId);
     void flags;
-    const operation = router.requestToSpot(target.targetNodeRid, target.spotId, parts, timeoutMs);
+    const operation = router.requestToSpot(
+      target.targetNodeRid,
+      target.spotId,
+      parts,
+      timeoutMs,
+      onAdmitted
+    );
     const replyParts = await awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);
     });
@@ -51,14 +58,16 @@ export class ZLinkRouterSocketSpotRouteTransport {
     target: ZLinkSpotRouteTarget,
     request: Message,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<readonly Message[]> {
     const router = this.sockets.routeRouter(target.routerChannelId);
     const operation = router.requestToSpot(
       target.targetNodeRid,
       target.spotId,
       [request],
-      timeoutMs
+      timeoutMs,
+      onAdmitted
     );
     return await awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);

package/src/runtime/channels/source-spot-router.ts

@@ -14,7 +14,8 @@ export class ZLinkSourceSpotRouter {
     packetName: string | undefined,
     request: unknown,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     throwIfAborted(signal);
     const parts = [
@@ -29,7 +30,8 @@ export class ZLinkSourceSpotRouter {
       target.targetNodeRid,
       target.spotId,
       parts,
-      timeoutMs ?? this.defaultRequestTimeoutMs
+      timeoutMs ?? this.defaultRequestTimeoutMs,
+      onAdmitted
     );
     const replyParts = await awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);
@@ -70,14 +72,16 @@ export class ZLinkSourceSpotRouter {
     target: ZLinkSpotRouteTarget,
     request: Message,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<readonly Message[]> {
     throwIfAborted(signal);
     const operation = sourceSpot.requestToSpot(
       target.targetNodeRid,
       target.spotId,
       request,
-      timeoutMs ?? this.defaultRequestTimeoutMs
+      timeoutMs ?? this.defaultRequestTimeoutMs,
+      onAdmitted
     );
     return await awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);

package/src/runtime/channels/spot-node-route-transport.ts

@@ -34,7 +34,8 @@ export class ZLinkSpotNodeRouteTransport {
     parts: readonly Message[],
     codecs: ZLinkChannelEnvelopeCodecRegistry | undefined,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<TReply> | undefined {
     const router = this.targets.spotNodeRouter(target.routerChannelId);
     if (router === undefined) {
@@ -47,7 +48,8 @@ export class ZLinkSpotNodeRouteTransport {
       target.targetNodeRid,
       target.spotId,
       parts,
-      effectiveTimeoutMs
+      effectiveTimeoutMs,
+      onAdmitted
     );
     return awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);
@@ -65,7 +67,8 @@ export class ZLinkSpotNodeRouteTransport {
     target: ZLinkSpotRouteTarget,
     request: Message,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<readonly Message[]> | undefined {
     const router = this.targets.spotNodeRouter(target.routerChannelId);
     if (router === undefined) {
@@ -78,7 +81,8 @@ export class ZLinkSpotNodeRouteTransport {
       target.targetNodeRid,
       target.spotId,
       request,
-      effectiveTimeoutMs
+      effectiveTimeoutMs,
+      onAdmitted
     );
     return awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);

package/src/runtime/channels/spot-route-bridge-transport.ts

@@ -37,7 +37,8 @@ export class ZLinkSpotRouteBridgeTransport {
     parts: readonly Message[],
     codecs: ZLinkChannelEnvelopeCodecRegistry | undefined,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     const bridge = this.requireBridge(target.routerChannelId);
     const operation = appendParts(
@@ -45,7 +46,7 @@ export class ZLinkSpotRouteBridgeTransport {
       parts
     )
       .timeout(timeoutMs ?? 0)
-      .submit();
+      .submit(onAdmitted);
     const replyParts = await awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);
     });
@@ -61,14 +62,15 @@ export class ZLinkSpotRouteBridgeTransport {
     target: ZLinkSpotRouteTarget,
     request: Message,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<readonly Message[]> {
     const bridge = this.requireBridge(target.routerChannelId);
     const operation = bridge
       .request(target.routerChannelId, target.targetNodeRid, target.spotId)
       .message(request)
       .timeout(timeoutMs ?? this.defaultRequestTimeoutMs ?? 0)
-      .submit();
+      .submit(onAdmitted);
     return awaitWithAbort(operation, signal, () => {
       void operation.then(closeMessages, () => undefined);
     });

package/src/runtime/channels/spot-route-dispatch-strategy.ts

@@ -42,6 +42,7 @@ export interface ZLinkLocalSpotRouteDispatcher {
     context: {
       readonly channelName: string;
       readonly signal?: AbortSignal;
+      readonly onAdmitted?: () => void;
       readonly metadata?: ReadonlyMap<string, string>;
     }
   ): Promise<TReply>;
@@ -163,7 +164,8 @@ export class ZLinkSpotRouteDispatchStrategy {
     request: unknown,
     timeoutMs: number | undefined,
     signal?: AbortSignal,
-    metadata?: ReadonlyMap<string, string>
+    metadata?: ReadonlyMap<string, string>,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     return runWithOutboundFlow(this.options.flowCreationEnabled?.() ?? true, () =>
       this.routeRequestToSpotScoped<TReply>(
@@ -172,7 +174,8 @@ export class ZLinkSpotRouteDispatchStrategy {
         request,
         timeoutMs,
         signal,
-        metadata
+        metadata,
+        onAdmitted
       )
     );
   }
@@ -183,7 +186,8 @@ export class ZLinkSpotRouteDispatchStrategy {
     request: unknown,
     timeoutMs: number | undefined,
     signal?: AbortSignal,
-    metadata?: ReadonlyMap<string, string>
+    metadata?: ReadonlyMap<string, string>,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     throwIfAborted(signal);
     const localSpotRouteNode = this.targets.localRouteNode(spotRouteTarget);
@@ -194,7 +198,8 @@ export class ZLinkSpotRouteDispatchStrategy {
         packetName,
         request,
         timeoutMs,
-        signal
+        signal,
+        onAdmitted
       );
     }
     const codecs = codecsForFrameworkPacket(packetName, this.options.codecs);
@@ -216,7 +221,8 @@ export class ZLinkSpotRouteDispatchStrategy {
         parts,
         codecs,
         timeoutMs,
-        signal
+        signal,
+        onAdmitted
       );
       if (namedSpotNodeRequest !== undefined) return namedSpotNodeRequest;
     }
@@ -226,7 +232,8 @@ export class ZLinkSpotRouteDispatchStrategy {
         parts,
         codecs,
         timeoutMs,
-        signal
+        signal,
+        onAdmitted
       );
     }
     if (this.targets.hasBoundRouteRouter(spotRouteTarget.routerChannelId)) {
@@ -236,7 +243,8 @@ export class ZLinkSpotRouteDispatchStrategy {
         codecs,
         ZLINK_SEND_DONT_WAIT,
         timeoutMs,
-        signal
+        signal,
+        onAdmitted
       );
     }
     const spotNodeRequest = this.spotNodeTransport.request<TReply>(
@@ -244,7 +252,8 @@ export class ZLinkSpotRouteDispatchStrategy {
       parts,
       codecs,
       timeoutMs,
-      signal
+      signal,
+      onAdmitted
     );
     if (spotNodeRequest !== undefined) {
       return spotNodeRequest;
@@ -255,7 +264,8 @@ export class ZLinkSpotRouteDispatchStrategy {
       codecs,
       0,
       timeoutMs,
-      signal
+      signal,
+      onAdmitted
     );
   }
 
@@ -265,7 +275,8 @@ export class ZLinkSpotRouteDispatchStrategy {
     packetName: string | undefined,
     request: unknown,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<TReply> {
     return this.sourceSpotRouter.request<TReply>(
       sourceSpot,
@@ -273,7 +284,8 @@ export class ZLinkSpotRouteDispatchStrategy {
       packetName,
       request,
       timeoutMs,
-      signal
+      signal,
+      onAdmitted
     );
   }
 
@@ -292,14 +304,16 @@ export class ZLinkSpotRouteDispatchStrategy {
     spotRouteTarget: ZLinkSpotRouteTarget,
     request: Message,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<readonly Message[]> {
     return this.sourceSpotRouter.requestRaw(
       sourceSpot,
       spotRouteTarget,
       request,
       timeoutMs,
-      signal
+      signal,
+      onAdmitted
     );
   }
 
@@ -307,7 +321,8 @@ export class ZLinkSpotRouteDispatchStrategy {
     spotRouteTarget: ZLinkSpotRouteTarget,
     request: Message,
     timeoutMs: number | undefined,
-    signal?: AbortSignal
+    signal?: AbortSignal,
+    onAdmitted?: () => void
   ): Promise<readonly Message[]> {
     throwIfAborted(signal);
     if (this.targets.hasNamedSpotNode(spotRouteTarget.routerChannelId)) {
@@ -315,23 +330,37 @@ export class ZLinkSpotRouteDispatchStrategy {
         spotRouteTarget,
         request,
         timeoutMs,
-        signal
+        signal,
+        onAdmitted
       );
       if (namedSpotNodeRequest !== undefined) return namedSpotNodeRequest;
     }
     if (this.bridgeTransport.has(spotRouteTarget.routerChannelId)) {
-      return this.bridgeTransport.requestRaw(spotRouteTarget, request, timeoutMs, signal);
+      return this.bridgeTransport.requestRaw(
+        spotRouteTarget,
+        request,
+        timeoutMs,
+        signal,
+        onAdmitted
+      );
     }
     const spotNodeRequest = this.spotNodeTransport.requestRaw(
       spotRouteTarget,
       request,
       timeoutMs,
-      signal
+      signal,
+      onAdmitted
     );
     if (spotNodeRequest !== undefined) {
       return spotNodeRequest;
     }
 
-    return this.routerSocketTransport.requestRaw(spotRouteTarget, request, timeoutMs, signal);
+    return this.routerSocketTransport.requestRaw(
+      spotRouteTarget,
+      request,
+      timeoutMs,
+      signal,
+      onAdmitted
+    );
   }
 }

package/src/runtime/diagnostics/flow-context.ts

@@ -2,7 +2,6 @@ import { AsyncLocalStorage } from 'node:async_hooks';
 import { randomBytes } from 'node:crypto';
 import type { ZLinkFlowOrigin } from '../../contracts';
 const FLOW_UUID_BYTES = 16;
-const FLOW_UUID_VARIANT_BYTE = 8;
 
 /**
  * Spec 27 §3 defines the flow_origin value set as lowercase
@@ -97,13 +96,27 @@ export function createInboundFlow(
   return { flowId: flowId ?? createFlowId(), flowOrigin: flowOrigin ?? 'Inbound', streamSessionId };
 }
 
+/**
+ * UUIDv7 with a dedicated counter (RFC 9562 §6.2 method 1): the 48-bit
+ * millisecond timestamp, then a 42-bit counter that starts at a random value
+ * and spans `rand_a` and the top of `rand_b`, then 32 random bits drawn once
+ * per process. Flow ids stay unique within the process without drawing
+ * random bytes for every message.
+ */
+const flowRandom = randomBytes(FLOW_UUID_BYTES);
+const FLOW_COUNTER_SPAN = 2 ** 42;
+let flowCounter = flowRandom.readUIntBE(0, 6) % FLOW_COUNTER_SPAN;
+const FLOW_ID_TAIL = flowRandom.toString('hex', FLOW_UUID_BYTES - 4);
+
 function createFlowId(): string {
-  const bytes = randomBytes(FLOW_UUID_BYTES);
+  const counter = flowCounter;
+  flowCounter = (flowCounter + 1) % FLOW_COUNTER_SPAN;
   // Date.now() is always within 48 bits, which is exactly the UUIDv7
   // timestamp field.
-  bytes.writeUIntBE(Date.now(), 0, 6);
-  bytes[6] = 0x70 | (bytes[6] & 0x0f);
-  bytes[FLOW_UUID_VARIANT_BYTE] = 0x80 | (bytes[FLOW_UUID_VARIANT_BYTE] & 0x3f);
-  const hex = bytes.toString('hex');
-  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+  const timestamp = Date.now().toString(16).padStart(12, '0');
+  const randA = Math.floor(counter / 2 ** 30); // 12 bits
+  const randB = counter % 2 ** 30; // 30 bits after the 2 variant bits
+  const variantHigh = (0x8000 | Math.floor(randB / 2 ** 16)).toString(16);
+  const randBLow = (randB % 2 ** 16).toString(16).padStart(4, '0');
+  return `${timestamp.slice(0, 8)}-${timestamp.slice(8)}-7${randA.toString(16).padStart(3, '0')}-${variantHigh}-${randBLow}${FLOW_ID_TAIL}`;
 }

package/src/runtime/diagnostics/index.ts

@@ -1,4 +1,3 @@
-import { AsyncResource } from 'node:async_hooks';
 import type {
   ZLinkLocationRuntimeQuery,
   ZLinkLocationRuntimeStatus,
@@ -18,7 +17,7 @@ import type {
   ZLinkSpotLocation
 } from '../../contracts/Locations/Rows';
 import type { ZLinkBackendSocketMonitor, ZLinkBackendSocketMonitorEvent } from '../backend';
-import { ZLinkStateLane } from '../execution/state-lane';
+import { startOutsideStateLane, ZLinkStateLane } from '../execution/state-lane';
 import { normalizeOpaqueRoutingId } from '../routing-id';
 import {
   ZLinkLocationActorEventKind as ActorLocationEventKind,
@@ -54,7 +53,6 @@ export {
 } from './internal-event-contracts';
 
 const ZLINK_DISCONNECT_REASON_HANDSHAKE_FAILED = 3;
-const detachedStateLaneResource = new AsyncResource('zlink:location-runtime-monitoring-source');
 
 export interface ZLinkActorOwnerLeaseObservation {
   readonly actorId: string;
@@ -461,10 +459,6 @@ async function publishLocationRuntimeChange<T>(
   await publisher.publish(runtimeEvent);
 }
 
-function startOutsideStateLane<T>(work: () => T): T {
-  return detachedStateLaneResource.runInAsyncScope(work);
-}
-
 function stableSnapshot(value: unknown): string {
   return JSON.stringify(value, (_key, item) => (typeof item === 'bigint' ? item.toString() : item));
 }

package/src/runtime/diagnostics/message-flow.ts

@@ -13,7 +13,7 @@ import {
   type ZLinkRuntimeMessageFlowEvent,
   type ZLinkRuntimeMessageFlowResult
 } from '../../contracts/Dispatch/ZLinkDispatchOptions';
-import { ERROR_MESSAGE_MAX_LENGTH } from './dispatch-error-details';
+import { ERROR_MESSAGE_MAX_LENGTH, dispatchErrorDetails } from './dispatch-error-details';
 import type { ZLinkDispatchErrorSink } from './dispatch-error-port';
 import { currentFlowContext, FLOW_ORIGIN_VALUES } from './flow-context';
 const MESSAGE_FLOW_EVENT_ID = 'zlink.message_flow';
@@ -41,6 +41,7 @@ const telemetryTracer = openTelemetryTrace.getTracer('@zlink-systems/framework')
 let diagnosticsGeneration = 0n;
 
 interface ZLinkTelemetryRecord {
+  readonly severity?: 'warning';
   readonly eventId: typeof MESSAGE_FLOW_EVENT_ID | typeof DISPATCH_ERROR_EVENT_ID;
   readonly timestamp: Date;
   readonly phase?: string;
@@ -86,6 +87,15 @@ export function effectiveMessageFlow(ctx: ZLinkDiagnosticsContext): ZLinkMessage
   return ctx.liveMode.mode;
 }
 
+/**
+ * Message-flow tracing is on at Normal and Detailed only (04-flow-correlation
+ * §4). Below it no flow ID is created, validated, captured or propagated. This
+ * is the one decision every flow processing point reads.
+ */
+export function messageFlowTracingEnabled(mode: ZLinkMessageFlowLogMode): boolean {
+  return MESSAGE_FLOW_MODE_RANK[mode] >= MESSAGE_FLOW_MODE_RANK.normal;
+}
+
 export function createMessageFlowModeCell(
   dispatch: { diagnostics?: ZLinkDiagnosticsOptions } | undefined
 ): ZLinkMessageFlowModeCell {
@@ -137,10 +147,33 @@ export interface ZLinkMessageFlowTracePoint {
   trace(flowInput: MessageFlowInput): void;
 }
 
+export function traceSessionBindingControlDrop(
+  flow: ZLinkMessageFlowTracer | undefined,
+  sourceRid: string,
+  actorId: string,
+  packetName: string,
+  errorReason: 'location_unavailable' | 'stale_target',
+  error?: unknown
+): void {
+  const point = flowIfEnabled(flow, ZLinkMessageFlowOutcome.Dropped);
+  if (point === undefined) return;
+  point.trace({
+    outcome: ZLinkMessageFlowOutcome.Dropped,
+    surface: ZLinkDispatchErrorSurface.StreamSession,
+    messageKind: ZLinkDispatchMessageKind.Control,
+    sourceRid,
+    actorId,
+    packetName,
+    errorReason,
+    ...dispatchErrorDetails(error)
+  });
+}
+
 type MessageFlowInput = Omit<
   ZLinkRuntimeMessageFlowEvent,
   'effectiveMode' | 'flowId' | 'flowOrigin'
 > & {
+  readonly severity?: 'warning';
   readonly effectiveMode?: ZLinkMessageFlowLogMode;
   readonly flowId?: string;
   readonly flowOrigin?: import('../../contracts').ZLinkFlowOrigin;
@@ -201,7 +234,7 @@ export class ZLinkMessageFlowTracer {
   }
 
   flowCreationEnabled(): boolean {
-    return effectiveMessageFlow(this.ctx) !== 'off';
+    return messageFlowTracingEnabled(effectiveMessageFlow(this.ctx));
   }
 
   trace(flowInput: MessageFlowInput): void {
@@ -234,7 +267,7 @@ export class ZLinkMessageFlowTracer {
     const ambient = currentFlowContext();
     const flowId = flowInput.flowId ?? acceptedFlowId ?? ambient?.flowId;
     const flowOrigin = flowInput.flowOrigin ?? acceptedFlowOrigin ?? ambient?.flowOrigin;
-    const flow: ZLinkRuntimeMessageFlowEvent = {
+    const flow: MessageFlowInput = {
       ...flowInput,
       ...(flowId === undefined ? {} : { flowId, flowOrigin }),
       streamSessionId: flowInput.streamSessionId ?? ambient?.streamSessionId,
@@ -302,13 +335,17 @@ export class ZLinkMessageFlowTracer {
 
   private publishToLogger(record: ZLinkTelemetryRecord): void {
     try {
-      const severityNumber =
-        record.eventId === DISPATCH_ERROR_EVENT_ID ? SeverityNumber.ERROR : SeverityNumber.INFO;
+      const severity =
+        record.severity === 'warning'
+          ? 'WARN'
+          : record.eventId === DISPATCH_ERROR_EVENT_ID
+            ? 'ERROR'
+            : 'INFO';
       telemetryLogger.emit({
         eventName: record.eventId,
         timestamp: record.timestamp,
-        severityNumber,
-        severityText: record.eventId === DISPATCH_ERROR_EVENT_ID ? 'ERROR' : 'INFO',
+        severityNumber: SeverityNumber[severity],
+        severityText: severity,
         body: structuredLogBody(record),
         attributes: structuredLogAttributes(record)
       });
@@ -342,11 +379,12 @@ export class ZLinkMessageFlowTracer {
 }
 
 function toTelemetryRecord(
-  flow: ZLinkRuntimeMessageFlowEvent,
+  flow: MessageFlowInput,
   messageSizeBytes: number | undefined,
   durationSeconds: number | undefined
 ): ZLinkTelemetryRecord {
   return {
+    severity: flow.severity,
     eventId:
       flow.outcome === ZLinkMessageFlowOutcome.Error
         ? DISPATCH_ERROR_EVENT_ID
@@ -387,7 +425,7 @@ function toTelemetryRecord(
 function traceAttributes(record: ZLinkTelemetryRecord): Attributes {
   const attributes: Attributes = {};
   for (const [name, value] of Object.entries(record)) {
-    if (value === undefined || name === 'timestamp') continue;
+    if (value === undefined || name === 'timestamp' || name === 'severity') continue;
     attributes[toSnakeCase(name)] = value instanceof Date ? value.toISOString() : value;
   }
   return attributes;

package/src/runtime/diagnostics/runtime-metrics.ts

@@ -51,8 +51,8 @@ export interface ZLinkRuntimeMetricMeshSnapshot {
     readonly channelName: string;
     readonly readyMembers: number;
   }>;
-  readonly actorCapacity: ZLinkRuntimeMetricCapacity;
-  readonly spotCapacity: ZLinkRuntimeMetricCapacity;
+  readonly actorCapacity?: ZLinkRuntimeMetricCapacity;
+  readonly spotCapacity?: ZLinkRuntimeMetricCapacity;
   readonly spotTypeCapacities: ReadonlyArray<ZLinkRuntimeMetricSpotTypeCapacity>;
   readonly activation: { readonly active: number; readonly limit: number };
   readonly instanceSpots: ReadonlyArray<{
@@ -383,14 +383,16 @@ class MetricRegistry {
       }
     } else if (name.startsWith('zlink.object.capacity.')) {
       const field = metricSuffix(name);
-      result.observe(capacityValue(snapshot.actorCapacity, field), {
-        ...mesh,
-        capacity_scope: 'actor'
-      });
-      result.observe(capacityValue(snapshot.spotCapacity, field), {
-        ...mesh,
-        capacity_scope: 'spot'
-      });
+      if (snapshot.actorCapacity !== undefined)
+        result.observe(capacityValue(snapshot.actorCapacity, field), {
+          ...mesh,
+          capacity_scope: 'actor'
+        });
+      if (snapshot.spotCapacity !== undefined)
+        result.observe(capacityValue(snapshot.spotCapacity, field), {
+          ...mesh,
+          capacity_scope: 'spot'
+        });
     } else if (name.startsWith('zlink.spot.type.capacity.')) {
       const field = metricSuffix(name);
       for (const capacity of snapshot.spotTypeCapacities) {