fix(tui): arm streaming watchdog on every delta, not only visible ones (openclaw#69338)

CCcassiusdjs · claude · web-flow · commit 89b6d0248159 · 2026-04-21T21:53:36.000+10:00
When ingestDelta returns null (first empty/commentary delta or unchanged content), the handler returned early, skipping setActivityStatus and armStreamingWatchdog. If all subsequent deltas were also null (e.g. due to phase filtering), the watchdog was never armed and the status bar stayed stale as "idle" while a run was live. Move setActivityStatus("streaming") and armStreamingWatchdog before the null-displayText guard so they fire on every received delta event. Fixes openclaw#34513, openclaw#40824 Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/src/tui/tui-event-handlers.ts b/src/tui/tui-event-handlers.ts
@@ -298,15 +298,18 @@ export function createEventHandlers(context: EventHandlerContext) {
       }
     }
     if (evt.state === "delta") {
+      // Arm watchdog and mark streaming on every delta, even when the visible
+      // text hasn't changed yet (e.g. first commentary-only or tool-call delta).
+      // Without this, the watchdog never fires and the status bar stays stale.
+      setActivityStatus("streaming");
+      if (state.activeChatRunId === evt.runId) {
+        armStreamingWatchdog(evt.runId);
+      }
       const displayText = streamAssembler.ingestDelta(evt.runId, evt.message, state.showThinking);
       if (!displayText) {
         return;
       }
       chatLog.updateAssistant(displayText, evt.runId);
-      setActivityStatus("streaming");
-      if (state.activeChatRunId === evt.runId) {
-        armStreamingWatchdog(evt.runId);
-      }
     }
     if (evt.state === "final") {
       const isLocalBtwRun = isLocalBtwRunId?.(evt.runId) ?? false;

Original file line number	Diff line number	Diff line change
`@@ -298,15 +298,18 @@ export function createEventHandlers(context: EventHandlerContext) {`
`298`	`298`	`}`
`299`	`299`	`}`
`300`	`300`	`if (evt.state === "delta") {`
	`301`	`+ // Arm watchdog and mark streaming on every delta, even when the visible`
	`302`	`+ // text hasn't changed yet (e.g. first commentary-only or tool-call delta).`
	`303`	`+ // Without this, the watchdog never fires and the status bar stays stale.`
	`304`	`+ setActivityStatus("streaming");`
	`305`	`+ if (state.activeChatRunId === evt.runId) {`
	`306`	`+ armStreamingWatchdog(evt.runId);`
	`307`	`+ }`
`301`	`308`	`const displayText = streamAssembler.ingestDelta(evt.runId, evt.message, state.showThinking);`
`302`	`309`	`if (!displayText) {`
`303`	`310`	`return;`
`304`	`311`	`}`
`305`	`312`	`chatLog.updateAssistant(displayText, evt.runId);`
`306`		`- setActivityStatus("streaming");`
`307`		`- if (state.activeChatRunId === evt.runId) {`
`308`		`- armStreamingWatchdog(evt.runId);`
`309`		`- }`
`310`	`313`	`}`
`311`	`314`	`if (evt.state === "final") {`
`312`	`315`	`const isLocalBtwRun = isLocalBtwRunId?.(evt.runId) ?? false;`