@codingame/monaco-vscode-chat-service-override 17.2.1 → 18.0.0

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

@@ -20,16 +20,16 @@ import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/l
 import { TerminalLocation } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { accessibleViewInCodeBlock } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
-import { reviewEdits } from '@codingame/monaco-vscode-9f229325-8261-585c-a552-16085958c680-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
+import { reviewEdits } from '@codingame/monaco-vscode-6c0f93b9-169c-58c3-a9cb-7d60698eb52c-common/vscode/vs/workbench/contrib/inlineChat/browser/inlineChatController';
 import { ITerminalService, ITerminalEditorService, ITerminalGroupService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
 import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
 import { ChatCopyKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { isResponseVM } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
+import { isResponseVM } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/common/chatViewModel';
 import { ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { IChatWidgetService, IChatCodeBlockContextProviderService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
 import { DefaultChatTextEditor } from '@codingame/monaco-vscode-c465110a-57c0-59d7-a6b2-be0a4db7e517-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
-import { CHAT_CATEGORY } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
+import { CHAT_CATEGORY } from '@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/actions/chatActions';
 import { ApplyCodeBlockOperation, InsertCodeBlockOperation } from './codeBlockOperations.js';
 
 const shellLangIds = [
@@ -81,7 +81,7 @@ let CodeBlockActionRendering = class CodeBlockActionRendering extends Disposable
                     const context = this._context;
                     if (isCodeBlockActionContext(context) && context.codemapperUri) {
                         const label = labelService.getUriLabel(context.codemapperUri, { relative: true });
-                        return localize(4389, "Apply to {0}", label);
+                        return localize(4423, "Apply to {0}", label);
                     }
                     return super.getTooltip();
                 }
@@ -104,7 +104,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.copyCodeBlock',
-                title: ( localize2(4390, "Copy")),
+                title: ( localize2(4424, "Copy")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.copy,
@@ -189,7 +189,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: APPLY_IN_EDITOR_ID,
-                title: ( localize2(4391, "Apply in Editor")),
+                title: ( localize2(4425, "Apply in Editor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -225,7 +225,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertCodeBlock',
-                title: ( localize2(4392, "Insert At Cursor")),
+                title: ( localize2(4426, "Insert At Cursor")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -259,7 +259,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.insertIntoNewFile',
-                title: ( localize2(4393, "Insert into New File")),
+                title: ( localize2(4427, "Insert into New File")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -300,7 +300,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.runInTerminal',
-                title: ( localize2(4394, "Insert into Terminal")),
+                title: ( localize2(4428, "Insert into Terminal")),
                 precondition: ChatContextKeys.enabled,
                 f1: true,
                 category: CHAT_CATEGORY,
@@ -394,7 +394,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.nextCodeBlock',
-                title: ( localize2(4395, "Next Code Block")),
+                title: ( localize2(4429, "Next Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageDown, },
@@ -414,7 +414,7 @@ function registerChatCodeBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.previousCodeBlock',
-                title: ( localize2(4396, "Previous Code Block")),
+                title: ( localize2(4430, "Previous Code Block")),
                 keybinding: {
                     primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp,
                     mac: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.PageUp, },
@@ -473,7 +473,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.applyCompareEdits',
-                title: ( localize2(4397, "Apply Edits")),
+                title: ( localize2(4431, "Apply Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.gitPullRequestGoToChanges,
@@ -515,7 +515,7 @@ function registerChatCodeCompareBlockActions() {
         constructor() {
             super({
                 id: 'workbench.action.chat.discardCompareEdits',
-                title: ( localize2(4398, "Discard Edits")),
+                title: ( localize2(4432, "Discard Edits")),
                 f1: false,
                 category: CHAT_CATEGORY,
                 icon: Codicon.trash,

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

@@ -0,0 +1,8 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IChatContextPickService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatContextPickService.service";
+export declare class ChatContextContributions extends Disposable implements IWorkbenchContribution {
+    static readonly ID = "chat.contextContributions";
+    constructor(instantiationService: IInstantiationService, contextPickService: IChatContextPickService);
+}

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

@@ -0,0 +1,256 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+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';
+import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
+import { EditorResourceAccessor, SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
+import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { UntitledTextEditorInput } from '@codingame/monaco-vscode-f5d4b045-44e8-55a8-b683-308656a412fa-common/vscode/vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { FileEditorInput } from '@codingame/monaco-vscode-f5d4b045-44e8-55a8-b683-308656a412fa-common/vscode/vs/workbench/contrib/files/browser/editors/fileEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-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/chatModel';
+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-3a35f433-1297-5707-ab58-c261b8180e6d-common/vscode/vs/workbench/contrib/chat/browser/contrib/screenshot';
+import { ChatInstructionsPickerPick } from './promptActions/chatAttachInstructionsAction.js';
+import { imageToHash } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+
+let ChatContextContributions = class ChatContextContributions extends Disposable {
+    static { this.ID = 'chat.contextContributions'; }
+    constructor(instantiationService, contextPickService) {
+        super();
+        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ToolsContextPickerPick)));
+        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ChatInstructionsPickerPick)));
+        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(OpenEditorContextValuePick)));
+        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(RelatedFilesContextPickerPick)));
+        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ClipboardImageContextValuePick)));
+        this._store.add(contextPickService.registerChatContextItem(instantiationService.createInstance(ScreenshotContextValuePick)));
+    }
+};
+ChatContextContributions = ( __decorate([
+    ( __param(0, IInstantiationService)),
+    ( __param(1, IChatContextPickService))
+], ChatContextContributions));
+class ToolsContextPickerPick {
+    constructor() {
+        this.type = 'pickerPick';
+        this.label = ( localize(4433, 'Tools...'));
+        this.icon = Codicon.tools;
+        this.ordinal = -500;
+    }
+    asPicker(widget) {
+        const items = [];
+        for (const entry of widget.input.selectedToolsModel.entries.get()) {
+            if (entry instanceof ToolSet) {
+                items.push({
+                    toolInfo: ToolDataSource.classify(entry.source),
+                    label: entry.referenceName,
+                    description: entry.description,
+                    asAttachment: () => this._asToolSetAttachment(entry)
+                });
+            }
+            else {
+                items.push({
+                    toolInfo: ToolDataSource.classify(entry.source),
+                    label: entry.toolReferenceName ?? entry.displayName,
+                    description: entry.userDescription ?? entry.modelDescription,
+                    asAttachment: () => this._asToolAttachment(entry)
+                });
+            }
+        }
+        items.sort((a, b) => {
+            let res = a.toolInfo.ordinal - b.toolInfo.ordinal;
+            if (res === 0) {
+                res = a.toolInfo.label.localeCompare(b.toolInfo.label);
+            }
+            if (res === 0) {
+                res = a.label.localeCompare(b.label);
+            }
+            return res;
+        });
+        let lastGroupLabel;
+        const picks = [];
+        for (const item of items) {
+            if (lastGroupLabel !== item.toolInfo.label) {
+                picks.push({ type: 'separator', label: item.toolInfo.label });
+                lastGroupLabel = item.toolInfo.label;
+            }
+            picks.push(item);
+        }
+        return {
+            placeholder: ( localize(4434, '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(4435, 'Open Editors'));
+        this.icon = Codicon.file;
+        this.ordinal = 800;
+    }
+    isEnabled() {
+        return this._editorService.editors.filter(e => e instanceof FileEditorInput || e instanceof DiffEditorInput || e instanceof UntitledTextEditorInput).length > 0;
+    }
+    async asAttachment() {
+        const result = [];
+        for (const editor of this._editorService.editors) {
+            if (!(editor instanceof FileEditorInput || editor instanceof DiffEditorInput || editor instanceof UntitledTextEditorInput || editor instanceof NotebookEditorInput)) {
+                continue;
+            }
+            const uri = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.PRIMARY });
+            if (!uri) {
+                continue;
+            }
+            result.push({
+                kind: 'file',
+                id: ( uri.toString()),
+                value: uri,
+                name: this._labelService.getUriBasenameLabel(uri),
+            });
+        }
+        return result;
+    }
+};
+OpenEditorContextValuePick = ( __decorate([
+    ( __param(0, IEditorService)),
+    ( __param(1, ILabelService))
+], OpenEditorContextValuePick));
+let RelatedFilesContextPickerPick = class RelatedFilesContextPickerPick {
+    constructor(_chatEditingService, _labelService) {
+        this._chatEditingService = _chatEditingService;
+        this._labelService = _labelService;
+        this.type = 'pickerPick';
+        this.label = ( localize(4436, 'Related Files'));
+        this.icon = Codicon.sparkle;
+        this.ordinal = 300;
+    }
+    isEnabled(widget) {
+        return this._chatEditingService.hasRelatedFilesProviders() && (Boolean(widget.getInput()) || widget.attachmentModel.fileAttachments.length > 0);
+    }
+    asPicker(widget) {
+        const picks = (async () => {
+            const chatSessionId = widget.viewModel?.sessionId;
+            if (!chatSessionId) {
+                return [];
+            }
+            const relatedFiles = await this._chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None);
+            if (!relatedFiles) {
+                return [];
+            }
+            const attachments = widget.attachmentModel.getAttachmentIDs();
+            return this._chatEditingService.getRelatedFiles(chatSessionId, widget.getInput(), widget.attachmentModel.fileAttachments, CancellationToken.None)
+                .then((files) => (files ?? []).reduce((acc, cur) => {
+                acc.push({ type: 'separator', label: cur.group });
+                for (const file of cur.files) {
+                    const label = this._labelService.getUriBasenameLabel(file.uri);
+                    acc.push({
+                        label: label,
+                        description: this._labelService.getUriLabel(dirname(file.uri), { relative: true }),
+                        disabled: ( attachments.has(( file.uri.toString()))),
+                        asAttachment: () => {
+                            return {
+                                kind: 'file',
+                                id: ( file.uri.toString()),
+                                value: file.uri,
+                                name: label,
+                                omittedState: OmittedState.NotOmitted
+                            };
+                        }
+                    });
+                }
+                return acc;
+            }, []));
+        })();
+        return {
+            placeholder: ( localize(4437, 'Add related files to your working set')),
+            picks,
+        };
+    }
+};
+RelatedFilesContextPickerPick = ( __decorate([
+    ( __param(0, IChatEditingService)),
+    ( __param(1, ILabelService))
+], RelatedFilesContextPickerPick));
+let ClipboardImageContextValuePick = class ClipboardImageContextValuePick {
+    constructor(_clipboardService) {
+        this._clipboardService = _clipboardService;
+        this.type = 'valuePick';
+        this.label = ( localize(4438, 'Image from Clipboard'));
+        this.icon = Codicon.fileMedia;
+    }
+    async isEnabled(widget) {
+        if (!widget.input.selectedLanguageModel?.metadata.capabilities?.vision) {
+            return false;
+        }
+        const imageData = await this._clipboardService.readImage();
+        return isImage(imageData);
+    }
+    async asAttachment() {
+        const fileBuffer = await this._clipboardService.readImage();
+        return {
+            id: await imageToHash(fileBuffer),
+            name: ( localize(4439, 'Pasted Image')),
+            fullName: ( localize(4439, 'Pasted Image')),
+            value: fileBuffer,
+            kind: 'image',
+        };
+    }
+};
+ClipboardImageContextValuePick = ( __decorate([
+    ( __param(0, IClipboardService))
+], ClipboardImageContextValuePick));
+let ScreenshotContextValuePick = class ScreenshotContextValuePick {
+    constructor(_hostService) {
+        this._hostService = _hostService;
+        this.type = 'valuePick';
+        this.icon = Codicon.deviceCamera;
+        this.label = (isElectron
+            ? ( localize(4440, 'Screenshot Window'))
+            : ( localize(4441, 'Screenshot')));
+    }
+    async isEnabled(widget) {
+        return !!widget.input.selectedLanguageModel?.metadata.capabilities?.vision;
+    }
+    async asAttachment() {
+        const blob = await this._hostService.getScreenshot();
+        return blob && convertBufferToScreenshotVariable(blob);
+    }
+};
+ScreenshotContextValuePick = ( __decorate([
+    ( __param(0, IHostService))
+], ScreenshotContextValuePick));
+
+export { ChatContextContributions };

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

@@ -8,10 +8,9 @@ export declare class AttachSearchResultAction extends Action2 {
 }
 export declare class AttachContextAction extends Action2 {
     constructor();
-    private _getFileContextId;
-    private _attachContext;
     run(accessor: ServicesAccessor, ...args: any[]): Promise<void>;
-    private _showDiagnosticsPick;
     private _show;
-    private _showFolders;
+    private _handleQPPick;
+    private _handleContextPick;
+    private _handleContextPickerItem;
 }