Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291795 from microsoft/tyriar/290972

Browse Source 
Clamp terminal timeout to save values
This commit is contained in:
Daniel Imms
2026-01-29 20:16:40 -08:00
committed by GitHub
parent 543804d5de b9bd16fb3e
commit 40e01fce60
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
+4 -2
View File
@@ -66,6 +66,7 @@ import { isNumber, isString } from '../../../../../../base/common/types.js';
import { ChatConfiguration } from '../../../../chat/common/constants.js';
import { IChatWidgetService } from '../../../../chat/browser/chat.js';
import { TerminalChatCommandId } from '../../../chat/browser/terminalChat.js';
import { clamp } from '../../../../../../base/common/numbers.js';
// #region Tool data
@@ -732,10 +733,11 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
const executeCancellation = store.add(new CancellationTokenSource(token));
// Set up timeout if provided and the setting is enabled (only for foreground)
if (!args.isBackground && args.timeout !== undefined && args.timeout > 0) {
const timeoutValue = args.timeout !== undefined ? clamp(args.timeout, 0, Number.MAX_SAFE_INTEGER) : undefined;
if (!args.isBackground && timeoutValue !== undefined && timeoutValue > 0) {
const shouldEnforceTimeout = this._configurationService.getValue(TerminalChatAgentToolsSettingId.EnforceTimeoutFromModel) === true;
if (shouldEnforceTimeout) {
timeoutPromise = timeout(args.timeout);
timeoutPromise = timeout(timeoutValue);
timeoutPromise.then(() => {
if (!executeCancellation.token.isCancellationRequested) {
didTimeout = true;