@codingame/monaco-vscode-chat-service-override 25.1.2 → 26.0.0

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

@@ -1,42 +1,65 @@
 
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { KeyMod, KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
-import { localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { MenuRegistry, MenuId, registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ActiveEditorContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contextkeys';
+import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
-import { ChatAgentLocation, ChatModeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
-import { ChatViewId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
+import { localChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { ChatAgentLocation, ChatModeKind, ChatConfiguration } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { LocalChatSessionUri, getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+import { ChatViewId, isIChatViewViewContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { getEditingSessionContext, EditingSessionAction } from '@codingame/monaco-vscode-katex-common/vscode/vs/workbench/contrib/chat/browser/chatEditing/chatEditingActions';
 import { ChatEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput';
-import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, handleCurrentEditingSession, ACTION_ID_NEW_EDIT_SESSION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY, ACTION_ID_NEW_CHAT, ACTION_ID_NEW_EDIT_SESSION, handleCurrentEditingSession } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { clearChatEditor } from './chatClear.js';
-import { AgentSessionsViewerOrientation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { AgentSessionProviders, AgentSessionsViewerOrientation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/agentSessions/agentSessions';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 
+function isNewEditSessionActionContext(arg) {
+    if (arg && typeof arg === "object") {
+        const obj = arg;
+        if (obj.inputValue !== undefined && typeof obj.inputValue !== "string") {
+            return false;
+        }
+        if (obj.agentMode !== undefined && typeof obj.agentMode !== "boolean") {
+            return false;
+        }
+        if (obj.isPartialQuery !== undefined && typeof obj.isPartialQuery !== "boolean") {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
 function registerNewChatActions() {
     MenuRegistry.appendMenuItem(MenuId.ViewTitle, {
         submenu: MenuId.ChatNewMenu,
-        title: ( localize2(4781, "New Chat")),
+        title: ( localize2(4823, "New Chat")),
         icon: Codicon.plus,
-        when: ( ContextKeyExpr.equals('view', ChatViewId)),
-        group: 'navigation',
+        when: ( ContextKeyExpr.equals("view", ChatViewId)),
+        group: "navigation",
         order: -1,
         isSplitButton: true
     });
     registerAction2(class NewChatEditorAction extends Action2 {
         constructor() {
             super({
-                id: 'workbench.action.chatEditor.newChat',
-                title: ( localize2(4782, "New Chat")),
+                id: "workbench.action.chatEditor.newChat",
+                title: ( localize2(4824, "New Chat")),
                 icon: Codicon.plus,
                 f1: false,
-                precondition: ChatContextKeys.enabled,
+                precondition: ChatContextKeys.enabled
             });
         }
         async run(accessor, ...args) {
@@ -47,28 +70,24 @@ function registerNewChatActions() {
         constructor() {
             super({
                 id: ACTION_ID_NEW_CHAT,
-                title: ( localize2(4781, "New Chat")),
+                title: ( localize2(4823, "New Chat")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.plus,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
                 f1: true,
-                menu: [
-                    {
-                        id: MenuId.ChatContext,
-                        group: 'z_clear'
-                    },
-                    {
-                        id: MenuId.ChatNewMenu,
-                        group: '1_open',
-                        order: 1,
-                    },
-                    {
-                        id: MenuId.CompactWindowEditorTitle,
-                        group: 'navigation',
-                        when: ( ContextKeyExpr.and(( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)), ( ChatContextKeys.lockedToCodingAgent.negate()))),
-                        order: 1
-                    }
-                ],
+                menu: [{
+                    id: MenuId.ChatContext,
+                    group: "z_clear"
+                }, {
+                    id: MenuId.ChatNewMenu,
+                    group: "1_open",
+                    order: 1
+                }, {
+                    id: MenuId.CompactWindowEditorTitle,
+                    group: "navigation",
+                    when: ( ActiveEditorContext.isEqualTo(ChatEditorInput.EditorID)),
+                    order: 1
+                }],
                 keybinding: {
                     weight: KeybindingWeight.WorkbenchContrib + 1,
                     primary: KeyMod.CtrlCmd | KeyCode.KeyN,
@@ -82,65 +101,55 @@ function registerNewChatActions() {
             });
         }
         async run(accessor, ...args) {
-            const executeCommandContext = args[0];
+            const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
             const context = getEditingSessionContext(accessor, args);
-            const { editingSession, chatWidget: widget } = context ?? {};
-            if (!widget) {
-                return;
-            }
-            const dialogService = accessor.get(IDialogService);
-            const model = widget.viewModel?.model;
-            if (model && !(await handleCurrentEditingSession(model, undefined, dialogService))) {
-                return;
-            }
-            await editingSession?.stop();
-            await widget.clear();
-            widget.attachmentModel.clear(true);
-            widget.input.relatedFiles?.clear();
-            widget.focusInput();
-            if (!executeCommandContext) {
-                return;
-            }
-            if (typeof executeCommandContext.agentMode === 'boolean') {
-                widget.input.setChatMode(executeCommandContext.agentMode ? ChatModeKind.Agent : ChatModeKind.Edit);
-            }
-            if (executeCommandContext.inputValue) {
-                if (executeCommandContext.isPartialQuery) {
-                    widget.setInput(executeCommandContext.inputValue);
-                }
-                else {
-                    widget.acceptInput(executeCommandContext.inputValue);
-                }
-            }
+            await runNewChatAction(accessor, context, executeCommandContext);
         }
     });
     CommandsRegistry.registerCommandAlias(ACTION_ID_NEW_EDIT_SESSION, ACTION_ID_NEW_CHAT);
+    registerAction2(class NewLocalChatAction extends Action2 {
+        constructor() {
+            super({
+                id: "workbench.action.chat.newLocalChat",
+                title: ( localize2(4825, "New Local Chat")),
+                category: CHAT_CATEGORY,
+                icon: Codicon.plus,
+                precondition: ( ContextKeyExpr.and(ChatContextKeys.enabled, ( ChatContextKeys.location.isEqualTo(ChatAgentLocation.Chat)))),
+                f1: false
+            });
+        }
+        async run(accessor, ...args) {
+            const executeCommandContext = isNewEditSessionActionContext(args[0]) ? args[0] : undefined;
+            const context = getEditingSessionContext(accessor, args);
+            await runNewChatAction(accessor, context, executeCommandContext, AgentSessionProviders.Local);
+        }
+    });
     MenuRegistry.appendMenuItem(MenuId.ChatViewSessionTitleNavigationToolbar, {
         command: {
             id: ACTION_ID_NEW_CHAT,
-            title: ( localize2(4783, "Go Back")),
-            icon: Codicon.arrowLeft,
+            title: ( localize2(4826, "Go Back")),
+            icon: Codicon.arrowLeft
         },
         when: ( ChatContextKeys.agentSessionsViewerOrientation.notEqualsTo(AgentSessionsViewerOrientation.SideBySide)),
-        group: 'navigation',
+        group: "navigation",
         order: 1
     });
     registerAction2(class UndoChatEditInteractionAction extends EditingSessionAction {
         constructor() {
             super({
-                id: 'workbench.action.chat.undoEdit',
-                title: ( localize2(4784, "Undo Last Edit")),
+                id: "workbench.action.chat.undoEdit",
+                title: ( localize2(4827, "Undo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.discard,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanUndo, ChatContextKeys.enabled)),
                 f1: true,
                 menu: [{
-                        id: MenuId.ViewTitle,
-                        when: ( ContextKeyExpr.equals('view', ChatViewId)),
-                        group: 'navigation',
-                        order: -3,
-                        isHiddenByDefault: true
-                    }]
+                    id: MenuId.ViewTitle,
+                    when: ( ContextKeyExpr.equals("view", ChatViewId)),
+                    group: "navigation",
+                    order: -3,
+                    isHiddenByDefault: true
+                }]
             });
         }
         async runEditingSessionAction(accessor, editingSession) {
@@ -150,21 +159,19 @@ function registerNewChatActions() {
     registerAction2(class RedoChatEditInteractionAction extends EditingSessionAction {
         constructor() {
             super({
-                id: 'workbench.action.chat.redoEdit',
-                title: ( localize2(4785, "Redo Last Edit")),
+                id: "workbench.action.chat.redoEdit",
+                title: ( localize2(4828, "Redo Last Edit")),
                 category: CHAT_CATEGORY,
                 icon: Codicon.redo,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
-                menu: [
-                    {
-                        id: MenuId.ViewTitle,
-                        when: ( ContextKeyExpr.equals('view', ChatViewId)),
-                        group: 'navigation',
-                        order: -2,
-                        isHiddenByDefault: true
-                    }
-                ]
+                menu: [{
+                    id: MenuId.ViewTitle,
+                    when: ( ContextKeyExpr.equals("view", ChatViewId)),
+                    group: "navigation",
+                    order: -2,
+                    isHiddenByDefault: true
+                }]
             });
         }
         async runEditingSessionAction(accessor, editingSession) {
@@ -176,18 +183,18 @@ function registerNewChatActions() {
     registerAction2(class RedoChatCheckpoints extends EditingSessionAction {
         constructor() {
             super({
-                id: 'workbench.action.chat.redoEdit2',
-                title: ( localize2(4786, "Redo")),
-                tooltip: ( localize2(4787, "Reapply discarded workspace changes and chat")),
+                id: "workbench.action.chat.redoEdit2",
+                title: ( localize2(4829, "Redo")),
+                tooltip: ( localize2(4830, "Reapply discarded workspace changes and chat")),
                 category: CHAT_CATEGORY,
                 precondition: ( ContextKeyExpr.and(ChatContextKeys.chatEditingCanRedo, ChatContextKeys.enabled)),
                 f1: true,
                 menu: [{
-                        id: MenuId.ChatMessageRestoreCheckpoint,
-                        when: ( ChatContextKeys.lockedToCodingAgent.negate()),
-                        group: 'navigation',
-                        order: -1
-                    }]
+                    id: MenuId.ChatMessageRestoreCheckpoint,
+                    when: ( ChatContextKeys.lockedToCodingAgent.negate()),
+                    group: "navigation",
+                    order: -1
+                }]
             });
         }
         async runEditingSessionAction(accessor, editingSession) {
@@ -198,12 +205,67 @@ function registerNewChatActions() {
             const currentWidget = widget.getWidgetBySessionResource(editingSession.chatSessionResource);
             const requestText = currentWidget?.viewModel?.model.checkpoint?.message.text;
             if (currentWidget?.inputEditor.getValue() === requestText) {
-                currentWidget?.input.setValue('', false);
+                currentWidget?.input.setValue("", false);
             }
             currentWidget?.viewModel?.model.setCheckpoint(undefined);
             currentWidget?.focusInput();
         }
     });
 }
+function getResourceForNewChatSession(sessionType) {
+    const isRemoteSession = sessionType !== localChatSessionType;
+    if (isRemoteSession) {
+        return ( URI.from({
+            scheme: sessionType,
+            path: `/untitled-${generateUuid()}`
+        }));
+    }
+    return LocalChatSessionUri.forSession(generateUuid());
+}
+async function runNewChatAction(accessor, context, executeCommandContext, sessionType) {
+    const accessibilityService = accessor.get(IAccessibilityService);
+    const viewsService = accessor.get(IViewsService);
+    const configurationService = accessor.get(IConfigurationService);
+    const {
+        editingSession,
+        chatWidget: widget
+    } = context ?? {};
+    if (!widget) {
+        return;
+    }
+    const dialogService = accessor.get(IDialogService);
+    const model = widget.viewModel?.model;
+    if (model && !(await handleCurrentEditingSession(model, undefined, dialogService))) {
+        return;
+    }
+    await editingSession?.stop();
+    const currentResource = widget.viewModel?.model.sessionResource;
+    const newSessionType = sessionType ?? (currentResource ? getChatSessionType(currentResource) : localChatSessionType);
+    if (isIChatViewViewContext(widget.viewContext) && newSessionType !== localChatSessionType) {
+        const newResource = getResourceForNewChatSession(newSessionType);
+        const view = await viewsService.openView(ChatViewId);
+        await view.loadSession(newResource);
+    } else {
+        await widget.clear();
+    }
+    widget.attachmentModel.clear(true);
+    widget.focusInput();
+    accessibilityService.alert(( localize(4831, "New chat")));
+    if (!executeCommandContext) {
+        return;
+    }
+    if (typeof executeCommandContext.agentMode === "boolean") {
+        widget.input.setChatMode(executeCommandContext.agentMode ? ChatModeKind.Agent : ChatModeKind.Edit);
+    } else if (widget.input.currentModeKind === ChatModeKind.Edit && configurationService.getValue(ChatConfiguration.EditModeHidden)) {
+        widget.input.setChatMode(ChatModeKind.Agent);
+    }
+    if (executeCommandContext.inputValue) {
+        if (executeCommandContext.isPartialQuery) {
+            widget.setInput(executeCommandContext.inputValue);
+        } else {
+            widget.acceptInput(executeCommandContext.inputValue);
+        }
+    }
+}
 
 export { registerNewChatActions };

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

@@ -12,16 +12,16 @@ function registerChatPromptNavigationActions() {
     registerAction2(class NextUserPromptAction extends Action2 {
         constructor() {
             super({
-                id: 'workbench.action.chat.nextUserPrompt',
-                title: ( localize2(4788, "Next User Prompt")),
+                id: "workbench.action.chat.nextUserPrompt",
+                title: ( localize2(4832, "Next User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow,
                     weight: KeybindingWeight.WorkbenchContrib,
-                    when: ChatContextKeys.inChatSession,
+                    when: ChatContextKeys.inChatSession
                 },
                 precondition: ChatContextKeys.enabled,
                 f1: true,
-                category: CHAT_CATEGORY,
+                category: CHAT_CATEGORY
             });
         }
         run(accessor, ...args) {
@@ -31,16 +31,16 @@ function registerChatPromptNavigationActions() {
     registerAction2(class PreviousUserPromptAction extends Action2 {
         constructor() {
             super({
-                id: 'workbench.action.chat.previousUserPrompt',
-                title: ( localize2(4789, "Previous User Prompt")),
+                id: "workbench.action.chat.previousUserPrompt",
+                title: ( localize2(4833, "Previous User Prompt")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow,
                     weight: KeybindingWeight.WorkbenchContrib,
-                    when: ChatContextKeys.inChatSession,
+                    when: ChatContextKeys.inChatSession
                 },
                 precondition: ChatContextKeys.enabled,
                 f1: true,
-                category: CHAT_CATEGORY,
+                category: CHAT_CATEGORY
             });
         }
         run(accessor, ...args) {
@@ -58,7 +58,7 @@ function navigateUserPrompts(accessor, reverse) {
     if (!items || items.length === 0) {
         return;
     }
-    const userPrompts = items.filter((item) => isRequestVM(item));
+    const userPrompts = items.filter(item => isRequestVM(item));
     if (userPrompts.length === 0) {
         return;
     }
@@ -67,21 +67,18 @@ function navigateUserPrompts(accessor, reverse) {
     if (focused) {
         if (isRequestVM(focused)) {
             currentIndex = userPrompts.findIndex(prompt => prompt.id === focused.id);
-        }
-        else if (isResponseVM(focused)) {
+        } else if (isResponseVM(focused)) {
             currentIndex = userPrompts.findIndex(prompt => prompt.id === focused.requestId);
         }
     }
     let nextIndex;
     if (currentIndex === -1) {
         nextIndex = reverse ? userPrompts.length - 1 : 0;
-    }
-    else {
+    } else {
         nextIndex = reverse ? currentIndex - 1 : currentIndex + 1;
         if (nextIndex < 0) {
             nextIndex = 0;
-        }
-        else if (nextIndex >= userPrompts.length) {
+        } else if (nextIndex >= userPrompts.length) {
             nextIndex = userPrompts.length - 1;
         }
         if (nextIndex === currentIndex) {

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

@@ -17,14 +17,14 @@ function registerQuickChatActions() {
     registerAction2(class OpenInChatViewAction extends Action2 {
         constructor() {
             super({
-                id: 'workbench.action.quickchat.openInChatView',
-                title: ( localize2(4790, "Open in Chat View")),
+                id: "workbench.action.quickchat.openInChatView",
+                title: ( localize2(4834, "Open in Chat View")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.chatSparkle,
                 menu: {
                     id: MenuId.ChatInputSide,
-                    group: 'navigation',
+                    group: "navigation",
                     order: 10
                 }
             });
@@ -37,14 +37,14 @@ function registerQuickChatActions() {
     registerAction2(class CloseQuickChatAction extends Action2 {
         constructor() {
             super({
-                id: 'workbench.action.quickchat.close',
-                title: ( localize2(4791, "Close Quick Chat")),
+                id: "workbench.action.quickchat.close",
+                title: ( localize2(4835, "Close Quick Chat")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.close,
                 menu: {
                     id: MenuId.ChatInputSide,
-                    group: 'navigation',
+                    group: "navigation",
                     order: 20
                 }
             });
@@ -59,60 +59,59 @@ class QuickChatGlobalAction extends Action2 {
     constructor() {
         super({
             id: ASK_QUICK_QUESTION_ACTION_ID,
-            title: ( localize2(4792, 'Open Quick Chat')),
+            title: ( localize2(4836, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             icon: Codicon.chatSparkle,
             f1: false,
             category: CHAT_CATEGORY,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
-                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyL,
+                primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyMod.Alt | KeyCode.KeyL
             },
             menu: {
                 id: MenuId.ChatTitleBarMenu,
-                group: 'a_open',
+                group: "a_open",
                 order: 4
             },
             metadata: {
-                description: ( localize(4793, 'Toggle the quick chat')),
+                description: ( localize(4837, "Toggle the quick chat")),
                 args: [{
-                        name: 'args',
-                        schema: {
-                            anyOf: [
-                                {
-                                    type: 'object',
-                                    required: ['query'],
-                                    properties: {
-                                        query: {
-                                            description: ( localize(4794, "The query to open the quick chat with")),
-                                            type: 'string'
-                                        },
-                                        isPartialQuery: {
-                                            description: ( localize(4795, "Whether the query is partial; it will wait for more user input")),
-                                            type: 'boolean'
-                                        }
-                                    },
+                    name: "args",
+                    schema: {
+                        anyOf: [{
+                            type: "object",
+                            required: ["query"],
+                            properties: {
+                                query: {
+                                    description: ( localize(4838, "The query to open the quick chat with")),
+                                    type: "string"
                                 },
-                                {
-                                    type: 'string',
-                                    description: ( localize(4794, "The query to open the quick chat with"))
+                                isPartialQuery: {
+                                    description: ( localize(4839, "Whether the query is partial; it will wait for more user input")),
+                                    type: "boolean"
                                 }
-                            ]
-                        }
-                    }]
-            },
+                            }
+                        }, {
+                            type: "string",
+                            description: ( localize(4838, "The query to open the quick chat with"))
+                        }]
+                    }
+                }]
+            }
         });
     }
     run(accessor, query) {
         const quickChatService = accessor.get(IQuickChatService);
         let options;
         switch (typeof query) {
-            case 'string':
-                options = { query };
-                break;
-            case 'object':
-                options = query;
-                break;
+        case "string":
+            options = {
+                query
+            };
+            break;
+        case "object":
+            options = query;
+            break;
         }
         if (options?.query) {
             options.selection = ( new Selection(1, options.query.length + 1, 1, options.query.length + 1));
@@ -125,7 +124,7 @@ class AskQuickChatAction extends Action2 {
         super({
             id: `workbench.action.openQuickChat`,
             category: CHAT_CATEGORY,
-            title: ( localize2(4796, "Open Quick Chat")),
+            title: ( localize2(4840, "Open Quick Chat")),
             precondition: ChatContextKeys.enabled,
             f1: true
         });