@codingame/monaco-vscode-chat-service-override 2.2.2 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-chat-service-override",
-  "version": "2.2.2",
+  "version": "3.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
     "vscode-marked": "npm:marked@=3.0.2"
   }
 }

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

@@ -1,7 +1,7 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IAudioCueService, AudioCue } from 'vscode/vscode/vs/platform/audioCues/browser/audioCueService';
+import { IAccessibilitySignalService, AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
@@ -109,7 +109,7 @@ function getNewChatAction(viewId, providerId) {
     };
 }
 function announceChatCleared(accessor) {
-    accessor.get(IAudioCueService).playAudioCue(AudioCue.clear);
+    accessor.get(IAccessibilitySignalService).playSignal(AccessibilitySignal.clear);
 }
 
 export { ACTION_ID_NEW_CHAT, getNewChatAction, registerNewChatActions };

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

@@ -8,7 +8,7 @@ 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 { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -16,7 +16,7 @@ import { TerminalLocation } from 'vscode/vscode/vs/platform/terminal/common/term
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { CONTEXT_PROVIDER_EXISTS, CONTEXT_IN_CHAT_SESSION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
-import { IChatService, ChatAgentCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
+import { IChatService, ChatCopyKind } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatService';
 import { isResponseVM } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { CTX_INLINE_CHAT_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
 import { insertCell } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/controller/cellOperations';
@@ -56,14 +56,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                        'interactive.copyCodeBlock.label',
-                        "Copy"
-                    )),
-                    original: 'Copy'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
+                    'interactive.copyCodeBlock.label',
+                    "Copy"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -87,10 +84,11 @@ function registerChatCodeBlockActions() {
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
+                    result: context.element.result,
                     action: {
                         kind: 'copy',
                         codeBlockIndex: context.codeBlockIndex,
-                        copyKind: ChatAgentCopyKind.Toolbar,
+                        copyKind: ChatCopyKind.Toolbar,
                         copiedCharacters: context.code.length,
                         totalCharacters: context.code.length,
                         copiedText: context.code,
@@ -123,10 +121,11 @@ function registerChatCodeBlockActions() {
             agentId: context.element.agent?.id,
             sessionId: context.element.sessionId,
             requestId: context.element.requestId,
+            result: context.element.result,
             action: {
                 kind: 'copy',
                 codeBlockIndex: context.codeBlockIndex,
-                copyKind: ChatAgentCopyKind.Action,
+                copyKind: ChatCopyKind.Action,
                 copiedText,
                 copiedCharacters: copiedText.length,
                 totalCharacters,
@@ -142,14 +141,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                        'interactive.insertCodeBlock.label',
-                        "Insert at Cursor"
-                    )),
-                    original: 'Insert at Cursor'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
+                    'interactive.insertCodeBlock.label',
+                    "Insert at Cursor"
+                )),
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -266,6 +262,7 @@ function registerChatCodeBlockActions() {
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
+                    result: context.element.result,
                     action: {
                         kind: 'insert',
                         codeBlockIndex: context.codeBlockIndex,
@@ -279,14 +276,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                        'interactive.insertIntoNewFile.label',
-                        "Insert into New File"
-                    )),
-                    original: 'Insert into New File'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
+                    'interactive.insertIntoNewFile.label',
+                    "Insert into New File"
+                )),
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -311,6 +305,7 @@ function registerChatCodeBlockActions() {
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
+                    result: context.element.result,
                     action: {
                         kind: 'insert',
                         codeBlockIndex: context.codeBlockIndex,
@@ -322,21 +317,23 @@ function registerChatCodeBlockActions() {
         }
     });
     const shellLangIds = [
+        'fish',
+        'ps1',
+        'pwsh',
         'powershell',
-        'shellscript'
+        'sh',
+        'shellscript',
+        'zsh'
     ];
     registerAction2(class RunInTerminalAction extends ChatCodeBlockAction {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                        'interactive.runInTerminal.label',
-                        "Insert into Terminal"
-                    )),
-                    original: 'Insert into Terminal'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
+                    'interactive.runInTerminal.label',
+                    "Insert into Terminal"
+                )),
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -395,6 +392,7 @@ function registerChatCodeBlockActions() {
                     agentId: context.element.agent?.id,
                     sessionId: context.element.sessionId,
                     requestId: context.element.requestId,
+                    result: context.element.result,
                     action: {
                         kind: 'runInTerminal',
                         codeBlockIndex: context.codeBlockIndex,
@@ -433,14 +431,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                        'interactive.nextCodeBlock.label',
-                        "Next Code Block"
-                    )),
-                    original: 'Next Code Block'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
+                    'interactive.nextCodeBlock.label',
+                    "Next Code Block"
+                )),
                 keybinding: {
                     primary: 2048  | 512  | 12 ,
                     mac: { primary: 2048  | 512  | 12 , },
@@ -460,14 +455,11 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
-                        'interactive.previousCodeBlock.label',
-                        "Previous Code Block"
-                    )),
-                    original: 'Previous Code Block'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCodeblockActions',
+                    'interactive.previousCodeBlock.label',
+                    "Previous Code Block"
+                )),
                 keybinding: {
                     primary: 2048  | 512  | 11 ,
                     mac: { primary: 2048  | 512  | 11 , },

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
@@ -11,14 +11,11 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCopyActions',
-                        'interactive.copyAll.label',
-                        "Copy All"
-                    )),
-                    original: 'Copy All'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCopyActions',
+                    'interactive.copyAll.label',
+                    "Copy All"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -48,14 +45,11 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatCopyActions',
-                        'interactive.copyItem.label',
-                        "Copy"
-                    )),
-                    original: 'Copy'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatCopyActions',
+                    'interactive.copyItem.label',
+                    "Copy"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
@@ -10,14 +10,11 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions',
-                        'interactive.nextFileTree.label',
-                        "Next File Tree"
-                    )),
-                    original: 'Next File Tree'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions',
+                    'interactive.nextFileTree.label',
+                    "Next File Tree"
+                )),
                 keybinding: {
                     primary: 2048  | 67 ,
                     weight: 200 ,
@@ -36,14 +33,11 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions',
-                        'interactive.previousFileTree.label',
-                        "Previous File Tree"
-                    )),
-                    original: 'Previous File Tree'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatFileTreeActions',
+                    'interactive.previousFileTree.label',
+                    "Previous File Tree"
+                )),
                 keybinding: {
                     primary: 2048  | 1024  | 67 ,
                     weight: 200 ,

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
@@ -60,8 +60,9 @@ function getMoveToAction(viewId, providerId, moveTo) {
             }
             const editorService = accessor.get(IEditorService);
             const sessionId = viewModel.sessionId;
+            const viewState = view.widget.getViewState();
             view.clear();
-            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+            await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         }
     };
 }
@@ -70,14 +71,11 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-                        'interactiveSession.openInEditor.label',
-                        "Open Chat in Editor"
-                    )),
-                    original: 'Open Chat in Editor'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
+                    'interactiveSession.openInEditor.label',
+                    "Open Chat in Editor"
+                )),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true
@@ -91,14 +89,11 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-                        'interactiveSession.openInNewWindow.label',
-                        "Open Chat in New Window"
-                    )),
-                    original: 'Open Chat In New Window'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
+                    'interactiveSession.openInNewWindow.label',
+                    "Open Chat in New Window"
+                )),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true
@@ -112,14 +107,11 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
-                        'interactiveSession.openInSidebar.label',
-                        "Open Chat in Side Bar"
-                    )),
-                    original: 'Open Chat in Side Bar'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatMoveActions',
+                    'interactiveSession.openInSidebar.label',
+                    "Open Chat in Side Bar"
+                )),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_PROVIDER_EXISTS,
                 f1: true,
@@ -152,8 +144,9 @@ async function executeMoveToAction(accessor, moveTo) {
     }
     const sessionId = viewModel.sessionId;
     const view = await viewService.openView(widget.viewContext.viewId);
+    const viewState = view.widget.getViewState();
     view.clear();
-    await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+    await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { target: { sessionId }, pinned: true, viewState: viewState } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
 }
 async function moveToSidebar(accessor) {
     const viewsService = accessor.get(IViewsService);

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

@@ -1,7 +1,7 @@
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import marked from 'vscode-marked';
 import { IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
@@ -19,14 +19,11 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.markHelpful',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                        'interactive.helpful.label',
-                        "Helpful"
-                    )),
-                    original: 'Helpful'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
+                    'interactive.helpful.label',
+                    "Helpful"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsup,
@@ -50,6 +47,7 @@ function registerChatTitleActions() {
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
+                result: item.result,
                 action: {
                     kind: 'vote',
                     direction: InteractiveSessionVoteDirection.Up,
@@ -62,14 +60,11 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.markUnhelpful',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                        'interactive.unhelpful.label',
-                        "Unhelpful"
-                    )),
-                    original: 'Unhelpful'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
+                    'interactive.unhelpful.label',
+                    "Unhelpful"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.thumbsdown,
@@ -93,6 +88,7 @@ function registerChatTitleActions() {
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
+                result: item.result,
                 action: {
                     kind: 'vote',
                     direction: InteractiveSessionVoteDirection.Down,
@@ -105,14 +101,11 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.reportIssueForBug',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                        'interactive.reportIssueForBug.label',
-                        "Report Issue"
-                    )),
-                    original: 'Report Issue'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
+                    'interactive.reportIssueForBug.label',
+                    "Report Issue"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.report,
@@ -135,6 +128,7 @@ function registerChatTitleActions() {
                 agentId: item.agent?.id,
                 sessionId: item.sessionId,
                 requestId: item.requestId,
+                result: item.result,
                 action: {
                     kind: 'bug'
                 }
@@ -145,14 +139,11 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNotebook',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                        'interactive.insertIntoNotebook.label',
-                        "Insert into Notebook"
-                    )),
-                    original: 'Insert into Notebook'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
+                    'interactive.insertIntoNotebook.label',
+                    "Insert into Notebook"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.insert,
@@ -210,14 +201,11 @@ function registerChatTitleActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.remove',
-                title: {
-                    value: ( localizeWithPath(
-                        'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
-                        'chat.remove.label',
-                        "Remove Request and Response"
-                    )),
-                    original: 'Remove Request and Response'
-                },
+                title: ( localize2WithPath(
+                    'vs/workbench/contrib/chat/browser/actions/chatTitleActions',
+                    'chat.remove.label',
+                    "Remove Request and Response"
+                )),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.x,

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

@@ -8,7 +8,7 @@ import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/d
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
-import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
+import { Extensions as Extensions$1, registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { registerChatActions } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { registerChatCodeBlockActions } from './actions/chatCodeblockActions.js';
@@ -35,9 +35,10 @@ import { IChatSlashCommandService } from 'vscode/vscode/vs/workbench/contrib/cha
 import { alertFocusChange } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibilityContributions';
 import { AccessibleViewAction } from 'vscode/vscode/vs/workbench/contrib/accessibility/browser/accessibleViewActions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IChatVariablesService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatVariables';
 import { registerChatFileTreeActions } from './actions/chatFileTreeActions.js';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
-import { chatAgentLeader, chatSubcommandLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { chatAgentLeader, chatSubcommandLeader, chatVariableLeader } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
@@ -102,6 +103,7 @@ configurationRegistry.registerConfiguration({
     ( new SyncDescriptor(ChatEditorInput))
 ]);
 let ChatResolverContribution = class ChatResolverContribution extends Disposable {
+    static { this.ID = 'workbench.contrib.chatResolver'; }
     constructor(editorResolverService, instantiationService) {
         super();
         this._register(editorResolverService.registerEditor(`${Schemas.vscodeChatSesssion}:**/**`, {
@@ -202,16 +204,16 @@ class ChatAccessibleViewContribution extends Disposable {
     }
 }
 let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommandsContribution extends Disposable {
-    constructor(slashCommandService, commandService, chatAgentService) {
+    constructor(slashCommandService, commandService, chatAgentService, chatVariablesService) {
         super();
         this._store.add(slashCommandService.registerSlashCommand({
-            command: 'newChat',
+            command: 'clear',
             detail: ( localizeWithPath(
                 'vs/workbench/contrib/chat/browser/chat.contribution',
-                'newChat',
+                'clear',
                 "Start a new chat"
             )),
-            sortText: 'z2_newChat',
+            sortText: 'z2_clear',
             executeImmediately: true
         }, async () => {
             commandService.executeCommand(ACTION_ID_NEW_CHAT);
@@ -240,7 +242,7 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 const actionArg = { inputValue: `${agentWithLeader} ${a.metadata.sampleRequest}` };
                 const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
                 const agentLine = `* [\`${agentWithLeader}\`](command:${SubmitAction.ID}?${urlSafeArg}) - ${a.metadata.description}`;
-                const commands = await a.provideSlashCommands(CancellationToken.None);
+                const commands = await a.provideSlashCommands(undefined, [], CancellationToken.None);
                 const commandText = ( commands.map(c => {
                     const actionArg = { inputValue: `${agentWithLeader} ${chatSubcommandLeader}${c.name} ${c.sampleRequest ?? ''}` };
                     const urlSafeArg = encodeURIComponent(JSON.stringify(actionArg));
@@ -249,6 +251,19 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
                 return (agentLine + '\n' + commandText).trim();
             })))).join('\n');
             progress.report({ content: ( new MarkdownString(agentText, { isTrusted: { enabledCommands: [SubmitAction.ID] } })), kind: 'markdownContent' });
+            if (defaultAgent?.metadata.helpTextVariablesPrefix) {
+                progress.report({ content: '\n\n', kind: 'content' });
+                if (isMarkdownString(defaultAgent.metadata.helpTextVariablesPrefix)) {
+                    progress.report({ content: defaultAgent.metadata.helpTextVariablesPrefix, kind: 'markdownContent' });
+                }
+                else {
+                    progress.report({ content: defaultAgent.metadata.helpTextVariablesPrefix, kind: 'content' });
+                }
+                const variableText = ( Array.from(chatVariablesService.getVariables())
+                    .map(v => `* \`${chatVariableLeader}${v.name}\` - ${v.description}`))
+                    .join('\n');
+                progress.report({ content: '\n' + variableText, kind: 'content' });
+            }
             if (defaultAgent?.metadata.helpTextPostfix) {
                 progress.report({ content: '\n\n', kind: 'content' });
                 if (isMarkdownString(defaultAgent.metadata.helpTextPostfix)) {
@@ -264,10 +279,11 @@ let ChatSlashStaticSlashCommandsContribution = class ChatSlashStaticSlashCommand
 ChatSlashStaticSlashCommandsContribution = ( __decorate([
     ( __param(0, IChatSlashCommandService)),
     ( __param(1, ICommandService)),
-    ( __param(2, IChatAgentService))
+    ( __param(2, IChatAgentService)),
+    ( __param(3, IChatVariablesService))
 ], ChatSlashStaticSlashCommandsContribution));
 const workbenchContributionsRegistry = ( Registry.as(Extensions$1.Workbench));
-workbenchContributionsRegistry.registerWorkbenchContribution(ChatResolverContribution, 1 );
+registerWorkbenchContribution2(ChatResolverContribution.ID, ChatResolverContribution, 1 );
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatAccessibleViewContribution, 4 );
 workbenchContributionsRegistry.registerWorkbenchContribution(ChatSlashStaticSlashCommandsContribution, 4 );
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(ChatEditorInput.TypeID, ChatEditorInputSerializer);