@naylence/runtime 0.3.5-test.943 → 0.3.5-test.945

package/dist/browser/index.cjs

@@ -98,12 +98,12 @@ installProcessEnvShim();
 // --- END ENV SHIM ---
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.943
+// Generated from package.json version: 0.3.5-test.945
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.5-test.943';
+const VERSION = '0.3.5-test.945';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -29460,6 +29460,7 @@ class InPageListener extends TransportListener {
         this._busHandler = null;
         this._senderRegistry = new Map();
         this._systemToSender = new Map();
+        this._flowIdToSender = new Map();
         this._pendingAttachments = new Map();
         ensureBrowserEnvironment$1();
         const channelCandidate = options?.channelName;
@@ -29526,6 +29527,7 @@ class InPageListener extends TransportListener {
         this._unregisterBusListener();
         this._senderRegistry.clear();
         this._systemToSender.clear();
+        this._flowIdToSender.clear();
         this._pendingAttachments.clear();
         logger$p.debug('inpage_listener_stopped', {
             channel: this._channelName,
@@ -29579,10 +29581,25 @@ class InPageListener extends TransportListener {
             await this._handleAttachFrame(senderId, envelope);
             return;
         }
-        const entry = this._senderRegistry.get(senderId);
+        // 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$p.debug('inpage_listener_routed_by_flow_id', {
+                    sender_id: senderId,
+                    original_sender_id: originalSenderId,
+                    flow_id: envelope.flowId,
+                    frame_type: envelope.frame?.type ?? 'unknown',
+                });
+            }
+        }
         if (!entry) {
             logger$p.debug('inpage_listener_no_connector_for_sender', {
                 sender_id: senderId,
+                flow_id: envelope.flowId,
                 frame_type: envelope.frame?.type ?? 'unknown',
             });
             return;
@@ -29659,6 +29676,15 @@ 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$p.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) {
@@ -29706,7 +29732,7 @@ class InPageListener extends TransportListener {
                 origin_type: originType,
                 connector_type: connector.constructor?.name ?? 'unknown',
             });
-            return { connector, systemId, originType };
+            return { connector, systemId, originType, senderId: params.senderId };
         }
         catch (error) {
             logger$p.error('inpage_listener_connector_creation_failed', {
@@ -29760,6 +29786,12 @@ 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$p.debug('inpage_listener_wait_until_closed_failed', {
@@ -29771,9 +29803,24 @@ 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$p.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,
@@ -30216,6 +30263,29 @@ 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;
+        if (!broadcastConfig.localNodeId) {
+            broadcastConfig.localNodeId = routingNode.id;
+        }
+        if (!broadcastConfig.remoteNodeId) {
+            broadcastConfig.remoteNodeId = systemId;
+            logger$o.debug('broadcast_channel_listener_auto_configured_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: systemId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
+        else {
+            logger$o.debug('broadcast_channel_listener_using_provided_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: broadcastConfig.remoteNodeId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
         try {
             const connector = await routingNode.createOriginConnector({
                 originType,
@@ -30285,6 +30355,21 @@ 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$o.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$o.debug('broadcast_channel_listener_extracted_remote_node_id', {
+                remote_node_id: config.remoteNodeId,
+            });
+        }
         return config;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {

package/dist/browser/index.mjs

@@ -96,12 +96,12 @@ installProcessEnvShim();
 // --- END ENV SHIM ---
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.943
+// Generated from package.json version: 0.3.5-test.945
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.5-test.943';
+const VERSION = '0.3.5-test.945';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -29458,6 +29458,7 @@ class InPageListener extends TransportListener {
         this._busHandler = null;
         this._senderRegistry = new Map();
         this._systemToSender = new Map();
+        this._flowIdToSender = new Map();
         this._pendingAttachments = new Map();
         ensureBrowserEnvironment$1();
         const channelCandidate = options?.channelName;
@@ -29524,6 +29525,7 @@ class InPageListener extends TransportListener {
         this._unregisterBusListener();
         this._senderRegistry.clear();
         this._systemToSender.clear();
+        this._flowIdToSender.clear();
         this._pendingAttachments.clear();
         logger$p.debug('inpage_listener_stopped', {
             channel: this._channelName,
@@ -29577,10 +29579,25 @@ class InPageListener extends TransportListener {
             await this._handleAttachFrame(senderId, envelope);
             return;
         }
-        const entry = this._senderRegistry.get(senderId);
+        // 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$p.debug('inpage_listener_routed_by_flow_id', {
+                    sender_id: senderId,
+                    original_sender_id: originalSenderId,
+                    flow_id: envelope.flowId,
+                    frame_type: envelope.frame?.type ?? 'unknown',
+                });
+            }
+        }
         if (!entry) {
             logger$p.debug('inpage_listener_no_connector_for_sender', {
                 sender_id: senderId,
+                flow_id: envelope.flowId,
                 frame_type: envelope.frame?.type ?? 'unknown',
             });
             return;
@@ -29657,6 +29674,15 @@ 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$p.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) {
@@ -29704,7 +29730,7 @@ class InPageListener extends TransportListener {
                 origin_type: originType,
                 connector_type: connector.constructor?.name ?? 'unknown',
             });
-            return { connector, systemId, originType };
+            return { connector, systemId, originType, senderId: params.senderId };
         }
         catch (error) {
             logger$p.error('inpage_listener_connector_creation_failed', {
@@ -29758,6 +29784,12 @@ 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$p.debug('inpage_listener_wait_until_closed_failed', {
@@ -29769,9 +29801,24 @@ 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$p.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,
@@ -30214,6 +30261,29 @@ 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;
+        if (!broadcastConfig.localNodeId) {
+            broadcastConfig.localNodeId = routingNode.id;
+        }
+        if (!broadcastConfig.remoteNodeId) {
+            broadcastConfig.remoteNodeId = systemId;
+            logger$o.debug('broadcast_channel_listener_auto_configured_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: systemId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
+        else {
+            logger$o.debug('broadcast_channel_listener_using_provided_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: broadcastConfig.remoteNodeId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
         try {
             const connector = await routingNode.createOriginConnector({
                 originType,
@@ -30283,6 +30353,21 @@ 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$o.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$o.debug('broadcast_channel_listener_extracted_remote_node_id', {
+                remote_node_id: config.remoteNodeId,
+            });
+        }
         return config;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {

package/dist/cjs/naylence/fame/connector/broadcast-channel-listener.js

@@ -344,6 +344,29 @@ class BroadcastChannelListener extends transport_listener_js_1.TransportListener
                         inboxCapacity: this._inboxCapacity,
                     };
         }
+        // Automatically configure transport frame multiplexing:
+        // Use node IDs (not connector IDs) for node-to-node targeting
+        const broadcastConfig = connectorConfig;
+        if (!broadcastConfig.localNodeId) {
+            broadcastConfig.localNodeId = routingNode.id;
+        }
+        if (!broadcastConfig.remoteNodeId) {
+            broadcastConfig.remoteNodeId = systemId;
+            logger.debug('broadcast_channel_listener_auto_configured_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: systemId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
+        else {
+            logger.debug('broadcast_channel_listener_using_provided_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: broadcastConfig.remoteNodeId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
         try {
             const connector = await routingNode.createOriginConnector({
                 originType,
@@ -413,6 +436,21 @@ class BroadcastChannelListener extends transport_listener_js_1.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.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.debug('broadcast_channel_listener_extracted_remote_node_id', {
+                remote_node_id: config.remoteNodeId,
+            });
+        }
         return config;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {

package/dist/cjs/naylence/fame/connector/inpage-listener.js

@@ -65,6 +65,7 @@ class InPageListener extends transport_listener_js_1.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;
@@ -131,6 +132,7 @@ class InPageListener extends transport_listener_js_1.TransportListener {
         this._unregisterBusListener();
         this._senderRegistry.clear();
         this._systemToSender.clear();
+        this._flowIdToSender.clear();
         this._pendingAttachments.clear();
         logger.debug('inpage_listener_stopped', {
             channel: this._channelName,
@@ -184,10 +186,25 @@ class InPageListener extends transport_listener_js_1.TransportListener {
             await this._handleAttachFrame(senderId, envelope);
             return;
         }
-        const entry = this._senderRegistry.get(senderId);
+        // 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.debug('inpage_listener_routed_by_flow_id', {
+                    sender_id: senderId,
+                    original_sender_id: originalSenderId,
+                    flow_id: envelope.flowId,
+                    frame_type: envelope.frame?.type ?? 'unknown',
+                });
+            }
+        }
         if (!entry) {
             logger.debug('inpage_listener_no_connector_for_sender', {
                 sender_id: senderId,
+                flow_id: envelope.flowId,
                 frame_type: envelope.frame?.type ?? 'unknown',
             });
             return;
@@ -264,6 +281,15 @@ class InPageListener extends transport_listener_js_1.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.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) {
@@ -311,7 +337,7 @@ class InPageListener extends transport_listener_js_1.TransportListener {
                 origin_type: originType,
                 connector_type: connector.constructor?.name ?? 'unknown',
             });
-            return { connector, systemId, originType };
+            return { connector, systemId, originType, senderId: params.senderId };
         }
         catch (error) {
             logger.error('inpage_listener_connector_creation_failed', {
@@ -365,6 +391,12 @@ class InPageListener extends transport_listener_js_1.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.debug('inpage_listener_wait_until_closed_failed', {
@@ -376,9 +408,24 @@ class InPageListener extends transport_listener_js_1.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.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,

package/dist/cjs/version.js

@@ -1,10 +1,10 @@
 "use strict";
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.943
+// Generated from package.json version: 0.3.5-test.945
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 /**
  * The package version, injected at build time.
  * @internal
  */
-exports.VERSION = '0.3.5-test.943';
+exports.VERSION = '0.3.5-test.945';

package/dist/esm/naylence/fame/connector/broadcast-channel-listener.js

@@ -340,6 +340,29 @@ export 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;
+        if (!broadcastConfig.localNodeId) {
+            broadcastConfig.localNodeId = routingNode.id;
+        }
+        if (!broadcastConfig.remoteNodeId) {
+            broadcastConfig.remoteNodeId = systemId;
+            logger.debug('broadcast_channel_listener_auto_configured_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: systemId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
+        else {
+            logger.debug('broadcast_channel_listener_using_provided_remote_node_id', {
+                sender_id: params.senderId,
+                system_id: systemId,
+                remote_node_id: broadcastConfig.remoteNodeId,
+                local_node_id: broadcastConfig.localNodeId,
+            });
+        }
         try {
             const connector = await routingNode.createOriginConnector({
                 originType,
@@ -409,6 +432,21 @@ export 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.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.debug('broadcast_channel_listener_extracted_remote_node_id', {
+                remote_node_id: config.remoteNodeId,
+            });
+        }
         return config;
     }
     _monitorConnectorLifecycle(senderId, systemId, connector) {

package/dist/esm/naylence/fame/connector/inpage-listener.js

@@ -61,6 +61,7 @@ export 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;
@@ -127,6 +128,7 @@ export class InPageListener extends TransportListener {
         this._unregisterBusListener();
         this._senderRegistry.clear();
         this._systemToSender.clear();
+        this._flowIdToSender.clear();
         this._pendingAttachments.clear();
         logger.debug('inpage_listener_stopped', {
             channel: this._channelName,
@@ -180,10 +182,25 @@ export class InPageListener extends TransportListener {
             await this._handleAttachFrame(senderId, envelope);
             return;
         }
-        const entry = this._senderRegistry.get(senderId);
+        // 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.debug('inpage_listener_routed_by_flow_id', {
+                    sender_id: senderId,
+                    original_sender_id: originalSenderId,
+                    flow_id: envelope.flowId,
+                    frame_type: envelope.frame?.type ?? 'unknown',
+                });
+            }
+        }
         if (!entry) {
             logger.debug('inpage_listener_no_connector_for_sender', {
                 sender_id: senderId,
+                flow_id: envelope.flowId,
                 frame_type: envelope.frame?.type ?? 'unknown',
             });
             return;
@@ -260,6 +277,15 @@ export 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.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) {
@@ -307,7 +333,7 @@ export class InPageListener extends TransportListener {
                 origin_type: originType,
                 connector_type: connector.constructor?.name ?? 'unknown',
             });
-            return { connector, systemId, originType };
+            return { connector, systemId, originType, senderId: params.senderId };
         }
         catch (error) {
             logger.error('inpage_listener_connector_creation_failed', {
@@ -361,6 +387,12 @@ export 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.debug('inpage_listener_wait_until_closed_failed', {
@@ -372,9 +404,24 @@ export 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.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,

package/dist/esm/version.js

@@ -1,7 +1,7 @@
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.5-test.943
+// Generated from package.json version: 0.3.5-test.945
 /**
  * The package version, injected at build time.
  * @internal
  */
-export const VERSION = '0.3.5-test.943';
+export const VERSION = '0.3.5-test.945';