@codingame/monaco-vscode-chat-service-override 20.5.0 → 21.0.1

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatCurrentLine.js

@@ -40,8 +40,8 @@ import { INSTRUCTIONS_LANGUAGE_ID, PROMPT_LANGUAGE_ID } from '@codingame/monaco-
 import { MODE_FILE_EXTENSION } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/common/promptSyntax/config/promptFileLocations';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableFromEvent';
-import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 var InlineChatHintsController_1;
 registerCss(inlineChat);
@@ -53,14 +53,14 @@ const IGNORED_LANGUAGE_IDS = ( new Set([
     PROMPT_LANGUAGE_ID,
     MODE_FILE_EXTENSION
 ]));
-const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7685, "Whether inline chat shows a contextual hint"))));
+const CTX_INLINE_CHAT_SHOWING_HINT = ( new RawContextKey('inlineChatShowingHint', false, ( localize(7831, "Whether inline chat shows a contextual hint"))));
 const _inlineChatActionId = 'inlineChat.startWithCurrentLine';
 class InlineChatExpandLineAction extends EditorAction2 {
     constructor() {
         super({
             id: _inlineChatActionId,
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7686, "Start in Editor with Current Line")),
+            title: ( localize2(7832, "Start in Editor with Current Line")),
             f1: true,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
             keybinding: [{
@@ -103,7 +103,7 @@ class ShowInlineChatHintAction extends EditorAction2 {
         super({
             id: 'inlineChat.showHint',
             category: AbstractInline1ChatAction.category,
-            title: ( localize2(7687, "Show Inline Chat Hint")),
+            title: ( localize2(7833, "Show Inline Chat Hint")),
             f1: false,
             precondition: ( ContextKeyExpr.and(( CTX_INLINE_CHAT_VISIBLE.negate()), CTX_INLINE_CHAT_HAS_AGENT, EditorContextKeys.writable)),
         });
@@ -231,15 +231,15 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
                 this._ctxShowingHint.reset();
                 return;
             }
-            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7688, "Chat"));
+            const agentName = chatAgentService.getDefaultAgent(ChatAgentLocation.Editor)?.name ?? ( localize(7834, "Chat"));
             const { position, isEol, isWhitespace, kb, model } = showData;
             const inlineClassName = ['a' , 'inline-chat-hint', 'inline-chat-hint-text'];
             let content;
             if (isWhitespace) {
-                content = '\u00a0' + ( localize(7689, "{0} to edit with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7835, "{0} to edit with {1}", kb, agentName));
             }
             else if (isEol) {
-                content = '\u00a0' + ( localize(7690, "{0} to continue with {1}", kb, agentName));
+                content = '\u00a0' + ( localize(7836, "{0} to continue with {1}", kb, agentName));
             }
             else {
                 content = '\u200a' + kb + '\u200a';
@@ -268,7 +268,7 @@ let InlineChatHintsController = class InlineChatHintsController extends Disposab
             getActions: () => [
                 toAction({
                     id: 'inlineChat.disableHint',
-                    label: ( localize(7691, "Disable Inline Chat Hint")),
+                    label: ( localize(7837, "Disable Inline Chat Hint")),
                     run: async () => {
                         await this._configurationService.updateValue(setting, false);
                     }
@@ -296,7 +296,7 @@ class HideInlineChatHintAction extends EditorAction2 {
     constructor() {
         super({
             id: 'inlineChat.hideHint',
-            title: ( localize2(7692, "Hide Inline Chat Hint")),
+            title: ( localize2(7838, "Hide Inline Chat Hint")),
             precondition: CTX_INLINE_CHAT_SHOWING_HINT,
             keybinding: {
                 weight: KeybindingWeight.EditorContrib - 10,

package/vscode/src/vs/workbench/contrib/remoteCodingAgents/browser/remoteCodingAgents.contribution.d.ts

@@ -1,9 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { IRemoteCodingAgentsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/remoteCodingAgents/common/remoteCodingAgentsService.service";
 export declare class RemoteCodingAgentsContribution extends Disposable implements IWorkbenchContribution {
-    private readonly logService;
     private readonly remoteCodingAgentsService;
-    constructor(logService: ILogService, remoteCodingAgentsService: IRemoteCodingAgentsService);
+    constructor(remoteCodingAgentsService: IRemoteCodingAgentsService);
 }

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

@@ -3,7 +3,6 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
-import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
@@ -14,42 +13,42 @@ import { IRemoteCodingAgentsService } from '@codingame/monaco-vscode-api/vscode/
 const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'remoteCodingAgents',
     jsonSchema: {
-        description: ( localize(9713, 'Contributes remote coding agent integrations to the chat widget.')),
+        description: ( localize(9875, 'Contributes remote coding agent integrations to the chat widget.')),
         type: 'array',
         items: {
             type: 'object',
             properties: {
                 id: {
-                    description: ( localize(9714, 'A unique identifier for this item.')),
+                    description: ( localize(9876, 'A unique identifier for this item.')),
                     type: 'string',
                 },
                 command: {
                     description: ( localize(
-                        9715,
+                        9877,
                         'Identifier of the command to execute. The command must be declared in the "commands" section.'
                     )),
                     type: 'string'
                 },
                 displayName: {
                     description: ( localize(
-                        9716,
+                        9878,
                         'A user-friendly name for this item which is used for display in menus.'
                     )),
                     type: 'string'
                 },
                 description: {
-                    description: ( localize(9717, 'Description of the remote agent for use in menus and tooltips.')),
+                    description: ( localize(9879, 'Description of the remote agent for use in menus and tooltips.')),
                     type: 'string'
                 },
                 followUpRegex: {
                     description: ( localize(
-                        9718,
+                        9880,
                         '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(9719, 'Condition which must be true to show this item.')),
+                    description: ( localize(9881, 'Condition which must be true to show this item.')),
                     type: 'string'
                 },
             },
@@ -58,9 +57,8 @@ const extensionPoint = ExtensionsRegistry.registerExtensionPoint({
     }
 });
 let RemoteCodingAgentsContribution = class RemoteCodingAgentsContribution extends Disposable {
-    constructor(logService, remoteCodingAgentsService) {
+    constructor(remoteCodingAgentsService) {
         super();
-        this.logService = logService;
         this.remoteCodingAgentsService = remoteCodingAgentsService;
         extensionPoint.setHandler(extensions => {
             for (const ext of extensions) {
@@ -83,7 +81,6 @@ let RemoteCodingAgentsContribution = class RemoteCodingAgentsContribution extend
                         followUpRegex: contribution.followUpRegex,
                         when: contribution.when
                     };
-                    this.logService.info(`Registering remote coding agent: ${agent.displayName} (${agent.command})`);
                     this.remoteCodingAgentsService.registerAgent(agent);
                 }
             }
@@ -91,8 +88,7 @@ let RemoteCodingAgentsContribution = class RemoteCodingAgentsContribution extend
     }
 };
 RemoteCodingAgentsContribution = ( __decorate([
-    ( __param(0, ILogService)),
-    ( __param(1, IRemoteCodingAgentsService))
+    ( __param(0, IRemoteCodingAgentsService))
 ], RemoteCodingAgentsContribution));
 const workbenchRegistry = ( Registry.as(Extensions.Workbench));
 workbenchRegistry.registerWorkbenchContribution(RemoteCodingAgentsContribution, LifecyclePhase.Restored);

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(
-        11227,
+        11395,
         "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(
-        11228,
+        11396,
         "It can be activated using the command: Terminal: Start Chat ({0}), which will focus the input box.",
         startChatKeybinding
     )));
     content.push(makeRequestKeybinding ? ( localize(
-        11229,
+        11397,
         "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(
-        11230,
+        11398,
         "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(
-        11231,
+        11399,
         'The response can be inspected in the accessible view ({0}).',
         openAccessibleViewKeybinding
     )) : ( localize(
-        11232,
+        11400,
         '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(
-        11233,
+        11401,
         'Reach the response from the input box ({0}).',
         focusResponseKeybinding
     )) : ( localize(
-        11234,
+        11402,
         'Reach the response from the input box by tabbing or assigning a keybinding for the command: Focus Terminal Response.'
     )));
     content.push(focusInputKeybinding ? ( localize(
-        11235,
+        11403,
         'Reach the input box from the response ({0}).',
         focusInputKeybinding
     )) : ( localize(
-        11236,
+        11404,
         'Reach the response from the input box by shift+tabbing or assigning a keybinding for the command: Focus Terminal Input.'
     )));
     content.push(runCommandKeybinding ? ( localize(
-        11237,
+        11405,
         'With focus in the input box or command editor, the Terminal: Run Chat Command ({0}) action.',
         runCommandKeybinding
     )) : ( localize(
-        11238,
+        11406,
         'Run a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(insertCommandKeybinding ? ( localize(
-        11239,
+        11407,
         'With focus in the input box command editor, the Terminal: Insert Chat Command ({0}) action.',
         insertCommandKeybinding
     )) : ( localize(
-        11240,
+        11408,
         'Insert a command by tabbing to the button as the action is currently not triggerable by a keybinding.'
     )));
     content.push(( localize(
-        11241,
+        11409,
         "Use tab to reach conditional parts like commands, status, message responses and more."
     )));
     content.push(( localize(
-        11242,
+        11410,
         "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

@@ -12,15 +12,16 @@ import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 import { AbstractInline1ChatAction } from '../../../inlineChat/browser/inlineChatActions.js';
 import { isDetachedTerminalInstance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
 import { registerActiveXtermAction } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
-import { TerminalContextKeys } from '@codingame/monaco-vscode-262ed59d-4f76-57cd-9e9f-1877f26ae049-common/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
+import { TerminalContextMenuGroup } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common/vscode/vs/workbench/contrib/terminal/browser/terminalMenus';
+import { TerminalContextKeys } from '@codingame/monaco-vscode-b6d52a6d-8c8e-51f5-bcd2-1722295e31d9-common/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
 import { TerminalChatContextKeys, TerminalChatCommandId, MENU_TERMINAL_CHAT_WIDGET_STATUS } from '@codingame/monaco-vscode-07eaa805-9dea-5ec6-a422-a4f04872424d-common/vscode/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat';
 import { TerminalChatController } from './terminalChatController.js';
 import { activeChatController } from './terminalChatControllerHolder.js';
 
 registerActiveXtermAction({
     id: TerminalChatCommandId.Start,
-    title: ( localize2(11243, 'Terminal Inline Chat')),
-    category: AbstractInline1ChatAction.category,
+    title: ( localize2(11411, 'Open Inline Chat')),
+    category: ( localize2(11412, "Terminal")),
     keybinding: {
         primary: KeyMod.CtrlCmd | KeyCode.KeyI,
         when: ( ContextKeyExpr.and(TerminalContextKeys.focusInAny)),
@@ -32,9 +33,10 @@ registerActiveXtermAction({
         TerminalContextKeys.terminalHasBeenCreated
     )), TerminalChatContextKeys.hasChatAgent)),
     menu: {
-        id: MenuId.ChatTerminalMenu,
-        group: 'copilot',
-        order: 1
+        id: MenuId.TerminalInstanceContext,
+        group: TerminalContextMenuGroup.Chat,
+        order: 2,
+        when: ChatContextKeys.enabled
     },
     run: (_xterm, _accessor, activeInstance, opts) => {
         if (isDetachedTerminalInstance(activeInstance)) {
@@ -55,7 +57,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.Close,
-    title: ( localize2(11244, 'Close')),
+    title: ( localize2(11413, 'Close')),
     category: AbstractInline1ChatAction.category,
     keybinding: {
         primary: KeyCode.Escape,
@@ -80,8 +82,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunCommand,
-    title: ( localize2(11245, 'Run Chat Command')),
-    shortTitle: ( localize2(11246, 'Run')),
+    title: ( localize2(11414, 'Run Chat Command')),
+    shortTitle: ( localize2(11415, 'Run')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -109,8 +111,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RunFirstCommand,
-    title: ( localize2(11247, 'Run First Chat Command')),
-    shortTitle: ( localize2(11248, 'Run First')),
+    title: ( localize2(11416, 'Run First Chat Command')),
+    shortTitle: ( localize2(11417, 'Run First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -138,8 +140,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertCommand,
-    title: ( localize2(11249, 'Insert Chat Command')),
-    shortTitle: ( localize2(11250, 'Insert')),
+    title: ( localize2(11418, 'Insert Chat Command')),
+    shortTitle: ( localize2(11419, 'Insert')),
     category: AbstractInline1ChatAction.category,
     icon: Codicon.insert,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
@@ -168,8 +170,8 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.InsertFirstCommand,
-    title: ( localize2(11251, 'Insert First Chat Command')),
-    shortTitle: ( localize2(11252, 'Insert First')),
+    title: ( localize2(11420, 'Insert First Chat Command')),
+    shortTitle: ( localize2(11421, 'Insert First')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
@@ -197,7 +199,7 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.RerunRequest,
-    title: ( localize2(11253, "Rerun Request")),
+    title: ( localize2(11422, "Rerun Request")),
     f1: false,
     icon: Codicon.refresh,
     category: AbstractInline1ChatAction.category,
@@ -238,13 +240,13 @@ registerActiveXtermAction({
 });
 registerActiveXtermAction({
     id: TerminalChatCommandId.ViewInChat,
-    title: ( localize2(11254, 'View in Chat')),
+    title: ( localize2(11423, 'View in Chat')),
     category: AbstractInline1ChatAction.category,
     precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ContextKeyExpr.or(
         TerminalContextKeys.processSupported,
         TerminalContextKeys.terminalHasBeenCreated
     )), ( TerminalChatContextKeys.requestActive.negate()))),
-    icon: Codicon.commentDiscussion,
+    icon: Codicon.chatSparkle,
     menu: [{
             id: MENU_TERMINAL_CHAT_WIDGET_STATUS,
             group: 'zzz',

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

@@ -7,6 +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";
 export declare class TerminalChatController extends Disposable implements ITerminalContribution {
     private readonly _ctx;
     private readonly _contextKeyService;
@@ -27,7 +28,7 @@ export declare class TerminalChatController extends Disposable implements ITermi
     private _lastResponseContent;
     get lastResponseContent(): string | undefined;
     get scopedContextKeyService(): IContextKeyService;
-    constructor(_ctx: ITerminalContributionContext, chatCodeBlockContextProviderService: IChatCodeBlockContextProviderService, _contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, _terminalService: ITerminalService);
+    constructor(_ctx: ITerminalContributionContext, chatCodeBlockContextProviderService: IChatCodeBlockContextProviderService, chatEntitlementService: IChatEntitlementService, _contextKeyService: IContextKeyService, _instantiationService: IInstantiationService, _terminalService: ITerminalService);
     xtermReady(xterm: IXtermTerminal & {
         raw: RawXtermTerminal;
     }): void;

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

@@ -11,6 +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 { setActiveChatController } from './terminalChatControllerHolder.js';
 
 var TerminalChatController_1;
@@ -27,13 +28,18 @@ let TerminalChatController = class TerminalChatController extends Disposable {
     get scopedContextKeyService() {
         return this._terminalChatWidget?.value.inlineChatWidget.scopedContextKeyService ?? this._contextKeyService;
     }
-    constructor(_ctx, chatCodeBlockContextProviderService, _contextKeyService, _instantiationService, _terminalService) {
+    constructor(_ctx, chatCodeBlockContextProviderService, chatEntitlementService, _contextKeyService, _instantiationService, _terminalService) {
         super();
         this._ctx = _ctx;
         this._contextKeyService = _contextKeyService;
         this._instantiationService = _instantiationService;
         this._terminalService = _terminalService;
         this._forcedPlaceholder = undefined;
+        this._register(chatEntitlementService.onDidChangeSentiment(() => {
+            if (chatEntitlementService.sentiment.hidden) {
+                this._terminalChatWidget?.value.clear();
+            }
+        }));
         this._register(chatCodeBlockContextProviderService.registerProvider({
             getCodeBlockContext: (editor) => {
                 if (!editor || !this._terminalChatWidget?.hasValue || !this.hasFocus()) {
@@ -110,9 +116,10 @@ let TerminalChatController = class TerminalChatController extends Disposable {
 };
 TerminalChatController = TerminalChatController_1 = ( __decorate([
     ( __param(1, IChatCodeBlockContextProviderService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, ITerminalService))
+    ( __param(2, IChatEntitlementService)),
+    ( __param(3, IContextKeyService)),
+    ( __param(4, IInstantiationService)),
+    ( __param(5, ITerminalService))
 ], TerminalChatController));
 async function moveToPanelChat(accessor, model) {
     const viewsService = accessor.get(IViewsService);

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(11255, 'Ask about commands'));
+        this.inlineChatWidget.placeholder = defaultAgent?.description ?? ( localize(11424, 'Ask about commands'));
     }
     async reveal(viewState) {
         await this._createSession(viewState);

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

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

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

@@ -46,12 +46,7 @@ function getRecommendedToolsOverRunInTerminal(commandLine, languageModelToolsSer
     });
     if (recommendedTools.size) {
         previouslyRecommededInSession = true;
-        return {
-            content: [{
-                    kind: 'text',
-                    value: messages.join('  \n')
-                }],
-        };
+        return messages.join('  \n');
     }
     return undefined;
 }

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

@@ -1,6 +1,18 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import type { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+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";
+export interface IAutoApproveRule {
+    regex: RegExp;
+    regexCaseInsensitive: RegExp;
+    sourceText: string;
+    sourceTarget: ConfigurationTarget;
+    isDefaultRule: boolean;
+}
+export interface ICommandApprovalResultWithReason {
+    result: ICommandApprovalResult;
+    reason: string;
+}
 export type ICommandApprovalResult = "approved" | "denied" | "noMatch";
 export declare class CommandLineAutoApprover extends Disposable {
     private readonly _configurationService;
@@ -12,13 +24,16 @@ export declare class CommandLineAutoApprover extends Disposable {
     updateConfiguration(): void;
     isCommandAutoApproved(command: string, shell: string, os: OperatingSystem): {
         result: ICommandApprovalResult;
+        rule?: IAutoApproveRule;
         reason: string;
     };
     isCommandLineAutoApproved(commandLine: string): {
         result: ICommandApprovalResult;
+        rule?: IAutoApproveRule;
         reason: string;
     };
-    private _commandMatchesRegex;
+    private _commandMatchesRule;
     private _mapAutoApproveConfigToRules;
     private _convertAutoApproveEntryToRegex;
+    private _doConvertAutoApproveEntryToRegex;
 }