fix(web): scope run errors to current run

Author: wynxing

web/src/utils/eventBridge.test.ts

@@ -1022,6 +1022,8 @@ describe("eventBridge", () => {
     expect(useUIStore.getState().toasts.at(-1)?.message).toBe(
       "已达到本次运行最大轮数，可继续发送消息或调高 runtime.max_turns",
     );
+    useSessionStore.setState({ currentSessionId: "" } as any);
+    useGatewayStore.setState({ currentRunId: "" } as any);
   });
 
   it("RunError with max-turn stop reason uses explicit max-turn UX instead of generic run failed", () => {
@@ -1069,6 +1071,7 @@ describe("eventBridge", () => {
   it("RunError with max-turn stop reason is handled during session mismatch", () => {
     const api = createMockGatewayAPI();
     useSessionStore.setState({ currentSessionId: "sess-current" } as any);
+    useGatewayStore.setState({ currentRunId: "run-max-turn-mismatch" } as any);
     useChatStore.getState().addMessage({
       id: "tool-running-run-error-mismatch",
       role: "tool",
@@ -1106,6 +1109,92 @@ describe("eventBridge", () => {
     );
   });
 
+  it("RunError during session mismatch is ignored when run id is stale", () => {
+    const api = createMockGatewayAPI();
+    useSessionStore.setState({ currentSessionId: "sess-current" } as any);
+    useGatewayStore.setState({ currentRunId: "run-current" } as any);
+    useChatStore.getState().addMessage({
+      id: "tool-running-stale-run-error",
+      role: "tool",
+      type: "tool_call",
+      content: "",
+      toolName: "bash",
+      toolCallId: "tc-stale-run-error",
+      toolStatus: "running",
+      timestamp: Date.now(),
+    });
+    useChatStore.getState().setGenerating(true);
+
+    handleGatewayEvent(
+      {
+        type: EventType.RunError,
+        payload: {
+          event_type: EventType.RunError,
+          payload: {
+            code: "max_turn_exceeded",
+            message: "runtime: max turn limit reached (40)",
+            stop_reason: "max_turn_exceeded",
+          },
+        },
+        session_id: "sess-stale",
+        run_id: "run-stale",
+      },
+      api,
+    );
+
+    expect(useChatStore.getState().isGenerating).toBe(true);
+    expect(useChatStore.getState().stopReason).toBe("");
+    expect(useChatStore.getState().messages[0].toolStatus).toBe("running");
+    expect(useUIStore.getState().toasts).toHaveLength(0);
+    useSessionStore.setState({ currentSessionId: "" } as any);
+    useGatewayStore.setState({ currentRunId: "" } as any);
+  });
+
+  it("RunError for current run is handled while transitioning", () => {
+    const api = createMockGatewayAPI();
+    useSessionStore.setState({ currentSessionId: "sess-current" } as any);
+    useGatewayStore.setState({ currentRunId: "run-transition" } as any);
+    useChatStore.setState({ isTransitioning: true } as any);
+    useChatStore.getState().addMessage({
+      id: "tool-running-transition-run-error",
+      role: "tool",
+      type: "tool_call",
+      content: "",
+      toolName: "bash",
+      toolCallId: "tc-transition-run-error",
+      toolStatus: "running",
+      timestamp: Date.now(),
+    });
+    useChatStore.getState().setGenerating(true);
+
+    handleGatewayEvent(
+      {
+        type: EventType.RunError,
+        payload: {
+          event_type: EventType.RunError,
+          payload: {
+            code: "max_turn_exceeded",
+            message: "runtime: max turn limit reached (40)",
+            stop_reason: "max_turn_exceeded",
+          },
+        },
+        session_id: "sess-stale",
+        run_id: "run-transition",
+      },
+      api,
+    );
+
+    expect(useChatStore.getState().isGenerating).toBe(false);
+    expect(useChatStore.getState().stopReason).toBe("max_turn_exceeded");
+    expect(useChatStore.getState().messages[0].toolStatus).toBe("error");
+    expect(useUIStore.getState().toasts.at(-1)?.message).toBe(
+      "已达到本次运行最大轮数，可继续发送消息或调高 runtime.max_turns",
+    );
+    useSessionStore.setState({ currentSessionId: "" } as any);
+    useGatewayStore.setState({ currentRunId: "" } as any);
+    useChatStore.setState({ isTransitioning: false } as any);
+  });
+
   it("RunCanceled does not convert running tool calls to done", () => {
     const api = createMockGatewayAPI();
     useChatStore.getState().addMessage({

web/src/utils/eventBridge.ts

@@ -534,10 +534,7 @@ function normalizeUserQuestionRequestedPayload(
 }
 
 const CRITICAL_EVENTS = new Set<string>([EventType.Error, EventType.RunError]);
-const SESSION_AGNOSTIC_EVENTS = new Set<string>([
-  EventType.Error,
-  EventType.RunError,
-]);
+const SESSION_AGNOSTIC_EVENTS = new Set<string>([EventType.Error]);
 
 function strField(payload: unknown, key: string): string {
   return ((payload as PayloadRecord)?.[key] as string) ?? "";
@@ -547,6 +544,20 @@ function getRunKey(frameRunId: string | undefined): string {
   return (frameRunId || useGatewayStore.getState().currentRunId || "").trim();
 }
 
+function isCurrentRunScopedTerminalEvent(
+  eventType: string,
+  frameRunId: string | undefined,
+): boolean {
+  if (eventType !== EventType.RunError) return false;
+  const eventRunId = (frameRunId || "").trim();
+  const currentRunId = useGatewayStore.getState().currentRunId.trim();
+  return (
+    eventRunId !== "" &&
+    currentRunId !== "" &&
+    eventRunId === currentRunId
+  );
+}
+
 function isMaxTurnExceeded(reason: string, code = ""): boolean {
   return (
     reason === StopReason.MaxTurnExceeded ||
@@ -682,7 +693,8 @@ export function handleGatewayEvent(
     frameSessionId &&
     currentSessionId &&
     frameSessionId !== currentSessionId &&
-    !SESSION_AGNOSTIC_EVENTS.has(eventType)
+    !SESSION_AGNOSTIC_EVENTS.has(eventType) &&
+    !isCurrentRunScopedTerminalEvent(eventType, frameRunId)
   ) {
     return;
   }