@codingame/monaco-vscode-chat-service-override 22.1.8 → 23.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js

@@ -14,14 +14,16 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { showChatView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
+import { showChatView } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { isCellTextEditOperation } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatMode } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModes';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { InlineChatWidget } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
-import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { InlineChatWidget } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
+import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-a793b3ee-7ba9-5176-a019-30ec806fdd95-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { TerminalStickyScrollContribution } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution';
 import * as terminalChatWidget from './media/terminalChatWidget.css';
 import { TerminalChatContextKeys, MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
@@ -53,7 +55,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     get lastResponseContent() {
         return this._lastResponseContent;
     }
-    constructor(_terminalElement, _instance, _xterm, contextKeyService, _chatService, _storageService, _viewsService, instantiationService, _chatAgentService) {
+    constructor(_terminalElement, _instance, _xterm, contextKeyService, _chatService, _storageService, _viewsService, instantiationService, _chatAgentService, _layoutService) {
         super();
         this._terminalElement = _terminalElement;
         this._instance = _instance;
@@ -62,6 +64,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._storageService = _storageService;
         this._viewsService = _viewsService;
         this._chatAgentService = _chatAgentService;
+        this._layoutService = _layoutService;
         this._onDidHide = this._register(( new Emitter()));
         this.onDidHide = this._onDidHide.event;
         this._messages = this._store.add(( new Emitter()));
@@ -100,7 +103,8 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
                     telemetrySource: 'terminal-inline-chat',
                     executeToolbar: MenuId.ChatExecute,
                     inputSideToolbar: MENU_TERMINAL_CHAT_WIDGET_INPUT_SIDE_TOOLBAR,
-                }
+                },
+                defaultMode: ChatMode.Ask
             }
         });
         this._register(this._inlineChatWidget.chatWidget.onDidChangeViewModel(() => this._saveViewState()));
@@ -163,7 +167,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11538, 'Ask about commands'));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11825, 'Ask about commands'));
     }
     async reveal(viewState) {
         await this._createSession(viewState);
@@ -346,13 +350,13 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._activeRequestCts?.cancel();
         this._requestActiveContextKey.set(false);
         const model = this._inlineChatWidget.getChatModel();
-        if (!model?.sessionId) {
+        if (!model?.sessionResource) {
             return;
         }
-        this._chatService.cancelCurrentRequestForSession(model?.sessionId);
+        this._chatService.cancelCurrentRequestForSession(model?.sessionResource);
     }
     async viewInChat() {
-        const widget = await showChatView(this._viewsService);
+        const widget = await showChatView(this._viewsService, this._layoutService);
         const currentRequest = this._inlineChatWidget.chatWidget.viewModel?.model.getRequests().find(r => r.id === this._currentRequestId);
         if (!widget || !currentRequest?.response) {
             return;
@@ -370,17 +374,17 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
             }
             else if (item.kind === 'notebookEditGroup') {
                 for (const group of item.edits) {
-                    if (isCellTextEditOperation(group)) {
+                    if (isCellTextEditOperationArray(group)) {
                         message.push({
                             kind: 'textEdit',
-                            edits: [group.edit],
-                            uri: group.uri
+                            edits: ( group.map(e => e.edit)),
+                            uri: group[0].uri
                         });
                     }
                     else {
                         message.push({
                             kind: 'notebookEdit',
-                            edits: [group],
+                            edits: group,
                             uri: item.uri
                         });
                     }
@@ -390,7 +394,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
                 message.push(item);
             }
         }
-        this._chatService.addCompleteRequest(widget.viewModel.sessionId, `@${this._terminalAgentName} ${currentRequest.message.text}`, currentRequest.variableData, currentRequest.attempt, {
+        this._chatService.addCompleteRequest(widget.viewModel.sessionResource, `@${this._terminalAgentName} ${currentRequest.message.text}`, currentRequest.variableData, currentRequest.attempt, {
             message,
             result: currentRequest.response.result,
             followups: currentRequest.response.followups
@@ -405,7 +409,8 @@ TerminalChatWidget = ( __decorate([
     ( __param(5, IStorageService)),
     ( __param(6, IViewsService)),
     ( __param(7, IInstantiationService)),
-    ( __param(8, IChatAgentService))
+    ( __param(8, IChatAgentService)),
+    ( __param(9, IWorkbenchLayoutService))
 ], TerminalChatWidget));
 
 export { TerminalChatWidget };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/commandLineAutoApprover.js

@@ -6,7 +6,7 @@ import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/typ
 import { structuralEquals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/equals';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
-import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-a175bd1a-4858-5944-9ae5-fb73305dcb13-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
+import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-de235d7f-e72a-5adb-9256-acf6c64eb6f2-common/vscode/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration';
 import { isPowerShell } from './runInTerminalHelpers.js';
 
 const neverMatchRegex = /(?!.*)/;
@@ -22,6 +22,7 @@ let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
         this.updateConfiguration();
         this._register(this._configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(TerminalChatAgentToolsSettingId.AutoApprove) ||
+                e.affectsConfiguration(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules) ||
                 e.affectsConfiguration(TerminalChatAgentToolsSettingId.DeprecatedAutoApproveCompatible)) {
                 this.updateConfiguration();
             }
@@ -122,7 +123,8 @@ let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
         const allowListRules = [];
         const allowListCommandLineRules = [];
         const denyListCommandLineRules = [];
-        Object.entries(config).forEach(([key, value]) => {
+        const ignoreDefaults = this._configurationService.getValue(TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules) === true;
+        for (const [key, value] of Object.entries(config)) {
             const defaultValue = configInspectValue?.default?.value;
             const isDefaultRule = !!(isObject(defaultValue) &&
                 key in defaultValue &&
@@ -139,6 +141,9 @@ let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
                             : checkTarget(configInspectValue.userValue) ? ConfigurationTarget.USER
                                 : checkTarget(configInspectValue.applicationValue) ? ConfigurationTarget.APPLICATION
                                     : ConfigurationTarget.DEFAULT);
+            if (ignoreDefaults && isDefaultRule && sourceTarget === ConfigurationTarget.DEFAULT) {
+                continue;
+            }
             if (typeof value === 'boolean') {
                 const { regex, regexCaseInsensitive } = this._convertAutoApproveEntryToRegex(key);
                 if (value === true) {
@@ -170,7 +175,7 @@ let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
                     }
                 }
             }
-        });
+        }
         return {
             denyListRules,
             allowListRules,

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.d.ts

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
 import { type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from "./executeStrategy.js";
 import type { IMarker as IXtermMarker } from "@xterm/xterm";
@@ -37,6 +37,6 @@ export declare class BasicExecuteStrategy implements ITerminalExecuteStrategy {
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
     constructor(_instance: ITerminalInstance, _hasReceivedUserInput: () => boolean, _commandDetection: ICommandDetectionCapability, _logService: ITerminalLogService);
-    execute(commandLine: string, token: CancellationToken): Promise<ITerminalExecuteStrategyResult>;
+    execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult>;
     private _log;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/basicExecuteStrategy.js

@@ -2,10 +2,11 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { trackIdleOnPrompt, waitForIdle } from './executeStrategy.js';
+import { setupRecreatingStartMarker } from './strategyHelpers.js';
 
 let BasicExecuteStrategy = class BasicExecuteStrategy {
     constructor(_instance, _hasReceivedUserInput, _commandDetection, _logService) {
@@ -18,7 +19,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
         this._onDidCreateStartMarker = ( new Emitter());
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
     }
-    async execute(commandLine, token) {
+    async execute(commandLine, token, commandId) {
         const store = ( new DisposableStore());
         try {
             const idlePromptPromise = trackIdleOnPrompt(this._instance, 1000, store);
@@ -27,12 +28,19 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
                     this._log('onDone 1 of 2 via end event, waiting for short idle prompt');
                     return idlePromptPromise.then(() => {
                         this._log('onDone 2 of 2 via short idle prompt');
-                        return e;
+                        return {
+                            'type': 'success',
+                            command: e
+                        };
                     });
                 }),
                 Event.toPromise(token.onCancellationRequested, store).then(() => {
                     this._log('onDone via cancellation');
                 }),
+                Event.toPromise(this._instance.onDisposed, store).then(() => {
+                    this._log('onDone via terminal disposal');
+                    return { type: 'disposal' };
+                }),
                 trackIdleOnPrompt(this._instance, 3000, store).then(() => {
                     this._log('onDone long idle prompt');
                 }),
@@ -44,29 +52,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
             }
             this._log('Waiting for idle');
             await waitForIdle(this._instance.onData, 1000);
-            const markerListener = ( new MutableDisposable());
-            const recreateStartMarker = () => {
-                if (store.isDisposed) {
-                    return;
-                }
-                const marker = xterm.raw.registerMarker();
-                this._startMarker.value = marker ?? undefined;
-                this._onDidCreateStartMarker.fire(marker);
-                if (!marker) {
-                    markerListener.clear();
-                    return;
-                }
-                markerListener.value = marker.onDispose(() => {
-                    this._log(`Start marker was disposed, recreating`);
-                    recreateStartMarker();
-                });
-            };
-            recreateStartMarker();
-            store.add(toDisposable(() => {
-                markerListener.dispose();
-                this._startMarker.clear();
-                this._onDidCreateStartMarker.fire(undefined);
-            }));
+            setupRecreatingStartMarker(xterm, this._startMarker, m => this._onDidCreateStartMarker.fire(m), store, this._log.bind(this));
             if (this._hasReceivedUserInput()) {
                 this._log('Command timed out, sending SIGINT and retrying');
                 await this._instance.sendText('\x03', false);
@@ -74,7 +60,12 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
             }
             this._log(`Executing command line \`${commandLine}\``);
             this._instance.sendText(commandLine, true);
-            const finishedCommand = await onDone;
+            this._log('Waiting for done event');
+            const onDoneResult = await onDone;
+            if (onDoneResult && onDoneResult.type === 'disposal') {
+                throw ( new Error('The terminal was closed'));
+            }
+            const finishedCommand = onDoneResult && onDoneResult.type === 'success' ? onDoneResult.command : undefined;
             this._log('Waiting for idle');
             await waitForIdle(this._instance.onData, 1000);
             if (token.isCancellationRequested) {

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.d.ts

@@ -8,9 +8,12 @@ export interface ITerminalExecuteStrategy {
     /**
      * Executes a command line and gets a result designed to be passed directly to an LLM. The
      * result will include information about the exit code.
+     * @param commandLine The command line to execute
+     * @param token Cancellation token
+     * @param commandId Optional predefined command ID to link the command
      */
-    execute(commandLine: string, token: CancellationToken): Promise<ITerminalExecuteStrategyResult>;
-    onDidCreateStartMarker: Event<IXtermMarker | undefined>;
+    execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult>;
+    readonly onDidCreateStartMarker: Event<IXtermMarker | undefined>;
 }
 export interface ITerminalExecuteStrategyResult {
     output: string | undefined;

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/executeStrategy.js

@@ -40,9 +40,11 @@ function detectsCommonPromptPattern(cursorLine) {
 const PS_CONFIRM_RE = /\s*(?:\[[^\]]\]\s+[^\[]+\s*)+(?:\(default is\s+"[^"]+"\):)?\s+$/;
 const YN_PAIRED_RE = /(?:\(|\[)\s*(?:y(?:es)?\s*\/\s*n(?:o)?|n(?:o)?\s*\/\s*y(?:es)?)\s*(?:\]|\))\s+$/i;
 const YN_AFTER_PUNCT_RE = /[?:]\s*(?:\(|\[)?\s*y(?:es)?\s*\/\s*n(?:o)?\s*(?:\]|\))?\s+$/i;
+const CONFIRM_Y_RE = /\(y\)\s*$/i;
 const LINE_ENDS_WITH_COLON_RE = /:\s*$/;
+const END = /\(END\)$/;
 function detectsInputRequiredPattern(cursorLine) {
-    return PS_CONFIRM_RE.test(cursorLine) || YN_PAIRED_RE.test(cursorLine) || YN_AFTER_PUNCT_RE.test(cursorLine) || LINE_ENDS_WITH_COLON_RE.test(cursorLine.trim());
+    return PS_CONFIRM_RE.test(cursorLine) || YN_PAIRED_RE.test(cursorLine) || YN_AFTER_PUNCT_RE.test(cursorLine) || CONFIRM_Y_RE.test(cursorLine) || LINE_ENDS_WITH_COLON_RE.test(cursorLine.trim()) || END.test(cursorLine);
 }
 async function waitForIdleWithPromptHeuristics(onData, instance, idlePollIntervalMs, extendedTimeoutMs) {
     await waitForIdle(onData, idlePollIntervalMs);

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.d.ts

@@ -19,6 +19,6 @@ export declare class NoneExecuteStrategy implements ITerminalExecuteStrategy {
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
     constructor(_instance: ITerminalInstance, _hasReceivedUserInput: () => boolean, _logService: ITerminalLogService);
-    execute(commandLine: string, token: CancellationToken): Promise<ITerminalExecuteStrategyResult>;
+    execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult>;
     private _log;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/noneExecuteStrategy.js

@@ -2,9 +2,10 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { waitForIdle, waitForIdleWithPromptHeuristics } from './executeStrategy.js';
+import { setupRecreatingStartMarker } from './strategyHelpers.js';
 
 let NoneExecuteStrategy = class NoneExecuteStrategy {
     constructor(_instance, _hasReceivedUserInput, _logService) {
@@ -16,7 +17,7 @@ let NoneExecuteStrategy = class NoneExecuteStrategy {
         this._onDidCreateStartMarker = ( new Emitter());
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
     }
-    async execute(commandLine, token) {
+    async execute(commandLine, token, commandId) {
         const store = ( new DisposableStore());
         try {
             if (token.isCancellationRequested) {
@@ -32,29 +33,7 @@ let NoneExecuteStrategy = class NoneExecuteStrategy {
             if (token.isCancellationRequested) {
                 throw ( new CancellationError());
             }
-            const markerListener = ( new MutableDisposable());
-            const recreateStartMarker = () => {
-                if (store.isDisposed) {
-                    return;
-                }
-                const marker = xterm.raw.registerMarker();
-                this._startMarker.value = marker ?? undefined;
-                this._onDidCreateStartMarker.fire(marker);
-                if (!marker) {
-                    markerListener.clear();
-                    return;
-                }
-                markerListener.value = marker.onDispose(() => {
-                    this._log(`Start marker was disposed, recreating`);
-                    recreateStartMarker();
-                });
-            };
-            recreateStartMarker();
-            store.add(toDisposable(() => {
-                markerListener.dispose();
-                this._startMarker.clear();
-                this._onDidCreateStartMarker.fire(undefined);
-            }));
+            setupRecreatingStartMarker(xterm, this._startMarker, m => this._onDidCreateStartMarker.fire(m), store, this._log.bind(this));
             if (this._hasReceivedUserInput()) {
                 this._log('Command timed out, sending SIGINT and retrying');
                 await this._instance.sendText('\x03', false);

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.d.ts

@@ -1,6 +1,6 @@
 import type { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
-import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
+import type { ICommandDetectionCapability } from "@codingame/monaco-vscode-10af0e5d-64cb-56de-b584-29ab4a355d15-common/vscode/vs/platform/terminal/common/capabilities/capabilities";
 import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
 import type { ITerminalInstance } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 import { type ITerminalExecuteStrategy, type ITerminalExecuteStrategyResult } from "./executeStrategy.js";
@@ -21,6 +21,6 @@ export declare class RichExecuteStrategy implements ITerminalExecuteStrategy {
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
     constructor(_instance: ITerminalInstance, _commandDetection: ICommandDetectionCapability, _logService: ITerminalLogService);
-    execute(commandLine: string, token: CancellationToken): Promise<ITerminalExecuteStrategyResult>;
+    execute(commandLine: string, token: CancellationToken, commandId?: string): Promise<ITerminalExecuteStrategyResult>;
     private _log;
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/richExecuteStrategy.js

@@ -2,10 +2,11 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { MutableDisposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { ITerminalLogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service';
 import { trackIdleOnPrompt } from './executeStrategy.js';
+import { setupRecreatingStartMarker } from './strategyHelpers.js';
 
 let RichExecuteStrategy = class RichExecuteStrategy {
     constructor(_instance, _commandDetection, _logService) {
@@ -17,7 +18,7 @@ let RichExecuteStrategy = class RichExecuteStrategy {
         this._onDidCreateStartMarker = ( new Emitter());
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
     }
-    async execute(commandLine, token) {
+    async execute(commandLine, token, commandId) {
         const store = ( new DisposableStore());
         try {
             this._log('Waiting for xterm');
@@ -28,41 +29,31 @@ let RichExecuteStrategy = class RichExecuteStrategy {
             const onDone = Promise.race([
                 Event.toPromise(this._commandDetection.onCommandFinished, store).then(e => {
                     this._log('onDone via end event');
-                    return e;
+                    return {
+                        'type': 'success',
+                        command: e
+                    };
                 }),
                 Event.toPromise(token.onCancellationRequested, store).then(() => {
                     this._log('onDone via cancellation');
                 }),
+                Event.toPromise(this._instance.onDisposed, store).then(() => {
+                    this._log('onDone via terminal disposal');
+                    return { type: 'disposal' };
+                }),
                 trackIdleOnPrompt(this._instance, 1000, store).then(() => {
                     this._log('onDone via idle prompt');
                 }),
             ]);
-            const markerListener = ( new MutableDisposable());
-            const recreateStartMarker = () => {
-                if (store.isDisposed) {
-                    return;
-                }
-                const marker = xterm.raw.registerMarker();
-                this._startMarker.value = marker ?? undefined;
-                this._onDidCreateStartMarker.fire(marker);
-                if (!marker) {
-                    markerListener.clear();
-                    return;
-                }
-                markerListener.value = marker.onDispose(() => {
-                    recreateStartMarker();
-                });
-            };
-            recreateStartMarker();
-            store.add(toDisposable(() => {
-                markerListener.dispose();
-                this._startMarker.clear();
-                this._onDidCreateStartMarker.fire(undefined);
-            }));
+            setupRecreatingStartMarker(xterm, this._startMarker, m => this._onDidCreateStartMarker.fire(m), store, this._log.bind(this));
             this._log(`Executing command line \`${commandLine}\``);
-            this._instance.runCommand(commandLine, true);
+            this._instance.runCommand(commandLine, true, commandId);
             this._log('Waiting for done event');
-            const finishedCommand = await onDone;
+            const onDoneResult = await onDone;
+            if (onDoneResult && onDoneResult.type === 'disposal') {
+                throw ( new Error('The terminal was closed'));
+            }
+            const finishedCommand = onDoneResult && onDoneResult.type === 'success' ? onDoneResult.command : undefined;
             if (token.isCancellationRequested) {
                 throw ( new CancellationError());
             }

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.d.ts

@@ -0,0 +1,12 @@
+import { DisposableStore, MutableDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import type { IMarker as IXtermMarker } from "@xterm/xterm";
+/**
+ * Sets up a recreating start marker which is resilient to prompts that clear/re-render (eg. transient
+ * or powerlevel10k style prompts). The marker is recreated at the cursor position whenever the
+ * existing marker is disposed. The caller is responsible for adding the startMarker to the store.
+ */
+export declare function setupRecreatingStartMarker(xterm: {
+    raw: {
+        registerMarker(): IXtermMarker | undefined;
+    };
+}, startMarker: MutableDisposable<IXtermMarker>, fire: (marker: IXtermMarker | undefined) => void, store: DisposableStore, log?: (message: string) => void): void;

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/executeStrategy/strategyHelpers.js

@@ -0,0 +1,31 @@
+
+import { MutableDisposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+
+function setupRecreatingStartMarker(xterm, startMarker, fire, store, log) {
+    const markerListener = ( new MutableDisposable());
+    const recreateStartMarker = () => {
+        if (store.isDisposed) {
+            return;
+        }
+        const marker = xterm.raw.registerMarker();
+        startMarker.value = marker ?? undefined;
+        fire(marker);
+        if (!marker) {
+            markerListener.clear();
+            return;
+        }
+        markerListener.value = marker.onDispose(() => {
+            log?.('Start marker was disposed, recreating');
+            recreateStartMarker();
+        });
+    };
+    recreateStartMarker();
+    store.add(toDisposable(() => {
+        markerListener.dispose();
+        startMarker.clear();
+        fire(undefined);
+    }));
+    store.add(startMarker);
+}
+
+export { setupRecreatingStartMarker };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.d.ts

@@ -2,6 +2,9 @@ import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import type { ToolConfirmationAction } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
 import type { ICommandApprovalResultWithReason } from "./commandLineAutoApprover.js";
 export declare function isPowerShell(envShell: string, os: OperatingSystem): boolean;
+export declare function isWindowsPowerShell(envShell: string): boolean;
+export declare function isZsh(envShell: string, os: OperatingSystem): boolean;
+export declare function isFish(envShell: string, os: OperatingSystem): boolean;
 export declare function sanitizeTerminalOutput(output: string): string;
 export declare function generateAutoApproveActions(commandLine: string, subCommands: string[], autoApproveResult: {
     subCommandResults: ICommandApprovalResultWithReason[];

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalHelpers.js

@@ -3,7 +3,7 @@ import { Separator } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ac
 import { coalesce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { win32, posix } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
+import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
 function isPowerShell(envShell, os) {
@@ -12,9 +12,25 @@ function isPowerShell(envShell, os) {
     }
     return /^(?:powershell|pwsh)(?:-preview)?$/.test(posix.basename(envShell));
 }
+function isWindowsPowerShell(envShell) {
+    return envShell.endsWith('System32\\WindowsPowerShell\\v1.0\\powershell.exe');
+}
+function isZsh(envShell, os) {
+    if (os === OperatingSystem.Windows) {
+        return /^zsh(?:\.exe)?$/i.test(win32.basename(envShell));
+    }
+    return /^zsh$/.test(posix.basename(envShell));
+}
+function isFish(envShell, os) {
+    if (os === OperatingSystem.Windows) {
+        return /^fish(?:\.exe)?$/i.test(win32.basename(envShell));
+    }
+    return /^fish$/.test(posix.basename(envShell));
+}
 function generateAutoApproveActions(commandLine, subCommands, autoApproveResult) {
     const actions = [];
-    const canCreateAutoApproval = ( autoApproveResult.subCommandResults.some(e => e.result !== 'denied')) || autoApproveResult.commandLineResult.result === 'denied';
+    const canCreateAutoApproval = (autoApproveResult.subCommandResults.every(e => e.result !== 'denied') &&
+        autoApproveResult.commandLineResult.result !== 'denied');
     if (canCreateAutoApproval) {
         const unapprovedSubCommands = subCommands.filter((_, index) => {
             return autoApproveResult.subCommandResults[index].result !== 'approved';
@@ -56,11 +72,11 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         if (subCommandsToSuggest.length > 0) {
             let subCommandLabel;
             if (subCommandsToSuggest.length === 1) {
-                subCommandLabel = ( localize(11540, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
+                subCommandLabel = ( localize(11827, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
             }
             else {
                 const commandSeparated = subCommandsToSuggest.join(', ');
-                subCommandLabel = ( localize(11541, 'Always Allow Commands: {0}', commandSeparated));
+                subCommandLabel = ( localize(11828, 'Always Allow Commands: {0}', commandSeparated));
             }
             actions.push({
                 label: subCommandLabel,
@@ -78,11 +94,11 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
             !( commandsWithSubcommands.has(commandLine)) &&
             !( commandsWithSubSubCommands.has(commandLine))) {
             actions.push({
-                label: ( localize(11542, 'Always Allow Exact Command Line')),
+                label: ( localize(11829, 'Always Allow Exact Command Line')),
                 data: {
                     type: 'newRule',
                     rule: {
-                        key: commandLine,
+                        key: `/^${escapeRegExpCharacters(commandLine)}$/`,
                         value: {
                             approve: true,
                             matchCommandLine: true
@@ -96,7 +112,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(11543, 'Configure Auto Approve...')),
+        label: ( localize(11830, 'Configure Auto Approve...')),
         data: {
             type: 'configure'
         }
@@ -109,4 +125,4 @@ function dedupeRules(rules) {
     });
 }
 
-export { dedupeRules, generateAutoApproveActions, isPowerShell };
+export { dedupeRules, generateAutoApproveActions, isFish, isPowerShell, isWindowsPowerShell, isZsh };

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/runInTerminalToolTelemetry.js

@@ -394,6 +394,14 @@ const commandAllowList = ( new Set([
     'yarn',
     'yum',
     'zypper',
+    'aider',
+    'amp',
+    'claude',
+    'codex',
+    'copilot',
+    'gemini',
+    'toad',
+    'q',
     'taskkill',
     'taskkill.exe',
     'add-content',

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/taskHelpers.d.ts

@@ -45,7 +45,7 @@ export declare function resolveDependencyTasks(parentTask: Task, workspaceFolder
 /**
  * Collects output, polling duration, and idle status for all terminals.
  */
-export declare function collectTerminalResults(terminals: ITerminalInstance[], task: Task, instantiationService: IInstantiationService, invocationContext: IToolInvocationContext, progress: ToolProgress, token: CancellationToken, disposableStore: DisposableStore, isActive?: () => Promise<boolean>, dependencyTasks?: Task[]): Promise<Array<{
+export declare function collectTerminalResults(terminals: ITerminalInstance[], task: Task, instantiationService: IInstantiationService, invocationContext: IToolInvocationContext, progress: ToolProgress, token: CancellationToken, disposableStore: DisposableStore, isActive?: (task: Task) => Promise<boolean>, dependencyTasks?: Task[]): Promise<Array<{
     name: string;
     output: string;
     resources?: ILinkLocation[];