@codingame/monaco-vscode-chat-service-override 6.0.3 → 7.0.0

package/chat.js

@@ -24,6 +24,8 @@ import { InlineChatSessionServiceImpl } from 'vscode/vscode/vs/workbench/contrib
 import { LanguageModelStatsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModelStats.js';
 import './vscode/src/vs/workbench/contrib/chat/browser/chat.contribution.js';
 import './vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.contribution.js';
+import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { LanguageModelToolsService } from './vscode/src/vs/workbench/contrib/chat/common/languageModelToolsService.js';
 
 function getServiceOverride() {
     return {
@@ -40,7 +42,8 @@ function getServiceOverride() {
         [( IInlineChatSavingService.toString())]: new SyncDescriptor(InlineChatSavingServiceImpl, [], true),
         [( IChatCodeBlockContextProviderService.toString())]: new SyncDescriptor(ChatCodeBlockContextProviderService, [], true),
         [( ILanguageModelStatsService.toString())]: new SyncDescriptor(LanguageModelStatsService, [], true),
-        [( IChatAgentNameService.toString())]: new SyncDescriptor(ChatAgentNameService, [], true)
+        [( IChatAgentNameService.toString())]: new SyncDescriptor(ChatAgentNameService, [], true),
+        [( ILanguageModelToolsService.toString())]: new SyncDescriptor(LanguageModelToolsService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "6.0.3",
+  "version": "7.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@6.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@7.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatCodeblockActions.js

@@ -9,12 +9,16 @@ import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextK
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { CopyAction } from 'vscode/vscode/vs/editor/contrib/clipboard/browser/clipboard';
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/terminal';
 import { accessibleViewInCodeBlock } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -29,6 +33,7 @@ import { NOTEBOOK_EDITOR_ID, CellKind } from 'vscode/vscode/vs/workbench/contrib
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatCodeblockActions";
 function isCodeBlockActionContext(thing) {
@@ -147,7 +152,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2WithPath(_moduleId, 1, "Insert at Cursor")),
+                title: ( localize2WithPath(_moduleId, 1, "Apply in Editor")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -218,10 +223,11 @@ function registerChatCodeBlockActions() {
             this.notifyUserAction(accessor, codeBlockActionContext);
             const bulkEditService = accessor.get(IBulkEditService);
             const codeEditorService = accessor.get(ICodeEditorService);
+            const progressService = accessor.get(IProgressService);
+            const notificationService = accessor.get(INotificationService);
             const mappedEditsProviders = accessor.get(ILanguageFeaturesService).mappedEditsProvider.ordered(activeModel);
             let mappedEdits = null;
             if (mappedEditsProviders.length > 0) {
-                const mostRelevantProvider = mappedEditsProviders[0];
                 const docRefs = [];
                 if (codeEditor.hasModel()) {
                     const model = codeEditor.getModel();
@@ -243,9 +249,27 @@ function registerChatCodeBlockActions() {
                     docRefs.push(usedDocuments);
                 }
                 const cancellationTokenSource = ( (new CancellationTokenSource()));
-                mappedEdits = await mostRelevantProvider.provideMappedEdits(activeModel, [codeBlockActionContext.code], { documents: docRefs }, cancellationTokenSource.token);
+                try {
+                    mappedEdits = await progressService.withProgress({ location: ProgressLocation.Notification, delay: 500, sticky: true, cancellable: true }, async (progress) => {
+                        progress.report({ message: ( localizeWithPath(_moduleId, 2, "Applying code block...")) });
+                        for (const provider of mappedEditsProviders) {
+                            const mappedEdits = await provider.provideMappedEdits(activeModel, [codeBlockActionContext.code], { documents: docRefs }, cancellationTokenSource.token);
+                            if (mappedEdits) {
+                                return mappedEdits;
+                            }
+                        }
+                        return null;
+                    }, () => cancellationTokenSource.cancel());
+                }
+                catch (e) {
+                    notificationService.notify({ severity: Severity$1.Error, message: ( localizeWithPath(_moduleId, 3, "Failed to apply code block: {0}", e.message)) });
+                }
+                finally {
+                    cancellationTokenSource.dispose();
+                }
             }
             if (mappedEdits) {
+                console.log('Mapped edits:', mappedEdits);
                 await bulkEditService.apply(mappedEdits);
             }
             else {
@@ -280,7 +304,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2WithPath(_moduleId, 2, "Insert into New File")),
+                title: ( localize2WithPath(_moduleId, 4, "Insert into New File")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -328,7 +352,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2WithPath(_moduleId, 3, "Insert into Terminal")),
+                title: ( localize2WithPath(_moduleId, 5, "Insert into Terminal")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -413,7 +437,7 @@ function registerChatCodeBlockActions() {
         const currentResponse = curCodeBlockInfo ?
             curCodeBlockInfo.element :
             (focusedResponse ?? widget.viewModel?.getItems().reverse().find((item) => isResponseVM(item)));
-        if (!currentResponse) {
+        if (!currentResponse || !isResponseVM(currentResponse)) {
             return;
         }
         widget.reveal(currentResponse);
@@ -427,7 +451,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2WithPath(_moduleId, 4, "Next Code Block")),
+                title: ( localize2WithPath(_moduleId, 6, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -447,7 +471,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2WithPath(_moduleId, 5, "Previous Code Block")),
+                title: ( localize2WithPath(_moduleId, 7, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -503,7 +527,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2WithPath(_moduleId, 6, "Apply Edits")),
+                title: ( localize2WithPath(_moduleId, 8, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.check,
@@ -513,7 +537,8 @@ function registerChatCodeCompareBlockActions() {
                 ))),
                 menu: {
                     id: MenuId.ChatCompareBlock,
-                    group: 'navigation'
+                    group: 'navigation',
+                    order: 1,
                 }
             });
         }
@@ -528,6 +553,31 @@ function registerChatCodeCompareBlockActions() {
             });
         }
     });
+    registerAction2(class DiscardEditsCompareBlockAction extends ChatCompareCodeBlockAction {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.discardCompareEdits',
+                title: ( localize2WithPath(_moduleId, 9, "Discard Edits")),
+                f1: false,
+                category: CHAT_CATEGORY,
+                icon: Codicon.trash,
+                precondition: ( (ContextKeyExpr.and(
+                    EditorContextKeys.hasChanges,
+                     (CONTEXT_CHAT_EDIT_APPLIED.negate())
+                ))),
+                menu: {
+                    id: MenuId.ChatCompareBlock,
+                    group: 'navigation',
+                    order: 2,
+                }
+            });
+        }
+        async runWithContext(accessor, context) {
+            const instaService = accessor.get(IInstantiationService);
+            const editor = instaService.createInstance(DefaultChatTextEditor);
+            editor.discard(context.element, context.edit);
+        }
+    });
 }
 
 export { isCodeBlockActionContext, isCodeCompareBlockActionContext, registerChatCodeBlockActions, registerChatCodeCompareBlockActions };

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatContextActions.js

@@ -21,17 +21,64 @@ import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/c
 import { AnythingQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { EditorType } from 'vscode/vscode/vs/editor/common/editorCommon';
+import { compare } from 'vscode/vscode/vs/base/common/strings';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatContextActions";
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
+    registerAction2(AttachFileAction);
+    registerAction2(AttachSelectionAction);
+}
+class AttachFileAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.attachFile'; }
+    constructor() {
+        super({
+            id: AttachFileAction.ID,
+            title: ( localize2WithPath(_moduleId, 0, "Attach File")),
+            category: CHAT_CATEGORY,
+            f1: false
+        });
+    }
+    async run(accessor, ...args) {
+        const variablesService = accessor.get(IChatVariablesService);
+        const textEditorService = accessor.get(IEditorService);
+        const activeUri = textEditorService.activeEditor?.resource;
+        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote].includes(activeUri.scheme)) {
+            variablesService.attachContext('file', activeUri, ChatAgentLocation.Panel);
+        }
+    }
+}
+class AttachSelectionAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.attachSelection'; }
+    constructor() {
+        super({
+            id: AttachSelectionAction.ID,
+            title: ( localize2WithPath(_moduleId, 1, "Add Selection to Chat")),
+            category: CHAT_CATEGORY,
+            f1: false
+        });
+    }
+    async run(accessor, ...args) {
+        const variablesService = accessor.get(IChatVariablesService);
+        const textEditorService = accessor.get(IEditorService);
+        const activeEditor = textEditorService.activeTextEditorControl;
+        const activeUri = textEditorService.activeEditor?.resource;
+        if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote].includes(activeUri.scheme)) {
+            const selection = activeEditor?.getSelection();
+            if (selection) {
+                variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
+            }
+        }
+    }
 }
 class AttachContextAction extends Action2 {
     static { this.ID = 'workbench.action.chat.attachContext'; }
     constructor() {
         super({
             id: AttachContextAction.ID,
-            title: ( localize2WithPath(_moduleId, 0, "Attach Context")),
+            title: ( localize2WithPath(_moduleId, 2, "Attach Context")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
@@ -166,11 +213,22 @@ class AttachContextAction extends Action2 {
             }
         }
         quickPickItems.push({
-            label: ( localizeWithPath(_moduleId, 1, '{0} Symbol...', `$(${Codicon.symbolField.id})`)),
+            label: ( localizeWithPath(_moduleId, 3, '{0} Symbol...', `$(${Codicon.symbolField.id})`)),
             icon: ThemeIcon.fromId(Codicon.symbolField.id),
             prefix: SymbolsQuickAccessProvider.PREFIX
         });
-        this._show(quickInputService, commandService, widget, quickPickItems);
+        function extractTextFromIconLabel(label) {
+            if (!label) {
+                return '';
+            }
+            const match = label.match(/\$\([^\)]+\)\s*(.+)/);
+            return match ? match[1] : label;
+        }
+        this._show(quickInputService, commandService, widget, quickPickItems.sort(function (a, b) {
+            const first = extractTextFromIconLabel(a.label).toUpperCase();
+            const second = extractTextFromIconLabel(b.label).toUpperCase();
+            return compare(first, second);
+        }));
     }
     _show(quickInputService, commandService, widget, quickPickItems, query = '') {
         quickInputService.quickAccess.show(query, {
@@ -179,7 +237,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: ( localizeWithPath(_moduleId, 2, 'Search attachments')),
+            placeholder: ( localizeWithPath(_moduleId, 4, 'Search attachments')),
             providerOptions: {
                 handleAccept: (item) => {
                     if ('prefix' in item) {

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatDeveloperActions.js

@@ -0,0 +1,28 @@
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+
+const _moduleId = "vs/workbench/contrib/chat/browser/actions/chatDeveloperActions";
+function registerChatDeveloperActions() {
+    registerAction2(LogChatInputHistoryAction);
+}
+class LogChatInputHistoryAction extends Action2 {
+    static { this.ID = 'workbench.action.chat.logInputHistory'; }
+    constructor() {
+        super({
+            id: LogChatInputHistoryAction.ID,
+            title: ( localize2WithPath(_moduleId, 0, "Log Chat Input History")),
+            icon: Codicon.attach,
+            category: Categories.Developer,
+            f1: true
+        });
+    }
+    async run(accessor, ...args) {
+        const chatWidgetService = accessor.get(IChatWidgetService);
+        chatWidgetService.lastFocusedWidget?.logInputHistory();
+    }
+}
+
+export { registerChatDeveloperActions };

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

@@ -37,10 +37,12 @@ import 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 import './contrib/chatInputEditorContrib.js';
 import './contrib/chatContextAttachments.js';
 import './contrib/chatInputCompletions.js';
+import './contrib/chatInputEditorHover.js';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { chatVariableLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import '../common/chatServiceImpl.js';
+import '../common/languageModelToolsService.js';
 import '../common/chatSlashCommands.js';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
@@ -53,6 +55,8 @@ import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/edit
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import 'vscode/vscode/vs/workbench/contrib/chat/common/chatColors';
 import { registerChatContextActions } from './actions/chatContextActions.js';
+import { registerChatDeveloperActions } from './actions/chatDeveloperActions.js';
+import { LanguageModelToolsExtensionPointHandler } from '../common/tools/languageModelToolsContribution.js';
 
 const _moduleId = "vs/workbench/contrib/chat/browser/chat.contribution";
 const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
@@ -101,9 +105,24 @@ configurationRegistry.registerConfiguration({
             deprecated: true,
             default: false
         },
+        'chat.experimental.variables.editor': {
+            type: 'boolean',
+            description: ( localizeWithPath(_moduleId, 7, "Enables variables for editor chat.")),
+            default: false
+        },
+        'chat.experimental.variables.notebook': {
+            type: 'boolean',
+            description: ( localizeWithPath(_moduleId, 8, "Enables variables for notebook chat.")),
+            default: false
+        },
+        'chat.experimental.variables.terminal': {
+            type: 'boolean',
+            description: ( localizeWithPath(_moduleId, 9, "Enables variables for terminal chat.")),
+            default: false
+        },
     }
 });
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localizeWithPath(_moduleId, 7, "Chat"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(ChatEditor, ChatEditorInput.EditorID, ( localizeWithPath(_moduleId, 10, "Chat"))), [
     ( (new SyncDescriptor(ChatEditorInput)))
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
@@ -112,7 +131,7 @@ let ChatResolverContribution = class ChatResolverContribution extends Disposable
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
             id: ChatEditorInput.EditorID,
-            label: ( localizeWithPath(_moduleId, 7, "Chat")),
+            label: ( localizeWithPath(_moduleId, 10, "Chat")),
             priority: RegisteredEditorPriority.builtin
         }, {
             singlePerResource: true,
@@ -135,7 +154,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
         super();
         this._store.add(slashCommandService.registerSlashCommand({
             command: 'clear',
-            detail: ( localizeWithPath(_moduleId, 8, "Start a new chat")),
+            detail: ( localizeWithPath(_moduleId, 11, "Start a new chat")),
             sortText: 'z2_clear',
             executeImmediately: true
         }, async () => {
@@ -182,7 +201,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 }
                 const variables = [
                     ...chatVariablesService.getVariables(),
-                    { name: 'file', description: ( localizeWithPath(_moduleId, 9, "Choose a file in the workspace")) }
+                    { name: 'file', description: ( localizeWithPath(_moduleId, 12, "Choose a file in the workspace")) }
                 ];
                 const variableText = ( (variables
                     .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`)))
@@ -213,6 +232,7 @@ registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribu
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, LifecyclePhase.Eventually);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);
 registerWorkbenchContribution2(ChatExtensionPointHandler.ID, ChatExtensionPointHandler, WorkbenchPhase.BlockStartup);
+registerWorkbenchContribution2(LanguageModelToolsExtensionPointHandler.ID, LanguageModelToolsExtensionPointHandler, WorkbenchPhase.Eventually);
 registerChatActions();
 registerChatCopyActions();
 registerChatCodeBlockActions();
@@ -225,3 +245,4 @@ registerChatExportActions();
 registerMoveActions();
 registerNewChatActions();
 registerChatContextActions();
+registerChatDeveloperActions();

package/vscode/src/vs/workbench/contrib/chat/browser/chatParticipantContributions.js

@@ -78,10 +78,14 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                     )),
                     type: 'string'
                 },
+                when: {
+                    description: ( localizeWithPath(_moduleId, 7, "A condition which must be true to enable this participant.")),
+                    type: 'string'
+                },
                 commands: {
                     markdownDescription: ( localizeWithPath(
                         _moduleId,
-                        7,
+                        8,
                         "Commands available for this chat participant, which the user can invoke with a `/`."
                     )),
                     type: 'array',
@@ -94,23 +98,23 @@ const chatParticipantExtensionPoint = ExtensionsRegistry.registerExtensionPoint(
                             name: {
                                 description: ( localizeWithPath(
                                     _moduleId,
-                                    8,
+                                    9,
                                     "A short name by which this command is referred to in the UI, e.g. `fix` or * `explain` for commands that fix an issue or explain code. The name should be unique among the commands provided by this participant."
                                 )),
                                 type: 'string'
                             },
                             description: {
-                                description: ( localizeWithPath(_moduleId, 9, "A description of this command.")),
+                                description: ( localizeWithPath(_moduleId, 10, "A description of this command.")),
                                 type: 'string'
                             },
                             when: {
-                                description: ( localizeWithPath(_moduleId, 10, "A condition which must be true to enable this command.")),
+                                description: ( localizeWithPath(_moduleId, 11, "A condition which must be true to enable this command.")),
                                 type: 'string'
                             },
                             sampleRequest: {
                                 description: ( localizeWithPath(
                                     _moduleId,
-                                    11,
+                                    12,
                                     "When the user clicks this command in `/help`, this text will be submitted to the participant."
                                 )),
                                 type: 'string'
@@ -192,12 +196,12 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                         severity: Severity$1.Error,
                         message: ( localizeWithPath(
                             _moduleId,
-                            12,
+                            13,
                             "Chat failed to load. Please ensure that the GitHub Copilot Chat extension is up to date."
                         )),
                         actions: {
                             primary: [
-                                ( (new Action('showExtension', ( localizeWithPath(_moduleId, 13, "Show Extension")), undefined, true, () => {
+                                ( (new Action('showExtension', ( localizeWithPath(_moduleId, 14, "Show Extension")), undefined, true, () => {
                                 return this.commandService.executeCommand('workbench.extensions.action.showExtensionsWithIds', ['GitHub.copilot-chat']);
                             })))
                             ]
@@ -205,10 +209,6 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                     });
                     continue;
                 }
-                if (this.productService.quality === 'stable' && !isProposedApiEnabled(extension.description, 'chatParticipantPrivate')) {
-                    this.logService.warn(`Chat participants are not yet enabled in VS Code Stable (${extension.description.identifier.value})`);
-                    continue;
-                }
                 for (const providerDescriptor of extension.value) {
                     if (!providerDescriptor.name.match(/^[\w0-9_-]+$/)) {
                         this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT register participant with invalid name: ${providerDescriptor.name}. Name must match /^[\\w0-9_-]+$/.`);
@@ -238,10 +238,6 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
                     if (providerDescriptor.isDefault && (!providerDescriptor.locations || providerDescriptor.locations?.includes(ChatAgentLocation.Panel))) {
                         store.add(this.registerDefaultParticipantView(providerDescriptor));
                     }
-                    if (providerDescriptor.when && !isProposedApiEnabled(extension.description, 'chatParticipantAdditions')) {
-                        this.logService.error(`Extension '${extension.description.identifier.value}' CANNOT use API proposal: chatParticipantAdditions.`);
-                        continue;
-                    }
                     store.add(this._chatAgentService.registerAgent(providerDescriptor.id, {
                         extensionId: extension.description.identifier,
                         publisherDisplayName: extension.description.publisherDisplayName ?? extension.description.publisher,
@@ -274,7 +270,7 @@ let ChatExtensionPointHandler = class ChatExtensionPointHandler {
         });
     }
     registerViewContainer() {
-        const title = ( localize2WithPath(_moduleId, 14, "Chat"));
+        const title = ( localize2WithPath(_moduleId, 15, "Chat"));
         const icon = Codicon.commentDiscussion;
         const viewContainerId = CHAT_SIDEBAR_PANEL_ID;
         const viewContainer = ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({

package/vscode/src/vs/workbench/contrib/chat/browser/chatVariables.js

@@ -72,7 +72,7 @@ let ChatVariablesService = class ChatVariablesService {
         await Promise.allSettled(jobs);
         resolvedVariables = coalesce(resolvedVariables);
         resolvedVariables.sort((a, b) => b.range.start - a.range.start);
-        resolvedVariables.push(...resolvedAttachedContext);
+        resolvedVariables.push(...coalesce(resolvedAttachedContext));
         return {
             variables: resolvedVariables,
         };

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.js

@@ -1,3 +1,4 @@
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ChatWidget } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
 
@@ -10,6 +11,8 @@ class ChatContextAttachments extends Disposable {
         super();
         this.widget = widget;
         this._attachedContext = ( new Set());
+        this._onDidChangeInputState = this._register(( new Emitter()));
+        this.onDidChangeInputState = this._onDidChangeInputState.event;
         this._register(this.widget.onDidDeleteContext((e) => {
             this._removeContext(e);
         }));
@@ -22,7 +25,11 @@ class ChatContextAttachments extends Disposable {
     }
     setInputState(s) {
         if (!Array.isArray(s)) {
-            return;
+            s = [];
+        }
+        this._attachedContext.clear();
+        for (const attachment of s) {
+            this._attachedContext.add(attachment);
         }
         this.widget.setContext(true, ...s);
     }
@@ -37,9 +44,11 @@ class ChatContextAttachments extends Disposable {
             this._attachedContext.add(attachment);
         }
         this.widget.setContext(overwrite, ...attachments);
+        this._onDidChangeInputState.fire();
     }
     _removeContext(attachment) {
         this._attachedContext.delete(attachment);
+        this._onDidChangeInputState.fire();
     }
     _clearAttachedContext() {
         this._attachedContext.clear();

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.js

@@ -6,6 +6,7 @@ import { CompletionItemKind } from 'vscode/vscode/vs/editor/common/languages';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { SubmitAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
@@ -14,7 +15,7 @@ import { ChatInputPart } from 'vscode/vscode/vs/workbench/contrib/chat/browser/c
 import { SelectAndInsertFileAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables';
 import { ChatAgentLocation, getFullyQualifiedId } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService, IChatAgentNameService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
-import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, chatSubcommandLeader, chatVariableLeader, ChatRequestVariablePart, chatAgentLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestAgentPart, ChatRequestAgentSubcommandPart, ChatRequestTextPart, chatSubcommandLeader, chatAgentLeader, chatVariableLeader, ChatRequestVariablePart } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatSlashCommands.service';
 import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables.service';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -101,7 +102,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                     .filter(a => a.locations.includes(widget.location));
                 return {
                     suggestions: ( (agents.map((agent, i) => {
-                        const { label: agentLabel, isDupe } = getAgentCompletionDetails(agent, agents, this.chatAgentNameService);
+                        const { label: agentLabel, isDupe } = this.getAgentCompletionDetails(agent);
                         return {
                             label: isDupe ?
                                 { label: agentLabel, description: agent.description, detail: ` (${agent.publisherDisplayName})` } :
@@ -173,13 +174,13 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 const agents = this.chatAgentService.getAgents()
                     .filter(a => a.locations.includes(widget.location));
                 const getFilterText = (agent, command) => {
-                    const dummyPrefix = agent.id === 'github.copilot.terminal' ? `0000` : ``;
+                    const dummyPrefix = agent.id === 'github.copilot.terminalPanel' ? `0000` : ``;
                     return `${chatSubcommandLeader}${dummyPrefix}${agent.name}.${command}`;
                 };
                 const justAgents = ( (agents
                     .filter(a => !a.isDefault)
                     .map(agent => {
-                    const { label: agentLabel, isDupe } = getAgentCompletionDetails(agent, agents, this.chatAgentNameService);
+                    const { label: agentLabel, isDupe } = this.getAgentCompletionDetails(agent);
                     const detail = agent.description;
                     return {
                         label: isDupe ?
@@ -196,7 +197,7 @@ let AgentCompletions = class AgentCompletions extends Disposable {
                 })));
                 return {
                     suggestions: justAgents.concat(agents.flatMap(agent => ( (agent.slashCommands.map((c, i) => {
-                        const { label: agentLabel, isDupe } = getAgentCompletionDetails(agent, agents, this.chatAgentNameService);
+                        const { label: agentLabel, isDupe } = this.getAgentCompletionDetails(agent);
                         const withSlash = `${chatSubcommandLeader}${c.name}`;
                         return {
                             label: { label: withSlash, description: agentLabel, detail: isDupe ? ` (${agent.publisherDisplayName})` : undefined },
@@ -214,6 +215,12 @@ let AgentCompletions = class AgentCompletions extends Disposable {
             }
         }));
     }
+    getAgentCompletionDetails(agent) {
+        const isAllowed = this.chatAgentNameService.getAgentNameRestriction(agent);
+        const agentLabel = `${chatAgentLeader}${isAllowed ? agent.name : getFullyQualifiedId(agent)}`;
+        const isDupe = isAllowed && this.chatAgentService.agentHasDupeName(agent.id);
+        return { label: agentLabel, isDupe };
+    }
 };
 AgentCompletions = ( (__decorate([
     ( (__param(0, ILanguageFeaturesService))),
@@ -315,7 +322,7 @@ function computeCompletionRanges(model, position, reg) {
 let VariableCompletions = class VariableCompletions extends Disposable {
     static { VariableCompletions_1 = this; }
     static { this.VariableNameDef = ( (new RegExp(`${chatVariableLeader}\\w*`, 'g'))); }
-    constructor(languageFeaturesService, chatWidgetService, chatVariablesService) {
+    constructor(languageFeaturesService, chatWidgetService, chatVariablesService, configService) {
         super();
         this.languageFeaturesService = languageFeaturesService;
         this.chatWidgetService = chatWidgetService;
@@ -324,8 +331,15 @@ let VariableCompletions = class VariableCompletions extends Disposable {
             _debugDisplayName: 'chatVariables',
             triggerCharacters: [chatVariableLeader],
             provideCompletionItems: async (model, position, _context, _token) => {
+                const locations = ( (new Set()));
+                locations.add(ChatAgentLocation.Panel);
+                for (const value of ( (Object.values(ChatAgentLocation)))) {
+                    if (typeof value === 'string' && configService.getValue(`chat.experimental.variables.${value}`)) {
+                        locations.add(value);
+                    }
+                }
                 const widget = this.chatWidgetService.getWidgetByInputUri(model.uri);
-                if (!widget || widget.location !== ChatAgentLocation.Panel ) {
+                if (!widget || !( (locations.has(widget.location)))) {
                     return null;
                 }
                 const range = computeCompletionRanges(model, position, VariableCompletions_1.VariableNameDef);
@@ -359,12 +373,7 @@ let VariableCompletions = class VariableCompletions extends Disposable {
 VariableCompletions = VariableCompletions_1 = ( (__decorate([
     ( (__param(0, ILanguageFeaturesService))),
     ( (__param(1, IChatWidgetService))),
-    ( (__param(2, IChatVariablesService)))
+    ( (__param(2, IChatVariablesService))),
+    ( (__param(3, IConfigurationService)))
 ], VariableCompletions)));
 ( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(VariableCompletions, LifecyclePhase.Eventually);
-function getAgentCompletionDetails(agent, otherAgents, chatAgentNameService) {
-    const isAllowed = chatAgentNameService.getAgentNameRestriction(agent);
-    const agentLabel = `${chatAgentLeader}${isAllowed ? agent.name : getFullyQualifiedId(agent)}`;
-    const isDupe = isAllowed && !!otherAgents.find(other => other.name === agent.name && other.id !== agent.id);
-    return { label: agentLabel, isDupe };
-}

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorContrib.js

@@ -173,10 +173,7 @@ let InputEditorDecorations = class InputEditorDecorations extends Disposable {
         this.widget.inputEditor.setDecorationsByType(decorationDescription, placeholderDecorationType, placeholderDecoration ?? []);
         const textDecorations = [];
         if (agentPart) {
-            const isDupe = !!this.chatAgentService.getAgents().find(other => other.name === agentPart.agent.name && other.id !== agentPart.agent.id);
-            const publisher = isDupe ? `(${agentPart.agent.publisherDisplayName}) ` : '';
-            const agentHover = `${publisher}${agentPart.agent.description}`;
-            textDecorations.push({ range: agentPart.editorRange, hoverMessage: ( new MarkdownString(agentHover)) });
+            textDecorations.push({ range: agentPart.editorRange });
             if (agentSubcommandPart) {
                 textDecorations.push({ range: agentSubcommandPart.editorRange, hoverMessage: ( new MarkdownString(agentSubcommandPart.command.description)) });
             }

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover.js

@@ -0,0 +1,87 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { RenderedHoverParts, HoverAnchorType, HoverParticipantRegistry } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverTypes';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatAgentHover, getChatAgentHoverOptions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatAgentHover';
+import { ChatEditorHoverWrapper } from './editorHoverWrapper.js';
+import { extractAgentAndCommand } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+
+const _moduleId = "vs/workbench/contrib/chat/browser/contrib/chatInputEditorHover";
+let ChatAgentHoverParticipant = class ChatAgentHoverParticipant {
+    constructor(editor, instantiationService, chatWidgetService, commandService) {
+        this.editor = editor;
+        this.instantiationService = instantiationService;
+        this.chatWidgetService = chatWidgetService;
+        this.commandService = commandService;
+        this.hoverOrdinal = 1;
+    }
+    computeSync(anchor, _lineDecorations) {
+        if (!this.editor.hasModel()) {
+            return [];
+        }
+        const widget = this.chatWidgetService.getWidgetByInputUri(this.editor.getModel().uri);
+        if (!widget) {
+            return [];
+        }
+        const { agentPart } = extractAgentAndCommand(widget.parsedInput);
+        if (!agentPart) {
+            return [];
+        }
+        if (Range.containsPosition(agentPart.editorRange, anchor.range.getStartPosition())) {
+            return [( (new ChatAgentHoverPart(this, Range.lift(agentPart.editorRange), agentPart.agent)))];
+        }
+        return [];
+    }
+    renderHoverParts(context, hoverParts) {
+        if (!hoverParts.length) {
+            return (
+                 (new RenderedHoverParts([]))
+            );
+        }
+        const disposables = ( (new DisposableStore()));
+        const hover = disposables.add(this.instantiationService.createInstance(ChatAgentHover));
+        disposables.add(hover.onDidChangeContents(() => context.onContentsChanged()));
+        const hoverPart = hoverParts[0];
+        const agent = hoverPart.agent;
+        hover.setAgent(agent.id);
+        const actions = getChatAgentHoverOptions(() => agent, this.commandService).actions;
+        const wrapper = this.instantiationService.createInstance(ChatEditorHoverWrapper, hover.domNode, actions);
+        const wrapperNode = wrapper.domNode;
+        context.fragment.appendChild(wrapperNode);
+        const renderedHoverPart = {
+            hoverPart,
+            hoverElement: wrapperNode,
+            dispose() { disposables.dispose(); }
+        };
+        return (
+             (new RenderedHoverParts([renderedHoverPart]))
+        );
+    }
+    getAccessibleContent(hoverPart) {
+        return ( localizeWithPath(_moduleId, 0, 'There is a chat agent hover part here.'));
+    }
+};
+ChatAgentHoverParticipant = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IChatWidgetService))),
+    ( (__param(3, ICommandService)))
+], ChatAgentHoverParticipant)));
+class ChatAgentHoverPart {
+    constructor(owner, range, agent) {
+        this.owner = owner;
+        this.range = range;
+        this.agent = agent;
+    }
+    isValidForHoverAnchor(anchor) {
+        return (anchor.type === HoverAnchorType.Range
+            && this.range.startColumn <= anchor.range.startColumn
+            && this.range.endColumn >= anchor.range.endColumn);
+    }
+}
+HoverParticipantRegistry.register(ChatAgentHoverParticipant);
+
+export { ChatAgentHoverPart, ChatAgentHoverParticipant };

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/editorHoverWrapper.js

@@ -0,0 +1,31 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import './media/editorHoverWrapper.css.js';
+import { $ as $$1, h as h$1 } from 'vscode/vscode/vs/base/browser/dom';
+import 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+
+const $ = $$1;
+const h = h$1;
+let ChatEditorHoverWrapper = class ChatEditorHoverWrapper {
+    constructor(hoverContentElement, actions, keybindingService) {
+        this.keybindingService = keybindingService;
+        const hoverElement = h('.chat-editor-hover-wrapper@root', [h('.chat-editor-hover-wrapper-content@content')]);
+        this.domNode = hoverElement.root;
+        hoverElement.content.appendChild(hoverContentElement);
+        if (actions && actions.length > 0) {
+            const statusBarElement = $('.hover-row.status-bar');
+            const actionsElement = $('.actions');
+            actions.forEach(action => {
+                const keybinding = this.keybindingService.lookupKeybinding(action.commandId);
+                keybinding ? keybinding.getLabel() : null;
+            });
+            statusBarElement.appendChild(actionsElement);
+            this.domNode.appendChild(statusBarElement);
+        }
+    }
+};
+ChatEditorHoverWrapper = ( __decorate([
+    ( __param(2, IKeybindingService))
+], ChatEditorHoverWrapper));
+
+export { ChatEditorHoverWrapper };

package/vscode/src/vs/workbench/contrib/chat/browser/contrib/media/editorHoverWrapper.css.js

@@ -0,0 +1,6 @@
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+
+var css = ".chat-editor-hover-wrapper-content{padding:2px 8px}";
+n(css,{});
+
+export { css, css as default };

package/vscode/src/vs/workbench/contrib/chat/common/chatServiceImpl.js

@@ -437,8 +437,8 @@ let ChatService = class ChatService extends Disposable {
                         if (!request.response) {
                             continue;
                         }
-                        history.push({ role: ChatMessageRole.User, content: request.message.text });
-                        history.push({ role: ChatMessageRole.Assistant, content: request.response.response.asString() });
+                        history.push({ role: ChatMessageRole.User, content: { type: 'text', value: request.message.text } });
+                        history.push({ role: ChatMessageRole.Assistant, content: { type: 'text', value: request.response.response.asString() } });
                     }
                     const message = parsedRequest.text;
                     const commandResult = await this.chatSlashCommandService.executeCommand(commandPart.slashCommand.command, message.substring(commandPart.slashCommand.command.length + 1).trimStart(), ( (new Progress(p => {
@@ -495,13 +495,13 @@ let ChatService = class ChatService extends Disposable {
                     chatSessionId: model.sessionId,
                     location
                 });
-                const rawResult = { errorDetails: { message: err.message } };
+                this.logService.error(`Error while handling chat request: ${toErrorMessage(err, true)}`);
                 if (request) {
+                    const rawResult = { errorDetails: { message: err.message } };
                     model.setResponse(request, rawResult);
+                    completeResponseCreated();
+                    model.completeResponse(request);
                 }
-                completeResponseCreated();
-                this.logService.error(`Error while handling chat request: ${toErrorMessage(err)}`);
-                model.completeResponse(request);
             }
             finally {
                 listener.dispose();

package/vscode/src/vs/workbench/contrib/chat/common/languageModelToolsService.js

@@ -0,0 +1,60 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+
+let LanguageModelToolsService = class LanguageModelToolsService {
+    constructor(_extensionService) {
+        this._extensionService = _extensionService;
+        this._onDidChangeTools = ( new Emitter());
+        this.onDidChangeTools = this._onDidChangeTools.event;
+        this._tools = ( new Map());
+    }
+    registerToolData(toolData) {
+        if (( this._tools.has(toolData.name))) {
+            throw ( new Error(`Tool "${toolData.name}" is already registered.`));
+        }
+        this._tools.set(toolData.name, { data: toolData });
+        this._onDidChangeTools.fire({ added: toolData });
+        return toDisposable(() => {
+            this._tools.delete(toolData.name);
+            this._onDidChangeTools.fire({ removed: toolData.name });
+        });
+    }
+    registerToolImplementation(name, tool) {
+        const entry = this._tools.get(name);
+        if (!entry) {
+            throw ( new Error(`Tool "${name}" was not contributed.`));
+        }
+        if (entry.impl) {
+            throw ( new Error(`Tool "${name}" already has an implementation.`));
+        }
+        entry.impl = tool;
+        return toDisposable(() => {
+            entry.impl = undefined;
+        });
+    }
+    getTools() {
+        return ( Iterable.map(( this._tools.values()), i => i.data));
+    }
+    async invokeTool(name, parameters, token) {
+        let tool = this._tools.get(name);
+        if (!tool) {
+            throw ( new Error(`Tool ${name} was not contributed`));
+        }
+        if (!tool.impl) {
+            await this._extensionService.activateByEvent(`onLanguageModelTool:${name}`);
+            tool = this._tools.get(name);
+            if (!tool?.impl) {
+                throw ( new Error(`Tool ${name} does not have an implementation registered.`));
+            }
+        }
+        return tool.impl.invoke(parameters, token);
+    }
+};
+LanguageModelToolsService = ( __decorate([
+    ( __param(0, IExtensionService))
+], LanguageModelToolsService));
+
+export { LanguageModelToolsService };

package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js

@@ -0,0 +1,93 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { DisposableMap } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
+
+const _moduleId = "vs/workbench/contrib/chat/common/tools/languageModelToolsContribution";
+const languageModelToolsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
+    extensionPoint: 'languageModelTools',
+    activationEventsGenerator: (contributions, result) => {
+        for (const contrib of contributions) {
+            result.push(`onLanguageModelTool:${contrib.name}`);
+        }
+    },
+    jsonSchema: {
+        description: ( localizeWithPath(
+            _moduleId,
+            0,
+            'Contributes a tool that can be invoked by a language model.'
+        )),
+        type: 'array',
+        items: {
+            additionalProperties: false,
+            type: 'object',
+            defaultSnippets: [{ body: { name: '', description: '' } }],
+            required: ['name', 'description'],
+            properties: {
+                name: {
+                    description: ( localizeWithPath(
+                        _moduleId,
+                        1,
+                        "A name for this tool which must be unique across all tools."
+                    )),
+                    type: 'string'
+                },
+                description: {
+                    description: ( localizeWithPath(
+                        _moduleId,
+                        2,
+                        "A description of this tool that may be passed to a language model."
+                    )),
+                    type: 'string'
+                },
+                displayName: {
+                    description: ( localizeWithPath(
+                        _moduleId,
+                        3,
+                        "A human-readable name for this tool that may be used to describe it in the UI."
+                    )),
+                    type: 'string'
+                },
+                parametersSchema: {
+                    description: ( localizeWithPath(_moduleId, 4, "A JSON schema for the parameters this tool accepts.")),
+                    type: 'object',
+                    $ref: 'http://json-schema.org/draft-07/schema#'
+                }
+            }
+        }
+    }
+});
+function toToolKey(extensionIdentifier, toolName) {
+    return `${extensionIdentifier.value}/${toolName}`;
+}
+let LanguageModelToolsExtensionPointHandler = class LanguageModelToolsExtensionPointHandler {
+    static { this.ID = 'workbench.contrib.toolsExtensionPointHandler'; }
+    constructor(languageModelToolsService, logService) {
+        this._registrationDisposables = ( (new DisposableMap()));
+        languageModelToolsExtensionPoint.setHandler((extensions, delta) => {
+            for (const extension of delta.added) {
+                for (const tool of extension.value) {
+                    if (!tool.name || !tool.description) {
+                        logService.warn(`Invalid tool contribution from ${extension.description.identifier.value}: ${JSON.stringify(tool)}`);
+                        continue;
+                    }
+                    const disposable = languageModelToolsService.registerToolData(tool);
+                    this._registrationDisposables.set(toToolKey(extension.description.identifier, tool.name), disposable);
+                }
+            }
+            for (const extension of delta.removed) {
+                for (const tool of extension.value) {
+                    this._registrationDisposables.deleteAndDispose(toToolKey(extension.description.identifier, tool.name));
+                }
+            }
+        });
+    }
+};
+LanguageModelToolsExtensionPointHandler = ( (__decorate([
+    ( (__param(0, ILanguageModelToolsService))),
+    ( (__param(1, ILogService)))
+], LanguageModelToolsExtensionPointHandler)));
+
+export { LanguageModelToolsExtensionPointHandler };

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

@@ -1,8 +1,9 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
-import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuRegistry, registerAction2, MenuId, isIMenuItem } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { InlineChatController } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
-import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, DiscardAction, RerunAction, CancelSessionAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges, CopyRecordings } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
-import { INLINE_CHAT_ID } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
+import { StartSessionAction, CloseAction, ConfigureInlineChatAction, UnstashSessionAction, DiscardHunkAction, DiscardAction, RerunAction, MoveToNextHunk, MoveToPreviousHunk, ArrowOutUpAction, ArrowOutDownAction, FocusInlineChat, ViewInChatAction, ToggleDiffForChange, AcceptChanges, CopyRecordings } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatActions';
+import { INLINE_CHAT_ID, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_CONFIG_TXT_BTNS, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_WIDGET_STATUS, InlineChatConfigKeys, MENU_INLINE_CHAT_EXECUTE } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
@@ -13,8 +14,41 @@ import { InlineChatAccessibleView } from './inlineChatAccessibleView.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { InlineChatEnabler } from 'vscode/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl';
 import { AccessibleViewRegistry } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
+import { SubmitAction, CancelAction } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatExecuteActions';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { CONTEXT_CHAT_INPUT_HAS_TEXT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
+const _moduleId = "vs/workbench/contrib/inlineChat/browser/inlineChat.contribution";
 registerEditorContribution(INLINE_CHAT_ID, InlineChatController, EditorContributionInstantiation.Eager);
+const sendActionMenuItem = {
+    group: '0_main',
+    order: 0,
+    command: {
+        id: SubmitAction.ID,
+        title: ( localizeWithPath(_moduleId, 0, "Send")),
+    },
+    when: ( (ContextKeyExpr.and(
+        CONTEXT_CHAT_INPUT_HAS_TEXT,
+         (CTX_INLINE_CHAT_REQUEST_IN_PROGRESS.toNegated()),
+        CTX_INLINE_CHAT_CONFIG_TXT_BTNS
+    ))),
+};
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_CONTENT_STATUS, sendActionMenuItem);
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, sendActionMenuItem);
+const cancelActionMenuItem = {
+    group: '0_main',
+    order: 0,
+    command: {
+        id: CancelAction.ID,
+        title: ( localizeWithPath(_moduleId, 1, "Stop Request")),
+        shortTitle: ( localizeWithPath(_moduleId, 2, "Stop")),
+    },
+    when: ( (ContextKeyExpr.and(CTX_INLINE_CHAT_REQUEST_IN_PROGRESS))),
+};
+MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_WIDGET_STATUS, cancelActionMenuItem);
 registerAction2(StartSessionAction);
 registerAction2(CloseAction);
 registerAction2(ConfigureInlineChatAction);
@@ -22,7 +56,6 @@ registerAction2(UnstashSessionAction);
 registerAction2(DiscardHunkAction);
 registerAction2(DiscardAction);
 registerAction2(RerunAction);
-registerAction2(CancelSessionAction);
 registerAction2(MoveToNextHunk);
 registerAction2(MoveToPreviousHunk);
 registerAction2(ArrowOutUpAction);
@@ -32,7 +65,42 @@ registerAction2(ViewInChatAction);
 registerAction2(ToggleDiffForChange);
 registerAction2(AcceptChanges);
 registerAction2(CopyRecordings);
-const workbenchContributionsRegistry = ( Registry.as(Extensions.Workbench));
+const workbenchContributionsRegistry = ( (Registry.as(Extensions.Workbench)));
 workbenchContributionsRegistry.registerWorkbenchContribution(InlineChatNotebookContribution, LifecyclePhase.Restored);
 registerWorkbenchContribution2(InlineChatEnabler.Id, InlineChatEnabler, WorkbenchPhase.AfterRestored);
-AccessibleViewRegistry.register(( new InlineChatAccessibleView()));
+AccessibleViewRegistry.register(( (new InlineChatAccessibleView())));
+let MenuCopier = class MenuCopier {
+    static { this.Id = 'inlineChat.menuCopier'; }
+    constructor(configService) {
+        const store = ( (new DisposableStore()));
+        function updateMenu() {
+            store.clear();
+            for (const item of MenuRegistry.getMenuItems(MenuId.ChatExecute)) {
+                if (configService.getValue(InlineChatConfigKeys.ExpTextButtons) && isIMenuItem(item) && (item.command.id === SubmitAction.ID || item.command.id === CancelAction.ID)) {
+                    continue;
+                }
+                store.add(MenuRegistry.appendMenuItem(MENU_INLINE_CHAT_EXECUTE, item));
+            }
+        }
+        updateMenu();
+        const listener = MenuRegistry.onDidChangeMenu(e => {
+            if (( (e.has(MenuId.ChatExecute)))) {
+                updateMenu();
+            }
+        });
+        const listener2 = configService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration(InlineChatConfigKeys.ExpTextButtons)) {
+                updateMenu();
+            }
+        });
+        this.dispose = () => {
+            listener.dispose();
+            listener2.dispose();
+            store.dispose();
+        };
+    }
+};
+MenuCopier = ( (__decorate([
+    ( (__param(0, IConfigurationService)))
+], MenuCopier)));
+registerWorkbenchContribution2(MenuCopier.Id, MenuCopier, WorkbenchPhase.AfterRestored);

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

@@ -4,6 +4,8 @@ import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/cod
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { AccessibleViewType, AccessibleViewProviderId } from 'vscode/vscode/vs/platform/accessibility/browser/accessibleView';
 import { AccessibilityVerbositySettingId } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
+import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
+import { renderMarkdownAsPlaintext } from 'vscode/vscode/vs/base/browser/markdownRenderer';
 
 class InlineChatAccessibleView {
     constructor() {
@@ -29,7 +31,7 @@ class InlineChatAccessibleView {
         return {
             id: AccessibleViewProviderId.InlineChat,
             verbositySettingKey: AccessibilityVerbositySettingId.InlineChat,
-            provideContent() { return responseContent; },
+            provideContent() { return renderMarkdownAsPlaintext(( new MarkdownString(responseContent)), true); },
             onClose() {
                 controller.focus();
             },