@naylence/runtime 0.3.6-test.101 → 0.3.6-test.103

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.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.101';
+const VERSION = '0.3.6-test.103';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10863,6 +10863,12 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -10876,11 +10882,10 @@ class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
@@ -12679,15 +12684,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger$W.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -12814,6 +12833,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -12890,9 +12910,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger$W.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger$W.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger$W.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

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.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.101';
+const VERSION = '0.3.6-test.103';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10861,6 +10861,12 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -10874,11 +10880,10 @@ class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
@@ -12677,15 +12682,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger$W.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -12812,6 +12831,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -12888,9 +12908,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger$W.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger$W.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger$W.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/cjs/naylence/fame/node/admission/default-node-attach-client.js

@@ -11,15 +11,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -146,6 +160,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -222,9 +237,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await (0, task_utils_js_1.delay)(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/cjs/naylence/fame/node/upstream-session-manager.js

@@ -321,6 +321,12 @@ class UpstreamSessionManager extends task_spawner_js_1.TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -334,11 +340,10 @@ class UpstreamSessionManager extends task_spawner_js_1.TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;

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.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 /**
  * The package version, injected at build time.
  * @internal
  */
-exports.VERSION = '0.3.6-test.101';
+exports.VERSION = '0.3.6-test.103';

package/dist/esm/naylence/fame/node/admission/default-node-attach-client.js

@@ -8,15 +8,29 @@ export class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -143,6 +157,7 @@ export class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -219,9 +234,20 @@ export class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/esm/naylence/fame/node/upstream-session-manager.js

@@ -318,6 +318,12 @@ export class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -331,11 +337,10 @@ export class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;

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.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-export const VERSION = '0.3.6-test.101';
+export const VERSION = '0.3.6-test.103';

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.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.101';
+const VERSION = '0.3.6-test.103';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10779,6 +10779,12 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -10792,11 +10798,10 @@ class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
@@ -12595,15 +12600,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger$W.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -12730,6 +12749,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -12806,9 +12826,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger$W.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger$W.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger$W.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/node/index.mjs

@@ -13,12 +13,12 @@ import fastify from 'fastify';
 import websocketPlugin from '@fastify/websocket';
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.101';
+const VERSION = '0.3.6-test.103';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10778,6 +10778,12 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -10791,11 +10797,10 @@ class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
@@ -12594,15 +12599,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger$W.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -12729,6 +12748,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -12805,9 +12825,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger$W.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger$W.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger$W.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/node/node.cjs

@@ -5563,12 +5563,12 @@ for (const [name, config] of Object.entries(SQLITE_PROFILES)) {
 }
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.101';
+const VERSION = '0.3.6-test.103';
 
 /**
  * Fame errors module - Fame protocol specific error classes
@@ -12471,6 +12471,12 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -12484,11 +12490,10 @@ class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
@@ -14287,15 +14292,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger$Y.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -14422,6 +14441,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -14498,9 +14518,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger$Y.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger$Y.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger$Y.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/node/node.mjs

@@ -5562,12 +5562,12 @@ for (const [name, config] of Object.entries(SQLITE_PROFILES)) {
 }
 
 // This file is auto-generated during build - do not edit manually
-// Generated from package.json version: 0.3.6-test.101
+// Generated from package.json version: 0.3.6-test.103
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.101';
+const VERSION = '0.3.6-test.103';
 
 /**
  * Fame errors module - Fame protocol specific error classes
@@ -12470,6 +12470,12 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        // Check if we should create a broadcast callback grant before processing connection grants
+        // This prevents adding duplicate broadcast grants
+        const shouldAddBroadcastGrant = this.shouldAdvertiseBroadcastGrant(grant, callbackGrants);
+        const broadcastCallbackGrant = shouldAddBroadcastGrant
+            ? this.createBroadcastCallbackGrant(grant)
+            : null;
         // Include admission client's connection grants as callback grants
         // This ensures DirectAdmissionClient grants are available for grant selection
         if (welcome.frame.connectionGrants && Array.isArray(welcome.frame.connectionGrants)) {
@@ -12483,11 +12489,10 @@ class UpstreamSessionManager extends TaskSpawner {
                 }
             }
         }
-        if (this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
-            const augmented = this.createBroadcastCallbackGrant(grant);
-            if (augmented) {
-                callbackGrants.push(augmented);
-            }
+        // Add broadcast grant after connection grants to ensure we don't duplicate
+        // any broadcast grants that may have been in connectionGrants
+        if (broadcastCallbackGrant && this.shouldAdvertiseBroadcastGrant(grant, callbackGrants)) {
+            callbackGrants.push(broadcastCallbackGrant);
         }
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
@@ -14286,15 +14291,29 @@ class DefaultNodeAttachClient {
     constructor(options = {}) {
         this.buffer = [];
         this.inHandshake = false;
+        this.expectedSystemId = null;
         this.timeoutMs = options.timeoutMs ?? 10000;
         this.attachmentKeyValidator = options.attachmentKeyValidator;
         this.replicaStickinessManager = options.replicaStickinessManager ?? null;
     }
     async attach(node, originType, connector, welcomeFrame, finalHandler, keys, callbackGrants) {
         this.inHandshake = true;
+        this.expectedSystemId = welcomeFrame.systemId;
         const interimHandler = async (envelope, context) => {
             if (this.inHandshake) {
-                this.buffer.push(envelope);
+                // Filter: only buffer frames related to our systemId or frames without systemId info
+                const frameSystemId = envelope.frame?.systemId;
+                if (!frameSystemId || frameSystemId === this.expectedSystemId) {
+                    this.buffer.push(envelope);
+                }
+                else {
+                    // Silently ignore frames from other agents during concurrent handshakes
+                    logger$Y.debug('handshake_ignoring_frame_from_different_system', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: frameSystemId,
+                        expected_system_id: this.expectedSystemId,
+                    });
+                }
                 return null;
             }
             return finalHandler(envelope, context);
@@ -14421,6 +14440,7 @@ class DefaultNodeAttachClient {
             parent_id: ackFrame.targetSystemId,
         });
         this.inHandshake = false;
+        this.expectedSystemId = null;
         await connector.replaceHandler(finalHandler);
         while (this.buffer.length > 0) {
             const bufferedEnvelope = this.buffer.shift();
@@ -14497,9 +14517,20 @@ class DefaultNodeAttachClient {
                 if (envelope.frame.type === 'NodeAttachAck') {
                     return envelope;
                 }
-                logger$Y.error('unexpected_frame_during_handshake', {
-                    frame_type: envelope.frame.type,
-                });
+                // NodeAttach frames during handshake are expected in multi-agent scenarios
+                // where multiple agents attach concurrently to the same channel
+                if (envelope.frame.type === 'NodeAttach') {
+                    logger$Y.debug('handshake_ignoring_concurrent_attach', {
+                        frame_type: envelope.frame.type,
+                        frame_system_id: envelope.frame?.systemId ?? 'unknown',
+                    });
+                }
+                else {
+                    // Other unexpected frames are still logged as errors
+                    logger$Y.error('unexpected_frame_during_handshake', {
+                        frame_type: envelope.frame.type,
+                    });
+                }
             }
             await delay(HANDSHAKE_POLL_INTERVAL_MS);
         }

package/dist/types/naylence/fame/node/admission/default-node-attach-client.d.ts

@@ -14,6 +14,7 @@ export declare class DefaultNodeAttachClient implements NodeAttachClient {
     private readonly replicaStickinessManager;
     private readonly buffer;
     private inHandshake;
+    private expectedSystemId;
     constructor(options?: DefaultNodeAttachClientOptions);
     attach(node: NodeLike, originType: DeliveryOriginType, connector: FameConnector, welcomeFrame: NodeWelcomeFrame, finalHandler: FameEnvelopeHandler, keys?: Array<Record<string, unknown>>, callbackGrants?: Array<Record<string, unknown>>): Promise<AttachInfo>;
     private awaitAck;

package/dist/types/version.d.ts

@@ -2,4 +2,4 @@
  * The package version, injected at build time.
  * @internal
  */
-export declare const VERSION = "0.3.6-test.101";
+export declare const VERSION = "0.3.6-test.103";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naylence/runtime",
-  "version": "0.3.6-test.101",
+  "version": "0.3.6-test.103",
   "type": "module",
   "description": "Naylence Runtime - Complete TypeScript runtime",
   "author": "Naylence Dev <naylencedev@gmail.com>",