From d0afae14327243e2f4827b86b7d75718d1863668 Mon Sep 17 00:00:00 2001
From: Chao Fan <fanchao.njupt@gmail.com>
Date: Fri, 20 Mar 2026 21:55:51 +0800
Subject: [PATCH] fix(gateway): use unique run ids for node agent requests

---
 src/gateway/server-node-events.test.ts | 3 ++-
 src/gateway/server-node-events.ts      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gateway/server-node-events.test.ts b/src/gateway/server-node-events.test.ts
index dbf1bde579f..b8f5f74f2f5 100644
--- a/src/gateway/server-node-events.test.ts
+++ b/src/gateway/server-node-events.test.ts
@@ -682,6 +682,7 @@ describe("agent request events", () => {
       channel: "telegram",
       to: "123",
     });
-    expect(opts.runId).toBe(opts.sessionId);
+    expect(typeof opts.runId).toBe("string");
+    expect(opts.runId).not.toBe(opts.sessionId);
   });
 });
diff --git a/src/gateway/server-node-events.ts b/src/gateway/server-node-events.ts
index 2e9e911725a..27737cdd26d 100644
--- a/src/gateway/server-node-events.ts
+++ b/src/gateway/server-node-events.ts
@@ -431,7 +431,9 @@ export const handleNodeEvent = async (ctx: NodeEventContext, nodeId: string, evt
 
       void agentCommandFromIngress(
         {
-          runId: sessionId,
+          // Each ingress request must get its own run id. Reusing sessionId
+          // collapses per-run gateway state (seq tracking, aborts, tool streams).
+          runId: randomUUID(),
           message,
           images,
           sessionId,