@codingame/monaco-vscode-chat-service-override 21.6.0 → 22.0.0

package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.js

@@ -13,42 +13,42 @@ import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteCodingAgents',
     jsonSchema: {
-        description: ( localize(9881, 'Contributes remote coding agent integrations to the chat widget.')),
+        description: ( localize(9971, 'Contributes remote coding agent integrations to the chat widget.')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
-                    description: ( localize(9882, 'A unique identifier for this item.')),
+                    description: ( localize(9972, 'A unique identifier for this item.')),
                     type: 'string',
                 },
                 command: {
                     description: ( localize(
-                        9883,
+                        9973,
                         'Identifier of the command to execute. The command must be declared in the "commands" section.'
                     )),
                     type: 'string'
                 },
                 displayName: {
                     description: ( localize(
-                        9884,
+                        9974,
                         'A user-friendly name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localize(9885, 'Description of the remote agent for use in menus and tooltips.')),
+                    description: ( localize(9975, 'Description of the remote agent for use in menus and tooltips.')),
                     type: 'string'
                 },
                 followUpRegex: {
                     description: ( localize(
-                        9886,
+                        9976,
                         'The last occurrence of pattern in an existing chat conversation is sent to the contributing extension to facilitate follow-up responses.'
                     )),
                     type: 'string',
                 },
                 when: {
-                    description: ( localize(9887, 'Condition which must be true to show this item.')),
+                    description: ( localize(9977, 'Condition which must be true to show this item.')),
                     type: 'string'
                 },
             },

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

@@ -41,68 +41,68 @@ function getAccessibilityHelpText(accessor) {
     const focusResponseKeybinding = keybindingService.lookupKeybinding('chat.action.focus')?.getAriaLabel();
     const focusInputKeybinding = keybindingService.lookupKeybinding('workbench.action.chat.focusInput')?.getAriaLabel();
     content.push(( localize(
-        11408,
+        11508,
         "Inline chat occurs within a terminal. It is useful for suggesting terminal commands. Keep in mind that AI generated code may be incorrect."
     )));
     content.push(( localize(
-        11409,
+        11509,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        11410,
+        11510,
         "The input box is where the user can type a request and can make the request ({0}). The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus.",
         makeRequestKeybinding
     )) : ( localize(
-        11411,
+        11511,
         "The input box is where the user can type a request and can make the request by tabbing to the Make Request button, which is not currently triggerable via keybindings. The widget will be closed and all content will be discarded when the Escape key is pressed and the terminal will regain focus."
     )));
     content.push(openAccessibleViewKeybinding ? ( localize(
-        11412,
+        11512,
         'The response can be inspected in the accessible view ({0}).',
         openAccessibleViewKeybinding
     )) : ( localize(
-        11413,
+        11513,
         'With the input box focused, inspect the response in the accessible view via the Open Accessible View command, which is currently not triggerable by a keybinding.'
     )));
     content.push(focusResponseKeybinding ? ( localize(
-        11414,
+        11514,
         'Reach the response from the input box ({0}).',
         focusResponseKeybinding
     )) : ( localize(
-        11415,
+        11515,
         'Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response.'
     )));
     content.push(focusInputKeybinding ? ( localize(
-        11416,
+        11516,
         'Reach the input box from the response ({0}).',
         focusInputKeybinding
     )) : ( localize(
-        11417,
+        11517,
         'Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input.'
     )));
     content.push(runCommandKeybinding ? ( localize(
-        11418,
+        11518,
         'With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.',
         runCommandKeybinding
     )) : ( localize(
-        11419,
+        11519,
         'Run a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        11420,
+        11520,
         'With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.',
         insertCommandKeybinding
     )) : ( localize(
-        11421,
+        11521,
         'Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(( localize(
-        11422,
+        11522,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        11423,
+        11523,
         "Accessibility Signals can be changed via settings with a prefix of signals.chat. By default, if a request takes more than 4 seconds, you will hear a sound indicating that progress is still occurring."
     )));
     return content.join('\n');

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

@@ -20,8 +20,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(11424, 'Open Inline Chat')),
-    category: ( localize2(11425, "Terminal")),
+    title: ( localize2(11524, 'Open Inline Chat')),
+    category: ( localize2(11525, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -57,7 +57,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(11426, 'Close')),
+    title: ( localize2(11526, 'Close')),
     category: AbstractInline1ChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -82,8 +82,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(11427, 'Run Chat Command')),
-    shortTitle: ( localize2(11428, 'Run')),
+    title: ( localize2(11527, 'Run Chat Command')),
+    shortTitle: ( localize2(11528, 'Run')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -111,8 +111,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(11429, 'Run First Chat Command')),
-    shortTitle: ( localize2(11430, 'Run First')),
+    title: ( localize2(11529, 'Run First Chat Command')),
+    shortTitle: ( localize2(11530, 'Run First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -140,8 +140,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(11431, 'Insert Chat Command')),
-    shortTitle: ( localize2(11432, 'Insert')),
+    title: ( localize2(11531, 'Insert Chat Command')),
+    shortTitle: ( localize2(11532, 'Insert')),
     category: AbstractInline1ChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -170,8 +170,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(11433, 'Insert First Chat Command')),
-    shortTitle: ( localize2(11434, 'Insert First')),
+    title: ( localize2(11533, 'Insert First Chat Command')),
+    shortTitle: ( localize2(11534, 'Insert First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -199,7 +199,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(11435, "Rerun Request")),
+    title: ( localize2(11535, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInline1ChatAction.category,
@@ -240,7 +240,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(11436, 'View in Chat')),
+    title: ( localize2(11536, 'View in Chat')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,

package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.d.ts

@@ -7,7 +7,7 @@ import { ITerminalContribution, ITerminalInstance, IXtermTerminal } from "@codin
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { TerminalChatWidget } from "./terminalChatWidget.js";
 import type { ITerminalContributionContext } from "@codingame/monaco-vscode-88141f48-1af9-57ef-a278-f4b2ff6128fa-common/vscode/vs/workbench/contrib/terminal/browser/terminalExtensions";
-import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service";
+import { IChatEntitlementService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service";
 export declare class TerminalChatController extends Disposable implements ITerminalContribution {
     private readonly _ctx;
     private readonly _contextKeyService;

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

@@ -11,7 +11,7 @@ import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalChatWidget } from './terminalChatWidget.js';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
-import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEntitlementService.service';
+import { IChatEntitlementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/chat/common/chatEntitlementService.service';
 import { setActiveChatController } from './terminalChatControllerHolder.js';
 
 var TerminalChatController_1;
@@ -129,7 +129,7 @@ async function moveToPanelChat(accessor, model) {
         for (const request of model.getRequests().slice()) {
             await chatService.adoptRequest(widget.viewModel.model.sessionId, request);
         }
-        widget.focusLastMessage();
+        widget.focusResponseItem();
     }
 }
 

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

@@ -163,7 +163,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11437, 'Ask about commands'));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11537, 'Ask about commands'));
     }
     async reveal(viewState) {
         await this._createSession(viewState);
@@ -395,7 +395,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
             result: currentRequest.response.result,
             followups: currentRequest.response.followups
         });
-        widget.focusLastMessage();
+        widget.focusResponseItem();
         this.hide();
     }
 };

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

@@ -12,6 +12,7 @@ export interface IAutoApproveRule {
 export interface ICommandApprovalResultWithReason {
     result: ICommandApprovalResult;
     reason: string;
+    rule?: IAutoApproveRule;
 }
 export type ICommandApprovalResult = "approved" | "denied" | "noMatch";
 export declare class CommandLineAutoApprover extends Disposable {
@@ -22,16 +23,8 @@ export declare class CommandLineAutoApprover extends Disposable {
     private _denyListCommandLineRules;
     constructor(_configurationService: IConfigurationService);
     updateConfiguration(): void;
-    isCommandAutoApproved(command: string, shell: string, os: OperatingSystem): {
-        result: ICommandApprovalResult;
-        rule?: IAutoApproveRule;
-        reason: string;
-    };
-    isCommandLineAutoApproved(commandLine: string): {
-        result: ICommandApprovalResult;
-        rule?: IAutoApproveRule;
-        reason: string;
-    };
+    isCommandAutoApproved(command: string, shell: string, os: OperatingSystem): ICommandApprovalResultWithReason;
+    isCommandLineAutoApproved(commandLine: string): ICommandApprovalResultWithReason;
     private _commandMatchesRule;
     private _mapAutoApproveConfigToRules;
     private _convertAutoApproveEntryToRegex;

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

@@ -10,6 +10,7 @@ import { TerminalChatAgentToolsSettingId } from '@codingame/monaco-vscode-a175bd
 import { isPowerShell } from './runInTerminalHelpers.js';
 
 const neverMatchRegex = /(?!.*)/;
+const transientEnvVarRegex = /^[A-Z_][A-Z0-9_]*=/i;
 let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
     constructor(_configurationService) {
         super();
@@ -43,6 +44,12 @@ let CommandLineAutoApprover = class CommandLineAutoApprover extends Disposable {
         this._denyListCommandLineRules = denyListCommandLineRules;
     }
     isCommandAutoApproved(command, shell, os) {
+        if (transientEnvVarRegex.test(command)) {
+            return {
+                result: 'denied',
+                reason: `Command '${command}' is denied because it contains transient environment variables`
+            };
+        }
         for (const rule of this._denyListRules) {
             if (this._commandMatchesRule(rule, command, shell, os)) {
                 return {

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

@@ -33,7 +33,7 @@ export declare class BasicExecuteStrategy implements ITerminalExecuteStrategy {
     private readonly _commandDetection;
     private readonly _logService;
     readonly type = "basic";
-    private _startMarker;
+    private readonly _startMarker;
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
     constructor(_instance: ITerminalInstance, _hasReceivedUserInput: () => boolean, _commandDetection: ICommandDetectionCapability, _logService: ITerminalLogService);

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

@@ -2,7 +2,7 @@
 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 { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore, toDisposable } 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';
@@ -14,6 +14,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
         this._commandDetection = _commandDetection;
         this._logService = _logService;
         this.type = 'basic';
+        this._startMarker = ( new MutableDisposable());
         this._onDidCreateStartMarker = ( new Emitter());
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
     }
@@ -43,10 +44,28 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
             }
             this._log('Waiting for idle');
             await waitForIdle(this._instance.onData, 1000);
-            this._onDidCreateStartMarker.fire(this._startMarker = store.add(xterm.raw.registerMarker()));
-            store.add(this._startMarker.onDispose(() => {
-                this._log(`Start marker was disposed, recreating`);
-                this._onDidCreateStartMarker.fire(this._startMarker = store.add(xterm.raw.registerMarker()));
+            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);
             }));
             if (this._hasReceivedUserInput()) {
                 this._log('Command timed out, sending SIGINT and retrying');
@@ -73,7 +92,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
             }
             if (output === undefined) {
                 try {
-                    output = xterm.getContentsAsText(this._startMarker, endMarker);
+                    output = xterm.getContentsAsText(this._startMarker.value, endMarker);
                     this._log('Fetched output via markers');
                 }
                 catch {

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

@@ -15,7 +15,7 @@ export declare class NoneExecuteStrategy implements ITerminalExecuteStrategy {
     private readonly _hasReceivedUserInput;
     private readonly _logService;
     readonly type = "none";
-    private _startMarker;
+    private readonly _startMarker;
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
     constructor(_instance: ITerminalInstance, _hasReceivedUserInput: () => boolean, _logService: ITerminalLogService);

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

@@ -2,7 +2,7 @@
 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 { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore, toDisposable } 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';
 
@@ -12,6 +12,7 @@ let NoneExecuteStrategy = class NoneExecuteStrategy {
         this._hasReceivedUserInput = _hasReceivedUserInput;
         this._logService = _logService;
         this.type = 'none';
+        this._startMarker = ( new MutableDisposable());
         this._onDidCreateStartMarker = ( new Emitter());
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
     }
@@ -31,10 +32,28 @@ let NoneExecuteStrategy = class NoneExecuteStrategy {
             if (token.isCancellationRequested) {
                 throw ( new CancellationError());
             }
-            this._onDidCreateStartMarker.fire(this._startMarker = store.add(xterm.raw.registerMarker()));
-            store.add(this._startMarker.onDispose(() => {
-                this._log(`Start marker was disposed, recreating`);
-                this._onDidCreateStartMarker.fire(this._startMarker = store.add(xterm.raw.registerMarker()));
+            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);
             }));
             if (this._hasReceivedUserInput()) {
                 this._log('Command timed out, sending SIGINT and retrying');
@@ -53,7 +72,7 @@ let NoneExecuteStrategy = class NoneExecuteStrategy {
             let output;
             const additionalInformationLines = [];
             try {
-                output = xterm.getContentsAsText(this._startMarker, endMarker);
+                output = xterm.getContentsAsText(this._startMarker.value, endMarker);
                 this._log('Fetched output via markers');
             }
             catch {

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

@@ -17,7 +17,7 @@ export declare class RichExecuteStrategy implements ITerminalExecuteStrategy {
     private readonly _commandDetection;
     private readonly _logService;
     readonly type = "rich";
-    private _startMarker;
+    private readonly _startMarker;
     private readonly _onDidCreateStartMarker;
     onDidCreateStartMarker: Event<IXtermMarker | undefined>;
     constructor(_instance: ITerminalInstance, _commandDetection: ICommandDetectionCapability, _logService: ITerminalLogService);

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

@@ -2,7 +2,7 @@
 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 { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { MutableDisposable, DisposableStore, toDisposable } 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';
@@ -13,6 +13,7 @@ let RichExecuteStrategy = class RichExecuteStrategy {
         this._commandDetection = _commandDetection;
         this._logService = _logService;
         this.type = 'rich';
+        this._startMarker = ( new MutableDisposable());
         this._onDidCreateStartMarker = ( new Emitter());
         this.onDidCreateStartMarker = this._onDidCreateStartMarker.event;
     }
@@ -36,10 +37,27 @@ let RichExecuteStrategy = class RichExecuteStrategy {
                     this._log('onDone via idle prompt');
                 }),
             ]);
-            this._onDidCreateStartMarker.fire(this._startMarker = store.add(xterm.raw.registerMarker()));
-            store.add(this._startMarker.onDispose(() => {
-                this._log(`Start marker was disposed, recreating`);
-                this._onDidCreateStartMarker.fire(this._startMarker = store.add(xterm.raw.registerMarker()));
+            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);
             }));
             this._log(`Executing command line \`${commandLine}\``);
             this._instance.runCommand(commandLine, true);
@@ -60,7 +78,7 @@ let RichExecuteStrategy = class RichExecuteStrategy {
             }
             if (output === undefined) {
                 try {
-                    output = xterm.getContentsAsText(this._startMarker, endMarker);
+                    output = xterm.getContentsAsText(this._startMarker.value, endMarker);
                     this._log('Fetched output via markers');
                 }
                 catch {

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

@@ -7,3 +7,4 @@ export declare function generateAutoApproveActions(commandLine: string, subComma
     subCommandResults: ICommandApprovalResultWithReason[];
     commandLineResult: ICommandApprovalResultWithReason;
 }): ToolConfirmationAction[];
+export declare function dedupeRules(rules: ICommandApprovalResultWithReason[]): ICommandApprovalResultWithReason[];

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

@@ -19,6 +19,13 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         const unapprovedSubCommands = subCommands.filter((_, index) => {
             return autoApproveResult.subCommandResults[index].result !== 'approved';
         });
+        const neverAutoApproveCommands = ( new Set([
+            'bash', 'sh', 'zsh', 'fish', 'ksh', 'csh', 'tcsh', 'dash',
+            'pwsh', 'powershell', 'powershell.exe', 'cmd', 'cmd.exe',
+            'python', 'python3', 'node', 'ruby', 'perl', 'php', 'lua',
+            'eval', 'exec', 'source', 'sudo', 'su', 'doas',
+            'curl', 'wget', 'invoke-restmethod', 'invoke-webrequest', 'irm', 'iwr',
+        ]));
         const commandsWithSubcommands = ( new Set(
             ['git', 'npm', 'yarn', 'docker', 'kubectl', 'cargo', 'dotnet', 'mvn', 'gradle']
         ));
@@ -27,6 +34,9 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
             const parts = command.trim().split(/\s+/);
             const baseCommand = parts[0].toLowerCase();
             const baseSubCommand = parts.length > 1 ? `${parts[0]} ${parts[1]}`.toLowerCase() : '';
+            if (( neverAutoApproveCommands.has(baseCommand))) {
+                return undefined;
+            }
             if (( commandsWithSubSubCommands.has(baseSubCommand))) {
                 if (parts.length >= 3 && !parts[2].startsWith('-')) {
                     return `${parts[0]} ${parts[1]} ${parts[2]}`;
@@ -46,11 +56,11 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         if (subCommandsToSuggest.length > 0) {
             let subCommandLabel;
             if (subCommandsToSuggest.length === 1) {
-                subCommandLabel = ( localize(11439, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
+                subCommandLabel = ( localize(11539, 'Always Allow Command: {0}', subCommandsToSuggest[0]));
             }
             else {
                 const commandSeparated = subCommandsToSuggest.join(', ');
-                subCommandLabel = ( localize(11440, 'Always Allow Commands: {0}', commandSeparated));
+                subCommandLabel = ( localize(11540, 'Always Allow Commands: {0}', commandSeparated));
             }
             actions.push({
                 label: subCommandLabel,
@@ -68,7 +78,7 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
             !( commandsWithSubcommands.has(commandLine)) &&
             !( commandsWithSubSubCommands.has(commandLine))) {
             actions.push({
-                label: ( localize(11441, 'Always Allow Exact Command Line')),
+                label: ( localize(11541, 'Always Allow Exact Command Line')),
                 data: {
                     type: 'newRule',
                     rule: {
@@ -86,12 +96,17 @@ function generateAutoApproveActions(commandLine, subCommands, autoApproveResult)
         actions.push(( new Separator()));
     }
     actions.push({
-        label: ( localize(11442, 'Configure Auto Approve...')),
+        label: ( localize(11542, 'Configure Auto Approve...')),
         data: {
             type: 'configure'
         }
     });
     return actions;
 }
+function dedupeRules(rules) {
+    return rules.filter((result, index, array) => {
+        return result.rule && array.findIndex(r => r.rule && r.rule.sourceText === result.rule.sourceText) === index;
+    });
+}
 
-export { generateAutoApproveActions, isPowerShell };
+export { dedupeRules, generateAutoApproveActions, isPowerShell };

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

@@ -31,5 +31,10 @@ export declare class RunInTerminalToolTelemetry {
         inputToolManualAcceptCount: number | undefined;
         inputToolManualRejectCount: number | undefined;
         inputToolManualChars: number | undefined;
+        inputToolAutoAcceptCount: number | undefined;
+        inputToolAutoChars: number | undefined;
+        inputToolManualShownCount: number | undefined;
+        inputToolFreeFormInputShownCount: number | undefined;
+        inputToolFreeFormInputCount: number | undefined;
     }): void;
 }

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

@@ -74,6 +74,9 @@ let RunInTerminalToolTelemetry = class RunInTerminalToolTelemetry {
             inputToolManualAcceptCount: state.inputToolManualAcceptCount ?? 0,
             inputToolManualRejectCount: state.inputToolManualRejectCount ?? 0,
             inputToolManualChars: state.inputToolManualChars ?? 0,
+            inputToolManualShownCount: state.inputToolManualShownCount ?? 0,
+            inputToolFreeFormInputShownCount: state.inputToolFreeFormInputShownCount ?? 0,
+            inputToolFreeFormInputCount: state.inputToolFreeFormInputCount ?? 0,
         });
     }
 };

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

@@ -54,6 +54,9 @@ export declare function collectTerminalResults(terminals: ITerminalInstance[], t
     inputToolManualAcceptCount: number;
     inputToolManualRejectCount: number;
     inputToolManualChars: number;
+    inputToolManualShownCount: number;
+    inputToolFreeFormInputShownCount: number;
+    inputToolFreeFormInputCount: number;
 }>>;
 export declare function taskProblemPollFn(execution: IExecution, token: CancellationToken, taskService: ITaskService): Promise<IPollingResult | undefined>;
 export interface ILinkLocation {