@naylence/runtime 0.3.6-test.102 → 0.3.6-test.104

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.102
+// Generated from package.json version: 0.3.6-test.104
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.102';
+const VERSION = '0.3.6-test.104';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10863,6 +10863,20 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger$Z.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger$Z.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -10872,16 +10886,31 @@ class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger$Z.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger$Z.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger$Z.debug('added_broadcast_callback_grant');
         }
+        else if (broadcastCallbackGrant) {
+            logger$Z.debug('skipped_duplicate_broadcast_callback_grant');
+        }
+        logger$Z.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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.102
+// Generated from package.json version: 0.3.6-test.104
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.102';
+const VERSION = '0.3.6-test.104';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10861,6 +10861,20 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger$Z.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger$Z.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -10870,16 +10884,31 @@ class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger$Z.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger$Z.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger$Z.debug('added_broadcast_callback_grant');
         }
+        else if (broadcastCallbackGrant) {
+            logger$Z.debug('skipped_duplicate_broadcast_callback_grant');
+        }
+        logger$Z.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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

@@ -321,6 +321,20 @@ class UpstreamSessionManager extends task_spawner_js_1.TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -330,16 +344,31 @@ class UpstreamSessionManager extends task_spawner_js_1.TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger.debug('added_broadcast_callback_grant');
+        }
+        else if (broadcastCallbackGrant) {
+            logger.debug('skipped_duplicate_broadcast_callback_grant');
         }
+        logger.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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

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

@@ -318,6 +318,20 @@ export class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -327,16 +341,31 @@ export class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger.debug('added_broadcast_callback_grant');
+        }
+        else if (broadcastCallbackGrant) {
+            logger.debug('skipped_duplicate_broadcast_callback_grant');
         }
+        logger.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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

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.102
+// Generated from package.json version: 0.3.6-test.104
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.102';
+const VERSION = '0.3.6-test.104';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10779,6 +10779,20 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger$Z.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger$Z.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -10788,16 +10802,31 @@ class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger$Z.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger$Z.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger$Z.debug('added_broadcast_callback_grant');
         }
+        else if (broadcastCallbackGrant) {
+            logger$Z.debug('skipped_duplicate_broadcast_callback_grant');
+        }
+        logger$Z.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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.102
+// Generated from package.json version: 0.3.6-test.104
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.102';
+const VERSION = '0.3.6-test.104';
 
 /**
  * Fame protocol specific error classes with WebSocket close codes and proper inheritance.
@@ -10778,6 +10778,20 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger$Z.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger$Z.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -10787,16 +10801,31 @@ class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger$Z.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger$Z.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger$Z.debug('added_broadcast_callback_grant');
         }
+        else if (broadcastCallbackGrant) {
+            logger$Z.debug('skipped_duplicate_broadcast_callback_grant');
+        }
+        logger$Z.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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.102
+// Generated from package.json version: 0.3.6-test.104
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.102';
+const VERSION = '0.3.6-test.104';
 
 /**
  * Fame errors module - Fame protocol specific error classes
@@ -12471,6 +12471,20 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger$$.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger$$.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -12480,16 +12494,31 @@ class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger$$.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger$$.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger$$.debug('added_broadcast_callback_grant');
         }
+        else if (broadcastCallbackGrant) {
+            logger$$.debug('skipped_duplicate_broadcast_callback_grant');
+        }
+        logger$$.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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.102
+// Generated from package.json version: 0.3.6-test.104
 /**
  * The package version, injected at build time.
  * @internal
  */
-const VERSION = '0.3.6-test.102';
+const VERSION = '0.3.6-test.104';
 
 /**
  * Fame errors module - Fame protocol specific error classes
@@ -12470,6 +12470,20 @@ class UpstreamSessionManager extends TaskSpawner {
         await connector.start(this.wrappedHandler);
         this.connector = connector;
         const callbackGrants = this.node.gatherSupportedCallbackGrants();
+        logger$$.debug('callback_grants_before_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
+        // 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;
+        logger$$.debug('broadcast_callback_grant_check', {
+            should_add: shouldAddBroadcastGrant,
+            grant_created: !!broadcastCallbackGrant,
+        });
         // 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)) {
@@ -12479,16 +12493,31 @@ class UpstreamSessionManager extends TaskSpawner {
                     const isDuplicate = callbackGrants.some(existing => JSON.stringify(existing) === JSON.stringify(grant));
                     if (!isDuplicate) {
                         callbackGrants.push(grant);
+                        logger$$.debug('added_connection_grant_as_callback', {
+                            type: grant.type,
+                        });
+                    }
+                    else {
+                        logger$$.debug('skipped_duplicate_connection_grant', {
+                            type: grant.type,
+                        });
                     }
                 }
             }
         }
-        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);
+            logger$$.debug('added_broadcast_callback_grant');
         }
+        else if (broadcastCallbackGrant) {
+            logger$$.debug('skipped_duplicate_broadcast_callback_grant');
+        }
+        logger$$.debug('callback_grants_after_augmentation', {
+            count: callbackGrants.length,
+            types: callbackGrants.map(g => g.type),
+        });
         const attachInfo = await this.attachClient.attach(this.node, this.outboundOriginType, connector, welcome.frame, this.wrappedHandler, this.getKeys() ?? undefined, callbackGrants);
         this.targetSystemId = attachInfo.targetSystemId ?? null;
         if (this.targetSystemId) {

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.102";
+export declare const VERSION = "0.3.6-test.104";

package/package.json

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