From 48e9d80bdb3dc26a4452bc1cc92886de524fdc4f Mon Sep 17 00:00:00 2001
From: Michael Bleigh <bleigh@google.com>
Date: Wed, 6 May 2026 12:12:06 -0700
Subject: [PATCH] fix(core): filter tool updates by callId to prevent session
 cross-talk

---
 packages/core/src/agent/legacy-agent-session.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/core/src/agent/legacy-agent-session.ts b/packages/core/src/agent/legacy-agent-session.ts
index 1940157ba8..b1fb496e3a 100644
--- a/packages/core/src/agent/legacy-agent-session.ts
+++ b/packages/core/src/agent/legacy-agent-session.ts
@@ -515,6 +515,11 @@ export class LegacyAgentProtocol implements AgentProtocol {
 
     for (const tc of msg.toolCalls) {
       const callId = tc.request.callId;
+
+      if (!this._translationState.pendingToolNames.has(callId)) {
+        continue;
+      }
+
       let status: ToolEventStatus = 'pending';
       if (tc.status === 'validating' || tc.status === 'scheduled') {
         status = 'pending';