@codingame/monaco-vscode-chat-service-override 9.0.3 → 10.0.1

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

@@ -1,6 +1,5 @@
 import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { compare } from 'vscode/vscode/vs/base/common/strings';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
@@ -11,12 +10,12 @@ import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { showChatView } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService, IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { isQuickChat } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatWidget';
-import { ChatContextAttachments } from '../contrib/chatContextAttachments.js';
+import { ChatContextAttachments } from 'vscode/vscode/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments';
 import { ChatAgentLocation } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents';
 import { IChatAgentService } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { CONTEXT_CHAT_LOCATION, CONTEXT_IN_CHAT_INPUT } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
@@ -26,6 +25,11 @@ import { ILanguageModelToolsService } from 'vscode/vscode/vs/workbench/contrib/c
 import { AnythingQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/anythingQuickAccess';
 import { SymbolsQuickAccessProvider } from 'vscode/vscode/vs/workbench/contrib/search/browser/symbolsQuickAccess';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { imageToHash, isImage } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatImagePaste';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 
 function registerChatContextActions() {
     registerAction2(AttachContextAction);
@@ -37,9 +41,15 @@ class AttachFileAction extends Action2 {
     constructor() {
         super({
             id: AttachFileAction.ID,
-            title: ( localize2(7109, "Attach File")),
+            title: ( localize2(7320, "Add File to Chat")),
             category: CHAT_CATEGORY,
-            f1: false
+            f1: false,
+            precondition: ( (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))),
+            menu: {
+                id: MenuId.ChatCommandCenter,
+                group: 'a_chat',
+                order: 10,
+            }
         });
     }
     async run(accessor, ...args) {
@@ -47,6 +57,7 @@ class AttachFileAction extends Action2 {
         const textEditorService = accessor.get(IEditorService);
         const activeUri = textEditorService.activeEditor?.resource;
         if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
+            (await showChatView(accessor.get(IViewsService)))?.focusInput();
             variablesService.attachContext('file', activeUri, ChatAgentLocation.Panel);
         }
     }
@@ -56,9 +67,15 @@ class AttachSelectionAction extends Action2 {
     constructor() {
         super({
             id: AttachSelectionAction.ID,
-            title: ( localize2(7110, "Add Selection to Chat")),
+            title: ( localize2(7321, "Add Selection to Chat")),
             category: CHAT_CATEGORY,
-            f1: false
+            f1: false,
+            precondition: ( (ActiveEditorContext.isEqualTo('workbench.editors.files.textFileEditor'))),
+            menu: {
+                id: MenuId.ChatCommandCenter,
+                group: 'a_chat',
+                order: 11,
+            }
         });
     }
     async run(accessor, ...args) {
@@ -69,6 +86,7 @@ class AttachSelectionAction extends Action2 {
         if (textEditorService.activeTextEditorControl?.getEditorType() === EditorType.ICodeEditor && activeUri && [Schemas.file, Schemas.vscodeRemote, Schemas.untitled].includes(activeUri.scheme)) {
             const selection = activeEditor?.getSelection();
             if (selection) {
+                (await showChatView(accessor.get(IViewsService)))?.focusInput();
                 variablesService.attachContext('file', { uri: activeUri, range: selection }, ChatAgentLocation.Panel);
             }
         }
@@ -94,20 +112,33 @@ class AttachContextAction extends Action2 {
     constructor() {
         super({
             id: AttachContextAction.ID,
-            title: ( localize2(7111, "Attach Context")),
+            title: ( localize2(7322, "Attach Context")),
             icon: Codicon.attach,
             category: CHAT_CATEGORY,
             precondition: AttachContextAction._cdt,
             keybinding: {
                 when: CONTEXT_IN_CHAT_INPUT,
-                primary: KeyMod.CtrlCmd | KeyCode.Slash,
-                weight: KeybindingWeight.EditorContrib
+                primary: 2048  | 90 ,
+                weight: 100
             },
             menu: [
                 {
-                    when: AttachContextAction._cdt,
+                    when: ( (ContextKeyExpr.and(
+                         (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel)),
+                        AttachContextAction._cdt
+                    ))),
+                    id: MenuId.ChatInput,
+                    group: 'navigation',
+                    order: 2
+                },
+                {
+                    when: ( (ContextKeyExpr.and(
+                         (( (CONTEXT_CHAT_LOCATION.isEqualTo(ChatAgentLocation.Panel))).negate()),
+                        AttachContextAction._cdt
+                    ))),
                     id: MenuId.ChatExecute,
                     group: 'navigation',
+                    order: 1
                 },
             ]
         });
@@ -122,7 +153,7 @@ class AttachContextAction extends Action2 {
             `:${item.range.startLineNumber}-${item.range.endLineNumber}` :
             `:${item.range.startLineNumber}`);
     }
-    async _attachContext(widget, commandService, ...picks) {
+    async _attachContext(widget, commandService, clipboardService, ...picks) {
         const toAttach = [];
         for (const pick of picks) {
             if (pick && typeof pick === 'object' && 'command' in pick && pick.command) {
@@ -149,14 +180,26 @@ class AttachContextAction extends Action2 {
                 });
             }
             else if (pick && typeof pick === 'object' && 'resource' in pick && pick.resource) {
-                toAttach.push({
-                    ...pick,
-                    id: this._getFileContextId({ resource: pick.resource }),
-                    value: pick.resource,
-                    name: pick.label,
-                    isFile: true,
-                    isDynamic: true
-                });
+                if (/\.(png|jpg|jpeg|bmp|gif|tiff)$/i.test(pick.resource.path)) {
+                    toAttach.push({
+                        id: ( (pick.resource.toString())),
+                        name: pick.label,
+                        fullName: pick.label,
+                        value: pick.resource,
+                        isDynamic: true,
+                        isImage: true
+                    });
+                }
+                else {
+                    toAttach.push({
+                        ...pick,
+                        id: this._getFileContextId({ resource: pick.resource }),
+                        value: pick.resource,
+                        name: pick.label,
+                        isFile: true,
+                        isDynamic: true
+                    });
+                }
             }
             else if ('symbolName' in pick && pick.uri && pick.range) {
                 toAttach.push({
@@ -179,6 +222,17 @@ class AttachContextAction extends Action2 {
                     isTool: true
                 });
             }
+            else if ('kind' in pick && pick.kind === 'image') {
+                const fileBuffer = await clipboardService.readImage();
+                toAttach.push({
+                    id: await imageToHash(fileBuffer),
+                    name: ( localize(7323, 'Pasted Image')),
+                    fullName: ( localize(7323, 'Pasted Image')),
+                    value: fileBuffer,
+                    isDynamic: true,
+                    isImage: true
+                });
+            }
             else {
                 toAttach.push({
                     ...pick,
@@ -201,6 +255,8 @@ class AttachContextAction extends Action2 {
         const widgetService = accessor.get(IChatWidgetService);
         const languageModelToolsService = accessor.get(ILanguageModelToolsService);
         const quickChatService = accessor.get(IQuickChatService);
+        const clipboardService = accessor.get(IClipboardService);
+        const configurationService = accessor.get(IConfigurationService);
         const context = args[0];
         const widget = context?.widget ?? widgetService.lastFocusedWidget;
         if (!widget) {
@@ -220,6 +276,17 @@ class AttachContextAction extends Action2 {
                 });
             }
         }
+        if (configurationService.getValue('chat.experimental.imageAttachments')) {
+            const imageData = await clipboardService.readImage();
+            if (isImage(imageData)) {
+                quickPickItems.push({
+                    id: await imageToHash(imageData),
+                    kind: 'image',
+                    label: ( localize(7324, 'Image from Clipboard')),
+                    iconClass: ThemeIcon.asClassName(Codicon.fileMedia),
+                });
+            }
+        }
         if (widget.viewModel?.sessionId) {
             const agentPart = widget.parsedInput.parts.find((part) => part instanceof ChatRequestAgentPart);
             if (agentPart) {
@@ -260,11 +327,27 @@ class AttachContextAction extends Action2 {
             }
         }
         quickPickItems.push({
-            label: ( localize(7112, 'Symbol...')),
+            label: ( localize(7325, 'Symbol...')),
             icon: ThemeIcon.fromId(Codicon.symbolField.id),
             iconClass: ThemeIcon.asClassName(Codicon.symbolField),
             prefix: SymbolsQuickAccessProvider.PREFIX
         });
+        if (widget.location === ChatAgentLocation.Notebook) {
+            quickPickItems.push({
+                kind: 'dynamic',
+                id: 'chatContext.notebook.kernelVariable',
+                isDynamic: true,
+                icon: ThemeIcon.fromId(Codicon.serverEnvironment.id),
+                iconClass: ThemeIcon.asClassName(Codicon.serverEnvironment),
+                value: 'kernelVariable',
+                label: ( localize(7326, 'Kernel Variable...')),
+                command: {
+                    id: 'notebook.chat.selectAndInsertKernelVariable',
+                    title: ( localize(7327, 'Select and Insert Kernel Variable')),
+                    arguments: [{ widget, range: undefined }]
+                }
+            });
+        }
         function extractTextFromIconLabel(label) {
             if (!label) {
                 return '';
@@ -276,23 +359,26 @@ class AttachContextAction extends Action2 {
             const first = extractTextFromIconLabel(a.label).toUpperCase();
             const second = extractTextFromIconLabel(b.label).toUpperCase();
             return compare(first, second);
-        }));
+        }), clipboardService, '');
     }
-    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, query = '') {
+    _show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, query = '') {
         quickInputService.quickAccess.show(query, {
             enabledProviderPrefixes: [
                 AnythingQuickAccessProvider.PREFIX,
                 SymbolsQuickAccessProvider.PREFIX,
                 AbstractGotoSymbolQuickAccessProvider.PREFIX
             ],
-            placeholder: ( localize(7113, 'Search attachments')),
+            placeholder: ( localize(7328, 'Search attachments')),
             providerOptions: {
                 handleAccept: (item) => {
                     if ('prefix' in item) {
-                        this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, item.prefix);
+                        this._show(quickInputService, commandService, widget, quickChatService, quickPickItems, clipboardService, item.prefix);
                     }
                     else {
-                        this._attachContext(widget, commandService, item);
+                        if (!clipboardService) {
+                            return;
+                        }
+                        this._attachContext(widget, commandService, clipboardService, item);
                         if (isQuickChat(widget)) {
                             quickChatService.open();
                         }
@@ -301,6 +387,9 @@ class AttachContextAction extends Action2 {
                 additionPicks: quickPickItems,
                 filter: (item) => {
                     const attachedContext = widget.getContrib(ChatContextAttachments.ID)?.getContext() ?? ( (new Set()));
+                    if ('kind' in item && item.kind === 'image') {
+                        return !( (attachedContext.has(item.id)));
+                    }
                     if ('symbol' in item && item.symbol) {
                         return !( (attachedContext.has(this._getFileContextId(item.symbol.location))));
                     }

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

@@ -11,7 +11,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyAll',
-                title: ( localize2(7114, "Copy All")),
+                title: ( localize2(7329, "Copy All")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {
@@ -41,7 +41,7 @@ function registerChatCopyActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyItem',
-                title: ( localize2(7115, "Copy")),
+                title: ( localize2(7330, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 menu: {

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

@@ -12,7 +12,7 @@ class LogChatInputHistoryAction extends Action2 {
     constructor() {
         super({
             id: LogChatInputHistoryAction.ID,
-            title: ( localize2(7116, "Log Chat Input History")),
+            title: ( localize2(7331, "Log Chat Input History")),
             icon: Codicon.attach,
             category: Categories.Developer,
             f1: true

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

@@ -1,7 +1,5 @@
-import { KeyMod, KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { localize2 } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { CHAT_CATEGORY } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { CONTEXT_IN_CHAT_SESSION, CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
@@ -12,10 +10,10 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextFileTree',
-                title: ( localize2(7121, "Next File Tree")),
+                title: ( localize2(7337, "Next File Tree")),
                 keybinding: {
-                    primary: KeyMod.CtrlCmd | KeyCode.F9,
-                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: 2048  | 67 ,
+                    weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
                 precondition: CONTEXT_CHAT_ENABLED,
@@ -31,10 +29,10 @@ function registerChatFileTreeActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousFileTree',
-                title: ( localize2(7122, "Previous File Tree")),
+                title: ( localize2(7338, "Previous File Tree")),
                 keybinding: {
-                    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F9,
-                    weight: KeybindingWeight.WorkbenchContrib,
+                    primary: 2048  | 1024  | 67 ,
+                    weight: 200 ,
                     when: CONTEXT_IN_CHAT_SESSION,
                 },
                 precondition: CONTEXT_CHAT_ENABLED,

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

@@ -13,14 +13,14 @@ import { IChatService } from 'vscode/vscode/vs/workbench/contrib/chat/common/cha
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const defaultFileName = 'chat.json';
-const filters = [{ name: ( localize(7123, "Chat Session")), extensions: ['json'] }];
+const filters = [{ name: ( localize(7339, "Chat Session")), extensions: ['json'] }];
 function registerChatExportActions() {
     registerAction2(class ExportChatAction extends Action2 {
         constructor() {
             super({
                 id: 'workbench.action.chat.export',
                 category: CHAT_CATEGORY,
-                title: ( localize2(7124, "Export Chat...")),
+                title: ( localize2(7340, "Export Chat...")),
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
             });
@@ -54,7 +54,7 @@ function registerChatExportActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.import',
-                title: ( localize2(7125, "Import Chat...")),
+                title: ( localize2(7341, "Import Chat...")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,

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

@@ -5,6 +5,7 @@ import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextke
 import { CHAT_CATEGORY, isChatViewTitleActionContext } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { CHAT_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
 import { IChatWidgetService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ChatEditor } from '../chatEditor.js';
 import { ChatEditorInput } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CONTEXT_CHAT_ENABLED } from 'vscode/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
@@ -22,7 +23,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInEditor`,
-                title: ( localize2(7126, "Open Chat in Editor")),
+                title: ( localize2(7342, "Open Chat in Editor")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -42,7 +43,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInNewWindow`,
-                title: ( localize2(7127, "Open Chat in New Window")),
+                title: ( localize2(7343, "Open Chat in New Window")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -62,7 +63,7 @@ function registerMoveActions() {
         constructor() {
             super({
                 id: `workbench.action.chat.openInSidebar`,
-                title: ( localize2(7128, "Open Chat in Side Bar")),
+                title: ( localize2(7344, "Open Chat in Side Bar")),
                 category: CHAT_CATEGORY,
                 precondition: CONTEXT_CHAT_ENABLED,
                 f1: true,
@@ -100,12 +101,13 @@ async function moveToSidebar(accessor) {
     const viewsService = accessor.get(IViewsService);
     const editorService = accessor.get(IEditorService);
     const editorGroupService = accessor.get(IEditorGroupsService);
-    const chatEditorInput = editorService.activeEditor;
+    const chatEditor = editorService.activeEditorPane;
+    const chatEditorInput = chatEditor?.input;
     let view;
-    if (chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
-        await editorService.closeEditor({ editor: chatEditorInput, groupId: editorGroupService.activeGroup.id });
+    if (chatEditor instanceof ChatEditor && chatEditorInput instanceof ChatEditorInput && chatEditorInput.sessionId) {
+        await editorService.closeEditor({ editor: chatEditor.input, groupId: editorGroupService.activeGroup.id });
         view = await viewsService.openView(CHAT_VIEW_ID);
-        view.loadSession(chatEditorInput.sessionId);
+        view.loadSession(chatEditorInput.sessionId, chatEditor.getViewState());
     }
     else {
         view = await viewsService.openView(CHAT_VIEW_ID);