fix(node): expose subscriptions on ClientNodeInteraction wrapper (#3694)

Apollon77 · claude · web-flow · commit ccd892f42267 · 2026-05-06T13:01:32.000+02:00
CommissioningClient assigns `node.interaction as ClientInteraction` to
`peer.interaction`, but `node.interaction` is a `ClientNodeInteraction`
wrapper that did not expose `subscriptions`. PeerAddressMonitor's
address-migration path then dereferenced `interaction.subscriptions`,
crashing with "Cannot read properties of undefined (reading
'closeForPeer')" whenever a session migrated to a discovered IP.

Add a `subscriptions` getter on `ClientNodeInteraction` that resolves
the singleton from the node environment, matching what the inner
`ClientInteraction` returns. Tighten `ClientInteraction.environment`
from `protected` to `#environment` since no subclass needs it.

Co-authored-by: Claude Opus 4.7 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/node/src/node/client/ClientNodeInteraction.ts b/packages/node/src/node/client/ClientNodeInteraction.ts
@@ -18,6 +18,7 @@ import {
     ClientRead,
     ClientSubscribe,
     ClientSubscription,
+    ClientSubscriptions,
     ClientWrite,
     DecodedInvokeResult,
     Interactable,
@@ -165,6 +166,10 @@ export class ClientNodeInteraction implements Interactable<ActionContext> {
         return this.#interaction.probe(options);
     }
 
+    get subscriptions(): ClientSubscriptions {
+        return this.#node.env.get(ClientSubscriptions);
+    }
+
     get #interaction() {
         if (this.#node.construction.status !== Lifecycle.Status.Active) {
             throw new ImplementationError(
diff --git a/packages/protocol/src/action/client/ClientInteraction.ts b/packages/protocol/src/action/client/ClientInteraction.ts
@@ -108,7 +108,7 @@ const DEFAULT_MINIMUM_RESPONSE_TIMEOUT_WITH_FAILSAFE = Seconds(30);
 export class ClientInteraction<
     SessionT extends InteractionSession = InteractionSession,
 > implements Interactable<SessionT> {
-    protected readonly environment: Environment;
+    readonly #environment: Environment;
     readonly #lifetime: Lifetime;
     readonly #exchangeProvider: ExchangeProvider;
     readonly #interactions = new BasicSet<Read | Write | Invoke | Subscribe | ClientBdxRequest>();
@@ -125,7 +125,7 @@ export class ClientInteraction<
     #nextCommandRef = 1;
 
     constructor({ environment, abort, sustainRetries, exchangeProvider, address, network }: ClientInteractionContext) {
-        this.environment = environment;
+        this.#environment = environment;
         this.#exchangeProvider = exchangeProvider ?? environment.get(ExchangeProvider);
         if (environment.has(ClientSubscriptions)) {
             this.#subscriptions = environment.get(ClientSubscriptions);
@@ -180,7 +180,7 @@ export class ClientInteraction<
 
     get subscriptions() {
         if (this.#subscriptions === undefined) {
-            this.#subscriptions = this.environment.get(ClientSubscriptions);
+            this.#subscriptions = this.#environment.get(ClientSubscriptions);
         }
         return this.#subscriptions;
     }
