diff --git a/sdk/apps/cli/src/acp/acpAgent.ts b/sdk/apps/cli/src/acp/acpAgent.ts index efc1f47985..2635aef4bf 100644 --- a/sdk/apps/cli/src/acp/acpAgent.ts +++ b/sdk/apps/cli/src/acp/acpAgent.ts @@ -26,7 +26,6 @@ import { type ClineCore, Llms, ProviderSettingsManager, - readGlobalSettings, SessionSource, } from "@cline/core"; import type { Message } from "@cline/shared"; @@ -534,7 +533,6 @@ export class AcpAgent implements Agent { mode: session.currentMode, defaultToolAutoApprove: false, toolPolicies: { "*": { autoApprove: false } }, - runCommandsTimeoutMs: readGlobalSettings().runCommandsTimeoutMs ?? 30000, enableSpawnAgent: true, enableAgentTeams: false, enableTools: true, diff --git a/sdk/apps/cli/src/main.ts b/sdk/apps/cli/src/main.ts index 65b75b9695..c2f8bf6588 100644 --- a/sdk/apps/cli/src/main.ts +++ b/sdk/apps/cli/src/main.ts @@ -118,7 +118,6 @@ export async function runCli(): Promise { setClineDir(configDir); } setHomeDir(homedir()); - const { readGlobalSettings } = await import("@cline/core"); // Capture activation telemetry only after config/home directory selection // has been applied, so the telemetry singleton's persisted distinct-id @@ -864,7 +863,6 @@ export async function runCli(): Promise { }); const config: Config = { - runCommandsTimeoutMs: readGlobalSettings().runCommandsTimeoutMs, providerId: provider, modelId: args.model ?? diff --git a/sdk/apps/cli/src/runtime/run-interactive.ts b/sdk/apps/cli/src/runtime/run-interactive.ts index 5ea068fb20..3f7652444b 100644 --- a/sdk/apps/cli/src/runtime/run-interactive.ts +++ b/sdk/apps/cli/src/runtime/run-interactive.ts @@ -583,7 +583,6 @@ export async function runInteractive( ...readGlobalSettings(), runCommandsTimeoutMs: timeoutMs, }); - config.runCommandsTimeoutMs = timeoutMs; await sessionRuntime.ensureReady(); await sessionRuntime.restartWithCurrentMessages(); }, diff --git a/sdk/apps/cli/src/utils/types.ts b/sdk/apps/cli/src/utils/types.ts index fa96f9610b..967f05b605 100644 --- a/sdk/apps/cli/src/utils/types.ts +++ b/sdk/apps/cli/src/utils/types.ts @@ -30,7 +30,6 @@ export interface Config extends Omit { mode: CliAgentMode; defaultToolAutoApprove: boolean; toolPolicies: Record; - runCommandsTimeoutMs: number; } export interface ActiveCliSession { diff --git a/sdk/packages/core/src/extensions/tools/index.ts b/sdk/packages/core/src/extensions/tools/index.ts index 565ec63856..38a11b0307 100644 --- a/sdk/packages/core/src/extensions/tools/index.ts +++ b/sdk/packages/core/src/extensions/tools/index.ts @@ -178,6 +178,8 @@ export function createBuiltinTools( return createDefaultTools({ ...toolsConfig, + bashTimeoutMs: + toolsConfig.bashTimeoutMs ?? executorOptions.bash?.timeoutMs, executors, }); } diff --git a/sdk/packages/core/src/runtime/orchestration/runtime-builder.ts b/sdk/packages/core/src/runtime/orchestration/runtime-builder.ts index 5253a522a8..ffe8044369 100644 --- a/sdk/packages/core/src/runtime/orchestration/runtime-builder.ts +++ b/sdk/packages/core/src/runtime/orchestration/runtime-builder.ts @@ -109,7 +109,6 @@ function createBuiltinToolsList( createBuiltinTools({ cwd, ...preset, - bashTimeoutMs: runCommandsTimeoutMs, enableSkills: !!skillsExecutor, ...toolRoutingConfig, executorOptions: {