fix(ui): clear pending run state on cross-run final to fix stuck typing indicator

haoyu-haoyu · haoyu-haoyu · commit eb2b75b50683 · 2026-03-30T21:16:34.000+01:00
When a subagent completes and sends a final event with a different runId, the WebChat UI appends the message but did not clear chatRunId / chatStream / chatStreamStartedAt. This left the parent agent visually stuck in a typing / processing state even after the final response was already visible. Refreshing the page cleared it. Now clear the pending run state when a cross-run final carries a real (non-NO_REPLY) assistant message. NO_REPLY / empty finals still preserve the parent run state since the parent agent may still be processing. Closes #57795 Assisted-by: Claude Code
diff --git a/ui/src/ui/controllers/chat.test.ts b/ui/src/ui/controllers/chat.test.ts
@@ -99,7 +99,7 @@ describe("handleChatEvent", () => {
     expect(state.chatStream).toBe("Hello");
   });
 
-  it("appends final payload from another run without clearing active stream", () => {
+  it("appends final payload from another run and clears pending run state", () => {
     const state = createState({
       sessionKey: "main",
       chatRunId: "run-user",
@@ -115,10 +115,12 @@ describe("handleChatEvent", () => {
         content: [{ type: "text", text: "Sub-agent findings" }],
       },
     };
-    expect(handleChatEvent(state, payload)).toBe(null);
-    expect(state.chatRunId).toBe("run-user");
-    expect(state.chatStream).toBe("Working...");
-    expect(state.chatStreamStartedAt).toBe(123);
+    expect(handleChatEvent(state, payload)).toBe("final");
+    // Pending run state must be cleared so the UI exits typing indicator.
+    // See https://github.com/openclaw/openclaw/issues/57795
+    expect(state.chatRunId).toBe(null);
+    expect(state.chatStream).toBe(null);
+    expect(state.chatStreamStartedAt).toBe(null);
     expect(state.chatMessages).toHaveLength(1);
     expect(state.chatMessages[0]).toEqual(payload.message);
   });
diff --git a/ui/src/ui/controllers/chat.ts b/ui/src/ui/controllers/chat.ts
@@ -285,7 +285,13 @@ export function handleChatEvent(state: ChatState, payload?: ChatEventPayload) {
       const finalMessage = normalizeFinalAssistantMessage(payload.message);
       if (finalMessage && !isAssistantSilentReply(finalMessage)) {
         state.chatMessages = [...state.chatMessages, finalMessage];
-        return null;
+        // Clear pending run state so the UI exits the typing/processing
+        // indicator. Without this, the parent agent appears stuck in typing
+        // state after subagent completion even though the final response is
+        // already visible. See #57795.
+        state.chatRunId = null;
+        state.chatStream = null;
+        state.chatStreamStartedAt = null;
       }
       return "final";
     }
