From 436da24e03554286135a5b876ab177bfd80c38ad Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sat, 1 Aug 2026 02:00:02 +0200
Subject: [PATCH] refactor(agent): remove unused pending-run message identity

---
 packages/server/src/server/agent/agent-manager.ts   | 2 +-
 packages/server/src/server/agent/agent-run-state.ts | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/server/agent/agent-manager.ts b/packages/server/src/server/agent/agent-manager.ts
index 23f3fbf2bd..5902e8e368 100644
--- a/packages/server/src/server/agent/agent-manager.ts
+++ b/packages/server/src/server/agent/agent-manager.ts
@@ -2031,7 +2031,7 @@ export class AgentManager {
     const isReplacement = agent.pendingReplacement;
     agent.lastError = undefined;
 
-    const pendingRun = this.runs.createPendingRun(agentId, options?.clientMessageId);
+    const pendingRun = this.runs.createPendingRun(agentId);
 
     const streamForwarder = async function* streamForwarder(this: AgentManager) {
       let turnId: string;
diff --git a/packages/server/src/server/agent/agent-run-state.ts b/packages/server/src/server/agent/agent-run-state.ts
index 601a5d1f5b..06176394a0 100644
--- a/packages/server/src/server/agent/agent-run-state.ts
+++ b/packages/server/src/server/agent/agent-run-state.ts
@@ -13,7 +13,6 @@ export interface ForegroundTurnWaiter {
 export interface PendingForegroundRun {
   token: string;
   kind: "foreground";
-  clientMessageId: string | null;
   stagedEvents: AgentStreamEvent[];
   turnId: string | null;
   started: boolean;
@@ -42,8 +41,8 @@ export interface ForegroundRunAgentState {
 export class AgentRunState {
   private readonly runs = new Map<string, TrackedAgentRun>();
 
-  createPendingRun(agentId: string, clientMessageId?: string): PendingForegroundRun {
-    const pendingRun = createPendingForegroundRun(clientMessageId ?? null);
+  createPendingRun(agentId: string): PendingForegroundRun {
+    const pendingRun = createPendingForegroundRun();
     this.runs.set(agentId, pendingRun);
     return pendingRun;
   }
@@ -265,13 +264,12 @@ export class ForegroundTurnStream {
   }
 }
 
-function createPendingForegroundRun(clientMessageId: string | null): PendingForegroundRun {
+function createPendingForegroundRun(): PendingForegroundRun {
   return {
     ...createTrackedRunState(),
     kind: "foreground",
     turnId: null,
     started: false,
-    clientMessageId,
     stagedEvents: [],
   };
 }