@codingame/monaco-vscode-chat-service-override 24.3.0 → 25.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(10379, 'Contributes remote coding agent integrations to the chat widget.')),
+        description: ( localize(10409, 'Contributes remote coding agent integrations to the chat widget.')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
-                    description: ( localize(10380, 'A unique identifier for this item.')),
+                    description: ( localize(10410, 'A unique identifier for this item.')),
                     type: 'string',
                 },
                 command: {
                     description: ( localize(
-                        10381,
+                        10411,
                         'Identifier of the command to execute. The command must be declared in the "commands" section.'
                     )),
                     type: 'string'
                 },
                 displayName: {
                     description: ( localize(
-                        10382,
+                        10412,
                         'A user-friendly name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localize(10383, 'Description of the remote agent for use in menus and tooltips.')),
+                    description: ( localize(10413, 'Description of the remote agent for use in menus and tooltips.')),
                     type: 'string'
                 },
                 followUpRegex: {
                     description: ( localize(
-                        10384,
+                        10414,
                         '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(10385, 'Condition which must be true to show this item.')),
+                    description: ( localize(10415, 'Condition which must be true to show this item.')),
                     type: 'string'
                 },
             },

package/vscode/src/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.js

@@ -5,7 +5,7 @@ import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event'
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 let RemoteCodingAgentsService = class RemoteCodingAgentsService extends Disposable {

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

@@ -31,6 +31,7 @@
 
 .monaco-workbench .terminal-inline-chat .interactive-session {
 	margin: initial;
+	max-width: unset;
 }
 
 .monaco-workbench .terminal-inline-chat.hide {

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(
-        11951,
+        11976,
         "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(
-        11952,
+        11977,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        11953,
+        11978,
         "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(
-        11954,
+        11979,
         "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(
-        11955,
+        11980,
         'The response can be inspected in the accessible view ({0}).',
         openAccessibleViewKeybinding
     )) : ( localize(
-        11956,
+        11981,
         '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(
-        11957,
+        11982,
         'Reach the response from the input box ({0}).',
         focusResponseKeybinding
     )) : ( localize(
-        11958,
+        11983,
         'Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response.'
     )));
     content.push(focusInputKeybinding ? ( localize(
-        11959,
+        11984,
         'Reach the input box from the response ({0}).',
         focusInputKeybinding
     )) : ( localize(
-        11960,
+        11985,
         'Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input.'
     )));
     content.push(runCommandKeybinding ? ( localize(
-        11961,
+        11986,
         'With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.',
         runCommandKeybinding
     )) : ( localize(
-        11962,
+        11987,
         'Run a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        11963,
+        11988,
         'With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.',
         insertCommandKeybinding
     )) : ( localize(
-        11964,
+        11989,
         'Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(( localize(
-        11965,
+        11990,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        11966,
+        11991,
         "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

@@ -8,9 +8,9 @@ import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { KeybindingWeight, KeybindingsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { ChatAgentLocation, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { AbstractInline1ChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
@@ -33,8 +33,8 @@ import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(11967, 'Open Inline Chat')),
-    category: ( localize2(11968, "Terminal")),
+    title: ( localize2(11992, 'Open Inline Chat')),
+    category: ( localize2(11993, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -76,7 +76,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(11969, 'Close')),
+    title: ( localize2(11994, 'Close')),
     category: AbstractInline1ChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -101,8 +101,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(11970, 'Run Chat Command')),
-    shortTitle: ( localize2(11971, 'Run')),
+    title: ( localize2(11995, 'Run Chat Command')),
+    shortTitle: ( localize2(11996, 'Run')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -130,8 +130,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(11972, 'Run First Chat Command')),
-    shortTitle: ( localize2(11973, 'Run First')),
+    title: ( localize2(11997, 'Run First Chat Command')),
+    shortTitle: ( localize2(11998, 'Run First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -159,8 +159,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(11974, 'Insert Chat Command')),
-    shortTitle: ( localize2(11975, 'Insert')),
+    title: ( localize2(11999, 'Insert Chat Command')),
+    shortTitle: ( localize2(12000, 'Insert')),
     category: AbstractInline1ChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -189,8 +189,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(11976, 'Insert First Chat Command')),
-    shortTitle: ( localize2(11977, 'Insert First')),
+    title: ( localize2(12001, 'Insert First Chat Command')),
+    shortTitle: ( localize2(12002, 'Insert First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -218,7 +218,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(11978, "Rerun Request")),
+    title: ( localize2(12003, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInline1ChatAction.category,
@@ -259,7 +259,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(11979, 'View in Chat')),
+    title: ( localize2(12004, 'View in Chat')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -285,8 +285,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
     constructor() {
         super({
             id: TerminalChatCommandId.ViewHiddenChatTerminals,
-            title: ( localize2(11980, 'View Hidden Chat Terminals')),
-            category: ( localize2(11981, 'Terminal')),
+            title: ( localize2(12005, 'View Hidden Chat Terminals')),
+            category: ( localize2(12006, 'Terminal')),
             f1: true,
             precondition: ( ContextKeyExpr.and(TerminalChatContextKeys.hasHiddenChatTerminals, ChatContextKeys.enabled)),
             menu: [{
@@ -318,7 +318,8 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             }
         }
         const items = [];
-        const lastCommandLocalized = (command) => ( localize2(11982, 'Last: {0}', command)).value;
+        const lastCommandLocalized = (command) => ( localize2(12007, 'Last: {0}', command)).value;
+        const MAX_DETAIL_LENGTH = 80;
         const metas = [];
         for (const instance of ( all.values())) {
             const iconId = instantiationService.invokeFunction(getIconId, instance);
@@ -327,17 +328,32 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
             const chatSessionId = terminalChatService.getChatSessionIdForInstance(instance);
             let chatSessionTitle;
             if (chatSessionId) {
-                const sessionUri = LocalChatSessionUri.forSession(chatSessionId);
-                chatSessionTitle = chatService.getSession(sessionUri)?.title || chatService.getPersistedSessionTitle(sessionUri);
+                chatSessionTitle = chatService.getSessionTitle(LocalChatSessionUri.forSession(chatSessionId));
             }
-            let description;
-            if (chatSessionTitle) {
-                description = `${chatSessionTitle}`;
+            const description = chatSessionTitle;
+            let detail;
+            let tooltip;
+            if (lastCommand) {
+                const commandLines = lastCommand.split('\n');
+                const firstLine = commandLines[0];
+                const displayCommand = firstLine.length > MAX_DETAIL_LENGTH ? firstLine.substring(0, MAX_DETAIL_LENGTH) + '…' : firstLine;
+                detail = lastCommandLocalized(displayCommand);
+                const wasTruncated = firstLine.length > MAX_DETAIL_LENGTH;
+                const hasMultipleLines = commandLines.length > 1;
+                if (wasTruncated || hasMultipleLines) {
+                    if (hasMultipleLines) {
+                        tooltip = { value: `\`\`\`\n${lastCommand}\n\`\`\``, supportThemeIcons: true };
+                    }
+                    else {
+                        tooltip = lastCommandLocalized(lastCommand);
+                    }
+                }
             }
             metas.push({
                 label,
                 description,
-                detail: lastCommand ? lastCommandLocalized(lastCommand) : undefined,
+                detail,
+                tooltip,
                 id: String(instance.instanceId),
             });
         }
@@ -346,14 +362,15 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
                 label: m.label,
                 description: m.description,
                 detail: m.detail,
+                tooltip: m.tooltip,
                 id: m.id
             });
         }
         const qp = quickInputService.createQuickPick();
-        qp.placeholder = ( localize2(11983, 'Select a chat terminal to show and focus')).value;
+        qp.placeholder = ( localize2(12008, 'Select a chat terminal to show and focus')).value;
         qp.items = items;
         qp.canSelectMany = false;
-        qp.title = ( localize2(11984, 'Chat Terminals')).value;
+        qp.title = ( localize2(12009, 'Chat Terminals')).value;
         qp.matchOnDescription = true;
         qp.matchOnDetail = true;
         const qpDisposables = ( new DisposableStore());
@@ -366,7 +383,7 @@ registerAction2(class ShowChatTerminalsAction extends Action2 {
                     terminalService.setActiveInstance(instance);
                     await terminalService.revealTerminal(instance);
                     qp.hide();
-                    terminalService.focusInstance(instance);
+                    await terminalService.focusInstance(instance);
                 }
                 else {
                     qp.hide();
@@ -414,14 +431,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminal,
-        title: ( localize(11985, 'Chat: Focus Most Recent Terminal')),
+        title: ( localize(12010, 'Chat: Focus Most Recent Terminal')),
     },
     when: ChatContextKeys.inChatSession
 });
 MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
     command: {
         id: TerminalChatCommandId.FocusMostRecentChatTerminalOutput,
-        title: ( localize(11986, 'Chat: Focus Most Recent Terminal Output')),
+        title: ( localize(12011, 'Chat: Focus Most Recent Terminal Output')),
     },
     when: ChatContextKeys.inChatSession
 });

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

@@ -5,7 +5,7 @@ import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/l
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IChatCodeBlockContextProviderService, IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
 import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { TerminalChatWidget } from './terminalChatWidget.js';

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

@@ -1,5 +1,5 @@
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
 export declare class TerminalChatEnabler {
     static Id: string;
     private readonly _ctxHasProvider;

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

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 

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

@@ -6,7 +6,7 @@ import { ITerminalChatService } from "@codingame/monaco-vscode-api/vscode/vs/wor
 import { ITerminalService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 /**
  * Used to manage chat tool invocations and the underlying terminal instances they create/use.
  */
@@ -40,6 +40,12 @@ export declare class TerminalChatService extends Disposable implements ITerminal
      * approval that lasts only for the duration of the session.
      */
     private readonly _sessionAutoApprovalEnabled;
+    /**
+     * Tracks session-scoped auto-approve rules per chat session. These are temporary rules that
+     * last only for the duration of the chat session (not persisted to disk).
+     * Map<chatSessionId, Record<ruleKey, ruleValue>>
+     */
+    private readonly _sessionAutoApproveRules;
     constructor(_logService: ILogService, _terminalService: ITerminalService, _storageService: IStorageService, _contextKeyService: IContextKeyService, _chatService: IChatService);
     registerTerminalInstanceWithToolSession(terminalToolSessionId: string | undefined, instance: ITerminalInstance): void;
     getTerminalInstanceByToolSessionId(terminalToolSessionId: string | undefined): Promise<ITerminalInstance | undefined>;
@@ -61,4 +67,12 @@ export declare class TerminalChatService extends Disposable implements ITerminal
     private _updateHasToolTerminalContextKeys;
     setChatSessionAutoApproval(chatSessionId: string, enabled: boolean): void;
     hasChatSessionAutoApproval(chatSessionId: string): boolean;
+    addSessionAutoApproveRule(chatSessionId: string, key: string, value: boolean | {
+        approve: boolean;
+        matchCommandLine?: boolean;
+    }): void;
+    getSessionAutoApproveRules(chatSessionId: string): Readonly<Record<string, boolean | {
+        approve: boolean;
+        matchCommandLine?: boolean;
+    }>>;
 }

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

@@ -7,9 +7,9 @@ import { ITerminalService } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 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 { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { TerminalChatContextKeys } from '@codingame/monaco-vscode-xterm-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
-import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
+import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
 import { isNumber, isString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 
 var StorageKeys;
@@ -35,9 +35,18 @@ let TerminalChatService = class TerminalChatService extends Disposable {
         this._activeProgressParts = ( new Set());
         this._pendingRestoredMappings = ( new Map());
         this._sessionAutoApprovalEnabled = ( new Set());
+        this._sessionAutoApproveRules = ( new Map());
         this._hasToolTerminalContext = TerminalChatContextKeys.hasChatTerminals.bindTo(this._contextKeyService);
         this._hasHiddenToolTerminalContext = TerminalChatContextKeys.hasHiddenChatTerminals.bindTo(this._contextKeyService);
         this._restoreFromStorage();
+        this._register(this._chatService.onDidDisposeSession(e => {
+            for (const resource of e.sessionResource) {
+                const sessionId = LocalChatSessionUri.parseLocalSessionId(resource);
+                if (sessionId) {
+                    this._sessionAutoApproveRules.delete(sessionId);
+                }
+            }
+        }));
     }
     registerTerminalInstanceWithToolSession(terminalToolSessionId, instance) {
         if (!terminalToolSessionId) {
@@ -55,16 +64,18 @@ let TerminalChatService = class TerminalChatService extends Disposable {
             this._updateHasToolTerminalContextKeys();
         }));
         this._register(this._chatService.onDidDisposeSession(e => {
-            if (LocalChatSessionUri.parseLocalSessionId(e.sessionResource) === terminalToolSessionId) {
-                this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
-                this._toolSessionIdByTerminalInstance.delete(instance);
-                this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
-                const sessionId = LocalChatSessionUri.parseLocalSessionId(e.sessionResource);
-                if (sessionId) {
-                    this._sessionAutoApprovalEnabled.delete(sessionId);
+            for (const resource of e.sessionResource) {
+                if (LocalChatSessionUri.parseLocalSessionId(resource) === terminalToolSessionId) {
+                    this._terminalInstancesByToolSessionId.delete(terminalToolSessionId);
+                    this._toolSessionIdByTerminalInstance.delete(instance);
+                    this._terminalInstanceListenersByToolSessionId.deleteAndDispose(terminalToolSessionId);
+                    const sessionId = LocalChatSessionUri.parseLocalSessionId(resource);
+                    if (sessionId) {
+                        this._sessionAutoApprovalEnabled.delete(sessionId);
+                    }
+                    this._persistToStorage();
+                    this._updateHasToolTerminalContextKeys();
                 }
-                this._persistToStorage();
-                this._updateHasToolTerminalContextKeys();
             }
         }));
         this._register(this._terminalService.onDidChangeInstances(() => this._updateHasToolTerminalContextKeys()));
@@ -252,6 +263,17 @@ let TerminalChatService = class TerminalChatService extends Disposable {
     hasChatSessionAutoApproval(chatSessionId) {
         return ( this._sessionAutoApprovalEnabled.has(chatSessionId));
     }
+    addSessionAutoApproveRule(chatSessionId, key, value) {
+        let sessionRules = this._sessionAutoApproveRules.get(chatSessionId);
+        if (!sessionRules) {
+            sessionRules = {};
+            this._sessionAutoApproveRules.set(chatSessionId, sessionRules);
+        }
+        sessionRules[key] = value;
+    }
+    getSessionAutoApproveRules(chatSessionId) {
+        return this._sessionAutoApproveRules.get(chatSessionId) ?? {};
+    }
 };
 TerminalChatService = ( __decorate([
     ( __param(0, ILogService)),

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

@@ -8,9 +8,9 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IChatAcceptInputOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat";
 import { IChatWidgetService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service";
-import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service";
-import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel";
-import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service";
+import { IChatAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service";
+import { IChatResponseModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel";
+import { IChatService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service";
 import { InlineChatWidget } from "@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget";
 import { ITerminalInstance, type IXtermTerminal } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
 export declare class TerminalChatWidget extends Disposable {
@@ -38,6 +38,7 @@ export declare class TerminalChatWidget extends Disposable {
     get lastResponseContent(): string | undefined;
     private _terminalAgentName;
     private readonly _model;
+    private readonly _sessionDisposables;
     private _sessionCtor;
     private _currentRequestId;
     private _activeRequestCts?;

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

@@ -15,10 +15,10 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 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 { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/participants/chatAgents.service';
+import { isCellTextEditOperationArray } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ChatMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModes';
-import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
+import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { InlineChatWidget } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatWidget';
 import { MENU_INLINE_CHAT_WIDGET_SECONDARY } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
@@ -68,6 +68,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
         this._viewStateStorageKey = 'terminal-inline-chat-view-state';
         this._terminalAgentName = 'terminal';
         this._model = this._register(( new MutableDisposable()));
+        this._sessionDisposables = this._register(( new MutableDisposable()));
         this._requestInProgress = observableValue(this, false);
         this.requestInProgress = this._requestInProgress;
         this._focusedContextKey = TerminalChatContextKeys.focused.bindTo(contextKeyService);
@@ -164,7 +165,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
     }
     _resetPlaceholder() {
         const defaultAgent = this._chatAgentService.getDefaultAgent(ChatAgentLocation.Terminal);
-        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11987, 'Ask about commands'));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(12012, 'Ask about commands'));
     }
     async reveal() {
         await this._createSession();
@@ -262,7 +263,7 @@ let TerminalChatWidget = class TerminalChatWidget extends Disposable {
                 this._resetPlaceholder();
             }
         });
-        this._register(toDisposable(() => this._sessionCtor?.cancel()));
+        this._sessionDisposables.value = toDisposable(() => this._sessionCtor?.cancel());
     }
     _saveViewState() {
         const viewState = this._inlineChatWidget.chatWidget.getViewState();

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

@@ -1,2 +1,2 @@
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 export declare function getRecommendedToolsOverRunInTerminal(commandLine: string, languageModelToolsService: ILanguageModelToolsService): string | undefined;

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

@@ -6,7 +6,7 @@ import { MutableDisposable, DisposableStore } from '@codingame/monaco-vscode-api
 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';
+import { createAltBufferPromise, setupRecreatingStartMarker } from './strategyHelpers.js';
 
 let BasicExecuteStrategy = class BasicExecuteStrategy {
     constructor(_instance, _hasReceivedUserInput, _commandDetection, _logService) {
@@ -50,6 +50,7 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
             if (!xterm) {
                 throw ( new Error('Xterm is not available'));
             }
+            const alternateBufferPromise = createAltBufferPromise(xterm, store, this._log.bind(this));
             this._log('Waiting for idle');
             await waitForIdle(this._instance.onData, 1000);
             setupRecreatingStartMarker(xterm, this._startMarker, m => this._onDidCreateStartMarker.fire(m), store, this._log.bind(this));
@@ -64,10 +65,19 @@ let BasicExecuteStrategy = class BasicExecuteStrategy {
             this._log(`Executing command line \`${commandLine}\``);
             this._instance.sendText(commandLine, true);
             this._log('Waiting for done event');
-            const onDoneResult = await onDone;
+            const onDoneResult = await Promise.race([onDone, alternateBufferPromise.then(() => ({ type: 'alternateBuffer' }))]);
             if (onDoneResult && onDoneResult.type === 'disposal') {
                 throw ( new Error('The terminal was closed'));
             }
+            if (onDoneResult && onDoneResult.type === 'alternateBuffer') {
+                this._log('Detected alternate buffer entry, skipping output capture');
+                return {
+                    output: undefined,
+                    exitCode: undefined,
+                    error: 'alternateBuffer',
+                    didEnterAltBuffer: true
+                };
+            }
             const finishedCommand = onDoneResult && onDoneResult.type === 'success' ? onDoneResult.command : undefined;
             if (finishedCommand) {
                 this._log(`Finished command id=${finishedCommand.id ?? 'none'} for requested=${commandId ?? 'none'}`);

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

@@ -20,6 +20,7 @@ export interface ITerminalExecuteStrategyResult {
     additionalInformation?: string;
     exitCode?: number;
     error?: string;
+    didEnterAltBuffer?: boolean;
 }
 export declare function waitForIdle(onData: Event<unknown>, idleDurationMs: number): Promise<void>;
 export interface IPromptDetectionResult {