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

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

@@ -5,7 +5,6 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isElectron } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
@@ -19,11 +18,11 @@ import { FileEditorInput } from '@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7
 import { NotebookEditorInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
+import { toToolSetVariableEntry, toToolVariableEntry, OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ToolSet, ToolDataSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService';
 import { isImage } from '../chatPasteProviders.js';
 import { convertBufferToScreenshotVariable } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
-import { imageToHash } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { imageToHash } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ChatInstructionsPickerPick } from '../promptSyntax/attachInstructionsAction.js';
 
 let ChatContextContributions = class ChatContextContributions extends Disposable {
@@ -45,7 +44,7 @@ ChatContextContributions = ( __decorate([
 class ToolsContextPickerPick {
     constructor() {
         this.type = 'pickerPick';
-        this.label = ( localize(4603, 'Tools...'));
+        this.label = ( localize(4619, 'Tools...'));
         this.icon = Codicon.tools;
         this.ordinal = -500;
     }
@@ -58,7 +57,7 @@ class ToolsContextPickerPick {
                         toolInfo: ToolDataSource.classify(entry.source),
                         label: entry.referenceName,
                         description: entry.description,
-                        asAttachment: () => this._asToolSetAttachment(entry)
+                        asAttachment: () => toToolSetVariableEntry(entry)
                     });
                 }
                 else {
@@ -66,7 +65,7 @@ class ToolsContextPickerPick {
                         toolInfo: ToolDataSource.classify(entry.source),
                         label: entry.toolReferenceName ?? entry.displayName,
                         description: entry.userDescription ?? entry.modelDescription,
-                        asAttachment: () => this._asToolAttachment(entry)
+                        asAttachment: () => toToolVariableEntry(entry)
                     });
                 }
             }
@@ -91,35 +90,17 @@ class ToolsContextPickerPick {
             picks.push(item);
         }
         return {
-            placeholder: ( localize(4604, 'Select a tool')),
+            placeholder: ( localize(4620, 'Select a tool')),
             picks: Promise.resolve(picks)
         };
     }
-    _asToolAttachment(entry) {
-        return {
-            kind: 'tool',
-            id: entry.id,
-            icon: ThemeIcon.isThemeIcon(entry.icon) ? entry.icon : undefined,
-            name: entry.displayName,
-            value: undefined,
-        };
-    }
-    _asToolSetAttachment(entry) {
-        return {
-            kind: 'toolset',
-            id: entry.id,
-            icon: entry.icon,
-            name: entry.referenceName,
-            value: ( Array.from(entry.getTools()).map(t => this._asToolAttachment(t))),
-        };
-    }
 }
 let OpenEditorContextValuePick = class OpenEditorContextValuePick {
     constructor(_editorService, _labelService) {
         this._editorService = _editorService;
         this._labelService = _labelService;
         this.type = 'valuePick';
-        this.label = ( localize(4605, 'Open Editors'));
+        this.label = ( localize(4621, 'Open Editors'));
         this.icon = Codicon.file;
         this.ordinal = 800;
     }
@@ -155,7 +136,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
         this._chatEditingService = _chatEditingService;
         this._labelService = _labelService;
         this.type = 'pickerPick';
-        this.label = ( localize(4606, 'Related Files'));
+        this.label = ( localize(4622, 'Related Files'));
         this.icon = Codicon.sparkle;
         this.ordinal = 300;
     }
@@ -197,7 +178,7 @@ let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
             }, []));
         })();
         return {
-            placeholder: ( localize(4607, 'Add related files to your working set')),
+            placeholder: ( localize(4623, 'Add related files to your working set')),
             picks,
         };
     }
@@ -210,7 +191,7 @@ let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
     constructor(_clipboardService) {
         this._clipboardService = _clipboardService;
         this.type = 'valuePick';
-        this.label = ( localize(4608, 'Image from Clipboard'));
+        this.label = ( localize(4624, 'Image from Clipboard'));
         this.icon = Codicon.fileMedia;
     }
     async isEnabled(widget) {
@@ -224,8 +205,8 @@ let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
         const fileBuffer = await this._clipboardService.readImage();
         return {
             id: await imageToHash(fileBuffer),
-            name: ( localize(4609, 'Pasted Image')),
-            fullName: ( localize(4609, 'Pasted Image')),
+            name: ( localize(4625, 'Pasted Image')),
+            fullName: ( localize(4625, 'Pasted Image')),
             value: fileBuffer,
             kind: 'image',
         };
@@ -240,8 +221,8 @@ let ScreenshotContextValuePick = class ScreenshotContextValuePick {
         this.type = 'valuePick';
         this.icon = Codicon.deviceCamera;
         this.label = (isElectron
-            ? ( localize(4610, 'Screenshot Window'))
-            : ( localize(4611, 'Screenshot')));
+            ? ( localize(4626, 'Screenshot Window'))
+            : ( localize(4627, 'Screenshot')));
     }
     async isEnabled(widget) {
         return !!widget.input.selectedLanguageModel?.metadata.capabilities?.vision;

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

@@ -25,7 +25,7 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { IListService } from '@codingame/monaco-vscode-api/vscode/vs/platform/list/browser/listService.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
-import { resolveCommandsContext } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
+import { resolveCommandsContext } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/browser/parts/editor/editorCommandsContext';
 import { ResourceContextKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
 import { isEditorCommandsContext, EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
@@ -35,16 +35,16 @@ import { ExplorerFolderContext } from '@codingame/monaco-vscode-f24e325c-2ce0-5b
 import { AnythingQuickAccessProvider } from '@codingame/monaco-vscode-64322fa2-7385-5f46-935b-8f243d98004b-common/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { isSearchTreeFileMatch, isSearchTreeMatch } from '@codingame/monaco-vscode-85f7fb0f-70f5-5a5e-831b-15c743a8bd11-common/vscode/vs/workbench/contrib/search/browser/searchTreeModel/searchTreeCommon';
 import { SymbolsQuickAccessProvider } from '@codingame/monaco-vscode-bc8c28cd-7a80-54a9-af1a-e6b1e7a7f34a-common/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
-import { SearchContext } from '@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common/vscode/vs/workbench/contrib/search/common/constants';
+import { SearchContext } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/constants';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { OmittedState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatVariableEntries';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { showChatView } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService, IQuickChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
+import { isChatContextPickerPickItem } from '@codingame/monaco-vscode-51e7513d-a395-525d-b226-639aa8c6cc2d-common/vscode/vs/workbench/contrib/chat/browser/chatContextPickService';
 import { IChatContextPickService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service';
 import { isQuickChat } from '@codingame/monaco-vscode-e28ac690-06d5-5ee9-92d1-02df70296354-common/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { resizeImage } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { registerPromptActions } from '../promptSyntax/promptFileActions.js';
 import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -62,7 +62,7 @@ async function withChatView(accessor) {
     const viewsService = accessor.get(IViewsService);
     const chatWidgetService = accessor.get(IChatWidgetService);
     const lastFocusedWidget = chatWidgetService.lastFocusedWidget;
-    if (!lastFocusedWidget || lastFocusedWidget.location === ChatAgentLocation.Panel) {
+    if (!lastFocusedWidget || lastFocusedWidget.location === ChatAgentLocation.Chat) {
         return showChatView(viewsService);
     }
     return lastFocusedWidget;
@@ -115,7 +115,7 @@ class AttachFileToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFileToChatAction.ID,
-            title: ( localize2(4612, "Add File to Chat")),
+            title: ( localize2(4628, "Add File to Chat")),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             f1: true,
@@ -164,7 +164,7 @@ class AttachFolderToChatAction extends AttachResourceAction {
     constructor() {
         super({
             id: AttachFolderToChatAction.ID,
-            title: ( localize2(4613, "Add Folder to Chat")),
+            title: ( localize2(4629, "Add Folder to Chat")),
             category: CHAT_CATEGORY,
             f1: false,
             menu: {
@@ -193,7 +193,7 @@ class AttachSelectionToChatAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionToChatAction.ID,
-            title: ( localize2(4614, "Add Selection to Chat")),
+            title: ( localize2(4630, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
             f1: true,
             precondition: ChatContextKeys.enabled,
@@ -258,7 +258,7 @@ class AttachSearchResultAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.insertSearchResults',
-            title: ( localize2(4615, 'Add Search Results to Chat')),
+            title: ( localize2(4631, 'Add Search Results to Chat')),
             category: CHAT_CATEGORY,
             f1: false,
             menu: [{
@@ -324,16 +324,16 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.chat.attachContext',
-            title: ( localize2(4616, "Add Context...")),
+            title: ( localize2(4632, "Add Context...")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             keybinding: {
-                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)))),
+                when: ( ContextKeyExpr.and(ChatContextKeys.inChatInput, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
                 primary: KeyMod.CtrlCmd | KeyCode.Slash,
                 weight: KeybindingWeight.EditorContrib
             },
             menu: {
-                when: ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Panel)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
+                when: ( ContextKeyExpr.and(( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
                 id: MenuId.ChatInputAttachmentToolbar,
                 group: 'navigation',
                 order: 3
@@ -401,7 +401,7 @@ class AttachContextAction extends Action2 {
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: placeholder ?? ( localize(4617, 'Search attachments')),
+            placeholder: placeholder ?? ( localize(4633, 'Search attachments')),
             providerOptions,
         });
     }
@@ -469,7 +469,7 @@ class AttachContextAction extends Action2 {
         const pickerConfig = item.asPicker(widget);
         const store = ( new DisposableStore());
         const goBackItem = {
-            label: ( localize(4618, 'Go back ↩')),
+            label: ( localize(4634, 'Go back ↩')),
             alwaysShow: true
         };
         const configureItem = pickerConfig.configure ? {

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

@@ -13,7 +13,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(4619, "Copy All")),
+                title: ( localize2(4635, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -43,7 +43,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(4620, "Copy")),
+                title: ( localize2(4636, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -16,7 +16,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(4621, "Log Chat Input History")),
+            title: ( localize2(4637, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,
@@ -33,7 +33,7 @@ class LogChatIndexAction extends Action2 {
     constructor() {
         super({
             id: LogChatIndexAction.ID,
-            title: ( localize2(4622, "Log Chat Index")),
+            title: ( localize2(4638, "Log Chat Index")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true,

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

@@ -13,7 +13,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(4654, "Next File Tree")),
+                title: ( localize2(4673, "Next File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,
@@ -32,7 +32,7 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(4655, "Previous File Tree")),
+                title: ( localize2(4674, "Previous File Tree")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
                     weight: KeybindingWeight.WorkbenchContrib,

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

@@ -14,14 +14,14 @@ import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/c
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(4656, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(4675, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(4657, "Export Chat...")),
+                title: ( localize2(4676, "Export Chat...")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
             });
@@ -58,7 +58,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(4658, "Import Chat...")),
+                title: ( localize2(4677, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,

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

@@ -20,7 +20,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
     constructor() {
         super({
             id: ManageLanguageModelAuthenticationAction.ID,
-            title: ( localize2(4659, 'Manage Language Model Access...')),
+            title: ( localize2(4678, 'Manage Language Model Access...')),
             category: CHAT_CATEGORY,
             precondition: ChatContextKeys.enabled,
             menu: [{
@@ -91,9 +91,9 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
         if (extensionAuth.size === 0) {
             dialogService.prompt({
                 type: 'info',
-                message: ( localize(4660, 'No language models requiring authentication found.')),
+                message: ( localize(4679, 'No language models requiring authentication found.')),
                 detail: ( localize(
-                    4661,
+                    4680,
                     'There are currently no language models that require authentication.'
                 ))
             });
@@ -108,10 +108,10 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
             items.push({
                 type: 'separator',
                 id: ownerId,
-                label: ( localize(4662, '{0}', extension.displayName || extension.name)),
+                label: ( localize(4681, '{0}', extension.displayName || extension.name)),
                 buttons: [{
                         iconClass: ThemeIcon.asClassName(Codicon.info),
-                        tooltip: ( localize(4663, 'Open Extension')),
+                        tooltip: ( localize(4682, 'Open Extension')),
                     }]
             });
             let addedTrustedSeparator = false;
@@ -120,7 +120,7 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     if (allowedExt.trusted && !addedTrustedSeparator) {
                         items.push({
                             type: 'separator',
-                            label: ( localize(4664, 'Trusted by Microsoft')),
+                            label: ( localize(4683, 'Trusted by Microsoft')),
                         });
                         addedTrustedSeparator = true;
                     }
@@ -133,16 +133,16 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                         disabled: allowedExt.trusted,
                         buttons: [{
                                 iconClass: ThemeIcon.asClassName(Codicon.info),
-                                tooltip: ( localize(4663, 'Open Extension')),
+                                tooltip: ( localize(4682, 'Open Extension')),
                             }]
                     });
                 }
             }
             else {
                 items.push({
-                    label: ( localize(4665, 'No extensions have access')),
+                    label: ( localize(4684, 'No extensions have access')),
                     description: ( localize(
-                        4666,
+                        4685,
                         'No extensions are currently allowed to use models from {0}',
                         ownerId
                     )),
@@ -165,8 +165,8 @@ class ManageLanguageModelAuthenticationAction extends Action2 {
                     void extensionsWorkbenchService.open(extId);
                 }
             },
-            title: ( localize(4667, 'Manage Language Model Access')),
-            placeHolder: ( localize(4668, 'Choose which extensions can access language models')),
+            title: ( localize(4686, 'Manage Language Model Access')),
+            placeHolder: ( localize(4687, 'Choose which extensions can access language models')),
         });
         if (!result) {
             return;

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

@@ -28,7 +28,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInEditor',
-                title: ( localize2(4669, "Open Chat in Editor")),
+                title: ( localize2(4688, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -49,7 +49,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInNewWindow',
-                title: ( localize2(4670, "Open Chat in New Window")),
+                title: ( localize2(4689, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true,
@@ -70,7 +70,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.openInSidebar',
-                title: ( localize2(4671, "Open Chat in Side Bar")),
+                title: ( localize2(4690, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: ChatContextKeys.enabled,
                 f1: true
@@ -89,9 +89,9 @@ function registerMoveActions() {
         });
     }
     [MenuId.EditorTitle, MenuId.CompactWindowEditorTitle].forEach(id => {
-        appendOpenChatInViewMenuItem(id, ( localize(4672, "Open Chat in Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4673, "Open Chat in Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
-        appendOpenChatInViewMenuItem(id, ( localize(4674, "Open Chat in Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
+        appendOpenChatInViewMenuItem(id, ( localize(4691, "Open Chat in Secondary Side Bar")), Codicon.layoutSidebarRightDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.AuxiliaryBar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4692, "Open Chat in Primary Side Bar")), Codicon.layoutSidebarLeftDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Sidebar)));
+        appendOpenChatInViewMenuItem(id, ( localize(4693, "Open Chat in Panel")), Codicon.layoutPanelDock, ( ChatContextKeys.panelLocation.isEqualTo(ViewContainerLocation.Panel)));
     });
 }
 async function executeMoveToAction(accessor, moveTo, _sessionId) {
@@ -99,11 +99,16 @@ async function executeMoveToAction(accessor, moveTo, _sessionId) {
     const editorService = accessor.get(IEditorService);
     const widget = (_sessionId ? widgetService.getWidgetBySessionId(_sessionId) : undefined)
         ?? widgetService.lastFocusedWidget;
-    if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Panel) {
+    if (!widget || !widget.viewModel || widget.location !== ChatAgentLocation.Chat) {
         await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
         return;
     }
     const sessionId = widget.viewModel.sessionId;
+    const existingWidget = widgetService.getWidgetBySessionId(sessionId);
+    if (!existingWidget) {
+        await editorService.openEditor({ resource: ChatEditorInput.getNewEditorUri(), options: { pinned: true, auxiliary: { compact: true, bounds: { width: 640, height: 640 } } } }, moveTo === MoveToNewLocation.Window ? AUX_WINDOW_GROUP : ACTIVE_GROUP);
+        return;
+    }
     const viewState = widget.getViewState();
     widget.clear();
     await widget.waitForReady();

package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatPromptNavigationActions.d.ts

@@ -0,0 +1 @@
+export declare function registerChatPromptNavigationActions(): void;

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

@@ -0,0 +1,98 @@
+
+import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { isRequestVM, isResponseVM } from '@codingame/monaco-vscode-c2deffc4-ad68-5e63-8f95-9b89e0fc6898-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+
+function registerChatPromptNavigationActions() {
+    registerAction2(class NextUserPromptAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.nextUserPrompt',
+                title: ( localize2(4694, "Next User Prompt")),
+                keybinding: {
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow,
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    when: ChatContextKeys.inChatSession,
+                },
+                precondition: ChatContextKeys.enabled,
+                f1: true,
+                category: CHAT_CATEGORY,
+            });
+        }
+        run(accessor, ...args) {
+            navigateUserPrompts(accessor, false);
+        }
+    });
+    registerAction2(class PreviousUserPromptAction extends Action2 {
+        constructor() {
+            super({
+                id: 'workbench.action.chat.previousUserPrompt',
+                title: ( localize2(4695, "Previous User Prompt")),
+                keybinding: {
+                    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
+                    weight: KeybindingWeight.WorkbenchContrib,
+                    when: ChatContextKeys.inChatSession,
+                },
+                precondition: ChatContextKeys.enabled,
+                f1: true,
+                category: CHAT_CATEGORY,
+            });
+        }
+        run(accessor, ...args) {
+            navigateUserPrompts(accessor, true);
+        }
+    });
+}
+function navigateUserPrompts(accessor, reverse) {
+    const chatWidgetService = accessor.get(IChatWidgetService);
+    const widget = chatWidgetService.lastFocusedWidget;
+    if (!widget) {
+        return;
+    }
+    const items = widget.viewModel?.getItems();
+    if (!items || items.length === 0) {
+        return;
+    }
+    const userPrompts = items.filter((item) => isRequestVM(item));
+    if (userPrompts.length === 0) {
+        return;
+    }
+    const focused = widget.getFocus();
+    let currentIndex = -1;
+    if (focused) {
+        if (isRequestVM(focused)) {
+            currentIndex = userPrompts.findIndex(prompt => prompt.id === focused.id);
+        }
+        else if (isResponseVM(focused)) {
+            currentIndex = userPrompts.findIndex(prompt => prompt.id === focused.requestId);
+        }
+    }
+    let nextIndex;
+    if (currentIndex === -1) {
+        nextIndex = reverse ? userPrompts.length - 1 : 0;
+    }
+    else {
+        nextIndex = reverse ? currentIndex - 1 : currentIndex + 1;
+        if (nextIndex < 0) {
+            nextIndex = 0;
+        }
+        else if (nextIndex >= userPrompts.length) {
+            nextIndex = userPrompts.length - 1;
+        }
+        if (nextIndex === currentIndex) {
+            return;
+        }
+    }
+    const targetPrompt = userPrompts[nextIndex];
+    if (targetPrompt) {
+        widget.focus(targetPrompt);
+        widget.reveal(targetPrompt);
+    }
+}
+
+export { registerChatPromptNavigationActions };

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

@@ -18,7 +18,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4675, "Open in Chat View")),
+                title: ( localize2(4696, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.chatSparkle,
@@ -38,7 +38,7 @@ function registerQuickChatActions() {
         constructor() {
             super({
                 id: 'workbench.action.quickchat.close',
-                title: ( localize2(4676, "Close Quick Chat")),
+                title: ( localize2(4697, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
@@ -59,7 +59,7 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4677, 'Open Quick Chat')),
+            title: ( localize2(4698, 'Open Quick Chat')),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.chatSparkle,
             f1: false,
@@ -74,7 +74,7 @@ class QuickChatGlobalAction extends Action2 {
                 order: 4
             },
             metadata: {
-                description: ( localize(4678, 'Toggle the quick chat')),
+                description: ( localize(4699, 'Toggle the quick chat')),
                 args: [{
                         name: 'args',
                         schema: {
@@ -84,18 +84,18 @@ class QuickChatGlobalAction extends Action2 {
                                     required: ['query'],
                                     properties: {
                                         query: {
-                                            description: ( localize(4679, "The query to open the quick chat with")),
+                                            description: ( localize(4700, "The query to open the quick chat with")),
                                             type: 'string'
                                         },
                                         isPartialQuery: {
-                                            description: ( localize(4680, "Whether the query is partial; it will wait for more user input")),
+                                            description: ( localize(4701, "Whether the query is partial; it will wait for more user input")),
                                             type: 'boolean'
                                         }
                                     },
                                 },
                                 {
                                     type: 'string',
-                                    description: ( localize(4679, "The query to open the quick chat with"))
+                                    description: ( localize(4700, "The query to open the quick chat with"))
                                 }
                             ]
                         }
@@ -125,7 +125,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4681, "Open Quick Chat")),
+            title: ( localize2(4702, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });