feat(tui,cli-runner): expose streamingWatchdogMs config + bump watchdog defaults

Joseph Felix BAMBA · claude · Joseph Felix BAMBA · commit b0f7ac68e781 · 2026-05-09T14:29:19.000+02:00
F16 — TUI streaming-watchdog wiring:
- Adds `cli.tui.streamingWatchdogMs` config field (zod-validated, optional).
- `runTui` now reads this value and passes it to `createEventHandlers`,
  closing the gap where `context.streamingWatchdogMs` was a consumer-side
  knob with no producer-side wiring.
- Raises the in-code default from 30s to 600000ms (10 minutes). The 30s
  default tripped on long-reasoning models, slow tool runs, and SSE
  keepalive gaps; the 10m value matches the empirically validated
  downstream patch.
- Adds `resolveTuiStreamingWatchdogMs(config)` helper + unit tests for
  config-shape edge cases (NaN, negative, Infinity, fractional, string).
- Adds tui-event-handlers test verifying the new default fires at 10m
  (not 30s) when no override is supplied.

F18 — CLI watchdog defaults:
- Raises `CLI_FRESH_WATCHDOG_DEFAULTS.maxMs` from 600000 (10m) to
  3600000 (60m).
- Raises `CLI_RESUME_WATCHDOG_DEFAULTS.maxMs` from 180000 (3m) to
  3600000 (60m).
- Per-CLI-backend overrides at `cli.watchdog.fresh.maxMs` /
  `.resume.maxMs` continue to apply unchanged; this commit only moves
  the fallback ceiling so users without a per-backend override don't
  see false aborts on long but legitimate runs.

Backward compatibility:
- `cli.tui.streamingWatchdogMs` is optional; existing configs without it
  pick up the new 10m default rather than the prior 30s.
- The CLI watchdog defaults change only affects callers that did NOT
  set their own per-backend ratio/min/max, where previously the
  computed `maxMs` ceiling was 600000/180000.
- All existing tests for `resolveCliNoOutputTimeoutMs` continue to pass
  because their assertions (e.g. 480000 = 600000 * 0.8) sit below the
  new ceiling.

Docs:
- `docs/gateway/configuration-reference.md` documents the new
  `cli.tui.streamingWatchdogMs` field with default + disable semantics.

Co-Authored-By: Forge &lt;noreply@anthropic.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Docs: https://docs.openclaw.ai
 
 ### Changes
 
+- TUI/CLI runner: expose `cli.tui.streamingWatchdogMs` config field, raise the in-code streaming watchdog default from 30s to 10m, and lift `CLI_FRESH_WATCHDOG_DEFAULTS.maxMs` (10m → 60m) and `CLI_RESUME_WATCHDOG_DEFAULTS.maxMs` (3m → 60m) so long-reasoning models, slow tool runs, and SSE keepalive gaps stop tripping false aborts; per-backend overrides at `cli.watchdog.fresh.maxMs`/`.resume.maxMs` continue to apply unchanged.
 - Chat commands: add `/think default` and `/fast default` to clear session overrides and inherit configured/provider defaults. (#79385) Thanks @VACInc.
 - Dependencies: refresh workspace dependency pins and lockfile, including `@openai/codex` `0.130.0`, `acpx` `0.7.0`, AWS SDK `3.1044.0`, OpenTelemetry `0.217.0`, `typebox` `1.1.38`, `vite` `8.0.11`, `oxfmt` `0.48.0`, and `oxlint` `1.63.0`, and update the Codex harness model snapshot for the new bundled app-server catalog.
 - Plugins/install: add guarded plugin install overrides so onboarding and repair tests can route specific plugins to registry specs or local `npm pack` artifacts via environment variables.
diff --git a/docs/gateway/configuration-reference.md b/docs/gateway/configuration-reference.md
@@ -1145,6 +1145,9 @@ Notes:
     banner: {
       taglineMode: "off", // random | default | off
     },
+    tui: {
+      streamingWatchdogMs: 600000, // default 10m; 0 disables
+    },
   },
 }
 ```
@@ -1154,6 +1157,11 @@ Notes:
   - `"default"`: fixed neutral tagline (`All your chats, one OpenClaw.`).
   - `"off"`: no tagline text (banner title/version still shown).
 - To hide the entire banner (not just taglines), set env `OPENCLAW_HIDE_BANNER=1`.
+- `cli.tui.streamingWatchdogMs` is the no-stream-delta window after which the
+  interactive TUI resets activity status to idle and posts the "taking longer
+  than expected" notice. Default: `600000` (10 minutes). Set to `0` to disable.
+  Raise this when working with long-reasoning models, slow tool runs, or
+  upstreams with long SSE keepalive gaps.
 
 ---
 
diff --git a/src/agents/cli-watchdog-defaults.ts b/src/agents/cli-watchdog-defaults.ts
@@ -1,13 +1,17 @@
 export const CLI_WATCHDOG_MIN_TIMEOUT_MS = 1_000;
 
+// `maxMs` caps the "no output" watchdog ceiling. Originally 600_000 (10m) for fresh
+// runs and 180_000 (3m) for resume. Raised to 60m: long-form reasoning, tool calls
+// that legitimately take 5–10m, and SSE keepalive gaps were tripping false aborts.
+// Per-CLI-backend overrides at `cli.watchdog.fresh.maxMs` / `.resume.maxMs` still apply.
 export const CLI_FRESH_WATCHDOG_DEFAULTS = {
   noOutputTimeoutRatio: 0.8,
   minMs: 180_000,
-  maxMs: 600_000,
+  maxMs: 3_600_000,
 } as const;
 
 export const CLI_RESUME_WATCHDOG_DEFAULTS = {
   noOutputTimeoutRatio: 0.3,
   minMs: 60_000,
-  maxMs: 180_000,
+  maxMs: 3_600_000,
 } as const;
diff --git a/src/config/types.cli.ts b/src/config/types.cli.ts
@@ -1,5 +1,15 @@
 export type CliBannerTaglineMode = "random" | "default" | "off";
 
+export type CliTuiConfig = {
+  /**
+   * "No stream delta arrived" watchdog window for the TUI. When the upstream
+   * stream stalls for this long while a run is active, the TUI resets activity
+   * status to idle and posts the "taking longer than expected" notice.
+   * Default: 600000 (10 minutes). Set to 0 to disable.
+   */
+  streamingWatchdogMs?: number;
+};
+
 export type CliConfig = {
   banner?: {
     /**
@@ -10,4 +20,6 @@ export type CliConfig = {
      */
     taglineMode?: CliBannerTaglineMode;
   };
+  /** TUI-side runtime knobs (interactive `openclaw` chat). */
+  tui?: CliTuiConfig;
 };
diff --git a/src/config/zod-schema.ts b/src/config/zod-schema.ts
@@ -469,6 +469,12 @@ export const OpenClawSchema = z
           })
           .strict()
           .optional(),
+        tui: z
+          .object({
+            streamingWatchdogMs: z.number().int().nonnegative().optional(),
+          })
+          .strict()
+          .optional(),
       })
       .strict()
       .optional(),
diff --git a/src/tui/tui-event-handlers.test.ts b/src/tui/tui-event-handlers.test.ts
@@ -1233,6 +1233,30 @@ describe("tui-event-handlers: streaming watchdog", () => {
     handlers.dispose?.();
   });
 
+  it("falls back to the 10-minute default when streamingWatchdogMs is undefined", () => {
+    const { state, chatLog, setActivityStatus, handlers } = createHarness();
+
+    handlers.handleChatEvent({
+      runId: "run-default",
+      sessionKey: state.currentSessionKey,
+      state: "delta",
+      message: { content: "hi" },
+    } satisfies ChatEvent);
+
+    // Old default was 30s — verify it does NOT fire at 31s anymore.
+    vi.advanceTimersByTime(31_000);
+    expect(setActivityStatus).not.toHaveBeenCalledWith("idle");
+    expect(state.activeChatRunId).toBe("run-default");
+
+    // New default is 10m — verify it DOES fire just past the 10m boundary.
+    vi.advanceTimersByTime(600_001 - 31_000);
+    expect(setActivityStatus).toHaveBeenLastCalledWith("idle");
+    expect(state.activeChatRunId).toBeNull();
+    expect(chatLog.addSystem).toHaveBeenCalledWith(expectedTimeoutMessage);
+
+    handlers.dispose?.();
+  });
+
   it("is disabled when streamingWatchdogMs is 0", () => {
     const { state, chatLog, setActivityStatus, handlers } = createHarness({
       streamingWatchdogMs: 0,
diff --git a/src/tui/tui-event-handlers.ts b/src/tui/tui-event-handlers.ts
@@ -48,7 +48,11 @@ type EventHandlerContext = {
   localMode?: boolean;
 };
 
-const DEFAULT_STREAMING_WATCHDOG_MS = 30_000;
+// Streaming-watchdog default fires "response is taking longer than expected" when
+// no stream delta arrives for this long. Originally 30s, raised to 10m so long
+// reasoning / tool runs and SSE keepalive gaps don't cause spurious "idle" trips.
+// Override per-install via `cli.tui.streamingWatchdogMs`.
+const DEFAULT_STREAMING_WATCHDOG_MS = 600_000;
 const STREAMING_WATCHDOG_USER_MESSAGE =
   "This response is taking longer than expected. Send another message to continue.";
 
diff --git a/src/tui/tui.test.ts b/src/tui/tui.test.ts
@@ -19,6 +19,7 @@ import {
   resolveLocalAuthSpawnCwd,
   resolveLocalAuthSpawnOptions,
   resolveTuiSessionKey,
+  resolveTuiStreamingWatchdogMs,
   stopTuiSafely,
 } from "./tui.js";
 
@@ -498,3 +499,58 @@ describe("resolveLocalAuthSpawnCwd", () => {
     ).toBe("/worktree/subdir");
   });
 });
+
+describe("resolveTuiStreamingWatchdogMs", () => {
+  it("returns undefined when cli.tui.streamingWatchdogMs is unset", () => {
+    expect(resolveTuiStreamingWatchdogMs({} as OpenClawConfig)).toBeUndefined();
+    expect(resolveTuiStreamingWatchdogMs({ cli: {} } as OpenClawConfig)).toBeUndefined();
+    expect(resolveTuiStreamingWatchdogMs({ cli: { tui: {} } } as OpenClawConfig)).toBeUndefined();
+  });
+
+  it("returns the configured value when finite and non-negative", () => {
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: 900_000 } },
+      } as OpenClawConfig),
+    ).toBe(900_000);
+  });
+
+  it("preserves 0 (caller-side disable signal)", () => {
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: 0 } },
+      } as OpenClawConfig),
+    ).toBe(0);
+  });
+
+  it("floors fractional values", () => {
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: 1234.9 } },
+      } as OpenClawConfig),
+    ).toBe(1234);
+  });
+
+  it("rejects negative, NaN, Infinity, and non-number inputs", () => {
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: -10 } },
+      } as OpenClawConfig),
+    ).toBeUndefined();
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: Number.NaN } },
+      } as OpenClawConfig),
+    ).toBeUndefined();
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: Number.POSITIVE_INFINITY } },
+      } as OpenClawConfig),
+    ).toBeUndefined();
+    expect(
+      resolveTuiStreamingWatchdogMs({
+        cli: { tui: { streamingWatchdogMs: "600000" as unknown as number } },
+      } as OpenClawConfig),
+    ).toBeUndefined();
+  });
+});
diff --git a/src/tui/tui.ts b/src/tui/tui.ts
@@ -78,6 +78,14 @@ const OPENCLAW_DIST_ENTRY_MJS_PATH = fileURLToPath(
 
 const OPENAI_CODEX_PROVIDER = "openai-codex";
 
+export function resolveTuiStreamingWatchdogMs(config: OpenClawConfig): number | undefined {
+  const value = config.cli?.tui?.streamingWatchdogMs;
+  if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
+    return undefined;
+  }
+  return Math.floor(value);
+}
+
 type RunTuiOptions = TuiOptions & {
   backend?: TuiBackend;
   config?: OpenClawConfig;
@@ -1083,6 +1091,7 @@ export async function runTui(opts: RunTuiOptions): Promise<TuiResult> {
     isLocalBtwRunId,
     forgetLocalBtwRunId,
     clearLocalBtwRunIds,
+    streamingWatchdogMs: resolveTuiStreamingWatchdogMs(config),
   });
 
   const deferredFinish = createDeferredTuiFinish();
