From 8f998741b7336df1b6dbf9fdc5398f699fc8c316 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sun, 18 Jan 2026 05:24:24 +0000
Subject: [PATCH] fix: shorten doctor gateway health timeout in non-interactive

---
 src/commands/doctor-gateway-health.ts | 9 +++++++--
 src/commands/doctor.ts                | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/commands/doctor-gateway-health.ts b/src/commands/doctor-gateway-health.ts
index 367ce6c82..e66d4d18c 100644
--- a/src/commands/doctor-gateway-health.ts
+++ b/src/commands/doctor-gateway-health.ts
@@ -6,11 +6,16 @@ import { note } from "../terminal/note.js";
 import { healthCommand } from "./health.js";
 import { formatHealthCheckFailure } from "./health-format.js";
 
-export async function checkGatewayHealth(params: { runtime: RuntimeEnv; cfg: ClawdbotConfig }) {
+export async function checkGatewayHealth(params: {
+  runtime: RuntimeEnv;
+  cfg: ClawdbotConfig;
+  timeoutMs?: number;
+}) {
   const gatewayDetails = buildGatewayConnectionDetails({ config: params.cfg });
+  const timeoutMs = typeof params.timeoutMs === "number" && params.timeoutMs > 0 ? params.timeoutMs : 10_000;
   let healthOk = false;
   try {
-    await healthCommand({ json: false, timeoutMs: 10_000 }, params.runtime);
+    await healthCommand({ json: false, timeoutMs }, params.runtime);
     healthOk = true;
   } catch (err) {
     const message = String(err);
diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
index b6a49229b..ca0d82bc0 100644
--- a/src/commands/doctor.ts
+++ b/src/commands/doctor.ts
@@ -233,7 +233,11 @@ export async function doctorCommand(
 
   noteWorkspaceStatus(cfg);
 
-  const { healthOk } = await checkGatewayHealth({ runtime, cfg });
+  const { healthOk } = await checkGatewayHealth({
+    runtime,
+    cfg,
+    timeoutMs: options.nonInteractive === true ? 3000 : 10_000,
+  });
   await maybeRepairGatewayDaemon({
     cfg,
     runtime,