From 94b46f76153d0b85cfbd64e7efb75c0bfba0b02d Mon Sep 17 00:00:00 2001
From: Robin Newhouse <robin@cline.bot>
Date: Thu, 14 May 2026 13:05:17 -0700
Subject: [PATCH] Fix run_commands timeout config defaults

---
 sdk/apps/cli/src/acp/acpAgent.ts                  | 3 ++-
 sdk/apps/cli/src/tui/hooks/use-config-panel.tsx   | 6 ++++--
 sdk/apps/cli/src/tui/interactive-config.ts        | 2 +-
 sdk/packages/core/src/services/global-settings.ts | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sdk/apps/cli/src/acp/acpAgent.ts b/sdk/apps/cli/src/acp/acpAgent.ts
index c6e04dbb11..efc1f47985 100644
--- a/sdk/apps/cli/src/acp/acpAgent.ts
+++ b/sdk/apps/cli/src/acp/acpAgent.ts
@@ -26,6 +26,7 @@ import {
 	type ClineCore,
 	Llms,
 	ProviderSettingsManager,
+	readGlobalSettings,
 	SessionSource,
 } from "@cline/core";
 import type { Message } from "@cline/shared";
@@ -533,7 +534,7 @@ export class AcpAgent implements Agent {
 			mode: session.currentMode,
 			defaultToolAutoApprove: false,
 			toolPolicies: { "*": { autoApprove: false } },
-			runCommandsTimeoutMs: 30000,
+			runCommandsTimeoutMs: readGlobalSettings().runCommandsTimeoutMs ?? 30000,
 			enableSpawnAgent: true,
 			enableAgentTeams: false,
 			enableTools: true,
diff --git a/sdk/apps/cli/src/tui/hooks/use-config-panel.tsx b/sdk/apps/cli/src/tui/hooks/use-config-panel.tsx
index efa462778f..c20ae6f50c 100644
--- a/sdk/apps/cli/src/tui/hooks/use-config-panel.tsx
+++ b/sdk/apps/cli/src/tui/hooks/use-config-panel.tsx
@@ -1,4 +1,4 @@
-import { Llms } from "@cline/core";
+import { Llms, readGlobalSettings } from "@cline/core";
 import type { ChoiceContext } from "@opentui-ui/dialog";
 import type { DialogActions } from "@opentui-ui/dialog/react";
 import { useCallback, useMemo } from "react";
@@ -36,7 +36,9 @@ export function useConfigPanel(opts: {
 }) {
 	const emptyConfigData = useMemo(
 		() => ({
-			general: { runCommandsTimeoutMs: 30000 },
+			general: {
+				runCommandsTimeoutMs: readGlobalSettings().runCommandsTimeoutMs ?? 30000,
+			},
 			workflows: [] as InteractiveConfigItem[],
 			rules: [] as InteractiveConfigItem[],
 			skills: [] as InteractiveConfigItem[],
diff --git a/sdk/apps/cli/src/tui/interactive-config.ts b/sdk/apps/cli/src/tui/interactive-config.ts
index 8ad5b7c971..0e1a8dcf44 100644
--- a/sdk/apps/cli/src/tui/interactive-config.ts
+++ b/sdk/apps/cli/src/tui/interactive-config.ts
@@ -268,7 +268,7 @@ export async function loadInteractiveConfigData(input: {
 	const agents: InteractiveConfigItem[] = [];
 	const plugins: InteractiveConfigItem[] = [];
 	const general = {
-		runCommandsTimeoutMs: readGlobalSettings().runCommandsTimeoutMs,
+		runCommandsTimeoutMs: readGlobalSettings().runCommandsTimeoutMs ?? 30000,
 	};
 	const mcp: InteractiveConfigItem[] = [];
 	const tools: InteractiveConfigItem[] = [];
diff --git a/sdk/packages/core/src/services/global-settings.ts b/sdk/packages/core/src/services/global-settings.ts
index 5f1444b273..9908d5e025 100644
--- a/sdk/packages/core/src/services/global-settings.ts
+++ b/sdk/packages/core/src/services/global-settings.ts
@@ -38,7 +38,6 @@ export const GlobalSettingsSchema = z
 			.number()
 			.int()
 			.positive()
-			.optional()
 			.catch(30000)
 			.default(30000),
 	})