@naylence/runtime 0.3.5-test.953 → 0.3.5-test.955

package/dist/node/index.cjs

@@ -14,12 +14,12 @@ var fastify = require('fastify');
 var websocketPlugin = require('@fastify/websocket');
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.953
+// Generated from package.json version: 0.3.5-test.955
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.5-test.953';
+const VERSION = '0.3.5-test.955';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -837,7 +837,7 @@ class TaskCancelledError extends Error {
  * Provides functionality similar to Python's asyncio TaskSpawner with proper
  * error handling, cancellation, and graceful shutdown capabilities.
  */
-const logger$1b = getLogger('naylence.fame.util.task_spawner');
+const logger$1c = getLogger('naylence.fame.util.task_spawner');
 function firstDefined(source, keys) {
     for (const key of keys) {
         if (Object.prototype.hasOwnProperty.call(source, key)) {
@@ -998,7 +998,7 @@ class TaskSpawner {
         const taskId = `task-${++this._taskCounter}`;
         const taskName = normalizedOptions.name || `unnamed-${taskId}`;
         const timeout = normalizedOptions.timeout ?? this._config.defaultTimeout;
-        logger$1b.debug('starting_background_task', {
+        logger$1c.debug('starting_background_task', {
             task_name: taskName,
             task_id: taskId,
         });
@@ -1015,7 +1015,7 @@ class TaskSpawner {
         task.promise
             .then(() => {
             if (!this._suppressCompletionLogging) {
-                logger$1b.debug('task_completed_successfully', {
+                logger$1c.debug('task_completed_successfully', {
                     task_name: taskName,
                     task_id: taskId,
                     duration_ms: Date.now() - task.startTime,
@@ -1069,7 +1069,7 @@ class TaskSpawner {
             error.name === 'AbortError' ||
             error.message === 'Task cancelled' ||
             error.message === 'Aborted') {
-            logger$1b.debug('task_cancelled', {
+            logger$1c.debug('task_cancelled', {
                 task_name: taskName,
                 note: 'Task cancelled as requested',
             });
@@ -1077,7 +1077,7 @@ class TaskSpawner {
         }
         // Handle timeout
         if (error instanceof TaskTimeoutError) {
-            logger$1b.warning('task_timed_out', {
+            logger$1c.warning('task_timed_out', {
                 task_name: taskName,
                 error: error.message,
             });
@@ -1089,7 +1089,7 @@ class TaskSpawner {
         // Handle known WebSocket shutdown race condition (similar to Python version)
         if (error.message.includes("await wasn't used with future") ||
             error.message.includes('WebSocket closed during receive')) {
-            logger$1b.debug('task_shutdown_race_condition_handled', {
+            logger$1c.debug('task_shutdown_race_condition_handled', {
                 task_name: taskName,
                 note: 'Normal WebSocket close timing during shutdown - not an error',
             });
@@ -1099,7 +1099,7 @@ class TaskSpawner {
         if (error.name === 'FameTransportClose' ||
             error.message.includes('normal closure') ||
             error.message.includes('Connection closed')) {
-            logger$1b.debug('task_shutdown_completed_normally', {
+            logger$1c.debug('task_shutdown_completed_normally', {
                 task_name: taskName,
                 note: 'Task closed normally during shutdown',
             });
@@ -1112,14 +1112,14 @@ class TaskSpawner {
         // Log retriable errors as warnings (they'll be retried by upstream logic)
         // Log non-retriable errors as errors (fatal failures)
         if (isRetriableError) {
-            logger$1b.warning('background_task_failed', {
+            logger$1c.warning('background_task_failed', {
                 task_name: taskName,
                 error: error.message,
                 retriable: true,
             });
         }
         else {
-            logger$1b.error('background_task_failed', {
+            logger$1c.error('background_task_failed', {
                 task_name: taskName,
                 error: error.message,
                 stack: error.stack,
@@ -1138,11 +1138,11 @@ class TaskSpawner {
     async shutdownTasks(options = {}) {
         const { gracePeriod, cancelHanging, joinTimeout } = normalizeShutdownOptions(options);
         if (this._tasks.size === 0) {
-            logger$1b.debug('shutdown_tasks_no_tasks_to_shutdown');
+            logger$1c.debug('shutdown_tasks_no_tasks_to_shutdown');
             return;
         }
         this._suppressCompletionLogging = true;
-        logger$1b.debug('shutting_down_tasks', {
+        logger$1c.debug('shutting_down_tasks', {
             task_count: this._tasks.size,
             task_names: Array.from(this._tasks.values()).map((t) => t.name),
             grace_period_ms: gracePeriod,
@@ -1157,7 +1157,7 @@ class TaskSpawner {
         if (cancelHanging) {
             const stillRunning = tasks.filter((task) => task.getState() === TaskState.RUNNING && !completed.has(task));
             if (stillRunning.length > 0) {
-                logger$1b.debug('tasks_did_not_complete_within_grace_period', {
+                logger$1c.debug('tasks_did_not_complete_within_grace_period', {
                     hanging_count: stillRunning.length,
                 });
                 // Wait for them to finish with individual timeouts
@@ -1167,7 +1167,7 @@ class TaskSpawner {
                     }
                     catch (error) {
                         if (error instanceof TaskTimeoutError) {
-                            logger$1b.warning('task_did_not_shutdown', {
+                            logger$1c.warning('task_did_not_shutdown', {
                                 task_name: task.name || task.id,
                                 join_timeout_ms: joinTimeout,
                             });
@@ -1178,7 +1178,7 @@ class TaskSpawner {
                         }
                         else if (!(error instanceof TaskCancelledError)) {
                             /* istanbul ignore next - unreachable defensive branch */
-                            logger$1b.error('task_raised_during_cancellation', {
+                            logger$1c.error('task_raised_during_cancellation', {
                                 task_name: task.name || task.id,
                                 error: error instanceof Error ? error.message : String(error),
                             });
@@ -2271,6 +2271,7 @@ function validateKeyCorrelationTtlSec(ttlSec) {
  * condition/promise and ensure at most one notifier coroutine exists for a
  * flow at any time.
  */
+const logger$1b = getLogger('naylence.fame.flow.flow_controller');
 /**
  * Simple condition variable implementation for TypeScript/Node.js
  * Similar to Python's asyncio.Condition
@@ -2396,8 +2397,17 @@ class FlowController {
         // clamp into [0, initialWindow]
         const newBalance = Math.max(0, Math.min(this.initialWindow, prev + delta));
         this.credits.set(flowId, newBalance);
+        const crossedZero = prev <= 0 && newBalance > 0;
+        logger$1b.debug('flow_controller_add_credits', {
+            flow_id: flowId,
+            delta,
+            prev_balance: prev,
+            new_balance: newBalance,
+            initial_window: this.initialWindow,
+            crossed_zero: crossedZero,
+        });
         // wake waiters only if we crossed the zero boundary
-        if (prev <= 0 && newBalance > 0) {
+        if (crossedZero) {
             this.wakeWaiters(flowId);
         }
         return newBalance;
@@ -2408,11 +2418,27 @@ class FlowController {
     async acquire(flowId) {
         this.ensureFlow(flowId);
         const condition = this.conditions.get(flowId);
+        logger$1b.debug('flow_controller_acquire_attempt', {
+            flow_id: flowId,
+            current_balance: this.credits.get(flowId),
+        });
         while (this.credits.get(flowId) <= 0) {
+            logger$1b.debug('flow_controller_waiting_for_credit', {
+                flow_id: flowId,
+            });
             await condition.wait();
+            logger$1b.debug('flow_controller_woke_with_credit', {
+                flow_id: flowId,
+                balance_after_wake: this.credits.get(flowId),
+            });
         }
         const current = this.credits.get(flowId);
         this.credits.set(flowId, current - 1);
+        logger$1b.debug('flow_controller_credit_consumed', {
+            flow_id: flowId,
+            prev_balance: current,
+            remaining_balance: current - 1,
+        });
     }
     /**
      * Consume *credits* immediately (non-blocking).
@@ -2432,6 +2458,12 @@ class FlowController {
         const current = this.credits.get(flowId);
         const remaining = Math.max(current - credits, 0);
         this.credits.set(flowId, remaining);
+        logger$1b.debug('flow_controller_consume', {
+            flow_id: flowId,
+            requested: credits,
+            prev_balance: current,
+            remaining_balance: remaining,
+        });
         return remaining;
     }
     /**
@@ -2452,6 +2484,10 @@ class FlowController {
         this.windowIds.delete(flowId);
         this.credits.set(flowId, this.initialWindow);
         this.wakeWaiters(flowId);
+        logger$1b.debug('flow_controller_flow_reset', {
+            flow_id: flowId,
+            reset_balance: this.initialWindow,
+        });
     }
     /**
      * Return `[windowId, flags]` for the next outbound envelope.
@@ -9734,84 +9770,6 @@ class BoundedAsyncQueue {
     }
 }
 
-/**
- * Transport frame layer for multiplexing logical links on physical channels.
- *
- * This lightweight framing layer wraps raw FAME payloads to enable multiple
- * logical connections over a single physical channel (BroadcastChannel or InPage bus).
- *
- * The transport frame does NOT modify FAME envelopes - it only wraps the raw
- * Uint8Array payload at the connector level.
- */
-/**
- * Transport frame version for future compatibility
- */
-const TRANSPORT_FRAME_VERSION = 1;
-/**
- * Wrap a raw payload in a transport frame
- *
- * @param payload - Raw FAME envelope bytes
- * @param srcNodeId - Local node ID (this connector)
- * @param dstNodeId - Remote node ID (target connector)
- * @returns Transport frame ready for transmission
- */
-function wrapTransportFrame(payload, srcNodeId, dstNodeId) {
-    return {
-        v: TRANSPORT_FRAME_VERSION,
-        src: srcNodeId,
-        dst: dstNodeId,
-        payload,
-    };
-}
-/**
- * Serialize a transport frame for transmission over the bus
- *
- * @param frame - Transport frame to serialize
- * @returns Serialized frame data ready for postMessage/dispatchEvent
- */
-function serializeTransportFrame(frame) {
-    // Convert Uint8Array to regular array for JSON serialization
-    const serializable = {
-        v: frame.v,
-        src: frame.src,
-        dst: frame.dst,
-        payload: Array.from(frame.payload),
-    };
-    return serializable;
-}
-/**
- * Unwrap a transport frame (pure deserializer - no filtering)
- *
- * @param raw - Raw data from the bus
- * @returns Unwrapped frame with payload as Uint8Array, or null if invalid structure
- */
-function unwrapTransportFrame(raw) {
-    // Validate basic structure
-    if (!raw || typeof raw !== 'object') {
-        return null;
-    }
-    const frame = raw;
-    // Check version
-    if (frame.v !== TRANSPORT_FRAME_VERSION) {
-        return null;
-    }
-    // Check src and dst
-    if (typeof frame.src !== 'string' || typeof frame.dst !== 'string') {
-        return null;
-    }
-    // Extract payload
-    if (!frame.payload || !Array.isArray(frame.payload)) {
-        return null;
-    }
-    // Convert array back to Uint8Array and return full frame
-    return {
-        v: frame.v,
-        src: frame.src,
-        dst: frame.dst,
-        payload: Uint8Array.from(frame.payload),
-    };
-}
-
 const logger$_ = getLogger('naylence.fame.connector.broadcast_channel_connector');
 const BROADCAST_CHANNEL_CONNECTOR_TYPE = 'broadcast-channel-connector';
 const DEFAULT_CHANNEL$7 = 'naylence-fabric';
@@ -9875,22 +9833,12 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
             ? Math.floor(config.inboxCapacity)
             : DEFAULT_INBOX_CAPACITY$7;
         this.inbox = new BoundedAsyncQueue(preferredCapacity);
+        this.inboxCapacity = preferredCapacity;
         this.connectorId = BroadcastChannelConnector.generateConnectorId();
         this.channel = new BroadcastChannel(this.channelName);
-        // Set local and remote node IDs (defaults to connector ID for backwards compatibility)
-        this.localNodeId =
-            typeof config.localNodeId === 'string' && config.localNodeId.trim().length > 0
-                ? config.localNodeId.trim()
-                : this.connectorId;
-        this.remoteNodeId =
-            typeof config.remoteNodeId === 'string' && config.remoteNodeId.trim().length > 0
-                ? config.remoteNodeId.trim()
-                : '*'; // Accept from any remote if not specified
         logger$_.debug('broadcast_channel_connector_created', {
             channel: this.channelName,
             connector_id: this.connectorId,
-            local_node_id: this.localNodeId,
-            remote_node_id: this.remoteNodeId,
             inbox_capacity: preferredCapacity,
             timestamp: new Date().toISOString(),
         });
@@ -9923,67 +9871,6 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
             if (busMessage.senderId === this.connectorId) {
                 return;
             }
-            // Try to unwrap as transport frame
-            const frame = unwrapTransportFrame(busMessage.payload);
-            if (frame) {
-                // Apply connector's filtering policy: strict dst check, src accepts wildcard
-                const srcMatches = this.remoteNodeId === '*' || frame.src === this.remoteNodeId;
-                const dstMatches = frame.dst === this.localNodeId;
-                if (dstMatches && srcMatches) {
-                    // Successfully received and filtered transport frame
-                    logger$_.debug('broadcast_channel_transport_frame_received', {
-                        channel: this.channelName,
-                        sender_id: busMessage.senderId,
-                        connector_id: this.connectorId,
-                        local_node_id: this.localNodeId,
-                        remote_node_id: this.remoteNodeId,
-                        frame_src: frame.src,
-                        frame_dst: frame.dst,
-                        payload_length: frame.payload.byteLength,
-                    });
-                    const unwrapped = frame.payload;
-                    if (this._shouldSkipDuplicateAck(busMessage.senderId, unwrapped)) {
-                        return;
-                    }
-                    try {
-                        if (typeof this.inbox.tryEnqueue === 'function') {
-                            const accepted = this.inbox.tryEnqueue(unwrapped);
-                            if (accepted) {
-                                return;
-                            }
-                        }
-                        this.inbox.enqueue(unwrapped);
-                    }
-                    catch (error) {
-                        if (error instanceof QueueFullError) {
-                            logger$_.warning('broadcast_channel_receive_queue_full', {
-                                channel: this.channelName,
-                            });
-                        }
-                        else {
-                            logger$_.error('broadcast_channel_receive_error', {
-                                channel: this.channelName,
-                                error: error instanceof Error ? error.message : String(error),
-                            });
-                        }
-                    }
-                    return;
-                }
-                else {
-                    // Frame filtered out by addressing rules
-                    logger$_.debug('broadcast_channel_transport_frame_filtered', {
-                        channel: this.channelName,
-                        connector_id: this.connectorId,
-                        local_node_id: this.localNodeId,
-                        remote_node_id: this.remoteNodeId,
-                        frame_src: frame.src,
-                        frame_dst: frame.dst,
-                        reason: !dstMatches ? 'wrong_destination' : 'wrong_source',
-                    });
-                    return;
-                }
-            }
-            // Fall back to legacy format (no transport frame)
             const payload = BroadcastChannelConnector.coercePayload(busMessage.payload);
             if (!payload) {
                 logger$_.debug('broadcast_channel_payload_rejected', {
@@ -10006,15 +9893,27 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
                 if (typeof this.inbox.tryEnqueue === 'function') {
                     const accepted = this.inbox.tryEnqueue(payload);
                     if (accepted) {
+                        this.logInboxSnapshot('broadcast_channel_inbox_enqueued', {
+                            source: 'listener',
+                            enqueue_strategy: 'try',
+                            payload_length: payload.byteLength,
+                        });
                         return;
                     }
                 }
                 this.inbox.enqueue(payload);
+                this.logInboxSnapshot('broadcast_channel_inbox_enqueued', {
+                    source: 'listener',
+                    enqueue_strategy: 'enqueue',
+                    payload_length: payload.byteLength,
+                });
             }
             catch (error) {
                 if (error instanceof QueueFullError) {
                     logger$_.warning('broadcast_channel_receive_queue_full', {
                         channel: this.channelName,
+                        inbox_capacity: this.inboxCapacity,
+                        inbox_remaining_capacity: this.inbox.remainingCapacity,
                     });
                 }
                 else {
@@ -10098,15 +9997,25 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
             if (typeof this.inbox.tryEnqueue === 'function') {
                 const accepted = this.inbox.tryEnqueue(item);
                 if (accepted) {
+                    this.logInboxSnapshot('broadcast_channel_push_enqueued', {
+                        enqueue_strategy: 'try',
+                        item_type: this._describeInboxItem(item),
+                    });
                     return;
                 }
             }
             this.inbox.enqueue(item);
+            this.logInboxSnapshot('broadcast_channel_push_enqueued', {
+                enqueue_strategy: 'enqueue',
+                item_type: this._describeInboxItem(item),
+            });
         }
         catch (error) {
             if (error instanceof QueueFullError) {
                 logger$_.warning('broadcast_channel_push_queue_full', {
                     channel: this.channelName,
+                    inbox_capacity: this.inboxCapacity,
+                    inbox_remaining_capacity: this.inbox.remainingCapacity,
                 });
                 throw error;
             }
@@ -10122,30 +10031,18 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
         logger$_.debug('broadcast_channel_message_sending', {
             channel: this.channelName,
             sender_id: this.connectorId,
-            local_node_id: this.localNodeId,
-            remote_node_id: this.remoteNodeId,
-        });
-        // Only use transport framing if both localNodeId and remoteNodeId are explicitly set
-        // (not using default values). This ensures backwards compatibility.
-        const useTransportFrame = this.localNodeId !== this.connectorId ||
-            this.remoteNodeId !== '*';
-        let payload;
-        if (useTransportFrame) {
-            // Wrap payload in transport frame
-            const frame = wrapTransportFrame(data, this.localNodeId, this.remoteNodeId);
-            payload = serializeTransportFrame(frame);
-        }
-        else {
-            // Legacy format: send raw payload
-            payload = data;
-        }
+        });
         this.channel.postMessage({
             senderId: this.connectorId,
-            payload,
+            payload: data,
         });
     }
     async _transportReceive() {
-        return await this.inbox.dequeue();
+        const item = await this.inbox.dequeue();
+        this.logInboxSnapshot('broadcast_channel_inbox_dequeued', {
+            item_type: this._describeInboxItem(item),
+        });
+        return item;
     }
     async _transportClose(code, reason) {
         logger$_.debug('broadcast_channel_transport_closing', {
@@ -10199,6 +10096,28 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
         }
         return rawOrEnvelope;
     }
+    _describeInboxItem(item) {
+        if (item instanceof Uint8Array) {
+            return 'bytes';
+        }
+        if (item.envelope) {
+            return 'channel_message';
+        }
+        if (item.frame) {
+            return 'envelope';
+        }
+        return 'unknown';
+    }
+    logInboxSnapshot(event, extra = {}) {
+        logger$_.debug(event, {
+            channel: this.channelName,
+            connector_id: this.connectorId,
+            connector_state: this.state,
+            inbox_capacity: this.inboxCapacity,
+            inbox_remaining_capacity: this.inbox.remainingCapacity,
+            ...extra,
+        });
+    }
     _shouldSkipDuplicateAck(senderId, payload) {
         const dedupKey = this._extractAckDedupKey(payload);
         if (!dedupKey) {
@@ -10297,24 +10216,6 @@ let BroadcastChannelConnector$2 = class BroadcastChannelConnector extends BaseAs
             });
         }
     }
-    /**
-     * Update the remote node ID after learning it from NodeAttachAck
-     * This allows upstream connectors to switch from wildcard to specific addressing
-     */
-    updateRemoteNodeId(newRemoteNodeId) {
-        if (typeof newRemoteNodeId !== 'string' || newRemoteNodeId.trim().length === 0) {
-            throw new Error('Invalid remote node ID');
-        }
-        const oldValue = this.remoteNodeId;
-        this.remoteNodeId = newRemoteNodeId.trim();
-        logger$_.debug('broadcast_channel_connector_remote_node_id_updated', {
-            channel: this.channelName,
-            connector_id: this.connectorId,
-            local_node_id: this.localNodeId,
-            old_remote_node_id: oldValue,
-            new_remote_node_id: this.remoteNodeId,
-        });
-    }
     _trimSeenAcks(now) {
         while (this.seenAckOrder.length > 0) {
             const candidate = this.seenAckOrder[0];
@@ -10452,12 +10353,9 @@ function isBroadcastChannelConnectionGrant(candidate) {
             record.inboxCapacity <= 0)) {
         return false;
     }
-    if (record.localNodeId !== undefined &&
-        (typeof record.localNodeId !== 'string' || record.localNodeId.length === 0)) {
-        return false;
-    }
-    if (record.remoteNodeId !== undefined &&
-        (typeof record.remoteNodeId !== 'string' || record.remoteNodeId.length === 0)) {
+    if (record.initialWindow !== undefined &&
+        (!Number.isFinite(record.initialWindow) ||
+            record.initialWindow <= 0)) {
         return false;
     }
     return true;
@@ -10493,19 +10391,14 @@ function normalizeBroadcastChannelConnectionGrant(candidate) {
         }
         result.inboxCapacity = Math.floor(inboxValue);
     }
-    const localNodeIdValue = candidate.localNodeId ?? candidate['local_node_id'];
-    if (localNodeIdValue !== undefined) {
-        if (typeof localNodeIdValue !== 'string' || localNodeIdValue.trim().length === 0) {
-            throw new TypeError('BroadcastChannelConnectionGrant "localNodeId" must be a non-empty string when provided');
-        }
-        result.localNodeId = localNodeIdValue.trim();
-    }
-    const remoteNodeIdValue = candidate.remoteNodeId ?? candidate['remote_node_id'];
-    if (remoteNodeIdValue !== undefined) {
-        if (typeof remoteNodeIdValue !== 'string' || remoteNodeIdValue.trim().length === 0) {
-            throw new TypeError('BroadcastChannelConnectionGrant "remoteNodeId" must be a non-empty string when provided');
+    const windowValue = candidate.initialWindow ?? candidate['initial_window'];
+    if (windowValue !== undefined) {
+        if (typeof windowValue !== 'number' ||
+            !Number.isFinite(windowValue) ||
+            windowValue <= 0) {
+            throw new TypeError('BroadcastChannelConnectionGrant "initialWindow" must be a positive number when provided');
         }
-        result.remoteNodeId = remoteNodeIdValue.trim();
+        result.initialWindow = Math.floor(windowValue);
     }
     return result;
 }
@@ -10520,11 +10413,8 @@ function broadcastChannelGrantToConnectorConfig(grant) {
     if (normalized.inboxCapacity !== undefined) {
         config.inboxCapacity = normalized.inboxCapacity;
     }
-    if (normalized.localNodeId) {
-        config.localNodeId = normalized.localNodeId;
-    }
-    if (normalized.remoteNodeId) {
-        config.remoteNodeId = normalized.remoteNodeId;
+    if (normalized.initialWindow !== undefined) {
+        config.initialWindow = normalized.initialWindow;
     }
     return config;
 }
@@ -10816,12 +10706,6 @@ class UpstreamSessionManager extends TaskSpawner {
             cryptoProvider.prepareForAttach(welcome.frame.systemId, welcome.frame.assignedPath, welcome.frame.acceptedLogicals ?? []);
         }
         await this.onWelcome(welcome.frame);
-        // Inject node ID into grant for transport frame multiplexing
-        // This ensures localNodeId matches the node's systemId for proper frame filtering
-        grant.localNodeId = welcome.frame.systemId;
-        if (welcome.frame.targetSystemId) {
-            grant.remoteNodeId = welcome.frame.targetSystemId;
-        }
         const connector = await ConnectorFactory.createConnector(grant, {
             systemId: welcome.frame.systemId,
         });
@@ -12778,20 +12662,6 @@ class DefaultNodeAttachClient {
         if (!targetSystemId) {
             throw new Error('Target system ID must be set in NodeAttachAckFrame on success');
         }
-        // Update connector's remote node ID if it supports it (e.g., BroadcastChannelConnector, InPageConnector)
-        // This allows upstream connectors to switch from wildcard '*' to specific node addressing
-        const updatableConnector = connector;
-        if (typeof updatableConnector.updateRemoteNodeId === 'function') {
-            try {
-                updatableConnector.updateRemoteNodeId(targetSystemId);
-            }
-            catch (error) {
-                logger$W.debug('connector_remote_node_id_update_failed', {
-                    target_system_id: targetSystemId,
-                    error: error instanceof Error ? error.message : String(error),
-                });
-            }
-        }
         try {
             if (this.replicaStickinessManager) {
                 this.replicaStickinessManager.accept(ackFrame.stickiness ?? null);
@@ -20492,20 +20362,9 @@ class InPageConnector extends BaseAsyncConnector {
             : DEFAULT_INBOX_CAPACITY$6;
         this.inbox = new BoundedAsyncQueue(preferredCapacity);
         this.connectorId = InPageConnector.generateConnectorId();
-        // Set local and remote node IDs (defaults to connector ID for backwards compatibility)
-        this.localNodeId =
-            typeof config.localNodeId === 'string' && config.localNodeId.trim().length > 0
-                ? config.localNodeId.trim()
-                : this.connectorId;
-        this.remoteNodeId =
-            typeof config.remoteNodeId === 'string' && config.remoteNodeId.trim().length > 0
-                ? config.remoteNodeId.trim()
-                : '*'; // Accept from any remote if not specified
         logger$G.debug('inpage_connector_initialized', {
             channel: this.channelName,
             connector_id: this.connectorId,
-            local_node_id: this.localNodeId,
-            remote_node_id: this.remoteNodeId,
         });
         this.onMsg = (event) => {
             const messageEvent = event;
@@ -20539,64 +20398,6 @@ class InPageConnector extends BaseAsyncConnector {
             if (busMessage.senderId === this.connectorId) {
                 return;
             }
-            // Try to unwrap as transport frame
-            const frame = unwrapTransportFrame(busMessage.payload);
-            if (frame) {
-                // Apply connector's filtering policy: strict dst check, src accepts wildcard
-                const srcMatches = this.remoteNodeId === '*' || frame.src === this.remoteNodeId;
-                const dstMatches = frame.dst === this.localNodeId;
-                if (dstMatches && srcMatches) {
-                    // Successfully received and filtered transport frame
-                    logger$G.debug('inpage_transport_frame_received', {
-                        channel: this.channelName,
-                        sender_id: busMessage.senderId,
-                        connector_id: this.connectorId,
-                        local_node_id: this.localNodeId,
-                        remote_node_id: this.remoteNodeId,
-                        frame_src: frame.src,
-                        frame_dst: frame.dst,
-                        payload_length: frame.payload.byteLength,
-                    });
-                    const unwrapped = frame.payload;
-                    try {
-                        if (typeof this.inbox.tryEnqueue === 'function') {
-                            const accepted = this.inbox.tryEnqueue(unwrapped);
-                            if (accepted) {
-                                return;
-                            }
-                        }
-                        this.inbox.enqueue(unwrapped);
-                    }
-                    catch (error) {
-                        if (error instanceof QueueFullError) {
-                            logger$G.warning('inpage_receive_queue_full', {
-                                channel: this.channelName,
-                            });
-                        }
-                        else {
-                            logger$G.error('inpage_receive_error', {
-                                channel: this.channelName,
-                                error: error instanceof Error ? error.message : String(error),
-                            });
-                        }
-                    }
-                    return;
-                }
-                else {
-                    // Frame filtered out by addressing rules
-                    logger$G.debug('inpage_transport_frame_filtered', {
-                        channel: this.channelName,
-                        connector_id: this.connectorId,
-                        local_node_id: this.localNodeId,
-                        remote_node_id: this.remoteNodeId,
-                        frame_src: frame.src,
-                        frame_dst: frame.dst,
-                        reason: !dstMatches ? 'wrong_destination' : 'wrong_source',
-                    });
-                    return;
-                }
-            }
-            // Fall back to legacy format (no transport frame)
             const payload = InPageConnector.coercePayload(busMessage.payload);
             if (!payload) {
                 logger$G.debug('inpage_payload_rejected', {
@@ -20755,27 +20556,11 @@ class InPageConnector extends BaseAsyncConnector {
         logger$G.debug('inpage_message_sending', {
             channel: this.channelName,
             sender_id: this.connectorId,
-            local_node_id: this.localNodeId,
-            remote_node_id: this.remoteNodeId,
-        });
-        // Only use transport framing if both localNodeId and remoteNodeId are explicitly set
-        // (not using default values). This ensures backwards compatibility.
-        const useTransportFrame = this.localNodeId !== this.connectorId ||
-            this.remoteNodeId !== '*';
-        let payload;
-        if (useTransportFrame) {
-            // Wrap payload in transport frame
-            const frame = wrapTransportFrame(data, this.localNodeId, this.remoteNodeId);
-            payload = serializeTransportFrame(frame);
-        }
-        else {
-            // Legacy format: send raw payload
-            payload = data;
-        }
+        });
         const event = new MessageEvent(this.channelName, {
             data: {
                 senderId: this.connectorId,
-                payload,
+                payload: data,
             },
         });
         getSharedBus$1().dispatchEvent(event);
@@ -20804,24 +20589,6 @@ class InPageConnector extends BaseAsyncConnector {
         }
         return rawOrEnvelope;
     }
-    /**
-     * Update the remote node ID after learning it from NodeAttachAck
-     * This allows upstream connectors to switch from wildcard to specific addressing
-     */
-    updateRemoteNodeId(newRemoteNodeId) {
-        if (typeof newRemoteNodeId !== 'string' || newRemoteNodeId.trim().length === 0) {
-            throw new Error('Invalid remote node ID');
-        }
-        const oldValue = this.remoteNodeId;
-        this.remoteNodeId = newRemoteNodeId.trim();
-        logger$G.debug('inpage_connector_remote_node_id_updated', {
-            channel: this.channelName,
-            connector_id: this.connectorId,
-            local_node_id: this.localNodeId,
-            old_remote_node_id: oldValue,
-            new_remote_node_id: this.remoteNodeId,
-        });
-    }
 }
 
 const RPC_REGISTRY = Symbol('naylence.rpc.registry');
@@ -28158,14 +27925,6 @@ function isInPageConnectionGrant(candidate) {
             record.inboxCapacity <= 0)) {
         return false;
     }
-    if (record.localNodeId !== undefined &&
-        (typeof record.localNodeId !== 'string' || record.localNodeId.length === 0)) {
-        return false;
-    }
-    if (record.remoteNodeId !== undefined &&
-        (typeof record.remoteNodeId !== 'string' || record.remoteNodeId.length === 0)) {
-        return false;
-    }
     return true;
 }
 function normalizeInPageConnectionGrant(candidate) {
@@ -28199,20 +27958,6 @@ function normalizeInPageConnectionGrant(candidate) {
         }
         result.inboxCapacity = Math.floor(inboxValue);
     }
-    const localNodeIdValue = candidate.localNodeId ?? candidate['local_node_id'];
-    if (localNodeIdValue !== undefined) {
-        if (typeof localNodeIdValue !== 'string' || localNodeIdValue.trim().length === 0) {
-            throw new TypeError('InPageConnectionGrant "localNodeId" must be a non-empty string when provided');
-        }
-        result.localNodeId = localNodeIdValue.trim();
-    }
-    const remoteNodeIdValue = candidate.remoteNodeId ?? candidate['remote_node_id'];
-    if (remoteNodeIdValue !== undefined) {
-        if (typeof remoteNodeIdValue !== 'string' || remoteNodeIdValue.trim().length === 0) {
-            throw new TypeError('InPageConnectionGrant "remoteNodeId" must be a non-empty string when provided');
-        }
-        result.remoteNodeId = remoteNodeIdValue.trim();
-    }
     return result;
 }
 function inPageGrantToConnectorConfig(grant) {
@@ -28226,12 +27971,6 @@ function inPageGrantToConnectorConfig(grant) {
     if (normalized.inboxCapacity !== undefined) {
         config.inboxCapacity = normalized.inboxCapacity;
     }
-    if (normalized.localNodeId) {
-        config.localNodeId = normalized.localNodeId;
-    }
-    if (normalized.remoteNodeId) {
-        config.remoteNodeId = normalized.remoteNodeId;
-    }
     return config;
 }
 
@@ -28809,8 +28548,7 @@ class BroadcastChannelConnectorFactory extends ConnectorFactory {
                 type: BROADCAST_CHANNEL_CONNECTOR_TYPE,
                 channelName: connectorConfig.channelName,
                 inboxCapacity: connectorConfig.inboxCapacity,
-                localNodeId: connectorConfig.localNodeId,
-                remoteNodeId: connectorConfig.remoteNodeId,
+                initialWindow: connectorConfig.initialWindow,
             };
         }
         const config = {
@@ -28835,6 +28573,7 @@ class BroadcastChannelConnectorFactory extends ConnectorFactory {
             purpose: 'connection',
             channelName: normalizedConfig.channelName,
             inboxCapacity: normalizedConfig.inboxCapacity,
+            initialWindow: normalizedConfig.initialWindow,
         });
         return grant;
     }
@@ -28860,8 +28599,6 @@ class BroadcastChannelConnectorFactory extends ConnectorFactory {
             type: BROADCAST_CHANNEL_CONNECTOR_TYPE,
             channelName,
             inboxCapacity,
-            localNodeId: normalized.localNodeId,
-            remoteNodeId: normalized.remoteNodeId,
         };
         const connector = new BroadcastChannelConnector(connectorConfig, baseConfig);
         if (options.authorization) {
@@ -28923,16 +28660,6 @@ class BroadcastChannelConnectorFactory extends ConnectorFactory {
         if (candidate.authorizationContext !== undefined) {
             normalized.authorizationContext = candidate.authorizationContext;
         }
-        // Handle localNodeId
-        const localNodeId = candidate.localNodeId ?? candidate['local_node_id'];
-        if (typeof localNodeId === 'string' && localNodeId.trim().length > 0) {
-            normalized.localNodeId = localNodeId.trim();
-        }
-        // Handle remoteNodeId
-        const remoteNodeId = candidate.remoteNodeId ?? candidate['remote_node_id'];
-        if (typeof remoteNodeId === 'string' && remoteNodeId.trim().length > 0) {
-            normalized.remoteNodeId = remoteNodeId.trim();
-        }
         normalized.channelName = normalized.channelName ?? DEFAULT_CHANNEL$5;
         normalized.inboxCapacity =
             normalized.inboxCapacity ?? DEFAULT_INBOX_CAPACITY$5;
@@ -29496,8 +29223,6 @@ class InPageConnectorFactory extends ConnectorFactory {
             type: INPAGE_CONNECTOR_TYPE,
             channelName,
             inboxCapacity,
-            localNodeId: normalized.localNodeId,
-            remoteNodeId: normalized.remoteNodeId,
         };
         const connector = new InPageConnector(connectorConfig, baseConfig);
         if (options.authorization) {
@@ -29566,16 +29291,6 @@ class InPageConnectorFactory extends ConnectorFactory {
         if (candidate.authorizationContext !== undefined) {
             normalized.authorizationContext = candidate.authorizationContext;
         }
-        // Handle localNodeId
-        const localNodeId = candidate.localNodeId ?? candidate['local_node_id'];
-        if (typeof localNodeId === 'string' && localNodeId.trim().length > 0) {
-            normalized.localNodeId = localNodeId.trim();
-        }
-        // Handle remoteNodeId
-        const remoteNodeId = candidate.remoteNodeId ?? candidate['remote_node_id'];
-        if (typeof remoteNodeId === 'string' && remoteNodeId.trim().length > 0) {
-            normalized.remoteNodeId = remoteNodeId.trim();
-        }
         normalized.channelName = normalized.channelName ?? DEFAULT_CHANNEL$3;
         normalized.inboxCapacity =
             normalized.inboxCapacity ?? DEFAULT_INBOX_CAPACITY$3;
@@ -36341,18 +36056,13 @@ class BroadcastChannelListener extends TransportListener {
         });
     }
     asCallbackGrant() {
-        const grant = {
+        return this.withLegacySnakeCaseKeys({
             type: BROADCAST_CHANNEL_CONNECTOR_TYPE,
             connectorType: BROADCAST_CHANNEL_CONNECTOR_TYPE,
             connectionGrantType: BROADCAST_CHANNEL_CONNECTION_GRANT_TYPE,
             channelName: this._channelName,
             inboxCapacity: this._inboxCapacity,
-        };
-        // Include localNodeId for transport frame multiplexing if node is available
-        if (this._routingNode) {
-            grant.localNodeId = this._routingNode.id;
-        }
-        return this.withLegacySnakeCaseKeys(grant);
+        });
     }
     _registerChannelListener() {
         if (this._channelHandler) {
@@ -36412,54 +36122,23 @@ class BroadcastChannelListener extends TransportListener {
         if (typeof senderId !== 'string' || senderId.length === 0) {
             return null;
         }
-        // Check if payload is a transport frame object first
-        let envelopePayload = null;
-        if (this._routingNode && record.payload && typeof record.payload === 'object') {
-            // Try to unwrap as transport frame
-            const frame = unwrapTransportFrame(record.payload);
-            if (frame) {
-                // Apply listener's filtering policy: accept frames addressed to us OR with wildcard destination
-                // Wildcard is needed because downstream nodes don't know the sentinel's ID during initial attach
-                const isAddressedToUs = frame.dst === this._routingNode.id || frame.dst === '*';
-                if (isAddressedToUs) {
-                    envelopePayload = frame.payload;
-                    logger$a.debug('broadcast_channel_listener_unwrapped_transport_frame', {
-                        sender_id: senderId,
-                        src: frame.src,
-                        dst: frame.dst,
-                    });
-                }
-                else {
-                    // Frame addressed to a different node, ignore it
-                    logger$a.debug('broadcast_channel_listener_ignored_frame_wrong_destination', {
-                        sender_id: senderId,
-                        dst: frame.dst,
-                        expected: this._routingNode.id,
-                    });
-                    return null;
-                }
-            }
-        }
-        // If not a transport frame, try to coerce as legacy format
-        if (!envelopePayload) {
-            envelopePayload = coercePayload$1(record.payload);
-            if (!envelopePayload) {
-                logger$a.debug('broadcast_channel_listener_ignored_event_without_payload', {
-                    sender_id: senderId,
-                });
-                return null;
-            }
+        const payload = coercePayload$1(record.payload);
+        if (!payload) {
+            logger$a.debug('broadcast_channel_listener_ignored_event_without_payload', {
+                sender_id: senderId,
+            });
+            return null;
         }
         let envelope;
         try {
-            const decoded = new TextDecoder().decode(envelopePayload);
+            const decoded = new TextDecoder().decode(payload);
             const parsed = JSON.parse(decoded);
             envelope = core.deserializeEnvelope(parsed);
         }
         catch (error) {
             const decoded = (() => {
                 try {
-                    return new TextDecoder().decode(envelopePayload);
+                    return new TextDecoder().decode(payload);
                 }
                 catch {
                     return null;
@@ -36579,20 +36258,6 @@ class BroadcastChannelListener extends TransportListener {
                         inboxCapacity: this._inboxCapacity,
                     };
         }
-        // Automatically configure transport frame multiplexing:
-        // Use node IDs (not connector IDs) for node-to-node targeting
-        const broadcastConfig = connectorConfig;
-        // Always force localNodeId to be this listener's node ID
-        // This ensures the sentinel sets localNodeId=sentinel, not the child's ID
-        broadcastConfig.localNodeId = routingNode.id;
-        // Always force remoteNodeId to be the attaching child's system ID
-        broadcastConfig.remoteNodeId = systemId;
-        logger$a.debug('broadcast_channel_listener_configured_node_ids', {
-            sender_id: params.senderId,
-            system_id: systemId,
-            local_node_id: broadcastConfig.localNodeId,
-            remote_node_id: broadcastConfig.remoteNodeId,
-        });
         try {
             const connector = await routingNode.createOriginConnector({
                 originType,
@@ -36662,21 +36327,6 @@ class BroadcastChannelListener extends TransportListener {
             inboxCandidate > 0) {
             config.inboxCapacity = Math.floor(inboxCandidate);
         }
-        // Extract transport frame multiplexing node IDs
-        const localNodeIdCandidate = candidate.localNodeId ?? candidate['local_node_id'];
-        if (typeof localNodeIdCandidate === 'string' && localNodeIdCandidate.trim().length > 0) {
-            config.localNodeId = localNodeIdCandidate.trim();
-            logger$a.debug('broadcast_channel_listener_extracted_local_node_id', {
-                local_node_id: config.localNodeId,
-            });
-        }
-        const remoteNodeIdCandidate = candidate.remoteNodeId ?? candidate['remote_node_id'];
-        if (typeof remoteNodeIdCandidate === 'string' && remoteNodeIdCandidate.trim().length > 0) {
-            config.remoteNodeId = remoteNodeIdCandidate.trim();
-            logger$a.debug('broadcast_channel_listener_extracted_remote_node_id', {
-                remote_node_id: config.remoteNodeId,
-            });
-        }
         return config;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {
@@ -37399,7 +37049,6 @@ class InPageListener extends TransportListener {
         this._busHandler = null;
         this._senderRegistry = new Map();
         this._systemToSender = new Map();
-        this._flowIdToSender = new Map();
         this._pendingAttachments = new Map();
         ensureBrowserEnvironment();
         const channelCandidate = options?.channelName;
@@ -37466,7 +37115,6 @@ class InPageListener extends TransportListener {
         this._unregisterBusListener();
         this._senderRegistry.clear();
         this._systemToSender.clear();
-        this._flowIdToSender.clear();
         this._pendingAttachments.clear();
         logger$7.debug('inpage_listener_stopped', {
             channel: this._channelName,
@@ -37520,25 +37168,10 @@ class InPageListener extends TransportListener {
             await this._handleAttachFrame(senderId, envelope);
             return;
         }
-        // Try to find connector by sender ID first
-        let entry = this._senderRegistry.get(senderId);
-        // If not found and we have a flowId, try to route based on flow
-        if (!entry && envelope.flowId) {
-            const originalSenderId = this._flowIdToSender.get(envelope.flowId);
-            if (originalSenderId) {
-                entry = this._senderRegistry.get(originalSenderId);
-                logger$7.debug('inpage_listener_routed_by_flow_id', {
-                    sender_id: senderId,
-                    original_sender_id: originalSenderId,
-                    flow_id: envelope.flowId,
-                    frame_type: envelope.frame?.type ?? 'unknown',
-                });
-            }
-        }
+        const entry = this._senderRegistry.get(senderId);
         if (!entry) {
             logger$7.debug('inpage_listener_no_connector_for_sender', {
                 sender_id: senderId,
-                flow_id: envelope.flowId,
                 frame_type: envelope.frame?.type ?? 'unknown',
             });
             return;
@@ -37615,15 +37248,6 @@ class InPageListener extends TransportListener {
         }
         this._senderRegistry.set(senderId, entry);
         this._systemToSender.set(entry.systemId, senderId);
-        // Track the flowId if present so we can route responses back
-        if (envelope.flowId) {
-            this._flowIdToSender.set(envelope.flowId, senderId);
-            logger$7.debug('inpage_listener_registered_flow_id', {
-                sender_id: senderId,
-                system_id: entry.systemId,
-                flow_id: envelope.flowId,
-            });
-        }
         await this._deliverEnvelope(entry, envelope);
     }
     async _createConnectorForAttach(params) {
@@ -37671,7 +37295,7 @@ class InPageListener extends TransportListener {
                 origin_type: originType,
                 connector_type: connector.constructor?.name ?? 'unknown',
             });
-            return { connector, systemId, originType, senderId: params.senderId };
+            return { connector, systemId, originType };
         }
         catch (error) {
             logger$7.error('inpage_listener_connector_creation_failed', {
@@ -37725,12 +37349,6 @@ class InPageListener extends TransportListener {
             if (this._systemToSender.get(systemId) === senderId) {
                 this._systemToSender.delete(systemId);
             }
-            // Clean up flowId mappings for this sender
-            for (const [flowId, sid] of this._flowIdToSender.entries()) {
-                if (sid === senderId) {
-                    this._flowIdToSender.delete(flowId);
-                }
-            }
         })
             .catch((error) => {
             logger$7.debug('inpage_listener_wait_until_closed_failed', {
@@ -37742,24 +37360,9 @@ class InPageListener extends TransportListener {
             if (this._systemToSender.get(systemId) === senderId) {
                 this._systemToSender.delete(systemId);
             }
-            // Clean up flowId mappings for this sender
-            for (const [flowId, sid] of this._flowIdToSender.entries()) {
-                if (sid === senderId) {
-                    this._flowIdToSender.delete(flowId);
-                }
-            }
         });
     }
     async _deliverEnvelope(entry, envelope) {
-        // Track flowId for routing responses back
-        if (envelope.flowId && !this._flowIdToSender.has(envelope.flowId)) {
-            this._flowIdToSender.set(envelope.flowId, entry.senderId);
-            logger$7.debug('inpage_listener_registered_flow_id_on_delivery', {
-                sender_id: entry.senderId,
-                system_id: entry.systemId,
-                flow_id: envelope.flowId,
-            });
-        }
         const message = this._buildChannelMessage({
             envelope,
             connector: entry.connector,